This commit was manufactured by cvs2svn to create tag 'v200911042233'.
diff --git a/bundles/org.eclipse.jst.ws.cxf.consumption.core/.classpath b/bundles/org.eclipse.jst.ws.cxf.consumption.core/.classpath
deleted file mode 100644
index e721d0c..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.consumption.core/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="src" path="src/"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/bundles/org.eclipse.jst.ws.cxf.consumption.core/.project b/bundles/org.eclipse.jst.ws.cxf.consumption.core/.project
deleted file mode 100644
index e59b69c..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.consumption.core/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.jst.ws.cxf.consumption.core</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
diff --git a/bundles/org.eclipse.jst.ws.cxf.consumption.core/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.jst.ws.cxf.consumption.core/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 7894f8b..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.consumption.core/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,7 +0,0 @@
-#Fri Nov 07 23:58:52 EST 2008
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
diff --git a/bundles/org.eclipse.jst.ws.cxf.consumption.core/META-INF/MANIFEST.MF b/bundles/org.eclipse.jst.ws.cxf.consumption.core/META-INF/MANIFEST.MF
deleted file mode 100644
index 55d6472..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.consumption.core/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,24 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.jst.ws.cxf.consumption.core;singleton:=true
-Bundle-Version: 0.4.0.qualifier
-Bundle-Activator: org.eclipse.jst.ws.internal.cxf.consumption.core.CXFConsumptionCorePlugin
-Bundle-Vendor: %pluginProvider
-Bundle-Localization: plugin
-Export-Package: org.eclipse.jst.ws.internal.cxf.consumption.core.commands;x-friends:="org.eclipse.jst.ws.cxf.consumption.ui"
-Require-Bundle: org.eclipse.ui;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.wst.ws;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.core.resources;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.jst.ws;bundle-version="[1.0.304,1.1.0)",
- org.eclipse.wst.common.frameworks;bundle-version="[1.1.200,1.3.0)",
- org.eclipse.jst.ws.cxf.core;bundle-version="0.4.3",
- org.eclipse.jdt.core;bundle-version="[3.4.0,4.0.0)",
- javax.wsdl;bundle-version="[1.6.2,1.7.0)",
- org.eclipse.wst.common.modulecore;bundle-version="[1.1.0,1.3.0)",
- org.eclipse.jst.ws.jaxws.core;bundle-version="0.5.0"
-Ant-Version: Apache Ant 1.7.0
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Created-By: 1.5.0_14-b03 (Sun Microsystems Inc.)
-Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.jst.ws.cxf.consumption.core/about.html b/bundles/org.eclipse.jst.ws.cxf.consumption.core/about.html
deleted file mode 100644
index 3d169bf..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.consumption.core/about.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
-<title>About</title>
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
-
-<p>September 12, 2008</p>
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, "Program" will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is
-being redistributed by another party ("Redistributor") and different terms and conditions may
-apply to your use of any object code in the Content. Check the Redistributor's license that was
-provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
-
-</body>
-</html>
diff --git a/bundles/org.eclipse.jst.ws.cxf.consumption.core/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 7c6cf7c..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 Web Tools Platform
-
-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 63eb001..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.consumption.core/src/org/eclipse/jst/ws/internal/cxf/consumption/core/CXFConsumptionCoreMessages.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IONA Technologies PLC
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IONA Technologies PLC - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.cxf.consumption.core;
-
-import org.eclipse.osgi.util.NLS;
-
-public class CXFConsumptionCoreMessages extends NLS {
- private static final String BUNDLE_NAME =
- "org.eclipse.jst.ws.internal.cxf.consumption.core.CXFConsumptionCoreMessages"; //$NON-NLS-1$
-
- static {
- // initialize resource bundle
- NLS.initializeMessages(CXFConsumptionCoreMessages.BUNDLE_NAME, CXFConsumptionCoreMessages.class);
- }
-
- private CXFConsumptionCoreMessages() {
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.cxf.consumption.core/src/org/eclipse/jst/ws/internal/cxf/consumption/core/CXFConsumptionCoreMessages.properties b/bundles/org.eclipse.jst.ws.cxf.consumption.core/src/org/eclipse/jst/ws/internal/cxf/consumption/core/CXFConsumptionCoreMessages.properties
deleted file mode 100644
index 5d980bc..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.consumption.core/src/org/eclipse/jst/ws/internal/cxf/consumption/core/CXFConsumptionCoreMessages.properties
+++ /dev/null
@@ -1,10 +0,0 @@
-###############################################################################
-# Copyright (c) 2008 IONA Technologies PLC
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IONA Technologies PLC - initial API and implementation
-###############################################################################
\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.cxf.consumption.core/src/org/eclipse/jst/ws/internal/cxf/consumption/core/CXFConsumptionCorePlugin.java b/bundles/org.eclipse.jst.ws.cxf.consumption.core/src/org/eclipse/jst/ws/internal/cxf/consumption/core/CXFConsumptionCorePlugin.java
deleted file mode 100644
index e920fe6..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.consumption.core/src/org/eclipse/jst/ws/internal/cxf/consumption/core/CXFConsumptionCorePlugin.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IONA Technologies PLC
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IONA Technologies PLC - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.cxf.consumption.core;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.osgi.framework.BundleContext;
-
-/**
- * The activator class controls the plug-in life cycle.
- *
- */
-public class CXFConsumptionCorePlugin extends AbstractUIPlugin {
- // The plug-in ID
- public static final String PLUGIN_ID = "org.eclipse.jst.ws.cxf.consumption.core"; //$NON-NLS-1$
-
- // The shared instance
- private static CXFConsumptionCorePlugin plugin;
-
- /**
- * The constructor.
- */
- public CXFConsumptionCorePlugin() {
- }
-
- /**
- * Returns the shared instance.
- *
- * @return the shared instance
- */
- public static CXFConsumptionCorePlugin getDefault() {
- return plugin;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
- */
- @Override
- public void start(BundleContext context) throws Exception {
- super.start(context);
- plugin = this;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
- */
- @Override
- public void stop(BundleContext context) throws Exception {
- plugin = null;
- super.stop(context);
- }
-
- public static void logMessage(int severity, String message) {
- CXFConsumptionCorePlugin.log(new Status(severity, CXFConsumptionCorePlugin.PLUGIN_ID,
- message));
- }
-
- public static void log(IStatus status) {
- CXFConsumptionCorePlugin.getDefault().getLog().log(status);
- }
-
- public static void log(Throwable exception) {
- CXFConsumptionCorePlugin.log(new Status(IStatus.ERROR, CXFConsumptionCorePlugin.PLUGIN_ID,
- exception.toString(), exception));
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.cxf.consumption.core/src/org/eclipse/jst/ws/internal/cxf/consumption/core/commands/WSDL2JavaClientCommand.java b/bundles/org.eclipse.jst.ws.cxf.consumption.core/src/org/eclipse/jst/ws/internal/cxf/consumption/core/commands/WSDL2JavaClientCommand.java
deleted file mode 100644
index 0b637d7..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.Path;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jst.ws.internal.cxf.consumption.core.CXFConsumptionCorePlugin;
-import org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaDataModel;
-import org.eclipse.jst.ws.internal.cxf.core.resources.JavaResourceChangeListener;
-import org.eclipse.jst.ws.internal.cxf.core.utils.CommandLineUtils;
-import org.eclipse.jst.ws.internal.cxf.core.utils.FileUtils;
-import org.eclipse.jst.ws.internal.cxf.core.utils.LaunchUtils;
-import org.eclipse.jst.ws.jaxws.core.utils.JDTUtils;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-
-/**
- * Executes the <code>org.apache.cxf.tools.wsdlto.WSDLToJava</code> command with the arguments
- * necessary to generate a client.
- *
- */
-public class WSDL2JavaClientCommand extends AbstractDataModelOperation {
- public static final String CXF_TOOL_CLASS_NAME = "org.apache.cxf.tools.wsdlto.WSDLToJava"; //$NON-NLS-1$
-
- private WSDL2JavaDataModel model;
-
- private JavaResourceChangeListener javaResourceChangeListener;
-
- /**
- * Constructs a <code>WSDL2JavaClientCommand</code> object.
- * @param model the <code>WSDL2JavaDataModel</code> used to pass information
- * between commands.
- */
- public WSDL2JavaClientCommand(WSDL2JavaDataModel model) {
- this.model = model;
- }
-
- @Override
- public IStatus execute(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
- IStatus status = Status.OK_STATUS;
- javaResourceChangeListener = new JavaResourceChangeListener(new Path(model.getJavaSourceFolder()));
- ResourcesPlugin.getWorkspace().addResourceChangeListener(javaResourceChangeListener,
- IResourceChangeEvent.POST_CHANGE);
-
- String[] progArgs = CommandLineUtils.getWSDL2JavaGenerateClientArguments(model);
-
- try {
- String projectName = model.getProjectName();
-
- IJavaProject javaProject = JDTUtils.getJavaProject(projectName);
- LaunchUtils.launch(javaProject, WSDL2JavaClientCommand.CXF_TOOL_CLASS_NAME, progArgs);
- FileUtils.copyW2JFilesFromTmp(this.model);
- } catch (CoreException ce) {
- status = ce.getStatus();
- CXFConsumptionCorePlugin.log(status);
- }
-
- ResourcesPlugin.getWorkspace().removeResourceChangeListener(javaResourceChangeListener);
- return status;
- }
-
- @Override
- public IStatus undo(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
- IStatus status = Status.OK_STATUS;
- List<IResource> changedResources = new ArrayList<IResource>();
- changedResources.addAll(javaResourceChangeListener.getChangedResources());
- if (changedResources.size() > 0) {
- for (IResource resource : changedResources) {
- try {
- resource.delete(true, monitor);
- } catch (CoreException ce) {
- status = ce.getStatus();
- CXFConsumptionCorePlugin.log(status);
- }
- }
- }
- return status;
- }
-}
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 d66e388..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.consumption.core/src/org/eclipse/jst/ws/internal/cxf/consumption/core/commands/WSDL2JavaClientDefaultingCommand.java
+++ /dev/null
@@ -1,119 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IONA Technologies PLC
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IONA Technologies PLC - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.cxf.consumption.core.commands;
-
-import java.io.IOException;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.HashMap;
-
-import javax.wsdl.Definition;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.ws.internal.cxf.consumption.core.CXFConsumptionCorePlugin;
-import org.eclipse.jst.ws.internal.cxf.core.CXFCorePlugin;
-import org.eclipse.jst.ws.internal.cxf.core.context.WSDL2JavaPersistentContext;
-import org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaDataModel;
-import org.eclipse.jst.ws.jaxws.core.utils.JDTUtils;
-import org.eclipse.jst.ws.jaxws.core.utils.WSDLUtils;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-
-/**
- * Loads the <code>WSDL2JavaDataModel</code> with the persisted defaults
- * from the preferences and with the initial runtime information such as the
- * starting point WSDL URL.
- *
- */
-public class WSDL2JavaClientDefaultingCommand extends AbstractDataModelOperation {
- private WSDL2JavaDataModel model;
- private String projectName;
- private String inputURL;
-
- /**
- * Constructs a WSDL2JavaClientDefaultingCommand object.
- * @param model the <code>WSDL2JavaDataModel</code> used to pass information
- * between commands.
- */
- public WSDL2JavaClientDefaultingCommand(WSDL2JavaDataModel model, String projectName, String inputURL) {
- this.model = model;
- this.projectName = projectName;
- this.inputURL = inputURL;
- }
-
- @Override
- public IStatus execute(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
- IStatus status = Status.OK_STATUS;
- WSDL2JavaPersistentContext context = CXFCorePlugin.getDefault().getWSDL2JavaContext();
- model.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()).toOSString());
-
- try {
- URL wsdlUrl = new URL(inputURL);
- model.setWsdlURL(wsdlUrl);
-
- Definition definition = WSDLUtils.readWSDL(model.getWsdlURL());
- if (definition != null) {
- String targetNamespace = definition.getTargetNamespace();
- String packageName = WSDLUtils.getPackageNameFromNamespace(targetNamespace);
- model.setTargetNamespace(targetNamespace);
- model.getIncludedNamespaces().put(targetNamespace, packageName);
-
- String wsdlLocation = WSDLUtils.getWSDLLocation(definition);
- if (wsdlLocation != null) {
- model.setWsdlLocation(wsdlLocation);
- }
-
- model.setWsdlDefinition(definition);
- }
-
- } catch (MalformedURLException murle) {
- status = new Status(IStatus.ERROR, CXFConsumptionCorePlugin.PLUGIN_ID,
- murle.getLocalizedMessage());
- CXFConsumptionCorePlugin.log(status);
- } catch (IOException ioe) {
- status = new Status(IStatus.ERROR, CXFConsumptionCorePlugin.PLUGIN_ID,
- ioe.getLocalizedMessage());
- CXFConsumptionCorePlugin.log(status);
- }
- return status;
- }
-
- public WSDL2JavaDataModel getWSDL2JavaDataModel() {
- return model;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.cxf.consumption.core/src/org/eclipse/jst/ws/internal/cxf/consumption/core/locator/CXFWebServiceLocator.java b/bundles/org.eclipse.jst.ws.cxf.consumption.core/src/org/eclipse/jst/ws/internal/cxf/consumption/core/locator/CXFWebServiceLocator.java
deleted file mode 100644
index a150dea..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.consumption.core/src/org/eclipse/jst/ws/internal/cxf/consumption/core/locator/CXFWebServiceLocator.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IONA Technologies PLC
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IONA Technologies PLC - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.cxf.consumption.core.locator;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.jst.ws.internal.common.J2EEUtils;
-import org.eclipse.wst.ws.internal.wsfinder.AbstractWebServiceLocator;
-
-@SuppressWarnings("restriction")
-public class CXFWebServiceLocator extends AbstractWebServiceLocator {
-
- @Override
- @SuppressWarnings("unchecked")
- public List getWebServiceClients(IProgressMonitor monitor) {
- return super.getWebServiceClients(monitor);
- }
-
- @Override
- @SuppressWarnings("unchecked")
- public List getWebServiceClients(IProject[] projects, IProgressMonitor monitor) {
- return super.getWebServiceClients(projects, monitor);
- }
-
- @Override
- @SuppressWarnings("unchecked")
- public List getWebServices(IProgressMonitor monitor) {
- IProject[] projects = ResourcesPlugin.getWorkspace().getRoot().getProjects();
- return getWebServices(projects, monitor);
- }
-
- @Override
- @SuppressWarnings("unchecked")
- public List getWebServices(IProject[] projects, IProgressMonitor monitor) {
- List webServices = new ArrayList();
- for (IProject project : projects) {
- if (J2EEUtils.isWebComponent(project)) {
- webServices.addAll(getWebServicesFromProject(project));
- }
- }
- return webServices;
- }
-
- @SuppressWarnings("unchecked")
- private List getWebServicesFromProject(IProject project) {
- return null;
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.cxf.consumption.ui/.classpath b/bundles/org.eclipse.jst.ws.cxf.consumption.ui/.classpath
deleted file mode 100644
index e721d0c..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.consumption.ui/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="src" path="src/"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/bundles/org.eclipse.jst.ws.cxf.consumption.ui/.project b/bundles/org.eclipse.jst.ws.cxf.consumption.ui/.project
deleted file mode 100644
index f8721ed..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.consumption.ui/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.jst.ws.cxf.consumption.ui</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
diff --git a/bundles/org.eclipse.jst.ws.cxf.consumption.ui/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.jst.ws.cxf.consumption.ui/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index fc358c6..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.consumption.ui/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,7 +0,0 @@
-#Fri Nov 07 23:58:53 EST 2008
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
diff --git a/bundles/org.eclipse.jst.ws.cxf.consumption.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.jst.ws.cxf.consumption.ui/META-INF/MANIFEST.MF
deleted file mode 100644
index cc21552..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.consumption.ui/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,31 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.jst.ws.cxf.consumption.ui;singleton:=true
-Bundle-Version: 0.4.0.qualifier
-Bundle-Activator: org.eclipse.jst.ws.internal.cxf.consumption.ui.CXFConsumptionUIPlugin
-Bundle-Vendor: %pluginProvider
-Bundle-Localization: plugin
-Export-Package: org.eclipse.jst.ws.internal.cxf.consumption.ui.wsrt;x-friends:="org.eclipse.jst.ws.cxf.creation.ui"
-Require-Bundle: org.eclipse.ui;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.jst.ws.consumption.ui;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.core.resources;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.wst.command.env.ui;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.wst.command.env.core;bundle-version="[1.0.204,1.1.0)",
- org.eclipse.jdt.core;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.jst.ws;bundle-version="[1.0.304,1.1.0)",
- org.eclipse.wst.common.modulecore;bundle-version="[1.1.0,1.3.0)",
- org.eclipse.jdt.ui;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.wst.ws;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.jst.ws.cxf.consumption.core;bundle-version="0.3.4",
- org.eclipse.wst.common.frameworks;bundle-version="[1.1.200,1.3.0)",
- org.eclipse.wst.command.env;bundle-version="[1.0.305,1.1.0)",
- org.eclipse.jst.ws.cxf.core;bundle-version="0.4.3",
- org.eclipse.jst.ws.cxf.ui;bundle-version="0.3.5",
- javax.wsdl;bundle-version="[1.6.2,1.7.0)",
- org.eclipse.jst.ws.jaxws.core;bundle-version="0.5.0"
-Ant-Version: Apache Ant 1.7.0
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Created-By: 1.5.0_14-b03 (Sun Microsystems Inc.)
-Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.jst.ws.cxf.consumption.ui/about.html b/bundles/org.eclipse.jst.ws.cxf.consumption.ui/about.html
deleted file mode 100644
index 3d169bf..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.consumption.ui/about.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
-<title>About</title>
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
-
-<p>September 12, 2008</p>
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, "Program" will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is
-being redistributed by another party ("Redistributor") and different terms and conditions may
-apply to your use of any object code in the Content. Check the Redistributor's license that was
-provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
-
-</body>
-</html>
diff --git a/bundles/org.eclipse.jst.ws.cxf.consumption.ui/build.properties b/bundles/org.eclipse.jst.ws.cxf.consumption.ui/build.properties
deleted file mode 100644
index 534b8eb..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.consumption.ui/build.properties
+++ /dev/null
@@ -1,6 +0,0 @@
-source.. = src/
-bin.includes = META-INF/,\
- about.html,\
- .,\
- plugin.properties,\
- plugin.xml
diff --git a/bundles/org.eclipse.jst.ws.cxf.consumption.ui/plugin.properties b/bundles/org.eclipse.jst.ws.cxf.consumption.ui/plugin.properties
deleted file mode 100644
index 5ade88b..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.consumption.ui/plugin.properties
+++ /dev/null
@@ -1,17 +0,0 @@
-###############################################################################
-# Copyright (c) 2008 IONA Technologies PLC
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IONA Technologies PLC - initial API and implementation
-###############################################################################
-
-pluginName=CXF Web Services Consumption UI (Incubation)
-pluginProvider=Eclipse Web Tools Platform
-
-JAXWS_WEBSERVICETYPE=POJO Web Service
-
-JAXWS_CLIENT=JAX-WS Stub
\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.cxf.consumption.ui/plugin.xml b/bundles/org.eclipse.jst.ws.cxf.consumption.ui/plugin.xml
deleted file mode 100644
index 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 5f847b8..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.consumption.ui/src/org/eclipse/jst/ws/internal/cxf/consumption/ui/CXFConsumptionUIMessages.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IONA Technologies PLC
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IONA Technologies PLC - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.cxf.consumption.ui;
-
-import org.eclipse.osgi.util.NLS;
-
-public class CXFConsumptionUIMessages extends NLS {
- private static final String BUNDLE_NAME =
- "org.eclipse.jst.ws.internal.cxf.consumption.ui.CXFConsumptionUIMessages"; //$NON-NLS-1$
- public static String CXFJAXWSSELECTIONLAUNCHABLE_SELECTION_DIALOG_MESSAGE;
- public static String CXFJAXWSSELECTIONLAUNCHABLE_SELECTION_DIALOG_TITLE;
-
- public static String WSDL2JAVA_CLIENT_PAGE_TITLE;
- public static String WSDL2JAVA_CLIENT_PAGE_DESCRIPTION;
-
- public static String WSDL2JAVA_ClIENT_DEFAULTS_PAGE_TITLE;
- public static String WSDL2JAVA_CLIENT_DEFAULTS_PAGE_DESCRIPTION;
-
- public static String WSDL2JAVA_GROUP_LABEL;
- public static String WSDL2JAVA_XJC_ARG_GROUP_LABEL;
-
- static {
- // initialize resource bundle
- NLS.initializeMessages(CXFConsumptionUIMessages.BUNDLE_NAME, CXFConsumptionUIMessages.class);
- }
-
- private CXFConsumptionUIMessages() {
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.cxf.consumption.ui/src/org/eclipse/jst/ws/internal/cxf/consumption/ui/CXFConsumptionUIMessages.properties b/bundles/org.eclipse.jst.ws.cxf.consumption.ui/src/org/eclipse/jst/ws/internal/cxf/consumption/ui/CXFConsumptionUIMessages.properties
deleted file mode 100644
index 9406b55..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.consumption.ui/src/org/eclipse/jst/ws/internal/cxf/consumption/ui/CXFConsumptionUIMessages.properties
+++ /dev/null
@@ -1,24 +0,0 @@
-###############################################################################
-# Copyright (c) 2008 IONA Technologies PLC
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IONA Technologies PLC - initial API and implementation
-###############################################################################
-
-CXFJAXWSSELECTIONLAUNCHABLE_SELECTION_DIALOG_TITLE=Browse Workspace Classes and Interfaces
-CXFJAXWSSELECTIONLAUNCHABLE_SELECTION_DIALOG_MESSAGE=Select the Java Class or Interface which will be used to create the Web Service
-
-#WSDL2Java Client Congih Widget Factory
-WSDL2JAVA_CLIENT_PAGE_TITLE={0} {1} Web Service WSDL2Java Client Configuration
-WSDL2JAVA_CLIENT_PAGE_DESCRIPTION=Customise your Web Service generation by selecting options on this page
-
-WSDL2JAVA_ClIENT_DEFAULTS_PAGE_TITLE={0} {1} Web Service WSDL2Java Client Configuration
-WSDL2JAVA_CLIENT_DEFAULTS_PAGE_DESCRIPTION=Customise your Web Service generation by selecting options on this page
-
-#WSDL2Java Client Defaults Config Widget
-WSDL2JAVA_GROUP_LABEL=WSDL2Java Generation Options
-WSDL2JAVA_XJC_ARG_GROUP_LABEL=XJC Arguments
\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.cxf.consumption.ui/src/org/eclipse/jst/ws/internal/cxf/consumption/ui/CXFConsumptionUIPlugin.java b/bundles/org.eclipse.jst.ws.cxf.consumption.ui/src/org/eclipse/jst/ws/internal/cxf/consumption/ui/CXFConsumptionUIPlugin.java
deleted file mode 100644
index 269b5e6..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.consumption.ui/src/org/eclipse/jst/ws/internal/cxf/consumption/ui/CXFConsumptionUIPlugin.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IONA Technologies PLC
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IONA Technologies PLC - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.cxf.consumption.ui;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.osgi.framework.BundleContext;
-
-/**
- * The activator class controls the plug-in life cycle
- *
- */
-public class CXFConsumptionUIPlugin extends AbstractUIPlugin {
-
- // The plug-in ID
- public static final String PLUGIN_ID = "org.eclipse.jst.ws.cxf.consumption.ui"; //$NON-NLS-1$
-
- // The shared instance
- private static CXFConsumptionUIPlugin plugin;
-
- /**
- * The constructor
- */
- public CXFConsumptionUIPlugin() {
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
- */
- @Override
- public void start(BundleContext context) throws Exception {
- super.start(context);
- plugin = this;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
- */
- @Override
- public void stop(BundleContext context) throws Exception {
- plugin = null;
- super.stop(context);
- }
-
- /**
- * Returns the shared instance
- *
- * @return the shared instance
- */
- public static CXFConsumptionUIPlugin getDefault() {
- return plugin;
- }
-
- public static void logMessage(int severity, String message) {
- CXFConsumptionUIPlugin.log(new Status(severity, CXFConsumptionUIPlugin.PLUGIN_ID, message));
- }
-
- public static void log(IStatus status) {
- CXFConsumptionUIPlugin.getDefault().getLog().log(status);
- }
-
- public static void log(Throwable exception) {
- CXFConsumptionUIPlugin.log(new Status(IStatus.ERROR, CXFConsumptionUIPlugin.PLUGIN_ID,
- exception.toString(), exception));
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.cxf.consumption.ui/src/org/eclipse/jst/ws/internal/cxf/consumption/ui/widgets/CXFJAXWSSelectionLaunchable.java b/bundles/org.eclipse.jst.ws.cxf.consumption.ui/src/org/eclipse/jst/ws/internal/cxf/consumption/ui/widgets/CXFJAXWSSelectionLaunchable.java
deleted file mode 100644
index 053d1d9..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.consumption.ui/src/org/eclipse/jst/ws/internal/cxf/consumption/ui/widgets/CXFJAXWSSelectionLaunchable.java
+++ /dev/null
@@ -1,205 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IONA Technologies PLC
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IONA Technologies PLC - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.cxf.consumption.ui.widgets;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IPackageFragment;
-import org.eclipse.jdt.core.IPackageFragmentRoot;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jdt.ui.JavaElementLabelProvider;
-import org.eclipse.jdt.ui.StandardJavaElementContentProvider;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.viewers.TreeSelection;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.viewers.ViewerFilter;
-import org.eclipse.jface.window.Window;
-import org.eclipse.jst.ws.internal.common.ResourceUtils;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.AbstractObjectSelectionLaunchable;
-import org.eclipse.jst.ws.internal.cxf.consumption.ui.CXFConsumptionUIMessages;
-import org.eclipse.jst.ws.internal.cxf.consumption.ui.CXFConsumptionUIPlugin;
-import org.eclipse.jst.ws.jaxws.core.utils.JDTUtils;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.ISelectionService;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.dialogs.ElementTreeSelectionDialog;
-import org.eclipse.ui.dialogs.ISelectionStatusValidator;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-
-@SuppressWarnings("restriction")
-public class CXFJAXWSSelectionLaunchable extends AbstractObjectSelectionLaunchable {
- private IStatus validationStatus = Status.OK_STATUS;
-
- private IProject project;
- private String serverComponentName;
- private String className = "";
-
- @Override
- public void setInitialSelection(IStructuredSelection initialSelection) {
- if (initialSelection != null && !initialSelection.isEmpty()) {
- Object firstElement = initialSelection.getFirstElement();
- if (firstElement instanceof String) {
- className = firstElement.toString();
- }
- }
- }
-
- @Override
- public int launch(Shell shell) {
- IStatus status = Status.OK_STATUS;
- ElementTreeSelectionDialog selectionDialog = new ElementTreeSelectionDialog(shell,
- new JavaElementLabelProvider(), new StandardJavaElementContentProvider());
- selectionDialog.setTitle(CXFConsumptionUIMessages.CXFJAXWSSELECTIONLAUNCHABLE_SELECTION_DIALOG_TITLE);
- selectionDialog
- .setMessage(CXFConsumptionUIMessages.CXFJAXWSSELECTIONLAUNCHABLE_SELECTION_DIALOG_MESSAGE);
- selectionDialog.setAllowMultiple(false);
- selectionDialog.setInput(JavaCore.create(ResourcesPlugin.getWorkspace().getRoot()));
- selectionDialog.addFilter(new JavaViewerFilter());
-
- selectionDialog.setValidator(new JavaSelectionStatusValidator());
-
- int returnCode = selectionDialog.open();
- if (returnCode == Window.OK) {
- ICompilationUnit selectedCompilationUnit = (ICompilationUnit) selectionDialog.getFirstResult();
- IType type = selectedCompilationUnit.findPrimaryType();
- className = type.getFullyQualifiedName();
- try {
- IResource typeResource = type.getUnderlyingResource();
- if (typeResource != null) {
- this.project = typeResource.getProject();
- IVirtualComponent comp = ResourceUtils.getComponentOf(typeResource);
- if (comp != null) {
- serverComponentName = comp.getName();
- }
- } else {
- project = null;
- serverComponentName = null;
- }
- return status.getSeverity();
- } catch (JavaModelException jme) {
- project = null;
- serverComponentName = null;
- status = jme.getStatus();
- CXFConsumptionUIPlugin.log(status);
- return status.getSeverity();
- }
- }
-
- return IStatus.CANCEL;
- }
-
- @Override
- public IStructuredSelection getObjectSelection() {
- return new StructuredSelection(className);
- }
-
- public String getComponentName() {
- return serverComponentName;
- }
-
- public IProject getProject() {
- ISelectionService selectionService = PlatformUI.getWorkbench().getActiveWorkbenchWindow()
- .getSelectionService();
- ISelection selection = selectionService.getSelection();
-
- if (selection != null && !selection.isEmpty() && selection instanceof TreeSelection) {
- TreeSelection treeSelection = (TreeSelection) selection;
- Object firstElement = treeSelection.getFirstElement();
- if (firstElement instanceof ICompilationUnit) {
- ICompilationUnit compilationUnit = (ICompilationUnit) firstElement;
- project = compilationUnit.getResource().getProject();
- }
- }
- return project;
- }
-
- @Override
- public IStatus validateSelection(IStructuredSelection objectSelection) {
- return validationStatus;
- }
-
- @Override
- public String getObjectSelectionDisplayableString() {
- return className;
- }
-
- @Override
- public boolean validate(String stringToValidate) {
- className = stringToValidate;
-
- IProject project = getProject();
- if (project != null) {
- validationStatus = JDTUtils.validateJavaTypeName(project.getName(), className);
- } else {
- validationStatus = JDTUtils.validateJavaTypeName(className);
- }
-
-// IProject project = getProject();
-// if (project != null) {
-// IType type = JDTUtils.getType(project, className);
-// if (type == null || !type.exists()) {
-// validationStatus = new Status(IStatus.ERROR, CXFConsumptionUIPlugin.PLUGIN_ID, "");
-// } else {
-// validationStatus = JDTUtils.validateJavaTypeName(project.getName(), className);
-// }
-// return validationStatus.isOK();
-// }
- return validationStatus.isOK();
- }
-
- private static class JavaViewerFilter extends ViewerFilter {
- @Override
- public boolean select(Viewer viewer, Object parentElement, Object element) {
- try {
- if (element instanceof IJavaProject) {
- return true;
- }
- if (element instanceof IPackageFragmentRoot) {
- IPackageFragmentRoot packageFragmentRoot = (IPackageFragmentRoot) element;
- return packageFragmentRoot.getKind() == IPackageFragmentRoot.K_SOURCE;
- }
- if (element instanceof IPackageFragment) {
- IPackageFragment packageFragment = (IPackageFragment) element;
- return packageFragment.hasChildren();
- }
- if (element instanceof ICompilationUnit) {
- ICompilationUnit compilationUnit = (ICompilationUnit) element;
- IType type = compilationUnit.findPrimaryType();
- return type.isClass() || type.isInterface();
-
- }
- } catch (JavaModelException jme) {
- CXFConsumptionUIPlugin.log(jme.getStatus());
- }
- return false;
- }
- }
-
- private static class JavaSelectionStatusValidator implements ISelectionStatusValidator {
- public IStatus validate(Object[] selection) {
- if (selection.length == 1) {
- if (selection[0] instanceof ICompilationUnit) {
- return new Status(IStatus.OK, CXFConsumptionUIPlugin.PLUGIN_ID, ""); //$NON-NLS-1$
- }
- }
- return new Status(IStatus.ERROR, CXFConsumptionUIPlugin.PLUGIN_ID, ""); //$NON-NLS-1$
- }
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.cxf.consumption.ui/src/org/eclipse/jst/ws/internal/cxf/consumption/ui/widgets/WSDL2JavaClientConfigWidget.java b/bundles/org.eclipse.jst.ws.cxf.consumption.ui/src/org/eclipse/jst/ws/internal/cxf/consumption/ui/widgets/WSDL2JavaClientConfigWidget.java
deleted file mode 100644
index 84d09c4..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,279 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IONA Technologies PLC
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IONA Technologies PLC - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.cxf.consumption.ui.widgets;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jface.viewers.ColumnWeightData;
-import org.eclipse.jface.viewers.ICellEditorListener;
-import org.eclipse.jface.viewers.ICellEditorValidator;
-import org.eclipse.jface.viewers.TableLayout;
-import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.jface.viewers.TableViewerColumn;
-import org.eclipse.jface.viewers.TextCellEditor;
-import org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaDataModel;
-import org.eclipse.jst.ws.internal.cxf.ui.viewers.PackageNameEditingSupport;
-import org.eclipse.jst.ws.internal.cxf.ui.viewers.PackageNameTableContentProvider;
-import org.eclipse.jst.ws.internal.cxf.ui.widgets.WSDL2JavaWidgetFactory;
-import org.eclipse.jst.ws.jaxws.core.utils.JDTUtils;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.List;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.swt.widgets.TableItem;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.wst.command.internal.env.ui.widgets.SimpleWidgetDataContributor;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetDataEvents;
-
-@SuppressWarnings("restriction")
-public class WSDL2JavaClientConfigWidget extends SimpleWidgetDataContributor {
- private IStatus status = Status.OK_STATUS;
- private Listener statusListener;
-
- private WSDL2JavaDataModel model;
-
- private Composite namespaceCompositeHolder;
- private Composite namespaceComposite;
- private int namespaceCompositeHeight = -1;
-
- public WSDL2JavaClientConfigWidget() {
- }
-
- public void setWSDL2JavaDataModel(WSDL2JavaDataModel model) {
- this.model = model;
- }
-
- @Override
- public WidgetDataEvents addControls(final Composite parent, final Listener statusListener) {
- this.statusListener = statusListener;
-
- final Composite mainComposite = new Composite(parent, SWT.NONE);
- GridLayout gridLayout = new GridLayout(3, false);
- mainComposite.setLayout(gridLayout);
-
- GridData gridData = new GridData(SWT.FILL, SWT.FILL, true, true);
- mainComposite.setLayoutData(gridData);
-
- // Output Dir
- WSDL2JavaWidgetFactory.createOutputDirectoryLabel(mainComposite);
-
- Combo outputDirCombo = WSDL2JavaWidgetFactory.createOutputDirectoryCombo(mainComposite, model);
- gridData = new GridData(SWT.FILL, SWT.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);
-
- TextCellEditor textCellEditor = new TextCellEditor(packageNameTableViewer.getTable());
- textCellEditor.addListener( new ICellEditorListener() {
-
- public void editorValueChanged(boolean oldValidState, boolean newValidState) {
- statusListener.handleEvent(null);
- }
-
- public void cancelEditor() {
- }
-
- public void applyEditorValue() {
- }
- });
-
- textCellEditor.setValidator(new ICellEditorValidator() {
-
- public String isValid(Object packageName) {
- status = JDTUtils.validatePackageName(model.getProjectName(), packageName.toString());
- if (status.getSeverity() == IStatus.OK) {
- return null;
- }
- return status.getMessage();
- }
- });
-
- packageNameViewerColumn.setEditingSupport(new PackageNameEditingSupport(packageNameTableViewer,
- textCellEditor, model));
-
- columnWeightData = new ColumnWeightData(100, 100, true);
- tableLayout.addColumnData(columnWeightData);
-
- packageNameTableViewer.setContentProvider(new PackageNameTableContentProvider());
- packageNameTableViewer.setInput(model.getWsdlDefinition());
-
- TableItem[] tableItems = packageNameTableViewer.getTable().getItems();
- for (int i = 0; i < tableItems.length; i++) {
- TableItem tableItem = tableItems[i];
- if (model.getIncludedNamespaces().containsKey(tableItem.getText(0))) {
- tableItem.setChecked(true);
- }
- }
- return packageNameTable;
- }
-
- private Composite getNamespaceMappingComposite(Composite parent) {
- namespaceComposite = new Composite(parent, SWT.NONE);
- GridLayout gridLayout = new GridLayout(1, true);
- namespaceComposite.setLayout(gridLayout);
- GridData gridData = new GridData(SWT.FILL, SWT.FILL, true, true);
- namespaceComposite.setLayoutData(gridData);
-
- Table packageNameTable = createNamespaceMappingTable(namespaceComposite);
-
- gridData = new GridData(SWT.FILL, SWT.FILL, true, true);
- gridData.horizontalSpan = 3;
- gridData.verticalSpan = 6;
- packageNameTable.setLayoutData(gridData);
-
- return namespaceComposite;
- }
-
- @Override
- public IStatus getStatus() {
- return status;
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.cxf.consumption.ui/src/org/eclipse/jst/ws/internal/cxf/consumption/ui/widgets/WSDL2JavaClientConfigWidgetFactory.java b/bundles/org.eclipse.jst.ws.cxf.consumption.ui/src/org/eclipse/jst/ws/internal/cxf/consumption/ui/widgets/WSDL2JavaClientConfigWidgetFactory.java
deleted file mode 100644
index e76d373..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.consumption.ui/src/org/eclipse/jst/ws/internal/cxf/consumption/ui/widgets/WSDL2JavaClientConfigWidgetFactory.java
+++ /dev/null
@@ -1,87 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IONA Technologies PLC
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IONA Technologies PLC - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.cxf.consumption.ui.widgets;
-
-import org.eclipse.jst.ws.internal.cxf.consumption.core.commands.WSDL2JavaClientDefaultingCommand;
-import org.eclipse.jst.ws.internal.cxf.consumption.ui.CXFConsumptionUIMessages;
-import org.eclipse.jst.ws.internal.cxf.core.CXFCorePlugin;
-import org.eclipse.jst.ws.internal.cxf.core.model.CXFContext;
-import org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaDataModel;
-import org.eclipse.wst.command.internal.env.core.data.DataMappingRegistry;
-import org.eclipse.wst.command.internal.env.ui.widgets.INamedWidgetContributor;
-import org.eclipse.wst.command.internal.env.ui.widgets.INamedWidgetContributorFactory;
-import org.eclipse.wst.command.internal.env.ui.widgets.SimpleWidgetContributor;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetContributor;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetContributorFactory;
-
-@SuppressWarnings("restriction")
-public class WSDL2JavaClientConfigWidgetFactory implements INamedWidgetContributorFactory {
- private SimpleWidgetContributor wsdl2JavaClientWidgetContributor;
- private SimpleWidgetContributor wsdl2JavaClientDefaultsWidgetContributor;
-
- private WSDL2JavaClientConfigWidget wsdl2JavaConfigWidget = new WSDL2JavaClientConfigWidget();
- private WSDL2JavaClientDefaultsConfigWidget wsdl2JavaClientDefaultsConfigWidget = new WSDL2JavaClientDefaultsConfigWidget();
-
- public INamedWidgetContributor getFirstNamedWidget() {
- if ((wsdl2JavaClientWidgetContributor == null
- || wsdl2JavaClientDefaultsWidgetContributor == null)) {
- init();
- }
- return wsdl2JavaClientWidgetContributor;
- }
-
- public INamedWidgetContributor getNextNamedWidget(INamedWidgetContributor widgetContributor) {
- if (widgetContributor == wsdl2JavaClientWidgetContributor) {
- return wsdl2JavaClientDefaultsWidgetContributor;
- }
- return null;
- }
-
- public void registerDataMappings(DataMappingRegistry dataRegistry) {
- dataRegistry.addMapping(WSDL2JavaClientDefaultingCommand.class,
- "WSDL2JavaDataModel", WSDL2JavaClientConfigWidgetFactory.class); //$NON-NLS-1$
- }
-
- public void setWSDL2JavaDataModel(WSDL2JavaDataModel model) {
- wsdl2JavaConfigWidget.setWSDL2JavaDataModel(model);
- wsdl2JavaClientDefaultsConfigWidget.setWSDL2JavaDataModel(model);
- }
-
- private void init() {
- wsdl2JavaClientWidgetContributor = new SimpleWidgetContributor();
- CXFContext context = CXFCorePlugin.getDefault().getWSDL2JavaContext();
- String wsdl2JavaClientPageTitle = CXFConsumptionUIMessages.bind(
- CXFConsumptionUIMessages.WSDL2JAVA_CLIENT_PAGE_TITLE, new Object[]{
- context.getCxfRuntimeEdition(), context.getCxfRuntimeVersion()});
- wsdl2JavaClientWidgetContributor.setTitle(wsdl2JavaClientPageTitle);
- wsdl2JavaClientWidgetContributor
- .setDescription(CXFConsumptionUIMessages.WSDL2JAVA_CLIENT_PAGE_DESCRIPTION);
- wsdl2JavaClientWidgetContributor.setFactory(new WidgetContributorFactory() {
- public WidgetContributor create() {
- return wsdl2JavaConfigWidget;
- }
- });
-
- wsdl2JavaClientDefaultsWidgetContributor = new SimpleWidgetContributor();
- String wsdl2JavaClientDefaultsPageTitle = CXFConsumptionUIMessages.bind(
- CXFConsumptionUIMessages.WSDL2JAVA_ClIENT_DEFAULTS_PAGE_TITLE, new Object[] {
- context.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 69a7d75..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.consumption.ui/src/org/eclipse/jst/ws/internal/cxf/consumption/ui/widgets/WSDL2JavaClientDefaultsConfigWidget.java
+++ /dev/null
@@ -1,98 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IONA Technologies PLC
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IONA Technologies PLC - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.cxf.consumption.ui.widgets;
-
-import org.eclipse.jst.ws.internal.cxf.consumption.ui.CXFConsumptionUIMessages;
-import org.eclipse.jst.ws.internal.cxf.core.CXFCorePlugin;
-import org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaDataModel;
-import org.eclipse.jst.ws.internal.cxf.core.utils.CXFModelUtils;
-import org.eclipse.jst.ws.internal.cxf.ui.widgets.WSDL2JavaWidgetFactory;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Group;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.wst.command.internal.env.ui.widgets.SimpleWidgetDataContributor;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetDataEvents;
-
-@SuppressWarnings("restriction")
-public class WSDL2JavaClientDefaultsConfigWidget extends SimpleWidgetDataContributor {
-
- private WSDL2JavaDataModel model;
-
- public WSDL2JavaClientDefaultsConfigWidget() {
- }
-
- public void setWSDL2JavaDataModel(WSDL2JavaDataModel model) {
- this.model = model;
- }
-
- @Override
- public WidgetDataEvents addControls(final Composite parent, final Listener statusListener) {
- final Composite mainComposite = new Composite(parent, SWT.NONE);
- GridLayout gridLayout = new GridLayout(1, false);
- mainComposite.setLayout(gridLayout);
-
- GridData gridData = new GridData(SWT.FILL, SWT.FILL, true, true);
- mainComposite.setLayoutData(gridData);
-
- Group wsdl2javaGroup = new Group(mainComposite, SWT.SHADOW_IN);
- wsdl2javaGroup.setText(CXFConsumptionUIMessages.WSDL2JAVA_GROUP_LABEL);
- GridLayout wsdl2javalayout = new GridLayout(1, true);
- wsdl2javaGroup.setLayout(wsdl2javalayout);
- gridData = new GridData(SWT.FILL, SWT.FILL, true, false);
- wsdl2javaGroup.setLayoutData(gridData);
-
-// WSDL2JavaWidgetFactory.createGenerateServerButton(wsdl2javaGroup, model);
- WSDL2JavaWidgetFactory.createGenerateImplementationButton(wsdl2javaGroup, model);
-
- WSDL2JavaWidgetFactory.createDefaultValuesButton(wsdl2javaGroup, model);
-
- WSDL2JavaWidgetFactory.createProcessSOAPHeadersButton(wsdl2javaGroup, model);
-
- WSDL2JavaWidgetFactory.createNamespacePackageMappingButton(wsdl2javaGroup, model);
-
- WSDL2JavaWidgetFactory.createExcludesNamespaceMappingButton(wsdl2javaGroup, model);
-
- if (CXFModelUtils.isAutoNameResolutionPermitted()) {
- WSDL2JavaWidgetFactory.createAutoNameResolutionButton(wsdl2javaGroup, model);
- }
-
- if (model.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 2417e78..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.consumption.ui/src/org/eclipse/jst/ws/internal/cxf/consumption/ui/widgets/object/JAXWSSelectionTransformer.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IONA Technologies PLC
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IONA Technologies PLC - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.cxf.consumption.ui.widgets.object;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IPackageFragment;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jst.ws.internal.cxf.consumption.ui.CXFConsumptionUIPlugin;
-import org.eclipse.wst.command.internal.env.core.data.Transformer;
-
-@SuppressWarnings("restriction")
-public class JAXWSSelectionTransformer implements Transformer {
-
- public Object transform(Object value) {
- if (value instanceof IStructuredSelection) {
- IStructuredSelection structuredSelection = (IStructuredSelection) value;
- Object selection = structuredSelection.getFirstElement();
- if (selection instanceof IFile) {
- IFile file = (IFile) selection;
- String fullyQualifiedJavaName = this.getFullyQualifiedJavaName(file);
- return new StructuredSelection(fullyQualifiedJavaName);
- } else if (selection instanceof ICompilationUnit) {
- IResource resource = ((ICompilationUnit) selection).getResource();
- if (resource instanceof IFile) {
- IFile file = (IFile) resource;
- String fullyQualifiedJavaName = this.getFullyQualifiedJavaName(file);
- return new StructuredSelection(fullyQualifiedJavaName);
- }
- }
- if (selection instanceof String) {
- return structuredSelection;
- }
- }
- return value;
- }
-
- private String getFullyQualifiedJavaName(IFile resource) {
- IProject project = resource.getProject();
-
- IPath path = resource.getFullPath();
-
- if (path.getFileExtension() != null) {
- path = path.removeFileExtension();
- }
-
- String javaFileName = path.lastSegment();
-
- if (path.isAbsolute()) {
- try {
- IPath javaFolderPath = path.removeLastSegments(1);
- IPackageFragment packageFragment = JavaCore.create(project).findPackageFragment(
- javaFolderPath);
- return packageFragment.getElementName() + "." + javaFileName; //$NON-NLS-1$
- } catch (JavaModelException jme) {
- CXFConsumptionUIPlugin.log(jme.getStatus());
- }
- }
- return javaFileName;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.cxf.consumption.ui/src/org/eclipse/jst/ws/internal/cxf/consumption/ui/wsrt/CXFWebServiceClient.java b/bundles/org.eclipse.jst.ws.cxf.consumption.ui/src/org/eclipse/jst/ws/internal/cxf/consumption/ui/wsrt/CXFWebServiceClient.java
deleted file mode 100644
index 84086c2..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.consumption.ui/src/org/eclipse/jst/ws/internal/cxf/consumption/ui/wsrt/CXFWebServiceClient.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IONA Technologies PLC
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IONA Technologies PLC - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.cxf.consumption.ui.wsrt;
-
-import java.util.Vector;
-
-import org.eclipse.jst.ws.internal.cxf.consumption.core.commands.WSDL2JavaClientCommand;
-import org.eclipse.jst.ws.internal.cxf.consumption.core.commands.WSDL2JavaClientDefaultingCommand;
-import org.eclipse.jst.ws.internal.cxf.core.model.CXFFactory;
-import org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaDataModel;
-import org.eclipse.wst.command.internal.env.core.ICommandFactory;
-import org.eclipse.wst.command.internal.env.core.SimpleCommandFactory;
-import org.eclipse.wst.common.environment.IEnvironment;
-import org.eclipse.wst.ws.internal.wsrt.AbstractWebServiceClient;
-import org.eclipse.wst.ws.internal.wsrt.IContext;
-import org.eclipse.wst.ws.internal.wsrt.ISelection;
-import org.eclipse.wst.ws.internal.wsrt.WebServiceClientInfo;
-
-@SuppressWarnings("restriction")
-public class CXFWebServiceClient extends AbstractWebServiceClient {
-
- public CXFWebServiceClient(WebServiceClientInfo info) {
- super(info);
- }
-
- @Override
- public ICommandFactory assemble(IEnvironment env, IContext ctx, ISelection sel, String project,
- String earProject) {
- return null;
- }
-
- @Override
- public ICommandFactory deploy(IEnvironment env, IContext ctx, ISelection sel, String project,
- String earProject) {
- return null;
- }
-
- @Override
- @SuppressWarnings("unchecked")
- public ICommandFactory develop(IEnvironment env, IContext ctx, ISelection sel, String projectName,
- String earProject) {
-
- Vector commands = new Vector();
-
- WSDL2JavaDataModel wsdl2JavaModel = CXFFactory.eINSTANCE.createWSDL2JavaDataModel();
- commands.add(new WSDL2JavaClientDefaultingCommand(wsdl2JavaModel, projectName,
- getWebServiceClientInfo().getWsdlURL()));
- commands.add(new WSDL2JavaClientCommand(wsdl2JavaModel));
-
- return new SimpleCommandFactory(commands);
- }
-
- @Override
- public ICommandFactory install(IEnvironment env, IContext ctx, ISelection sel, String project,
- String earProject) {
- return null;
- }
-
- @Override
- public ICommandFactory run(IEnvironment env, IContext ctx, ISelection sel, String project,
- String earProject) {
- return null;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.cxf.core/.classpath b/bundles/org.eclipse.jst.ws.cxf.core/.classpath
deleted file mode 100644
index e328083..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.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.cxf.core/.project b/bundles/org.eclipse.jst.ws.cxf.core/.project
deleted file mode 100644
index 9e02324..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.core/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.jst.ws.cxf.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.core/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.jst.ws.cxf.core/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 3c4e8e2..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.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.core/META-INF/MANIFEST.MF b/bundles/org.eclipse.jst.ws.cxf.core/META-INF/MANIFEST.MF
deleted file mode 100644
index b81dd3c..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.core/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,60 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.jst.ws.cxf.core;singleton:=true
-Bundle-Version: 0.4.3.qualifier
-Bundle-Activator: org.eclipse.jst.ws.internal.cxf.core.CXFCorePlugin
-Bundle-Vendor: %pluginProvider
-Bundle-Localization: plugin
-Export-Package: org.eclipse.jst.ws.internal.cxf.core;
- x-friends:="org.eclipse.jst.ws.cxf.ui,
- org.eclipse.jst.ws.cxf.consumption.ui,
- org.eclipse.jst.ws.cxf.creation.core,
- org.eclipse.jst.ws.cxf.creation.ui,
- org.eclipse.jst.ws.cxf.consumption.core",
- org.eclipse.jst.ws.internal.cxf.core.context;x-friends:="org.eclipse.jst.ws.cxf.ui,org.eclipse.jst.ws.cxf.creation.core,org.eclipse.jst.ws.cxf.consumption.core",
- org.eclipse.jst.ws.internal.cxf.core.model;
- x-friends:="org.eclipse.jst.ws.cxf.consumption.ui,
- org.eclipse.jst.ws.cxf.creation.core,
- org.eclipse.jst.ws.cxf.ui,
- org.eclipse.jst.ws.cxf.creation.ui,
- org.eclipse.jst.ws.cxf.consumption.core",
- org.eclipse.jst.ws.internal.cxf.core.model.impl;x-internal:=true,
- org.eclipse.jst.ws.internal.cxf.core.resources;x-friends:="org.eclipse.jst.ws.cxf.creation.core,org.eclipse.jst.ws.cxf.consumption.core",
- org.eclipse.jst.ws.internal.cxf.core.utils;
- x-friends:="org.eclipse.jst.ws.cxf.ui,
- org.eclipse.jst.ws.cxf.consumption.ui,
- org.eclipse.jst.ws.cxf.creation.core,
- org.eclipse.jst.ws.cxf.creation.ui,
- org.eclipse.jst.ws.cxf.consumption.core"
-Require-Bundle: org.eclipse.wst.common.project.facet.ui;bundle-version="[1.3.0,2.0.0)",
- org.eclipse.jst.j2ee;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.jst.j2ee.core;bundle-version="[1.1.200,1.3.0)",
- org.eclipse.jem;bundle-version="[2.0.0,2.1.0)",
- org.eclipse.wst.command.env;bundle-version="[1.0.305,1.1.0)",
- org.eclipse.jst.ws;bundle-version="[1.0.304,1.1.0)",
- org.eclipse.emf.codegen;bundle-version="[2.4.0,3.0.0)",
- org.eclipse.jdt.core;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.debug.core;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.jdt.launching;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.wst.sse.core;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.wst.sse.ui;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.jdt.ui;bundle-version="[3.4.0,4.0.0)",
- javax.wsdl;bundle-version="[1.6.2,1.7.0)",
- org.eclipse.ltk.core.refactoring;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.ui.console;bundle-version="[3.3.0,4.0.0)",
- org.eclipse.emf.ecore;bundle-version="[2.4.0,3.0.0)",
- org.eclipse.jdt.apt.core;bundle-version="[3.3.100,4.0.0)",
- org.eclipse.jst.ws.annotations.core;bundle-version="0.5.0",
- org.eclipse.jst.ws.jaxws.core;bundle-version="0.5.0",
- org.eclipse.wst.command.env.core;bundle-version="[1.0.204,1.1.0)"
-Ant-Version: Apache Ant 1.7.0
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Created-By: 1.5.0_14-b03 (Sun Microsystems Inc.)
-Bundle-ActivationPolicy: lazy
-Import-Package: javax.jws,
- javax.jws.soap,
- javax.xml.ws;version="2.1.0",
- org.jdom;version="1.0.0",
- org.jdom.input;version="1.0.0",
- org.jdom.output;version="1.0.0"
diff --git a/bundles/org.eclipse.jst.ws.cxf.core/about.html b/bundles/org.eclipse.jst.ws.cxf.core/about.html
deleted file mode 100644
index 3d169bf..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.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.core/about.ini b/bundles/org.eclipse.jst.ws.cxf.core/about.ini
deleted file mode 100644
index e3b93e6..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.core/about.ini
+++ /dev/null
@@ -1,12 +0,0 @@
-# about.ini
-# contains information about a feature
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# "%key" are externalized strings defined in about.properties
-# This file does not need to be translated.
-
-# Property "aboutText" contains blurb for feature details in the "About"
-# dialog (translated). Maximum 15 lines and 75 characters per line.
-aboutText=%blurb
-
-# Property "featureImage" contains path to feature image (32x32)
-featureImage=icons/WTP_icon_x32_v2.png
diff --git a/bundles/org.eclipse.jst.ws.cxf.core/about.mappings b/bundles/org.eclipse.jst.ws.cxf.core/about.mappings
deleted file mode 100644
index a28390a..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.core/about.mappings
+++ /dev/null
@@ -1,6 +0,0 @@
-# about.mappings
-# contains fill-ins for about.properties
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# This file does not need to be translated.
-
-0=@build@
diff --git a/bundles/org.eclipse.jst.ws.cxf.core/about.properties b/bundles/org.eclipse.jst.ws.cxf.core/about.properties
deleted file mode 100644
index f89916e..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.core/about.properties
+++ /dev/null
@@ -1,26 +0,0 @@
-###############################################################################
-# Copyright (c) 2008 IONA Technologies PLC
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IONA Technologies PLC - initial API and implementation
-###############################################################################
-# about.properties
-# contains externalized strings for about.ini
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# fill-ins are supplied by about.mappings
-# This file should be translated.
-#
-# Do not translate any values surrounded by {}
-
-blurb=CXF Web Services (Incubation)\n\
-\n\
-Version: {featureVersion}\n\
-Build id: {0}\n\
-\n\
-(c) Copyright IONA Technologies PLC 2008. All rights reserved.\n\
-Visit http://www.eclipse.org/webtools/incubator/\n\
-\n
diff --git a/bundles/org.eclipse.jst.ws.cxf.core/build.properties b/bundles/org.eclipse.jst.ws.cxf.core/build.properties
deleted file mode 100644
index a47ba23..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.core/build.properties
+++ /dev/null
@@ -1,11 +0,0 @@
-source.. = src/
-bin.includes = META-INF/,\
- about.html,\
- about.ini,\
- about.mappings,\
- about.properties,\
- jmerger/,\
- .,\
- plugin.properties,\
- plugin.xml,\
- icons/
diff --git a/bundles/org.eclipse.jst.ws.cxf.core/icons/WTP_icon_x32_v2.png b/bundles/org.eclipse.jst.ws.cxf.core/icons/WTP_icon_x32_v2.png
deleted file mode 100644
index 6f09c2a..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.core/icons/WTP_icon_x32_v2.png
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.jst.ws.cxf.core/icons/view16/console_view.gif b/bundles/org.eclipse.jst.ws.cxf.core/icons/view16/console_view.gif
deleted file mode 100644
index a598f60..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.core/icons/view16/console_view.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.jst.ws.cxf.core/jmerger/merge.xml b/bundles/org.eclipse.jst.ws.cxf.core/jmerger/merge.xml
deleted file mode 100644
index 202dd30..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.core/jmerger/merge.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Merge rules used by JMerger -->
-<merge:options
- xmlns:merge="http://www.eclipse.org/org/eclipse/emf/codegen/jmerge/Options">
-
- <!-- if target is generated, transfer -->
- <!-- change to sourceMarkup if the source is the standard -->
- <merge:pull
- sourceGet="Method/getBody"
- sourceTransfer="(\s*//\s*begin-user-code.*?//\s*end-user-code\s*)\n"
- targetPut="Method/setBody"/>
-
- <merge:pull
- sourceGet="Method/getReturnType"
- targetPut="Method/setReturnType"/>
- <merge:pull
- sourceGet="Method/getExceptions"
- targetPut="Method/addException"/>
-
- <merge:pull
- sourceGet="Member/getComment"
- targetPut="Member/setComment"/>
- <merge:pull
- sourceGet="Import/getName"
- targetPut="Import/setName"/>
- <merge:pull
- sourceGet="CompilationUnit/getHeader"
- targetPut="CompilationUnit/setHeader"/>
-
-<!-- Merge rules to handle annotation:
- - With this pull rule, annotations in the target is replaced by annotations of the
- same name in the source.
- - With this sweep rule, any annotation in the target that is not available in the
- source is commented out.
- - By default, any annotation in the source that is not in the target are pulled into the target.
--->
-
- <merge:pull
- sourceGet="Annotation/getContents"
- targetPut="Annotation/setContents"/>
-
- <merge:sweep select="Annotation" action="comment"/>
-
-</merge:options>
diff --git a/bundles/org.eclipse.jst.ws.cxf.core/model/CXF.ecore b/bundles/org.eclipse.jst.ws.cxf.core/model/CXF.ecore
deleted file mode 100644
index ad3e302..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.core/model/CXF.ecore
+++ /dev/null
@@ -1,160 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ecore:EPackage xmi:version="2.0"
- xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="model"
- nsURI="http:///org/eclipse/jst/ws/internal/cxf/core/model.ecore" nsPrefix="org.eclipse.jst.ws.internal.cxf.core.model">
- <eClassifiers xsi:type="ecore:EClass" name="CXFContext" abstract="true" interface="true">
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="cxfRuntimeLocation" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="cxfRuntimeEdition" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="cxfRuntimeVersion" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="verbose" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
- defaultValueLiteral="true"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="generateAntBuildFile" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
- defaultValueLiteral="false"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="generateClient" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
- defaultValueLiteral="false"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="generateServer" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
- defaultValueLiteral="false"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="databinding" eType="#//DataBinding"
- defaultValueLiteral="jaxb"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="frontend" eType="#//Frontend"
- defaultValueLiteral="jaxws"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="useSpringApplicationContext"
- eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean" defaultValueLiteral="true"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="exportCXFClasspathContainer"
- eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean" defaultValueLiteral="true"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="CXFDataModel" abstract="true" eSuperTypes="#//CXFContext">
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="projectName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="resourceDirectory" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="classDirectory" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="wsdlFileName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="wsdlURL" eType="#//URL"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="configWsdlLocation" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="fullyQualifiedJavaClassName"
- eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="fullyQualifiedJavaInterfaceName"
- eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="configId" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="targetNamespace" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="endpointName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="serviceName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="wsdlDefinition" eType="#//Definition"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="wsdlLocation" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="Java2WSContext" abstract="true" interface="true"
- eSuperTypes="#//CXFContext">
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="soap12Binding" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
- defaultValueLiteral="false"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="generateXSDImports" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
- defaultValueLiteral="true"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="generateWSDL" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
- defaultValueLiteral="true"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="generateWrapperFaultBeans"
- eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean" defaultValueLiteral="true"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="annotationProcessingEnabled"
- eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean" defaultValueLiteral="false"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="generateWebMethodAnnotation"
- eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean" defaultValueLiteral="false"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="generateWebParamAnnotation"
- eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean" defaultValueLiteral="false"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="generateRequestWrapperAnnotation"
- eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean" defaultValueLiteral="false"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="generateResponseWrapperAnnotation"
- eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean" defaultValueLiteral="false"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="Java2WSDataModel" eSuperTypes="#//CXFDataModel #//Java2WSContext">
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="classpath" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="javaStartingPoint" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="useServiceEndpointInterface"
- eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="extractInterface" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="serviceEndpointInterfaceName"
- eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="methodMap">
- <eGenericType eClassifier="#//Map">
- <eTypeArguments eClassifier="#//IMethod"/>
- <eTypeArguments eClassifier="#//Map">
- <eTypeArguments eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
- <eTypeArguments eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBooleanObject"/>
- </eTypeArguments>
- </eGenericType>
- </eStructuralFeatures>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="annotationMap">
- <eGenericType eClassifier="#//Map">
- <eTypeArguments eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
- <eTypeArguments eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBooleanObject"/>
- </eGenericType>
- </eStructuralFeatures>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="sourceDirectory" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="portName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="WSDL2JavaContext" abstract="true" interface="true"
- eSuperTypes="#//CXFContext">
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="generateImplementation"
- eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean" defaultValueLiteral="true"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="processSOAPHeaders" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
- defaultValueLiteral="false"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="loadDefaultNamespacePackageNameMapping"
- eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean" defaultValueLiteral="true"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="loadDefaultExcludesNamepsaceMapping"
- eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean" defaultValueLiteral="true"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="validate" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
- defaultValueLiteral="true"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="wsdlVersion" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"
- defaultValueLiteral="1.1"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="useDefaultValues" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
- defaultValueLiteral="true"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="xjcArgs" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="noAddressBinding" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
- defaultValueLiteral="false"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="xjcUseDefaultValues" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
- defaultValueLiteral="false"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="xjcToString" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
- defaultValueLiteral="false"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="xjcToStringMultiLine" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
- defaultValueLiteral="false"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="xjcToStringSimple" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
- defaultValueLiteral="false"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="xjcLocator" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
- defaultValueLiteral="false"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="xjcSyncMethods" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
- defaultValueLiteral="false"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="xjcMarkGenerated" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
- defaultValueLiteral="false"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="xjcEpisodeFile" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="autoNameResolution" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
- defaultValueLiteral="false"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="WSDL2JavaDataModel" eSuperTypes="#//CXFDataModel #//WSDL2JavaContext">
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="includedNamespaces">
- <eGenericType eClassifier="#//Map">
- <eTypeArguments eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
- <eTypeArguments eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
- </eGenericType>
- </eStructuralFeatures>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="bindingFiles" upperBound="-1"
- eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="excludedNamespaces">
- <eGenericType eClassifier="#//Map">
- <eTypeArguments eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
- <eTypeArguments eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
- </eGenericType>
- </eStructuralFeatures>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="catalogFile" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="javaSourceFolder" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EEnum" name="Frontend">
- <eLiterals name="JAXWS" literal="jaxws"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EEnum" name="DataBinding">
- <eLiterals name="JAXB" literal="jaxb"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EDataType" name="URL" instanceClassName="java.net.URL"/>
- <eClassifiers xsi:type="ecore:EDataType" name="Definition" instanceClassName="javax.wsdl.Definition"/>
- <eClassifiers xsi:type="ecore:EDataType" name="Map" instanceClassName="java.util.Map">
- <eTypeParameters name="T"/>
- <eTypeParameters name="T1"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EDataType" name="IMethod" instanceClassName="org.eclipse.jdt.core.IMethod"/>
-</ecore:EPackage>
diff --git a/bundles/org.eclipse.jst.ws.cxf.core/model/CXF.ecore_diagram b/bundles/org.eclipse.jst.ws.cxf.core/model/CXF.ecore_diagram
deleted file mode 100644
index bc323f6..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.core/model/CXF.ecore_diagram
+++ /dev/null
@@ -1,379 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<notation:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.1/notation" xmi:id="_yrUN0eukEd2pfImT1jT7vQ" type="Ecore" measurementUnit="Pixel">
- <children xmi:type="notation:Node" xmi:id="_zJtaAOukEd2pfImT1jT7vQ" type="2001">
- <children xmi:type="notation:Node" xmi:id="_zJ3LAOukEd2pfImT1jT7vQ" type="5001"/>
- <children xmi:type="notation:Node" xmi:id="_zJ3LAeukEd2pfImT1jT7vQ" type="7001">
- <children xmi:type="notation:Node" xmi:id="_zS81kOukEd2pfImT1jT7vQ" type="3001">
- <element xmi:type="ecore:EAttribute" href="CXF.ecore#//CXFContext/cxfRuntimeLocation"/>
- <layoutConstraint xmi:type="notation:Location" xmi:id="_zS81keukEd2pfImT1jT7vQ"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_zS81kuukEd2pfImT1jT7vQ" type="3001">
- <element xmi:type="ecore:EAttribute" href="CXF.ecore#//CXFContext/cxfRuntimeEdition"/>
- <layoutConstraint xmi:type="notation:Location" xmi:id="_zS81k-ukEd2pfImT1jT7vQ"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_zS81lOukEd2pfImT1jT7vQ" type="3001">
- <element xmi:type="ecore:EAttribute" href="CXF.ecore#//CXFContext/cxfRuntimeVersion"/>
- <layoutConstraint xmi:type="notation:Location" xmi:id="_zS81leukEd2pfImT1jT7vQ"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_zS81luukEd2pfImT1jT7vQ" type="3001">
- <element xmi:type="ecore:EAttribute" href="CXF.ecore#//CXFContext/verbose"/>
- <layoutConstraint xmi:type="notation:Location" xmi:id="_zS81l-ukEd2pfImT1jT7vQ"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_zS81mOukEd2pfImT1jT7vQ" type="3001">
- <element xmi:type="ecore:EAttribute" href="CXF.ecore#//CXFContext/generateAntBuildFile"/>
- <layoutConstraint xmi:type="notation:Location" xmi:id="_zS81meukEd2pfImT1jT7vQ"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_zS81muukEd2pfImT1jT7vQ" type="3001">
- <element xmi:type="ecore:EAttribute" href="CXF.ecore#//CXFContext/generateClient"/>
- <layoutConstraint xmi:type="notation:Location" xmi:id="_zS81m-ukEd2pfImT1jT7vQ"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_zS81nOukEd2pfImT1jT7vQ" type="3001">
- <element xmi:type="ecore:EAttribute" href="CXF.ecore#//CXFContext/generateServer"/>
- <layoutConstraint xmi:type="notation:Location" xmi:id="_zS81neukEd2pfImT1jT7vQ"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_zS81nuukEd2pfImT1jT7vQ" type="3001">
- <element xmi:type="ecore:EAttribute" href="CXF.ecore#//CXFContext/databinding"/>
- <layoutConstraint xmi:type="notation:Location" xmi:id="_zS81n-ukEd2pfImT1jT7vQ"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_zS81oOukEd2pfImT1jT7vQ" type="3001">
- <element xmi:type="ecore:EAttribute" href="CXF.ecore#//CXFContext/frontend"/>
- <layoutConstraint xmi:type="notation:Location" xmi:id="_zS81oeukEd2pfImT1jT7vQ"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_zS81ouukEd2pfImT1jT7vQ" type="3001">
- <element xmi:type="ecore:EAttribute" href="CXF.ecore#//CXFContext/useSpringApplicationContext"/>
- <layoutConstraint xmi:type="notation:Location" xmi:id="_zS81o-ukEd2pfImT1jT7vQ"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_-IhwoOunEd2pfImT1jT7vQ" type="3001">
- <element xmi:type="ecore:EAttribute" href="CXF.ecore#//CXFContext/exportCXFClasspathContainer"/>
- <layoutConstraint xmi:type="notation:Location" xmi:id="_-IhwoeunEd2pfImT1jT7vQ"/>
- </children>
- <styles xmi:type="notation:DrawerStyle" xmi:id="_zJ3LAuukEd2pfImT1jT7vQ"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_zJ3LA-ukEd2pfImT1jT7vQ"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_zJ3LBOukEd2pfImT1jT7vQ"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_zJ3LBeukEd2pfImT1jT7vQ" type="7002">
- <styles xmi:type="notation:DrawerStyle" xmi:id="_zJ3LBuukEd2pfImT1jT7vQ"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_zJ3LB-ukEd2pfImT1jT7vQ"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_zJ3LCOukEd2pfImT1jT7vQ"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_zJ3LCeukEd2pfImT1jT7vQ" type="7003">
- <styles xmi:type="notation:DrawerStyle" xmi:id="_zJ3LCuukEd2pfImT1jT7vQ"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_zJ3LC-ukEd2pfImT1jT7vQ"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_zJ3LDOukEd2pfImT1jT7vQ"/>
- </children>
- <styles xmi:type="notation:ShapeStyle" xmi:id="_zJtaAeukEd2pfImT1jT7vQ"/>
- <element xmi:type="ecore:EClass" href="CXF.ecore#//CXFContext"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_zJtaAuukEd2pfImT1jT7vQ" x="465" y="15"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_zJ3LDeukEd2pfImT1jT7vQ" type="2001">
- <children xmi:type="notation:Node" xmi:id="_zJ3LEOukEd2pfImT1jT7vQ" type="5001"/>
- <children xmi:type="notation:Node" xmi:id="_zJ3LEeukEd2pfImT1jT7vQ" type="7001">
- <styles xmi:type="notation:DrawerStyle" xmi:id="_zJ3LEuukEd2pfImT1jT7vQ"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_zJ3LE-ukEd2pfImT1jT7vQ"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_zJ3LFOukEd2pfImT1jT7vQ"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_zJ3LFeukEd2pfImT1jT7vQ" type="7002">
- <styles xmi:type="notation:DrawerStyle" xmi:id="_zJ3LFuukEd2pfImT1jT7vQ"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_zJ3LF-ukEd2pfImT1jT7vQ"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_zJ3LGOukEd2pfImT1jT7vQ"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_zJ3LGeukEd2pfImT1jT7vQ" type="7003">
- <styles xmi:type="notation:DrawerStyle" xmi:id="_zJ3LGuukEd2pfImT1jT7vQ"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_zJ3LG-ukEd2pfImT1jT7vQ"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_zJ3LHOukEd2pfImT1jT7vQ"/>
- </children>
- <styles xmi:type="notation:ShapeStyle" xmi:id="_zJ3LDuukEd2pfImT1jT7vQ"/>
- <element xmi:type="ecore:EClass" href="CXF.ecore#//CXFDataModel"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_zJ3LD-ukEd2pfImT1jT7vQ" x="465" y="290"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_zJ3LHeukEd2pfImT1jT7vQ" type="2001">
- <children xmi:type="notation:Node" xmi:id="_zJ3LIOukEd2pfImT1jT7vQ" type="5001"/>
- <children xmi:type="notation:Node" xmi:id="_zJ3LIeukEd2pfImT1jT7vQ" type="7001">
- <styles xmi:type="notation:DrawerStyle" xmi:id="_zJ3LIuukEd2pfImT1jT7vQ"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_zJ3LI-ukEd2pfImT1jT7vQ"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_zJ3LJOukEd2pfImT1jT7vQ"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_zJ3LJeukEd2pfImT1jT7vQ" type="7002">
- <styles xmi:type="notation:DrawerStyle" xmi:id="_zJ3LJuukEd2pfImT1jT7vQ"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_zJ3LJ-ukEd2pfImT1jT7vQ"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_zJ3LKOukEd2pfImT1jT7vQ"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_zJ3LKeukEd2pfImT1jT7vQ" type="7003">
- <styles xmi:type="notation:DrawerStyle" xmi:id="_zJ3LKuukEd2pfImT1jT7vQ"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_zJ3LK-ukEd2pfImT1jT7vQ"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_zJ3LLOukEd2pfImT1jT7vQ"/>
- </children>
- <styles xmi:type="notation:ShapeStyle" xmi:id="_zJ3LHuukEd2pfImT1jT7vQ"/>
- <element xmi:type="ecore:EClass" href="CXF.ecore#//Java2WSContext"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_zJ3LH-ukEd2pfImT1jT7vQ" x="185" y="290"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_zJ3LLeukEd2pfImT1jT7vQ" type="2001">
- <children xmi:type="notation:Node" xmi:id="_zJ3LMOukEd2pfImT1jT7vQ" type="5001"/>
- <children xmi:type="notation:Node" xmi:id="_zJ3LMeukEd2pfImT1jT7vQ" type="7001">
- <styles xmi:type="notation:DrawerStyle" xmi:id="_zJ3LMuukEd2pfImT1jT7vQ"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_zJ3LM-ukEd2pfImT1jT7vQ"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_zJ3LNOukEd2pfImT1jT7vQ"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_zJ3LNeukEd2pfImT1jT7vQ" type="7002">
- <styles xmi:type="notation:DrawerStyle" xmi:id="_zJ3LNuukEd2pfImT1jT7vQ"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_zJ3LN-ukEd2pfImT1jT7vQ"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_zJ3LOOukEd2pfImT1jT7vQ"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_zKAU8OukEd2pfImT1jT7vQ" type="7003">
- <styles xmi:type="notation:DrawerStyle" xmi:id="_zKAU8eukEd2pfImT1jT7vQ"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_zKAU8uukEd2pfImT1jT7vQ"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_zKAU8-ukEd2pfImT1jT7vQ"/>
- </children>
- <styles xmi:type="notation:ShapeStyle" xmi:id="_zJ3LLuukEd2pfImT1jT7vQ"/>
- <element xmi:type="ecore:EClass" href="CXF.ecore#//Java2WSDataModel"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_zJ3LL-ukEd2pfImT1jT7vQ" x="230" y="620"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_zKAU9OukEd2pfImT1jT7vQ" type="2001">
- <children xmi:type="notation:Node" xmi:id="_zKAU9-ukEd2pfImT1jT7vQ" type="5001"/>
- <children xmi:type="notation:Node" xmi:id="_zKAU-OukEd2pfImT1jT7vQ" type="7001">
- <children xmi:type="notation:Node" xmi:id="_cwezIB92Ed6I5swlrsn37g" type="3001">
- <element xmi:type="ecore:EAttribute" href="CXF.ecore#//WSDL2JavaContext/generateImplementation"/>
- <layoutConstraint xmi:type="notation:Location" xmi:id="_cwezIR92Ed6I5swlrsn37g"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_cwezIh92Ed6I5swlrsn37g" type="3001">
- <element xmi:type="ecore:EAttribute" href="CXF.ecore#//WSDL2JavaContext/processSOAPHeaders"/>
- <layoutConstraint xmi:type="notation:Location" xmi:id="_cwfaMB92Ed6I5swlrsn37g"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_cwfaMR92Ed6I5swlrsn37g" type="3001">
- <element xmi:type="ecore:EAttribute" href="CXF.ecore#//WSDL2JavaContext/loadDefaultNamespacePackageNameMapping"/>
- <layoutConstraint xmi:type="notation:Location" xmi:id="_cwfaMh92Ed6I5swlrsn37g"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_cwfaMx92Ed6I5swlrsn37g" type="3001">
- <element xmi:type="ecore:EAttribute" href="CXF.ecore#//WSDL2JavaContext/loadDefaultExcludesNamepsaceMapping"/>
- <layoutConstraint xmi:type="notation:Location" xmi:id="_cwfaNB92Ed6I5swlrsn37g"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_cwfaNR92Ed6I5swlrsn37g" type="3001">
- <element xmi:type="ecore:EAttribute" href="CXF.ecore#//WSDL2JavaContext/validate"/>
- <layoutConstraint xmi:type="notation:Location" xmi:id="_cwgBQB92Ed6I5swlrsn37g"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_cwgBQR92Ed6I5swlrsn37g" type="3001">
- <element xmi:type="ecore:EAttribute" href="CXF.ecore#//WSDL2JavaContext/wsdlVersion"/>
- <layoutConstraint xmi:type="notation:Location" xmi:id="_cwgBQh92Ed6I5swlrsn37g"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_cwgBQx92Ed6I5swlrsn37g" type="3001">
- <element xmi:type="ecore:EAttribute" href="CXF.ecore#//WSDL2JavaContext/useDefaultValues"/>
- <layoutConstraint xmi:type="notation:Location" xmi:id="_cwgBRB92Ed6I5swlrsn37g"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_cwgBRR92Ed6I5swlrsn37g" type="3001">
- <element xmi:type="ecore:EAttribute" href="CXF.ecore#//WSDL2JavaContext/xjcArgs"/>
- <layoutConstraint xmi:type="notation:Location" xmi:id="_cwgBRh92Ed6I5swlrsn37g"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_cwgoUB92Ed6I5swlrsn37g" type="3001">
- <element xmi:type="ecore:EAttribute" href="CXF.ecore#//WSDL2JavaContext/noAddressBinding"/>
- <layoutConstraint xmi:type="notation:Location" xmi:id="_cwgoUR92Ed6I5swlrsn37g"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_cwgoUh92Ed6I5swlrsn37g" type="3001">
- <element xmi:type="ecore:EAttribute" href="CXF.ecore#//WSDL2JavaContext/xjcUseDefaultValues"/>
- <layoutConstraint xmi:type="notation:Location" xmi:id="_cwgoUx92Ed6I5swlrsn37g"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_cwhPYB92Ed6I5swlrsn37g" type="3001">
- <element xmi:type="ecore:EAttribute" href="CXF.ecore#//WSDL2JavaContext/xjcToString"/>
- <layoutConstraint xmi:type="notation:Location" xmi:id="_cwhPYR92Ed6I5swlrsn37g"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_cwhPYh92Ed6I5swlrsn37g" type="3001">
- <element xmi:type="ecore:EAttribute" href="CXF.ecore#//WSDL2JavaContext/xjcToStringMultiLine"/>
- <layoutConstraint xmi:type="notation:Location" xmi:id="_cwhPYx92Ed6I5swlrsn37g"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_cwhPZB92Ed6I5swlrsn37g" type="3001">
- <element xmi:type="ecore:EAttribute" href="CXF.ecore#//WSDL2JavaContext/xjcToStringSimple"/>
- <layoutConstraint xmi:type="notation:Location" xmi:id="_cwhPZR92Ed6I5swlrsn37g"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_cwh2cB92Ed6I5swlrsn37g" type="3001">
- <element xmi:type="ecore:EAttribute" href="CXF.ecore#//WSDL2JavaContext/xjcLocator"/>
- <layoutConstraint xmi:type="notation:Location" xmi:id="_cwh2cR92Ed6I5swlrsn37g"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_cwh2ch92Ed6I5swlrsn37g" type="3001">
- <element xmi:type="ecore:EAttribute" href="CXF.ecore#//WSDL2JavaContext/xjcSyncMethods"/>
- <layoutConstraint xmi:type="notation:Location" xmi:id="_cwh2cx92Ed6I5swlrsn37g"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_cwh2dB92Ed6I5swlrsn37g" type="3001">
- <element xmi:type="ecore:EAttribute" href="CXF.ecore#//WSDL2JavaContext/xjcMarkGenerated"/>
- <layoutConstraint xmi:type="notation:Location" xmi:id="_cwh2dR92Ed6I5swlrsn37g"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_cwidgB92Ed6I5swlrsn37g" type="3001">
- <element xmi:type="ecore:EAttribute" href="CXF.ecore#//WSDL2JavaContext/xjcEpisodeFile"/>
- <layoutConstraint xmi:type="notation:Location" xmi:id="_cwidgR92Ed6I5swlrsn37g"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_jVh0gB92Ed6I5swlrsn37g" type="3001">
- <element xmi:type="ecore:EAttribute" href="CXF.ecore#//WSDL2JavaContext/autoNameResolution"/>
- <layoutConstraint xmi:type="notation:Location" xmi:id="_jVh0gR92Ed6I5swlrsn37g"/>
- </children>
- <styles xmi:type="notation:DrawerStyle" xmi:id="_zKAU-eukEd2pfImT1jT7vQ"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_zKAU-uukEd2pfImT1jT7vQ"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_zKAU--ukEd2pfImT1jT7vQ"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_zKAU_OukEd2pfImT1jT7vQ" type="7002">
- <styles xmi:type="notation:DrawerStyle" xmi:id="_zKAU_eukEd2pfImT1jT7vQ"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_zKAU_uukEd2pfImT1jT7vQ"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_zKAU_-ukEd2pfImT1jT7vQ"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_zKAVAOukEd2pfImT1jT7vQ" type="7003">
- <styles xmi:type="notation:DrawerStyle" xmi:id="_zKAVAeukEd2pfImT1jT7vQ"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_zKAVAuukEd2pfImT1jT7vQ"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_zKAVA-ukEd2pfImT1jT7vQ"/>
- </children>
- <styles xmi:type="notation:ShapeStyle" xmi:id="_zKAU9eukEd2pfImT1jT7vQ"/>
- <element xmi:type="ecore:EClass" href="CXF.ecore#//WSDL2JavaContext"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_zKAU9uukEd2pfImT1jT7vQ" x="725" y="290"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_zKAVBOukEd2pfImT1jT7vQ" type="2001">
- <children xmi:type="notation:Node" xmi:id="_zKAVB-ukEd2pfImT1jT7vQ" type="5001"/>
- <children xmi:type="notation:Node" xmi:id="_zKAVCOukEd2pfImT1jT7vQ" type="7001">
- <styles xmi:type="notation:DrawerStyle" xmi:id="_zKAVCeukEd2pfImT1jT7vQ"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_zKAVCuukEd2pfImT1jT7vQ"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_zKAVC-ukEd2pfImT1jT7vQ"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_zKAVDOukEd2pfImT1jT7vQ" type="7002">
- <styles xmi:type="notation:DrawerStyle" xmi:id="_zKAVDeukEd2pfImT1jT7vQ"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_zKAVDuukEd2pfImT1jT7vQ"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_zKAVD-ukEd2pfImT1jT7vQ"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_zKAVEOukEd2pfImT1jT7vQ" type="7003">
- <styles xmi:type="notation:DrawerStyle" xmi:id="_zKAVEeukEd2pfImT1jT7vQ"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_zKAVEuukEd2pfImT1jT7vQ"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_zKAVE-ukEd2pfImT1jT7vQ"/>
- </children>
- <styles xmi:type="notation:ShapeStyle" xmi:id="_zKAVBeukEd2pfImT1jT7vQ"/>
- <element xmi:type="ecore:EClass" href="CXF.ecore#//WSDL2JavaDataModel"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_zKAVBuukEd2pfImT1jT7vQ" x="750" y="670"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_zKAVFOukEd2pfImT1jT7vQ" type="2005">
- <children xmi:type="notation:Node" xmi:id="_zKAVF-ukEd2pfImT1jT7vQ" type="5005"/>
- <children xmi:type="notation:Node" xmi:id="_zKAVGOukEd2pfImT1jT7vQ" type="7011">
- <styles xmi:type="notation:DrawerStyle" xmi:id="_zKAVGeukEd2pfImT1jT7vQ"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_zKAVGuukEd2pfImT1jT7vQ"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_zKAVG-ukEd2pfImT1jT7vQ"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_zKAVHOukEd2pfImT1jT7vQ" type="7012">
- <styles xmi:type="notation:DrawerStyle" xmi:id="_zKAVHeukEd2pfImT1jT7vQ"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_zKAVHuukEd2pfImT1jT7vQ"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_zKAVH-ukEd2pfImT1jT7vQ"/>
- </children>
- <styles xmi:type="notation:ShapeStyle" xmi:id="_zKAVFeukEd2pfImT1jT7vQ"/>
- <element xmi:type="ecore:EEnum" href="CXF.ecore#//Frontend"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_zKAVFuukEd2pfImT1jT7vQ" x="735" y="15" width="91"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_zKAVIOukEd2pfImT1jT7vQ" type="2005">
- <children xmi:type="notation:Node" xmi:id="_zKAVI-ukEd2pfImT1jT7vQ" type="5005"/>
- <children xmi:type="notation:Node" xmi:id="_zKAVJOukEd2pfImT1jT7vQ" type="7011">
- <styles xmi:type="notation:DrawerStyle" xmi:id="_zKAVJeukEd2pfImT1jT7vQ"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_zKAVJuukEd2pfImT1jT7vQ"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_zKAVJ-ukEd2pfImT1jT7vQ"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_zKAVKOukEd2pfImT1jT7vQ" type="7012">
- <styles xmi:type="notation:DrawerStyle" xmi:id="_zKAVKeukEd2pfImT1jT7vQ"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_zKAVKuukEd2pfImT1jT7vQ"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_zKAVK-ukEd2pfImT1jT7vQ"/>
- </children>
- <styles xmi:type="notation:ShapeStyle" xmi:id="_zKAVIeukEd2pfImT1jT7vQ"/>
- <element xmi:type="ecore:EEnum" href="CXF.ecore#//DataBinding"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_zKAVIuukEd2pfImT1jT7vQ" x="735" y="75" width="91"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_zKAVLOukEd2pfImT1jT7vQ" type="2004">
- <children xmi:type="notation:Node" xmi:id="_zKAVL-ukEd2pfImT1jT7vQ" type="5004"/>
- <children xmi:type="notation:Node" xmi:id="_zKAVMOukEd2pfImT1jT7vQ" type="7010">
- <styles xmi:type="notation:DrawerStyle" xmi:id="_zKAVMeukEd2pfImT1jT7vQ"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_zKAVMuukEd2pfImT1jT7vQ"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_zKAVM-ukEd2pfImT1jT7vQ"/>
- </children>
- <styles xmi:type="notation:ShapeStyle" xmi:id="_zKAVLeukEd2pfImT1jT7vQ"/>
- <element xmi:type="ecore:EDataType" href="CXF.ecore#//URL"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_zKAVLuukEd2pfImT1jT7vQ" x="185" y="15" width="76"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_zKAVNOukEd2pfImT1jT7vQ" type="2004">
- <children xmi:type="notation:Node" xmi:id="_zKKF8OukEd2pfImT1jT7vQ" type="5004"/>
- <children xmi:type="notation:Node" xmi:id="_zKKF8eukEd2pfImT1jT7vQ" type="7010">
- <styles xmi:type="notation:DrawerStyle" xmi:id="_zKKF8uukEd2pfImT1jT7vQ"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_zKKF8-ukEd2pfImT1jT7vQ"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_zKKF9OukEd2pfImT1jT7vQ"/>
- </children>
- <styles xmi:type="notation:ShapeStyle" xmi:id="_zKAVNeukEd2pfImT1jT7vQ"/>
- <element xmi:type="ecore:EDataType" href="CXF.ecore#//Definition"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_zKAVNuukEd2pfImT1jT7vQ" x="185" y="60" width="76"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_zKKF9eukEd2pfImT1jT7vQ" type="2004">
- <children xmi:type="notation:Node" xmi:id="_zKKF-OukEd2pfImT1jT7vQ" type="5004"/>
- <children xmi:type="notation:Node" xmi:id="_zKKF-eukEd2pfImT1jT7vQ" type="7010">
- <styles xmi:type="notation:DrawerStyle" xmi:id="_zKKF-uukEd2pfImT1jT7vQ"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_zKKF--ukEd2pfImT1jT7vQ"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_zKKF_OukEd2pfImT1jT7vQ"/>
- </children>
- <styles xmi:type="notation:ShapeStyle" xmi:id="_zKKF9uukEd2pfImT1jT7vQ"/>
- <element xmi:type="ecore:EDataType" href="CXF.ecore#//Map"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_zKKF9-ukEd2pfImT1jT7vQ" x="185" y="110" width="76"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_zKKF_eukEd2pfImT1jT7vQ" type="2004">
- <children xmi:type="notation:Node" xmi:id="_zKKGAOukEd2pfImT1jT7vQ" type="5004"/>
- <children xmi:type="notation:Node" xmi:id="_zKKGAeukEd2pfImT1jT7vQ" type="7010">
- <styles xmi:type="notation:DrawerStyle" xmi:id="_zKKGAuukEd2pfImT1jT7vQ"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_zKKGA-ukEd2pfImT1jT7vQ"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_zKKGBOukEd2pfImT1jT7vQ"/>
- </children>
- <styles xmi:type="notation:ShapeStyle" xmi:id="_zKKF_uukEd2pfImT1jT7vQ"/>
- <element xmi:type="ecore:EDataType" href="CXF.ecore#//IMethod"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_zKKF_-ukEd2pfImT1jT7vQ" x="185" y="155" width="76"/>
- </children>
- <styles xmi:type="notation:DiagramStyle" xmi:id="_yrUN0uukEd2pfImT1jT7vQ"/>
- <element xmi:type="ecore:EPackage" href="CXF.ecore#/"/>
- <edges xmi:type="notation:Edge" xmi:id="_zUl0UOukEd2pfImT1jT7vQ" type="4004" source="_zJ3LDeukEd2pfImT1jT7vQ" target="_zJtaAOukEd2pfImT1jT7vQ">
- <styles xmi:type="notation:ConnectorStyle" xmi:id="_zUl0UeukEd2pfImT1jT7vQ"/>
- <styles xmi:type="notation:FontStyle" xmi:id="_zUl0UuukEd2pfImT1jT7vQ"/>
- <element xsi:nil="true"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_zUl0U-ukEd2pfImT1jT7vQ" points="[4, -1, 1, 73]$[4, -73, 1, 1]"/>
- <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_zWX9COukEd2pfImT1jT7vQ" id="(0.46,0.007490637)"/>
- <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_zWX9CeukEd2pfImT1jT7vQ" id="(0.5027027,0.9852217)"/>
- </edges>
- <edges xmi:type="notation:Edge" xmi:id="_zVCgQOukEd2pfImT1jT7vQ" type="4004" source="_zJ3LHeukEd2pfImT1jT7vQ" target="_zJtaAOukEd2pfImT1jT7vQ">
- <styles xmi:type="notation:ConnectorStyle" xmi:id="_zVCgQeukEd2pfImT1jT7vQ"/>
- <styles xmi:type="notation:FontStyle" xmi:id="_zVCgQuukEd2pfImT1jT7vQ"/>
- <element xsi:nil="true"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_zVCgQ-ukEd2pfImT1jT7vQ" points="[0, 1, -41, 318]$[41, -317, 0, 0]"/>
- <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_zWX9AOukEd2pfImT1jT7vQ" id="(0.8995816,0.04278075)"/>
- <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_zWX9AeukEd2pfImT1jT7vQ" id="(0.10810811,0.9950739)"/>
- </edges>
- <edges xmi:type="notation:Edge" xmi:id="_zVCgROukEd2pfImT1jT7vQ" type="4004" source="_zJ3LLeukEd2pfImT1jT7vQ" target="_zJ3LDeukEd2pfImT1jT7vQ">
- <styles xmi:type="notation:ConnectorStyle" xmi:id="_zVCgReukEd2pfImT1jT7vQ"/>
- <styles xmi:type="notation:FontStyle" xmi:id="_zVCgRuukEd2pfImT1jT7vQ"/>
- <element xsi:nil="true"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_zVCgR-ukEd2pfImT1jT7vQ" points="[0, 0, -60, -120]$[60, 120, 0, 0]"/>
- <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_zWX9CuukEd2pfImT1jT7vQ" id="(0.90816325,0.0053475937)"/>
- <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_zWX9C-ukEd2pfImT1jT7vQ" id="(0.255,0.98876405)"/>
- </edges>
- <edges xmi:type="notation:Edge" xmi:id="_zVCgSOukEd2pfImT1jT7vQ" type="4004" source="_zJ3LLeukEd2pfImT1jT7vQ" target="_zJ3LHeukEd2pfImT1jT7vQ">
- <styles xmi:type="notation:ConnectorStyle" xmi:id="_zVCgSeukEd2pfImT1jT7vQ"/>
- <styles xmi:type="notation:FontStyle" xmi:id="_zVCgSuukEd2pfImT1jT7vQ"/>
- <element xsi:nil="true"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_zVCgS-ukEd2pfImT1jT7vQ" points="[0, 0, -60, 62]$[60, -61, 0, 1]"/>
- <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_zWX9DOukEd2pfImT1jT7vQ" id="(0.3877551,0.0053475937)"/>
- <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_zWX9DeukEd2pfImT1jT7vQ" id="(0.51046026,0.98930484)"/>
- </edges>
- <edges xmi:type="notation:Edge" xmi:id="_zVCgTOukEd2pfImT1jT7vQ" type="4004" source="_zKAU9OukEd2pfImT1jT7vQ" target="_zJtaAOukEd2pfImT1jT7vQ">
- <styles xmi:type="notation:ConnectorStyle" xmi:id="_zVCgTeukEd2pfImT1jT7vQ"/>
- <styles xmi:type="notation:FontStyle" xmi:id="_zVCgTuukEd2pfImT1jT7vQ"/>
- <element xsi:nil="true"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_zVCgT-ukEd2pfImT1jT7vQ" points="[0, 0, -60, 301]$[60, -300, 0, 1]"/>
- <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_zWX9BuukEd2pfImT1jT7vQ" id="(1.0,0.4984127)"/>
- <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_zWX9B-ukEd2pfImT1jT7vQ" id="(0.84864867,0.9655172)"/>
- </edges>
- <edges xmi:type="notation:Edge" xmi:id="_zVCgUOukEd2pfImT1jT7vQ" type="4004" source="_zKAVBOukEd2pfImT1jT7vQ" target="_zJ3LDeukEd2pfImT1jT7vQ">
- <styles xmi:type="notation:ConnectorStyle" xmi:id="_zVCgUeukEd2pfImT1jT7vQ"/>
- <styles xmi:type="notation:FontStyle" xmi:id="_zVCgUuukEd2pfImT1jT7vQ"/>
- <element xsi:nil="true"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_zVCgU-ukEd2pfImT1jT7vQ" points="[-56, -30, 374, 202]$[-265, -143, 165, 89]"/>
- <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_zWX9AuukEd2pfImT1jT7vQ" id="(0.055172414,0.008130081)"/>
- <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_zWX9A-ukEd2pfImT1jT7vQ" id="(0.0,0.6666667)"/>
- </edges>
- <edges xmi:type="notation:Edge" xmi:id="_zVCgVOukEd2pfImT1jT7vQ" type="4004" source="_zKAVBOukEd2pfImT1jT7vQ" target="_zKAU9OukEd2pfImT1jT7vQ">
- <styles xmi:type="notation:ConnectorStyle" xmi:id="_zVCgVeukEd2pfImT1jT7vQ"/>
- <styles xmi:type="notation:FontStyle" xmi:id="_zVCgVuukEd2pfImT1jT7vQ"/>
- <element xsi:nil="true"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_zVCgV-ukEd2pfImT1jT7vQ" points="[0, 0, -111, 0]$[111, 0, 0, 0]"/>
- <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_zWX9BOukEd2pfImT1jT7vQ" id="(0.5862069,0.0)"/>
- <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_zWX9BeukEd2pfImT1jT7vQ" id="(0.4029304,0.9936508)"/>
- </edges>
-</notation:Diagram>
diff --git a/bundles/org.eclipse.jst.ws.cxf.core/model/CXF.genmodel b/bundles/org.eclipse.jst.ws.cxf.core/model/CXF.genmodel
deleted file mode 100644
index 39df3b9..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.core/model/CXF.genmodel
+++ /dev/null
@@ -1,103 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<genmodel:GenModel xmi:version="2.0"
- xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
- xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="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"
- modelDirectory="/org.eclipse.jst.ws.cxf.core/src" modelPluginID="org.eclipse.jst.ws.cxf.core"
- modelName="CXF" rootExtendsInterface="" rootImplementsInterface="" importerID="org.eclipse.emf.importer.ecore"
- complianceLevel="5.0" copyrightFields="false" language="">
- <foreignModel>CXF.ecore</foreignModel>
- <genPackages prefix="CXF" basePackage="org.eclipse.jst.ws.internal.cxf.core" disposableProviderFactory="true"
- ecorePackage="CXF.ecore#/">
- <genEnums typeSafeEnumCompatible="false" ecoreEnum="CXF.ecore#//Frontend">
- <genEnumLiterals ecoreEnumLiteral="CXF.ecore#//Frontend/JAXWS"/>
- </genEnums>
- <genEnums typeSafeEnumCompatible="false" ecoreEnum="CXF.ecore#//DataBinding">
- <genEnumLiterals ecoreEnumLiteral="CXF.ecore#//DataBinding/JAXB"/>
- </genEnums>
- <genDataTypes ecoreDataType="CXF.ecore#//URL"/>
- <genDataTypes ecoreDataType="CXF.ecore#//Definition"/>
- <genDataTypes ecoreDataType="CXF.ecore#//Map">
- <genTypeParameters ecoreTypeParameter="CXF.ecore#//Map/T"/>
- <genTypeParameters ecoreTypeParameter="CXF.ecore#//Map/T1"/>
- </genDataTypes>
- <genDataTypes ecoreDataType="CXF.ecore#//IMethod"/>
- <genClasses image="false" ecoreClass="CXF.ecore#//CXFContext">
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute CXF.ecore#//CXFContext/cxfRuntimeLocation"/>
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute CXF.ecore#//CXFContext/cxfRuntimeEdition"/>
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute CXF.ecore#//CXFContext/cxfRuntimeVersion"/>
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute CXF.ecore#//CXFContext/verbose"/>
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute CXF.ecore#//CXFContext/generateAntBuildFile"/>
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute CXF.ecore#//CXFContext/generateClient"/>
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute CXF.ecore#//CXFContext/generateServer"/>
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute CXF.ecore#//CXFContext/databinding"/>
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute CXF.ecore#//CXFContext/frontend"/>
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute CXF.ecore#//CXFContext/useSpringApplicationContext"/>
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute CXF.ecore#//CXFContext/exportCXFClasspathContainer"/>
- </genClasses>
- <genClasses image="false" ecoreClass="CXF.ecore#//CXFDataModel">
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute CXF.ecore#//CXFDataModel/projectName"/>
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute CXF.ecore#//CXFDataModel/resourceDirectory"/>
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute CXF.ecore#//CXFDataModel/classDirectory"/>
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute CXF.ecore#//CXFDataModel/wsdlFileName"/>
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute CXF.ecore#//CXFDataModel/wsdlURL"/>
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute CXF.ecore#//CXFDataModel/configWsdlLocation"/>
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute CXF.ecore#//CXFDataModel/fullyQualifiedJavaClassName"/>
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute CXF.ecore#//CXFDataModel/fullyQualifiedJavaInterfaceName"/>
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute CXF.ecore#//CXFDataModel/configId"/>
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute CXF.ecore#//CXFDataModel/targetNamespace"/>
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute CXF.ecore#//CXFDataModel/endpointName"/>
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute CXF.ecore#//CXFDataModel/serviceName"/>
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute CXF.ecore#//CXFDataModel/wsdlDefinition"/>
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute CXF.ecore#//CXFDataModel/wsdlLocation"/>
- </genClasses>
- <genClasses image="false" ecoreClass="CXF.ecore#//Java2WSContext">
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute CXF.ecore#//Java2WSContext/soap12Binding"/>
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute CXF.ecore#//Java2WSContext/generateXSDImports"/>
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute CXF.ecore#//Java2WSContext/generateWSDL"/>
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute CXF.ecore#//Java2WSContext/generateWrapperFaultBeans"/>
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute CXF.ecore#//Java2WSContext/annotationProcessingEnabled"/>
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute CXF.ecore#//Java2WSContext/generateWebMethodAnnotation"/>
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute CXF.ecore#//Java2WSContext/generateWebParamAnnotation"/>
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute CXF.ecore#//Java2WSContext/generateRequestWrapperAnnotation"/>
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute CXF.ecore#//Java2WSContext/generateResponseWrapperAnnotation"/>
- </genClasses>
- <genClasses ecoreClass="CXF.ecore#//Java2WSDataModel">
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute CXF.ecore#//Java2WSDataModel/classpath"/>
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute CXF.ecore#//Java2WSDataModel/javaStartingPoint"/>
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute CXF.ecore#//Java2WSDataModel/useServiceEndpointInterface"/>
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute CXF.ecore#//Java2WSDataModel/extractInterface"/>
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute CXF.ecore#//Java2WSDataModel/serviceEndpointInterfaceName"/>
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute CXF.ecore#//Java2WSDataModel/methodMap"/>
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute CXF.ecore#//Java2WSDataModel/annotationMap"/>
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute CXF.ecore#//Java2WSDataModel/sourceDirectory"/>
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute CXF.ecore#//Java2WSDataModel/portName"/>
- </genClasses>
- <genClasses image="false" ecoreClass="CXF.ecore#//WSDL2JavaContext">
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute CXF.ecore#//WSDL2JavaContext/generateImplementation"/>
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute CXF.ecore#//WSDL2JavaContext/processSOAPHeaders"/>
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute CXF.ecore#//WSDL2JavaContext/loadDefaultNamespacePackageNameMapping"/>
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute CXF.ecore#//WSDL2JavaContext/loadDefaultExcludesNamepsaceMapping"/>
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute CXF.ecore#//WSDL2JavaContext/validate"/>
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute CXF.ecore#//WSDL2JavaContext/wsdlVersion"/>
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute CXF.ecore#//WSDL2JavaContext/useDefaultValues"/>
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute CXF.ecore#//WSDL2JavaContext/xjcArgs"/>
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute CXF.ecore#//WSDL2JavaContext/noAddressBinding"/>
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute CXF.ecore#//WSDL2JavaContext/xjcUseDefaultValues"/>
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute CXF.ecore#//WSDL2JavaContext/xjcToString"/>
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute CXF.ecore#//WSDL2JavaContext/xjcToStringMultiLine"/>
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute CXF.ecore#//WSDL2JavaContext/xjcToStringSimple"/>
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute CXF.ecore#//WSDL2JavaContext/xjcLocator"/>
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute CXF.ecore#//WSDL2JavaContext/xjcSyncMethods"/>
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute CXF.ecore#//WSDL2JavaContext/xjcMarkGenerated"/>
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute CXF.ecore#//WSDL2JavaContext/xjcEpisodeFile"/>
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute CXF.ecore#//WSDL2JavaContext/autoNameResolution"/>
- </genClasses>
- <genClasses ecoreClass="CXF.ecore#//WSDL2JavaDataModel">
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute CXF.ecore#//WSDL2JavaDataModel/includedNamespaces"/>
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute CXF.ecore#//WSDL2JavaDataModel/bindingFiles"/>
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute CXF.ecore#//WSDL2JavaDataModel/excludedNamespaces"/>
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute CXF.ecore#//WSDL2JavaDataModel/catalogFile"/>
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute CXF.ecore#//WSDL2JavaDataModel/javaSourceFolder"/>
- </genClasses>
- </genPackages>
-</genmodel:GenModel>
diff --git a/bundles/org.eclipse.jst.ws.cxf.core/plugin.properties b/bundles/org.eclipse.jst.ws.cxf.core/plugin.properties
deleted file mode 100644
index 4e243e6..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.core/plugin.properties
+++ /dev/null
@@ -1,21 +0,0 @@
-###############################################################################
-# Copyright (c) 2008 IONA Technologies PLC
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IONA Technologies PLC - initial API and implementation
-###############################################################################
-
-pluginName=CXF Web Services Core (Incubation)
-pluginProvider=Eclipse Web Tools Platform
-
-CXF_FACET_CORE_LABEL=CXF 2.x Web Services
-CXF_FACET_CORE_DISCRIPTION=Enables Web Services generation through CXF 2.x
-CXF_CORE_TEMPLATE_LABEL=CXF Web Services Project
-CXF_FACET_JST_WEB24_PRESET_LABEL=CXF Web Services Project v2.4
-CXF_FACET_JST_WEB25_PRESET_LABEL=CXF Web Services Project v2.5
-CXF_FACET_JST_WEB24_PRESET_DESCRIPTION=Configures a Dynamic Web Project with CXF using Web Module v2.4 and Java v5.0
-CXF_FACET_JST_WEB25_PRESET_DESCRIPTION=Configures a Dynamic Web Project with CXF using Web Module v2.5 and Java v5.0
diff --git a/bundles/org.eclipse.jst.ws.cxf.core/plugin.xml b/bundles/org.eclipse.jst.ws.cxf.core/plugin.xml
deleted file mode 100644
index e783d88..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.core/plugin.xml
+++ /dev/null
@@ -1,103 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.2"?>
-<plugin>
-
- <extension point="org.eclipse.emf.ecore.generated_package">
- <package
- uri = "http:///org/eclipse/jst/ws/internal/cxf/core/model.ecore"
- class = "org.eclipse.jst.ws.internal.cxf.core.model.CXFPackage"
- genModel = "model/CXF.genmodel" />
- </extension>
-
- <extension point="org.eclipse.wst.common.project.facet.core.facets">
- <project-facet id="cxf.core">
- <label>%CXF_FACET_CORE_LABEL</label>
- <description>%CXF_FACET_CORE_DISCRIPTION</description>
- </project-facet>
-
- <project-facet-version facet="cxf.core" version="1.0">
- <constraint>
- <and>
- <requires facet="jst.web" version="[2.4"/>
- <requires facet="jst.java" version="[5.0"/>
- <conflicts facet="axis2.core" version="[1.0"/>
- <conflicts facet="axis2.ext" version="[1.0"/>
- </and>
- </constraint>
-
- <action id="cxf.core.install" type="INSTALL">
- <delegate class="org.eclipse.jst.ws.internal.cxf.facet.CXFFacetInstallDelegate"/>
- </action>
-
- <action id="cxf.core.uninstall" type="UNINSTALL">
- <delegate class="org.eclipse.jst.ws.internal.cxf.facet.CXFFacetUninstallDelegate"/>
- </action>
- </project-facet-version>
- <template id="template.cxf.core">
- <label>%CXF_CORE_TEMPLATE_LABEL</label>
- <fixed
- facet="cxf.core">
- </fixed>
- <fixed
- facet="jst.web">
- </fixed>
- <fixed
- facet="jst.java">
- </fixed>
- <preset
- id="cxf.jst.web24.preset">
- </preset>
- </template>
- </extension>
-
- <extension point="org.eclipse.wst.common.project.facet.core.runtimes">
- <supported>
- <runtime-component any="true"/>
- <facet
- id="cxf.core"
- version="1.0"/>
- </supported>
- </extension>
-
- <extension point="org.eclipse.wst.common.project.facet.core.presets">
- <static-preset id="cxf.jst.web24.preset">
- <label>%CXF_FACET_JST_WEB24_PRESET_LABEL</label>
- <description>%CXF_FACET_JST_WEB24_PRESET_DESCRIPTION</description>
- <facet
- id="cxf.core"
- version="1.0">
- </facet>
- <facet
- id="jst.web"
- version="2.4">
- </facet>
- <facet
- id="jst.java"
- version="5.0">
- </facet>
- </static-preset>
- <static-preset id="cxf.jst.web25.preset">
- <label>%CXF_FACET_JST_WEB25_PRESET_LABEL</label>
- <description>%CXF_FACET_JST_WEB25_PRESET_DESCRIPTION</description>
- <facet
- id="cxf.core"
- version="1.0">
- </facet>
- <facet
- id="jst.web"
- version="2.5">
- </facet>
- <facet
- id="jst.java"
- version="5.0">
- </facet>
- </static-preset>
- </extension>
-
- <extension point="org.eclipse.jdt.core.classpathContainerInitializer">
- <classpathContainerInitializer
- class="org.eclipse.jst.ws.internal.cxf.core.CXFClasspathContainerInitializer"
- id="org.eclipse.jst.ws.cxf.core.CXF_CLASSPATH_CONTAINER">
- </classpathContainerInitializer>
- </extension>
-</plugin>
diff --git a/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/CXFClasspathContainer.java b/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/CXFClasspathContainer.java
deleted file mode 100644
index ebddbba..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/CXFClasspathContainer.java
+++ /dev/null
@@ -1,111 +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.core;
-
-import java.io.File;
-import java.text.MessageFormat;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jdt.core.IClasspathContainer;
-import org.eclipse.jdt.core.IClasspathEntry;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.JavaCore;
-
-public class CXFClasspathContainer implements IClasspathContainer {
-
- private IPath path;
- private List<IClasspathEntry> classpathEntries;
- private String cxfLibraryEdition;
- private String cxfLibraryVersion;
- private String cxfLibraryLocation;
-
- public CXFClasspathContainer(IPath path, IJavaProject javaProject) {
- this.path = path;
- classpathEntries = new ArrayList<IClasspathEntry>();
- cxfLibraryLocation = getCxfRuntimeLocation();
- cxfLibraryVersion = getCxfRuntimeVersion();
- cxfLibraryEdition = getCxfRuntimeEdition();
- }
-
- public IClasspathEntry[] getClasspathEntries() {
- if (!cxfLibraryVersion.equals(getCxfRuntimeVersion())) {
- classpathEntries = new ArrayList<IClasspathEntry>();
- cxfLibraryLocation = getCxfRuntimeLocation();
- cxfLibraryVersion = getCxfRuntimeVersion();
- cxfLibraryEdition = getCxfRuntimeEdition();
- }
-
- if (classpathEntries.size() == 0) {
- File cxfLibDirectory = getCXFLibraryDirectory();
- if (cxfLibDirectory.exists() && cxfLibDirectory.isDirectory()) {
- String[] files = cxfLibDirectory.list();
- for (int i = 0; i < files.length; i++) {
- File file = new File(cxfLibDirectory.getPath() + File.separator + files[i]);
- String fileName = file.getName();
- if (fileName.indexOf(".") != -1
- && fileName.substring(fileName.lastIndexOf("."), fileName.length()).equals(
- ".jar")) {
- classpathEntries.add(JavaCore.newLibraryEntry(new Path(file.getAbsolutePath()), null,
- new Path("/")));
- }
- }
- }
- }
- return classpathEntries.toArray(new IClasspathEntry[classpathEntries.size()]);
- }
-
- public boolean isValid() {
- if (getCxfRuntimeLocation().length() > 0) {
- File cxfLibDirectory = getCXFLibraryDirectory();
- return cxfLibDirectory.exists() && cxfLibDirectory.isDirectory();
- }
- return false;
- }
-
- public String getDescription() {
- return MessageFormat.format(CXFCoreMessages.CXF_CONTAINER_LIBRARY, cxfLibraryEdition,
- cxfLibraryVersion);
- }
-
- public int getKind() {
- return K_APPLICATION;
- }
-
- public IPath getPath() {
- return path;
- }
-
- private String getCxfRuntimeLocation() {
- return CXFCorePlugin.getDefault().getJava2WSContext().getCxfRuntimeLocation();
- }
-
- private String getCxfRuntimeVersion() {
- return CXFCorePlugin.getDefault().getJava2WSContext().getCxfRuntimeVersion();
- }
-
- private String getCxfRuntimeEdition() {
- return CXFCorePlugin.getDefault().getJava2WSContext().getCxfRuntimeEdition();
- }
-
- private File getCXFLibraryDirectory() {
- IPath cxfLibPath = new Path(cxfLibraryLocation);
- if (!cxfLibPath.hasTrailingSeparator()) {
- cxfLibPath = cxfLibPath.addTrailingSeparator();
- }
- cxfLibPath = cxfLibPath.append("lib"); //$NON-NLS-1$
-
- File cxfLibDirectory = new File(cxfLibPath.toOSString());
- return cxfLibDirectory;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/CXFClasspathContainerInitializer.java b/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/CXFClasspathContainerInitializer.java
deleted file mode 100644
index 6742391..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/CXFClasspathContainerInitializer.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.core;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.jdt.core.ClasspathContainerInitializer;
-import org.eclipse.jdt.core.IClasspathContainer;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.JavaCore;
-
-public class CXFClasspathContainerInitializer extends ClasspathContainerInitializer {
-
- @Override
- public void initialize(IPath containerPath, IJavaProject javaProject) throws CoreException {
- CXFClasspathContainer cxfClasspathContainer = new CXFClasspathContainer(containerPath, javaProject);
-
- if (cxfClasspathContainer.isValid()) {
- JavaCore.setClasspathContainer(containerPath, new IJavaProject[] {javaProject},
- new IClasspathContainer[] {cxfClasspathContainer}, null);
- }
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/CXFCoreMessages.java b/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/CXFCoreMessages.java
deleted file mode 100644
index 076592c..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/CXFCoreMessages.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.core;
-
-import org.eclipse.osgi.util.NLS;
-
-public class CXFCoreMessages extends NLS {
- private static final String BUNDLE_NAME =
- "org.eclipse.jst.ws.internal.cxf.core.CXFCoreMessages"; //$NON-NLS-1$
-
- public static String CXF_FACET_INSTALL_DELEGATE_RUNTIME_LOCATION_NOT_SET;
-
- public static String CXF_CONTAINER_LIBRARY;
-
- static {
- // initialize resource bundle
- NLS.initializeMessages(BUNDLE_NAME, CXFCoreMessages.class);
- }
-
- private CXFCoreMessages() {
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/CXFCoreMessages.properties b/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/CXFCoreMessages.properties
deleted file mode 100644
index 45daa76..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/CXFCoreMessages.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
-###############################################################################
-
-#JDTUtils
-CXF_FACET_INSTALL_DELEGATE_RUNTIME_LOCATION_NOT_SET=CXF Runtime location not set. Please set location in Preferences > Web Services > CXf 2.x Preferences
-CXF_CONTAINER_LIBRARY={0} Library [{1}]
\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/CXFCorePlugin.java b/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/CXFCorePlugin.java
deleted file mode 100644
index 4e65100..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/CXFCorePlugin.java
+++ /dev/null
@@ -1,120 +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.core;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.ws.internal.cxf.core.context.Java2WSPersistentContext;
-import org.eclipse.jst.ws.internal.cxf.core.context.WSDL2JavaPersistentContext;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.osgi.framework.BundleContext;
-import org.osgi.framework.Version;
-
-/**
- * The activator class controls the plug-in life cycle
- *
- */
-public class CXFCorePlugin extends AbstractUIPlugin {
-
- // The plug-in ID
- public static final String PLUGIN_ID = "org.eclipse.jst.ws.cxf.core"; //$NON-NLS-1$
-
- public static final String CXF_VERSION_2_0 = "2.0"; //$NON-NLS-1$
-
- public static final String CXF_VERSION_2_1 = "2.1"; //$NON-NLS-1$
-
- // The shared instance
- private static CXFCorePlugin plugin;
-
- private Java2WSPersistentContext java2WSContext;
- private WSDL2JavaPersistentContext wsdl2JavaContext;
-
- private Version currentRuntimeVersion;
-
- /**
- * The constructor
- */
- public CXFCorePlugin() {
- }
-
- /*
- * (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 CXFCorePlugin getDefault() {
- return plugin;
- }
-
- public Java2WSPersistentContext getJava2WSContext() {
- if (java2WSContext == null) {
- java2WSContext = new Java2WSPersistentContext();
- java2WSContext.load();
- }
- return java2WSContext;
- }
-
- public WSDL2JavaPersistentContext getWSDL2JavaContext() {
- if (wsdl2JavaContext == null) {
- wsdl2JavaContext = new WSDL2JavaPersistentContext();
- wsdl2JavaContext.load();
- }
- return wsdl2JavaContext;
- }
-
- public Version getCurrentRuntimeVersion() {
- if (currentRuntimeVersion == null) {
- String cxfRuntimeVersion = CXFCorePlugin.getDefault().getJava2WSContext().getCxfRuntimeVersion();
- if (cxfRuntimeVersion.length() == 0) {
- cxfRuntimeVersion = "0.0.0";
- }
- this.currentRuntimeVersion = new Version(cxfRuntimeVersion);
- }
- return currentRuntimeVersion;
- }
-
- public void setCurrentRuntimeVersion(Version version) {
- this.currentRuntimeVersion = version;
- }
-
- public static void logMessage(int severity, String message) {
- CXFCorePlugin.log(new Status(severity, CXFCorePlugin.PLUGIN_ID, message));
- }
-
- public static void log(IStatus status) {
- CXFCorePlugin.getDefault().getLog().log(status);
- }
-
- public static void log(Throwable exception) {
- CXFCorePlugin.log(new Status(IStatus.ERROR, CXFCorePlugin.PLUGIN_ID,
- exception.toString(), exception));
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/context/CXFPersistentContext.java b/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/context/CXFPersistentContext.java
deleted file mode 100644
index b94407b..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/context/CXFPersistentContext.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.core.context;
-
-import org.eclipse.core.runtime.Plugin;
-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.wst.command.internal.env.context.PersistentContext;
-
-@SuppressWarnings("restriction")
-public abstract class CXFPersistentContext extends PersistentContext implements CXFContext {
- /**
- * String constant used to lookup the cxf runtime location general
- * preference from the plugins local preferences store.
- */
- private static final String PREFERENCE_CXF_RUNTIME_LOCATION = "cxfRuntimeLocation"; //$NON-NLS-1$
-
- /**
- * Stirng constant used to lookup the cxf runtime edition general preference from
- * the plugins local preferences store.
- */
- private static final String PREFERENCE_CXF_RUNTIME_EDITION = "cxfRuntimeEdition"; //$NON-NLS-1$
-
- /**
- * Stirng constant used to lookup the cxf version general preference from
- * the plugins local preferences store.
- */
- private static final String PREFERENCE_CXF_RUNTIME_VERSION = "cxfRuntimeVersion"; //$NON-NLS-1$
-
- private static final String PREFERENCE_EXPORT_CXF_CLASSPATH_CONTAINER = "exportCXFClasspathContainer"; //$NON-NLS-1$
-
- private static final String PREFERENCE_CXF_VERBOSE = "cxfVerbose"; //$NON-NLS-1$
-
- private static final String PREFERENCE_CXF_USE_SPRING_APP_CONTEXT = "cxfUseSpringAppContext"; //$NON-NLS-1$
-
- public CXFPersistentContext(Plugin plugin) {
- super(CXFCorePlugin.getDefault());
- }
-
- public void load() {
- setDefault(PREFERENCE_CXF_RUNTIME_LOCATION, ""); //$NON-NLS-1$
- setDefault(PREFERENCE_CXF_RUNTIME_EDITION, ""); //$NON-NLS-1$
- setDefault(PREFERENCE_CXF_RUNTIME_VERSION, ""); //$NON-NLS-1$
-
- setDefault(PREFERENCE_EXPORT_CXF_CLASSPATH_CONTAINER, CXFModelUtils.getDefaultBooleanValue(
- CXFPackage.CXF_CONTEXT, CXFPackage.CXF_CONTEXT__EXPORT_CXF_CLASSPATH_CONTAINER));
-
- setDefault(PREFERENCE_CXF_VERBOSE, CXFModelUtils.getDefaultBooleanValue(CXFPackage.CXF_CONTEXT,
- CXFPackage.CXF_CONTEXT__VERBOSE));
-
- setDefault(PREFERENCE_CXF_USE_SPRING_APP_CONTEXT, CXFModelUtils.getDefaultBooleanValue(
- CXFPackage.CXF_CONTEXT, CXFPackage.CXF_CONTEXT__USE_SPRING_APPLICATION_CONTEXT));
- }
-
- public String getCxfRuntimeLocation() {
- return getValueAsString(PREFERENCE_CXF_RUNTIME_LOCATION);
- }
-
- public void setCxfRuntimeLocation(String runtimeLocation) {
- setValue(PREFERENCE_CXF_RUNTIME_LOCATION, runtimeLocation);
- }
-
- public String getCxfRuntimeEdition() {
- return getValueAsString(PREFERENCE_CXF_RUNTIME_EDITION);
- }
-
- public void setCxfRuntimeEdition(String runtimeEdition) {
- setValue(PREFERENCE_CXF_RUNTIME_EDITION, runtimeEdition);
- }
-
- public String getCxfRuntimeVersion() {
- return getValueAsString(PREFERENCE_CXF_RUNTIME_VERSION);
- }
-
- public void setCxfRuntimeVersion(String runtimeVersion) {
- setValue(PREFERENCE_CXF_RUNTIME_VERSION, runtimeVersion);
- }
-
- public boolean isExportCXFClasspathContainer() {
- return getValueAsBoolean(PREFERENCE_EXPORT_CXF_CLASSPATH_CONTAINER);
- }
-
- public void setExportCXFClasspathContainer(boolean exportCXFClasspathContainer) {
- setValue(PREFERENCE_EXPORT_CXF_CLASSPATH_CONTAINER, exportCXFClasspathContainer);
- }
-
- public boolean isVerbose() {
- return getValueAsBoolean(PREFERENCE_CXF_VERBOSE);
- }
-
- public void setVerbose(boolean verbose) {
- setValue(PREFERENCE_CXF_VERBOSE, true);
- }
-
- public boolean isUseSpringApplicationContext() {
- return getValueAsBoolean(PREFERENCE_CXF_USE_SPRING_APP_CONTEXT);
- }
-
- public void setUseSpringApplicationContext(boolean useSpringAppContext) {
- setValue(PREFERENCE_CXF_USE_SPRING_APP_CONTEXT, useSpringAppContext);
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/context/Java2WSPersistentContext.java b/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/context/Java2WSPersistentContext.java
deleted file mode 100644
index c61e17d..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/context/Java2WSPersistentContext.java
+++ /dev/null
@@ -1,268 +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.core.context;
-
-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.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.utils.CXFModelUtils;
-
-@SuppressWarnings("restriction")
-public class Java2WSPersistentContext extends CXFPersistentContext implements Java2WSContext {
- /**
- * String constant used to lookup the cxf soap binding general preference
- * from the plugins local preferences store.
- */
- private static final String PREFERENCE_J2WS_SOAP12_BINDING = "cxfJ2WSSoap12Binding"; //$NON-NLS-1$
- /**
- * String constant used to lookup the cxf generate xsd imports general
- * preference from the plugins local preferences store.
- */
- private static final String PREFERENCE_J2WS_GENERATE_XSD_IMPORTS = "cxfJ2WSXSDImports"; //$NON-NLS-1$
-
- /**
- * String constant used to lookup the cxf default frontend general
- * preference from the plugins local preferences store.
- */
- public static final String PREFERENCE_J2WS_DEFAULT_FRONTEND = "cxfJ2WSDefaultFrontend"; //$NON-NLS-1$
-
- /**
- * String constant used to lookup the cxf default Databinding general
- * preference from the plugins local preferences store.
- */
- public static final String PREFERENCE_J2WS_DEFAULT_DATABINDING = "cxfJ2WSDefaultDatabinding"; //$NON-NLS-1$
-
- /**
- * String constant used to lookup the cxf generate client general preference
- * from the plugins local preferences store.
- */
- public static final String PREFERENCE_J2WS_GENERATE_CLIENT = "cxfJ2WSGenerateClient"; //$NON-NLS-1$
-
- /**
- * String constant used to lookup the cxf generate server general preference
- * from the plugins local preferences store.
- */
- public static final String PREFERENCE_J2WS_GENERATE_SERVER = "cxfJ2WSGenerateServer"; //$NON-NLS-1$
-
- /**
- * String constant used to lookup the cxf generate wrapper and fault beans
- * general preference from the plugins local preferences store.
- */
- public static final String PREFERENCE_J2WS_GENERATE_WRAPPER_FAULT_BEANS = "cxfJ2WSGenerateWrapperFault"; //$NON-NLS-1$
-
- /**
- * String constant used to lookup the cxf generate wsdl general preference
- * from the plugins local preferences store.
- */
- public static final String PREFERENCE_J2WS_GENERATE_WSDL = "cxfJ2WSGenerateWSDL"; //$NON-NLS-1$
-
- /**
- * String constant used to lookup the cxf generate ant build file general
- * preference from the plugins local preferences store.
- */
- public static final String PREFERENCE_J2WS_GENERATE_ANT_BUILD_FILE = "cxfJ2WSGenerateANTBuildFile"; //$NON-NLS-1$
-
- /**
- * String constant used to lookup the APT annotation processing general
- * preference from the plugins local preferences store.
- */
- public static final String PREFERENCE_J2WS_ENABLE_ANNOTATION_PROCESSING
- = "cxfJ2WSEnableAnnotationProcessing"; //$NON-NLS-1$
-
- /**
- * String constant used to lookup the generate <code>@WebMethod</code> annotation general
- * preference from the plugins local preferences store.
- */
- public static final String PREFERENCE_GENERATE_WEB_METHOD_ANNOTATION
- = "cxfJ2WSGenerateWebMethodAnnotation"; //$NON-NLS-1$
-
- /**
- * String constant used to lookup the generate <code>@WebParam</code> annotation general
- * preference from the plugins local preferences store.
- */
- public static final String PREFERENCE_GENERATE_WEB_PARAM_ANNOTATION
- = "cxfJ2WSGenerateWebParamAnnotation"; //$NON-NLS-1$
-
- /**
- * String constant used to lookup the generate <code>@RequestWrapper</code> annotation general
- * preference from the plugins local preferences store.
- */
- public static final String PREFERENCE_GENERATE_REQUEST_WRAPPER_ANNOTATION
- = "cxfJ2WSGenerateRequestWrapperAnnotation"; //$NON-NLS-1$
-
- /**
- * String constant used to lookup the generate <code>@ResponseWrapper</code> annotation general
- * preference from the plugins local preferences store.
- */
- public static final String PREFERENCE_GENERATE_RESPONSE_WRAPPER_ANNOTATION
- = "cxfJ2WSGenerateResponseWrapperAnnotation"; //$NON-NLS-1$
-
- public Java2WSPersistentContext() {
- super(CXFCorePlugin.getDefault());
- }
-
- public void load() {
- super.load();
- setDefault(PREFERENCE_J2WS_SOAP12_BINDING, CXFModelUtils.getDefaultBooleanValue(
- CXFPackage.JAVA2_WS_CONTEXT, CXFPackage.JAVA2_WS_CONTEXT__SOAP12_BINDING));
-
- setDefault(PREFERENCE_J2WS_GENERATE_XSD_IMPORTS, CXFModelUtils.getDefaultBooleanValue(
- CXFPackage.JAVA2_WS_CONTEXT, CXFPackage.JAVA2_WS_CONTEXT__GENERATE_XSD_IMPORTS));
-
- setDefault(PREFERENCE_J2WS_DEFAULT_DATABINDING, DataBinding.JAXB.getLiteral());
-
- setDefault(PREFERENCE_J2WS_DEFAULT_FRONTEND, Frontend.JAXWS.getLiteral());
-
- setDefault(PREFERENCE_J2WS_GENERATE_CLIENT, CXFModelUtils.getDefaultBooleanValue(
- CXFPackage.CXF_CONTEXT, CXFPackage.CXF_CONTEXT__GENERATE_CLIENT));
-
- setDefault(PREFERENCE_J2WS_GENERATE_SERVER, CXFModelUtils.getDefaultBooleanValue(
- CXFPackage.CXF_CONTEXT, CXFPackage.CXF_CONTEXT__GENERATE_SERVER));
-
- setDefault(PREFERENCE_J2WS_GENERATE_WRAPPER_FAULT_BEANS, CXFModelUtils.getDefaultBooleanValue(
- CXFPackage.JAVA2_WS_CONTEXT, CXFPackage.JAVA2_WS_CONTEXT__GENERATE_WRAPPER_FAULT_BEANS));
-
- setDefault(PREFERENCE_J2WS_GENERATE_WSDL, CXFModelUtils.getDefaultBooleanValue(
- CXFPackage.JAVA2_WS_CONTEXT, CXFPackage.JAVA2_WS_CONTEXT__GENERATE_WSDL));
-
- setDefault(PREFERENCE_J2WS_ENABLE_ANNOTATION_PROCESSING, CXFModelUtils.getDefaultBooleanValue(
- CXFPackage.JAVA2_WS_CONTEXT, CXFPackage.JAVA2_WS_CONTEXT__ANNOTATION_PROCESSING_ENABLED));
-
- //TODO MOVE THE FOLLOWING 4
- setDefault(PREFERENCE_GENERATE_WEB_METHOD_ANNOTATION, CXFModelUtils.getDefaultBooleanValue(
- CXFPackage.JAVA2_WS_CONTEXT, CXFPackage.JAVA2_WS_CONTEXT__GENERATE_WEB_METHOD_ANNOTATION));
-
- setDefault(PREFERENCE_GENERATE_WEB_PARAM_ANNOTATION, CXFModelUtils.getDefaultBooleanValue(
- CXFPackage.JAVA2_WS_CONTEXT, CXFPackage.JAVA2_WS_CONTEXT__GENERATE_WEB_PARAM_ANNOTATION));
-
- setDefault(PREFERENCE_GENERATE_REQUEST_WRAPPER_ANNOTATION, CXFModelUtils
- .getDefaultBooleanValue(CXFPackage.JAVA2_WS_CONTEXT,
- CXFPackage.JAVA2_WS_CONTEXT__GENERATE_REQUEST_WRAPPER_ANNOTATION));
-
- setDefault(PREFERENCE_GENERATE_RESPONSE_WRAPPER_ANNOTATION, CXFModelUtils.getDefaultBooleanValue(
- CXFPackage.JAVA2_WS_CONTEXT,
- CXFPackage.JAVA2_WS_CONTEXT__GENERATE_RESPONSE_WRAPPER_ANNOTATION));
- }
-
- public boolean isSoap12Binding() {
- return getValueAsBoolean(PREFERENCE_J2WS_SOAP12_BINDING);
- }
-
- public void setSoap12Binding(boolean soap12Binding) {
- setValue(PREFERENCE_J2WS_SOAP12_BINDING, soap12Binding);
- }
-
- public boolean isGenerateXSDImports() {
- return getValueAsBoolean(PREFERENCE_J2WS_GENERATE_XSD_IMPORTS);
- }
-
- public void setGenerateXSDImports(boolean generateXSDImports) {
- setValue(PREFERENCE_J2WS_GENERATE_XSD_IMPORTS, generateXSDImports);
- }
-
- public DataBinding getDatabinding() {
- return DataBinding.get(getValueAsString(PREFERENCE_J2WS_DEFAULT_DATABINDING));
- }
-
- public void setDatabinding(DataBinding dataBinding) {
- setValue(PREFERENCE_J2WS_DEFAULT_DATABINDING, dataBinding.getLiteral());
- }
-
- public Frontend getFrontend() {
- return Frontend.get(getValueAsString(PREFERENCE_J2WS_DEFAULT_FRONTEND));
- }
-
- public void setFrontend(Frontend defaultFrontend) {
- setValue(PREFERENCE_J2WS_DEFAULT_FRONTEND, defaultFrontend.getLiteral());
- }
-
- public boolean isGenerateClient() {
- return getValueAsBoolean(PREFERENCE_J2WS_GENERATE_CLIENT);
- }
-
- public void setGenerateClient(boolean generateClient) {
- setValue(PREFERENCE_J2WS_GENERATE_CLIENT, generateClient);
- }
-
- public boolean isGenerateServer() {
- return getValueAsBoolean(PREFERENCE_J2WS_GENERATE_SERVER);
- }
-
- public void setGenerateServer(boolean generateServer) {
- setValue(PREFERENCE_J2WS_GENERATE_SERVER, generateServer);
- }
-
- public boolean isGenerateWrapperFaultBeans() {
- return getValueAsBoolean(PREFERENCE_J2WS_GENERATE_WRAPPER_FAULT_BEANS);
- }
-
- public void setGenerateWrapperFaultBeans(boolean generateWrapperFaultBeans) {
- setValue(PREFERENCE_J2WS_GENERATE_WRAPPER_FAULT_BEANS, generateWrapperFaultBeans);
- }
-
- public boolean isGenerateWSDL() {
- return getValueAsBoolean(PREFERENCE_J2WS_GENERATE_WSDL);
- }
-
- public void setGenerateWSDL(boolean generateWSDL) {
- setValue(PREFERENCE_J2WS_GENERATE_WSDL, generateWSDL);
- }
-
- public boolean isGenerateAntBuildFile() {
- return getValueAsBoolean(PREFERENCE_J2WS_GENERATE_ANT_BUILD_FILE);
- }
-
- public void setGenerateAntBuildFile(boolean generateAntBuildFile) {
- setValue(PREFERENCE_J2WS_GENERATE_ANT_BUILD_FILE, generateAntBuildFile);
- }
-
- public boolean isAnnotationProcessingEnabled() {
- return getValueAsBoolean(PREFERENCE_J2WS_ENABLE_ANNOTATION_PROCESSING);
- }
-
- public boolean isGenerateWebMethodAnnotation() {
- return getValueAsBoolean(PREFERENCE_GENERATE_WEB_METHOD_ANNOTATION);
- }
-
- public boolean isGenerateWebParamAnnotation() {
- return getValueAsBoolean(PREFERENCE_GENERATE_WEB_PARAM_ANNOTATION);
- }
-
- public void setGenerateWebParamAnnotation(boolean generateWebParamAnnotation) {
- setValue(PREFERENCE_GENERATE_WEB_PARAM_ANNOTATION, generateWebParamAnnotation);
- }
-
- public void setGenerateWebMethodAnnotation(boolean generateWebMethodAnnotation) {
- setValue(PREFERENCE_GENERATE_WEB_METHOD_ANNOTATION, generateWebMethodAnnotation);
- }
-
- public void setAnnotationProcessingEnabled(boolean enableAnnotationProcessing) {
- setValue(PREFERENCE_J2WS_ENABLE_ANNOTATION_PROCESSING, enableAnnotationProcessing);
- }
-
- public boolean isGenerateRequestWrapperAnnotation() {
- return getValueAsBoolean(PREFERENCE_GENERATE_REQUEST_WRAPPER_ANNOTATION);
- }
-
- public void setGenerateRequestWrapperAnnotation(boolean generateRequestWrapperAnnotation) {
- setValue(PREFERENCE_GENERATE_REQUEST_WRAPPER_ANNOTATION, generateRequestWrapperAnnotation);
- }
-
- public boolean isGenerateResponseWrapperAnnotation() {
- return getValueAsBoolean(PREFERENCE_GENERATE_RESPONSE_WRAPPER_ANNOTATION);
- }
-
- public void setGenerateResponseWrapperAnnotation(boolean generateResponseWrapperAnnotation) {
- setValue(PREFERENCE_GENERATE_RESPONSE_WRAPPER_ANNOTATION, generateResponseWrapperAnnotation);
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/context/WSDL2JavaPersistentContext.java b/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/context/WSDL2JavaPersistentContext.java
deleted file mode 100644
index 182d3f1..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/context/WSDL2JavaPersistentContext.java
+++ /dev/null
@@ -1,312 +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.core.context;
-
-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.DataBinding;
-import org.eclipse.jst.ws.internal.cxf.core.model.Frontend;
-import org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaContext;
-import org.eclipse.jst.ws.internal.cxf.core.utils.CXFModelUtils;
-
-@SuppressWarnings("restriction")
-public class WSDL2JavaPersistentContext extends CXFPersistentContext implements WSDL2JavaContext {
- public static final String PREFERENCE_W2J_GENERATE_CLIENT = "cxfW2JGenerateClient"; //$NON-NLS-1$
- public static final String PREFERENCE_W2J_GENERATE_SERVER = "cxfW2JGenerateServer"; //$NON-NLS-1$
- public static final String PREFERENCE_W2J_GENERATE_IMPLEMENTATION = "cxfW2JGenerateImplementation"; //$NON-NLS-1$
- public static final String PREFERENCE_W2J_GENERATE_ANT_BUILD_FILE = "cxfW2JGenerateAntBuildFile"; //$NON-NLS-1$
-
- public static final String PREFERENCE_W2J_PROCESS_SOAP_HEADERS = "cxfW2JProcessSOAPHeaders"; //$NON-NLS-1$
- public static final String PREFERENCE_W2J_LOAD_DEFAULT_NAMESPACE_PACKAGENAME_MAPPING
- = "cxfW2JLoadDefaultNamespacePackagenameMapping"; //$NON-NLS-1$
- public static final String PREFERENCE_W2J_LOAD_DEFAULT_EXCLUDES_NAMESPACE_MAPPING
- = "cxfW2JLoadDefaultExcludesNamepsaceMapping"; //$NON-NLS-1$
-
- public static final String PREFERENCE_W2J_VALIDATE_WSDL = "cxfW2JValidateWSDL"; //$NON-NLS-1$
-
- public static final String PREFERENCE_W2J_DATABINDING = "cxfW2JDatabinding"; //$NON-NLS-1$
- public static final String PREFERENCE_W2J_FRONTEND = "cxfW2JFrontend"; //$NON-NLS-1$
- public static final String PREFERENCE_W2J_WSDL_VERSION = "cxfW2JWSDLVersion"; //$NON-NLS-1$
- public static final String PREFERENCE_W2J_XJC_ARGS = "cxfW2JXJCArgs"; //$NON-NLS-1$
- public static final String PREFERENCE_W2J_NO_ADDRESS_BINDING = "cxfW2JNoAddressBinding"; //$NON-NLS-1$
- public static final String PREFERENCE_W2J_USE_DEFAULT_VALUES = "cxfW2JUseDefaultValues"; //$NON-NLS-1$
- public static final String PREFERENCE_W2J_AUTO_NAME_RESOLUTION = "cxfW2JAutoNameResolution"; //$NON-NLS-1$
-
- public static final String XJC_USE_DEFAULT_VALUES = "xjcUseDefaultValues"; //$NON-NLS-1$
- public static final String XJC_TO_STRING = "xjcToString"; //$NON-NLS-1$
- public static final String XJC_TO_STRING_MULTI = "xjcToStringMulti"; //$NON-NLS-1$
- public static final String XJC_TO_STRING_SIMPLE = "xjcToStringSimple"; //$NON-NLS-1$
- public static final String XJC_LOCATOR = "xjcLocator"; //$NON-NLS-1$
- public static final String XJC_SYNC_METHODS = "xjcSyncMethods"; //$NON-NLS-1$
- public static final String XJC_MARK_GENERATED = "xjcMarkGenerated"; //$NON-NLS-1$
- public static final String XJC_EPISODE_FILE = "xjcEpisodeFile"; //$NON-NLS-1$
-
- public WSDL2JavaPersistentContext() {
- super(CXFCorePlugin.getDefault());
- }
-
- public void load() {
- super.load();
- setDefault(PREFERENCE_W2J_GENERATE_CLIENT, CXFModelUtils.getDefaultBooleanValue(
- CXFPackage.CXF_CONTEXT, CXFPackage.CXF_CONTEXT__GENERATE_CLIENT));
-
- setDefault(PREFERENCE_W2J_GENERATE_SERVER, CXFModelUtils.getDefaultBooleanValue(
- CXFPackage.CXF_CONTEXT, CXFPackage.CXF_CONTEXT__GENERATE_SERVER));
-
- setDefault(PREFERENCE_W2J_GENERATE_IMPLEMENTATION, CXFModelUtils.getDefaultBooleanValue(
- CXFPackage.WSDL2_JAVA_CONTEXT, CXFPackage.WSDL2_JAVA_CONTEXT__GENERATE_IMPLEMENTATION));
-
- setDefault(PREFERENCE_W2J_GENERATE_ANT_BUILD_FILE, CXFModelUtils.getDefaultBooleanValue(
- CXFPackage.CXF_CONTEXT, CXFPackage.CXF_CONTEXT__GENERATE_ANT_BUILD_FILE));
-
- setDefault(PREFERENCE_W2J_XJC_ARGS, ""); //$NON-NLS-1$
-
- setDefault(PREFERENCE_W2J_PROCESS_SOAP_HEADERS, CXFModelUtils.getDefaultBooleanValue(
- CXFPackage.WSDL2_JAVA_CONTEXT, CXFPackage.WSDL2_JAVA_CONTEXT__PROCESS_SOAP_HEADERS));
-
- setDefault(PREFERENCE_W2J_LOAD_DEFAULT_NAMESPACE_PACKAGENAME_MAPPING, CXFModelUtils
- .getDefaultBooleanValue(CXFPackage.WSDL2_JAVA_CONTEXT,
- CXFPackage.WSDL2_JAVA_CONTEXT__LOAD_DEFAULT_NAMESPACE_PACKAGE_NAME_MAPPING));
-
- setDefault(PREFERENCE_W2J_LOAD_DEFAULT_EXCLUDES_NAMESPACE_MAPPING, CXFModelUtils
- .getDefaultBooleanValue(CXFPackage.WSDL2_JAVA_CONTEXT,
- CXFPackage.WSDL2_JAVA_CONTEXT__LOAD_DEFAULT_EXCLUDES_NAMEPSACE_MAPPING));
-
- setDefault(PREFERENCE_W2J_VALIDATE_WSDL, CXFModelUtils.getDefaultBooleanValue(
- CXFPackage.WSDL2_JAVA_CONTEXT, CXFPackage.WSDL2_JAVA_CONTEXT__VALIDATE));
-
- setDefault(PREFERENCE_W2J_DATABINDING, DataBinding.JAXB.getLiteral());
-
- setDefault(PREFERENCE_W2J_FRONTEND, Frontend.JAXWS.getLiteral());
-
- setDefault(PREFERENCE_W2J_WSDL_VERSION, CXFPackage.eINSTANCE.getWSDL2JavaContext_WsdlVersion()
- .getDefaultValueLiteral());
-
- setDefault(PREFERENCE_W2J_NO_ADDRESS_BINDING, CXFModelUtils.getDefaultBooleanValue(
- CXFPackage.WSDL2_JAVA_CONTEXT, CXFPackage.WSDL2_JAVA_CONTEXT__NO_ADDRESS_BINDING));
-
- setDefault(PREFERENCE_W2J_USE_DEFAULT_VALUES, CXFModelUtils.getDefaultBooleanValue(
- CXFPackage.WSDL2_JAVA_CONTEXT, CXFPackage.WSDL2_JAVA_CONTEXT__USE_DEFAULT_VALUES));
-
- setDefault(PREFERENCE_W2J_AUTO_NAME_RESOLUTION, CXFModelUtils.getDefaultBooleanValue(
- CXFPackage.WSDL2_JAVA_CONTEXT, CXFPackage.WSDL2_JAVA_CONTEXT__AUTO_NAME_RESOLUTION));
-
- setDefault(XJC_USE_DEFAULT_VALUES, CXFModelUtils.getDefaultBooleanValue(
- CXFPackage.WSDL2_JAVA_CONTEXT, CXFPackage.WSDL2_JAVA_CONTEXT__XJC_USE_DEFAULT_VALUES));
-
- setDefault(XJC_TO_STRING, CXFModelUtils.getDefaultBooleanValue(CXFPackage.WSDL2_JAVA_CONTEXT,
- CXFPackage.WSDL2_JAVA_CONTEXT__XJC_TO_STRING));
-
- setDefault(XJC_TO_STRING_MULTI, CXFModelUtils.getDefaultBooleanValue(CXFPackage.WSDL2_JAVA_CONTEXT,
- CXFPackage.WSDL2_JAVA_CONTEXT__XJC_TO_STRING_MULTI_LINE));
-
- setDefault(XJC_TO_STRING_SIMPLE, CXFModelUtils.getDefaultBooleanValue(CXFPackage.WSDL2_JAVA_CONTEXT,
- CXFPackage.WSDL2_JAVA_CONTEXT__XJC_TO_STRING_SIMPLE));
-
- setDefault(XJC_LOCATOR, CXFModelUtils.getDefaultBooleanValue(CXFPackage.WSDL2_JAVA_CONTEXT,
- CXFPackage.WSDL2_JAVA_CONTEXT__XJC_LOCATOR));
-
- setDefault(XJC_SYNC_METHODS, CXFModelUtils.getDefaultBooleanValue(CXFPackage.WSDL2_JAVA_CONTEXT,
- CXFPackage.WSDL2_JAVA_CONTEXT__XJC_SYNC_METHODS));
-
- setDefault(XJC_MARK_GENERATED, CXFModelUtils.getDefaultBooleanValue(CXFPackage.WSDL2_JAVA_CONTEXT,
- CXFPackage.WSDL2_JAVA_CONTEXT__XJC_MARK_GENERATED));
-
- setDefault(XJC_EPISODE_FILE, ""); //$NON-NLS-1$
- }
-
- public boolean isGenerateAntBuildFile() {
- return getValueAsBoolean(PREFERENCE_W2J_GENERATE_ANT_BUILD_FILE);
- }
-
- public void setGenerateAntBuildFile(boolean generateAntBuildFile) {
- setValue(PREFERENCE_W2J_GENERATE_ANT_BUILD_FILE, generateAntBuildFile);
- }
-
- public boolean isGenerateClient() {
- return getValueAsBoolean(PREFERENCE_W2J_GENERATE_CLIENT);
- }
-
- public void setGenerateClient(boolean generateClient) {
- setValue(PREFERENCE_W2J_GENERATE_CLIENT, generateClient);
- }
-
- public boolean isGenerateImplementation() {
- return getValueAsBoolean(PREFERENCE_W2J_GENERATE_IMPLEMENTATION);
- }
-
- public void setGenerateImplementation(boolean generateImplementation) {
- setValue(PREFERENCE_W2J_GENERATE_IMPLEMENTATION, generateImplementation);
- }
-
- public boolean isGenerateServer() {
- return getValueAsBoolean(PREFERENCE_W2J_GENERATE_SERVER);
- }
-
- public void setGenerateServer(boolean generateServer) {
- setValue(PREFERENCE_W2J_GENERATE_SERVER, generateServer);
- }
-
- public boolean isLoadDefaultNamespacePackageNameMapping() {
- return getValueAsBoolean(PREFERENCE_W2J_LOAD_DEFAULT_NAMESPACE_PACKAGENAME_MAPPING);
- }
-
- public void setLoadDefaultNamespacePackageNameMapping(boolean loadDefaultNamespacePackageNameMapping) {
- setValue(PREFERENCE_W2J_LOAD_DEFAULT_NAMESPACE_PACKAGENAME_MAPPING,
- loadDefaultNamespacePackageNameMapping);
- }
-
- public boolean isLoadDefaultExcludesNamepsaceMapping() {
- return getValueAsBoolean(PREFERENCE_W2J_LOAD_DEFAULT_EXCLUDES_NAMESPACE_MAPPING);
- }
-
- public void setLoadDefaultExcludesNamepsaceMapping(boolean loadDefaultExcludesNamepsaceMapping) {
- setValue(PREFERENCE_W2J_LOAD_DEFAULT_EXCLUDES_NAMESPACE_MAPPING, loadDefaultExcludesNamepsaceMapping);
- }
-
- public boolean isProcessSOAPHeaders() {
- return getValueAsBoolean(PREFERENCE_W2J_PROCESS_SOAP_HEADERS);
- }
-
- public void setProcessSOAPHeaders(boolean processSoapHeaders) {
- setValue(PREFERENCE_W2J_PROCESS_SOAP_HEADERS, processSoapHeaders);
- }
-
- public boolean isValidate() {
- return getValueAsBoolean(PREFERENCE_W2J_VALIDATE_WSDL);
- }
-
- public void setValidate(boolean validate) {
- setValue(PREFERENCE_W2J_VALIDATE_WSDL, validate);
- }
-
- public DataBinding getDatabinding() {
- return DataBinding.get(getValueAsString(PREFERENCE_W2J_DATABINDING));
- }
-
- public void setDatabinding(DataBinding dataBinding) {
- setValue(PREFERENCE_W2J_DATABINDING, dataBinding.getLiteral());
- }
-
- public Frontend getFrontend() {
- return Frontend.get(getValueAsString(PREFERENCE_W2J_FRONTEND));
- }
-
- public void setFrontend(Frontend frontend) {
- setValue(PREFERENCE_W2J_FRONTEND, frontend.getLiteral());
- }
-
- public String getWsdlVersion() {
- return getValueAsString(PREFERENCE_W2J_WSDL_VERSION);
- }
-
- public void setWsdlVersion(String wsdlVersion) {
- setValue(PREFERENCE_W2J_WSDL_VERSION, wsdlVersion);
- }
-
- public String getXjcArgs() {
- return getValueAsString(PREFERENCE_W2J_XJC_ARGS);
- }
-
- public void setXjcArgs(String xjcArgs) {
- setValue(PREFERENCE_W2J_XJC_ARGS, xjcArgs);
- }
-
- public boolean isNoAddressBinding() {
- return getValueAsBoolean(PREFERENCE_W2J_NO_ADDRESS_BINDING);
- }
-
- public void setNoAddressBinding(boolean noAddressBinding) {
- setValue(PREFERENCE_W2J_NO_ADDRESS_BINDING, noAddressBinding);
- }
-
- public boolean isAutoNameResolution() {
- return getValueAsBoolean(PREFERENCE_W2J_AUTO_NAME_RESOLUTION);
- }
-
- public void setAutoNameResolution(boolean autoNameResolution) {
- setValue(PREFERENCE_W2J_AUTO_NAME_RESOLUTION, autoNameResolution);
- }
-
- public boolean isUseDefaultValues() {
- return getValueAsBoolean(PREFERENCE_W2J_USE_DEFAULT_VALUES);
- }
-
- public void setUseDefaultValues(boolean useDefaultValues) {
- setValue(PREFERENCE_W2J_USE_DEFAULT_VALUES, useDefaultValues);
- }
-
-
- public boolean isXjcUseDefaultValues() {
- return getValueAsBoolean(XJC_USE_DEFAULT_VALUES);
- }
-
- public void setXjcUseDefaultValues(boolean useXJCDefaultValues) {
- setValue(XJC_USE_DEFAULT_VALUES, useXJCDefaultValues);
- }
-
- public boolean isXjcToString() {
- return getValueAsBoolean(XJC_TO_STRING);
- }
-
- public void setXjcToString(boolean xjcToString) {
- setValue(XJC_TO_STRING, xjcToString);
- }
-
- public boolean isXjcToStringMultiLine() {
- return getValueAsBoolean(XJC_TO_STRING_MULTI);
- }
-
- public void setXjcToStringMultiLine(boolean xjcToStringMultiLine) {
- setValue(XJC_TO_STRING_MULTI, xjcToStringMultiLine);
- }
-
- public boolean isXjcToStringSimple() {
- return getValueAsBoolean(XJC_TO_STRING_SIMPLE);
- }
-
- public void setXjcToStringSimple(boolean xjcToStringSimple) {
- setValue(XJC_TO_STRING_SIMPLE, xjcToStringSimple);
- }
-
- public boolean isXjcLocator() {
- return getValueAsBoolean(XJC_LOCATOR);
- }
-
- public void setXjcLocator(boolean xjcLocator) {
- setValue(XJC_LOCATOR, xjcLocator);
- }
-
- public boolean isXjcSyncMethods() {
- return getValueAsBoolean(XJC_SYNC_METHODS);
- }
-
- public void setXjcSyncMethods(boolean xjcSyncMethods) {
- setValue(XJC_SYNC_METHODS, xjcSyncMethods);
- }
-
- public boolean isXjcMarkGenerated() {
- return getValueAsBoolean(XJC_MARK_GENERATED);
- }
-
- public void setXjcMarkGenerated(boolean xjcMarkGenerated) {
- setValue(XJC_MARK_GENERATED, xjcMarkGenerated);
- }
-
- public String getXjcEpisodeFile() {
- return getValueAsString(XJC_EPISODE_FILE);
- }
-
- public void setXjcEpisodeFile(String xjcEpisodeFile) {
- setValue(XJC_EPISODE_FILE, xjcEpisodeFile);
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/model/CXFContext.java b/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/model/CXFContext.java
deleted file mode 100644
index 694be28..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/model/CXFContext.java
+++ /dev/null
@@ -1,225 +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.core.model;
-
-/**
- *
- * @model abstract="true" interface="true"
- */
-public interface CXFContext {
-
- /**
- * Returns the CXF Home Directory location.
- *
- * @model
- */
- String getCxfRuntimeLocation();
-
- /**
- * Sets the value of the '{@link org.eclipse.jst.ws.internal.cxf.core.model.CXFContext#getCxfRuntimeLocation <em>Cxf Runtime Location</em>}' attribute.
- * <!-- begin-user-doc -->
- * Sets the CXF Home Directory location.
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Cxf Runtime Location</em>' attribute.
- * @see #getCxfRuntimeLocation()
- * @generated
- */
- void setCxfRuntimeLocation(String value);
-
- /**
- * Returns the CXF Runtime Edition.
- *
- * @model
- */
- String getCxfRuntimeEdition();
-
- /**
- * Sets the value of the '{@link org.eclipse.jst.ws.internal.cxf.core.model.CXFContext#getCxfRuntimeEdition <em>Cxf Runtime Edition</em>}' attribute.
- * <!-- begin-user-doc -->
- * Sets the CXF Runtime Edition.
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Cxf Runtime Edition</em>' attribute.
- * @see #getCxfRuntimeEdition()
- * @generated
- */
- void setCxfRuntimeEdition(String value);
-
- /**
- * Returns the CXF Tool version.
- *
- * @model
- */
- String getCxfRuntimeVersion();
-
- /**
- * Sets the value of the '{@link org.eclipse.jst.ws.internal.cxf.core.model.CXFContext#getCxfRuntimeVersion <em>Cxf Runtime Version</em>}' attribute.
- * <!-- begin-user-doc -->
- * Sets the CXF Tool version
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Cxf Runtime Version</em>' attribute.
- * @see #getCxfRuntimeVersion()
- * @generated
- */
- void setCxfRuntimeVersion(String value);
-
- /**
- * Returns whether comments are shown during the code generation process.
- *
- * @model default="true"
- */
- boolean isVerbose();
-
- /**
- * Sets the value of the '{@link org.eclipse.jst.ws.internal.cxf.core.model.CXFContext#isVerbose <em>Verbose</em>}' attribute.
- * <!-- begin-user-doc -->
- * Displays comments during the code generation process.
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Verbose</em>' attribute.
- * @see #isVerbose()
- * @generated
- */
- void setVerbose(boolean value);
-
- /**
- * Returns whether to generate an Ant build.xml file.
- *
- * @model default="false"
- */
- boolean isGenerateAntBuildFile();
-
- /**
- * Sets the value of the '{@link org.eclipse.jst.ws.internal.cxf.core.model.CXFContext#isGenerateAntBuildFile <em>Generate Ant Build File</em>}' attribute.
- * <!-- begin-user-doc -->
- * Set to generate an Ant build.xml file.
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Generate Ant Build File</em>' attribute.
- * @see #isGenerateAntBuildFile()
- * @generated
- */
- void setGenerateAntBuildFile(boolean value);
-
- /**
- * Returns whether to generate a client.
- *
- * @model default="false"
- */
- boolean isGenerateClient();
-
- /**
- * Sets the value of the '{@link org.eclipse.jst.ws.internal.cxf.core.model.CXFContext#isGenerateClient <em>Generate Client</em>}' attribute.
- * <!-- begin-user-doc -->
- * Specify to generate client side code.
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Generate Client</em>' attribute.
- * @see #isGenerateClient()
- * @generated
- */
- void setGenerateClient(boolean value);
-
- /**
- * Returns whether to generate a server.
- *
- * @model default="false"
- */
- boolean isGenerateServer();
-
- /**
- * Sets the value of the '{@link org.eclipse.jst.ws.internal.cxf.core.model.CXFContext#isGenerateServer <em>Generate Server</em>}' attribute.
- * <!-- begin-user-doc -->
- * Specify to generate server side code.
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Generate Server</em>' attribute.
- * @see #isGenerateServer()
- * @generated
- */
- void setGenerateServer(boolean value);
-
- /**
- * Returns the data binding used.
- *
- * @model default="jaxb"
- */
- DataBinding getDatabinding();
-
- /**
- * Sets the value of the '{@link org.eclipse.jst.ws.internal.cxf.core.model.CXFContext#getDatabinding <em>Databinding</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Databinding</em>' attribute.
- * @see org.eclipse.jst.ws.internal.cxf.core.model.DataBinding
- * @see #getDatabinding()
- * @generated
- */
- void setDatabinding(DataBinding value);
-
- /**
- * Returns the frontend used.
- *
- * @model default="jaxws"
- */
- Frontend getFrontend();
-
- /**
- * Sets the value of the '{@link org.eclipse.jst.ws.internal.cxf.core.model.CXFContext#getFrontend <em>Frontend</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Frontend</em>' attribute.
- * @see org.eclipse.jst.ws.internal.cxf.core.model.Frontend
- * @see #getFrontend()
- * @generated
- */
- void setFrontend(Frontend value);
-
- /**
- * Returns if the Spring Application Context is used instead of cxf-servlet.
- *
- * @model default="true"
- */
- boolean isUseSpringApplicationContext();
-
- /**
- * Sets the value of the '{@link org.eclipse.jst.ws.internal.cxf.core.model.CXFContext#isUseSpringApplicationContext <em>Use Spring Application Context</em>}' attribute.
- * <!-- begin-user-doc -->
- * If true the Spring Application Context is used otherwise cxf servlet.
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Use Spring Application Context</em>' attribute.
- * @see #isUseSpringApplicationContext()
- * @generated
- */
- void setUseSpringApplicationContext(boolean value);
-
- /**
- * Returns the value of the '<em><b>Export CXF Classpath Container</b></em>' attribute.
- * The default value is <code>"true"</code>.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Export CXF Classpath Container</em>' attribute isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- * @return the value of the '<em>Export CXF Classpath Container</em>' attribute.
- * @see #setExportCXFClasspathContainer(boolean)
- * @see org.eclipse.jst.ws.internal.cxf.core.model.CXFPackage#getCXFContext_ExportCXFClasspathContainer()
- * @model default="true"
- * @generated
- */
- boolean isExportCXFClasspathContainer();
-
- /**
- * Sets the value of the '{@link org.eclipse.jst.ws.internal.cxf.core.model.CXFContext#isExportCXFClasspathContainer <em>Export CXF Classpath Container</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Export CXF Classpath Container</em>' attribute.
- * @see #isExportCXFClasspathContainer()
- * @generated
- */
- void setExportCXFClasspathContainer(boolean value);
-}
diff --git a/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/model/CXFDataModel.java b/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/model/CXFDataModel.java
deleted file mode 100644
index 03a1cee..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/model/CXFDataModel.java
+++ /dev/null
@@ -1,268 +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.core.model;
-
-import java.net.URL;
-import javax.wsdl.Definition;
-
-/**
- *
- * @model abstract="true"
- */
-public interface CXFDataModel extends CXFContext {
- /**
- * Returns the originating project that contains the java or wsdl resource.
- *
- * @model
- */
- String getProjectName();
-
- /**
- * Sets the value of the '{@link org.eclipse.jst.ws.internal.cxf.core.model.CXFDataModel#getProjectName <em>Project Name</em>}' attribute.
- * <!-- begin-user-doc -->
- * Sets the originating project that contains the java or wsdl resource.
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Project Name</em>' attribute.
- * @see #getProjectName()
- * @generated
- */
- void setProjectName(String value);
-
- /**
- * Returns the resource directory in which the output files are placed.
- *
- * @model
- */
- String getResourceDirectory();
-
- /**
- * Sets the value of the '{@link org.eclipse.jst.ws.internal.cxf.core.model.CXFDataModel#getResourceDirectory <em>Resource Directory</em>}' attribute.
- * <!-- begin-user-doc -->
- * Sets the resource directory in which the output files are placed.
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Resource Directory</em>' attribute.
- * @see #getResourceDirectory()
- * @generated
- */
- void setResourceDirectory(String value);
-
- /**
- * Returns the directory in which the generated sources are compiled into.
- * If not specified, the files are not compiled.
- *
- * @model
- */
- String getClassDirectory();
-
- /**
- * Sets the value of the '{@link org.eclipse.jst.ws.internal.cxf.core.model.CXFDataModel#getClassDirectory <em>Class Directory</em>}' attribute.
- * <!-- begin-user-doc -->
- * Sets directory in which the generated sources are compiled into. If not
- * specified, the files are not compiled.
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Class Directory</em>' attribute.
- * @see #getClassDirectory()
- * @generated
- */
- void setClassDirectory(String value);
-
- /**
- * Returns the name of the WSDL File that is used as input to WSDL2Java or
- * is the output of Java2WS.
- *
- * @model
- */
- String getWsdlFileName();
-
- /**
- * Sets the value of the '{@link org.eclipse.jst.ws.internal.cxf.core.model.CXFDataModel#getWsdlFileName <em>Wsdl File Name</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Wsdl File Name</em>' attribute.
- * @see #getWsdlFileName()
- * @generated
- */
- void setWsdlFileName(String value);
-
- /**
- * Returns the WSDL URL.
- *
- * @model
- */
- URL getWsdlURL();
-
- /**
- * Sets the value of the '{@link org.eclipse.jst.ws.internal.cxf.core.model.CXFDataModel#getWsdlURL <em>Wsdl URL</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Wsdl URL</em>' attribute.
- * @see #getWsdlURL()
- * @generated
- */
- void setWsdlURL(URL value);
-
- /**
- * Returns the wsdl location relative to the WebContent directory.
- * Used in the spring configuration.
- *
- * @model
- */
- String getConfigWsdlLocation();
-
- /**
- * Sets the value of the '{@link org.eclipse.jst.ws.internal.cxf.core.model.CXFDataModel#getConfigWsdlLocation <em>Config Wsdl Location</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Config Wsdl Location</em>' attribute.
- * @see #getConfigWsdlLocation()
- * @generated
- */
- void setConfigWsdlLocation(String value);
-
- /**
- * Returns the Java Class that may be used as input to Java2WS or is the output
- * of WSDL2Java.
- *
- * @model
- */
- String getFullyQualifiedJavaClassName();
-
- /**
- * Sets the value of the '{@link org.eclipse.jst.ws.internal.cxf.core.model.CXFDataModel#getFullyQualifiedJavaClassName <em>Fully Qualified Java Class Name</em>}' attribute.
- * <!-- begin-user-doc -->
- * Sets the Java Class that may be used as input to Java2WS or is the output of WSDL2Java.
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Fully Qualified Java Class Name</em>' attribute.
- * @see #getFullyQualifiedJavaClassName()
- * @generated
- */
- void setFullyQualifiedJavaClassName(String value);
-
- /**
- * Returns the name of the Java Interface that may be used as input to Java2WS.
- *
- * @model
- */
- String getFullyQualifiedJavaInterfaceName();
-
- /**
- * Sets the value of the '{@link org.eclipse.jst.ws.internal.cxf.core.model.CXFDataModel#getFullyQualifiedJavaInterfaceName <em>Fully Qualified Java Interface Name</em>}' attribute.
- * <!-- begin-user-doc -->
- * Sets the name of the Java Interface that may be used as input to Java2WS.
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Fully Qualified Java Interface Name</em>' attribute.
- * @see #getFullyQualifiedJavaInterfaceName()
- * @generated
- */
- void setFullyQualifiedJavaInterfaceName(String value);
-
- /**
- * Used in the CXF Spring Configuration to uniquely identify elements.
- *
- * @model
- */
- String getConfigId();
-
- /**
- * Sets the value of the '{@link org.eclipse.jst.ws.internal.cxf.core.model.CXFDataModel#getConfigId <em>Config Id</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Config Id</em>' attribute.
- * @see #getConfigId()
- * @generated
- */
- void setConfigId(String value);
-
- /**
- * Returns the targetNamespace.
- *
- * @model
- */
- String getTargetNamespace();
-
- /**
- * Sets the value of the '{@link org.eclipse.jst.ws.internal.cxf.core.model.CXFDataModel#getTargetNamespace <em>Target Namespace</em>}' attribute.
- * <!-- begin-user-doc -->
- * Sets the targetNamespace.
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Target Namespace</em>' attribute.
- * @see #getTargetNamespace()
- * @generated
- */
- void setTargetNamespace(String value);
-
- /**
- * Returns the endointName attribute used in the jaxws:endpoint element in the CXF Spring Configuration.
- *
- * @model
- */
- String getEndpointName();
-
- /**
- * Sets the value of the '{@link org.eclipse.jst.ws.internal.cxf.core.model.CXFDataModel#getEndpointName <em>Endpoint Name</em>}' attribute.
- * <!-- begin-user-doc -->
- * Sets the endpointName attribute used in the jaxws:endpoint element in the CXF Spring Configuration.
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Endpoint Name</em>' attribute.
- * @see #getEndpointName()
- * @generated
- */
- void setEndpointName(String value);
-
- /**
- * Returns the serviceName attribute used in the jaxws:endpoint element in the CXF Spring Configuration.
- *
- * @model
- */
- String getServiceName();
-
- /**
- * Sets the value of the '{@link org.eclipse.jst.ws.internal.cxf.core.model.CXFDataModel#getServiceName <em>Service Name</em>}' attribute.
- * <!-- begin-user-doc -->
- * Sets the serviceName attribute used in the jaxws:endpoint element in the CXF Spring Configuration.
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Service Name</em>' attribute.
- * @see #getServiceName()
- * @generated
- */
- void setServiceName(String value);
-
- /**
- * @model
- */
- Definition getWsdlDefinition();
-
- /**
- * Sets the value of the '{@link org.eclipse.jst.ws.internal.cxf.core.model.CXFDataModel#getWsdlDefinition <em>Wsdl Definition</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Wsdl Definition</em>' attribute.
- * @see #getWsdlDefinition()
- * @generated
- */
- void setWsdlDefinition(Definition value);
-
- /**
- * @model
- */
- String getWsdlLocation();
-
- /**
- * Sets the value of the '{@link org.eclipse.jst.ws.internal.cxf.core.model.CXFDataModel#getWsdlLocation <em>Wsdl Location</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Wsdl Location</em>' attribute.
- * @see #getWsdlLocation()
- * @generated
- */
- void setWsdlLocation(String value);
-
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/model/CXFFactory.java b/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/model/CXFFactory.java
deleted file mode 100644
index 57e301b..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/model/CXFFactory.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/**
- * Copyright (c) 2008 IONA Technologies PLC
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IONA Technologies PLC - initial API and implementation
- *
- * $Id: CXFFactory.java,v 1.1 2008/11/10 20:37:43 david_williams Exp $
- */
-package org.eclipse.jst.ws.internal.cxf.core.model;
-
-import org.eclipse.emf.ecore.EFactory;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Factory</b> for the model.
- * It provides a create method for each non-abstract class of the model.
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.ws.internal.cxf.core.model.CXFPackage
- * @generated
- */
-public interface CXFFactory extends EFactory {
- /**
- * The singleton instance of the factory.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- CXFFactory eINSTANCE = org.eclipse.jst.ws.internal.cxf.core.model.impl.CXFFactoryImpl.init();
-
- /**
- * Returns a new object of class '<em>Java2 WS Data Model</em>'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return a new object of class '<em>Java2 WS Data Model</em>'.
- * @generated
- */
- Java2WSDataModel createJava2WSDataModel();
-
- /**
- * Returns a new object of class '<em>WSDL2 Java Data Model</em>'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return a new object of class '<em>WSDL2 Java Data Model</em>'.
- * @generated
- */
- WSDL2JavaDataModel createWSDL2JavaDataModel();
-
- /**
- * Returns the package supported by this factory.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the package supported by this factory.
- * @generated
- */
- CXFPackage getCXFPackage();
-
-} //CXFFactory
diff --git a/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/model/CXFPackage.java b/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/model/CXFPackage.java
deleted file mode 100644
index 2e1d5b6..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/model/CXFPackage.java
+++ /dev/null
@@ -1,3350 +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
- *
- * $Id: CXFPackage.java,v 1.3 2009/04/06 21:33:14 sclarke Exp $
- */
-package org.eclipse.jst.ws.internal.cxf.core.model;
-
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EDataType;
-import org.eclipse.emf.ecore.EEnum;
-import org.eclipse.emf.ecore.EPackage;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Package</b> for the model.
- * It contains accessors for the meta objects to represent
- * <ul>
- * <li>each class,</li>
- * <li>each feature of each class,</li>
- * <li>each enum,</li>
- * <li>and each data type</li>
- * </ul>
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.ws.internal.cxf.core.model.CXFFactory
- * @model kind="package"
- * @generated
- */
-public interface CXFPackage extends EPackage {
- /**
- * The package name.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- String eNAME = "model";
-
- /**
- * The package namespace URI.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- String eNS_URI = "http:///org/eclipse/jst/ws/internal/cxf/core/model.ecore";
-
- /**
- * The package namespace name.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- String eNS_PREFIX = "org.eclipse.jst.ws.internal.cxf.core.model";
-
- /**
- * The singleton instance of the package.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- CXFPackage eINSTANCE = org.eclipse.jst.ws.internal.cxf.core.model.impl.CXFPackageImpl.init();
-
- /**
- * The meta object id for the '{@link org.eclipse.jst.ws.internal.cxf.core.model.CXFContext <em>Context</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.ws.internal.cxf.core.model.CXFContext
- * @see org.eclipse.jst.ws.internal.cxf.core.model.impl.CXFPackageImpl#getCXFContext()
- * @generated
- */
- int CXF_CONTEXT = 0;
-
- /**
- * The feature id for the '<em><b>Cxf Runtime Location</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int CXF_CONTEXT__CXF_RUNTIME_LOCATION = 0;
-
- /**
- * The feature id for the '<em><b>Cxf Runtime Edition</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int CXF_CONTEXT__CXF_RUNTIME_EDITION = 1;
-
- /**
- * The feature id for the '<em><b>Cxf Runtime Version</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int CXF_CONTEXT__CXF_RUNTIME_VERSION = 2;
-
- /**
- * The feature id for the '<em><b>Verbose</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int CXF_CONTEXT__VERBOSE = 3;
-
- /**
- * The feature id for the '<em><b>Generate Ant Build File</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int CXF_CONTEXT__GENERATE_ANT_BUILD_FILE = 4;
-
- /**
- * The feature id for the '<em><b>Generate Client</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int CXF_CONTEXT__GENERATE_CLIENT = 5;
-
- /**
- * The feature id for the '<em><b>Generate Server</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int CXF_CONTEXT__GENERATE_SERVER = 6;
-
- /**
- * The feature id for the '<em><b>Databinding</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int CXF_CONTEXT__DATABINDING = 7;
-
- /**
- * The feature id for the '<em><b>Frontend</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int CXF_CONTEXT__FRONTEND = 8;
-
- /**
- * The feature id for the '<em><b>Use Spring Application Context</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int CXF_CONTEXT__USE_SPRING_APPLICATION_CONTEXT = 9;
-
- /**
- * The feature id for the '<em><b>Export CXF Classpath Container</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int CXF_CONTEXT__EXPORT_CXF_CLASSPATH_CONTAINER = 10;
-
- /**
- * The number of structural features of the '<em>Context</em>' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int CXF_CONTEXT_FEATURE_COUNT = 11;
-
- /**
- * The meta object id for the '{@link org.eclipse.jst.ws.internal.cxf.core.model.impl.CXFDataModelImpl <em>Data Model</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.ws.internal.cxf.core.model.impl.CXFDataModelImpl
- * @see org.eclipse.jst.ws.internal.cxf.core.model.impl.CXFPackageImpl#getCXFDataModel()
- * @generated
- */
- int CXF_DATA_MODEL = 1;
-
- /**
- * The feature id for the '<em><b>Cxf Runtime Location</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int CXF_DATA_MODEL__CXF_RUNTIME_LOCATION = CXF_CONTEXT__CXF_RUNTIME_LOCATION;
-
- /**
- * The feature id for the '<em><b>Cxf Runtime Edition</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int CXF_DATA_MODEL__CXF_RUNTIME_EDITION = CXF_CONTEXT__CXF_RUNTIME_EDITION;
-
- /**
- * The feature id for the '<em><b>Cxf Runtime Version</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int CXF_DATA_MODEL__CXF_RUNTIME_VERSION = CXF_CONTEXT__CXF_RUNTIME_VERSION;
-
- /**
- * The feature id for the '<em><b>Verbose</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int CXF_DATA_MODEL__VERBOSE = CXF_CONTEXT__VERBOSE;
-
- /**
- * The feature id for the '<em><b>Generate Ant Build File</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int CXF_DATA_MODEL__GENERATE_ANT_BUILD_FILE = CXF_CONTEXT__GENERATE_ANT_BUILD_FILE;
-
- /**
- * The feature id for the '<em><b>Generate Client</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int CXF_DATA_MODEL__GENERATE_CLIENT = CXF_CONTEXT__GENERATE_CLIENT;
-
- /**
- * The feature id for the '<em><b>Generate Server</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int CXF_DATA_MODEL__GENERATE_SERVER = CXF_CONTEXT__GENERATE_SERVER;
-
- /**
- * The feature id for the '<em><b>Databinding</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int CXF_DATA_MODEL__DATABINDING = CXF_CONTEXT__DATABINDING;
-
- /**
- * The feature id for the '<em><b>Frontend</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int CXF_DATA_MODEL__FRONTEND = CXF_CONTEXT__FRONTEND;
-
- /**
- * The feature id for the '<em><b>Use Spring Application Context</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int CXF_DATA_MODEL__USE_SPRING_APPLICATION_CONTEXT = CXF_CONTEXT__USE_SPRING_APPLICATION_CONTEXT;
-
- /**
- * The feature id for the '<em><b>Export CXF Classpath Container</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int CXF_DATA_MODEL__EXPORT_CXF_CLASSPATH_CONTAINER = CXF_CONTEXT__EXPORT_CXF_CLASSPATH_CONTAINER;
-
- /**
- * The feature id for the '<em><b>Project Name</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int CXF_DATA_MODEL__PROJECT_NAME = CXF_CONTEXT_FEATURE_COUNT + 0;
-
- /**
- * The feature id for the '<em><b>Resource Directory</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int CXF_DATA_MODEL__RESOURCE_DIRECTORY = CXF_CONTEXT_FEATURE_COUNT + 1;
-
- /**
- * The feature id for the '<em><b>Class Directory</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int CXF_DATA_MODEL__CLASS_DIRECTORY = CXF_CONTEXT_FEATURE_COUNT + 2;
-
- /**
- * The feature id for the '<em><b>Wsdl File Name</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int CXF_DATA_MODEL__WSDL_FILE_NAME = CXF_CONTEXT_FEATURE_COUNT + 3;
-
- /**
- * The feature id for the '<em><b>Wsdl URL</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int CXF_DATA_MODEL__WSDL_URL = CXF_CONTEXT_FEATURE_COUNT + 4;
-
- /**
- * The feature id for the '<em><b>Config Wsdl Location</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int CXF_DATA_MODEL__CONFIG_WSDL_LOCATION = CXF_CONTEXT_FEATURE_COUNT + 5;
-
- /**
- * The feature id for the '<em><b>Fully Qualified Java Class Name</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int CXF_DATA_MODEL__FULLY_QUALIFIED_JAVA_CLASS_NAME = CXF_CONTEXT_FEATURE_COUNT + 6;
-
- /**
- * The feature id for the '<em><b>Fully Qualified Java Interface Name</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int CXF_DATA_MODEL__FULLY_QUALIFIED_JAVA_INTERFACE_NAME = CXF_CONTEXT_FEATURE_COUNT + 7;
-
- /**
- * The feature id for the '<em><b>Config Id</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int CXF_DATA_MODEL__CONFIG_ID = CXF_CONTEXT_FEATURE_COUNT + 8;
-
- /**
- * The feature id for the '<em><b>Target Namespace</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int CXF_DATA_MODEL__TARGET_NAMESPACE = CXF_CONTEXT_FEATURE_COUNT + 9;
-
- /**
- * The feature id for the '<em><b>Endpoint Name</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int CXF_DATA_MODEL__ENDPOINT_NAME = CXF_CONTEXT_FEATURE_COUNT + 10;
-
- /**
- * The feature id for the '<em><b>Service Name</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int CXF_DATA_MODEL__SERVICE_NAME = CXF_CONTEXT_FEATURE_COUNT + 11;
-
- /**
- * The feature id for the '<em><b>Wsdl Definition</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int CXF_DATA_MODEL__WSDL_DEFINITION = CXF_CONTEXT_FEATURE_COUNT + 12;
-
- /**
- * The feature id for the '<em><b>Wsdl Location</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int CXF_DATA_MODEL__WSDL_LOCATION = CXF_CONTEXT_FEATURE_COUNT + 13;
-
- /**
- * The number of structural features of the '<em>Data Model</em>' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int CXF_DATA_MODEL_FEATURE_COUNT = CXF_CONTEXT_FEATURE_COUNT + 14;
-
- /**
- * The meta object id for the '{@link org.eclipse.jst.ws.internal.cxf.core.model.Java2WSContext <em>Java2 WS Context</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.ws.internal.cxf.core.model.Java2WSContext
- * @see org.eclipse.jst.ws.internal.cxf.core.model.impl.CXFPackageImpl#getJava2WSContext()
- * @generated
- */
- int JAVA2_WS_CONTEXT = 2;
-
- /**
- * The feature id for the '<em><b>Cxf Runtime Location</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int JAVA2_WS_CONTEXT__CXF_RUNTIME_LOCATION = CXF_CONTEXT__CXF_RUNTIME_LOCATION;
-
- /**
- * The feature id for the '<em><b>Cxf Runtime Edition</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int JAVA2_WS_CONTEXT__CXF_RUNTIME_EDITION = CXF_CONTEXT__CXF_RUNTIME_EDITION;
-
- /**
- * The feature id for the '<em><b>Cxf Runtime Version</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int JAVA2_WS_CONTEXT__CXF_RUNTIME_VERSION = CXF_CONTEXT__CXF_RUNTIME_VERSION;
-
- /**
- * The feature id for the '<em><b>Verbose</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int JAVA2_WS_CONTEXT__VERBOSE = CXF_CONTEXT__VERBOSE;
-
- /**
- * The feature id for the '<em><b>Generate Ant Build File</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int JAVA2_WS_CONTEXT__GENERATE_ANT_BUILD_FILE = CXF_CONTEXT__GENERATE_ANT_BUILD_FILE;
-
- /**
- * The feature id for the '<em><b>Generate Client</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int JAVA2_WS_CONTEXT__GENERATE_CLIENT = CXF_CONTEXT__GENERATE_CLIENT;
-
- /**
- * The feature id for the '<em><b>Generate Server</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int JAVA2_WS_CONTEXT__GENERATE_SERVER = CXF_CONTEXT__GENERATE_SERVER;
-
- /**
- * The feature id for the '<em><b>Databinding</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int JAVA2_WS_CONTEXT__DATABINDING = CXF_CONTEXT__DATABINDING;
-
- /**
- * The feature id for the '<em><b>Frontend</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int JAVA2_WS_CONTEXT__FRONTEND = CXF_CONTEXT__FRONTEND;
-
- /**
- * The feature id for the '<em><b>Use Spring Application Context</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int JAVA2_WS_CONTEXT__USE_SPRING_APPLICATION_CONTEXT = CXF_CONTEXT__USE_SPRING_APPLICATION_CONTEXT;
-
- /**
- * The feature id for the '<em><b>Export CXF Classpath Container</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int JAVA2_WS_CONTEXT__EXPORT_CXF_CLASSPATH_CONTAINER = CXF_CONTEXT__EXPORT_CXF_CLASSPATH_CONTAINER;
-
- /**
- * The feature id for the '<em><b>Soap12 Binding</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int JAVA2_WS_CONTEXT__SOAP12_BINDING = CXF_CONTEXT_FEATURE_COUNT + 0;
-
- /**
- * The feature id for the '<em><b>Generate XSD Imports</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int JAVA2_WS_CONTEXT__GENERATE_XSD_IMPORTS = CXF_CONTEXT_FEATURE_COUNT + 1;
-
- /**
- * The feature id for the '<em><b>Generate WSDL</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int JAVA2_WS_CONTEXT__GENERATE_WSDL = CXF_CONTEXT_FEATURE_COUNT + 2;
-
- /**
- * The feature id for the '<em><b>Generate Wrapper Fault Beans</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int JAVA2_WS_CONTEXT__GENERATE_WRAPPER_FAULT_BEANS = CXF_CONTEXT_FEATURE_COUNT + 3;
-
- /**
- * The feature id for the '<em><b>Annotation Processing Enabled</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int JAVA2_WS_CONTEXT__ANNOTATION_PROCESSING_ENABLED = CXF_CONTEXT_FEATURE_COUNT + 4;
-
- /**
- * The feature id for the '<em><b>Generate Web Method Annotation</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int JAVA2_WS_CONTEXT__GENERATE_WEB_METHOD_ANNOTATION = CXF_CONTEXT_FEATURE_COUNT + 5;
-
- /**
- * The feature id for the '<em><b>Generate Web Param Annotation</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int JAVA2_WS_CONTEXT__GENERATE_WEB_PARAM_ANNOTATION = CXF_CONTEXT_FEATURE_COUNT + 6;
-
- /**
- * The feature id for the '<em><b>Generate Request Wrapper Annotation</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int JAVA2_WS_CONTEXT__GENERATE_REQUEST_WRAPPER_ANNOTATION = CXF_CONTEXT_FEATURE_COUNT + 7;
-
- /**
- * The feature id for the '<em><b>Generate Response Wrapper Annotation</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int JAVA2_WS_CONTEXT__GENERATE_RESPONSE_WRAPPER_ANNOTATION = CXF_CONTEXT_FEATURE_COUNT + 8;
-
- /**
- * The number of structural features of the '<em>Java2 WS Context</em>' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int JAVA2_WS_CONTEXT_FEATURE_COUNT = CXF_CONTEXT_FEATURE_COUNT + 9;
-
- /**
- * The meta object id for the '{@link org.eclipse.jst.ws.internal.cxf.core.model.impl.Java2WSDataModelImpl <em>Java2 WS Data Model</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.ws.internal.cxf.core.model.impl.Java2WSDataModelImpl
- * @see org.eclipse.jst.ws.internal.cxf.core.model.impl.CXFPackageImpl#getJava2WSDataModel()
- * @generated
- */
- int JAVA2_WS_DATA_MODEL = 3;
-
- /**
- * The feature id for the '<em><b>Cxf Runtime Location</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int JAVA2_WS_DATA_MODEL__CXF_RUNTIME_LOCATION = CXF_DATA_MODEL__CXF_RUNTIME_LOCATION;
-
- /**
- * The feature id for the '<em><b>Cxf Runtime Edition</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int JAVA2_WS_DATA_MODEL__CXF_RUNTIME_EDITION = CXF_DATA_MODEL__CXF_RUNTIME_EDITION;
-
- /**
- * The feature id for the '<em><b>Cxf Runtime Version</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int JAVA2_WS_DATA_MODEL__CXF_RUNTIME_VERSION = CXF_DATA_MODEL__CXF_RUNTIME_VERSION;
-
- /**
- * The feature id for the '<em><b>Verbose</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int JAVA2_WS_DATA_MODEL__VERBOSE = CXF_DATA_MODEL__VERBOSE;
-
- /**
- * The feature id for the '<em><b>Generate Ant Build File</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int JAVA2_WS_DATA_MODEL__GENERATE_ANT_BUILD_FILE = CXF_DATA_MODEL__GENERATE_ANT_BUILD_FILE;
-
- /**
- * The feature id for the '<em><b>Generate Client</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int JAVA2_WS_DATA_MODEL__GENERATE_CLIENT = CXF_DATA_MODEL__GENERATE_CLIENT;
-
- /**
- * The feature id for the '<em><b>Generate Server</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int JAVA2_WS_DATA_MODEL__GENERATE_SERVER = CXF_DATA_MODEL__GENERATE_SERVER;
-
- /**
- * The feature id for the '<em><b>Databinding</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int JAVA2_WS_DATA_MODEL__DATABINDING = CXF_DATA_MODEL__DATABINDING;
-
- /**
- * The feature id for the '<em><b>Frontend</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int JAVA2_WS_DATA_MODEL__FRONTEND = CXF_DATA_MODEL__FRONTEND;
-
- /**
- * The feature id for the '<em><b>Use Spring Application Context</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int JAVA2_WS_DATA_MODEL__USE_SPRING_APPLICATION_CONTEXT = CXF_DATA_MODEL__USE_SPRING_APPLICATION_CONTEXT;
-
- /**
- * The feature id for the '<em><b>Export CXF Classpath Container</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int JAVA2_WS_DATA_MODEL__EXPORT_CXF_CLASSPATH_CONTAINER = CXF_DATA_MODEL__EXPORT_CXF_CLASSPATH_CONTAINER;
-
- /**
- * The feature id for the '<em><b>Project Name</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int JAVA2_WS_DATA_MODEL__PROJECT_NAME = CXF_DATA_MODEL__PROJECT_NAME;
-
- /**
- * The feature id for the '<em><b>Resource Directory</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int JAVA2_WS_DATA_MODEL__RESOURCE_DIRECTORY = CXF_DATA_MODEL__RESOURCE_DIRECTORY;
-
- /**
- * The feature id for the '<em><b>Class Directory</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int JAVA2_WS_DATA_MODEL__CLASS_DIRECTORY = CXF_DATA_MODEL__CLASS_DIRECTORY;
-
- /**
- * The feature id for the '<em><b>Wsdl File Name</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int JAVA2_WS_DATA_MODEL__WSDL_FILE_NAME = CXF_DATA_MODEL__WSDL_FILE_NAME;
-
- /**
- * The feature id for the '<em><b>Wsdl URL</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int JAVA2_WS_DATA_MODEL__WSDL_URL = CXF_DATA_MODEL__WSDL_URL;
-
- /**
- * The feature id for the '<em><b>Config Wsdl Location</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int JAVA2_WS_DATA_MODEL__CONFIG_WSDL_LOCATION = CXF_DATA_MODEL__CONFIG_WSDL_LOCATION;
-
- /**
- * The feature id for the '<em><b>Fully Qualified Java Class Name</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int JAVA2_WS_DATA_MODEL__FULLY_QUALIFIED_JAVA_CLASS_NAME = CXF_DATA_MODEL__FULLY_QUALIFIED_JAVA_CLASS_NAME;
-
- /**
- * The feature id for the '<em><b>Fully Qualified Java Interface Name</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int JAVA2_WS_DATA_MODEL__FULLY_QUALIFIED_JAVA_INTERFACE_NAME = CXF_DATA_MODEL__FULLY_QUALIFIED_JAVA_INTERFACE_NAME;
-
- /**
- * The feature id for the '<em><b>Config Id</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int JAVA2_WS_DATA_MODEL__CONFIG_ID = CXF_DATA_MODEL__CONFIG_ID;
-
- /**
- * The feature id for the '<em><b>Target Namespace</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int JAVA2_WS_DATA_MODEL__TARGET_NAMESPACE = CXF_DATA_MODEL__TARGET_NAMESPACE;
-
- /**
- * The feature id for the '<em><b>Endpoint Name</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int JAVA2_WS_DATA_MODEL__ENDPOINT_NAME = CXF_DATA_MODEL__ENDPOINT_NAME;
-
- /**
- * The feature id for the '<em><b>Service Name</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int JAVA2_WS_DATA_MODEL__SERVICE_NAME = CXF_DATA_MODEL__SERVICE_NAME;
-
- /**
- * The feature id for the '<em><b>Wsdl Definition</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int JAVA2_WS_DATA_MODEL__WSDL_DEFINITION = CXF_DATA_MODEL__WSDL_DEFINITION;
-
- /**
- * The feature id for the '<em><b>Wsdl Location</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int JAVA2_WS_DATA_MODEL__WSDL_LOCATION = CXF_DATA_MODEL__WSDL_LOCATION;
-
- /**
- * The feature id for the '<em><b>Soap12 Binding</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int JAVA2_WS_DATA_MODEL__SOAP12_BINDING = CXF_DATA_MODEL_FEATURE_COUNT + 0;
-
- /**
- * The feature id for the '<em><b>Generate XSD Imports</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int JAVA2_WS_DATA_MODEL__GENERATE_XSD_IMPORTS = CXF_DATA_MODEL_FEATURE_COUNT + 1;
-
- /**
- * The feature id for the '<em><b>Generate WSDL</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int JAVA2_WS_DATA_MODEL__GENERATE_WSDL = CXF_DATA_MODEL_FEATURE_COUNT + 2;
-
- /**
- * The feature id for the '<em><b>Generate Wrapper Fault Beans</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int JAVA2_WS_DATA_MODEL__GENERATE_WRAPPER_FAULT_BEANS = CXF_DATA_MODEL_FEATURE_COUNT + 3;
-
- /**
- * The feature id for the '<em><b>Annotation Processing Enabled</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int JAVA2_WS_DATA_MODEL__ANNOTATION_PROCESSING_ENABLED = CXF_DATA_MODEL_FEATURE_COUNT + 4;
-
- /**
- * The feature id for the '<em><b>Generate Web Method Annotation</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int JAVA2_WS_DATA_MODEL__GENERATE_WEB_METHOD_ANNOTATION = CXF_DATA_MODEL_FEATURE_COUNT + 5;
-
- /**
- * The feature id for the '<em><b>Generate Web Param Annotation</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int JAVA2_WS_DATA_MODEL__GENERATE_WEB_PARAM_ANNOTATION = CXF_DATA_MODEL_FEATURE_COUNT + 6;
-
- /**
- * The feature id for the '<em><b>Generate Request Wrapper Annotation</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int JAVA2_WS_DATA_MODEL__GENERATE_REQUEST_WRAPPER_ANNOTATION = CXF_DATA_MODEL_FEATURE_COUNT + 7;
-
- /**
- * The feature id for the '<em><b>Generate Response Wrapper Annotation</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int JAVA2_WS_DATA_MODEL__GENERATE_RESPONSE_WRAPPER_ANNOTATION = CXF_DATA_MODEL_FEATURE_COUNT + 8;
-
- /**
- * The feature id for the '<em><b>Classpath</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int JAVA2_WS_DATA_MODEL__CLASSPATH = CXF_DATA_MODEL_FEATURE_COUNT + 9;
-
- /**
- * The feature id for the '<em><b>Java Starting Point</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int JAVA2_WS_DATA_MODEL__JAVA_STARTING_POINT = CXF_DATA_MODEL_FEATURE_COUNT + 10;
-
- /**
- * The feature id for the '<em><b>Use Service Endpoint Interface</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int JAVA2_WS_DATA_MODEL__USE_SERVICE_ENDPOINT_INTERFACE = CXF_DATA_MODEL_FEATURE_COUNT + 11;
-
- /**
- * The feature id for the '<em><b>Extract Interface</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int JAVA2_WS_DATA_MODEL__EXTRACT_INTERFACE = CXF_DATA_MODEL_FEATURE_COUNT + 12;
-
- /**
- * The feature id for the '<em><b>Service Endpoint Interface Name</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int JAVA2_WS_DATA_MODEL__SERVICE_ENDPOINT_INTERFACE_NAME = CXF_DATA_MODEL_FEATURE_COUNT + 13;
-
- /**
- * The feature id for the '<em><b>Method Map</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int JAVA2_WS_DATA_MODEL__METHOD_MAP = CXF_DATA_MODEL_FEATURE_COUNT + 14;
-
- /**
- * The feature id for the '<em><b>Annotation Map</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int JAVA2_WS_DATA_MODEL__ANNOTATION_MAP = CXF_DATA_MODEL_FEATURE_COUNT + 15;
-
- /**
- * The feature id for the '<em><b>Source Directory</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int JAVA2_WS_DATA_MODEL__SOURCE_DIRECTORY = CXF_DATA_MODEL_FEATURE_COUNT + 16;
-
- /**
- * The feature id for the '<em><b>Port Name</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int JAVA2_WS_DATA_MODEL__PORT_NAME = CXF_DATA_MODEL_FEATURE_COUNT + 17;
-
- /**
- * The number of structural features of the '<em>Java2 WS Data Model</em>' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int JAVA2_WS_DATA_MODEL_FEATURE_COUNT = CXF_DATA_MODEL_FEATURE_COUNT + 18;
-
- /**
- * The meta object id for the '{@link org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaContext <em>WSDL2 Java Context</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaContext
- * @see org.eclipse.jst.ws.internal.cxf.core.model.impl.CXFPackageImpl#getWSDL2JavaContext()
- * @generated
- */
- int WSDL2_JAVA_CONTEXT = 4;
-
- /**
- * The feature id for the '<em><b>Cxf Runtime Location</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int WSDL2_JAVA_CONTEXT__CXF_RUNTIME_LOCATION = CXF_CONTEXT__CXF_RUNTIME_LOCATION;
-
- /**
- * The feature id for the '<em><b>Cxf Runtime Edition</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int WSDL2_JAVA_CONTEXT__CXF_RUNTIME_EDITION = CXF_CONTEXT__CXF_RUNTIME_EDITION;
-
- /**
- * The feature id for the '<em><b>Cxf Runtime Version</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int WSDL2_JAVA_CONTEXT__CXF_RUNTIME_VERSION = CXF_CONTEXT__CXF_RUNTIME_VERSION;
-
- /**
- * The feature id for the '<em><b>Verbose</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int WSDL2_JAVA_CONTEXT__VERBOSE = CXF_CONTEXT__VERBOSE;
-
- /**
- * The feature id for the '<em><b>Generate Ant Build File</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int WSDL2_JAVA_CONTEXT__GENERATE_ANT_BUILD_FILE = CXF_CONTEXT__GENERATE_ANT_BUILD_FILE;
-
- /**
- * The feature id for the '<em><b>Generate Client</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int WSDL2_JAVA_CONTEXT__GENERATE_CLIENT = CXF_CONTEXT__GENERATE_CLIENT;
-
- /**
- * The feature id for the '<em><b>Generate Server</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int WSDL2_JAVA_CONTEXT__GENERATE_SERVER = CXF_CONTEXT__GENERATE_SERVER;
-
- /**
- * The feature id for the '<em><b>Databinding</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int WSDL2_JAVA_CONTEXT__DATABINDING = CXF_CONTEXT__DATABINDING;
-
- /**
- * The feature id for the '<em><b>Frontend</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int WSDL2_JAVA_CONTEXT__FRONTEND = CXF_CONTEXT__FRONTEND;
-
- /**
- * The feature id for the '<em><b>Use Spring Application Context</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int WSDL2_JAVA_CONTEXT__USE_SPRING_APPLICATION_CONTEXT = CXF_CONTEXT__USE_SPRING_APPLICATION_CONTEXT;
-
- /**
- * The feature id for the '<em><b>Export CXF Classpath Container</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int WSDL2_JAVA_CONTEXT__EXPORT_CXF_CLASSPATH_CONTAINER = CXF_CONTEXT__EXPORT_CXF_CLASSPATH_CONTAINER;
-
- /**
- * The feature id for the '<em><b>Generate Implementation</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int WSDL2_JAVA_CONTEXT__GENERATE_IMPLEMENTATION = CXF_CONTEXT_FEATURE_COUNT + 0;
-
- /**
- * The feature id for the '<em><b>Process SOAP Headers</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int WSDL2_JAVA_CONTEXT__PROCESS_SOAP_HEADERS = CXF_CONTEXT_FEATURE_COUNT + 1;
-
- /**
- * The feature id for the '<em><b>Load Default Namespace Package Name Mapping</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int WSDL2_JAVA_CONTEXT__LOAD_DEFAULT_NAMESPACE_PACKAGE_NAME_MAPPING = CXF_CONTEXT_FEATURE_COUNT + 2;
-
- /**
- * The feature id for the '<em><b>Load Default Excludes Namepsace Mapping</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int WSDL2_JAVA_CONTEXT__LOAD_DEFAULT_EXCLUDES_NAMEPSACE_MAPPING = CXF_CONTEXT_FEATURE_COUNT + 3;
-
- /**
- * The feature id for the '<em><b>Validate</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int WSDL2_JAVA_CONTEXT__VALIDATE = CXF_CONTEXT_FEATURE_COUNT + 4;
-
- /**
- * The feature id for the '<em><b>Wsdl Version</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int WSDL2_JAVA_CONTEXT__WSDL_VERSION = CXF_CONTEXT_FEATURE_COUNT + 5;
-
- /**
- * The feature id for the '<em><b>Use Default Values</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int WSDL2_JAVA_CONTEXT__USE_DEFAULT_VALUES = CXF_CONTEXT_FEATURE_COUNT + 6;
-
- /**
- * The feature id for the '<em><b>Xjc Args</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int WSDL2_JAVA_CONTEXT__XJC_ARGS = CXF_CONTEXT_FEATURE_COUNT + 7;
-
- /**
- * The feature id for the '<em><b>No Address Binding</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int WSDL2_JAVA_CONTEXT__NO_ADDRESS_BINDING = CXF_CONTEXT_FEATURE_COUNT + 8;
-
- /**
- * The feature id for the '<em><b>Xjc Use Default Values</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int WSDL2_JAVA_CONTEXT__XJC_USE_DEFAULT_VALUES = CXF_CONTEXT_FEATURE_COUNT + 9;
-
- /**
- * The feature id for the '<em><b>Xjc To String</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int WSDL2_JAVA_CONTEXT__XJC_TO_STRING = CXF_CONTEXT_FEATURE_COUNT + 10;
-
- /**
- * The feature id for the '<em><b>Xjc To String Multi Line</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int WSDL2_JAVA_CONTEXT__XJC_TO_STRING_MULTI_LINE = CXF_CONTEXT_FEATURE_COUNT + 11;
-
- /**
- * The feature id for the '<em><b>Xjc To String Simple</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int WSDL2_JAVA_CONTEXT__XJC_TO_STRING_SIMPLE = CXF_CONTEXT_FEATURE_COUNT + 12;
-
- /**
- * The feature id for the '<em><b>Xjc Locator</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int WSDL2_JAVA_CONTEXT__XJC_LOCATOR = CXF_CONTEXT_FEATURE_COUNT + 13;
-
- /**
- * The feature id for the '<em><b>Xjc Sync Methods</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int WSDL2_JAVA_CONTEXT__XJC_SYNC_METHODS = CXF_CONTEXT_FEATURE_COUNT + 14;
-
- /**
- * The feature id for the '<em><b>Xjc Mark Generated</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int WSDL2_JAVA_CONTEXT__XJC_MARK_GENERATED = CXF_CONTEXT_FEATURE_COUNT + 15;
-
- /**
- * The feature id for the '<em><b>Xjc Episode File</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int WSDL2_JAVA_CONTEXT__XJC_EPISODE_FILE = CXF_CONTEXT_FEATURE_COUNT + 16;
-
- /**
- * The feature id for the '<em><b>Auto Name Resolution</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int WSDL2_JAVA_CONTEXT__AUTO_NAME_RESOLUTION = CXF_CONTEXT_FEATURE_COUNT + 17;
-
- /**
- * The number of structural features of the '<em>WSDL2 Java Context</em>' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int WSDL2_JAVA_CONTEXT_FEATURE_COUNT = CXF_CONTEXT_FEATURE_COUNT + 18;
-
- /**
- * The meta object id for the '{@link org.eclipse.jst.ws.internal.cxf.core.model.impl.WSDL2JavaDataModelImpl <em>WSDL2 Java Data Model</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.ws.internal.cxf.core.model.impl.WSDL2JavaDataModelImpl
- * @see org.eclipse.jst.ws.internal.cxf.core.model.impl.CXFPackageImpl#getWSDL2JavaDataModel()
- * @generated
- */
- int WSDL2_JAVA_DATA_MODEL = 5;
-
- /**
- * The feature id for the '<em><b>Cxf Runtime Location</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int WSDL2_JAVA_DATA_MODEL__CXF_RUNTIME_LOCATION = CXF_DATA_MODEL__CXF_RUNTIME_LOCATION;
-
- /**
- * The feature id for the '<em><b>Cxf Runtime Edition</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int WSDL2_JAVA_DATA_MODEL__CXF_RUNTIME_EDITION = CXF_DATA_MODEL__CXF_RUNTIME_EDITION;
-
- /**
- * The feature id for the '<em><b>Cxf Runtime Version</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int WSDL2_JAVA_DATA_MODEL__CXF_RUNTIME_VERSION = CXF_DATA_MODEL__CXF_RUNTIME_VERSION;
-
- /**
- * The feature id for the '<em><b>Verbose</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int WSDL2_JAVA_DATA_MODEL__VERBOSE = CXF_DATA_MODEL__VERBOSE;
-
- /**
- * The feature id for the '<em><b>Generate Ant Build File</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int WSDL2_JAVA_DATA_MODEL__GENERATE_ANT_BUILD_FILE = CXF_DATA_MODEL__GENERATE_ANT_BUILD_FILE;
-
- /**
- * The feature id for the '<em><b>Generate Client</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int WSDL2_JAVA_DATA_MODEL__GENERATE_CLIENT = CXF_DATA_MODEL__GENERATE_CLIENT;
-
- /**
- * The feature id for the '<em><b>Generate Server</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int WSDL2_JAVA_DATA_MODEL__GENERATE_SERVER = CXF_DATA_MODEL__GENERATE_SERVER;
-
- /**
- * The feature id for the '<em><b>Databinding</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int WSDL2_JAVA_DATA_MODEL__DATABINDING = CXF_DATA_MODEL__DATABINDING;
-
- /**
- * The feature id for the '<em><b>Frontend</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int WSDL2_JAVA_DATA_MODEL__FRONTEND = CXF_DATA_MODEL__FRONTEND;
-
- /**
- * The feature id for the '<em><b>Use Spring Application Context</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int WSDL2_JAVA_DATA_MODEL__USE_SPRING_APPLICATION_CONTEXT = CXF_DATA_MODEL__USE_SPRING_APPLICATION_CONTEXT;
-
- /**
- * The feature id for the '<em><b>Export CXF Classpath Container</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int WSDL2_JAVA_DATA_MODEL__EXPORT_CXF_CLASSPATH_CONTAINER = CXF_DATA_MODEL__EXPORT_CXF_CLASSPATH_CONTAINER;
-
- /**
- * The feature id for the '<em><b>Project Name</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int WSDL2_JAVA_DATA_MODEL__PROJECT_NAME = CXF_DATA_MODEL__PROJECT_NAME;
-
- /**
- * The feature id for the '<em><b>Resource Directory</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int WSDL2_JAVA_DATA_MODEL__RESOURCE_DIRECTORY = CXF_DATA_MODEL__RESOURCE_DIRECTORY;
-
- /**
- * The feature id for the '<em><b>Class Directory</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int WSDL2_JAVA_DATA_MODEL__CLASS_DIRECTORY = CXF_DATA_MODEL__CLASS_DIRECTORY;
-
- /**
- * The feature id for the '<em><b>Wsdl File Name</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int WSDL2_JAVA_DATA_MODEL__WSDL_FILE_NAME = CXF_DATA_MODEL__WSDL_FILE_NAME;
-
- /**
- * The feature id for the '<em><b>Wsdl URL</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int WSDL2_JAVA_DATA_MODEL__WSDL_URL = CXF_DATA_MODEL__WSDL_URL;
-
- /**
- * The feature id for the '<em><b>Config Wsdl Location</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int WSDL2_JAVA_DATA_MODEL__CONFIG_WSDL_LOCATION = CXF_DATA_MODEL__CONFIG_WSDL_LOCATION;
-
- /**
- * The feature id for the '<em><b>Fully Qualified Java Class Name</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int WSDL2_JAVA_DATA_MODEL__FULLY_QUALIFIED_JAVA_CLASS_NAME = CXF_DATA_MODEL__FULLY_QUALIFIED_JAVA_CLASS_NAME;
-
- /**
- * The feature id for the '<em><b>Fully Qualified Java Interface Name</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int WSDL2_JAVA_DATA_MODEL__FULLY_QUALIFIED_JAVA_INTERFACE_NAME = CXF_DATA_MODEL__FULLY_QUALIFIED_JAVA_INTERFACE_NAME;
-
- /**
- * The feature id for the '<em><b>Config Id</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int WSDL2_JAVA_DATA_MODEL__CONFIG_ID = CXF_DATA_MODEL__CONFIG_ID;
-
- /**
- * The feature id for the '<em><b>Target Namespace</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int WSDL2_JAVA_DATA_MODEL__TARGET_NAMESPACE = CXF_DATA_MODEL__TARGET_NAMESPACE;
-
- /**
- * The feature id for the '<em><b>Endpoint Name</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int WSDL2_JAVA_DATA_MODEL__ENDPOINT_NAME = CXF_DATA_MODEL__ENDPOINT_NAME;
-
- /**
- * The feature id for the '<em><b>Service Name</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int WSDL2_JAVA_DATA_MODEL__SERVICE_NAME = CXF_DATA_MODEL__SERVICE_NAME;
-
- /**
- * The feature id for the '<em><b>Wsdl Definition</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int WSDL2_JAVA_DATA_MODEL__WSDL_DEFINITION = CXF_DATA_MODEL__WSDL_DEFINITION;
-
- /**
- * The feature id for the '<em><b>Wsdl Location</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int WSDL2_JAVA_DATA_MODEL__WSDL_LOCATION = CXF_DATA_MODEL__WSDL_LOCATION;
-
- /**
- * The feature id for the '<em><b>Generate Implementation</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int WSDL2_JAVA_DATA_MODEL__GENERATE_IMPLEMENTATION = CXF_DATA_MODEL_FEATURE_COUNT + 0;
-
- /**
- * The feature id for the '<em><b>Process SOAP Headers</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int WSDL2_JAVA_DATA_MODEL__PROCESS_SOAP_HEADERS = CXF_DATA_MODEL_FEATURE_COUNT + 1;
-
- /**
- * The feature id for the '<em><b>Load Default Namespace Package Name Mapping</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int WSDL2_JAVA_DATA_MODEL__LOAD_DEFAULT_NAMESPACE_PACKAGE_NAME_MAPPING = CXF_DATA_MODEL_FEATURE_COUNT + 2;
-
- /**
- * The feature id for the '<em><b>Load Default Excludes Namepsace Mapping</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int WSDL2_JAVA_DATA_MODEL__LOAD_DEFAULT_EXCLUDES_NAMEPSACE_MAPPING = CXF_DATA_MODEL_FEATURE_COUNT + 3;
-
- /**
- * The feature id for the '<em><b>Validate</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int WSDL2_JAVA_DATA_MODEL__VALIDATE = CXF_DATA_MODEL_FEATURE_COUNT + 4;
-
- /**
- * The feature id for the '<em><b>Wsdl Version</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int WSDL2_JAVA_DATA_MODEL__WSDL_VERSION = CXF_DATA_MODEL_FEATURE_COUNT + 5;
-
- /**
- * The feature id for the '<em><b>Use Default Values</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int WSDL2_JAVA_DATA_MODEL__USE_DEFAULT_VALUES = CXF_DATA_MODEL_FEATURE_COUNT + 6;
-
- /**
- * The feature id for the '<em><b>Xjc Args</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int WSDL2_JAVA_DATA_MODEL__XJC_ARGS = CXF_DATA_MODEL_FEATURE_COUNT + 7;
-
- /**
- * The feature id for the '<em><b>No Address Binding</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int WSDL2_JAVA_DATA_MODEL__NO_ADDRESS_BINDING = CXF_DATA_MODEL_FEATURE_COUNT + 8;
-
- /**
- * The feature id for the '<em><b>Xjc Use Default Values</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int WSDL2_JAVA_DATA_MODEL__XJC_USE_DEFAULT_VALUES = CXF_DATA_MODEL_FEATURE_COUNT + 9;
-
- /**
- * The feature id for the '<em><b>Xjc To String</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int WSDL2_JAVA_DATA_MODEL__XJC_TO_STRING = CXF_DATA_MODEL_FEATURE_COUNT + 10;
-
- /**
- * The feature id for the '<em><b>Xjc To String Multi Line</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int WSDL2_JAVA_DATA_MODEL__XJC_TO_STRING_MULTI_LINE = CXF_DATA_MODEL_FEATURE_COUNT + 11;
-
- /**
- * The feature id for the '<em><b>Xjc To String Simple</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int WSDL2_JAVA_DATA_MODEL__XJC_TO_STRING_SIMPLE = CXF_DATA_MODEL_FEATURE_COUNT + 12;
-
- /**
- * The feature id for the '<em><b>Xjc Locator</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int WSDL2_JAVA_DATA_MODEL__XJC_LOCATOR = CXF_DATA_MODEL_FEATURE_COUNT + 13;
-
- /**
- * The feature id for the '<em><b>Xjc Sync Methods</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int WSDL2_JAVA_DATA_MODEL__XJC_SYNC_METHODS = CXF_DATA_MODEL_FEATURE_COUNT + 14;
-
- /**
- * The feature id for the '<em><b>Xjc Mark Generated</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int WSDL2_JAVA_DATA_MODEL__XJC_MARK_GENERATED = CXF_DATA_MODEL_FEATURE_COUNT + 15;
-
- /**
- * The feature id for the '<em><b>Xjc Episode File</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int WSDL2_JAVA_DATA_MODEL__XJC_EPISODE_FILE = CXF_DATA_MODEL_FEATURE_COUNT + 16;
-
- /**
- * The feature id for the '<em><b>Auto Name Resolution</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int WSDL2_JAVA_DATA_MODEL__AUTO_NAME_RESOLUTION = CXF_DATA_MODEL_FEATURE_COUNT + 17;
-
- /**
- * The feature id for the '<em><b>Included Namespaces</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int WSDL2_JAVA_DATA_MODEL__INCLUDED_NAMESPACES = CXF_DATA_MODEL_FEATURE_COUNT + 18;
-
- /**
- * The feature id for the '<em><b>Binding Files</b></em>' attribute list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int WSDL2_JAVA_DATA_MODEL__BINDING_FILES = CXF_DATA_MODEL_FEATURE_COUNT + 19;
-
- /**
- * The feature id for the '<em><b>Excluded Namespaces</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int WSDL2_JAVA_DATA_MODEL__EXCLUDED_NAMESPACES = CXF_DATA_MODEL_FEATURE_COUNT + 20;
-
- /**
- * The feature id for the '<em><b>Catalog File</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int WSDL2_JAVA_DATA_MODEL__CATALOG_FILE = CXF_DATA_MODEL_FEATURE_COUNT + 21;
-
- /**
- * The feature id for the '<em><b>Java Source Folder</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int WSDL2_JAVA_DATA_MODEL__JAVA_SOURCE_FOLDER = CXF_DATA_MODEL_FEATURE_COUNT + 22;
-
- /**
- * The number of structural features of the '<em>WSDL2 Java Data Model</em>' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int WSDL2_JAVA_DATA_MODEL_FEATURE_COUNT = CXF_DATA_MODEL_FEATURE_COUNT + 23;
-
- /**
- * The meta object id for the '{@link org.eclipse.jst.ws.internal.cxf.core.model.Frontend <em>Frontend</em>}' enum.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.ws.internal.cxf.core.model.Frontend
- * @see org.eclipse.jst.ws.internal.cxf.core.model.impl.CXFPackageImpl#getFrontend()
- * @generated
- */
- int FRONTEND = 6;
-
- /**
- * The meta object id for the '{@link org.eclipse.jst.ws.internal.cxf.core.model.DataBinding <em>Data Binding</em>}' enum.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.ws.internal.cxf.core.model.DataBinding
- * @see org.eclipse.jst.ws.internal.cxf.core.model.impl.CXFPackageImpl#getDataBinding()
- * @generated
- */
- int DATA_BINDING = 7;
-
- /**
- * The meta object id for the '<em>URL</em>' data type.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see java.net.URL
- * @see org.eclipse.jst.ws.internal.cxf.core.model.impl.CXFPackageImpl#getURL()
- * @generated
- */
- int URL = 8;
-
- /**
- * The meta object id for the '<em>Definition</em>' data type.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see javax.wsdl.Definition
- * @see org.eclipse.jst.ws.internal.cxf.core.model.impl.CXFPackageImpl#getDefinition()
- * @generated
- */
- int DEFINITION = 9;
-
- /**
- * The meta object id for the '<em>Map</em>' data type.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see java.util.Map
- * @see org.eclipse.jst.ws.internal.cxf.core.model.impl.CXFPackageImpl#getMap()
- * @generated
- */
- int MAP = 10;
-
- /**
- * The meta object id for the '<em>IMethod</em>' data type.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jdt.core.IMethod
- * @see org.eclipse.jst.ws.internal.cxf.core.model.impl.CXFPackageImpl#getIMethod()
- * @generated
- */
- int IMETHOD = 11;
-
-
- /**
- * Returns the meta object for class '{@link org.eclipse.jst.ws.internal.cxf.core.model.CXFContext <em>Context</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for class '<em>Context</em>'.
- * @see org.eclipse.jst.ws.internal.cxf.core.model.CXFContext
- * @generated
- */
- EClass getCXFContext();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.jst.ws.internal.cxf.core.model.CXFContext#getCxfRuntimeLocation <em>Cxf Runtime Location</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Cxf Runtime Location</em>'.
- * @see org.eclipse.jst.ws.internal.cxf.core.model.CXFContext#getCxfRuntimeLocation()
- * @see #getCXFContext()
- * @generated
- */
- EAttribute getCXFContext_CxfRuntimeLocation();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.jst.ws.internal.cxf.core.model.CXFContext#getCxfRuntimeEdition <em>Cxf Runtime Edition</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Cxf Runtime Edition</em>'.
- * @see org.eclipse.jst.ws.internal.cxf.core.model.CXFContext#getCxfRuntimeEdition()
- * @see #getCXFContext()
- * @generated
- */
- EAttribute getCXFContext_CxfRuntimeEdition();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.jst.ws.internal.cxf.core.model.CXFContext#getCxfRuntimeVersion <em>Cxf Runtime Version</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Cxf Runtime Version</em>'.
- * @see org.eclipse.jst.ws.internal.cxf.core.model.CXFContext#getCxfRuntimeVersion()
- * @see #getCXFContext()
- * @generated
- */
- EAttribute getCXFContext_CxfRuntimeVersion();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.jst.ws.internal.cxf.core.model.CXFContext#isVerbose <em>Verbose</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Verbose</em>'.
- * @see org.eclipse.jst.ws.internal.cxf.core.model.CXFContext#isVerbose()
- * @see #getCXFContext()
- * @generated
- */
- EAttribute getCXFContext_Verbose();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.jst.ws.internal.cxf.core.model.CXFContext#isGenerateAntBuildFile <em>Generate Ant Build File</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Generate Ant Build File</em>'.
- * @see org.eclipse.jst.ws.internal.cxf.core.model.CXFContext#isGenerateAntBuildFile()
- * @see #getCXFContext()
- * @generated
- */
- EAttribute getCXFContext_GenerateAntBuildFile();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.jst.ws.internal.cxf.core.model.CXFContext#isGenerateClient <em>Generate Client</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Generate Client</em>'.
- * @see org.eclipse.jst.ws.internal.cxf.core.model.CXFContext#isGenerateClient()
- * @see #getCXFContext()
- * @generated
- */
- EAttribute getCXFContext_GenerateClient();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.jst.ws.internal.cxf.core.model.CXFContext#isGenerateServer <em>Generate Server</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Generate Server</em>'.
- * @see org.eclipse.jst.ws.internal.cxf.core.model.CXFContext#isGenerateServer()
- * @see #getCXFContext()
- * @generated
- */
- EAttribute getCXFContext_GenerateServer();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.jst.ws.internal.cxf.core.model.CXFContext#getDatabinding <em>Databinding</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Databinding</em>'.
- * @see org.eclipse.jst.ws.internal.cxf.core.model.CXFContext#getDatabinding()
- * @see #getCXFContext()
- * @generated
- */
- EAttribute getCXFContext_Databinding();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.jst.ws.internal.cxf.core.model.CXFContext#getFrontend <em>Frontend</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Frontend</em>'.
- * @see org.eclipse.jst.ws.internal.cxf.core.model.CXFContext#getFrontend()
- * @see #getCXFContext()
- * @generated
- */
- EAttribute getCXFContext_Frontend();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.jst.ws.internal.cxf.core.model.CXFContext#isUseSpringApplicationContext <em>Use Spring Application Context</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Use Spring Application Context</em>'.
- * @see org.eclipse.jst.ws.internal.cxf.core.model.CXFContext#isUseSpringApplicationContext()
- * @see #getCXFContext()
- * @generated
- */
- EAttribute getCXFContext_UseSpringApplicationContext();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.jst.ws.internal.cxf.core.model.CXFContext#isExportCXFClasspathContainer <em>Export CXF Classpath Container</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Export CXF Classpath Container</em>'.
- * @see org.eclipse.jst.ws.internal.cxf.core.model.CXFContext#isExportCXFClasspathContainer()
- * @see #getCXFContext()
- * @generated
- */
- EAttribute getCXFContext_ExportCXFClasspathContainer();
-
- /**
- * Returns the meta object for class '{@link org.eclipse.jst.ws.internal.cxf.core.model.CXFDataModel <em>Data Model</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for class '<em>Data Model</em>'.
- * @see org.eclipse.jst.ws.internal.cxf.core.model.CXFDataModel
- * @generated
- */
- EClass getCXFDataModel();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.jst.ws.internal.cxf.core.model.CXFDataModel#getProjectName <em>Project Name</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Project Name</em>'.
- * @see org.eclipse.jst.ws.internal.cxf.core.model.CXFDataModel#getProjectName()
- * @see #getCXFDataModel()
- * @generated
- */
- EAttribute getCXFDataModel_ProjectName();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.jst.ws.internal.cxf.core.model.CXFDataModel#getResourceDirectory <em>Resource Directory</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Resource Directory</em>'.
- * @see org.eclipse.jst.ws.internal.cxf.core.model.CXFDataModel#getResourceDirectory()
- * @see #getCXFDataModel()
- * @generated
- */
- EAttribute getCXFDataModel_ResourceDirectory();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.jst.ws.internal.cxf.core.model.CXFDataModel#getClassDirectory <em>Class Directory</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Class Directory</em>'.
- * @see org.eclipse.jst.ws.internal.cxf.core.model.CXFDataModel#getClassDirectory()
- * @see #getCXFDataModel()
- * @generated
- */
- EAttribute getCXFDataModel_ClassDirectory();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.jst.ws.internal.cxf.core.model.CXFDataModel#getWsdlFileName <em>Wsdl File Name</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Wsdl File Name</em>'.
- * @see org.eclipse.jst.ws.internal.cxf.core.model.CXFDataModel#getWsdlFileName()
- * @see #getCXFDataModel()
- * @generated
- */
- EAttribute getCXFDataModel_WsdlFileName();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.jst.ws.internal.cxf.core.model.CXFDataModel#getWsdlURL <em>Wsdl URL</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Wsdl URL</em>'.
- * @see org.eclipse.jst.ws.internal.cxf.core.model.CXFDataModel#getWsdlURL()
- * @see #getCXFDataModel()
- * @generated
- */
- EAttribute getCXFDataModel_WsdlURL();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.jst.ws.internal.cxf.core.model.CXFDataModel#getConfigWsdlLocation <em>Config Wsdl Location</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Config Wsdl Location</em>'.
- * @see org.eclipse.jst.ws.internal.cxf.core.model.CXFDataModel#getConfigWsdlLocation()
- * @see #getCXFDataModel()
- * @generated
- */
- EAttribute getCXFDataModel_ConfigWsdlLocation();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.jst.ws.internal.cxf.core.model.CXFDataModel#getFullyQualifiedJavaClassName <em>Fully Qualified Java Class Name</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Fully Qualified Java Class Name</em>'.
- * @see org.eclipse.jst.ws.internal.cxf.core.model.CXFDataModel#getFullyQualifiedJavaClassName()
- * @see #getCXFDataModel()
- * @generated
- */
- EAttribute getCXFDataModel_FullyQualifiedJavaClassName();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.jst.ws.internal.cxf.core.model.CXFDataModel#getFullyQualifiedJavaInterfaceName <em>Fully Qualified Java Interface Name</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Fully Qualified Java Interface Name</em>'.
- * @see org.eclipse.jst.ws.internal.cxf.core.model.CXFDataModel#getFullyQualifiedJavaInterfaceName()
- * @see #getCXFDataModel()
- * @generated
- */
- EAttribute getCXFDataModel_FullyQualifiedJavaInterfaceName();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.jst.ws.internal.cxf.core.model.CXFDataModel#getConfigId <em>Config Id</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Config Id</em>'.
- * @see org.eclipse.jst.ws.internal.cxf.core.model.CXFDataModel#getConfigId()
- * @see #getCXFDataModel()
- * @generated
- */
- EAttribute getCXFDataModel_ConfigId();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.jst.ws.internal.cxf.core.model.CXFDataModel#getTargetNamespace <em>Target Namespace</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Target Namespace</em>'.
- * @see org.eclipse.jst.ws.internal.cxf.core.model.CXFDataModel#getTargetNamespace()
- * @see #getCXFDataModel()
- * @generated
- */
- EAttribute getCXFDataModel_TargetNamespace();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.jst.ws.internal.cxf.core.model.CXFDataModel#getEndpointName <em>Endpoint Name</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Endpoint Name</em>'.
- * @see org.eclipse.jst.ws.internal.cxf.core.model.CXFDataModel#getEndpointName()
- * @see #getCXFDataModel()
- * @generated
- */
- EAttribute getCXFDataModel_EndpointName();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.jst.ws.internal.cxf.core.model.CXFDataModel#getServiceName <em>Service Name</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Service Name</em>'.
- * @see org.eclipse.jst.ws.internal.cxf.core.model.CXFDataModel#getServiceName()
- * @see #getCXFDataModel()
- * @generated
- */
- EAttribute getCXFDataModel_ServiceName();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.jst.ws.internal.cxf.core.model.CXFDataModel#getWsdlDefinition <em>Wsdl Definition</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Wsdl Definition</em>'.
- * @see org.eclipse.jst.ws.internal.cxf.core.model.CXFDataModel#getWsdlDefinition()
- * @see #getCXFDataModel()
- * @generated
- */
- EAttribute getCXFDataModel_WsdlDefinition();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.jst.ws.internal.cxf.core.model.CXFDataModel#getWsdlLocation <em>Wsdl Location</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Wsdl Location</em>'.
- * @see org.eclipse.jst.ws.internal.cxf.core.model.CXFDataModel#getWsdlLocation()
- * @see #getCXFDataModel()
- * @generated
- */
- EAttribute getCXFDataModel_WsdlLocation();
-
- /**
- * Returns the meta object for class '{@link org.eclipse.jst.ws.internal.cxf.core.model.Java2WSContext <em>Java2 WS Context</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for class '<em>Java2 WS Context</em>'.
- * @see org.eclipse.jst.ws.internal.cxf.core.model.Java2WSContext
- * @generated
- */
- EClass getJava2WSContext();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.jst.ws.internal.cxf.core.model.Java2WSContext#isSoap12Binding <em>Soap12 Binding</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Soap12 Binding</em>'.
- * @see org.eclipse.jst.ws.internal.cxf.core.model.Java2WSContext#isSoap12Binding()
- * @see #getJava2WSContext()
- * @generated
- */
- EAttribute getJava2WSContext_Soap12Binding();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.jst.ws.internal.cxf.core.model.Java2WSContext#isGenerateXSDImports <em>Generate XSD Imports</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Generate XSD Imports</em>'.
- * @see org.eclipse.jst.ws.internal.cxf.core.model.Java2WSContext#isGenerateXSDImports()
- * @see #getJava2WSContext()
- * @generated
- */
- EAttribute getJava2WSContext_GenerateXSDImports();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.jst.ws.internal.cxf.core.model.Java2WSContext#isGenerateWSDL <em>Generate WSDL</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Generate WSDL</em>'.
- * @see org.eclipse.jst.ws.internal.cxf.core.model.Java2WSContext#isGenerateWSDL()
- * @see #getJava2WSContext()
- * @generated
- */
- EAttribute getJava2WSContext_GenerateWSDL();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.jst.ws.internal.cxf.core.model.Java2WSContext#isGenerateWrapperFaultBeans <em>Generate Wrapper Fault Beans</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Generate Wrapper Fault Beans</em>'.
- * @see org.eclipse.jst.ws.internal.cxf.core.model.Java2WSContext#isGenerateWrapperFaultBeans()
- * @see #getJava2WSContext()
- * @generated
- */
- EAttribute getJava2WSContext_GenerateWrapperFaultBeans();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.jst.ws.internal.cxf.core.model.Java2WSContext#isAnnotationProcessingEnabled <em>Annotation Processing Enabled</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Annotation Processing Enabled</em>'.
- * @see org.eclipse.jst.ws.internal.cxf.core.model.Java2WSContext#isAnnotationProcessingEnabled()
- * @see #getJava2WSContext()
- * @generated
- */
- EAttribute getJava2WSContext_AnnotationProcessingEnabled();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.jst.ws.internal.cxf.core.model.Java2WSContext#isGenerateWebMethodAnnotation <em>Generate Web Method Annotation</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Generate Web Method Annotation</em>'.
- * @see org.eclipse.jst.ws.internal.cxf.core.model.Java2WSContext#isGenerateWebMethodAnnotation()
- * @see #getJava2WSContext()
- * @generated
- */
- EAttribute getJava2WSContext_GenerateWebMethodAnnotation();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.jst.ws.internal.cxf.core.model.Java2WSContext#isGenerateWebParamAnnotation <em>Generate Web Param Annotation</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Generate Web Param Annotation</em>'.
- * @see org.eclipse.jst.ws.internal.cxf.core.model.Java2WSContext#isGenerateWebParamAnnotation()
- * @see #getJava2WSContext()
- * @generated
- */
- EAttribute getJava2WSContext_GenerateWebParamAnnotation();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.jst.ws.internal.cxf.core.model.Java2WSContext#isGenerateRequestWrapperAnnotation <em>Generate Request Wrapper Annotation</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Generate Request Wrapper Annotation</em>'.
- * @see org.eclipse.jst.ws.internal.cxf.core.model.Java2WSContext#isGenerateRequestWrapperAnnotation()
- * @see #getJava2WSContext()
- * @generated
- */
- EAttribute getJava2WSContext_GenerateRequestWrapperAnnotation();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.jst.ws.internal.cxf.core.model.Java2WSContext#isGenerateResponseWrapperAnnotation <em>Generate Response Wrapper Annotation</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Generate Response Wrapper Annotation</em>'.
- * @see org.eclipse.jst.ws.internal.cxf.core.model.Java2WSContext#isGenerateResponseWrapperAnnotation()
- * @see #getJava2WSContext()
- * @generated
- */
- EAttribute getJava2WSContext_GenerateResponseWrapperAnnotation();
-
- /**
- * Returns the meta object for class '{@link org.eclipse.jst.ws.internal.cxf.core.model.Java2WSDataModel <em>Java2 WS Data Model</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for class '<em>Java2 WS Data Model</em>'.
- * @see org.eclipse.jst.ws.internal.cxf.core.model.Java2WSDataModel
- * @generated
- */
- EClass getJava2WSDataModel();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.jst.ws.internal.cxf.core.model.Java2WSDataModel#getClasspath <em>Classpath</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Classpath</em>'.
- * @see org.eclipse.jst.ws.internal.cxf.core.model.Java2WSDataModel#getClasspath()
- * @see #getJava2WSDataModel()
- * @generated
- */
- EAttribute getJava2WSDataModel_Classpath();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.jst.ws.internal.cxf.core.model.Java2WSDataModel#getJavaStartingPoint <em>Java Starting Point</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Java Starting Point</em>'.
- * @see org.eclipse.jst.ws.internal.cxf.core.model.Java2WSDataModel#getJavaStartingPoint()
- * @see #getJava2WSDataModel()
- * @generated
- */
- EAttribute getJava2WSDataModel_JavaStartingPoint();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.jst.ws.internal.cxf.core.model.Java2WSDataModel#isUseServiceEndpointInterface <em>Use Service Endpoint Interface</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Use Service Endpoint Interface</em>'.
- * @see org.eclipse.jst.ws.internal.cxf.core.model.Java2WSDataModel#isUseServiceEndpointInterface()
- * @see #getJava2WSDataModel()
- * @generated
- */
- EAttribute getJava2WSDataModel_UseServiceEndpointInterface();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.jst.ws.internal.cxf.core.model.Java2WSDataModel#isExtractInterface <em>Extract Interface</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Extract Interface</em>'.
- * @see org.eclipse.jst.ws.internal.cxf.core.model.Java2WSDataModel#isExtractInterface()
- * @see #getJava2WSDataModel()
- * @generated
- */
- EAttribute getJava2WSDataModel_ExtractInterface();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.jst.ws.internal.cxf.core.model.Java2WSDataModel#getServiceEndpointInterfaceName <em>Service Endpoint Interface Name</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Service Endpoint Interface Name</em>'.
- * @see org.eclipse.jst.ws.internal.cxf.core.model.Java2WSDataModel#getServiceEndpointInterfaceName()
- * @see #getJava2WSDataModel()
- * @generated
- */
- EAttribute getJava2WSDataModel_ServiceEndpointInterfaceName();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.jst.ws.internal.cxf.core.model.Java2WSDataModel#getMethodMap <em>Method Map</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Method Map</em>'.
- * @see org.eclipse.jst.ws.internal.cxf.core.model.Java2WSDataModel#getMethodMap()
- * @see #getJava2WSDataModel()
- * @generated
- */
- EAttribute getJava2WSDataModel_MethodMap();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.jst.ws.internal.cxf.core.model.Java2WSDataModel#getAnnotationMap <em>Annotation Map</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Annotation Map</em>'.
- * @see org.eclipse.jst.ws.internal.cxf.core.model.Java2WSDataModel#getAnnotationMap()
- * @see #getJava2WSDataModel()
- * @generated
- */
- EAttribute getJava2WSDataModel_AnnotationMap();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.jst.ws.internal.cxf.core.model.Java2WSDataModel#getSourceDirectory <em>Source Directory</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Source Directory</em>'.
- * @see org.eclipse.jst.ws.internal.cxf.core.model.Java2WSDataModel#getSourceDirectory()
- * @see #getJava2WSDataModel()
- * @generated
- */
- EAttribute getJava2WSDataModel_SourceDirectory();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.jst.ws.internal.cxf.core.model.Java2WSDataModel#getPortName <em>Port Name</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Port Name</em>'.
- * @see org.eclipse.jst.ws.internal.cxf.core.model.Java2WSDataModel#getPortName()
- * @see #getJava2WSDataModel()
- * @generated
- */
- EAttribute getJava2WSDataModel_PortName();
-
- /**
- * Returns the meta object for class '{@link org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaContext <em>WSDL2 Java Context</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for class '<em>WSDL2 Java Context</em>'.
- * @see org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaContext
- * @generated
- */
- EClass getWSDL2JavaContext();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaContext#isGenerateImplementation <em>Generate Implementation</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Generate Implementation</em>'.
- * @see org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaContext#isGenerateImplementation()
- * @see #getWSDL2JavaContext()
- * @generated
- */
- EAttribute getWSDL2JavaContext_GenerateImplementation();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaContext#isProcessSOAPHeaders <em>Process SOAP Headers</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Process SOAP Headers</em>'.
- * @see org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaContext#isProcessSOAPHeaders()
- * @see #getWSDL2JavaContext()
- * @generated
- */
- EAttribute getWSDL2JavaContext_ProcessSOAPHeaders();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaContext#isLoadDefaultNamespacePackageNameMapping <em>Load Default Namespace Package Name Mapping</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Load Default Namespace Package Name Mapping</em>'.
- * @see org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaContext#isLoadDefaultNamespacePackageNameMapping()
- * @see #getWSDL2JavaContext()
- * @generated
- */
- EAttribute getWSDL2JavaContext_LoadDefaultNamespacePackageNameMapping();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaContext#isLoadDefaultExcludesNamepsaceMapping <em>Load Default Excludes Namepsace Mapping</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Load Default Excludes Namepsace Mapping</em>'.
- * @see org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaContext#isLoadDefaultExcludesNamepsaceMapping()
- * @see #getWSDL2JavaContext()
- * @generated
- */
- EAttribute getWSDL2JavaContext_LoadDefaultExcludesNamepsaceMapping();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaContext#isValidate <em>Validate</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Validate</em>'.
- * @see org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaContext#isValidate()
- * @see #getWSDL2JavaContext()
- * @generated
- */
- EAttribute getWSDL2JavaContext_Validate();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaContext#getWsdlVersion <em>Wsdl Version</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Wsdl Version</em>'.
- * @see org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaContext#getWsdlVersion()
- * @see #getWSDL2JavaContext()
- * @generated
- */
- EAttribute getWSDL2JavaContext_WsdlVersion();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaContext#isUseDefaultValues <em>Use Default Values</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Use Default Values</em>'.
- * @see org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaContext#isUseDefaultValues()
- * @see #getWSDL2JavaContext()
- * @generated
- */
- EAttribute getWSDL2JavaContext_UseDefaultValues();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaContext#getXjcArgs <em>Xjc Args</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Xjc Args</em>'.
- * @see org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaContext#getXjcArgs()
- * @see #getWSDL2JavaContext()
- * @generated
- */
- EAttribute getWSDL2JavaContext_XjcArgs();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaContext#isNoAddressBinding <em>No Address Binding</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>No Address Binding</em>'.
- * @see org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaContext#isNoAddressBinding()
- * @see #getWSDL2JavaContext()
- * @generated
- */
- EAttribute getWSDL2JavaContext_NoAddressBinding();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaContext#isXjcUseDefaultValues <em>Xjc Use Default Values</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Xjc Use Default Values</em>'.
- * @see org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaContext#isXjcUseDefaultValues()
- * @see #getWSDL2JavaContext()
- * @generated
- */
- EAttribute getWSDL2JavaContext_XjcUseDefaultValues();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaContext#isXjcToString <em>Xjc To String</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Xjc To String</em>'.
- * @see org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaContext#isXjcToString()
- * @see #getWSDL2JavaContext()
- * @generated
- */
- EAttribute getWSDL2JavaContext_XjcToString();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaContext#isXjcToStringMultiLine <em>Xjc To String Multi Line</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Xjc To String Multi Line</em>'.
- * @see org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaContext#isXjcToStringMultiLine()
- * @see #getWSDL2JavaContext()
- * @generated
- */
- EAttribute getWSDL2JavaContext_XjcToStringMultiLine();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaContext#isXjcToStringSimple <em>Xjc To String Simple</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Xjc To String Simple</em>'.
- * @see org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaContext#isXjcToStringSimple()
- * @see #getWSDL2JavaContext()
- * @generated
- */
- EAttribute getWSDL2JavaContext_XjcToStringSimple();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaContext#isXjcLocator <em>Xjc Locator</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Xjc Locator</em>'.
- * @see org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaContext#isXjcLocator()
- * @see #getWSDL2JavaContext()
- * @generated
- */
- EAttribute getWSDL2JavaContext_XjcLocator();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaContext#isXjcSyncMethods <em>Xjc Sync Methods</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Xjc Sync Methods</em>'.
- * @see org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaContext#isXjcSyncMethods()
- * @see #getWSDL2JavaContext()
- * @generated
- */
- EAttribute getWSDL2JavaContext_XjcSyncMethods();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaContext#isXjcMarkGenerated <em>Xjc Mark Generated</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Xjc Mark Generated</em>'.
- * @see org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaContext#isXjcMarkGenerated()
- * @see #getWSDL2JavaContext()
- * @generated
- */
- EAttribute getWSDL2JavaContext_XjcMarkGenerated();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaContext#getXjcEpisodeFile <em>Xjc Episode File</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Xjc Episode File</em>'.
- * @see org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaContext#getXjcEpisodeFile()
- * @see #getWSDL2JavaContext()
- * @generated
- */
- EAttribute getWSDL2JavaContext_XjcEpisodeFile();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaContext#isAutoNameResolution <em>Auto Name Resolution</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Auto Name Resolution</em>'.
- * @see org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaContext#isAutoNameResolution()
- * @see #getWSDL2JavaContext()
- * @generated
- */
- EAttribute getWSDL2JavaContext_AutoNameResolution();
-
- /**
- * Returns the meta object for class '{@link org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaDataModel <em>WSDL2 Java Data Model</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for class '<em>WSDL2 Java Data Model</em>'.
- * @see org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaDataModel
- * @generated
- */
- EClass getWSDL2JavaDataModel();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaDataModel#getIncludedNamespaces <em>Included Namespaces</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Included Namespaces</em>'.
- * @see org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaDataModel#getIncludedNamespaces()
- * @see #getWSDL2JavaDataModel()
- * @generated
- */
- EAttribute getWSDL2JavaDataModel_IncludedNamespaces();
-
- /**
- * Returns the meta object for the attribute list '{@link org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaDataModel#getBindingFiles <em>Binding Files</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute list '<em>Binding Files</em>'.
- * @see org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaDataModel#getBindingFiles()
- * @see #getWSDL2JavaDataModel()
- * @generated
- */
- EAttribute getWSDL2JavaDataModel_BindingFiles();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaDataModel#getExcludedNamespaces <em>Excluded Namespaces</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Excluded Namespaces</em>'.
- * @see org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaDataModel#getExcludedNamespaces()
- * @see #getWSDL2JavaDataModel()
- * @generated
- */
- EAttribute getWSDL2JavaDataModel_ExcludedNamespaces();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaDataModel#getCatalogFile <em>Catalog File</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Catalog File</em>'.
- * @see org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaDataModel#getCatalogFile()
- * @see #getWSDL2JavaDataModel()
- * @generated
- */
- EAttribute getWSDL2JavaDataModel_CatalogFile();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaDataModel#getJavaSourceFolder <em>Java Source Folder</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Java Source Folder</em>'.
- * @see org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaDataModel#getJavaSourceFolder()
- * @see #getWSDL2JavaDataModel()
- * @generated
- */
- EAttribute getWSDL2JavaDataModel_JavaSourceFolder();
-
- /**
- * Returns the meta object for enum '{@link org.eclipse.jst.ws.internal.cxf.core.model.Frontend <em>Frontend</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for enum '<em>Frontend</em>'.
- * @see org.eclipse.jst.ws.internal.cxf.core.model.Frontend
- * @generated
- */
- EEnum getFrontend();
-
- /**
- * Returns the meta object for enum '{@link org.eclipse.jst.ws.internal.cxf.core.model.DataBinding <em>Data Binding</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for enum '<em>Data Binding</em>'.
- * @see org.eclipse.jst.ws.internal.cxf.core.model.DataBinding
- * @generated
- */
- EEnum getDataBinding();
-
- /**
- * Returns the meta object for data type '{@link java.net.URL <em>URL</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for data type '<em>URL</em>'.
- * @see java.net.URL
- * @model instanceClass="java.net.URL"
- * @generated
- */
- EDataType getURL();
-
- /**
- * Returns the meta object for data type '{@link javax.wsdl.Definition <em>Definition</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for data type '<em>Definition</em>'.
- * @see javax.wsdl.Definition
- * @model instanceClass="javax.wsdl.Definition"
- * @generated
- */
- EDataType getDefinition();
-
- /**
- * Returns the meta object for data type '{@link java.util.Map <em>Map</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for data type '<em>Map</em>'.
- * @see java.util.Map
- * @model instanceClass="java.util.Map" typeParameters="T T1"
- * @generated
- */
- EDataType getMap();
-
- /**
- * Returns the meta object for data type '{@link org.eclipse.jdt.core.IMethod <em>IMethod</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for data type '<em>IMethod</em>'.
- * @see org.eclipse.jdt.core.IMethod
- * @model instanceClass="org.eclipse.jdt.core.IMethod"
- * @generated
- */
- EDataType getIMethod();
-
- /**
- * Returns the factory that creates the instances of the model.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the factory that creates the instances of the model.
- * @generated
- */
- CXFFactory getCXFFactory();
-
- /**
- * <!-- begin-user-doc -->
- * Defines literals for the meta objects that represent
- * <ul>
- * <li>each class,</li>
- * <li>each feature of each class,</li>
- * <li>each enum,</li>
- * <li>and each data type</li>
- * </ul>
- * <!-- end-user-doc -->
- * @generated
- */
- interface Literals {
- /**
- * The meta object literal for the '{@link org.eclipse.jst.ws.internal.cxf.core.model.CXFContext <em>Context</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.ws.internal.cxf.core.model.CXFContext
- * @see org.eclipse.jst.ws.internal.cxf.core.model.impl.CXFPackageImpl#getCXFContext()
- * @generated
- */
- EClass CXF_CONTEXT = eINSTANCE.getCXFContext();
-
- /**
- * The meta object literal for the '<em><b>Cxf Runtime Location</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EAttribute CXF_CONTEXT__CXF_RUNTIME_LOCATION = eINSTANCE.getCXFContext_CxfRuntimeLocation();
-
- /**
- * The meta object literal for the '<em><b>Cxf Runtime Edition</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EAttribute CXF_CONTEXT__CXF_RUNTIME_EDITION = eINSTANCE.getCXFContext_CxfRuntimeEdition();
-
- /**
- * The meta object literal for the '<em><b>Cxf Runtime Version</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EAttribute CXF_CONTEXT__CXF_RUNTIME_VERSION = eINSTANCE.getCXFContext_CxfRuntimeVersion();
-
- /**
- * The meta object literal for the '<em><b>Verbose</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EAttribute CXF_CONTEXT__VERBOSE = eINSTANCE.getCXFContext_Verbose();
-
- /**
- * The meta object literal for the '<em><b>Generate Ant Build File</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EAttribute CXF_CONTEXT__GENERATE_ANT_BUILD_FILE = eINSTANCE.getCXFContext_GenerateAntBuildFile();
-
- /**
- * The meta object literal for the '<em><b>Generate Client</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EAttribute CXF_CONTEXT__GENERATE_CLIENT = eINSTANCE.getCXFContext_GenerateClient();
-
- /**
- * The meta object literal for the '<em><b>Generate Server</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EAttribute CXF_CONTEXT__GENERATE_SERVER = eINSTANCE.getCXFContext_GenerateServer();
-
- /**
- * The meta object literal for the '<em><b>Databinding</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EAttribute CXF_CONTEXT__DATABINDING = eINSTANCE.getCXFContext_Databinding();
-
- /**
- * The meta object literal for the '<em><b>Frontend</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EAttribute CXF_CONTEXT__FRONTEND = eINSTANCE.getCXFContext_Frontend();
-
- /**
- * The meta object literal for the '<em><b>Use Spring Application Context</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EAttribute CXF_CONTEXT__USE_SPRING_APPLICATION_CONTEXT = eINSTANCE.getCXFContext_UseSpringApplicationContext();
-
- /**
- * The meta object literal for the '<em><b>Export CXF Classpath Container</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EAttribute CXF_CONTEXT__EXPORT_CXF_CLASSPATH_CONTAINER = eINSTANCE.getCXFContext_ExportCXFClasspathContainer();
-
- /**
- * The meta object literal for the '{@link org.eclipse.jst.ws.internal.cxf.core.model.impl.CXFDataModelImpl <em>Data Model</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.ws.internal.cxf.core.model.impl.CXFDataModelImpl
- * @see org.eclipse.jst.ws.internal.cxf.core.model.impl.CXFPackageImpl#getCXFDataModel()
- * @generated
- */
- EClass CXF_DATA_MODEL = eINSTANCE.getCXFDataModel();
-
- /**
- * The meta object literal for the '<em><b>Project Name</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EAttribute CXF_DATA_MODEL__PROJECT_NAME = eINSTANCE.getCXFDataModel_ProjectName();
-
- /**
- * The meta object literal for the '<em><b>Resource Directory</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EAttribute CXF_DATA_MODEL__RESOURCE_DIRECTORY = eINSTANCE.getCXFDataModel_ResourceDirectory();
-
- /**
- * The meta object literal for the '<em><b>Class Directory</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EAttribute CXF_DATA_MODEL__CLASS_DIRECTORY = eINSTANCE.getCXFDataModel_ClassDirectory();
-
- /**
- * The meta object literal for the '<em><b>Wsdl File Name</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EAttribute CXF_DATA_MODEL__WSDL_FILE_NAME = eINSTANCE.getCXFDataModel_WsdlFileName();
-
- /**
- * The meta object literal for the '<em><b>Wsdl URL</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EAttribute CXF_DATA_MODEL__WSDL_URL = eINSTANCE.getCXFDataModel_WsdlURL();
-
- /**
- * The meta object literal for the '<em><b>Config Wsdl Location</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EAttribute CXF_DATA_MODEL__CONFIG_WSDL_LOCATION = eINSTANCE.getCXFDataModel_ConfigWsdlLocation();
-
- /**
- * The meta object literal for the '<em><b>Fully Qualified Java Class Name</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EAttribute CXF_DATA_MODEL__FULLY_QUALIFIED_JAVA_CLASS_NAME = eINSTANCE.getCXFDataModel_FullyQualifiedJavaClassName();
-
- /**
- * The meta object literal for the '<em><b>Fully Qualified Java Interface Name</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EAttribute CXF_DATA_MODEL__FULLY_QUALIFIED_JAVA_INTERFACE_NAME = eINSTANCE.getCXFDataModel_FullyQualifiedJavaInterfaceName();
-
- /**
- * The meta object literal for the '<em><b>Config Id</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EAttribute CXF_DATA_MODEL__CONFIG_ID = eINSTANCE.getCXFDataModel_ConfigId();
-
- /**
- * The meta object literal for the '<em><b>Target Namespace</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EAttribute CXF_DATA_MODEL__TARGET_NAMESPACE = eINSTANCE.getCXFDataModel_TargetNamespace();
-
- /**
- * The meta object literal for the '<em><b>Endpoint Name</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EAttribute CXF_DATA_MODEL__ENDPOINT_NAME = eINSTANCE.getCXFDataModel_EndpointName();
-
- /**
- * The meta object literal for the '<em><b>Service Name</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EAttribute CXF_DATA_MODEL__SERVICE_NAME = eINSTANCE.getCXFDataModel_ServiceName();
-
- /**
- * The meta object literal for the '<em><b>Wsdl Definition</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EAttribute CXF_DATA_MODEL__WSDL_DEFINITION = eINSTANCE.getCXFDataModel_WsdlDefinition();
-
- /**
- * The meta object literal for the '<em><b>Wsdl Location</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EAttribute CXF_DATA_MODEL__WSDL_LOCATION = eINSTANCE.getCXFDataModel_WsdlLocation();
-
- /**
- * The meta object literal for the '{@link org.eclipse.jst.ws.internal.cxf.core.model.Java2WSContext <em>Java2 WS Context</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.ws.internal.cxf.core.model.Java2WSContext
- * @see org.eclipse.jst.ws.internal.cxf.core.model.impl.CXFPackageImpl#getJava2WSContext()
- * @generated
- */
- EClass JAVA2_WS_CONTEXT = eINSTANCE.getJava2WSContext();
-
- /**
- * The meta object literal for the '<em><b>Soap12 Binding</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EAttribute JAVA2_WS_CONTEXT__SOAP12_BINDING = eINSTANCE.getJava2WSContext_Soap12Binding();
-
- /**
- * The meta object literal for the '<em><b>Generate XSD Imports</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EAttribute JAVA2_WS_CONTEXT__GENERATE_XSD_IMPORTS = eINSTANCE.getJava2WSContext_GenerateXSDImports();
-
- /**
- * The meta object literal for the '<em><b>Generate WSDL</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EAttribute JAVA2_WS_CONTEXT__GENERATE_WSDL = eINSTANCE.getJava2WSContext_GenerateWSDL();
-
- /**
- * The meta object literal for the '<em><b>Generate Wrapper Fault Beans</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EAttribute JAVA2_WS_CONTEXT__GENERATE_WRAPPER_FAULT_BEANS = eINSTANCE.getJava2WSContext_GenerateWrapperFaultBeans();
-
- /**
- * The meta object literal for the '<em><b>Annotation Processing Enabled</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EAttribute JAVA2_WS_CONTEXT__ANNOTATION_PROCESSING_ENABLED = eINSTANCE.getJava2WSContext_AnnotationProcessingEnabled();
-
- /**
- * The meta object literal for the '<em><b>Generate Web Method Annotation</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EAttribute JAVA2_WS_CONTEXT__GENERATE_WEB_METHOD_ANNOTATION = eINSTANCE.getJava2WSContext_GenerateWebMethodAnnotation();
-
- /**
- * The meta object literal for the '<em><b>Generate Web Param Annotation</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EAttribute JAVA2_WS_CONTEXT__GENERATE_WEB_PARAM_ANNOTATION = eINSTANCE.getJava2WSContext_GenerateWebParamAnnotation();
-
- /**
- * The meta object literal for the '<em><b>Generate Request Wrapper Annotation</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EAttribute JAVA2_WS_CONTEXT__GENERATE_REQUEST_WRAPPER_ANNOTATION = eINSTANCE.getJava2WSContext_GenerateRequestWrapperAnnotation();
-
- /**
- * The meta object literal for the '<em><b>Generate Response Wrapper Annotation</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EAttribute JAVA2_WS_CONTEXT__GENERATE_RESPONSE_WRAPPER_ANNOTATION = eINSTANCE.getJava2WSContext_GenerateResponseWrapperAnnotation();
-
- /**
- * The meta object literal for the '{@link org.eclipse.jst.ws.internal.cxf.core.model.impl.Java2WSDataModelImpl <em>Java2 WS Data Model</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.ws.internal.cxf.core.model.impl.Java2WSDataModelImpl
- * @see org.eclipse.jst.ws.internal.cxf.core.model.impl.CXFPackageImpl#getJava2WSDataModel()
- * @generated
- */
- EClass JAVA2_WS_DATA_MODEL = eINSTANCE.getJava2WSDataModel();
-
- /**
- * The meta object literal for the '<em><b>Classpath</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EAttribute JAVA2_WS_DATA_MODEL__CLASSPATH = eINSTANCE.getJava2WSDataModel_Classpath();
-
- /**
- * The meta object literal for the '<em><b>Java Starting Point</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EAttribute JAVA2_WS_DATA_MODEL__JAVA_STARTING_POINT = eINSTANCE.getJava2WSDataModel_JavaStartingPoint();
-
- /**
- * The meta object literal for the '<em><b>Use Service Endpoint Interface</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EAttribute JAVA2_WS_DATA_MODEL__USE_SERVICE_ENDPOINT_INTERFACE = eINSTANCE.getJava2WSDataModel_UseServiceEndpointInterface();
-
- /**
- * The meta object literal for the '<em><b>Extract Interface</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EAttribute JAVA2_WS_DATA_MODEL__EXTRACT_INTERFACE = eINSTANCE.getJava2WSDataModel_ExtractInterface();
-
- /**
- * The meta object literal for the '<em><b>Service Endpoint Interface Name</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EAttribute JAVA2_WS_DATA_MODEL__SERVICE_ENDPOINT_INTERFACE_NAME = eINSTANCE.getJava2WSDataModel_ServiceEndpointInterfaceName();
-
- /**
- * The meta object literal for the '<em><b>Method Map</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EAttribute JAVA2_WS_DATA_MODEL__METHOD_MAP = eINSTANCE.getJava2WSDataModel_MethodMap();
-
- /**
- * The meta object literal for the '<em><b>Annotation Map</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EAttribute JAVA2_WS_DATA_MODEL__ANNOTATION_MAP = eINSTANCE.getJava2WSDataModel_AnnotationMap();
-
- /**
- * The meta object literal for the '<em><b>Source Directory</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EAttribute JAVA2_WS_DATA_MODEL__SOURCE_DIRECTORY = eINSTANCE.getJava2WSDataModel_SourceDirectory();
-
- /**
- * The meta object literal for the '<em><b>Port Name</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EAttribute JAVA2_WS_DATA_MODEL__PORT_NAME = eINSTANCE.getJava2WSDataModel_PortName();
-
- /**
- * The meta object literal for the '{@link org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaContext <em>WSDL2 Java Context</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaContext
- * @see org.eclipse.jst.ws.internal.cxf.core.model.impl.CXFPackageImpl#getWSDL2JavaContext()
- * @generated
- */
- EClass WSDL2_JAVA_CONTEXT = eINSTANCE.getWSDL2JavaContext();
-
- /**
- * The meta object literal for the '<em><b>Generate Implementation</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EAttribute WSDL2_JAVA_CONTEXT__GENERATE_IMPLEMENTATION = eINSTANCE.getWSDL2JavaContext_GenerateImplementation();
-
- /**
- * The meta object literal for the '<em><b>Process SOAP Headers</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EAttribute WSDL2_JAVA_CONTEXT__PROCESS_SOAP_HEADERS = eINSTANCE.getWSDL2JavaContext_ProcessSOAPHeaders();
-
- /**
- * The meta object literal for the '<em><b>Load Default Namespace Package Name Mapping</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EAttribute WSDL2_JAVA_CONTEXT__LOAD_DEFAULT_NAMESPACE_PACKAGE_NAME_MAPPING = eINSTANCE.getWSDL2JavaContext_LoadDefaultNamespacePackageNameMapping();
-
- /**
- * The meta object literal for the '<em><b>Load Default Excludes Namepsace Mapping</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EAttribute WSDL2_JAVA_CONTEXT__LOAD_DEFAULT_EXCLUDES_NAMEPSACE_MAPPING = eINSTANCE.getWSDL2JavaContext_LoadDefaultExcludesNamepsaceMapping();
-
- /**
- * The meta object literal for the '<em><b>Validate</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EAttribute WSDL2_JAVA_CONTEXT__VALIDATE = eINSTANCE.getWSDL2JavaContext_Validate();
-
- /**
- * The meta object literal for the '<em><b>Wsdl Version</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EAttribute WSDL2_JAVA_CONTEXT__WSDL_VERSION = eINSTANCE.getWSDL2JavaContext_WsdlVersion();
-
- /**
- * The meta object literal for the '<em><b>Use Default Values</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EAttribute WSDL2_JAVA_CONTEXT__USE_DEFAULT_VALUES = eINSTANCE.getWSDL2JavaContext_UseDefaultValues();
-
- /**
- * The meta object literal for the '<em><b>Xjc Args</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EAttribute WSDL2_JAVA_CONTEXT__XJC_ARGS = eINSTANCE.getWSDL2JavaContext_XjcArgs();
-
- /**
- * The meta object literal for the '<em><b>No Address Binding</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EAttribute WSDL2_JAVA_CONTEXT__NO_ADDRESS_BINDING = eINSTANCE.getWSDL2JavaContext_NoAddressBinding();
-
- /**
- * The meta object literal for the '<em><b>Xjc Use Default Values</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EAttribute WSDL2_JAVA_CONTEXT__XJC_USE_DEFAULT_VALUES = eINSTANCE.getWSDL2JavaContext_XjcUseDefaultValues();
-
- /**
- * The meta object literal for the '<em><b>Xjc To String</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EAttribute WSDL2_JAVA_CONTEXT__XJC_TO_STRING = eINSTANCE.getWSDL2JavaContext_XjcToString();
-
- /**
- * The meta object literal for the '<em><b>Xjc To String Multi Line</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EAttribute WSDL2_JAVA_CONTEXT__XJC_TO_STRING_MULTI_LINE = eINSTANCE.getWSDL2JavaContext_XjcToStringMultiLine();
-
- /**
- * The meta object literal for the '<em><b>Xjc To String Simple</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EAttribute WSDL2_JAVA_CONTEXT__XJC_TO_STRING_SIMPLE = eINSTANCE.getWSDL2JavaContext_XjcToStringSimple();
-
- /**
- * The meta object literal for the '<em><b>Xjc Locator</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EAttribute WSDL2_JAVA_CONTEXT__XJC_LOCATOR = eINSTANCE.getWSDL2JavaContext_XjcLocator();
-
- /**
- * The meta object literal for the '<em><b>Xjc Sync Methods</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EAttribute WSDL2_JAVA_CONTEXT__XJC_SYNC_METHODS = eINSTANCE.getWSDL2JavaContext_XjcSyncMethods();
-
- /**
- * The meta object literal for the '<em><b>Xjc Mark Generated</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EAttribute WSDL2_JAVA_CONTEXT__XJC_MARK_GENERATED = eINSTANCE.getWSDL2JavaContext_XjcMarkGenerated();
-
- /**
- * The meta object literal for the '<em><b>Xjc Episode File</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EAttribute WSDL2_JAVA_CONTEXT__XJC_EPISODE_FILE = eINSTANCE.getWSDL2JavaContext_XjcEpisodeFile();
-
- /**
- * The meta object literal for the '<em><b>Auto Name Resolution</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EAttribute WSDL2_JAVA_CONTEXT__AUTO_NAME_RESOLUTION = eINSTANCE.getWSDL2JavaContext_AutoNameResolution();
-
- /**
- * The meta object literal for the '{@link org.eclipse.jst.ws.internal.cxf.core.model.impl.WSDL2JavaDataModelImpl <em>WSDL2 Java Data Model</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.ws.internal.cxf.core.model.impl.WSDL2JavaDataModelImpl
- * @see org.eclipse.jst.ws.internal.cxf.core.model.impl.CXFPackageImpl#getWSDL2JavaDataModel()
- * @generated
- */
- EClass WSDL2_JAVA_DATA_MODEL = eINSTANCE.getWSDL2JavaDataModel();
-
- /**
- * The meta object literal for the '<em><b>Included Namespaces</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EAttribute WSDL2_JAVA_DATA_MODEL__INCLUDED_NAMESPACES = eINSTANCE.getWSDL2JavaDataModel_IncludedNamespaces();
-
- /**
- * The meta object literal for the '<em><b>Binding Files</b></em>' attribute list feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EAttribute WSDL2_JAVA_DATA_MODEL__BINDING_FILES = eINSTANCE.getWSDL2JavaDataModel_BindingFiles();
-
- /**
- * The meta object literal for the '<em><b>Excluded Namespaces</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EAttribute WSDL2_JAVA_DATA_MODEL__EXCLUDED_NAMESPACES = eINSTANCE.getWSDL2JavaDataModel_ExcludedNamespaces();
-
- /**
- * The meta object literal for the '<em><b>Catalog File</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EAttribute WSDL2_JAVA_DATA_MODEL__CATALOG_FILE = eINSTANCE.getWSDL2JavaDataModel_CatalogFile();
-
- /**
- * The meta object literal for the '<em><b>Java Source Folder</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EAttribute WSDL2_JAVA_DATA_MODEL__JAVA_SOURCE_FOLDER = eINSTANCE.getWSDL2JavaDataModel_JavaSourceFolder();
-
- /**
- * The meta object literal for the '{@link org.eclipse.jst.ws.internal.cxf.core.model.Frontend <em>Frontend</em>}' enum.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.ws.internal.cxf.core.model.Frontend
- * @see org.eclipse.jst.ws.internal.cxf.core.model.impl.CXFPackageImpl#getFrontend()
- * @generated
- */
- EEnum FRONTEND = eINSTANCE.getFrontend();
-
- /**
- * The meta object literal for the '{@link org.eclipse.jst.ws.internal.cxf.core.model.DataBinding <em>Data Binding</em>}' enum.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.ws.internal.cxf.core.model.DataBinding
- * @see org.eclipse.jst.ws.internal.cxf.core.model.impl.CXFPackageImpl#getDataBinding()
- * @generated
- */
- EEnum DATA_BINDING = eINSTANCE.getDataBinding();
-
- /**
- * The meta object literal for the '<em>URL</em>' data type.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see java.net.URL
- * @see org.eclipse.jst.ws.internal.cxf.core.model.impl.CXFPackageImpl#getURL()
- * @generated
- */
- EDataType URL = eINSTANCE.getURL();
-
- /**
- * The meta object literal for the '<em>Definition</em>' data type.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see javax.wsdl.Definition
- * @see org.eclipse.jst.ws.internal.cxf.core.model.impl.CXFPackageImpl#getDefinition()
- * @generated
- */
- EDataType DEFINITION = eINSTANCE.getDefinition();
-
- /**
- * The meta object literal for the '<em>Map</em>' data type.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see java.util.Map
- * @see org.eclipse.jst.ws.internal.cxf.core.model.impl.CXFPackageImpl#getMap()
- * @generated
- */
- EDataType MAP = eINSTANCE.getMap();
-
- /**
- * The meta object literal for the '<em>IMethod</em>' data type.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jdt.core.IMethod
- * @see org.eclipse.jst.ws.internal.cxf.core.model.impl.CXFPackageImpl#getIMethod()
- * @generated
- */
- EDataType IMETHOD = eINSTANCE.getIMethod();
-
- }
-
-} //CXFPackage
diff --git a/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/model/DataBinding.java b/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/model/DataBinding.java
deleted file mode 100644
index 6d1fb16..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/model/DataBinding.java
+++ /dev/null
@@ -1,191 +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
- *
- * $Id: DataBinding.java,v 1.1 2008/11/10 20:37:43 david_williams Exp $
- */
-package org.eclipse.jst.ws.internal.cxf.core.model;
-
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.emf.common.util.Enumerator;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the literals of the enumeration '<em><b>Data Binding</b></em>',
- * and utility methods for working with them.
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.ws.internal.cxf.core.model.CXFPackage#getDataBinding()
- * @model
- * @generated
- */
-public enum DataBinding implements Enumerator {
- /**
- * The '<em><b>JAXB</b></em>' literal object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #JAXB_VALUE
- * @generated
- * @ordered
- */
- JAXB(0, "JAXB", "jaxb");
-
- /**
- * The '<em><b>JAXB</b></em>' literal value.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of '<em><b>JAXB</b></em>' literal object isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- * @see #JAXB
- * @model literal="jaxb"
- * @generated
- * @ordered
- */
- public static final int JAXB_VALUE = 0;
-
- /**
- * An array of all the '<em><b>Data Binding</b></em>' enumerators.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private static final DataBinding[] VALUES_ARRAY =
- new DataBinding[] {
- JAXB,
- };
-
- /**
- * A public read-only list of all the '<em><b>Data Binding</b></em>' enumerators.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public static final List<DataBinding> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
-
- /**
- * Returns the '<em><b>Data Binding</b></em>' literal with the specified literal value.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public static DataBinding get(String literal) {
- for (int i = 0; i < VALUES_ARRAY.length; ++i) {
- DataBinding result = VALUES_ARRAY[i];
- if (result.toString().equals(literal)) {
- return result;
- }
- }
- return null;
- }
-
- /**
- * Returns the '<em><b>Data Binding</b></em>' literal with the specified name.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public static DataBinding getByName(String name) {
- for (int i = 0; i < VALUES_ARRAY.length; ++i) {
- DataBinding result = VALUES_ARRAY[i];
- if (result.getName().equals(name)) {
- return result;
- }
- }
- return null;
- }
-
- /**
- * Returns the '<em><b>Data Binding</b></em>' literal with the specified integer value.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public static DataBinding get(int value) {
- switch (value) {
- case JAXB_VALUE: return JAXB;
- }
- return null;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private final int value;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private final String name;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private final String literal;
-
- /**
- * Only this class can construct instances.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private DataBinding(int value, String name, String literal) {
- this.value = value;
- this.name = name;
- this.literal = literal;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public int getValue() {
- return value;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public String getName() {
- return name;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public String getLiteral() {
- return literal;
- }
-
- /**
- * Returns the literal value of the enumerator, which is its string representation.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public String toString() {
- return literal;
- }
-
-} //DataBinding
diff --git a/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/model/Frontend.java b/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/model/Frontend.java
deleted file mode 100644
index 44a9a0e..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/model/Frontend.java
+++ /dev/null
@@ -1,191 +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
- *
- * $Id: Frontend.java,v 1.1 2008/11/10 20:37:43 david_williams Exp $
- */
-package org.eclipse.jst.ws.internal.cxf.core.model;
-
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.emf.common.util.Enumerator;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the literals of the enumeration '<em><b>Frontend</b></em>',
- * and utility methods for working with them.
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.ws.internal.cxf.core.model.CXFPackage#getFrontend()
- * @model
- * @generated
- */
-public enum Frontend implements Enumerator {
- /**
- * The '<em><b>JAXWS</b></em>' literal object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #JAXWS_VALUE
- * @generated
- * @ordered
- */
- JAXWS(0, "JAXWS", "jaxws");
-
- /**
- * The '<em><b>JAXWS</b></em>' literal value.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of '<em><b>JAXWS</b></em>' literal object isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- * @see #JAXWS
- * @model literal="jaxws"
- * @generated
- * @ordered
- */
- public static final int JAXWS_VALUE = 0;
-
- /**
- * An array of all the '<em><b>Frontend</b></em>' enumerators.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private static final Frontend[] VALUES_ARRAY =
- new Frontend[] {
- JAXWS,
- };
-
- /**
- * A public read-only list of all the '<em><b>Frontend</b></em>' enumerators.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public static final List<Frontend> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
-
- /**
- * Returns the '<em><b>Frontend</b></em>' literal with the specified literal value.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public static Frontend get(String literal) {
- for (int i = 0; i < VALUES_ARRAY.length; ++i) {
- Frontend result = VALUES_ARRAY[i];
- if (result.toString().equals(literal)) {
- return result;
- }
- }
- return null;
- }
-
- /**
- * Returns the '<em><b>Frontend</b></em>' literal with the specified name.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public static Frontend getByName(String name) {
- for (int i = 0; i < VALUES_ARRAY.length; ++i) {
- Frontend result = VALUES_ARRAY[i];
- if (result.getName().equals(name)) {
- return result;
- }
- }
- return null;
- }
-
- /**
- * Returns the '<em><b>Frontend</b></em>' literal with the specified integer value.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public static Frontend get(int value) {
- switch (value) {
- case JAXWS_VALUE: return JAXWS;
- }
- return null;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private final int value;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private final String name;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private final String literal;
-
- /**
- * Only this class can construct instances.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private Frontend(int value, String name, String literal) {
- this.value = value;
- this.name = name;
- this.literal = literal;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public int getValue() {
- return value;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public String getName() {
- return name;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public String getLiteral() {
- return literal;
- }
-
- /**
- * Returns the literal value of the enumerator, which is its string representation.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public String toString() {
- return literal;
- }
-
-} //Frontend
diff --git a/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/model/Java2WSContext.java b/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/model/Java2WSContext.java
deleted file mode 100644
index 9149d7d..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/model/Java2WSContext.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.core.model;
-
-/**
- *
- * @model abstract="true" interface="true"
- */
-public interface Java2WSContext extends CXFContext {
- /**
- * Returns whether the generated WSDL is to include a SOAP 1.2 binding.
- *
- * @model default="false"
- */
- boolean isSoap12Binding();
-
- /**
- * Sets the value of the '{@link org.eclipse.jst.ws.internal.cxf.core.model.Java2WSContext#isSoap12Binding <em>Soap12 Binding</em>}' attribute.
- * <!-- begin-user-doc -->
- * Specifies that the generated WSDL is to include a SOAP 1.2 binding.
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Soap12 Binding</em>' attribute.
- * @see #isSoap12Binding()
- * @generated
- */
- void setSoap12Binding(boolean value);
-
- /**
- * Returns whether to output schemas to separate files and use imports to
- * load them instead of inlining them into the wsdl.
- *
- * @model default="true"
- */
- boolean isGenerateXSDImports();
-
- /**
- * Sets the value of the '{@link org.eclipse.jst.ws.internal.cxf.core.model.Java2WSContext#isGenerateXSDImports <em>Generate XSD Imports</em>}' attribute.
- * <!-- begin-user-doc -->
- * Output schemas to separate files and use imports to load them instead of
- * inlining them into the wsdl.
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Generate XSD Imports</em>' attribute.
- * @see #isGenerateXSDImports()
- * @generated
- */
- void setGenerateXSDImports(boolean value);
-
- /**
- * Returns whether to generate wsdl.
- *
- * @model default="true"
- */
- boolean isGenerateWSDL();
-
- /**
- * Sets the value of the '{@link org.eclipse.jst.ws.internal.cxf.core.model.Java2WSContext#isGenerateWSDL <em>Generate WSDL</em>}' attribute.
- * <!-- begin-user-doc -->
- * Specify to generate the WSDL file.
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Generate WSDL</em>' attribute.
- * @see #isGenerateWSDL()
- * @generated
- */
- void setGenerateWSDL(boolean value);
-
- /**
- * Returns whether to generate wrapper beans.
- *
- * @model default="true"
- */
- boolean isGenerateWrapperFaultBeans();
-
- /**
- * Sets the value of the '{@link org.eclipse.jst.ws.internal.cxf.core.model.Java2WSContext#isGenerateWrapperFaultBeans <em>Generate Wrapper Fault Beans</em>}' attribute.
- * <!-- begin-user-doc -->
- * Specify to generate the wrapper and fault bean.
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Generate Wrapper Fault Beans</em>' attribute.
- * @see #isGenerateWrapperFaultBeans()
- * @generated
- */
- void setGenerateWrapperFaultBeans(boolean value);
-
- /**
- * Returns whether the Annotation Processing Tool (APT) is enabled.
- *
- * @model default="false"
- */
- boolean isAnnotationProcessingEnabled();
-
- /**
- * Sets the value of the '{@link org.eclipse.jst.ws.internal.cxf.core.model.Java2WSContext#isAnnotationProcessingEnabled <em>Annotation Processing Enabled</em>}' attribute.
- * <!-- begin-user-doc -->
- * Set to enable the Annotation Processing Tool (APT) extension.
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Annotation Processing Enabled</em>' attribute.
- * @see #isAnnotationProcessingEnabled()
- * @generated
- */
- void setAnnotationProcessingEnabled(boolean value);
-
- /**
- * Returns whether the <code>@WebMethod</code> annotation generation is enabled by default.
- *
- * @model default="true"
- */
- boolean isGenerateWebMethodAnnotation();
-
- /**
- * Sets the value of the '{@link org.eclipse.jst.ws.internal.cxf.core.model.Java2WSContext#isGenerateWebMethodAnnotation <em>Generate Web Method Annotation</em>}' attribute.
- * <!-- begin-user-doc -->
- * Sets the enablement of the <code>@WebMethod</code> annotation generation.
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Generate Web Method Annotation</em>' attribute.
- * @see #isGenerateWebMethodAnnotation()
- * @generated
- */
- void setGenerateWebMethodAnnotation(boolean value);
-
- /**
- * Returns whether the <code>@WebParam</code> annotation generation is enabled by default.
- *
- * @model default="true"
- */
- boolean isGenerateWebParamAnnotation();
-
- /**
- * Sets the value of the '{@link org.eclipse.jst.ws.internal.cxf.core.model.Java2WSContext#isGenerateWebParamAnnotation <em>Generate Web Param Annotation</em>}' attribute.
- * <!-- begin-user-doc -->
- * Sets the enablement of the <code>@WebParam</code> annotation generation.
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Generate Web Param Annotation</em>' attribute.
- * @see #isGenerateWebParamAnnotation()
- * @generated
- */
- void setGenerateWebParamAnnotation(boolean value);
-
- /**
- * Returns whether the <code>@RequestWrapper</code> annotation generation is enabled by default.
- *
- * @model default="true"
- */
- boolean isGenerateRequestWrapperAnnotation();
-
- /**
- * Sets the value of the '{@link org.eclipse.jst.ws.internal.cxf.core.model.Java2WSContext#isGenerateRequestWrapperAnnotation <em>Generate Request Wrapper Annotation</em>}' attribute.
- * <!-- begin-user-doc -->
- * Sets the enablement of the <code>@RequestWrapper</code> annotation generation.
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Generate Request Wrapper Annotation</em>' attribute.
- * @see #isGenerateRequestWrapperAnnotation()
- * @generated
- */
- void setGenerateRequestWrapperAnnotation(boolean value);
-
- /**
- * Returns whether the <code>@ResponseWrapper</code> annotation generation is enabled by default.
- *
- * @model default="true"
- */
- boolean isGenerateResponseWrapperAnnotation();
-
- /**
- * Sets the value of the '{@link org.eclipse.jst.ws.internal.cxf.core.model.Java2WSContext#isGenerateResponseWrapperAnnotation <em>Generate Response Wrapper Annotation</em>}' attribute.
- * <!-- begin-user-doc -->
- * Sets the enablement of the <code>@ResponseWrapper</code> annotation generation.
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Generate Response Wrapper Annotation</em>' attribute.
- * @see #isGenerateResponseWrapperAnnotation()
- * @generated
- */
- void setGenerateResponseWrapperAnnotation(boolean value);
-}
diff --git a/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/model/Java2WSDataModel.java b/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/model/Java2WSDataModel.java
deleted file mode 100644
index bcf6c67..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/model/Java2WSDataModel.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.core.model;
-
-import java.util.Map;
-
-import org.eclipse.jdt.core.IMethod;
-
-/**
- *
- * @model
- */
-public interface Java2WSDataModel extends CXFDataModel, Java2WSContext {
- /**
- * Returns the classpath searched when processing.
- *
- * @model
- */
- String getClasspath();
-
- /**
- * Sets the value of the '{@link org.eclipse.jst.ws.internal.cxf.core.model.Java2WSDataModel#getClasspath <em>Classpath</em>}' attribute.
- * <!-- begin-user-doc -->
- * Sets the classpath to search when processing.
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Classpath</em>' attribute.
- * @see #getClasspath()
- * @generated
- */
- void setClasspath(String value);
-
- /**
- * Returns the Java starting point artifact. This can be either a Java Class or Interface.
- *
- * @model
- */
- String getJavaStartingPoint();
-
- /**
- * Sets the value of the '{@link org.eclipse.jst.ws.internal.cxf.core.model.Java2WSDataModel#getJavaStartingPoint <em>Java Starting Point</em>}' attribute.
- * <!-- begin-user-doc -->
- * Sets the Java starting point artifact. It may be a Java Class or Interface.
- * @see #setFullyQualifiedJavaClassName()
- * @see #setFullyQualifiedJavaInterfaceName()
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Java Starting Point</em>' attribute.
- * @see #getJavaStartingPoint()
- * @generated
- */
- void setJavaStartingPoint(String value);
-
- /**
- * If the starting point is a Java Class this tracks whether to use an SEI has been selected.
- *
- * @model
- */
- boolean isUseServiceEndpointInterface();
-
-
- /**
- * Sets the value of the '{@link org.eclipse.jst.ws.internal.cxf.core.model.Java2WSDataModel#isUseServiceEndpointInterface <em>Use Service Endpoint Interface</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Use Service Endpoint Interface</em>' attribute.
- * @see #isUseServiceEndpointInterface()
- * @generated
- */
- void setUseServiceEndpointInterface(boolean value);
-
- /**
- * If the starting point is a Java Class this tracks whether to option to
- * extract the SEI has been selected.
- *
- * @model
- */
- boolean isExtractInterface();
-
- /**
- * Sets the value of the '{@link org.eclipse.jst.ws.internal.cxf.core.model.Java2WSDataModel#isExtractInterface <em>Extract Interface</em>}' attribute.
- * <!-- begin-user-doc -->
- * Sets the option to extract the SEI from the Java class starting point.
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Extract Interface</em>' attribute.
- * @see #isExtractInterface()
- * @generated
- */
- void setExtractInterface(boolean value);
-
- /**
- * Gets the new SEI name.
- *
- * @model
- */
- String getServiceEndpointInterfaceName();
-
- /**
- * Sets the value of the '{@link org.eclipse.jst.ws.internal.cxf.core.model.Java2WSDataModel#getServiceEndpointInterfaceName <em>Service Endpoint Interface Name</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Service Endpoint Interface Name</em>' attribute.
- * @see #getServiceEndpointInterfaceName()
- * @generated
- */
- void setServiceEndpointInterfaceName(String value);
-
- /**
- * Returns the map of the methods to use and their annotations.
- *
- * @model
- */
- Map<IMethod, Map<String, Boolean>> getMethodMap();
-
- /**
- * Sets the value of the '{@link org.eclipse.jst.ws.internal.cxf.core.model.Java2WSDataModel#getMethodMap <em>Method Map</em>}' attribute.
- * <!-- begin-user-doc -->
- * Sets the map of the methods to use and the method annotations.
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Method Map</em>' attribute.
- * @see #getMethodMap()
- * @generated
- */
- void setMethodMap(Map<IMethod, Map<String, Boolean>> value);
-
- /**
- * Returns a map of enabled default method annotations
- *
- * @model
- */
- Map<String, Boolean> getAnnotationMap();
-
- /**
- * Sets the value of the '{@link org.eclipse.jst.ws.internal.cxf.core.model.Java2WSDataModel#getAnnotationMap <em>Annotation Map</em>}' attribute.
- * <!-- begin-user-doc -->
- * Sets a map of the enabled method annotations.
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Annotation Map</em>' attribute.
- * @see #getAnnotationMap()
- * @generated
- */
- void setAnnotationMap(Map<String, Boolean> value);
-
- /**
- * Returns the directory in which the generated source files are placed.
- *
- * @model
- */
- String getSourceDirectory();
-
- /**
- * Sets the value of the '{@link org.eclipse.jst.ws.internal.cxf.core.model.Java2WSDataModel#getSourceDirectory <em>Source Directory</em>}' attribute.
- * <!-- begin-user-doc -->
- * Sets the directory in which the generated source files are placed.
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Source Directory</em>' attribute.
- * @see #getSourceDirectory()
- * @generated
- */
- void setSourceDirectory(String value);
-
- /**
- * Returns the port name used in the generated wsdl.
- *
- * @model
- */
- String getPortName();
-
- /**
- * Sets the value of the '{@link org.eclipse.jst.ws.internal.cxf.core.model.Java2WSDataModel#getPortName <em>Port Name</em>}' attribute.
- * <!-- begin-user-doc -->
- * Sets the port name to use in the generated wsdl.
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Port Name</em>' attribute.
- * @see #getPortName()
- * @generated
- */
- void setPortName(String value);
-
-}
diff --git a/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/model/WSDL2JavaContext.java b/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/model/WSDL2JavaContext.java
deleted file mode 100644
index 716a16a..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/model/WSDL2JavaContext.java
+++ /dev/null
@@ -1,351 +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.core.model;
-
-/**
- *
- * @model abstract="true" interface="true"
- */
-public interface WSDL2JavaContext extends CXFContext {
-
- /**
- * Returns whether to generate starting point code for an implementation object.
- *
- * @model default="true"
- */
- boolean isGenerateImplementation();
-
- /**
- * Sets the value of the '{@link org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaContext#isGenerateImplementation <em>Generate Implementation</em>}' attribute.
- * <!-- begin-user-doc -->
- * Specifies whether to generate starting point code for an implementation object.
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Generate Implementation</em>' attribute.
- * @see #isGenerateImplementation()
- * @generated
- */
- void setGenerateImplementation(boolean value);
-
- /**
- * Returns whether processing of implicit SOAP headers (i.e. SOAP headers
- * defined in the wsdl:binding but not wsdl:portType section.) is enabled.
- *
- * @model default="false"
- */
- boolean isProcessSOAPHeaders();
-
- /**
- * Sets the value of the '{@link org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaContext#isProcessSOAPHeaders <em>Process SOAP Headers</em>}' attribute.
- * <!-- begin-user-doc -->
- * Enables or disables processing of implicit SOAP headers (i.e. SOAP
- * headers defined in the wsdl:binding but not wsdl:portType section.)
- * Default is false.
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Process SOAP Headers</em>' attribute.
- * @see #isProcessSOAPHeaders()
- * @generated
- */
- void setProcessSOAPHeaders(boolean value);
-
- /**
- * Returns whether the loading of the default namespace package name mapping is enabled.
- * Default is true.
- *
- * @model default="true"
- */
- boolean isLoadDefaultNamespacePackageNameMapping();
-
- /**
- * Sets the value of the '{@link org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaContext#isLoadDefaultNamespacePackageNameMapping <em>Load Default Namespace Package Name Mapping</em>}' attribute.
- * <!-- begin-user-doc -->
- * Enables the use of the default namespace package name mapping.
- * Default is true.
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Load Default Namespace Package Name Mapping</em>' attribute.
- * @see #isLoadDefaultNamespacePackageNameMapping()
- * @generated
- */
- void setLoadDefaultNamespacePackageNameMapping(boolean value);
-
- /**
- * Returns whether the loading of the default excludes namespace mapping is enabled.
- * Default is true.
- *
- * @model default="true"
- */
- boolean isLoadDefaultExcludesNamepsaceMapping();
-
- /**
- * Sets the value of the '{@link org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaContext#isLoadDefaultExcludesNamepsaceMapping <em>Load Default Excludes Namepsace Mapping</em>}' attribute.
- * <!-- begin-user-doc -->
- * Enables the use of the default excludes namespace mapping.
- * Default is true.
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Load Default Excludes Namepsace Mapping</em>' attribute.
- * @see #isLoadDefaultExcludesNamepsaceMapping()
- * @generated
- */
- void setLoadDefaultExcludesNamepsaceMapping(boolean value);
-
- /**
- * Returns whether to validate the WSDL before generating the code.
- *
- * @model default="true"
- */
- boolean isValidate();
-
- /**
- * Sets the value of the '{@link org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaContext#isValidate <em>Validate</em>}' attribute.
- * <!-- begin-user-doc -->
- * Enables WSDL validation before code generation.
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Validate</em>' attribute.
- * @see #isValidate()
- * @generated
- */
- void setValidate(boolean value);
-
- /**
- * Returns the wsdl version .Default is WSDL1.1. Currently supports only WSDL1.1 version.
- *
- * @model default="1.1"
- */
- String getWsdlVersion();
-
- /**
- * Sets the value of the '{@link org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaContext#getWsdlVersion <em>Wsdl Version</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Wsdl Version</em>' attribute.
- * @see #getWsdlVersion()
- * @generated
- */
- void setWsdlVersion(String value);
-
- /**
- * Returns whether the tool is set to generate default vales for the
- * generated client and the generated implementation.
- *
- * @model default="true"
- */
- boolean isUseDefaultValues();
-
- /**
- * Sets the value of the '{@link org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaContext#isUseDefaultValues <em>Use Default Values</em>}' attribute.
- * <!-- begin-user-doc -->
- * Generate default vales for the generated client and the generated implementation.
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Use Default Values</em>' attribute.
- * @see #isUseDefaultValues()
- * @generated
- */
- void setUseDefaultValues(boolean value);
-
- /**
- * Returns the comma separated list of arguments to be passed directly to
- * the XJC when the JAXB binding is being used.
- *
- * @model
- */
- String getXjcArgs();
-
- /**
- * Sets the value of the '{@link org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaContext#getXjcArgs <em>Xjc Args</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Xjc Args</em>' attribute.
- * @see #getXjcArgs()
- * @generated
- */
- void setXjcArgs(String value);
-
- /**
- * Returns whether the tool is set to use the CXF proprietary WS-Addressing
- * type instead of the JAX-WS 2.1 compliant mapping.
- *
- * @model
- */
- boolean isNoAddressBinding();
-
- /**
- * Sets the value of the '{@link org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaContext#isNoAddressBinding <em>No Address Binding</em>}' attribute.
- * <!-- begin-user-doc -->
- * Instructs the tool to use the CXF proprietary WS-Addressing type
- * instead of the JAX-WS 2.1 compliant mapping.
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>No Address Binding</em>' attribute.
- * @see #isNoAddressBinding()
- * @generated
- */
- void setNoAddressBinding(boolean value);
-
- /**
- * Returns whether XJC will initialize fields mapped from elements with their default values.
- *
- * @model
- */
- boolean isXjcUseDefaultValues();
-
- /**
- * Sets the value of the '{@link org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaContext#isXjcUseDefaultValues <em>Xjc Use Default Values</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Xjc Use Default Values</em>' attribute.
- * @see #isXjcUseDefaultValues()
- * @generated
- */
- void setXjcUseDefaultValues(boolean value);
-
- /**
- * Returns whether XJC will generate a <code>toString()</code> method.
- *
- * @model
- */
- boolean isXjcToString();
-
- /**
- * Sets the value of the '{@link org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaContext#isXjcToString <em>Xjc To String</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Xjc To String</em>' attribute.
- * @see #isXjcToString()
- * @generated
- */
- void setXjcToString(boolean value);
-
- /**
- * Returns whether multi line output is enabled for <code>toString()</code>.
- *
- * @model
- */
- boolean isXjcToStringMultiLine();
-
- /**
- * Sets the value of the '{@link org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaContext#isXjcToStringMultiLine <em>Xjc To String Multi Line</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Xjc To String Multi Line</em>' attribute.
- * @see #isXjcToStringMultiLine()
- * @generated
- */
- void setXjcToStringMultiLine(boolean value);
-
- /**
- * Returns whether terse output is enabled for <code>toString()</code>.
- *
- * @model
- */
- boolean isXjcToStringSimple();
-
- /**
- * Sets the value of the '{@link org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaContext#isXjcToStringSimple <em>Xjc To String Simple</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Xjc To String Simple</em>' attribute.
- * @see #isXjcToStringSimple()
- * @generated
- */
- void setXjcToStringSimple(boolean value);
-
- /**
- * Returns whether source location support is enabled.
- * @model
- */
- boolean isXjcLocator();
-
- /**
- * Sets the value of the '{@link org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaContext#isXjcLocator <em>Xjc Locator</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Xjc Locator</em>' attribute.
- * @see #isXjcLocator()
- * @generated
- */
- void setXjcLocator(boolean value);
-
- /**
- * Returns whether the XJC will generate accessor methods with 'synchronized' keyword.
- *
- * @model
- */
- boolean isXjcSyncMethods();
-
- /**
- * Sets the value of the '{@link org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaContext#isXjcSyncMethods <em>Xjc Sync Methods</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Xjc Sync Methods</em>' attribute.
- * @see #isXjcSyncMethods()
- * @generated
- */
- void setXjcSyncMethods(boolean value);
-
- /**
- * Returns whether the XJC will mark the code as generated using the annotations.
- *
- * @model
- */
- boolean isXjcMarkGenerated();
-
- /**
- * Sets the value of the '{@link org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaContext#isXjcMarkGenerated <em>Xjc Mark Generated</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Xjc Mark Generated</em>' attribute.
- * @see #isXjcMarkGenerated()
- * @generated
- */
- void setXjcMarkGenerated(boolean value);
-
- /**
- * The episode file location.
- *
- * @model
- */
- String getXjcEpisodeFile();
-
- /**
- * Sets the value of the '{@link org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaContext#getXjcEpisodeFile <em>Xjc Episode File</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Xjc Episode File</em>' attribute.
- * @see #getXjcEpisodeFile()
- * @generated
- */
- void setXjcEpisodeFile(String value);
-
- /**
- * Returns the value of the '<em><b>Auto Name Resolution</b></em>' attribute.
- * The default value is <code>"false"</code>.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Auto Name Resolution</em>' attribute isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- * @return the value of the '<em>Auto Name Resolution</em>' attribute.
- * @see #setAutoNameResolution(boolean)
- * @see org.eclipse.jst.ws.internal.cxf.core.model.CXFPackage#getWSDL2JavaContext_AutoNameResolution()
- * @model default="false"
- * @generated
- */
- boolean isAutoNameResolution();
-
- /**
- * Sets the value of the '{@link org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaContext#isAutoNameResolution <em>Auto Name Resolution</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Auto Name Resolution</em>' attribute.
- * @see #isAutoNameResolution()
- * @generated
- */
- void setAutoNameResolution(boolean value);
-}
diff --git a/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/model/WSDL2JavaDataModel.java b/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/model/WSDL2JavaDataModel.java
deleted file mode 100644
index 7e189c5..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/model/WSDL2JavaDataModel.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.core.model;
-
-import java.util.Map;
-import org.eclipse.emf.common.util.EList;
-
-/**
- * @model
- */
-public interface WSDL2JavaDataModel extends CXFDataModel, WSDL2JavaContext {
- /**
- * Returns the package names to use for the generated code.
- *
- * @model
- */
- Map<String, String> getIncludedNamespaces();
-
- /**
- * Sets the value of the '{@link org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaDataModel#getIncludedNamespaces <em>Included Namespaces</em>}' attribute.
- * <!-- begin-user-doc -->
- * Specifies zero, or more, package names to use for the generated code.
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Included Namespaces</em>' attribute.
- * @see #getIncludedNamespaces()
- * @generated
- */
- void setIncludedNamespaces(Map<String, String> value);
-
- /**
- * Returns a List of the JAXWS or JAXB binding files used, if any.
- *
- * @model
- */
- EList<String> getBindingFiles();
-
- /**
- * Returns the java package to excluded namespace mappings.
- *
- * @model
- */
- Map<String, String> getExcludedNamespaces();
-
- /**
- * Sets the value of the '{@link org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaDataModel#getExcludedNamespaces <em>Excluded Namespaces</em>}' attribute.
- * <!-- begin-user-doc -->
- * Ignore the specified WSDL schema namespace when generating code.
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Excluded Namespaces</em>' attribute.
- * @see #getExcludedNamespaces()
- * @generated
- */
- void setExcludedNamespaces(Map<String, String> value);
-
- /**
- * Returns the catalog file used to map the imported wsdl/schema
- * @model
- */
- String getCatalogFile();
-
- /**
- * Sets the value of the '{@link org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaDataModel#getCatalogFile <em>Catalog File</em>}' attribute.
- * <!-- begin-user-doc -->
- * Specify catalog file to map the imported wsdl/schema.
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Catalog File</em>' attribute.
- * @see #getCatalogFile()
- * @generated
- */
- void setCatalogFile(String value);
-
- /**
- * Returns the value of the Java Source Directory into which the files are generated.
- *
- * @model
- */
- String getJavaSourceFolder();
-
- /**
- * Sets the value of the '{@link org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaDataModel#getJavaSourceFolder <em>Java Source Folder</em>}' attribute.
- * <!-- begin-user-doc -->
- * Sets the value of the Java Source Directory into which the files are generated.
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Java Source Folder</em>' attribute.
- * @see #getJavaSourceFolder()
- * @generated
- */
- void setJavaSourceFolder(String value);
-
-}
diff --git a/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/model/impl/CXFDataModelImpl.java b/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/model/impl/CXFDataModelImpl.java
deleted file mode 100644
index 8ca9da2..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/model/impl/CXFDataModelImpl.java
+++ /dev/null
@@ -1,1475 +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
- *
- * $Id: CXFDataModelImpl.java,v 1.3 2009/01/29 21:46:59 sclarke Exp $
- */
-package org.eclipse.jst.ws.internal.cxf.core.model.impl;
-
-import java.net.URL;
-
-import javax.wsdl.Definition;
-
-import org.eclipse.emf.common.notify.Notification;
-
-import org.eclipse.emf.ecore.EClass;
-
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-import org.eclipse.jst.ws.internal.cxf.core.model.CXFDataModel;
-import org.eclipse.jst.ws.internal.cxf.core.model.CXFPackage;
-import org.eclipse.jst.ws.internal.cxf.core.model.DataBinding;
-import org.eclipse.jst.ws.internal.cxf.core.model.Frontend;
-
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Data Model</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- * <li>{@link org.eclipse.jst.ws.internal.cxf.core.model.impl.CXFDataModelImpl#getCxfRuntimeLocation <em>Cxf Runtime Location</em>}</li>
- * <li>{@link org.eclipse.jst.ws.internal.cxf.core.model.impl.CXFDataModelImpl#getCxfRuntimeEdition <em>Cxf Runtime Edition</em>}</li>
- * <li>{@link org.eclipse.jst.ws.internal.cxf.core.model.impl.CXFDataModelImpl#getCxfRuntimeVersion <em>Cxf Runtime Version</em>}</li>
- * <li>{@link org.eclipse.jst.ws.internal.cxf.core.model.impl.CXFDataModelImpl#isVerbose <em>Verbose</em>}</li>
- * <li>{@link org.eclipse.jst.ws.internal.cxf.core.model.impl.CXFDataModelImpl#isGenerateAntBuildFile <em>Generate Ant Build File</em>}</li>
- * <li>{@link org.eclipse.jst.ws.internal.cxf.core.model.impl.CXFDataModelImpl#isGenerateClient <em>Generate Client</em>}</li>
- * <li>{@link org.eclipse.jst.ws.internal.cxf.core.model.impl.CXFDataModelImpl#isGenerateServer <em>Generate Server</em>}</li>
- * <li>{@link org.eclipse.jst.ws.internal.cxf.core.model.impl.CXFDataModelImpl#getDatabinding <em>Databinding</em>}</li>
- * <li>{@link org.eclipse.jst.ws.internal.cxf.core.model.impl.CXFDataModelImpl#getFrontend <em>Frontend</em>}</li>
- * <li>{@link org.eclipse.jst.ws.internal.cxf.core.model.impl.CXFDataModelImpl#isUseSpringApplicationContext <em>Use Spring Application Context</em>}</li>
- * <li>{@link org.eclipse.jst.ws.internal.cxf.core.model.impl.CXFDataModelImpl#isExportCXFClasspathContainer <em>Export CXF Classpath Container</em>}</li>
- * <li>{@link org.eclipse.jst.ws.internal.cxf.core.model.impl.CXFDataModelImpl#getProjectName <em>Project Name</em>}</li>
- * <li>{@link org.eclipse.jst.ws.internal.cxf.core.model.impl.CXFDataModelImpl#getResourceDirectory <em>Resource Directory</em>}</li>
- * <li>{@link org.eclipse.jst.ws.internal.cxf.core.model.impl.CXFDataModelImpl#getClassDirectory <em>Class Directory</em>}</li>
- * <li>{@link org.eclipse.jst.ws.internal.cxf.core.model.impl.CXFDataModelImpl#getWsdlFileName <em>Wsdl File Name</em>}</li>
- * <li>{@link org.eclipse.jst.ws.internal.cxf.core.model.impl.CXFDataModelImpl#getWsdlURL <em>Wsdl URL</em>}</li>
- * <li>{@link org.eclipse.jst.ws.internal.cxf.core.model.impl.CXFDataModelImpl#getConfigWsdlLocation <em>Config Wsdl Location</em>}</li>
- * <li>{@link org.eclipse.jst.ws.internal.cxf.core.model.impl.CXFDataModelImpl#getFullyQualifiedJavaClassName <em>Fully Qualified Java Class Name</em>}</li>
- * <li>{@link org.eclipse.jst.ws.internal.cxf.core.model.impl.CXFDataModelImpl#getFullyQualifiedJavaInterfaceName <em>Fully Qualified Java Interface Name</em>}</li>
- * <li>{@link org.eclipse.jst.ws.internal.cxf.core.model.impl.CXFDataModelImpl#getConfigId <em>Config Id</em>}</li>
- * <li>{@link org.eclipse.jst.ws.internal.cxf.core.model.impl.CXFDataModelImpl#getTargetNamespace <em>Target Namespace</em>}</li>
- * <li>{@link org.eclipse.jst.ws.internal.cxf.core.model.impl.CXFDataModelImpl#getEndpointName <em>Endpoint Name</em>}</li>
- * <li>{@link org.eclipse.jst.ws.internal.cxf.core.model.impl.CXFDataModelImpl#getServiceName <em>Service Name</em>}</li>
- * <li>{@link org.eclipse.jst.ws.internal.cxf.core.model.impl.CXFDataModelImpl#getWsdlDefinition <em>Wsdl Definition</em>}</li>
- * <li>{@link org.eclipse.jst.ws.internal.cxf.core.model.impl.CXFDataModelImpl#getWsdlLocation <em>Wsdl Location</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public abstract class CXFDataModelImpl extends EObjectImpl implements CXFDataModel {
- /**
- * The default value of the '{@link #getCxfRuntimeLocation() <em>Cxf Runtime Location</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getCxfRuntimeLocation()
- * @generated
- * @ordered
- */
- protected static final String CXF_RUNTIME_LOCATION_EDEFAULT = null;
-
- /**
- * The cached value of the '{@link #getCxfRuntimeLocation() <em>Cxf Runtime Location</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getCxfRuntimeLocation()
- * @generated
- * @ordered
- */
- protected String cxfRuntimeLocation = CXF_RUNTIME_LOCATION_EDEFAULT;
-
- /**
- * The default value of the '{@link #getCxfRuntimeEdition() <em>Cxf Runtime Edition</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getCxfRuntimeEdition()
- * @generated
- * @ordered
- */
- protected static final String CXF_RUNTIME_EDITION_EDEFAULT = null;
-
- /**
- * The cached value of the '{@link #getCxfRuntimeEdition() <em>Cxf Runtime Edition</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getCxfRuntimeEdition()
- * @generated
- * @ordered
- */
- protected String cxfRuntimeEdition = CXF_RUNTIME_EDITION_EDEFAULT;
-
- /**
- * The default value of the '{@link #getCxfRuntimeVersion() <em>Cxf Runtime Version</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getCxfRuntimeVersion()
- * @generated
- * @ordered
- */
- protected static final String CXF_RUNTIME_VERSION_EDEFAULT = null;
-
- /**
- * The cached value of the '{@link #getCxfRuntimeVersion() <em>Cxf Runtime Version</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getCxfRuntimeVersion()
- * @generated
- * @ordered
- */
- protected String cxfRuntimeVersion = CXF_RUNTIME_VERSION_EDEFAULT;
-
- /**
- * The default value of the '{@link #isVerbose() <em>Verbose</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #isVerbose()
- * @generated
- * @ordered
- */
- protected static final boolean VERBOSE_EDEFAULT = true;
-
- /**
- * The cached value of the '{@link #isVerbose() <em>Verbose</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #isVerbose()
- * @generated
- * @ordered
- */
- protected boolean verbose = VERBOSE_EDEFAULT;
-
- /**
- * The default value of the '{@link #isGenerateAntBuildFile() <em>Generate Ant Build File</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #isGenerateAntBuildFile()
- * @generated
- * @ordered
- */
- protected static final boolean GENERATE_ANT_BUILD_FILE_EDEFAULT = false;
-
- /**
- * The cached value of the '{@link #isGenerateAntBuildFile() <em>Generate Ant Build File</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #isGenerateAntBuildFile()
- * @generated
- * @ordered
- */
- protected boolean generateAntBuildFile = GENERATE_ANT_BUILD_FILE_EDEFAULT;
-
- /**
- * The default value of the '{@link #isGenerateClient() <em>Generate Client</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #isGenerateClient()
- * @generated
- * @ordered
- */
- protected static final boolean GENERATE_CLIENT_EDEFAULT = false;
-
- /**
- * The cached value of the '{@link #isGenerateClient() <em>Generate Client</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #isGenerateClient()
- * @generated
- * @ordered
- */
- protected boolean generateClient = GENERATE_CLIENT_EDEFAULT;
-
- /**
- * The default value of the '{@link #isGenerateServer() <em>Generate Server</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #isGenerateServer()
- * @generated
- * @ordered
- */
- protected static final boolean GENERATE_SERVER_EDEFAULT = false;
-
- /**
- * The cached value of the '{@link #isGenerateServer() <em>Generate Server</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #isGenerateServer()
- * @generated
- * @ordered
- */
- protected boolean generateServer = GENERATE_SERVER_EDEFAULT;
-
- /**
- * The default value of the '{@link #getDatabinding() <em>Databinding</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getDatabinding()
- * @generated
- * @ordered
- */
- protected static final DataBinding DATABINDING_EDEFAULT = DataBinding.JAXB;
-
- /**
- * The cached value of the '{@link #getDatabinding() <em>Databinding</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getDatabinding()
- * @generated
- * @ordered
- */
- protected DataBinding databinding = DATABINDING_EDEFAULT;
-
- /**
- * The default value of the '{@link #getFrontend() <em>Frontend</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getFrontend()
- * @generated
- * @ordered
- */
- protected static final Frontend FRONTEND_EDEFAULT = Frontend.JAXWS;
-
- /**
- * The cached value of the '{@link #getFrontend() <em>Frontend</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getFrontend()
- * @generated
- * @ordered
- */
- protected Frontend frontend = FRONTEND_EDEFAULT;
-
- /**
- * The default value of the '{@link #isUseSpringApplicationContext() <em>Use Spring Application Context</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #isUseSpringApplicationContext()
- * @generated
- * @ordered
- */
- protected static final boolean USE_SPRING_APPLICATION_CONTEXT_EDEFAULT = true;
-
- /**
- * The cached value of the '{@link #isUseSpringApplicationContext() <em>Use Spring Application Context</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #isUseSpringApplicationContext()
- * @generated
- * @ordered
- */
- protected boolean useSpringApplicationContext = USE_SPRING_APPLICATION_CONTEXT_EDEFAULT;
-
- /**
- * The default value of the '{@link #isExportCXFClasspathContainer() <em>Export CXF Classpath Container</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #isExportCXFClasspathContainer()
- * @generated
- * @ordered
- */
- protected static final boolean EXPORT_CXF_CLASSPATH_CONTAINER_EDEFAULT = true;
-
- /**
- * The cached value of the '{@link #isExportCXFClasspathContainer() <em>Export CXF Classpath Container</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #isExportCXFClasspathContainer()
- * @generated
- * @ordered
- */
- protected boolean exportCXFClasspathContainer = EXPORT_CXF_CLASSPATH_CONTAINER_EDEFAULT;
-
- /**
- * The default value of the '{@link #getProjectName() <em>Project Name</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getProjectName()
- * @generated
- * @ordered
- */
- protected static final String PROJECT_NAME_EDEFAULT = null;
-
- /**
- * The cached value of the '{@link #getProjectName() <em>Project Name</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getProjectName()
- * @generated
- * @ordered
- */
- protected String projectName = PROJECT_NAME_EDEFAULT;
-
- /**
- * The default value of the '{@link #getResourceDirectory() <em>Resource Directory</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getResourceDirectory()
- * @generated
- * @ordered
- */
- protected static final String RESOURCE_DIRECTORY_EDEFAULT = null;
-
- /**
- * The cached value of the '{@link #getResourceDirectory() <em>Resource Directory</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getResourceDirectory()
- * @generated
- * @ordered
- */
- protected String resourceDirectory = RESOURCE_DIRECTORY_EDEFAULT;
-
- /**
- * The default value of the '{@link #getClassDirectory() <em>Class Directory</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getClassDirectory()
- * @generated
- * @ordered
- */
- protected static final String CLASS_DIRECTORY_EDEFAULT = null;
-
- /**
- * The cached value of the '{@link #getClassDirectory() <em>Class Directory</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getClassDirectory()
- * @generated
- * @ordered
- */
- protected String classDirectory = CLASS_DIRECTORY_EDEFAULT;
-
- /**
- * The default value of the '{@link #getWsdlFileName() <em>Wsdl File Name</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getWsdlFileName()
- * @generated
- * @ordered
- */
- protected static final String WSDL_FILE_NAME_EDEFAULT = null;
-
- /**
- * The cached value of the '{@link #getWsdlFileName() <em>Wsdl File Name</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getWsdlFileName()
- * @generated
- * @ordered
- */
- protected String wsdlFileName = WSDL_FILE_NAME_EDEFAULT;
-
- /**
- * The default value of the '{@link #getWsdlURL() <em>Wsdl URL</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getWsdlURL()
- * @generated
- * @ordered
- */
- protected static final URL WSDL_URL_EDEFAULT = null;
-
- /**
- * The cached value of the '{@link #getWsdlURL() <em>Wsdl URL</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getWsdlURL()
- * @generated
- * @ordered
- */
- protected URL wsdlURL = WSDL_URL_EDEFAULT;
-
- /**
- * The default value of the '{@link #getConfigWsdlLocation() <em>Config Wsdl Location</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getConfigWsdlLocation()
- * @generated
- * @ordered
- */
- protected static final String CONFIG_WSDL_LOCATION_EDEFAULT = null;
-
- /**
- * The cached value of the '{@link #getConfigWsdlLocation() <em>Config Wsdl Location</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getConfigWsdlLocation()
- * @generated
- * @ordered
- */
- protected String configWsdlLocation = CONFIG_WSDL_LOCATION_EDEFAULT;
-
- /**
- * The default value of the '{@link #getFullyQualifiedJavaClassName() <em>Fully Qualified Java Class Name</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getFullyQualifiedJavaClassName()
- * @generated
- * @ordered
- */
- protected static final String FULLY_QUALIFIED_JAVA_CLASS_NAME_EDEFAULT = null;
-
- /**
- * The cached value of the '{@link #getFullyQualifiedJavaClassName() <em>Fully Qualified Java Class Name</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getFullyQualifiedJavaClassName()
- * @generated
- * @ordered
- */
- protected String fullyQualifiedJavaClassName = FULLY_QUALIFIED_JAVA_CLASS_NAME_EDEFAULT;
-
- /**
- * The default value of the '{@link #getFullyQualifiedJavaInterfaceName() <em>Fully Qualified Java Interface Name</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getFullyQualifiedJavaInterfaceName()
- * @generated
- * @ordered
- */
- protected static final String FULLY_QUALIFIED_JAVA_INTERFACE_NAME_EDEFAULT = null;
-
- /**
- * The cached value of the '{@link #getFullyQualifiedJavaInterfaceName() <em>Fully Qualified Java Interface Name</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getFullyQualifiedJavaInterfaceName()
- * @generated
- * @ordered
- */
- protected String fullyQualifiedJavaInterfaceName = FULLY_QUALIFIED_JAVA_INTERFACE_NAME_EDEFAULT;
-
- /**
- * The default value of the '{@link #getConfigId() <em>Config Id</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getConfigId()
- * @generated
- * @ordered
- */
- protected static final String CONFIG_ID_EDEFAULT = null;
-
- /**
- * The cached value of the '{@link #getConfigId() <em>Config Id</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getConfigId()
- * @generated
- * @ordered
- */
- protected String configId = CONFIG_ID_EDEFAULT;
-
- /**
- * The default value of the '{@link #getTargetNamespace() <em>Target Namespace</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getTargetNamespace()
- * @generated
- * @ordered
- */
- protected static final String TARGET_NAMESPACE_EDEFAULT = null;
-
- /**
- * The cached value of the '{@link #getTargetNamespace() <em>Target Namespace</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getTargetNamespace()
- * @generated
- * @ordered
- */
- protected String targetNamespace = TARGET_NAMESPACE_EDEFAULT;
-
- /**
- * The default value of the '{@link #getEndpointName() <em>Endpoint Name</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getEndpointName()
- * @generated
- * @ordered
- */
- protected static final String ENDPOINT_NAME_EDEFAULT = null;
-
- /**
- * The cached value of the '{@link #getEndpointName() <em>Endpoint Name</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getEndpointName()
- * @generated
- * @ordered
- */
- protected String endpointName = ENDPOINT_NAME_EDEFAULT;
-
- /**
- * The default value of the '{@link #getServiceName() <em>Service Name</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getServiceName()
- * @generated
- * @ordered
- */
- protected static final String SERVICE_NAME_EDEFAULT = null;
-
- /**
- * The cached value of the '{@link #getServiceName() <em>Service Name</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getServiceName()
- * @generated
- * @ordered
- */
- protected String serviceName = SERVICE_NAME_EDEFAULT;
-
- /**
- * The default value of the '{@link #getWsdlDefinition() <em>Wsdl Definition</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getWsdlDefinition()
- * @generated
- * @ordered
- */
- protected static final Definition WSDL_DEFINITION_EDEFAULT = null;
-
- /**
- * The cached value of the '{@link #getWsdlDefinition() <em>Wsdl Definition</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getWsdlDefinition()
- * @generated
- * @ordered
- */
- protected Definition wsdlDefinition = WSDL_DEFINITION_EDEFAULT;
-
- /**
- * The default value of the '{@link #getWsdlLocation() <em>Wsdl Location</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getWsdlLocation()
- * @generated
- * @ordered
- */
- protected static final String WSDL_LOCATION_EDEFAULT = null;
-
- /**
- * The cached value of the '{@link #getWsdlLocation() <em>Wsdl Location</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getWsdlLocation()
- * @generated
- * @ordered
- */
- protected String wsdlLocation = WSDL_LOCATION_EDEFAULT;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected CXFDataModelImpl() {
- super();
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- protected EClass eStaticClass() {
- return CXFPackage.Literals.CXF_DATA_MODEL;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public String getCxfRuntimeLocation() {
- return cxfRuntimeLocation;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setCxfRuntimeLocation(String newCxfRuntimeLocation) {
- String oldCxfRuntimeLocation = cxfRuntimeLocation;
- cxfRuntimeLocation = newCxfRuntimeLocation;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, CXFPackage.CXF_DATA_MODEL__CXF_RUNTIME_LOCATION, oldCxfRuntimeLocation, cxfRuntimeLocation));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public String getCxfRuntimeEdition() {
- return cxfRuntimeEdition;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setCxfRuntimeEdition(String newCxfRuntimeEdition) {
- String oldCxfRuntimeEdition = cxfRuntimeEdition;
- cxfRuntimeEdition = newCxfRuntimeEdition;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, CXFPackage.CXF_DATA_MODEL__CXF_RUNTIME_EDITION, oldCxfRuntimeEdition, cxfRuntimeEdition));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public String getCxfRuntimeVersion() {
- return cxfRuntimeVersion;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setCxfRuntimeVersion(String newCxfRuntimeVersion) {
- String oldCxfRuntimeVersion = cxfRuntimeVersion;
- cxfRuntimeVersion = newCxfRuntimeVersion;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, CXFPackage.CXF_DATA_MODEL__CXF_RUNTIME_VERSION, oldCxfRuntimeVersion, cxfRuntimeVersion));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public boolean isVerbose() {
- return verbose;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setVerbose(boolean newVerbose) {
- boolean oldVerbose = verbose;
- verbose = newVerbose;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, CXFPackage.CXF_DATA_MODEL__VERBOSE, oldVerbose, verbose));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public boolean isGenerateAntBuildFile() {
- return generateAntBuildFile;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setGenerateAntBuildFile(boolean newGenerateAntBuildFile) {
- boolean oldGenerateAntBuildFile = generateAntBuildFile;
- generateAntBuildFile = newGenerateAntBuildFile;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, CXFPackage.CXF_DATA_MODEL__GENERATE_ANT_BUILD_FILE, oldGenerateAntBuildFile, generateAntBuildFile));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public boolean isGenerateClient() {
- return generateClient;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setGenerateClient(boolean newGenerateClient) {
- boolean oldGenerateClient = generateClient;
- generateClient = newGenerateClient;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, CXFPackage.CXF_DATA_MODEL__GENERATE_CLIENT, oldGenerateClient, generateClient));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public boolean isGenerateServer() {
- return generateServer;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setGenerateServer(boolean newGenerateServer) {
- boolean oldGenerateServer = generateServer;
- generateServer = newGenerateServer;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, CXFPackage.CXF_DATA_MODEL__GENERATE_SERVER, oldGenerateServer, generateServer));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public DataBinding getDatabinding() {
- return databinding;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setDatabinding(DataBinding newDatabinding) {
- DataBinding oldDatabinding = databinding;
- databinding = newDatabinding == null ? DATABINDING_EDEFAULT : newDatabinding;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, CXFPackage.CXF_DATA_MODEL__DATABINDING, oldDatabinding, databinding));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public Frontend getFrontend() {
- return frontend;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setFrontend(Frontend newFrontend) {
- Frontend oldFrontend = frontend;
- frontend = newFrontend == null ? FRONTEND_EDEFAULT : newFrontend;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, CXFPackage.CXF_DATA_MODEL__FRONTEND, oldFrontend, frontend));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public boolean isUseSpringApplicationContext() {
- return useSpringApplicationContext;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setUseSpringApplicationContext(boolean newUseSpringApplicationContext) {
- boolean oldUseSpringApplicationContext = useSpringApplicationContext;
- useSpringApplicationContext = newUseSpringApplicationContext;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, CXFPackage.CXF_DATA_MODEL__USE_SPRING_APPLICATION_CONTEXT, oldUseSpringApplicationContext, useSpringApplicationContext));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public boolean isExportCXFClasspathContainer() {
- return exportCXFClasspathContainer;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setExportCXFClasspathContainer(boolean newExportCXFClasspathContainer) {
- boolean oldExportCXFClasspathContainer = exportCXFClasspathContainer;
- exportCXFClasspathContainer = newExportCXFClasspathContainer;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, CXFPackage.CXF_DATA_MODEL__EXPORT_CXF_CLASSPATH_CONTAINER, oldExportCXFClasspathContainer, exportCXFClasspathContainer));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public String getProjectName() {
- return projectName;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setProjectName(String newProjectName) {
- String oldProjectName = projectName;
- projectName = newProjectName;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, CXFPackage.CXF_DATA_MODEL__PROJECT_NAME, oldProjectName, projectName));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public String getResourceDirectory() {
- return resourceDirectory;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setResourceDirectory(String newResourceDirectory) {
- String oldResourceDirectory = resourceDirectory;
- resourceDirectory = newResourceDirectory;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, CXFPackage.CXF_DATA_MODEL__RESOURCE_DIRECTORY, oldResourceDirectory, resourceDirectory));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public String getClassDirectory() {
- return classDirectory;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setClassDirectory(String newClassDirectory) {
- String oldClassDirectory = classDirectory;
- classDirectory = newClassDirectory;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, CXFPackage.CXF_DATA_MODEL__CLASS_DIRECTORY, oldClassDirectory, classDirectory));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public String getWsdlFileName() {
- return wsdlFileName;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setWsdlFileName(String newWsdlFileName) {
- String oldWsdlFileName = wsdlFileName;
- wsdlFileName = newWsdlFileName;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, CXFPackage.CXF_DATA_MODEL__WSDL_FILE_NAME, oldWsdlFileName, wsdlFileName));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public URL getWsdlURL() {
- return wsdlURL;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setWsdlURL(URL newWsdlURL) {
- URL oldWsdlURL = wsdlURL;
- wsdlURL = newWsdlURL;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, CXFPackage.CXF_DATA_MODEL__WSDL_URL, oldWsdlURL, wsdlURL));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public String getConfigWsdlLocation() {
- return configWsdlLocation;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setConfigWsdlLocation(String newConfigWsdlLocation) {
- String oldConfigWsdlLocation = configWsdlLocation;
- configWsdlLocation = newConfigWsdlLocation;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, CXFPackage.CXF_DATA_MODEL__CONFIG_WSDL_LOCATION, oldConfigWsdlLocation, configWsdlLocation));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public String getFullyQualifiedJavaClassName() {
- return fullyQualifiedJavaClassName;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setFullyQualifiedJavaClassName(String newFullyQualifiedJavaClassName) {
- String oldFullyQualifiedJavaClassName = fullyQualifiedJavaClassName;
- fullyQualifiedJavaClassName = newFullyQualifiedJavaClassName;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, CXFPackage.CXF_DATA_MODEL__FULLY_QUALIFIED_JAVA_CLASS_NAME, oldFullyQualifiedJavaClassName, fullyQualifiedJavaClassName));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public String getFullyQualifiedJavaInterfaceName() {
- return fullyQualifiedJavaInterfaceName;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setFullyQualifiedJavaInterfaceName(String newFullyQualifiedJavaInterfaceName) {
- String oldFullyQualifiedJavaInterfaceName = fullyQualifiedJavaInterfaceName;
- fullyQualifiedJavaInterfaceName = newFullyQualifiedJavaInterfaceName;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, CXFPackage.CXF_DATA_MODEL__FULLY_QUALIFIED_JAVA_INTERFACE_NAME, oldFullyQualifiedJavaInterfaceName, fullyQualifiedJavaInterfaceName));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public String getConfigId() {
- return configId;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setConfigId(String newConfigId) {
- String oldConfigId = configId;
- configId = newConfigId;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, CXFPackage.CXF_DATA_MODEL__CONFIG_ID, oldConfigId, configId));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public String getTargetNamespace() {
- return targetNamespace;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setTargetNamespace(String newTargetNamespace) {
- String oldTargetNamespace = targetNamespace;
- targetNamespace = newTargetNamespace;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, CXFPackage.CXF_DATA_MODEL__TARGET_NAMESPACE, oldTargetNamespace, targetNamespace));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public String getEndpointName() {
- return endpointName;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setEndpointName(String newEndpointName) {
- String oldEndpointName = endpointName;
- endpointName = newEndpointName;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, CXFPackage.CXF_DATA_MODEL__ENDPOINT_NAME, oldEndpointName, endpointName));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public String getServiceName() {
- return serviceName;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setServiceName(String newServiceName) {
- String oldServiceName = serviceName;
- serviceName = newServiceName;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, CXFPackage.CXF_DATA_MODEL__SERVICE_NAME, oldServiceName, serviceName));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public Definition getWsdlDefinition() {
- return wsdlDefinition;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setWsdlDefinition(Definition newWsdlDefinition) {
- Definition oldWsdlDefinition = wsdlDefinition;
- wsdlDefinition = newWsdlDefinition;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, CXFPackage.CXF_DATA_MODEL__WSDL_DEFINITION, oldWsdlDefinition, wsdlDefinition));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public String getWsdlLocation() {
- return wsdlLocation;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setWsdlLocation(String newWsdlLocation) {
- String oldWsdlLocation = wsdlLocation;
- wsdlLocation = newWsdlLocation;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, CXFPackage.CXF_DATA_MODEL__WSDL_LOCATION, oldWsdlLocation, wsdlLocation));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public Object eGet(int featureID, boolean resolve, boolean coreType) {
- switch (featureID) {
- case CXFPackage.CXF_DATA_MODEL__CXF_RUNTIME_LOCATION:
- return getCxfRuntimeLocation();
- case CXFPackage.CXF_DATA_MODEL__CXF_RUNTIME_EDITION:
- return getCxfRuntimeEdition();
- case CXFPackage.CXF_DATA_MODEL__CXF_RUNTIME_VERSION:
- return getCxfRuntimeVersion();
- case CXFPackage.CXF_DATA_MODEL__VERBOSE:
- return isVerbose() ? Boolean.TRUE : Boolean.FALSE;
- case CXFPackage.CXF_DATA_MODEL__GENERATE_ANT_BUILD_FILE:
- return isGenerateAntBuildFile() ? Boolean.TRUE : Boolean.FALSE;
- case CXFPackage.CXF_DATA_MODEL__GENERATE_CLIENT:
- return isGenerateClient() ? Boolean.TRUE : Boolean.FALSE;
- case CXFPackage.CXF_DATA_MODEL__GENERATE_SERVER:
- return isGenerateServer() ? Boolean.TRUE : Boolean.FALSE;
- case CXFPackage.CXF_DATA_MODEL__DATABINDING:
- return getDatabinding();
- case CXFPackage.CXF_DATA_MODEL__FRONTEND:
- return getFrontend();
- case CXFPackage.CXF_DATA_MODEL__USE_SPRING_APPLICATION_CONTEXT:
- return isUseSpringApplicationContext() ? Boolean.TRUE : Boolean.FALSE;
- case CXFPackage.CXF_DATA_MODEL__EXPORT_CXF_CLASSPATH_CONTAINER:
- return isExportCXFClasspathContainer() ? Boolean.TRUE : Boolean.FALSE;
- case CXFPackage.CXF_DATA_MODEL__PROJECT_NAME:
- return getProjectName();
- case CXFPackage.CXF_DATA_MODEL__RESOURCE_DIRECTORY:
- return getResourceDirectory();
- case CXFPackage.CXF_DATA_MODEL__CLASS_DIRECTORY:
- return getClassDirectory();
- case CXFPackage.CXF_DATA_MODEL__WSDL_FILE_NAME:
- return getWsdlFileName();
- case CXFPackage.CXF_DATA_MODEL__WSDL_URL:
- return getWsdlURL();
- case CXFPackage.CXF_DATA_MODEL__CONFIG_WSDL_LOCATION:
- return getConfigWsdlLocation();
- case CXFPackage.CXF_DATA_MODEL__FULLY_QUALIFIED_JAVA_CLASS_NAME:
- return getFullyQualifiedJavaClassName();
- case CXFPackage.CXF_DATA_MODEL__FULLY_QUALIFIED_JAVA_INTERFACE_NAME:
- return getFullyQualifiedJavaInterfaceName();
- case CXFPackage.CXF_DATA_MODEL__CONFIG_ID:
- return getConfigId();
- case CXFPackage.CXF_DATA_MODEL__TARGET_NAMESPACE:
- return getTargetNamespace();
- case CXFPackage.CXF_DATA_MODEL__ENDPOINT_NAME:
- return getEndpointName();
- case CXFPackage.CXF_DATA_MODEL__SERVICE_NAME:
- return getServiceName();
- case CXFPackage.CXF_DATA_MODEL__WSDL_DEFINITION:
- return getWsdlDefinition();
- case CXFPackage.CXF_DATA_MODEL__WSDL_LOCATION:
- return getWsdlLocation();
- }
- return super.eGet(featureID, resolve, coreType);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public void eSet(int featureID, Object newValue) {
- switch (featureID) {
- case CXFPackage.CXF_DATA_MODEL__CXF_RUNTIME_LOCATION:
- setCxfRuntimeLocation((String)newValue);
- return;
- case CXFPackage.CXF_DATA_MODEL__CXF_RUNTIME_EDITION:
- setCxfRuntimeEdition((String)newValue);
- return;
- case CXFPackage.CXF_DATA_MODEL__CXF_RUNTIME_VERSION:
- setCxfRuntimeVersion((String)newValue);
- return;
- case CXFPackage.CXF_DATA_MODEL__VERBOSE:
- setVerbose(((Boolean)newValue).booleanValue());
- return;
- case CXFPackage.CXF_DATA_MODEL__GENERATE_ANT_BUILD_FILE:
- setGenerateAntBuildFile(((Boolean)newValue).booleanValue());
- return;
- case CXFPackage.CXF_DATA_MODEL__GENERATE_CLIENT:
- setGenerateClient(((Boolean)newValue).booleanValue());
- return;
- case CXFPackage.CXF_DATA_MODEL__GENERATE_SERVER:
- setGenerateServer(((Boolean)newValue).booleanValue());
- return;
- case CXFPackage.CXF_DATA_MODEL__DATABINDING:
- setDatabinding((DataBinding)newValue);
- return;
- case CXFPackage.CXF_DATA_MODEL__FRONTEND:
- setFrontend((Frontend)newValue);
- return;
- case CXFPackage.CXF_DATA_MODEL__USE_SPRING_APPLICATION_CONTEXT:
- setUseSpringApplicationContext(((Boolean)newValue).booleanValue());
- return;
- case CXFPackage.CXF_DATA_MODEL__EXPORT_CXF_CLASSPATH_CONTAINER:
- setExportCXFClasspathContainer(((Boolean)newValue).booleanValue());
- return;
- case CXFPackage.CXF_DATA_MODEL__PROJECT_NAME:
- setProjectName((String)newValue);
- return;
- case CXFPackage.CXF_DATA_MODEL__RESOURCE_DIRECTORY:
- setResourceDirectory((String)newValue);
- return;
- case CXFPackage.CXF_DATA_MODEL__CLASS_DIRECTORY:
- setClassDirectory((String)newValue);
- return;
- case CXFPackage.CXF_DATA_MODEL__WSDL_FILE_NAME:
- setWsdlFileName((String)newValue);
- return;
- case CXFPackage.CXF_DATA_MODEL__WSDL_URL:
- setWsdlURL((URL)newValue);
- return;
- case CXFPackage.CXF_DATA_MODEL__CONFIG_WSDL_LOCATION:
- setConfigWsdlLocation((String)newValue);
- return;
- case CXFPackage.CXF_DATA_MODEL__FULLY_QUALIFIED_JAVA_CLASS_NAME:
- setFullyQualifiedJavaClassName((String)newValue);
- return;
- case CXFPackage.CXF_DATA_MODEL__FULLY_QUALIFIED_JAVA_INTERFACE_NAME:
- setFullyQualifiedJavaInterfaceName((String)newValue);
- return;
- case CXFPackage.CXF_DATA_MODEL__CONFIG_ID:
- setConfigId((String)newValue);
- return;
- case CXFPackage.CXF_DATA_MODEL__TARGET_NAMESPACE:
- setTargetNamespace((String)newValue);
- return;
- case CXFPackage.CXF_DATA_MODEL__ENDPOINT_NAME:
- setEndpointName((String)newValue);
- return;
- case CXFPackage.CXF_DATA_MODEL__SERVICE_NAME:
- setServiceName((String)newValue);
- return;
- case CXFPackage.CXF_DATA_MODEL__WSDL_DEFINITION:
- setWsdlDefinition((Definition)newValue);
- return;
- case CXFPackage.CXF_DATA_MODEL__WSDL_LOCATION:
- setWsdlLocation((String)newValue);
- return;
- }
- super.eSet(featureID, newValue);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public void eUnset(int featureID) {
- switch (featureID) {
- case CXFPackage.CXF_DATA_MODEL__CXF_RUNTIME_LOCATION:
- setCxfRuntimeLocation(CXF_RUNTIME_LOCATION_EDEFAULT);
- return;
- case CXFPackage.CXF_DATA_MODEL__CXF_RUNTIME_EDITION:
- setCxfRuntimeEdition(CXF_RUNTIME_EDITION_EDEFAULT);
- return;
- case CXFPackage.CXF_DATA_MODEL__CXF_RUNTIME_VERSION:
- setCxfRuntimeVersion(CXF_RUNTIME_VERSION_EDEFAULT);
- return;
- case CXFPackage.CXF_DATA_MODEL__VERBOSE:
- setVerbose(VERBOSE_EDEFAULT);
- return;
- case CXFPackage.CXF_DATA_MODEL__GENERATE_ANT_BUILD_FILE:
- setGenerateAntBuildFile(GENERATE_ANT_BUILD_FILE_EDEFAULT);
- return;
- case CXFPackage.CXF_DATA_MODEL__GENERATE_CLIENT:
- setGenerateClient(GENERATE_CLIENT_EDEFAULT);
- return;
- case CXFPackage.CXF_DATA_MODEL__GENERATE_SERVER:
- setGenerateServer(GENERATE_SERVER_EDEFAULT);
- return;
- case CXFPackage.CXF_DATA_MODEL__DATABINDING:
- setDatabinding(DATABINDING_EDEFAULT);
- return;
- case CXFPackage.CXF_DATA_MODEL__FRONTEND:
- setFrontend(FRONTEND_EDEFAULT);
- return;
- case CXFPackage.CXF_DATA_MODEL__USE_SPRING_APPLICATION_CONTEXT:
- setUseSpringApplicationContext(USE_SPRING_APPLICATION_CONTEXT_EDEFAULT);
- return;
- case CXFPackage.CXF_DATA_MODEL__EXPORT_CXF_CLASSPATH_CONTAINER:
- setExportCXFClasspathContainer(EXPORT_CXF_CLASSPATH_CONTAINER_EDEFAULT);
- return;
- case CXFPackage.CXF_DATA_MODEL__PROJECT_NAME:
- setProjectName(PROJECT_NAME_EDEFAULT);
- return;
- case CXFPackage.CXF_DATA_MODEL__RESOURCE_DIRECTORY:
- setResourceDirectory(RESOURCE_DIRECTORY_EDEFAULT);
- return;
- case CXFPackage.CXF_DATA_MODEL__CLASS_DIRECTORY:
- setClassDirectory(CLASS_DIRECTORY_EDEFAULT);
- return;
- case CXFPackage.CXF_DATA_MODEL__WSDL_FILE_NAME:
- setWsdlFileName(WSDL_FILE_NAME_EDEFAULT);
- return;
- case CXFPackage.CXF_DATA_MODEL__WSDL_URL:
- setWsdlURL(WSDL_URL_EDEFAULT);
- return;
- case CXFPackage.CXF_DATA_MODEL__CONFIG_WSDL_LOCATION:
- setConfigWsdlLocation(CONFIG_WSDL_LOCATION_EDEFAULT);
- return;
- case CXFPackage.CXF_DATA_MODEL__FULLY_QUALIFIED_JAVA_CLASS_NAME:
- setFullyQualifiedJavaClassName(FULLY_QUALIFIED_JAVA_CLASS_NAME_EDEFAULT);
- return;
- case CXFPackage.CXF_DATA_MODEL__FULLY_QUALIFIED_JAVA_INTERFACE_NAME:
- setFullyQualifiedJavaInterfaceName(FULLY_QUALIFIED_JAVA_INTERFACE_NAME_EDEFAULT);
- return;
- case CXFPackage.CXF_DATA_MODEL__CONFIG_ID:
- setConfigId(CONFIG_ID_EDEFAULT);
- return;
- case CXFPackage.CXF_DATA_MODEL__TARGET_NAMESPACE:
- setTargetNamespace(TARGET_NAMESPACE_EDEFAULT);
- return;
- case CXFPackage.CXF_DATA_MODEL__ENDPOINT_NAME:
- setEndpointName(ENDPOINT_NAME_EDEFAULT);
- return;
- case CXFPackage.CXF_DATA_MODEL__SERVICE_NAME:
- setServiceName(SERVICE_NAME_EDEFAULT);
- return;
- case CXFPackage.CXF_DATA_MODEL__WSDL_DEFINITION:
- setWsdlDefinition(WSDL_DEFINITION_EDEFAULT);
- return;
- case CXFPackage.CXF_DATA_MODEL__WSDL_LOCATION:
- setWsdlLocation(WSDL_LOCATION_EDEFAULT);
- return;
- }
- super.eUnset(featureID);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public boolean eIsSet(int featureID) {
- switch (featureID) {
- case CXFPackage.CXF_DATA_MODEL__CXF_RUNTIME_LOCATION:
- return CXF_RUNTIME_LOCATION_EDEFAULT == null ? cxfRuntimeLocation != null : !CXF_RUNTIME_LOCATION_EDEFAULT.equals(cxfRuntimeLocation);
- case CXFPackage.CXF_DATA_MODEL__CXF_RUNTIME_EDITION:
- return CXF_RUNTIME_EDITION_EDEFAULT == null ? cxfRuntimeEdition != null : !CXF_RUNTIME_EDITION_EDEFAULT.equals(cxfRuntimeEdition);
- case CXFPackage.CXF_DATA_MODEL__CXF_RUNTIME_VERSION:
- return CXF_RUNTIME_VERSION_EDEFAULT == null ? cxfRuntimeVersion != null : !CXF_RUNTIME_VERSION_EDEFAULT.equals(cxfRuntimeVersion);
- case CXFPackage.CXF_DATA_MODEL__VERBOSE:
- return verbose != VERBOSE_EDEFAULT;
- case CXFPackage.CXF_DATA_MODEL__GENERATE_ANT_BUILD_FILE:
- return generateAntBuildFile != GENERATE_ANT_BUILD_FILE_EDEFAULT;
- case CXFPackage.CXF_DATA_MODEL__GENERATE_CLIENT:
- return generateClient != GENERATE_CLIENT_EDEFAULT;
- case CXFPackage.CXF_DATA_MODEL__GENERATE_SERVER:
- return generateServer != GENERATE_SERVER_EDEFAULT;
- case CXFPackage.CXF_DATA_MODEL__DATABINDING:
- return databinding != DATABINDING_EDEFAULT;
- case CXFPackage.CXF_DATA_MODEL__FRONTEND:
- return frontend != FRONTEND_EDEFAULT;
- case CXFPackage.CXF_DATA_MODEL__USE_SPRING_APPLICATION_CONTEXT:
- return useSpringApplicationContext != USE_SPRING_APPLICATION_CONTEXT_EDEFAULT;
- case CXFPackage.CXF_DATA_MODEL__EXPORT_CXF_CLASSPATH_CONTAINER:
- return exportCXFClasspathContainer != EXPORT_CXF_CLASSPATH_CONTAINER_EDEFAULT;
- case CXFPackage.CXF_DATA_MODEL__PROJECT_NAME:
- return PROJECT_NAME_EDEFAULT == null ? projectName != null : !PROJECT_NAME_EDEFAULT.equals(projectName);
- case CXFPackage.CXF_DATA_MODEL__RESOURCE_DIRECTORY:
- return RESOURCE_DIRECTORY_EDEFAULT == null ? resourceDirectory != null : !RESOURCE_DIRECTORY_EDEFAULT.equals(resourceDirectory);
- case CXFPackage.CXF_DATA_MODEL__CLASS_DIRECTORY:
- return CLASS_DIRECTORY_EDEFAULT == null ? classDirectory != null : !CLASS_DIRECTORY_EDEFAULT.equals(classDirectory);
- case CXFPackage.CXF_DATA_MODEL__WSDL_FILE_NAME:
- return WSDL_FILE_NAME_EDEFAULT == null ? wsdlFileName != null : !WSDL_FILE_NAME_EDEFAULT.equals(wsdlFileName);
- case CXFPackage.CXF_DATA_MODEL__WSDL_URL:
- return WSDL_URL_EDEFAULT == null ? wsdlURL != null : !WSDL_URL_EDEFAULT.equals(wsdlURL);
- case CXFPackage.CXF_DATA_MODEL__CONFIG_WSDL_LOCATION:
- return CONFIG_WSDL_LOCATION_EDEFAULT == null ? configWsdlLocation != null : !CONFIG_WSDL_LOCATION_EDEFAULT.equals(configWsdlLocation);
- case CXFPackage.CXF_DATA_MODEL__FULLY_QUALIFIED_JAVA_CLASS_NAME:
- return FULLY_QUALIFIED_JAVA_CLASS_NAME_EDEFAULT == null ? fullyQualifiedJavaClassName != null : !FULLY_QUALIFIED_JAVA_CLASS_NAME_EDEFAULT.equals(fullyQualifiedJavaClassName);
- case CXFPackage.CXF_DATA_MODEL__FULLY_QUALIFIED_JAVA_INTERFACE_NAME:
- return FULLY_QUALIFIED_JAVA_INTERFACE_NAME_EDEFAULT == null ? fullyQualifiedJavaInterfaceName != null : !FULLY_QUALIFIED_JAVA_INTERFACE_NAME_EDEFAULT.equals(fullyQualifiedJavaInterfaceName);
- case CXFPackage.CXF_DATA_MODEL__CONFIG_ID:
- return CONFIG_ID_EDEFAULT == null ? configId != null : !CONFIG_ID_EDEFAULT.equals(configId);
- case CXFPackage.CXF_DATA_MODEL__TARGET_NAMESPACE:
- return TARGET_NAMESPACE_EDEFAULT == null ? targetNamespace != null : !TARGET_NAMESPACE_EDEFAULT.equals(targetNamespace);
- case CXFPackage.CXF_DATA_MODEL__ENDPOINT_NAME:
- return ENDPOINT_NAME_EDEFAULT == null ? endpointName != null : !ENDPOINT_NAME_EDEFAULT.equals(endpointName);
- case CXFPackage.CXF_DATA_MODEL__SERVICE_NAME:
- return SERVICE_NAME_EDEFAULT == null ? serviceName != null : !SERVICE_NAME_EDEFAULT.equals(serviceName);
- case CXFPackage.CXF_DATA_MODEL__WSDL_DEFINITION:
- return WSDL_DEFINITION_EDEFAULT == null ? wsdlDefinition != null : !WSDL_DEFINITION_EDEFAULT.equals(wsdlDefinition);
- case CXFPackage.CXF_DATA_MODEL__WSDL_LOCATION:
- return WSDL_LOCATION_EDEFAULT == null ? wsdlLocation != null : !WSDL_LOCATION_EDEFAULT.equals(wsdlLocation);
- }
- return super.eIsSet(featureID);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public String toString() {
- if (eIsProxy()) return super.toString();
-
- StringBuffer result = new StringBuffer(super.toString());
- result.append(" (cxfRuntimeLocation: ");
- result.append(cxfRuntimeLocation);
- result.append(", cxfRuntimeEdition: ");
- result.append(cxfRuntimeEdition);
- result.append(", cxfRuntimeVersion: ");
- result.append(cxfRuntimeVersion);
- result.append(", verbose: ");
- result.append(verbose);
- result.append(", generateAntBuildFile: ");
- result.append(generateAntBuildFile);
- result.append(", generateClient: ");
- result.append(generateClient);
- result.append(", generateServer: ");
- result.append(generateServer);
- result.append(", databinding: ");
- result.append(databinding);
- result.append(", frontend: ");
- result.append(frontend);
- result.append(", useSpringApplicationContext: ");
- result.append(useSpringApplicationContext);
- result.append(", exportCXFClasspathContainer: ");
- result.append(exportCXFClasspathContainer);
- result.append(", projectName: ");
- result.append(projectName);
- result.append(", resourceDirectory: ");
- result.append(resourceDirectory);
- result.append(", classDirectory: ");
- result.append(classDirectory);
- result.append(", wsdlFileName: ");
- result.append(wsdlFileName);
- result.append(", wsdlURL: ");
- result.append(wsdlURL);
- result.append(", configWsdlLocation: ");
- result.append(configWsdlLocation);
- result.append(", fullyQualifiedJavaClassName: ");
- result.append(fullyQualifiedJavaClassName);
- result.append(", fullyQualifiedJavaInterfaceName: ");
- result.append(fullyQualifiedJavaInterfaceName);
- result.append(", configId: ");
- result.append(configId);
- result.append(", targetNamespace: ");
- result.append(targetNamespace);
- result.append(", endpointName: ");
- result.append(endpointName);
- result.append(", serviceName: ");
- result.append(serviceName);
- result.append(", wsdlDefinition: ");
- result.append(wsdlDefinition);
- result.append(", wsdlLocation: ");
- result.append(wsdlLocation);
- result.append(')');
- return result.toString();
- }
-
-} //CXFDataModelImpl
diff --git a/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/model/impl/CXFFactoryImpl.java b/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/model/impl/CXFFactoryImpl.java
deleted file mode 100644
index 7c51630..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/model/impl/CXFFactoryImpl.java
+++ /dev/null
@@ -1,287 +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
- *
- * $Id: CXFFactoryImpl.java,v 1.1 2008/11/10 20:37:42 david_williams Exp $
- */
-package org.eclipse.jst.ws.internal.cxf.core.model.impl;
-
-import java.net.URL;
-
-import java.util.Map;
-
-import javax.wsdl.Definition;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EDataType;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EPackage;
-
-import org.eclipse.emf.ecore.impl.EFactoryImpl;
-
-import org.eclipse.emf.ecore.plugin.EcorePlugin;
-
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jst.ws.internal.cxf.core.model.*;
-
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model <b>Factory</b>.
- * <!-- end-user-doc -->
- * @generated
- */
-public class CXFFactoryImpl extends EFactoryImpl implements CXFFactory {
- /**
- * Creates the default factory implementation.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public static CXFFactory init() {
- try {
- CXFFactory theCXFFactory = (CXFFactory)EPackage.Registry.INSTANCE.getEFactory("http:///org/eclipse/jst/ws/internal/cxf/core/model.ecore");
- if (theCXFFactory != null) {
- return theCXFFactory;
- }
- }
- catch (Exception exception) {
- EcorePlugin.INSTANCE.log(exception);
- }
- return new CXFFactoryImpl();
- }
-
- /**
- * Creates an instance of the factory.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public CXFFactoryImpl() {
- super();
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public EObject create(EClass eClass) {
- switch (eClass.getClassifierID()) {
- case CXFPackage.JAVA2_WS_DATA_MODEL: return (EObject)createJava2WSDataModel();
- case CXFPackage.WSDL2_JAVA_DATA_MODEL: return (EObject)createWSDL2JavaDataModel();
- default:
- throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
- }
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public Object createFromString(EDataType eDataType, String initialValue) {
- switch (eDataType.getClassifierID()) {
- case CXFPackage.FRONTEND:
- return createFrontendFromString(eDataType, initialValue);
- case CXFPackage.DATA_BINDING:
- return createDataBindingFromString(eDataType, initialValue);
- case CXFPackage.URL:
- return createURLFromString(eDataType, initialValue);
- case CXFPackage.DEFINITION:
- return createDefinitionFromString(eDataType, initialValue);
- case CXFPackage.MAP:
- return createMapFromString(eDataType, initialValue);
- case CXFPackage.IMETHOD:
- return createIMethodFromString(eDataType, initialValue);
- default:
- throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
- }
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public String convertToString(EDataType eDataType, Object instanceValue) {
- switch (eDataType.getClassifierID()) {
- case CXFPackage.FRONTEND:
- return convertFrontendToString(eDataType, instanceValue);
- case CXFPackage.DATA_BINDING:
- return convertDataBindingToString(eDataType, instanceValue);
- case CXFPackage.URL:
- return convertURLToString(eDataType, instanceValue);
- case CXFPackage.DEFINITION:
- return convertDefinitionToString(eDataType, instanceValue);
- case CXFPackage.MAP:
- return convertMapToString(eDataType, instanceValue);
- case CXFPackage.IMETHOD:
- return convertIMethodToString(eDataType, instanceValue);
- default:
- throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
- }
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public Java2WSDataModel createJava2WSDataModel() {
- Java2WSDataModelImpl java2WSDataModel = new Java2WSDataModelImpl();
- return java2WSDataModel;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public WSDL2JavaDataModel createWSDL2JavaDataModel() {
- WSDL2JavaDataModelImpl wsdl2JavaDataModel = new WSDL2JavaDataModelImpl();
- return wsdl2JavaDataModel;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public Frontend createFrontendFromString(EDataType eDataType, String initialValue) {
- Frontend result = Frontend.get(initialValue);
- if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
- return result;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public String convertFrontendToString(EDataType eDataType, Object instanceValue) {
- return instanceValue == null ? null : instanceValue.toString();
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public DataBinding createDataBindingFromString(EDataType eDataType, String initialValue) {
- DataBinding result = DataBinding.get(initialValue);
- if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
- return result;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public String convertDataBindingToString(EDataType eDataType, Object instanceValue) {
- return instanceValue == null ? null : instanceValue.toString();
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public URL createURLFromString(EDataType eDataType, String initialValue) {
- return (URL)super.createFromString(eDataType, initialValue);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public String convertURLToString(EDataType eDataType, Object instanceValue) {
- return super.convertToString(eDataType, instanceValue);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public Definition createDefinitionFromString(EDataType eDataType, String initialValue) {
- return (Definition)super.createFromString(eDataType, initialValue);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public String convertDefinitionToString(EDataType eDataType, Object instanceValue) {
- return super.convertToString(eDataType, instanceValue);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public Map<?, ?> createMapFromString(EDataType eDataType, String initialValue) {
- return (Map<?, ?>)super.createFromString(initialValue);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public String convertMapToString(EDataType eDataType, Object instanceValue) {
- return super.convertToString(instanceValue);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public IMethod createIMethodFromString(EDataType eDataType, String initialValue) {
- return (IMethod)super.createFromString(eDataType, initialValue);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public String convertIMethodToString(EDataType eDataType, Object instanceValue) {
- return super.convertToString(eDataType, instanceValue);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public CXFPackage getCXFPackage() {
- return (CXFPackage)getEPackage();
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @deprecated
- * @generated
- */
- @Deprecated
- public static CXFPackage getPackage() {
- return CXFPackage.eINSTANCE;
- }
-
-} //CXFFactoryImpl
diff --git a/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/model/impl/CXFPackageImpl.java b/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/model/impl/CXFPackageImpl.java
deleted file mode 100644
index c566bd1..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/model/impl/CXFPackageImpl.java
+++ /dev/null
@@ -1,1177 +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
- *
- * $Id: CXFPackageImpl.java,v 1.5 2009/08/23 22:51:57 sclarke Exp $
- */
-package org.eclipse.jst.ws.internal.cxf.core.model.impl;
-
-import java.util.Map;
-
-import javax.wsdl.Definition;
-
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EDataType;
-import org.eclipse.emf.ecore.EEnum;
-import org.eclipse.emf.ecore.EGenericType;
-import org.eclipse.emf.ecore.EPackage;
-
-import org.eclipse.emf.ecore.impl.EPackageImpl;
-
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jst.ws.internal.cxf.core.model.CXFContext;
-import org.eclipse.jst.ws.internal.cxf.core.model.CXFDataModel;
-import org.eclipse.jst.ws.internal.cxf.core.model.CXFFactory;
-import org.eclipse.jst.ws.internal.cxf.core.model.CXFPackage;
-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.core.model.WSDL2JavaContext;
-import org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaDataModel;
-
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model <b>Package</b>.
- * <!-- end-user-doc -->
- * @generated
- */
-public class CXFPackageImpl extends EPackageImpl implements CXFPackage {
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private EClass cxfContextEClass = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private EClass cxfDataModelEClass = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private EClass java2WSContextEClass = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private EClass java2WSDataModelEClass = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private EClass wsdl2JavaContextEClass = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private EClass wsdl2JavaDataModelEClass = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private EEnum frontendEEnum = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private EEnum dataBindingEEnum = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private EDataType urlEDataType = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private EDataType definitionEDataType = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private EDataType mapEDataType = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private EDataType iMethodEDataType = null;
-
- /**
- * Creates an instance of the model <b>Package</b>, registered with
- * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package
- * package URI value.
- * <p>Note: the correct way to create the package is via the static
- * factory method {@link #init init()}, which also performs
- * initialization of the package, or returns the registered package,
- * if one already exists.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.emf.ecore.EPackage.Registry
- * @see org.eclipse.jst.ws.internal.cxf.core.model.CXFPackage#eNS_URI
- * @see #init()
- * @generated
- */
- private CXFPackageImpl() {
- super(eNS_URI, CXFFactory.eINSTANCE);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private static boolean isInited = false;
-
- /**
- * Creates, registers, and initializes the <b>Package</b> for this
- * model, and for any others upon which it depends. Simple
- * dependencies are satisfied by calling this method on all
- * dependent packages before doing anything else. This method drives
- * initialization for interdependent packages directly, in parallel
- * with this package, itself.
- * <p>Of this package and its interdependencies, all packages which
- * have not yet been registered by their URI values are first created
- * and registered. The packages are then initialized in two steps:
- * meta-model objects for all of the packages are created before any
- * are initialized, since one package's meta-model objects may refer to
- * those of another.
- * <p>Invocation of this method will not affect any packages that have
- * already been initialized.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #eNS_URI
- * @see #createPackageContents()
- * @see #initializePackageContents()
- * @generated
- */
- public static CXFPackage init() {
- if (isInited) return (CXFPackage)EPackage.Registry.INSTANCE.getEPackage(CXFPackage.eNS_URI);
-
- // Obtain or create and register package
- CXFPackageImpl theCXFPackage = (CXFPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(eNS_URI) instanceof CXFPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(eNS_URI) : new CXFPackageImpl());
-
- isInited = true;
-
- // Create package meta-data objects
- theCXFPackage.createPackageContents();
-
- // Initialize created meta-data
- theCXFPackage.initializePackageContents();
-
- // Mark meta-data to indicate it can't be changed
- theCXFPackage.freeze();
-
- return theCXFPackage;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EClass getCXFContext() {
- return cxfContextEClass;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EAttribute getCXFContext_CxfRuntimeLocation() {
- return (EAttribute)cxfContextEClass.getEStructuralFeatures().get(0);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EAttribute getCXFContext_CxfRuntimeEdition() {
- return (EAttribute)cxfContextEClass.getEStructuralFeatures().get(1);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EAttribute getCXFContext_CxfRuntimeVersion() {
- return (EAttribute)cxfContextEClass.getEStructuralFeatures().get(2);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EAttribute getCXFContext_Verbose() {
- return (EAttribute)cxfContextEClass.getEStructuralFeatures().get(3);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EAttribute getCXFContext_GenerateAntBuildFile() {
- return (EAttribute)cxfContextEClass.getEStructuralFeatures().get(4);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EAttribute getCXFContext_GenerateClient() {
- return (EAttribute)cxfContextEClass.getEStructuralFeatures().get(5);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EAttribute getCXFContext_GenerateServer() {
- return (EAttribute)cxfContextEClass.getEStructuralFeatures().get(6);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EAttribute getCXFContext_Databinding() {
- return (EAttribute)cxfContextEClass.getEStructuralFeatures().get(7);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EAttribute getCXFContext_Frontend() {
- return (EAttribute)cxfContextEClass.getEStructuralFeatures().get(8);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EAttribute getCXFContext_UseSpringApplicationContext() {
- return (EAttribute)cxfContextEClass.getEStructuralFeatures().get(9);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EAttribute getCXFContext_ExportCXFClasspathContainer() {
- return (EAttribute)cxfContextEClass.getEStructuralFeatures().get(10);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EClass getCXFDataModel() {
- return cxfDataModelEClass;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EAttribute getCXFDataModel_ProjectName() {
- return (EAttribute)cxfDataModelEClass.getEStructuralFeatures().get(0);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EAttribute getCXFDataModel_ResourceDirectory() {
- return (EAttribute)cxfDataModelEClass.getEStructuralFeatures().get(1);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EAttribute getCXFDataModel_ClassDirectory() {
- return (EAttribute)cxfDataModelEClass.getEStructuralFeatures().get(2);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EAttribute getCXFDataModel_WsdlFileName() {
- return (EAttribute)cxfDataModelEClass.getEStructuralFeatures().get(3);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EAttribute getCXFDataModel_WsdlURL() {
- return (EAttribute)cxfDataModelEClass.getEStructuralFeatures().get(4);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EAttribute getCXFDataModel_ConfigWsdlLocation() {
- return (EAttribute)cxfDataModelEClass.getEStructuralFeatures().get(5);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EAttribute getCXFDataModel_FullyQualifiedJavaClassName() {
- return (EAttribute)cxfDataModelEClass.getEStructuralFeatures().get(6);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EAttribute getCXFDataModel_FullyQualifiedJavaInterfaceName() {
- return (EAttribute)cxfDataModelEClass.getEStructuralFeatures().get(7);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EAttribute getCXFDataModel_ConfigId() {
- return (EAttribute)cxfDataModelEClass.getEStructuralFeatures().get(8);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EAttribute getCXFDataModel_TargetNamespace() {
- return (EAttribute)cxfDataModelEClass.getEStructuralFeatures().get(9);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EAttribute getCXFDataModel_EndpointName() {
- return (EAttribute)cxfDataModelEClass.getEStructuralFeatures().get(10);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EAttribute getCXFDataModel_ServiceName() {
- return (EAttribute)cxfDataModelEClass.getEStructuralFeatures().get(11);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EAttribute getCXFDataModel_WsdlDefinition() {
- return (EAttribute)cxfDataModelEClass.getEStructuralFeatures().get(12);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EAttribute getCXFDataModel_WsdlLocation() {
- return (EAttribute)cxfDataModelEClass.getEStructuralFeatures().get(13);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EClass getJava2WSContext() {
- return java2WSContextEClass;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EAttribute getJava2WSContext_Soap12Binding() {
- return (EAttribute)java2WSContextEClass.getEStructuralFeatures().get(0);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EAttribute getJava2WSContext_GenerateXSDImports() {
- return (EAttribute)java2WSContextEClass.getEStructuralFeatures().get(1);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EAttribute getJava2WSContext_GenerateWSDL() {
- return (EAttribute)java2WSContextEClass.getEStructuralFeatures().get(2);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EAttribute getJava2WSContext_GenerateWrapperFaultBeans() {
- return (EAttribute)java2WSContextEClass.getEStructuralFeatures().get(3);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EAttribute getJava2WSContext_AnnotationProcessingEnabled() {
- return (EAttribute)java2WSContextEClass.getEStructuralFeatures().get(4);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EAttribute getJava2WSContext_GenerateWebMethodAnnotation() {
- return (EAttribute)java2WSContextEClass.getEStructuralFeatures().get(5);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EAttribute getJava2WSContext_GenerateWebParamAnnotation() {
- return (EAttribute)java2WSContextEClass.getEStructuralFeatures().get(6);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EAttribute getJava2WSContext_GenerateRequestWrapperAnnotation() {
- return (EAttribute)java2WSContextEClass.getEStructuralFeatures().get(7);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EAttribute getJava2WSContext_GenerateResponseWrapperAnnotation() {
- return (EAttribute)java2WSContextEClass.getEStructuralFeatures().get(8);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EClass getJava2WSDataModel() {
- return java2WSDataModelEClass;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EAttribute getJava2WSDataModel_Classpath() {
- return (EAttribute)java2WSDataModelEClass.getEStructuralFeatures().get(0);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EAttribute getJava2WSDataModel_JavaStartingPoint() {
- return (EAttribute)java2WSDataModelEClass.getEStructuralFeatures().get(1);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EAttribute getJava2WSDataModel_UseServiceEndpointInterface() {
- return (EAttribute)java2WSDataModelEClass.getEStructuralFeatures().get(2);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EAttribute getJava2WSDataModel_ExtractInterface() {
- return (EAttribute)java2WSDataModelEClass.getEStructuralFeatures().get(3);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EAttribute getJava2WSDataModel_ServiceEndpointInterfaceName() {
- return (EAttribute)java2WSDataModelEClass.getEStructuralFeatures().get(4);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EAttribute getJava2WSDataModel_MethodMap() {
- return (EAttribute)java2WSDataModelEClass.getEStructuralFeatures().get(5);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EAttribute getJava2WSDataModel_AnnotationMap() {
- return (EAttribute)java2WSDataModelEClass.getEStructuralFeatures().get(6);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EAttribute getJava2WSDataModel_SourceDirectory() {
- return (EAttribute)java2WSDataModelEClass.getEStructuralFeatures().get(7);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EAttribute getJava2WSDataModel_PortName() {
- return (EAttribute)java2WSDataModelEClass.getEStructuralFeatures().get(8);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EClass getWSDL2JavaContext() {
- return wsdl2JavaContextEClass;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EAttribute getWSDL2JavaContext_GenerateImplementation() {
- return (EAttribute)wsdl2JavaContextEClass.getEStructuralFeatures().get(0);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EAttribute getWSDL2JavaContext_ProcessSOAPHeaders() {
- return (EAttribute)wsdl2JavaContextEClass.getEStructuralFeatures().get(1);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EAttribute getWSDL2JavaContext_LoadDefaultNamespacePackageNameMapping() {
- return (EAttribute)wsdl2JavaContextEClass.getEStructuralFeatures().get(2);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EAttribute getWSDL2JavaContext_LoadDefaultExcludesNamepsaceMapping() {
- return (EAttribute)wsdl2JavaContextEClass.getEStructuralFeatures().get(3);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EAttribute getWSDL2JavaContext_Validate() {
- return (EAttribute)wsdl2JavaContextEClass.getEStructuralFeatures().get(4);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EAttribute getWSDL2JavaContext_WsdlVersion() {
- return (EAttribute)wsdl2JavaContextEClass.getEStructuralFeatures().get(5);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EAttribute getWSDL2JavaContext_UseDefaultValues() {
- return (EAttribute)wsdl2JavaContextEClass.getEStructuralFeatures().get(6);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EAttribute getWSDL2JavaContext_XjcArgs() {
- return (EAttribute)wsdl2JavaContextEClass.getEStructuralFeatures().get(7);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EAttribute getWSDL2JavaContext_NoAddressBinding() {
- return (EAttribute)wsdl2JavaContextEClass.getEStructuralFeatures().get(8);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EAttribute getWSDL2JavaContext_XjcUseDefaultValues() {
- return (EAttribute)wsdl2JavaContextEClass.getEStructuralFeatures().get(9);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EAttribute getWSDL2JavaContext_XjcToString() {
- return (EAttribute)wsdl2JavaContextEClass.getEStructuralFeatures().get(10);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EAttribute getWSDL2JavaContext_XjcToStringMultiLine() {
- return (EAttribute)wsdl2JavaContextEClass.getEStructuralFeatures().get(11);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EAttribute getWSDL2JavaContext_XjcToStringSimple() {
- return (EAttribute)wsdl2JavaContextEClass.getEStructuralFeatures().get(12);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EAttribute getWSDL2JavaContext_XjcLocator() {
- return (EAttribute)wsdl2JavaContextEClass.getEStructuralFeatures().get(13);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EAttribute getWSDL2JavaContext_XjcSyncMethods() {
- return (EAttribute)wsdl2JavaContextEClass.getEStructuralFeatures().get(14);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EAttribute getWSDL2JavaContext_XjcMarkGenerated() {
- return (EAttribute)wsdl2JavaContextEClass.getEStructuralFeatures().get(15);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EAttribute getWSDL2JavaContext_XjcEpisodeFile() {
- return (EAttribute)wsdl2JavaContextEClass.getEStructuralFeatures().get(16);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EAttribute getWSDL2JavaContext_AutoNameResolution() {
- return (EAttribute)wsdl2JavaContextEClass.getEStructuralFeatures().get(17);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EClass getWSDL2JavaDataModel() {
- return wsdl2JavaDataModelEClass;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EAttribute getWSDL2JavaDataModel_IncludedNamespaces() {
- return (EAttribute)wsdl2JavaDataModelEClass.getEStructuralFeatures().get(0);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EAttribute getWSDL2JavaDataModel_BindingFiles() {
- return (EAttribute)wsdl2JavaDataModelEClass.getEStructuralFeatures().get(1);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EAttribute getWSDL2JavaDataModel_ExcludedNamespaces() {
- return (EAttribute)wsdl2JavaDataModelEClass.getEStructuralFeatures().get(2);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EAttribute getWSDL2JavaDataModel_CatalogFile() {
- return (EAttribute)wsdl2JavaDataModelEClass.getEStructuralFeatures().get(3);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EAttribute getWSDL2JavaDataModel_JavaSourceFolder() {
- return (EAttribute)wsdl2JavaDataModelEClass.getEStructuralFeatures().get(4);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EEnum getFrontend() {
- return frontendEEnum;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EEnum getDataBinding() {
- return dataBindingEEnum;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EDataType getURL() {
- return urlEDataType;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EDataType getDefinition() {
- return definitionEDataType;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EDataType getMap() {
- return mapEDataType;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EDataType getIMethod() {
- return iMethodEDataType;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public CXFFactory getCXFFactory() {
- return (CXFFactory)getEFactoryInstance();
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private boolean isCreated = false;
-
- /**
- * Creates the meta-model objects for the package. This method is
- * guarded to have no affect on any invocation but its first.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void createPackageContents() {
- if (isCreated) return;
- isCreated = true;
-
- // Create classes and their features
- cxfContextEClass = createEClass(CXF_CONTEXT);
- createEAttribute(cxfContextEClass, CXF_CONTEXT__CXF_RUNTIME_LOCATION);
- createEAttribute(cxfContextEClass, CXF_CONTEXT__CXF_RUNTIME_EDITION);
- createEAttribute(cxfContextEClass, CXF_CONTEXT__CXF_RUNTIME_VERSION);
- createEAttribute(cxfContextEClass, CXF_CONTEXT__VERBOSE);
- createEAttribute(cxfContextEClass, CXF_CONTEXT__GENERATE_ANT_BUILD_FILE);
- createEAttribute(cxfContextEClass, CXF_CONTEXT__GENERATE_CLIENT);
- createEAttribute(cxfContextEClass, CXF_CONTEXT__GENERATE_SERVER);
- createEAttribute(cxfContextEClass, CXF_CONTEXT__DATABINDING);
- createEAttribute(cxfContextEClass, CXF_CONTEXT__FRONTEND);
- createEAttribute(cxfContextEClass, CXF_CONTEXT__USE_SPRING_APPLICATION_CONTEXT);
- createEAttribute(cxfContextEClass, CXF_CONTEXT__EXPORT_CXF_CLASSPATH_CONTAINER);
-
- cxfDataModelEClass = createEClass(CXF_DATA_MODEL);
- createEAttribute(cxfDataModelEClass, CXF_DATA_MODEL__PROJECT_NAME);
- createEAttribute(cxfDataModelEClass, CXF_DATA_MODEL__RESOURCE_DIRECTORY);
- createEAttribute(cxfDataModelEClass, CXF_DATA_MODEL__CLASS_DIRECTORY);
- createEAttribute(cxfDataModelEClass, CXF_DATA_MODEL__WSDL_FILE_NAME);
- createEAttribute(cxfDataModelEClass, CXF_DATA_MODEL__WSDL_URL);
- createEAttribute(cxfDataModelEClass, CXF_DATA_MODEL__CONFIG_WSDL_LOCATION);
- createEAttribute(cxfDataModelEClass, CXF_DATA_MODEL__FULLY_QUALIFIED_JAVA_CLASS_NAME);
- createEAttribute(cxfDataModelEClass, CXF_DATA_MODEL__FULLY_QUALIFIED_JAVA_INTERFACE_NAME);
- createEAttribute(cxfDataModelEClass, CXF_DATA_MODEL__CONFIG_ID);
- createEAttribute(cxfDataModelEClass, CXF_DATA_MODEL__TARGET_NAMESPACE);
- createEAttribute(cxfDataModelEClass, CXF_DATA_MODEL__ENDPOINT_NAME);
- createEAttribute(cxfDataModelEClass, CXF_DATA_MODEL__SERVICE_NAME);
- createEAttribute(cxfDataModelEClass, CXF_DATA_MODEL__WSDL_DEFINITION);
- createEAttribute(cxfDataModelEClass, CXF_DATA_MODEL__WSDL_LOCATION);
-
- java2WSContextEClass = createEClass(JAVA2_WS_CONTEXT);
- createEAttribute(java2WSContextEClass, JAVA2_WS_CONTEXT__SOAP12_BINDING);
- createEAttribute(java2WSContextEClass, JAVA2_WS_CONTEXT__GENERATE_XSD_IMPORTS);
- createEAttribute(java2WSContextEClass, JAVA2_WS_CONTEXT__GENERATE_WSDL);
- createEAttribute(java2WSContextEClass, JAVA2_WS_CONTEXT__GENERATE_WRAPPER_FAULT_BEANS);
- createEAttribute(java2WSContextEClass, JAVA2_WS_CONTEXT__ANNOTATION_PROCESSING_ENABLED);
- createEAttribute(java2WSContextEClass, JAVA2_WS_CONTEXT__GENERATE_WEB_METHOD_ANNOTATION);
- createEAttribute(java2WSContextEClass, JAVA2_WS_CONTEXT__GENERATE_WEB_PARAM_ANNOTATION);
- createEAttribute(java2WSContextEClass, JAVA2_WS_CONTEXT__GENERATE_REQUEST_WRAPPER_ANNOTATION);
- createEAttribute(java2WSContextEClass, JAVA2_WS_CONTEXT__GENERATE_RESPONSE_WRAPPER_ANNOTATION);
-
- java2WSDataModelEClass = createEClass(JAVA2_WS_DATA_MODEL);
- createEAttribute(java2WSDataModelEClass, JAVA2_WS_DATA_MODEL__CLASSPATH);
- createEAttribute(java2WSDataModelEClass, JAVA2_WS_DATA_MODEL__JAVA_STARTING_POINT);
- createEAttribute(java2WSDataModelEClass, JAVA2_WS_DATA_MODEL__USE_SERVICE_ENDPOINT_INTERFACE);
- createEAttribute(java2WSDataModelEClass, JAVA2_WS_DATA_MODEL__EXTRACT_INTERFACE);
- createEAttribute(java2WSDataModelEClass, JAVA2_WS_DATA_MODEL__SERVICE_ENDPOINT_INTERFACE_NAME);
- createEAttribute(java2WSDataModelEClass, JAVA2_WS_DATA_MODEL__METHOD_MAP);
- createEAttribute(java2WSDataModelEClass, JAVA2_WS_DATA_MODEL__ANNOTATION_MAP);
- createEAttribute(java2WSDataModelEClass, JAVA2_WS_DATA_MODEL__SOURCE_DIRECTORY);
- createEAttribute(java2WSDataModelEClass, JAVA2_WS_DATA_MODEL__PORT_NAME);
-
- wsdl2JavaContextEClass = createEClass(WSDL2_JAVA_CONTEXT);
- createEAttribute(wsdl2JavaContextEClass, WSDL2_JAVA_CONTEXT__GENERATE_IMPLEMENTATION);
- createEAttribute(wsdl2JavaContextEClass, WSDL2_JAVA_CONTEXT__PROCESS_SOAP_HEADERS);
- createEAttribute(wsdl2JavaContextEClass, WSDL2_JAVA_CONTEXT__LOAD_DEFAULT_NAMESPACE_PACKAGE_NAME_MAPPING);
- createEAttribute(wsdl2JavaContextEClass, WSDL2_JAVA_CONTEXT__LOAD_DEFAULT_EXCLUDES_NAMEPSACE_MAPPING);
- createEAttribute(wsdl2JavaContextEClass, WSDL2_JAVA_CONTEXT__VALIDATE);
- createEAttribute(wsdl2JavaContextEClass, WSDL2_JAVA_CONTEXT__WSDL_VERSION);
- createEAttribute(wsdl2JavaContextEClass, WSDL2_JAVA_CONTEXT__USE_DEFAULT_VALUES);
- createEAttribute(wsdl2JavaContextEClass, WSDL2_JAVA_CONTEXT__XJC_ARGS);
- createEAttribute(wsdl2JavaContextEClass, WSDL2_JAVA_CONTEXT__NO_ADDRESS_BINDING);
- createEAttribute(wsdl2JavaContextEClass, WSDL2_JAVA_CONTEXT__XJC_USE_DEFAULT_VALUES);
- createEAttribute(wsdl2JavaContextEClass, WSDL2_JAVA_CONTEXT__XJC_TO_STRING);
- createEAttribute(wsdl2JavaContextEClass, WSDL2_JAVA_CONTEXT__XJC_TO_STRING_MULTI_LINE);
- createEAttribute(wsdl2JavaContextEClass, WSDL2_JAVA_CONTEXT__XJC_TO_STRING_SIMPLE);
- createEAttribute(wsdl2JavaContextEClass, WSDL2_JAVA_CONTEXT__XJC_LOCATOR);
- createEAttribute(wsdl2JavaContextEClass, WSDL2_JAVA_CONTEXT__XJC_SYNC_METHODS);
- createEAttribute(wsdl2JavaContextEClass, WSDL2_JAVA_CONTEXT__XJC_MARK_GENERATED);
- createEAttribute(wsdl2JavaContextEClass, WSDL2_JAVA_CONTEXT__XJC_EPISODE_FILE);
- createEAttribute(wsdl2JavaContextEClass, WSDL2_JAVA_CONTEXT__AUTO_NAME_RESOLUTION);
-
- wsdl2JavaDataModelEClass = createEClass(WSDL2_JAVA_DATA_MODEL);
- createEAttribute(wsdl2JavaDataModelEClass, WSDL2_JAVA_DATA_MODEL__INCLUDED_NAMESPACES);
- createEAttribute(wsdl2JavaDataModelEClass, WSDL2_JAVA_DATA_MODEL__BINDING_FILES);
- createEAttribute(wsdl2JavaDataModelEClass, WSDL2_JAVA_DATA_MODEL__EXCLUDED_NAMESPACES);
- createEAttribute(wsdl2JavaDataModelEClass, WSDL2_JAVA_DATA_MODEL__CATALOG_FILE);
- createEAttribute(wsdl2JavaDataModelEClass, WSDL2_JAVA_DATA_MODEL__JAVA_SOURCE_FOLDER);
-
- // Create enums
- frontendEEnum = createEEnum(FRONTEND);
- dataBindingEEnum = createEEnum(DATA_BINDING);
-
- // Create data types
- urlEDataType = createEDataType(URL);
- definitionEDataType = createEDataType(DEFINITION);
- mapEDataType = createEDataType(MAP);
- iMethodEDataType = createEDataType(IMETHOD);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private boolean isInitialized = false;
-
- /**
- * Complete the initialization of the package and its meta-model. This
- * method is guarded to have no affect on any invocation but its first.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void initializePackageContents() {
- if (isInitialized) return;
- isInitialized = true;
-
- // Initialize package
- setName(eNAME);
- setNsPrefix(eNS_PREFIX);
- setNsURI(eNS_URI);
-
- // Create type parameters
- addETypeParameter(mapEDataType, "T");
- addETypeParameter(mapEDataType, "T1");
-
- // Set bounds for type parameters
-
- // Add supertypes to classes
- cxfDataModelEClass.getESuperTypes().add(this.getCXFContext());
- java2WSContextEClass.getESuperTypes().add(this.getCXFContext());
- java2WSDataModelEClass.getESuperTypes().add(this.getCXFDataModel());
- java2WSDataModelEClass.getESuperTypes().add(this.getJava2WSContext());
- wsdl2JavaContextEClass.getESuperTypes().add(this.getCXFContext());
- wsdl2JavaDataModelEClass.getESuperTypes().add(this.getCXFDataModel());
- wsdl2JavaDataModelEClass.getESuperTypes().add(this.getWSDL2JavaContext());
-
- // Initialize classes and features; add operations and parameters
- initEClass(cxfContextEClass, CXFContext.class, "CXFContext", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
- initEAttribute(getCXFContext_CxfRuntimeLocation(), ecorePackage.getEString(), "cxfRuntimeLocation", null, 0, 1, CXFContext.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEAttribute(getCXFContext_CxfRuntimeEdition(), ecorePackage.getEString(), "cxfRuntimeEdition", null, 0, 1, CXFContext.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEAttribute(getCXFContext_CxfRuntimeVersion(), ecorePackage.getEString(), "cxfRuntimeVersion", null, 0, 1, CXFContext.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEAttribute(getCXFContext_Verbose(), ecorePackage.getEBoolean(), "verbose", "true", 0, 1, CXFContext.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEAttribute(getCXFContext_GenerateAntBuildFile(), ecorePackage.getEBoolean(), "generateAntBuildFile", "false", 0, 1, CXFContext.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEAttribute(getCXFContext_GenerateClient(), ecorePackage.getEBoolean(), "generateClient", "false", 0, 1, CXFContext.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEAttribute(getCXFContext_GenerateServer(), ecorePackage.getEBoolean(), "generateServer", "false", 0, 1, CXFContext.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEAttribute(getCXFContext_Databinding(), this.getDataBinding(), "databinding", "jaxb", 0, 1, CXFContext.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEAttribute(getCXFContext_Frontend(), this.getFrontend(), "frontend", "jaxws", 0, 1, CXFContext.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEAttribute(getCXFContext_UseSpringApplicationContext(), ecorePackage.getEBoolean(), "useSpringApplicationContext", "true", 0, 1, CXFContext.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEAttribute(getCXFContext_ExportCXFClasspathContainer(), ecorePackage.getEBoolean(), "exportCXFClasspathContainer", "true", 0, 1, CXFContext.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
- initEClass(cxfDataModelEClass, CXFDataModel.class, "CXFDataModel", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
- initEAttribute(getCXFDataModel_ProjectName(), ecorePackage.getEString(), "projectName", null, 0, 1, CXFDataModel.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEAttribute(getCXFDataModel_ResourceDirectory(), ecorePackage.getEString(), "resourceDirectory", null, 0, 1, CXFDataModel.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEAttribute(getCXFDataModel_ClassDirectory(), ecorePackage.getEString(), "classDirectory", null, 0, 1, CXFDataModel.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEAttribute(getCXFDataModel_WsdlFileName(), ecorePackage.getEString(), "wsdlFileName", null, 0, 1, CXFDataModel.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEAttribute(getCXFDataModel_WsdlURL(), this.getURL(), "wsdlURL", null, 0, 1, CXFDataModel.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEAttribute(getCXFDataModel_ConfigWsdlLocation(), ecorePackage.getEString(), "configWsdlLocation", null, 0, 1, CXFDataModel.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEAttribute(getCXFDataModel_FullyQualifiedJavaClassName(), ecorePackage.getEString(), "fullyQualifiedJavaClassName", null, 0, 1, CXFDataModel.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEAttribute(getCXFDataModel_FullyQualifiedJavaInterfaceName(), ecorePackage.getEString(), "fullyQualifiedJavaInterfaceName", null, 0, 1, CXFDataModel.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEAttribute(getCXFDataModel_ConfigId(), ecorePackage.getEString(), "configId", null, 0, 1, CXFDataModel.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEAttribute(getCXFDataModel_TargetNamespace(), ecorePackage.getEString(), "targetNamespace", null, 0, 1, CXFDataModel.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEAttribute(getCXFDataModel_EndpointName(), ecorePackage.getEString(), "endpointName", null, 0, 1, CXFDataModel.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEAttribute(getCXFDataModel_ServiceName(), ecorePackage.getEString(), "serviceName", null, 0, 1, CXFDataModel.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEAttribute(getCXFDataModel_WsdlDefinition(), this.getDefinition(), "wsdlDefinition", null, 0, 1, CXFDataModel.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEAttribute(getCXFDataModel_WsdlLocation(), ecorePackage.getEString(), "wsdlLocation", null, 0, 1, CXFDataModel.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
- initEClass(java2WSContextEClass, Java2WSContext.class, "Java2WSContext", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
- initEAttribute(getJava2WSContext_Soap12Binding(), ecorePackage.getEBoolean(), "soap12Binding", "false", 0, 1, Java2WSContext.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEAttribute(getJava2WSContext_GenerateXSDImports(), ecorePackage.getEBoolean(), "generateXSDImports", "true", 0, 1, Java2WSContext.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEAttribute(getJava2WSContext_GenerateWSDL(), ecorePackage.getEBoolean(), "generateWSDL", "true", 0, 1, Java2WSContext.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEAttribute(getJava2WSContext_GenerateWrapperFaultBeans(), ecorePackage.getEBoolean(), "generateWrapperFaultBeans", "true", 0, 1, Java2WSContext.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEAttribute(getJava2WSContext_AnnotationProcessingEnabled(), ecorePackage.getEBoolean(), "annotationProcessingEnabled", "false", 0, 1, Java2WSContext.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEAttribute(getJava2WSContext_GenerateWebMethodAnnotation(), ecorePackage.getEBoolean(), "generateWebMethodAnnotation", "false", 0, 1, Java2WSContext.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEAttribute(getJava2WSContext_GenerateWebParamAnnotation(), ecorePackage.getEBoolean(), "generateWebParamAnnotation", "false", 0, 1, Java2WSContext.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEAttribute(getJava2WSContext_GenerateRequestWrapperAnnotation(), ecorePackage.getEBoolean(), "generateRequestWrapperAnnotation", "false", 0, 1, Java2WSContext.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEAttribute(getJava2WSContext_GenerateResponseWrapperAnnotation(), ecorePackage.getEBoolean(), "generateResponseWrapperAnnotation", "false", 0, 1, Java2WSContext.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
- initEClass(java2WSDataModelEClass, Java2WSDataModel.class, "Java2WSDataModel", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
- initEAttribute(getJava2WSDataModel_Classpath(), ecorePackage.getEString(), "classpath", null, 0, 1, Java2WSDataModel.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEAttribute(getJava2WSDataModel_JavaStartingPoint(), ecorePackage.getEString(), "javaStartingPoint", null, 0, 1, Java2WSDataModel.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEAttribute(getJava2WSDataModel_UseServiceEndpointInterface(), ecorePackage.getEBoolean(), "useServiceEndpointInterface", null, 0, 1, Java2WSDataModel.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEAttribute(getJava2WSDataModel_ExtractInterface(), ecorePackage.getEBoolean(), "extractInterface", null, 0, 1, Java2WSDataModel.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEAttribute(getJava2WSDataModel_ServiceEndpointInterfaceName(), ecorePackage.getEString(), "serviceEndpointInterfaceName", null, 0, 1, Java2WSDataModel.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- EGenericType g1 = createEGenericType(this.getMap());
- EGenericType g2 = createEGenericType(this.getIMethod());
- g1.getETypeArguments().add(g2);
- g2 = createEGenericType(this.getMap());
- g1.getETypeArguments().add(g2);
- EGenericType g3 = createEGenericType(ecorePackage.getEString());
- g2.getETypeArguments().add(g3);
- g3 = createEGenericType(ecorePackage.getEBooleanObject());
- g2.getETypeArguments().add(g3);
- initEAttribute(getJava2WSDataModel_MethodMap(), g1, "methodMap", null, 0, 1, Java2WSDataModel.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- g1 = createEGenericType(this.getMap());
- g2 = createEGenericType(ecorePackage.getEString());
- g1.getETypeArguments().add(g2);
- g2 = createEGenericType(ecorePackage.getEBooleanObject());
- g1.getETypeArguments().add(g2);
- initEAttribute(getJava2WSDataModel_AnnotationMap(), g1, "annotationMap", null, 0, 1, Java2WSDataModel.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEAttribute(getJava2WSDataModel_SourceDirectory(), ecorePackage.getEString(), "sourceDirectory", null, 0, 1, Java2WSDataModel.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEAttribute(getJava2WSDataModel_PortName(), ecorePackage.getEString(), "portName", null, 0, 1, Java2WSDataModel.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
- initEClass(wsdl2JavaContextEClass, WSDL2JavaContext.class, "WSDL2JavaContext", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
- initEAttribute(getWSDL2JavaContext_GenerateImplementation(), ecorePackage.getEBoolean(), "generateImplementation", "true", 0, 1, WSDL2JavaContext.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEAttribute(getWSDL2JavaContext_ProcessSOAPHeaders(), ecorePackage.getEBoolean(), "processSOAPHeaders", "false", 0, 1, WSDL2JavaContext.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEAttribute(getWSDL2JavaContext_LoadDefaultNamespacePackageNameMapping(), ecorePackage.getEBoolean(), "loadDefaultNamespacePackageNameMapping", "true", 0, 1, WSDL2JavaContext.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEAttribute(getWSDL2JavaContext_LoadDefaultExcludesNamepsaceMapping(), ecorePackage.getEBoolean(), "loadDefaultExcludesNamepsaceMapping", "true", 0, 1, WSDL2JavaContext.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEAttribute(getWSDL2JavaContext_Validate(), ecorePackage.getEBoolean(), "validate", "true", 0, 1, WSDL2JavaContext.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEAttribute(getWSDL2JavaContext_WsdlVersion(), ecorePackage.getEString(), "wsdlVersion", "1.1", 0, 1, WSDL2JavaContext.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEAttribute(getWSDL2JavaContext_UseDefaultValues(), ecorePackage.getEBoolean(), "useDefaultValues", "true", 0, 1, WSDL2JavaContext.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEAttribute(getWSDL2JavaContext_XjcArgs(), ecorePackage.getEString(), "xjcArgs", null, 0, 1, WSDL2JavaContext.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEAttribute(getWSDL2JavaContext_NoAddressBinding(), ecorePackage.getEBoolean(), "noAddressBinding", "false", 0, 1, WSDL2JavaContext.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEAttribute(getWSDL2JavaContext_XjcUseDefaultValues(), ecorePackage.getEBoolean(), "xjcUseDefaultValues", "false", 0, 1, WSDL2JavaContext.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEAttribute(getWSDL2JavaContext_XjcToString(), ecorePackage.getEBoolean(), "xjcToString", "false", 0, 1, WSDL2JavaContext.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEAttribute(getWSDL2JavaContext_XjcToStringMultiLine(), ecorePackage.getEBoolean(), "xjcToStringMultiLine", "false", 0, 1, WSDL2JavaContext.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEAttribute(getWSDL2JavaContext_XjcToStringSimple(), ecorePackage.getEBoolean(), "xjcToStringSimple", "false", 0, 1, WSDL2JavaContext.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEAttribute(getWSDL2JavaContext_XjcLocator(), ecorePackage.getEBoolean(), "xjcLocator", "false", 0, 1, WSDL2JavaContext.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEAttribute(getWSDL2JavaContext_XjcSyncMethods(), ecorePackage.getEBoolean(), "xjcSyncMethods", "false", 0, 1, WSDL2JavaContext.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEAttribute(getWSDL2JavaContext_XjcMarkGenerated(), ecorePackage.getEBoolean(), "xjcMarkGenerated", "false", 0, 1, WSDL2JavaContext.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEAttribute(getWSDL2JavaContext_XjcEpisodeFile(), ecorePackage.getEString(), "xjcEpisodeFile", null, 0, 1, WSDL2JavaContext.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEAttribute(getWSDL2JavaContext_AutoNameResolution(), ecorePackage.getEBoolean(), "autoNameResolution", "false", 0, 1, WSDL2JavaContext.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
- initEClass(wsdl2JavaDataModelEClass, WSDL2JavaDataModel.class, "WSDL2JavaDataModel", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
- g1 = createEGenericType(this.getMap());
- g2 = createEGenericType(ecorePackage.getEString());
- g1.getETypeArguments().add(g2);
- g2 = createEGenericType(ecorePackage.getEString());
- g1.getETypeArguments().add(g2);
- initEAttribute(getWSDL2JavaDataModel_IncludedNamespaces(), g1, "includedNamespaces", null, 0, 1, WSDL2JavaDataModel.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEAttribute(getWSDL2JavaDataModel_BindingFiles(), ecorePackage.getEString(), "bindingFiles", null, 0, -1, WSDL2JavaDataModel.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- g1 = createEGenericType(this.getMap());
- g2 = createEGenericType(ecorePackage.getEString());
- g1.getETypeArguments().add(g2);
- g2 = createEGenericType(ecorePackage.getEString());
- g1.getETypeArguments().add(g2);
- initEAttribute(getWSDL2JavaDataModel_ExcludedNamespaces(), g1, "excludedNamespaces", null, 0, 1, WSDL2JavaDataModel.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEAttribute(getWSDL2JavaDataModel_CatalogFile(), ecorePackage.getEString(), "catalogFile", null, 0, 1, WSDL2JavaDataModel.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEAttribute(getWSDL2JavaDataModel_JavaSourceFolder(), ecorePackage.getEString(), "javaSourceFolder", null, 0, 1, WSDL2JavaDataModel.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
- // Initialize enums and add enum literals
- initEEnum(frontendEEnum, Frontend.class, "Frontend");
- addEEnumLiteral(frontendEEnum, Frontend.JAXWS);
-
- initEEnum(dataBindingEEnum, DataBinding.class, "DataBinding");
- addEEnumLiteral(dataBindingEEnum, DataBinding.JAXB);
-
- // Initialize data types
- initEDataType(urlEDataType, java.net.URL.class, "URL", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS);
- initEDataType(definitionEDataType, Definition.class, "Definition", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS);
- initEDataType(mapEDataType, Map.class, "Map", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS);
- initEDataType(iMethodEDataType, IMethod.class, "IMethod", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS);
-
- // Create resource
- createResource(eNS_URI);
- }
-
-} //CXFPackageImpl
diff --git a/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/model/impl/Java2WSDataModelImpl.java b/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/model/impl/Java2WSDataModelImpl.java
deleted file mode 100644
index 399f07c..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/model/impl/Java2WSDataModelImpl.java
+++ /dev/null
@@ -1,1124 +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
- *
- * $Id: Java2WSDataModelImpl.java,v 1.2 2009/08/23 22:51:57 sclarke Exp $
- */
-package org.eclipse.jst.ws.internal.cxf.core.model.impl;
-
-import java.util.Map;
-
-import org.eclipse.emf.common.notify.Notification;
-
-import org.eclipse.emf.ecore.EClass;
-
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jst.ws.internal.cxf.core.model.CXFPackage;
-import org.eclipse.jst.ws.internal.cxf.core.model.Java2WSContext;
-import org.eclipse.jst.ws.internal.cxf.core.model.Java2WSDataModel;
-
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Java2 WS Data Model</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- * <li>{@link org.eclipse.jst.ws.internal.cxf.core.model.impl.Java2WSDataModelImpl#isSoap12Binding <em>Soap12 Binding</em>}</li>
- * <li>{@link org.eclipse.jst.ws.internal.cxf.core.model.impl.Java2WSDataModelImpl#isGenerateXSDImports <em>Generate XSD Imports</em>}</li>
- * <li>{@link org.eclipse.jst.ws.internal.cxf.core.model.impl.Java2WSDataModelImpl#isGenerateWSDL <em>Generate WSDL</em>}</li>
- * <li>{@link org.eclipse.jst.ws.internal.cxf.core.model.impl.Java2WSDataModelImpl#isGenerateWrapperFaultBeans <em>Generate Wrapper Fault Beans</em>}</li>
- * <li>{@link org.eclipse.jst.ws.internal.cxf.core.model.impl.Java2WSDataModelImpl#isAnnotationProcessingEnabled <em>Annotation Processing Enabled</em>}</li>
- * <li>{@link org.eclipse.jst.ws.internal.cxf.core.model.impl.Java2WSDataModelImpl#isGenerateWebMethodAnnotation <em>Generate Web Method Annotation</em>}</li>
- * <li>{@link org.eclipse.jst.ws.internal.cxf.core.model.impl.Java2WSDataModelImpl#isGenerateWebParamAnnotation <em>Generate Web Param Annotation</em>}</li>
- * <li>{@link org.eclipse.jst.ws.internal.cxf.core.model.impl.Java2WSDataModelImpl#isGenerateRequestWrapperAnnotation <em>Generate Request Wrapper Annotation</em>}</li>
- * <li>{@link org.eclipse.jst.ws.internal.cxf.core.model.impl.Java2WSDataModelImpl#isGenerateResponseWrapperAnnotation <em>Generate Response Wrapper Annotation</em>}</li>
- * <li>{@link org.eclipse.jst.ws.internal.cxf.core.model.impl.Java2WSDataModelImpl#getClasspath <em>Classpath</em>}</li>
- * <li>{@link org.eclipse.jst.ws.internal.cxf.core.model.impl.Java2WSDataModelImpl#getJavaStartingPoint <em>Java Starting Point</em>}</li>
- * <li>{@link org.eclipse.jst.ws.internal.cxf.core.model.impl.Java2WSDataModelImpl#isUseServiceEndpointInterface <em>Use Service Endpoint Interface</em>}</li>
- * <li>{@link org.eclipse.jst.ws.internal.cxf.core.model.impl.Java2WSDataModelImpl#isExtractInterface <em>Extract Interface</em>}</li>
- * <li>{@link org.eclipse.jst.ws.internal.cxf.core.model.impl.Java2WSDataModelImpl#getServiceEndpointInterfaceName <em>Service Endpoint Interface Name</em>}</li>
- * <li>{@link org.eclipse.jst.ws.internal.cxf.core.model.impl.Java2WSDataModelImpl#getMethodMap <em>Method Map</em>}</li>
- * <li>{@link org.eclipse.jst.ws.internal.cxf.core.model.impl.Java2WSDataModelImpl#getAnnotationMap <em>Annotation Map</em>}</li>
- * <li>{@link org.eclipse.jst.ws.internal.cxf.core.model.impl.Java2WSDataModelImpl#getSourceDirectory <em>Source Directory</em>}</li>
- * <li>{@link org.eclipse.jst.ws.internal.cxf.core.model.impl.Java2WSDataModelImpl#getPortName <em>Port Name</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class Java2WSDataModelImpl extends CXFDataModelImpl implements Java2WSDataModel {
- /**
- * The default value of the '{@link #isSoap12Binding() <em>Soap12 Binding</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #isSoap12Binding()
- * @generated
- * @ordered
- */
- protected static final boolean SOAP12_BINDING_EDEFAULT = false;
-
- /**
- * The cached value of the '{@link #isSoap12Binding() <em>Soap12 Binding</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #isSoap12Binding()
- * @generated
- * @ordered
- */
- protected boolean soap12Binding = SOAP12_BINDING_EDEFAULT;
-
- /**
- * The default value of the '{@link #isGenerateXSDImports() <em>Generate XSD Imports</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #isGenerateXSDImports()
- * @generated
- * @ordered
- */
- protected static final boolean GENERATE_XSD_IMPORTS_EDEFAULT = true;
-
- /**
- * The cached value of the '{@link #isGenerateXSDImports() <em>Generate XSD Imports</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #isGenerateXSDImports()
- * @generated
- * @ordered
- */
- protected boolean generateXSDImports = GENERATE_XSD_IMPORTS_EDEFAULT;
-
- /**
- * The default value of the '{@link #isGenerateWSDL() <em>Generate WSDL</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #isGenerateWSDL()
- * @generated
- * @ordered
- */
- protected static final boolean GENERATE_WSDL_EDEFAULT = true;
-
- /**
- * The cached value of the '{@link #isGenerateWSDL() <em>Generate WSDL</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #isGenerateWSDL()
- * @generated
- * @ordered
- */
- protected boolean generateWSDL = GENERATE_WSDL_EDEFAULT;
-
- /**
- * The default value of the '{@link #isGenerateWrapperFaultBeans() <em>Generate Wrapper Fault Beans</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #isGenerateWrapperFaultBeans()
- * @generated
- * @ordered
- */
- protected static final boolean GENERATE_WRAPPER_FAULT_BEANS_EDEFAULT = true;
-
- /**
- * The cached value of the '{@link #isGenerateWrapperFaultBeans() <em>Generate Wrapper Fault Beans</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #isGenerateWrapperFaultBeans()
- * @generated
- * @ordered
- */
- protected boolean generateWrapperFaultBeans = GENERATE_WRAPPER_FAULT_BEANS_EDEFAULT;
-
- /**
- * The default value of the '{@link #isAnnotationProcessingEnabled() <em>Annotation Processing Enabled</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #isAnnotationProcessingEnabled()
- * @generated
- * @ordered
- */
- protected static final boolean ANNOTATION_PROCESSING_ENABLED_EDEFAULT = false;
-
- /**
- * The cached value of the '{@link #isAnnotationProcessingEnabled() <em>Annotation Processing Enabled</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #isAnnotationProcessingEnabled()
- * @generated
- * @ordered
- */
- protected boolean annotationProcessingEnabled = ANNOTATION_PROCESSING_ENABLED_EDEFAULT;
-
- /**
- * The default value of the '{@link #isGenerateWebMethodAnnotation() <em>Generate Web Method Annotation</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #isGenerateWebMethodAnnotation()
- * @generated
- * @ordered
- */
- protected static final boolean GENERATE_WEB_METHOD_ANNOTATION_EDEFAULT = false;
-
- /**
- * The cached value of the '{@link #isGenerateWebMethodAnnotation() <em>Generate Web Method Annotation</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #isGenerateWebMethodAnnotation()
- * @generated
- * @ordered
- */
- protected boolean generateWebMethodAnnotation = GENERATE_WEB_METHOD_ANNOTATION_EDEFAULT;
-
- /**
- * The default value of the '{@link #isGenerateWebParamAnnotation() <em>Generate Web Param Annotation</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #isGenerateWebParamAnnotation()
- * @generated
- * @ordered
- */
- protected static final boolean GENERATE_WEB_PARAM_ANNOTATION_EDEFAULT = false;
-
- /**
- * The cached value of the '{@link #isGenerateWebParamAnnotation() <em>Generate Web Param Annotation</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #isGenerateWebParamAnnotation()
- * @generated
- * @ordered
- */
- protected boolean generateWebParamAnnotation = GENERATE_WEB_PARAM_ANNOTATION_EDEFAULT;
-
- /**
- * The default value of the '{@link #isGenerateRequestWrapperAnnotation() <em>Generate Request Wrapper Annotation</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #isGenerateRequestWrapperAnnotation()
- * @generated
- * @ordered
- */
- protected static final boolean GENERATE_REQUEST_WRAPPER_ANNOTATION_EDEFAULT = false;
-
- /**
- * The cached value of the '{@link #isGenerateRequestWrapperAnnotation() <em>Generate Request Wrapper Annotation</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #isGenerateRequestWrapperAnnotation()
- * @generated
- * @ordered
- */
- protected boolean generateRequestWrapperAnnotation = GENERATE_REQUEST_WRAPPER_ANNOTATION_EDEFAULT;
-
- /**
- * The default value of the '{@link #isGenerateResponseWrapperAnnotation() <em>Generate Response Wrapper Annotation</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #isGenerateResponseWrapperAnnotation()
- * @generated
- * @ordered
- */
- protected static final boolean GENERATE_RESPONSE_WRAPPER_ANNOTATION_EDEFAULT = false;
-
- /**
- * The cached value of the '{@link #isGenerateResponseWrapperAnnotation() <em>Generate Response Wrapper Annotation</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #isGenerateResponseWrapperAnnotation()
- * @generated
- * @ordered
- */
- protected boolean generateResponseWrapperAnnotation = GENERATE_RESPONSE_WRAPPER_ANNOTATION_EDEFAULT;
-
- /**
- * The default value of the '{@link #getClasspath() <em>Classpath</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getClasspath()
- * @generated
- * @ordered
- */
- protected static final String CLASSPATH_EDEFAULT = null;
-
- /**
- * The cached value of the '{@link #getClasspath() <em>Classpath</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getClasspath()
- * @generated
- * @ordered
- */
- protected String classpath = CLASSPATH_EDEFAULT;
-
- /**
- * The default value of the '{@link #getJavaStartingPoint() <em>Java Starting Point</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getJavaStartingPoint()
- * @generated
- * @ordered
- */
- protected static final String JAVA_STARTING_POINT_EDEFAULT = null;
-
- /**
- * The cached value of the '{@link #getJavaStartingPoint() <em>Java Starting Point</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getJavaStartingPoint()
- * @generated
- * @ordered
- */
- protected String javaStartingPoint = JAVA_STARTING_POINT_EDEFAULT;
-
- /**
- * The default value of the '{@link #isUseServiceEndpointInterface() <em>Use Service Endpoint Interface</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #isUseServiceEndpointInterface()
- * @generated
- * @ordered
- */
- protected static final boolean USE_SERVICE_ENDPOINT_INTERFACE_EDEFAULT = false;
-
- /**
- * The cached value of the '{@link #isUseServiceEndpointInterface() <em>Use Service Endpoint Interface</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #isUseServiceEndpointInterface()
- * @generated
- * @ordered
- */
- protected boolean useServiceEndpointInterface = USE_SERVICE_ENDPOINT_INTERFACE_EDEFAULT;
-
- /**
- * The default value of the '{@link #isExtractInterface() <em>Extract Interface</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #isExtractInterface()
- * @generated
- * @ordered
- */
- protected static final boolean EXTRACT_INTERFACE_EDEFAULT = false;
-
- /**
- * The cached value of the '{@link #isExtractInterface() <em>Extract Interface</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #isExtractInterface()
- * @generated
- * @ordered
- */
- protected boolean extractInterface = EXTRACT_INTERFACE_EDEFAULT;
-
- /**
- * The default value of the '{@link #getServiceEndpointInterfaceName() <em>Service Endpoint Interface Name</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getServiceEndpointInterfaceName()
- * @generated
- * @ordered
- */
- protected static final String SERVICE_ENDPOINT_INTERFACE_NAME_EDEFAULT = null;
-
- /**
- * The cached value of the '{@link #getServiceEndpointInterfaceName() <em>Service Endpoint Interface Name</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getServiceEndpointInterfaceName()
- * @generated
- * @ordered
- */
- protected String serviceEndpointInterfaceName = SERVICE_ENDPOINT_INTERFACE_NAME_EDEFAULT;
-
- /**
- * The cached value of the '{@link #getMethodMap() <em>Method Map</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getMethodMap()
- * @generated
- * @ordered
- */
- protected Map<IMethod, Map<String, Boolean>> methodMap;
-
- /**
- * The cached value of the '{@link #getAnnotationMap() <em>Annotation Map</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getAnnotationMap()
- * @generated
- * @ordered
- */
- protected Map<String, Boolean> annotationMap;
-
- /**
- * The default value of the '{@link #getSourceDirectory() <em>Source Directory</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getSourceDirectory()
- * @generated
- * @ordered
- */
- protected static final String SOURCE_DIRECTORY_EDEFAULT = null;
-
- /**
- * The cached value of the '{@link #getSourceDirectory() <em>Source Directory</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getSourceDirectory()
- * @generated
- * @ordered
- */
- protected String sourceDirectory = SOURCE_DIRECTORY_EDEFAULT;
-
- /**
- * The default value of the '{@link #getPortName() <em>Port Name</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getPortName()
- * @generated
- * @ordered
- */
- protected static final String PORT_NAME_EDEFAULT = null;
-
- /**
- * The cached value of the '{@link #getPortName() <em>Port Name</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getPortName()
- * @generated
- * @ordered
- */
- protected String portName = PORT_NAME_EDEFAULT;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected Java2WSDataModelImpl() {
- super();
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- protected EClass eStaticClass() {
- return CXFPackage.Literals.JAVA2_WS_DATA_MODEL;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public boolean isSoap12Binding() {
- return soap12Binding;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setSoap12Binding(boolean newSoap12Binding) {
- boolean oldSoap12Binding = soap12Binding;
- soap12Binding = newSoap12Binding;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, CXFPackage.JAVA2_WS_DATA_MODEL__SOAP12_BINDING, oldSoap12Binding, soap12Binding));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public boolean isGenerateXSDImports() {
- return generateXSDImports;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setGenerateXSDImports(boolean newGenerateXSDImports) {
- boolean oldGenerateXSDImports = generateXSDImports;
- generateXSDImports = newGenerateXSDImports;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, CXFPackage.JAVA2_WS_DATA_MODEL__GENERATE_XSD_IMPORTS, oldGenerateXSDImports, generateXSDImports));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public boolean isGenerateWSDL() {
- return generateWSDL;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setGenerateWSDL(boolean newGenerateWSDL) {
- boolean oldGenerateWSDL = generateWSDL;
- generateWSDL = newGenerateWSDL;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, CXFPackage.JAVA2_WS_DATA_MODEL__GENERATE_WSDL, oldGenerateWSDL, generateWSDL));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public boolean isGenerateWrapperFaultBeans() {
- return generateWrapperFaultBeans;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setGenerateWrapperFaultBeans(boolean newGenerateWrapperFaultBeans) {
- boolean oldGenerateWrapperFaultBeans = generateWrapperFaultBeans;
- generateWrapperFaultBeans = newGenerateWrapperFaultBeans;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, CXFPackage.JAVA2_WS_DATA_MODEL__GENERATE_WRAPPER_FAULT_BEANS, oldGenerateWrapperFaultBeans, generateWrapperFaultBeans));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public boolean isAnnotationProcessingEnabled() {
- return annotationProcessingEnabled;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setAnnotationProcessingEnabled(boolean newAnnotationProcessingEnabled) {
- boolean oldAnnotationProcessingEnabled = annotationProcessingEnabled;
- annotationProcessingEnabled = newAnnotationProcessingEnabled;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, CXFPackage.JAVA2_WS_DATA_MODEL__ANNOTATION_PROCESSING_ENABLED, oldAnnotationProcessingEnabled, annotationProcessingEnabled));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public boolean isGenerateWebMethodAnnotation() {
- return generateWebMethodAnnotation;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setGenerateWebMethodAnnotation(boolean newGenerateWebMethodAnnotation) {
- boolean oldGenerateWebMethodAnnotation = generateWebMethodAnnotation;
- generateWebMethodAnnotation = newGenerateWebMethodAnnotation;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, CXFPackage.JAVA2_WS_DATA_MODEL__GENERATE_WEB_METHOD_ANNOTATION, oldGenerateWebMethodAnnotation, generateWebMethodAnnotation));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public boolean isGenerateWebParamAnnotation() {
- return generateWebParamAnnotation;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setGenerateWebParamAnnotation(boolean newGenerateWebParamAnnotation) {
- boolean oldGenerateWebParamAnnotation = generateWebParamAnnotation;
- generateWebParamAnnotation = newGenerateWebParamAnnotation;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, CXFPackage.JAVA2_WS_DATA_MODEL__GENERATE_WEB_PARAM_ANNOTATION, oldGenerateWebParamAnnotation, generateWebParamAnnotation));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public boolean isGenerateRequestWrapperAnnotation() {
- return generateRequestWrapperAnnotation;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setGenerateRequestWrapperAnnotation(boolean newGenerateRequestWrapperAnnotation) {
- boolean oldGenerateRequestWrapperAnnotation = generateRequestWrapperAnnotation;
- generateRequestWrapperAnnotation = newGenerateRequestWrapperAnnotation;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, CXFPackage.JAVA2_WS_DATA_MODEL__GENERATE_REQUEST_WRAPPER_ANNOTATION, oldGenerateRequestWrapperAnnotation, generateRequestWrapperAnnotation));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public boolean isGenerateResponseWrapperAnnotation() {
- return generateResponseWrapperAnnotation;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setGenerateResponseWrapperAnnotation(boolean newGenerateResponseWrapperAnnotation) {
- boolean oldGenerateResponseWrapperAnnotation = generateResponseWrapperAnnotation;
- generateResponseWrapperAnnotation = newGenerateResponseWrapperAnnotation;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, CXFPackage.JAVA2_WS_DATA_MODEL__GENERATE_RESPONSE_WRAPPER_ANNOTATION, oldGenerateResponseWrapperAnnotation, generateResponseWrapperAnnotation));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public String getClasspath() {
- return classpath;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setClasspath(String newClasspath) {
- String oldClasspath = classpath;
- classpath = newClasspath;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, CXFPackage.JAVA2_WS_DATA_MODEL__CLASSPATH, oldClasspath, classpath));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public String getJavaStartingPoint() {
- return javaStartingPoint;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setJavaStartingPoint(String newJavaStartingPoint) {
- String oldJavaStartingPoint = javaStartingPoint;
- javaStartingPoint = newJavaStartingPoint;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, CXFPackage.JAVA2_WS_DATA_MODEL__JAVA_STARTING_POINT, oldJavaStartingPoint, javaStartingPoint));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public boolean isUseServiceEndpointInterface() {
- return useServiceEndpointInterface;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setUseServiceEndpointInterface(boolean newUseServiceEndpointInterface) {
- boolean oldUseServiceEndpointInterface = useServiceEndpointInterface;
- useServiceEndpointInterface = newUseServiceEndpointInterface;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, CXFPackage.JAVA2_WS_DATA_MODEL__USE_SERVICE_ENDPOINT_INTERFACE, oldUseServiceEndpointInterface, useServiceEndpointInterface));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public boolean isExtractInterface() {
- return extractInterface;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setExtractInterface(boolean newExtractInterface) {
- boolean oldExtractInterface = extractInterface;
- extractInterface = newExtractInterface;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, CXFPackage.JAVA2_WS_DATA_MODEL__EXTRACT_INTERFACE, oldExtractInterface, extractInterface));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public String getServiceEndpointInterfaceName() {
- return serviceEndpointInterfaceName;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setServiceEndpointInterfaceName(String newServiceEndpointInterfaceName) {
- String oldServiceEndpointInterfaceName = serviceEndpointInterfaceName;
- serviceEndpointInterfaceName = newServiceEndpointInterfaceName;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, CXFPackage.JAVA2_WS_DATA_MODEL__SERVICE_ENDPOINT_INTERFACE_NAME, oldServiceEndpointInterfaceName, serviceEndpointInterfaceName));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public Map<IMethod, Map<String, Boolean>> getMethodMap() {
- return methodMap;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setMethodMap(Map<IMethod, Map<String, Boolean>> newMethodMap) {
- Map<IMethod, Map<String, Boolean>> oldMethodMap = methodMap;
- methodMap = newMethodMap;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, CXFPackage.JAVA2_WS_DATA_MODEL__METHOD_MAP, oldMethodMap, methodMap));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public Map<String, Boolean> getAnnotationMap() {
- return annotationMap;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setAnnotationMap(Map<String, Boolean> newAnnotationMap) {
- Map<String, Boolean> oldAnnotationMap = annotationMap;
- annotationMap = newAnnotationMap;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, CXFPackage.JAVA2_WS_DATA_MODEL__ANNOTATION_MAP, oldAnnotationMap, annotationMap));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public String getSourceDirectory() {
- return sourceDirectory;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setSourceDirectory(String newSourceDirectory) {
- String oldSourceDirectory = sourceDirectory;
- sourceDirectory = newSourceDirectory;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, CXFPackage.JAVA2_WS_DATA_MODEL__SOURCE_DIRECTORY, oldSourceDirectory, sourceDirectory));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public String getPortName() {
- return portName;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setPortName(String newPortName) {
- String oldPortName = portName;
- portName = newPortName;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, CXFPackage.JAVA2_WS_DATA_MODEL__PORT_NAME, oldPortName, portName));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public Object eGet(int featureID, boolean resolve, boolean coreType) {
- switch (featureID) {
- case CXFPackage.JAVA2_WS_DATA_MODEL__SOAP12_BINDING:
- return isSoap12Binding() ? Boolean.TRUE : Boolean.FALSE;
- case CXFPackage.JAVA2_WS_DATA_MODEL__GENERATE_XSD_IMPORTS:
- return isGenerateXSDImports() ? Boolean.TRUE : Boolean.FALSE;
- case CXFPackage.JAVA2_WS_DATA_MODEL__GENERATE_WSDL:
- return isGenerateWSDL() ? Boolean.TRUE : Boolean.FALSE;
- case CXFPackage.JAVA2_WS_DATA_MODEL__GENERATE_WRAPPER_FAULT_BEANS:
- return isGenerateWrapperFaultBeans() ? Boolean.TRUE : Boolean.FALSE;
- case CXFPackage.JAVA2_WS_DATA_MODEL__ANNOTATION_PROCESSING_ENABLED:
- return isAnnotationProcessingEnabled() ? Boolean.TRUE : Boolean.FALSE;
- case CXFPackage.JAVA2_WS_DATA_MODEL__GENERATE_WEB_METHOD_ANNOTATION:
- return isGenerateWebMethodAnnotation() ? Boolean.TRUE : Boolean.FALSE;
- case CXFPackage.JAVA2_WS_DATA_MODEL__GENERATE_WEB_PARAM_ANNOTATION:
- return isGenerateWebParamAnnotation() ? Boolean.TRUE : Boolean.FALSE;
- case CXFPackage.JAVA2_WS_DATA_MODEL__GENERATE_REQUEST_WRAPPER_ANNOTATION:
- return isGenerateRequestWrapperAnnotation() ? Boolean.TRUE : Boolean.FALSE;
- case CXFPackage.JAVA2_WS_DATA_MODEL__GENERATE_RESPONSE_WRAPPER_ANNOTATION:
- return isGenerateResponseWrapperAnnotation() ? Boolean.TRUE : Boolean.FALSE;
- case CXFPackage.JAVA2_WS_DATA_MODEL__CLASSPATH:
- return getClasspath();
- case CXFPackage.JAVA2_WS_DATA_MODEL__JAVA_STARTING_POINT:
- return getJavaStartingPoint();
- case CXFPackage.JAVA2_WS_DATA_MODEL__USE_SERVICE_ENDPOINT_INTERFACE:
- return isUseServiceEndpointInterface() ? Boolean.TRUE : Boolean.FALSE;
- case CXFPackage.JAVA2_WS_DATA_MODEL__EXTRACT_INTERFACE:
- return isExtractInterface() ? Boolean.TRUE : Boolean.FALSE;
- case CXFPackage.JAVA2_WS_DATA_MODEL__SERVICE_ENDPOINT_INTERFACE_NAME:
- return getServiceEndpointInterfaceName();
- case CXFPackage.JAVA2_WS_DATA_MODEL__METHOD_MAP:
- return getMethodMap();
- case CXFPackage.JAVA2_WS_DATA_MODEL__ANNOTATION_MAP:
- return getAnnotationMap();
- case CXFPackage.JAVA2_WS_DATA_MODEL__SOURCE_DIRECTORY:
- return getSourceDirectory();
- case CXFPackage.JAVA2_WS_DATA_MODEL__PORT_NAME:
- return getPortName();
- }
- return super.eGet(featureID, resolve, coreType);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @SuppressWarnings("unchecked")
- @Override
- public void eSet(int featureID, Object newValue) {
- switch (featureID) {
- case CXFPackage.JAVA2_WS_DATA_MODEL__SOAP12_BINDING:
- setSoap12Binding(((Boolean)newValue).booleanValue());
- return;
- case CXFPackage.JAVA2_WS_DATA_MODEL__GENERATE_XSD_IMPORTS:
- setGenerateXSDImports(((Boolean)newValue).booleanValue());
- return;
- case CXFPackage.JAVA2_WS_DATA_MODEL__GENERATE_WSDL:
- setGenerateWSDL(((Boolean)newValue).booleanValue());
- return;
- case CXFPackage.JAVA2_WS_DATA_MODEL__GENERATE_WRAPPER_FAULT_BEANS:
- setGenerateWrapperFaultBeans(((Boolean)newValue).booleanValue());
- return;
- case CXFPackage.JAVA2_WS_DATA_MODEL__ANNOTATION_PROCESSING_ENABLED:
- setAnnotationProcessingEnabled(((Boolean)newValue).booleanValue());
- return;
- case CXFPackage.JAVA2_WS_DATA_MODEL__GENERATE_WEB_METHOD_ANNOTATION:
- setGenerateWebMethodAnnotation(((Boolean)newValue).booleanValue());
- return;
- case CXFPackage.JAVA2_WS_DATA_MODEL__GENERATE_WEB_PARAM_ANNOTATION:
- setGenerateWebParamAnnotation(((Boolean)newValue).booleanValue());
- return;
- case CXFPackage.JAVA2_WS_DATA_MODEL__GENERATE_REQUEST_WRAPPER_ANNOTATION:
- setGenerateRequestWrapperAnnotation(((Boolean)newValue).booleanValue());
- return;
- case CXFPackage.JAVA2_WS_DATA_MODEL__GENERATE_RESPONSE_WRAPPER_ANNOTATION:
- setGenerateResponseWrapperAnnotation(((Boolean)newValue).booleanValue());
- return;
- case CXFPackage.JAVA2_WS_DATA_MODEL__CLASSPATH:
- setClasspath((String)newValue);
- return;
- case CXFPackage.JAVA2_WS_DATA_MODEL__JAVA_STARTING_POINT:
- setJavaStartingPoint((String)newValue);
- return;
- case CXFPackage.JAVA2_WS_DATA_MODEL__USE_SERVICE_ENDPOINT_INTERFACE:
- setUseServiceEndpointInterface(((Boolean)newValue).booleanValue());
- return;
- case CXFPackage.JAVA2_WS_DATA_MODEL__EXTRACT_INTERFACE:
- setExtractInterface(((Boolean)newValue).booleanValue());
- return;
- case CXFPackage.JAVA2_WS_DATA_MODEL__SERVICE_ENDPOINT_INTERFACE_NAME:
- setServiceEndpointInterfaceName((String)newValue);
- return;
- case CXFPackage.JAVA2_WS_DATA_MODEL__METHOD_MAP:
- setMethodMap((Map<IMethod, Map<String, Boolean>>)newValue);
- return;
- case CXFPackage.JAVA2_WS_DATA_MODEL__ANNOTATION_MAP:
- setAnnotationMap((Map<String, Boolean>)newValue);
- return;
- case CXFPackage.JAVA2_WS_DATA_MODEL__SOURCE_DIRECTORY:
- setSourceDirectory((String)newValue);
- return;
- case CXFPackage.JAVA2_WS_DATA_MODEL__PORT_NAME:
- setPortName((String)newValue);
- return;
- }
- super.eSet(featureID, newValue);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public void eUnset(int featureID) {
- switch (featureID) {
- case CXFPackage.JAVA2_WS_DATA_MODEL__SOAP12_BINDING:
- setSoap12Binding(SOAP12_BINDING_EDEFAULT);
- return;
- case CXFPackage.JAVA2_WS_DATA_MODEL__GENERATE_XSD_IMPORTS:
- setGenerateXSDImports(GENERATE_XSD_IMPORTS_EDEFAULT);
- return;
- case CXFPackage.JAVA2_WS_DATA_MODEL__GENERATE_WSDL:
- setGenerateWSDL(GENERATE_WSDL_EDEFAULT);
- return;
- case CXFPackage.JAVA2_WS_DATA_MODEL__GENERATE_WRAPPER_FAULT_BEANS:
- setGenerateWrapperFaultBeans(GENERATE_WRAPPER_FAULT_BEANS_EDEFAULT);
- return;
- case CXFPackage.JAVA2_WS_DATA_MODEL__ANNOTATION_PROCESSING_ENABLED:
- setAnnotationProcessingEnabled(ANNOTATION_PROCESSING_ENABLED_EDEFAULT);
- return;
- case CXFPackage.JAVA2_WS_DATA_MODEL__GENERATE_WEB_METHOD_ANNOTATION:
- setGenerateWebMethodAnnotation(GENERATE_WEB_METHOD_ANNOTATION_EDEFAULT);
- return;
- case CXFPackage.JAVA2_WS_DATA_MODEL__GENERATE_WEB_PARAM_ANNOTATION:
- setGenerateWebParamAnnotation(GENERATE_WEB_PARAM_ANNOTATION_EDEFAULT);
- return;
- case CXFPackage.JAVA2_WS_DATA_MODEL__GENERATE_REQUEST_WRAPPER_ANNOTATION:
- setGenerateRequestWrapperAnnotation(GENERATE_REQUEST_WRAPPER_ANNOTATION_EDEFAULT);
- return;
- case CXFPackage.JAVA2_WS_DATA_MODEL__GENERATE_RESPONSE_WRAPPER_ANNOTATION:
- setGenerateResponseWrapperAnnotation(GENERATE_RESPONSE_WRAPPER_ANNOTATION_EDEFAULT);
- return;
- case CXFPackage.JAVA2_WS_DATA_MODEL__CLASSPATH:
- setClasspath(CLASSPATH_EDEFAULT);
- return;
- case CXFPackage.JAVA2_WS_DATA_MODEL__JAVA_STARTING_POINT:
- setJavaStartingPoint(JAVA_STARTING_POINT_EDEFAULT);
- return;
- case CXFPackage.JAVA2_WS_DATA_MODEL__USE_SERVICE_ENDPOINT_INTERFACE:
- setUseServiceEndpointInterface(USE_SERVICE_ENDPOINT_INTERFACE_EDEFAULT);
- return;
- case CXFPackage.JAVA2_WS_DATA_MODEL__EXTRACT_INTERFACE:
- setExtractInterface(EXTRACT_INTERFACE_EDEFAULT);
- return;
- case CXFPackage.JAVA2_WS_DATA_MODEL__SERVICE_ENDPOINT_INTERFACE_NAME:
- setServiceEndpointInterfaceName(SERVICE_ENDPOINT_INTERFACE_NAME_EDEFAULT);
- return;
- case CXFPackage.JAVA2_WS_DATA_MODEL__METHOD_MAP:
- setMethodMap((Map<IMethod, Map<String, Boolean>>)null);
- return;
- case CXFPackage.JAVA2_WS_DATA_MODEL__ANNOTATION_MAP:
- setAnnotationMap((Map<String, Boolean>)null);
- return;
- case CXFPackage.JAVA2_WS_DATA_MODEL__SOURCE_DIRECTORY:
- setSourceDirectory(SOURCE_DIRECTORY_EDEFAULT);
- return;
- case CXFPackage.JAVA2_WS_DATA_MODEL__PORT_NAME:
- setPortName(PORT_NAME_EDEFAULT);
- return;
- }
- super.eUnset(featureID);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public boolean eIsSet(int featureID) {
- switch (featureID) {
- case CXFPackage.JAVA2_WS_DATA_MODEL__SOAP12_BINDING:
- return soap12Binding != SOAP12_BINDING_EDEFAULT;
- case CXFPackage.JAVA2_WS_DATA_MODEL__GENERATE_XSD_IMPORTS:
- return generateXSDImports != GENERATE_XSD_IMPORTS_EDEFAULT;
- case CXFPackage.JAVA2_WS_DATA_MODEL__GENERATE_WSDL:
- return generateWSDL != GENERATE_WSDL_EDEFAULT;
- case CXFPackage.JAVA2_WS_DATA_MODEL__GENERATE_WRAPPER_FAULT_BEANS:
- return generateWrapperFaultBeans != GENERATE_WRAPPER_FAULT_BEANS_EDEFAULT;
- case CXFPackage.JAVA2_WS_DATA_MODEL__ANNOTATION_PROCESSING_ENABLED:
- return annotationProcessingEnabled != ANNOTATION_PROCESSING_ENABLED_EDEFAULT;
- case CXFPackage.JAVA2_WS_DATA_MODEL__GENERATE_WEB_METHOD_ANNOTATION:
- return generateWebMethodAnnotation != GENERATE_WEB_METHOD_ANNOTATION_EDEFAULT;
- case CXFPackage.JAVA2_WS_DATA_MODEL__GENERATE_WEB_PARAM_ANNOTATION:
- return generateWebParamAnnotation != GENERATE_WEB_PARAM_ANNOTATION_EDEFAULT;
- case CXFPackage.JAVA2_WS_DATA_MODEL__GENERATE_REQUEST_WRAPPER_ANNOTATION:
- return generateRequestWrapperAnnotation != GENERATE_REQUEST_WRAPPER_ANNOTATION_EDEFAULT;
- case CXFPackage.JAVA2_WS_DATA_MODEL__GENERATE_RESPONSE_WRAPPER_ANNOTATION:
- return generateResponseWrapperAnnotation != GENERATE_RESPONSE_WRAPPER_ANNOTATION_EDEFAULT;
- case CXFPackage.JAVA2_WS_DATA_MODEL__CLASSPATH:
- return CLASSPATH_EDEFAULT == null ? classpath != null : !CLASSPATH_EDEFAULT.equals(classpath);
- case CXFPackage.JAVA2_WS_DATA_MODEL__JAVA_STARTING_POINT:
- return JAVA_STARTING_POINT_EDEFAULT == null ? javaStartingPoint != null : !JAVA_STARTING_POINT_EDEFAULT.equals(javaStartingPoint);
- case CXFPackage.JAVA2_WS_DATA_MODEL__USE_SERVICE_ENDPOINT_INTERFACE:
- return useServiceEndpointInterface != USE_SERVICE_ENDPOINT_INTERFACE_EDEFAULT;
- case CXFPackage.JAVA2_WS_DATA_MODEL__EXTRACT_INTERFACE:
- return extractInterface != EXTRACT_INTERFACE_EDEFAULT;
- case CXFPackage.JAVA2_WS_DATA_MODEL__SERVICE_ENDPOINT_INTERFACE_NAME:
- return SERVICE_ENDPOINT_INTERFACE_NAME_EDEFAULT == null ? serviceEndpointInterfaceName != null : !SERVICE_ENDPOINT_INTERFACE_NAME_EDEFAULT.equals(serviceEndpointInterfaceName);
- case CXFPackage.JAVA2_WS_DATA_MODEL__METHOD_MAP:
- return methodMap != null;
- case CXFPackage.JAVA2_WS_DATA_MODEL__ANNOTATION_MAP:
- return annotationMap != null;
- case CXFPackage.JAVA2_WS_DATA_MODEL__SOURCE_DIRECTORY:
- return SOURCE_DIRECTORY_EDEFAULT == null ? sourceDirectory != null : !SOURCE_DIRECTORY_EDEFAULT.equals(sourceDirectory);
- case CXFPackage.JAVA2_WS_DATA_MODEL__PORT_NAME:
- return PORT_NAME_EDEFAULT == null ? portName != null : !PORT_NAME_EDEFAULT.equals(portName);
- }
- return super.eIsSet(featureID);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass) {
- if (baseClass == Java2WSContext.class) {
- switch (derivedFeatureID) {
- case CXFPackage.JAVA2_WS_DATA_MODEL__SOAP12_BINDING: return CXFPackage.JAVA2_WS_CONTEXT__SOAP12_BINDING;
- case CXFPackage.JAVA2_WS_DATA_MODEL__GENERATE_XSD_IMPORTS: return CXFPackage.JAVA2_WS_CONTEXT__GENERATE_XSD_IMPORTS;
- case CXFPackage.JAVA2_WS_DATA_MODEL__GENERATE_WSDL: return CXFPackage.JAVA2_WS_CONTEXT__GENERATE_WSDL;
- case CXFPackage.JAVA2_WS_DATA_MODEL__GENERATE_WRAPPER_FAULT_BEANS: return CXFPackage.JAVA2_WS_CONTEXT__GENERATE_WRAPPER_FAULT_BEANS;
- case CXFPackage.JAVA2_WS_DATA_MODEL__ANNOTATION_PROCESSING_ENABLED: return CXFPackage.JAVA2_WS_CONTEXT__ANNOTATION_PROCESSING_ENABLED;
- case CXFPackage.JAVA2_WS_DATA_MODEL__GENERATE_WEB_METHOD_ANNOTATION: return CXFPackage.JAVA2_WS_CONTEXT__GENERATE_WEB_METHOD_ANNOTATION;
- case CXFPackage.JAVA2_WS_DATA_MODEL__GENERATE_WEB_PARAM_ANNOTATION: return CXFPackage.JAVA2_WS_CONTEXT__GENERATE_WEB_PARAM_ANNOTATION;
- case CXFPackage.JAVA2_WS_DATA_MODEL__GENERATE_REQUEST_WRAPPER_ANNOTATION: return CXFPackage.JAVA2_WS_CONTEXT__GENERATE_REQUEST_WRAPPER_ANNOTATION;
- case CXFPackage.JAVA2_WS_DATA_MODEL__GENERATE_RESPONSE_WRAPPER_ANNOTATION: return CXFPackage.JAVA2_WS_CONTEXT__GENERATE_RESPONSE_WRAPPER_ANNOTATION;
- default: return -1;
- }
- }
- return super.eBaseStructuralFeatureID(derivedFeatureID, baseClass);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public int eDerivedStructuralFeatureID(int baseFeatureID, Class<?> baseClass) {
- if (baseClass == Java2WSContext.class) {
- switch (baseFeatureID) {
- case CXFPackage.JAVA2_WS_CONTEXT__SOAP12_BINDING: return CXFPackage.JAVA2_WS_DATA_MODEL__SOAP12_BINDING;
- case CXFPackage.JAVA2_WS_CONTEXT__GENERATE_XSD_IMPORTS: return CXFPackage.JAVA2_WS_DATA_MODEL__GENERATE_XSD_IMPORTS;
- case CXFPackage.JAVA2_WS_CONTEXT__GENERATE_WSDL: return CXFPackage.JAVA2_WS_DATA_MODEL__GENERATE_WSDL;
- case CXFPackage.JAVA2_WS_CONTEXT__GENERATE_WRAPPER_FAULT_BEANS: return CXFPackage.JAVA2_WS_DATA_MODEL__GENERATE_WRAPPER_FAULT_BEANS;
- case CXFPackage.JAVA2_WS_CONTEXT__ANNOTATION_PROCESSING_ENABLED: return CXFPackage.JAVA2_WS_DATA_MODEL__ANNOTATION_PROCESSING_ENABLED;
- case CXFPackage.JAVA2_WS_CONTEXT__GENERATE_WEB_METHOD_ANNOTATION: return CXFPackage.JAVA2_WS_DATA_MODEL__GENERATE_WEB_METHOD_ANNOTATION;
- case CXFPackage.JAVA2_WS_CONTEXT__GENERATE_WEB_PARAM_ANNOTATION: return CXFPackage.JAVA2_WS_DATA_MODEL__GENERATE_WEB_PARAM_ANNOTATION;
- case CXFPackage.JAVA2_WS_CONTEXT__GENERATE_REQUEST_WRAPPER_ANNOTATION: return CXFPackage.JAVA2_WS_DATA_MODEL__GENERATE_REQUEST_WRAPPER_ANNOTATION;
- case CXFPackage.JAVA2_WS_CONTEXT__GENERATE_RESPONSE_WRAPPER_ANNOTATION: return CXFPackage.JAVA2_WS_DATA_MODEL__GENERATE_RESPONSE_WRAPPER_ANNOTATION;
- default: return -1;
- }
- }
- return super.eDerivedStructuralFeatureID(baseFeatureID, baseClass);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public String toString() {
- if (eIsProxy()) return super.toString();
-
- StringBuffer result = new StringBuffer(super.toString());
- result.append(" (soap12Binding: ");
- result.append(soap12Binding);
- result.append(", generateXSDImports: ");
- result.append(generateXSDImports);
- result.append(", generateWSDL: ");
- result.append(generateWSDL);
- result.append(", generateWrapperFaultBeans: ");
- result.append(generateWrapperFaultBeans);
- result.append(", annotationProcessingEnabled: ");
- result.append(annotationProcessingEnabled);
- result.append(", generateWebMethodAnnotation: ");
- result.append(generateWebMethodAnnotation);
- result.append(", generateWebParamAnnotation: ");
- result.append(generateWebParamAnnotation);
- result.append(", generateRequestWrapperAnnotation: ");
- result.append(generateRequestWrapperAnnotation);
- result.append(", generateResponseWrapperAnnotation: ");
- result.append(generateResponseWrapperAnnotation);
- result.append(", classpath: ");
- result.append(classpath);
- result.append(", javaStartingPoint: ");
- result.append(javaStartingPoint);
- result.append(", useServiceEndpointInterface: ");
- result.append(useServiceEndpointInterface);
- result.append(", extractInterface: ");
- result.append(extractInterface);
- result.append(", serviceEndpointInterfaceName: ");
- result.append(serviceEndpointInterfaceName);
- result.append(", methodMap: ");
- result.append(methodMap);
- result.append(", annotationMap: ");
- result.append(annotationMap);
- result.append(", sourceDirectory: ");
- result.append(sourceDirectory);
- result.append(", portName: ");
- result.append(portName);
- result.append(')');
- return result.toString();
- }
-
-} //Java2WSDataModelImpl
diff --git a/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/model/impl/WSDL2JavaDataModelImpl.java b/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/model/impl/WSDL2JavaDataModelImpl.java
deleted file mode 100644
index 93a7053..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/model/impl/WSDL2JavaDataModelImpl.java
+++ /dev/null
@@ -1,1397 +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
- *
- * $Id: WSDL2JavaDataModelImpl.java,v 1.2 2009/04/06 21:33:14 sclarke Exp $
- */
-package org.eclipse.jst.ws.internal.cxf.core.model.impl;
-
-import java.util.Collection;
-import java.util.Map;
-
-import org.eclipse.emf.common.notify.Notification;
-
-import org.eclipse.emf.common.util.EList;
-
-import org.eclipse.emf.ecore.EClass;
-
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
-import org.eclipse.emf.ecore.util.EDataTypeUniqueEList;
-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.model.WSDL2JavaDataModel;
-
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>WSDL2 Java Data Model</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- * <li>{@link org.eclipse.jst.ws.internal.cxf.core.model.impl.WSDL2JavaDataModelImpl#isGenerateImplementation <em>Generate Implementation</em>}</li>
- * <li>{@link org.eclipse.jst.ws.internal.cxf.core.model.impl.WSDL2JavaDataModelImpl#isProcessSOAPHeaders <em>Process SOAP Headers</em>}</li>
- * <li>{@link org.eclipse.jst.ws.internal.cxf.core.model.impl.WSDL2JavaDataModelImpl#isLoadDefaultNamespacePackageNameMapping <em>Load Default Namespace Package Name Mapping</em>}</li>
- * <li>{@link org.eclipse.jst.ws.internal.cxf.core.model.impl.WSDL2JavaDataModelImpl#isLoadDefaultExcludesNamepsaceMapping <em>Load Default Excludes Namepsace Mapping</em>}</li>
- * <li>{@link org.eclipse.jst.ws.internal.cxf.core.model.impl.WSDL2JavaDataModelImpl#isValidate <em>Validate</em>}</li>
- * <li>{@link org.eclipse.jst.ws.internal.cxf.core.model.impl.WSDL2JavaDataModelImpl#getWsdlVersion <em>Wsdl Version</em>}</li>
- * <li>{@link org.eclipse.jst.ws.internal.cxf.core.model.impl.WSDL2JavaDataModelImpl#isUseDefaultValues <em>Use Default Values</em>}</li>
- * <li>{@link org.eclipse.jst.ws.internal.cxf.core.model.impl.WSDL2JavaDataModelImpl#getXjcArgs <em>Xjc Args</em>}</li>
- * <li>{@link org.eclipse.jst.ws.internal.cxf.core.model.impl.WSDL2JavaDataModelImpl#isNoAddressBinding <em>No Address Binding</em>}</li>
- * <li>{@link org.eclipse.jst.ws.internal.cxf.core.model.impl.WSDL2JavaDataModelImpl#isXjcUseDefaultValues <em>Xjc Use Default Values</em>}</li>
- * <li>{@link org.eclipse.jst.ws.internal.cxf.core.model.impl.WSDL2JavaDataModelImpl#isXjcToString <em>Xjc To String</em>}</li>
- * <li>{@link org.eclipse.jst.ws.internal.cxf.core.model.impl.WSDL2JavaDataModelImpl#isXjcToStringMultiLine <em>Xjc To String Multi Line</em>}</li>
- * <li>{@link org.eclipse.jst.ws.internal.cxf.core.model.impl.WSDL2JavaDataModelImpl#isXjcToStringSimple <em>Xjc To String Simple</em>}</li>
- * <li>{@link org.eclipse.jst.ws.internal.cxf.core.model.impl.WSDL2JavaDataModelImpl#isXjcLocator <em>Xjc Locator</em>}</li>
- * <li>{@link org.eclipse.jst.ws.internal.cxf.core.model.impl.WSDL2JavaDataModelImpl#isXjcSyncMethods <em>Xjc Sync Methods</em>}</li>
- * <li>{@link org.eclipse.jst.ws.internal.cxf.core.model.impl.WSDL2JavaDataModelImpl#isXjcMarkGenerated <em>Xjc Mark Generated</em>}</li>
- * <li>{@link org.eclipse.jst.ws.internal.cxf.core.model.impl.WSDL2JavaDataModelImpl#getXjcEpisodeFile <em>Xjc Episode File</em>}</li>
- * <li>{@link org.eclipse.jst.ws.internal.cxf.core.model.impl.WSDL2JavaDataModelImpl#isAutoNameResolution <em>Auto Name Resolution</em>}</li>
- * <li>{@link org.eclipse.jst.ws.internal.cxf.core.model.impl.WSDL2JavaDataModelImpl#getIncludedNamespaces <em>Included Namespaces</em>}</li>
- * <li>{@link org.eclipse.jst.ws.internal.cxf.core.model.impl.WSDL2JavaDataModelImpl#getBindingFiles <em>Binding Files</em>}</li>
- * <li>{@link org.eclipse.jst.ws.internal.cxf.core.model.impl.WSDL2JavaDataModelImpl#getExcludedNamespaces <em>Excluded Namespaces</em>}</li>
- * <li>{@link org.eclipse.jst.ws.internal.cxf.core.model.impl.WSDL2JavaDataModelImpl#getCatalogFile <em>Catalog File</em>}</li>
- * <li>{@link org.eclipse.jst.ws.internal.cxf.core.model.impl.WSDL2JavaDataModelImpl#getJavaSourceFolder <em>Java Source Folder</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class WSDL2JavaDataModelImpl extends CXFDataModelImpl implements WSDL2JavaDataModel {
- /**
- * The default value of the '{@link #isGenerateImplementation() <em>Generate Implementation</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #isGenerateImplementation()
- * @generated
- * @ordered
- */
- protected static final boolean GENERATE_IMPLEMENTATION_EDEFAULT = true;
-
- /**
- * The cached value of the '{@link #isGenerateImplementation() <em>Generate Implementation</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #isGenerateImplementation()
- * @generated
- * @ordered
- */
- protected boolean generateImplementation = GENERATE_IMPLEMENTATION_EDEFAULT;
-
- /**
- * The default value of the '{@link #isProcessSOAPHeaders() <em>Process SOAP Headers</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #isProcessSOAPHeaders()
- * @generated
- * @ordered
- */
- protected static final boolean PROCESS_SOAP_HEADERS_EDEFAULT = false;
-
- /**
- * The cached value of the '{@link #isProcessSOAPHeaders() <em>Process SOAP Headers</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #isProcessSOAPHeaders()
- * @generated
- * @ordered
- */
- protected boolean processSOAPHeaders = PROCESS_SOAP_HEADERS_EDEFAULT;
-
- /**
- * The default value of the '{@link #isLoadDefaultNamespacePackageNameMapping() <em>Load Default Namespace Package Name Mapping</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #isLoadDefaultNamespacePackageNameMapping()
- * @generated
- * @ordered
- */
- protected static final boolean LOAD_DEFAULT_NAMESPACE_PACKAGE_NAME_MAPPING_EDEFAULT = true;
-
- /**
- * The cached value of the '{@link #isLoadDefaultNamespacePackageNameMapping() <em>Load Default Namespace Package Name Mapping</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #isLoadDefaultNamespacePackageNameMapping()
- * @generated
- * @ordered
- */
- protected boolean loadDefaultNamespacePackageNameMapping = LOAD_DEFAULT_NAMESPACE_PACKAGE_NAME_MAPPING_EDEFAULT;
-
- /**
- * The default value of the '{@link #isLoadDefaultExcludesNamepsaceMapping() <em>Load Default Excludes Namepsace Mapping</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #isLoadDefaultExcludesNamepsaceMapping()
- * @generated
- * @ordered
- */
- protected static final boolean LOAD_DEFAULT_EXCLUDES_NAMEPSACE_MAPPING_EDEFAULT = true;
-
- /**
- * The cached value of the '{@link #isLoadDefaultExcludesNamepsaceMapping() <em>Load Default Excludes Namepsace Mapping</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #isLoadDefaultExcludesNamepsaceMapping()
- * @generated
- * @ordered
- */
- protected boolean loadDefaultExcludesNamepsaceMapping = LOAD_DEFAULT_EXCLUDES_NAMEPSACE_MAPPING_EDEFAULT;
-
- /**
- * The default value of the '{@link #isValidate() <em>Validate</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #isValidate()
- * @generated
- * @ordered
- */
- protected static final boolean VALIDATE_EDEFAULT = true;
-
- /**
- * The cached value of the '{@link #isValidate() <em>Validate</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #isValidate()
- * @generated
- * @ordered
- */
- protected boolean validate = VALIDATE_EDEFAULT;
-
- /**
- * The default value of the '{@link #getWsdlVersion() <em>Wsdl Version</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getWsdlVersion()
- * @generated
- * @ordered
- */
- protected static final String WSDL_VERSION_EDEFAULT = "1.1";
-
- /**
- * The cached value of the '{@link #getWsdlVersion() <em>Wsdl Version</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getWsdlVersion()
- * @generated
- * @ordered
- */
- protected String wsdlVersion = WSDL_VERSION_EDEFAULT;
-
- /**
- * The default value of the '{@link #isUseDefaultValues() <em>Use Default Values</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #isUseDefaultValues()
- * @generated
- * @ordered
- */
- protected static final boolean USE_DEFAULT_VALUES_EDEFAULT = true;
-
- /**
- * The cached value of the '{@link #isUseDefaultValues() <em>Use Default Values</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #isUseDefaultValues()
- * @generated
- * @ordered
- */
- protected boolean useDefaultValues = USE_DEFAULT_VALUES_EDEFAULT;
-
- /**
- * The default value of the '{@link #getXjcArgs() <em>Xjc Args</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getXjcArgs()
- * @generated
- * @ordered
- */
- protected static final String XJC_ARGS_EDEFAULT = null;
-
- /**
- * The cached value of the '{@link #getXjcArgs() <em>Xjc Args</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getXjcArgs()
- * @generated
- * @ordered
- */
- protected String xjcArgs = XJC_ARGS_EDEFAULT;
-
- /**
- * The default value of the '{@link #isNoAddressBinding() <em>No Address Binding</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #isNoAddressBinding()
- * @generated
- * @ordered
- */
- protected static final boolean NO_ADDRESS_BINDING_EDEFAULT = false;
-
- /**
- * The cached value of the '{@link #isNoAddressBinding() <em>No Address Binding</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #isNoAddressBinding()
- * @generated
- * @ordered
- */
- protected boolean noAddressBinding = NO_ADDRESS_BINDING_EDEFAULT;
-
- /**
- * The default value of the '{@link #isXjcUseDefaultValues() <em>Xjc Use Default Values</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #isXjcUseDefaultValues()
- * @generated
- * @ordered
- */
- protected static final boolean XJC_USE_DEFAULT_VALUES_EDEFAULT = false;
-
- /**
- * The cached value of the '{@link #isXjcUseDefaultValues() <em>Xjc Use Default Values</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #isXjcUseDefaultValues()
- * @generated
- * @ordered
- */
- protected boolean xjcUseDefaultValues = XJC_USE_DEFAULT_VALUES_EDEFAULT;
-
- /**
- * The default value of the '{@link #isXjcToString() <em>Xjc To String</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #isXjcToString()
- * @generated
- * @ordered
- */
- protected static final boolean XJC_TO_STRING_EDEFAULT = false;
-
- /**
- * The cached value of the '{@link #isXjcToString() <em>Xjc To String</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #isXjcToString()
- * @generated
- * @ordered
- */
- protected boolean xjcToString = XJC_TO_STRING_EDEFAULT;
-
- /**
- * The default value of the '{@link #isXjcToStringMultiLine() <em>Xjc To String Multi Line</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #isXjcToStringMultiLine()
- * @generated
- * @ordered
- */
- protected static final boolean XJC_TO_STRING_MULTI_LINE_EDEFAULT = false;
-
- /**
- * The cached value of the '{@link #isXjcToStringMultiLine() <em>Xjc To String Multi Line</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #isXjcToStringMultiLine()
- * @generated
- * @ordered
- */
- protected boolean xjcToStringMultiLine = XJC_TO_STRING_MULTI_LINE_EDEFAULT;
-
- /**
- * The default value of the '{@link #isXjcToStringSimple() <em>Xjc To String Simple</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #isXjcToStringSimple()
- * @generated
- * @ordered
- */
- protected static final boolean XJC_TO_STRING_SIMPLE_EDEFAULT = false;
-
- /**
- * The cached value of the '{@link #isXjcToStringSimple() <em>Xjc To String Simple</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #isXjcToStringSimple()
- * @generated
- * @ordered
- */
- protected boolean xjcToStringSimple = XJC_TO_STRING_SIMPLE_EDEFAULT;
-
- /**
- * The default value of the '{@link #isXjcLocator() <em>Xjc Locator</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #isXjcLocator()
- * @generated
- * @ordered
- */
- protected static final boolean XJC_LOCATOR_EDEFAULT = false;
-
- /**
- * The cached value of the '{@link #isXjcLocator() <em>Xjc Locator</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #isXjcLocator()
- * @generated
- * @ordered
- */
- protected boolean xjcLocator = XJC_LOCATOR_EDEFAULT;
-
- /**
- * The default value of the '{@link #isXjcSyncMethods() <em>Xjc Sync Methods</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #isXjcSyncMethods()
- * @generated
- * @ordered
- */
- protected static final boolean XJC_SYNC_METHODS_EDEFAULT = false;
-
- /**
- * The cached value of the '{@link #isXjcSyncMethods() <em>Xjc Sync Methods</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #isXjcSyncMethods()
- * @generated
- * @ordered
- */
- protected boolean xjcSyncMethods = XJC_SYNC_METHODS_EDEFAULT;
-
- /**
- * The default value of the '{@link #isXjcMarkGenerated() <em>Xjc Mark Generated</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #isXjcMarkGenerated()
- * @generated
- * @ordered
- */
- protected static final boolean XJC_MARK_GENERATED_EDEFAULT = false;
-
- /**
- * The cached value of the '{@link #isXjcMarkGenerated() <em>Xjc Mark Generated</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #isXjcMarkGenerated()
- * @generated
- * @ordered
- */
- protected boolean xjcMarkGenerated = XJC_MARK_GENERATED_EDEFAULT;
-
- /**
- * The default value of the '{@link #getXjcEpisodeFile() <em>Xjc Episode File</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getXjcEpisodeFile()
- * @generated
- * @ordered
- */
- protected static final String XJC_EPISODE_FILE_EDEFAULT = null;
-
- /**
- * The cached value of the '{@link #getXjcEpisodeFile() <em>Xjc Episode File</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getXjcEpisodeFile()
- * @generated
- * @ordered
- */
- protected String xjcEpisodeFile = XJC_EPISODE_FILE_EDEFAULT;
-
- /**
- * The default value of the '{@link #isAutoNameResolution() <em>Auto Name Resolution</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #isAutoNameResolution()
- * @generated
- * @ordered
- */
- protected static final boolean AUTO_NAME_RESOLUTION_EDEFAULT = false;
-
- /**
- * The cached value of the '{@link #isAutoNameResolution() <em>Auto Name Resolution</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #isAutoNameResolution()
- * @generated
- * @ordered
- */
- protected boolean autoNameResolution = AUTO_NAME_RESOLUTION_EDEFAULT;
-
- /**
- * The cached value of the '{@link #getIncludedNamespaces() <em>Included Namespaces</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getIncludedNamespaces()
- * @generated
- * @ordered
- */
- protected Map<String, String> includedNamespaces;
-
- /**
- * The cached value of the '{@link #getBindingFiles() <em>Binding Files</em>}' attribute list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getBindingFiles()
- * @generated
- * @ordered
- */
- protected EList<String> bindingFiles;
-
- /**
- * The cached value of the '{@link #getExcludedNamespaces() <em>Excluded Namespaces</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getExcludedNamespaces()
- * @generated
- * @ordered
- */
- protected Map<String, String> excludedNamespaces;
-
- /**
- * The default value of the '{@link #getCatalogFile() <em>Catalog File</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getCatalogFile()
- * @generated
- * @ordered
- */
- protected static final String CATALOG_FILE_EDEFAULT = null;
-
- /**
- * The cached value of the '{@link #getCatalogFile() <em>Catalog File</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getCatalogFile()
- * @generated
- * @ordered
- */
- protected String catalogFile = CATALOG_FILE_EDEFAULT;
-
- /**
- * The default value of the '{@link #getJavaSourceFolder() <em>Java Source Folder</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getJavaSourceFolder()
- * @generated
- * @ordered
- */
- protected static final String JAVA_SOURCE_FOLDER_EDEFAULT = null;
-
- /**
- * The cached value of the '{@link #getJavaSourceFolder() <em>Java Source Folder</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getJavaSourceFolder()
- * @generated
- * @ordered
- */
- protected String javaSourceFolder = JAVA_SOURCE_FOLDER_EDEFAULT;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected WSDL2JavaDataModelImpl() {
- super();
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- protected EClass eStaticClass() {
- return CXFPackage.Literals.WSDL2_JAVA_DATA_MODEL;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public boolean isGenerateImplementation() {
- return generateImplementation;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setGenerateImplementation(boolean newGenerateImplementation) {
- boolean oldGenerateImplementation = generateImplementation;
- generateImplementation = newGenerateImplementation;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, CXFPackage.WSDL2_JAVA_DATA_MODEL__GENERATE_IMPLEMENTATION, oldGenerateImplementation, generateImplementation));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public boolean isProcessSOAPHeaders() {
- return processSOAPHeaders;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setProcessSOAPHeaders(boolean newProcessSOAPHeaders) {
- boolean oldProcessSOAPHeaders = processSOAPHeaders;
- processSOAPHeaders = newProcessSOAPHeaders;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, CXFPackage.WSDL2_JAVA_DATA_MODEL__PROCESS_SOAP_HEADERS, oldProcessSOAPHeaders, processSOAPHeaders));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public boolean isLoadDefaultNamespacePackageNameMapping() {
- return loadDefaultNamespacePackageNameMapping;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setLoadDefaultNamespacePackageNameMapping(boolean newLoadDefaultNamespacePackageNameMapping) {
- boolean oldLoadDefaultNamespacePackageNameMapping = loadDefaultNamespacePackageNameMapping;
- loadDefaultNamespacePackageNameMapping = newLoadDefaultNamespacePackageNameMapping;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, CXFPackage.WSDL2_JAVA_DATA_MODEL__LOAD_DEFAULT_NAMESPACE_PACKAGE_NAME_MAPPING, oldLoadDefaultNamespacePackageNameMapping, loadDefaultNamespacePackageNameMapping));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public boolean isLoadDefaultExcludesNamepsaceMapping() {
- return loadDefaultExcludesNamepsaceMapping;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setLoadDefaultExcludesNamepsaceMapping(boolean newLoadDefaultExcludesNamepsaceMapping) {
- boolean oldLoadDefaultExcludesNamepsaceMapping = loadDefaultExcludesNamepsaceMapping;
- loadDefaultExcludesNamepsaceMapping = newLoadDefaultExcludesNamepsaceMapping;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, CXFPackage.WSDL2_JAVA_DATA_MODEL__LOAD_DEFAULT_EXCLUDES_NAMEPSACE_MAPPING, oldLoadDefaultExcludesNamepsaceMapping, loadDefaultExcludesNamepsaceMapping));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public boolean isValidate() {
- return validate;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setValidate(boolean newValidate) {
- boolean oldValidate = validate;
- validate = newValidate;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, CXFPackage.WSDL2_JAVA_DATA_MODEL__VALIDATE, oldValidate, validate));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public String getWsdlVersion() {
- return wsdlVersion;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setWsdlVersion(String newWsdlVersion) {
- String oldWsdlVersion = wsdlVersion;
- wsdlVersion = newWsdlVersion;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, CXFPackage.WSDL2_JAVA_DATA_MODEL__WSDL_VERSION, oldWsdlVersion, wsdlVersion));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public boolean isUseDefaultValues() {
- return useDefaultValues;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setUseDefaultValues(boolean newUseDefaultValues) {
- boolean oldUseDefaultValues = useDefaultValues;
- useDefaultValues = newUseDefaultValues;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, CXFPackage.WSDL2_JAVA_DATA_MODEL__USE_DEFAULT_VALUES, oldUseDefaultValues, useDefaultValues));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public String getXjcArgs() {
- return xjcArgs;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setXjcArgs(String newXjcArgs) {
- String oldXjcArgs = xjcArgs;
- xjcArgs = newXjcArgs;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, CXFPackage.WSDL2_JAVA_DATA_MODEL__XJC_ARGS, oldXjcArgs, xjcArgs));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public boolean isNoAddressBinding() {
- return noAddressBinding;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setNoAddressBinding(boolean newNoAddressBinding) {
- boolean oldNoAddressBinding = noAddressBinding;
- noAddressBinding = newNoAddressBinding;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, CXFPackage.WSDL2_JAVA_DATA_MODEL__NO_ADDRESS_BINDING, oldNoAddressBinding, noAddressBinding));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public boolean isXjcUseDefaultValues() {
- return xjcUseDefaultValues;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setXjcUseDefaultValues(boolean newXjcUseDefaultValues) {
- boolean oldXjcUseDefaultValues = xjcUseDefaultValues;
- xjcUseDefaultValues = newXjcUseDefaultValues;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, CXFPackage.WSDL2_JAVA_DATA_MODEL__XJC_USE_DEFAULT_VALUES, oldXjcUseDefaultValues, xjcUseDefaultValues));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public boolean isXjcToString() {
- return xjcToString;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setXjcToString(boolean newXjcToString) {
- boolean oldXjcToString = xjcToString;
- xjcToString = newXjcToString;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, CXFPackage.WSDL2_JAVA_DATA_MODEL__XJC_TO_STRING, oldXjcToString, xjcToString));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public boolean isXjcToStringMultiLine() {
- return xjcToStringMultiLine;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setXjcToStringMultiLine(boolean newXjcToStringMultiLine) {
- boolean oldXjcToStringMultiLine = xjcToStringMultiLine;
- xjcToStringMultiLine = newXjcToStringMultiLine;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, CXFPackage.WSDL2_JAVA_DATA_MODEL__XJC_TO_STRING_MULTI_LINE, oldXjcToStringMultiLine, xjcToStringMultiLine));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public boolean isXjcToStringSimple() {
- return xjcToStringSimple;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setXjcToStringSimple(boolean newXjcToStringSimple) {
- boolean oldXjcToStringSimple = xjcToStringSimple;
- xjcToStringSimple = newXjcToStringSimple;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, CXFPackage.WSDL2_JAVA_DATA_MODEL__XJC_TO_STRING_SIMPLE, oldXjcToStringSimple, xjcToStringSimple));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public boolean isXjcLocator() {
- return xjcLocator;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setXjcLocator(boolean newXjcLocator) {
- boolean oldXjcLocator = xjcLocator;
- xjcLocator = newXjcLocator;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, CXFPackage.WSDL2_JAVA_DATA_MODEL__XJC_LOCATOR, oldXjcLocator, xjcLocator));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public boolean isXjcSyncMethods() {
- return xjcSyncMethods;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setXjcSyncMethods(boolean newXjcSyncMethods) {
- boolean oldXjcSyncMethods = xjcSyncMethods;
- xjcSyncMethods = newXjcSyncMethods;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, CXFPackage.WSDL2_JAVA_DATA_MODEL__XJC_SYNC_METHODS, oldXjcSyncMethods, xjcSyncMethods));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public boolean isXjcMarkGenerated() {
- return xjcMarkGenerated;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setXjcMarkGenerated(boolean newXjcMarkGenerated) {
- boolean oldXjcMarkGenerated = xjcMarkGenerated;
- xjcMarkGenerated = newXjcMarkGenerated;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, CXFPackage.WSDL2_JAVA_DATA_MODEL__XJC_MARK_GENERATED, oldXjcMarkGenerated, xjcMarkGenerated));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public String getXjcEpisodeFile() {
- return xjcEpisodeFile;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setXjcEpisodeFile(String newXjcEpisodeFile) {
- String oldXjcEpisodeFile = xjcEpisodeFile;
- xjcEpisodeFile = newXjcEpisodeFile;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, CXFPackage.WSDL2_JAVA_DATA_MODEL__XJC_EPISODE_FILE, oldXjcEpisodeFile, xjcEpisodeFile));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public boolean isAutoNameResolution() {
- return autoNameResolution;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setAutoNameResolution(boolean newAutoNameResolution) {
- boolean oldAutoNameResolution = autoNameResolution;
- autoNameResolution = newAutoNameResolution;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, CXFPackage.WSDL2_JAVA_DATA_MODEL__AUTO_NAME_RESOLUTION, oldAutoNameResolution, autoNameResolution));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public Map<String, String> getIncludedNamespaces() {
- return includedNamespaces;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setIncludedNamespaces(Map<String, String> newIncludedNamespaces) {
- Map<String, String> oldIncludedNamespaces = includedNamespaces;
- includedNamespaces = newIncludedNamespaces;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, CXFPackage.WSDL2_JAVA_DATA_MODEL__INCLUDED_NAMESPACES, oldIncludedNamespaces, includedNamespaces));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EList<String> getBindingFiles() {
- if (bindingFiles == null) {
- bindingFiles = new EDataTypeUniqueEList<String>(String.class, this, CXFPackage.WSDL2_JAVA_DATA_MODEL__BINDING_FILES);
- }
- return bindingFiles;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public Map<String, String> getExcludedNamespaces() {
- return excludedNamespaces;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setExcludedNamespaces(Map<String, String> newExcludedNamespaces) {
- Map<String, String> oldExcludedNamespaces = excludedNamespaces;
- excludedNamespaces = newExcludedNamespaces;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, CXFPackage.WSDL2_JAVA_DATA_MODEL__EXCLUDED_NAMESPACES, oldExcludedNamespaces, excludedNamespaces));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public String getCatalogFile() {
- return catalogFile;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setCatalogFile(String newCatalogFile) {
- String oldCatalogFile = catalogFile;
- catalogFile = newCatalogFile;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, CXFPackage.WSDL2_JAVA_DATA_MODEL__CATALOG_FILE, oldCatalogFile, catalogFile));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public String getJavaSourceFolder() {
- return javaSourceFolder;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setJavaSourceFolder(String newJavaSourceFolder) {
- String oldJavaSourceFolder = javaSourceFolder;
- javaSourceFolder = newJavaSourceFolder;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, CXFPackage.WSDL2_JAVA_DATA_MODEL__JAVA_SOURCE_FOLDER, oldJavaSourceFolder, javaSourceFolder));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public Object eGet(int featureID, boolean resolve, boolean coreType) {
- switch (featureID) {
- case CXFPackage.WSDL2_JAVA_DATA_MODEL__GENERATE_IMPLEMENTATION:
- return isGenerateImplementation() ? Boolean.TRUE : Boolean.FALSE;
- case CXFPackage.WSDL2_JAVA_DATA_MODEL__PROCESS_SOAP_HEADERS:
- return isProcessSOAPHeaders() ? Boolean.TRUE : Boolean.FALSE;
- case CXFPackage.WSDL2_JAVA_DATA_MODEL__LOAD_DEFAULT_NAMESPACE_PACKAGE_NAME_MAPPING:
- return isLoadDefaultNamespacePackageNameMapping() ? Boolean.TRUE : Boolean.FALSE;
- case CXFPackage.WSDL2_JAVA_DATA_MODEL__LOAD_DEFAULT_EXCLUDES_NAMEPSACE_MAPPING:
- return isLoadDefaultExcludesNamepsaceMapping() ? Boolean.TRUE : Boolean.FALSE;
- case CXFPackage.WSDL2_JAVA_DATA_MODEL__VALIDATE:
- return isValidate() ? Boolean.TRUE : Boolean.FALSE;
- case CXFPackage.WSDL2_JAVA_DATA_MODEL__WSDL_VERSION:
- return getWsdlVersion();
- case CXFPackage.WSDL2_JAVA_DATA_MODEL__USE_DEFAULT_VALUES:
- return isUseDefaultValues() ? Boolean.TRUE : Boolean.FALSE;
- case CXFPackage.WSDL2_JAVA_DATA_MODEL__XJC_ARGS:
- return getXjcArgs();
- case CXFPackage.WSDL2_JAVA_DATA_MODEL__NO_ADDRESS_BINDING:
- return isNoAddressBinding() ? Boolean.TRUE : Boolean.FALSE;
- case CXFPackage.WSDL2_JAVA_DATA_MODEL__XJC_USE_DEFAULT_VALUES:
- return isXjcUseDefaultValues() ? Boolean.TRUE : Boolean.FALSE;
- case CXFPackage.WSDL2_JAVA_DATA_MODEL__XJC_TO_STRING:
- return isXjcToString() ? Boolean.TRUE : Boolean.FALSE;
- case CXFPackage.WSDL2_JAVA_DATA_MODEL__XJC_TO_STRING_MULTI_LINE:
- return isXjcToStringMultiLine() ? Boolean.TRUE : Boolean.FALSE;
- case CXFPackage.WSDL2_JAVA_DATA_MODEL__XJC_TO_STRING_SIMPLE:
- return isXjcToStringSimple() ? Boolean.TRUE : Boolean.FALSE;
- case CXFPackage.WSDL2_JAVA_DATA_MODEL__XJC_LOCATOR:
- return isXjcLocator() ? Boolean.TRUE : Boolean.FALSE;
- case CXFPackage.WSDL2_JAVA_DATA_MODEL__XJC_SYNC_METHODS:
- return isXjcSyncMethods() ? Boolean.TRUE : Boolean.FALSE;
- case CXFPackage.WSDL2_JAVA_DATA_MODEL__XJC_MARK_GENERATED:
- return isXjcMarkGenerated() ? Boolean.TRUE : Boolean.FALSE;
- case CXFPackage.WSDL2_JAVA_DATA_MODEL__XJC_EPISODE_FILE:
- return getXjcEpisodeFile();
- case CXFPackage.WSDL2_JAVA_DATA_MODEL__AUTO_NAME_RESOLUTION:
- return isAutoNameResolution() ? Boolean.TRUE : Boolean.FALSE;
- case CXFPackage.WSDL2_JAVA_DATA_MODEL__INCLUDED_NAMESPACES:
- return getIncludedNamespaces();
- case CXFPackage.WSDL2_JAVA_DATA_MODEL__BINDING_FILES:
- return getBindingFiles();
- case CXFPackage.WSDL2_JAVA_DATA_MODEL__EXCLUDED_NAMESPACES:
- return getExcludedNamespaces();
- case CXFPackage.WSDL2_JAVA_DATA_MODEL__CATALOG_FILE:
- return getCatalogFile();
- case CXFPackage.WSDL2_JAVA_DATA_MODEL__JAVA_SOURCE_FOLDER:
- return getJavaSourceFolder();
- }
- return super.eGet(featureID, resolve, coreType);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @SuppressWarnings("unchecked")
- @Override
- public void eSet(int featureID, Object newValue) {
- switch (featureID) {
- case CXFPackage.WSDL2_JAVA_DATA_MODEL__GENERATE_IMPLEMENTATION:
- setGenerateImplementation(((Boolean)newValue).booleanValue());
- return;
- case CXFPackage.WSDL2_JAVA_DATA_MODEL__PROCESS_SOAP_HEADERS:
- setProcessSOAPHeaders(((Boolean)newValue).booleanValue());
- return;
- case CXFPackage.WSDL2_JAVA_DATA_MODEL__LOAD_DEFAULT_NAMESPACE_PACKAGE_NAME_MAPPING:
- setLoadDefaultNamespacePackageNameMapping(((Boolean)newValue).booleanValue());
- return;
- case CXFPackage.WSDL2_JAVA_DATA_MODEL__LOAD_DEFAULT_EXCLUDES_NAMEPSACE_MAPPING:
- setLoadDefaultExcludesNamepsaceMapping(((Boolean)newValue).booleanValue());
- return;
- case CXFPackage.WSDL2_JAVA_DATA_MODEL__VALIDATE:
- setValidate(((Boolean)newValue).booleanValue());
- return;
- case CXFPackage.WSDL2_JAVA_DATA_MODEL__WSDL_VERSION:
- setWsdlVersion((String)newValue);
- return;
- case CXFPackage.WSDL2_JAVA_DATA_MODEL__USE_DEFAULT_VALUES:
- setUseDefaultValues(((Boolean)newValue).booleanValue());
- return;
- case CXFPackage.WSDL2_JAVA_DATA_MODEL__XJC_ARGS:
- setXjcArgs((String)newValue);
- return;
- case CXFPackage.WSDL2_JAVA_DATA_MODEL__NO_ADDRESS_BINDING:
- setNoAddressBinding(((Boolean)newValue).booleanValue());
- return;
- case CXFPackage.WSDL2_JAVA_DATA_MODEL__XJC_USE_DEFAULT_VALUES:
- setXjcUseDefaultValues(((Boolean)newValue).booleanValue());
- return;
- case CXFPackage.WSDL2_JAVA_DATA_MODEL__XJC_TO_STRING:
- setXjcToString(((Boolean)newValue).booleanValue());
- return;
- case CXFPackage.WSDL2_JAVA_DATA_MODEL__XJC_TO_STRING_MULTI_LINE:
- setXjcToStringMultiLine(((Boolean)newValue).booleanValue());
- return;
- case CXFPackage.WSDL2_JAVA_DATA_MODEL__XJC_TO_STRING_SIMPLE:
- setXjcToStringSimple(((Boolean)newValue).booleanValue());
- return;
- case CXFPackage.WSDL2_JAVA_DATA_MODEL__XJC_LOCATOR:
- setXjcLocator(((Boolean)newValue).booleanValue());
- return;
- case CXFPackage.WSDL2_JAVA_DATA_MODEL__XJC_SYNC_METHODS:
- setXjcSyncMethods(((Boolean)newValue).booleanValue());
- return;
- case CXFPackage.WSDL2_JAVA_DATA_MODEL__XJC_MARK_GENERATED:
- setXjcMarkGenerated(((Boolean)newValue).booleanValue());
- return;
- case CXFPackage.WSDL2_JAVA_DATA_MODEL__XJC_EPISODE_FILE:
- setXjcEpisodeFile((String)newValue);
- return;
- case CXFPackage.WSDL2_JAVA_DATA_MODEL__AUTO_NAME_RESOLUTION:
- setAutoNameResolution(((Boolean)newValue).booleanValue());
- return;
- case CXFPackage.WSDL2_JAVA_DATA_MODEL__INCLUDED_NAMESPACES:
- setIncludedNamespaces((Map<String, String>)newValue);
- return;
- case CXFPackage.WSDL2_JAVA_DATA_MODEL__BINDING_FILES:
- getBindingFiles().clear();
- getBindingFiles().addAll((Collection<? extends String>)newValue);
- return;
- case CXFPackage.WSDL2_JAVA_DATA_MODEL__EXCLUDED_NAMESPACES:
- setExcludedNamespaces((Map<String, String>)newValue);
- return;
- case CXFPackage.WSDL2_JAVA_DATA_MODEL__CATALOG_FILE:
- setCatalogFile((String)newValue);
- return;
- case CXFPackage.WSDL2_JAVA_DATA_MODEL__JAVA_SOURCE_FOLDER:
- setJavaSourceFolder((String)newValue);
- return;
- }
- super.eSet(featureID, newValue);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public void eUnset(int featureID) {
- switch (featureID) {
- case CXFPackage.WSDL2_JAVA_DATA_MODEL__GENERATE_IMPLEMENTATION:
- setGenerateImplementation(GENERATE_IMPLEMENTATION_EDEFAULT);
- return;
- case CXFPackage.WSDL2_JAVA_DATA_MODEL__PROCESS_SOAP_HEADERS:
- setProcessSOAPHeaders(PROCESS_SOAP_HEADERS_EDEFAULT);
- return;
- case CXFPackage.WSDL2_JAVA_DATA_MODEL__LOAD_DEFAULT_NAMESPACE_PACKAGE_NAME_MAPPING:
- setLoadDefaultNamespacePackageNameMapping(LOAD_DEFAULT_NAMESPACE_PACKAGE_NAME_MAPPING_EDEFAULT);
- return;
- case CXFPackage.WSDL2_JAVA_DATA_MODEL__LOAD_DEFAULT_EXCLUDES_NAMEPSACE_MAPPING:
- setLoadDefaultExcludesNamepsaceMapping(LOAD_DEFAULT_EXCLUDES_NAMEPSACE_MAPPING_EDEFAULT);
- return;
- case CXFPackage.WSDL2_JAVA_DATA_MODEL__VALIDATE:
- setValidate(VALIDATE_EDEFAULT);
- return;
- case CXFPackage.WSDL2_JAVA_DATA_MODEL__WSDL_VERSION:
- setWsdlVersion(WSDL_VERSION_EDEFAULT);
- return;
- case CXFPackage.WSDL2_JAVA_DATA_MODEL__USE_DEFAULT_VALUES:
- setUseDefaultValues(USE_DEFAULT_VALUES_EDEFAULT);
- return;
- case CXFPackage.WSDL2_JAVA_DATA_MODEL__XJC_ARGS:
- setXjcArgs(XJC_ARGS_EDEFAULT);
- return;
- case CXFPackage.WSDL2_JAVA_DATA_MODEL__NO_ADDRESS_BINDING:
- setNoAddressBinding(NO_ADDRESS_BINDING_EDEFAULT);
- return;
- case CXFPackage.WSDL2_JAVA_DATA_MODEL__XJC_USE_DEFAULT_VALUES:
- setXjcUseDefaultValues(XJC_USE_DEFAULT_VALUES_EDEFAULT);
- return;
- case CXFPackage.WSDL2_JAVA_DATA_MODEL__XJC_TO_STRING:
- setXjcToString(XJC_TO_STRING_EDEFAULT);
- return;
- case CXFPackage.WSDL2_JAVA_DATA_MODEL__XJC_TO_STRING_MULTI_LINE:
- setXjcToStringMultiLine(XJC_TO_STRING_MULTI_LINE_EDEFAULT);
- return;
- case CXFPackage.WSDL2_JAVA_DATA_MODEL__XJC_TO_STRING_SIMPLE:
- setXjcToStringSimple(XJC_TO_STRING_SIMPLE_EDEFAULT);
- return;
- case CXFPackage.WSDL2_JAVA_DATA_MODEL__XJC_LOCATOR:
- setXjcLocator(XJC_LOCATOR_EDEFAULT);
- return;
- case CXFPackage.WSDL2_JAVA_DATA_MODEL__XJC_SYNC_METHODS:
- setXjcSyncMethods(XJC_SYNC_METHODS_EDEFAULT);
- return;
- case CXFPackage.WSDL2_JAVA_DATA_MODEL__XJC_MARK_GENERATED:
- setXjcMarkGenerated(XJC_MARK_GENERATED_EDEFAULT);
- return;
- case CXFPackage.WSDL2_JAVA_DATA_MODEL__XJC_EPISODE_FILE:
- setXjcEpisodeFile(XJC_EPISODE_FILE_EDEFAULT);
- return;
- case CXFPackage.WSDL2_JAVA_DATA_MODEL__AUTO_NAME_RESOLUTION:
- setAutoNameResolution(AUTO_NAME_RESOLUTION_EDEFAULT);
- return;
- case CXFPackage.WSDL2_JAVA_DATA_MODEL__INCLUDED_NAMESPACES:
- setIncludedNamespaces((Map<String, String>)null);
- return;
- case CXFPackage.WSDL2_JAVA_DATA_MODEL__BINDING_FILES:
- getBindingFiles().clear();
- return;
- case CXFPackage.WSDL2_JAVA_DATA_MODEL__EXCLUDED_NAMESPACES:
- setExcludedNamespaces((Map<String, String>)null);
- return;
- case CXFPackage.WSDL2_JAVA_DATA_MODEL__CATALOG_FILE:
- setCatalogFile(CATALOG_FILE_EDEFAULT);
- return;
- case CXFPackage.WSDL2_JAVA_DATA_MODEL__JAVA_SOURCE_FOLDER:
- setJavaSourceFolder(JAVA_SOURCE_FOLDER_EDEFAULT);
- return;
- }
- super.eUnset(featureID);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public boolean eIsSet(int featureID) {
- switch (featureID) {
- case CXFPackage.WSDL2_JAVA_DATA_MODEL__GENERATE_IMPLEMENTATION:
- return generateImplementation != GENERATE_IMPLEMENTATION_EDEFAULT;
- case CXFPackage.WSDL2_JAVA_DATA_MODEL__PROCESS_SOAP_HEADERS:
- return processSOAPHeaders != PROCESS_SOAP_HEADERS_EDEFAULT;
- case CXFPackage.WSDL2_JAVA_DATA_MODEL__LOAD_DEFAULT_NAMESPACE_PACKAGE_NAME_MAPPING:
- return loadDefaultNamespacePackageNameMapping != LOAD_DEFAULT_NAMESPACE_PACKAGE_NAME_MAPPING_EDEFAULT;
- case CXFPackage.WSDL2_JAVA_DATA_MODEL__LOAD_DEFAULT_EXCLUDES_NAMEPSACE_MAPPING:
- return loadDefaultExcludesNamepsaceMapping != LOAD_DEFAULT_EXCLUDES_NAMEPSACE_MAPPING_EDEFAULT;
- case CXFPackage.WSDL2_JAVA_DATA_MODEL__VALIDATE:
- return validate != VALIDATE_EDEFAULT;
- case CXFPackage.WSDL2_JAVA_DATA_MODEL__WSDL_VERSION:
- return WSDL_VERSION_EDEFAULT == null ? wsdlVersion != null : !WSDL_VERSION_EDEFAULT.equals(wsdlVersion);
- case CXFPackage.WSDL2_JAVA_DATA_MODEL__USE_DEFAULT_VALUES:
- return useDefaultValues != USE_DEFAULT_VALUES_EDEFAULT;
- case CXFPackage.WSDL2_JAVA_DATA_MODEL__XJC_ARGS:
- return XJC_ARGS_EDEFAULT == null ? xjcArgs != null : !XJC_ARGS_EDEFAULT.equals(xjcArgs);
- case CXFPackage.WSDL2_JAVA_DATA_MODEL__NO_ADDRESS_BINDING:
- return noAddressBinding != NO_ADDRESS_BINDING_EDEFAULT;
- case CXFPackage.WSDL2_JAVA_DATA_MODEL__XJC_USE_DEFAULT_VALUES:
- return xjcUseDefaultValues != XJC_USE_DEFAULT_VALUES_EDEFAULT;
- case CXFPackage.WSDL2_JAVA_DATA_MODEL__XJC_TO_STRING:
- return xjcToString != XJC_TO_STRING_EDEFAULT;
- case CXFPackage.WSDL2_JAVA_DATA_MODEL__XJC_TO_STRING_MULTI_LINE:
- return xjcToStringMultiLine != XJC_TO_STRING_MULTI_LINE_EDEFAULT;
- case CXFPackage.WSDL2_JAVA_DATA_MODEL__XJC_TO_STRING_SIMPLE:
- return xjcToStringSimple != XJC_TO_STRING_SIMPLE_EDEFAULT;
- case CXFPackage.WSDL2_JAVA_DATA_MODEL__XJC_LOCATOR:
- return xjcLocator != XJC_LOCATOR_EDEFAULT;
- case CXFPackage.WSDL2_JAVA_DATA_MODEL__XJC_SYNC_METHODS:
- return xjcSyncMethods != XJC_SYNC_METHODS_EDEFAULT;
- case CXFPackage.WSDL2_JAVA_DATA_MODEL__XJC_MARK_GENERATED:
- return xjcMarkGenerated != XJC_MARK_GENERATED_EDEFAULT;
- case CXFPackage.WSDL2_JAVA_DATA_MODEL__XJC_EPISODE_FILE:
- return XJC_EPISODE_FILE_EDEFAULT == null ? xjcEpisodeFile != null : !XJC_EPISODE_FILE_EDEFAULT.equals(xjcEpisodeFile);
- case CXFPackage.WSDL2_JAVA_DATA_MODEL__AUTO_NAME_RESOLUTION:
- return autoNameResolution != AUTO_NAME_RESOLUTION_EDEFAULT;
- case CXFPackage.WSDL2_JAVA_DATA_MODEL__INCLUDED_NAMESPACES:
- return includedNamespaces != null;
- case CXFPackage.WSDL2_JAVA_DATA_MODEL__BINDING_FILES:
- return bindingFiles != null && !bindingFiles.isEmpty();
- case CXFPackage.WSDL2_JAVA_DATA_MODEL__EXCLUDED_NAMESPACES:
- return excludedNamespaces != null;
- case CXFPackage.WSDL2_JAVA_DATA_MODEL__CATALOG_FILE:
- return CATALOG_FILE_EDEFAULT == null ? catalogFile != null : !CATALOG_FILE_EDEFAULT.equals(catalogFile);
- case CXFPackage.WSDL2_JAVA_DATA_MODEL__JAVA_SOURCE_FOLDER:
- return JAVA_SOURCE_FOLDER_EDEFAULT == null ? javaSourceFolder != null : !JAVA_SOURCE_FOLDER_EDEFAULT.equals(javaSourceFolder);
- }
- return super.eIsSet(featureID);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass) {
- if (baseClass == WSDL2JavaContext.class) {
- switch (derivedFeatureID) {
- case CXFPackage.WSDL2_JAVA_DATA_MODEL__GENERATE_IMPLEMENTATION: return CXFPackage.WSDL2_JAVA_CONTEXT__GENERATE_IMPLEMENTATION;
- case CXFPackage.WSDL2_JAVA_DATA_MODEL__PROCESS_SOAP_HEADERS: return CXFPackage.WSDL2_JAVA_CONTEXT__PROCESS_SOAP_HEADERS;
- case CXFPackage.WSDL2_JAVA_DATA_MODEL__LOAD_DEFAULT_NAMESPACE_PACKAGE_NAME_MAPPING: return CXFPackage.WSDL2_JAVA_CONTEXT__LOAD_DEFAULT_NAMESPACE_PACKAGE_NAME_MAPPING;
- case CXFPackage.WSDL2_JAVA_DATA_MODEL__LOAD_DEFAULT_EXCLUDES_NAMEPSACE_MAPPING: return CXFPackage.WSDL2_JAVA_CONTEXT__LOAD_DEFAULT_EXCLUDES_NAMEPSACE_MAPPING;
- case CXFPackage.WSDL2_JAVA_DATA_MODEL__VALIDATE: return CXFPackage.WSDL2_JAVA_CONTEXT__VALIDATE;
- case CXFPackage.WSDL2_JAVA_DATA_MODEL__WSDL_VERSION: return CXFPackage.WSDL2_JAVA_CONTEXT__WSDL_VERSION;
- case CXFPackage.WSDL2_JAVA_DATA_MODEL__USE_DEFAULT_VALUES: return CXFPackage.WSDL2_JAVA_CONTEXT__USE_DEFAULT_VALUES;
- case CXFPackage.WSDL2_JAVA_DATA_MODEL__XJC_ARGS: return CXFPackage.WSDL2_JAVA_CONTEXT__XJC_ARGS;
- case CXFPackage.WSDL2_JAVA_DATA_MODEL__NO_ADDRESS_BINDING: return CXFPackage.WSDL2_JAVA_CONTEXT__NO_ADDRESS_BINDING;
- case CXFPackage.WSDL2_JAVA_DATA_MODEL__XJC_USE_DEFAULT_VALUES: return CXFPackage.WSDL2_JAVA_CONTEXT__XJC_USE_DEFAULT_VALUES;
- case CXFPackage.WSDL2_JAVA_DATA_MODEL__XJC_TO_STRING: return CXFPackage.WSDL2_JAVA_CONTEXT__XJC_TO_STRING;
- case CXFPackage.WSDL2_JAVA_DATA_MODEL__XJC_TO_STRING_MULTI_LINE: return CXFPackage.WSDL2_JAVA_CONTEXT__XJC_TO_STRING_MULTI_LINE;
- case CXFPackage.WSDL2_JAVA_DATA_MODEL__XJC_TO_STRING_SIMPLE: return CXFPackage.WSDL2_JAVA_CONTEXT__XJC_TO_STRING_SIMPLE;
- case CXFPackage.WSDL2_JAVA_DATA_MODEL__XJC_LOCATOR: return CXFPackage.WSDL2_JAVA_CONTEXT__XJC_LOCATOR;
- case CXFPackage.WSDL2_JAVA_DATA_MODEL__XJC_SYNC_METHODS: return CXFPackage.WSDL2_JAVA_CONTEXT__XJC_SYNC_METHODS;
- case CXFPackage.WSDL2_JAVA_DATA_MODEL__XJC_MARK_GENERATED: return CXFPackage.WSDL2_JAVA_CONTEXT__XJC_MARK_GENERATED;
- case CXFPackage.WSDL2_JAVA_DATA_MODEL__XJC_EPISODE_FILE: return CXFPackage.WSDL2_JAVA_CONTEXT__XJC_EPISODE_FILE;
- case CXFPackage.WSDL2_JAVA_DATA_MODEL__AUTO_NAME_RESOLUTION: return CXFPackage.WSDL2_JAVA_CONTEXT__AUTO_NAME_RESOLUTION;
- default: return -1;
- }
- }
- return super.eBaseStructuralFeatureID(derivedFeatureID, baseClass);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public int eDerivedStructuralFeatureID(int baseFeatureID, Class<?> baseClass) {
- if (baseClass == WSDL2JavaContext.class) {
- switch (baseFeatureID) {
- case CXFPackage.WSDL2_JAVA_CONTEXT__GENERATE_IMPLEMENTATION: return CXFPackage.WSDL2_JAVA_DATA_MODEL__GENERATE_IMPLEMENTATION;
- case CXFPackage.WSDL2_JAVA_CONTEXT__PROCESS_SOAP_HEADERS: return CXFPackage.WSDL2_JAVA_DATA_MODEL__PROCESS_SOAP_HEADERS;
- case CXFPackage.WSDL2_JAVA_CONTEXT__LOAD_DEFAULT_NAMESPACE_PACKAGE_NAME_MAPPING: return CXFPackage.WSDL2_JAVA_DATA_MODEL__LOAD_DEFAULT_NAMESPACE_PACKAGE_NAME_MAPPING;
- case CXFPackage.WSDL2_JAVA_CONTEXT__LOAD_DEFAULT_EXCLUDES_NAMEPSACE_MAPPING: return CXFPackage.WSDL2_JAVA_DATA_MODEL__LOAD_DEFAULT_EXCLUDES_NAMEPSACE_MAPPING;
- case CXFPackage.WSDL2_JAVA_CONTEXT__VALIDATE: return CXFPackage.WSDL2_JAVA_DATA_MODEL__VALIDATE;
- case CXFPackage.WSDL2_JAVA_CONTEXT__WSDL_VERSION: return CXFPackage.WSDL2_JAVA_DATA_MODEL__WSDL_VERSION;
- case CXFPackage.WSDL2_JAVA_CONTEXT__USE_DEFAULT_VALUES: return CXFPackage.WSDL2_JAVA_DATA_MODEL__USE_DEFAULT_VALUES;
- case CXFPackage.WSDL2_JAVA_CONTEXT__XJC_ARGS: return CXFPackage.WSDL2_JAVA_DATA_MODEL__XJC_ARGS;
- case CXFPackage.WSDL2_JAVA_CONTEXT__NO_ADDRESS_BINDING: return CXFPackage.WSDL2_JAVA_DATA_MODEL__NO_ADDRESS_BINDING;
- case CXFPackage.WSDL2_JAVA_CONTEXT__XJC_USE_DEFAULT_VALUES: return CXFPackage.WSDL2_JAVA_DATA_MODEL__XJC_USE_DEFAULT_VALUES;
- case CXFPackage.WSDL2_JAVA_CONTEXT__XJC_TO_STRING: return CXFPackage.WSDL2_JAVA_DATA_MODEL__XJC_TO_STRING;
- case CXFPackage.WSDL2_JAVA_CONTEXT__XJC_TO_STRING_MULTI_LINE: return CXFPackage.WSDL2_JAVA_DATA_MODEL__XJC_TO_STRING_MULTI_LINE;
- case CXFPackage.WSDL2_JAVA_CONTEXT__XJC_TO_STRING_SIMPLE: return CXFPackage.WSDL2_JAVA_DATA_MODEL__XJC_TO_STRING_SIMPLE;
- case CXFPackage.WSDL2_JAVA_CONTEXT__XJC_LOCATOR: return CXFPackage.WSDL2_JAVA_DATA_MODEL__XJC_LOCATOR;
- case CXFPackage.WSDL2_JAVA_CONTEXT__XJC_SYNC_METHODS: return CXFPackage.WSDL2_JAVA_DATA_MODEL__XJC_SYNC_METHODS;
- case CXFPackage.WSDL2_JAVA_CONTEXT__XJC_MARK_GENERATED: return CXFPackage.WSDL2_JAVA_DATA_MODEL__XJC_MARK_GENERATED;
- case CXFPackage.WSDL2_JAVA_CONTEXT__XJC_EPISODE_FILE: return CXFPackage.WSDL2_JAVA_DATA_MODEL__XJC_EPISODE_FILE;
- case CXFPackage.WSDL2_JAVA_CONTEXT__AUTO_NAME_RESOLUTION: return CXFPackage.WSDL2_JAVA_DATA_MODEL__AUTO_NAME_RESOLUTION;
- default: return -1;
- }
- }
- return super.eDerivedStructuralFeatureID(baseFeatureID, baseClass);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public String toString() {
- if (eIsProxy()) return super.toString();
-
- StringBuffer result = new StringBuffer(super.toString());
- result.append(" (generateImplementation: ");
- result.append(generateImplementation);
- result.append(", processSOAPHeaders: ");
- result.append(processSOAPHeaders);
- result.append(", loadDefaultNamespacePackageNameMapping: ");
- result.append(loadDefaultNamespacePackageNameMapping);
- result.append(", loadDefaultExcludesNamepsaceMapping: ");
- result.append(loadDefaultExcludesNamepsaceMapping);
- result.append(", validate: ");
- result.append(validate);
- result.append(", wsdlVersion: ");
- result.append(wsdlVersion);
- result.append(", useDefaultValues: ");
- result.append(useDefaultValues);
- result.append(", xjcArgs: ");
- result.append(xjcArgs);
- result.append(", noAddressBinding: ");
- result.append(noAddressBinding);
- result.append(", xjcUseDefaultValues: ");
- result.append(xjcUseDefaultValues);
- result.append(", xjcToString: ");
- result.append(xjcToString);
- result.append(", xjcToStringMultiLine: ");
- result.append(xjcToStringMultiLine);
- result.append(", xjcToStringSimple: ");
- result.append(xjcToStringSimple);
- result.append(", xjcLocator: ");
- result.append(xjcLocator);
- result.append(", xjcSyncMethods: ");
- result.append(xjcSyncMethods);
- result.append(", xjcMarkGenerated: ");
- result.append(xjcMarkGenerated);
- result.append(", xjcEpisodeFile: ");
- result.append(xjcEpisodeFile);
- result.append(", autoNameResolution: ");
- result.append(autoNameResolution);
- result.append(", includedNamespaces: ");
- result.append(includedNamespaces);
- result.append(", bindingFiles: ");
- result.append(bindingFiles);
- result.append(", excludedNamespaces: ");
- result.append(excludedNamespaces);
- result.append(", catalogFile: ");
- result.append(catalogFile);
- result.append(", javaSourceFolder: ");
- result.append(javaSourceFolder);
- result.append(')');
- return result.toString();
- }
-
-} //WSDL2JavaDataModelImpl
diff --git a/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/model/util/CXFAdapterFactory.java b/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/model/util/CXFAdapterFactory.java
deleted file mode 100644
index 4ab8047..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/model/util/CXFAdapterFactory.java
+++ /dev/null
@@ -1,220 +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
- *
- * $Id: CXFAdapterFactory.java,v 1.2 2009/01/26 15:28:14 sclarke Exp $
- */
-package org.eclipse.jst.ws.internal.cxf.core.model.util;
-
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.common.notify.Notifier;
-
-import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.jst.ws.internal.cxf.core.model.*;
-
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Adapter Factory</b> for the model.
- * It provides an adapter <code>createXXX</code> method for each class of the model.
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.ws.internal.cxf.core.model.CXFPackage
- * @generated
- */
-public class CXFAdapterFactory extends AdapterFactoryImpl {
- /**
- * The cached model package.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected static CXFPackage modelPackage;
-
- /**
- * Creates an instance of the adapter factory.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public CXFAdapterFactory() {
- if (modelPackage == null) {
- modelPackage = CXFPackage.eINSTANCE;
- }
- }
-
- /**
- * Returns whether this factory is applicable for the type of the object.
- * <!-- begin-user-doc -->
- * This implementation returns <code>true</code> if the object is either the model's package or is an instance object of the model.
- * <!-- end-user-doc -->
- * @return whether this factory is applicable for the type of the object.
- * @generated
- */
- @Override
- public boolean isFactoryForType(Object object) {
- if (object == modelPackage) {
- return true;
- }
- if (object instanceof EObject) {
- return ((EObject)object).eClass().getEPackage() == modelPackage;
- }
- return false;
- }
-
- /**
- * The switch that delegates to the <code>createXXX</code> methods.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected CXFSwitch<Adapter> modelSwitch =
- new CXFSwitch<Adapter>() {
- @Override
- public Adapter caseCXFContext(CXFContext object) {
- return createCXFContextAdapter();
- }
- @Override
- public Adapter caseCXFDataModel(CXFDataModel object) {
- return createCXFDataModelAdapter();
- }
- @Override
- public Adapter caseJava2WSContext(Java2WSContext object) {
- return createJava2WSContextAdapter();
- }
- @Override
- public Adapter caseJava2WSDataModel(Java2WSDataModel object) {
- return createJava2WSDataModelAdapter();
- }
- @Override
- public Adapter caseWSDL2JavaContext(WSDL2JavaContext object) {
- return createWSDL2JavaContextAdapter();
- }
- @Override
- public Adapter caseWSDL2JavaDataModel(WSDL2JavaDataModel object) {
- return createWSDL2JavaDataModelAdapter();
- }
- @Override
- public Adapter defaultCase(EObject object) {
- return createEObjectAdapter();
- }
- };
-
- /**
- * Creates an adapter for the <code>target</code>.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param target the object to adapt.
- * @return the adapter for the <code>target</code>.
- * @generated
- */
- @Override
- public Adapter createAdapter(Notifier target) {
- return modelSwitch.doSwitch((EObject)target);
- }
-
-
- /**
- * Creates a new adapter for an object of class '{@link org.eclipse.jst.ws.internal.cxf.core.model.CXFContext <em>Context</em>}'.
- * <!-- begin-user-doc -->
- * This default implementation returns null so that we can easily ignore cases;
- * it's useful to ignore a case when inheritance will catch all the cases anyway.
- * <!-- end-user-doc -->
- * @return the new adapter.
- * @see org.eclipse.jst.ws.internal.cxf.core.model.CXFContext
- * @generated
- */
- public Adapter createCXFContextAdapter() {
- return null;
- }
-
- /**
- * Creates a new adapter for an object of class '{@link org.eclipse.jst.ws.internal.cxf.core.model.CXFDataModel <em>Data Model</em>}'.
- * <!-- begin-user-doc -->
- * This default implementation returns null so that we can easily ignore cases;
- * it's useful to ignore a case when inheritance will catch all the cases anyway.
- * <!-- end-user-doc -->
- * @return the new adapter.
- * @see org.eclipse.jst.ws.internal.cxf.core.model.CXFDataModel
- * @generated
- */
- public Adapter createCXFDataModelAdapter() {
- return null;
- }
-
- /**
- * Creates a new adapter for an object of class '{@link org.eclipse.jst.ws.internal.cxf.core.model.Java2WSContext <em>Java2 WS Context</em>}'.
- * <!-- begin-user-doc -->
- * This default implementation returns null so that we can easily ignore cases;
- * it's useful to ignore a case when inheritance will catch all the cases anyway.
- * <!-- end-user-doc -->
- * @return the new adapter.
- * @see org.eclipse.jst.ws.internal.cxf.core.model.Java2WSContext
- * @generated
- */
- public Adapter createJava2WSContextAdapter() {
- return null;
- }
-
- /**
- * Creates a new adapter for an object of class '{@link org.eclipse.jst.ws.internal.cxf.core.model.Java2WSDataModel <em>Java2 WS Data Model</em>}'.
- * <!-- begin-user-doc -->
- * This default implementation returns null so that we can easily ignore cases;
- * it's useful to ignore a case when inheritance will catch all the cases anyway.
- * <!-- end-user-doc -->
- * @return the new adapter.
- * @see org.eclipse.jst.ws.internal.cxf.core.model.Java2WSDataModel
- * @generated
- */
- public Adapter createJava2WSDataModelAdapter() {
- return null;
- }
-
- /**
- * Creates a new adapter for an object of class '{@link org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaContext <em>WSDL2 Java Context</em>}'.
- * <!-- begin-user-doc -->
- * This default implementation returns null so that we can easily ignore cases;
- * it's useful to ignore a case when inheritance will catch all the cases anyway.
- * <!-- end-user-doc -->
- * @return the new adapter.
- * @see org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaContext
- * @generated
- */
- public Adapter createWSDL2JavaContextAdapter() {
- return null;
- }
-
- /**
- * Creates a new adapter for an object of class '{@link org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaDataModel <em>WSDL2 Java Data Model</em>}'.
- * <!-- begin-user-doc -->
- * This default implementation returns null so that we can easily ignore cases;
- * it's useful to ignore a case when inheritance will catch all the cases anyway.
- * <!-- end-user-doc -->
- * @return the new adapter.
- * @see org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaDataModel
- * @generated
- */
- public Adapter createWSDL2JavaDataModelAdapter() {
- return null;
- }
-
- /**
- * Creates a new adapter for the default case.
- * <!-- begin-user-doc -->
- * This default implementation returns null.
- * <!-- end-user-doc -->
- * @return the new adapter.
- * @generated
- */
- public Adapter createEObjectAdapter() {
- return null;
- }
-
-} //CXFAdapterFactory
diff --git a/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/model/util/CXFSwitch.java b/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/model/util/CXFSwitch.java
deleted file mode 100644
index 4c0f84b..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/model/util/CXFSwitch.java
+++ /dev/null
@@ -1,250 +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
- *
- * $Id: CXFSwitch.java,v 1.1 2008/11/10 20:37:45 david_williams Exp $
- */
-package org.eclipse.jst.ws.internal.cxf.core.model.util;
-
-import java.util.List;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.jst.ws.internal.cxf.core.model.*;
-
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Switch</b> for the model's inheritance hierarchy.
- * It supports the call {@link #doSwitch(EObject) doSwitch(object)}
- * to invoke the <code>caseXXX</code> method for each class of the model,
- * starting with the actual class of the object
- * and proceeding up the inheritance hierarchy
- * until a non-null result is returned,
- * which is the result of the switch.
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.ws.internal.cxf.core.model.CXFPackage
- * @generated
- */
-public class CXFSwitch<T> {
- /**
- * The cached model package
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected static CXFPackage modelPackage;
-
- /**
- * Creates an instance of the switch.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public CXFSwitch() {
- if (modelPackage == null) {
- modelPackage = CXFPackage.eINSTANCE;
- }
- }
-
- /**
- * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the first non-null result returned by a <code>caseXXX</code> call.
- * @generated
- */
- public T doSwitch(EObject theEObject) {
- return doSwitch(theEObject.eClass(), theEObject);
- }
-
- /**
- * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the first non-null result returned by a <code>caseXXX</code> call.
- * @generated
- */
- protected T doSwitch(EClass theEClass, EObject theEObject) {
- if (theEClass.eContainer() == modelPackage) {
- return doSwitch(theEClass.getClassifierID(), theEObject);
- }
- else {
- List<EClass> eSuperTypes = theEClass.getESuperTypes();
- return
- eSuperTypes.isEmpty() ?
- defaultCase(theEObject) :
- doSwitch(eSuperTypes.get(0), theEObject);
- }
- }
-
- /**
- * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the first non-null result returned by a <code>caseXXX</code> call.
- * @generated
- */
- protected T doSwitch(int classifierID, EObject theEObject) {
- switch (classifierID) {
- case CXFPackage.CXF_CONTEXT: {
- CXFContext cxfContext = (CXFContext)theEObject;
- T result = caseCXFContext(cxfContext);
- if (result == null) result = defaultCase(theEObject);
- return result;
- }
- case CXFPackage.CXF_DATA_MODEL: {
- CXFDataModel cxfDataModel = (CXFDataModel)theEObject;
- T result = caseCXFDataModel(cxfDataModel);
- if (result == null) result = caseCXFContext(cxfDataModel);
- if (result == null) result = defaultCase(theEObject);
- return result;
- }
- case CXFPackage.JAVA2_WS_CONTEXT: {
- Java2WSContext java2WSContext = (Java2WSContext)theEObject;
- T result = caseJava2WSContext(java2WSContext);
- if (result == null) result = caseCXFContext(java2WSContext);
- if (result == null) result = defaultCase(theEObject);
- return result;
- }
- case CXFPackage.JAVA2_WS_DATA_MODEL: {
- Java2WSDataModel java2WSDataModel = (Java2WSDataModel)theEObject;
- T result = caseJava2WSDataModel(java2WSDataModel);
- if (result == null) result = caseCXFDataModel(java2WSDataModel);
- if (result == null) result = caseJava2WSContext(java2WSDataModel);
- if (result == null) result = caseCXFContext(java2WSDataModel);
- if (result == null) result = defaultCase(theEObject);
- return result;
- }
- case CXFPackage.WSDL2_JAVA_CONTEXT: {
- WSDL2JavaContext wsdl2JavaContext = (WSDL2JavaContext)theEObject;
- T result = caseWSDL2JavaContext(wsdl2JavaContext);
- if (result == null) result = caseCXFContext(wsdl2JavaContext);
- if (result == null) result = defaultCase(theEObject);
- return result;
- }
- case CXFPackage.WSDL2_JAVA_DATA_MODEL: {
- WSDL2JavaDataModel wsdl2JavaDataModel = (WSDL2JavaDataModel)theEObject;
- T result = caseWSDL2JavaDataModel(wsdl2JavaDataModel);
- if (result == null) result = caseCXFDataModel(wsdl2JavaDataModel);
- if (result == null) result = caseWSDL2JavaContext(wsdl2JavaDataModel);
- if (result == null) result = caseCXFContext(wsdl2JavaDataModel);
- if (result == null) result = defaultCase(theEObject);
- return result;
- }
- default: return defaultCase(theEObject);
- }
- }
-
- /**
- * Returns the result of interpreting the object as an instance of '<em>Context</em>'.
- * <!-- begin-user-doc -->
- * This implementation returns null;
- * returning a non-null result will terminate the switch.
- * <!-- end-user-doc -->
- * @param object the target of the switch.
- * @return the result of interpreting the object as an instance of '<em>Context</em>'.
- * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
- * @generated
- */
- public T caseCXFContext(CXFContext object) {
- return null;
- }
-
- /**
- * Returns the result of interpreting the object as an instance of '<em>Data Model</em>'.
- * <!-- begin-user-doc -->
- * This implementation returns null;
- * returning a non-null result will terminate the switch.
- * <!-- end-user-doc -->
- * @param object the target of the switch.
- * @return the result of interpreting the object as an instance of '<em>Data Model</em>'.
- * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
- * @generated
- */
- public T caseCXFDataModel(CXFDataModel object) {
- return null;
- }
-
- /**
- * Returns the result of interpreting the object as an instance of '<em>Java2 WS Context</em>'.
- * <!-- begin-user-doc -->
- * This implementation returns null;
- * returning a non-null result will terminate the switch.
- * <!-- end-user-doc -->
- * @param object the target of the switch.
- * @return the result of interpreting the object as an instance of '<em>Java2 WS Context</em>'.
- * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
- * @generated
- */
- public T caseJava2WSContext(Java2WSContext object) {
- return null;
- }
-
- /**
- * Returns the result of interpreting the object as an instance of '<em>Java2 WS Data Model</em>'.
- * <!-- begin-user-doc -->
- * This implementation returns null;
- * returning a non-null result will terminate the switch.
- * <!-- end-user-doc -->
- * @param object the target of the switch.
- * @return the result of interpreting the object as an instance of '<em>Java2 WS Data Model</em>'.
- * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
- * @generated
- */
- public T caseJava2WSDataModel(Java2WSDataModel object) {
- return null;
- }
-
- /**
- * Returns the result of interpreting the object as an instance of '<em>WSDL2 Java Context</em>'.
- * <!-- begin-user-doc -->
- * This implementation returns null;
- * returning a non-null result will terminate the switch.
- * <!-- end-user-doc -->
- * @param object the target of the switch.
- * @return the result of interpreting the object as an instance of '<em>WSDL2 Java Context</em>'.
- * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
- * @generated
- */
- public T caseWSDL2JavaContext(WSDL2JavaContext object) {
- return null;
- }
-
- /**
- * Returns the result of interpreting the object as an instance of '<em>WSDL2 Java Data Model</em>'.
- * <!-- begin-user-doc -->
- * This implementation returns null;
- * returning a non-null result will terminate the switch.
- * <!-- end-user-doc -->
- * @param object the target of the switch.
- * @return the result of interpreting the object as an instance of '<em>WSDL2 Java Data Model</em>'.
- * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
- * @generated
- */
- public T caseWSDL2JavaDataModel(WSDL2JavaDataModel object) {
- return null;
- }
-
- /**
- * Returns the result of interpreting the object as an instance of '<em>EObject</em>'.
- * <!-- begin-user-doc -->
- * This implementation returns null;
- * returning a non-null result will terminate the switch, but this is the last case anyway.
- * <!-- end-user-doc -->
- * @param object the target of the switch.
- * @return the result of interpreting the object as an instance of '<em>EObject</em>'.
- * @see #doSwitch(org.eclipse.emf.ecore.EObject)
- * @generated
- */
- public T defaultCase(EObject object) {
- return null;
- }
-
-} //CXFSwitch
diff --git a/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/resources/JavaResourceChangeListener.java b/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/resources/JavaResourceChangeListener.java
deleted file mode 100644
index 03c8e99..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/resources/JavaResourceChangeListener.java
+++ /dev/null
@@ -1,86 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IONA Technologies PLC
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IONA Technologies PLC - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.cxf.core.resources;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IResourceChangeEvent;
-import org.eclipse.core.resources.IResourceChangeListener;
-import org.eclipse.core.resources.IResourceDelta;
-import org.eclipse.core.resources.IResourceDeltaVisitor;
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.jst.ws.internal.cxf.core.CXFCorePlugin;
-
-/**
- * Listens for changes to the <code>IJavaProject</code> src folder.
- *
- */
-public class JavaResourceChangeListener implements IResourceChangeListener {
- private List<IResource> changedResources = new ArrayList<IResource>();
-
- private IPath sourceDirectoryPath;
-
- /**
- * Constructs a JavaResourceChangeListener instance.
- *
- * @param sourceDirectoryPath
- */
- public JavaResourceChangeListener(IPath sourceDirectoryPath) {
- this.sourceDirectoryPath = sourceDirectoryPath;
- }
-
- public void resourceChanged(IResourceChangeEvent event) {
- if (event.getType() != IResourceChangeEvent.POST_CHANGE) {
- return;
- }
- IResourceDelta rootDelta = event.getDelta();
-
- IWorkspaceRoot workspaceRoot = ResourcesPlugin.getWorkspace().getRoot();
- IFolder srcFolder = workspaceRoot.getFolder(sourceDirectoryPath);
- IPath srcFolderPath = srcFolder.getFullPath();
- if (!srcFolderPath.hasTrailingSeparator()) {
- srcFolderPath = srcFolderPath.addTrailingSeparator();
- }
-
- IResourceDelta javaResourceDelta = rootDelta.findMember(srcFolderPath);
-
- if (javaResourceDelta == null) {
- return;
- }
-
- IResourceDeltaVisitor visitor = new IResourceDeltaVisitor() {
- public boolean visit(IResourceDelta delta) {
- if (delta.getKind() != IResourceDelta.ADDED) {
- return true;
- }
- IResource resource = delta.getResource();
- changedResources.add(resource);
- return true;
- }
- };
- try {
- javaResourceDelta.accept(visitor);
- } catch (CoreException ce) {
- CXFCorePlugin.log(ce.getStatus());
- }
- }
-
- public List<IResource> getChangedResources() {
- return changedResources;
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/resources/WebContentChangeListener.java b/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/resources/WebContentChangeListener.java
deleted file mode 100644
index 940b1cc..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/resources/WebContentChangeListener.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IONA Technologies PLC
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IONA Technologies PLC - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.cxf.core.resources;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IResourceChangeEvent;
-import org.eclipse.core.resources.IResourceChangeListener;
-import org.eclipse.core.resources.IResourceDelta;
-import org.eclipse.core.resources.IResourceDeltaVisitor;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.jst.ws.internal.common.J2EEUtils;
-import org.eclipse.jst.ws.internal.cxf.core.CXFCorePlugin;
-
-/**
- * Listens for changes to the web projects WebContent folder.
- *
- */
-@SuppressWarnings("restriction")
-public class WebContentChangeListener implements IResourceChangeListener {
- private List<IResource> changedResources = new ArrayList<IResource>();
-
- private String projectName;
-
- public WebContentChangeListener(String projectName) {
- this.projectName = projectName;
- }
-
- public void resourceChanged(IResourceChangeEvent event) {
- if (event.getType() != IResourceChangeEvent.POST_CHANGE) {
- return;
- }
- IResourceDelta rootDelta = event.getDelta();
-
- IPath webContentPath = J2EEUtils.getWebContentPath(ResourcesPlugin.getWorkspace().getRoot()
- .getProject(projectName));
- if (!webContentPath.hasTrailingSeparator()) {
- webContentPath = webContentPath.addTrailingSeparator();
- }
-
- IResourceDelta webResourceDelta = rootDelta.findMember(webContentPath); //$NON-NLS-1$
- if (webResourceDelta == null) {
- return;
- }
-
- IResourceDeltaVisitor visitor = new IResourceDeltaVisitor() {
- public boolean visit(IResourceDelta delta) {
- if (delta.getKind() != IResourceDelta.ADDED) {
- return true;
- }
- IResource resource = delta.getResource();
- changedResources.add(resource);
- return true;
- }
- };
- try {
- webResourceDelta.accept(visitor);
- } catch (CoreException ce) {
- CXFCorePlugin.log(ce.getStatus());
- }
- }
-
- public List<IResource> getChangedResources() {
- return changedResources;
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/utils/CXFModelUtils.java b/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/utils/CXFModelUtils.java
deleted file mode 100644
index 0b245dd..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/utils/CXFModelUtils.java
+++ /dev/null
@@ -1,455 +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.core.utils;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.Map.Entry;
-
-import javax.jws.WebMethod;
-import javax.jws.WebParam;
-import javax.jws.WebService;
-import javax.xml.ws.RequestWrapper;
-import javax.xml.ws.ResponseWrapper;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.ILocalVariable;
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jdt.core.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.CompilationUnit;
-import org.eclipse.jdt.core.dom.MemberValuePair;
-import org.eclipse.jdt.core.dom.NormalAnnotation;
-import org.eclipse.jdt.core.dom.StringLiteral;
-import org.eclipse.jdt.core.dom.rewrite.ImportRewrite;
-import org.eclipse.jdt.ui.CodeStyleConfiguration;
-import org.eclipse.jdt.ui.SharedASTProvider;
-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.cxf.core.CXFCorePlugin;
-import org.eclipse.jst.ws.internal.cxf.core.model.CXFPackage;
-import org.eclipse.jst.ws.internal.cxf.core.model.Java2WSDataModel;
-import org.eclipse.jst.ws.jaxws.core.utils.JDTUtils;
-import org.eclipse.ltk.core.refactoring.TextFileChange;
-import org.eclipse.text.edits.TextEdit;
-import org.osgi.framework.Version;
-
-/**
- * Provides utility methods for working with the CXF model.
- * Also serving as an interim class to aid in refactoring core utilities into jaxws core.
- *
- */
-public final class CXFModelUtils {
- private static final Version v_0_0_0 = new Version("0.0.0");
- private static final Version v_2_1 = new Version(CXFCorePlugin.CXF_VERSION_2_1);
- private static final Version v_2_0_7 = new Version("2.0.7");
- private static final Version v_2_1_1 = new Version("2.1.1");
-
- public static final String WEB_SERVICE = "WebService"; //$NON-NLS-1$
- public static final String WEB_METHOD = "WebMethod"; //$NON-NLS-1$
- public static final String WEB_PARAM = "WebParam"; //$NON-NLS-1$
- public static final String REQUEST_WRAPPER = "RequestWrapper"; //$NON-NLS-1$
- public static final String RESPONSE_WRAPPER = "ResponseWrapper"; //$NON-NLS-1$
-
- private static final String ENDPOINT_INTERFACE = "endpointInterface"; //$NON-NLS-1$
-
- private static Map<String, String> ANNOTATION_TYPENAME_MAP = new HashMap<String, String>();
-
- static {
- ANNOTATION_TYPENAME_MAP.put("ServiceMode", "javax.xml.ws.ServiceMode"); //$NON-NLS-1$ //$NON-NLS-2$
- ANNOTATION_TYPENAME_MAP.put("WebFault", "javax.xml.ws.WebFault"); //$NON-NLS-1$ //$NON-NLS-2$
- ANNOTATION_TYPENAME_MAP.put(REQUEST_WRAPPER, "javax.xml.ws.RequestWrapper"); //$NON-NLS-1$
- ANNOTATION_TYPENAME_MAP.put(RESPONSE_WRAPPER, "javax.xml.ws.ResponseWrapper"); //$NON-NLS-1$ //$NON-NLS-2$
- ANNOTATION_TYPENAME_MAP.put("WebServiceClient", "javax.xml.ws.WebServiceClient"); //$NON-NLS-1$ //$NON-NLS-2$
- ANNOTATION_TYPENAME_MAP.put("WebEndpoint", "javax.xml.ws.WebEndpoint"); //$NON-NLS-1$ //$NON-NLS-2$
- ANNOTATION_TYPENAME_MAP.put("WebServiceProvider", "javax.xml.ws.WebServiceProvider"); //$NON-NLS-1$ //$NON-NLS-2$
- ANNOTATION_TYPENAME_MAP.put("BindingType", "javax.xml.ws.BindingType"); //$NON-NLS-1$ //$NON-NLS-2$
- ANNOTATION_TYPENAME_MAP.put("WebServiceRef", "javax.xml.ws.WebServiceRef"); //$NON-NLS-1$ //$NON-NLS-2$
- ANNOTATION_TYPENAME_MAP.put("WebServiceRefs", "javax.xml.ws.WebServiceRefs"); //$NON-NLS-1$ //$NON-NLS-2$
- ANNOTATION_TYPENAME_MAP.put(WEB_SERVICE, "javax.jws.WebService"); //$NON-NLS-1$
- ANNOTATION_TYPENAME_MAP.put(WEB_METHOD, "javax.jws.WebMethod"); //$NON-NLS-1$
- ANNOTATION_TYPENAME_MAP.put("Oneway", "javax.jws.OneWay"); //$NON-NLS-1$ //$NON-NLS-2$
- ANNOTATION_TYPENAME_MAP.put(WEB_PARAM, "javax.jws.WebParam"); //$NON-NLS-1$
- ANNOTATION_TYPENAME_MAP.put("WebResult", "javax.jws.WebResult"); //$NON-NLS-1$ //$NON-NLS-2$
- ANNOTATION_TYPENAME_MAP.put("SOAPBinding", "javax.jws.SOAPBinding"); //$NON-NLS-1$ //$NON-NLS-2$
- ANNOTATION_TYPENAME_MAP.put("HandlerChain", "javax.jws.HandlerChain"); //$NON-NLS-1$ //$NON-NLS-2$
- }
-
- private CXFModelUtils() {
- }
-
- public static void getWebServiceAnnotationChange(IType type, Java2WSDataModel model,
- TextFileChange textFileChange) throws CoreException {
- ICompilationUnit source = type.getCompilationUnit();
- CompilationUnit compilationUnit = SharedASTProvider.getAST(source, SharedASTProvider.WAIT_YES, null);
-
- AST ast = compilationUnit.getAST();
-
- NormalAnnotation webServiceAnnotation = getAnnotation(type, WebService.class);
- if (webServiceAnnotation != null && model.isUseServiceEndpointInterface() && type.isClass()) {
- MemberValuePair endpointInterface = getMemberValuePair(webServiceAnnotation, ENDPOINT_INTERFACE);
- if (endpointInterface != null && endpointInterface.getValue() instanceof StringLiteral) {
- StringLiteral stringLiteral = (StringLiteral) endpointInterface.getValue();
- if (!stringLiteral.getLiteralValue().equals(model.getServiceEndpointInterfaceName())) {
- ASTNode newSEIValue = AnnotationsCore.createStringLiteral(ast, model
- .getServiceEndpointInterfaceName());
-
- textFileChange.addEdit(AnnotationUtils.createUpdateMemberValuePairTextEdit(endpointInterface, newSEIValue));
- }
- } else {
- MemberValuePair endpointInterfacePair = AnnotationsCore.createMemberValuePair(ast,
- ENDPOINT_INTERFACE, AnnotationsCore.createStringLiteral(ast, model
- .getServiceEndpointInterfaceName()));
-
- textFileChange.addEdit(AnnotationUtils.createAddMemberValuePairTextEdit(webServiceAnnotation, endpointInterfacePair));
- }
- } else {
- IAnnotationAttributeInitializer annotationAttributeInitializer =
- AnnotationsManager.getAnnotationDefinitionForClass(WebService.class).
- getAnnotationAttributeInitializer();
-
- List<MemberValuePair> memberValuePairs = annotationAttributeInitializer.getMemberValuePairs(type, ast,
- WebService.class);
-
- if (model.isUseServiceEndpointInterface() && type.isClass()) {
- MemberValuePair endpointInterfaceValuePair = AnnotationsCore.createStringMemberValuePair(ast,
- ENDPOINT_INTERFACE, model.getServiceEndpointInterfaceName());
- memberValuePairs.add(1, endpointInterfaceValuePair);
- }
-
- Annotation annotation = AnnotationsCore.createNormalAnnotation(ast, WebService.class.getSimpleName(), memberValuePairs);
-
- textFileChange.addEdit(AnnotationUtils.createAddAnnotationTextEdit(source.findPrimaryType(), annotation));
- }
- }
-
- private static NormalAnnotation getAnnotation(IType type, Class<? extends java.lang.annotation.Annotation> annotation) {
- Annotation jdtAnnotation = AnnotationUtils.getAnnotation(type, annotation);
- if (jdtAnnotation != null && jdtAnnotation instanceof NormalAnnotation) {
- return (NormalAnnotation) jdtAnnotation;
- }
- return null;
- }
-
- @SuppressWarnings("unchecked")
- private static MemberValuePair getMemberValuePair(NormalAnnotation annotation, String memberName) {
- List<MemberValuePair> memberValuePairs = annotation.values();
- for (MemberValuePair memberValuePair : memberValuePairs) {
- if (memberValuePair.getName().getIdentifier().equals(memberName)) {
- return memberValuePair;
- }
- }
- return null;
- }
-
- public static void createMethodAnnotationChange(IType type, IMethod method,
- Class<? extends java.lang.annotation.Annotation> annotationClass, TextFileChange textFileChange)
- throws CoreException {
- ICompilationUnit source = type.getCompilationUnit();
- CompilationUnit compilationUnit = SharedASTProvider.getAST(source, SharedASTProvider.WAIT_YES, null);
-
- AST ast = compilationUnit.getAST();
-
- Annotation annotation = getAnnotation(method, ast, annotationClass);
-
- textFileChange.addEdit(AnnotationUtils.createAddAnnotationTextEdit(method, annotation));
- }
-
- public static void getWebMethodAnnotationChange(IType type, IMethod method,
- TextFileChange textFileChange) throws CoreException {
- ICompilationUnit source = type.getCompilationUnit();
- CompilationUnit compilationUnit = SharedASTProvider.getAST(source, SharedASTProvider.WAIT_YES, null);
-
- AST ast = compilationUnit.getAST();
-
- Annotation annotation = getAnnotation(method, ast, WebMethod.class);
-
- textFileChange.addEdit(AnnotationUtils.createAddAnnotationTextEdit(method, annotation));
- }
-
- public static void getRequestWrapperAnnotationChange(IType type, IMethod method,
- TextFileChange textFileChange) throws CoreException {
- ICompilationUnit source = type.getCompilationUnit();
- CompilationUnit compilationUnit = SharedASTProvider.getAST(source, SharedASTProvider.WAIT_YES, null);
-
- AST ast = compilationUnit.getAST();
-
- Annotation annotation = getAnnotation(method, ast, RequestWrapper.class);
-
- textFileChange.addEdit(AnnotationUtils.createAddAnnotationTextEdit(method, annotation));
- }
-
- public static void getResponseWrapperAnnotationChange(IType type, IMethod method,
- TextFileChange textFileChange) throws CoreException {
- ICompilationUnit source = type.getCompilationUnit();
- CompilationUnit compilationUnit = SharedASTProvider.getAST(source, SharedASTProvider.WAIT_YES, null);
-
- AST ast = compilationUnit.getAST();
-
- Annotation annotation = getAnnotation(method, ast, ResponseWrapper.class);
-
- textFileChange.addEdit(AnnotationUtils.createAddAnnotationTextEdit(method, annotation));
- }
-
- public static void getWebParamAnnotationChange(IType type, final IMethod method,
- ILocalVariable parameter, TextFileChange textFileChange)
- throws CoreException {
- ICompilationUnit source = type.getCompilationUnit();
- CompilationUnit compilationUnit = SharedASTProvider.getAST(source, SharedASTProvider.WAIT_YES, null);
-
- AST ast = compilationUnit.getAST();
-
- Annotation annotation = getAnnotation(parameter, ast, WebParam.class);
-
- textFileChange.addEdit(AnnotationUtils.createAddAnnotationTextEdit(parameter, annotation));
- }
-
- private static Annotation getAnnotation(IJavaElement javaElement, AST ast,
- Class<? extends java.lang.annotation.Annotation> annotationClass) {
-
- IAnnotationAttributeInitializer annotationAttributeInitializer = AnnotationsManager.
- getAnnotationDefinitionForClass(annotationClass).getAnnotationAttributeInitializer();
-
- List<MemberValuePair> memberValuePairs =
- annotationAttributeInitializer.getMemberValuePairs(javaElement, ast, annotationClass);
-
- return AnnotationsCore.createNormalAnnotation(ast, annotationClass.getSimpleName(), memberValuePairs);
- }
-
- public static void getImportsChange(ICompilationUnit compilationUnit, Java2WSDataModel model,
- TextFileChange textFileChange, boolean classOnly) {
- try {
-
- ImportRewrite importRewrite = CodeStyleConfiguration.createImportRewrite(compilationUnit, true);
-
- importRewrite.addImport(ANNOTATION_TYPENAME_MAP.get(WEB_SERVICE));
-
- if (!classOnly) {
- Map<IMethod, Map<String, Boolean>> methodAnnotationMap = model.getMethodMap();
- Set<Entry<IMethod, Map<String, Boolean>>> methodAnnotationSet = methodAnnotationMap.entrySet();
- for (Map.Entry<IMethod, Map<String, Boolean>> methodAnnotation : methodAnnotationSet) {
- Map<String, Boolean> methodMap = methodAnnotation.getValue();
- Set<Entry<String, Boolean>> methodSet = methodMap.entrySet();
- for (Map.Entry<String, Boolean> method : methodSet) {
- if (ANNOTATION_TYPENAME_MAP.containsKey(method.getKey()) && method.getValue()) {
- importRewrite.addImport(ANNOTATION_TYPENAME_MAP.get(method.getKey()));
- }
- }
- }
- }
- if (importRewrite.hasRecordedChanges()) {
- TextEdit importTextEdit = importRewrite.rewriteImports(null);
- textFileChange.addEdit(importTextEdit);
- }
- } catch (CoreException ce) {
- CXFCorePlugin.log(ce.getStatus());
- }
- }
-
- /**
- * Loads all public methods with the default annotation maps
- * @return
- */
- public static Map<IMethod, Map<String, Boolean>> getMethodMap(IType type, Java2WSDataModel model) {
- Map<IMethod, Map<String, Boolean>> methodMap = new HashMap<IMethod, Map<String, Boolean>>();
-
- try {
- IMethod[] methods = type.getMethods();
- for (IMethod method : methods) {
- if (type.isInterface()) {
- methodMap.put(method, getAnnotationMap(model));
- } else if (type.isClass() && JDTUtils.isPublicMethod(method)) {
- methodMap.put(method, getAnnotationMap(model));
- }
- }
- } catch (JavaModelException jme) {
- CXFCorePlugin.log(jme.getStatus());
- }
- return methodMap;
- }
-
- public static Map<String, Boolean> getAnnotationMap(Java2WSDataModel model) {
- Map<String, Boolean> annotationdMap = new HashMap<String, Boolean>();
- annotationdMap.put(CXFModelUtils.WEB_METHOD, model.isGenerateWebMethodAnnotation());
- annotationdMap.put(CXFModelUtils.WEB_PARAM, model.isGenerateWebParamAnnotation());
- annotationdMap.put(CXFModelUtils.REQUEST_WRAPPER, model.isGenerateRequestWrapperAnnotation());
- annotationdMap.put(CXFModelUtils.RESPONSE_WRAPPER, model.isGenerateResponseWrapperAnnotation());
- return annotationdMap;
- }
-
- /**
- * CXF wsdl2java -autoNameResolution is supported in the CXF 2.0 stream from 2.0.7
- * and in the CXF 2.1 stream from 2.1.1 up.
- *
- * @param cxfRuntimeVersion
- * @return
- */
- public static boolean isAutoNameResolutionPermitted() {
- Version currentVersion = CXFCorePlugin.getDefault().getCurrentRuntimeVersion();
- //On startup with clean workspace show by default.
- if (currentVersion.compareTo(v_0_0_0) == 0) {
- return true;
- }
-
- if (currentVersion.compareTo(CXFModelUtils.v_2_1_1) >= 0) {
- return true;
- }
-
- if (currentVersion.compareTo(CXFModelUtils.v_2_0_7) >= 0
- && currentVersion.compareTo(CXFModelUtils.v_2_1) < 0) {
- return true;
- }
- return false;
- }
-
- public static boolean getDefaultBooleanValue(int classifierID, int featureID) {
- Object defaultValue = null;
-
- if (classifierID == CXFPackage.CXF_CONTEXT) {
- switch (featureID) {
- case CXFPackage.CXF_CONTEXT__EXPORT_CXF_CLASSPATH_CONTAINER:
- defaultValue = CXFPackage.eINSTANCE.getCXFContext_ExportCXFClasspathContainer()
- .getDefaultValue();
- break;
- case CXFPackage.CXF_CONTEXT__VERBOSE:
- defaultValue = CXFPackage.eINSTANCE.getCXFContext_Verbose().getDefaultValue();
- break;
- case CXFPackage.CXF_CONTEXT__GENERATE_ANT_BUILD_FILE:
- defaultValue = CXFPackage.eINSTANCE.getCXFContext_GenerateAntBuildFile().getDefaultValue();
- break;
- case CXFPackage.CXF_CONTEXT__USE_SPRING_APPLICATION_CONTEXT:
- defaultValue = CXFPackage.eINSTANCE.getCXFContext_UseSpringApplicationContext()
- .getDefaultValue();
- break;
- case CXFPackage.CXF_CONTEXT__GENERATE_CLIENT:
- defaultValue = CXFPackage.eINSTANCE.getCXFContext_GenerateClient().getDefaultValue();
- break;
- case CXFPackage.CXF_CONTEXT__GENERATE_SERVER:
- defaultValue = CXFPackage.eINSTANCE.getCXFContext_GenerateServer().getDefaultValue();
- break;
- }
- }
-
- if (classifierID == CXFPackage.JAVA2_WS_CONTEXT) {
- switch (featureID) {
- case CXFPackage.JAVA2_WS_CONTEXT__ANNOTATION_PROCESSING_ENABLED:
- defaultValue = CXFPackage.eINSTANCE.getJava2WSContext_AnnotationProcessingEnabled()
- .getDefaultValue();
- break;
- case CXFPackage.JAVA2_WS_CONTEXT__SOAP12_BINDING:
- defaultValue = CXFPackage.eINSTANCE.getJava2WSContext_Soap12Binding().getDefaultValue();
- break;
- case CXFPackage.JAVA2_WS_CONTEXT__GENERATE_XSD_IMPORTS:
- defaultValue = CXFPackage.eINSTANCE.getJava2WSContext_GenerateXSDImports().getDefaultValue();
- break;
- case CXFPackage.JAVA2_WS_CONTEXT__GENERATE_WRAPPER_FAULT_BEANS:
- defaultValue = CXFPackage.eINSTANCE.getJava2WSContext_GenerateWrapperFaultBeans()
- .getDefaultValue();
- break;
- case CXFPackage.JAVA2_WS_CONTEXT__GENERATE_WSDL:
- defaultValue = CXFPackage.eINSTANCE.getJava2WSContext_GenerateWSDL().getDefaultValue();
- break;
- case CXFPackage.JAVA2_WS_CONTEXT__GENERATE_WEB_METHOD_ANNOTATION:
- defaultValue = CXFPackage.eINSTANCE.getJava2WSContext_GenerateWebMethodAnnotation()
- .getDefaultValue();
- break;
- case CXFPackage.JAVA2_WS_CONTEXT__GENERATE_WEB_PARAM_ANNOTATION:
- defaultValue = CXFPackage.eINSTANCE.getJava2WSContext_GenerateWebParamAnnotation()
- .getDefaultValue();
- break;
- case CXFPackage.JAVA2_WS_CONTEXT__GENERATE_REQUEST_WRAPPER_ANNOTATION:
- defaultValue = CXFPackage.eINSTANCE.getJava2WSContext_GenerateRequestWrapperAnnotation()
- .getDefaultValue();
- break;
- case CXFPackage.JAVA2_WS_CONTEXT__GENERATE_RESPONSE_WRAPPER_ANNOTATION:
- defaultValue = CXFPackage.eINSTANCE.getJava2WSContext_GenerateResponseWrapperAnnotation()
- .getDefaultValue();
- break;
- }
- }
-
- if (classifierID == CXFPackage.WSDL2_JAVA_CONTEXT) {
- switch (featureID) {
- case CXFPackage.WSDL2_JAVA_CONTEXT__NO_ADDRESS_BINDING:
- defaultValue = CXFPackage.eINSTANCE.getWSDL2JavaContext_NoAddressBinding().getDefaultValue();
- break;
- case CXFPackage.WSDL2_JAVA_CONTEXT__USE_DEFAULT_VALUES:
- defaultValue = CXFPackage.eINSTANCE.getWSDL2JavaContext_UseDefaultValues().getDefaultValue();
- break;
- case CXFPackage.WSDL2_JAVA_CONTEXT__AUTO_NAME_RESOLUTION:
- defaultValue = CXFPackage.eINSTANCE.getWSDL2JavaContext_AutoNameResolution()
- .getDefaultValue();
- break;
- case CXFPackage.WSDL2_JAVA_CONTEXT__GENERATE_IMPLEMENTATION:
- defaultValue = CXFPackage.eINSTANCE.getWSDL2JavaContext_GenerateImplementation()
- .getDefaultValue();
- break;
- case CXFPackage.WSDL2_JAVA_CONTEXT__PROCESS_SOAP_HEADERS:
- defaultValue = CXFPackage.eINSTANCE.getWSDL2JavaContext_ProcessSOAPHeaders()
- .getDefaultValue();
- break;
- case CXFPackage.WSDL2_JAVA_CONTEXT__GENERATE_ANT_BUILD_FILE:
- defaultValue = CXFPackage.eINSTANCE.getCXFContext_GenerateAntBuildFile().getDefaultValue();
- break;
- case CXFPackage.WSDL2_JAVA_CONTEXT__VALIDATE:
- defaultValue = CXFPackage.eINSTANCE.getWSDL2JavaContext_Validate().getDefaultValue();
- break;
- case CXFPackage.WSDL2_JAVA_CONTEXT__LOAD_DEFAULT_NAMESPACE_PACKAGE_NAME_MAPPING:
- defaultValue = CXFPackage.eINSTANCE
- .getWSDL2JavaContext_LoadDefaultNamespacePackageNameMapping().getDefaultValue();
- break;
- case CXFPackage.WSDL2_JAVA_CONTEXT__LOAD_DEFAULT_EXCLUDES_NAMEPSACE_MAPPING:
- defaultValue = CXFPackage.eINSTANCE.getWSDL2JavaContext_LoadDefaultExcludesNamepsaceMapping()
- .getDefaultValue();
- break;
- case CXFPackage.WSDL2_JAVA_CONTEXT__XJC_USE_DEFAULT_VALUES:
- defaultValue = CXFPackage.eINSTANCE.getWSDL2JavaContext_XjcUseDefaultValues()
- .getDefaultValue();
- break;
- case CXFPackage.WSDL2_JAVA_CONTEXT__XJC_TO_STRING:
- defaultValue = CXFPackage.eINSTANCE.getWSDL2JavaContext_XjcToString().getDefaultValue();
- break;
- case CXFPackage.WSDL2_JAVA_CONTEXT__XJC_TO_STRING_MULTI_LINE:
- defaultValue = CXFPackage.eINSTANCE.getWSDL2JavaContext_XjcToStringMultiLine()
- .getDefaultValue();
- break;
- case CXFPackage.WSDL2_JAVA_CONTEXT__XJC_TO_STRING_SIMPLE:
- defaultValue = CXFPackage.eINSTANCE.getWSDL2JavaContext_XjcToStringSimple().getDefaultValue();
- break;
- case CXFPackage.WSDL2_JAVA_CONTEXT__XJC_LOCATOR:
- defaultValue = CXFPackage.eINSTANCE.getWSDL2JavaContext_XjcLocator().getDefaultValue();
- break;
- case CXFPackage.WSDL2_JAVA_CONTEXT__XJC_SYNC_METHODS:
- defaultValue = CXFPackage.eINSTANCE.getWSDL2JavaContext_XjcSyncMethods().getDefaultValue();
- break;
- case CXFPackage.WSDL2_JAVA_CONTEXT__XJC_MARK_GENERATED:
- defaultValue = CXFPackage.eINSTANCE.getWSDL2JavaContext_XjcMarkGenerated().getDefaultValue();
- break;
- }
- }
-
- if (defaultValue != null && defaultValue instanceof Boolean) {
- return ((Boolean) defaultValue).booleanValue();
- }
-
- return false;
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/utils/CommandLineUtils.java b/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/utils/CommandLineUtils.java
deleted file mode 100644
index 59750f3..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/utils/CommandLineUtils.java
+++ /dev/null
@@ -1,319 +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.core.utils;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.jst.ws.internal.common.ResourceUtils;
-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.model.WSDL2JavaDataModel;
-import org.eclipse.jst.ws.jaxws.core.utils.JDTUtils;
-
-@SuppressWarnings("restriction")
-public final class CommandLineUtils {
- // Java2WSDL
- private static String OUT_FILE = "-o"; //$NON-NLS-1$
- private static String RESOURCE_DIR = "-d"; //$NON-NLS-1$
- private static String SOURCE_DIR = "-s"; //$NON-NLS-1$
- private static String CLASS_DIR = "-classdir"; //$NON-NLS-1$
- private static String J2W_CLASSPATH = "-cp"; //$NON-NLS-1$
- private static String INC_SOAP12 = "-soap12"; //$NON-NLS-1$
- private static String TARGET_NAMESPACE = "-t"; //$NON-NLS-1$
- private static String J2W_SERVICE_NAME = "-servicename"; //$NON-NLS-1$
- private static String PORT_NAME = "-portname"; //$NON-NLS-1$
- private static String GEN_XSD_IMPORTS = "-createxsdimports"; //$NON-NLS-1$
- private static String VERBOSE = "-verbose"; //$NON-NLS-1$
-
- // Java2WS
- private static String J2W_FRONTEND = "-frontend"; //$NON-NLS-1$
- private static String J2W_DATABINDING = "-databinding"; //$NON-NLS-1$
- private static String BEAN_PATH = "-beans"; //$NON-NLS-1$
- private static String GEN_WSDL = "-wsdl"; //$NON-NLS-1$
- private static String GEN_CLIENT = "-client"; //$NON-NLS-1$
- private static String GEN_SERVER = "-server"; //$NON-NLS-1$
- private static String GEN_WRAPPER_FAULT = "-wrapperbean"; //$NON-NLS-1$
-
- private static String W2J_PACKAGE_NAME = "-p"; //$NON-NLS-1$
- private static String W2J_BINDING_NAME = "-b"; //$NON-NLS-1$
-
- private static String W2J_FRONTEND = "-fe"; //$NON-NLS-1$
- private static String W2J_DATABINDING = "-db"; //$NON-NLS-1$
- private static String W2J_WSDL_VERSION = "-wv"; //$NON-NLS-1$
- private static String W2J_SERVICE_NAME = "-sn"; //$NON-NLS-1$
- private static String W2J_CATALOG = "-catalog"; //$NON-NLS-1$
- private static String W2J_COMPILE = "-compile"; //$NON-NLS-1$
- private static String W2J_GEN_IMPL = "-impl"; //$NON-NLS-1$
- private static String W2J_GEN_ALL = "-all"; //$NON-NLS-1$
- private static String W2J_NO_OVERWRITE = "-keep"; //$NON-NLS-1$
- private static String W2J_DEFAULT_VALUES = "-defaultValues"; //$NON-NLS-1$
- private static String W2J_AUTO_NAME_RESOLUTION = "-autoNameResolution"; //$NON-NLS-1$
- private static String W2J_EXCLUDE_NAMESPACE = "-nexclude"; //$NON-NLS-1$
- private static String W2J_EXT_SOAP_HEADER = "-exsh"; //$NON-NLS-1$
- private static String W2J_DEFAULT_NAMESPACE = "-dns"; //$NON-NLS-1$
- private static String W2J_DEFAULT_EXCLUDE_NS = "-dex"; //$NON-NLS-1$
- private static String W2J_WSDL_LOCATION = "-wsdlLocation"; //$NON-NLS-1$
- private static String W2J_XJC_ARGS = "-xjc"; //$NON-NLS-1$
- private static String W2J_NO_ADDRESS_BINDING = "-noAddressBinding"; //$NON-NLS-1$
- private static String W2J_VALIDATE_WSDL = "-validate"; //$NON-NLS-1$
-
- // XJC
- 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 CommandLineUtils() {
- }
-
- public static String[] getJava2WSProgramArguments(Java2WSDataModel model) {
- List<String> progArgs = new ArrayList<String>();
-
- IProject project = ResourceUtils.getWorkspaceRoot().getProject(model.getProjectName());
- if (project != null && project.exists() && JDTUtils.isJavaProject(project)) {
- String className = model.getJavaStartingPoint();
- if (model.isUseServiceEndpointInterface() && model.getFullyQualifiedJavaClassName() != null) {
- className = model.getFullyQualifiedJavaClassName();
- }
- // Add all the earlier wsdl2java tool options
- progArgs.addAll(Arrays.asList(CommandLineUtils.getStandardJava2WSDLProgramArguments(model)));
-
- if (model.getCxfRuntimeVersion().compareTo(CXFCorePlugin.CXF_VERSION_2_1) >= 0) {
- progArgs.add(J2W_FRONTEND);
- progArgs.add(model.getFrontend().getLiteral());
-
- progArgs.add(J2W_DATABINDING);
- progArgs.add(model.getDatabinding().getLiteral());
-
- // progArgs.add(BEAN_PATH);
- // progArgs.add("BEAN_PATH");
-
- if (model.isGenerateWSDL()) {
- progArgs.add(GEN_WSDL);
- } else {
- progArgs.remove(OUT_FILE);
- progArgs.remove(model.getWsdlFileName());
- }
-
- if (model.isGenerateClient()) {
- progArgs.add(GEN_CLIENT);
- }
-
- if (model.isGenerateServer()) {
- progArgs.add(GEN_SERVER);
- }
-
- if (model.isGenerateWrapperFaultBeans()) {
- progArgs.add(GEN_WRAPPER_FAULT);
- }
- }
-
- progArgs.add(className);
- }
- return progArgs.toArray(new String[progArgs.size()]);
- }
-
- private static String[] getStandardJava2WSDLProgramArguments(Java2WSDataModel model) {
- String projectName = model.getProjectName();
- List<String> progArgs = new ArrayList<String>();
- progArgs.add(J2W_CLASSPATH);
- progArgs.add(JDTUtils.getJavaProjectOutputDirectoryPath(projectName).toOSString());
-
- progArgs.add(SOURCE_DIR);
- progArgs.add(FileUtils.getTmpFolder(projectName) + "/src"); //$NON-NLS-1$
-
- progArgs.add(RESOURCE_DIR);
- progArgs.add(FileUtils.getTmpFolder(projectName) + "/wsdl"); //$NON-NLS-1$
-
- progArgs.add(CLASS_DIR);
- progArgs.add(JDTUtils.getJavaProjectOutputDirectoryPath(projectName).toOSString());
-
- progArgs.add(OUT_FILE);
- progArgs.add(model.getWsdlFileName());
-
- if (model.isSoap12Binding()) {
- progArgs.add(INC_SOAP12);
- }
- if (model.isGenerateXSDImports()) {
- progArgs.add(GEN_XSD_IMPORTS);
- }
-
- if (model.isVerbose()) {
- progArgs.add(VERBOSE);
- }
-
- return progArgs.toArray(new String[progArgs.size()]);
- }
-
- public static String[] getWSDL2JavaProgramArguments(WSDL2JavaDataModel model) {
- String projectName = model.getProjectName();
- List<String> progArgs = new ArrayList<String>();
-
- IProject project = ResourceUtils.getWorkspaceRoot().getProject(projectName);
- if (project != null && project.exists() && JDTUtils.isJavaProject(project)) {
- // Add Standard args
- progArgs.addAll(Arrays.asList(CommandLineUtils.getStandardWSDL2JavaProgramArguments(model,
- projectName)));
-
- String serviceName = model.getServiceName();
- if (serviceName != null && serviceName.length() > 0) {
- progArgs.add(W2J_SERVICE_NAME);
- progArgs.add(serviceName);
- }
-
- if (model.isUseDefaultValues()) {
- progArgs.add(W2J_DEFAULT_VALUES);
- }
-
- if (model.getCxfRuntimeVersion().compareTo(CXFCorePlugin.CXF_VERSION_2_1) >= 0) {
- progArgs.add(W2J_FRONTEND);
- progArgs.add(model.getFrontend().getLiteral());
-
- progArgs.add(W2J_DATABINDING);
- progArgs.add(model.getDatabinding().getLiteral());
-
- progArgs.add(W2J_WSDL_VERSION);
- progArgs.add(model.getWsdlVersion());
-
- if (model.isNoAddressBinding()) {
- progArgs.add(W2J_NO_ADDRESS_BINDING);
- }
- }
-
- progArgs.add(model.getWsdlURL().toExternalForm());
- }
- return progArgs.toArray(new String[progArgs.size()]);
- }
-
- public static String[] getWSDL2JavaGenerateClientArguments(WSDL2JavaDataModel model) {
- String projectName = model.getProjectName();
- List<String> progArgs = new ArrayList<String>();
-
- IProject project = ResourceUtils.getWorkspaceRoot().getProject(projectName);
- if (project != null && project.exists() && JDTUtils.isJavaProject(project)) {
- progArgs.add(GEN_CLIENT);
-
- // Add WSLD2Java args
- progArgs.addAll(Arrays.asList(CommandLineUtils.getWSDL2JavaProgramArguments(model)));
- }
- return progArgs.toArray(new String[progArgs.size()]);
- }
-
- public static String[] getStandardWSDL2JavaProgramArguments(WSDL2JavaDataModel model, String projectName) {
- List<String> progArgs = new ArrayList<String>();
- progArgs.add(RESOURCE_DIR);
- progArgs.add(FileUtils.getTmpFolder(projectName) + "/src"); //$NON-NLS-1$
-
- progArgs.add(CLASS_DIR);
- progArgs.add(JDTUtils.getJavaProjectOutputDirectoryPath(projectName).toOSString());
-
- Map<String, String> includedNamespaces = model.getIncludedNamespaces();
- if (includedNamespaces != null && model.getIncludedNamespaces().size() > 0) {
- Set<Map.Entry<String, String>> includedNamespacesEntrySet = includedNamespaces.entrySet();
- for (Map.Entry<String, String> entry : includedNamespacesEntrySet) {
- progArgs.add(W2J_PACKAGE_NAME);
- String wsdlNamespace = entry.getKey();
- String packageName = entry.getValue();
- progArgs.add(wsdlNamespace + "=" + packageName); //$NON-NLS-1$
- }
- }
-
- List<String> bindingFiles = model.getBindingFiles();
- if (!bindingFiles.isEmpty()) {
- for (String bindingFile : bindingFiles) {
- progArgs.add(W2J_BINDING_NAME);
- progArgs.add(bindingFile);
- }
- }
-
- if (model.isGenerateServer()) {
- progArgs.add(GEN_SERVER);
- }
-
- if (model.isGenerateImplementation()) {
- progArgs.add(W2J_GEN_IMPL);
- }
-
- if(model.isValidate()) {
- progArgs.add(W2J_VALIDATE_WSDL);
- }
-
- progArgs.add(W2J_EXT_SOAP_HEADER);
- progArgs.add(Boolean.toString(model.isProcessSOAPHeaders()));
-
- progArgs.add(W2J_DEFAULT_NAMESPACE);
- progArgs.add(Boolean.toString(model.isLoadDefaultNamespacePackageNameMapping()));
-
- progArgs.add(W2J_DEFAULT_EXCLUDE_NS);
- progArgs.add(Boolean.toString(model.isLoadDefaultExcludesNamepsaceMapping()));
-
- if (model.isAutoNameResolution() && CXFModelUtils.isAutoNameResolutionPermitted()) {
- progArgs.add(W2J_AUTO_NAME_RESOLUTION);
- }
-
- String xjcArgs = CommandLineUtils.getXJCArgs(model);
- if (xjcArgs.trim().length() > 0) {
- progArgs.add(W2J_XJC_ARGS + xjcArgs);
- }
-
- if (model.getWsdlLocation() != null) {
- progArgs.add(W2J_WSDL_LOCATION);
- progArgs.add(model.getWsdlLocation());
- }
-
- if (model.isVerbose()) {
- progArgs.add(VERBOSE);
- }
- return progArgs.toArray(new String[progArgs.size()]);
- }
-
- private static String getXJCArgs(WSDL2JavaDataModel model) {
- List<String> xjcArgs = new ArrayList<String>();
- if (model.isXjcUseDefaultValues()) {
- xjcArgs.add(XJC_DV_ARG);
- }
- if (model.isXjcToString()) {
- xjcArgs.add(XJC_TS_ARG);
- }
- if (model.isXjcToStringMultiLine()) {
- xjcArgs.add(XJC_TS_MULTI_ARG);
- }
- if (model.isXjcToStringSimple()) {
- xjcArgs.add(XJC_TS_SIMPLE);
- }
- if (model.isXjcLocator()) {
- xjcArgs.add(XJC_LOCATOR_ARG);
- }
- if (model.isXjcSyncMethods()) {
- xjcArgs.add(XJC_SYNC_METHODS_ARG);
- }
- if (model.isXjcMarkGenerated()) {
- xjcArgs.add(XJC_MARK_GENERATED_ARG);
- }
-
- String xjcArg = xjcArgs.toString();
- xjcArg = xjcArg.replace('[', ' ');
- xjcArg = xjcArg.replace(']', ' ');
-
- xjcArg = xjcArg.replaceAll("\\s", ""); //$NON-NLS-1$ //$NON-NLS-2$
-
- return xjcArg.trim();
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/utils/FileUtils.java b/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/utils/FileUtils.java
deleted file mode 100644
index 4dc3359..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/utils/FileUtils.java
+++ /dev/null
@@ -1,270 +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.core.utils;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.net.URL;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.core.runtime.content.IContentDescription;
-import org.eclipse.core.runtime.content.IContentType;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.IType;
-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.model.WSDL2JavaDataModel;
-import org.eclipse.jst.ws.jaxws.core.utils.JDTUtils;
-import org.eclipse.jst.ws.jaxws.core.utils.WSDLUtils;
-import org.eclipse.wst.sse.core.internal.format.IStructuredFormatProcessor;
-import org.eclipse.wst.sse.ui.internal.FormatProcessorsExtensionReader;
-
-@SuppressWarnings("restriction")
-public final class FileUtils {
-
- private static final String TMP_FOLDER_NAME = ".cxftmp"; //$NON-NLS-1$
-
- private FileUtils() {
- }
-
- public static IProject getProject(String projectName) {
- return ResourcesPlugin.getWorkspace().getRoot().getProject(projectName);
- }
-
- public static void copyFolder(String source, String destination) {
- File sourceFolder = new File(source);
-
- String[] files = sourceFolder.list();
- for (int i = 0; i < files.length; i++) {
- File file = new File(sourceFolder + File.separator + files[i]);
- if (file.isDirectory()) {
- copyFolder(source, destination, files[i]);
- } else {
- copyFile(source, destination, files[i]);
- }
- }
- }
-
- private static void copyFolder(String sourceFolder, String targetFolder, String name) {
- File target = new File(targetFolder + File.separator + name);
- if (!target.exists()) {
- target.mkdir();
- }
- copyFolder(sourceFolder + File.separator + name, targetFolder + File.separator + name);
- }
-
- public static void copyFile(String sourceFolder, String targetFolder, String fileName) {
- File sourceFile = new File(sourceFolder + File.separator + fileName);
- File targetFile = new File(targetFolder + File.separator + fileName);
- if (!targetFile.exists()) {
- InputStream inputStream = null;
- OutputStream outputStream = null;
- try {
- inputStream = new FileInputStream(sourceFile);
- outputStream = new FileOutputStream(targetFile);
- byte[] buffer = new byte[102400];
- while (true) {
- int numberOfBytes = inputStream.read(buffer);
- if (numberOfBytes < 0) {
- break;
- }
- outputStream.write(buffer, 0, numberOfBytes);
- }
-
- } catch (FileNotFoundException fnfe) {
- CXFCorePlugin.log(fnfe);
- } catch (IOException ioe) {
- CXFCorePlugin.log(ioe);
- } finally {
- try {
- if (inputStream != null) {
- inputStream.close();
- }
- if (outputStream != null) {
- outputStream.close();
- }
- } catch(IOException ioe) {
- CXFCorePlugin.log(ioe);
- }
- }
- } else {
- if (sourceFile.getName().indexOf(".java") != -1) { //$NON-NLS-1$
- MergeUtils.merge(sourceFile, targetFile);
- }
- }
- }
-
- public static String getTmpFolderName() {
- return TMP_FOLDER_NAME;
- }
-
- public static String getTmpFolder(String projectName) {
- return FileUtils.getTmpFolder(FileUtils.getProject(projectName));
- }
-
- public static String getTmpFolder(IProject project) {
- IFolder tmpFolder = project.getFolder(TMP_FOLDER_NAME);
- if (!tmpFolder.exists()) {
- try {
- tmpFolder.create(true, true, new NullProgressMonitor());
- } catch (CoreException ce) {
- CXFCorePlugin.log(ce.getStatus());
- }
- }
-
- IFolder tmpSrcFolder = tmpFolder.getFolder("src"); //$NON-NLS-1$
- if (!tmpSrcFolder.exists()) {
- try {
- tmpSrcFolder.create(true, true, new NullProgressMonitor());
- } catch (CoreException ce) {
- CXFCorePlugin.log(ce.getStatus());
- }
- }
-
- IFolder tmpWSDLFolder = tmpFolder.getFolder("wsdl"); //$NON-NLS-1$
- if (!tmpWSDLFolder.exists()) {
- try {
- tmpWSDLFolder.create(true, true, new NullProgressMonitor());
- } catch (CoreException ce) {
- CXFCorePlugin.log(ce.getStatus());
- }
- }
- return tmpFolder.getLocation().toOSString();
- }
-
- public static void copyW2JFilesFromTmp(WSDL2JavaDataModel model) {
- IWorkspaceRoot workspaceRoot = ResourcesPlugin.getWorkspace().getRoot();
-
- IProject project = workspaceRoot.getProject(model.getProjectName());
- IFolder srcFolder = workspaceRoot.getFolder(new Path(model.getJavaSourceFolder()));
- FileUtils.copyFolder(getTmpFolder(project) + "/src", srcFolder.getLocation().toOSString()); //$NON-NLS-1$
-
- try {
- srcFolder.refreshLocal(IResource.DEPTH_INFINITE, new NullProgressMonitor());
- } catch (CoreException ce) {
- CXFCorePlugin.log(ce.getStatus());
- }
- deleteTmpFolder(project);
- }
-
- public static void copyJ2WFilesFromTmp(Java2WSDataModel model) {
- String projectName = model.getProjectName();
- IProject project = FileUtils.getProject(projectName);
-
- IType type = JDTUtils.getType(JDTUtils.getJavaProject(projectName), model.getJavaStartingPoint());
- IJavaElement javaElement = type.getPackageFragment().getParent();
- IResource javaElementResource = javaElement.getResource();
- if (javaElementResource instanceof IFolder) {
- try {
- IFolder srcDirectory = (IFolder) javaElementResource;
- FileUtils.copyFolder(getTmpFolder(project) + "/src", srcDirectory.getLocation().toOSString()); //$NON-NLS-1$
- srcDirectory.refreshLocal(IResource.DEPTH_INFINITE, new NullProgressMonitor());
-
- if (model.isGenerateWSDL()) {
- IFolder wsdlFolder = WSDLUtils.getWSDLFolder(projectName);
- FileUtils.copyFolder(getTmpFolder(project) + "/wsdl", wsdlFolder.getLocation() //$NON-NLS-1$
- .toOSString());
- model.setConfigWsdlLocation(wsdlFolder.getName() + "/" //$NON-NLS-1$
- + model.getWsdlFileName());
- wsdlFolder.refreshLocal(IResource.DEPTH_INFINITE, new NullProgressMonitor());
- }
- } catch (CoreException ce) {
- CXFCorePlugin.log(ce.getStatus());
- }
-
- }
- deleteTmpFolder(project);
- }
-
- private static IStatus deleteTmpFolder(IProject project) {
- IStatus status = Status.OK_STATUS;
-
- IFolder tmpFolder = project.getFolder(TMP_FOLDER_NAME);
- if (tmpFolder.exists()) {
- try {
- tmpFolder.delete(true, false, new NullProgressMonitor());
- } catch (CoreException ce) {
- CXFCorePlugin.log(ce.getStatus());
- }
- }
- return status;
- }
-
- public static boolean isFileInWebContentFolder(IProject project, IPath filePath) {
- IPath webContentPath = WSDLUtils.getWebContentFolder(project).getLocation();
- if (webContentPath.isPrefixOf(filePath)) {
- return true;
- }
- return false;
- }
-
- public static boolean isFileInWorkspace(URL fileURL) {
- IPath filePath = new Path(fileURL.getPath());
-
- IWorkspaceRoot workspaceRoot = ResourcesPlugin.getWorkspace().getRoot();
- IPath workspacePath = workspaceRoot.getLocation();
- if (filePath.isValidPath(workspacePath.toOSString())) {
- return true;
- }
- return false;
- }
-
- public static void formatXMLFile(IFile file) {
- if (file != null) {
- try {
- IContentDescription contentDescription = file.getContentDescription();
- if (contentDescription == null) {
- return;
- }
- IContentType contentType = contentDescription.getContentType();
- IStructuredFormatProcessor formatProcessor = FormatProcessorsExtensionReader.getInstance()
- .getFormatProcessor(contentType.getId());
- if (formatProcessor != null) {
- formatProcessor.formatFile(file);
- }
- } catch (CoreException ce) {
- CXFCorePlugin.log(ce.getStatus());
- } catch (IOException ioe) {
- CXFCorePlugin.log(ioe);
- }
- }
- }
-
- public static void refreshProject(String projectName, IProgressMonitor monitor) {
- IProject project = FileUtils.getProject(projectName);
- FileUtils.refreshProject(project, monitor);
- }
-
- public static void refreshProject(IProject project, IProgressMonitor monitor) {
- try {
- project.refreshLocal(IResource.DEPTH_INFINITE, monitor);
- } catch (CoreException ce) {
- CXFCorePlugin.log(ce.getStatus());
- }
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/utils/LaunchUtils.java b/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/utils/LaunchUtils.java
deleted file mode 100644
index 3d8ce3a..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/utils/LaunchUtils.java
+++ /dev/null
@@ -1,172 +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.core.utils;
-
-import java.io.IOException;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.debug.core.ILaunch;
-import org.eclipse.debug.core.ILaunchManager;
-import org.eclipse.debug.core.Launch;
-import org.eclipse.debug.core.model.IProcess;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.launching.IVMInstall;
-import org.eclipse.jdt.launching.IVMInstall2;
-import org.eclipse.jdt.launching.IVMRunner;
-import org.eclipse.jdt.launching.JavaRuntime;
-import org.eclipse.jdt.launching.VMRunnerConfiguration;
-import org.eclipse.jst.ws.internal.cxf.core.CXFCorePlugin;
-import org.eclipse.jst.ws.internal.cxf.core.model.CXFContext;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.console.ConsolePlugin;
-import org.eclipse.ui.console.IConsole;
-import org.eclipse.ui.console.IConsoleConstants;
-import org.eclipse.ui.console.IConsoleManager;
-import org.eclipse.ui.console.IConsoleView;
-import org.eclipse.ui.console.IOConsoleOutputStream;
-import org.eclipse.ui.console.MessageConsole;
-
-public final class LaunchUtils {
-
- private LaunchUtils() {
- }
-
- public static IStatus launch(String[] runtimeClasspath, String className, String[] programArgs) {
- IStatus status = Status.OK_STATUS;
- try {
- IVMInstall vmInstall = JavaRuntime.getDefaultVMInstall();
- IVMRunner vmRunner = vmInstall.getVMRunner(ILaunchManager.RUN_MODE);
- VMRunnerConfiguration vmRunnerConfiguration = new VMRunnerConfiguration(className,
- runtimeClasspath);
- vmRunnerConfiguration.setProgramArguments(programArgs);
-
- ILaunch launch = new Launch(null, ILaunchManager.RUN_MODE, null);
- vmRunner.run(vmRunnerConfiguration, launch, null);
-
- while (!launch.isTerminated()) {
- try {
- Thread.sleep(100);
- } catch (InterruptedException ie) {
- CXFCorePlugin.log(ie);
- }
- }
-
- IProcess[] processes = launch.getProcesses();
- String outputStream = processes[0].getStreamsProxy().getOutputStreamMonitor().getContents();
- if (outputStream != null && outputStream.length() > 0) {
- status = new Status(IStatus.INFO, CXFCorePlugin.PLUGIN_ID, outputStream);
- }
-
- } catch (CoreException ce) {
- CXFCorePlugin.log(ce);
- }
- return status;
- }
-
- public static void launch(IJavaProject javaProject, String className, String[] programArgs)
- throws CoreException {
- IVMInstall vmInstall = JavaRuntime.getVMInstall(javaProject);
- if (vmInstall == null) {
- vmInstall = JavaRuntime.getDefaultVMInstall();
- }
-
- IVMRunner vmRunner = vmInstall.getVMRunner(ILaunchManager.RUN_MODE);
- String[] runtimeClasspath = JavaRuntime.computeDefaultRuntimeClassPath(javaProject);
- VMRunnerConfiguration vmRunnerConfiguration = new VMRunnerConfiguration(className, runtimeClasspath);
-
- vmRunnerConfiguration.setProgramArguments(programArgs);
-
- if (vmInstall instanceof IVMInstall2) {
- IVMInstall2 install2 = (IVMInstall2) vmInstall;
- if (install2.getJavaVersion().compareTo(JavaCore.VERSION_1_6) > 0) {
- vmRunnerConfiguration.setVMArguments(new String[] { "-Djava.endorsed.dirs="
- + CXFCorePlugin.getDefault().getJava2WSContext().getCxfRuntimeLocation() });
- }
- }
-
- ILaunch launch = new Launch(null, ILaunchManager.RUN_MODE, null);
- vmRunner.run(vmRunnerConfiguration, launch, null);
-
- while (!launch.isTerminated()) {
- try {
- Thread.sleep(100);
- } catch (InterruptedException ie) {
- CXFCorePlugin.log(ie);
- }
- }
-
- IProcess[] processes = launch.getProcesses();
-
- String outputStream = processes[0].getStreamsProxy().getOutputStreamMonitor().getContents();
- logStream(outputStream);
- String errorStream = processes[0].getStreamsProxy().getErrorStreamMonitor().getContents();
- logStream(errorStream);
-
- logErrorStreamContents(errorStream, className);
- }
-
- private static void logStream(String outputStream) {
- try {
- MessageConsole cxfConsole = getCXFConsole();
- IWorkbench workbench = PlatformUI.getWorkbench();
- IWorkbenchWindow workbenchWindow = workbench.getActiveWorkbenchWindow();
- if (workbenchWindow != null) {
- IWorkbenchPage workbenchPage = workbenchWindow.getActivePage();
- String console_view_id = IConsoleConstants.ID_CONSOLE_VIEW;
- IConsoleView consoleView = (IConsoleView) workbenchPage.showView(console_view_id);
- consoleView.display(cxfConsole);
- IOConsoleOutputStream consoleOutputStream = cxfConsole.newOutputStream();
- consoleOutputStream.write(outputStream);
- consoleOutputStream.close();
- }
- } catch (PartInitException pie) {
- CXFCorePlugin.log(pie);
- } catch (IOException ioe) {
- CXFCorePlugin.log(ioe);
- }
- }
-
- private static MessageConsole getCXFConsole() {
- ConsolePlugin consolePlugin = ConsolePlugin.getDefault();
- IConsoleManager consoleManager = consolePlugin.getConsoleManager();
- IConsole[] existingConsoles = consoleManager.getConsoles();
- CXFContext context = CXFCorePlugin.getDefault().getJava2WSContext();
- for (int i = 0; i < existingConsoles.length; i++) {
- if (existingConsoles[i].getName().equals(context.getCxfRuntimeEdition() + " "
- + context.getCxfRuntimeVersion())) {
- return (MessageConsole) existingConsoles[i];
- }
- }
- MessageConsole cxfConsole = new MessageConsole(context.getCxfRuntimeEdition() + " "
- + context.getCxfRuntimeVersion(),
- CXFCorePlugin.imageDescriptorFromPlugin(CXFCorePlugin.PLUGIN_ID,
- "icons/view16/console_view.gif")); //$NON-NLS-1$
- consoleManager.addConsoles(new IConsole[]{cxfConsole});
- return cxfConsole;
- }
-
- private static void logErrorStreamContents(String message, String className) {
- String toolName = className.substring(className.lastIndexOf(".") + 1, //$NON-NLS-1$
- className.length());
-
- if (message != null && message.indexOf(toolName + " Error") != -1) { //$NON-NLS-1$
- Status toolStatus = new Status(IStatus.ERROR, CXFCorePlugin.PLUGIN_ID, message);
- CXFCorePlugin.log(toolStatus);
- }
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/utils/MergeUtils.java b/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/utils/MergeUtils.java
deleted file mode 100644
index 902b143..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/utils/MergeUtils.java
+++ /dev/null
@@ -1,93 +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.core.utils;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.net.URL;
-
-import org.eclipse.core.runtime.FileLocator;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.emf.codegen.merge.java.JControlModel;
-import org.eclipse.emf.codegen.merge.java.JMerger;
-import org.eclipse.emf.codegen.merge.java.facade.FacadeHelper;
-import org.eclipse.emf.codegen.merge.java.facade.JCompilationUnit;
-import org.eclipse.emf.codegen.util.CodeGenUtil;
-import org.eclipse.jst.ws.internal.cxf.core.CXFCorePlugin;
-
-public final class MergeUtils {
-
- private MergeUtils() {
-
- }
-
- private static JMerger getJMerger() {
- FacadeHelper facadeHelper = CodeGenUtil.instantiateFacadeHelper(JMerger.DEFAULT_FACADE_HELPER_CLASS);
- URL mergeFileURL = FileLocator.find(CXFCorePlugin.getDefault().getBundle(), new Path(
- "/jmerger/merge.xml"), null); //$NON-NLS-1$
- JControlModel controlModel = new JControlModel();
- controlModel.initialize(facadeHelper, mergeFileURL.toString());
- JMerger jmerger = new JMerger(controlModel);
-
- return jmerger;
- }
-
- public static void merge(File sourceFile, File targetFile) {
- JMerger merger = getJMerger();
-
- FileInputStream sourceInputStream = null;
- FileInputStream targetInputStream = null;
- OutputStream targetOutputStream = null;
- try {
- // set source
- sourceInputStream = new FileInputStream(sourceFile);
- JCompilationUnit inputCompilationUnit = merger
- .createCompilationUnitForInputStream(sourceInputStream);
- merger.setSourceCompilationUnit(inputCompilationUnit);
-
- // set target
- targetInputStream = new FileInputStream(targetFile);
- JCompilationUnit targetCompilationUnit = merger
- .createCompilationUnitForInputStream(targetInputStream);
- merger.setTargetCompilationUnit(targetCompilationUnit);
-
- // merge source and target
- merger.merge();
-
- // write merged contents
- targetOutputStream = new FileOutputStream(targetFile);
- byte[] bytes = merger.getTargetCompilationUnit().getContents().getBytes();
- targetOutputStream.write(bytes, 0, bytes.length);
- } catch (FileNotFoundException fnfe) {
- CXFCorePlugin.log(fnfe);
- } catch (IOException ioe) {
- CXFCorePlugin.log(ioe);
- } finally {
- try {
- if (sourceInputStream != null) {
- sourceInputStream.close();
- }
- if (targetInputStream != null) {
- targetInputStream.close();
- }
- if (targetOutputStream != null) {
- targetOutputStream.close();
- }
- } catch (IOException ioe) {
- CXFCorePlugin.log(ioe);
- }
- }
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/utils/SpringUtils.java b/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/utils/SpringUtils.java
deleted file mode 100644
index 3e841e5..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/utils/SpringUtils.java
+++ /dev/null
@@ -1,435 +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.core.utils;
-
-import java.io.ByteArrayInputStream;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.net.MalformedURLException;
-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.xml.namespace.QName;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jst.ws.internal.common.J2EEUtils;
-import org.eclipse.jst.ws.internal.cxf.core.CXFCorePlugin;
-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.jaxws.core.utils.WSDLUtils;
-import org.jdom.Attribute;
-import org.jdom.Document;
-import org.jdom.Element;
-import org.jdom.JDOMException;
-import org.jdom.Namespace;
-import org.jdom.input.SAXBuilder;
-import org.jdom.output.XMLOutputter;
-
-@SuppressWarnings("restriction")
-public final class SpringUtils {
- private static Namespace SPRING_BEANS_NS = Namespace
- .getNamespace("http://www.springframework.org/schema/beans"); //$NON-NLS-1$
- private static Namespace XMLNS_XSI = Namespace.getNamespace("xsi", //$NON-NLS-1$
- "http://www.w3.org/2001/XMLSchema-instance"); //$NON-NLS-1$
- private static Namespace JAXWS_NS = Namespace.getNamespace("jaxws", "http://cxf.apache.org/jaxws"); //$NON-NLS-1$ //$NON-NLS-2$
- private static Namespace SOAP_NS = Namespace.getNamespace("soap", "http://cxf.apache.org/bindings/soap"); //$NON-NLS-1$ //$NON-NLS-2$
-
- private static String DOC_ROOT = "beans"; //$NON-NLS-1$
-
- private SpringUtils() {
- }
-
- public static IFile getBeansFile(IProject project) throws IOException {
- IFile beansFile = null;
- IPath webContentPath = J2EEUtils.getWebContentPath(project);
- if (!webContentPath.hasTrailingSeparator()) {
- webContentPath = webContentPath.addTrailingSeparator();
-
- IPath webINFPath = webContentPath.append(new Path("WEB-INF/")); //$NON-NLS-1$
- IFolder webINFFolder = ResourcesPlugin.getWorkspace().getRoot().getFolder(webINFPath);
- beansFile = webINFFolder.getFile("beans.xml"); //$NON-NLS-1$
- if (!beansFile.exists()) {
- try {
- IProgressMonitor progressMonitor = new NullProgressMonitor();
- beansFile.create(new ByteArrayInputStream(new byte[] {}), true, progressMonitor);
- createBaseBeansFile(beansFile);
- } catch (CoreException ce) {
- CXFCorePlugin.log(ce);
- }
- }
- }
- return beansFile;
- }
-
- public static IFile getBeansFile(String projectName) throws IOException {
- return SpringUtils.getBeansFile(FileUtils.getProject(projectName));
- }
-
- /**
- * Returns a handle to the cxf-servlet file in the Web projects WEB-INF
- * folder.
- *
- * @param project
- * @return {@link IFile}
- */
- public static IFile getCXFServlet(IProject project) throws IOException {
- IFile cxfServlet = null;
- IPath webContentPath = J2EEUtils.getWebContentPath(project);
- if (!webContentPath.hasTrailingSeparator()) {
- webContentPath = webContentPath.addTrailingSeparator();
-
- IPath webINFPath = webContentPath.append(new Path("WEB-INF/")); //$NON-NLS-1$
- IFolder webINFFolder = ResourcesPlugin.getWorkspace().getRoot().getFolder(webINFPath);
- cxfServlet = webINFFolder.getFile("cxf-servlet.xml"); //$NON-NLS-1$
- if (!cxfServlet.exists()) {
- try {
- IProgressMonitor progressMonitor = new NullProgressMonitor();
-
- cxfServlet.create(new ByteArrayInputStream(new byte[] {}), true, progressMonitor);
- createBaseCXFServletFile(cxfServlet);
- } catch (CoreException ce) {
- CXFCorePlugin.log(ce.getStatus());
- }
- }
- }
- return cxfServlet;
- }
-
- public static IFile getCXFServlet(String projectName) throws IOException {
- return SpringUtils.getCXFServlet(FileUtils.getProject(projectName));
- }
-
- private static void createBaseCXFServletFile(IFile cxfServlet) throws IOException {
- Element beans = new Element(DOC_ROOT);
- beans.setNamespace(SPRING_BEANS_NS);
- beans.addNamespaceDeclaration(XMLNS_XSI);
- beans.addNamespaceDeclaration(JAXWS_NS);
- beans.addNamespaceDeclaration(SOAP_NS);
-
- Attribute schemaLocation = new Attribute(
- "schemaLocation", //$NON-NLS-1$
- "http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd " //$NON-NLS-1$
- + "http://cxf.apache.org/bindings/soap http://cxf.apache.org/schemas/configuration/soap.xsd " //$NON-NLS-1$
- + "http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd", XMLNS_XSI); //$NON-NLS-1$
-
- beans.setAttribute(schemaLocation);
-
- writeConfig(new Document(beans), cxfServlet);
- }
-
- private static void createBaseBeansFile(IFile beansFile) throws IOException {
- Element beans = new Element(DOC_ROOT);
- beans.setNamespace(SPRING_BEANS_NS);
- beans.addNamespaceDeclaration(XMLNS_XSI);
- beans.addNamespaceDeclaration(JAXWS_NS);
-
- Attribute schemaLocation = new Attribute(
- "schemaLocation", //$NON-NLS-1$
- "http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd " //$NON-NLS-1$
- + "http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd", XMLNS_XSI); //$NON-NLS-1$
-
- beans.setAttribute(schemaLocation);
-
- Element importCXFResource = new Element("import", SPRING_BEANS_NS); //$NON-NLS-1$
- importCXFResource.setAttribute("resource", "classpath:META-INF/cxf/cxf.xml"); //$NON-NLS-1$ //$NON-NLS-2$
-
- Element importCXFSoapExtensionResource = new Element("import", SPRING_BEANS_NS); //$NON-NLS-1$
- importCXFSoapExtensionResource.setAttribute("resource", //$NON-NLS-1$
- "classpath:META-INF/cxf/cxf-extension-soap.xml"); //$NON-NLS-1$
-
- Element importCXFServeltResource = new Element("import", SPRING_BEANS_NS); //$NON-NLS-1$
- importCXFServeltResource.setAttribute("resource", "classpath:META-INF/cxf/cxf-servlet.xml"); //$NON-NLS-1$ //$NON-NLS-2$
-
- beans.addContent(importCXFResource);
- beans.addContent(importCXFSoapExtensionResource);
- beans.addContent(importCXFServeltResource);
-
- writeConfig(new Document(beans), beansFile);
- }
-
- public static boolean isSpringBeansFile(IFile springBeansFile) throws IOException {
- FileInputStream springBeansInputStream = new FileInputStream(springBeansFile.getLocation().toFile());
- if (springBeansInputStream.available() > 0) {
- SAXBuilder builder = new SAXBuilder();
- try {
- Document doc = builder.build(springBeansInputStream);
- Element root = doc.getRootElement();
- if (root.getName().equals(DOC_ROOT) && root.getNamespace().equals(SPRING_BEANS_NS)) {
- return true;
- }
- } catch (JDOMException jdome) {
- CXFCorePlugin.log(jdome);
- } finally {
- springBeansInputStream.close();
- }
- }
- return false;
- }
-
- @SuppressWarnings("unchecked")
- private static boolean isBeanDefined(CXFDataModel cxfDataModel, String projectName, String elementName,
- Namespace namespace, String id) throws IOException {
- IFile springConfigFile = null;
-
- if (CXFCorePlugin.getDefault().getJava2WSContext().isUseSpringApplicationContext()) {
- springConfigFile = SpringUtils.getBeansFile(projectName);
- } else {
- springConfigFile = SpringUtils.getCXFServlet(projectName);
- }
-
- if (isSpringBeansFile(springConfigFile)) {
- SAXBuilder builder = new SAXBuilder();
- FileInputStream springConfigInputSteam = new FileInputStream(springConfigFile.getLocation()
- .toFile());
- try {
- Document doc = builder.build(springConfigInputSteam);
- Element beans = doc.getRootElement();
-
- List<Element> endpoints = beans.getChildren(elementName, namespace);
- for (Element element : endpoints) {
- if (element != null && element.getAttribute("id") != null) { //$NON-NLS-1$
- Attribute idAttribute = element.getAttribute("id"); //$NON-NLS-1$
- if (idAttribute.getValue().equals(id)) {
- return true;
- }
- }
- }
- } catch (JDOMException jdome) {
- CXFCorePlugin.log(jdome);
- } finally {
- springConfigInputSteam.close();
- }
- }
- return false;
- }
-
- @SuppressWarnings("unchecked")
- public static String getEndpointAddress(IProject project, String jaxwsEndpointId) throws IOException {
- IFile springConfigFile = null;
- if (CXFCorePlugin.getDefault().getJava2WSContext().isUseSpringApplicationContext()) {
- springConfigFile = SpringUtils.getBeansFile(project);
- } else {
- springConfigFile = SpringUtils.getCXFServlet(project);
- }
- if (isSpringBeansFile(springConfigFile)) {
- SAXBuilder builder = new SAXBuilder();
- FileInputStream springConfigInputSteam = new FileInputStream(springConfigFile.getLocation()
- .toFile());
- try {
- Document doc = builder.build(springConfigInputSteam);
- Element beans = doc.getRootElement();
- List<Element> endpoints = beans.getChildren("endpoint", JAXWS_NS); //$NON-NLS-1$
- for (Element element : endpoints) {
- if (element != null && element.getAttribute("id") != null) { //$NON-NLS-1$
- Attribute idAttribute = element.getAttribute("id"); //$NON-NLS-1$
- if (idAttribute.getValue().equals(jaxwsEndpointId)) {
- return element.getAttribute("address").getValue(); //$NON-NLS-1$
- }
- }
- }
- } catch (JDOMException jdome) {
- CXFCorePlugin.log(jdome);
- } finally {
- springConfigInputSteam.close();
- }
- }
- return ""; //$NON-NLS-1$
- }
-
- @SuppressWarnings("unchecked")
- public static void createConfigurationFromWSDL(WSDL2JavaDataModel model) throws IOException {
- String targetNamespace = model.getTargetNamespace();
- String packageName = model.getIncludedNamespaces().get(targetNamespace);
-
- Definition definition = model.getWsdlDefinition();
- Map servicesMap = definition.getServices();
- Set<Map.Entry> servicesSet = servicesMap.entrySet();
- for (Map.Entry serviceEntry : servicesSet) {
- Service service = (Service) serviceEntry.getValue();
- model.setServiceName(service.getQName().getLocalPart());
- Map portsMap = service.getPorts();
- Set<Map.Entry> portsSet = portsMap.entrySet();
- for (Map.Entry portEntry : portsSet) {
- Port port = (Port) portEntry.getValue();
- model.setEndpointName(port.getName());
- PortType portType = port.getBinding().getPortType();
- QName qName = portType.getQName();
- String portTypeName = qName.getLocalPart();
- String fullyQualifiedClassName = packageName + "." + //$NON-NLS-1$
- convertPortTypeName(portTypeName) + "Impl"; //$NON-NLS-1$
- model.setFullyQualifiedJavaClassName(fullyQualifiedClassName);
- SpringUtils.createJAXWSEndpoint(model);
- }
- }
- }
-
- @SuppressWarnings("unchecked")
- public static void loadSpringConfigInformationFromWSDL(CXFDataModel model) {
- IFile wsdlFile = WSDLUtils.getWSDLFolder(model.getProjectName()).getFile(model.getWsdlFileName());
- if (wsdlFile.exists()) {
- try {
- model.setWsdlURL(wsdlFile.getLocationURI().toURL());
- Definition definition = WSDLUtils.readWSDL(model.getWsdlURL());
- Map servicesMap = definition.getServices();
- Set<Map.Entry> servicesSet = servicesMap.entrySet();
- for (Map.Entry serviceEntry : servicesSet) {
- Service service = (Service) serviceEntry.getValue();
- model.setServiceName(service.getQName().getLocalPart());
- Map portsMap = service.getPorts();
- Set<Map.Entry> portsSet = portsMap.entrySet();
- for (Map.Entry portEntry : portsSet) {
- Port port = (Port) portEntry.getValue();
- model.setEndpointName(port.getName());
- }
- }
- model.setWsdlDefinition(definition);
- } catch (MalformedURLException murle) {
- CXFCorePlugin.log(murle);
- } catch (IOException ioe) {
- CXFCorePlugin.log(ioe);
- }
- }
- }
-
- private static String convertPortTypeName(String portTypeName) {
- String[] segments = portTypeName.split("[\\-\\.\\:\\_\\u00b7\\u0387\\u06dd\\u06de]");
-
- StringBuilder stringBuilder = new StringBuilder();
- for (String segment : segments) {
- if (segment.length() == 0) {
- continue;
- }
- char firstCharacter = segment.charAt(0);
- if (!Character.isDigit(firstCharacter) && Character.isLowerCase(firstCharacter)) {
- segment = segment.substring(0, 1).toUpperCase() + segment.substring(1);
- }
-
- for (int i = 1; i < segment.length(); i++) {
- char currentChar = segment.charAt(i);
- char precedingChar = segment.charAt(i - 1);
- if (Character.isLetter(currentChar) && Character.isDigit(precedingChar)
- && Character.isLowerCase(currentChar)) {
- segment = segment.substring(0, i) + segment.substring(i, i + 1).toUpperCase()
- + segment.substring(i + 1, segment.length());
- }
- }
- stringBuilder.append(segment);
- }
- return stringBuilder.toString();
- }
-
- public static void createJAXWSEndpoint(CXFDataModel model) throws IOException {
- String projectName = model.getProjectName();
-
- IFile springConfigFile = null;
- if (CXFCorePlugin.getDefault().getJava2WSContext().isUseSpringApplicationContext()) {
- springConfigFile = SpringUtils.getBeansFile(projectName);
- } else {
- springConfigFile = SpringUtils.getCXFServlet(projectName);
- }
-
- if (isSpringBeansFile(springConfigFile)) {
- SAXBuilder builder = new SAXBuilder();
- FileInputStream springConfigInputSteam = new FileInputStream(springConfigFile.getLocation()
- .toFile());
- try {
- Document doc = builder.build(springConfigInputSteam);
- Element beans = doc.getRootElement();
-
- Element jaxwsEndpoint = new Element("endpoint", JAXWS_NS); //$NON-NLS-1$
-
- String id = getJAXWSEndpointID(model);
- model.setConfigId(id);
- jaxwsEndpoint.setAttribute("id", id); //$NON-NLS-1$
-
- jaxwsEndpoint.setAttribute("implementor", model.getFullyQualifiedJavaClassName()); //$NON-NLS-1$
-
- if (model.getConfigWsdlLocation() != null) {
- jaxwsEndpoint.setAttribute("wsdlLocation", model.getConfigWsdlLocation()); //$NON-NLS-1$
-
- if (model.getEndpointName() != null && model.getServiceName() != null) {
- jaxwsEndpoint.setAttribute("endpointName", "tns:" + model.getEndpointName()); //$NON-NLS-1$ //$NON-NLS-2$
- jaxwsEndpoint.setAttribute("serviceName", "tns:" + model.getServiceName()); //$NON-NLS-1$ //$NON-NLS-2$
-
- Namespace XMLNS_TNS = Namespace.getNamespace("tns", model.getTargetNamespace()); //$NON-NLS-1$
- jaxwsEndpoint.addNamespaceDeclaration(XMLNS_TNS);
- }
- }
-
- if (model.getEndpointName() != null) {
- jaxwsEndpoint.setAttribute("address", "/" + model.getEndpointName()); //$NON-NLS-1$ //$NON-NLS-2$
- } else {
- jaxwsEndpoint.setAttribute("address", "/" + id); //$NON-NLS-1$ //$NON-NLS-2$
- }
-
-
- Element jaxwsFeatures = new Element("features", JAXWS_NS); //$NON-NLS-1$
- Element bean = new Element("bean", SPRING_BEANS_NS); //$NON-NLS-1$
- bean.setAttribute("class", "org.apache.cxf.feature.LoggingFeature"); //$NON-NLS-1$ //$NON-NLS-2$
- jaxwsFeatures.addContent(bean);
- jaxwsEndpoint.addContent(jaxwsFeatures);
-
- if (!isBeanDefined(model, projectName, "endpoint", JAXWS_NS, id)) { //$NON-NLS-1$
- beans.addContent(jaxwsEndpoint);
-
- writeConfig(doc, springConfigFile);
- }
- } catch (JDOMException jdome) {
- CXFCorePlugin.log(jdome);
- } finally {
- springConfigInputSteam.close();
- }
- }
- }
-
- private static String getJAXWSEndpointID(CXFDataModel model) {
- String implementor = model.getFullyQualifiedJavaClassName();
- if (implementor.indexOf(".") != -1) { //$NON-NLS-1$
- implementor = implementor.substring(implementor.lastIndexOf(".") + 1, implementor.length());
- }
- if (!implementor.startsWith("Impl") && implementor.indexOf("Impl") != -1) {
- implementor = implementor.substring(0, implementor.indexOf("Impl")).toLowerCase(); //$NON-NLS-1$;
- } else {
- implementor = implementor.toLowerCase();
- }
- return implementor;
- }
-
- private static void writeConfig(Document document, IFile springConfigFile) throws IOException {
- OutputStream outputStream = new FileOutputStream(springConfigFile.getLocation().toFile());
- try {
- XMLOutputter outputter = new XMLOutputter();
- outputter.output(document, outputStream);
- springConfigFile.refreshLocal(IResource.DEPTH_ONE, new NullProgressMonitor());
- FileUtils.formatXMLFile(springConfigFile);
- } catch (CoreException ce) {
- CXFCorePlugin.log(ce.getStatus());
- } finally {
- outputStream.close();
- }
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/facet/CXFFacetInstallDelegate.java b/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/facet/CXFFacetInstallDelegate.java
deleted file mode 100644
index 8617355..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/facet/CXFFacetInstallDelegate.java
+++ /dev/null
@@ -1,264 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IONA Technologies PLC
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IONA Technologies PLC - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.cxf.facet;
-
-import java.math.BigInteger;
-import java.util.List;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jdt.apt.core.util.AptConfig;
-import org.eclipse.jdt.core.IAccessRule;
-import org.eclipse.jdt.core.IClasspathAttribute;
-import org.eclipse.jdt.core.IClasspathEntry;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jem.java.JavaRefFactory;
-import org.eclipse.jst.j2ee.common.CommonFactory;
-import org.eclipse.jst.j2ee.common.Listener;
-import org.eclipse.jst.j2ee.model.IModelProvider;
-import org.eclipse.jst.j2ee.model.ModelProviderManager;
-import org.eclipse.jst.j2ee.webapplication.ContextParam;
-import org.eclipse.jst.j2ee.webapplication.ServletType;
-import org.eclipse.jst.j2ee.webapplication.WebapplicationFactory;
-import org.eclipse.jst.javaee.core.Description;
-import org.eclipse.jst.javaee.core.DisplayName;
-import org.eclipse.jst.javaee.core.JavaeeFactory;
-import org.eclipse.jst.javaee.core.ParamValue;
-import org.eclipse.jst.javaee.core.UrlPatternType;
-import org.eclipse.jst.javaee.web.Servlet;
-import org.eclipse.jst.javaee.web.ServletMapping;
-import org.eclipse.jst.javaee.web.SessionConfig;
-import org.eclipse.jst.javaee.web.WebFactory;
-import org.eclipse.jst.ws.internal.cxf.core.CXFCoreMessages;
-import org.eclipse.jst.ws.internal.cxf.core.CXFCorePlugin;
-import org.eclipse.jst.ws.jaxws.core.utils.JDTUtils;
-import org.eclipse.wst.common.project.facet.core.IDelegate;
-import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion;
-
-/**
- * Adds the CXF classpath container to the project.
- * <p>
- * Also sets up the web projects application deployment descriptor (web.xml file)
- * to use cxf-servlet or the Spring Application context (WEB-INF/beans.xml) for
- * endpoint configuration. Depends on a setting in the CXF preferences.
- *
- */
-public class CXFFacetInstallDelegate implements IDelegate {
-
- public void execute(final IProject project, IProjectFacetVersion fv, Object config,
- IProgressMonitor monitor) throws CoreException {
-
- if (CXFCorePlugin.getDefault().getJava2WSContext().getCxfRuntimeLocation().equals("")) { //$NON-NLS-1$
- throw new CoreException(new Status(Status.ERROR, CXFCorePlugin.PLUGIN_ID,
- CXFCoreMessages.CXF_FACET_INSTALL_DELEGATE_RUNTIME_LOCATION_NOT_SET));
- }
-
- IPath cxfLibPath = new Path(CXFCorePlugin.getDefault().getJava2WSContext().getCxfRuntimeLocation());
- if (!cxfLibPath.hasTrailingSeparator()) {
- cxfLibPath = cxfLibPath.addTrailingSeparator();
- }
- cxfLibPath = cxfLibPath.append("lib"); //$NON-NLS-1$
-
- IClasspathAttribute jstComponentDependency =
- JavaCore.newClasspathAttribute("org.eclipse.jst.component.dependency", "/WEB-INF/lib"); //$NON-NLS-1$
- IClasspathEntry cxfClasspathContainer =
- JavaCore.newContainerEntry(new Path("org.eclipse.jst.ws.cxf.core.CXF_CLASSPATH_CONTAINER"), //$NON-NLS-1$
- new IAccessRule[0],
- CXFCorePlugin.getDefault().getJava2WSContext().isExportCXFClasspathContainer()
- ? new IClasspathAttribute[]{jstComponentDependency} : new IClasspathAttribute[]{},
- true);
-
- JDTUtils.addToClasspath(JavaCore.create(project), cxfClasspathContainer);
-
- // Add CXF Servlet, Servlet Mapping and Session Config to web.xml
- final IModelProvider provider = ModelProviderManager.getModelProvider(project);
- provider.modify(new Runnable() {
- public void run() {
- Object modelProvider = provider.getModelObject();
- boolean useSpringAppContext = CXFCorePlugin.getDefault().getJava2WSContext()
- .isUseSpringApplicationContext();
- // 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;
- addCXFJSTWEB25Servlet(project, javaeeWebApp);
- if (useSpringAppContext) {
- addSpringApplicationContextWeb25(project, 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;
- addCXFJSTWEB24Servlet(project, webApp);
- if (useSpringAppContext) {
- addSpringApplicationContextWeb24(project, webApp);
- }
- }
- }
- }, null);
-
- if (CXFCorePlugin.getDefault().getJava2WSContext().isAnnotationProcessingEnabled()) {
- AptConfig.setEnabled(JavaCore.create(project), true);
- }
- }
-
- @SuppressWarnings("unchecked")
- private void addSpringApplicationContextWeb24(IProject webProject,
- org.eclipse.jst.j2ee.webapplication.WebApp webapp) {
- List contextParams = webapp.getContextParams();
- for (int i = 0; i < contextParams.size(); i++) {
- ContextParam contextParam = (ContextParam) contextParams.get(i);
- if (contextParam.getParamName().equals("contextConfigLocation")) { //$NON-NLS-1$
- return;
- }
- }
- // org.eclipse.jst.javaee.core.ParamValue
- List listeners = webapp.getListeners();
- for (int i = 0; i < listeners.size(); i++) {
- Listener contextLoaderListener = (Listener) listeners.get(i);
- if (contextLoaderListener.getListenerClass().getName().equals(
- "org.springframework.web.context.ContextLoaderListener")) { //$NON-NLS-1$
- return;
- }
- }
-
- CommonFactory commonFactory = CommonFactory.eINSTANCE;
- JavaRefFactory javaRefFactory = JavaRefFactory.eINSTANCE;
-
- org.eclipse.jst.j2ee.common.ParamValue configLocationParam = commonFactory.createParamValue();
- configLocationParam.setName("contextConfigLocation"); //$NON-NLS-1$
- configLocationParam.setValue("WEB-INF/beans.xml"); //$NON-NLS-1$
-
- webapp.getContextParams().add(configLocationParam);
-
- Listener contextLoaderListener = commonFactory.createListener();
- JavaClass javaClass = javaRefFactory.createJavaClass();
- javaClass.setName("org.springframework.web.context.ContextLoaderListener"); //$NON-NLS-1$
- contextLoaderListener.setListenerClass(javaClass);
-
- webapp.getListeners().add(contextLoaderListener);
- }
-
- @SuppressWarnings("unchecked")
- private void addSpringApplicationContextWeb25(IProject webProject,
- org.eclipse.jst.javaee.web.WebApp webapp) {
- List contextParams = webapp.getContextParams();
- for (int i = 0; i < contextParams.size(); i++) {
- ParamValue contextParam = (ParamValue) contextParams.get(i);
- if (contextParam.getParamName().equals("contextConfigLocation")) { //$NON-NLS-1$
- return;
- }
- }
-
- List listeners = webapp.getListeners();
- for (int i = 0; i < listeners.size(); i++) {
- org.eclipse.jst.javaee.core.Listener contextLoaderListener =
- (org.eclipse.jst.javaee.core.Listener) listeners.get(i);
- if (contextLoaderListener.getListenerClass().equals(
- "org.springframework.web.context.ContextLoaderListener")) { //$NON-NLS-1$
- return;
- }
- }
-
- JavaeeFactory javaeeFactory = JavaeeFactory.eINSTANCE;
-
- ParamValue configLocationParam = javaeeFactory.createParamValue();
- configLocationParam.setParamName("contextConfigLocation"); //$NON-NLS-1$
- configLocationParam.setParamValue("WEB-INF/beans.xml"); //$NON-NLS-1$
-
- webapp.getContextParams().add(configLocationParam);
-
- org.eclipse.jst.javaee.core.Listener contextLoaderListener = javaeeFactory.createListener();
- contextLoaderListener.setListenerClass("org.springframework.web.context.ContextLoaderListener"); //$NON-NLS-1$
-
- webapp.getListeners().add(contextLoaderListener);
- }
-
- @SuppressWarnings("unchecked")
- private void addCXFJSTWEB24Servlet(IProject webProject, org.eclipse.jst.j2ee.webapplication.WebApp webapp) {
- List servlets = webapp.getServlets();
- for (int i = 0; i < servlets.size(); i++) {
- org.eclipse.jst.j2ee.webapplication.Servlet servlet = (org.eclipse.jst.j2ee.webapplication.Servlet) servlets.get(i);
- if (servlet.getServletName().equals("cxf")) { //$NON-NLS-1$
- return;
- }
- }
-
- WebapplicationFactory factory = WebapplicationFactory.eINSTANCE;
-
- org.eclipse.jst.j2ee.webapplication.Servlet cxfServlet = factory.createServlet();
- ServletType servletType = factory.createServletType();
- cxfServlet.setWebType(servletType);
- cxfServlet.setServletName("cxf"); //$NON-NLS-1$
- servletType.setClassName("org.apache.cxf.transport.servlet.CXFServlet"); //$NON-NLS-1$
- cxfServlet.setDisplayName("cxf"); //$NON-NLS-1$
- cxfServlet.setLoadOnStartup(Integer.valueOf(1));
-
- webapp.getServlets().add(cxfServlet);
-
- org.eclipse.jst.j2ee.webapplication.ServletMapping servletMapping = factory.createServletMapping();
- servletMapping.setServlet(cxfServlet);
- servletMapping.setUrlPattern("/services/*"); //$NON-NLS-1$
- webapp.getServletMappings().add(servletMapping);
-
- org.eclipse.jst.j2ee.webapplication.SessionConfig sessionConfig = factory.createSessionConfig();
- sessionConfig.setSessionTimeout(60);
- webapp.setSessionConfig(sessionConfig);
- }
-
- @SuppressWarnings("unchecked")
- private void addCXFJSTWEB25Servlet(IProject webProject, org.eclipse.jst.javaee.web.WebApp webapp) {
- List servlets = webapp.getServlets();
- for (int i = 0; i < servlets.size(); i++) {
- Servlet servlet = (Servlet) servlets.get(i);
- if (servlet.getServletName().equals("cxf")) { //$NON-NLS-1$
- return;
- }
- }
-
- // CXF Servlet
- WebFactory factory = WebFactory.eINSTANCE;
- Servlet cxfServlet = factory.createServlet();
-
- cxfServlet.setServletName("cxf"); //$NON-NLS-1$
-
- DisplayName cxfServletDisplayName = JavaeeFactory.eINSTANCE.createDisplayName();
- cxfServletDisplayName.setValue("cxf"); //$NON-NLS-1$
- cxfServlet.getDisplayNames().add(cxfServletDisplayName);
-
- Description cxfServletDescription = JavaeeFactory.eINSTANCE.createDescription();
- cxfServletDescription.setValue("Apache CXF Endpoint"); //$NON-NLS-1$
- cxfServlet.getDescriptions().add(cxfServletDescription);
-
- cxfServlet.setServletClass("org.apache.cxf.transport.servlet.CXFServlet"); //$NON-NLS-1$
-
- cxfServlet.setLoadOnStartup(Integer.valueOf(1));
-
- webapp.getServlets().add(cxfServlet);
-
- ServletMapping cxfServletMapping = factory.createServletMapping();
- cxfServletMapping.setServletName("cxf"); //$NON-NLS-1$
- UrlPatternType url = JavaeeFactory.eINSTANCE.createUrlPatternType();
- url.setValue("/services/*"); //$NON-NLS-1$
- cxfServletMapping.getUrlPatterns().add(url);
- webapp.getServletMappings().add(cxfServletMapping);
-
- SessionConfig sessionConfig = factory.createSessionConfig();
- sessionConfig.setSessionTimeout(new BigInteger("60")); //$NON-NLS-1$
- webapp.getSessionConfigs().add(sessionConfig);
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/facet/CXFFacetUninstallDelegate.java b/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/facet/CXFFacetUninstallDelegate.java
deleted file mode 100644
index 41d409c..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/facet/CXFFacetUninstallDelegate.java
+++ /dev/null
@@ -1,27 +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.facet;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.wst.common.project.facet.core.IDelegate;
-import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion;
-
-public class CXFFacetUninstallDelegate implements IDelegate {
-
- public void execute(IProject project, IProjectFacetVersion fv, Object config, IProgressMonitor monitor)
- throws CoreException {
-
- //TODO Implement
- }
-
-}
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 7b310e7..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.4.0.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;x-friends:="org.eclipse.jst.ws.cxf.creation.ui"
-Require-Bundle: org.eclipse.ui;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.core.resources;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.wst.common.frameworks;bundle-version="[1.1.200,1.3.0)",
- org.eclipse.wst.ws;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.jst.ws;bundle-version="[1.0.304,1.1.0)",
- org.eclipse.jdt.core;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.jst.ws.cxf.core;bundle-version="0.4.3",
- org.eclipse.jdt.ui;bundle-version="[3.4.0,4.0.0)",
- javax.wsdl;bundle-version="[1.6.2,1.7.0)",
- org.eclipse.ltk.core.refactoring;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.wst.server.core;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.jst.j2ee;bundle-version="[1.1.100,1.2.0)",
- org.eclipse.jst.j2ee.core;bundle-version="[1.1.0,1.3.0)",
- org.eclipse.ltk.ui.refactoring;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.text;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.jst.ws.annotations.core;bundle-version="0.5.0",
- org.eclipse.jst.ws.jaxws.core;bundle-version="0.5.0",
- org.eclipse.emf.ecore;bundle-version="[2.4.0,3.0.0)",
- org.eclipse.jem;bundle-version="[2.0.0,2.1.0)"
-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 9cd8c83..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 Web Tools Platform
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 c08c96e..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.creation.core/src/org/eclipse/jst/ws/internal/cxf/creation/core/CXFCreationCoreMessages.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.creation.core;
-
-import org.eclipse.osgi.util.NLS;
-
-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;
-
- public static String JAVA2WS_SERVICE_IMPL_NOT_FOUND;
- public static String JAVA2WS_SERVICE_IMPL_NOT_BINARY;
-
- 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 d7ac111..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.creation.core/src/org/eclipse/jst/ws/internal/cxf/creation/core/CXFCreationCoreMessages.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
-###############################################################################
-
-WSDL2JAVA_PROJECT_SELECTION_ERROR=A possible conflict has been detected between project selections.\n\n The current configuration will result in code being generated into the "{0}" project.\n\nTo change the configuration click Cancel and then select the "Service project:" link in the "Configuration:" section in the Web Service wizard.\n\nClick Ok to continue with the current configuration.
-
-WSDL2JAVA_VALID_PORTTYPE_MESSAGE=The WSDL document must have a valid portType element
-
-JAVA2WS_SERVICE_IMPL_NOT_FOUND=The Service Implementation "{0}" cannot be loaded from the "{1}" project. Please check that the project contains the class and that it is visible on the projects "Java Build Path".
-JAVA2WS_SERVICE_IMPL_NOT_BINARY=Binary class files not supported. The Service Implementation must be a Java Source type.
\ No newline at end of file
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 e339e78..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.creation.core/src/org/eclipse/jst/ws/internal/cxf/creation/core/CXFCreationCorePlugin.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.core;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.osgi.framework.BundleContext;
-
-/**
- * The activator class controls the plug-in life cycle
- *
- */
-public class 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 5891812..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,168 +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.ExtensibilityElement;
-import javax.wsdl.extensions.soap.SOAPAddress;
-import javax.wsdl.extensions.soap12.SOAP12Address;
-
-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.creation.core.CXFCreationCorePlugin;
-import org.eclipse.jst.ws.jaxws.core.utils.WSDLUtils;
-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;
-
-@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();
-
- ExtensibilityElement extensibilityElement = WSDLUtils.getEndpointAddress(definition);
- if (extensibilityElement != null) {
- if (extensibilityElement instanceof SOAPAddress) {
- ((SOAPAddress) extensibilityElement).setLocationURI(wsdlAddress);
- }
- if (extensibilityElement instanceof SOAP12Address) {
- ((SOAP12Address) extensibilityElement).setLocationURI(wsdlAddress);
- }
-
- WSDLUtils.writeWSDL(model.getWsdlURL(), definition);
- }
- }
- } 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 cac3055..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,230 +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 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.ILocalVariable;
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.dom.SingleVariableDeclaration;
-import org.eclipse.jst.ws.annotations.core.utils.AnnotationUtils;
-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.IUndoManager;
-import org.eclipse.ltk.core.refactoring.RefactoringCore;
-import org.eclipse.ltk.core.refactoring.RefactoringStatus;
-import org.eclipse.ltk.core.refactoring.TextFileChange;
-import org.eclipse.text.edits.MultiTextEdit;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-
-public class JAXWSAnnotateJavaCommand extends AbstractDataModelOperation {
- private int numberOfChanges = 0;
-
- 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 == null) {
- continue;
- }
- 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.getSingleVariableDeclarations(method);
- for (SingleVariableDeclaration parameter : parameters) {
- CXFModelUtils.getWebParamAnnotationChange(javaInterfaceType, method,
- (ILocalVariable) parameter.resolveBinding().getJavaElement(), textFileChange);
- }
- }
- }
-
- CXFModelUtils.getImportsChange(javaInterfaceType.getCompilationUnit(), model,
- textFileChange, false);
-
- executeChange(monitor, textFileChange);
- }
-
- 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.getSingleVariableDeclarations(method);
- for (SingleVariableDeclaration parameter : parameters) {
- CXFModelUtils.getWebParamAnnotationChange(javaClassType, method,
- (ILocalVariable) parameter.resolveBinding().getJavaElement(), textFileChange);
- }
- }
- }
-
- CXFModelUtils.getImportsChange(javaClassType.getCompilationUnit(), model,
- textFileChange, false);
-
- executeChange(monitor, textFileChange);
- }
-
- 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);
- }
-
- private void executeChange(IProgressMonitor monitor, Change change) {
- if (change == null) {
- return;
- }
-
- IUndoManager manager = RefactoringCore.getUndoManager();
- boolean successful = false;
- Change undoChange = null;
- try {
- change.initializeValidationData(monitor);
- RefactoringStatus valid = change.isValid(monitor);
- if (valid.isOK()) {
- manager.aboutToPerformChange(change);
- undoChange = change.perform(monitor);
- successful = true;
- numberOfChanges++;
- }
- } catch (CoreException ce) {
- CXFCreationCorePlugin.log(ce.getStatus());
- } finally {
- manager.changePerformed(change, successful);
- }
- if (undoChange != null) {
- undoChange.initializeValidationData(monitor);
- manager.addUndo(undoChange.getName(), undoChange);
- }
- }
-
- @Override
- public IStatus undo(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
- IStatus status = Status.OK_STATUS;
-
- IUndoManager manager = RefactoringCore.getUndoManager();
-
- if (manager.anythingToUndo()) {
- try {
- for (int i = 0; i < numberOfChanges; i++) {
- manager.performUndo(null, monitor);
- }
- } catch (CoreException ce) {
- status = ce.getStatus();
- 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 396bb79..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,158 +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.jdt.core.IType;
-import org.eclipse.jdt.core.JavaCore;
-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.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.
- *
- */
-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;
- IType startingPoint = JDTUtils.getType(projectName, model.getJavaStartingPoint());
- javaResourceChangeListener = new JavaResourceChangeListener(JDTUtils
- .getJavaProjectSourceDirectoryPath(startingPoint));
- 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 = JavaCore.create(project);
- LaunchUtils.launch(javaProject, CXF_TOOL_CLASS_NAME, progArgs);
- FileUtils.copyJ2WFilesFromTmp(model);
-
- if (model.isGenerateWSDL()) {
- SpringUtils.loadSpringConfigInformationFromWSDL((model));
- }
-
- if (isImplementationSelected() || isGenerateServer()) {
- 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;
- }
-
- private boolean isImplementationSelected() {
- return (model.getFullyQualifiedJavaClassName() != null &&
- model.getFullyQualifiedJavaClassName().trim().length() > 0);
- }
-
- private boolean isGenerateServer() {
- if (model.isGenerateServer()) {
- model.setFullyQualifiedJavaClassName(model.getFullyQualifiedJavaInterfaceName() + "Impl");
- return true;
- }
- return false;
- }
-
- @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 9a7c2b3..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,105 +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.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.jst.ws.jaxws.core.utils.WSDLUtils;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-
-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 = getClassName(model.getProjectName(), model.getJavaStartingPoint());
- model.setWsdlFileName(className.toLowerCase() + WSDLUtils.WSDL_FILE_EXTENSION);
- } 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;
- }
-
- public String getClassName(String projectName, String fullyQualifiedClassName) {
- return JDTUtils.getType(JDTUtils.getJavaProject(projectName), fullyQualifiedClassName)
- .getElementName();
- }
-
- @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 8a55198..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,170 +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.ui.PlatformUI;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-
-@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;
- }
- };
- String typeName = model.getServiceEndpointInterfaceName();
- if (typeName.indexOf(".") != -1) {
- typeName = typeName.substring(typeName.lastIndexOf(".") + 1, typeName.length());
- }
- extractInterfaceProcessor.setTypeName(typeName);
- 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 = new PerformChangeOperation(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/Java2WSValidateInputCommand.java b/bundles/org.eclipse.jst.ws.cxf.creation.core/src/org/eclipse/jst/ws/internal/cxf/creation/core/commands/Java2WSValidateInputCommand.java
deleted file mode 100644
index b3beece..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.creation.core/src/org/eclipse/jst/ws/internal/cxf/creation/core/commands/Java2WSValidateInputCommand.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Shane Clarke.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Shane Clarke - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.cxf.creation.core.commands;
-
-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.jst.ws.internal.cxf.core.model.Java2WSDataModel;
-import org.eclipse.jst.ws.internal.cxf.creation.core.CXFCreationCoreMessages;
-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;
-
-public class Java2WSValidateInputCommand extends AbstractDataModelOperation {
-
- private Java2WSDataModel model;
-
- public Java2WSValidateInputCommand(Java2WSDataModel model) {
- this.model = model;
- }
-
- @Override
- public IStatus execute(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
- IStatus status = Status.OK_STATUS;
- IJavaProject javaProject = JDTUtils.getJavaProject(model.getProjectName());
- if (javaProject != null) {
- IType type = JDTUtils.getType(javaProject, model.getJavaStartingPoint());
- if (type == null || !type.exists()) {
- status = new Status(IStatus.ERROR, CXFCreationCorePlugin.PLUGIN_ID,
- CXFCreationCoreMessages.bind(CXFCreationCoreMessages.JAVA2WS_SERVICE_IMPL_NOT_FOUND,
- new Object[] {model.getJavaStartingPoint(), model.getProjectName()}));
- }
- if (type.isBinary()) {
- status = new Status(IStatus.ERROR, CXFCreationCorePlugin.PLUGIN_ID,
- CXFCreationCoreMessages.JAVA2WS_SERVICE_IMPL_NOT_BINARY);
- }
- }
- 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 38f9da5..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.Path;
-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.
- *
- */
-@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(new Path(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 b105e2a..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,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.io.File;
-import java.io.IOException;
-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.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.creation.core.CXFCreationCorePlugin;
-import org.eclipse.jst.ws.jaxws.core.utils.JDTUtils;
-import org.eclipse.jst.ws.jaxws.core.utils.WSDLUtils;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-import org.eclipse.wst.ws.internal.util.WSDLCopier;
-
-@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()).toOSString());
-
- 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);
- setWSDLLocation(definition);
- }
- } 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);
- setWSDLLocation(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.toURI().toURL());
- }
- model.setWsdlFileName(getWSDLFileNameFromURL(model.getWsdlURL()));
-
- IPath wsdlLocationPath = new Path(model.getWsdlURL().getPath());
- wsdlLocationPath = wsdlLocationPath.removeFirstSegments(WSDLUtils.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);
- } catch (IOException ioe) {
- status = new Status(IStatus.ERROR, CXFCorePlugin.PLUGIN_ID, ioe.getLocalizedMessage());
- CXFCreationCorePlugin.log(ioe);
- }
- ResourcesPlugin.getWorkspace().removeResourceChangeListener(webContentChangeListener);
- return status;
- }
-
- public String getWSDLFileNameFromURL(URL wsdlURL) {
- IPath wsdlPath = new Path(wsdlURL.toExternalForm());
- return wsdlPath.lastSegment();
- }
-
- private void setWSDLLocation(Definition definition) throws MalformedURLException {
- String wsdlLocation = WSDLUtils.getWSDLLocation(definition);
- if (wsdlLocation != null) {
- model.setWsdlLocation(wsdlLocation);
- }
- }
-
- 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 ef416b9..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,111 +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.environment.StatusException;
-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>
- *
- *
- */
-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.WARNING, 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.WARNING, 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.WARNING, 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;
- }
-
- if (!status.isOK()) {
- try {
- getEnvironment().getStatusHandler().report(status);
- } catch (StatusException e) {
- return new Status(IStatus.ERROR, CXFCorePlugin.PLUGIN_ID, 0, "", null);
- }
- }
- 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 48ea797..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.creation.ui/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,44 +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.4.0.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;x-internal:=true,
- org.eclipse.jst.ws.internal.cxf.creation.ui.widgets;x-internal:=true,
- org.eclipse.jst.ws.internal.cxf.creation.ui.wsrt;x-internal:=true
-Require-Bundle: org.eclipse.ui;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.jst.ws.consumption.ui;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.wst.command.env.core;bundle-version="[1.0.204,1.1.0)",
- org.eclipse.core.resources;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.jdt.core;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.jst.ws.cxf.core;bundle-version="0.4.3",
- org.eclipse.jst.ws.cxf.creation.core;bundle-version="0.3.5",
- org.eclipse.wst.ws;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.wst.common.frameworks;bundle-version="[1.1.200,1.3.0)",
- org.eclipse.wst.command.env.ui;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.jdt.ui;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.jface.text;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.jst.ws.cxf.ui;bundle-version="0.3.5",
- org.eclipse.jst.ws.cxf.consumption.ui;bundle-version="0.3.3",
- org.eclipse.wst.command.env;bundle-version="[1.0.305,1.1.0)",
- org.eclipse.jst.ws.creation.ui;bundle-version="[1.0.305,1.1.0)",
- org.eclipse.jst.ws;bundle-version="[1.0.304,1.1.0)",
- org.eclipse.ltk.core.refactoring;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.jst.ws.annotations.core;bundle-version="0.5.0",
- org.eclipse.jst.ws.jaxws.core;bundle-version="0.5.0",
- org.eclipse.emf.common;bundle-version="[2.4.0,3.0.0)",
- javax.wsdl;bundle-version="[1.6.2,1.7.0)",
- org.eclipse.ui.editors;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.wst.common.modulecore;bundle-version="[1.1.0,1.3.0)",
- org.eclipse.jdt.apt.core;bundle-version="[3.3.100,4.0.0)",
- org.eclipse.core.filesystem;bundle-version="[1.2.0,2.0.0)"
-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
-Import-Package: javax.jws
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 ef52b4d..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 Web Tools Platform
-
-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 6210526..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.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 2d3a443..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.creation.ui/src/org/eclipse/jst/ws/internal/cxf/creation/ui/CXFCreationUIMessages.java
+++ /dev/null
@@ -1,66 +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;
-
-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_MESSAGE;
- public static String JAVA2WS_SELECT_SEI_OPTION;
- public static String JAVA2WS_SELECT_SEI_DIALOG_TITLE;
- public static String JAVA2WS_SELECT_SEI_DIALOG_DESCRIPTION;
- public static String JAVA2WS_SELECT_SEI_WEBSERVICE_NAME_ATTRIBUTE_PRESENT;
- public static String JAVA2WS_SELECT_IMPL_DIALOG_TITLE;
- public static String JAVA2WS_SELECT_IMPL_DIALOG_DESCRIPTION;
- 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;
-
- public static String WEBSERVICE_ENPOINTINTERFACE_MUST_IMPLEMENT;
- public static String WEBSERVICE_ENPOINTINTERFACE_NOT_FOUND;
- public static String WEBSERVICE_IMPLEMENTATION_NOT_FOUND;
-
- 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 4bcfe64..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.creation.ui/src/org/eclipse/jst/ws/internal/cxf/creation/ui/CXFCreationUIPlugin.java
+++ /dev/null
@@ -1,90 +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
- *
- */
-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.toString(), 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 a7e42d8..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.creation.ui/src/org/eclipse/jst/ws/internal/cxf/creation/ui/CXFCreationUImessages.properties
+++ /dev/null
@@ -1,56 +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 an existing Service Endpoint Interface (SEI) or create an SEI by extracting an interface from the implementation 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 that implements all the methods of the SEI.
-
-#Java2WS Config Widget Factory
-JAVA2WS_JAXWS_ANNOTATE_PAGE_TITLE={0} {1} Web Service JAX-WS Annotations Configuration
-JAVA2WS_JAXWS_ANNOTATE_PAGE_DESCRIPTION=Optionally, select the JAX-WS Annotations to add.
-
-JAVA2WS_PAGE_TITLE={0} {1} Web Service Java2WS Configuration
-JAVA2WS_PAGE_DESCRIPTION=Configure the {0} Java to WS options.
-
-#WSDL2Java Config Widget Factory
-WSDL2JAVA_PAGE_TITLE={0} {1} Web Service WSDL2Java Configuration
-WSDL2JAVA_PAGE_DESCRIPTION=Configure the {0} WSDL to Java options.
-
-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_MESSAGE=Please select a Service Endpoint Interface
-JAVA2WS_SELECT_SEI_OPTION=Please select an SEI option
-JAVA2WS_SELECT_SEI_DIALOG_TITLE=Select Service Endpoint Interface
-JAVA2WS_SELECT_SEI_DIALOG_DESCRIPTION=Select the Interface to use as the Service Endpoint Interface
-JAVA2WS_SELECT_SEI_WEBSERVICE_NAME_ATTRIBUTE_PRESENT=Implementation class contains an @WebService annotation with a name attribute which cannot be combined with an endpointInterface attribute
-JAVA2WS_SELECT_IMPL_DIALOG_TITLE=Select an Implementation
-JAVA2WS_SELECT_IMPL_DIALOG_DESCRIPTION=Select the Implementation to use for the Web Service
-
-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:
-
-WEBSERVICE_ENPOINTINTERFACE_MUST_IMPLEMENT=Implementation class must implement the SEI method ''{0}''
-WEBSERVICE_ENPOINTINTERFACE_NOT_FOUND=The endpointInterface ''{0}'' cannot be found
-WEBSERVICE_IMPLEMENTATION_NOT_FOUND=The Implementation ''{0}'' cannot be found
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 dd54664..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,30 +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;
-
-@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 0257fc2..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,101 +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.ILocalVariable;
-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.annotations.core.utils.AnnotationUtils;
-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.ui.CXFCreationUIPlugin;
-import org.eclipse.swt.graphics.Image;
-
-@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.equals(CXFModelUtils.WEB_PARAM)) {
- List<SingleVariableDeclaration> parameters = AnnotationUtils.getSingleVariableDeclarations(method);
-
- if (parameters.size() == 0) {
- return disabled;
- }
- for (SingleVariableDeclaration parameter : parameters) {
- ILocalVariable variable = (ILocalVariable) parameter.resolveBinding().getJavaElement();
- if (AnnotationUtils.isAnnotationPresent(variable, 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 8bce936..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,530 +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.ILocalVariable;
-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.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.ITreeSelection;
-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;
-
-@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 IType) {
- return new Object[] {type};
- }
- }
- } catch (JavaModelException jme) {
- CXFCreationUIPlugin.log(jme.getStatus());
- }
- }
-
- if (element instanceof IType) {
- try {
- IType sourceType = (IType) element;
- List<IMethod> publicMethods = new ArrayList<IMethod>();
- IMethod[] methods = sourceType.getMethods();
- if (sourceType.isInterface()) {
- return methods;
- } else if (sourceType.isClass()) {
- 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 ITreeSelection) {
- ITreeSelection treeSelection = (TreeSelection) event.getSelection();
- Object firstElement = treeSelection.getFirstElement();
-
- IDocument document = annotationPreviewViewer.getDocument();
- FindReplaceDocumentAdapter findReplaceDocumentAdapter =
- new FindReplaceDocumentAdapter(document);
- try {
- if (firstElement instanceof IType) {
- IType sourceType = (IType) firstElement;
- String elementName = sourceType.getElementName();
-
- StringBuilder regex = new StringBuilder("\\bpublic\\W+(?:\\w+\\W+){1,3}?");
- regex.append(elementName);
- regex.append("\\b");
- IRegion region = findReplaceDocumentAdapter.find(0, regex.toString(), true, true,
- false, true);
-
- annotationPreviewViewer.setSelectedRange(region.getOffset(), region.getLength());
- annotationPreviewViewer.revealRange(region.getOffset(), region.getLength());
- } else if (firstElement instanceof IMethod) {
- IMethod sourceMethod = (IMethod) firstElement;
- IType sourceType = (IType) sourceMethod.getParent();
-
- String elementName = sourceMethod.getElementName();
-
- StringBuilder regex = new StringBuilder();
-
- if (sourceType.isClass()) {
- regex.append("\\bpublic");
- }
-
- regex.append("\\W+(?:\\w+\\W+){1,3}?");
- regex.append(elementName);
- regex.append("\\s*?\\(\\s*?.*?");
-
- String[] parameterTypes = sourceMethod.getParameterTypes();
- String[] paramterNames = sourceMethod.getParameterNames();
-
- for (int i = 0; i < parameterTypes.length; i++) {
- regex.append("\\s*?");
- String typeName = Signature.toString(parameterTypes[i]);
- regex.append(typeName);
- regex.append("\\s*?");
- regex.append(paramterNames[i]);
- if (i < parameterTypes.length - 1) {
- regex.append("\\s*?,\\s*?.*?");
- }
- }
- regex.append("\\s*?\\)");
-
- IRegion region = findReplaceDocumentAdapter.find(0, regex.toString(), 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) {
- CXFCreationUIPlugin.log(jme);
- }
- }
- }
- });
-
- 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);
-
- 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.getSingleVariableDeclarations(method);
- for (SingleVariableDeclaration parameter : parameters) {
- CXFModelUtils.getWebParamAnnotationChange(type, method,
- (ILocalVariable) parameter.resolveBinding().getJavaElement(), 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 = getSourceFromType(getType());
- IDocument document = new Document(source);
-
- JavaPlugin.getDefault().getJavaTextTools().setupJavaDocumentPartitioner(document,
- IJavaPartitions.JAVA_PARTITIONING);
- annotationPreviewViewer.setDocument(document);
-
- return annotationPreviewViewer;
- }
-
- public String getSourceFromType(IType type) {
- try {
- return type.getCompilationUnit().getBuffer().getContents();
- } catch (JavaModelException jme) {
- CXFCreationUIPlugin.log(jme.getStatus());
- }
- return ""; //$NON-NLS-1$
- }
-
- @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) {
- if (element instanceof IMethod) {
- IMethod method = (IMethod) element;
- return !AnnotationUtils.isAnnotationPresent(type.findMethods(method)[0],
- annotationKey);
- }
- return false;
- }
-
- @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 IMethod) {
- IMethod method = (IMethod) 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 1b68163..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,66 +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;
-
-@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 b163bb6..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,575 +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.net.URI;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import javax.jws.WebService;
-
-import org.eclipse.core.filesystem.EFS;
-import org.eclipse.core.filesystem.IFileStore;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jdt.core.IAnnotation;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jdt.core.IPackageFragment;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jdt.core.Signature;
-import org.eclipse.jdt.core.search.IJavaSearchConstants;
-import org.eclipse.jface.viewers.CheckStateChangedEvent;
-import org.eclipse.jface.viewers.CheckboxTableViewer;
-import org.eclipse.jface.viewers.ICheckStateListener;
-import org.eclipse.jface.window.Window;
-import org.eclipse.jst.ws.annotations.core.utils.AnnotationUtils;
-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.internal.jaxws.core.JAXWSCoreMessages;
-import org.eclipse.jst.ws.internal.jaxws.core.JAXWSCorePlugin;
-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.ui.dialogs.ElementTreeSelectionDialog;
-import org.eclipse.wst.command.internal.env.ui.widgets.SimpleWidgetDataContributor;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetDataEvents;
-
-@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 static final String NAME = "name";
-
- private int NUMBER_OF_PUBLIC_METHODS;
- private int NUMBER_OF_CHECKED_METHODS;
- private IMethod[] publicMethods;
-
- private Button useSEIButton;
- private Button selectSEIButton;
- private Button browseSEIButton;
- 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() {
- boolean useSEI = model.isUseServiceEndpointInterface();
- useSEIButton.setSelection(useSEI);
- selectSEIButton.setSelection(useSEI);
- selectSEIButton.setEnabled(useSEI);
- if (!useSEI) {
- selectSEICombo.deselectAll();
- }
- enableSelectSEIControls(useSEI);
- extractSEIButton.setSelection(false);
- extractSEIButton.setEnabled(useSEI);
- enableExtractSEIControls(useSEI);
- seiInterfaceNameText.setText("");
- seiMembersToExtractTableViewer.setAllChecked(false);
- NUMBER_OF_CHECKED_METHODS = 0;
- validateSEISelection();
- }
-
- @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) {
- model.setServiceEndpointInterfaceName("");
-
- 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 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.getText().trim().length() > 0) {
- 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);
- }
- });
-
- selectSEICombo.addModifyListener(new ModifyListener() {
-
- public void modifyText(ModifyEvent event) {
- updateSEISelectionStatus();
- statusListener.handleEvent(null);
- }
- });
-
- gridData = new GridData(SWT.FILL, SWT.FILL, true, false);
- gridData.horizontalSpan = 1;
- selectSEICombo.setLayoutData(gridData);
-
- browseSEIButton = Java2WSWidgetFactory.createBrowseButton(composite);
-
- gridData = new GridData(SWT.FILL, SWT.FILL, false, false);
- gridData.horizontalSpan = 1;
- browseSEIButton.setLayoutData(gridData);
-
- browseSEIButton.addSelectionListener(new SelectionAdapter() {
-
- @Override
- public void widgetSelected(SelectionEvent e) {
- ElementTreeSelectionDialog selectionDialog = Java2WSWidgetFactory.createElementTreeSelectionDialog(
- composite.getShell(), CXFCreationUIMessages.JAVA2WS_SELECT_SEI_DIALOG_TITLE,
- CXFCreationUIMessages.JAVA2WS_SELECT_SEI_DIALOG_DESCRIPTION,
- JDTUtils.getJavaProject(model.getProjectName()), IJavaSearchConstants.INTERFACE);
-
- int returnCode = selectionDialog.open();
- if (returnCode == Window.OK) {
- ICompilationUnit selectedCompilationUnit = (ICompilationUnit) selectionDialog.getFirstResult();
- String selectedInterface = selectedCompilationUnit.findPrimaryType().getFullyQualifiedName();
- List<String> seis = Arrays.asList(selectSEICombo.getItems());
- if (!seis.contains(selectedInterface)) {
- selectSEICombo.add(selectedInterface);
- }
- selectSEICombo.setText(selectedInterface);
- }
- }
- });
-
- 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) {
- if (extractSEIButton.getSelection()) {
- String interfaceName = seiInterfaceNameText.getText();
- String seiName = interfaceName;
- String packageName = startingPointType.getPackageFragment().getElementName();
- if (packageName.length() > 0) {
- seiName = packageName + "." + interfaceName;
- }
- model.setServiceEndpointInterfaceName(seiName);
-
- String compilationUnitName = interfaceName + ".java"; //$NON-NLS-1$
- JAVA_TYPE_NAME_STATUS = JDTUtils.validateJavaTypeName(model.getProjectName(), interfaceName);
- JAVA_TYPE_EXISTS_STATUS = checkTypeExists(startingPointType, compilationUnitName);
- updateSEISelectionStatus();
- statusListener.handleEvent(null);
- }
- }
- });
-
- gridData = new GridData(SWT.FILL, SWT.FILL, true, false);
- gridData.horizontalSpan = 1;
- seiInterfaceNameText.setLayoutData(gridData);
-
- Java2WSWidgetFactory.createPaddingLabel(composite);
- 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);
-
- if (model.isUseServiceEndpointInterface()) {
- if (selectSEICombo.indexOf(model.getServiceEndpointInterfaceName()) == -1) {
- selectSEICombo.add(model.getServiceEndpointInterfaceName());
- }
- selectSEICombo.setText(model.getServiceEndpointInterfaceName());
- model.setFullyQualifiedJavaInterfaceName(model.getServiceEndpointInterfaceName());
- }
-
- return this;
- }
-
- private void validateSEISelection() {
- if (!useSEIButton.getSelection()) {
- SEI_SELECTION_STATUS = Status.OK_STATUS;
- return;
- }
- IType seiType = JDTUtils.getType(model.getProjectName(), selectSEICombo.getText());
- if (seiType != null) {
- try {
- IMethod[] seiMethods = seiType.getMethods();
- for (IMethod seiMethod : seiMethods) {
- IMethod[] implMethods = startingPointType.findMethods(seiMethod);
- if (implMethods == null) {
- SEI_SELECTION_STATUS = new Status(IStatus.ERROR, CXFCreationUIPlugin.PLUGIN_ID,
- CXFCreationUIMessages.bind(CXFCreationUIMessages.WEBSERVICE_ENPOINTINTERFACE_MUST_IMPLEMENT,
- getImplementsMessage(seiType, seiMethod)));
- break;
- } else {
- SEI_SELECTION_STATUS = validateSEIAddition();
- }
- }
- model.setServiceEndpointInterfaceName(selectSEICombo.getText());
- model.setFullyQualifiedJavaInterfaceName(selectSEICombo.getText());
- } catch (JavaModelException jme) {
- CXFCreationUIPlugin.log(jme.getStatus());
- }
- } else {
- SEI_SELECTION_STATUS = new Status(IStatus.ERROR, CXFCreationUIPlugin.PLUGIN_ID,
- CXFCreationUIMessages.bind(CXFCreationUIMessages.WEBSERVICE_ENPOINTINTERFACE_NOT_FOUND,
- selectSEICombo.getText()));
- }
- }
-
- private String getImplementsMessage(IType seiType, IMethod seiMethod) {
- StringBuilder message = new StringBuilder(seiType.getElementName());
- message.append("."); //$NON-NLS-1$
- message.append(seiMethod.getElementName());
- message.append("("); //$NON-NLS-1$
- String[] parameterTypes = seiMethod.getParameterTypes();
- for (int i = 0; i < parameterTypes.length; i++) {
- String parameterType = Signature.toString(parameterTypes[i]);
- message.append(parameterType);
- if (i < parameterTypes.length - 1) {
- message.append(", "); //$NON-NLS-1$
- }
- }
- message.append(")"); //$NON-NLS-1$
- return message.toString();
- }
-
- private IStatus validateSEIAddition() {
- IStatus status = Status.OK_STATUS;
- try {
- IAnnotation webService = AnnotationUtils.getAnnotation(WebService.class, startingPointType);
- if (webService != null) {
- Object name = AnnotationUtils.getAnnotationValue(webService, NAME);
- if (name != null) {
- status = new Status(IStatus.ERROR, CXFCreationUIPlugin.PLUGIN_ID,
- CXFCreationUIMessages.JAVA2WS_SELECT_SEI_WEBSERVICE_NAME_ATTRIBUTE_PRESENT);
- }
- }
- } catch (JavaModelException jme) {
- CXFCreationUIPlugin.log(jme.getStatus());
- }
- return status;
- }
-
- public void enableSelectSEIControls(boolean enable) {
- selectSEICombo.setEnabled(enable);
- browseSEIButton.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_MESSAGE);
- } else if (selectSEIButton.getSelection() && selectSEICombo.getText().length() > 0) {
- validateSEISelection();
- }
-
- 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;
- }
-
- public 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;
- }
-}
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 f3efcbb..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,183 +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.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.WSDLUtils;
-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;
-
-@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 176cf0e..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,73 +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;
-
-@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.bind(CXFCreationUIMessages.JAVA2WS_PAGE_DESCRIPTION,
- context.getCxfRuntimeEdition()));
- 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 7654d1e..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,175 +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.Arrays;
-import java.util.List;
-
-import org.eclipse.core.runtime.IStatus;
-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.search.IJavaSearchConstants;
-import org.eclipse.jface.window.Window;
-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.Listener;
-import org.eclipse.ui.dialogs.ElementTreeSelectionDialog;
-import org.eclipse.wst.command.internal.env.ui.widgets.SimpleWidgetDataContributor;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetDataEvents;
-
-@SuppressWarnings("restriction")
-public class Java2WSInterfaceConfigWidget extends SimpleWidgetDataContributor {
- private IStatus IMPL_SELECTION_STATUS = Status.OK_STATUS;
-
- private Java2WSDataModel model;
- private IType startingPointType;
-
- private Combo selectImplementationCombo;
-
- public Java2WSInterfaceConfigWidget() {
- }
-
- public void setJava2WSDataModel(Java2WSDataModel model) {
- this.model = model;
- }
-
- public void setJavaStartingPointType(IType startingPointType) {
- this.startingPointType = startingPointType;
- }
-
- @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);
-
- Java2WSWidgetFactory.createSelectImplementationLabel(composite);
-
- selectImplementationCombo = Java2WSWidgetFactory
- .createSelectImplementationCombo(composite, model, startingPointType);
- gridData = new GridData(SWT.FILL, SWT.FILL, true, false);
- selectImplementationCombo.setLayoutData(gridData);
-
- selectImplementationCombo.addSelectionListener(new SelectionAdapter() {
- @Override
- public void widgetSelected(SelectionEvent event) {
- validateImplementationSelection();
- statusListener.handleEvent(null);
- }
- });
-
- selectImplementationCombo.addModifyListener(new ModifyListener() {
-
- public void modifyText(ModifyEvent event) {
- validateImplementationSelection();
- statusListener.handleEvent(null);
- }
- });
-
- Button browseImplButton = Java2WSWidgetFactory.createBrowseButton(composite);
- gridData = new GridData(SWT.FILL, SWT.FILL, false, false);
- browseImplButton.setLayoutData(gridData);
-
- browseImplButton.addSelectionListener(new SelectionAdapter() {
-
- @Override
- public void widgetSelected(SelectionEvent e) {
-
- ElementTreeSelectionDialog selectionDialog = Java2WSWidgetFactory.createElementTreeSelectionDialog(
- composite.getShell(), CXFCreationUIMessages.JAVA2WS_SELECT_IMPL_DIALOG_TITLE,
- CXFCreationUIMessages.JAVA2WS_SELECT_IMPL_DIALOG_DESCRIPTION,
- JDTUtils.getJavaProject(model.getProjectName()), IJavaSearchConstants.CLASS);
-
- int returnCode = selectionDialog.open();
- if (returnCode == Window.OK) {
- ICompilationUnit selectedCompilationUnit = (ICompilationUnit) selectionDialog.getFirstResult();
- String selectedImplementation = selectedCompilationUnit.findPrimaryType().getFullyQualifiedName();
- List<String> impls = Arrays.asList(selectImplementationCombo.getItems());
- if (!impls.contains(selectedImplementation)) {
- selectImplementationCombo.add(selectedImplementation);
- }
- selectImplementationCombo.setText(selectedImplementation);
- }
- }
- });
- return this;
- }
-
- @Override
- public IStatus getStatus() {
- return IMPL_SELECTION_STATUS;
- }
-
- private void validateImplementationSelection() {
- IType implType = JDTUtils.getType(model.getProjectName(), selectImplementationCombo.getText());
- if (implType != null) {
- try {
- IMethod[] seiMethods = startingPointType.getMethods();
- for (IMethod seiMethod : seiMethods) {
- IMethod[] implMethod = implType.findMethods(seiMethod);
- if (implMethod == null) {
- IMPL_SELECTION_STATUS = new Status(IStatus.ERROR, CXFCreationUIPlugin.PLUGIN_ID,
- CXFCreationUIMessages.bind(CXFCreationUIMessages.WEBSERVICE_ENPOINTINTERFACE_MUST_IMPLEMENT,
- getImplementsMessage(startingPointType, seiMethod)));
- break;
- }
- IMPL_SELECTION_STATUS = Status.OK_STATUS;
- }
- model.setServiceEndpointInterfaceName(startingPointType.getFullyQualifiedName());
- model.setFullyQualifiedJavaClassName(selectImplementationCombo.getText());
- } catch (JavaModelException jme) {
- CXFCreationUIPlugin.log(jme.getStatus());
- }
- } else {
- IMPL_SELECTION_STATUS = new Status(IStatus.ERROR, CXFCreationUIPlugin.PLUGIN_ID,
- CXFCreationUIMessages.bind(CXFCreationUIMessages.WEBSERVICE_IMPLEMENTATION_NOT_FOUND,
- selectImplementationCombo.getText()));
- }
- }
-
- private String getImplementsMessage(IType seiType, IMethod seiMethod) {
- StringBuilder message = new StringBuilder(seiType.getElementName());
- message.append("."); //$NON-NLS-1$
- message.append(seiMethod.getElementName());
- message.append("("); //$NON-NLS-1$
- String[] parameterTypes = seiMethod.getParameterTypes();
- for (int i = 0; i < parameterTypes.length; i++) {
- String parameterType = Signature.toString(parameterTypes[i]);
- message.append(parameterType);
- if (i < parameterTypes.length - 1) {
- message.append(", "); //$NON-NLS-1$
- }
- }
- message.append(")"); //$NON-NLS-1$
- return message.toString();
- }
-
-}
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 7ae4091..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,139 +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 javax.jws.WebService;
-
-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.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;
-
-@SuppressWarnings("restriction")
-public class Java2WSSelectSEIWidgetFactory implements INamedWidgetContributorFactory {
- private static final String ENDPOINT_INTERFACE = "endpointInterface";
-
- private SimpleWidgetContributor classWidgetContributor;
- private SimpleWidgetContributor interfaceWidgetContributor;
-
- private Java2WSClassConfigWidget java2WSClassConfigWidget = new Java2WSClassConfigWidget();
- private Java2WSInterfaceConfigWidget java2WSInterfaceConfigWidget = new Java2WSInterfaceConfigWidget();
-
- private Java2WSDataModel model;
- private IType startingPointType;
-
- public INamedWidgetContributor getFirstNamedWidget() {
- if (startingPointType == null) {
- return null;
- }
-
- if (interfaceWidgetContributor == null || classWidgetContributor == null) {
- init();
- }
-
- try {
- if (startingPointType.isInterface()) {
- return interfaceWidgetContributor;
- } else if (startingPointType.isClass()) {
- checkForServiceEndpointInterface();
- return classWidgetContributor;
- }
- } catch (JavaModelException jme) {
- CXFCreationUIPlugin.log(jme.getStatus());
- }
-
- return null;
- }
-
- private void checkForServiceEndpointInterface() throws JavaModelException {
- IAnnotation[] annotations = startingPointType.getAnnotations();
- for (IAnnotation annotation : annotations) {
- if (annotation.getElementName().equals(WebService.class.getSimpleName())) {
- IMemberValuePair[] memberValuePairs = annotation.getMemberValuePairs();
- for (IMemberValuePair memberValuePair : memberValuePairs) {
- if (memberValuePair.getMemberName().equals(ENDPOINT_INTERFACE)) {
- String endpointInterface = memberValuePair.getValue().toString();
- IType seiType = startingPointType.getJavaProject().findType(endpointInterface);
- if (seiType != null && seiType.exists()) {
- model.setUseServiceEndpointInterface(true);
- model.setServiceEndpointInterfaceName(endpointInterface);
- }
- }
- }
- }
- }
- }
-
- 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) {
- this.model = 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 bf91d44..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,305 +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;
-
-@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);
-
- TextCellEditor textCellEditor = new TextCellEditor(packageNameTableViewer.getTable());
- textCellEditor.addListener( new ICellEditorListener() {
-
- public void editorValueChanged(boolean oldValidState, boolean newValidState) {
- statusListener.handleEvent(null);
- }
-
- public void cancelEditor() {
- }
-
- public void applyEditorValue() {
- }
- });
-
- textCellEditor.setValidator(new ICellEditorValidator() {
-
- public String isValid(Object packageName) {
- status = JDTUtils.validatePackageName(model.getProjectName(), packageName.toString());
- if (status.getSeverity() == IStatus.OK) {
- return null;
- }
- return status.getMessage();
- }
- });
-
- packageNameViewerColumn.setEditingSupport(new PackageNameEditingSupport(packageNameTableViewer,
- textCellEditor, model));
-
- columnWeightData = new ColumnWeightData(100, 100, true);
- tableLayout.addColumnData(columnWeightData);
-
- packageNameTableViewer.setContentProvider(new PackageNameTableContentProvider());
- packageNameTableViewer.setInput(model.getWsdlDefinition());
-
- TableItem[] tableItems = 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;
- }
-}
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 31edd23..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,87 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IONA Technologies PLC
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IONA Technologies PLC - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.cxf.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;
-
-@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.bind(CXFCreationUIMessages.WSDL2JAVA_PAGE_DESCRIPTION,
- context.getCxfRuntimeEdition()));
- 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 e02d64f..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,97 +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;
-
-@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 7d7c048..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,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
- *******************************************************************************/
-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>
- *
- */
-@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 4c938b8..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.Java2WSValidateInputCommand;
-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;
-
-@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 Java2WSValidateInputCommand(java2WSDataModel));
- 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();
- wsdl2JavaDataModel.setProjectName(projectName);
- 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 698c689..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,32 +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;
-
-@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 d3d798d..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.ui/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.cxf.ui;singleton:=true
-Bundle-Version: 0.4.0.qualifier
-Bundle-Activator: org.eclipse.jst.ws.internal.cxf.ui.CXFUIPlugin
-Bundle-Vendor: %pluginProvider
-Bundle-Localization: plugin
-Export-Package: org.eclipse.jst.ws.internal.cxf.ui;x-internal:=true,
- org.eclipse.jst.ws.internal.cxf.ui.dialogs;x-internal:=true,
- org.eclipse.jst.ws.internal.cxf.ui.viewers;x-friends:="org.eclipse.jst.ws.cxf.consumption.ui,org.eclipse.jst.ws.cxf.creation.ui",
- org.eclipse.jst.ws.internal.cxf.ui.widgets;x-friends:="org.eclipse.jst.ws.cxf.consumption.ui,org.eclipse.jst.ws.cxf.creation.ui"
-Require-Bundle: org.eclipse.ui;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.jst.ws.cxf.core;bundle-version="0.4.3",
- org.eclipse.core.resources;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.ui.ide;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.jdt.core;bundle-version="[3.4.0,4.0.0)",
- javax.wsdl;bundle-version="[1.6.2,1.7.0)",
- org.eclipse.jdt.ui;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.wst.command.env;bundle-version="[1.0.305,1.1.0)",
- org.eclipse.wst.command.env.core;bundle-version="[1.0.204,1.1.0)",
- org.eclipse.emf.ecore;bundle-version="[2.4.0,3.0.0)",
- org.eclipse.jst.ws.jaxws.core;bundle-version="0.5.0"
-Ant-Version: Apache Ant 1.7.0
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Created-By: 1.5.0_14-b03 (Sun Microsystems Inc.)
-Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.jst.ws.cxf.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 991b896..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.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 UI (Incubation)
-pluginProvider=Eclipse Web Tools Platform
-
-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 8756a4f..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.ui/src/org/eclipse/jst/ws/internal/cxf/ui/CXFUIMessages.java
+++ /dev/null
@@ -1,179 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IONA Technologies PLC
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IONA Technologies PLC - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.cxf.ui;
-
-import org.eclipse.osgi.util.NLS;
-
-public class CXFUIMessages extends NLS {
- private static final String BUNDLE_NAME = "org.eclipse.jst.ws.internal.cxf.ui.CXFUImessages"; //$NON-NLS-1$
- public static String CXF_RUNTIME_PREFERENCE_PAGE_RUNTIME_HOME_TAB_NAME;
- public static String CXF_RUNTIME_PREFERENCE_PAGE_RUNTIME_HOME_TAB_TOOLTIP;
- public static String CXF_RUNTIME_PREFERENCE_PAGE_CXF_HOME_DIR_LABEL;
- public static String CXF_RUNTIME_PREFERENCE_PAGE_RUNTIME_NOT_SET;
- public static String CXF_RUNTIME_PREFERENCE_PAGE_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_BROWSE_LABEL;
- public static String JAVA2WS_EXTRACT_SEI;
- public static String JAVA2WS_EXTRACT_SEI_LABEL;
- public static String JAVA2WS_EXTRACT_SEI_TOOLTIP;
- public static String JAVA2WS_EXTRACT_MEMBERS_LABEL;
-
- public static String JAVA2WS_SELECT_ALL_BUTTON;
- public static String JAVA2WS_DESELECT_ALL_BUTTON;
-
- public static String JAVA2WS_SELECT_IMPLEMENTATION;
- public static String JAVA2WS_SELECT_IMPLEMENTATION_TOOLTIP;
-
- public static String WSDL2JAVA_FRONTEND_TOOLTIP;
- public static String WSDL2JAVA_DATABINDING_TOOLTIP;
- public static String WSDL2JAVA_WSDL_VERSION_TOOLTIP;
- public static String WSDL2JAVA_GENERATE_IMPLEMENTATION_TOOLTIP;
- public static String WSDL2JAVA_GENERATE_CLIENT_TOOLTIP;
- public static String WSDL2JAVA_GENERATE_SERVER_TOOLTIP;
- public static String WSDL2JAVA_DEFAULT_VALUES_TOOLTIP;
- public static String WSDL2JAVA_EXCLUDE_NAMESPACE_TOOLTIP;
- public static String WSDL2JAVA_PROCESS_SOAP_HEADERS_TOOLTIP;
- public static String WSDL2JAVA_DEFAULT_NAMESPACE_LOADING_TOOLTIP;
- public static String WSDL2JAVA_EXCLUDE_NAMESPACE_LOADING_TOOLTIP;
- public static String WSDL2JAVA_WSDL_LOCATION_TOOLTIP;
- public static String WSDL2JAVA_NO_ADDRESS_BINDING;
- public static String WSDL2JAVA_NO_ADDRESS_BINDING_TOOLTIP;
- public static String WSDL2JAVA_AUTO_NAME_RESOLUTION;
- public static String WSDL2JAVA_AUTO_NAME_RESOLUTION_TOOLTIP;
- public static String WSDL2JAVA_XML_CATALOG_TOOLTIP;
- public static String WSDL2JAVA_XJC_ARGS_TOOLTIP;
- public static String WSDL2JAVA_XJC_ARG_GROUP_TITLE;
- public static String WSDL2JAVA_XJC_ARG_COLUMN_NAME;
- public static String WSDL2JAVA_XJC_DESCRIPTION_COLUMN_NAME;
- public static String WSDL2JAVA_XJC_DEFAULT_VALUES;
- public static String WSDL2JAVA_XJC_TOSTRING;
- public static String WSDL2JAVA_XJC_TOSTRING_MULTILINE;
- public static String WSDL2JAVA_XJC_TOSTRING_SIMPLE;
- public static String WSDL2JAVA_XJC_LOCATOR;
- public static String WSDL2JAVA_XJC_SYNC_METHODS;
- public static String WSDL2JAVA_XJC_MARK_GENERATED;
- public static String WSDL2JAVA_XJC_EPISODE_FILE;
-
- public static String RESOURCE_SELECTIN_DIALOG_BROWSE_WORKSPACE_BUTTON;
- public static String RESOURCE_SELECTIN_DIALOG_BROWSE_FILE_SYSTEM_BUTTON;
- public static String RESOURCE_SELECTIN_DIALOG_BROWSE_FILE_NOT_FOUND_ERROR;
-
- public static String WSDL2JAVA_OUTPUT_DIRECTORY;
- public static String WSDL2JAVA_OUTPUT_DIRECTORY_TOOLTIP;
-
- public static String WSDL2JAVA_PACKAGE_NAME;
- public static String WSDL2JAVA_PACKAGE_NAME_TOOLTIP;
-
- public static String WSDL2JAVA_PACKAGE_NAME_OPTIONAL;
- public static String WSDL2JAVA_PACKAGE_NAME_OPTIONAL_TOOLTIP;
-
- public static String WSDL2JAVA_WSDL_NAMESPACE_COLUMN_HEADER;
- public static String WSDL2JAVA_PACKAGE_NAME_COLUMN_HEADER;
-
- public static String WSDL2JAVA_SERVICE_NAME;
- public static String WSDL2JAVA_SERVICE_NAME_TOOLTIP;
-
- public static String WSDL2JAVA_BINDING_FILES;
- public static String WSDL2JAVA_BINDING_NAME_TOOLTIP;
- public static String WSDL2JAVA_BINDING_FILES_ADD;
- public static String WSDL2JAVA_BINDING_FILES_REMOVE;
-
- public static String WSDL2JAVA_BINDING_FILE_DIALOG_TITLE;
- public static String WSDL2JAVA_BINDING_FILE_DIALOG_MESSAGE;
- public static String WSDL2JAVA_BINDING_FILE_DIALOG_FILTER_NAME;
-
- public static String WSDL2JAVA_XML_CATLOG;
- public static String WSDL2JAVA_XML_CATLOG_TOOLTIP;
- public static String WSDL2JAVA_XML_CATLOG_BROWSE;
- static {
- // initialize resource bundle
- NLS.initializeMessages(BUNDLE_NAME, CXFUIMessages.class);
- }
-
- private CXFUIMessages() {
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.cxf.ui/src/org/eclipse/jst/ws/internal/cxf/ui/CXFUIPlugin.java b/bundles/org.eclipse.jst.ws.cxf.ui/src/org/eclipse/jst/ws/internal/cxf/ui/CXFUIPlugin.java
deleted file mode 100644
index 2d12299..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.ui/src/org/eclipse/jst/ws/internal/cxf/ui/CXFUIPlugin.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IONA Technologies PLC
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IONA Technologies PLC - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.cxf.ui;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.osgi.framework.BundleContext;
-
-/**
- * The activator class controls the plug-in life cycle
- *
- */
-public class CXFUIPlugin extends AbstractUIPlugin {
-
- // The plug-in ID
- public static final String PLUGIN_ID = "org.eclipse.jst.ws.cxf.ui"; //$NON-NLS-1$
-
- // The shared instance
- private static CXFUIPlugin plugin;
-
- /**
- * The constructor
- */
- public CXFUIPlugin() {
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
- */
- public void start(BundleContext context) throws Exception {
- super.start(context);
- plugin = this;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
- */
- public void stop(BundleContext context) throws Exception {
- plugin = null;
- super.stop(context);
- }
-
- /**
- * Returns the shared instance
- *
- * @return the shared instance
- */
- public static CXFUIPlugin getDefault() {
- return plugin;
- }
-
- public static void logMessage(int severity, String message) {
- CXFUIPlugin.log(new Status(severity, CXFUIPlugin.PLUGIN_ID, message));
- }
-
- public static void log(IStatus status) {
- CXFUIPlugin.getDefault().getLog().log(status);
- }
-
- public static void log(Throwable exception) {
- CXFUIPlugin.log(new Status(IStatus.ERROR, CXFUIPlugin.PLUGIN_ID,
- exception.toString(), exception));
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.cxf.ui/src/org/eclipse/jst/ws/internal/cxf/ui/CXFUImessages.properties b/bundles/org.eclipse.jst.ws.cxf.ui/src/org/eclipse/jst/ws/internal/cxf/ui/CXFUImessages.properties
deleted file mode 100644
index 434ae2d..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.ui/src/org/eclipse/jst/ws/internal/cxf/ui/CXFUImessages.properties
+++ /dev/null
@@ -1,168 +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=&Endpoint Config
-SPRING_CONFIG_PREFERENCES_TAB_TOOLTIP=Please select the default option for Spring configuration generation
-SPRING_CONFIG_USE_CXF_SERVLET=Use CX&F Servlet
-SPRING_CONFIG_USE_CXF_SPRING_APPLICATION_CONTEXT=Use Spring &Application Context
-
-CXF_DEFAULT_FRONTEND_LABEL=Default &Frontend:
-CXF_DEFAULT_DATABINDING_LABEL=Default &Databindng:
-JAVA2WS_GROUP_LABEL=Java2WS Generation Options:
-JAVA2WSDL_GROUP_LABEL=Java2WSDL Generation Options:
-WSDL2JAVA_GROUP_LABEL=WSDL2Java Generation Options:
-JAVA2WS_GEN_CLIENT_LABEL=Generate Cli&ent
-JAVA2WS_GEN_SERVER_LABEL=Generate Ser&ver
-JAVA2WS_GEN_IMPLEMENTATION_LABEL=Generate &Implementation
-JAVA2WS_GEN_WRAPPER_FAULT_LABEL=Generate Wrapper and Fault &Beans
-JAVA2WS_GEN_WSDL_LABEL=Generate WSD&L
-JAVA2WS_DEFAULT_SOAPBINDING_LABEL=Default S&OAP Binding:
-JAVA2WS_GEN_XSD_IMPORTS=Generate separate XSD for the &types
-CXF_INVALID_VERSION_FORMAT=Invalid Version Format
-CXF_VERSION_NOT_SPECIFIED=CXF version value not specified
-SPRING_CONFIG_GROUP_LABEL=CXF Endpoint Configuration Options:
-WSDL2JAVA_PROCESS_SOAP_HEADERS=Enable &processing of implicit SOAP headers
-WSDL2JAVA_LOAD_DEFAULT_NAMESPACE_PACKAGE_MAPPING=Enable &loading of the default namespace package name mapping
-WSDL2JAVA_USE_DEFAULT_EXCLUDES_NAMESPACE_MAPPING=Enable the use of the default &excludes namespace mapping
-WSDL2JAVA_WSDL_VERSION_LABEL=WSDL Version:
-WSDL2JAVA_USE_DEFAULT_VALUES=Generate &default values for the generated artifacts
-
-JAXWS_ANNOTATIONS_GROUP_LABEL=JAX-WS Annotation Generation
-JAXWS_ANNOTATIONS_GROUP_TOOLTIP=Select the annotations which are generated by default on the class or interface before input to Java2WS
-JAXWS_GENERATE_WEB_METHOD=@Web&Method
-JAXWS_GENERATE_WEB_PARAM=@Web&Param
-JAXWS_GENERATE_REQUEST_WRAPPER=@Re&questWrapper
-JAXWS_GENERATE_RESPONSE_WRAPPER=@&ResponseWrapper
-JAXWS_ANNOTATIONS_PROCESSING_GROUP_LABEL=JAX-WS Annotation Processing
-JAXWS_ENABLE_ANNOTATION_PROCESSING=&Enable annotation validation processing
-JAXWS_ENABLE_ANNOTATION_PROCESSING_TOOLTIP=Turn JAX-WS annotation processing on or off in projects configured for {0} web services
-
-JAVA2WS_SOAP12_BINDING_TOOLTIP=Specify to generate SOAP 1.2 binding
-JAVA2WS_CREATE_XSD_IMPORTS_TOOLTIP= Output schemas to separate files and use imports to load them instead of inlining them into the wsdl
-JAVA2WS_DATABINDING_TOOLTIP= Specify the data binding. Default is jaxb for jaxws frontend
-#JAVA2WS_DATABINDING_TOOLTIP= Specify the data binding (aegis or jaxb). Default is jaxb for jaxws frontend, and aegis for simple frontend
-JAVA2WS_FRONTEND_TOOLTIP=Specify the frontend to use
-#JAVA2WS_FRONTEND_TOOLTIP=Specify the frontend to use. jaxws and the simple frontend are supported
-JAVA2WS_GENERATE_WSDL_TOOLTIP=Specify to generate the WSDL file
-JAVA2WS_GENERATE_WRAPPERBEAN_TOOLTIP=Specify to generate the wrapper and fault bean
-JAVA2WS_GENERATE_CLIENT_TOOLTIP=Generate a client mainline using JAX-WS APIs\n.....\n javax.xml.ws.Service service = javax.xml.ws.Service.create(...);\n... client = service.getPort(...);\n
-JAVA2WS_GENERATE_SERVER_TOOLTIP=Generate a server mainline using JAX-WS APIs\n.....\n javax.xml.ws.Endpoint.publish(...);\n.....\n
-JAVA2WS_GENERATE_ANT_TOOLTIP=Specify to generate an Ant build.xml file
-JAVA2WS_BEANS_TOOLTIP=Specify the pathname of a file defining additional Spring beans to customise data binding configuration
-JAVA2WS_TARGET_NAMESPACE_TOOLTIP=Specify the target namespace to use in the wsdl
-JAVA2WS_SERVICE_NAME_TOOLTIP=Specify the service name to use in the generated wsdl
-JAVA2WS_PORT_NAME_TOOLTIP=Specify the port name to use in the generated wsdl
-JAVA2WS_ADDRESS_TOOLTIP= Specify the port address
-
-JAVA2WS_WSDL_FILE_NAME=&WSDL File:
-JAVA2WS_OUTPUT_FILE_TOOLTIP=Specify the output wsdl file name
-
-JAVA2WS_USE_SEI_BUTTON=&Use a Service Endpoint Interface:
-JAVA2WS_USE_SEI_INFO_LABEL=(You may work directly with the {0} Java class. But working from an interface is the recommended approach. Two options are provided here.)
-JAVA2WS_SELECT_SEI=Select SEI:
-#JAVA2WS_SELECT_SEI_LABEL=Select SEI from &Type Hierarchy:
-JAVA2WS_SELECT_SEI_LABEL=Selec&t an SEI:
-JAVA2WS_SELECT_SEI_TOOLTIP=Select the Interface from the Type Hierarchy to use as the SEI
-JAVA2WS_BROWSE_LABEL=Browse...
-JAVA2WS_EXTRACT_SEI=Extract SEI:
-JAVA2WS_EXTRACT_SEI_LABEL=&Create an SEI:
-JAVA2WS_EXTRACT_SEI_TOOLTIP=Type the name of the Service Endpoint Interface to extract
-JAVA2WS_EXTRACT_MEMBERS_LABEL=Members to declare in the extracted SEI:
-JAVA2WS_SELECT_ALL_BUTTON=&Select All...
-JAVA2WS_DESELECT_ALL_BUTTON=&Deselect All...
-JAVA2WS_SELECT_IMPLEMENTATION=Select &Implementation:
-JAVA2WS_SELECT_IMPLEMENTATION_TOOLTIP=Select the Implementation
-
-WSDL2JAVA_FRONTEND_TOOLTIP=Specify the frontend. Default is JAXWS. Currently supports only JAXWS frontend
-WSDL2JAVA_DATABINDING_TOOLTIP=Specify the databinding. Default is JAXB. Currently supports only JAXB databinding
-WSDL2JAVA_WSDL_VERSION_TOOLTIP=Specify the wsdl version .Default is WSDL1.1. Currently 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 9befcd1..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.ui/src/org/eclipse/jst/ws/internal/cxf/ui/dialogs/ResourceSelectionDialog.java
+++ /dev/null
@@ -1,241 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IONA Technologies PLC
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IONA Technologies PLC - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.cxf.ui.dialogs;
-
-import java.io.File;
-import java.util.Arrays;
-
-import org.eclipse.core.resources.IContainer;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.viewers.ViewerFilter;
-import org.eclipse.jst.ws.internal.cxf.ui.CXFUIMessages;
-import org.eclipse.jst.ws.internal.cxf.ui.CXFUIPlugin;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.FileDialog;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.dialogs.ElementTreeSelectionDialog;
-import org.eclipse.ui.dialogs.ISelectionStatusValidator;
-import org.eclipse.ui.dialogs.SelectionDialog;
-import org.eclipse.ui.dialogs.SelectionStatusDialog;
-import org.eclipse.ui.model.WorkbenchContentProvider;
-import org.eclipse.ui.model.WorkbenchLabelProvider;
-
-/**
- * A <code>SelectionStatusDialog</code> which allows the selection of files
- * with a specific extension from the workspace or file system.
- *
- */
-public class ResourceSelectionDialog extends SelectionStatusDialog {
- private IStatus OK_FILE_STATUS = new Status(IStatus.OK, CXFUIPlugin.PLUGIN_ID, ""); //$NON-NLS-1$
-
- private IStatus ERROR_FILE_STATUS = new Status(IStatus.ERROR, CXFUIPlugin.PLUGIN_ID,
- CXFUIMessages.RESOURCE_SELECTIN_DIALOG_BROWSE_FILE_NOT_FOUND_ERROR);
-
- private IStatus VALIDATE_SELECTION_STATUS = new Status(IStatus.ERROR, CXFUIPlugin.PLUGIN_ID, ""); //$NON-NLS-1$
-
- private Text resourceText;
-
- private String filterExtension;
- private String filterName;
-
- /**
- * Creates an instance of <code>ResourceSelectionDialog</code>
- *
- * @param parent
- * @param filterExtension
- * the file name extension which the dialogs will use to filter
- * files
- * @param filterName
- * the name that describes the filterExtension
- * @param dialogTitle
- * the dialog title
- */
- public ResourceSelectionDialog(Shell parent, String filterExtension, String filterName, String dialogTitle) {
- super(parent);
-
- this.filterExtension = filterExtension;
- this.filterName = filterName;
-
- setTitle(dialogTitle);
- setStatusLineAboveButtons(true);
- int shellStyle = getShellStyle();
- setShellStyle(shellStyle | SWT.MAX | SWT.RESIZE);
- updateStatus(VALIDATE_SELECTION_STATUS);
- }
-
- @Override
- protected Control createDialogArea(Composite parent) {
- final Composite composite = (Composite) super.createDialogArea(parent);
-
- Composite buttonComposite = new Composite(composite, SWT.NONE);
- GridData gridData = new GridData(SWT.FILL, SWT.FILL, true, false);
- gridData.widthHint = 500;
- buttonComposite.setLayoutData(gridData);
-
- GridLayout gridLayout = new GridLayout(3, false);
- buttonComposite.setLayout(gridLayout);
-
- Label messageLabel = createMessageArea(buttonComposite);
- gridData = new GridData(SWT.BEGINNING, SWT.CENTER, true, false);
- messageLabel.setLayoutData(gridData);
-
- Button browseWorkspace = new Button(buttonComposite, SWT.PUSH);
- browseWorkspace.setText(CXFUIMessages.RESOURCE_SELECTIN_DIALOG_BROWSE_WORKSPACE_BUTTON);
- browseWorkspace.addSelectionListener(new SelectionAdapter() {
-
- @Override
- public void widgetSelected(SelectionEvent event) {
- SelectionDialog dialog = createWorkspaceResourceDialog(composite.getShell());
- if (dialog.open() == SelectionDialog.OK) {
- Object[] result = dialog.getResult();
- IResource resource = (IResource) result[0];
- resourceText.setText(resource.getLocation().toOSString());
- }
- }
- });
-
- gridData = new GridData(SWT.END, SWT.FILL, false, false);
- browseWorkspace.setLayoutData(gridData);
-
- Button browseFileSystem = new Button(buttonComposite, SWT.PUSH);
- browseFileSystem.setText(CXFUIMessages.RESOURCE_SELECTIN_DIALOG_BROWSE_FILE_SYSTEM_BUTTON);
- browseFileSystem.addSelectionListener(new SelectionAdapter() {
-
- @Override
- public void widgetSelected(SelectionEvent event) {
- FileDialog dialog = createFileSystemResourceDialog(composite.getShell());
- String result = dialog.open();
- if (result == null) {
- return;
- }
- IPath filterPath = new Path(dialog.getFilterPath());
- String buildFileName = dialog.getFileName();
- IPath path = filterPath.append(buildFileName).makeAbsolute();
-
- resourceText.setText(path.toOSString());
- }
- });
- gridData = new GridData(SWT.END, SWT.FILL, false, false);
- browseFileSystem.setLayoutData(gridData);
-
- resourceText = new Text(buttonComposite, SWT.BORDER);
- gridData = new GridData(SWT.FILL, SWT.FILL, true, false);
- resourceText.addModifyListener(new ModifyListener() {
-
- public void modifyText(ModifyEvent event) {
- String resource = resourceText.getText();
- File file = new File(resource);
- if (file.exists()) {
- setResult(Arrays.asList(resource));
- updateStatus(OK_FILE_STATUS);
- } else {
- updateStatus(ERROR_FILE_STATUS);
- }
- }
- });
- gridData.horizontalSpan = 3;
- resourceText.setLayoutData(gridData);
-
- return composite;
- }
-
- private SelectionDialog createWorkspaceResourceDialog(Shell shell) {
- ElementTreeSelectionDialog workspaceResourceDialog = new ElementTreeSelectionDialog(shell,
- new WorkbenchLabelProvider(), new WorkbenchContentProvider());
-
- workspaceResourceDialog.setTitle(getMessage());
- workspaceResourceDialog.setMessage(filterName);
- workspaceResourceDialog.setAllowMultiple(false);
-
- workspaceResourceDialog.addFilter(new ViewerFilter() {
- @Override
- public boolean select(Viewer viewer, Object parentElement, Object element) {
- if (element instanceof IFile) {
- IFile file = (IFile) element;
- return file.isAccessible() && file.getFileExtension().equals(filterExtension);
- }
-
- if (element instanceof IProject && !((IProject) element).isOpen()) {
- IProject project = (IProject) element;
- return project.isAccessible();
- }
-
- if (element instanceof IContainer) {
- try {
- IContainer container = (IContainer) element;
- IResource[] resources = container.members();
- for (IResource resource : resources) {
- if (select(viewer, parentElement, resource)) {
- return true;
- }
- }
- } catch (CoreException ce) {
- CXFUIPlugin.log(ce.getStatus());
- }
- }
- return false;
- }
- });
-
- workspaceResourceDialog.setValidator(new ISelectionStatusValidator() {
-
- public IStatus validate(Object[] selection) {
- if (selection.length > 0) {
- Object selected = selection[0];
- if (selected instanceof IFile) {
- IFile file = (IFile) selected;
- if (file.getFileExtension().equals(filterExtension)) {
- return OK_FILE_STATUS;
- }
- }
- }
- return VALIDATE_SELECTION_STATUS;
- }
- });
-
- workspaceResourceDialog.setInput(ResourcesPlugin.getWorkspace().getRoot());
-
- return workspaceResourceDialog;
- }
-
- private FileDialog createFileSystemResourceDialog(Shell shell) {
- FileDialog dialog = new FileDialog(shell, SWT.OPEN);
- dialog.setFilterExtensions(new String[] { "*" + filterExtension }); //$NON-NLS-1$;
- dialog.setFilterNames(new String[] { filterName });
- return dialog;
- }
-
- @Override
- protected void computeResult() {
- // do nothing
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.cxf.ui/src/org/eclipse/jst/ws/internal/cxf/ui/preferences/CXFRuntimePreferencePage.java b/bundles/org.eclipse.jst.ws.cxf.ui/src/org/eclipse/jst/ws/internal/cxf/ui/preferences/CXFRuntimePreferencePage.java
deleted file mode 100644
index 1a100d0..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.ui/src/org/eclipse/jst/ws/internal/cxf/ui/preferences/CXFRuntimePreferencePage.java
+++ /dev/null
@@ -1,517 +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;
-
-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/JavaViewerFilter.java b/bundles/org.eclipse.jst.ws.cxf.ui/src/org/eclipse/jst/ws/internal/cxf/ui/viewers/JavaViewerFilter.java
deleted file mode 100644
index 8440008..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.ui/src/org/eclipse/jst/ws/internal/cxf/ui/viewers/JavaViewerFilter.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Shane Clarke.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Shane Clarke - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.cxf.ui.viewers;
-
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IPackageFragment;
-import org.eclipse.jdt.core.IPackageFragmentRoot;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jdt.core.search.IJavaSearchConstants;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.viewers.ViewerFilter;
-import org.eclipse.jst.ws.internal.cxf.ui.CXFUIPlugin;
-
-/**
- * <code>ViewerFilter</code> that filters on classes or interfaces within a <code>IJavaProject</code>
- *
- */
-public class JavaViewerFilter extends ViewerFilter {
-
- private IJavaProject javaProject;
- private int elementKinds;
-
- /**
- * Constructs an instance of <code>JavaViewerFilter</code> given a <code>IJavaProject</code> and an
- * <code>IJavaSearchConstants</code> element kind to search for. All other elements are filtered.
- *
- * @param javaProject the java project to filter
- * @param elementKinds a flag defining nature of searched elements; the only valid values are:
- * <code>IJavaSearchConstants.CLASS</code>
- * <code>IJavaSearchConstants.INTERFACE</code>
- * <code>IJavaSearchConstants.CLASS_AND_INTERFACE</code>
- */
- public JavaViewerFilter(IJavaProject javaProject, int elementKinds) {
- this.javaProject = javaProject;
- this.elementKinds = elementKinds;
-
- }
-
- @Override
- public boolean select(Viewer viewer, Object parentElement, Object element) {
- try {
- if (element instanceof IJavaProject) {
- return javaProject.equals((IJavaProject) element);
- }
- if (element instanceof IPackageFragmentRoot) {
- IPackageFragmentRoot packageFragmentRoot = (IPackageFragmentRoot) element;
- return packageFragmentRoot.getKind() == IPackageFragmentRoot.K_SOURCE;
- }
- if (element instanceof IPackageFragment) {
- IPackageFragment packageFragment = (IPackageFragment) element;
- return packageFragment.hasChildren();
- }
- if (element instanceof ICompilationUnit) {
- ICompilationUnit compilationUnit = (ICompilationUnit) element;
- IType type = compilationUnit.findPrimaryType();
- switch (elementKinds) {
- case IJavaSearchConstants.CLASS:
- return type.isClass();
- case IJavaSearchConstants.INTERFACE:
- return type.isInterface() && !type.isAnnotation();
- case IJavaSearchConstants.CLASS_AND_INTERFACE:
- return type.isClass() || (type.isInterface() && !type.isAnnotation());
- }
-
- }
- } catch (JavaModelException jme) {
- CXFUIPlugin.log(jme.getStatus());
- }
- return false;
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.cxf.ui/src/org/eclipse/jst/ws/internal/cxf/ui/viewers/PackageNameColumnLabelProvider.java b/bundles/org.eclipse.jst.ws.cxf.ui/src/org/eclipse/jst/ws/internal/cxf/ui/viewers/PackageNameColumnLabelProvider.java
deleted file mode 100644
index 2606742..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.ui/src/org/eclipse/jst/ws/internal/cxf/ui/viewers/PackageNameColumnLabelProvider.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IONA Technologies PLC
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IONA Technologies PLC - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.cxf.ui.viewers;
-
-import java.util.Map;
-
-import org.eclipse.jface.viewers.ColumnLabelProvider;
-import org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaDataModel;
-import org.eclipse.jst.ws.jaxws.core.utils.WSDLUtils;
-
-public class PackageNameColumnLabelProvider extends ColumnLabelProvider {
- private Map<String, String> includedNamespaces;
-
- public PackageNameColumnLabelProvider(WSDL2JavaDataModel model) {
- includedNamespaces = model.getIncludedNamespaces();
- }
-
- @Override
- public String getText(Object element) {
- if (includedNamespaces.containsKey(element.toString())) {
- return includedNamespaces.get(element.toString());
- }
- return WSDLUtils.getPackageNameFromNamespace(element.toString());
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.cxf.ui/src/org/eclipse/jst/ws/internal/cxf/ui/viewers/PackageNameEditingSupport.java b/bundles/org.eclipse.jst.ws.cxf.ui/src/org/eclipse/jst/ws/internal/cxf/ui/viewers/PackageNameEditingSupport.java
deleted file mode 100644
index b4657fb..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.ui/src/org/eclipse/jst/ws/internal/cxf/ui/viewers/PackageNameEditingSupport.java
+++ /dev/null
@@ -1,86 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IONA Technologies PLC
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IONA Technologies PLC - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.cxf.ui.viewers;
-
-import java.util.Map;
-
-import org.eclipse.jface.viewers.CellEditor;
-import org.eclipse.jface.viewers.EditingSupport;
-import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaDataModel;
-import org.eclipse.jst.ws.jaxws.core.utils.WSDLUtils;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.swt.widgets.TableItem;
-
-public class PackageNameEditingSupport extends EditingSupport implements SelectionListener {
- private CellEditor packageNameCellEditor;
- private Table table;
- private Map<String, String> includedNamespaces;
-
- public PackageNameEditingSupport(TableViewer tableViewer, CellEditor packageNameCellEditor,
- WSDL2JavaDataModel model) {
- super(tableViewer);
- this.table = tableViewer.getTable();
- this.packageNameCellEditor = packageNameCellEditor;
- includedNamespaces = model.getIncludedNamespaces();
- table.addSelectionListener(this);
- }
-
- @Override
- protected boolean canEdit(Object element) {
- return table.getSelection()[0].getChecked();
- }
-
- @Override
- protected CellEditor getCellEditor(Object element) {
- return packageNameCellEditor;
- }
-
- @Override
- protected Object getValue(Object element) {
- if (includedNamespaces.containsKey(element.toString())) {
- return includedNamespaces.get(element.toString());
- }
- return WSDLUtils.getPackageNameFromNamespace(element.toString());
- }
-
- @Override
- protected void setValue(Object namespace, Object packageName) {
- if (namespace != null && packageName != null) {
- includedNamespaces.put(namespace.toString(), packageName.toString());
- getViewer().update(namespace, null);
- }
- }
-
- public void widgetSelected(SelectionEvent event) {
- if (event.detail == SWT.CHECK) {
- TableItem item = (TableItem) event.item;
- String namespaceKey = item.getText(0);
- String packageName = item.getText(1);
- if (item.getChecked()) {
- if (!includedNamespaces.containsKey(namespaceKey)) {
- includedNamespaces.put(namespaceKey, packageName);
- }
- } else {
- if (includedNamespaces.containsKey(namespaceKey)) {
- includedNamespaces.remove(namespaceKey);
- }
- }
- }
- }
-
- public void widgetDefaultSelected(SelectionEvent event) {
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.cxf.ui/src/org/eclipse/jst/ws/internal/cxf/ui/viewers/PackageNameTableContentProvider.java b/bundles/org.eclipse.jst.ws.cxf.ui/src/org/eclipse/jst/ws/internal/cxf/ui/viewers/PackageNameTableContentProvider.java
deleted file mode 100644
index f9cb6e4..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.ui/src/org/eclipse/jst/ws/internal/cxf/ui/viewers/PackageNameTableContentProvider.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IONA Technologies PLC
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IONA Technologies PLC - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.cxf.ui.viewers;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-
-import javax.wsdl.Definition;
-
-import org.eclipse.jface.viewers.IStructuredContentProvider;
-import org.eclipse.jface.viewers.Viewer;
-
-public class PackageNameTableContentProvider implements IStructuredContentProvider {
-
- @SuppressWarnings("unchecked")
- public Object[] getElements(Object inputElement) {
- List<Object> elements = new ArrayList<Object>();
- if (inputElement instanceof Definition) {
- Definition definition = (Definition) inputElement;
- Map namespaces = definition.getNamespaces();
- Collection values = namespaces.values();
- for (Object namespaceValue : values) {
- String namespace = namespaceValue.toString();
- if (!namespace.equals(definition.getTargetNamespace()) && !elements.contains(namespace)) {
- elements.add(namespace);
- }
- }
- }
- return elements.toArray(new Object[elements.size()]);
- }
-
- public void dispose() {
- }
-
- public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.cxf.ui/src/org/eclipse/jst/ws/internal/cxf/ui/widgets/AnnotationsComposite.java b/bundles/org.eclipse.jst.ws.cxf.ui/src/org/eclipse/jst/ws/internal/cxf/ui/widgets/AnnotationsComposite.java
deleted file mode 100644
index 4904799..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.ui/src/org/eclipse/jst/ws/internal/cxf/ui/widgets/AnnotationsComposite.java
+++ /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
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.cxf.ui.widgets;
-
-import org.eclipse.jst.ws.internal.cxf.core.CXFCorePlugin;
-import org.eclipse.jst.ws.internal.cxf.core.context.Java2WSPersistentContext;
-import org.eclipse.jst.ws.internal.cxf.core.model.CXFPackage;
-import org.eclipse.jst.ws.internal.cxf.core.utils.CXFModelUtils;
-import org.eclipse.jst.ws.internal.cxf.ui.CXFUIMessages;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Group;
-
-public class AnnotationsComposite extends Composite {
- private Java2WSPersistentContext context = CXFCorePlugin.getDefault().getJava2WSContext();
-
- private Button generateWebMethodButton;
- private Button generateWebParamButton;
- private Button generateRequestWrapperButton;
- private Button generateResponseWrapperButton;
-
- private Button enableAPTButton;
-
- public AnnotationsComposite(Composite parent, int style) {
- super(parent, style);
- addControls();
- }
-
- private void addControls() {
- GridLayout preflayout = new GridLayout(1, true);
- this.setLayout(preflayout);
-
- GridData gridData = new GridData(SWT.FILL, SWT.FILL, true, false);
- this.setLayoutData(gridData);
-
- Group jaxwsAnnotationsGroup = new Group(this, SWT.SHADOW_IN);
- jaxwsAnnotationsGroup.setText(CXFUIMessages.JAXWS_ANNOTATIONS_GROUP_LABEL);
- jaxwsAnnotationsGroup.setToolTipText(CXFUIMessages.JAXWS_ANNOTATIONS_GROUP_TOOLTIP);
- GridLayout gridLayout = new GridLayout(1, true);
- jaxwsAnnotationsGroup.setLayout(gridLayout);
- gridData = new GridData(SWT.FILL, SWT.FILL, true, false);
- jaxwsAnnotationsGroup.setLayoutData(gridData);
-
- generateWebMethodButton = new Button(jaxwsAnnotationsGroup, SWT.CHECK);
- generateWebMethodButton.setText(CXFUIMessages.JAXWS_GENERATE_WEB_METHOD);
- generateWebMethodButton.addSelectionListener(new SelectionAdapter() {
- 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 d4e41f1..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.ui/src/org/eclipse/jst/ws/internal/cxf/ui/widgets/BlankRuntimePreferencesComposite.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IONA Technologies PLC
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IONA Technologies PLC - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.cxf.ui.widgets;
-
-import org.eclipse.jst.ws.internal.cxf.ui.CXFUIMessages;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.custom.CLabel;
-import org.eclipse.ui.ISharedImages;
-import org.eclipse.ui.PlatformUI;
-
-public class BlankRuntimePreferencesComposite extends Composite {
-
- public BlankRuntimePreferencesComposite(Composite parent, int style) {
- super(parent, style);
-
- addControls();
- }
-
- private void addControls() {
- this.setLayout(new GridLayout());
- CLabel setIntallDirLabel = new CLabel(this, SWT.NONE);
- GridData gridData = new GridData(SWT.CENTER, SWT.CENTER, true, true);
- setIntallDirLabel.setLayoutData(gridData);
- setIntallDirLabel.setImage(PlatformUI.getWorkbench().getSharedImages().getImage(
- ISharedImages.IMG_OBJS_ERROR_TSK));
- setIntallDirLabel.setText(CXFUIMessages.CXF_RUNTIME_PREFERENCE_PAGE_RUNTIME_NOT_SET);
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.cxf.ui/src/org/eclipse/jst/ws/internal/cxf/ui/widgets/CXF20WSDL2JavaPreferencesComposite.java b/bundles/org.eclipse.jst.ws.cxf.ui/src/org/eclipse/jst/ws/internal/cxf/ui/widgets/CXF20WSDL2JavaPreferencesComposite.java
deleted file mode 100644
index 5d1d9c9..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.ui/src/org/eclipse/jst/ws/internal/cxf/ui/widgets/CXF20WSDL2JavaPreferencesComposite.java
+++ /dev/null
@@ -1,197 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IONA Technologies PLC
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IONA Technologies PLC - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.cxf.ui.widgets;
-
-import org.eclipse.jst.ws.internal.cxf.core.CXFCorePlugin;
-import org.eclipse.jst.ws.internal.cxf.core.model.CXFPackage;
-import org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaContext;
-import org.eclipse.jst.ws.internal.cxf.core.utils.CXFModelUtils;
-import org.eclipse.jst.ws.internal.cxf.ui.CXFUIMessages;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Group;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.swt.widgets.TableItem;
-
-public class CXF20WSDL2JavaPreferencesComposite extends Composite {
- WSDL2JavaContext context = CXFCorePlugin.getDefault().getWSDL2JavaContext();
-
- private Button generateServerButton;
- private Button generateImplementationButton;
- private Button processSOAPHeadersButton;
- private Button namespacePackageMappingButton;
- private Button excludesNamespaceMappingButton;
-
- private Button useDefaultValuesButton;
- private Button autoNameResolutionButton;
-
- private Table xjcArgsTable;
-
- private TableItem xjcDefaultValuesTableItem;
- private TableItem xjcToStringTableItem;
- private TableItem xjcToStringMultiLineTableItem;
- private TableItem xjcToStringSimpleTableItem;
- private TableItem xjcLocatorTableItem;
- private TableItem xjcSyncMethodsTableItem;
- private TableItem xjcMarkGeneratedTableItem;
-
- public CXF20WSDL2JavaPreferencesComposite(Composite parent, int style) {
- super(parent, style);
- }
-
- public void addControls() {
- GridLayout preflayout = new GridLayout(1, true);
- this.setLayout(preflayout);
-
- GridData gridData = new GridData(SWT.FILL, SWT.FILL, true, false);
- this.setLayoutData(gridData);
-
- Group wsdl2javaGroup = new Group(this, SWT.SHADOW_IN);
- wsdl2javaGroup.setText(CXFUIMessages.WSDL2JAVA_GROUP_LABEL);
- GridLayout wsdl2javalayout = new GridLayout(1, true);
- wsdl2javaGroup.setLayout(wsdl2javalayout);
- gridData = new GridData(SWT.FILL, SWT.FILL, true, false);
- wsdl2javaGroup.setLayoutData(gridData);
-
- generateServerButton = WSDL2JavaWidgetFactory.createGenerateServerButton(wsdl2javaGroup, context);
- generateImplementationButton = WSDL2JavaWidgetFactory.createGenerateImplementationButton(
- wsdl2javaGroup, context);
-
- useDefaultValuesButton = WSDL2JavaWidgetFactory.createDefaultValuesButton(wsdl2javaGroup, context);
-
- processSOAPHeadersButton = WSDL2JavaWidgetFactory.createProcessSOAPHeadersButton(wsdl2javaGroup,
- context);
-
- namespacePackageMappingButton = WSDL2JavaWidgetFactory.createNamespacePackageMappingButton(
- wsdl2javaGroup, context);
-
- excludesNamespaceMappingButton = WSDL2JavaWidgetFactory.createExcludesNamespaceMappingButton(
- wsdl2javaGroup, context);
-
- if (CXFModelUtils.isAutoNameResolutionPermitted()) {
- autoNameResolutionButton = WSDL2JavaWidgetFactory.createAutoNameResolutionButton(wsdl2javaGroup,
- context);
- }
-
- Group xjcArgGroup = new Group(this, SWT.SHADOW_IN);
- xjcArgGroup.setText(CXFUIMessages.WSDL2JAVA_XJC_ARG_GROUP_TITLE);
- GridLayout xjcArgLayout = new GridLayout(1, true);
- xjcArgGroup.setLayout(xjcArgLayout);
- gridData = new GridData(SWT.FILL, SWT.FILL, true, false);
- xjcArgGroup.setLayoutData(gridData);
-
- xjcArgsTable = WSDL2JavaWidgetFactory.createXJCArgTable(xjcArgGroup, context);
- gridData = new GridData(SWT.FILL, SWT.FILL, true, true);
- gridData.horizontalSpan = 3;
- gridData.verticalSpan = 6;
- xjcArgsTable.setLayoutData(gridData);
-
- xjcDefaultValuesTableItem = WSDL2JavaWidgetFactory.createXJCDefaultValuesTableItem(xjcArgsTable,
- context);
- xjcToStringTableItem = WSDL2JavaWidgetFactory.createXJCToStringTableItem(xjcArgsTable, context);
- xjcToStringMultiLineTableItem = WSDL2JavaWidgetFactory.createXJCToStringMultiLineTableItem(
- xjcArgsTable, context);
- xjcToStringSimpleTableItem = WSDL2JavaWidgetFactory.createXJCToStringSimpleTableItem(xjcArgsTable,
- context);
- xjcLocatorTableItem = WSDL2JavaWidgetFactory.createXJCLocatorTableItem(xjcArgsTable, context);
- xjcSyncMethodsTableItem = WSDL2JavaWidgetFactory.createXJCSyncMethodsTableItem(xjcArgsTable, context);
- xjcMarkGeneratedTableItem = WSDL2JavaWidgetFactory.createXJCMarkGeneratedTableItem(xjcArgsTable,
- context);
- }
-
- public void setDefaults() {
- useDefaultValuesButton.setSelection(CXFModelUtils.getDefaultBooleanValue(
- CXFPackage.WSDL2_JAVA_CONTEXT, CXFPackage.WSDL2_JAVA_CONTEXT__USE_DEFAULT_VALUES));
-
- generateServerButton.setSelection(CXFModelUtils.getDefaultBooleanValue(CXFPackage.CXF_CONTEXT,
- CXFPackage.CXF_CONTEXT__GENERATE_SERVER));
- generateImplementationButton.setSelection(CXFModelUtils.getDefaultBooleanValue(
- CXFPackage.WSDL2_JAVA_CONTEXT, CXFPackage.WSDL2_JAVA_CONTEXT__GENERATE_IMPLEMENTATION));
- processSOAPHeadersButton.setSelection(CXFModelUtils.getDefaultBooleanValue(
- CXFPackage.WSDL2_JAVA_CONTEXT, CXFPackage.WSDL2_JAVA_CONTEXT__PROCESS_SOAP_HEADERS));
- namespacePackageMappingButton.setSelection(CXFModelUtils.getDefaultBooleanValue(
- CXFPackage.WSDL2_JAVA_CONTEXT,
- CXFPackage.WSDL2_JAVA_CONTEXT__LOAD_DEFAULT_NAMESPACE_PACKAGE_NAME_MAPPING));
- excludesNamespaceMappingButton.setSelection(CXFModelUtils.getDefaultBooleanValue(
- CXFPackage.WSDL2_JAVA_CONTEXT,
- CXFPackage.WSDL2_JAVA_CONTEXT__LOAD_DEFAULT_EXCLUDES_NAMEPSACE_MAPPING));
-
- if (canUpdateAutoNameResolution()) {
- autoNameResolutionButton.setSelection(CXFModelUtils.getDefaultBooleanValue(
- CXFPackage.WSDL2_JAVA_CONTEXT, CXFPackage.WSDL2_JAVA_CONTEXT__AUTO_NAME_RESOLUTION));
- }
-
- xjcDefaultValuesTableItem.setChecked(CXFModelUtils.getDefaultBooleanValue(
- CXFPackage.WSDL2_JAVA_CONTEXT, CXFPackage.WSDL2_JAVA_CONTEXT__XJC_USE_DEFAULT_VALUES));
- xjcToStringTableItem.setChecked(CXFModelUtils.getDefaultBooleanValue(CXFPackage.WSDL2_JAVA_CONTEXT,
- CXFPackage.WSDL2_JAVA_CONTEXT__XJC_TO_STRING));
- xjcToStringMultiLineTableItem.setChecked(CXFModelUtils.getDefaultBooleanValue(
- CXFPackage.WSDL2_JAVA_CONTEXT, CXFPackage.WSDL2_JAVA_CONTEXT__XJC_TO_STRING_MULTI_LINE));
- xjcToStringSimpleTableItem.setChecked(CXFModelUtils.getDefaultBooleanValue(
- CXFPackage.WSDL2_JAVA_CONTEXT, CXFPackage.WSDL2_JAVA_CONTEXT__XJC_TO_STRING_SIMPLE));
- xjcLocatorTableItem.setChecked(CXFModelUtils.getDefaultBooleanValue(CXFPackage.WSDL2_JAVA_CONTEXT,
- CXFPackage.WSDL2_JAVA_CONTEXT__XJC_LOCATOR));
- xjcSyncMethodsTableItem.setChecked(CXFModelUtils.getDefaultBooleanValue(
- CXFPackage.WSDL2_JAVA_CONTEXT, CXFPackage.WSDL2_JAVA_CONTEXT__XJC_SYNC_METHODS));
- xjcMarkGeneratedTableItem.setChecked(CXFModelUtils.getDefaultBooleanValue(
- CXFPackage.WSDL2_JAVA_CONTEXT, CXFPackage.WSDL2_JAVA_CONTEXT__XJC_MARK_GENERATED));
- }
-
- public void refresh() {
- useDefaultValuesButton.setSelection(context.isUseDefaultValues());
- generateServerButton.setSelection(context.isGenerateServer());
- generateImplementationButton.setSelection(context.isGenerateImplementation());
- processSOAPHeadersButton.setSelection(context.isProcessSOAPHeaders());
- namespacePackageMappingButton.setSelection(context.isLoadDefaultNamespacePackageNameMapping());
- excludesNamespaceMappingButton.setSelection(context.isLoadDefaultExcludesNamepsaceMapping());
-
- if (canUpdateAutoNameResolution()) {
- autoNameResolutionButton.setSelection(context.isAutoNameResolution());
- }
-
- xjcDefaultValuesTableItem.setChecked(context.isXjcUseDefaultValues());
- xjcToStringTableItem.setChecked(context.isXjcToString());
- xjcToStringMultiLineTableItem.setChecked(context.isXjcToStringMultiLine());
- xjcToStringSimpleTableItem.setChecked(context.isXjcToStringSimple());
- xjcLocatorTableItem.setChecked(context.isXjcLocator());
- xjcSyncMethodsTableItem.setChecked(context.isXjcSyncMethods());
- xjcMarkGeneratedTableItem.setChecked(context.isXjcMarkGenerated());
- }
-
- public void storeValues() {
- context.setUseDefaultValues(useDefaultValuesButton.getSelection());
- context.setGenerateServer(generateServerButton.getSelection());
- context.setGenerateImplementation(generateImplementationButton.getSelection());
- context.setProcessSOAPHeaders(processSOAPHeadersButton.getSelection());
- context.setLoadDefaultNamespacePackageNameMapping(namespacePackageMappingButton.getSelection());
- context.setLoadDefaultExcludesNamepsaceMapping(excludesNamespaceMappingButton.getSelection());
-
- if (canUpdateAutoNameResolution()) {
- context.setAutoNameResolution(autoNameResolutionButton.getSelection());
- }
-
- context.setXjcUseDefaultValues(xjcDefaultValuesTableItem.getChecked());
- context.setXjcToString(xjcToStringTableItem.getChecked());
- context.setXjcToStringMultiLine(xjcToStringMultiLineTableItem.getChecked());
- context.setXjcToStringSimple(xjcToStringSimpleTableItem.getChecked());
- context.setXjcLocator(xjcLocatorTableItem.getChecked());
- context.setXjcSyncMethods(xjcSyncMethodsTableItem.getChecked());
- context.setXjcMarkGenerated(xjcMarkGeneratedTableItem.getChecked());
- }
-
- private boolean canUpdateAutoNameResolution() {
- return autoNameResolutionButton != null && CXFModelUtils.isAutoNameResolutionPermitted();
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.cxf.ui/src/org/eclipse/jst/ws/internal/cxf/ui/widgets/CXF21WSDL2JavaPreferencesComposite.java b/bundles/org.eclipse.jst.ws.cxf.ui/src/org/eclipse/jst/ws/internal/cxf/ui/widgets/CXF21WSDL2JavaPreferencesComposite.java
deleted file mode 100644
index 142cb30..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.ui/src/org/eclipse/jst/ws/internal/cxf/ui/widgets/CXF21WSDL2JavaPreferencesComposite.java
+++ /dev/null
@@ -1,264 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IONA Technologies PLC
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IONA Technologies PLC - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.cxf.ui.widgets;
-
-import org.eclipse.jst.ws.internal.cxf.core.CXFCorePlugin;
-import org.eclipse.jst.ws.internal.cxf.core.model.CXFPackage;
-import org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaContext;
-import org.eclipse.jst.ws.internal.cxf.core.utils.CXFModelUtils;
-import org.eclipse.jst.ws.internal.cxf.ui.CXFUIMessages;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Group;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.swt.widgets.TableItem;
-
-public class CXF21WSDL2JavaPreferencesComposite extends Composite {
- WSDL2JavaContext context = CXFCorePlugin.getDefault().getWSDL2JavaContext();
-
- private Button generateServerButton;
- private Button generateImplementationButton;
- private Button processSOAPHeadersButton;
- private Button namespacePackageMappingButton;
- private Button excludesNamespaceMappingButton;
-
- private Table xjcArgsTable;
-
- private TableItem xjcDefaultValuesTableItem;
- private TableItem xjcToStringTableItem;
- private TableItem xjcToStringMultiLineTableItem;
- private TableItem xjcToStringSimpleTableItem;
- private TableItem xjcLocatorTableItem;
- private TableItem xjcSyncMethodsTableItem;
- private TableItem xjcMarkGeneratedTableItem;
-
- private Button useDefaultValuesButton;
- private Button noAddressBindingButton;
- private Button autoNameResolutionButton;
-
- public CXF21WSDL2JavaPreferencesComposite(Composite parent, int style) {
- super(parent, style);
- }
-
- public void addControls() {
- GridLayout preflayout = new GridLayout(1, true);
- this.setLayout(preflayout);
-
- GridData gridData = new GridData(SWT.FILL, SWT.FILL, true, false);
- this.setLayoutData(gridData);
-
- Group wsdl2javaGroup = new Group(this, SWT.SHADOW_IN);
- wsdl2javaGroup.setText(CXFUIMessages.WSDL2JAVA_GROUP_LABEL);
- GridLayout wsdl2javalayout = new GridLayout(2, false);
- wsdl2javaGroup.setLayout(wsdl2javalayout);
- gridData = new GridData(SWT.FILL, SWT.FILL, true, false);
- wsdl2javaGroup.setLayoutData(gridData);
-
- // Frontend
- // WSDL2JavaWidgetFactory.createFrontendLabel(wsdl2javaGroup);
- // Combo frontendCombo =
- // WSDL2JavaWidgetFactory.createFrontendCombo(wsdl2javaGroup, context);
- // gridData = new GridData(SWT.FILL, SWT.FILL, true, false);
- // frontendCombo.setLayoutData(gridData);
-
- // Databinding
- // WSDL2JavaWidgetFactory.createDatabindingLabel(wsdl2javaGroup);
- // Combo databindingCombo =
- // WSDL2JavaWidgetFactory.createDatabindingCombo(wsdl2javaGroup,
- // context);
- // gridData = new GridData(SWT.FILL, SWT.FILL, true, false);
- // databindingCombo.setLayoutData(gridData);
-
- // WSDL Version
- // WSDL2JavaWidgetFactory. createWSDLVersionLabel(wsdl2javaGroup);
- // Combo wsdlVersionCombo =
- // WSDL2JavaWidgetFactory.createWSDLVersionCombo(wsdl2javaGroup,
- // context);
- // gridData = new GridData(SWT.FILL, SWT.FILL, true, false);
- // wsdlVersionCombo.setLayoutData(gridData);
-
- generateServerButton = WSDL2JavaWidgetFactory.createGenerateServerButton(wsdl2javaGroup, context);
- gridData = new GridData(SWT.FILL, SWT.FILL, true, false);
- gridData.horizontalSpan = 2;
- generateServerButton.setLayoutData(gridData);
-
- generateImplementationButton = WSDL2JavaWidgetFactory.createGenerateImplementationButton(
- wsdl2javaGroup, context);
- gridData = new GridData(SWT.FILL, SWT.FILL, true, false);
- gridData.horizontalSpan = 2;
- generateImplementationButton.setLayoutData(gridData);
-
- useDefaultValuesButton = WSDL2JavaWidgetFactory.createDefaultValuesButton(wsdl2javaGroup, context);
- gridData = new GridData(SWT.FILL, SWT.FILL, true, false);
- gridData.horizontalSpan = 2;
- useDefaultValuesButton.setLayoutData(gridData);
-
- processSOAPHeadersButton = WSDL2JavaWidgetFactory.createProcessSOAPHeadersButton(wsdl2javaGroup,
- context);
- gridData = new GridData(SWT.FILL, SWT.FILL, true, false);
- gridData.horizontalSpan = 2;
- processSOAPHeadersButton.setLayoutData(gridData);
-
- namespacePackageMappingButton = WSDL2JavaWidgetFactory.createNamespacePackageMappingButton(
- wsdl2javaGroup, context);
- gridData = new GridData(SWT.FILL, SWT.FILL, true, false);
- gridData.horizontalSpan = 2;
- namespacePackageMappingButton.setLayoutData(gridData);
-
- excludesNamespaceMappingButton = WSDL2JavaWidgetFactory.createExcludesNamespaceMappingButton(
- wsdl2javaGroup, context);
- gridData = new GridData(SWT.FILL, SWT.FILL, true, false);
- gridData.horizontalSpan = 2;
- excludesNamespaceMappingButton.setLayoutData(gridData);
-
- if (CXFModelUtils.isAutoNameResolutionPermitted()) {
- autoNameResolutionButton = WSDL2JavaWidgetFactory.createAutoNameResolutionButton(wsdl2javaGroup, context);
- gridData = new GridData(SWT.FILL, SWT.FILL, true, false);
- gridData.horizontalSpan = 2;
- autoNameResolutionButton.setLayoutData(gridData);
- }
-
- noAddressBindingButton = WSDL2JavaWidgetFactory.createNoAddressBindingButton(wsdl2javaGroup, context);
- gridData = new GridData(SWT.FILL, SWT.FILL, true, false);
- gridData.horizontalSpan = 2;
- noAddressBindingButton.setLayoutData(gridData);
-
- Group xjcArgGroup = new Group(this, SWT.SHADOW_IN);
- xjcArgGroup.setText(CXFUIMessages.WSDL2JAVA_XJC_ARG_GROUP_TITLE);
- GridLayout xjcArgLayout = new GridLayout(1, true);
- xjcArgGroup.setLayout(xjcArgLayout);
- gridData = new GridData(SWT.FILL, SWT.FILL, true, false);
- xjcArgGroup.setLayoutData(gridData);
-
- xjcArgsTable = WSDL2JavaWidgetFactory.createXJCArgTable(xjcArgGroup, context);
- gridData = new GridData(SWT.FILL, SWT.FILL, true, true);
- gridData.horizontalSpan = 3;
- gridData.verticalSpan = 6;
- xjcArgsTable.setLayoutData(gridData);
-
- xjcDefaultValuesTableItem = WSDL2JavaWidgetFactory.createXJCDefaultValuesTableItem(xjcArgsTable,
- context);
- xjcToStringTableItem = WSDL2JavaWidgetFactory.createXJCToStringTableItem(xjcArgsTable, context);
- xjcToStringMultiLineTableItem = WSDL2JavaWidgetFactory.createXJCToStringMultiLineTableItem(
- xjcArgsTable, context);
- xjcToStringSimpleTableItem = WSDL2JavaWidgetFactory.createXJCToStringSimpleTableItem(xjcArgsTable,
- context);
- xjcLocatorTableItem = WSDL2JavaWidgetFactory.createXJCLocatorTableItem(xjcArgsTable, context);
- xjcSyncMethodsTableItem = WSDL2JavaWidgetFactory.createXJCSyncMethodsTableItem(xjcArgsTable, context);
- xjcMarkGeneratedTableItem = WSDL2JavaWidgetFactory.createXJCMarkGeneratedTableItem(xjcArgsTable,
- context);
- }
-
- public void setDefaults() {
- useDefaultValuesButton.setSelection(CXFModelUtils.getDefaultBooleanValue(
- CXFPackage.WSDL2_JAVA_CONTEXT, CXFPackage.WSDL2_JAVA_CONTEXT__USE_DEFAULT_VALUES));
-
- noAddressBindingButton.setSelection(CXFModelUtils.getDefaultBooleanValue(
- CXFPackage.WSDL2_JAVA_CONTEXT, CXFPackage.WSDL2_JAVA_CONTEXT__NO_ADDRESS_BINDING));
-
- generateServerButton.setSelection(CXFModelUtils.getDefaultBooleanValue(CXFPackage.CXF_CONTEXT,
- CXFPackage.CXF_CONTEXT__GENERATE_SERVER));
-
- generateImplementationButton.setSelection(CXFModelUtils.getDefaultBooleanValue(
- CXFPackage.WSDL2_JAVA_CONTEXT, CXFPackage.WSDL2_JAVA_CONTEXT__GENERATE_IMPLEMENTATION));
-
- processSOAPHeadersButton.setSelection(CXFModelUtils.getDefaultBooleanValue(
- CXFPackage.WSDL2_JAVA_CONTEXT, CXFPackage.WSDL2_JAVA_CONTEXT__PROCESS_SOAP_HEADERS));
-
- namespacePackageMappingButton.setSelection(CXFModelUtils.getDefaultBooleanValue(
- CXFPackage.WSDL2_JAVA_CONTEXT,
- CXFPackage.WSDL2_JAVA_CONTEXT__LOAD_DEFAULT_NAMESPACE_PACKAGE_NAME_MAPPING));
-
- excludesNamespaceMappingButton.setSelection(CXFModelUtils.getDefaultBooleanValue(
- CXFPackage.WSDL2_JAVA_CONTEXT,
- CXFPackage.WSDL2_JAVA_CONTEXT__LOAD_DEFAULT_EXCLUDES_NAMEPSACE_MAPPING));
-
- if (canUpdateAutoNameResolution()) {
- autoNameResolutionButton.setSelection(CXFModelUtils.getDefaultBooleanValue(
- CXFPackage.WSDL2_JAVA_CONTEXT, CXFPackage.WSDL2_JAVA_CONTEXT__AUTO_NAME_RESOLUTION));
- }
-
- xjcDefaultValuesTableItem.setChecked(CXFModelUtils.getDefaultBooleanValue(
- CXFPackage.WSDL2_JAVA_CONTEXT, CXFPackage.WSDL2_JAVA_CONTEXT__XJC_USE_DEFAULT_VALUES));
-
- xjcToStringTableItem.setChecked(CXFModelUtils.getDefaultBooleanValue(CXFPackage.WSDL2_JAVA_CONTEXT,
- CXFPackage.WSDL2_JAVA_CONTEXT__XJC_TO_STRING));
-
- xjcToStringMultiLineTableItem.setChecked(CXFModelUtils.getDefaultBooleanValue(
- CXFPackage.WSDL2_JAVA_CONTEXT, CXFPackage.WSDL2_JAVA_CONTEXT__XJC_TO_STRING_MULTI_LINE));
-
- xjcToStringSimpleTableItem.setChecked(CXFModelUtils.getDefaultBooleanValue(
- CXFPackage.WSDL2_JAVA_CONTEXT, CXFPackage.WSDL2_JAVA_CONTEXT__XJC_TO_STRING_SIMPLE));
-
- xjcLocatorTableItem.setChecked(CXFModelUtils.getDefaultBooleanValue(CXFPackage.WSDL2_JAVA_CONTEXT,
- CXFPackage.WSDL2_JAVA_CONTEXT__XJC_LOCATOR));
-
- xjcSyncMethodsTableItem.setChecked(CXFModelUtils.getDefaultBooleanValue(
- CXFPackage.WSDL2_JAVA_CONTEXT, CXFPackage.WSDL2_JAVA_CONTEXT__XJC_SYNC_METHODS));
-
- xjcMarkGeneratedTableItem.setChecked(CXFModelUtils.getDefaultBooleanValue(
- CXFPackage.WSDL2_JAVA_CONTEXT, CXFPackage.WSDL2_JAVA_CONTEXT__XJC_MARK_GENERATED));
- }
-
- public void refresh() {
- useDefaultValuesButton.setSelection(context.isUseDefaultValues());
- noAddressBindingButton.setSelection(context.isNoAddressBinding());
-
- if (canUpdateAutoNameResolution()) {
- autoNameResolutionButton.setSelection(context.isAutoNameResolution());
- }
-
- generateServerButton.setSelection(context.isGenerateServer());
- generateImplementationButton.setSelection(context.isGenerateImplementation());
- processSOAPHeadersButton.setSelection(context.isProcessSOAPHeaders());
- namespacePackageMappingButton.setSelection(context.isLoadDefaultNamespacePackageNameMapping());
- excludesNamespaceMappingButton.setSelection(context.isLoadDefaultExcludesNamepsaceMapping());
-
- xjcDefaultValuesTableItem.setChecked(context.isXjcUseDefaultValues());
- xjcToStringTableItem.setChecked(context.isXjcToString());
- xjcToStringMultiLineTableItem.setChecked(context.isXjcToStringMultiLine());
- xjcToStringSimpleTableItem.setChecked(context.isXjcToStringSimple());
- xjcLocatorTableItem.setChecked(context.isXjcLocator());
- xjcSyncMethodsTableItem.setChecked(context.isXjcSyncMethods());
- xjcMarkGeneratedTableItem.setChecked(context.isXjcMarkGenerated());
- }
-
- public void storeValues() {
- context.setUseDefaultValues(useDefaultValuesButton.getSelection());
- context.setNoAddressBinding(noAddressBindingButton.getSelection());
-
- if (canUpdateAutoNameResolution()) {
- context.setAutoNameResolution(autoNameResolutionButton.getSelection());
- }
-
- context.setGenerateServer(generateServerButton.getSelection());
- context.setGenerateImplementation(generateImplementationButton.getSelection());
- context.setProcessSOAPHeaders(processSOAPHeadersButton.getSelection());
- context.setLoadDefaultNamespacePackageNameMapping(namespacePackageMappingButton.getSelection());
- context.setLoadDefaultExcludesNamepsaceMapping(excludesNamespaceMappingButton.getSelection());
-
- context.setXjcUseDefaultValues(xjcDefaultValuesTableItem.getChecked());
- context.setXjcToString(xjcToStringTableItem.getChecked());
- context.setXjcToStringMultiLine(xjcToStringMultiLineTableItem.getChecked());
- context.setXjcToStringSimple(xjcToStringSimpleTableItem.getChecked());
- context.setXjcLocator(xjcLocatorTableItem.getChecked());
- context.setXjcSyncMethods(xjcSyncMethodsTableItem.getChecked());
- context.setXjcMarkGenerated(xjcMarkGeneratedTableItem.getChecked());
- }
-
- private boolean canUpdateAutoNameResolution() {
- return autoNameResolutionButton != null && CXFModelUtils.isAutoNameResolutionPermitted();
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.cxf.ui/src/org/eclipse/jst/ws/internal/cxf/ui/widgets/Java2WSDLRuntimePreferencesComposite.java b/bundles/org.eclipse.jst.ws.cxf.ui/src/org/eclipse/jst/ws/internal/cxf/ui/widgets/Java2WSDLRuntimePreferencesComposite.java
deleted file mode 100644
index ebb5ead..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.ui/src/org/eclipse/jst/ws/internal/cxf/ui/widgets/Java2WSDLRuntimePreferencesComposite.java
+++ /dev/null
@@ -1,107 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IONA Technologies PLC
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IONA Technologies PLC - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.cxf.ui.widgets;
-
-import org.eclipse.jst.ws.internal.cxf.core.CXFCorePlugin;
-import org.eclipse.jst.ws.internal.cxf.core.context.Java2WSPersistentContext;
-import org.eclipse.jst.ws.internal.cxf.core.model.CXFPackage;
-import org.eclipse.jst.ws.internal.cxf.core.utils.CXFModelUtils;
-import org.eclipse.jst.ws.internal.cxf.ui.CXFUIMessages;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Group;
-import org.eclipse.swt.widgets.Link;
-import org.eclipse.swt.widgets.TabFolder;
-
-public class Java2WSDLRuntimePreferencesComposite extends Composite {
- private Java2WSPersistentContext context = CXFCorePlugin.getDefault().getJava2WSContext();
-
- private Combo soapBindingCombo;
- private Button createXSDImportsButton;
- private TabFolder tabFolder;
-
- public Java2WSDLRuntimePreferencesComposite(Composite parent, int style, TabFolder tabFolder) {
- super(parent, style);
- this.tabFolder = tabFolder;
- }
-
- public void addControls() {
- GridLayout preflayout = new GridLayout(1, true);
- this.setLayout(preflayout);
-
- GridData gridData = new GridData(SWT.FILL, SWT.FILL, true, false);
- this.setLayoutData(gridData);
-
- Group java2wsdlGroup = new Group(this, SWT.SHADOW_IN);
- java2wsdlGroup.setText(CXFUIMessages.JAVA2WSDL_GROUP_LABEL);
- GridLayout java2wslayout = new GridLayout();
- java2wslayout.numColumns = 2;
- java2wsdlGroup.setLayout(java2wslayout);
- gridData = new GridData(SWT.FILL, SWT.FILL, true, false);
- java2wsdlGroup.setLayoutData(gridData);
-
- Java2WSWidgetFactory.createSOAPBindingLabel(java2wsdlGroup);
-
- soapBindingCombo = Java2WSWidgetFactory.createSOAPBingCombo(java2wsdlGroup, context);
- gridData = new GridData(GridData.FILL_HORIZONTAL);
- soapBindingCombo.setLayoutData(gridData);
-
- createXSDImportsButton = Java2WSWidgetFactory.createXSDImportsButton(java2wsdlGroup, context);
- gridData = new GridData(GridData.FILL_HORIZONTAL);
- gridData.horizontalSpan = 2;
- createXSDImportsButton.setLayoutData(gridData);
-
- Link link = new Link(this, SWT.NONE);
- link.setText(CXFUIMessages.ANNOTATIONS_PREFERENCES_LINK);
- link.addSelectionListener(new SelectionAdapter() {
- public void widgetSelected(SelectionEvent e) {
- tabFolder.setSelection(3);
- }
- });
- }
-
- public void setDefaults() {
- if (CXFModelUtils.getDefaultBooleanValue(CXFPackage.JAVA2_WS_CONTEXT,
- CXFPackage.JAVA2_WS_CONTEXT__SOAP12_BINDING)) {
- soapBindingCombo.setText("SOAP 1.2"); //$NON-NLS-1$
- } else {
- soapBindingCombo.setText("SOAP 1.1"); //$NON-NLS-1$
- }
-
- createXSDImportsButton.setSelection(CXFModelUtils.getDefaultBooleanValue(CXFPackage.JAVA2_WS_CONTEXT,
- CXFPackage.JAVA2_WS_CONTEXT__GENERATE_XSD_IMPORTS));
- }
-
- public void refresh() {
- if (context.isSoap12Binding()) {
- soapBindingCombo.setText("SOAP 1.2"); //$NON-NLS-1$
- } else {
- soapBindingCombo.setText("SOAP 1.1"); //$NON-NLS-1$
- }
- createXSDImportsButton.setSelection(context.isGenerateXSDImports());
- }
-
- public void storeValues() {
- if (soapBindingCombo.getText().equals("SOAP 1.2")) {
- context.setSoap12Binding(true);
- } else {
- context.setSoap12Binding(false);
- }
-
- context.setGenerateXSDImports(createXSDImportsButton.getSelection());
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.cxf.ui/src/org/eclipse/jst/ws/internal/cxf/ui/widgets/Java2WSRuntimePreferencesComposite.java b/bundles/org.eclipse.jst.ws.cxf.ui/src/org/eclipse/jst/ws/internal/cxf/ui/widgets/Java2WSRuntimePreferencesComposite.java
deleted file mode 100644
index 9d62ffe..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.ui/src/org/eclipse/jst/ws/internal/cxf/ui/widgets/Java2WSRuntimePreferencesComposite.java
+++ /dev/null
@@ -1,190 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IONA Technologies PLC
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IONA Technologies PLC - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.cxf.ui.widgets;
-
-import org.eclipse.jst.ws.internal.cxf.core.CXFCorePlugin;
-import org.eclipse.jst.ws.internal.cxf.core.context.Java2WSPersistentContext;
-import org.eclipse.jst.ws.internal.cxf.core.model.CXFPackage;
-import org.eclipse.jst.ws.internal.cxf.core.utils.CXFModelUtils;
-import org.eclipse.jst.ws.internal.cxf.ui.CXFUIMessages;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Group;
-import org.eclipse.swt.widgets.Link;
-import org.eclipse.swt.widgets.TabFolder;
-
-public class Java2WSRuntimePreferencesComposite extends Composite {
- private Java2WSPersistentContext context = CXFCorePlugin.getDefault().getJava2WSContext();
-
- private Combo soapBindingCombo;
- private Button createXSDImportsButton;
-
- private Button generateClientButton;
- private Button generateServerButton;
- private Button generateWrapperFaultBeanButton;
- private Button generateWSDLButton;
-
- private TabFolder tabFolder;
-
- public Java2WSRuntimePreferencesComposite(Composite parent, int style, TabFolder tabFolder) {
- super(parent, style);
- this.tabFolder = tabFolder;
- }
-
- public void addControls() {
- GridLayout preflayout = new GridLayout();
-
- preflayout.numColumns = 2;
- preflayout.marginHeight = 10;
- this.setLayout(preflayout);
- GridData gridData = new GridData(SWT.FILL, SWT.FILL, true, false);
- this.setLayoutData(gridData);
-
- // Java2WS Group
- Group java2wsGroup = new Group(this, SWT.SHADOW_IN);
- java2wsGroup.setText(CXFUIMessages.JAVA2WS_GROUP_LABEL);
- GridLayout java2wslayout = new GridLayout();
-
- java2wslayout.numColumns = 3;
-
- java2wslayout.marginHeight = 10;
- java2wsGroup.setLayout(java2wslayout);
- gridData = new GridData(GridData.FILL_HORIZONTAL);
- gridData.horizontalSpan = 2;
- java2wsGroup.setLayoutData(gridData);
-
- // Frontend
- Java2WSWidgetFactory.createFrontendLabel(java2wsGroup);
- Combo frontendCombo = Java2WSWidgetFactory.createFrontendCombo(java2wsGroup, context);
- gridData = new GridData(SWT.FILL, SWT.FILL, true, false);
- gridData.horizontalSpan = 2;
- frontendCombo.setLayoutData(gridData);
-
- // Databinding
- Java2WSWidgetFactory.createDatabindingLabel(java2wsGroup);
- Combo databindingCombo = Java2WSWidgetFactory.createDatabindingCombo(java2wsGroup, context);
- gridData = new GridData(SWT.FILL, SWT.FILL, true, false);
- gridData.horizontalSpan = 2;
- databindingCombo.setLayoutData(gridData);
-
- // Gen Client
- generateClientButton = Java2WSWidgetFactory.createGenerateClientButton(java2wsGroup, context);
-
- // Gen Server
- generateServerButton = Java2WSWidgetFactory.createGenerateServerButton(java2wsGroup, context);
-
- // Gen Wrapper and Fault Bean
- generateWrapperFaultBeanButton = Java2WSWidgetFactory.createGenerateWrapperFaultBeanButton(
- java2wsGroup, context);
-
- // Gen WSDL
- generateWSDLButton = Java2WSWidgetFactory.createGenerateWSDLButton(java2wsGroup, context);
- generateWSDLButton.addSelectionListener(new SelectionAdapter() {
- public void widgetSelected(SelectionEvent e) {
- enableWSDLGroup(generateWSDLButton.getSelection());
- }
- });
-
- gridData = new GridData(GridData.FILL_HORIZONTAL);
- gridData.horizontalSpan = 3;
- generateWSDLButton.setLayoutData(gridData);
-
- Group wsdlGroup = new Group(java2wsGroup, SWT.SHADOW_ETCHED_IN);
- GridLayout wsdlGroupLayout = new GridLayout(2, false);
- wsdlGroup.setLayout(wsdlGroupLayout);
- gridData = new GridData(GridData.FILL_HORIZONTAL);
- gridData.horizontalSpan = 3;
- wsdlGroup.setLayoutData(gridData);
-
- Java2WSWidgetFactory.createSOAPBindingLabel(wsdlGroup);
-
- soapBindingCombo = Java2WSWidgetFactory.createSOAPBingCombo(wsdlGroup, context);
- gridData = new GridData(GridData.FILL_HORIZONTAL);
- soapBindingCombo.setLayoutData(gridData);
-
- createXSDImportsButton = Java2WSWidgetFactory.createXSDImportsButton(wsdlGroup, context);
- gridData = new GridData(GridData.FILL_HORIZONTAL);
- gridData.horizontalSpan = 2;
- createXSDImportsButton.setLayoutData(gridData);
-
- Link link = new Link(this, SWT.NONE);
- link.setText(CXFUIMessages.ANNOTATIONS_PREFERENCES_LINK);
- link.addSelectionListener(new SelectionAdapter() {
- public void widgetSelected(SelectionEvent e) {
- tabFolder.setSelection(3);
- }
- });
- enableWSDLGroup(context.isGenerateWSDL());
- }
-
- protected void enableWSDLGroup(boolean enable) {
- soapBindingCombo.setEnabled(enable);
- createXSDImportsButton.setEnabled(enable);
- }
-
- public void setDefaults() {
- if (CXFModelUtils.getDefaultBooleanValue(CXFPackage.JAVA2_WS_CONTEXT,
- CXFPackage.JAVA2_WS_CONTEXT__SOAP12_BINDING)) {
- soapBindingCombo.setText("SOAP 1.2"); //$NON-NLS-1$
- } else {
- soapBindingCombo.setText("SOAP 1.1"); //$NON-NLS-1$
- }
-
- createXSDImportsButton.setSelection(CXFModelUtils.getDefaultBooleanValue(CXFPackage.JAVA2_WS_CONTEXT,
- CXFPackage.JAVA2_WS_CONTEXT__GENERATE_XSD_IMPORTS));
-
- generateClientButton.setSelection(CXFModelUtils.getDefaultBooleanValue(CXFPackage.CXF_CONTEXT,
- CXFPackage.CXF_CONTEXT__GENERATE_CLIENT));
-
- generateServerButton.setSelection(CXFModelUtils.getDefaultBooleanValue(CXFPackage.CXF_CONTEXT,
- CXFPackage.CXF_CONTEXT__GENERATE_SERVER));
-
- generateWrapperFaultBeanButton.setSelection(CXFModelUtils.getDefaultBooleanValue(
- CXFPackage.JAVA2_WS_CONTEXT, CXFPackage.JAVA2_WS_CONTEXT__GENERATE_WRAPPER_FAULT_BEANS));
-
- generateWSDLButton.setSelection(CXFModelUtils.getDefaultBooleanValue(CXFPackage.JAVA2_WS_CONTEXT,
- CXFPackage.JAVA2_WS_CONTEXT__GENERATE_WSDL));
- }
-
- public void refresh() {
- if (context.isSoap12Binding()) {
- soapBindingCombo.setText("SOAP 1.2"); //$NON-NLS-1$
- } else {
- soapBindingCombo.setText("SOAP 1.1"); //$NON-NLS-1$
- }
-
- createXSDImportsButton.setSelection(context.isGenerateXSDImports());
- generateClientButton.setSelection(context.isGenerateClient());
- generateServerButton.setSelection(context.isGenerateServer());
- generateWrapperFaultBeanButton.setSelection(context.isGenerateWrapperFaultBeans());
- generateWSDLButton.setSelection(context.isGenerateWSDL());
- }
-
- public void storeValues() {
- if (soapBindingCombo.getText().equals("SOAP 1.2")) {
- context.setSoap12Binding(true);
- } else {
- context.setSoap12Binding(false);
- }
-
- context.setGenerateXSDImports(createXSDImportsButton.getSelection());
- context.setGenerateClient(generateClientButton.getSelection());
- context.setGenerateServer(generateServerButton.getSelection());
- context.setGenerateWrapperFaultBeans(generateWrapperFaultBeanButton.getSelection());
- context.setGenerateWSDL(generateWSDLButton.getSelection());
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.cxf.ui/src/org/eclipse/jst/ws/internal/cxf/ui/widgets/Java2WSWidgetFactory.java b/bundles/org.eclipse.jst.ws.cxf.ui/src/org/eclipse/jst/ws/internal/cxf/ui/widgets/Java2WSWidgetFactory.java
deleted file mode 100644
index b285248..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.ui/src/org/eclipse/jst/ws/internal/cxf/ui/widgets/Java2WSWidgetFactory.java
+++ /dev/null
@@ -1,414 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IONA Technologies PLC
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IONA Technologies PLC - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.cxf.ui.widgets;
-
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.ITypeHierarchy;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jdt.ui.JavaElementLabelProvider;
-import org.eclipse.jdt.ui.StandardJavaElementContentProvider;
-import org.eclipse.jface.viewers.ArrayContentProvider;
-import org.eclipse.jface.viewers.CheckboxTableViewer;
-import org.eclipse.jst.ws.internal.cxf.core.model.DataBinding;
-import org.eclipse.jst.ws.internal.cxf.core.model.Frontend;
-import org.eclipse.jst.ws.internal.cxf.core.model.Java2WSContext;
-import org.eclipse.jst.ws.internal.cxf.core.model.Java2WSDataModel;
-import org.eclipse.jst.ws.internal.cxf.ui.CXFUIMessages;
-import org.eclipse.jst.ws.internal.cxf.ui.CXFUIPlugin;
-import org.eclipse.jst.ws.internal.cxf.ui.viewers.JavaViewerFilter;
-import org.eclipse.jst.ws.jaxws.core.utils.JDTUtils;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.dialogs.ElementTreeSelectionDialog;
-import org.eclipse.ui.dialogs.ISelectionStatusValidator;
-
-/**
- * Provides widgets for Java2WS preferences, wizards, dialogs. Enables the reuse
- * of widgets in multiple locations. Widgets have there labeling and tooltips
- * set here and where possible listeners are set which update instances of
- * <code>Java2WSContext</code> and <code>Java2WSDataModel</code>.
- *
- */
-public final class Java2WSWidgetFactory {
-
- private Java2WSWidgetFactory() {
- }
-
- public static Label createSOAPBindingLabel(Composite parent) {
- Label defaultSoapBinding = new Label(parent, SWT.NONE);
- defaultSoapBinding.setText(CXFUIMessages.JAVA2WS_DEFAULT_SOAPBINDING_LABEL);
- return defaultSoapBinding;
- }
-
- public static Combo createSOAPBingCombo(Composite parent, final Java2WSContext context) {
- Combo soapBindingCombo = new Combo(parent, SWT.READ_ONLY);
- soapBindingCombo.setToolTipText(CXFUIMessages.JAVA2WS_SOAP12_BINDING_TOOLTIP);
- soapBindingCombo.add("SOAP 1.1"); //$NON-NLS-1$
- soapBindingCombo.add("SOAP 1.2"); //$NON-NLS-1$
- soapBindingCombo.addSelectionListener(new SelectionAdapter() {
- 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.BORDER);
- seiCombo.setToolTipText(CXFUIMessages.JAVA2WS_SELECT_SEI_TOOLTIP);
-
- IJavaProject javaProject = JDTUtils.getJavaProject(model.getProjectName());
- try {
- ITypeHierarchy typeHierarchy = javaStartingPointType.newTypeHierarchy(javaProject, null);
- IType[] allInterfaces = typeHierarchy.getAllInterfaces();
- for (int i = 0; i < allInterfaces.length; i++) {
- IType itype = allInterfaces[i];
- if (!itype.isBinary() && itype.getResource().getProject().equals(javaProject.getProject())) {
- seiCombo.add(itype.getFullyQualifiedName());
- }
- }
- } catch (JavaModelException jme) {
- CXFUIPlugin.log(jme.getStatus());
- }
-
- seiCombo.addSelectionListener(new SelectionAdapter() {
- @Override
- public void widgetSelected(SelectionEvent event) {
- String seiInterfaceName = seiCombo.getText();
- model.setFullyQualifiedJavaInterfaceName(seiInterfaceName);
- }
- });
-
- seiCombo.deselectAll();
- return seiCombo;
- }
-
- public static Button createBrowseButton(Composite parent) {
- Button browseButton = new Button(parent, SWT.PUSH);
- browseButton.setText(CXFUIMessages.JAVA2WS_BROWSE_LABEL);
- return browseButton;
- }
-
- public static Button createExtractSEIButton(Composite parent) {
- Button extractSEIButton = new Button(parent, SWT.RADIO);
- extractSEIButton.setText(CXFUIMessages.JAVA2WS_EXTRACT_SEI_LABEL);
- return extractSEIButton;
- }
-
- public static Label createExtractSEILabel(Composite parent) {
- Label extractSEILabel = new Label(parent, SWT.NONE);
- extractSEILabel.setText(CXFUIMessages.JAVA2WS_EXTRACT_SEI_LABEL);
- return extractSEILabel;
- }
-
- public static Text createSEIInterfaceNameText(Composite parent) {
- Text seiInterfaceNameText = new Text(parent, SWT.BORDER);
- seiInterfaceNameText.setToolTipText(CXFUIMessages.JAVA2WS_EXTRACT_SEI_TOOLTIP);
- return seiInterfaceNameText;
- }
-
- public static Label createMemebersToExtractLabel(Composite parent) {
- Label seiMembersToExtractLabel = new Label(parent, SWT.NONE);
- seiMembersToExtractLabel.setText(CXFUIMessages.JAVA2WS_EXTRACT_MEMBERS_LABEL);
- return seiMembersToExtractLabel;
- }
-
- public static CheckboxTableViewer createSEIMembersToExtractTableViewer(Composite parent) {
- CheckboxTableViewer seiMembersToExtractTableViewer = CheckboxTableViewer.newCheckList(parent,
- SWT.BORDER | SWT.V_SCROLL | SWT.H_SCROLL);
- seiMembersToExtractTableViewer.setLabelProvider(new JavaElementLabelProvider());
- seiMembersToExtractTableViewer.setContentProvider(new ArrayContentProvider());
- return seiMembersToExtractTableViewer;
- }
-
- public static Button createSelectAllButton(Composite parent) {
- Button selectAllButton = new Button(parent, SWT.PUSH);
- selectAllButton.setText(CXFUIMessages.JAVA2WS_SELECT_ALL_BUTTON);
- return selectAllButton;
- }
-
- public static Button createDeselectAllButton(Composite parent) {
- Button deselectAllButton = new Button(parent, SWT.PUSH);
- deselectAllButton.setText(CXFUIMessages.JAVA2WS_DESELECT_ALL_BUTTON);
- return deselectAllButton;
- }
-
- public static Label createSelectImplementationLabel(Composite parent) {
- Label selectImplementationLabel = new Label(parent, SWT.NONE);
- selectImplementationLabel.setText(CXFUIMessages.JAVA2WS_SELECT_IMPLEMENTATION);
- return selectImplementationLabel;
- }
-
- public static Combo createSelectImplementationCombo(Composite parent,
- final Java2WSDataModel model, IType javaStartingPointType) {
- final Combo selectImplementationCombo = new Combo(parent, SWT.BORDER);
- selectImplementationCombo.setToolTipText(CXFUIMessages.JAVA2WS_SELECT_IMPLEMENTATION_TOOLTIP);
-
- IJavaProject javaProject = JDTUtils.getJavaProject(model.getProjectName());
- try {
- ITypeHierarchy typeHierarchy = javaStartingPointType.newTypeHierarchy(javaProject, null);
- IType[] allImplementations = typeHierarchy.getAllSubtypes(javaStartingPointType);
- for (int i = 0; i < allImplementations.length; i++) {
- IType itype = allImplementations[i];
- if (!itype.isBinary() && itype.getResource().getProject().equals(javaProject.getProject())) {
- String packageName = itype.getPackageFragment().getElementName();
- if (packageName.trim().length() > 0) {
- packageName += "."; //$NON-NLS-1$
- }
- String qualifiedName = packageName + itype.getPrimaryElement().getElementName();
- selectImplementationCombo.add(qualifiedName);
- }
- }
- } catch (JavaModelException jme) {
- CXFUIPlugin.log(jme.getStatus());
- }
-
- selectImplementationCombo.addSelectionListener(new SelectionAdapter() {
- @Override
- public void widgetSelected(SelectionEvent event) {
- String implementationName = selectImplementationCombo.getText();
- model.setFullyQualifiedJavaClassName(implementationName);
- }
- });
-
- selectImplementationCombo.deselectAll();
- return selectImplementationCombo;
- }
-
- /**
- * Creates am <code>ElementTreeSelectionDialog</code> that displays all the classes or all the interfaces
- * within a <code>IJavaProject</code> allowing one class or interface to be selected.
- *
- * @param parent the parent shell
- * @param title the dialog title
- * @param message the dialog message
- * @param javaProject the java project that is filtered
- * @param elementKinds a flag defining nature of searched elements; the only valid values are:
- * <code>IJavaSearchConstants.CLASS</code>
- * <code>IJavaSearchConstants.INTERFACE</code>
- * <code>IJavaSearchConstants.CLASS_AND_INTERFACE</code>
- *
- * @return the element tree selection dialog
- */
- public static ElementTreeSelectionDialog createElementTreeSelectionDialog(Shell parent, String title,
- String message, IJavaProject javaProject, int elementKinds) {
- ElementTreeSelectionDialog selectionDialog = new ElementTreeSelectionDialog(parent,
- new JavaElementLabelProvider(), new StandardJavaElementContentProvider());
- selectionDialog.setTitle(title);
- selectionDialog.setMessage(message);
- selectionDialog.setAllowMultiple(false);
- selectionDialog.setInput(JavaCore.create(ResourcesPlugin.getWorkspace().getRoot()));
-
- selectionDialog.addFilter(new JavaViewerFilter(javaProject, elementKinds));
-
- selectionDialog.setValidator(new ISelectionStatusValidator() {
-
- public IStatus validate(Object[] selection) {
- if (selection.length == 1) {
- if (selection[0] instanceof ICompilationUnit) {
- return new Status(IStatus.OK, CXFUIPlugin.PLUGIN_ID, ""); //$NON-NLS-1$
- }
- }
- return new Status(IStatus.ERROR, CXFUIPlugin.PLUGIN_ID, ""); //$NON-NLS-1$
- }
- });
-
- return selectionDialog;
-
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.cxf.ui/src/org/eclipse/jst/ws/internal/cxf/ui/widgets/SpringConfigComposite.java b/bundles/org.eclipse.jst.ws.cxf.ui/src/org/eclipse/jst/ws/internal/cxf/ui/widgets/SpringConfigComposite.java
deleted file mode 100644
index d04358c..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.ui/src/org/eclipse/jst/ws/internal/cxf/ui/widgets/SpringConfigComposite.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IONA Technologies PLC
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IONA Technologies PLC - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.cxf.ui.widgets;
-
-import org.eclipse.jst.ws.internal.cxf.core.CXFCorePlugin;
-import org.eclipse.jst.ws.internal.cxf.core.model.CXFContext;
-import org.eclipse.jst.ws.internal.cxf.core.model.CXFPackage;
-import org.eclipse.jst.ws.internal.cxf.core.utils.CXFModelUtils;
-import org.eclipse.jst.ws.internal.cxf.ui.CXFUIMessages;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Group;
-
-public class SpringConfigComposite extends Composite {
- private CXFContext context = CXFCorePlugin.getDefault().getJava2WSContext();
-
- private Button useCXFServletButton;
- private Button useSpringAppContextButton;
-
- public SpringConfigComposite(Composite parent, int style) {
- super(parent, style);
- addControls();
- }
-
- private void addControls() {
- GridLayout preflayout = new GridLayout(1, true);
- this.setLayout(preflayout);
-
- GridData gridData = new GridData(SWT.FILL, SWT.FILL, true, false);
- this.setLayoutData(gridData);
-
- Group springConfigGroup = new Group(this, SWT.SHADOW_IN);
- springConfigGroup.setText(CXFUIMessages.SPRING_CONFIG_GROUP_LABEL);
- GridLayout springConfigLayout = new GridLayout(2, true);
- springConfigGroup.setLayout(springConfigLayout);
- gridData = new GridData(SWT.FILL, SWT.FILL, true, false);
- gridData.horizontalSpan = 2;
- springConfigGroup.setLayoutData(gridData);
-
- useCXFServletButton = new Button(springConfigGroup, SWT.RADIO);
- useCXFServletButton.setText(CXFUIMessages.SPRING_CONFIG_USE_CXF_SERVLET);
- useCXFServletButton.addSelectionListener(new SelectionAdapter() {
- public void widgetSelected(SelectionEvent e) {
- boolean selected = ((Button) e.widget).getSelection();
- context.setUseSpringApplicationContext(!selected);
- }
- });
-
- useSpringAppContextButton = new Button(springConfigGroup, SWT.RADIO);
- useSpringAppContextButton
- .setText(CXFUIMessages.SPRING_CONFIG_USE_CXF_SPRING_APPLICATION_CONTEXT);
- useSpringAppContextButton.addSelectionListener(new SelectionAdapter() {
- public void widgetSelected(SelectionEvent e) {
- boolean selected = ((Button) e.widget).getSelection();
- context.setUseSpringApplicationContext(selected);
- }
- });
-
- if (context.isUseSpringApplicationContext()) {
- useSpringAppContextButton.setSelection(true);
- } else {
- useCXFServletButton.setSelection(true);
- }
- }
-
- public void setDefaults() {
- boolean useSpringAppcontext = CXFModelUtils.getDefaultBooleanValue(CXFPackage.CXF_CONTEXT,
- CXFPackage.CXF_CONTEXT__USE_SPRING_APPLICATION_CONTEXT);
- useSpringAppContextButton.setSelection(useSpringAppcontext);
- useCXFServletButton.setSelection(!useSpringAppcontext);
- }
-
- public void storeValues() {
- context.setUseSpringApplicationContext(useSpringAppContextButton.getSelection());
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.cxf.ui/src/org/eclipse/jst/ws/internal/cxf/ui/widgets/WSDL2JavaWidgetFactory.java b/bundles/org.eclipse.jst.ws.cxf.ui/src/org/eclipse/jst/ws/internal/cxf/ui/widgets/WSDL2JavaWidgetFactory.java
deleted file mode 100644
index fab1807..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.ui/src/org/eclipse/jst/ws/internal/cxf/ui/widgets/WSDL2JavaWidgetFactory.java
+++ /dev/null
@@ -1,614 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IONA Technologies PLC
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IONA Technologies PLC - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.cxf.ui.widgets;
-
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Set;
-
-import javax.wsdl.Definition;
-import javax.wsdl.Service;
-import javax.xml.namespace.QName;
-
-import org.eclipse.jdt.core.IPackageFragmentRoot;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jface.viewers.ColumnLabelProvider;
-import org.eclipse.jface.viewers.ColumnWeightData;
-import org.eclipse.jface.viewers.TableLayout;
-import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.jface.viewers.TableViewerColumn;
-import org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaContext;
-import org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaDataModel;
-import org.eclipse.jst.ws.internal.cxf.ui.CXFUIMessages;
-import org.eclipse.jst.ws.internal.cxf.ui.CXFUIPlugin;
-import org.eclipse.jst.ws.internal.cxf.ui.dialogs.ResourceSelectionDialog;
-import org.eclipse.jst.ws.internal.cxf.ui.viewers.PackageNameColumnLabelProvider;
-import org.eclipse.jst.ws.jaxws.core.utils.JDTUtils;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.events.PaintEvent;
-import org.eclipse.swt.events.PaintListener;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.List;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.swt.widgets.TableColumn;
-import org.eclipse.swt.widgets.TableItem;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.dialogs.SelectionDialog;
-
-/**
- * Provides widgets for WSDL2Java preferences, wizards, dialogs. Enables the
- * reuse of widgets in multiple locations. Widgets have there labeling and
- * tooltips set here and where possible listeners are set which update instances
- * of <code>WSDL2JavaContext</code> and <code>WSDL2JavaDataModel</code>.
- *
- */
-public final class WSDL2JavaWidgetFactory {
- private static final String XJC_DV_ARG = "-Xdv"; //$NON-NLS-1$
- private static final String XJC_TS_ARG = "-Xts"; //$NON-NLS-1$
- private static final String XJC_TS_MULTI_ARG = "-Xts:style:multiline"; //$NON-NLS-1$
- private static final String XJC_TS_SIMPLE = "-Xts:style:simple"; //$NON-NLS-1$
- private static final String XJC_LOCATOR_ARG = "-Xlocator"; //$NON-NLS-1$
- private static final String XJC_SYNC_METHODS_ARG = "-Xsync-methods"; //$NON-NLS-1$
- private static final String XJC_MARK_GENERATED_ARG = "-mark-generated"; //$NON-NLS-1$
- private static final String XJC_EPISODE_FILE_ARG = "-episode"; //$NON-NLS-1$
-
- private WSDL2JavaWidgetFactory() {
- }
-
- public static Button createGenerateClientButton(Composite parent, final WSDL2JavaContext model) {
- final Button genClientButton = new Button(parent, SWT.CHECK);
- genClientButton.setText(CXFUIMessages.JAVA2WS_GEN_CLIENT_LABEL);
- genClientButton.setToolTipText(CXFUIMessages.WSDL2JAVA_GENERATE_CLIENT_TOOLTIP);
- genClientButton.addSelectionListener(new SelectionAdapter() {
- 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.deselectAll();
- }
- }
- }
-
- public static Label createBindingFilesLabel(Composite parent) {
- Label bindingFilesLabel = new Label(parent, SWT.NONE);
- bindingFilesLabel.setText(CXFUIMessages.WSDL2JAVA_BINDING_FILES);
- bindingFilesLabel.setToolTipText(CXFUIMessages.WSDL2JAVA_BINDING_NAME_TOOLTIP);
- return bindingFilesLabel;
- }
-
- public static List createBindingFilesList(Composite parent) {
- final List bindingFilesList = new List(parent, SWT.MULTI | SWT.BORDER | SWT.H_SCROLL | SWT.V_SCROLL);
- bindingFilesList.setToolTipText(CXFUIMessages.WSDL2JAVA_BINDING_NAME_TOOLTIP);
- return bindingFilesList;
- }
-
- public static Button createAddBindingFileButton(final Composite parent, final WSDL2JavaDataModel model,
- final List bindingFilesList) {
- Button addBindingFileButton = new Button(parent, SWT.PUSH);
- addBindingFileButton.setText(CXFUIMessages.WSDL2JAVA_BINDING_FILES_ADD);
- addBindingFileButton.addSelectionListener(new SelectionAdapter() {
-
- @Override
- public void widgetSelected(SelectionEvent event) {
- ResourceSelectionDialog selectionDialog = new ResourceSelectionDialog(
- parent.getShell(),
- "xml", //$NON-NLS-1$
- CXFUIMessages.WSDL2JAVA_BINDING_FILE_DIALOG_FILTER_NAME,
- CXFUIMessages.WSDL2JAVA_BINDING_FILE_DIALOG_TITLE);
- selectionDialog.setMessage(CXFUIMessages.WSDL2JAVA_BINDING_FILE_DIALOG_MESSAGE);
- if (selectionDialog.open() == SelectionDialog.OK) {
- String result = selectionDialog.getResult()[0].toString();
- if (!model.getBindingFiles().contains(result)) {
- model.getBindingFiles().add(result);
- bindingFilesList.add(result);
- }
- }
- }
- });
- return addBindingFileButton;
- }
-
- public static Button createRemoveBindingFileButton(Composite parent, final WSDL2JavaDataModel model,
- final List bindingFilesList) {
- final Button removeBindingFileButton = new Button(parent, SWT.PUSH);
- removeBindingFileButton.setText(CXFUIMessages.WSDL2JAVA_BINDING_FILES_REMOVE);
- removeBindingFileButton.setEnabled(false);
- removeBindingFileButton.addSelectionListener(new SelectionAdapter() {
-
- @Override
- public void widgetSelected(SelectionEvent event) {
- String[] selectedBindingFiles = bindingFilesList.getSelection();
- for (String bindingFile : selectedBindingFiles) {
- bindingFilesList.remove(bindingFile);
- model.getBindingFiles().remove(bindingFile);
- }
-
- if (bindingFilesList.getItemCount() == 0) {
- removeBindingFileButton.setEnabled(false);
- }
- }
- });
-
- bindingFilesList.addPaintListener(new PaintListener() {
- public void paintControl(PaintEvent event) {
- if (bindingFilesList.getItemCount() == 0) {
- removeBindingFileButton.setEnabled(false);
- } else {
- removeBindingFileButton.setEnabled(true);
- }
- }
- });
-
- return removeBindingFileButton;
- }
-
- public static Label createPaddingLabel(Composite parent) {
- return new Label(parent, SWT.NONE);
- }
-
- public static Label createXMLCatalogLabel(Composite parent) {
- Label xmlCatalogLabel = new Label(parent, SWT.NONE);
- xmlCatalogLabel.setText(CXFUIMessages.WSDL2JAVA_XML_CATLOG);
- xmlCatalogLabel.setToolTipText(CXFUIMessages.WSDL2JAVA_XML_CATALOG_TOOLTIP);
- return xmlCatalogLabel;
- }
-
- public static Text createXMLCatalogText(Composite parent, final WSDL2JavaDataModel model) {
- final Text xmlCatalogText = new Text(parent, SWT.BORDER);
- xmlCatalogText.setToolTipText(CXFUIMessages.WSDL2JAVA_XML_CATALOG_TOOLTIP);
- xmlCatalogText.addModifyListener(new ModifyListener() {
- public void modifyText(ModifyEvent e) {
- String xmlCatalog = xmlCatalogText.getText();
- model.setCatalogFile(xmlCatalog);
- }
- });
-
- return xmlCatalogText;
- }
-
- public static Button createXMLCatalogBrowseButton(Composite parent) {
- Button xmlCatalogBrowseButton = new Button(parent, SWT.PUSH);
- xmlCatalogBrowseButton.setText(CXFUIMessages.WSDL2JAVA_XML_CATLOG_BROWSE);
- return xmlCatalogBrowseButton;
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxb.core/.classpath b/bundles/org.eclipse.jst.ws.jaxb.core/.classpath
deleted file mode 100644
index f930cb7..0000000
--- a/bundles/org.eclipse.jst.ws.jaxb.core/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/bundles/org.eclipse.jst.ws.jaxb.core/.project b/bundles/org.eclipse.jst.ws.jaxb.core/.project
deleted file mode 100644
index 275d338..0000000
--- a/bundles/org.eclipse.jst.ws.jaxb.core/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.jst.ws.jaxb.core</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
diff --git a/bundles/org.eclipse.jst.ws.jaxb.core/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.jst.ws.jaxb.core/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 83e002a..0000000
--- a/bundles/org.eclipse.jst.ws.jaxb.core/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,7 +0,0 @@
-#Mon Feb 02 11:50:42 GMT 2009
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.5
diff --git a/bundles/org.eclipse.jst.ws.jaxb.core/META-INF/MANIFEST.MF b/bundles/org.eclipse.jst.ws.jaxb.core/META-INF/MANIFEST.MF
deleted file mode 100644
index db48f2f..0000000
--- a/bundles/org.eclipse.jst.ws.jaxb.core/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,33 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.jst.ws.jaxb.core;singleton:=true
-Bundle-Vendor: %pluginProvider
-Bundle-Version: 0.1.0.qualifier
-Bundle-ClassPath: .
-Bundle-Localization: plugin
-Eclipse-RegisterBuddy: org.eclipse.jst.ws.annotations.core
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Bundle-Activator: org.eclipse.jst.ws.internal.jaxb.core.JAXBCorePlugin
-Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.jdt.core;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.core.resources;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.jdt.apt.core;bundle-version="[3.3.100,4.0.0)",
- org.eclipse.core.filesystem;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.core.filebuffers;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.jdt.ui;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.jface.text;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.ltk.core.refactoring;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.ui;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.jst.ws.annotations.core;bundle-version="0.5.0",
- org.eclipse.jst.ws;bundle-version="[1.0.304,1.1.0)"
-Export-Package: org.eclipse.jst.ws.internal.jaxb.core
-Import-Package: javax.activation,
- javax.xml.bind;version="[2.1.0,2.2.0)",
- javax.xml.bind.annotation;version="[2.1.0,2.2.0)",
- javax.xml.bind.annotation.adapters;version="[2.1.0,2.2.0)",
- javax.xml.bind.attachment;version="[2.1.0,2.2.0)",
- javax.xml.bind.helpers;version="[2.1.0,2.2.0)",
- javax.xml.bind.util;version="[2.1.0,2.2.0)",
- org.apache.xerces.util
-Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.jst.ws.jaxb.core/about.html b/bundles/org.eclipse.jst.ws.jaxb.core/about.html
deleted file mode 100644
index 5b6a031..0000000
--- a/bundles/org.eclipse.jst.ws.jaxb.core/about.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
-<title>About</title>
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
-
-<p>February 19, 2009</p>
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, "Program" will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is
-being redistributed by another party ("Redistributor") and different terms and conditions may
-apply to your use of any object code in the Content. Check the Redistributor's license that was
-provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
-
-</body>
-</html>
diff --git a/bundles/org.eclipse.jst.ws.jaxb.core/about.ini b/bundles/org.eclipse.jst.ws.jaxb.core/about.ini
deleted file mode 100644
index e3b93e6..0000000
--- a/bundles/org.eclipse.jst.ws.jaxb.core/about.ini
+++ /dev/null
@@ -1,12 +0,0 @@
-# about.ini
-# contains information about a feature
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# "%key" are externalized strings defined in about.properties
-# This file does not need to be translated.
-
-# Property "aboutText" contains blurb for feature details in the "About"
-# dialog (translated). Maximum 15 lines and 75 characters per line.
-aboutText=%blurb
-
-# Property "featureImage" contains path to feature image (32x32)
-featureImage=icons/WTP_icon_x32_v2.png
diff --git a/bundles/org.eclipse.jst.ws.jaxb.core/about.mappings b/bundles/org.eclipse.jst.ws.jaxb.core/about.mappings
deleted file mode 100644
index a28390a..0000000
--- a/bundles/org.eclipse.jst.ws.jaxb.core/about.mappings
+++ /dev/null
@@ -1,6 +0,0 @@
-# about.mappings
-# contains fill-ins for about.properties
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# This file does not need to be translated.
-
-0=@build@
diff --git a/bundles/org.eclipse.jst.ws.jaxb.core/about.properties b/bundles/org.eclipse.jst.ws.jaxb.core/about.properties
deleted file mode 100644
index cf8469f..0000000
--- a/bundles/org.eclipse.jst.ws.jaxb.core/about.properties
+++ /dev/null
@@ -1,26 +0,0 @@
-###############################################################################
-# Copyright (c) 2009 Shane Clarke and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# Shane Clarke - initial API and implementation
-###############################################################################
-# about.properties
-# contains externalized strings for about.ini
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# fill-ins are supplied by about.mappings
-# This file should be translated.
-#
-# Do not translate any values surrounded by {}
-
-blurb=JAXB Tools (Incubation)\n\
-\n\
-Version: {featureVersion}\n\
-Build id: {0}\n\
-\n\
-(c) Copyright Shane Clarke and others 2009. All rights reserved.\n\
-Visit http://www.eclipse.org/webtools/incubator/\n\
-\n
diff --git a/bundles/org.eclipse.jst.ws.jaxb.core/build.properties b/bundles/org.eclipse.jst.ws.jaxb.core/build.properties
deleted file mode 100644
index 8b9d613..0000000
--- a/bundles/org.eclipse.jst.ws.jaxb.core/build.properties
+++ /dev/null
@@ -1,11 +0,0 @@
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
- .,\
- plugin.xml,\
- plugin.properties,\
- about.html,\
- about.properties,\
- about.ini,\
- about.mappings,\
- icons/
diff --git a/bundles/org.eclipse.jst.ws.jaxb.core/icons/WTP_icon_x32_v2.png b/bundles/org.eclipse.jst.ws.jaxb.core/icons/WTP_icon_x32_v2.png
deleted file mode 100644
index 6f09c2a..0000000
--- a/bundles/org.eclipse.jst.ws.jaxb.core/icons/WTP_icon_x32_v2.png
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.jst.ws.jaxb.core/plugin.properties b/bundles/org.eclipse.jst.ws.jaxb.core/plugin.properties
deleted file mode 100644
index f759216..0000000
--- a/bundles/org.eclipse.jst.ws.jaxb.core/plugin.properties
+++ /dev/null
@@ -1,15 +0,0 @@
-###############################################################################
-# Copyright (c) 2009 Progress Software
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-###############################################################################
-
-#properties file for JAXB Core
-pluginName=JAXB Tools Core (Incubation)
-pluginProvider=Eclipse Web Tools Platform
-
-JAXB_CATEGORY_NAME=JAXB
-
-XML_SCHEMA_TYPE_RULES=Validation rules governing the use of @XmlSchemaType
\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.jaxb.core/plugin.xml b/bundles/org.eclipse.jst.ws.jaxb.core/plugin.xml
deleted file mode 100644
index de73a78..0000000
--- a/bundles/org.eclipse.jst.ws.jaxb.core/plugin.xml
+++ /dev/null
@@ -1,183 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.2"?>
-<plugin>
- <extension point="org.eclipse.jst.ws.annotations.core.annotationCategory">
- <category
- id="jaxb.category"
- name="%JAXB_CATEGORY_NAME">
- </category>
- </extension>
-
- <extension point="org.eclipse.jst.ws.annotations.core.annotationDefinition">
- <annotation
- category="jaxb.category"
- class="javax.xml.bind.annotation.XmlAccessorOrder"
- name="XmlAccessorOrder"/>
- <annotation
- category="jaxb.category"
- class="javax.xml.bind.annotation.XmlAccessorType"
- name="XmlAccessorType"/>
-
- <!-- TODO Reinstate when XmlAdapter issue is solved
- <annotation
- category="jaxb.category"
- class="javax.xml.bind.annotation.adapters.XmlAdapter"
- name="XmlAdapter">
- </annotation>
- -->
-
- <annotation
- category="jaxb.category"
- class="javax.xml.bind.annotation.XmlAnyAttribute"
- name="XmlAnyAttribute">
- </annotation>
- <annotation
- category="jaxb.category"
- class="javax.xml.bind.annotation.XmlAnyElement"
- name="XmlAnyElement">
- </annotation>
- <annotation
- category="jaxb.category"
- class="javax.xml.bind.annotation.XmlAttachmentRef"
- name="XmlAttachmentRef">
- </annotation>
- <annotation
- category="jaxb.category"
- class="javax.xml.bind.annotation.XmlAttribute"
- name="XmlAttribute">
- </annotation>
- <annotation
- category="jaxb.category"
- class="javax.xml.bind.annotation.XmlElement"
- name="XmlElement">
- </annotation>
- <annotation
- category="jaxb.category"
- class="javax.xml.bind.annotation.XmlElementDecl"
- name="XmlElementDecl">
- </annotation>
- <annotation
- category="jaxb.category"
- class="javax.xml.bind.annotation.XmlElementRef"
- name="XmlElementRef">
- </annotation>
- <annotation
- category="jaxb.category"
- class="javax.xml.bind.annotation.XmlElementRefs"
- name="XmlElementRefs">
- </annotation>
- <annotation
- category="jaxb.category"
- class="javax.xml.bind.annotation.XmlElementWrapper"
- name="XmlElementWrapper">
- </annotation>
- <annotation
- category="jaxb.category"
- class="javax.xml.bind.annotation.XmlElements"
- name="XmlElements">
- </annotation>
- <annotation
- category="jaxb.category"
- class="javax.xml.bind.annotation.XmlEnum"
- name="XmlEnum">
- </annotation>
- <annotation
- category="jaxb.category"
- class="javax.xml.bind.annotation.XmlEnumValue"
- name="XmlEnumValue">
- </annotation>
- <annotation
- category="jaxb.category"
- class="javax.xml.bind.annotation.XmlID"
- name="XmlID">
- </annotation>
- <annotation
- category="jaxb.category"
- class="javax.xml.bind.annotation.XmlIDREF"
- name="XmlIDREF">
- </annotation>
- <annotation
- category="jaxb.category"
- class="javax.xml.bind.annotation.XmlInlineBinaryData"
- name="XmlInlineBinaryData">
- </annotation>
- <annotation
- category="jaxb.category"
- class="javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter"
- name="XmlJavaTypeAdapter">
- </annotation>
- <annotation
- category="jaxb.category"
- class="javax.xml.bind.annotation.adapters.XmlJavaTypeAdapters"
- name="XmlJavaTypeAdapters">
- </annotation>
- <annotation
- category="jaxb.category"
- class="javax.xml.bind.annotation.XmlList"
- name="XmlList">
- </annotation>
- <annotation
- category="jaxb.category"
- class="javax.xml.bind.annotation.XmlMimeType"
- name="XmlMimeType">
- </annotation>
- <annotation
- category="jaxb.category"
- class="javax.xml.bind.annotation.XmlMixed"
- name="XmlMixed">
- </annotation>
- <annotation
- category="jaxb.category"
- class="javax.xml.bind.annotation.XmlNs"
- name="XmlNs">
- </annotation>
- <annotation
- category="jaxb.category"
- class="javax.xml.bind.annotation.XmlRegistry"
- name="XmlRegistry">
- </annotation>
- <annotation
- category="jaxb.category"
- class="javax.xml.bind.annotation.XmlRootElement"
- name="XmlRootElement">
- </annotation>
- <annotation
- category="jaxb.category"
- class="javax.xml.bind.annotation.XmlSchema"
- name="XmlSchema">
- </annotation>
- <annotation
- category="jaxb.category"
- class="javax.xml.bind.annotation.XmlSchemaType"
- name="XmlSchemaType">
- </annotation>
- <annotation
- category="jaxb.category"
- class="javax.xml.bind.annotation.XmlSchemaTypes"
- name="XmlSchemaTypes">
- </annotation>
- <annotation
- category="jaxb.category"
- class="javax.xml.bind.annotation.XmlSeeAlso"
- name="XmlSeeAlso">
- </annotation>
- <annotation
- category="jaxb.category"
- class="javax.xml.bind.annotation.XmlTransient"
- name="XmlTransient">
- </annotation>
- <annotation
- category="jaxb.category"
- class="javax.xml.bind.annotation.XmlType"
- name="XmlType">
- </annotation>
- <annotation
- category="jaxb.category"
- class="javax.xml.bind.annotation.XmlValue"
- name="XmlValue">
- </annotation>
- </extension>
-
-
-
-</plugin>
diff --git a/bundles/org.eclipse.jst.ws.jaxb.core/src/org/eclipse/jst/ws/internal/jaxb/core/JAXBCoreMessages.java b/bundles/org.eclipse.jst.ws.jaxb.core/src/org/eclipse/jst/ws/internal/jaxb/core/JAXBCoreMessages.java
deleted file mode 100644
index 44f8819..0000000
--- a/bundles/org.eclipse.jst.ws.jaxb.core/src/org/eclipse/jst/ws/internal/jaxb/core/JAXBCoreMessages.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Progress Software
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.jaxb.core;
-
-import org.eclipse.osgi.util.NLS;
-
-public class JAXBCoreMessages extends NLS {
- private static final String BUNDLE_NAME =
- "org.eclipse.jst.ws.internal.jaxb.core.JAXBCoreMessages"; //$NON-NLS-1$
-
- public static String TYPE_NAME_DIFFERENT_CASE_EXISTS;
- public static String TYPE_WITH_NAME_ALREADY_EXISTS;
-
- public static String XML_SCHEMA_TYPE_MUST_HAVE_DEFAULT_ON_FIELD_OR_METHOD;
-
- static {
- // initialize resource bundle
- NLS.initializeMessages(BUNDLE_NAME, JAXBCoreMessages.class);
- }
-
- private JAXBCoreMessages() {
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxb.core/src/org/eclipse/jst/ws/internal/jaxb/core/JAXBCoreMessages.properties b/bundles/org.eclipse.jst.ws.jaxb.core/src/org/eclipse/jst/ws/internal/jaxb/core/JAXBCoreMessages.properties
deleted file mode 100644
index 7081bab..0000000
--- a/bundles/org.eclipse.jst.ws.jaxb.core/src/org/eclipse/jst/ws/internal/jaxb/core/JAXBCoreMessages.properties
+++ /dev/null
@@ -1,12 +0,0 @@
-###############################################################################
-# Copyright (c) 2009 Progress Software Inc
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-###############################################################################
-
-#JDTUtils
-TYPE_NAME_DIFFERENT_CASE_EXISTS=A Type with the same name but different case already exists
-TYPE_WITH_NAME_ALREADY_EXISTS=A compilation unit named ''{0}'' already exists in package ''{1}''
-XML_SCHEMA_TYPE_MUST_HAVE_DEFAULT_ON_FIELD_OR_METHOD=If @XmlSchemaType is used on a field or a method, then the value of type() must be DEFAULT.class (JAXB 2.1, 8.6.4.2)
\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.jaxb.core/src/org/eclipse/jst/ws/internal/jaxb/core/JAXBCorePlugin.java b/bundles/org.eclipse.jst.ws.jaxb.core/src/org/eclipse/jst/ws/internal/jaxb/core/JAXBCorePlugin.java
deleted file mode 100644
index 664db78..0000000
--- a/bundles/org.eclipse.jst.ws.jaxb.core/src/org/eclipse/jst/ws/internal/jaxb/core/JAXBCorePlugin.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Progress Software
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.jaxb.core;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Plugin;
-import org.eclipse.core.runtime.Status;
-import org.osgi.framework.BundleContext;
-
-public class JAXBCorePlugin extends Plugin {
- public static final String PLUGIN_ID = "org.eclipse.jst.ws.jaxb.core"; //$NON-NLS-1$
-
- // The shared instance
- private static JAXBCorePlugin plugin;
-
- public static JAXBCorePlugin getDefault() {
- return plugin;
- }
-
- public void start(BundleContext context) throws Exception {
- super.start(context);
- plugin = this;
- }
-
- public void stop(BundleContext context) throws Exception {
- plugin = null;
- super.stop(context);
- }
-
- public static void logMessage(int severity, String message) {
- JAXBCorePlugin.log(new Status(severity, JAXBCorePlugin.PLUGIN_ID, message));
- }
-
- public static void log(IStatus status) {
- JAXBCorePlugin.getDefault().getLog().log(status);
- }
-
- public static void log(Throwable exception) {
- JAXBCorePlugin.log(new Status(IStatus.ERROR, JAXBCorePlugin.PLUGIN_ID, exception
- .getLocalizedMessage(), exception));
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.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 e47b8c0..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.core/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,41 +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.2.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;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.jdt.core;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.core.resources;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.jdt.apt.core;bundle-version="[3.3.100,4.0.0)",
- org.eclipse.core.filesystem;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.core.filebuffers;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.jdt.ui;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.jface.text;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.ltk.core.refactoring;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.ui;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.jst.ws.annotations.core;bundle-version="0.5.0",
- javax.wsdl;bundle-version="[1.6.2,1.7.0)",
- org.eclipse.jst.ws;bundle-version="[1.0.304,1.1.0)"
-Export-Package: org.eclipse.jst.ws.internal.jaxws.core;x-friends:="org.eclipse.jst.ws.jaxws.core.tests,org.eclipse.jst.ws.jaxws.ui",
- org.eclipse.jst.ws.internal.jaxws.core.annotations.validation;x-friends:="org.eclipse.jst.ws.annotations.core",
- org.eclipse.jst.ws.internal.jaxws.core.utils;x-friends:="org.eclipse.jst.ws.jaxws.ui",
- org.eclipse.jst.ws.jaxws.core.utils
-Import-Package: javax.activation,
- javax.jws,
- javax.jws.soap,
- javax.xml.soap,
- javax.xml.ws;version="2.1.0",
- javax.xml.ws.handler;version="2.1.0",
- javax.xml.ws.handler.soap;version="2.1.0",
- javax.xml.ws.http;version="2.1.0",
- javax.xml.ws.soap;version="2.1.0",
- javax.xml.ws.spi;version="2.1.0",
- javax.xml.ws.wsaddressing;version="2.1.0",
- org.apache.xerces.util
-Bundle-ActivationPolicy: lazy
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/about.ini b/bundles/org.eclipse.jst.ws.jaxws.core/about.ini
deleted file mode 100644
index e3b93e6..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.core/about.ini
+++ /dev/null
@@ -1,12 +0,0 @@
-# about.ini
-# contains information about a feature
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# "%key" are externalized strings defined in about.properties
-# This file does not need to be translated.
-
-# Property "aboutText" contains blurb for feature details in the "About"
-# dialog (translated). Maximum 15 lines and 75 characters per line.
-aboutText=%blurb
-
-# Property "featureImage" contains path to feature image (32x32)
-featureImage=icons/WTP_icon_x32_v2.png
diff --git a/bundles/org.eclipse.jst.ws.jaxws.core/about.mappings b/bundles/org.eclipse.jst.ws.jaxws.core/about.mappings
deleted file mode 100644
index a28390a..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.core/about.mappings
+++ /dev/null
@@ -1,6 +0,0 @@
-# about.mappings
-# contains fill-ins for about.properties
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# This file does not need to be translated.
-
-0=@build@
diff --git a/bundles/org.eclipse.jst.ws.jaxws.core/about.properties b/bundles/org.eclipse.jst.ws.jaxws.core/about.properties
deleted file mode 100644
index c71ead5..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.core/about.properties
+++ /dev/null
@@ -1,26 +0,0 @@
-###############################################################################
-# Copyright (c) 2009 Shane Clarke and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# Shane Clarke - initial API and implementation
-###############################################################################
-# about.properties
-# contains externalized strings for about.ini
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# fill-ins are supplied by about.mappings
-# This file should be translated.
-#
-# Do not translate any values surrounded by {}
-
-blurb=JAX-WS Tools (Incubation)\n\
-\n\
-Version: {featureVersion}\n\
-Build id: {0}\n\
-\n\
-(c) Copyright Eclipse contributors and others 2008, 2009. All rights reserved.\n\
-Visit http://www.eclipse.org/webtools/incubator/\n\
-\n
diff --git a/bundles/org.eclipse.jst.ws.jaxws.core/build.properties b/bundles/org.eclipse.jst.ws.jaxws.core/build.properties
deleted file mode 100644
index 8b9d613..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.core/build.properties
+++ /dev/null
@@ -1,11 +0,0 @@
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
- .,\
- plugin.xml,\
- plugin.properties,\
- about.html,\
- about.properties,\
- about.ini,\
- about.mappings,\
- icons/
diff --git a/bundles/org.eclipse.jst.ws.jaxws.core/icons/WTP_icon_x32_v2.png b/bundles/org.eclipse.jst.ws.jaxws.core/icons/WTP_icon_x32_v2.png
deleted file mode 100644
index 6f09c2a..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.core/icons/WTP_icon_x32_v2.png
+++ /dev/null
Binary files differ
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 84ad775..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.core/plugin.properties
+++ /dev/null
@@ -1,35 +0,0 @@
-###############################################################################
-# Copyright (c) 2009 Shane Clarke and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# Shane Clarke - initial API and implementation
-###############################################################################
-
-#properties file for JAXWS Core
-pluginName=JAX-WS Tools Core (Incubation)
-pluginProvider=Eclipse Web Tools Platform
-
-WEBSERVICE_CLASS_DEFAULT_PUBLIC_CONSTRUCTOR_RULE=Classes annotated with @WebService must have a default public constructor
-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=Methods annotated with @WebMethod must be public, and must not be declared static or final
-SOAPBINDING_RULES=@SOAPBinding Rules. Encoded use not supported. No RPC style on methods. No mixing of SOAPBinding styles. RPC style only with wrapped parameter style
-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_DOCUMENT_BARE_RULES=Document Bare operations are subject to a number of restrictions. Combinations of @Oneway. Not @Oneway. Void Return. Non-Void Return. @WebParam Modes IN, OUT, INOUT. Header parameters
-HOLDER_TYPES_PARAMETERS_RULE=Parameters that conform to the definition of Holder Types must be annotated with @WebParam.Mode.OUT or @WebParam.Mode.INOUT
-UNIQUE_NAMES_RULE=Checks @ResponseWrapper, @RequestWrapper and @WebFault Beans for unique className and faultBean attributes
-HANDLERCHAIN_RULES=@HandlerChain and @SOAPMessageHandlers annotations cannot coexist. @HandlerChain allowed on TYPE only
-WEBSERVICEREFS_RULES=Each @WebServiceRef annotation inside a @WebServiceRefs must contain name and type elements with non-default values
-WEBSERVICE_TARGET_NAMESPACE_RULE=Classes or Interfaces in the default package that are annotated with @javax.jws.WebService must specify a target namespace
-WEBSERVICE_WSDL_LOCATION_RULE=The service implementation bean must remain consistent with the portType and bindings declared in this WSDL referenced in the @WebService.wsdlLocation attribute
-WEBSERVICEPROVIDER_RULES=A Provider based service endpoint implementation must implement a typed Provider interface and provide a public default constructor.
-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 f3333dd..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.core/plugin.xml
+++ /dev/null
@@ -1,278 +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">
- <targetFilter target="FIELD"/>
- <targetFilter target="METHOD"/>
- </annotation>
- <annotation
- category="jaxws.category"
- class="javax.jws.Oneway"
- name="Oneway">
- </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"
- restrictedTo="CLASS_ONLY">
- </annotation>
- <annotation
- category="jaxws.category"
- class="javax.xml.ws.WebServiceRefs"
- name="WebServiceRefs"
- restrictedTo="CLASS_ONLY">
- </annotation>
- <annotation
- category="jaxws.category"
- class="javax.xml.ws.ServiceMode"
- name="ServiceMode"
- restrictedTo="CLASS_ONLY">
- </annotation>
- <annotation
- category="jaxws.category"
- class="javax.xml.ws.WebFault"
- name="WebFault"
- restrictedTo="CLASS_ONLY">
- </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"
- restrictedTo="CLASS_ONLY">
- </annotation>
- <annotation
- category="jaxws.category"
- class="javax.xml.ws.soap.MTOM"
- name="MTOM"
- restrictedTo="CLASS_ONLY">
- </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.annotationProcessor">
- <processor
- annotation="javax.jws.WebService"
- class="org.eclipse.jst.ws.internal.jaxws.core.annotations.validation.HolderTypeParametersRule">
- <description>
- %HOLDER_TYPES_PARAMETERS_RULE
- </description>
- </processor>
- <processor
- annotation="javax.jws.WebService"
- class="org.eclipse.jst.ws.internal.jaxws.core.annotations.validation.UniqueNamesRule">
- <description>
- %UNIQUE_NAMES_RULE
- </description>
- </processor>
- <processor
- annotation="javax.jws.WebService"
- class="org.eclipse.jst.ws.internal.jaxws.core.annotations.validation.WebServiceDefaultPublicConstructorRule">
- <description>
- %WEBSERVICE_CLASS_DEFAULT_PUBLIC_CONSTRUCTOR_RULE
- </description>
- </processor>
- <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.WebServiceSEIRestrictionsRule">
- <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.WebMethodPublicStaticFinalRule">
- <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.OnewayRules">
- <description>
- %ONEWAY_NO_RETURN_VALUE
- </description>
- </processor>
- <processor
- annotation="javax.jws.soap.SOAPBinding"
- class="org.eclipse.jst.ws.internal.jaxws.core.annotations.validation.SOAPBindingRules">
- <description>
- %SOAPBINDING_RULES
- </description>
- </processor>
- <processor
- annotation="javax.jws.soap.SOAPBinding"
- class="org.eclipse.jst.ws.internal.jaxws.core.annotations.validation.SOAPBindingDocumentBareRules">
- <description>
- %SOAPBINDING_DOCUMENT_BARE_RULES
- </description>
- </processor>
- <processor
- annotation="javax.jws.HandlerChain"
- class="org.eclipse.jst.ws.internal.jaxws.core.annotations.validation.HandlerChainRules">
- <description>
- %HANDLERCHAIN_RULES
- </description>
- </processor>
- <processor
- annotation="javax.xml.ws.WebServiceRefs"
- class="org.eclipse.jst.ws.internal.jaxws.core.annotations.validation.WebServiceRefsRules">
- <description>
- %WEBSERVICEREFS_RULES
- </description>
- </processor>
- <processor
- annotation="javax.jws.WebService"
- class="org.eclipse.jst.ws.internal.jaxws.core.annotations.validation.WebServiceTargetNamespaceRule">
- <description>
- %WEBSERVICE_TARGET_NAMESPACE_RULE
- </description>
- </processor>
- <processor
- annotation="javax.jws.WebService"
- class="org.eclipse.jst.ws.internal.jaxws.core.annotations.validation.WebServiceWSDLLocationRule">
- <description>
- %WEBSERVICE_WSDL_LOCATION_RULE
- </description>
- </processor>
- <processor
- annotation="javax.xml.ws.WebServiceProvider"
- class="org.eclipse.jst.ws.internal.jaxws.core.annotations.validation.WebServiceProviderRules">
- <description>
- %WEBSERVICEPROVIDER_RULES
- </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 e53a5da..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.core/src/org/eclipse/jst/ws/internal/jaxws/core/JAXWSCoreMessages.java
+++ /dev/null
@@ -1,114 +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;
-
-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_NO_RETURN_VALUE;
- public static String ONEWAY_NO_CHECKED_EXCEPTIONS;
- public static String ONEWAY_NO_HOLDER_PARAMETERS;
- public static String WEBPARAM_MODE_OUT_INOUT_HOLDER_TYPE;
-
- public static String HOLDER_TYPE_MUST_BE_OUT_INOUT;
-
- public static String DOC_BARE_NON_VOID_RETURN_NO_INOUT_OUT_PARAMETER;
- public static String DOC_BARE_ONLY_ONE_NON_HEADER_IN_PARAMETER;
- public static String DOC_BARE_VOID_RETURN_ONE_IN_PARAMETER;
- public static String DOC_BARE_VOID_RETURN_ONE_OUT_PARAMETER;
-
- public static String HANDLER_CHAIN_SOAP_MESSAGE_HANDLERS;
- public static String HANDLER_CHAIN_ON_FIELD;
- public static String HANDLER_CHAIN_ON_METHOD;
-
- public static String WEBSERVICEREFS_NAME_REQUIRED;
- public static String WEBSERVICEREFS_TYPE_REQUIRED;
-
- public static String WEBPARAM_NAME_REQUIRED_WHEN_DOC_BARE_OUT_INOUT;
-
- public static String WEBMETHOD_ONLY_SUPPORTED_ON_CLASSES_WITH_WEBSERVICE;
- public static String WEBMETHOD_ONLY_ON_PUBLIC_METHODS;
- public static String WEBMETHOD_NO_FINAL_MODIFIER_ALLOWED;
- public static String WEBMETHOD_NO_STATIC_MODIFIER_ALLOWED;
- public static String WEBMETHOD_EXCLUDE_SPECIFIED_NO_OTHER_ATTRIBUTES_ALLOWED;
- public static String WEBMETHOD_EXCLUDE_NOT_ALLOWED_ON_SEI;
-
- public static String WEBSERVICE_PUBLIC_ABSTRACT_FINAL;
- public static String WEBSERVICE_DEFAULT_PUBLIC_CONSTRUCTOR;
- public static String WEBSERVICE_OVERRIDE_FINALIZE;
- public static String WEBSERVICE_ENDPOINTINTERFACE_SEI;
- public static String WEBSERVICE_PORTNAME_SEI;
- public static String WEBSERVICE_SERVICENAME_SEI;
-
- public static String WEBSERVICE_ENPOINTINTERFACE_MUST_IMPLEMENT;
- public static String WEBSERVICE_ENPOINTINTERFACE_REDUCED_VISIBILITY;
- public static String WEBSERVICE_ENPOINTINTERFACE_INCOMPATIBLE_RETURN_TYPE;
- public static String WEBSERVICE_ENPOINTINTERFACE_NOT_INTERFACE;
- public static String WEBSERVICE_ENPOINTINTERFACE_NOT_FOUND;
- public static String WEBSERVICE_ENPOINTINTERFACE_NOT_ANNOTATED;
- public static String WEBSERVICE_ENPOINTINTERFACE_NOT_PUBLIC;
- public static String WEBSERVICE_ENPOINTINTERFACE_NO_WEBMETHODS;
- public static String WEBSERVICE_ENPOINTINTERFACE_NOT_OUTER;
- public static String WEBSERVICE_ENPOINTINTERFACE_NO_NAME_ATTRIBUTE;
- public static String WEBSERVICE_ENPOINTINTERFACE_NO_SOAPBINDING;
- public static String WEBSERVICE_ENPOINTINTERFACE_NO_WEBRESULT;
- public static String WEBSERVICE_ENPOINTINTERFACE_NO_WEBPARAM;
- public static String WEBSERVICE_ENPOINTINTERFACE_NO_ONEWAY;
-
- public static String WEBSERVICE_WEBSERVICEPROVIDER_COMBINATION;
-
- public static String WEBSERVICE_DEFAULT_PACKAGE_TARGET_NAMESPACE;
-
- public static String WEBSERVICE_WSDL_LOCATION_UNABLE_TO_LOCATE;
- public static String WEBSERVICE_WSDL_LOCATION_NO_PORT_NAME;
- public static String WEBSERVICE_WSDL_LOCATION_NO_SERVICE_NAME;
- public static String WEBSERVICE_WSDL_LOCATION_NO_OPERTATION_NAME;
- public static String WEBSERVICE_WSDL_LOCATION_WSDL_OPERATION_OUTPUT_METHOD_ONEWAY;
- public static String WEBSERVICE_WSDL_LOCATION_SOAP_BINDING_STYLE;
-
- public static String SOAPBINDING_NO_RPC_STYLE_ON_METHODS;
- public static String SOAPBINDING_RPC_ENCODED_NOT_SUPPORTED;
- public static String SOAPBINDING_DOCUMENT_ENCODED_NOT_SUPPORTED;
- public static String SOAPBINDING_NO_MIXED_BINDINGS;
- public static String SOAPBINDING_RPC_NO_BARE_PARAMETER_STYLE;
-
- public static String WEBSERVICEPROVIDER_DEFAULT_PUBLIC_CONSTRUCTOR;
- public static String WEBSERVICEPROVIDER_IMPLEMENT_TYPED_PROVIDER_INTERFACE;
- public static String WEBSERVICEPROVIDER_SOAPMESSAGE_SOAPBINDING;
- public static String WEBSERVICEPROVIDER_SOAPMESSAGE_MESSAGE_MODE;
- public static String WEBSERVICEPROVIDER_DATASOURCE_HTTPBINDING;
- public static String WEBSERVICEPROVIDER_DATASOURCE_MESSAGE_MODE;
-
- public static String OPERATION_NAMES_MUST_BE_UNIQUE_ERROR;
- public static String WRAPPER_FAULT_BEAN_NAMES_MUST_BE_UNIQUE;
- public static String DOC_BARE_METHODS_UNIQUE_XML_ELEMENTS;
- public static String LOCAL_NAME_ATTRIBUTES_MUST_BE_UNIQUE;
- public static String INVALID_NAME_ATTRIBUTE;
-
- public static String PARAMETER_NAME_CLASH;
- public static String GENERATED_PARAMETER_NAME_CLASH;
-
- 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 c387419..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.core/src/org/eclipse/jst/ws/internal/jaxws/core/JAXWSCoreMessages.properties
+++ /dev/null
@@ -1,82 +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_DEFAULT_PUBLIC_CONSTRUCTOR=Classes annotated with @WebService must have a default public constructor
-WEBSERVICE_PUBLIC_ABSTRACT_FINAL=Classes annotated with @WebService must be an outer public class, must not be final, and must not be abstract
-WEBSERVICE_OVERRIDE_FINALIZE=Classes annotated with @WebService must not define a finalize() method
-WEBMETHOD_ONLY_SUPPORTED_ON_CLASSES_WITH_WEBSERVICE=@WebMethod is only supported on classes annotated with @WebService
-WEBMETHOD_ONLY_ON_PUBLIC_METHODS=@WebMethod annotation is not allowed on non-public methods
-WEBMETHOD_NO_FINAL_MODIFIER_ALLOWED=@WebMethod annotation is not allowed on final methods
-WEBMETHOD_NO_STATIC_MODIFIER_ALLOWED=@WebMethod annotation is not allowed on static methods
-WEBMETHOD_EXCLUDE_SPECIFIED_NO_OTHER_ATTRIBUTES_ALLOWED=@WebMethod exclude attribute is specified. No other attributes allowed
-WEBMETHOD_EXCLUDE_NOT_ALLOWED_ON_SEI=@WebMethod annotations in SEI's are not allowed to specify the exclude attribute
-WEBSERVICE_SERVICENAME_SEI=@WebService serviceName element is not allowed on SEI
-WEBSERVICE_ENDPOINTINTERFACE_SEI=@WebService endpointInterface element is not allowed on SEI
-WEBSERVICE_PORTNAME_SEI=@WebService portName element is not allowed on SEI
-WEBSERVICE_ENPOINTINTERFACE_MUST_IMPLEMENT=Implementation class must implement the SEI method ''{0}''
-WEBSERVICE_ENPOINTINTERFACE_REDUCED_VISIBILITY=Cannot reduce the visibility of the SEI method
-WEBSERVICE_ENPOINTINTERFACE_INCOMPATIBLE_RETURN_TYPE=The return type is incompatible with {0}
-WEBSERVICE_ENPOINTINTERFACE_NOT_INTERFACE=The endpointInterface ''{0}'' must be an Interface
-WEBSERVICE_ENPOINTINTERFACE_NOT_FOUND=The endpointInterface ''{0}'' cannot be found
-WEBSERVICE_ENPOINTINTERFACE_NOT_ANNOTATED=The endpointInterface ''{0}'' must be annotated with @javax.jws.WebService
-WEBSERVICE_ENPOINTINTERFACE_NOT_PUBLIC=The endpointInterface ''{0}'' must be public
-WEBSERVICE_ENPOINTINTERFACE_NOT_OUTER=The endpointInterface ''{0}'' must be an outer interface
-WEBSERVICE_ENPOINTINTERFACE_NO_NAME_ATTRIBUTE=@WebService annotation contains an endpointInterface attribute. No name attribute allowed
-WEBSERVICE_ENPOINTINTERFACE_NO_WEBMETHODS=@WebService annotation contains an endpointInterface attribute. No methods annotated with @WebMethod allowed in implementation class
-WEBSERVICE_ENPOINTINTERFACE_NO_SOAPBINDING=@WebService annotation contains an endpointInterface attribute. @SOAPBinding not allowed in implementation class
-WEBSERVICE_ENPOINTINTERFACE_NO_WEBRESULT=@WebService annotation contains an endpointInterface attribute. No methods annotated with @WebResult allowed in implementation class
-WEBSERVICE_ENPOINTINTERFACE_NO_WEBPARAM=@WebService annotation contains an endpointInterface attribute. No parameters annotated with @WebParam allowed in implementation class
-WEBSERVICE_ENPOINTINTERFACE_NO_ONEWAY=@WebService annotation contains an endpointInterface attribute. No methods annotated with @Oneway allowed in implementation class
-WEBSERVICE_WEBSERVICEPROVIDER_COMBINATION=@WebService and @WebServiceProvider annotations cannot be combined
-WEBSERVICE_DEFAULT_PACKAGE_TARGET_NAMESPACE=Classes or Interfaces in the default package that are annotated with @WebService must specify a targetNamespace attribute
-ONEWAY_NO_RETURN_VALUE=@Oneway methods must not return a value
-ONEWAY_NO_CHECKED_EXCEPTIONS=@Oneway methods must not declare any checked exceptions
-ONEWAY_NO_HOLDER_PARAMETERS=@Oneway methods must not accept any javax.xml.ws.Holder<T> parameters.
-WEBPARAM_MODE_OUT_INOUT_HOLDER_TYPE=The @WebParam.Mode.OUT and @WebParam.Mode.INOUT modes may only be specified for javax.xml.ws.Holder<T> parameters
-HOLDER_TYPE_MUST_BE_OUT_INOUT=javax.xml.ws.Holder<T> parameters must be @WebParam.Mode.OUT or @WebParam.Mode.INOUT
-SOAPBINDING_NO_RPC_STYLE_ON_METHODS=RPC style @SOAPBinding annotations not supported on methods
-SOAPBINDING_RPC_ENCODED_NOT_SUPPORTED=RPC Encoded SOAP Bindings not supported
-SOAPBINDING_DOCUMENT_ENCODED_NOT_SUPPORTED=Document Encoded SOAP Bindings not supported
-SOAPBINDING_NO_MIXED_BINDINGS=Mixed RPC and Document style operations not permitted in the same service
-SOAPBINDING_RPC_NO_BARE_PARAMETER_STYLE=Use of RPC style requires use of WRAPPED parameter style
-DOC_BARE_ONLY_ONE_NON_HEADER_IN_PARAMETER=Document literal bare methods may have only one non-header IN parameter
-DOC_BARE_NON_VOID_RETURN_NO_INOUT_OUT_PARAMETER=Document literal bare methods that declare a non-void return value may not have any OUT or INOUT parameters
-DOC_BARE_VOID_RETURN_ONE_IN_PARAMETER=Document literal bare methods that declare a void return value may have only one IN/INOUT parameter
-DOC_BARE_VOID_RETURN_ONE_OUT_PARAMETER=Document literal bare methods that declare a void return value may have only one OUT/INOUT parameter
-WEBPARAM_NAME_REQUIRED_WHEN_DOC_BARE_OUT_INOUT=The @WebParam name attribute is required when the operation is Document Bare and the mode is OUT or INOUT
-OPERATION_NAMES_MUST_BE_UNIQUE_ERROR=Operation names must be unique : ''{0}''
-WRAPPER_FAULT_BEAN_NAMES_MUST_BE_UNIQUE=Generated Request/Response and Fault bean classes must have unique names within a package and must not clash with other classes in that package : ''{0}''
-DOC_BARE_METHODS_UNIQUE_XML_ELEMENTS=Document Literal Bare operations must have unique XML elements for the input and output messages across all operations on the Web Service : ''{0}''
-LOCAL_NAME_ATTRIBUTES_MUST_BE_UNIQUE=The wrapper bean localName attributes must be unique : ''{0}''
-INVALID_NAME_ATTRIBUTE=The name ''{0}'' contains invalid characters
-WEBSERVICE_WSDL_LOCATION_UNABLE_TO_LOCATE=Unable to locate wsdl at wsdlLocation: ''{0}''
-WEBSERVICE_WSDL_LOCATION_NO_PORT_NAME=No wsdl:port matching the portName ''{0}'' can be found in the WSDL ''{1}''
-WEBSERVICE_WSDL_LOCATION_NO_SERVICE_NAME=No wsdl:service matching the serviceName ''{0}'' can be found in the WSDL ''{1}''
-WEBSERVICE_WSDL_LOCATION_NO_OPERTATION_NAME=No @WebMethod matching the wsdl:operation ''{0}'' can be found
-WEBSERVICE_WSDL_LOCATION_WSDL_OPERATION_OUTPUT_METHOD_ONEWAY=The Method ''{0}'' is annotated @Oneway but the wsdl:operation ''{0}'' specifies a wsdl:output element
-WEBSERVICE_WSDL_LOCATION_SOAP_BINDING_STYLE=The wsdl ''{0}'' specifies a ''{1}'' SOAP binding style which does not match the ''{2}'' SOAP binding style of the web service implementation/SEI
-PARAMETER_NAME_CLASH=Parameter names must be unique: ''{0}''
-GENERATED_PARAMETER_NAME_CLASH=Parameter Name ''{0}'' will clash with a generated parameter name
-HANDLER_CHAIN_SOAP_MESSAGE_HANDLERS=@HandlerChain and @SOAPMessageHandlers cannot be combined
-HANDLER_CHAIN_ON_FIELD=The @HandlerChain annotation may only be specified on a TYPE. The annotation target includes FIELD for use by JAX-WS 2.0
-HANDLER_CHAIN_ON_METHOD=The @HandlerChain annotation may only be specified on a TYPE. The annotation target includes METHOD for use by JAX-WS 2.0
-WEBSERVICEREFS_NAME_REQUIRED=Each @WebServiceRef annotation inside a @WebServiceRefs must contain a name element with a non-default ("") value
-WEBSERVICEREFS_TYPE_REQUIRED=Each @WebServiceRef annotation inside a @WebServiceRefs must contain a type element with a non-default (Object.class) value
-WEBSERVICEPROVIDER_DEFAULT_PUBLIC_CONSTRUCTOR=Classes annotated with @WebServiceProvider must have a default public constructor
-WEBSERVICEPROVIDER_IMPLEMENT_TYPED_PROVIDER_INTERFACE=A Provider based endpoint implementation must implement a typed javax.xml.ws.Provider interface. Provider implementations work with the following types of objects: javax.xml.transform.Source, javax.xml.soap.SOAPMessage and javax.activation.DataSource
-WEBSERVICEPROVIDER_SOAPMESSAGE_SOAPBINDING=javax.xml.soap.SOAPMessage objects require the Provider implementation to use the SOAP Binding
-WEBSERVICEPROVIDER_SOAPMESSAGE_MESSAGE_MODE=javax.xml.soap.SOAPMessage objects require the Provider implementation to specify a @javax.xml.ws.ServiceMode annotation with javax.xml.ws.Service.Mode.MESSAGE as the value
-WEBSERVICEPROVIDER_DATASOURCE_HTTPBINDING=javax.activation.DataSource derived objects require the Provider implementation to use the HTTP Binding
-WEBSERVICEPROVIDER_DATASOURCE_MESSAGE_MODE=javax.activation.DataSource derived objects require the Provider implementation to specify a @javax.xml.ws.ServiceMode annotation with javax.xml.ws.Service.Mode.MESSAGE as the value
\ 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 ac127f3..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.core/src/org/eclipse/jst/ws/internal/jaxws/core/JAXWSCorePlugin.java
+++ /dev/null
@@ -1,50 +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;
-
-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/validation/HandlerChainRules.java b/bundles/org.eclipse.jst.ws.jaxws.core/src/org/eclipse/jst/ws/internal/jaxws/core/annotations/validation/HandlerChainRules.java
deleted file mode 100644
index 071fe83..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.core/src/org/eclipse/jst/ws/internal/jaxws/core/annotations/validation/HandlerChainRules.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.internal.jaxws.core.annotations.validation;
-
-import java.util.Collection;
-
-import javax.jws.HandlerChain;
-
-import org.eclipse.jst.ws.annotations.core.processor.AbstractAnnotationProcessor;
-import org.eclipse.jst.ws.annotations.core.utils.AnnotationUtils;
-import org.eclipse.jst.ws.internal.jaxws.core.JAXWSCoreMessages;
-
-import com.sun.mirror.declaration.AnnotationMirror;
-import com.sun.mirror.declaration.AnnotationTypeDeclaration;
-import com.sun.mirror.declaration.Declaration;
-import com.sun.mirror.declaration.FieldDeclaration;
-import com.sun.mirror.declaration.MethodDeclaration;
-import com.sun.mirror.declaration.TypeDeclaration;
-
-public class HandlerChainRules extends AbstractAnnotationProcessor {
-
- @Override
- public void process() {
- AnnotationTypeDeclaration annotationDeclaration = (AnnotationTypeDeclaration) environment
- .getTypeDeclaration(HandlerChain.class.getName());
-
- Collection<Declaration> annotatedTypes = environment
- .getDeclarationsAnnotatedWith(annotationDeclaration);
-
- for (Declaration declaration : annotatedTypes) {
- if (declaration instanceof TypeDeclaration) {
- @SuppressWarnings("deprecation")
- AnnotationMirror annotationMirror = AnnotationUtils.getAnnotation(declaration,
- javax.jws.soap.SOAPMessageHandlers.class);
- if (annotationMirror != null) {
- printFixableError(annotationMirror.getPosition(),
- JAXWSCoreMessages.HANDLER_CHAIN_SOAP_MESSAGE_HANDLERS);
- }
- }
-
- if (declaration instanceof FieldDeclaration) {
- AnnotationMirror annotationMirror = AnnotationUtils.getAnnotation(declaration,
- javax.jws.HandlerChain.class);
- printError(annotationMirror.getPosition(),
- JAXWSCoreMessages.HANDLER_CHAIN_ON_FIELD);
- }
-
- if (declaration instanceof MethodDeclaration) {
- AnnotationMirror annotationMirror = AnnotationUtils.getAnnotation(declaration,
- javax.jws.HandlerChain.class);
-
- printError(annotationMirror.getPosition(),
- JAXWSCoreMessages.HANDLER_CHAIN_ON_METHOD);
- }
- }
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.core/src/org/eclipse/jst/ws/internal/jaxws/core/annotations/validation/HolderTypeParametersRule.java b/bundles/org.eclipse.jst.ws.jaxws.core/src/org/eclipse/jst/ws/internal/jaxws/core/annotations/validation/HolderTypeParametersRule.java
deleted file mode 100644
index ec8ed2a..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.core/src/org/eclipse/jst/ws/internal/jaxws/core/annotations/validation/HolderTypeParametersRule.java
+++ /dev/null
@@ -1,92 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Shane Clarke.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Shane Clarke - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.jaxws.core.annotations.validation;
-
-import static org.eclipse.jst.ws.internal.jaxws.core.utils.JAXWSUtils.MODE;
-
-import java.util.Collection;
-
-import javax.jws.WebParam;
-import javax.jws.WebService;
-import javax.xml.ws.Holder;
-
-import org.eclipse.jst.ws.annotations.core.processor.AbstractAnnotationProcessor;
-import org.eclipse.jst.ws.annotations.core.utils.AnnotationUtils;
-import org.eclipse.jst.ws.internal.jaxws.core.JAXWSCoreMessages;
-
-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.ParameterDeclaration;
-import com.sun.mirror.declaration.TypeDeclaration;
-import com.sun.mirror.type.TypeMirror;
-
-public class HolderTypeParametersRule extends AbstractAnnotationProcessor {
-
- @Override
- public void process() {
- AnnotationTypeDeclaration annotationDeclaration = (AnnotationTypeDeclaration) environment
- .getTypeDeclaration(WebService.class.getName());
-
- Collection<Declaration> annotatedTypes = environment
- .getDeclarationsAnnotatedWith(annotationDeclaration);
-
- for (Declaration declaration : annotatedTypes) {
- if (declaration instanceof TypeDeclaration) {
- validateParameters((TypeDeclaration) declaration);
- }
- }
- }
-
- private void validateParameters(TypeDeclaration typeDeclaration) {
- Collection<? extends MethodDeclaration> methods = typeDeclaration.getMethods();
- for (MethodDeclaration methodDeclaration : methods) {
- Collection<ParameterDeclaration> parameters = methodDeclaration.getParameters();
- for (ParameterDeclaration parameter : parameters) {
- TypeMirror typeMirror = environment.getTypeUtils().getErasure(parameter.getType());
- boolean isHolderParameter = typeMirror.toString().equals(Holder.class.getCanonicalName());
- if (isWebParamOutInoutMode(parameter) && !isHolderParameter) {
- printError(parameter.getPosition(),
- JAXWSCoreMessages.WEBPARAM_MODE_OUT_INOUT_HOLDER_TYPE);
- } else if (isHolderParameter && isWebParamInMode(parameter)){
- printError(parameter.getPosition(),
- JAXWSCoreMessages.HOLDER_TYPE_MUST_BE_OUT_INOUT);
- }
- }
- }
- }
-
- private boolean isWebParamInMode(ParameterDeclaration parameter) {
- String mode = getMode(parameter);
- if (mode != null) {
- return mode.equals(WebParam.Mode.IN.toString());
- }
- return false;
- }
-
- private boolean isWebParamOutInoutMode(ParameterDeclaration parameter) {
- String mode = getMode(parameter);
- if (mode != null) {
- return mode.equals(WebParam.Mode.OUT.name()) || mode.equals(WebParam.Mode.INOUT.name());
- }
- return false;
- }
-
- private String getMode(ParameterDeclaration parameter) {
- AnnotationMirror webParam = AnnotationUtils.getAnnotation(parameter, WebParam.class);
- if (webParam != null) {
- return AnnotationUtils.getStringValue(webParam, MODE);
- }
- return null;
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.core/src/org/eclipse/jst/ws/internal/jaxws/core/annotations/validation/OnewayRules.java b/bundles/org.eclipse.jst.ws.jaxws.core/src/org/eclipse/jst/ws/internal/jaxws/core/annotations/validation/OnewayRules.java
deleted file mode 100644
index f4e764e..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.core/src/org/eclipse/jst/ws/internal/jaxws/core/annotations/validation/OnewayRules.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.jaxws.core.annotations.validation;
-
-import java.util.Collection;
-
-import javax.jws.Oneway;
-import javax.xml.ws.Holder;
-
-import org.eclipse.jst.ws.annotations.core.processor.AbstractAnnotationProcessor;
-import org.eclipse.jst.ws.internal.jaxws.core.JAXWSCoreMessages;
-
-import com.sun.mirror.declaration.AnnotationTypeDeclaration;
-import com.sun.mirror.declaration.Declaration;
-import com.sun.mirror.declaration.MethodDeclaration;
-import com.sun.mirror.declaration.ParameterDeclaration;
-import com.sun.mirror.type.TypeMirror;
-
-public class OnewayRules extends AbstractAnnotationProcessor {
-
- @Override
- public void process() {
- AnnotationTypeDeclaration annotationDeclaration = (AnnotationTypeDeclaration) environment
- .getTypeDeclaration(Oneway.class.getName());
-
- 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())) {
- printError(annotationDeclaration, methodDeclaration,
- JAXWSCoreMessages.ONEWAY_NO_RETURN_VALUE);
- }
- if (methodDeclaration.getThrownTypes().size() > 0) {
- printError(annotationDeclaration, methodDeclaration,
- JAXWSCoreMessages.ONEWAY_NO_CHECKED_EXCEPTIONS);
- }
- checkParameters(methodDeclaration, annotationDeclaration);
- }
- }
- }
-
- private void checkParameters(MethodDeclaration methodDeclaration,
- AnnotationTypeDeclaration annotationDeclaration) {
- Collection<ParameterDeclaration> parameters = methodDeclaration.getParameters();
- for (ParameterDeclaration parameter : parameters) {
- TypeMirror typeMirror = environment.getTypeUtils().getErasure(parameter.getType());
- if (typeMirror.toString().equals(Holder.class.getCanonicalName())) {
- printError(annotationDeclaration, methodDeclaration,
- JAXWSCoreMessages.ONEWAY_NO_HOLDER_PARAMETERS);
- }
- }
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.core/src/org/eclipse/jst/ws/internal/jaxws/core/annotations/validation/SOAPBindingDocumentBareRules.java b/bundles/org.eclipse.jst.ws.jaxws.core/src/org/eclipse/jst/ws/internal/jaxws/core/annotations/validation/SOAPBindingDocumentBareRules.java
deleted file mode 100644
index 1dba436..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.core/src/org/eclipse/jst/ws/internal/jaxws/core/annotations/validation/SOAPBindingDocumentBareRules.java
+++ /dev/null
@@ -1,236 +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 static org.eclipse.jst.ws.internal.jaxws.core.utils.JAXWSUtils.HEADER;
-import static org.eclipse.jst.ws.internal.jaxws.core.utils.JAXWSUtils.MODE;
-
-import java.util.Collection;
-
-import javax.jws.Oneway;
-import javax.jws.WebParam;
-import javax.jws.WebParam.Mode;
-import javax.jws.soap.SOAPBinding;
-import javax.xml.ws.Holder;
-
-import org.eclipse.jst.ws.annotations.core.processor.AbstractAnnotationProcessor;
-import org.eclipse.jst.ws.annotations.core.utils.AnnotationUtils;
-import org.eclipse.jst.ws.internal.jaxws.core.JAXWSCoreMessages;
-import org.eclipse.jst.ws.internal.jaxws.core.utils.JAXWSUtils;
-
-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.ParameterDeclaration;
-import com.sun.mirror.declaration.TypeDeclaration;
-import com.sun.mirror.type.TypeMirror;
-
-public class SOAPBindingDocumentBareRules extends AbstractAnnotationProcessor {
-
- @Override
- public void process() {
- AnnotationTypeDeclaration annotationDeclaration = (AnnotationTypeDeclaration) environment
- .getTypeDeclaration(SOAPBinding.class.getName());
-
- Collection<Declaration> annotatedTypes = environment
- .getDeclarationsAnnotatedWith(annotationDeclaration);
-
- for (Declaration declaration : annotatedTypes) {
- if (declaration instanceof TypeDeclaration) {
- TypeDeclaration typeDeclaration = (TypeDeclaration) declaration;
- Collection<AnnotationMirror> annotationMirrors = typeDeclaration.getAnnotationMirrors();
- for (AnnotationMirror mirror : annotationMirrors) {
- if (mirror.getAnnotationType().getDeclaration().equals(annotationDeclaration)) {
- if (JAXWSUtils.isDocumentBare(mirror)) {
- Collection<? extends MethodDeclaration> methodDeclarations = typeDeclaration.getMethods();
- for (MethodDeclaration methodDeclaration : methodDeclarations) {
- processMethod(methodDeclaration);
- }
- }
- }
- }
- }
-
- if (declaration instanceof MethodDeclaration) {
- MethodDeclaration methodDeclaration = (MethodDeclaration) declaration;
- Collection<AnnotationMirror> annotationMirrors = methodDeclaration.getAnnotationMirrors();
- for (AnnotationMirror mirror : annotationMirrors) {
- if (mirror.getAnnotationType().getDeclaration().equals(annotationDeclaration)) {
- if (JAXWSUtils.isDocumentBare(mirror)) {
- processMethod((MethodDeclaration) declaration);
- }
- }
- }
- }
- }
- }
-
- public void processMethod(MethodDeclaration methodDeclaration) {
- Collection<ParameterDeclaration> parameters = methodDeclaration.getParameters();
-
- //@Oneway operations
- if (isOneway(methodDeclaration) && !isSingleNonHeaderINParameter(parameters)) {
- printError(methodDeclaration.getPosition(),
- JAXWSCoreMessages.DOC_BARE_ONLY_ONE_NON_HEADER_IN_PARAMETER);
- } else {
- if (isVoidReturnType(methodDeclaration)) {
- if (countINParameters(parameters) > 1) {
- printError(methodDeclaration.getPosition(),
- JAXWSCoreMessages.DOC_BARE_VOID_RETURN_ONE_IN_PARAMETER);
- }
- if (countOUTParameters(parameters) > 1) {
- printError(methodDeclaration.getPosition(),
- JAXWSCoreMessages.DOC_BARE_VOID_RETURN_ONE_OUT_PARAMETER);
- }
- } else {
- if (countINParameters(parameters) > 1) {
- printError(methodDeclaration.getPosition(),
- JAXWSCoreMessages.DOC_BARE_ONLY_ONE_NON_HEADER_IN_PARAMETER);
- }
- if (countOUTParameters(parameters) > 0) {
- printError(methodDeclaration.getPosition(),
- JAXWSCoreMessages.DOC_BARE_NON_VOID_RETURN_NO_INOUT_OUT_PARAMETER);
- }
- }
- }
-
- //check for @WebParam.name attribute when @WebParam.Mode = OUT or INOUT
-// for(ParameterDeclaration parameterDeclaration : parameters) {
-// AnnotationMirror annotationMirror = AnnotationUtils.getAnnotation(parameterDeclaration, WebParam.class);
-// if (annotationMirror != null) {
-// String mode = getWebParamMode(annotationMirror, parameterDeclaration);
-// String name = AnnotationUtils.getStringValue(annotationMirror, NAME);
-//
-// if (name == null && (mode.equals(Mode.OUT.name()) || mode.equals(Mode.INOUT.name()))) {
-// printError(annotationMirror.getPosition(),
-// JAXWSCoreMessages.WEBPARAM_NAME_REQUIRED_WHEN_DOC_BARE_OUT_INOUT);
-// }
-// }
-// }
- }
-
- private boolean isOneway(MethodDeclaration methodDeclaration) {
- AnnotationMirror oneway = AnnotationUtils.getAnnotation(methodDeclaration, Oneway.class);
- if (oneway != null) {
- return true;
- }
- return false;
- }
-
- private boolean isVoidReturnType(MethodDeclaration methodDeclaration) {
- return methodDeclaration.getReturnType().equals(environment.getTypeUtils().getVoidType());
- }
-
- private boolean isSingleNonHeaderINParameter(Collection<ParameterDeclaration> parameters) {
- return countNonHeaderINParameters(parameters) <= 1;
- }
-
- private int countNonHeaderINParameters(Collection<ParameterDeclaration> parameters) {
- int inNonHeaderParameters = 0;
- for (ParameterDeclaration parameterDeclaration : parameters) {
- if (isNonHeaderINParameter(parameterDeclaration)) {
- inNonHeaderParameters++;
- }
- }
- return inNonHeaderParameters;
- }
-
- private boolean isNonHeaderINParameter(ParameterDeclaration parameterDeclaration) {
- AnnotationMirror webParam = AnnotationUtils.getAnnotation(parameterDeclaration, WebParam.class);
- if (webParam != null) {
- return getWebParamMode(webParam, parameterDeclaration).equals(Mode.IN.name())
- && !isHeader(webParam);
- }
-
- if (getDefaultWebParamMode(parameterDeclaration).equals(Mode.IN.name())) {
- return true;
- }
-
- return false;
- }
-
- private int countINParameters(Collection<ParameterDeclaration> parameters) {
- int inNonHeaderParameters = 0;
- for (ParameterDeclaration parameterDeclaration : parameters) {
- if (isINParameter(parameterDeclaration)) {
- inNonHeaderParameters++;
- }
- }
- return inNonHeaderParameters;
- }
-
- private boolean isINParameter(ParameterDeclaration parameterDeclaration) {
- AnnotationMirror webParam = AnnotationUtils.getAnnotation(parameterDeclaration, WebParam.class);
- if (webParam != null) {
- String mode = getWebParamMode(webParam, parameterDeclaration);
- return (mode.equals(Mode.IN.name()) || mode.equals(Mode.INOUT.name()))
- && !isHeader(webParam);
- }
-
- String defaultMode = getDefaultWebParamMode(parameterDeclaration);
- if (defaultMode.equals(Mode.IN.name()) || defaultMode.equals(Mode.INOUT.name())) {
- return true;
- }
-
- return false;
- }
-
- private int countOUTParameters(Collection<ParameterDeclaration> parameters) {
- int outNonHeaderParameters = 0;
- for (ParameterDeclaration parameterDeclaration : parameters) {
- if (isOUTParameter(parameterDeclaration)) {
- outNonHeaderParameters++;
- }
- }
- return outNonHeaderParameters;
- }
-
- private boolean isOUTParameter(ParameterDeclaration parameterDeclaration) {
- AnnotationMirror webParam = AnnotationUtils.getAnnotation(parameterDeclaration, WebParam.class);
- if (webParam != null) {
- String mode = getWebParamMode(webParam, parameterDeclaration);
- return (mode.equals(Mode.OUT.name()) || mode.equals(Mode.INOUT.name()))
- && !isHeader(webParam);
- }
-
- if (getDefaultWebParamMode(parameterDeclaration).equals(Mode.INOUT.name())) {
- return true;
- }
-
- return false;
- }
-
- private boolean isHeader(AnnotationMirror annotationMirror) {
- Boolean header = AnnotationUtils.getBooleanValue(annotationMirror, HEADER);
- if (header != null) {
- return header.booleanValue();
- }
- return false;
- }
-
- private String getWebParamMode(AnnotationMirror annotationMirror, ParameterDeclaration parameterDeclaration) {
- String mode = AnnotationUtils.getStringValue(annotationMirror, MODE);
- if (mode == null || mode.length() == 0) {
- mode = getDefaultWebParamMode(parameterDeclaration);
- }
- return mode;
- }
-
- private String getDefaultWebParamMode(ParameterDeclaration parameterDeclaration) {
- TypeMirror typeMirror = environment.getTypeUtils().getErasure(parameterDeclaration.getType());
- if (typeMirror.toString().equals(Holder.class.getCanonicalName())) {
- return Mode.INOUT.name();
- }
- return Mode.IN.name();
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.core/src/org/eclipse/jst/ws/internal/jaxws/core/annotations/validation/SOAPBindingRules.java b/bundles/org.eclipse.jst.ws.jaxws.core/src/org/eclipse/jst/ws/internal/jaxws/core/annotations/validation/SOAPBindingRules.java
deleted file mode 100644
index b5879d2..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.core/src/org/eclipse/jst/ws/internal/jaxws/core/annotations/validation/SOAPBindingRules.java
+++ /dev/null
@@ -1,99 +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 static org.eclipse.jst.ws.internal.jaxws.core.utils.JAXWSUtils.PARAMETER_STYLE;
-import static org.eclipse.jst.ws.internal.jaxws.core.utils.JAXWSUtils.STYLE;
-import static org.eclipse.jst.ws.internal.jaxws.core.utils.JAXWSUtils.USE;
-
-import java.util.Collection;
-
-import javax.jws.soap.SOAPBinding;
-import javax.jws.soap.SOAPBinding.ParameterStyle;
-import javax.jws.soap.SOAPBinding.Style;
-import javax.jws.soap.SOAPBinding.Use;
-
-import org.eclipse.jst.ws.annotations.core.processor.AbstractAnnotationProcessor;
-import org.eclipse.jst.ws.annotations.core.utils.AnnotationUtils;
-import org.eclipse.jst.ws.internal.jaxws.core.JAXWSCoreMessages;
-
-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;
-
-public class SOAPBindingRules extends AbstractAnnotationProcessor {
-
- @Override
- public void process() {
- AnnotationTypeDeclaration soapBindingDeclaration = (AnnotationTypeDeclaration) environment
- .getTypeDeclaration(SOAPBinding.class.getName());
-
- Collection<Declaration> annotatedTypes = environment
- .getDeclarationsAnnotatedWith(soapBindingDeclaration);
-
- for (Declaration declaration : annotatedTypes) {
- checkForEncodedUse(declaration);
- if (declaration instanceof TypeDeclaration) {
- checkForRPCBareOnTypeDeclaration((TypeDeclaration) declaration);
- }
-
- if (declaration instanceof MethodDeclaration) {
- checkForRPCStyleOnMethodDeclaration((MethodDeclaration) declaration);
- }
- }
- }
-
- private void checkForRPCBareOnTypeDeclaration(TypeDeclaration typeDeclaration) {
- AnnotationMirror soapBinding = AnnotationUtils.getAnnotation(typeDeclaration, SOAPBinding.class);
- String style = AnnotationUtils.getStringValue(soapBinding, STYLE);
- if (style != null && style.equals(Style.RPC.toString())) {
- String parameterStyle = AnnotationUtils.getStringValue(soapBinding, PARAMETER_STYLE);
- if (parameterStyle != null && parameterStyle.equals(ParameterStyle.BARE.toString())) {
- printError(soapBinding.getPosition(), JAXWSCoreMessages.SOAPBINDING_RPC_NO_BARE_PARAMETER_STYLE);
- }
- // check for Document style @SOAPBinding on methods
- Collection<? extends MethodDeclaration> methodDeclarations = typeDeclaration.getMethods();
- for (MethodDeclaration methodDeclaration : methodDeclarations) {
- AnnotationMirror soapBinding2 = AnnotationUtils.getAnnotation(methodDeclaration, SOAPBinding.class);
- if (soapBinding2 != null) {
- String style2 = AnnotationUtils.getStringValue(soapBinding2, STYLE);
- if (style2 == null || style2.equals(Style.DOCUMENT.toString())) {
- printError(soapBinding2.getPosition(), JAXWSCoreMessages.SOAPBINDING_NO_MIXED_BINDINGS);
- }
- }
- }
- }
- }
-
- private void checkForEncodedUse(Declaration declaration) {
- AnnotationMirror soapBinding = AnnotationUtils.getAnnotation(declaration, SOAPBinding.class);
- String use = AnnotationUtils.getStringValue(soapBinding, USE);
- if (use != null && use.equals(Use.ENCODED.toString())) {
- String style = AnnotationUtils.getStringValue(soapBinding, STYLE);
- if (style == null || style.equals(Style.DOCUMENT.toString())) {
- printError(soapBinding.getPosition(), JAXWSCoreMessages.SOAPBINDING_DOCUMENT_ENCODED_NOT_SUPPORTED);
- } else {
- printError(soapBinding.getPosition(), JAXWSCoreMessages.SOAPBINDING_RPC_ENCODED_NOT_SUPPORTED);
- }
- }
- }
-
- private void checkForRPCStyleOnMethodDeclaration(MethodDeclaration methodDeclaration) {
- AnnotationMirror soapBinding = AnnotationUtils.getAnnotation(methodDeclaration, SOAPBinding.class);
- String style = AnnotationUtils.getStringValue(soapBinding, STYLE);
- if (style != null && style.equals(Style.RPC.toString())) {
- printFixableError(soapBinding.getPosition(),
- JAXWSCoreMessages.SOAPBINDING_NO_RPC_STYLE_ON_METHODS);
- }
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.core/src/org/eclipse/jst/ws/internal/jaxws/core/annotations/validation/UniqueNamesRule.java b/bundles/org.eclipse.jst.ws.jaxws.core/src/org/eclipse/jst/ws/internal/jaxws/core/annotations/validation/UniqueNamesRule.java
deleted file mode 100644
index a2db05d..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.core/src/org/eclipse/jst/ws/internal/jaxws/core/annotations/validation/UniqueNamesRule.java
+++ /dev/null
@@ -1,477 +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 static org.eclipse.jst.ws.internal.jaxws.core.utils.JAXWSUtils.CLASS_NAME;
-import static org.eclipse.jst.ws.internal.jaxws.core.utils.JAXWSUtils.FAULT_BEAN;
-import static org.eclipse.jst.ws.internal.jaxws.core.utils.JAXWSUtils.HEADER;
-import static org.eclipse.jst.ws.internal.jaxws.core.utils.JAXWSUtils.LOCAL_NAME;
-import static org.eclipse.jst.ws.internal.jaxws.core.utils.JAXWSUtils.MODE;
-import static org.eclipse.jst.ws.internal.jaxws.core.utils.JAXWSUtils.NAME;
-import static org.eclipse.jst.ws.internal.jaxws.core.utils.JAXWSUtils.OPERATION_NAME;
-import static org.eclipse.jst.ws.internal.jaxws.core.utils.JAXWSUtils.RESPONSE_SUFFIX;
-import static org.eclipse.jst.ws.internal.jaxws.core.utils.JAXWSUtils.TARGET_NAMESPACE;
-
-import java.lang.annotation.Annotation;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import javax.jws.WebMethod;
-import javax.jws.WebParam;
-import javax.jws.WebResult;
-import javax.jws.WebService;
-import javax.jws.WebParam.Mode;
-import javax.jws.soap.SOAPBinding;
-import javax.xml.namespace.QName;
-import javax.xml.ws.Holder;
-import javax.xml.ws.RequestWrapper;
-import javax.xml.ws.ResponseWrapper;
-import javax.xml.ws.WebFault;
-
-import org.apache.xerces.util.XMLChar;
-import org.eclipse.jst.ws.annotations.core.processor.AbstractAnnotationProcessor;
-import org.eclipse.jst.ws.annotations.core.utils.AnnotationUtils;
-import org.eclipse.jst.ws.internal.jaxws.core.JAXWSCoreMessages;
-import org.eclipse.jst.ws.internal.jaxws.core.utils.JAXWSUtils;
-import org.eclipse.jst.ws.jaxws.core.utils.JDTUtils;
-
-import com.sun.mirror.declaration.AnnotationMirror;
-import com.sun.mirror.declaration.AnnotationTypeDeclaration;
-import com.sun.mirror.declaration.AnnotationValue;
-import com.sun.mirror.declaration.ClassDeclaration;
-import com.sun.mirror.declaration.Declaration;
-import com.sun.mirror.declaration.MethodDeclaration;
-import com.sun.mirror.declaration.ParameterDeclaration;
-import com.sun.mirror.declaration.TypeDeclaration;
-import com.sun.mirror.type.ReferenceType;
-import com.sun.mirror.type.TypeMirror;
-import com.sun.mirror.util.SourcePosition;
-
-public class UniqueNamesRule extends AbstractAnnotationProcessor {
- private static Pattern pattern = Pattern.compile("arg\\d++"); //$NON-NLS-1$
-
- @Override
- public void process() {
- AnnotationTypeDeclaration webServiceDeclaration = (AnnotationTypeDeclaration) environment
- .getTypeDeclaration(WebService.class.getName());
-
- Collection<Declaration> annotatedTypes = environment
- .getDeclarationsAnnotatedWith(webServiceDeclaration);
-
- for (Declaration declaration : annotatedTypes) {
- if (declaration instanceof TypeDeclaration) {
- TypeDeclaration typeDeclaration = (TypeDeclaration) declaration;
- checkOperationNames(typeDeclaration.getMethods());
- checkWrapperAndFaultBeanNames(typeDeclaration.getMethods());
- checkDocumentBareMethods(typeDeclaration.getMethods());
- checkMethodParameters(typeDeclaration.getMethods());
- }
- }
- }
-
- private void checkOperationNames(Collection<? extends MethodDeclaration> methods) {
- Map<Declaration, QName> nameMap = new HashMap<Declaration, QName>();
- for (MethodDeclaration methodDeclaration : methods) {
- nameMap.put(methodDeclaration, new QName(getTargetNamespace(methodDeclaration.getDeclaringType()),
- getOperationName(methodDeclaration)));
- }
-
- Declaration[] keys = nameMap.keySet().toArray(new Declaration[nameMap.size()]);
- QName[] values = nameMap.values().toArray(new QName[nameMap.size()]);
-
- for (int i = 0; i < values.length; i++) {
- QName qName = values[i];
- validateName(qName, keys[i]);
- for (int j = i + 1; j < values.length; j++) {
- QName otherQName = values[j];
- if (qName.equals(otherQName)) {
- printError(keys[i].getPosition(), JAXWSCoreMessages.bind(
- JAXWSCoreMessages.OPERATION_NAMES_MUST_BE_UNIQUE_ERROR, qName));
- printError(keys[j].getPosition(), JAXWSCoreMessages.bind(
- JAXWSCoreMessages.OPERATION_NAMES_MUST_BE_UNIQUE_ERROR, otherQName));
- }
- }
- }
- }
-
- private String getAttributeValue(Declaration declaration, Class<? extends Annotation> annotation, String attributeName) {
- AnnotationMirror annotationMirror = AnnotationUtils.getAnnotation(declaration, annotation);
- if (annotationMirror != null) {
- return AnnotationUtils.getStringValue(annotationMirror, attributeName);
- }
- return null;
- }
-
- private void checkWrapperAndFaultBeanNames(Collection<? extends MethodDeclaration> methodDeclarations) {
- AnnotationTypeDeclaration requestWrapperDeclaration = (AnnotationTypeDeclaration) environment
- .getTypeDeclaration(RequestWrapper.class.getName());
-
- AnnotationTypeDeclaration resposeWrapperDeclaration = (AnnotationTypeDeclaration) environment
- .getTypeDeclaration(ResponseWrapper.class.getName());
-
- Set<Declaration> methods = new HashSet<Declaration>();
- methods.addAll(environment.getDeclarationsAnnotatedWith(requestWrapperDeclaration));
- methods.addAll(environment.getDeclarationsAnnotatedWith(resposeWrapperDeclaration));
-
- List<AnnotationValue> classNames = new ArrayList<AnnotationValue>();
- Map<Object, QName> qNames = new HashMap<Object, QName>();
-
- for (Declaration declaration : methods) {
- AnnotationMirror requestWrapper = AnnotationUtils.getAnnotation(declaration, RequestWrapper.class);
- if (requestWrapper != null) {
- addClassName(requestWrapper, CLASS_NAME, classNames);
- addLocalName(requestWrapper, LOCAL_NAME, declaration, qNames);
- }
-
- AnnotationMirror responseWrapper = AnnotationUtils.getAnnotation(declaration, ResponseWrapper.class);
- if (responseWrapper != null) {
- addClassName(responseWrapper, CLASS_NAME, classNames);
- addLocalName(responseWrapper, LOCAL_NAME, declaration, qNames);
- }
- }
-
- Set<ReferenceType> thrownTypes = new HashSet<ReferenceType>();
-
- for (MethodDeclaration methodDeclaration : methodDeclarations) {
- thrownTypes.addAll(methodDeclaration.getThrownTypes());
- }
-
- for (ReferenceType referenceType : thrownTypes) {
- if (referenceType instanceof ClassDeclaration) {
- ClassDeclaration classDeclaration = (ClassDeclaration) referenceType;
- AnnotationMirror webFault = AnnotationUtils.getAnnotation(classDeclaration, WebFault.class);
- if (webFault != null) {
- addClassName(webFault, FAULT_BEAN, classNames);
- }
- }
- }
-
- for (int i = 0; i < classNames.size(); i++) {
- AnnotationValue className = classNames.get(i);
- for (int j = i + 1; j < classNames.size(); j++) {
- AnnotationValue otherClassName = classNames.get(j);
- if (className.getValue().toString().equalsIgnoreCase(otherClassName.getValue().toString())) {
- printError(className.getPosition(), JAXWSCoreMessages.bind(
- JAXWSCoreMessages.WRAPPER_FAULT_BEAN_NAMES_MUST_BE_UNIQUE, className));
- printError(otherClassName.getPosition(), JAXWSCoreMessages.bind(
- JAXWSCoreMessages.WRAPPER_FAULT_BEAN_NAMES_MUST_BE_UNIQUE, otherClassName));
- }
- }
- }
-
- validateQNames(qNames, JAXWSCoreMessages.LOCAL_NAME_ATTRIBUTES_MUST_BE_UNIQUE);
- }
-
- private void validateQNames(Map<Object, QName> qNames, String errorMessage) {
- Object[] keys = qNames.keySet().toArray(new Object[qNames.size()]);
- QName[] values = qNames.values().toArray(new QName[qNames.size()]);
-
- for(int i = 0; i < values.length; i++) {
- QName qName = values[i];
- validateName(qName, keys[i]);
- for(int j = i + 1; j < values.length; j++) {
- QName otherQName = values[j];
- if (qName.equals(otherQName)) {
- printError(getPosition(keys[i]), JAXWSCoreMessages.bind(errorMessage, qName));
- printError(getPosition(keys[j]), JAXWSCoreMessages.bind(errorMessage, otherQName));
- }
- }
- }
- }
-
- private void addClassName(AnnotationMirror annotationMirror, String attributeKey,
- List<AnnotationValue> classNames) {
- AnnotationValue className = AnnotationUtils.getAnnotationValue(annotationMirror, attributeKey);
- if (className != null) {
- classNames.add(className);
- }
- }
-
- private void addLocalName(AnnotationMirror annotationMirror, String attributeKey,
- Declaration declaration, Map<Object, QName> qNames) {
- AnnotationValue localNameValue = AnnotationUtils.getAnnotationValue(annotationMirror, attributeKey);
- if (localNameValue != null) {
- qNames.put(localNameValue, new QName(getTargetNamespace(annotationMirror,
- (MethodDeclaration)declaration), localNameValue.getValue().toString()));
- }
- }
-
- private void checkDocumentBareMethods(Collection<? extends MethodDeclaration> methods) {
- List<MethodDeclaration> docBareMethods = new ArrayList<MethodDeclaration>();
- for (MethodDeclaration methodDeclaration : methods) {
- if (hasDocumentBareSOAPBinding(methodDeclaration)) {
- docBareMethods.add(methodDeclaration);
- }
- }
-
- Map<Object, QName> qNames = new HashMap<Object, QName>();
- for (MethodDeclaration methodDeclaration : docBareMethods) {
- getDocumentBareOperationRequest(methodDeclaration, qNames);
- getDocumentBareOperationResponse(methodDeclaration, qNames);
- }
-
- validateQNames(qNames, JAXWSCoreMessages.DOC_BARE_METHODS_UNIQUE_XML_ELEMENTS);
- }
-
- private SourcePosition getPosition(Object value) {
- if (value instanceof AnnotationValue) {
- return ((AnnotationValue) value).getPosition();
- }
- if (value instanceof MethodDeclaration) {
- return ((MethodDeclaration) value).getPosition();
- }
- if (value instanceof ParameterDeclaration) {
- return ((ParameterDeclaration) value).getPosition();
- }
- return null;
- }
-
- private void validateName(QName qName, Object object) {
- String name = qName.getLocalPart();
- if (name.trim().length() > 0) {
- if (!XMLChar.isValidNCName(name)) {
- printError(getPosition(object), JAXWSCoreMessages.bind(
- JAXWSCoreMessages.INVALID_NAME_ATTRIBUTE, name));
- }
- }
- }
-
- private void validateName(AnnotationValue value) {
- String name = value.getValue().toString();
- if (name.trim().length() > 0) {
- if (!XMLChar.isValidNCName(name)) {
- printError(value.getPosition(), JAXWSCoreMessages.bind(
- JAXWSCoreMessages.INVALID_NAME_ATTRIBUTE, name));
- }
- }
- }
-
- private void getDocumentBareOperationRequest(MethodDeclaration methodDeclaration, Map<Object, QName> qNames) {
- Collection<ParameterDeclaration> parameters = methodDeclaration.getParameters();
- for (ParameterDeclaration parameterDeclaration : parameters) {
- AnnotationMirror webParam = AnnotationUtils.getAnnotation(parameterDeclaration, WebParam.class);
- if (webParam != null) {
- String mode = getWebParamMode(webParam, parameterDeclaration);
- if (mode.equals(Mode.IN.name()) || mode.equals(Mode.INOUT.name())) {
- getOperationRequest(webParam, methodDeclaration, parameterDeclaration, qNames);
- }
- } else {
- qNames.put(parameterDeclaration, getOperationRequestDefault(methodDeclaration));
- }
- }
- }
-
- private void getOperationRequest(AnnotationMirror annotationMirror, MethodDeclaration methodDeclaration,
- ParameterDeclaration parameterDeclaration, Map<Object, QName> qNames) {
- AnnotationValue name = AnnotationUtils.getAnnotationValue(annotationMirror, NAME);
- if (name != null) {
- QName qName = new QName(getTargetNamespace(annotationMirror, methodDeclaration), name.getValue()
- .toString());
- qNames.put(name, qName);
- } else {
- qNames.put(parameterDeclaration, getOperationRequestDefault(methodDeclaration));
- }
- }
-
- private QName getOperationRequestDefault(MethodDeclaration methodDeclaration) {
- return new QName(getTargetNamespace(methodDeclaration.getDeclaringType()), methodDeclaration
- .getSimpleName());
- }
-
- private void getDocumentBareOperationResponse(MethodDeclaration methodDeclaration, Map<Object, QName> qNames) {
- if (!returnsVoid(methodDeclaration)) {
- getOperationResponse(AnnotationUtils.getAnnotation(methodDeclaration, WebResult.class),
- methodDeclaration, qNames);
- } else {
- Collection<ParameterDeclaration> parameters = methodDeclaration.getParameters();
- for (ParameterDeclaration parameterDeclaration : parameters) {
- AnnotationMirror webParam = AnnotationUtils.getAnnotation(parameterDeclaration, WebParam.class);
- if (webParam != null) {
- String mode = getWebParamMode(webParam, parameterDeclaration);
- if (mode.equals(Mode.OUT.name()) || mode.equals(Mode.INOUT.name()) && !isHeader(webParam)) {
- getOperationResponse(webParam, methodDeclaration, qNames);
- break;
- }
- } else if (getDefaultWebParamMode(parameterDeclaration).equals(Mode.INOUT.name())) {
- qNames.put(parameterDeclaration, getOperationResponseDefault(methodDeclaration));
- break;
- }
- }
- }
- }
-
- private void getOperationResponse(AnnotationMirror annotationMirror, MethodDeclaration methodDeclaration,
- Map<Object, QName> qNames) {
- if (annotationMirror != null) {
- AnnotationValue name = AnnotationUtils.getAnnotationValue(annotationMirror, NAME);
- if (name != null) {
- qNames.put(name, new QName(getTargetNamespace(annotationMirror, methodDeclaration), name
- .getValue().toString()));
- } else {
- qNames.put(methodDeclaration, getOperationResponseDefault(methodDeclaration));
- }
- } else {
- qNames.put(methodDeclaration, getOperationResponseDefault(methodDeclaration));
- }
- }
-
- private QName getOperationResponseDefault(MethodDeclaration methodDeclaration) {
- return new QName(getTargetNamespace(methodDeclaration.getDeclaringType()), methodDeclaration
- .getSimpleName()
- + RESPONSE_SUFFIX);
- }
-
- private boolean isHeader(AnnotationMirror annotationMirror) {
- Boolean header = AnnotationUtils.getBooleanValue(annotationMirror, HEADER);
- if (header != null) {
- return header.booleanValue();
- }
- return false;
- }
-
- private String getWebParamMode(AnnotationMirror annotationMirror, ParameterDeclaration parameterDeclaration) {
- String mode = AnnotationUtils.getStringValue(annotationMirror, MODE);
- if (mode == null || mode.length() == 0) {
- mode = getDefaultWebParamMode(parameterDeclaration);
- }
- return mode;
- }
-
- private String getDefaultWebParamMode(ParameterDeclaration parameterDeclaration) {
- TypeMirror typeMirror = environment.getTypeUtils().getErasure(parameterDeclaration.getType());
- if (typeMirror.toString().equals(Holder.class.getCanonicalName())) {
- return Mode.INOUT.name();
- }
- return Mode.IN.name();
- }
-
- private boolean returnsVoid(MethodDeclaration methodDeclaration) {
- return methodDeclaration.getReturnType().equals(environment.getTypeUtils().getVoidType());
- }
-
- private void checkMethodParameters(Collection<? extends MethodDeclaration> methodDeclarations) {
- List<MethodDeclaration> methods = new ArrayList<MethodDeclaration>();
- for (MethodDeclaration methodDeclaration : methodDeclarations) {
- //Not Doc Bare
- if (!hasDocumentBareSOAPBinding(methodDeclaration)) {
- methods.add(methodDeclaration);
- }
- }
-
- for (MethodDeclaration methodDeclaration : methods) {
- List<AnnotationValue> names = new ArrayList<AnnotationValue>();
- List<ParameterDeclaration> parameters = (List<ParameterDeclaration>) methodDeclaration.getParameters();
- for (ParameterDeclaration parameterDeclaration : parameters) {
- AnnotationMirror webParam = AnnotationUtils.getAnnotation(parameterDeclaration, WebParam.class);
- if (webParam != null) {
- AnnotationValue name = AnnotationUtils.getAnnotationValue(webParam, NAME);
- if (name != null) {
- names.add(name);
- testForGeneratedNameClash(name, parameterDeclaration, parameters);
- }
- }
- }
-
- for (int i = 0; i < names.size(); i++) {
- AnnotationValue name = names.get(i);
- validateName(name);
- for (int j = i + 1; j < names.size(); j++) {
- AnnotationValue otherName = names.get(j);
- if (name.toString().equals(otherName.toString())) {
- printError(name.getPosition(), JAXWSCoreMessages.bind(
- JAXWSCoreMessages.PARAMETER_NAME_CLASH, name.getValue().toString()));
- printError(otherName.getPosition(), JAXWSCoreMessages.bind(
- JAXWSCoreMessages.PARAMETER_NAME_CLASH, otherName.getValue().toString()));
- }
- }
- }
- }
- }
-
- private void testForGeneratedNameClash(AnnotationValue webParamName, ParameterDeclaration parameter,
- List<ParameterDeclaration> parameters) {
- String name = webParamName.toString();
- Matcher matcher = pattern.matcher(name);
- if (matcher.matches()) {
- int argN = Integer.parseInt(name.substring(3));
- if (argN != parameters.indexOf(parameter)) {
- if (argN < parameters.size()) {
- ParameterDeclaration parameterN = parameters.get(argN);
- AnnotationMirror webParamN = AnnotationUtils.getAnnotation(parameterN, WebParam.class);
- if (webParamN != null) {
- AnnotationValue webParamNameN = AnnotationUtils.getAnnotationValue(webParamN, NAME);
- if (webParamNameN == null) {
- printError(parameterN.getPosition(), JAXWSCoreMessages.bind(
- JAXWSCoreMessages.GENERATED_PARAMETER_NAME_CLASH, name));
- printError(webParamName.getPosition(), JAXWSCoreMessages.bind(
- JAXWSCoreMessages.GENERATED_PARAMETER_NAME_CLASH, name));
- } else if (webParamNameN.toString().length() == 0) {
- printError(webParamNameN.getPosition(), JAXWSCoreMessages.bind(
- JAXWSCoreMessages.GENERATED_PARAMETER_NAME_CLASH, name));
- printError(webParamName.getPosition(), JAXWSCoreMessages.bind(
- JAXWSCoreMessages.GENERATED_PARAMETER_NAME_CLASH, name));
- }
- } else {
- printError(parameterN.getPosition(), JAXWSCoreMessages.bind(
- JAXWSCoreMessages.GENERATED_PARAMETER_NAME_CLASH, name));
- printError(webParamName.getPosition(), JAXWSCoreMessages.bind(
- JAXWSCoreMessages.GENERATED_PARAMETER_NAME_CLASH, name));
- }
- }
- }
- }
- }
-
- private String getTargetNamespace(TypeDeclaration typeDeclaration) {
- String targetNamespace = getAttributeValue(typeDeclaration, WebService.class, TARGET_NAMESPACE);
- if (targetNamespace != null) {
- return targetNamespace;
- }
-
- return JDTUtils.getTargetNamespaceFromPackageName(typeDeclaration.getPackage().getQualifiedName());
- }
-
- private String getTargetNamespace(AnnotationMirror annotationMirror, MethodDeclaration methodDeclaration) {
- String targetNamespace = AnnotationUtils.getStringValue(annotationMirror, TARGET_NAMESPACE);
- if (targetNamespace == null) {
- targetNamespace = getTargetNamespace(methodDeclaration.getDeclaringType());
- }
- return targetNamespace;
- }
-
- private String getOperationName(MethodDeclaration methodDeclaration) {
- String operationName = getAttributeValue(methodDeclaration, WebMethod.class, OPERATION_NAME);
- if (operationName != null) {
- return operationName;
- }
- return methodDeclaration.getSimpleName();
- }
-
- private boolean hasDocumentBareSOAPBinding(Declaration declaration) {
- AnnotationMirror soapBinding = AnnotationUtils.getAnnotation(declaration, SOAPBinding.class);
- if (soapBinding != null) {
- return JAXWSUtils.isDocumentBare(soapBinding);
- }
- if (declaration instanceof MethodDeclaration) {
- MethodDeclaration methodDeclaration = (MethodDeclaration) declaration;
- return hasDocumentBareSOAPBinding(methodDeclaration.getDeclaringType());
- }
-
- return false;
- }
-}
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 cc53422..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.core/src/org/eclipse/jst/ws/internal/jaxws/core/annotations/validation/WebMethodCheckForWebServiceRule.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Shane Clarke.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Shane Clarke - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.jaxws.core.annotations.validation;
-
-import java.util.Collection;
-
-import javax.jws.WebMethod;
-import javax.jws.WebService;
-
-import org.eclipse.jst.ws.annotations.core.processor.AbstractAnnotationProcessor;
-import org.eclipse.jst.ws.annotations.core.utils.AnnotationUtils;
-import org.eclipse.jst.ws.internal.jaxws.core.JAXWSCoreMessages;
-
-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;
-
-public class WebMethodCheckForWebServiceRule extends AbstractAnnotationProcessor {
-
- @Override
- public void process() {
- AnnotationTypeDeclaration annotationDeclaration = (AnnotationTypeDeclaration) environment
- .getTypeDeclaration(WebMethod.class.getName());
-
- Collection<Declaration> annotatedTypes = environment
- .getDeclarationsAnnotatedWith(annotationDeclaration);
-
- for (Declaration declaration : annotatedTypes) {
- Collection<AnnotationMirror> annotationMirrors = declaration.getAnnotationMirrors();
- for (AnnotationMirror mirror : annotationMirrors) {
- if (mirror.getAnnotationType().getDeclaration().equals(annotationDeclaration)
- && !checkForWebServiceAnnotation(((MethodDeclaration) declaration).getDeclaringType())) {
- printFixableError(mirror.getPosition(),
- JAXWSCoreMessages.WEBMETHOD_ONLY_SUPPORTED_ON_CLASSES_WITH_WEBSERVICE);
- }
- }
- }
- }
-
- private boolean checkForWebServiceAnnotation(TypeDeclaration typeDeclaration) {
- return AnnotationUtils.getAnnotation(typeDeclaration, WebService.class) != null;
- }
-}
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 426923e..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.core/src/org/eclipse/jst/ws/internal/jaxws/core/annotations/validation/WebMethodExcludeRules.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 static org.eclipse.jst.ws.internal.jaxws.core.utils.JAXWSUtils.EXCLUDE;
-
-import java.util.Collection;
-
-import javax.jws.WebMethod;
-
-import org.eclipse.jst.ws.annotations.core.processor.AbstractAnnotationProcessor;
-import org.eclipse.jst.ws.annotations.core.utils.AnnotationUtils;
-import org.eclipse.jst.ws.internal.jaxws.core.JAXWSCoreMessages;
-
-import com.sun.mirror.declaration.AnnotationMirror;
-import com.sun.mirror.declaration.AnnotationTypeDeclaration;
-import com.sun.mirror.declaration.AnnotationValue;
-import com.sun.mirror.declaration.ClassDeclaration;
-import com.sun.mirror.declaration.Declaration;
-import com.sun.mirror.declaration.InterfaceDeclaration;
-import com.sun.mirror.declaration.MethodDeclaration;
-import com.sun.mirror.declaration.TypeDeclaration;
-
-public class WebMethodExcludeRules extends AbstractAnnotationProcessor {
-
- @Override
- public void process() {
- AnnotationTypeDeclaration annotationDeclaration = (AnnotationTypeDeclaration) environment
- .getTypeDeclaration(WebMethod.class.getName());
-
- Collection<Declaration> annotatedTypes = environment.getDeclarationsAnnotatedWith(
- annotationDeclaration);
-
- for (Declaration declaration : annotatedTypes) {
- Collection<AnnotationMirror> annotationMirrors = declaration.getAnnotationMirrors();
- for (AnnotationMirror annotationMirror : annotationMirrors) {
- AnnotationValue excludeAttribute = AnnotationUtils.getAnnotationValue(annotationMirror,
- EXCLUDE);
- if (excludeAttribute != null) {
- MethodDeclaration methodDeclaration = (MethodDeclaration) declaration;
- TypeDeclaration typeDeclaration = methodDeclaration.getDeclaringType();
-
- if (typeDeclaration instanceof InterfaceDeclaration
- && ((Boolean) excludeAttribute.getValue()).booleanValue()) {
- printFixableError(excludeAttribute.getPosition(),
- JAXWSCoreMessages.WEBMETHOD_EXCLUDE_NOT_ALLOWED_ON_SEI);
- }
-
- if (typeDeclaration instanceof ClassDeclaration
- && annotationMirror.getElementValues().size() > 1
- && Boolean.valueOf(excludeAttribute.getValue().toString()).booleanValue()) {
- printFixableError(excludeAttribute.getPosition(),
- JAXWSCoreMessages.WEBMETHOD_EXCLUDE_SPECIFIED_NO_OTHER_ATTRIBUTES_ALLOWED);
- }
- }
- }
- }
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.core/src/org/eclipse/jst/ws/internal/jaxws/core/annotations/validation/WebMethodPublicStaticFinalRule.java b/bundles/org.eclipse.jst.ws.jaxws.core/src/org/eclipse/jst/ws/internal/jaxws/core/annotations/validation/WebMethodPublicStaticFinalRule.java
deleted file mode 100644
index 4920139..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.core/src/org/eclipse/jst/ws/internal/jaxws/core/annotations/validation/WebMethodPublicStaticFinalRule.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 javax.jws.WebMethod;
-
-import org.eclipse.jst.ws.annotations.core.processor.AbstractAnnotationProcessor;
-import org.eclipse.jst.ws.internal.jaxws.core.JAXWSCoreMessages;
-
-import com.sun.mirror.declaration.AnnotationTypeDeclaration;
-import com.sun.mirror.declaration.ClassDeclaration;
-import com.sun.mirror.declaration.Declaration;
-import com.sun.mirror.declaration.MethodDeclaration;
-import com.sun.mirror.declaration.Modifier;
-
-public class WebMethodPublicStaticFinalRule extends AbstractAnnotationProcessor {
-
- @Override
- public void process() {
- AnnotationTypeDeclaration annotationDeclaration = (AnnotationTypeDeclaration) environment
- .getTypeDeclaration(WebMethod.class.getName());
-
- Collection<Declaration> annotatedTypes = environment.getDeclarationsAnnotatedWith(
- annotationDeclaration);
-
- for (Declaration declaration : annotatedTypes) {
- if (declaration instanceof MethodDeclaration) {
- MethodDeclaration methodDeclaration = (MethodDeclaration) declaration;
- if (methodDeclaration.getDeclaringType() instanceof ClassDeclaration) {
- Collection<Modifier> modifiers = methodDeclaration.getModifiers();
- if (!modifiers.contains(Modifier.PUBLIC)) {
- printFixableError(methodDeclaration.getPosition(),
- JAXWSCoreMessages.WEBMETHOD_ONLY_ON_PUBLIC_METHODS);
- }
-
- if (modifiers.contains(Modifier.FINAL)) {
- printFixableError(methodDeclaration.getPosition(),
- JAXWSCoreMessages.WEBMETHOD_NO_FINAL_MODIFIER_ALLOWED);
- }
-
- if (modifiers.contains(Modifier.STATIC)) {
- printFixableError(methodDeclaration.getPosition(),
- JAXWSCoreMessages.WEBMETHOD_NO_STATIC_MODIFIER_ALLOWED);
- }
- }
- }
- }
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.core/src/org/eclipse/jst/ws/internal/jaxws/core/annotations/validation/WebServiceDefaultPublicConstructorRule.java b/bundles/org.eclipse.jst.ws.jaxws.core/src/org/eclipse/jst/ws/internal/jaxws/core/annotations/validation/WebServiceDefaultPublicConstructorRule.java
deleted file mode 100644
index 841a76e..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.core/src/org/eclipse/jst/ws/internal/jaxws/core/annotations/validation/WebServiceDefaultPublicConstructorRule.java
+++ /dev/null
@@ -1,67 +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 javax.jws.WebService;
-
-import org.eclipse.jst.ws.annotations.core.processor.AbstractAnnotationProcessor;
-import org.eclipse.jst.ws.internal.jaxws.core.JAXWSCoreMessages;
-
-import com.sun.mirror.declaration.AnnotationMirror;
-import com.sun.mirror.declaration.AnnotationTypeDeclaration;
-import com.sun.mirror.declaration.ClassDeclaration;
-import com.sun.mirror.declaration.ConstructorDeclaration;
-import com.sun.mirror.declaration.Declaration;
-import com.sun.mirror.declaration.Modifier;
-
-public class WebServiceDefaultPublicConstructorRule extends AbstractAnnotationProcessor {
-
- @Override
- public void process() {
- AnnotationTypeDeclaration annotationDeclaration = (AnnotationTypeDeclaration) environment
- .getTypeDeclaration(WebService.class.getName());
-
- Collection<Declaration> annotatedTypes = environment
- .getDeclarationsAnnotatedWith(annotationDeclaration);
-
- for (Declaration declaration : annotatedTypes) {
- if (declaration instanceof ClassDeclaration) {
- boolean hasDefaultConstructor = false;
- ClassDeclaration classDeclaration = (ClassDeclaration) declaration;
- Collection<ConstructorDeclaration> constructors = classDeclaration.getConstructors();
- if (constructors.size() == 0) {
- hasDefaultConstructor = true;
- } else {
- for (ConstructorDeclaration constructorDeclaration : constructors) {
- if (constructorDeclaration.getModifiers().contains(Modifier.PUBLIC) &&
- constructorDeclaration.getParameters().size() == 0) {
- hasDefaultConstructor = true;
- break;
- }
- }
- }
- if (!hasDefaultConstructor) {
- Collection<AnnotationMirror> annotationMirrors = declaration.getAnnotationMirrors();
- for (AnnotationMirror mirror : annotationMirrors) {
- if ( mirror.getAnnotationType().toString().equals(annotationDeclaration
- .getQualifiedName())) {
- printFixableError(declaration.getPosition(),
- JAXWSCoreMessages.WEBSERVICE_DEFAULT_PUBLIC_CONSTRUCTOR);
- }
- }
- }
- }
- }
- }
-
-}
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 cc4bd37..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.core/src/org/eclipse/jst/ws/internal/jaxws/core/annotations/validation/WebServiceNoFinalizeMethodRule.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 static org.eclipse.jst.ws.internal.jaxws.core.utils.JAXWSUtils.FINALIZE;
-
-import java.util.Collection;
-
-import javax.jws.WebService;
-
-import org.eclipse.jst.ws.annotations.core.processor.AbstractAnnotationProcessor;
-import org.eclipse.jst.ws.internal.jaxws.core.JAXWSCoreMessages;
-
-import com.sun.mirror.declaration.AnnotationTypeDeclaration;
-import com.sun.mirror.declaration.Declaration;
-import com.sun.mirror.declaration.MethodDeclaration;
-import com.sun.mirror.declaration.TypeDeclaration;
-
-public class WebServiceNoFinalizeMethodRule extends AbstractAnnotationProcessor {
-
- @Override
- public void process() {
- AnnotationTypeDeclaration annotationDeclaration = (AnnotationTypeDeclaration) environment
- .getTypeDeclaration(WebService.class.getName());
-
- Collection<Declaration> annotatedTypes = environment
- .getDeclarationsAnnotatedWith(annotationDeclaration);
-
- for (Declaration declaration : annotatedTypes) {
- MethodDeclaration finalizeMethod = getFinalizeMethod(declaration);
- if (finalizeMethod != null) {
- printFixableError(finalizeMethod.getPosition(), JAXWSCoreMessages.WEBSERVICE_OVERRIDE_FINALIZE);
- }
- }
- }
-
- private MethodDeclaration getFinalizeMethod(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 methodDeclaration;
- }
- }
- }
- return null;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.core/src/org/eclipse/jst/ws/internal/jaxws/core/annotations/validation/WebServiceProviderRules.java b/bundles/org.eclipse.jst.ws.jaxws.core/src/org/eclipse/jst/ws/internal/jaxws/core/annotations/validation/WebServiceProviderRules.java
deleted file mode 100644
index 1575a26..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.core/src/org/eclipse/jst/ws/internal/jaxws/core/annotations/validation/WebServiceProviderRules.java
+++ /dev/null
@@ -1,203 +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 static org.eclipse.jst.ws.internal.jaxws.core.utils.JAXWSUtils.VALUE;
-
-import java.util.Collection;
-
-import javax.activation.DataSource;
-import javax.xml.soap.SOAPMessage;
-import javax.xml.transform.Source;
-import javax.xml.ws.BindingType;
-import javax.xml.ws.ServiceMode;
-import javax.xml.ws.WebServiceProvider;
-import javax.xml.ws.Service.Mode;
-import javax.xml.ws.http.HTTPBinding;
-import javax.xml.ws.soap.SOAPBinding;
-
-import org.eclipse.jst.ws.annotations.core.processor.AbstractAnnotationProcessor;
-import org.eclipse.jst.ws.annotations.core.utils.AnnotationUtils;
-import org.eclipse.jst.ws.internal.jaxws.core.JAXWSCoreMessages;
-
-import com.sun.mirror.declaration.AnnotationMirror;
-import com.sun.mirror.declaration.AnnotationTypeDeclaration;
-import com.sun.mirror.declaration.ClassDeclaration;
-import com.sun.mirror.declaration.ConstructorDeclaration;
-import com.sun.mirror.declaration.Declaration;
-import com.sun.mirror.declaration.InterfaceDeclaration;
-import com.sun.mirror.declaration.Modifier;
-import com.sun.mirror.type.InterfaceType;
-import com.sun.mirror.type.TypeMirror;
-
-public class WebServiceProviderRules extends AbstractAnnotationProcessor {
-
- @Override
- public void process() {
- AnnotationTypeDeclaration annotationDeclaration = (AnnotationTypeDeclaration) environment
- .getTypeDeclaration(WebServiceProvider.class.getName());
-
- Collection<Declaration> annotatedTypes = environment.getDeclarationsAnnotatedWith(annotationDeclaration);
-
- for (Declaration declaration : annotatedTypes) {
- if (declaration instanceof ClassDeclaration) {
- checkForDefaultConstructor((ClassDeclaration)declaration);
- checkForProviderInterface((ClassDeclaration)declaration);
- }
- }
- }
-
- private void checkForProviderInterface(ClassDeclaration classDeclaration) {
- Collection<InterfaceType> interfaces = classDeclaration.getSuperinterfaces();
- boolean implementsTypedProvider = false;
- if (interfaces.size() > 0) {
- for (InterfaceType interfaceType : interfaces) {
- Collection<TypeMirror> typeParameters = interfaceType.getActualTypeArguments();
- if (typeParameters.size() > 0) {
- for (TypeMirror typeMirror : typeParameters) {
- if (typeMirror instanceof ClassDeclaration) {
- ClassDeclaration classDecl = (ClassDeclaration) typeMirror;
- if (classDecl.getQualifiedName().equals(SOAPMessage.class.getCanonicalName())) {
- checkSOAPMessageRequirements(classDeclaration);
- implementsTypedProvider = true;
- break;
- }
- Collection<InterfaceType> implementedInterfaces = classDecl.getSuperinterfaces();
- for (InterfaceType implementedInterface : implementedInterfaces) {
- InterfaceDeclaration interfaceDecl = implementedInterface.getDeclaration();
- if (interfaceDecl != null) {
- if (interfaceDecl.getQualifiedName().equals(Source.class.getCanonicalName())) {
- implementsTypedProvider = true;
- break;
- }
- if (interfaceDecl.getQualifiedName().equals(DataSource.class.getCanonicalName())) {
- checkDataSourceRequirements(classDeclaration);
- implementsTypedProvider = true;
- break;
- }
- }
- }
- }
- if (typeMirror instanceof InterfaceDeclaration) {
- InterfaceDeclaration interfaceDecl = (InterfaceDeclaration) typeMirror;
- if (interfaceDecl.getQualifiedName().equals(Source.class.getCanonicalName())) {
- implementsTypedProvider = true;
- break;
- }
- if (interfaceDecl.getQualifiedName().equals(DataSource.class.getCanonicalName())) {
- checkDataSourceRequirements(classDeclaration);
- implementsTypedProvider = true;
- break;
- }
- }
- }
- }
- }
- }
- if (!implementsTypedProvider) {
- AnnotationMirror webServiceProvider = AnnotationUtils.getAnnotation(classDeclaration,
- WebServiceProvider.class);
- printFixableError(webServiceProvider.getPosition(),
- JAXWSCoreMessages.WEBSERVICEPROVIDER_IMPLEMENT_TYPED_PROVIDER_INTERFACE);
- }
- }
-
- private void checkSOAPMessageRequirements(ClassDeclaration classDeclaration) {
- if (!isSOAPBinding(classDeclaration)) {
- printError(classDeclaration.getPosition(), JAXWSCoreMessages.WEBSERVICEPROVIDER_SOAPMESSAGE_SOAPBINDING);
- }
- if (!isMessageMode(classDeclaration)) {
- printError(classDeclaration.getPosition(), JAXWSCoreMessages.WEBSERVICEPROVIDER_SOAPMESSAGE_MESSAGE_MODE);
- }
- }
-
- private void checkDataSourceRequirements(ClassDeclaration classDeclaration) {
- if (!isHTTPBinding(classDeclaration)) {
- printError(classDeclaration.getPosition(), JAXWSCoreMessages.WEBSERVICEPROVIDER_DATASOURCE_HTTPBINDING);
- }
-
- if (!isMessageMode(classDeclaration)) {
- printError(classDeclaration.getPosition(), JAXWSCoreMessages.WEBSERVICEPROVIDER_DATASOURCE_MESSAGE_MODE);
-
- }
- }
-
- private boolean isSOAPBinding(ClassDeclaration classDeclaration) {
- String bindingType = getBindingTypeValue(classDeclaration);
- if (bindingType.equals(SOAPBinding.SOAP11HTTP_BINDING)
- || bindingType.equals(SOAPBinding.SOAP12HTTP_BINDING)
- || bindingType.equals(SOAPBinding.SOAP11HTTP_MTOM_BINDING)
- || bindingType.equals(SOAPBinding.SOAP12HTTP_MTOM_BINDING)) {
- return true;
- }
- return false;
- }
-
- private boolean isHTTPBinding(ClassDeclaration classDeclaration) {
- String bindingType = getBindingTypeValue(classDeclaration);
- if (bindingType.equals(HTTPBinding.HTTP_BINDING)) {
- return true;
- }
- return false;
- }
-
- private String getBindingTypeValue(ClassDeclaration classDeclaration) {
- AnnotationMirror bindingType = AnnotationUtils.getAnnotation(classDeclaration, BindingType.class);
- if (bindingType != null) {
- String value = AnnotationUtils.getStringValue(bindingType, VALUE);
- if (value != null) {
- return value;
- }
- }
- return SOAPBinding.SOAP11HTTP_BINDING;
- }
-
- private boolean isMessageMode(ClassDeclaration classDeclaration) {
- return getServiceMode(classDeclaration).equals(Mode.MESSAGE.name());
- }
-
- private boolean isPayloadMode(ClassDeclaration classDeclaration) {
- return getServiceMode(classDeclaration).equals(Mode.PAYLOAD.name());
- }
-
- private String getServiceMode(ClassDeclaration classDeclaration) {
- AnnotationMirror serviceMode = AnnotationUtils.getAnnotation(classDeclaration, ServiceMode.class);
- if (serviceMode != null) {
- String value = AnnotationUtils.getStringValue(serviceMode, VALUE);
- if (value != null) {
- return value;
- }
- }
- return Mode.PAYLOAD.toString();
- }
-
- private void checkForDefaultConstructor(ClassDeclaration classDeclaration) {
- boolean hasDefaultConstructor = false;
- Collection<ConstructorDeclaration> constructors = classDeclaration.getConstructors();
- if (constructors.size() == 0) {
- hasDefaultConstructor = true;
- } else {
- for (ConstructorDeclaration constructorDeclaration : constructors) {
- if (constructorDeclaration.getModifiers().contains(Modifier.PUBLIC) &&
- constructorDeclaration.getParameters().size() == 0) {
- hasDefaultConstructor = true;
- break;
- }
- }
- }
- if (!hasDefaultConstructor) {
- AnnotationMirror webServiceProvider = AnnotationUtils.getAnnotation(classDeclaration, WebServiceProvider.class);
- printFixableError(webServiceProvider.getPosition(),
- JAXWSCoreMessages.WEBSERVICEPROVIDER_DEFAULT_PUBLIC_CONSTRUCTOR);
- }
-
- }
-}
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 c114ae6..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.core/src/org/eclipse/jst/ws/internal/jaxws/core/annotations/validation/WebServicePublicAbstractFinalRule.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.core.annotations.validation;
-
-import java.util.Collection;
-
-import javax.jws.WebService;
-
-import org.eclipse.jst.ws.annotations.core.processor.AbstractAnnotationProcessor;
-import org.eclipse.jst.ws.internal.jaxws.core.JAXWSCoreMessages;
-
-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;
-
-public class WebServicePublicAbstractFinalRule extends AbstractAnnotationProcessor {
-
- @Override
- public void process() {
- AnnotationTypeDeclaration annotationDeclaration = (AnnotationTypeDeclaration) environment
- .getTypeDeclaration(WebService.class.getName());
-
- 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())) {
- printFixableError(declaration.getPosition(),
- JAXWSCoreMessages.WEBSERVICE_PUBLIC_ABSTRACT_FINAL);
- }
- }
- }
- TypeDeclaration typeDeclaration = (TypeDeclaration)declaration;
- if (typeDeclaration.getNestedTypes().size() > 0) {
- testNestedTypes(typeDeclaration.getNestedTypes(), annotationDeclaration);
- }
- }
- }
- }
-
- private void testNestedTypes(Collection<TypeDeclaration> nestedTypes,
- AnnotationTypeDeclaration annotationDeclaration) {
- for (TypeDeclaration nestedDeclaration : nestedTypes) {
- Collection<AnnotationMirror> annotationMirrors = nestedDeclaration.getAnnotationMirrors();
- for (AnnotationMirror mirror : annotationMirrors) {
- if (mirror.getAnnotationType().toString().equals(annotationDeclaration.getQualifiedName())) {
- printError(mirror.getPosition(),
- JAXWSCoreMessages.WEBSERVICE_PUBLIC_ABSTRACT_FINAL);
- }
- }
- }
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.core/src/org/eclipse/jst/ws/internal/jaxws/core/annotations/validation/WebServiceRefsRules.java b/bundles/org.eclipse.jst.ws.jaxws.core/src/org/eclipse/jst/ws/internal/jaxws/core/annotations/validation/WebServiceRefsRules.java
deleted file mode 100644
index 487f5e4..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.core/src/org/eclipse/jst/ws/internal/jaxws/core/annotations/validation/WebServiceRefsRules.java
+++ /dev/null
@@ -1,83 +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 static org.eclipse.jst.ws.internal.jaxws.core.utils.JAXWSUtils.NAME;
-import static org.eclipse.jst.ws.internal.jaxws.core.utils.JAXWSUtils.TYPE;
-import static org.eclipse.jst.ws.internal.jaxws.core.utils.JAXWSUtils.VALUE;
-
-import java.util.Collection;
-import java.util.List;
-
-import javax.xml.ws.WebServiceRefs;
-
-import org.eclipse.jst.ws.annotations.core.processor.AbstractAnnotationProcessor;
-import org.eclipse.jst.ws.annotations.core.utils.AnnotationUtils;
-import org.eclipse.jst.ws.internal.jaxws.core.JAXWSCoreMessages;
-
-import com.sun.mirror.declaration.AnnotationMirror;
-import com.sun.mirror.declaration.AnnotationTypeDeclaration;
-import com.sun.mirror.declaration.AnnotationValue;
-import com.sun.mirror.declaration.ClassDeclaration;
-import com.sun.mirror.declaration.Declaration;
-
-public class WebServiceRefsRules extends AbstractAnnotationProcessor {
-
- @Override
- public void process() {
- AnnotationTypeDeclaration annotationTypeDeclaration = (AnnotationTypeDeclaration) environment
- .getTypeDeclaration(WebServiceRefs.class.getName());
-
- Collection<Declaration> annotatedTypes = environment
- .getDeclarationsAnnotatedWith(annotationTypeDeclaration);
-
- for (Declaration declaration : annotatedTypes) {
- AnnotationMirror webServiceRefs = AnnotationUtils
- .getAnnotation(declaration, WebServiceRefs.class);
-
- AnnotationValue webServiceRefsValue = AnnotationUtils.getAnnotationValue(webServiceRefs, VALUE);
-
- if (webServiceRefsValue != null && webServiceRefsValue.getValue() instanceof List<?>) {
- List<AnnotationValue> value = (List<AnnotationValue>) webServiceRefsValue.getValue();
-
- for (AnnotationValue annotationValue : value) {
- if (annotationValue.getValue() instanceof AnnotationMirror) {
- AnnotationMirror webServiceRef = (AnnotationMirror) annotationValue.getValue();
-
- String webServiceRefName = AnnotationUtils.getStringValue(webServiceRef, NAME);
- if (webServiceRefName == null || webServiceRefName.trim().length() == 0) {
- printError(webServiceRef.getPosition(),
- JAXWSCoreMessages.WEBSERVICEREFS_NAME_REQUIRED);
- }
-
- AnnotationValue webServiceRefNameType = AnnotationUtils.getAnnotationValue(
- webServiceRef, TYPE);
- if (webServiceRefNameType != null && webServiceRefNameType instanceof AnnotationValue) {
- AnnotationValue type = (AnnotationValue) webServiceRefNameType;
- if (type.getValue() instanceof ClassDeclaration) {
- ClassDeclaration classDeclaration = (ClassDeclaration) type.getValue();
- if (classDeclaration.getQualifiedName().equals(
- java.lang.Object.class.getCanonicalName())) {
- printError(webServiceRef.getPosition(),
- JAXWSCoreMessages.WEBSERVICEREFS_TYPE_REQUIRED);
- }
- }
- } else {
- printError(webServiceRef.getPosition(),
- JAXWSCoreMessages.WEBSERVICEREFS_TYPE_REQUIRED);
- }
- }
- }
- }
- }
- }
-
-}
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 b7250dc..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.core/src/org/eclipse/jst/ws/internal/jaxws/core/annotations/validation/WebServiceSEIAllowedAttributesRule.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 static org.eclipse.jst.ws.internal.jaxws.core.utils.JAXWSUtils.ENDPOINT_INTERFACE;
-import static org.eclipse.jst.ws.internal.jaxws.core.utils.JAXWSUtils.PORT_NAME;
-import static org.eclipse.jst.ws.internal.jaxws.core.utils.JAXWSUtils.SERVICE_NAME;
-
-import java.util.Collection;
-
-import javax.jws.WebService;
-
-import org.eclipse.jst.ws.annotations.core.processor.AbstractAnnotationProcessor;
-import org.eclipse.jst.ws.annotations.core.utils.AnnotationUtils;
-import org.eclipse.jst.ws.internal.jaxws.core.JAXWSCoreMessages;
-
-import com.sun.mirror.declaration.AnnotationMirror;
-import com.sun.mirror.declaration.AnnotationTypeDeclaration;
-import com.sun.mirror.declaration.AnnotationValue;
-import com.sun.mirror.declaration.Declaration;
-import com.sun.mirror.declaration.InterfaceDeclaration;
-
-public class WebServiceSEIAllowedAttributesRule extends AbstractAnnotationProcessor {
-
- @Override
- public void process() {
- AnnotationTypeDeclaration annotationDeclaration = (AnnotationTypeDeclaration) environment
- .getTypeDeclaration(WebService.class.getName());
-
- Collection<Declaration> annotatedTypes = environment
- .getDeclarationsAnnotatedWith(annotationDeclaration);
-
- for (Declaration declaration : annotatedTypes) {
- if (declaration instanceof InterfaceDeclaration) {
- Collection<AnnotationMirror> annotationMirrors = declaration.getAnnotationMirrors();
-
- for (AnnotationMirror mirror : annotationMirrors) {
- AnnotationValue serviceName = AnnotationUtils.getAnnotationValue(mirror, SERVICE_NAME);
- if (serviceName != null) {
- printFixableError(serviceName.getPosition(),
- JAXWSCoreMessages.WEBSERVICE_SERVICENAME_SEI);
- }
-
- AnnotationValue endpointInterface = AnnotationUtils.getAnnotationValue(mirror, ENDPOINT_INTERFACE);
- if (endpointInterface != null) {
- printFixableError(endpointInterface.getPosition(),
- JAXWSCoreMessages.WEBSERVICE_ENDPOINTINTERFACE_SEI);
- }
-
- AnnotationValue portName = AnnotationUtils.getAnnotationValue(mirror, PORT_NAME);
- if (portName != null) {
- printFixableError(portName.getPosition(),
- JAXWSCoreMessages.WEBSERVICE_PORTNAME_SEI);
- }
- }
- }
- }
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.core/src/org/eclipse/jst/ws/internal/jaxws/core/annotations/validation/WebServiceSEIRestrictionsRule.java b/bundles/org.eclipse.jst.ws.jaxws.core/src/org/eclipse/jst/ws/internal/jaxws/core/annotations/validation/WebServiceSEIRestrictionsRule.java
deleted file mode 100644
index b5e8853..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.core/src/org/eclipse/jst/ws/internal/jaxws/core/annotations/validation/WebServiceSEIRestrictionsRule.java
+++ /dev/null
@@ -1,199 +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 static org.eclipse.jst.ws.internal.jaxws.core.utils.JAXWSUtils.ENDPOINT_INTERFACE;
-import static org.eclipse.jst.ws.internal.jaxws.core.utils.JAXWSUtils.NAME;
-
-import java.util.Collection;
-import java.util.Iterator;
-
-import javax.jws.Oneway;
-import javax.jws.WebMethod;
-import javax.jws.WebParam;
-import javax.jws.WebResult;
-import javax.jws.WebService;
-import javax.jws.soap.SOAPBinding;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.jst.ws.annotations.core.processor.AbstractAnnotationProcessor;
-import org.eclipse.jst.ws.annotations.core.utils.AnnotationUtils;
-import org.eclipse.jst.ws.internal.jaxws.core.JAXWSCoreMessages;
-import org.eclipse.jst.ws.jaxws.core.utils.JDTUtils;
-
-import com.sun.mirror.declaration.AnnotationMirror;
-import com.sun.mirror.declaration.AnnotationTypeDeclaration;
-import com.sun.mirror.declaration.AnnotationValue;
-import com.sun.mirror.declaration.ClassDeclaration;
-import com.sun.mirror.declaration.Declaration;
-import com.sun.mirror.declaration.InterfaceDeclaration;
-import com.sun.mirror.declaration.MethodDeclaration;
-import com.sun.mirror.declaration.Modifier;
-import com.sun.mirror.declaration.ParameterDeclaration;
-import com.sun.mirror.declaration.TypeDeclaration;
-
-public class WebServiceSEIRestrictionsRule extends AbstractAnnotationProcessor {
-
- @Override
- public void process() {
- AnnotationTypeDeclaration annotationDeclaration = (AnnotationTypeDeclaration) environment
- .getTypeDeclaration(WebService.class.getName());
- Collection<Declaration> annotatedTypes = environment
- .getDeclarationsAnnotatedWith(annotationDeclaration);
- for (Declaration declaration : annotatedTypes) {
- if (declaration instanceof ClassDeclaration) {
- Collection<AnnotationMirror> annotationMirrors = declaration.getAnnotationMirrors();
- for (AnnotationMirror mirror : annotationMirrors) {
- AnnotationValue endpointInterface = AnnotationUtils.getAnnotationValue(mirror,
- ENDPOINT_INTERFACE);
- if (endpointInterface != null) {
- AnnotationValue name = AnnotationUtils.getAnnotationValue(mirror, NAME);
- if (name != null) {
- printFixableError(name.getPosition(),
- JAXWSCoreMessages.WEBSERVICE_ENPOINTINTERFACE_NO_NAME_ATTRIBUTE);
- }
- checkRestrictions((ClassDeclaration) declaration, endpointInterface);
- checkJSR181Annotations((ClassDeclaration) declaration);
- }
- }
- }
- }
- }
-
- private void checkRestrictions(ClassDeclaration classDeclaration, AnnotationValue endpointInterface) {
- String sei = endpointInterface.getValue().toString();
- if ((JDTUtils.validateJavaTypeName(sei).getSeverity() == IStatus.ERROR)) {
- return;
- }
- com.sun.mirror.declaration.TypeDeclaration typeDeclaration = environment.getTypeDeclaration(sei);
- if (typeDeclaration != null) {
- if (!(typeDeclaration instanceof InterfaceDeclaration)) {
- printError(endpointInterface.getPosition(), JAXWSCoreMessages.bind(
- JAXWSCoreMessages.WEBSERVICE_ENPOINTINTERFACE_NOT_INTERFACE, sei));
- }
- if (typeDeclaration.getDeclaringType() != null) {
- printError(endpointInterface.getPosition(), JAXWSCoreMessages.bind(
- JAXWSCoreMessages.WEBSERVICE_ENPOINTINTERFACE_NOT_OUTER, sei));
- }
- AnnotationMirror annotationMirror = AnnotationUtils.getAnnotation(typeDeclaration,
- WebService.class);
- if (annotationMirror == null) {
- printError(endpointInterface.getPosition(), JAXWSCoreMessages.bind(
- JAXWSCoreMessages.WEBSERVICE_ENPOINTINTERFACE_NOT_ANNOTATED, sei));
- }
-
- if (!typeDeclaration.getModifiers().contains(Modifier.PUBLIC)) {
- printError(endpointInterface.getPosition(), JAXWSCoreMessages.bind(
- JAXWSCoreMessages.WEBSERVICE_ENPOINTINTERFACE_NOT_PUBLIC, sei));
- }
-
- if (!classDeclaration.getSuperinterfaces().contains(typeDeclaration)) {
- Collection<? extends MethodDeclaration> seiMethods = typeDeclaration.getMethods();
- Collection<? extends MethodDeclaration> implMethods = classDeclaration.getMethods();
-
- for (MethodDeclaration seiMethod : seiMethods) {
- boolean implemented = false;
- for (MethodDeclaration implMethod : implMethods) {
- if (AnnotationUtils.compareMethods(seiMethod, implMethod)) {
- if (!implMethod.getModifiers().contains(Modifier.PUBLIC)) {
- printFixableError(implMethod.getPosition(),
- JAXWSCoreMessages.WEBSERVICE_ENPOINTINTERFACE_REDUCED_VISIBILITY);
- }
- if (!implMethod.getReturnType().equals(seiMethod.getReturnType())) {
- printFixableError(implMethod.getPosition(), JAXWSCoreMessages.bind(
- JAXWSCoreMessages.WEBSERVICE_ENPOINTINTERFACE_INCOMPATIBLE_RETURN_TYPE,
- getImplementsMessage(typeDeclaration, seiMethod)),
- "", JAXWSCoreMessages.WEBSERVICE_ENPOINTINTERFACE_INCOMPATIBLE_RETURN_TYPE);
- }
- implemented = true;
- break;
- }
- }
- if (!implemented) {
- printFixableError(endpointInterface.getPosition(), JAXWSCoreMessages.bind(
- JAXWSCoreMessages.WEBSERVICE_ENPOINTINTERFACE_MUST_IMPLEMENT,
- getImplementsMessage(typeDeclaration, seiMethod)), "", //$NON-NLS-1$
- JAXWSCoreMessages.WEBSERVICE_ENPOINTINTERFACE_MUST_IMPLEMENT);
- }
- }
- }
- } else {
- printError(endpointInterface.getPosition(), JAXWSCoreMessages.bind(
- JAXWSCoreMessages.WEBSERVICE_ENPOINTINTERFACE_NOT_FOUND, sei));
- }
- }
-
- private String getImplementsMessage(TypeDeclaration typeDeclaration, MethodDeclaration seiMethod) {
- StringBuilder message = new StringBuilder(typeDeclaration.getSimpleName());
- message.append("."); //$NON-NLS-1$
- message.append(seiMethod.getSimpleName());
- message.append("("); //$NON-NLS-1$
- Collection<ParameterDeclaration> parameters = seiMethod.getParameters();
- Iterator<ParameterDeclaration> iter = parameters.iterator();
- while (iter.hasNext()) {
- ParameterDeclaration parameterDeclaration = iter.next();
- String typeMirror = environment.getTypeUtils().getErasure(parameterDeclaration.getType()).toString();
- message.append(typeMirror.substring(typeMirror.lastIndexOf(".") + 1)); //$NON-NLS-1$
- if (iter.hasNext()) {
- message.append(", "); //$NON-NLS-1$
- }
-
- }
- message.append(")"); //$NON-NLS-1$
- return message.toString();
- }
-
- private void checkJSR181Annotations(ClassDeclaration classDeclaration) {
- AnnotationMirror soapBinding = AnnotationUtils.getAnnotation(classDeclaration, SOAPBinding.class);
- if (soapBinding != null) {
- printFixableError(soapBinding.getPosition(),
- JAXWSCoreMessages.WEBSERVICE_ENPOINTINTERFACE_NO_SOAPBINDING);
- }
-
- Collection<? extends com.sun.mirror.declaration.MethodDeclaration> implMethods = classDeclaration
- .getMethods();
- for (com.sun.mirror.declaration.MethodDeclaration methodDeclaration : implMethods) {
- AnnotationMirror msoapBinding = AnnotationUtils.getAnnotation(methodDeclaration,
- SOAPBinding.class);
- if (msoapBinding != null) {
- printFixableError(msoapBinding.getPosition(),
- JAXWSCoreMessages.WEBSERVICE_ENPOINTINTERFACE_NO_SOAPBINDING);
- }
-
- AnnotationMirror oneway = AnnotationUtils.getAnnotation(methodDeclaration, Oneway.class);
- if (oneway != null) {
- printFixableError(oneway.getPosition(),
- JAXWSCoreMessages.WEBSERVICE_ENPOINTINTERFACE_NO_ONEWAY);
- }
-
- AnnotationMirror webMethod = AnnotationUtils.getAnnotation(methodDeclaration, WebMethod.class);
- if (webMethod != null) {
- printFixableError(webMethod.getPosition(),
- JAXWSCoreMessages.WEBSERVICE_ENPOINTINTERFACE_NO_WEBMETHODS);
- }
- AnnotationMirror webResult = AnnotationUtils.getAnnotation(methodDeclaration, WebResult.class);
- if (webResult != null) {
- printFixableError(webResult.getPosition(),
- JAXWSCoreMessages.WEBSERVICE_ENPOINTINTERFACE_NO_WEBRESULT);
- }
-
- Collection<ParameterDeclaration> parameters = methodDeclaration.getParameters();
- for (ParameterDeclaration parameterDeclaration : parameters) {
- AnnotationMirror webParam = AnnotationUtils.getAnnotation(parameterDeclaration,
- WebParam.class);
- if (webParam != null) {
- printFixableError(webParam.getPosition(),
- JAXWSCoreMessages.WEBSERVICE_ENPOINTINTERFACE_NO_WEBPARAM);
- }
- }
- }
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.core/src/org/eclipse/jst/ws/internal/jaxws/core/annotations/validation/WebServiceTargetNamespaceRule.java b/bundles/org.eclipse.jst.ws.jaxws.core/src/org/eclipse/jst/ws/internal/jaxws/core/annotations/validation/WebServiceTargetNamespaceRule.java
deleted file mode 100644
index 4df7031..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.core/src/org/eclipse/jst/ws/internal/jaxws/core/annotations/validation/WebServiceTargetNamespaceRule.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.core.annotations.validation;
-
-import static org.eclipse.jst.ws.internal.jaxws.core.utils.JAXWSUtils.TARGET_NAMESPACE;
-
-import java.util.Collection;
-
-import javax.jws.WebService;
-
-import org.eclipse.jst.ws.annotations.core.processor.AbstractAnnotationProcessor;
-import org.eclipse.jst.ws.annotations.core.utils.AnnotationUtils;
-import org.eclipse.jst.ws.internal.jaxws.core.JAXWSCoreMessages;
-
-import com.sun.mirror.declaration.AnnotationMirror;
-import com.sun.mirror.declaration.AnnotationTypeDeclaration;
-import com.sun.mirror.declaration.AnnotationValue;
-import com.sun.mirror.declaration.Declaration;
-import com.sun.mirror.declaration.PackageDeclaration;
-import com.sun.mirror.declaration.TypeDeclaration;
-
-public class WebServiceTargetNamespaceRule extends AbstractAnnotationProcessor {
-
- @Override
- public void process() {
- AnnotationTypeDeclaration annotationDeclaration = (AnnotationTypeDeclaration) environment
- .getTypeDeclaration(WebService.class.getName());
-
- Collection<Declaration> annotatedTypes = environment
- .getDeclarationsAnnotatedWith(annotationDeclaration);
-
- for (Declaration declaration : annotatedTypes) {
- if (declaration instanceof TypeDeclaration) {
- AnnotationMirror webService = AnnotationUtils.getAnnotation(declaration, WebService.class);
- AnnotationValue targetNamespace = AnnotationUtils.getAnnotationValue(webService, TARGET_NAMESPACE);
-
- TypeDeclaration typeDeclaration = (TypeDeclaration) declaration;
- PackageDeclaration packageDeclaration = typeDeclaration.getPackage();
- if (packageDeclaration.getQualifiedName().length() == 0 && targetNamespace == null) {
- printError(webService.getPosition(), JAXWSCoreMessages.WEBSERVICE_DEFAULT_PACKAGE_TARGET_NAMESPACE);
- } else if (targetNamespace != null && targetNamespace.getValue().toString().trim().length() == 0) {
- printError(targetNamespace.getPosition(), JAXWSCoreMessages.WEBSERVICE_DEFAULT_PACKAGE_TARGET_NAMESPACE);
- }
- }
- }
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.core/src/org/eclipse/jst/ws/internal/jaxws/core/annotations/validation/WebServiceWSDLLocationRule.java b/bundles/org.eclipse.jst.ws.jaxws.core/src/org/eclipse/jst/ws/internal/jaxws/core/annotations/validation/WebServiceWSDLLocationRule.java
deleted file mode 100644
index 2a6ee87..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.core/src/org/eclipse/jst/ws/internal/jaxws/core/annotations/validation/WebServiceWSDLLocationRule.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.internal.jaxws.core.annotations.validation;
-
-import static org.eclipse.jst.ws.internal.jaxws.core.utils.JAXWSUtils.ENDPOINT_INTERFACE;
-import static org.eclipse.jst.ws.internal.jaxws.core.utils.JAXWSUtils.EXCLUDE;
-import static org.eclipse.jst.ws.internal.jaxws.core.utils.JAXWSUtils.OPERATION_NAME;
-import static org.eclipse.jst.ws.internal.jaxws.core.utils.JAXWSUtils.PORT_NAME;
-import static org.eclipse.jst.ws.internal.jaxws.core.utils.JAXWSUtils.PORT_SUFFIX;
-import static org.eclipse.jst.ws.internal.jaxws.core.utils.JAXWSUtils.SERVICE_NAME;
-import static org.eclipse.jst.ws.internal.jaxws.core.utils.JAXWSUtils.SERVICE_SUFFIX;
-import static org.eclipse.jst.ws.internal.jaxws.core.utils.JAXWSUtils.STYLE;
-import static org.eclipse.jst.ws.internal.jaxws.core.utils.JAXWSUtils.TARGET_NAMESPACE;
-import static org.eclipse.jst.ws.internal.jaxws.core.utils.JAXWSUtils.WSDL_LOCATION;
-
-import java.io.IOException;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import javax.jws.Oneway;
-import javax.jws.WebMethod;
-import javax.jws.WebService;
-import javax.wsdl.Binding;
-import javax.wsdl.Definition;
-import javax.wsdl.Operation;
-import javax.wsdl.Port;
-import javax.wsdl.Service;
-import javax.wsdl.extensions.soap.SOAPBinding;
-import javax.wsdl.extensions.soap12.SOAP12Binding;
-import javax.xml.namespace.QName;
-
-import org.eclipse.jst.ws.annotations.core.processor.AbstractAnnotationProcessor;
-import org.eclipse.jst.ws.annotations.core.utils.AnnotationUtils;
-import org.eclipse.jst.ws.internal.jaxws.core.JAXWSCoreMessages;
-import org.eclipse.jst.ws.jaxws.core.utils.JDTUtils;
-import org.eclipse.jst.ws.jaxws.core.utils.WSDLUtils;
-
-import com.sun.mirror.declaration.AnnotationMirror;
-import com.sun.mirror.declaration.AnnotationTypeDeclaration;
-import com.sun.mirror.declaration.AnnotationValue;
-import com.sun.mirror.declaration.ClassDeclaration;
-import com.sun.mirror.declaration.Declaration;
-import com.sun.mirror.declaration.MethodDeclaration;
-import com.sun.mirror.declaration.TypeDeclaration;
-
-public class WebServiceWSDLLocationRule extends AbstractAnnotationProcessor {
-
- @Override
- @SuppressWarnings("unchecked")
- public void process() {
- AnnotationTypeDeclaration annotationDeclaration = (AnnotationTypeDeclaration) environment
- .getTypeDeclaration(WebService.class.getName());
-
- Collection<Declaration> annotatedTypes = environment
- .getDeclarationsAnnotatedWith(annotationDeclaration);
-
- for (Declaration declaration : annotatedTypes) {
- if (declaration instanceof ClassDeclaration) {
- ClassDeclaration classDeclaration = (ClassDeclaration) declaration;
- AnnotationMirror webService = AnnotationUtils.getAnnotation(declaration, WebService.class);
- AnnotationValue wsdlLocationValue = AnnotationUtils.getAnnotationValue(webService, WSDL_LOCATION);
- if (wsdlLocationValue == null) {
- break;
- }
- String wsdlLocation = wsdlLocationValue.getValue().toString();
- if (wsdlLocation != null && wsdlLocation.trim().length() > 0) {
- try {
- URL wsdlURL = new URL(wsdlLocation);
- Definition definition = WSDLUtils.readWSDL(wsdlURL);
- if (definition != null) {
- QName serviceQName = getServiceQName(webService, (ClassDeclaration) declaration);
- Service service = getService(definition, serviceQName);
- if (service != null) {
- String portName = getPortName(webService, classDeclaration);
- Port port = getPort(service, portName);
- if (port != null) {
- Binding binding = port.getBinding();
- validateBinding(binding, classDeclaration, webService, wsdlLocation);
- Map<String, MethodDeclaration> methodMap = getWebMethods(classDeclaration,
- webService);
- List<Operation> operations = binding.getPortType().getOperations();
- for (Operation operation : operations) {
- MethodDeclaration methodDeclaration = methodMap.get(operation.getName());
- if (methodDeclaration == null) {
- printError(webService.getPosition(), JAXWSCoreMessages.bind(
- JAXWSCoreMessages.WEBSERVICE_WSDL_LOCATION_NO_OPERTATION_NAME,
- operation.getName()));
- } else {
- AnnotationMirror oneway = AnnotationUtils.getAnnotation(
- methodDeclaration, Oneway.class);
- if (oneway != null && operation.getOutput() != null) {
- printError(methodDeclaration.getPosition(), JAXWSCoreMessages.bind(
- JAXWSCoreMessages.WEBSERVICE_WSDL_LOCATION_WSDL_OPERATION_OUTPUT_METHOD_ONEWAY,
- new Object[] {methodDeclaration.getSimpleName(), operation.getName()}));
- }
- }
- }
- } else {
- printError(webService.getPosition(), JAXWSCoreMessages.bind(
- JAXWSCoreMessages.WEBSERVICE_WSDL_LOCATION_NO_PORT_NAME,
- new Object[] {portName, wsdlLocation}));
- }
- } else {
- printError(webService.getPosition(), JAXWSCoreMessages.bind(
- JAXWSCoreMessages.WEBSERVICE_WSDL_LOCATION_NO_SERVICE_NAME,
- new Object[] {serviceQName.getLocalPart(), wsdlLocation}));
- }
- }
- } catch (MalformedURLException murle) {
- printError(wsdlLocationValue.getPosition(), murle.getLocalizedMessage());
- } catch (IOException ioe) {
- printNotice(wsdlLocationValue.getPosition(), JAXWSCoreMessages.bind(
- JAXWSCoreMessages.WEBSERVICE_WSDL_LOCATION_UNABLE_TO_LOCATE, wsdlLocation));
- }
- }
- }
- }
- }
-
- @SuppressWarnings("unchecked")
- private void validateBinding(Binding binding, ClassDeclaration classDeclaration,
- AnnotationMirror webService, String wsdlLocation) {
- String style = javax.jws.soap.SOAPBinding.Style.DOCUMENT.name();
-
- AnnotationMirror soapBindingAnnotation = getSOAPBinding(classDeclaration, webService);
- if (soapBindingAnnotation != null) {
- String styleValue = AnnotationUtils.getStringValue(soapBindingAnnotation, STYLE);
- if (styleValue != null) {
- style = styleValue;
- }
- }
-
- List extensibilityElements = binding.getExtensibilityElements();
- for (Object elementExtensible : extensibilityElements) {
- if (elementExtensible instanceof SOAPBinding) {
- SOAPBinding soapBinding = (SOAPBinding) elementExtensible;
- if (style.compareToIgnoreCase(soapBinding.getStyle()) != 0) {
- printError(soapBindingAnnotation == null ? webService.getPosition()
- : soapBindingAnnotation.getPosition(),
- JAXWSCoreMessages.bind(JAXWSCoreMessages.WEBSERVICE_WSDL_LOCATION_SOAP_BINDING_STYLE,
- new Object[] {wsdlLocation, soapBinding.getStyle(), style}));
- }
- }
- if (elementExtensible instanceof SOAP12Binding) {
- SOAP12Binding soap12Binding = (SOAP12Binding) elementExtensible;
- if (style.compareToIgnoreCase(soap12Binding.getStyle()) != 0) {
- printError(soapBindingAnnotation == null ? webService.getPosition()
- : soapBindingAnnotation.getPosition(),
- JAXWSCoreMessages.bind(JAXWSCoreMessages.WEBSERVICE_WSDL_LOCATION_SOAP_BINDING_STYLE,
- new Object[] {wsdlLocation, soap12Binding.getStyle(), style}));
- }
- }
- }
- }
-
- private AnnotationMirror getSOAPBinding(TypeDeclaration typeDeclaration, AnnotationMirror webService) {
- String endpointInterface = AnnotationUtils.getStringValue(webService, ENDPOINT_INTERFACE);
- if (endpointInterface != null) {
- TypeDeclaration seiDeclaration = environment.getTypeDeclaration(endpointInterface);
- if (seiDeclaration != null) {
- typeDeclaration = seiDeclaration;
- }
- }
- return AnnotationUtils.getAnnotation(typeDeclaration, javax.jws.soap.SOAPBinding.class);
- }
-
- private Map<String, MethodDeclaration> getWebMethods(TypeDeclaration typeDeclaration, AnnotationMirror webService) {
- Map<String, MethodDeclaration> methodMap = new HashMap<String, MethodDeclaration>();
-
- String endpointInterface = AnnotationUtils.getStringValue(webService, ENDPOINT_INTERFACE);
- if (endpointInterface != null) {
- TypeDeclaration seiDeclaration = environment.getTypeDeclaration(endpointInterface);
- if (seiDeclaration != null) {
- typeDeclaration = seiDeclaration;
- }
- }
-
- Collection<? extends MethodDeclaration> methods = typeDeclaration.getMethods();
- for (MethodDeclaration methodDeclaration : methods) {
- AnnotationMirror webMethod = AnnotationUtils.getAnnotation(methodDeclaration, WebMethod.class);
- if (webMethod != null && !isExluded(webMethod)) {
- methodMap.put(getOperationName(webMethod, methodDeclaration), methodDeclaration);
- } else {
- methodMap.put(methodDeclaration.getSimpleName(), methodDeclaration);
- }
- }
- return methodMap;
- }
-
- private boolean isExluded(AnnotationMirror webMethod) {
- Boolean exclude = AnnotationUtils.getBooleanValue(webMethod, EXCLUDE);
- if (exclude != null) {
- return exclude.booleanValue();
- }
- return false;
- }
-
- private String getOperationName(AnnotationMirror webMethod, MethodDeclaration methodDeclaration) {
- String operationName = AnnotationUtils.getStringValue(webMethod, OPERATION_NAME);
- if (operationName != null) {
- return operationName;
- }
- return methodDeclaration.getSimpleName();
- }
-
- @SuppressWarnings("unchecked")
- private Service getService(Definition definition, QName serviceQName) {
- Map servicesMap = definition.getServices();
- Set<Map.Entry> servicesSet = servicesMap.entrySet();
- for (Map.Entry<QName, Service> serviceEntry : servicesSet) {
- QName serviceEntryKey = serviceEntry.getKey();
- if (serviceEntryKey.equals(serviceQName)) {
- return serviceEntry.getValue();
- }
- }
- return null;
- }
-
- @SuppressWarnings("unchecked")
- private Port getPort(Service service, String portName) {
- Map portsMap = service.getPorts();
- Set<Map.Entry> portsSet = portsMap.entrySet();
- for (Map.Entry<String, Port> portEntry : portsSet) {
- String portEntryKey = portEntry.getKey();
- if (portEntryKey.equals(portName)) {
- return portEntry.getValue();
- }
- }
- return null;
- }
-
- private QName getServiceQName(AnnotationMirror webService, ClassDeclaration classDeclaration) {
- String serviceName = AnnotationUtils.getStringValue(webService, SERVICE_NAME);
- if (serviceName == null) {
- serviceName = classDeclaration.getSimpleName() + SERVICE_SUFFIX;
- }
- return new QName(getTargetNamespace(webService, classDeclaration), serviceName);
- }
-
- private String getPortName(AnnotationMirror webService, ClassDeclaration classDeclaration) {
- String portName = AnnotationUtils.getStringValue(webService, PORT_NAME);
- if (portName == null) {
- portName = classDeclaration.getSimpleName() + PORT_SUFFIX;
- }
- return portName;
- }
-
- private String getTargetNamespace(AnnotationMirror webService, ClassDeclaration classDeclaration) {
- String targetNamespace = AnnotationUtils.getStringValue(webService, TARGET_NAMESPACE);
- if (targetNamespace == null) {
- targetNamespace = JDTUtils.getTargetNamespaceFromPackageName(
- classDeclaration.getPackage().getQualifiedName());
- }
- return targetNamespace;
- }
-
-}
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 9aaa750..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.core/src/org/eclipse/jst/ws/internal/jaxws/core/annotations/validation/WebServiceWebServiceProviderCoExistRule.java
+++ /dev/null
@@ -1,50 +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 javax.jws.WebService;
-import javax.xml.ws.WebServiceProvider;
-
-import org.eclipse.jst.ws.annotations.core.processor.AbstractAnnotationProcessor;
-import org.eclipse.jst.ws.internal.jaxws.core.JAXWSCoreMessages;
-
-import com.sun.mirror.declaration.AnnotationMirror;
-import com.sun.mirror.declaration.AnnotationTypeDeclaration;
-import com.sun.mirror.declaration.Declaration;
-
-public class WebServiceWebServiceProviderCoExistRule extends AbstractAnnotationProcessor {
-
- @Override
- public void process() {
- AnnotationTypeDeclaration annotationDeclaration = (AnnotationTypeDeclaration) environment
- .getTypeDeclaration(WebService.class.getName());
-
- Collection<Declaration> annotatedTypes = environment
- .getDeclarationsAnnotatedWith(annotationDeclaration);
-
- for (Declaration declaration : annotatedTypes) {
- Collection<AnnotationMirror> annotationMirrors = declaration.getAnnotationMirrors();
-
- for (AnnotationMirror mirror : annotationMirrors) {
- checkWebServiceProvider(mirror);
- }
- }
- }
-
- private void checkWebServiceProvider(AnnotationMirror mirror) {
- if (mirror.getAnnotationType().toString().equals(WebServiceProvider.class.getName())) {
- printFixableError(mirror.getPosition(), JAXWSCoreMessages
- .WEBSERVICE_WEBSERVICEPROVIDER_COMBINATION);
- }
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.core/src/org/eclipse/jst/ws/internal/jaxws/core/utils/JAXWSUtils.java b/bundles/org.eclipse.jst.ws.jaxws.core/src/org/eclipse/jst/ws/internal/jaxws/core/utils/JAXWSUtils.java
deleted file mode 100644
index 6399b3d..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.core/src/org/eclipse/jst/ws/internal/jaxws/core/utils/JAXWSUtils.java
+++ /dev/null
@@ -1,130 +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.utils;
-
-import javax.jws.soap.SOAPBinding.ParameterStyle;
-import javax.jws.soap.SOAPBinding.Style;
-import javax.jws.soap.SOAPBinding.Use;
-
-import org.eclipse.jdt.core.IAnnotation;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jst.ws.annotations.core.utils.AnnotationUtils;
-import org.eclipse.jst.ws.internal.jaxws.core.JAXWSCorePlugin;
-
-import com.sun.mirror.declaration.AnnotationMirror;
-
-public final class JAXWSUtils {
-
- public static final String ACTION = "action"; //$NON-NLS-1$
- public static final String ARG = "arg"; //$NON-NLS-1$
- public static final String CLASS_NAME = "className"; //$NON-NLS-1$
- public static final String DOT_CHARACTER = "."; //$NON-NLS-1$
- public static final String ENDPOINT_INTERFACE = "endpointInterface"; //$NON-NLS-1$
- public static final String EXCLUDE = "exclude"; //$NON-NLS-1$
- public static final String FAULT_BEAN = "faultBean"; //$NON-NLS-1$
- public static final String FINALIZE = "finalize"; //$NON-NLS-1$
- public static final String HEADER = "header"; //$NON-NLS-1$
- public static final String JAXWS_SUBPACKAGE = "jaxws"; //$NON-NLS-1$
- public static final String LOCAL_NAME = "localName"; //$NON-NLS-1$
- public static final String MODE = "mode"; //$NON-NLS-1$
- public static final String NAME = "name"; //$NON-NLS-1$
- public static final String OPERATION_NAME = "operationName"; //$NON-NLS-1$
- public static final String PARAMETER_STYLE = "parameterStyle"; //$NON-NLS-1$
- public static final String PART_NAME = "partName"; //$NON-NLS-1$
- public static final String PORT_NAME = "portName"; //$NON-NLS-1$
- public static final String PORT_SUFFIX = "Port"; //$NON-NLS-1$
- public static final String RESPONSE = "Response"; //$NON-NLS-1$
- public static final String RESPONSE_SUFFIX = "Response"; //$NON-NLS-1$
- public static final String RETURN = "return"; //$NON-NLS-1$
- public static final String SERVICE_NAME = "serviceName"; //$NON-NLS-1$
- public static final String SERVICE_SUFFIX = "Service"; //$NON-NLS-1$
- public static final String STYLE = "style"; //$NON-NLS-1$
- public static final String TARGET_NAMESPACE = "targetNamespace"; //$NON-NLS-1$
- public static final String TRUE = "true"; //$NON-NLS-1$
- public static final String TYPE = "type"; //$NON-NLS-1$
- public static final String USE = "use"; //$NON-NLS-1$
- public static final String WSDL_LOCATION = "wsdlLocation"; //$NON-NLS-1$
- public static final String VALUE = "value"; //$NON-NLS-1$
-
- private JAXWSUtils() {
- }
-
- public static boolean isDocumentBare(AnnotationMirror mirror) {
- String style = AnnotationUtils.getStringValue(mirror, STYLE);
- String use = AnnotationUtils.getStringValue(mirror, USE);
- String parameterStyle = AnnotationUtils.getStringValue(mirror, PARAMETER_STYLE);
-
- return JAXWSUtils.isDocumentBare(style, use, parameterStyle);
- }
-
- public static boolean isDocumentBare(IAnnotation annotation) {
- try {
- String style = AnnotationUtils.getEnumValue(annotation, STYLE);
- String use = AnnotationUtils.getEnumValue(annotation, USE);
- String parameterStyle = AnnotationUtils.getEnumValue(annotation, PARAMETER_STYLE);
- return JAXWSUtils.isDocumentBare(style, use, parameterStyle);
- } catch (JavaModelException jme) {
- JAXWSCorePlugin.log(jme.getStatus());
- }
- return false;
- }
-
- public static boolean isDocumentBare(org.eclipse.jdt.core.dom.Annotation annotation) {
- String style = AnnotationUtils.getEnumValue(annotation, STYLE);
- String use = AnnotationUtils.getEnumValue(annotation, USE);
- String parameterStyle = AnnotationUtils.getEnumValue(annotation, PARAMETER_STYLE);
-
- return JAXWSUtils.isDocumentBare(style, use, parameterStyle);
- }
-
- public static boolean isDocumentBare(String style, String use, String parameterStyle) {
- return (style == null || style.equals(Style.DOCUMENT.name()))
- && (use == null || use.equals(Use.LITERAL.name()))
- && (parameterStyle != null && parameterStyle.equals(ParameterStyle.BARE.name()));
- }
-
- public static boolean isDocumentWrapped(AnnotationMirror mirror) {
- String style = AnnotationUtils.getStringValue(mirror, STYLE);
- String use = AnnotationUtils.getStringValue(mirror, USE);
- String parameterStyle = AnnotationUtils.getStringValue(mirror, PARAMETER_STYLE);
-
- return JAXWSUtils.isDocumentWrapped(style, use, parameterStyle);
- }
-
- public static boolean isDocumentWrapped(IAnnotation annotation) {
- try {
- String style = AnnotationUtils.getEnumValue(annotation, STYLE);
- String use = AnnotationUtils.getEnumValue(annotation, USE);
- String parameterStyle = AnnotationUtils.getEnumValue(annotation, PARAMETER_STYLE);
- return JAXWSUtils.isDocumentWrapped(style, use, parameterStyle);
- } catch (JavaModelException jme) {
- JAXWSCorePlugin.log(jme.getStatus());
- }
- return true;
- }
-
- public static boolean isDocumentWrapped(org.eclipse.jdt.core.dom.Annotation annotation) {
- String style = AnnotationUtils.getEnumValue(annotation, STYLE);
- String use = AnnotationUtils.getEnumValue(annotation, USE);
- String parameterStyle = AnnotationUtils.getEnumValue(annotation, PARAMETER_STYLE);
-
- return JAXWSUtils.isDocumentWrapped(style, use, parameterStyle);
- }
-
-
- public static boolean isDocumentWrapped(String style, String use, String parameterStyle) {
- return (style == null || style.equals(Style.DOCUMENT.name()))
- && (use == null || use.equals(Use.LITERAL.name()))
- && (parameterStyle == null || parameterStyle.equals(ParameterStyle.WRAPPED.name()));
- }
-
-
-}
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 40423c4..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.core/src/org/eclipse/jst/ws/jaxws/core/utils/JDTUtils.java
+++ /dev/null
@@ -1,328 +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.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
-
-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.Path;
-import org.eclipse.jdt.core.Flags;
-import org.eclipse.jdt.core.IClasspathEntry;
-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.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>
- */
-public final class JDTUtils {
-
- private JDTUtils() {
- }
-
- /**
- * Add a <code>IClasspathEntry</code> to a <code>IJavaProject</code>
- * @param javaProject the <code>IJavaProject</code> to add the classpath entry to
- * @param classpathEntry the <code>IClasspathEntry</code> to add
- */
- 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());
- }
- }
-
- /**
- * Remove a <code>IClasspathEntry</code> from a <code>IJavaProject</code>
- * @param javaProject the <code>IJavaProject</code> to remove the classpath entry from
- * @param classpathEntry the <code>IClasspathEntry</code> to remove
- */
- 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());
- }
- }
-
- /**
- * Returns the Java project corresponding to the given project name.
- * @param projectName the project name
- * @return the Java project corresponding to the given project name
- */
- public static IJavaProject getJavaProject(String projectName) {
- IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(projectName);
- return JavaCore.create(project);
- }
-
- /**
- * Returns the absolute path in the local file system of the default output location for the given java project.
- * @param javaProject the java project
- * @return the absolute path of the default output folder for the given java project
- */
- public static IPath getJavaProjectOutputDirectoryPath(IJavaProject javaProject) {
- try {
- return ResourcesPlugin.getWorkspace().getRoot().findMember(javaProject.getOutputLocation()).getLocation();
- } catch (JavaModelException jme) {
- JAXWSCorePlugin.log(jme.getStatus());
- }
- return ResourcesPlugin.getWorkspace().getRoot().findMember(javaProject.getPath()).getLocation();
- }
-
- /**
- * Returns the absolute path in the local file system of the default output location for the given java project name.
- * @param projectName the name of the java project
- * @return the absolute path of the default output folder for the given java project name
- */
- public static IPath getJavaProjectOutputDirectoryPath(String projectName) {
- return JDTUtils.getJavaProjectOutputDirectoryPath(JDTUtils.getJavaProject(projectName));
- }
-
- /**
- * Returns the full, absolute path relative to the workspace of the source folder that contains the given type.
- * @param type the <code>IType</code>
- * @return the absolute path of the given <code>IType</code> source folder
- */
- public static IPath getJavaProjectSourceDirectoryPath(IType type) {
- IPackageFragment packageFragment = type.getPackageFragment();
- IPackageFragmentRoot packageFragmentRoot = (IPackageFragmentRoot) packageFragment.getParent();
- IResource srcDirectoryResource = packageFragmentRoot.getResource();
- return srcDirectoryResource.getFullPath();
- }
-
- /**
- * Returns the full, absolute path relative to the workspace of the first source folder found in the java project with the given name.
- * @param projectName the name of the java project
- * @return the absolute path of the first source folder found in the java project with the given name.
- */
- public static IPath getJavaProjectSourceDirectoryPath(String projectName) {
- return JDTUtils.getJavaProjectSourceDirectoryPath(JDTUtils.getJavaProject(projectName));
- }
-
- /**
- * Returns the full, absolute path relative to the workspace of the first source folder found in the given java project.
- * @param javaProject the <code>IJavaProject</code>
- * @return the absolute path of the first source folder found in the given java project.
- */
- public static IPath getJavaProjectSourceDirectoryPath(IJavaProject javaProject) {
- try {
- IPackageFragmentRoot[] packageFragmentRoots = javaProject.getAllPackageFragmentRoots();
- IPackageFragmentRoot packageFragmentRoot = packageFragmentRoots[0];
- IResource srcDirectoryResource = packageFragmentRoot.getResource();
- return srcDirectoryResource.getFullPath();
- } catch (JavaModelException jme) {
- JAXWSCorePlugin.log(jme.getStatus());
- }
- return new Path("");
- }
-
- /**
- * If the given <code>IType</code> is an interface all methods declared in that interface are returned.
- * <p>
- * Alternatively if the given given <code>IType</code> is a class, only methods that are explicitly marked
- * public are returned.
- *
- * @param type the <code>IType</code>
- * @return the public methods declared in this type
- */
- public static IMethod[] getPublicMethods(IType type) {
- List<IMethod> publicMethods = new ArrayList<IMethod>();
- try {
- IMethod[] allMethods = type.getMethods();
- if (type.isInterface()) {
- return allMethods;
- }
- 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()]);
- }
-
- /**
- * Constructs a target namespace string from the given package name by splitting the dot '.' separated
- * package name, reversing the order of the package name segments followed by prefixing the string with
- * 'http://' and appending a forward slash '/' to the end.
- * <p>E.g., the Java package Òcom.example.wsÓ would return the target namespace Òhttp://ws.example.com/Ó.</p>
- * <p>If the package name is null or is of zero length "http://default_package/" is returned.</p>
- * @param packageName the package name
- * @return the derived target namespace
- */
- 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;
- }
-
- /**
- * Returns the first type found following the given java project's classpath with the given fully qualified name or null if none is found.
- * @param javaProject the given <code>IJavaProject</code>
- * @param fullyQualifiedClassName the given fully qualified name
- * @return the first type found following the java project's classpath with the given fully qualified name or null if none is found
- */
- public static IType getType(IJavaProject javaProject, String fullyQualifiedClassName) {
- try {
- return javaProject.findType(fullyQualifiedClassName);
- } catch (JavaModelException jme) {
- JAXWSCorePlugin.log(jme.getStatus());
- }
- return null;
- }
-
- /**
- * Returns the first type found with the given fully qualified name following the classpath of the java project with
- * the give project name or null if none is found.
- * @param projectName the name of the java project
- * @param fullyQualifiedClassName the given fully qualified name
- * @return the first type found following the java project's classpath with the given fully qualified name or null if none is found
- */
- public static IType getType(String projectName, String fullyQualifiedClassName) {
- return JDTUtils.getType(JDTUtils.getJavaProject(projectName), fullyQualifiedClassName);
- }
-
- /**
- * Returns whether the given project has the java nature.
- * @param project the given project
- * @return <code>true</code> if the project has the java nature
- */
- public static boolean isJavaProject(IProject project) {
- try {
- return project.hasNature(JavaCore.NATURE_ID);
- } catch (CoreException ce) {
- JAXWSCorePlugin.log(ce.getStatus());
- }
- return false;
- }
-
- /**
- * Returns true if the given method isn't a main method or constructor and if it has the public modifier.
- * @param method the given method
- * @return <code>true</code> if the given method is public
- */
- 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;
- }
-
- /**
- * Validates the given Java type name, either simple or qualified, using the workspace source and compliance levels.
- * @param name the name of a type
- * @return a status object with code IStatus.OK if the given name is valid as a Java type name, a status with
- * code IStatus.WARNING indicating why the given name is discouraged, otherwise a status object indicating what is wrong with the name
- */
- public static IStatus validateJavaTypeName(String name) {
- String sourceLevel = JavaCore.getOption(JavaCore.COMPILER_SOURCE);
- String complianceLevel = JavaCore.getOption(JavaCore.COMPILER_COMPLIANCE);
- return JavaConventions.validateJavaTypeName(name, sourceLevel, complianceLevel);
- }
-
- /**
- * Validates the given Java type name, either simple or qualified, using the given projects source and compliance levels.
- * @param projectName the name of the java project
- * @param name the name of a type
- * @return a status object with code IStatus.OK if the given name is valid as a Java type name, a status with
- * code IStatus.WARNING indicating why the given name is discouraged, otherwise a status object indicating what is wrong with the name
- */
- public static IStatus validateJavaTypeName(String projectName, String name) {
- IJavaProject javaProject = JDTUtils.getJavaProject(projectName);
- String sourceLevel = javaProject.getOption(JavaCore.COMPILER_SOURCE, true);
- String complianceLevel = javaProject.getOption(JavaCore.COMPILER_COMPLIANCE, true);
- return JavaConventions.validateJavaTypeName(name, sourceLevel, complianceLevel);
- }
-
- /**
- * Validate the given package name using the given projects source and compliance levels.
- * @param projectName the name of the java project
- * @param packageName the name of a package
- * @return a status object with code IStatus.OK if the given name is valid as a package name, otherwise a status
- * object indicating what is wrong with the name
- */
- 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);
- }
-
- /**
- * Validates the given Java identifier with the workspace source and compliance levels.
- * @param id the Java identifier
- * @return a status object with code IStatus.OK if the given identifier is a valid Java identifier, otherwise
- * a status object indicating what is wrong with the identifier
- */
- public static IStatus validateIdentifier(String id) {
- String sourceLevel = JavaCore.getOption(JavaCore.COMPILER_SOURCE);
- String complianceLevel = JavaCore.getOption(JavaCore.COMPILER_COMPLIANCE);
- return JavaConventions.validateIdentifier(id, sourceLevel, complianceLevel);
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.core/src/org/eclipse/jst/ws/jaxws/core/utils/WSDLUtils.java b/bundles/org.eclipse.jst.ws.jaxws.core/src/org/eclipse/jst/ws/jaxws/core/utils/WSDLUtils.java
deleted file mode 100644
index 53154f0..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.core/src/org/eclipse/jst/ws/jaxws/core/utils/WSDLUtils.java
+++ /dev/null
@@ -1,302 +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.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.net.MalformedURLException;
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.net.URL;
-import java.net.URLConnection;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import javax.wsdl.Definition;
-import javax.wsdl.Port;
-import javax.wsdl.Service;
-import javax.wsdl.WSDLException;
-import javax.wsdl.extensions.ExtensibilityElement;
-import javax.wsdl.extensions.soap.SOAPAddress;
-import javax.wsdl.extensions.soap12.SOAP12Address;
-import javax.wsdl.factory.WSDLFactory;
-import javax.wsdl.xml.WSDLReader;
-import javax.wsdl.xml.WSDLWriter;
-
-import org.eclipse.core.filesystem.URIUtil;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jst.ws.internal.common.J2EEUtils;
-import org.eclipse.jst.ws.internal.jaxws.core.JAXWSCorePlugin;
-import org.xml.sax.InputSource;
-
-/**
- * WSDL 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>
- */
-public final class WSDLUtils {
- private static final String WSDL_FILE_NAME_PATTERN = "[a-zA-Z0-9_\\-]+.wsdl";//$NON-NLS-1$
- private static final String WSDL_QUERY = "?wsdl"; //$NON-NLS-1$
-
- private static final IPath WSDL_FOLDER_PATH = new Path("wsdl/"); //$NON-NLS-1$
- private static final int TIMEOUT = 30000;
-
- public static final String WSDL_FILE_EXTENSION = ".wsdl"; //$NON-NLS-1$
-
- private WSDLUtils() {
- }
-
- /**
- * Returns a <code>javax.wsdl.Definition</code> by reading the WSDL document at the given URL or null if none can be found
- * or if the connection times out.
- * @param wsdlURL the url of the wsdl document to read.
- * @return the definition described in the wsdl document pointed to by the given URL.
- * @throws IOException if an I/O exception occurs.
- */
- public static Definition readWSDL(URL wsdlURL) throws IOException {
- URLConnection urlConnection = wsdlURL.openConnection();
- urlConnection.setConnectTimeout(TIMEOUT);
- urlConnection.setReadTimeout(TIMEOUT);
- InputStream inputStream = null;
- try {
- inputStream = urlConnection.getInputStream();
- InputSource inputSource = new InputSource(inputStream);
- WSDLFactory wsdlFactory = WSDLFactory.newInstance();
- WSDLReader wsdlReader = wsdlFactory.newWSDLReader();
- Definition definition = wsdlReader.readWSDL(wsdlURL.getPath(), inputSource);
- return definition;
- } catch (WSDLException wsdle) {
- JAXWSCorePlugin.log(wsdle);
- } finally {
- if (inputStream != null) {
- inputStream.close();
- }
- }
- return null;
- }
-
- /**
- * Writes the given <code>javax.wsdl.Definition</code> to the wsdl document at the given URL.
- * @param wsdlURL the url of the wsdl document to write to.
- * @param definition the WSDL definition to be written.
- * @throws IOException if an I/O exception occurs.
- * @throws CoreException if an exception occurs refreshing the file in the workspace if it exists.
- */
- public static void writeWSDL(URL wsdlURL, Definition definition) throws IOException, CoreException {
- URI wsdlURI = null;
- OutputStream wsdlOutputStream = null;
- try {
- wsdlURI = wsdlURL.toURI();
- File wsdlFile = new File(wsdlURI);
- wsdlOutputStream = new FileOutputStream(wsdlFile);
- WSDLFactory wsdlFactory = WSDLFactory.newInstance();
- WSDLWriter wsdlWriter = wsdlFactory.newWSDLWriter();
- wsdlWriter.writeWSDL(definition, wsdlOutputStream);
- } catch (WSDLException wsdle) {
- JAXWSCorePlugin.log(wsdle);
- } catch (URISyntaxException urise) {
- JAXWSCorePlugin.log(urise);
- } finally {
- if (wsdlOutputStream != null) {
- wsdlOutputStream.close();
- IFile file = ResourcesPlugin.getWorkspace().getRoot()
- .getFileForLocation(URIUtil.toPath(wsdlURI));
- if (file != null && file.exists()) {
- file.refreshLocal(IResource.DEPTH_ONE, new NullProgressMonitor());
- }
- }
- }
- }
-
- /**
- * Returns <code>true</code> if the given file name contains Alphanumeric characters, underscore '_',
- * dashes '-' and ends with the '.wsdl' extension. Otherwise returns <code>false</code>.
- * @param wsdlFileName the wsdl file name
- * @return <code>true</code> if valid, code>false</code> otherwise.
- */
- public static boolean isValidWSDLFileName(String wsdlFileName) {
- return wsdlFileName != null && wsdlFileName.matches(WSDL_FILE_NAME_PATTERN);
- }
-
- private static IProject getProject(String projectName) {
- return ResourcesPlugin.getWorkspace().getRoot().getProject(projectName);
- }
-
- /**
- * Returns the Web Content folder of the given project. The returned resource may not exist.
- * @param project the name of the web project
- * @return the web content folder
- */
- public static IFolder getWebContentFolder(IProject project) {
- return ResourcesPlugin.getWorkspace().getRoot().getFolder(
- WSDLUtils.getWebContentPath(project));
- }
-
- /**
- * Returns the WSDL folder of the project with the given name. The WSDL folder path is the projects web content folder
- * path appended with the 'WSDL' directory. The returned resource may not exist.
- * @param projectName the name of the web project
- * @return the wsdl folder
- */
- public static IFolder getWSDLFolder(String projectName) {
- return WSDLUtils.getWSDLFolder(WSDLUtils.getProject(projectName));
- }
-
- /**
- * Returns the WSDL folder of the given project. The WSDL folder path is the projects web content folder
- * path appended with the 'WSDL' directory. The returned resource may not exist.
- * @param projectName the name of the web project
- * @return the wsdl folder
- */
- public static IFolder getWSDLFolder(IProject project) {
- IPath wsdlFolderPath = WSDLUtils.getWebContentPath(project).append(WSDLUtils.WSDL_FOLDER_PATH);
- IFolder wsdlFolder = ResourcesPlugin.getWorkspace().getRoot().getFolder(wsdlFolderPath);
- if (!wsdlFolder.exists()) {
- try {
- wsdlFolder.create(true, true, new NullProgressMonitor());
- } catch (CoreException ce) {
- JAXWSCorePlugin.log(ce.getStatus());
- }
- }
- return wsdlFolder;
- }
-
- private static IPath getWebContentPath(IProject project) {
- return J2EEUtils.getWebContentPath(project).addTrailingSeparator();
- }
-
- /**
- * Returns the first <code>SOAPAddress</code> or <code>SOAP12Address</code> found in the given
- * <code>Definition</code> or null if none is found.
- * @param definition the given definition.
- * @return return one of:
- * <li>SOAPAddress<li>SOAP12Address<li>null if it can not find a soap address
- */
- @SuppressWarnings("unchecked")
- public static ExtensibilityElement getEndpointAddress(Definition definition) {
- if (definition != null) {
- Map servicesMap = definition.getServices();
- Set<Map.Entry> servicesSet = servicesMap.entrySet();
- 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();
- List extensibilityElements = port.getExtensibilityElements();
- for (Object object : extensibilityElements) {
- if (object instanceof SOAPAddress || object instanceof SOAP12Address) {
- return (ExtensibilityElement) object;
- }
- }
- }
- }
- }
- return null;
- }
-
- /**
- * Returns the location URI from the first <code>SOAPAddress</code> or <code>SOAP12Address</code> found
- * in the given <code>Definition</code> or null if none is found. The returned location URI is appended with
- * the '?wsdl' query if the query was not present in the <code>SOAPAddress</code> or <code>SOAP12Address</code> location URI.
- * @param definition the given defintion.
- * @return the location URI or the first <code>SOAPAddress</code> or <code>SOAP12Address</code> found in the given definition.
- * @throws MalformedURLException if an error occurs testing the location URI for a query part.
- */
- public static String getWSDLLocation(Definition definition) throws MalformedURLException {
- ExtensibilityElement extensibilityElement = WSDLUtils.getEndpointAddress(definition);
- if (extensibilityElement != null) {
- String locationURI = getLocationURI(extensibilityElement);
- if (locationURI.length() > 0) {
- URL endpointURL = new URL(locationURI);
- if (endpointURL.getQuery() == null) {
- locationURI += WSDL_QUERY;
- }
- return locationURI;
- }
- }
- return null;
- }
-
- private static String getLocationURI(ExtensibilityElement extensibilityElement) {
- if (extensibilityElement instanceof SOAPAddress) {
- return ((SOAPAddress) extensibilityElement).getLocationURI();
- }
- if (extensibilityElement instanceof SOAP12Address) {
- return ((SOAP12Address) extensibilityElement).getLocationURI();
- }
- return ""; //$NON-NLS-1$
- }
-
- /**
- * Constructs a dot separated package name from a given namespace.
- * <p>E.g., the namespace Òhttp://ws.example.com/Ó would return the Java package name Òcom.example.wsÓ.</p>
- * <p>N.B. This method does not preserve 'www' in the returned package name if it exists in the given namespace.</p>
- * @param namespace the given name.
- * @return a package name.
- */
- public static String getPackageNameFromNamespace(String namespace) {
- String packageName = ""; //$NON-NLS-1$
- try {
- List<String> packageNameElements = new ArrayList<String>();
-
- URL namespaceURL = new URL(namespace);
-
- // Remove www if there
- String authority = namespaceURL.getAuthority();
- if (authority.indexOf("www") != -1) { //$NON-NLS-1$
- authority = authority.substring(authority.indexOf(".") + 1, authority.length()); //$NON-NLS-1$
- }
-
- List<String> authorityElements = Arrays.asList(authority.split("\\.")); //$NON-NLS-1$
- Collections.reverse(authorityElements);
- packageNameElements.addAll(authorityElements);
-
- String path = namespaceURL.getPath();
- List<String> pathElements = Arrays.asList(path.split("[/\\\\]")); //$NON-NLS-1$
- packageNameElements.addAll(pathElements);
-
- Iterator<String> packageIterator = packageNameElements.iterator();
- while (packageIterator.hasNext()) {
- String element = packageIterator.next();
- if (element.trim().length() > 0) {
- packageName += element;
- if (packageIterator.hasNext()) {
- packageName += "."; //$NON-NLS-1$
- }
- }
- }
- } catch (MalformedURLException murle) {
- JAXWSCorePlugin.log(murle);
- }
- return packageName.toLowerCase();
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.dom.integration/.classpath b/bundles/org.eclipse.jst.ws.jaxws.dom.integration/.classpath
deleted file mode 100755
index 2d1a430..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.integration/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/bundles/org.eclipse.jst.ws.jaxws.dom.integration/.project b/bundles/org.eclipse.jst.ws.jaxws.dom.integration/.project
deleted file mode 100755
index 0b19add..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.integration/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.jst.ws.jaxws.dom.integration</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
diff --git a/bundles/org.eclipse.jst.ws.jaxws.dom.integration/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.jst.ws.jaxws.dom.integration/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100755
index ae0484e..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.integration/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,8 +0,0 @@
-#Mon Jul 20 15:25:31 EEST 2009
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.5
diff --git a/bundles/org.eclipse.jst.ws.jaxws.dom.integration/META-INF/MANIFEST.MF b/bundles/org.eclipse.jst.ws.jaxws.dom.integration/META-INF/MANIFEST.MF
deleted file mode 100755
index d42fed0..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.integration/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,26 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %Bundle-Name.0
-Bundle-Vendor: %Bundle-Vendor.0
-Bundle-SymbolicName: org.eclipse.jst.ws.jaxws.dom.integration;singleton:=true
-Bundle-Version: 1.0.0.qualifier
-Bundle-Activator: org.eclipse.jst.ws.jaxws.dom.integration.internal.plugin.DomIntegrationPlugin
-Bundle-Localization: plugin
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.core.resources,
- org.eclipse.emf.edit.ui,
- org.eclipse.jdt.core,
- org.eclipse.ui.ide,
- org.eclipse.ui.navigator,
- org.eclipse.wst.validation,
- org.eclipse.jdt.ui,
- org.eclipse.jst.j2ee.core,
- org.eclipse.jst.jee.ui,
- org.eclipse.jem.util,
- org.eclipse.jst.ws.jaxws.dom.ui,
- org.eclipse.jst.ws.jaxws.utils
-Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Export-Package: org.eclipse.jst.ws.jaxws.dom.integration.navigator,
- org.eclipse.jst.ws.jaxws.dom.integration.navigator.actions,
- org.eclipse.jst.ws.jaxws.dom.integration.validation
diff --git a/bundles/org.eclipse.jst.ws.jaxws.dom.integration/about.html b/bundles/org.eclipse.jst.ws.jaxws.dom.integration/about.html
deleted file mode 100644
index 8410afb..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.integration/about.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
-<title>About</title>
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
-
-<p>August 15, 2009</p>
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, "Program" will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is
-being redistributed by another party ("Redistributor") and different terms and conditions may
-apply to your use of any object code in the Content. Check the Redistributor's license that was
-provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
-
-</body>
-</html>
diff --git a/bundles/org.eclipse.jst.ws.jaxws.dom.integration/build.properties b/bundles/org.eclipse.jst.ws.jaxws.dom.integration/build.properties
deleted file mode 100755
index df4e79e..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.integration/build.properties
+++ /dev/null
@@ -1,17 +0,0 @@
-###############################################################################
-# Copyright (c) 2009 by SAP AG, Walldorf.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# SAP AG - initial API and implementation
-###############################################################################
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
- .,\
- plugin.xml,\
- plugin.properties,\
- about.html
diff --git a/bundles/org.eclipse.jst.ws.jaxws.dom.integration/plugin.properties b/bundles/org.eclipse.jst.ws.jaxws.dom.integration/plugin.properties
deleted file mode 100755
index c7cb898..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.integration/plugin.properties
+++ /dev/null
@@ -1,22 +0,0 @@
-###############################################################################
-# Copyright (c) 2009 by SAP AG, Walldorf.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# SAP AG - initial API and implementation
-###############################################################################
-###############################################################################
-# Language File for this Plugin
-###############################################################################
-
-# Generic Label and Description
-Bundle-Name.0=DOM Integration (Incubation)
-Bundle-Vendor.0=Eclipse Web Tools Platform
-
-DomValidator_Name = Web Services Validation
-DomValidation_MarkerName = Web Services Problem Marker
-navigatorContent.name.0 = JAX-WS Web Services Elements
-decorator.label.0 = Web Service Decorator
diff --git a/bundles/org.eclipse.jst.ws.jaxws.dom.integration/plugin.xml b/bundles/org.eclipse.jst.ws.jaxws.dom.integration/plugin.xml
deleted file mode 100755
index 4037979..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.integration/plugin.xml
+++ /dev/null
@@ -1,158 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<!--
- Copyright (c) 2009 by SAP AG, Walldorf.
- All rights reserved. This program and the accompanying materials
- are made available under the terms of the Eclipse Public License v1.0
- which accompanies this distribution, and is available at
- http://www.eclipse.org/legal/epl-v10.html
-
- Contributors:
- SAP AG - initial API and implementation
- -->
-
-<plugin>
- <extension point="org.eclipse.emf.edit.itemProviderAdapterFactories">
- <factory
- uri = "http:///org/eclipse/jst/ws/jaxws/dom/runtime/dom.ecore"
- class = "org.eclipse.jst.ws.jaxws.dom.integration.navigator.CustomDomItemProviderAdapterFactory"
- supportedTypes =
- "org.eclipse.emf.edit.provider.IEditingDomainItemProvider
- org.eclipse.emf.edit.provider.IStructuredItemContentProvider
- org.eclipse.emf.edit.provider.ITreeItemContentProvider
- org.eclipse.emf.edit.provider.IItemLabelProvider
- org.eclipse.emf.edit.provider.IItemPropertySource" />
- </extension>
-
- <!-- {{{ Defines integration for DOM objects to navigation tree -->
- <extension point="org.eclipse.ui.navigator.navigatorContent">
- <navigatorContent
- id="org.eclipse.jst.navigator.j2ee.ui.sapWS"
- contentProvider="org.eclipse.jst.ws.jaxws.dom.integration.navigator.DOMAdapterFactoryContentProvider"
- labelProvider="org.eclipse.jst.ws.jaxws.dom.integration.navigator.DOMAdapterFactoryLabelProvider"
- activeByDefault="true"
- name="%navigatorContent.name.0"
- priority="highest">
- <triggerPoints>
- <or>
- <instanceof value="org.eclipse.core.resources.IProject" />
- </or>
- </triggerPoints>
- <possibleChildren>
- <or>
- <instanceof value="org.eclipse.jst.ws.jaxws.dom.runtime.api.IWebService"/>
- <instanceof value="org.eclipse.jst.ws.jaxws.dom.runtime.api.IServiceEndpointInterface"/>
- <instanceof value="org.eclipse.jst.ws.jaxws.dom.runtime.api.IWebMethod"/>
- </or>
- </possibleChildren>
- <actionProvider
- class="org.eclipse.jst.ws.jaxws.dom.integration.navigator.actions.WSActionProvider"
- id="org.eclipse.jst.ws.jaxws.dom.integration.navigator.actions.WSActionProvider">
- <enablement>
- <or>
- <instanceof value="org.eclipse.jst.javaee.ejb.SessionBean"/>
- <instanceof value="org.eclipse.jst.ws.jaxws.dom.runtime.api.IWebService"/>
- <instanceof value="org.eclipse.jst.ws.jaxws.dom.runtime.api.IServiceEndpointInterface"/>
- <instanceof value="org.eclipse.jst.ws.jaxws.dom.runtime.api.IWebMethod"/>
- <instanceof value="org.eclipse.jst.ws.jaxws.dom.runtime.api.IWebParam"/>
- </or>
- </enablement>
- </actionProvider>
- </navigatorContent>
- </extension>
-
- <extension point="org.eclipse.ui.decorators">
- <decorator
- adaptable="true"
- location="BOTTOM_RIGHT"
- lightweight="false"
- label="%decorator.label.0"
- state="true"
- class="org.eclipse.jst.ws.jaxws.dom.integration.navigator.WebServiceProblemsDecorator"
- id="org.eclipse.jst.ws.jaxws.dom.integration.navigator.WebServiceDecorator">
- <enablement>
- <or>
- <objectClass name="org.eclipse.jst.ws.jaxws.dom.integration.navigator.ISEIChildList"/>
- <objectClass name="org.eclipse.jst.ws.jaxws.dom.integration.navigator.IWebServiceChildList"/>
- <objectClass name="org.eclipse.jst.ws.jaxws.dom.runtime.api.IWebServiceProject"/>
- <objectClass name="org.eclipse.jst.ws.jaxws.dom.runtime.api.IWebMethod"/>
- <objectClass name="org.eclipse.jst.ws.jaxws.dom.runtime.api.IWebParam"/>
- <objectClass name="org.eclipse.jst.ws.jaxws.dom.runtime.api.IWebService"/>
- <objectClass name="org.eclipse.jst.ws.jaxws.dom.runtime.api.IServiceEndpointInterface"/>
- </or>
- </enablement>
- </decorator>
- </extension>
- <!-- }}} -->
- <!-- {{{ Defines integration for DOM objects to properties view -->
- <extension point="org.eclipse.core.runtime.adapters">
- <factory
- adaptableType="org.eclipse.jst.ws.jaxws.dom.runtime.api.IWebService"
- class="org.eclipse.jst.ws.jaxws.dom.integration.navigator.DOMPropertyViewAdapterFactory">
- <adapter
- type="org.eclipse.ui.views.properties.IPropertySourceProvider">
- </adapter>
- </factory>
- <factory
- adaptableType="org.eclipse.jst.ws.jaxws.dom.runtime.api.IServiceEndpointInterface"
- class="org.eclipse.jst.ws.jaxws.dom.integration.navigator.DOMPropertyViewAdapterFactory">
- <adapter
- type="org.eclipse.ui.views.properties.IPropertySourceProvider">
- </adapter>
- </factory>
- <factory
- adaptableType="org.eclipse.jst.ws.jaxws.dom.runtime.api.IWebServiceProject"
- class="org.eclipse.jst.ws.jaxws.dom.integration.navigator.DOMPropertyViewAdapterFactory">
- <adapter
- type="org.eclipse.ui.views.properties.IPropertySourceProvider">
- </adapter>
- </factory>
- <factory
- adaptableType="org.eclipse.jst.ws.jaxws.dom.runtime.api.IWebMethod"
- class="org.eclipse.jst.ws.jaxws.dom.integration.navigator.DOMPropertyViewAdapterFactory">
- <adapter
- type="org.eclipse.ui.views.properties.IPropertySourceProvider">
- </adapter>
- </factory>
- <factory
- adaptableType="org.eclipse.jst.ws.jaxws.dom.runtime.api.IWebParam"
- class="org.eclipse.jst.ws.jaxws.dom.integration.navigator.DOMPropertyViewAdapterFactory">
- <adapter
- type="org.eclipse.ui.views.properties.IPropertySourceProvider">
- </adapter>
- </factory>
- <factory
- adaptableType="org.eclipse.jst.ws.jaxws.dom.ui.IDOMPropertyValue"
- class="org.eclipse.jst.ws.jaxws.dom.integration.navigator.DOMItemValuePropertySourceFactory">
- <adapter
- type="org.eclipse.ui.views.properties.IPropertySource">
- </adapter>
- </factory>
- </extension>
-<!-- }}} -->
-<!-- {{{ Defines integration for WST validation framework -->
- <extension
- id="wsValidator"
- name="%DomValidator_Name"
- point="org.eclipse.wst.validation.validator">
- <validator>
- <filter objectClass="org.eclipse.core.resources.IFile" nameFilter="*.java" />
- <markerId markerIdValue="WsValidatorMarker" />
- <helper
- class="org.eclipse.jst.ws.jaxws.dom.integration.validation.DomValidationHelper">
- </helper>
- <run
- class="org.eclipse.jst.ws.jaxws.dom.integration.validation.DomValidationManager">
- </run>
- </validator>
- </extension>
- <extension
- id="WsValidatorMarker"
- name="%DomValidation_MarkerName"
- point="org.eclipse.core.resources.markers">
- <super type="org.eclipse.core.resources.problemmarker"/>
- <super type="org.eclipse.core.resources.textmarker"/>
- <persistent value="true" />
- <attribute name="implementation"/>
- </extension>
-</plugin>
diff --git a/bundles/org.eclipse.jst.ws.jaxws.dom.integration/src/org/eclipse/jst/ws/jaxws/dom/integration/internal/plugin/DomIntegrationMessages.java b/bundles/org.eclipse.jst.ws.jaxws.dom.integration/src/org/eclipse/jst/ws/jaxws/dom/integration/internal/plugin/DomIntegrationMessages.java
deleted file mode 100755
index 34421b0..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.integration/src/org/eclipse/jst/ws/jaxws/dom/integration/internal/plugin/DomIntegrationMessages.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.dom.integration.internal.plugin;
-
-import org.eclipse.osgi.util.NLS;
-
-public class DomIntegrationMessages extends NLS
-{
- private static final String BUNDLE_NAME = "org.eclipse.jst.ws.jaxws.dom.integration.internal.plugin.DomIntegrationMessages"; //$NON-NLS-1$
-
- public static String DOMAdapterFactoryLabelProvider_JaxWsWebServicesLabel;
-
- public static String DOMAdapterFactoryLabelProvider_LoadingCanceledLabel;
-
- public static String DOMAdapterFactoryLabelProvider_LoadingDummyLabel;
-
- public static String DOMAdapterFactoryLabelProvider_SeiLabel;
-
- public static String DOMAdapterFactoryLabelProvider_WebServicesLabel;
-
- /** message constant */
- public static String OpenWSResourceAction_Name;
-
- /** message constant */
- public static String NavigateToImplementationAction_ShowInWebServicesAreaAction;
-
- /** message constant */
- public static String NavigateToImplementationAction_ShowInEJBAreaAction;
-
- /** message constant */
- public static String SelectFilesToCheckoutDlgTitle;
-
- /** message constant */
- public static String SelectFilesToCheckoutDlgTblTitle;
-
- /** message constant */
- public static String SelectFilesToCheckout_CanceledMessage;
-
-
- static
- {
- NLS.initializeMessages(BUNDLE_NAME, DomIntegrationMessages.class);
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.dom.integration/src/org/eclipse/jst/ws/jaxws/dom/integration/internal/plugin/DomIntegrationMessages.properties b/bundles/org.eclipse.jst.ws.jaxws.dom.integration/src/org/eclipse/jst/ws/jaxws/dom/integration/internal/plugin/DomIntegrationMessages.properties
deleted file mode 100755
index 07f9578..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.integration/src/org/eclipse/jst/ws/jaxws/dom/integration/internal/plugin/DomIntegrationMessages.properties
+++ /dev/null
@@ -1,25 +0,0 @@
-###############################################################################
-# Copyright (c) 2009 by SAP AG, Walldorf.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# SAP AG - initial API and implementation
-###############################################################################
-DOMAdapterFactoryLabelProvider_JaxWsWebServicesLabel = JAX-WS Web Services
-DOMAdapterFactoryLabelProvider_LoadingCanceledLabel = Loading Canceled
-DOMAdapterFactoryLabelProvider_LoadingDummyLabel = Loading...
-DOMAdapterFactoryLabelProvider_SeiLabel = Service Endpoint Interfaces
-DOMAdapterFactoryLabelProvider_WebServicesLabel = Web Services
-
-OpenWSResourceAction_Name = Open
-
-NavigateToImplementationAction_ShowInWebServicesAreaAction = Locate in Web Services Node
-NavigateToImplementationAction_ShowInEJBAreaAction = Locate in Deployment Descriptor Node
-
-
-SelectFilesToCheckoutDlgTitle = Confirm resource checkout
-SelectFilesToCheckoutDlgTblTitle = The following resources need to be checked out during the operation
-SelectFilesToCheckout_CanceledMessage = Operation cannot continue as resources checkout has been canceled
diff --git a/bundles/org.eclipse.jst.ws.jaxws.dom.integration/src/org/eclipse/jst/ws/jaxws/dom/integration/internal/plugin/DomIntegrationPlugin.java b/bundles/org.eclipse.jst.ws.jaxws.dom.integration/src/org/eclipse/jst/ws/jaxws/dom/integration/internal/plugin/DomIntegrationPlugin.java
deleted file mode 100755
index 6a9ab0e..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.integration/src/org/eclipse/jst/ws/jaxws/dom/integration/internal/plugin/DomIntegrationPlugin.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.dom.integration.internal.plugin;
-
-import org.eclipse.jst.ws.jaxws.dom.integration.navigator.DOMAdapterFactoryLabelProvider;
-import org.eclipse.jst.ws.jaxws.utils.ContractChecker;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.osgi.framework.BundleContext;
-
-/**
- * The activator class controls the plug-in life cycle
- */
-public class DomIntegrationPlugin extends AbstractUIPlugin {
-
- // The plug-in ID
- public static final String PLUGIN_ID = "org.eclipse.jst.ws.jaxws.dom.integration";
-
- // The shared instance
- private static DomIntegrationPlugin plugin;
-
- private DOMAdapterFactoryLabelProvider labelProvider;
-
- /**
- * The constructor
- */
- public DomIntegrationPlugin() {
- }
-
- /*
- * (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 DomIntegrationPlugin getDefault() {
- return plugin;
- }
-
- public void setLabelProvider(final DOMAdapterFactoryLabelProvider labelProvider)
- {
- ContractChecker.nullCheckParam(labelProvider, "labelProvider"); //$NON-NLS-1$
- this.labelProvider = labelProvider;
- }
-
- public DOMAdapterFactoryLabelProvider getLabelProvider()
- {
- return labelProvider;
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.dom.integration/src/org/eclipse/jst/ws/jaxws/dom/integration/internal/util/ProjectExplorerUtil.java b/bundles/org.eclipse.jst.ws.jaxws.dom.integration/src/org/eclipse/jst/ws/jaxws/dom/integration/internal/util/ProjectExplorerUtil.java
deleted file mode 100755
index 82f68fd..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.integration/src/org/eclipse/jst/ws/jaxws/dom/integration/internal/util/ProjectExplorerUtil.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.dom.integration.internal.util;
-
-import org.eclipse.ui.IViewPart;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.PlatformUI;
-
-/**
- * Utility class that holds methods to manipulate ProjectExplorer
- *
- * @author Georgi Vachkov
- */
-public class ProjectExplorerUtil
-{
- public static final ProjectExplorerUtil INSTANCE = new ProjectExplorerUtil();
-
- /**
- * This method should be called only from UI thread otherwise <code>null</code> will be returned
- *
- * @return the project explorer {@link IViewPart} in case it is available otherwise <code>null</code>
- */
- public IViewPart findProjectExplorer()
- {
- final IWorkbenchWindow workbenchWin = PlatformUI.getWorkbench().getActiveWorkbenchWindow();
- if (workbenchWin==null || workbenchWin.getActivePage()==null) {
- return null;
- }
-
- return workbenchWin.getActivePage().findView("org.eclipse.ui.navigator.ProjectExplorer"); //$NON-NLS-1$
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.dom.integration/src/org/eclipse/jst/ws/jaxws/dom/integration/navigator/CustomDomItemProviderAdapterFactory.java b/bundles/org.eclipse.jst.ws.jaxws.dom.integration/src/org/eclipse/jst/ws/jaxws/dom/integration/navigator/CustomDomItemProviderAdapterFactory.java
deleted file mode 100755
index 55f2522..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.integration/src/org/eclipse/jst/ws/jaxws/dom/integration/navigator/CustomDomItemProviderAdapterFactory.java
+++ /dev/null
@@ -1,156 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.dom.integration.navigator;
-
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.Notifier;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.IServiceEndpointInterface;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.IWebService;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.IWebServiceProject;
-import org.eclipse.jst.ws.jaxws.dom.ui.DomItemProviderAdapterFactory;
-
-/**
- * Factory that adapts DOM objects with Item provider adapters. For {@link ISEIChildList} and
- * {@link IWebServiceChildList} it creates specific adapter for other DOM objects delegates to
- * {@link DomItemProviderAdapterFactory}.
- *
- * @author
- */
-public class CustomDomItemProviderAdapterFactory extends DomItemProviderAdapterFactory
-{
- /**
- * The singleton instance
- */
- public static final CustomDomItemProviderAdapterFactory INSTANCE = new CustomDomItemProviderAdapterFactory();
-
- /**
- * Constructor
- */
- private CustomDomItemProviderAdapterFactory()
- {
- super();
-
- supportedTypes.add(IWebServiceChildList.class);
- supportedTypes.add(ISEIChildList.class);
- }
-
- protected Adapter createIWebServiceChildListAdapter(final IWebServiceProject wsProj)
- {
- return new IWebServiceChildList()
- {
- public EList<IWebService> getWSChildList()
- {
- return wsProj.getWebServices();
- }
-
- public Notifier getTarget()
- {
- return wsProj;
- }
-
- public boolean isAdapterForType(Object type)
- {
- return false;
- }
-
- public void notifyChanged(Notification notification)
- {
- // no processing needed currently
- }
-
- public void setTarget(Notifier newTarget)
- {
- // no processing needed currently
- }
- };
- }
-
- protected Adapter createISEIChildListAdapter(final IWebServiceProject wsProj)
- {
- return new ISEIChildList()
- {
- public EList<IServiceEndpointInterface> getSEIChildList()
- {
- return wsProj.getServiceEndpointInterfaces();
- }
-
- public Notifier getTarget()
- {
- return wsProj;
- }
-
- public boolean isAdapterForType(Object type)
- {
- return false;
- }
-
- public void notifyChanged(Notification notification)
- {
- // no processing needed currently
- }
-
- public void setTarget(Notifier newTarget)
- {
- // no processing needed currently
- }
- };
- }
-
- @Override
- public Adapter adapt(Notifier notifier, Object type)
- {
- if (notifier instanceof IWebServiceProject && type instanceof Class)
- {
- if(type.equals(IWebServiceChildList.class))
- {
- return adaptIWebServiceChildList((IWebServiceProject)notifier);
- }
- else if(type.equals(ISEIChildList.class))
- {
- return adaptISEIChildList((IWebServiceProject)notifier);
- }
- }
-
- return super.adapt(notifier, type);
- }
-
- protected Adapter adaptISEIChildList(final IWebServiceProject wsProject)
- {
- for(Adapter adapter : wsProject.eAdapters())
- {
- if(adapter instanceof ISEIChildList) {
- return adapter;
- }
- }
-
- final Adapter adapter = createISEIChildListAdapter(wsProject);
- associate(adapter, wsProject);
-
- return adapter;
- }
-
- protected Adapter adaptIWebServiceChildList(final IWebServiceProject wsProject)
- {
- for(Adapter adapter : wsProject.eAdapters())
- {
- if(adapter instanceof IWebServiceChildList) {
- return adapter;
- }
- }
-
- final Adapter adapter = createIWebServiceChildListAdapter(wsProject);
- associate(adapter, wsProject);
-
- return adapter;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.dom.integration/src/org/eclipse/jst/ws/jaxws/dom/integration/navigator/DOMAdapterFactoryContentProvider.java b/bundles/org.eclipse.jst.ws.jaxws.dom.integration/src/org/eclipse/jst/ws/jaxws/dom/integration/navigator/DOMAdapterFactoryContentProvider.java
deleted file mode 100755
index 5c0e3dd..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.integration/src/org/eclipse/jst/ws/jaxws/dom/integration/navigator/DOMAdapterFactoryContentProvider.java
+++ /dev/null
@@ -1,370 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.dom.integration.navigator;
-
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.ui.provider.AdapterFactoryContentProvider;
-import org.eclipse.jst.ws.jaxws.dom.integration.internal.util.ProjectExplorerUtil;
-import org.eclipse.jst.ws.jaxws.dom.integration.navigator.ILoadingWsProject.ILoadingCanceled;
-import org.eclipse.jst.ws.jaxws.dom.integration.navigator.ILoadingWsProject.ILoadingDummy;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.IDOM;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.IServiceEndpointInterface;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.IWebMethod;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.IWebParam;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.IWebService;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.IWebServiceProject;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.IWsDOMRuntimeExtension;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.IWsDomLoadListener;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.WsDOMLoadCanceledException;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.WsDOMRuntimeManager;
-import org.eclipse.jst.ws.jaxws.dom.runtime.registry.IWsDOMRuntimeInfo;
-import org.eclipse.jst.ws.jaxws.dom.runtime.registry.WsDOMRuntimeRegistry;
-import org.eclipse.jst.ws.jaxws.utils.ContractChecker;
-import org.eclipse.jst.ws.jaxws.utils.facets.FacetUtils;
-import org.eclipse.jst.ws.jaxws.utils.logging.Logger;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.TreeItem;
-import org.eclipse.ui.IViewPart;
-import org.eclipse.ui.navigator.CommonNavigator;
-import org.eclipse.ui.navigator.CommonViewer;
-
-/**
- * Content provider for DOM related objects
- *
- * @author
- */
-public class DOMAdapterFactoryContentProvider extends AdapterFactoryContentProvider
-{
- private Map<IWsDOMRuntimeExtension, IWsDomLoadListener> loadListeners = new HashMap<IWsDOMRuntimeExtension, IWsDomLoadListener>();
-
- /**
- * Constructor
- */
- public DOMAdapterFactoryContentProvider()
- {
- this(CustomDomItemProviderAdapterFactory.INSTANCE);
- }
-
- /**
- * Constructor
- * @param adapterFactory
- */
- public DOMAdapterFactoryContentProvider(AdapterFactory adapterFactory)
- {
- super(adapterFactory);
- }
-
- @Override
- public Object[] getChildren(final Object context)
- {
- if (context instanceof IAdaptable)
- {
- return getWsProject((IProject)((IAdaptable) context).getAdapter(IProject.class));
- }
- else if(context instanceof ILoadingWsProject)
- {
- return new Object[] { ((ILoadingWsProject)context).isLoadCanceled() ? new ILoadingCanceled(){} : new ILoadingDummy(){} };
- }
- else if(context instanceof IWebServiceProject)
- {
- return new Object[]{ adapterFactory.adapt(context, ISEIChildList.class),
- adapterFactory.adapt(context, IWebServiceChildList.class) };
- }
- else if(context instanceof IWebServiceChildList)
- {
- Object[] webServices = ((IWebServiceChildList)context).getWSChildList().toArray();
-
- for(int ii=0; ii<webServices.length; ii++)
- {
- adapterFactory.adapt(webServices[ii], ITreeItemContentProvider.class);
- }
-
- return webServices;
- }
- else if(context instanceof ISEIChildList)
- {
- Object[] sEIs = ((ISEIChildList)context).getSEIChildList().toArray();
-
- for(int ii=0; ii<sEIs.length; ii++)
- {
- adapterFactory.adapt(sEIs[ii], ITreeItemContentProvider.class);
- }
-
- return sEIs;
- }
- else if(context instanceof IWebService)
- {
- final IServiceEndpointInterface sei = ((IWebService)context).getServiceEndpoint();
- if (sei == null) {
- return new Object[0];
- }
-
- adapterFactory.adapt(sei, ITreeItemContentProvider.class);
- return new Object[]{ sei };
- }
- else if(context instanceof IServiceEndpointInterface) {
- return extractMethods((IServiceEndpointInterface) context);
- }
- else if (context instanceof IWebMethod) {
- return extractParams((IWebMethod)context);
- }
-
- return new Object[0];
- }
-
- protected Object[] getWsProject(final IProject project)
- {
- try {
- final IWsDOMRuntimeExtension runtime = getSupportingRuntime(project);
- if (runtime == null) {
- return new Object[0];
- }
-
- // WS project is loaded already
- final IWebServiceProject wsProject = getWsProject(runtime.getDOM(), project);
- if (wsProject != null)
- {
- adapterFactory.adapt(wsProject, ITreeItemContentProvider.class);
- return new Object[] { wsProject };
- }
-
- addRuntimeLoadListener(runtime);
- return new Object[] { new LoadingWsProject(project, false) };
- }
- catch (WsDOMLoadCanceledException e) { // $JL-EXC$
- return new Object[] { new LoadingWsProject(project, true) };
- }
- }
-
- protected IWsDomLoadListener addRuntimeLoadListener(final IWsDOMRuntimeExtension runtime)
- {
- IWsDomLoadListener loadListener = loadListeners.get(runtime);
- if (loadListener!=null) {
- return loadListener;
- }
-
- loadListener = new LoadListener(runtime);
- loadListeners.put(runtime, loadListener);
- runtime.addLoadListener(loadListener);
-
- return loadListener;
- }
-
- protected Object[] extractMethods(final IServiceEndpointInterface sei)
- {
- final List<IWebMethod> webMethods = sei.getWebMethods();
- for (IWebMethod webMethod : webMethods) {
- adapterFactory.adapt(webMethod, ITreeItemContentProvider.class);
- }
-
- return webMethods.toArray();
- }
-
- protected Object[] extractParams(final IWebMethod method)
- {
- final List<IWebParam> params = method.getParameters();
- for (IWebParam webParam : params) {
- adapterFactory.adapt(webParam, ITreeItemContentProvider.class);
- }
-
- return params.toArray();
- }
-
- @Override
- public boolean hasChildren(Object element)
- {
- if (element instanceof IWebServiceProject)
- {
- return true;
- }
- else if(element instanceof ILoadingWsProject)
- {
- return true;
- }
- else if(element instanceof IWebServiceChildList)
- {
- return !((IWebServiceChildList)element).getWSChildList().isEmpty();
- }
- else if(element instanceof ISEIChildList)
- {
- return !((ISEIChildList)element).getSEIChildList().isEmpty();
- }
- else if (element instanceof IWebService)
- {
- return ((IWebService) element).getServiceEndpoint() != null;
- }
- else if (element instanceof IServiceEndpointInterface)
- {
- return !((IServiceEndpointInterface)element).getWebMethods().isEmpty();
- }
- else if (element instanceof IWebMethod)
- {
- return !((IWebMethod)element).getParameters().isEmpty();
- }
-
- return false;
- }
-
- protected IWebServiceProject getWsProject(final IDOM dom, final IProject project)
- {
- if (dom == null) {
- return null;
- }
-
- for (IWebServiceProject wsProject : dom.getWebServiceProjects()) {
- if(wsProject.getName().equals(project.getName())) {
- return wsProject;
- }
- }
-
- return null;
- }
-
- protected IWsDOMRuntimeExtension getSupportingRuntime(final IProject project)
- {
- final Collection<IWsDOMRuntimeInfo> domRuntimeInfos = WsDOMRuntimeRegistry.getRegisteredRuntimesInfo();
- Map<String, String> facets;
- for (IWsDOMRuntimeInfo domRuntimeInfo : domRuntimeInfos)
- {
- facets = domRuntimeInfo.getProjectFacets();
- if (hasFacet(facets, project)) {
- return getDomRuntime(domRuntimeInfo.getId());
- }
- }
-
- return null;
- }
-
- protected boolean hasFacet(final Map<String, String> facets, final IProject project)
- {
- for (String facetId : facets.keySet())
- {
- if (facetId == null || facets.get(facetId) == null) {
- continue;
- }
-
- try {
- if ((new FacetUtils()).hasFacetWithVersion(project, facets.get(facetId), facetId, true)){
- return true;
- }
- }
- catch (CoreException e) {
- (new Logger()).logError(e.getMessage(), e);
- }
- }
-
- return false;
- }
-
- protected IWsDOMRuntimeExtension getDomRuntime(String runtimeId) {
- return WsDOMRuntimeManager.instance().getDOMRuntime(runtimeId);
- }
-
- /**
- * Class that is used to listen when the DOM load will be finished. After the load has finished
- * this class traverses the project explorers tree in order to find all instances of
- * {@link ILoadingWsProject} and substitute them with loaded {@link IWebServiceProject}
- *
- * @author Georgi Vachkov
- */
- protected class LoadListener implements IWsDomLoadListener
- {
- private final IWsDOMRuntimeExtension runtime;
-
- public LoadListener(final IWsDOMRuntimeExtension runtime)
- {
- ContractChecker.nullCheckParam(runtime, "runtime"); //$NON-NLS-1$
- this.runtime = runtime;
- }
-
- public void finished()
- {
- Display.getDefault().asyncExec(new Runnable()
- {
- public void run()
- {
- final IViewPart viewPart = ProjectExplorerUtil.INSTANCE.findProjectExplorer();
- if (viewPart instanceof CommonNavigator)
- {
- final CommonViewer commonViewer = ((CommonNavigator)viewPart).getCommonViewer();
- for (TreeItem item : commonViewer.getTree().getItems()) {
- exchangeDummy(item, commonViewer);
- }
- }
- }
- });
- }
-
- protected void exchangeDummy(final TreeItem treeItem, final CommonViewer commonViewer)
- {
- if (treeItem == null || treeItem.getData() instanceof IWebServiceProject) {
- return;
- }
-
- if (treeItem.getData() instanceof ILoadingWsProject) {
- exchangeTreeItemData(treeItem, commonViewer);
- }
- else {
- for (TreeItem child : treeItem.getItems()) {
- exchangeDummy(child, commonViewer);
- }
- }
- }
-
- private void exchangeTreeItemData(final TreeItem treeItem, final CommonViewer commonViewer)
- {
- final ILoadingWsProject loadingProject = (ILoadingWsProject)treeItem.getData();
- try {
- final IWebServiceProject wsProject = getWsProject(runtime.getDOM(), loadingProject.getProject());
- adapterFactory.adapt(wsProject, ITreeItemContentProvider.class);
- treeItem.setData(wsProject);
-
- } catch (WsDOMLoadCanceledException e) { // $JL-EXC$
- treeItem.setData(new LoadingWsProject(loadingProject.getProject(), true));
- }
-
- commonViewer.refresh(loadingProject.getProject());
- }
-
- public void started() {
- // nothing to do here
- }
- }
-
- private class LoadingWsProject implements ILoadingWsProject
- {
- final IProject project;
- final boolean isCanceled;
-
- public LoadingWsProject(final IProject project, final boolean isCanceled) {
- ContractChecker.nullCheckParam(project, "project"); //$NON-NLS-1$
- this.project = project;
- this.isCanceled = isCanceled;
- }
-
- public IProject getProject() {
- return project;
- }
-
- public boolean isLoadCanceled() {
- return isCanceled;
- }
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.dom.integration/src/org/eclipse/jst/ws/jaxws/dom/integration/navigator/DOMAdapterFactoryLabelProvider.java b/bundles/org.eclipse.jst.ws.jaxws.dom.integration/src/org/eclipse/jst/ws/jaxws/dom/integration/navigator/DOMAdapterFactoryLabelProvider.java
deleted file mode 100755
index 9484e8f..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.integration/src/org/eclipse/jst/ws/jaxws/dom/integration/navigator/DOMAdapterFactoryLabelProvider.java
+++ /dev/null
@@ -1,141 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.dom.integration.navigator;
-
-import org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider;
-import org.eclipse.jface.viewers.ILabelProviderListener;
-import org.eclipse.jface.viewers.LabelProviderChangedEvent;
-import org.eclipse.jst.ws.jaxws.dom.integration.internal.plugin.DomIntegrationMessages;
-import org.eclipse.jst.ws.jaxws.dom.integration.internal.plugin.DomIntegrationPlugin;
-import org.eclipse.jst.ws.jaxws.dom.integration.navigator.ILoadingWsProject.ILoadingCanceled;
-import org.eclipse.jst.ws.jaxws.dom.integration.navigator.ILoadingWsProject.ILoadingDummy;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.IServiceEndpointInterface;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.IWebMethod;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.IWebService;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.IWebServiceProject;
-import org.eclipse.jst.ws.jaxws.dom.ui.Images;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.ui.navigator.IDescriptionProvider;
-
-/**
- * DOM adapter factory that extends {@link AdapterFactoryLabelProvider} by providing
- * icons and labels for some objects that are not part of DOM and also overrides some
- * labels
- *
- * @author
- */
-public class DOMAdapterFactoryLabelProvider extends AdapterFactoryLabelProvider implements IDescriptionProvider
-{
- /**
- * Default Constructor uses {@link CustomDomItemProviderAdapterFactory} as default
- * adapter factory provided to the base class.
- */
- public DOMAdapterFactoryLabelProvider()
- {
- super(CustomDomItemProviderAdapterFactory.INSTANCE);
-
- DomIntegrationPlugin.getDefault().setLabelProvider(this);
- }
-
- @Override
- public Image getImage(Object element)
- {
- if(element instanceof IWebServiceChildList)
- {
- return Images.INSTANCE.getImage(Images.IMG_WEB_SERVICE_GROUP);
- }
- else if(element instanceof ISEIChildList)
- {
- return Images.INSTANCE.getImage(Images.IMG_SEI_GROUP);
- }
- else if(element instanceof ILoadingWsProject)
- {
- return Images.INSTANCE.getImage(Images.IMG_DOM_WS_PROVIDER);
- }
- else if (element instanceof ILoadingDummy || element instanceof ILoadingCanceled)
- {
- return null;
- }
-
- return super.getImage(element);
- }
-
- @Override
- public String getText(Object element)
- {
- if(element instanceof IWebServiceProject || element instanceof ILoadingWsProject)
- {
- return DomIntegrationMessages.DOMAdapterFactoryLabelProvider_JaxWsWebServicesLabel;
- }
- if (element instanceof ILoadingDummy)
- {
- return DomIntegrationMessages.DOMAdapterFactoryLabelProvider_LoadingDummyLabel;
- }
- if (element instanceof ILoadingCanceled)
- {
- return DomIntegrationMessages.DOMAdapterFactoryLabelProvider_LoadingCanceledLabel;
- }
- else if(element instanceof IWebServiceChildList)
- {
- return DomIntegrationMessages.DOMAdapterFactoryLabelProvider_WebServicesLabel;
- }
- else if(element instanceof ISEIChildList)
- {
- return DomIntegrationMessages.DOMAdapterFactoryLabelProvider_SeiLabel;
- }
-
- return super.getText(element);
- }
-
- public String getDescription(Object element)
- {
- if(element instanceof IWebService)
- {
- return ((IWebService)element).getName();
- }
- else if(element instanceof IServiceEndpointInterface)
- {
- return ((IServiceEndpointInterface)element).getName();
- }
- else if(element instanceof IWebServiceProject || element instanceof ILoadingWsProject)
- {
- return DomIntegrationMessages.DOMAdapterFactoryLabelProvider_JaxWsWebServicesLabel;
- }
- else if(element instanceof IWebServiceChildList)
- {
- return DomIntegrationMessages.DOMAdapterFactoryLabelProvider_WebServicesLabel;
- }
- else if(element instanceof ISEIChildList)
- {
- return DomIntegrationMessages.DOMAdapterFactoryLabelProvider_SeiLabel;
- }
- else if(element instanceof IWebMethod)
- {
- return ((IWebMethod)element).getName();
- }
-
- return super.getText(element);
- }
-
- public void fireLabelProviderChanged(Object element)
- {
- for (ILabelProviderListener labelProviderListener : labelProviderListeners) {
- labelProviderListener.labelProviderChanged(new LabelProviderChangedEvent(this, element));
- }
- }
-
- @Override
- protected Image getDefaultImage(Object object)
- {
- // No dfault images
- return null;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.dom.integration/src/org/eclipse/jst/ws/jaxws/dom/integration/navigator/DOMItemValuePropertySourceFactory.java b/bundles/org.eclipse.jst.ws.jaxws.dom.integration/src/org/eclipse/jst/ws/jaxws/dom/integration/navigator/DOMItemValuePropertySourceFactory.java
deleted file mode 100755
index fd4f630..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.integration/src/org/eclipse/jst/ws/jaxws/dom/integration/navigator/DOMItemValuePropertySourceFactory.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.dom.integration.navigator;
-
-import org.eclipse.core.runtime.IAdapterFactory;
-import org.eclipse.emf.edit.ui.provider.PropertySource;
-import org.eclipse.jst.ws.jaxws.dom.ui.IDOMPropertyValue;
-import org.eclipse.ui.views.properties.IPropertySource;
-
-/**
- * Adapter factory for that creates adapter from {@link IDOMPropertyValue} to
- * {@link IPropertySource} interface. This factory is registered in org.eclipse.core.runtime.adapters extension
- * point and is called when object of type {@link IDOMPropertyValue} needs to be
- * displayed or edited in property sheet.
- *
- * @author Georgi Vachkov
- */
-@SuppressWarnings("unchecked")
-public class DOMItemValuePropertySourceFactory implements IAdapterFactory
-{
- /*
- * (non-Javadoc)
- * @see org.eclipse.core.runtime.IAdapterFactory#getAdapter(java.lang.Object, java.lang.Class)
- */
- public Object getAdapter(Object adaptableObject, Class adapterType)
- {
- assert adaptableObject instanceof IDOMPropertyValue;
-
- final IDOMPropertyValue wrapper = (IDOMPropertyValue)adaptableObject;
-
- return new PropertySource(wrapper.getEditableValue(), wrapper);
- }
-
- /*
- * (non-Javadoc)
- * @see org.eclipse.core.runtime.IAdapterFactory#getAdapterList()
- */
- public Class[] getAdapterList() {
- return new Class[] {PropertySource.class};
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.dom.integration/src/org/eclipse/jst/ws/jaxws/dom/integration/navigator/DOMPropertyViewAdapterFactory.java b/bundles/org.eclipse.jst.ws.jaxws.dom.integration/src/org/eclipse/jst/ws/jaxws/dom/integration/navigator/DOMPropertyViewAdapterFactory.java
deleted file mode 100755
index 7a3343f..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.integration/src/org/eclipse/jst/ws/jaxws/dom/integration/navigator/DOMPropertyViewAdapterFactory.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.dom.integration.navigator;
-
-import org.eclipse.core.runtime.IAdapterFactory;
-import org.eclipse.ui.views.properties.IPropertySourceProvider;
-
-public class DOMPropertyViewAdapterFactory implements IAdapterFactory
-{
- private DOMAdapterFactoryContentProvider adapterFactory;
-
- @SuppressWarnings("unchecked")
- public Object getAdapter(Object adaptableObject, Class adapterType)
- {
- if (adapterType.isInstance(adaptableObject))
- {
- return adaptableObject;
- }
-
- if (adapterType == IPropertySourceProvider.class)
- {
- return getAdapterFactory();
- }
-
- return null;
- }
-
- @SuppressWarnings("unchecked")
- public Class[] getAdapterList()
- {
- return new Class[] {
- DOMAdapterFactoryContentProvider.class,
- };
- }
-
- protected DOMAdapterFactoryContentProvider getAdapterFactory()
- {
- if (adapterFactory == null) {
- adapterFactory = new DOMAdapterFactoryContentProvider();
- }
-
- return adapterFactory;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.dom.integration/src/org/eclipse/jst/ws/jaxws/dom/integration/navigator/ILoadingWsProject.java b/bundles/org.eclipse.jst.ws.jaxws.dom.integration/src/org/eclipse/jst/ws/jaxws/dom/integration/navigator/ILoadingWsProject.java
deleted file mode 100755
index 262eaa6..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.integration/src/org/eclipse/jst/ws/jaxws/dom/integration/navigator/ILoadingWsProject.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.dom.integration.navigator;
-
-import org.eclipse.core.resources.IProject;
-
-
-/**
- * An interface presenting not loaded web service project. This interface is used
- * to be added to the project explorer WS tree in cases when the project is relevant
- * but it is not yet loaded by DOM loader.
- *
- * @author Georgi Vachkov
- */
-public interface ILoadingWsProject
-{
- /**
- * @return the relevant project
- */
- public IProject getProject();
-
- /**
- * @return if the DOM loading has been canceled
- */
- public boolean isLoadCanceled();
-
- /**
- * Interface used to be added to the tree as a sub node of INotLoadedWsProject node
- * and displayed with text "Loading...".
- *
- * @author Georgi Vachkov
- */
- public interface ILoadingDummy {};
-
- public interface ILoadingCanceled {};
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.dom.integration/src/org/eclipse/jst/ws/jaxws/dom/integration/navigator/ISEIChildList.java b/bundles/org.eclipse.jst.ws.jaxws.dom.integration/src/org/eclipse/jst/ws/jaxws/dom/integration/navigator/ISEIChildList.java
deleted file mode 100755
index 04f6b4b..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.integration/src/org/eclipse/jst/ws/jaxws/dom/integration/navigator/ISEIChildList.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.dom.integration.navigator;
-
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.IServiceEndpointInterface;
-
-public interface ISEIChildList extends Adapter
-{
- public EList<IServiceEndpointInterface> getSEIChildList();
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.dom.integration/src/org/eclipse/jst/ws/jaxws/dom/integration/navigator/IWebServiceChildList.java b/bundles/org.eclipse.jst.ws.jaxws.dom.integration/src/org/eclipse/jst/ws/jaxws/dom/integration/navigator/IWebServiceChildList.java
deleted file mode 100755
index 96381d8..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.integration/src/org/eclipse/jst/ws/jaxws/dom/integration/navigator/IWebServiceChildList.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.dom.integration.navigator;
-
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.IWebService;
-
-public interface IWebServiceChildList extends Adapter
-{
- public EList<IWebService> getWSChildList();
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.dom.integration/src/org/eclipse/jst/ws/jaxws/dom/integration/navigator/WebServiceProblemsDecorator.java b/bundles/org.eclipse.jst.ws.jaxws.dom.integration/src/org/eclipse/jst/ws/jaxws/dom/integration/navigator/WebServiceProblemsDecorator.java
deleted file mode 100755
index 5a9d2be..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.integration/src/org/eclipse/jst/ws/jaxws/dom/integration/navigator/WebServiceProblemsDecorator.java
+++ /dev/null
@@ -1,218 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.dom.integration.navigator;
-
-import java.util.List;
-
-import org.eclipse.core.resources.IMarker;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.jdt.ui.JavaElementImageDescriptor;
-import org.eclipse.jdt.ui.ProblemsLabelDecorator;
-import org.eclipse.jst.ws.jaxws.dom.runtime.DomUtil;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.DomPackage;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.IServiceEndpointInterface;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.IWebMethod;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.IWebParam;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.IWebService;
-import org.eclipse.jst.ws.jaxws.dom.runtime.util.Dom2ResourceMapper;
-import org.eclipse.jst.ws.jaxws.utils.dom.validation.DomValidationConstants;
-import org.eclipse.jst.ws.jaxws.utils.logging.Logger;
-
-public class WebServiceProblemsDecorator extends ProblemsLabelDecorator
-{
- /** Enum to represent different marker types */
- public enum Severity {OK, ERROR, WARNING};
-
- private DomUtil domUtil = DomUtil.INSTANCE;
-
- @Override
- protected int computeAdornmentFlags(Object obj)
- {
- final Severity severity = defineSeverity(obj);
- if (severity == Severity.ERROR) {
- return JavaElementImageDescriptor.ERROR;
- }
-
- if (severity == Severity.WARNING) {
- return JavaElementImageDescriptor.WARNING;
- }
-
- return 0;
- }
-
- /**
- * Checks the object's resource for markers and defines the severity of the
- * problem if any.
- * @param obj
- * @return the severity calculated.
- */
- protected Severity defineSeverity(final Object obj)
- {
- try
- {
- // process additional DOM objects needed for UI - IWebServiceChildList and ISEIChildList
- if (obj instanceof IWebServiceChildList) {
- return defineSeverityForEList(((IWebServiceChildList)obj).getWSChildList());
- }
-
- if (obj instanceof ISEIChildList) {
- return defineSeverityForEList(((ISEIChildList)obj).getSEIChildList());
- }
-
- // do not process non DOM objects
- if( !(obj instanceof EObject) ) {
- return Severity.OK;
- }
-
- return defineSeverity((EObject) obj);
- }
- catch (CoreException e) {
- (new Logger()).logError(e.getMessage(), e);
- }
-
- return Severity.OK;
- }
-
- protected Severity defineSeverityForEList(final List<? extends EObject> list) throws CoreException
- {
- Severity severity = Severity.OK;
- for (EObject eObject : list)
- {
- Severity tempSeverity = defineSeverity(eObject);
- if (tempSeverity == Severity.ERROR) {
- return Severity.ERROR;
- }
-
- if (tempSeverity==Severity.WARNING) {
- severity = Severity.WARNING;
- }
- }
-
- return severity;
- }
-
- protected Severity defineSeverity(final EObject eObject) throws CoreException
- {
- final IResource resource = Dom2ResourceMapper.INSTANCE.findResource(eObject);
- if (resource!=null) {
- return defineSeverity(eObject, resource);
- }
-
- return Severity.OK;
- }
-
- protected Severity defineSeverity(final EObject eObject, final IResource resource) throws CoreException
- {
- if (!resource.isAccessible()) {
- return Severity.OK;
- }
-
- final int depth = (resource.getType()==IResource.PROJECT) ? IResource.DEPTH_INFINITE : IResource.DEPTH_ZERO;
- final IMarker[] markers = resource.findMarkers(DomValidationConstants.MARKER_ID, false, depth);
- Severity severity = Severity.OK;
- for (IMarker marker : markers)
- {
- if (!isRelevantFor(eObject, marker)) {
- continue;
- }
-
- int tempSeverity = (Integer)marker.getAttribute(IMarker.SEVERITY);
- if (tempSeverity==IMarker.SEVERITY_ERROR) {
- return Severity.ERROR;
- }
-
- if(tempSeverity==IMarker.SEVERITY_WARNING) {
- severity = Severity.WARNING;
- }
- }
-
- if (severity == Severity.OK && (eObject instanceof IWebService))
- {
- // for bean with explicit interface we need to check the interface as well
- // because it resides in another resource
- final IServiceEndpointInterface sei = ((IWebService)eObject).getServiceEndpoint();
- if (sei != null && !sei.isImplicit()) {
- severity = defineSeverity(sei);
- }
- }
-
- return severity;
- }
-
- /**
- * Defines if <code>marker</code> is relevant for <code>eObject</code>.
- * Only for web method and web parameter we need to define if the marker is relevant
- * because they are not unique in the scope of the resource. For example if there is a
- * marker set on the resource containing SEI, the SEI should be marked in any case
- * while the method only in case when the error is specifically for this method or
- * method parameter.
- * @param eObject the object to be validated
- * @param marker the resource marker
- * @return <code>true</code> in case the marker is relevant for <code>eObject</code>
- * @throws CoreException
- */
- protected boolean isRelevantFor(final EObject eObject, final IMarker marker) throws CoreException
- {
- switch (eObject.eClass().getClassifierID())
- {
- case DomPackage.IWEB_METHOD:
- return isRelevantForMethod((IWebMethod)eObject, marker);
- case DomPackage.IWEB_PARAM:
- return isRelevant(domUtil.calcUniqueImpl(eObject), marker);
- }
-
- return true;
- }
-
- /**
- * Defines if <code>marker</code> is relevant for <code>webMethod</code>.
- * Checks if the marker is specifically for this method or some of it's parameters.
- * @param webMethod the method to be checked
- * @param marker the marker to be checked
- * @return <code>true</code> in case marker is relevant
- * @throws CoreException
- */
- protected boolean isRelevantForMethod(final IWebMethod webMethod, final IMarker marker) throws CoreException
- {
- if (isRelevant(domUtil.calcUniqueImpl(webMethod), marker)) {
- return true;
- }
-
- for (IWebParam webParam : webMethod.getParameters())
- {
- if (isRelevant(domUtil.calcUniqueImpl(webParam), marker)) {
- return true;
- }
- }
-
- return false;
- }
-
- /**
- * Checks if marker's {@link DomValidationConstants#IMPLEMENTATION} attribute has same
- * value as <code>implementation</code>.
- * @param implementation the implementation signature
- * @param marker the marker to be checked
- * @return <code>true</code> in case marker is for this implementation
- * @throws CoreException
- */
- protected boolean isRelevant(final String implementation, final IMarker marker) throws CoreException
- {
- final Object found = marker.getAttribute(DomValidationConstants.IMPLEMENTATION);
- if (found != null && found.equals(implementation)) {
- return true;
- }
-
- return false;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.dom.integration/src/org/eclipse/jst/ws/jaxws/dom/integration/navigator/actions/NavigateToImplementationAction.java b/bundles/org.eclipse.jst.ws.jaxws.dom.integration/src/org/eclipse/jst/ws/jaxws/dom/integration/navigator/actions/NavigateToImplementationAction.java
deleted file mode 100755
index 0bf1369..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.integration/src/org/eclipse/jst/ws/jaxws/dom/integration/navigator/actions/NavigateToImplementationAction.java
+++ /dev/null
@@ -1,509 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.dom.integration.navigator.actions;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.ITreeContentProvider;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.viewers.StructuredViewer;
-import org.eclipse.jface.viewers.TreePath;
-import org.eclipse.jface.viewers.TreeViewer;
-import org.eclipse.jst.javaee.ejb.MessageDrivenBean;
-import org.eclipse.jst.javaee.ejb.SessionBean;
-import org.eclipse.jst.jee.ui.internal.navigator.ejb.GroupEJBProvider;
-import org.eclipse.jst.jee.ui.internal.navigator.ejb.GroupEjbSession;
-import org.eclipse.jst.ws.jaxws.dom.integration.internal.plugin.DomIntegrationMessages;
-import org.eclipse.jst.ws.jaxws.dom.integration.navigator.ISEIChildList;
-import org.eclipse.jst.ws.jaxws.dom.runtime.DomUtil;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.IDOM;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.IJavaWebServiceElement;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.IServiceEndpointInterface;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.IWebService;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.IWebServiceProject;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.IWsDOMRuntimeExtension;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.WsDOMLoadCanceledException;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.WsDOMRuntimeManager;
-import org.eclipse.jst.ws.jaxws.dom.runtime.persistence.Jee5WsDomRuntimeExtension;
-import org.eclipse.jst.ws.jaxws.utils.logging.ILogger;
-import org.eclipse.jst.ws.jaxws.utils.logging.Logger;
-import org.eclipse.jst.ws.jaxws.utils.resources.ProjectManagementUtils;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.ui.IActionDelegate2;
-import org.eclipse.ui.actions.SelectionListenerAction;
-
-public class NavigateToImplementationAction extends SelectionListenerAction
- implements IActionDelegate2 {
- protected Object srcObject;
-
- private IJavaProject project;
-
- private StructuredViewer viewer;
-
- protected NavigateToImplementationAction(StructuredViewer viewer) {
- this(DomIntegrationMessages.OpenWSResourceAction_Name);
-
- this.viewer = viewer;
- }
-
- protected NavigateToImplementationAction(String text) {
- super(text);
- }
-
- @Override
- public String getText()
- {
- if(srcObject instanceof SessionBean)
- {
- return DomIntegrationMessages.NavigateToImplementationAction_ShowInWebServicesAreaAction;
- }
- else
- {
- return DomIntegrationMessages.NavigateToImplementationAction_ShowInEJBAreaAction;
- }
- }
-
- @Override
- public boolean isEnabled() {
- boolean isEnabled = super.isEnabled()
- && this.viewer instanceof TreeViewer
- && this.project !=null
- && ProjectManagementUtils.isEjb3Project(this.project.getProject().getName());
-
- if(srcObject instanceof IWebService)
- {
- return isEnabled;
- }
-
- if(srcObject instanceof SessionBean)
- {
- SessionBean sessionBean = ((SessionBean)srcObject);
- IWebService webService = getWebService(sessionBean);
- if (webService == null)
- {
- return false;
- }
- return isEnabled;
- }
-
- if(srcObject instanceof IServiceEndpointInterface
- && ((IServiceEndpointInterface)srcObject).isImplicit())
- {
- return isEnabled;
- }
-
- return false;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.ui.IActionDelegate#run(org.eclipse.jface.action.IAction)
- */
- public void run(IAction action) {
- // TODO Auto-generated method stub
- run();
-
- }
-
- /**
- * The user has invoked this action
- */
- public void run() {
- if (!isEnabled())
- return;
-
- ICompilationUnit cu = null;
-
- if(srcObject instanceof SessionBean)
- {
- SessionBean sessionBean = ((SessionBean)srcObject);
- String ejbClass = sessionBean.getEjbClass();
- IWebService webService = getWebService(sessionBean);
- if (webService == null)
- {
- return;
- }
-
- IServiceEndpointInterface sEI = webService.getServiceEndpoint();
- boolean isImplicit = sEI.isImplicit();
- String sEIClass;
- if (!isImplicit){
- String impl = sEI.getImplementation();
- sEIClass = impl;
- } else {
- sEIClass = ejbClass;
- }
- try {
- cu = project.findType(sEIClass).getCompilationUnit();
- IResource resource = cu.getResource();
- moveToSEINode(resource);
- } catch (JavaModelException jme) {
- logger().logError("Unexpected exception occurred", jme); //$NON-NLS-1$
- return;
- }
-
- }
- else
- {
- try {
- cu = project.findType(
- ((IJavaWebServiceElement) srcObject)
- .getImplementation()).getCompilationUnit();
- } catch (JavaModelException jme) {
- logger().logError("Unexpected exception occurred", jme); //$NON-NLS-1$
- return;
- }
-
- moveToEjbNode(cu.getResource());
- }
- }
-
- /**
- * Returns IWebService if sessionBean has been exposed as web service.
- * @param sessionBean a session bean.
- * @return IWebService if sessionBean has been exposed as web service. If the session bean has not been
- * exposed as web service - returns null.
- * @throws NullPointerException if sessionBean is null.
- */
- protected IWebService getWebService(final SessionBean sessionBean)
- {
- final IWsDOMRuntimeExtension domRuntime = getDomRuntime();
- if (domRuntime == null) {
- return null;
- }
-
- try {
- final IDOM dom = domRuntime.getDOM();
- if (dom == null) {
- return null;
- }
-
- final IWebServiceProject webServiceProject = DomUtil.INSTANCE.findProjectByName(dom, this.project.getProject().getName());
- return DomUtil.INSTANCE.findWsByImplName(webServiceProject, sessionBean.getEjbClass());
- }
- catch (WsDOMLoadCanceledException e) { // $JL-EXC$
- return null;
- }
- }
-
- protected IWsDOMRuntimeExtension getDomRuntime() {
- return WsDOMRuntimeManager.instance().getDOMRuntime(Jee5WsDomRuntimeExtension.ID);
- }
-
- private void moveToSEINode(IResource resource)
- {
- TreeViewer treeViewer = (TreeViewer)this.viewer;
- ISelection sel = null;
-
- Object[] expandedObjects = treeViewer.getExpandedElements();
-
- Object[] projectElements = ((ITreeContentProvider) treeViewer
- .getContentProvider()).getChildren(this.project.getProject());
- IWebServiceProject wsProject = null;
-
- for (int ii = 0; ii < projectElements.length; ii++) {
- if (projectElements[ii] instanceof IWebServiceProject) {
- wsProject = (IWebServiceProject) projectElements[ii];
- treeViewer.expandToLevel(wsProject, 2);
- break;
- }
- }
-
- if (wsProject == null)
- return;
-
- for(IServiceEndpointInterface sEI : wsProject.getServiceEndpointInterfaces())
- {
- try {
- ICompilationUnit cu = project.findType(
- ((IJavaWebServiceElement) sEI)
- .getImplementation()).getCompilationUnit();
-
- if(cu.getResource().equals(resource))
- {
- sel = new StructuredSelection(sEI);
- TreePath treePath = getTreePathForSEI(treeViewer,
- wsProject);
- Object[] elementsToExpand = new Object[treePath
- .getSegmentCount()];
-
- for (int jj = 0; jj < elementsToExpand.length; jj++) {
- if (notAlreadyExpanded(treePath.getSegment(jj),
- expandedObjects)) {
- elementsToExpand[jj] = treePath.getSegment(jj);
- }
- }
-
- for (int jj = 0; jj < elementsToExpand.length; jj++) {
- if (elementsToExpand[jj] != null) {
- Object[] tmp = expandedObjects;
- expandedObjects = new Object[expandedObjects.length + 1];
-
- for (int kk = 0; kk < tmp.length; kk++) {
- expandedObjects[kk] = tmp[kk];
- }
-
- expandedObjects[expandedObjects.length - 1] = elementsToExpand[jj];
- }
- }
-
- break;
- }
- } catch (JavaModelException jme) {
- logger().logError("Unexpected exception occurred", jme); //$NON-NLS-1$
- return;
- }
-
- }
- setExpandedElementsAndSelection(treeViewer, expandedObjects, sel);
- }
-
- private void moveToEjbNode(IResource resource) {
- TreeViewer treeViewer = (TreeViewer)this.viewer;
- ISelection sel = null;
-
- Object[] expandedObjects = treeViewer.getExpandedElements();
-
- Object[] projectElements = ((ITreeContentProvider) treeViewer
- .getContentProvider()).getChildren(this.project.getProject());
- GroupEJBProvider ejbProvider = null;
- GroupEjbSession ejbSession = null;
-
- for (int ii = 0; ii < projectElements.length; ii++) {
- if (projectElements[ii] instanceof GroupEJBProvider) {
- ejbProvider = (GroupEJBProvider) projectElements[ii];
- treeViewer.expandToLevel(ejbProvider, 1);
- break;
- }
- }
-
- if (ejbProvider == null)
- return;
-
- for (Object ejbProviderChild : ejbProvider.getChildren()) {
- if (ejbProviderChild instanceof GroupEjbSession) {
- ejbSession = (GroupEjbSession) ejbProviderChild;
- treeViewer.expandToLevel(ejbSession, 2);
- }
- }
-
- if (ejbSession == null) {
- return;
- }
-
- Object[] ejbs = treeViewer.getExpandedElements();
-
- for (int ii = 0; ii < ejbs.length; ii++) {
- if ((ejbs[ii] instanceof SessionBean)||(ejbs[ii] instanceof MessageDrivenBean)) {
-
- IJavaProject javaProject = findJavaProject(ejbs[ii]);
- IType t = null;
- try {
- if((ejbs[ii] instanceof SessionBean))
- t = javaProject.findType(((SessionBean)ejbs[ii]).getEjbClass());
- else
- t = javaProject.findType(((MessageDrivenBean)ejbs[ii]).getEjbClass());
- } catch (JavaModelException e) {
- return;
- }
- IResource r = t.getResource();
-
- if (r.equals(resource)) {
- sel = new StructuredSelection(ejbs[ii]);
- TreePath treePath = getTreePathForObject(treeViewer,
- ejbs[ii]);
- expandElements(expandedObjects, treePath);
-
- break;
- }
- }
- }
-
- setExpandedElementsAndSelection(treeViewer, expandedObjects, sel);
- }
-
- protected IJavaProject findJavaProject(Object ejb)
- {
- IProject proj = ProjectUtilities.getProject(ejb);
- return JavaCore.create(proj);
- }
-
- private void setExpandedElementsAndSelection(TreeViewer treeViewer, Object[] expandedObjects, ISelection sel)
- {
- treeViewer.setExpandedElements(expandedObjects);
-
- if (sel != null) {
- treeViewer.setSelection(sel, true);
- }
- }
-
- private void expandElements(Object[] expandedObjects, TreePath treePath)
- {
-
- Object[] elementsToExpand = new Object[treePath.getSegmentCount()];
-
- for (int jj = 0; jj < elementsToExpand.length; jj++)
- {
- if (notAlreadyExpanded(treePath.getSegment(jj), expandedObjects))
- {
- elementsToExpand[jj] = treePath.getSegment(jj);
- }
- }
-
- for (int jj = 0; jj < elementsToExpand.length; jj++) {
- if (elementsToExpand[jj] != null) {
- Object[] tmp = expandedObjects;
- expandedObjects = new Object[expandedObjects.length + 1];
-
- for (int kk = 0; kk < tmp.length; kk++) {
- expandedObjects[kk] = tmp[kk];
- }
-
- expandedObjects[expandedObjects.length - 1] = elementsToExpand[jj];
- }
- }
- }
-
-
- private boolean notAlreadyExpanded(Object obj, Object[] expObjs) {
- for (int ii = 0; ii < expObjs.length; ii++) {
- if (expObjs[ii].equals(obj)) {
- return false;
- }
- }
-
- return true;
- }
-
- private TreePath getTreePathForSEI(TreeViewer treeViewer, IWebServiceProject wsProject)
- {
- TreePath[] treePaths = treeViewer.getExpandedTreePaths();
-
- for (int ii = 0; ii < treePaths.length; ii++) {
- if (treePaths[ii].getLastSegment() instanceof ISEIChildList
- && contains(treePaths[ii], wsProject)) {
- return treePaths[ii];
- }
- }
- return null;
- }
-
- private boolean contains(TreePath treePath, IWebServiceProject wsProject)
- {
- for(int ii=0; ii<treePath.getSegmentCount(); ii++)
- {
- if(treePath.getSegment(ii).equals(wsProject))
- {
- return true;
- }
- }
-
- return false;
- }
- private TreePath getTreePathForObject(TreeViewer treeViewer, Object obj) {
- TreePath[] treePaths = treeViewer.getExpandedTreePaths();
-
- for (int ii = 0; ii < treePaths.length; ii++) {
- if (treePaths[ii].getLastSegment().equals(obj)) {
- return treePaths[ii];
- }
- }
-
- return null;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.ui.IActionDelegate#selectionChanged(org.eclipse.jface.action.IAction,
- * org.eclipse.jface.viewers.ISelection)
- */
- public void selectionChanged(IAction action, ISelection selection) {
- // TODO HACK!
- updateSelection((IStructuredSelection) selection);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.ui.IActionDelegate#selectionChanged(org.eclipse.jface.action.IAction,
- * org.eclipse.jface.viewers.ISelection)
- */
- public void selectionChanged(IStructuredSelection selection,
- IJavaProject project) {
- super.selectionChanged(selection);
-
- this.project = project;
- }
-
- /**
- * The structured selection has changed in the workbench. Subclasses should
- * override this method to react to the change. Returns true if the action
- * should be enabled for this selection, and false otherwise.
- *
- * When this method is overridden, the super method must always be invoked.
- * If the super method returns false, this method must also return false.
- *
- * @param sel
- * the new structured selection
- */
- public boolean updateSelection(IStructuredSelection s) {
- if (!super.updateSelection(s))
- return false;
-
- srcObject = s.getFirstElement();
-
- return true;
- }
-
- private ILogger logger() {
- return new Logger();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.ui.IActionDelegate2#dispose()
- */
- public void dispose() {
- // Dispose
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.ui.IActionDelegate2#init(org.eclipse.jface.action.IAction)
- */
- public void init(IAction action) {
- // init
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.ui.IActionDelegate2#runWithEvent(org.eclipse.jface.action.IAction,
- * org.eclipse.swt.widgets.Event)
- */
- public void runWithEvent(IAction action, Event event) {
- runWithEvent(event);
-
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.dom.integration/src/org/eclipse/jst/ws/jaxws/dom/integration/navigator/actions/OpenWSResourceAction.java b/bundles/org.eclipse.jst.ws.jaxws.dom.integration/src/org/eclipse/jst/ws/jaxws/dom/integration/navigator/actions/OpenWSResourceAction.java
deleted file mode 100755
index 62f86dd..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.integration/src/org/eclipse/jst/ws/jaxws/dom/integration/navigator/actions/OpenWSResourceAction.java
+++ /dev/null
@@ -1,314 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.dom.integration.navigator.actions;
-
-import java.util.HashMap;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IMarker;
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jdt.core.ICompilationUnit;
-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.jface.action.IAction;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jst.ws.jaxws.dom.integration.internal.plugin.DomIntegrationMessages;
-import org.eclipse.jst.ws.jaxws.dom.runtime.DomUtil;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.IJavaWebServiceElement;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.IServiceEndpointInterface;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.IWebMethod;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.IWebParam;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.IWebService;
-import org.eclipse.jst.ws.jaxws.utils.logging.ILogger;
-import org.eclipse.jst.ws.jaxws.utils.logging.Logger;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.ui.IActionDelegate2;
-import org.eclipse.ui.IEditorDescriptor;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.actions.SelectionListenerAction;
-import org.eclipse.ui.ide.IDE;
-import org.eclipse.ui.part.FileEditorInput;
-
-public class OpenWSResourceAction extends SelectionListenerAction implements IActionDelegate2
-{
- protected Object srcObject;
-
- private IJavaProject project;
-
- private IServiceEndpointInterface sei;
- private DomUtil util = DomUtil.INSTANCE;
-
- protected OpenWSResourceAction() {
- this(DomIntegrationMessages.OpenWSResourceAction_Name);
- }
-
- protected OpenWSResourceAction(String text) {
- super(text);
- }
-
- @Override
- public boolean isEnabled() {
- boolean isEnabled = super.isEnabled()
- && this.project!=null;
-
- if(srcObject instanceof IWebService)
- {
- return isEnabled;
- }
-
- if(srcObject instanceof IServiceEndpointInterface)
- {
- return isEnabled;
- }
-
- if(srcObject instanceof IWebMethod)
- {
- return isEnabled;
- }
-
- if(srcObject instanceof IWebParam)
- {
- return isEnabled;
- }
-
- return false;
- }
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.ui.IActionDelegate#run(org.eclipse.jface.action.IAction)
- */
- public void run(IAction action) {
- run();
- }
-
- /**
- * The user has invoked this action
- */
- public void run() {
- if (!isEnabled())
- return;
-
- ICompilationUnit cu;
- IWebMethod webMethod = null;
- IWebParam webParam = null;
-
- if(srcObject instanceof IWebMethod)
- {
- webMethod = (IWebMethod)srcObject;
- srcObject = sei;
- }
- if(srcObject instanceof IWebParam)
- {
- webParam = (IWebParam)srcObject;
- webMethod = (IWebMethod)webParam.eContainer();
- srcObject = sei;
- }
-
- try {
-
- cu = project.findType(((IJavaWebServiceElement) srcObject).getImplementation()).getCompilationUnit();
-
- IWorkbenchPage page = getWorkbench().getActiveWorkbenchWindow().getActivePage();
-
- IEditorDescriptor desc = getWorkbench().getEditorRegistry().getDefaultEditor(cu.getResource().getName());
-
- cu = getCUToOpen(cu, webMethod);
- if (cu == null)
- {
- logger().logError("Unable to locate containing CU to open"); //$NON-NLS-1$
- return;
- }
-
- IFile file = getWorkspace().getRoot().findFilesForLocation(cu.getResource().getLocation())[0];
- IEditorPart editor = page.openEditor(new FileEditorInput(file), desc.getId());
-
- IMarker marker = file.createMarker(IMarker.TEXT);
- HashMap<String, Integer> map = new HashMap<String, Integer>();
-
- map.put(IMarker.CHAR_START, getMarkerPosition(cu, webMethod, false));
- map.put(IMarker.CHAR_END, getMarkerPosition(cu, webMethod, true));
-
- marker.setAttributes(map);
-
- IDE.gotoMarker(editor, marker);
- } catch (PartInitException pie) {
- logger().logError("Unable to open part editor", pie); //$NON-NLS-1$
- } catch(CoreException ce) {
- logger().logError(ce.getMessage(), ce);
- }
- }
-
- private int getMarkerPosition(ICompilationUnit cu, IWebMethod webMethod, boolean endPos) throws JavaModelException
- {
- final IType[] types = cu.getTypes();
- for (int ii = 0; ii < types.length; ii++)
- {
- if (webMethod == null)
- {
- return getPosition(types[ii], endPos);
- }
-
- final IMethod method = util.findMethod(types[ii], webMethod);
- if (method==null) {
- continue;
- }
-
- return getPosition(method, endPos);
- }
-
- return 0;
- }
-
- private int getPosition(IMember member, boolean endPos) throws JavaModelException
- {
- return member.getNameRange().getOffset() + ((endPos) ? member.getNameRange().getLength() : 0);
- }
-
- private ICompilationUnit getCUToOpen(ICompilationUnit cu, IWebMethod webMethod)
- {
- if (webMethod == null)
- {
- return cu;
- }
-
- try
- {
- final IType[] types = cu.getTypes();
- for(int ii=0; ii<types.length; ii++)
- {
- IMethod method = util.findMethod(types[ii], webMethod);
- if (method != null)
- {
- return types[ii].getCompilationUnit();
- }
- }
-
- for(int ii=0; ii<types.length; ii++)
- {
- IType[] superIntfTypes = types[ii].newSupertypeHierarchy(null).getSuperInterfaces(types[ii]);
-
- for(int jj=0; jj<superIntfTypes.length; jj++)
- {
- ICompilationUnit cuToOpen = getCUToOpen(superIntfTypes[jj].getCompilationUnit(), webMethod);
-
- if(cuToOpen!=null)
- {
- return cuToOpen;
- }
- }
-
- IType superClassType = types[ii].newSupertypeHierarchy(null).getSuperclass(types[ii]);
-
- ICompilationUnit cuToOpen = getCUToOpen(superClassType.getCompilationUnit(), webMethod);
-
- if(cuToOpen!=null)
- {
- return cuToOpen;
- }
- }
- }
- catch(JavaModelException jme)
- {
- logger().logError(jme.getMessage(), jme);
- }
-
- return null;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.ui.IActionDelegate#selectionChanged(org.eclipse.jface.action.IAction,
- * org.eclipse.jface.viewers.ISelection)
- */
- public void selectionChanged(IAction action, ISelection selection) {
- updateSelection((IStructuredSelection) selection);
- }
-
- public void selectionChanged(IStructuredSelection selection, IJavaProject project, IServiceEndpointInterface sei) {
- super.selectionChanged(selection);
-
- this.project = project;
- this.sei = sei;
- }
-
- /**
- * The structured selection has changed in the workbench. Subclasses should
- * override this method to react to the change. Returns true if the action
- * should be enabled for this selection, and false otherwise.
- *
- * When this method is overridden, the super method must always be invoked.
- * If the super method returns false, this method must also return false.
- *
- * @param sel
- * the new structured selection
- */
- public boolean updateSelection(IStructuredSelection s) {
- if (!super.updateSelection(s))
- return false;
-
- srcObject = s.getFirstElement();
-
- return true;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.ui.IActionDelegate2#dispose()
- */
- public void dispose() {
- // Dispose
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.ui.IActionDelegate2#init(org.eclipse.jface.action.IAction)
- */
- public void init(IAction action) {
- // init
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.ui.IActionDelegate2#runWithEvent(org.eclipse.jface.action.IAction,
- * org.eclipse.swt.widgets.Event)
- */
- public void runWithEvent(IAction action, Event event) {
- runWithEvent(event);
-
- }
-
- private ILogger logger() {
- return new Logger();
- }
-
- private IWorkbench getWorkbench() {
- return PlatformUI.getWorkbench();
- }
-
- private IWorkspace getWorkspace() {
- return ResourcesPlugin.getWorkspace();
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.dom.integration/src/org/eclipse/jst/ws/jaxws/dom/integration/navigator/actions/WSActionProvider.java b/bundles/org.eclipse.jst.ws.jaxws.dom.integration/src/org/eclipse/jst/ws/jaxws/dom/integration/navigator/actions/WSActionProvider.java
deleted file mode 100755
index bdf8ddf..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.integration/src/org/eclipse/jst/ws/jaxws/dom/integration/navigator/actions/WSActionProvider.java
+++ /dev/null
@@ -1,127 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.dom.integration.navigator.actions;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jface.action.IMenuManager;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.ITreeSelection;
-import org.eclipse.jface.viewers.TreePath;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.IServiceEndpointInterface;
-import org.eclipse.ui.IActionBars;
-import org.eclipse.ui.actions.ActionContext;
-import org.eclipse.ui.actions.ActionFactory;
-import org.eclipse.ui.navigator.CommonActionProvider;
-import org.eclipse.ui.navigator.ICommonActionConstants;
-import org.eclipse.ui.navigator.ICommonActionExtensionSite;
-import org.eclipse.ui.navigator.ICommonMenuConstants;
-
-
-public class WSActionProvider extends CommonActionProvider
-{
- private OpenWSResourceAction openAction;
-
- private NavigateToImplementationAction navigateAction;
-
- @Override
- public void fillActionBars(IActionBars actionBars)
- {
- if(openAction.isEnabled())
- actionBars.setGlobalActionHandler(ICommonActionConstants.OPEN, openAction);
-
- if(navigateAction.isEnabled())
- actionBars.setGlobalActionHandler(ActionFactory.FIND.getId(), navigateAction);
- }
-
- @Override
- public void fillContextMenu(IMenuManager menu)
- {
- if (getContext()==null || getContext().getSelection().isEmpty())
- return;
-
- IStructuredSelection selection = (IStructuredSelection) getContext().getSelection();
- openAction.selectionChanged(selection);
- navigateAction.selectionChanged(selection);
- navigateAction.setText(navigateAction.getText());
-
- if (openAction.isEnabled())
- menu.insertAfter(ICommonMenuConstants.GROUP_OPEN, openAction);
-
- if(navigateAction.isEnabled())
- menu.insertAfter(ICommonMenuConstants.GROUP_OPEN_WITH, navigateAction);
- }
-
- @Override
- public void init(ICommonActionExtensionSite site) {
- super.init(site);
-
- openAction = new OpenWSResourceAction();
- navigateAction = initNavigateAction(site);
- }
-
- protected NavigateToImplementationAction initNavigateAction(ICommonActionExtensionSite site)
- {
- return new NavigateToImplementationAction(site.getStructuredViewer());
- }
-
- @Override
- public void setContext(ActionContext context) {
- if (context != null && context.getSelection() instanceof IStructuredSelection)
- {
- IStructuredSelection selection = (IStructuredSelection) context.getSelection();
-
- if(selection instanceof ITreeSelection)
- {
- TreePath[] paths = ((ITreeSelection)selection).getPathsFor(selection.getFirstElement());
- IProject project = null;
-
- for(int ii=0; ii<paths.length; ii++)
- {
- TreePath path = paths[ii];
- IServiceEndpointInterface sei = null;
-
- for(int jj=0; jj<path.getSegmentCount(); jj++)
- {
- if(path.getSegment(jj) instanceof IServiceEndpointInterface)
- {
- sei = (IServiceEndpointInterface)path.getSegment(jj);
- break;
- }
- }
-
- for(int jj=0; jj<path.getSegmentCount(); jj++)
- {
- if(path.getSegment(jj) instanceof IProject)
- {
- project = (IProject)path.getSegment(jj);
- openAction.selectionChanged(selection, getJavaProject(project), sei);
- navigateAction.selectionChanged(selection, getJavaProject(project));
- super.setContext(context);
- return;
- }
- }
- }
- }
-
- openAction.selectionChanged(selection);
- navigateAction.selectionChanged(selection);
- }
-
- super.setContext(context);
- }
-
- protected IJavaProject getJavaProject(IProject project)
- {
- return JavaCore.create(project);
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.dom.integration/src/org/eclipse/jst/ws/jaxws/dom/integration/validation/DomValidationHelper.java b/bundles/org.eclipse.jst.ws.jaxws.dom.integration/src/org/eclipse/jst/ws/jaxws/dom/integration/validation/DomValidationHelper.java
deleted file mode 100755
index b5ec3a4..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.integration/src/org/eclipse/jst/ws/jaxws/dom/integration/validation/DomValidationHelper.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.dom.integration.validation;
-
-import org.eclipse.jst.ws.jaxws.dom.runtime.DomUtil;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.IDOM;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.IWebServiceProject;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.IWsDOMRuntimeExtension;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.WsDOMLoadCanceledException;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.WsDOMRuntimeManager;
-import org.eclipse.jst.ws.jaxws.utils.ContractChecker;
-import org.eclipse.wst.validation.internal.operations.WorkbenchContext;
-import org.eclipse.wst.validation.internal.provisional.core.IValidationContext;
-
-/**
- * {@link IValidationContext} implementor. Acts as helper class for validation. Used
- * by {@link DomValidationManager} to retrieve DOM model.
- *
- * @author Georgi Vachkov
- */
-@SuppressWarnings("restriction")
-public class DomValidationHelper extends WorkbenchContext
-{
- /**
- * Constructor - registers models that this helper will support. Registration is done
- * by setting model 'symbolicName' and method to be called for this method to be retrieved
- */
- public DomValidationHelper()
- {
- registerModel("webServiceProject", "getWebServiceProject", new Class[] {String.class}); //$NON-NLS-1$ //$NON-NLS-2$
- }
-
- /**
- * Executed by {@link WorkbenchContext} when {@link WorkbenchContext#loadModel(String, Object[])} is called
- * and finds the corresponding to {@link #getProject()} {@link IWebServiceProject}
- *
- * @param domId
- * @return found {@link IWebServiceProject} or <code>null</code>
- */
- public IWebServiceProject getWebServiceProject(final String domId)
- {
- ContractChecker.nullCheckParam(domId, "domId"); //$NON-NLS-1$
-
- final IWsDOMRuntimeExtension domRuntime = getDomRuntime(domId);
- if (domRuntime == null) {
- return null;
- }
-
- try {
- final IDOM dom = domRuntime.getDOM();
- if (dom==null) {
- return null;
- }
-
- return DomUtil.INSTANCE.findProjectByName(dom, getProject().getName());
- }
- catch (WsDOMLoadCanceledException e) { // $JL-EXC$
- return null;
- }
- }
-
- protected IWsDOMRuntimeExtension getDomRuntime(final String domId) {
- return WsDOMRuntimeManager.instance().getDOMRuntime(domId);
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.dom.integration/src/org/eclipse/jst/ws/jaxws/dom/integration/validation/DomValidationManager.java b/bundles/org.eclipse.jst.ws.jaxws.dom.integration/src/org/eclipse/jst/ws/jaxws/dom/integration/validation/DomValidationManager.java
deleted file mode 100755
index 622f26c..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.integration/src/org/eclipse/jst/ws/jaxws/dom/integration/validation/DomValidationManager.java
+++ /dev/null
@@ -1,151 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.dom.integration.validation;
-
-import java.util.Collection;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.jobs.ISchedulingRule;
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.common.util.TreeIterator;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.jst.ws.jaxws.dom.integration.internal.plugin.DomIntegrationPlugin;
-import org.eclipse.jst.ws.jaxws.dom.integration.navigator.CustomDomItemProviderAdapterFactory;
-import org.eclipse.jst.ws.jaxws.dom.integration.navigator.DOMAdapterFactoryLabelProvider;
-import org.eclipse.jst.ws.jaxws.dom.integration.navigator.ISEIChildList;
-import org.eclipse.jst.ws.jaxws.dom.integration.navigator.IWebServiceChildList;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.IWebServiceProject;
-import org.eclipse.jst.ws.jaxws.dom.runtime.validation.DomValidatorFactory;
-import org.eclipse.jst.ws.jaxws.dom.runtime.validation.IDomValidator;
-import org.eclipse.jst.ws.jaxws.utils.dom.validation.DomValidationConstants;
-import org.eclipse.jst.ws.jaxws.utils.logging.Logger;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.wst.validation.internal.provisional.core.IProjectValidationContext;
-import org.eclipse.wst.validation.internal.provisional.core.IReporter;
-import org.eclipse.wst.validation.internal.provisional.core.IValidationContext;
-import org.eclipse.wst.validation.internal.provisional.core.IValidatorJob;
-
-/**
- * Registered to WST validation framework IValidator. Receives notifications for
- * validation to be performed and calls registered DOM validators to perform the
- * real validation.
- *
- * @author Georgi Vachkov
- */
-public class DomValidationManager implements IValidatorJob
-{
- public void cleanup(final IReporter reporter) {
- // no resources for clean up
- }
-
- public void validate(final IValidationContext context, final IReporter reporter) {
- validateInJob(context, reporter);
- }
-
- public IStatus validateInJob(final IValidationContext context, final IReporter reporter)
- {
- cleanMarkers((IProjectValidationContext) context);
-
- IWebServiceProject wsProject;
- for (IDomValidator validator : getValidators())
- {
- wsProject = (IWebServiceProject)context.loadModel("webServiceProject", new String []{validator.getSupportedDomRuntime()}); //$NON-NLS-1$
- if (wsProject == null) {
- continue;
- }
-
- validator.validate(wsProject);
- refreshTree(wsProject);
- }
-
- return IValidatorJob.OK_STATUS;
- }
-
- public ISchedulingRule getSchedulingRule(final IValidationContext helper) {
- return null;
- }
-
- protected void refreshTree(final IWebServiceProject wsProject)
- {
- final DOMAdapterFactoryLabelProvider labelProvider = labelProvider();
- if (labelProvider == null) {
- return;
- }
-
- Display.getDefault().asyncExec(new RefreshRunnable(labelProvider, wsProject));
- }
-
- protected DOMAdapterFactoryLabelProvider labelProvider()
- {
- return DomIntegrationPlugin.getDefault().getLabelProvider();
- }
-
- protected void cleanMarkers(IProjectValidationContext context)
- {
- try {
- final IProject project = context.getProject();
- if (project != null && project.isAccessible()) {
- project.deleteMarkers(DomValidationConstants.MARKER_ID, true, IResource.DEPTH_INFINITE);
- }
- }
- catch (CoreException e) {
- (new Logger()).logError(e.getMessage(), e);
- }
- }
-
- protected Collection<IDomValidator> getValidators()
- {
- return DomValidatorFactory.INSTANCE.getRegisteredValidators();
- }
-
- /**
- * Class that fires label changed event to the label provider to apply validation
- * results in the displayed tree - i.e. decorate images
- *
- * @author Georgi Vachkov
- */
- protected class RefreshRunnable implements Runnable
- {
- private final DOMAdapterFactoryLabelProvider labelProvider;
- private final IWebServiceProject wsProject;
-
- public RefreshRunnable(final DOMAdapterFactoryLabelProvider labelProvider, final IWebServiceProject wsProject) {
- this.labelProvider = labelProvider;
- this.wsProject = wsProject;
- }
-
- public void run()
- {
- labelProvider.fireLabelProviderChanged(wsProject);
-
- fireLabelProviderChanged(ISEIChildList.class);
- fireLabelProviderChanged(IWebServiceChildList.class);
-
- final TreeIterator<EObject> allChilds = wsProject.eAllContents();
- while (allChilds.hasNext()) {
- labelProvider.fireLabelProviderChanged(allChilds.next());
- }
- }
-
- private void fireLabelProviderChanged(final Class<?> adapterClass)
- {
- final Adapter adapter = CustomDomItemProviderAdapterFactory.INSTANCE.adapt(wsProject, adapterClass);
- if (adapter == null) {
- return;
- }
-
- labelProvider.fireLabelProviderChanged(adapter);
- }
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/.classpath b/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/.classpath
deleted file mode 100755
index 2d1a430..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/.project b/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/.project
deleted file mode 100755
index 7938766..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.jst.ws.jaxws.dom.runtime</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
diff --git a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100755
index ae0484e..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,8 +0,0 @@
-#Mon Jul 20 15:25:31 EEST 2009
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.5
diff --git a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/META-INF/MANIFEST.MF b/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/META-INF/MANIFEST.MF
deleted file mode 100755
index bca6881..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,44 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %Bundle-Name.0
-Bundle-Vendor: %Bundle-Vendor.0
-Bundle-SymbolicName: org.eclipse.jst.ws.jaxws.dom.runtime;singleton:=true
-Bundle-Version: 1.0.0.qualifier
-Bundle-Localization: plugin
-Bundle-Activator: org.eclipse.jst.ws.jaxws.dom.runtime.internal.plugin.JaxWsDomRuntimePlugin
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.jdt.core,
- org.eclipse.jst.ws.jaxws.utils,
- org.eclipse.ui,
- org.eclipse.emf.validation,
- org.eclipse.jface.text,
- org.eclipse.jst.j2ee,
- org.eclipse.jst.j2ee.core,
- org.eclipse.jst.common.project.facet.core
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Export-Package: org.eclipse.jst.ws.jaxws.dom.runtime,
- org.eclipse.jst.ws.jaxws.dom.runtime.api,
- org.eclipse.jst.ws.jaxws.dom.runtime.internal.impl;x-friends:="org.eclipse.jst.ws.jaxws.dom.runtime.tests",
- org.eclipse.jst.ws.jaxws.dom.runtime.internal.plugin;x-friends:="org.eclipse.jst.ws.jaxws.dom.runtime.tests",
- org.eclipse.jst.ws.jaxws.dom.runtime.internal.util;x-friends:="org.eclipse.jst.ws.jaxws.dom.runtime.tests",
- org.eclipse.jst.ws.jaxws.dom.runtime.internal.validation.provider;x-friends:="org.eclipse.jst.ws.jaxws.dom.runtime.tests",
- org.eclipse.jst.ws.jaxws.dom.runtime.persistence,
- org.eclipse.jst.ws.jaxws.dom.runtime.persistence.annotation,
- org.eclipse.jst.ws.jaxws.dom.runtime.persistence.annotation.impl,
- org.eclipse.jst.ws.jaxws.dom.runtime.persistence.defaults,
- org.eclipse.jst.ws.jaxws.dom.runtime.persistence.serializer,
- org.eclipse.jst.ws.jaxws.dom.runtime.persistence.state,
- org.eclipse.jst.ws.jaxws.dom.runtime.persistence.sync,
- org.eclipse.jst.ws.jaxws.dom.runtime.provider,
- org.eclipse.jst.ws.jaxws.dom.runtime.registry,
- org.eclipse.jst.ws.jaxws.dom.runtime.util,
- org.eclipse.jst.ws.jaxws.dom.runtime.validation,
- org.eclipse.jst.ws.jaxws.dom.runtime.validation.impl,
- org.eclipse.jst.ws.jaxws.dom.runtime.validation.messages,
- org.eclipse.jst.ws.jaxws.dom.runtime.validation.provider,
- org.eclipse.jst.ws.jaxws.dom.runtime.validation.provider.exceptions,
- org.eclipse.jst.ws.jaxws.dom.runtime.validation.sei,
- org.eclipse.jst.ws.jaxws.dom.runtime.validation.webmethod,
- org.eclipse.jst.ws.jaxws.dom.runtime.validation.webparam,
- org.eclipse.jst.ws.jaxws.dom.runtime.validation.webservice
-Import-Package: javax.jws
diff --git a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/about.html b/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/about.html
deleted file mode 100644
index 8410afb..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/about.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
-<title>About</title>
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
-
-<p>August 15, 2009</p>
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, "Program" will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is
-being redistributed by another party ("Redistributor") and different terms and conditions may
-apply to your use of any object code in the Content. Check the Redistributor's license that was
-provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
-
-</body>
-</html>
diff --git a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/build.properties b/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/build.properties
deleted file mode 100755
index 3aae249..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/build.properties
+++ /dev/null
@@ -1,17 +0,0 @@
-###############################################################################
-# Copyright (c) 2009 by SAP AG, Walldorf.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# SAP AG - initial API and implementation
-###############################################################################
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
- .,\
- plugin.xml,\
- about.html,\
- plugin.properties
diff --git a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/plugin.properties b/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/plugin.properties
deleted file mode 100755
index 4002366..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/plugin.properties
+++ /dev/null
@@ -1,23 +0,0 @@
-###############################################################################
-# Copyright (c) 2009 by SAP AG, Walldorf.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# SAP AG - initial API and implementation
-###############################################################################
-###############################################################################
-# Language File for this Plugin
-###############################################################################
-
-# Generic Label and Description
-Bundle-Name.0=JAX-WS DOM runtime plug-in (Incubation)
-Bundle-Vendor.0=Eclipse Web Tools Platform
-
-DomValidatorsExtension_Name = DOM Validator
-DomRuntimesExtension_Name = DOM Runtimes
-ExtensionPoint-Name.3 = JEE5 DOM contribution
-ExtensionPoint-Name.5 = JEE5 DOM validation contribution
-category.name.0 = JEE5 DOM constraint provider
\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/plugin.xml b/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/plugin.xml
deleted file mode 100755
index dbfa195..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/plugin.xml
+++ /dev/null
@@ -1,91 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<!--
- Copyright (c) 2009 by SAP AG, Walldorf.
- All rights reserved. This program and the accompanying materials
- are made available under the terms of the Eclipse Public License v1.0
- which accompanies this distribution, and is available at
- http://www.eclipse.org/legal/epl-v10.html
-
- Contributors:
- SAP AG - initial API and implementation
- -->
-
-<plugin>
-
- <extension-point id="domruntimes" name="%DomRuntimesExtension_Name" schema="schema/runtimes.exsd"/>
- <extension-point id="domValidator" name="%DomValidatorsExtension_Name" schema="schema/domValidator.exsd"/>
-
- <extension point="org.eclipse.ui.startup">
- <startup class="org.eclipse.jst.ws.jaxws.dom.runtime.WsDomStartupParticipant"/>
- </extension>
-
- <extension point="org.eclipse.emf.ecore.generated_package">
- <package
- uri = "http:///org/eclipse/jst/ws/jaxws/dom/runtime/dom.ecore"
- class = "org.eclipse.jst.ws.jaxws.dom.runtime.api.DomPackage" />
- </extension>
-
-
- <extension
- id="org.eclipse.jst.ws.jaxws.dom.jee5"
- name="%ExtensionPoint-Name.3"
- point="org.eclipse.jst.ws.jaxws.dom.runtime.domruntimes">
- <implementation class="org.eclipse.jst.ws.jaxws.dom.runtime.persistence.Jee5WsDomRuntimeExtension"/>
- <project_facet id="jst.ejb" version="3.0"/>
- <project_facet id="jst.web" version="2.5"/>
- </extension>
- <extension
- id="dom"
- name="%ExtensionPoint-Name.5"
- point="org.eclipse.jst.ws.jaxws.dom.runtime.domValidator">
- <implementation class="org.eclipse.jst.ws.jaxws.dom.runtime.validation.JaxWsDomValidator"/>
- </extension>
-
- <!-- {{{ EMF validation contribution -->
-
- <extension
- point="org.eclipse.emf.validation.constraintProviders">
- <category
- name="%category.name.0"
- id="org.eclipse.jst.ws.jaxws.dom.jee5"/>
- <constraintProvider
- cache="true"
- class="org.eclipse.jst.ws.jaxws.dom.runtime.validation.WsDynamicModelConstraintProvider">
- <package namespaceUri="http:///org/eclipse/jst/ws/jaxws/dom/runtime/dom.ecore"/>
- </constraintProvider>
- </extension>
- <extension
- point="org.eclipse.emf.validation.constraintBindings">
- <clientContext
- default="false"
- id="org.eclipse.jst.ws.jaxws.dom.jee5.domContext">
- <enablement>
- <or>
- <instanceof
- value="org.eclipse.jst.ws.jaxws.dom.runtime.api.IServiceEndpointInterface">
- </instanceof>
- <instanceof
- value="org.eclipse.jst.ws.jaxws.dom.runtime.api.IWebService">
- </instanceof>
- <instanceof
- value="org.eclipse.jst.ws.jaxws.dom.runtime.api.IWebMethod">
- </instanceof>
- <instanceof
- value="org.eclipse.jst.ws.jaxws.dom.runtime.api.IWebParam">
- </instanceof>
- </or>
- </enablement>
- </clientContext>
- <binding
- context="org.eclipse.jst.ws.jaxws.dom.jee5.domContext"
- category="org.eclipse.jst.ws.jaxws.dom.jee5"/>
- </extension>
- <extension point="org.eclipse.emf.validation.validationListeners">
- <listener class="org.eclipse.jst.ws.jaxws.dom.runtime.validation.WsProblemsReporter">
- <clientContext id="org.eclipse.jst.ws.jaxws.dom.jee5.domContext"/>
- </listener>
- </extension>
- <!-- }}} EMF validation contribution -->
-
-</plugin>
diff --git a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/schema/domValidator.exsd b/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/schema/domValidator.exsd
deleted file mode 100755
index c354381..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/schema/domValidator.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.jaxws.dom.runtime" xmlns="http://www.w3.org/2001/XMLSchema">
-<annotation>
- <appInfo>
- <meta.schema plugin="org.eclipse.jst.ws.jaxws.dom.runtime" id="consumertype" name="Consumer Type Provider"/>
- </appInfo>
- <documentation>
- Extension point for registering DOM validator factory that will instantiate.
- </documentation>
- </annotation>
-
- <element name="extension">
- <annotation>
- <appInfo>
- <meta.element />
- </appInfo>
- </annotation>
- <complexType>
- <sequence>
- <element ref="implementation"/>
- </sequence>
- <attribute name="point" type="string" use="required">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- <attribute name="id" type="string" use="required">
- <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="implementation">
- <annotation>
- <documentation>
- Describes a consumertype
- </documentation>
- </annotation>
- <complexType>
- <attribute name="class" type="string" use="required">
- <annotation>
- <documentation>
-
- </documentation>
- <appInfo>
- <meta.attribute kind="java" basedOn=":org.eclipse.jst.ws.jaxws.dom.runtime.validation.IDomValidator"/>
- </appInfo>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <annotation>
- <appInfo>
- <meta.section type="since"/>
- </appInfo>
- <documentation>
- [Enter the first release in which this extension point appears.]
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="examples"/>
- </appInfo>
- <documentation>
- [Enter extension point usage example here.]
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="apiInfo"/>
- </appInfo>
- <documentation>
- [Enter API information here.]
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="implementation"/>
- </appInfo>
- <documentation>
- [Enter information about supplied implementation of this extension point.]
- </documentation>
- </annotation>
-
-
-</schema>
diff --git a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/schema/runtimes.exsd b/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/schema/runtimes.exsd
deleted file mode 100755
index 493eb25..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/schema/runtimes.exsd
+++ /dev/null
@@ -1,122 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.jst.ws.jaxws.dom.runtime" xmlns="http://www.w3.org/2001/XMLSchema">
-<annotation>
- <appInfo>
- <meta.schema plugin="org.eclipse.jst.ws.jaxws.dom.runtime" id="supportedruntimes" name="Supported Runtimes"/>
- </appInfo>
- <documentation>
- Use this extension point to add support for a runtime in the WS DOM Tree.
- </documentation>
- </annotation>
-
- <element name="extension">
- <annotation>
- <appInfo>
- <meta.element />
- </appInfo>
- </annotation>
- <complexType>
- <sequence>
- <element ref="implementation"/>
- <element ref="project_facet" minOccurs="1" maxOccurs="unbounded"/>
- </sequence>
- <attribute name="point" type="string" use="required">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- <attribute name="id" type="string" use="required">
- <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="implementation">
- <complexType>
- <attribute name="class" type="string" use="required">
- <annotation>
- <documentation>
-
- </documentation>
- <appInfo>
- <meta.attribute kind="java" basedOn=":org.eclipse.jst.ws.jaxws.dom.runtime.api.IWsDOMRuntimeExtension"/>
- </appInfo>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <element name="project_facet">
- <complexType>
- <attribute name="id" type="string" use="required">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- <attribute name="version" type="string">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <annotation>
- <appInfo>
- <meta.section type="since"/>
- </appInfo>
- <documentation>
- [Enter the first release in which this extension point appears.]
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="examples"/>
- </appInfo>
- <documentation>
- [Enter extension point usage example here.]
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="apiInfo"/>
- </appInfo>
- <documentation>
- [Enter API information here.]
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="implementation"/>
- </appInfo>
- <documentation>
- [Enter information about supplied implementation of this extension point.]
- </documentation>
- </annotation>
-
-
-</schema>
diff --git a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/DomUtil.java b/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/DomUtil.java
deleted file mode 100755
index 67d18cb..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/DomUtil.java
+++ /dev/null
@@ -1,237 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.dom.runtime;
-
-import java.util.Collection;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.DomPackage;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.IDOM;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.IJavaWebServiceElement;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.IServiceEndpointInterface;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.IWebMethod;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.IWebParam;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.IWebService;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.IWebServiceProject;
-import org.eclipse.jst.ws.jaxws.dom.runtime.util.DomSwitch;
-
-
-public class DomUtil
-{
- public static final DomUtil INSTANCE = new DomUtil();
-
- private final DomSwitch<String> implSwitch;
-
- public DomUtil() {
- implSwitch = createImplFinderSwitch();
- }
-
- public void setFeatureValue(final EObject object, final int featureId, final Object value)
- {
- final EStructuralFeature feature = object.eClass().getEStructuralFeature(featureId);
- object.eSet(feature, value);
- }
-
- public Object getFeatureValue(final EObject object, final int featureId)
- {
- final EStructuralFeature feature = object.eClass().getEStructuralFeature(featureId);
- return object.eGet(feature);
- }
-
- public void addToCollectionFeature(final EObject object, final int featureId, final Object value)
- {
- @SuppressWarnings("unchecked")
- final Collection<Object> oldValue = (Collection<Object>) getFeatureValue(object, featureId);
- oldValue.add(value);
- }
-
- public IWebServiceProject findProjectByName(IDOM dom, String name)
- {
- for (IWebServiceProject wsProject : dom.getWebServiceProjects())
- {
- if (wsProject.getName().equals(name))
- {
- return wsProject;
- }
- }
- return null;
- }
-
- public IWebService findWsByImplName(IWebServiceProject wsProject, String name)
- {
- for (IWebService ws : wsProject.getWebServices())
- {
- if (ws.getImplementation().equals(name))
- {
- return ws;
- }
- }
- return null;
- }
-
- public IServiceEndpointInterface findSeiByImplName(IWebServiceProject wsProject, String name)
- {
- for (IServiceEndpointInterface sei : wsProject.getServiceEndpointInterfaces())
- {
- if (sei.getImplementation().equals(name))
- {
- return sei;
- }
- }
- return null;
- }
-
-
- public IWebMethod findWebMethodByImpl(IServiceEndpointInterface sei, String impl)
- {
- for (IWebMethod wm : sei.getWebMethods())
- {
- if (wm.getImplementation().equals(impl))
- {
- return wm;
- }
- }
- return null;
- }
-
- public IMethod findMethod(final IType seiType, final IWebMethod webMethod) throws JavaModelException
- {
- for (IMethod method : seiType.getMethods())
- {
- if (webMethod.getImplementation().equals(calcImplementation(method))) {
- return method;
- }
- }
-
- return null;
- }
-
- public IJavaWebServiceElement findJavaWebServiceElemByImplName(IWebServiceProject wsProject, String name)
- {
- final IWebService ws = findWsByImplName(wsProject, name);
- return ws == null ? findSeiByImplName(wsProject, name) : ws;
- }
-
- /**
- * Calculates the method signature to be used as implementation in {@link IWebMethod}
- * @param method
- * @return calculated string
- * @throws JavaModelException
- */
- public String calcImplementation(final IMethod method) throws JavaModelException
- {
- return method.getElementName() + method.getSignature();
- }
-
- /**
- * Extract {@link IWebServiceProject} out of DOM object by recursively
- * iterating parent objects.
- * @param eObject
- * @return the found project or <code>null</code> in case not found
- */
- public IWebServiceProject findWsProject(EObject eObject)
- {
- EObject parent = eObject;
- while (parent!=null)
- {
- if (parent instanceof IWebServiceProject) {
- return (IWebServiceProject)parent;
- }
-
- parent = parent.eContainer();
- }
-
- return null;
- }
-
- /**
- * Defines if this SEI is part of outside-in web service
- * @param sei
- * @return true if there is a web service with wsdlLocation set to something different than <code>null</code>
- */
- public boolean isOutsideInWebService(final IServiceEndpointInterface sei)
- {
- if (sei == null) {
- return false;
- }
-
- for (IWebService webService : sei.getImplementingWebServices()) {
- if (webService.getWsdlLocation()!=null) {
- return true;
- }
- }
-
- return false;
- }
-
- /**
- * Calculates unique implementation for DOM object in the scope of the resource in which
- * they exist. Useful when you need to uniquely identify DOM object.
- *
- * @param eObject
- * @return calculated implementation
- */
- public String calcUniqueImpl(final EObject eObject)
- {
- if (eObject.eClass().getClassifierID() == DomPackage.IWEB_PARAM)
- {
- final IWebParam wp = (IWebParam) eObject;
- return ((IWebMethod)wp.eContainer()).getImplementation() + "[" + wp.getImplementation() + "]"; //$NON-NLS-1$ //$NON-NLS-2$
- }
-
- return extractImplementation(eObject);
- }
-
- /**
- * Extracts the implementation property for DOM object without casting :-D.
- *
- * @param eObject
- * @return the implementation
- */
- public String extractImplementation(final EObject eObject) {
- return implSwitch.doSwitch(eObject);
- }
-
- private DomSwitch<String> createImplFinderSwitch()
- {
- return new DomSwitch<String>()
- {
- @Override
- public String caseIWebService(IWebService ws) {
- return ws.getImplementation();
- }
-
- @Override
- public String caseIServiceEndpointInterface(IServiceEndpointInterface sei) {
- return sei.getImplementation();
- }
-
- @Override
- public String caseIWebMethod(IWebMethod wm) {
- return wm.getImplementation();
- }
-
- @Override
- public String caseIWebParam(IWebParam wp) {
- return wp.getImplementation();
- }
-
- @Override
- public String caseIWebServiceProject(IWebServiceProject wsProject) {
- return wsProject.getName();
- }
- };
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/GeneralTypesNames.java b/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/GeneralTypesNames.java
deleted file mode 100755
index 0c4bdbc..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/GeneralTypesNames.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.dom.runtime;
-
-/**
- * Class containing constatns with names of some general types used often in validation.
- *
- * @author Georgi Vachkov
- *
- */
-
-public interface GeneralTypesNames
-{
- /** java.lang.Object */
- public static final String JAVA_LANG_OBJECT = "java.lang.Object"; //$NON-NLS-1$
-
- /** java.io.Serializable */
- public static final String JAVA_IO_SERIALIZABLE = "java.io.Serializable"; //$NON-NLS-1$
-
- /** java.rmi.Remote */
- public static final String JAVA_RMI_REMOTE = "java.rmi.Remote"; //$NON-NLS-1$
-
- /** java.lang.Throwable */
- public static final String JAVA_LANG_THROWABLE = "java.lang.Throwable"; //$NON-NLS-1$
-
- /** java.lang.Exception */
- public static final String JAVA_LANG_EXCEPTION = "java.lang.Exception"; //$NON-NLS-1$
-
- /** java.lang.Cloneable */
- public static final String JAVA_LANG_CLONEABLE = "java.lang.Cloneable"; //$NON-NLS-1$
-
- /** java.lang.Comparable */
- public static final String JAVA_LANG_COMPARABLE = "java.lang.Comparable"; //$NON-NLS-1$
-
- /** java.util.Map */
- public static final String JAVA_UTIL_MAP = "java.util.Map"; //$NON-NLS-1$
-
- /** java.util.Collection */
- public static final String JAVA_UTIL_COLLECTION = "java.util.Collection"; //$NON-NLS-1$
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/INamedExtensionInfo.java b/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/INamedExtensionInfo.java
deleted file mode 100755
index ce509af..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/INamedExtensionInfo.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.dom.runtime;
-
-/**
- * Interface representig and extention.
- */
-public interface INamedExtensionInfo
-{
-
- /**
- * The unique ID to identify this consumer type when calling the <code>ProxyGeneratorFactory</code>, e.g. <code>jee/jaxws</code>
- *
- * @return non-empty string containing the ID
- */
- public abstract String getId();
-
- /**
- * A verbose name for the type of consumer, e.g. <code>JAX-WS</code>
- *
- * @return localized string used for the UI
- */
- public abstract String getName();
-
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/IPropertyDefaults.java b/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/IPropertyDefaults.java
deleted file mode 100755
index 6cbcd10..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/IPropertyDefaults.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.dom.runtime;
-
-import org.eclipse.emf.ecore.EStructuralFeature;
-
-/**
- * Interface that provides default values for DOM object's properties.
- * Usually this interface should be used by clients that need to revert some
- * property value to the default one.
- *
- * @author Georgi Vachkov
- */
-public interface IPropertyDefaults
-{
- /**
- * Defines the default value for this <code>feature</code>.
- *
- * @param feature the feature representing the objects property type
- * @return the default value. In case <code>null</code> is possible property value
- * <code>null</code> might be returned
- */
- public Object getDefault(EStructuralFeature feature);
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/IPropertyState.java b/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/IPropertyState.java
deleted file mode 100755
index e8c4e9b..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/IPropertyState.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.dom.runtime;
-
-import org.eclipse.emf.ecore.EStructuralFeature;
-
-/**
- * Interface for checking the state of some property for concrete DOM object.
- * This interface should be used by DOM clients that need to know if some property
- * can be changed - for example UI editor that needs to know if the property should
- * be enabled for edit or disabled.
- *
- * @author Georgi Vachkov
- */
-public interface IPropertyState
-{
- /**
- * Defines if property is changeable.
- * @return <code>true</code> in case property can be changed
- */
- public boolean isChangeable(EStructuralFeature feature);
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/PrimitiveTypeHandler.java b/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/PrimitiveTypeHandler.java
deleted file mode 100755
index 15127b2..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/PrimitiveTypeHandler.java
+++ /dev/null
@@ -1,135 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.dom.runtime;
-
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * Utility class used for some general primitive type checks/operations.
- *
- * @author Georgi Vachkov
- *
- */
-
-public class PrimitiveTypeHandler
-{
- private static final String ARRAY_MARK = "[]"; //$NON-NLS-1$
-
- private static final String VOID = "void"; //$NON-NLS-1$
-
- private static Map<String, String> primitiveTypes = new HashMap<String, String>();
-
- static
- {
- primitiveTypes.put("boolean", "java.lang.Boolean"); //$NON-NLS-1$ //$NON-NLS-2$
- primitiveTypes.put("java.lang.Boolean", "java.lang.Boolean"); //$NON-NLS-1$ //$NON-NLS-2$
- primitiveTypes.put("byte", "java.lang.Byte"); //$NON-NLS-1$ //$NON-NLS-2$
- primitiveTypes.put("java.lang.Byte", "java.lang.Byte"); //$NON-NLS-1$ //$NON-NLS-2$
- primitiveTypes.put("char", "java.lang.Character"); //$NON-NLS-1$ //$NON-NLS-2$
- primitiveTypes.put("java.lang.Character", "java.lang.Character"); //$NON-NLS-1$ //$NON-NLS-2$
- primitiveTypes.put("double", "java.lang.Double"); //$NON-NLS-1$ //$NON-NLS-2$
- primitiveTypes.put("java.lang.Double", "java.lang.Double"); //$NON-NLS-1$ //$NON-NLS-2$
- primitiveTypes.put("float", "java.lang.Float"); //$NON-NLS-1$ //$NON-NLS-2$
- primitiveTypes.put("java.lang.Float", "java.lang.Float"); //$NON-NLS-1$ //$NON-NLS-2$
- primitiveTypes.put("int", "java.lang.Integer"); //$NON-NLS-1$ //$NON-NLS-2$
- primitiveTypes.put("java.lang.Integer", "java.lang.Integer"); //$NON-NLS-1$ //$NON-NLS-2$
- primitiveTypes.put("java.lang.String", "java.lang.String"); //$NON-NLS-1$ //$NON-NLS-2$
- primitiveTypes.put("long", "java.lang.Long"); //$NON-NLS-1$ //$NON-NLS-2$
- primitiveTypes.put("java.lang.Long", "java.lang.Long"); //$NON-NLS-1$ //$NON-NLS-2$
- primitiveTypes.put("short", "java.lang.Short"); //$NON-NLS-1$ //$NON-NLS-2$
- primitiveTypes.put("java.lang.Short", "java.lang.Short"); //$NON-NLS-1$ //$NON-NLS-2$
- }
-
- /**
- * Returns the object type for primitive type. Mapping between types:
- *
- * <pre>
- * "boolean, "java.lang.Boolean"
- * "java.lang.Boolean", "java.lang.Boolean"
- * "byte", "java.lang.Byte"
- * "java.lang.Byte", "java.lang.Byte"
- * "char", "java.lang.Character"
- * "java.lang.Character", "java.lang.Character"
- * "double", "java.lang.Double"
- * "java.lang.Double", "java.lang.Double"
- * "float", "java.lang.Float"
- * "java.lang.Float", "java.lang.Float"
- * "int", "java.lang.Integer"
- * "java.lang.Integer", "java.lang.Integer"
- * "java.lang.String", "java.lang.String"
- * "long", "java.lang.Long"
- * "java.lang.Long", "java.lang.Long"
- * "short", "java.lang.Short"
- * "java.lang.Short", "java.lang.Short"
- * </pre>
- *
- * @param typeName
- * @return wrapper class name for <tt>typeName</tt>.
- */
- public static String getObjectTypeForPrimitiveType(String typeName)
- {
- return primitiveTypes.get(typeName);
- }
-
- /**
- * @param typeName
- * @return true if <tt>typeName</tt> is java primitive type.
- */
- public static boolean isJavaPrimitiveType(String typeName)
- {
- return (primitiveTypes.get(typeName) != null);
- }
-
- /**
- * Checks if the <tt>typeName</tt> represents an array type.
- *
- * @param typeName
- * @return true if <tt>typeName</tt> is array type
- */
- public static boolean isArrayType(String typeName)
- {
- return typeName.trim().endsWith(ARRAY_MARK);
- }
-
- /**
- * Checks if <tt>typeName</tt> is void.
- *
- * @param typeName
- * @return true if <tt>typeName</tt> is void.
- */
- public static boolean isVoidType(String typeName)
- {
- return typeName.trim().equals(VOID);
- }
-
- /**
- * Retrieves the real type name from array type. Example:
- *
- * <pre>
- * For type 'int[]' returns 'int'
- * For type 'String[][]' returns 'String'
- * </pre>
- *
- * @param typeName
- * @return real type name
- */
- public static String getTypeFromArrayType(String typeName)
- {
- String name = typeName.trim().replaceAll(" ", ""); //$NON-NLS-1$ //$NON-NLS-2$
- while (name.endsWith(ARRAY_MARK))
- {
- name = name.substring(0, name.length() - ARRAY_MARK.length());
- }
-
- return name;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/TypeResolver.java b/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/TypeResolver.java
deleted file mode 100755
index 82418e6..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/TypeResolver.java
+++ /dev/null
@@ -1,192 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.dom.runtime;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jdt.core.Signature;
-
-/**
- * Utility class containing logic for resolving type names from IType object.
- *
- * @author Georgi Vachkov
- */
-public class TypeResolver
-{
- private static final String DOT = "."; //$NON-NLS-1$
-
- private static final String QUOTE = "?"; //$NON-NLS-1$
-
- /**
- * Resolves <tt>typeName</tt> using <tt>type</tt>. In case when <tt>typeName</tt> contains generics declaration all types used in
- * declaraion are returned.
- *
- * @param typeName
- * @param type
- * @return list of resolved types
- * @throws JavaModelException
- */
- public static List<String> resolveTypes(String typeName, IType type) throws JavaModelException
- {
- List<String> names = new ArrayList<String>(1);
- String realTypeName = Signature.toString(typeName);
-
- if (hasGenerics(realTypeName))
- {
- names = getTypesFromGenerics(realTypeName, type);
- } else
- {
- names.add(realTypeName);
- }
-
- List<String> resolvedNames = new ArrayList<String>(names.size());
- for (String name : names)
- {
- String resolvedName = resolveType(name, type);
-
- if (!resolvedName.equals(QUOTE))
- {
- resolvedNames.add(resolvedName);
- }
- }
-
- return resolvedNames;
- }
-
- /**
- * Retrieves real type in case type is present by generics.
- *
- * @param typeName
- * @param declaringType
- * @return the real type of the expression if <tt>typeName</tt> is an expression otherwise <tt>typeName</tt>
- * @throws JavaModelException
- */
- private static String getType(String typeName, IType declaringType) throws JavaModelException
- {
- if (typeName.indexOf('?') > -1)
- {
- int pos = typeName.trim().lastIndexOf(' ');
- if (pos > -1)
- {
- return TypeResolver.resolveType(typeName.substring(pos + 1), declaringType);
- }
- }
-
- return typeName;
- }
-
- /**
- * Gets the types used in generics declaration.
- * @param typeName
- * @param type the type containing resolved type
- * @return list of type names.
- * @throws JavaModelException
- */
- public static final List<String> getTypesFromGenerics(String typeName, IType type) throws JavaModelException
- {
- String name = typeName;
- List<String> names= new ArrayList<String>();
-
- int ltPos = -1;
- int gtPos = -1;
- while ((ltPos = name.indexOf('<')) > -1)
- {
- if ((gtPos = name.lastIndexOf('>')) == -1)
- {
- gtPos = name.length()-2;
- }
-
- String firstName = name.substring(0, ltPos) + name.substring(gtPos+1);
- name = name.substring(ltPos+1, gtPos);
-
- addName(firstName, names, type);
- if (name.indexOf('<') == -1)
- {
- addName(name, names, type);
- }
- }
-
- return names;
- }
-
- private static final void addName(final String name, final List<String> names, final IType type) throws JavaModelException
- {
- int comaPos = name.indexOf(',');
- if( comaPos > -1)
- {
- names.add(name.substring(0, comaPos));
- names.add(name.substring(comaPos+1));
- }
- else {
- names.add(getType(name, type));
- }
- }
-
- /**
- * Resolves type.
- *
- * @param typeName
- * @param type
- * @return the resolved type name.
- * @throws JavaModelException
- */
- public static String resolveType(final String typeName, final IType type) throws JavaModelException
- {
- String realTypeName = typeName;
- if (PrimitiveTypeHandler.isArrayType(typeName))
- {
- return resolveType(PrimitiveTypeHandler.getTypeFromArrayType(typeName), type);
- }
-
- if (PrimitiveTypeHandler.isJavaPrimitiveType(realTypeName) || PrimitiveTypeHandler.isVoidType(realTypeName))
- {
- return realTypeName;
- }
-
- if (realTypeName.indexOf(DOT) > -1)
- {
- return realTypeName;
- }
-
- String[][] st = type.resolveType(realTypeName);
- if (st != null)
- {
- if (st[0][0].length() == 0)
- {
- return st[0][1];
- }
-
- return st[0][0] + DOT + st[0][1];
- }
-
- if (realTypeName.startsWith(new String(new char[] { Signature.C_UNRESOLVED })))
- {
- return resolveType(realTypeName.substring(1, realTypeName.length()), type);
- }
-
- return realTypeName;
- }
-
- /**
- * Checks whether <code>typeName</code> uses generics declaration. Example: for 'java.util.List<Strng>' the method will return true.
- *
- * @param typeName
- * @return true is <tt>typeName</tt> contains generics declaration.
- */
- private static boolean hasGenerics(String typeName)
- {
- return (typeName.indexOf('<') > -1);
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/WsDomStartupParticipant.java b/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/WsDomStartupParticipant.java
deleted file mode 100755
index 2a21001..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/WsDomStartupParticipant.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.dom.runtime;
-
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.WsDOMRuntimeManager;
-import org.eclipse.jst.ws.jaxws.dom.runtime.internal.plugin.JaxWsDomRuntimeMessages;
-import org.eclipse.ui.IStartup;
-
-/**
- * Startup participant registered on IDE startup extension point
- *
- * @author Georgi Vachkov
- */
-public class WsDomStartupParticipant implements IStartup
-{
-
- /**
- * Called by the Eclipse on workbench startup.
- * Starts load for registered web service runtimes
- */
- public void earlyStartup()
- {
- Job job = new Job(JaxWsDomRuntimeMessages.WsDomStartupParticipant_Startup_Job_Message)
- {
- @Override
- protected IStatus run(final IProgressMonitor monitor)
- {
- WsDOMRuntimeManager.instance().createDOMRuntimes(monitor);
- return Status.OK_STATUS;
- }
- };
-
- job.setUser(false);
- job.setPriority(Job.LONG);
- job.setRule(ResourcesPlugin.getWorkspace().getRoot());
- job.schedule();
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/api/DomFactory.java b/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/api/DomFactory.java
deleted file mode 100755
index 5a87613..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/api/DomFactory.java
+++ /dev/null
@@ -1,114 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.dom.runtime.api;
-
-import org.eclipse.emf.ecore.EFactory;
-
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Factory</b> for the model.
- * It provides a create method for each non-abstract class of the model.
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.ws.jaxws.dom.runtime.api.DomPackage
- * @generated
- */
-public interface DomFactory extends EFactory {
- /**
- * The singleton instance of the factory.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- DomFactory eINSTANCE = org.eclipse.jst.ws.jaxws.dom.runtime.internal.impl.DomFactoryImpl.init();
-
- /**
- * Returns a new object of class '<em>IDOM</em>'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return a new object of class '<em>IDOM</em>'.
- * @generated
- */
- IDOM createIDOM();
-
- /**
- * Returns a new object of class '<em>IJava Web Service Element</em>'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return a new object of class '<em>IJava Web Service Element</em>'.
- * @generated
- */
- IJavaWebServiceElement createIJavaWebServiceElement();
-
- /**
- * Returns a new object of class '<em>IService Endpoint Interface</em>'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return a new object of class '<em>IService Endpoint Interface</em>'.
- * @generated
- */
- IServiceEndpointInterface createIServiceEndpointInterface();
-
- /**
- * Returns a new object of class '<em>IWeb Method</em>'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return a new object of class '<em>IWeb Method</em>'.
- * @generated
- */
- IWebMethod createIWebMethod();
-
- /**
- * Returns a new object of class '<em>IWeb Param</em>'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return a new object of class '<em>IWeb Param</em>'.
- * @generated
- */
- IWebParam createIWebParam();
-
- /**
- * Returns a new object of class '<em>IWeb Service</em>'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return a new object of class '<em>IWeb Service</em>'.
- * @generated
- */
- IWebService createIWebService();
-
- /**
- * Returns a new object of class '<em>IWeb Service Project</em>'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return a new object of class '<em>IWeb Service Project</em>'.
- * @generated
- */
- IWebServiceProject createIWebServiceProject();
-
- /**
- * Returns a new object of class '<em>IWeb Type</em>'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return a new object of class '<em>IWeb Type</em>'.
- * @generated
- */
- IWebType createIWebType();
-
- /**
- * Returns the package supported by this factory.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the package supported by this factory.
- * @generated
- */
- DomPackage getDomPackage();
-
-} //DomFactory
diff --git a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/api/DomPackage.java b/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/api/DomPackage.java
deleted file mode 100755
index d6aab07..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/api/DomPackage.java
+++ /dev/null
@@ -1,1372 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.dom.runtime.api;
-
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EEnum;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EReference;
-
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Package</b> for the model.
- * It contains accessors for the meta objects to represent
- * <ul>
- * <li>each class,</li>
- * <li>each feature of each class,</li>
- * <li>each enum,</li>
- * <li>and each data type</li>
- * </ul>
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.ws.jaxws.dom.runtime.api.DomFactory
- * @model kind="package"
- * @generated
- */
-public interface DomPackage extends EPackage {
- /**
- * The package name.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- String eNAME = "dom"; //$NON-NLS-1$
-
- /**
- * The package namespace URI.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- String eNS_URI = "http:///org/eclipse/jst/ws/jaxws/dom/runtime/dom.ecore"; //$NON-NLS-1$
-
- /**
- * The package namespace name.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- String eNS_PREFIX = "org.eclipse.jst.ws.jaxws.dom.runtime"; //$NON-NLS-1$
-
- /**
- * The singleton instance of the package.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- DomPackage eINSTANCE = org.eclipse.jst.ws.jaxws.dom.runtime.internal.impl.DomPackageImpl.init();
-
- /**
- * The meta object id for the '{@link org.eclipse.jst.ws.jaxws.dom.runtime.internal.impl.IDOMImpl <em>IDOM</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.ws.jaxws.dom.runtime.internal.impl.IDOMImpl
- * @see org.eclipse.jst.ws.jaxws.dom.runtime.internal.impl.DomPackageImpl#getIDOM()
- * @generated
- */
- int IDOM = 0;
-
- /**
- * The feature id for the '<em><b>Web Service Projects</b></em>' containment reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int IDOM__WEB_SERVICE_PROJECTS = 0;
-
- /**
- * The number of structural features of the '<em>IDOM</em>' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int IDOM_FEATURE_COUNT = 1;
-
- /**
- * The meta object id for the '{@link org.eclipse.jst.ws.jaxws.dom.runtime.internal.impl.IJavaWebServiceElementImpl <em>IJava Web Service Element</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.ws.jaxws.dom.runtime.internal.impl.IJavaWebServiceElementImpl
- * @see org.eclipse.jst.ws.jaxws.dom.runtime.internal.impl.DomPackageImpl#getIJavaWebServiceElement()
- * @generated
- */
- int IJAVA_WEB_SERVICE_ELEMENT = 1;
-
- /**
- * The feature id for the '<em><b>Implementation</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int IJAVA_WEB_SERVICE_ELEMENT__IMPLEMENTATION = 0;
-
- /**
- * The feature id for the '<em><b>Name</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int IJAVA_WEB_SERVICE_ELEMENT__NAME = 1;
-
- /**
- * The number of structural features of the '<em>IJava Web Service Element</em>' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int IJAVA_WEB_SERVICE_ELEMENT_FEATURE_COUNT = 2;
-
- /**
- * The meta object id for the '{@link org.eclipse.jst.ws.jaxws.dom.runtime.internal.impl.IServiceEndpointInterfaceImpl <em>IService Endpoint Interface</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.ws.jaxws.dom.runtime.internal.impl.IServiceEndpointInterfaceImpl
- * @see org.eclipse.jst.ws.jaxws.dom.runtime.internal.impl.DomPackageImpl#getIServiceEndpointInterface()
- * @generated
- */
- int ISERVICE_ENDPOINT_INTERFACE = 2;
-
- /**
- * The feature id for the '<em><b>Implementation</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int ISERVICE_ENDPOINT_INTERFACE__IMPLEMENTATION = IJAVA_WEB_SERVICE_ELEMENT__IMPLEMENTATION;
-
- /**
- * The feature id for the '<em><b>Name</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int ISERVICE_ENDPOINT_INTERFACE__NAME = IJAVA_WEB_SERVICE_ELEMENT__NAME;
-
- /**
- * The feature id for the '<em><b>Implicit</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int ISERVICE_ENDPOINT_INTERFACE__IMPLICIT = IJAVA_WEB_SERVICE_ELEMENT_FEATURE_COUNT + 0;
-
- /**
- * The feature id for the '<em><b>Implementing Web Services</b></em>' reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int ISERVICE_ENDPOINT_INTERFACE__IMPLEMENTING_WEB_SERVICES = IJAVA_WEB_SERVICE_ELEMENT_FEATURE_COUNT + 1;
-
- /**
- * The feature id for the '<em><b>Web Methods</b></em>' containment reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int ISERVICE_ENDPOINT_INTERFACE__WEB_METHODS = IJAVA_WEB_SERVICE_ELEMENT_FEATURE_COUNT + 2;
-
- /**
- * The feature id for the '<em><b>Target Namespace</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int ISERVICE_ENDPOINT_INTERFACE__TARGET_NAMESPACE = IJAVA_WEB_SERVICE_ELEMENT_FEATURE_COUNT + 3;
-
- /**
- * The feature id for the '<em><b>Soap Binding Style</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int ISERVICE_ENDPOINT_INTERFACE__SOAP_BINDING_STYLE = IJAVA_WEB_SERVICE_ELEMENT_FEATURE_COUNT + 4;
-
- /**
- * The feature id for the '<em><b>Soap Binding Use</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int ISERVICE_ENDPOINT_INTERFACE__SOAP_BINDING_USE = IJAVA_WEB_SERVICE_ELEMENT_FEATURE_COUNT + 5;
-
- /**
- * The feature id for the '<em><b>Soap Binding Parameter Style</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int ISERVICE_ENDPOINT_INTERFACE__SOAP_BINDING_PARAMETER_STYLE = IJAVA_WEB_SERVICE_ELEMENT_FEATURE_COUNT + 6;
-
- /**
- * The number of structural features of the '<em>IService Endpoint Interface</em>' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int ISERVICE_ENDPOINT_INTERFACE_FEATURE_COUNT = IJAVA_WEB_SERVICE_ELEMENT_FEATURE_COUNT + 7;
-
- /**
- * The meta object id for the '{@link org.eclipse.jst.ws.jaxws.dom.runtime.internal.impl.IWebMethodImpl <em>IWeb Method</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.ws.jaxws.dom.runtime.internal.impl.IWebMethodImpl
- * @see org.eclipse.jst.ws.jaxws.dom.runtime.internal.impl.DomPackageImpl#getIWebMethod()
- * @generated
- */
- int IWEB_METHOD = 3;
-
- /**
- * The feature id for the '<em><b>Implementation</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int IWEB_METHOD__IMPLEMENTATION = IJAVA_WEB_SERVICE_ELEMENT__IMPLEMENTATION;
-
- /**
- * The feature id for the '<em><b>Name</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int IWEB_METHOD__NAME = IJAVA_WEB_SERVICE_ELEMENT__NAME;
-
- /**
- * The feature id for the '<em><b>Parameters</b></em>' containment reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int IWEB_METHOD__PARAMETERS = IJAVA_WEB_SERVICE_ELEMENT_FEATURE_COUNT + 0;
-
- /**
- * The feature id for the '<em><b>Excluded</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int IWEB_METHOD__EXCLUDED = IJAVA_WEB_SERVICE_ELEMENT_FEATURE_COUNT + 1;
-
- /**
- * The feature id for the '<em><b>Soap Binding Style</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int IWEB_METHOD__SOAP_BINDING_STYLE = IJAVA_WEB_SERVICE_ELEMENT_FEATURE_COUNT + 2;
-
- /**
- * The feature id for the '<em><b>Soap Binding Use</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int IWEB_METHOD__SOAP_BINDING_USE = IJAVA_WEB_SERVICE_ELEMENT_FEATURE_COUNT + 3;
-
- /**
- * The feature id for the '<em><b>Soap Binding Parameter Style</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int IWEB_METHOD__SOAP_BINDING_PARAMETER_STYLE = IJAVA_WEB_SERVICE_ELEMENT_FEATURE_COUNT + 4;
-
- /**
- * The number of structural features of the '<em>IWeb Method</em>' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int IWEB_METHOD_FEATURE_COUNT = IJAVA_WEB_SERVICE_ELEMENT_FEATURE_COUNT + 5;
-
- /**
- * The meta object id for the '{@link org.eclipse.jst.ws.jaxws.dom.runtime.internal.impl.IWebParamImpl <em>IWeb Param</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.ws.jaxws.dom.runtime.internal.impl.IWebParamImpl
- * @see org.eclipse.jst.ws.jaxws.dom.runtime.internal.impl.DomPackageImpl#getIWebParam()
- * @generated
- */
- int IWEB_PARAM = 4;
-
- /**
- * The feature id for the '<em><b>Implementation</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int IWEB_PARAM__IMPLEMENTATION = IJAVA_WEB_SERVICE_ELEMENT__IMPLEMENTATION;
-
- /**
- * The feature id for the '<em><b>Name</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int IWEB_PARAM__NAME = IJAVA_WEB_SERVICE_ELEMENT__NAME;
-
- /**
- * The feature id for the '<em><b>Kind</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int IWEB_PARAM__KIND = IJAVA_WEB_SERVICE_ELEMENT_FEATURE_COUNT + 0;
-
- /**
- * The feature id for the '<em><b>Type Name</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int IWEB_PARAM__TYPE_NAME = IJAVA_WEB_SERVICE_ELEMENT_FEATURE_COUNT + 1;
-
- /**
- * The feature id for the '<em><b>Part Name</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int IWEB_PARAM__PART_NAME = IJAVA_WEB_SERVICE_ELEMENT_FEATURE_COUNT + 2;
-
- /**
- * The feature id for the '<em><b>Target Namespace</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int IWEB_PARAM__TARGET_NAMESPACE = IJAVA_WEB_SERVICE_ELEMENT_FEATURE_COUNT + 3;
-
- /**
- * The feature id for the '<em><b>Header</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int IWEB_PARAM__HEADER = IJAVA_WEB_SERVICE_ELEMENT_FEATURE_COUNT + 4;
-
- /**
- * The number of structural features of the '<em>IWeb Param</em>' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int IWEB_PARAM_FEATURE_COUNT = IJAVA_WEB_SERVICE_ELEMENT_FEATURE_COUNT + 5;
-
- /**
- * The meta object id for the '{@link org.eclipse.jst.ws.jaxws.dom.runtime.internal.impl.IWebServiceImpl <em>IWeb Service</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.ws.jaxws.dom.runtime.internal.impl.IWebServiceImpl
- * @see org.eclipse.jst.ws.jaxws.dom.runtime.internal.impl.DomPackageImpl#getIWebService()
- * @generated
- */
- int IWEB_SERVICE = 5;
-
- /**
- * The feature id for the '<em><b>Implementation</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int IWEB_SERVICE__IMPLEMENTATION = IJAVA_WEB_SERVICE_ELEMENT__IMPLEMENTATION;
-
- /**
- * The feature id for the '<em><b>Name</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int IWEB_SERVICE__NAME = IJAVA_WEB_SERVICE_ELEMENT__NAME;
-
- /**
- * The feature id for the '<em><b>Service Endpoint</b></em>' reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int IWEB_SERVICE__SERVICE_ENDPOINT = IJAVA_WEB_SERVICE_ELEMENT_FEATURE_COUNT + 0;
-
- /**
- * The feature id for the '<em><b>Target Namespace</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int IWEB_SERVICE__TARGET_NAMESPACE = IJAVA_WEB_SERVICE_ELEMENT_FEATURE_COUNT + 1;
-
- /**
- * The feature id for the '<em><b>Port Name</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int IWEB_SERVICE__PORT_NAME = IJAVA_WEB_SERVICE_ELEMENT_FEATURE_COUNT + 2;
-
- /**
- * The feature id for the '<em><b>Wsdl Location</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int IWEB_SERVICE__WSDL_LOCATION = IJAVA_WEB_SERVICE_ELEMENT_FEATURE_COUNT + 3;
-
- /**
- * The number of structural features of the '<em>IWeb Service</em>' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int IWEB_SERVICE_FEATURE_COUNT = IJAVA_WEB_SERVICE_ELEMENT_FEATURE_COUNT + 4;
-
- /**
- * The meta object id for the '{@link org.eclipse.jst.ws.jaxws.dom.runtime.internal.impl.IWebServiceProjectImpl <em>IWeb Service Project</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.ws.jaxws.dom.runtime.internal.impl.IWebServiceProjectImpl
- * @see org.eclipse.jst.ws.jaxws.dom.runtime.internal.impl.DomPackageImpl#getIWebServiceProject()
- * @generated
- */
- int IWEB_SERVICE_PROJECT = 6;
-
- /**
- * The feature id for the '<em><b>Web Services</b></em>' containment reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int IWEB_SERVICE_PROJECT__WEB_SERVICES = 0;
-
- /**
- * The feature id for the '<em><b>Service Endpoint Interfaces</b></em>' containment reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int IWEB_SERVICE_PROJECT__SERVICE_ENDPOINT_INTERFACES = 1;
-
- /**
- * The feature id for the '<em><b>Name</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int IWEB_SERVICE_PROJECT__NAME = 2;
-
- /**
- * The number of structural features of the '<em>IWeb Service Project</em>' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int IWEB_SERVICE_PROJECT_FEATURE_COUNT = 3;
-
- /**
- * The meta object id for the '{@link org.eclipse.jst.ws.jaxws.dom.runtime.internal.impl.IWebTypeImpl <em>IWeb Type</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.ws.jaxws.dom.runtime.internal.impl.IWebTypeImpl
- * @see org.eclipse.jst.ws.jaxws.dom.runtime.internal.impl.DomPackageImpl#getIWebType()
- * @generated
- */
- int IWEB_TYPE = 7;
-
- /**
- * The feature id for the '<em><b>Implementation</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int IWEB_TYPE__IMPLEMENTATION = IJAVA_WEB_SERVICE_ELEMENT__IMPLEMENTATION;
-
- /**
- * The feature id for the '<em><b>Name</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int IWEB_TYPE__NAME = IJAVA_WEB_SERVICE_ELEMENT__NAME;
-
- /**
- * The number of structural features of the '<em>IWeb Type</em>' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int IWEB_TYPE_FEATURE_COUNT = IJAVA_WEB_SERVICE_ELEMENT_FEATURE_COUNT + 0;
-
- /**
- * The meta object id for the '{@link org.eclipse.jst.ws.jaxws.dom.runtime.api.WebParamKind <em>Web Param Kind</em>}' enum.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.ws.jaxws.dom.runtime.api.WebParamKind
- * @see org.eclipse.jst.ws.jaxws.dom.runtime.internal.impl.DomPackageImpl#getWebParamKind()
- * @generated
- */
- int WEB_PARAM_KIND = 8;
-
-
- /**
- * The meta object id for the '{@link org.eclipse.jst.ws.jaxws.dom.runtime.api.SOAPBindingStyle <em>SOAP Binding Style</em>}' enum.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.ws.jaxws.dom.runtime.api.SOAPBindingStyle
- * @see org.eclipse.jst.ws.jaxws.dom.runtime.internal.impl.DomPackageImpl#getSOAPBindingStyle()
- * @generated
- */
- int SOAP_BINDING_STYLE = 9;
-
- /**
- * The meta object id for the '{@link org.eclipse.jst.ws.jaxws.dom.runtime.api.SOAPBindingUse <em>SOAP Binding Use</em>}' enum.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.ws.jaxws.dom.runtime.api.SOAPBindingUse
- * @see org.eclipse.jst.ws.jaxws.dom.runtime.internal.impl.DomPackageImpl#getSOAPBindingUse()
- * @generated
- */
- int SOAP_BINDING_USE = 10;
-
- /**
- * The meta object id for the '{@link org.eclipse.jst.ws.jaxws.dom.runtime.api.SOAPBindingParameterStyle <em>SOAP Binding Parameter Style</em>}' enum.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.ws.jaxws.dom.runtime.api.SOAPBindingParameterStyle
- * @see org.eclipse.jst.ws.jaxws.dom.runtime.internal.impl.DomPackageImpl#getSOAPBindingParameterStyle()
- * @generated
- */
- int SOAP_BINDING_PARAMETER_STYLE = 11;
-
-
- /**
- * Returns the meta object for class '{@link org.eclipse.jst.ws.jaxws.dom.runtime.api.IDOM <em>IDOM</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for class '<em>IDOM</em>'.
- * @see org.eclipse.jst.ws.jaxws.dom.runtime.api.IDOM
- * @generated
- */
- EClass getIDOM();
-
- /**
- * Returns the meta object for the containment reference list '{@link org.eclipse.jst.ws.jaxws.dom.runtime.api.IDOM#getWebServiceProjects <em>Web Service Projects</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the containment reference list '<em>Web Service Projects</em>'.
- * @see org.eclipse.jst.ws.jaxws.dom.runtime.api.IDOM#getWebServiceProjects()
- * @see #getIDOM()
- * @generated
- */
- EReference getIDOM_WebServiceProjects();
-
- /**
- * Returns the meta object for class '{@link org.eclipse.jst.ws.jaxws.dom.runtime.api.IJavaWebServiceElement <em>IJava Web Service Element</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for class '<em>IJava Web Service Element</em>'.
- * @see org.eclipse.jst.ws.jaxws.dom.runtime.api.IJavaWebServiceElement
- * @generated
- */
- EClass getIJavaWebServiceElement();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.jst.ws.jaxws.dom.runtime.api.IJavaWebServiceElement#getImplementation <em>Implementation</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Implementation</em>'.
- * @see org.eclipse.jst.ws.jaxws.dom.runtime.api.IJavaWebServiceElement#getImplementation()
- * @see #getIJavaWebServiceElement()
- * @generated
- */
- EAttribute getIJavaWebServiceElement_Implementation();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.jst.ws.jaxws.dom.runtime.api.IJavaWebServiceElement#getName <em>Name</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Name</em>'.
- * @see org.eclipse.jst.ws.jaxws.dom.runtime.api.IJavaWebServiceElement#getName()
- * @see #getIJavaWebServiceElement()
- * @generated
- */
- EAttribute getIJavaWebServiceElement_Name();
-
- /**
- * Returns the meta object for class '{@link org.eclipse.jst.ws.jaxws.dom.runtime.api.IServiceEndpointInterface <em>IService Endpoint Interface</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for class '<em>IService Endpoint Interface</em>'.
- * @see org.eclipse.jst.ws.jaxws.dom.runtime.api.IServiceEndpointInterface
- * @generated
- */
- EClass getIServiceEndpointInterface();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.jst.ws.jaxws.dom.runtime.api.IServiceEndpointInterface#isImplicit <em>Implicit</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Implicit</em>'.
- * @see org.eclipse.jst.ws.jaxws.dom.runtime.api.IServiceEndpointInterface#isImplicit()
- * @see #getIServiceEndpointInterface()
- * @generated
- */
- EAttribute getIServiceEndpointInterface_Implicit();
-
- /**
- * Returns the meta object for the reference list '{@link org.eclipse.jst.ws.jaxws.dom.runtime.api.IServiceEndpointInterface#getImplementingWebServices <em>Implementing Web Services</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the reference list '<em>Implementing Web Services</em>'.
- * @see org.eclipse.jst.ws.jaxws.dom.runtime.api.IServiceEndpointInterface#getImplementingWebServices()
- * @see #getIServiceEndpointInterface()
- * @generated
- */
- EReference getIServiceEndpointInterface_ImplementingWebServices();
-
- /**
- * Returns the meta object for the containment reference list '{@link org.eclipse.jst.ws.jaxws.dom.runtime.api.IServiceEndpointInterface#getWebMethods <em>Web Methods</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the containment reference list '<em>Web Methods</em>'.
- * @see org.eclipse.jst.ws.jaxws.dom.runtime.api.IServiceEndpointInterface#getWebMethods()
- * @see #getIServiceEndpointInterface()
- * @generated
- */
- EReference getIServiceEndpointInterface_WebMethods();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.jst.ws.jaxws.dom.runtime.api.IServiceEndpointInterface#getTargetNamespace <em>Target Namespace</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Target Namespace</em>'.
- * @see org.eclipse.jst.ws.jaxws.dom.runtime.api.IServiceEndpointInterface#getTargetNamespace()
- * @see #getIServiceEndpointInterface()
- * @generated
- */
- EAttribute getIServiceEndpointInterface_TargetNamespace();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.jst.ws.jaxws.dom.runtime.api.IServiceEndpointInterface#getSoapBindingStyle <em>Soap Binding Style</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Soap Binding Style</em>'.
- * @see org.eclipse.jst.ws.jaxws.dom.runtime.api.IServiceEndpointInterface#getSoapBindingStyle()
- * @see #getIServiceEndpointInterface()
- * @generated
- */
- EAttribute getIServiceEndpointInterface_SoapBindingStyle();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.jst.ws.jaxws.dom.runtime.api.IServiceEndpointInterface#getSoapBindingUse <em>Soap Binding Use</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Soap Binding Use</em>'.
- * @see org.eclipse.jst.ws.jaxws.dom.runtime.api.IServiceEndpointInterface#getSoapBindingUse()
- * @see #getIServiceEndpointInterface()
- * @generated
- */
- EAttribute getIServiceEndpointInterface_SoapBindingUse();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.jst.ws.jaxws.dom.runtime.api.IServiceEndpointInterface#getSoapBindingParameterStyle <em>Soap Binding Parameter Style</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Soap Binding Parameter Style</em>'.
- * @see org.eclipse.jst.ws.jaxws.dom.runtime.api.IServiceEndpointInterface#getSoapBindingParameterStyle()
- * @see #getIServiceEndpointInterface()
- * @generated
- */
- EAttribute getIServiceEndpointInterface_SoapBindingParameterStyle();
-
- /**
- * Returns the meta object for class '{@link org.eclipse.jst.ws.jaxws.dom.runtime.api.IWebMethod <em>IWeb Method</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for class '<em>IWeb Method</em>'.
- * @see org.eclipse.jst.ws.jaxws.dom.runtime.api.IWebMethod
- * @generated
- */
- EClass getIWebMethod();
-
- /**
- * Returns the meta object for the containment reference list '{@link org.eclipse.jst.ws.jaxws.dom.runtime.api.IWebMethod#getParameters <em>Parameters</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the containment reference list '<em>Parameters</em>'.
- * @see org.eclipse.jst.ws.jaxws.dom.runtime.api.IWebMethod#getParameters()
- * @see #getIWebMethod()
- * @generated
- */
- EReference getIWebMethod_Parameters();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.jst.ws.jaxws.dom.runtime.api.IWebMethod#isExcluded <em>Excluded</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Excluded</em>'.
- * @see org.eclipse.jst.ws.jaxws.dom.runtime.api.IWebMethod#isExcluded()
- * @see #getIWebMethod()
- * @generated
- */
- EAttribute getIWebMethod_Excluded();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.jst.ws.jaxws.dom.runtime.api.IWebMethod#getSoapBindingStyle <em>Soap Binding Style</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Soap Binding Style</em>'.
- * @see org.eclipse.jst.ws.jaxws.dom.runtime.api.IWebMethod#getSoapBindingStyle()
- * @see #getIWebMethod()
- * @generated
- */
- EAttribute getIWebMethod_SoapBindingStyle();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.jst.ws.jaxws.dom.runtime.api.IWebMethod#getSoapBindingUse <em>Soap Binding Use</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Soap Binding Use</em>'.
- * @see org.eclipse.jst.ws.jaxws.dom.runtime.api.IWebMethod#getSoapBindingUse()
- * @see #getIWebMethod()
- * @generated
- */
- EAttribute getIWebMethod_SoapBindingUse();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.jst.ws.jaxws.dom.runtime.api.IWebMethod#getSoapBindingParameterStyle <em>Soap Binding Parameter Style</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Soap Binding Parameter Style</em>'.
- * @see org.eclipse.jst.ws.jaxws.dom.runtime.api.IWebMethod#getSoapBindingParameterStyle()
- * @see #getIWebMethod()
- * @generated
- */
- EAttribute getIWebMethod_SoapBindingParameterStyle();
-
- /**
- * Returns the meta object for class '{@link org.eclipse.jst.ws.jaxws.dom.runtime.api.IWebParam <em>IWeb Param</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for class '<em>IWeb Param</em>'.
- * @see org.eclipse.jst.ws.jaxws.dom.runtime.api.IWebParam
- * @generated
- */
- EClass getIWebParam();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.jst.ws.jaxws.dom.runtime.api.IWebParam#getKind <em>Kind</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Kind</em>'.
- * @see org.eclipse.jst.ws.jaxws.dom.runtime.api.IWebParam#getKind()
- * @see #getIWebParam()
- * @generated
- */
- EAttribute getIWebParam_Kind();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.jst.ws.jaxws.dom.runtime.api.IWebParam#getTypeName <em>Type Name</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Type Name</em>'.
- * @see org.eclipse.jst.ws.jaxws.dom.runtime.api.IWebParam#getTypeName()
- * @see #getIWebParam()
- * @generated
- */
- EAttribute getIWebParam_TypeName();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.jst.ws.jaxws.dom.runtime.api.IWebParam#getPartName <em>Part Name</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Part Name</em>'.
- * @see org.eclipse.jst.ws.jaxws.dom.runtime.api.IWebParam#getPartName()
- * @see #getIWebParam()
- * @generated
- */
- EAttribute getIWebParam_PartName();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.jst.ws.jaxws.dom.runtime.api.IWebParam#getTargetNamespace <em>Target Namespace</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Target Namespace</em>'.
- * @see org.eclipse.jst.ws.jaxws.dom.runtime.api.IWebParam#getTargetNamespace()
- * @see #getIWebParam()
- * @generated
- */
- EAttribute getIWebParam_TargetNamespace();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.jst.ws.jaxws.dom.runtime.api.IWebParam#isHeader <em>Header</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Header</em>'.
- * @see org.eclipse.jst.ws.jaxws.dom.runtime.api.IWebParam#isHeader()
- * @see #getIWebParam()
- * @generated
- */
- EAttribute getIWebParam_Header();
-
- /**
- * Returns the meta object for class '{@link org.eclipse.jst.ws.jaxws.dom.runtime.api.IWebService <em>IWeb Service</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for class '<em>IWeb Service</em>'.
- * @see org.eclipse.jst.ws.jaxws.dom.runtime.api.IWebService
- * @generated
- */
- EClass getIWebService();
-
- /**
- * Returns the meta object for the reference '{@link org.eclipse.jst.ws.jaxws.dom.runtime.api.IWebService#getServiceEndpoint <em>Service Endpoint</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the reference '<em>Service Endpoint</em>'.
- * @see org.eclipse.jst.ws.jaxws.dom.runtime.api.IWebService#getServiceEndpoint()
- * @see #getIWebService()
- * @generated
- */
- EReference getIWebService_ServiceEndpoint();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.jst.ws.jaxws.dom.runtime.api.IWebService#getTargetNamespace <em>Target Namespace</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Target Namespace</em>'.
- * @see org.eclipse.jst.ws.jaxws.dom.runtime.api.IWebService#getTargetNamespace()
- * @see #getIWebService()
- * @generated
- */
- EAttribute getIWebService_TargetNamespace();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.jst.ws.jaxws.dom.runtime.api.IWebService#getPortName <em>Port Name</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Port Name</em>'.
- * @see org.eclipse.jst.ws.jaxws.dom.runtime.api.IWebService#getPortName()
- * @see #getIWebService()
- * @generated
- */
- EAttribute getIWebService_PortName();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.jst.ws.jaxws.dom.runtime.api.IWebService#getWsdlLocation <em>Wsdl Location</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Wsdl Location</em>'.
- * @see org.eclipse.jst.ws.jaxws.dom.runtime.api.IWebService#getWsdlLocation()
- * @see #getIWebService()
- * @generated
- */
- EAttribute getIWebService_WsdlLocation();
-
- /**
- * Returns the meta object for class '{@link org.eclipse.jst.ws.jaxws.dom.runtime.api.IWebServiceProject <em>IWeb Service Project</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for class '<em>IWeb Service Project</em>'.
- * @see org.eclipse.jst.ws.jaxws.dom.runtime.api.IWebServiceProject
- * @generated
- */
- EClass getIWebServiceProject();
-
- /**
- * Returns the meta object for the containment reference list '{@link org.eclipse.jst.ws.jaxws.dom.runtime.api.IWebServiceProject#getWebServices <em>Web Services</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the containment reference list '<em>Web Services</em>'.
- * @see org.eclipse.jst.ws.jaxws.dom.runtime.api.IWebServiceProject#getWebServices()
- * @see #getIWebServiceProject()
- * @generated
- */
- EReference getIWebServiceProject_WebServices();
-
- /**
- * Returns the meta object for the containment reference list '{@link org.eclipse.jst.ws.jaxws.dom.runtime.api.IWebServiceProject#getServiceEndpointInterfaces <em>Service Endpoint Interfaces</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the containment reference list '<em>Service Endpoint Interfaces</em>'.
- * @see org.eclipse.jst.ws.jaxws.dom.runtime.api.IWebServiceProject#getServiceEndpointInterfaces()
- * @see #getIWebServiceProject()
- * @generated
- */
- EReference getIWebServiceProject_ServiceEndpointInterfaces();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.jst.ws.jaxws.dom.runtime.api.IWebServiceProject#getName <em>Name</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Name</em>'.
- * @see org.eclipse.jst.ws.jaxws.dom.runtime.api.IWebServiceProject#getName()
- * @see #getIWebServiceProject()
- * @generated
- */
- EAttribute getIWebServiceProject_Name();
-
- /**
- * Returns the meta object for class '{@link org.eclipse.jst.ws.jaxws.dom.runtime.api.IWebType <em>IWeb Type</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for class '<em>IWeb Type</em>'.
- * @see org.eclipse.jst.ws.jaxws.dom.runtime.api.IWebType
- * @generated
- */
- EClass getIWebType();
-
- /**
- * Returns the meta object for enum '{@link org.eclipse.jst.ws.jaxws.dom.runtime.api.WebParamKind <em>Web Param Kind</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for enum '<em>Web Param Kind</em>'.
- * @see org.eclipse.jst.ws.jaxws.dom.runtime.api.WebParamKind
- * @generated
- */
- EEnum getWebParamKind();
-
- /**
- * Returns the meta object for enum '{@link org.eclipse.jst.ws.jaxws.dom.runtime.api.SOAPBindingStyle <em>SOAP Binding Style</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for enum '<em>SOAP Binding Style</em>'.
- * @see org.eclipse.jst.ws.jaxws.dom.runtime.api.SOAPBindingStyle
- * @generated
- */
- EEnum getSOAPBindingStyle();
-
- /**
- * Returns the meta object for enum '{@link org.eclipse.jst.ws.jaxws.dom.runtime.api.SOAPBindingUse <em>SOAP Binding Use</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for enum '<em>SOAP Binding Use</em>'.
- * @see org.eclipse.jst.ws.jaxws.dom.runtime.api.SOAPBindingUse
- * @generated
- */
- EEnum getSOAPBindingUse();
-
- /**
- * Returns the meta object for enum '{@link org.eclipse.jst.ws.jaxws.dom.runtime.api.SOAPBindingParameterStyle <em>SOAP Binding Parameter Style</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for enum '<em>SOAP Binding Parameter Style</em>'.
- * @see org.eclipse.jst.ws.jaxws.dom.runtime.api.SOAPBindingParameterStyle
- * @generated
- */
- EEnum getSOAPBindingParameterStyle();
-
- /**
- * Returns the factory that creates the instances of the model.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the factory that creates the instances of the model.
- * @generated
- */
- DomFactory getDomFactory();
-
- /**
- * <!-- begin-user-doc -->
- * Defines literals for the meta objects that represent
- * <ul>
- * <li>each class,</li>
- * <li>each feature of each class,</li>
- * <li>each enum,</li>
- * <li>and each data type</li>
- * </ul>
- * <!-- end-user-doc -->
- * @generated
- */
- interface Literals {
- /**
- * The meta object literal for the '{@link org.eclipse.jst.ws.jaxws.dom.runtime.internal.impl.IDOMImpl <em>IDOM</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.ws.jaxws.dom.runtime.internal.impl.IDOMImpl
- * @see org.eclipse.jst.ws.jaxws.dom.runtime.internal.impl.DomPackageImpl#getIDOM()
- * @generated
- */
- EClass IDOM = eINSTANCE.getIDOM();
-
- /**
- * The meta object literal for the '<em><b>Web Service Projects</b></em>' containment reference list feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EReference IDOM__WEB_SERVICE_PROJECTS = eINSTANCE.getIDOM_WebServiceProjects();
-
- /**
- * The meta object literal for the '{@link org.eclipse.jst.ws.jaxws.dom.runtime.internal.impl.IJavaWebServiceElementImpl <em>IJava Web Service Element</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.ws.jaxws.dom.runtime.internal.impl.IJavaWebServiceElementImpl
- * @see org.eclipse.jst.ws.jaxws.dom.runtime.internal.impl.DomPackageImpl#getIJavaWebServiceElement()
- * @generated
- */
- EClass IJAVA_WEB_SERVICE_ELEMENT = eINSTANCE.getIJavaWebServiceElement();
-
- /**
- * The meta object literal for the '<em><b>Implementation</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EAttribute IJAVA_WEB_SERVICE_ELEMENT__IMPLEMENTATION = eINSTANCE.getIJavaWebServiceElement_Implementation();
-
- /**
- * The meta object literal for the '<em><b>Name</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EAttribute IJAVA_WEB_SERVICE_ELEMENT__NAME = eINSTANCE.getIJavaWebServiceElement_Name();
-
- /**
- * The meta object literal for the '{@link org.eclipse.jst.ws.jaxws.dom.runtime.internal.impl.IServiceEndpointInterfaceImpl <em>IService Endpoint Interface</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.ws.jaxws.dom.runtime.internal.impl.IServiceEndpointInterfaceImpl
- * @see org.eclipse.jst.ws.jaxws.dom.runtime.internal.impl.DomPackageImpl#getIServiceEndpointInterface()
- * @generated
- */
- EClass ISERVICE_ENDPOINT_INTERFACE = eINSTANCE.getIServiceEndpointInterface();
-
- /**
- * The meta object literal for the '<em><b>Implicit</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EAttribute ISERVICE_ENDPOINT_INTERFACE__IMPLICIT = eINSTANCE.getIServiceEndpointInterface_Implicit();
-
- /**
- * The meta object literal for the '<em><b>Implementing Web Services</b></em>' reference list feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EReference ISERVICE_ENDPOINT_INTERFACE__IMPLEMENTING_WEB_SERVICES = eINSTANCE.getIServiceEndpointInterface_ImplementingWebServices();
-
- /**
- * The meta object literal for the '<em><b>Web Methods</b></em>' containment reference list feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EReference ISERVICE_ENDPOINT_INTERFACE__WEB_METHODS = eINSTANCE.getIServiceEndpointInterface_WebMethods();
-
- /**
- * The meta object literal for the '<em><b>Target Namespace</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EAttribute ISERVICE_ENDPOINT_INTERFACE__TARGET_NAMESPACE = eINSTANCE.getIServiceEndpointInterface_TargetNamespace();
-
- /**
- * The meta object literal for the '<em><b>Soap Binding Style</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EAttribute ISERVICE_ENDPOINT_INTERFACE__SOAP_BINDING_STYLE = eINSTANCE.getIServiceEndpointInterface_SoapBindingStyle();
-
- /**
- * The meta object literal for the '<em><b>Soap Binding Use</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EAttribute ISERVICE_ENDPOINT_INTERFACE__SOAP_BINDING_USE = eINSTANCE.getIServiceEndpointInterface_SoapBindingUse();
-
- /**
- * The meta object literal for the '<em><b>Soap Binding Parameter Style</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EAttribute ISERVICE_ENDPOINT_INTERFACE__SOAP_BINDING_PARAMETER_STYLE = eINSTANCE.getIServiceEndpointInterface_SoapBindingParameterStyle();
-
- /**
- * The meta object literal for the '{@link org.eclipse.jst.ws.jaxws.dom.runtime.internal.impl.IWebMethodImpl <em>IWeb Method</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.ws.jaxws.dom.runtime.internal.impl.IWebMethodImpl
- * @see org.eclipse.jst.ws.jaxws.dom.runtime.internal.impl.DomPackageImpl#getIWebMethod()
- * @generated
- */
- EClass IWEB_METHOD = eINSTANCE.getIWebMethod();
-
- /**
- * The meta object literal for the '<em><b>Parameters</b></em>' containment reference list feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EReference IWEB_METHOD__PARAMETERS = eINSTANCE.getIWebMethod_Parameters();
-
- /**
- * The meta object literal for the '<em><b>Excluded</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EAttribute IWEB_METHOD__EXCLUDED = eINSTANCE.getIWebMethod_Excluded();
-
- /**
- * The meta object literal for the '<em><b>Soap Binding Style</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EAttribute IWEB_METHOD__SOAP_BINDING_STYLE = eINSTANCE.getIWebMethod_SoapBindingStyle();
-
- /**
- * The meta object literal for the '<em><b>Soap Binding Use</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EAttribute IWEB_METHOD__SOAP_BINDING_USE = eINSTANCE.getIWebMethod_SoapBindingUse();
-
- /**
- * The meta object literal for the '<em><b>Soap Binding Parameter Style</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EAttribute IWEB_METHOD__SOAP_BINDING_PARAMETER_STYLE = eINSTANCE.getIWebMethod_SoapBindingParameterStyle();
-
- /**
- * The meta object literal for the '{@link org.eclipse.jst.ws.jaxws.dom.runtime.internal.impl.IWebParamImpl <em>IWeb Param</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.ws.jaxws.dom.runtime.internal.impl.IWebParamImpl
- * @see org.eclipse.jst.ws.jaxws.dom.runtime.internal.impl.DomPackageImpl#getIWebParam()
- * @generated
- */
- EClass IWEB_PARAM = eINSTANCE.getIWebParam();
-
- /**
- * The meta object literal for the '<em><b>Kind</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EAttribute IWEB_PARAM__KIND = eINSTANCE.getIWebParam_Kind();
-
- /**
- * The meta object literal for the '<em><b>Type Name</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EAttribute IWEB_PARAM__TYPE_NAME = eINSTANCE.getIWebParam_TypeName();
-
- /**
- * The meta object literal for the '<em><b>Part Name</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EAttribute IWEB_PARAM__PART_NAME = eINSTANCE.getIWebParam_PartName();
-
- /**
- * The meta object literal for the '<em><b>Target Namespace</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EAttribute IWEB_PARAM__TARGET_NAMESPACE = eINSTANCE.getIWebParam_TargetNamespace();
-
- /**
- * The meta object literal for the '<em><b>Header</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EAttribute IWEB_PARAM__HEADER = eINSTANCE.getIWebParam_Header();
-
- /**
- * The meta object literal for the '{@link org.eclipse.jst.ws.jaxws.dom.runtime.internal.impl.IWebServiceImpl <em>IWeb Service</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.ws.jaxws.dom.runtime.internal.impl.IWebServiceImpl
- * @see org.eclipse.jst.ws.jaxws.dom.runtime.internal.impl.DomPackageImpl#getIWebService()
- * @generated
- */
- EClass IWEB_SERVICE = eINSTANCE.getIWebService();
-
- /**
- * The meta object literal for the '<em><b>Service Endpoint</b></em>' reference feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EReference IWEB_SERVICE__SERVICE_ENDPOINT = eINSTANCE.getIWebService_ServiceEndpoint();
-
- /**
- * The meta object literal for the '<em><b>Target Namespace</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EAttribute IWEB_SERVICE__TARGET_NAMESPACE = eINSTANCE.getIWebService_TargetNamespace();
-
- /**
- * The meta object literal for the '<em><b>Port Name</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EAttribute IWEB_SERVICE__PORT_NAME = eINSTANCE.getIWebService_PortName();
-
- /**
- * The meta object literal for the '<em><b>Wsdl Location</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EAttribute IWEB_SERVICE__WSDL_LOCATION = eINSTANCE.getIWebService_WsdlLocation();
-
- /**
- * The meta object literal for the '{@link org.eclipse.jst.ws.jaxws.dom.runtime.internal.impl.IWebServiceProjectImpl <em>IWeb Service Project</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.ws.jaxws.dom.runtime.internal.impl.IWebServiceProjectImpl
- * @see org.eclipse.jst.ws.jaxws.dom.runtime.internal.impl.DomPackageImpl#getIWebServiceProject()
- * @generated
- */
- EClass IWEB_SERVICE_PROJECT = eINSTANCE.getIWebServiceProject();
-
- /**
- * The meta object literal for the '<em><b>Web Services</b></em>' containment reference list feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EReference IWEB_SERVICE_PROJECT__WEB_SERVICES = eINSTANCE.getIWebServiceProject_WebServices();
-
- /**
- * The meta object literal for the '<em><b>Service Endpoint Interfaces</b></em>' containment reference list feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EReference IWEB_SERVICE_PROJECT__SERVICE_ENDPOINT_INTERFACES = eINSTANCE.getIWebServiceProject_ServiceEndpointInterfaces();
-
- /**
- * The meta object literal for the '<em><b>Name</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EAttribute IWEB_SERVICE_PROJECT__NAME = eINSTANCE.getIWebServiceProject_Name();
-
- /**
- * The meta object literal for the '{@link org.eclipse.jst.ws.jaxws.dom.runtime.internal.impl.IWebTypeImpl <em>IWeb Type</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.ws.jaxws.dom.runtime.internal.impl.IWebTypeImpl
- * @see org.eclipse.jst.ws.jaxws.dom.runtime.internal.impl.DomPackageImpl#getIWebType()
- * @generated
- */
- EClass IWEB_TYPE = eINSTANCE.getIWebType();
-
- /**
- * The meta object literal for the '{@link org.eclipse.jst.ws.jaxws.dom.runtime.api.WebParamKind <em>Web Param Kind</em>}' enum.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.ws.jaxws.dom.runtime.api.WebParamKind
- * @see org.eclipse.jst.ws.jaxws.dom.runtime.internal.impl.DomPackageImpl#getWebParamKind()
- * @generated
- */
- EEnum WEB_PARAM_KIND = eINSTANCE.getWebParamKind();
-
- /**
- * The meta object literal for the '{@link org.eclipse.jst.ws.jaxws.dom.runtime.api.SOAPBindingStyle <em>SOAP Binding Style</em>}' enum.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.ws.jaxws.dom.runtime.api.SOAPBindingStyle
- * @see org.eclipse.jst.ws.jaxws.dom.runtime.internal.impl.DomPackageImpl#getSOAPBindingStyle()
- * @generated
- */
- EEnum SOAP_BINDING_STYLE = eINSTANCE.getSOAPBindingStyle();
-
- /**
- * The meta object literal for the '{@link org.eclipse.jst.ws.jaxws.dom.runtime.api.SOAPBindingUse <em>SOAP Binding Use</em>}' enum.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.ws.jaxws.dom.runtime.api.SOAPBindingUse
- * @see org.eclipse.jst.ws.jaxws.dom.runtime.internal.impl.DomPackageImpl#getSOAPBindingUse()
- * @generated
- */
- EEnum SOAP_BINDING_USE = eINSTANCE.getSOAPBindingUse();
-
- /**
- * The meta object literal for the '{@link org.eclipse.jst.ws.jaxws.dom.runtime.api.SOAPBindingParameterStyle <em>SOAP Binding Parameter Style</em>}' enum.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.ws.jaxws.dom.runtime.api.SOAPBindingParameterStyle
- * @see org.eclipse.jst.ws.jaxws.dom.runtime.internal.impl.DomPackageImpl#getSOAPBindingParameterStyle()
- * @generated
- */
- EEnum SOAP_BINDING_PARAMETER_STYLE = eINSTANCE.getSOAPBindingParameterStyle();
-
- }
-
-} //DomPackage
diff --git a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/api/IDOM.java b/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/api/IDOM.java
deleted file mode 100755
index e94a88b..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/api/IDOM.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.dom.runtime.api;
-
-import org.eclipse.emf.common.util.EList;
-
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>IDOM</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- * <li>{@link org.eclipse.jst.ws.jaxws.dom.runtime.api.IDOM#getWebServiceProjects <em>Web Service Projects</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jst.ws.jaxws.dom.runtime.api.DomPackage#getIDOM()
- * @model
- * @generated
- */
-public interface IDOM extends EObject {
- /**
- * Returns the value of the '<em><b>Web Service Projects</b></em>' containment reference list.
- * The list contents are of type {@link org.eclipse.jst.ws.jaxws.dom.runtime.api.IWebServiceProject}.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Web Service Projects</em>' containment reference list isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- * @return the value of the '<em>Web Service Projects</em>' containment reference list.
- * @see org.eclipse.jst.ws.jaxws.dom.runtime.api.DomPackage#getIDOM_WebServiceProjects()
- * @model containment="true" suppressedSetVisibility="true"
- * @generated
- */
- EList<IWebServiceProject> getWebServiceProjects();
-
-} // IDOM
diff --git a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/api/IJavaWebServiceElement.java b/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/api/IJavaWebServiceElement.java
deleted file mode 100755
index 21200fa..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/api/IJavaWebServiceElement.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.dom.runtime.api;
-
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * @model
- * * @author Hristo Sabev
- *
- */
-public interface IJavaWebServiceElement extends EObject
-{
- /**
- * @model changeable="true" suppressedSetVisibility="true" required="true"
- * @return
- */
- public String getImplementation();
-
- /**
- * @model changeable="true" required="true"
- * @return
- */
- public String getName();
-
- /**
- * Sets the value of the '{@link org.eclipse.jst.ws.jaxws.dom.runtime.api.IJavaWebServiceElement#getName <em>Name</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Name</em>' attribute.
- * @see #getName()
- * @generated
- */
- void setName(String value);
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/api/IServiceEndpointInterface.java b/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/api/IServiceEndpointInterface.java
deleted file mode 100755
index 3589d11..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/api/IServiceEndpointInterface.java
+++ /dev/null
@@ -1,145 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.dom.runtime.api;
-
-import org.eclipse.emf.common.util.EList;
-
-
-/**
- * @model
- * @author Hristo Sabev
- *
- */
-public interface IServiceEndpointInterface extends IJavaWebServiceElement
-{
- /**
- * @model changeable="true" suppressedSetVisibility="true" required="true"
- * @return
- */
- public boolean isImplicit();
-
- /**
- * @model changeable="true" suppressedSetVisibility="true" required="true" containment="false" many="true" type="IWebService" opposite="serviceEndpoint"
- * @return
- */
- public EList<IWebService> getImplementingWebServices();
-
- /**
- * @model changeable="true" suppressedSetVisibility="true" required="true" containment="true" many="true" type="IWebMethod"
- * @return
- */
- public EList<IWebMethod> getWebMethods();
-
- /**
- * @model changeable="true" required="true"
- */
- public String getTargetNamespace();
-
- /**
- * Sets the value of the '{@link org.eclipse.jst.ws.jaxws.dom.runtime.api.IServiceEndpointInterface#getTargetNamespace <em>Target Namespace</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Target Namespace</em>' attribute.
- * @see #getTargetNamespace()
- * @generated
- */
- void setTargetNamespace(String value);
-
- /**
- * Returns the value of the '<em><b>Soap Binding Style</b></em>' attribute.
- * The default value is <code>"DOCUMENT"</code>.
- * The literals are from the enumeration {@link org.eclipse.jst.ws.jaxws.dom.runtime.api.SOAPBindingStyle}.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Soap Binding Style</em>' attribute isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- * @return the value of the '<em>Soap Binding Style</em>' attribute.
- * @see org.eclipse.jst.ws.jaxws.dom.runtime.api.SOAPBindingStyle
- * @see #setSoapBindingStyle(SOAPBindingStyle)
- * @see org.eclipse.jst.ws.jaxws.dom.runtime.api.DomPackage#getIServiceEndpointInterface_SoapBindingStyle()
- * @model default="DOCUMENT" required="true"
- * @generated
- */
- SOAPBindingStyle getSoapBindingStyle();
-
- /**
- * Sets the value of the '{@link org.eclipse.jst.ws.jaxws.dom.runtime.api.IServiceEndpointInterface#getSoapBindingStyle <em>Soap Binding Style</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Soap Binding Style</em>' attribute.
- * @see org.eclipse.jst.ws.jaxws.dom.runtime.api.SOAPBindingStyle
- * @see #getSoapBindingStyle()
- * @generated
- */
- void setSoapBindingStyle(SOAPBindingStyle value);
-
- /**
- * Returns the value of the '<em><b>Soap Binding Use</b></em>' attribute.
- * The default value is <code>"LITERAL"</code>.
- * The literals are from the enumeration {@link org.eclipse.jst.ws.jaxws.dom.runtime.api.SOAPBindingUse}.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Soap Binding Use</em>' attribute isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- * @return the value of the '<em>Soap Binding Use</em>' attribute.
- * @see org.eclipse.jst.ws.jaxws.dom.runtime.api.SOAPBindingUse
- * @see #setSoapBindingUse(SOAPBindingUse)
- * @see org.eclipse.jst.ws.jaxws.dom.runtime.api.DomPackage#getIServiceEndpointInterface_SoapBindingUse()
- * @model default="LITERAL" required="true"
- * @generated
- */
- SOAPBindingUse getSoapBindingUse();
-
- /**
- * Sets the value of the '{@link org.eclipse.jst.ws.jaxws.dom.runtime.api.IServiceEndpointInterface#getSoapBindingUse <em>Soap Binding Use</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Soap Binding Use</em>' attribute.
- * @see org.eclipse.jst.ws.jaxws.dom.runtime.api.SOAPBindingUse
- * @see #getSoapBindingUse()
- * @generated
- */
- void setSoapBindingUse(SOAPBindingUse value);
-
- /**
- * Returns the value of the '<em><b>Soap Binding Parameter Style</b></em>' attribute.
- * The default value is <code>"WRAPPED"</code>.
- * The literals are from the enumeration {@link org.eclipse.jst.ws.jaxws.dom.runtime.api.SOAPBindingParameterStyle}.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Soap Binding Parameter Style</em>' attribute isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- * @return the value of the '<em>Soap Binding Parameter Style</em>' attribute.
- * @see org.eclipse.jst.ws.jaxws.dom.runtime.api.SOAPBindingParameterStyle
- * @see #setSoapBindingParameterStyle(SOAPBindingParameterStyle)
- * @see org.eclipse.jst.ws.jaxws.dom.runtime.api.DomPackage#getIServiceEndpointInterface_SoapBindingParameterStyle()
- * @model default="WRAPPED" required="true"
- * @generated
- */
- SOAPBindingParameterStyle getSoapBindingParameterStyle();
-
- /**
- * Sets the value of the '{@link org.eclipse.jst.ws.jaxws.dom.runtime.api.IServiceEndpointInterface#getSoapBindingParameterStyle <em>Soap Binding Parameter Style</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Soap Binding Parameter Style</em>' attribute.
- * @see org.eclipse.jst.ws.jaxws.dom.runtime.api.SOAPBindingParameterStyle
- * @see #getSoapBindingParameterStyle()
- * @generated
- */
- void setSoapBindingParameterStyle(SOAPBindingParameterStyle value);
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/api/IWSDOMRuntimeManager.java b/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/api/IWSDOMRuntimeManager.java
deleted file mode 100755
index ca39cb9..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/api/IWSDOMRuntimeManager.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.dom.runtime.api;
-
-import java.util.Collection;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-
-
-public interface IWSDOMRuntimeManager
-{
- /**
- * Instantiates the DOM Runtimes if not already.
- * @param progress monitor to track progress
- */
- public void createDOMRuntimes(IProgressMonitor monitor);
-
- /**
- * This method should return the DOM runtime instance corresponding to the runtime id
- * and instantiate such DOM runtime instance if non existent at the
- * moment of invocation of this method.
- *
- * @param runtimeId - string identifier of the runtime
- * @return the DOM runtime instance. Null if runtime with such id is not registered
- */
- public IWsDOMRuntimeExtension getDOMRuntime(String runtimeId);
-
- /**
- *
- * @return a list of all DOM Runtimes currently instantiated
- */
- public Collection<IWsDOMRuntimeExtension> getDOMRuntimes();
-
- /**
- * This method should reload all instances of DOM Runtimes.
- *
- */
- public void reloadDOMRuntimes(IProgressMonitor monitor);
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/api/IWebMethod.java b/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/api/IWebMethod.java
deleted file mode 100755
index 070d385..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/api/IWebMethod.java
+++ /dev/null
@@ -1,132 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.dom.runtime.api;
-
-import org.eclipse.emf.common.util.EList;
-
-
-/**
- * @model
- * @author Hristo Sabev
- */
-public interface IWebMethod extends IJavaWebServiceElement
-{
- /**
- * @model type="IWebParam" suppressedSetVisibility="true" many="true" containment="true" required="true"
- * @return
- */
- EList<IWebParam> getParameters();
-
- /**
- * @model type="boolean" many="false" changeable="true" required="true"
- */
- boolean isExcluded();
-
- /**
- * Sets the value of the '{@link org.eclipse.jst.ws.jaxws.dom.runtime.api.IWebMethod#isExcluded <em>Excluded</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Excluded</em>' attribute.
- * @see #isExcluded()
- * @generated
- */
- void setExcluded(boolean value);
-
- /**
- * Returns the value of the '<em><b>Soap Binding Style</b></em>' attribute.
- * The default value is <code>"DOCUMENT"</code>.
- * The literals are from the enumeration {@link org.eclipse.jst.ws.jaxws.dom.runtime.api.SOAPBindingStyle}.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Soap Binding Style</em>' attribute isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- * @return the value of the '<em>Soap Binding Style</em>' attribute.
- * @see org.eclipse.jst.ws.jaxws.dom.runtime.api.SOAPBindingStyle
- * @see #setSoapBindingStyle(SOAPBindingStyle)
- * @see org.eclipse.jst.ws.jaxws.dom.runtime.api.DomPackage#getIWebMethod_SoapBindingStyle()
- * @model default="DOCUMENT" required="true"
- * @generated
- */
- SOAPBindingStyle getSoapBindingStyle();
-
- /**
- * Sets the value of the '{@link org.eclipse.jst.ws.jaxws.dom.runtime.api.IWebMethod#getSoapBindingStyle <em>Soap Binding Style</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Soap Binding Style</em>' attribute.
- * @see org.eclipse.jst.ws.jaxws.dom.runtime.api.SOAPBindingStyle
- * @see #getSoapBindingStyle()
- * @generated
- */
- void setSoapBindingStyle(SOAPBindingStyle value);
-
- /**
- * Returns the value of the '<em><b>Soap Binding Use</b></em>' attribute.
- * The default value is <code>"LITERAL"</code>.
- * The literals are from the enumeration {@link org.eclipse.jst.ws.jaxws.dom.runtime.api.SOAPBindingUse}.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Soap Binding Use</em>' attribute isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- * @return the value of the '<em>Soap Binding Use</em>' attribute.
- * @see org.eclipse.jst.ws.jaxws.dom.runtime.api.SOAPBindingUse
- * @see #setSoapBindingUse(SOAPBindingUse)
- * @see org.eclipse.jst.ws.jaxws.dom.runtime.api.DomPackage#getIWebMethod_SoapBindingUse()
- * @model default="LITERAL" required="true"
- * @generated
- */
- SOAPBindingUse getSoapBindingUse();
-
- /**
- * Sets the value of the '{@link org.eclipse.jst.ws.jaxws.dom.runtime.api.IWebMethod#getSoapBindingUse <em>Soap Binding Use</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Soap Binding Use</em>' attribute.
- * @see org.eclipse.jst.ws.jaxws.dom.runtime.api.SOAPBindingUse
- * @see #getSoapBindingUse()
- * @generated
- */
- void setSoapBindingUse(SOAPBindingUse value);
-
- /**
- * Returns the value of the '<em><b>Soap Binding Parameter Style</b></em>' attribute.
- * The default value is <code>"WRAPPED"</code>.
- * The literals are from the enumeration {@link org.eclipse.jst.ws.jaxws.dom.runtime.api.SOAPBindingParameterStyle}.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Soap Binding Parameter Style</em>' attribute isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- * @return the value of the '<em>Soap Binding Parameter Style</em>' attribute.
- * @see org.eclipse.jst.ws.jaxws.dom.runtime.api.SOAPBindingParameterStyle
- * @see #setSoapBindingParameterStyle(SOAPBindingParameterStyle)
- * @see org.eclipse.jst.ws.jaxws.dom.runtime.api.DomPackage#getIWebMethod_SoapBindingParameterStyle()
- * @model default="WRAPPED" required="true"
- * @generated
- */
- SOAPBindingParameterStyle getSoapBindingParameterStyle();
-
- /**
- * Sets the value of the '{@link org.eclipse.jst.ws.jaxws.dom.runtime.api.IWebMethod#getSoapBindingParameterStyle <em>Soap Binding Parameter Style</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Soap Binding Parameter Style</em>' attribute.
- * @see org.eclipse.jst.ws.jaxws.dom.runtime.api.SOAPBindingParameterStyle
- * @see #getSoapBindingParameterStyle()
- * @generated
- */
- void setSoapBindingParameterStyle(SOAPBindingParameterStyle value);
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/api/IWebParam.java b/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/api/IWebParam.java
deleted file mode 100755
index f7696e5..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/api/IWebParam.java
+++ /dev/null
@@ -1,122 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.dom.runtime.api;
-
-
-/**
- *
- * @author Hristo Sabev
- *
- * @model
- */
-public interface IWebParam extends IJavaWebServiceElement
-{
- /**
- * @model required="true" many="false" suppressedSetVisibility="true"
- * @return
- */
- String getTypeName();
-
- /**
- * Returns the value of the '<em><b>Part Name</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Part Name</em>' attribute isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- * @return the value of the '<em>Part Name</em>' attribute.
- * @see #setPartName(String)
- * @see org.eclipse.jst.ws.jaxws.dom.runtime.api.DomPackage#getIWebParam_PartName()
- * @model required="true"
- * @generated
- */
- String getPartName();
-
- /**
- * Sets the value of the '{@link org.eclipse.jst.ws.jaxws.dom.runtime.api.IWebParam#getPartName <em>Part Name</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Part Name</em>' attribute.
- * @see #getPartName()
- * @generated
- */
- void setPartName(String value);
-
- /**
- * Returns the value of the '<em><b>Target Namespace</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Target Namespace</em>' attribute isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- * @return the value of the '<em>Target Namespace</em>' attribute.
- * @see #setTargetNamespace(String)
- * @see org.eclipse.jst.ws.jaxws.dom.runtime.api.DomPackage#getIWebParam_TargetNamespace()
- * @model required="true"
- * @generated
- */
- String getTargetNamespace();
-
- /**
- * Sets the value of the '{@link org.eclipse.jst.ws.jaxws.dom.runtime.api.IWebParam#getTargetNamespace <em>Target Namespace</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Target Namespace</em>' attribute.
- * @see #getTargetNamespace()
- * @generated
- */
- void setTargetNamespace(String value);
-
- /**
- * Returns the value of the '<em><b>Header</b></em>' attribute.
- * The default value is <code>"false"</code>.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Header</em>' attribute isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- * @return the value of the '<em>Header</em>' attribute.
- * @see #setHeader(boolean)
- * @see org.eclipse.jst.ws.jaxws.dom.runtime.api.DomPackage#getIWebParam_Header()
- * @model default="false" required="true"
- * @generated
- */
- boolean isHeader();
-
- /**
- * Sets the value of the '{@link org.eclipse.jst.ws.jaxws.dom.runtime.api.IWebParam#isHeader <em>Header</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Header</em>' attribute.
- * @see #isHeader()
- * @generated
- */
- void setHeader(boolean value);
-
- /**
- * @model type="WebParamKind" required="true" many="false"
- */
- WebParamKind getKind();
-
- /**
- * Sets the value of the '{@link org.eclipse.jst.ws.jaxws.dom.runtime.api.IWebParam#getKind <em>Kind</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Kind</em>' attribute.
- * @see org.eclipse.jst.ws.jaxws.dom.runtime.api.WebParamKind
- * @see #getKind()
- * @generated
- */
- void setKind(WebParamKind value);
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/api/IWebService.java b/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/api/IWebService.java
deleted file mode 100755
index 6011fe3..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/api/IWebService.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.dom.runtime.api;
-
-
-/**
- * @model
- * @author Hristo Sabev
- *
- */
-public interface IWebService extends IJavaWebServiceElement
-{
- /**
- * @model suppressedSetVisibility="true" opposite="implementingWebServices" type="IServiceEndpointInterface"
- * @return
- */
- public IServiceEndpointInterface getServiceEndpoint();
-
- /**
- * @model changeable="true" required="true"
- */
- public String getTargetNamespace();
-
- /**
- * Sets the value of the '{@link org.eclipse.jst.ws.jaxws.dom.runtime.api.IWebService#getTargetNamespace <em>Target Namespace</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Target Namespace</em>' attribute.
- * @see #getTargetNamespace()
- * @generated
- */
- void setTargetNamespace(String value);
-
- /**
- * @model changeable="true" required="true"
- */
- public String getPortName();
-
- /**
- * Sets the value of the '{@link org.eclipse.jst.ws.jaxws.dom.runtime.api.IWebService#getPortName <em>Port Name</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Port Name</em>' attribute.
- * @see #getPortName()
- * @generated
- */
- void setPortName(String value);
-
- /**
- * @model changeable="true" suppressedSetVisibility="true"
- */
- public String getWsdlLocation();
-
- /**
- * Sets the value of the '{@link org.eclipse.jst.ws.jaxws.dom.runtime.api.IWebService#getWsdlLocation <em>Wsdl Location</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Wsdl Location</em>' attribute.
- * @see #getWsdlLocation()
- * @generated
- */
- void setWsdlLocation(String value);
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/api/IWebServiceProject.java b/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/api/IWebServiceProject.java
deleted file mode 100755
index b41d5ee..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/api/IWebServiceProject.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.dom.runtime.api;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EObject;
-
-
-/**
- * @model
- * @author Hristo Sabev
- */
-public interface IWebServiceProject extends EObject
-{
- /**
- * @model type="IWebService" suppressedSetVisibility="true" many="true" containment="true"
- * @return
- */
- public EList<IWebService> getWebServices();
-
-
- /**
- * @model type="IServiceEndpointInterface" suppressedSetVisibility="true" many="true" containment="true"
- */
- public EList<IServiceEndpointInterface> getServiceEndpointInterfaces();
-
- /**
- * @model suppressedSetVisibility="true" required="true"
- */
- public String getName();
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/api/IWebType.java b/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/api/IWebType.java
deleted file mode 100755
index 734da97..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/api/IWebType.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.dom.runtime.api;
-
-
-/**
- * @model
- * @author Hristo Sabev
- */
-public interface IWebType extends IJavaWebServiceElement {
-
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/api/IWsDOMRuntimeExtension.java b/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/api/IWsDOMRuntimeExtension.java
deleted file mode 100755
index f2b8050..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/api/IWsDOMRuntimeExtension.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.dom.runtime.api;
-
-import java.io.IOException;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-
-
-/**
- * This interface should be implemented by all runtime which want to have DOM Tree
- * representation on top of them.
- *
- * @author Georgi Hristov I036201
- */
-public interface IWsDOMRuntimeExtension
-{
- /**
- * This method should instantiate the DOM instance for the runtime and loads the
- * data into it. The method locks the workspace root during execution. If you call this
- * method during loading (i.e. somebody already called it in different thread) the method
- * will block until the load finishes instead of triggering DOM reload.
- *
- * @param monitor progress monitor to be used during loading, cancelling the load via monitor is supported
- * @throws IOException in case the DOM loading is not able to read required data
- * @throws WsDOMLoadCanceledException in case the loading was cancelled via provided
- * <code>monitor</code>.
- */
- public void createDOM(IProgressMonitor monitor) throws IOException, WsDOMLoadCanceledException;
-
- /**
- * Adds a load listener to be notified in load events. In case the loading has already been started
- * this listener's methods are called depending on the current state of the load.
- * {@link IWsDomLoadListener#finished()} method is called in any case regardless of whether loading
- * has been cancelled or not.
- * @param listener
- */
- public void addLoadListener(IWsDomLoadListener listener);
-
- /**
- * Removes the listener from DOM loading listeners list
- *
- * @param listener
- */
- public void removeLoadListener(IWsDomLoadListener listener);
-
- /**
- * To get a handle to the DOM instance available for this runtime.
- *
- * @return the DOM instance or <code>null</code> in case the loading was not started yet or
- * is not finished yet.
- * @throws WsDOMLoadCanceledException in case loading has been called already but the load
- * has been cancelled
- */
- public IDOM getDOM() throws WsDOMLoadCanceledException;
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/api/IWsDomLoadListener.java b/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/api/IWsDomLoadListener.java
deleted file mode 100755
index 879b046..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/api/IWsDomLoadListener.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.dom.runtime.api;
-
-
-
-/**
- * Interface to be implemented by interested in DOM load process. Implementors can be added to
- * the {@link IWsDOMRuntimeExtension} to receive notifications on load startup/finish
- *
- * @author Georgi Vachkov
- */
-public interface IWsDomLoadListener
-{
- /**
- * Called by {@link IWsDOMRuntimeExtension} just before the DOM load start
- */
- public void started();
-
- /**
- * Called by {@link IWsDOMRuntimeExtension} when the DOM load has finished
- */
- public void finished();
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/api/SOAPBindingParameterStyle.java b/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/api/SOAPBindingParameterStyle.java
deleted file mode 100755
index 956855f..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/api/SOAPBindingParameterStyle.java
+++ /dev/null
@@ -1,223 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.dom.runtime.api;
-
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.emf.common.util.Enumerator;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the literals of the enumeration '<em><b>SOAP Binding Parameter Style</b></em>',
- * and utility methods for working with them.
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.ws.jaxws.dom.runtime.api.DomPackage#getSOAPBindingParameterStyle()
- * @model
- * @generated
- */
-public enum SOAPBindingParameterStyle implements Enumerator {
- /**
- * The '<em><b>WRAPPED</b></em>' literal object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #WRAPPED_VALUE
- * @generated
- * @ordered
- */
- WRAPPED(0, "WRAPPED", "WRAPPED"), //$NON-NLS-1$ //$NON-NLS-2$
-
- /**
- * The '<em><b>BARE</b></em>' literal object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #BARE_VALUE
- * @generated
- * @ordered
- */
- BARE(1, "BARE", "BARE"); //$NON-NLS-1$ //$NON-NLS-2$
-
- /**
- * The '<em><b>WRAPPED</b></em>' literal value.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of '<em><b>WRAPPED</b></em>' literal object isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- * @see #WRAPPED
- * @model
- * @generated
- * @ordered
- */
- public static final int WRAPPED_VALUE = 0;
-
- /**
- * The '<em><b>BARE</b></em>' literal value.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of '<em><b>BARE</b></em>' literal object isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- * @see #BARE
- * @model
- * @generated
- * @ordered
- */
- public static final int BARE_VALUE = 1;
-
- /**
- * An array of all the '<em><b>SOAP Binding Parameter Style</b></em>' enumerators.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private static final SOAPBindingParameterStyle[] VALUES_ARRAY =
- new SOAPBindingParameterStyle[]
- {
- WRAPPED,
- BARE,
- };
-
- /**
- * A public read-only list of all the '<em><b>SOAP Binding Parameter Style</b></em>' enumerators.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public static final List<SOAPBindingParameterStyle> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
-
- /**
- * Returns the '<em><b>SOAP Binding Parameter Style</b></em>' literal with the specified literal value.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public static SOAPBindingParameterStyle get(String literal) {
- for (int i = 0; i < VALUES_ARRAY.length; ++i)
- {
- SOAPBindingParameterStyle result = VALUES_ARRAY[i];
- if (result.toString().equals(literal))
- {
- return result;
- }
- }
- return null;
- }
-
- /**
- * Returns the '<em><b>SOAP Binding Parameter Style</b></em>' literal with the specified name.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public static SOAPBindingParameterStyle getByName(String name) {
- for (int i = 0; i < VALUES_ARRAY.length; ++i)
- {
- SOAPBindingParameterStyle result = VALUES_ARRAY[i];
- if (result.getName().equals(name))
- {
- return result;
- }
- }
- return null;
- }
-
- /**
- * Returns the '<em><b>SOAP Binding Parameter Style</b></em>' literal with the specified integer value.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public static SOAPBindingParameterStyle get(int value) {
- switch (value)
- {
- case WRAPPED_VALUE: return WRAPPED;
- case BARE_VALUE: return BARE;
- }
- return null;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private final int value;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private final String name;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private final String literal;
-
- /**
- * Only this class can construct instances.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private SOAPBindingParameterStyle(int value, String name, String literal) {
- this.value = value;
- this.name = name;
- this.literal = literal;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public int getValue() {
- return value;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public String getName() {
- return name;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public String getLiteral() {
- return literal;
- }
-
- /**
- * Returns the literal value of the enumerator, which is its string representation.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public String toString() {
- return literal;
- }
-
-} //SOAPBindingParameterStyle
diff --git a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/api/SOAPBindingStyle.java b/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/api/SOAPBindingStyle.java
deleted file mode 100755
index 6082254..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/api/SOAPBindingStyle.java
+++ /dev/null
@@ -1,223 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.dom.runtime.api;
-
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.emf.common.util.Enumerator;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the literals of the enumeration '<em><b>SOAP Binding Style</b></em>',
- * and utility methods for working with them.
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.ws.jaxws.dom.runtime.api.DomPackage#getSOAPBindingStyle()
- * @model
- * @generated
- */
-public enum SOAPBindingStyle implements Enumerator {
- /**
- * The '<em><b>DOCUMENT</b></em>' literal object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #DOCUMENT_VALUE
- * @generated
- * @ordered
- */
- DOCUMENT(0, "DOCUMENT", "DOCUMENT"), //$NON-NLS-1$ //$NON-NLS-2$
-
- /**
- * The '<em><b>RPC</b></em>' literal object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #RPC_VALUE
- * @generated
- * @ordered
- */
- RPC(1, "RPC", "RPC"); //$NON-NLS-1$ //$NON-NLS-2$
-
- /**
- * The '<em><b>DOCUMENT</b></em>' literal value.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of '<em><b>DOCUMENT</b></em>' literal object isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- * @see #DOCUMENT
- * @model
- * @generated
- * @ordered
- */
- public static final int DOCUMENT_VALUE = 0;
-
- /**
- * The '<em><b>RPC</b></em>' literal value.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of '<em><b>RPC</b></em>' literal object isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- * @see #RPC
- * @model
- * @generated
- * @ordered
- */
- public static final int RPC_VALUE = 1;
-
- /**
- * An array of all the '<em><b>SOAP Binding Style</b></em>' enumerators.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private static final SOAPBindingStyle[] VALUES_ARRAY =
- new SOAPBindingStyle[]
- {
- DOCUMENT,
- RPC,
- };
-
- /**
- * A public read-only list of all the '<em><b>SOAP Binding Style</b></em>' enumerators.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public static final List<SOAPBindingStyle> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
-
- /**
- * Returns the '<em><b>SOAP Binding Style</b></em>' literal with the specified literal value.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public static SOAPBindingStyle get(String literal) {
- for (int i = 0; i < VALUES_ARRAY.length; ++i)
- {
- SOAPBindingStyle result = VALUES_ARRAY[i];
- if (result.toString().equals(literal))
- {
- return result;
- }
- }
- return null;
- }
-
- /**
- * Returns the '<em><b>SOAP Binding Style</b></em>' literal with the specified name.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public static SOAPBindingStyle getByName(String name) {
- for (int i = 0; i < VALUES_ARRAY.length; ++i)
- {
- SOAPBindingStyle result = VALUES_ARRAY[i];
- if (result.getName().equals(name))
- {
- return result;
- }
- }
- return null;
- }
-
- /**
- * Returns the '<em><b>SOAP Binding Style</b></em>' literal with the specified integer value.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public static SOAPBindingStyle get(int value) {
- switch (value)
- {
- case DOCUMENT_VALUE: return DOCUMENT;
- case RPC_VALUE: return RPC;
- }
- return null;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private final int value;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private final String name;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private final String literal;
-
- /**
- * Only this class can construct instances.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private SOAPBindingStyle(int value, String name, String literal) {
- this.value = value;
- this.name = name;
- this.literal = literal;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public int getValue() {
- return value;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public String getName() {
- return name;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public String getLiteral() {
- return literal;
- }
-
- /**
- * Returns the literal value of the enumerator, which is its string representation.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public String toString() {
- return literal;
- }
-
-} //SOAPBindingStyle
diff --git a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/api/SOAPBindingUse.java b/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/api/SOAPBindingUse.java
deleted file mode 100755
index b35b180..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/api/SOAPBindingUse.java
+++ /dev/null
@@ -1,223 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.dom.runtime.api;
-
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.emf.common.util.Enumerator;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the literals of the enumeration '<em><b>SOAP Binding Use</b></em>',
- * and utility methods for working with them.
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.ws.jaxws.dom.runtime.api.DomPackage#getSOAPBindingUse()
- * @model
- * @generated
- */
-public enum SOAPBindingUse implements Enumerator {
- /**
- * The '<em><b>LITERAL</b></em>' literal object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #LITERAL_VALUE
- * @generated
- * @ordered
- */
- LITERAL(0, "LITERAL", "LITERAL"), //$NON-NLS-1$ //$NON-NLS-2$
-
- /**
- * The '<em><b>ENCODED</b></em>' literal object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #ENCODED_VALUE
- * @generated
- * @ordered
- */
- ENCODED(1, "ENCODED", "ENCODED"); //$NON-NLS-1$ //$NON-NLS-2$
-
- /**
- * The '<em><b>LITERAL</b></em>' literal value.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of '<em><b>LITERAL</b></em>' literal object isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- * @see #LITERAL
- * @model
- * @generated
- * @ordered
- */
- public static final int LITERAL_VALUE = 0;
-
- /**
- * The '<em><b>ENCODED</b></em>' literal value.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of '<em><b>ENCODED</b></em>' literal object isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- * @see #ENCODED
- * @model
- * @generated
- * @ordered
- */
- public static final int ENCODED_VALUE = 1;
-
- /**
- * An array of all the '<em><b>SOAP Binding Use</b></em>' enumerators.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private static final SOAPBindingUse[] VALUES_ARRAY =
- new SOAPBindingUse[]
- {
- LITERAL,
- ENCODED,
- };
-
- /**
- * A public read-only list of all the '<em><b>SOAP Binding Use</b></em>' enumerators.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public static final List<SOAPBindingUse> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
-
- /**
- * Returns the '<em><b>SOAP Binding Use</b></em>' literal with the specified literal value.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public static SOAPBindingUse get(String literal) {
- for (int i = 0; i < VALUES_ARRAY.length; ++i)
- {
- SOAPBindingUse result = VALUES_ARRAY[i];
- if (result.toString().equals(literal))
- {
- return result;
- }
- }
- return null;
- }
-
- /**
- * Returns the '<em><b>SOAP Binding Use</b></em>' literal with the specified name.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public static SOAPBindingUse getByName(String name) {
- for (int i = 0; i < VALUES_ARRAY.length; ++i)
- {
- SOAPBindingUse result = VALUES_ARRAY[i];
- if (result.getName().equals(name))
- {
- return result;
- }
- }
- return null;
- }
-
- /**
- * Returns the '<em><b>SOAP Binding Use</b></em>' literal with the specified integer value.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public static SOAPBindingUse get(int value) {
- switch (value)
- {
- case LITERAL_VALUE: return LITERAL;
- case ENCODED_VALUE: return ENCODED;
- }
- return null;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private final int value;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private final String name;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private final String literal;
-
- /**
- * Only this class can construct instances.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private SOAPBindingUse(int value, String name, String literal) {
- this.value = value;
- this.name = name;
- this.literal = literal;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public int getValue() {
- return value;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public String getName() {
- return name;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public String getLiteral() {
- return literal;
- }
-
- /**
- * Returns the literal value of the enumerator, which is its string representation.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public String toString() {
- return literal;
- }
-
-} //SOAPBindingUse
diff --git a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/api/WebParamKind.java b/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/api/WebParamKind.java
deleted file mode 100755
index 092643c..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/api/WebParamKind.java
+++ /dev/null
@@ -1,207 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.dom.runtime.api;
-
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-import org.eclipse.emf.common.util.Enumerator;
-
-/**
- * @model
- * @author Hristo Sabev
- *
- */
-public enum WebParamKind implements Enumerator {/**@model*/IN(0, "IN", "IN"), /**@model*/INOUT(1, "INOUT", "INOUT"), /**@model*/OUT(2, "OUT", "OUT"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$
-
-/**
- * The '<em><b>IN</b></em>' literal value.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of '<em><b>IN</b></em>' literal object isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- * @see #IN
- * @model
- * @generated
- * @ordered
- */
- public static final int IN_VALUE = 0;
-/**
- * The '<em><b>INOUT</b></em>' literal value.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of '<em><b>INOUT</b></em>' literal object isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- * @see #INOUT
- * @model
- * @generated
- * @ordered
- */
- public static final int INOUT_VALUE = 1;
-/**
- * The '<em><b>OUT</b></em>' literal value.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of '<em><b>OUT</b></em>' literal object isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- * @see #OUT
- * @model
- * @generated
- * @ordered
- */
- public static final int OUT_VALUE = 2;
-/**
- * An array of all the '<em><b>Web Param Kind</b></em>' enumerators.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private static final WebParamKind[] VALUES_ARRAY =
- new WebParamKind[]
- {
- IN,
- INOUT,
- OUT,
- };
-/**
- * A public read-only list of all the '<em><b>Web Param Kind</b></em>' enumerators.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public static final List<WebParamKind> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
-
-/**
- * Returns the '<em><b>Web Param Kind</b></em>' literal with the specified literal value.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public static WebParamKind get(String literal) {
- for (int i = 0; i < VALUES_ARRAY.length; ++i)
- {
- WebParamKind result = VALUES_ARRAY[i];
- if (result.toString().equals(literal))
- {
- return result;
- }
- }
- return null;
- }
-
-/**
- * Returns the '<em><b>Web Param Kind</b></em>' literal with the specified name.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public static WebParamKind getByName(String name) {
- for (int i = 0; i < VALUES_ARRAY.length; ++i)
- {
- WebParamKind result = VALUES_ARRAY[i];
- if (result.getName().equals(name))
- {
- return result;
- }
- }
- return null;
- }
-
-/**
- * Returns the '<em><b>Web Param Kind</b></em>' literal with the specified integer value.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public static WebParamKind get(int value) {
- switch (value)
- {
- case IN_VALUE: return IN;
- case INOUT_VALUE: return INOUT;
- case OUT_VALUE: return OUT;
- }
- return null;
- }
-
-/**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private final int value;
-/**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private final String name;
-/**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private final String literal;
-
-/**
- * Only this class can construct instances.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private WebParamKind(int value, String name, String literal) {
- this.value = value;
- this.name = name;
- this.literal = literal;
- }
-
-/**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public int getValue() {
- return value;
- }
-
-/**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public String getName() {
- return name;
- }
-
-/**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public String getLiteral() {
- return literal;
- }
-
-/**
- * Returns the literal value of the enumerator, which is its string representation.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public String toString() {
- return literal;
- }}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/api/WsDOMLoadCanceledException.java b/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/api/WsDOMLoadCanceledException.java
deleted file mode 100755
index 671047b..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/api/WsDOMLoadCanceledException.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.dom.runtime.api;
-
-import org.eclipse.jst.ws.jaxws.utils.ContractChecker;
-
-
-/**
- * Exception thrown in case the loading of WS DOM has been cancelled
- *
- * @author Georgi Vachkov
- */
-public class WsDOMLoadCanceledException extends Exception
-{
- private static final long serialVersionUID = 1L;
- private final String localizedMessage;
-
- /**
- * Constructs exception with ability to provide localized message
- * @param message - the detail message (which is saved for later retrieval
- * by the {@link #getMessage()} method)
- * @param localizedMessage - the localized message (which is saved for later retrieval
- * by the {@link #getLocalizedMessage()} method)
- *
- * @throws NullPointerException - in case localised message is null
- * */
- public WsDOMLoadCanceledException(final String message, final String localizedMessage) {
- super(message);
- ContractChecker.nullCheckParam(localizedMessage, "localizedMessage"); //$NON-NLS-1$
- this.localizedMessage = localizedMessage;
- }
-
- /**
- * Returns localized message with which the exception was constructed.*/
- @Override
- public String getLocalizedMessage() {
- return localizedMessage;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/api/WsDOMRuntimeManager.java b/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/api/WsDOMRuntimeManager.java
deleted file mode 100755
index 06d4a6f..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/api/WsDOMRuntimeManager.java
+++ /dev/null
@@ -1,147 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.dom.runtime.api;
-
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.jst.ws.jaxws.dom.runtime.registry.IWsDOMRuntimeInfo;
-import org.eclipse.jst.ws.jaxws.dom.runtime.registry.WsDOMRuntimeRegistry;
-import org.eclipse.jst.ws.jaxws.utils.logging.ILogger;
-import org.eclipse.jst.ws.jaxws.utils.logging.Logger;
-
-/**
- * Factory class for instantiating DOM Runtimes and managing those instances.
- *
- * @author Georgi Hristov
- *
- */
-public class WsDOMRuntimeManager implements IWSDOMRuntimeManager
-{
- private static WsDOMRuntimeManager instance = new WsDOMRuntimeManager();
-
- private Map<String,IWsDOMRuntimeExtension> domRuntimes = new HashMap<String,IWsDOMRuntimeExtension>();
-
- protected WsDOMRuntimeManager()
- {
- // singleton
- }
-
- public static IWSDOMRuntimeManager instance()
- {
- return instance;
- }
-
- /**
- * Instantiates the DOM Runtimes if not already.
- *
- */
- public synchronized void createDOMRuntimes(final IProgressMonitor monitor)
- {
- for (IWsDOMRuntimeInfo runtimeInfo : WsDOMRuntimeRegistry.getRegisteredRuntimesInfo()) {
- createDOMRuntime(runtimeInfo, monitor);
- }
- }
-
- protected IWsDOMRuntimeExtension createDOMRuntime(final IWsDOMRuntimeInfo runtimeInfo, final IProgressMonitor monitor)
- {
- final IWsDOMRuntimeExtension domRuntime = getDOMRuntime(runtimeInfo);
- if (domRuntime == null) {
- return null;
- }
-
- try {
- domRuntime.createDOM(monitor);
- }
- catch (Exception unexpected) {
- logger().logError("Unexpected Exception! Dom from runtime " + runtimeInfo.getName() + " will not be processed!", unexpected); //$NON-NLS-1$ //$NON-NLS-2$
- }
-
- return domRuntime;
- }
-
- /**
- * This method should return the DOM runtime instance corresponding to the descriptor object
- * of type IRuntimeInfo and instantiate such DOM runtime instance if non existent at the
- * moment of invocation of this method.
- *
- * @param runtimeInfo - descriptor of the DOM runtime to be instantiated and returned
- * @return the DOM runtime instance
- */
- public IWsDOMRuntimeExtension getDOMRuntime(final IWsDOMRuntimeInfo runtimeInfo)
- {
- if (runtimeInfo == null) {
- return null;
- }
-
- IWsDOMRuntimeExtension domRuntime = domRuntimes.get(runtimeInfo.getId());
- if (domRuntime == null)
- {
- domRuntime = WsDOMRuntimeRegistry.instantiateRuntime(runtimeInfo);
- if (domRuntime != null) {
- synchronized(domRuntimes) {
- domRuntimes.put(runtimeInfo.getId(), domRuntime);
- }
- }
- }
-
- return domRuntime;
- }
-
- /**
- * This method should return the DOM runtime instance corresponding to the runtime id
- * and instantiate such DOM runtime instance if non existent at the
- * moment of invocation of this method.
- *
- * @param runtimeId - string identifier of the runtime
- * @return the DOM runtime instance
- */
- public IWsDOMRuntimeExtension getDOMRuntime(final String runtimeId)
- {
- return getDOMRuntime(WsDOMRuntimeRegistry.getRuntimeInfo(runtimeId));
- }
-
- /**
- *
- * @return a list of all instantiated DOM Runtimes
- */
- public Collection<IWsDOMRuntimeExtension> getDOMRuntimes()
- {
- if (domRuntimes.size() == 0)
- {
- final Collection<IWsDOMRuntimeInfo> rtInfos = WsDOMRuntimeRegistry.getRegisteredRuntimesInfo();
- for (IWsDOMRuntimeInfo runtimeInfo : rtInfos) {
- getDOMRuntime(runtimeInfo);
- }
- }
-
- return domRuntimes.values();
- }
-
- /**
- * This method should reload all instances of DOM Runtimes.
- *
- */
- public synchronized void reloadDOMRuntimes(final IProgressMonitor monitor)
- {
- synchronized(domRuntimes) {
- domRuntimes = new HashMap<String,IWsDOMRuntimeExtension>();
- }
-
- createDOMRuntimes(monitor);
- }
-
- private ILogger logger() {
- return new Logger();
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/dom.ecore b/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/dom.ecore
deleted file mode 100755
index 0041eda..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/dom.ecore
+++ /dev/null
@@ -1,132 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ecore:EPackage xmi:version="2.0"
- xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="dom"
- nsURI="http:///org/eclipse/jst/ws/jaxws/dom/runtime/dom.ecore" nsPrefix="org.eclipse.jst.ws.jaxws.dom.runtime">
- <eClassifiers xsi:type="ecore:EClass" name="IDOM">
- <eStructuralFeatures xsi:type="ecore:EReference" name="webServiceProjects" upperBound="-1"
- eType="#//IWebServiceProject" containment="true" resolveProxies="false">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="suppressedSetVisibility" value="true"/>
- </eAnnotations>
- </eStructuralFeatures>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="IJavaWebServiceElement">
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="implementation" lowerBound="1"
- eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="suppressedSetVisibility" value="true"/>
- </eAnnotations>
- </eStructuralFeatures>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="IServiceEndpointInterface" eSuperTypes="#//IJavaWebServiceElement">
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="implicit" lowerBound="1"
- eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="suppressedSetVisibility" value="true"/>
- </eAnnotations>
- </eStructuralFeatures>
- <eStructuralFeatures xsi:type="ecore:EReference" name="implementingWebServices"
- lowerBound="1" upperBound="-1" eType="#//IWebService" eOpposite="#//IWebService/serviceEndpoint">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="suppressedSetVisibility" value="true"/>
- </eAnnotations>
- </eStructuralFeatures>
- <eStructuralFeatures xsi:type="ecore:EReference" name="webMethods" lowerBound="1"
- upperBound="-1" eType="#//IWebMethod" containment="true" resolveProxies="false">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="suppressedSetVisibility" value="true"/>
- </eAnnotations>
- </eStructuralFeatures>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="targetNamespace" lowerBound="1"
- eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="soapBindingStyle" lowerBound="1"
- eType="#//SOAPBindingStyle" defaultValueLiteral="DOCUMENT"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="soapBindingUse" lowerBound="1"
- eType="#//SOAPBindingUse" defaultValueLiteral="LITERAL"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="soapBindingParameterStyle"
- lowerBound="1" eType="#//SOAPBindingParameterStyle" defaultValueLiteral="WRAPPED"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="IWebMethod" eSuperTypes="#//IJavaWebServiceElement">
- <eStructuralFeatures xsi:type="ecore:EReference" name="parameters" lowerBound="1"
- upperBound="-1" eType="#//IWebParam" containment="true" resolveProxies="false">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="suppressedSetVisibility" value="true"/>
- </eAnnotations>
- </eStructuralFeatures>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="excluded" lowerBound="1"
- eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="soapBindingStyle" lowerBound="1"
- eType="#//SOAPBindingStyle" defaultValueLiteral="DOCUMENT"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="soapBindingUse" lowerBound="1"
- eType="#//SOAPBindingUse" defaultValueLiteral="LITERAL"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="soapBindingParameterStyle"
- lowerBound="1" eType="#//SOAPBindingParameterStyle" defaultValueLiteral="WRAPPED"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="IWebParam" eSuperTypes="#//IJavaWebServiceElement">
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="kind" lowerBound="1" eType="#//WebParamKind"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="typeName" lowerBound="1"
- eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="suppressedSetVisibility" value="true"/>
- </eAnnotations>
- </eStructuralFeatures>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="partName" lowerBound="1"
- eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="targetNamespace" lowerBound="1"
- eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="header" lowerBound="1"
- eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean" defaultValueLiteral="false"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="IWebService" eSuperTypes="#//IJavaWebServiceElement">
- <eStructuralFeatures xsi:type="ecore:EReference" name="serviceEndpoint" eType="#//IServiceEndpointInterface"
- eOpposite="#//IServiceEndpointInterface/implementingWebServices">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="suppressedSetVisibility" value="true"/>
- </eAnnotations>
- </eStructuralFeatures>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="targetNamespace" lowerBound="1"
- eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="portName" lowerBound="1"
- eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="wsdlLocation" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="IWebServiceProject">
- <eStructuralFeatures xsi:type="ecore:EReference" name="webServices" upperBound="-1"
- eType="#//IWebService" containment="true" resolveProxies="false">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="suppressedSetVisibility" value="true"/>
- </eAnnotations>
- </eStructuralFeatures>
- <eStructuralFeatures xsi:type="ecore:EReference" name="serviceEndpointInterfaces"
- upperBound="-1" eType="#//IServiceEndpointInterface" containment="true" resolveProxies="false">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="suppressedSetVisibility" value="true"/>
- </eAnnotations>
- </eStructuralFeatures>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="suppressedSetVisibility" value="true"/>
- </eAnnotations>
- </eStructuralFeatures>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="IWebType" eSuperTypes="#//IJavaWebServiceElement"/>
- <eClassifiers xsi:type="ecore:EEnum" name="WebParamKind">
- <eLiterals name="IN"/>
- <eLiterals name="INOUT" value="1"/>
- <eLiterals name="OUT" value="2"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EEnum" name="SOAPBindingStyle">
- <eLiterals name="DOCUMENT" literal="DOCUMENT"/>
- <eLiterals name="RPC" value="1"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EEnum" name="SOAPBindingUse">
- <eLiterals name="LITERAL"/>
- <eLiterals name="ENCODED" value="1"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EEnum" name="SOAPBindingParameterStyle">
- <eLiterals name="WRAPPED"/>
- <eLiterals name="BARE" value="1"/>
- </eClassifiers>
-</ecore:EPackage>
diff --git a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/dom.ws.genmodel b/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/dom.ws.genmodel
deleted file mode 100755
index b4269ab..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/dom.ws.genmodel
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<genmodel:GenModel xmi:version="2.0"
- xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
- xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="org.eclipse.jst.ws.jaxws.dom.runtime/src"
- editDirectory="org.eclipse.jst.ws.jaxws.dom.ui/src" editorDirectory="org.eclipse.jst.ws.jaxws.dom.runtime.editor/src"
- modelPluginID="org.eclipse.jst.ws.jaxws.dom.runtime" modelName="Dom" editPluginClass="org.eclipse.jst.ws.jaxws.dom.ui.internal.plugin.DomUi"
- editorPluginClass="org.eclipse.jst.ws.jaxws.dom.ui.navigator.generated.DomEditorPlugin"
- nonNLSMarkers="true" testsDirectory="org.eclipse.jst.ws.jaxws.dom.runtime.tests/src"
- importerID="org.eclipse.emf.importer.java" complianceLevel="5.0" copyrightFields="false"
- providerRootExtendsClass="">
- <foreignModel>@model</foreignModel>
- <genPackages prefix="Dom" basePackage="org.eclipse.jst.ws.jaxws" disposableProviderFactory="true"
- interfacePackageSuffix="runtime.api" metaDataPackageSuffix="runtime.api" classPackageSuffix="runtime.internal.impl"
- utilityPackageSuffix="runtime.util" providerPackageSuffix="ui" generateExampleClass="false"
- ecorePackage="dom.ecore#/">
- <genEnums typeSafeEnumCompatible="false" ecoreEnum="dom.ecore#//WebParamKind">
- <genEnumLiterals ecoreEnumLiteral="dom.ecore#//WebParamKind/IN"/>
- <genEnumLiterals ecoreEnumLiteral="dom.ecore#//WebParamKind/INOUT"/>
- <genEnumLiterals ecoreEnumLiteral="dom.ecore#//WebParamKind/OUT"/>
- </genEnums>
- <genEnums typeSafeEnumCompatible="false" ecoreEnum="dom.ecore#//SOAPBindingStyle">
- <genEnumLiterals ecoreEnumLiteral="dom.ecore#//SOAPBindingStyle/DOCUMENT"/>
- <genEnumLiterals ecoreEnumLiteral="dom.ecore#//SOAPBindingStyle/RPC"/>
- </genEnums>
- <genEnums typeSafeEnumCompatible="false" ecoreEnum="dom.ecore#//SOAPBindingUse">
- <genEnumLiterals ecoreEnumLiteral="dom.ecore#//SOAPBindingUse/LITERAL"/>
- <genEnumLiterals ecoreEnumLiteral="dom.ecore#//SOAPBindingUse/ENCODED"/>
- </genEnums>
- <genEnums typeSafeEnumCompatible="false" ecoreEnum="dom.ecore#//SOAPBindingParameterStyle">
- <genEnumLiterals ecoreEnumLiteral="dom.ecore#//SOAPBindingParameterStyle/WRAPPED"/>
- <genEnumLiterals ecoreEnumLiteral="dom.ecore#//SOAPBindingParameterStyle/BARE"/>
- </genEnums>
- <genClasses ecoreClass="dom.ecore#//IDOM">
- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference dom.ecore#//IDOM/webServiceProjects"/>
- </genClasses>
- <genClasses ecoreClass="dom.ecore#//IJavaWebServiceElement">
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute dom.ecore#//IJavaWebServiceElement/implementation"/>
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute dom.ecore#//IJavaWebServiceElement/name"/>
- </genClasses>
- <genClasses ecoreClass="dom.ecore#//IServiceEndpointInterface">
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute dom.ecore#//IServiceEndpointInterface/implicit"/>
- <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference dom.ecore#//IServiceEndpointInterface/implementingWebServices"/>
- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference dom.ecore#//IServiceEndpointInterface/webMethods"/>
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute dom.ecore#//IServiceEndpointInterface/targetNamespace"/>
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute dom.ecore#//IServiceEndpointInterface/soapBindingStyle"/>
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute dom.ecore#//IServiceEndpointInterface/soapBindingUse"/>
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute dom.ecore#//IServiceEndpointInterface/soapBindingParameterStyle"/>
- </genClasses>
- <genClasses ecoreClass="dom.ecore#//IWebMethod">
- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference dom.ecore#//IWebMethod/parameters"/>
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute dom.ecore#//IWebMethod/excluded"/>
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute dom.ecore#//IWebMethod/soapBindingStyle"/>
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute dom.ecore#//IWebMethod/soapBindingUse"/>
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute dom.ecore#//IWebMethod/soapBindingParameterStyle"/>
- </genClasses>
- <genClasses ecoreClass="dom.ecore#//IWebParam">
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute dom.ecore#//IWebParam/kind"/>
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute dom.ecore#//IWebParam/typeName"/>
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute dom.ecore#//IWebParam/partName"/>
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute dom.ecore#//IWebParam/targetNamespace"/>
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute dom.ecore#//IWebParam/header"/>
- </genClasses>
- <genClasses ecoreClass="dom.ecore#//IWebService">
- <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference dom.ecore#//IWebService/serviceEndpoint"/>
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute dom.ecore#//IWebService/targetNamespace"/>
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute dom.ecore#//IWebService/portName"/>
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute dom.ecore#//IWebService/wsdlLocation"/>
- </genClasses>
- <genClasses ecoreClass="dom.ecore#//IWebServiceProject">
- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference dom.ecore#//IWebServiceProject/webServices"/>
- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference dom.ecore#//IWebServiceProject/serviceEndpointInterfaces"/>
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute dom.ecore#//IWebServiceProject/name"/>
- </genClasses>
- <genClasses ecoreClass="dom.ecore#//IWebType"/>
- </genPackages>
-</genmodel:GenModel>
diff --git a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/internal/impl/DomFactoryImpl.java b/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/internal/impl/DomFactoryImpl.java
deleted file mode 100755
index 91d3a74..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/internal/impl/DomFactoryImpl.java
+++ /dev/null
@@ -1,320 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.dom.runtime.internal.impl;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EDataType;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.impl.EFactoryImpl;
-import org.eclipse.emf.ecore.plugin.EcorePlugin;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.DomFactory;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.DomPackage;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.IDOM;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.IJavaWebServiceElement;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.IServiceEndpointInterface;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.IWebMethod;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.IWebParam;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.IWebService;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.IWebServiceProject;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.IWebType;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.SOAPBindingParameterStyle;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.SOAPBindingStyle;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.SOAPBindingUse;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.WebParamKind;
-
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model <b>Factory</b>.
- * <!-- end-user-doc -->
- * @generated
- */
-public class DomFactoryImpl extends EFactoryImpl implements DomFactory {
- /**
- * Creates the default factory implementation.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public static DomFactory init() {
- try
- {
- DomFactory theDomFactory = (DomFactory)EPackage.Registry.INSTANCE.getEFactory("http:///org/eclipse/jst/ws/jaxws/dom/runtime/dom.ecore"); //$NON-NLS-1$
- if (theDomFactory != null)
- {
- return theDomFactory;
- }
- }
- catch (Exception exception)
- {
- EcorePlugin.INSTANCE.log(exception);
- }
- return new DomFactoryImpl();
- }
-
- /**
- * Creates an instance of the factory.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public DomFactoryImpl() {
- super();
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public EObject create(EClass eClass) {
- switch (eClass.getClassifierID())
- {
- case DomPackage.IDOM: return createIDOM();
- case DomPackage.IJAVA_WEB_SERVICE_ELEMENT: return createIJavaWebServiceElement();
- case DomPackage.ISERVICE_ENDPOINT_INTERFACE: return createIServiceEndpointInterface();
- case DomPackage.IWEB_METHOD: return createIWebMethod();
- case DomPackage.IWEB_PARAM: return createIWebParam();
- case DomPackage.IWEB_SERVICE: return createIWebService();
- case DomPackage.IWEB_SERVICE_PROJECT: return createIWebServiceProject();
- case DomPackage.IWEB_TYPE: return createIWebType();
- default:
- throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$
- }
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public Object createFromString(EDataType eDataType, String initialValue) {
- switch (eDataType.getClassifierID())
- {
- case DomPackage.WEB_PARAM_KIND:
- return createWebParamKindFromString(eDataType, initialValue);
- case DomPackage.SOAP_BINDING_STYLE:
- return createSOAPBindingStyleFromString(eDataType, initialValue);
- case DomPackage.SOAP_BINDING_USE:
- return createSOAPBindingUseFromString(eDataType, initialValue);
- case DomPackage.SOAP_BINDING_PARAMETER_STYLE:
- return createSOAPBindingParameterStyleFromString(eDataType, initialValue);
- default:
- throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$
- }
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public String convertToString(EDataType eDataType, Object instanceValue) {
- switch (eDataType.getClassifierID())
- {
- case DomPackage.WEB_PARAM_KIND:
- return convertWebParamKindToString(eDataType, instanceValue);
- case DomPackage.SOAP_BINDING_STYLE:
- return convertSOAPBindingStyleToString(eDataType, instanceValue);
- case DomPackage.SOAP_BINDING_USE:
- return convertSOAPBindingUseToString(eDataType, instanceValue);
- case DomPackage.SOAP_BINDING_PARAMETER_STYLE:
- return convertSOAPBindingParameterStyleToString(eDataType, instanceValue);
- default:
- throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$
- }
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public IDOM createIDOM() {
- IDOMImpl idom = new IDOMImpl();
- return idom;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public IJavaWebServiceElement createIJavaWebServiceElement() {
- IJavaWebServiceElementImpl iJavaWebServiceElement = new IJavaWebServiceElementImpl();
- return iJavaWebServiceElement;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public IServiceEndpointInterface createIServiceEndpointInterface() {
- IServiceEndpointInterfaceImpl iServiceEndpointInterface = new IServiceEndpointInterfaceImpl();
- return iServiceEndpointInterface;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public IWebMethod createIWebMethod() {
- IWebMethodImpl iWebMethod = new IWebMethodImpl();
- return iWebMethod;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public IWebParam createIWebParam() {
- IWebParamImpl iWebParam = new IWebParamImpl();
- return iWebParam;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public IWebService createIWebService() {
- IWebServiceImpl iWebService = new IWebServiceImpl();
- return iWebService;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public IWebServiceProject createIWebServiceProject() {
- IWebServiceProjectImpl iWebServiceProject = new IWebServiceProjectImpl();
- return iWebServiceProject;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public IWebType createIWebType() {
- IWebTypeImpl iWebType = new IWebTypeImpl();
- return iWebType;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public WebParamKind createWebParamKindFromString(EDataType eDataType, String initialValue) {
- WebParamKind result = WebParamKind.get(initialValue);
- if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- return result;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public String convertWebParamKindToString(EDataType eDataType, Object instanceValue) {
- return instanceValue == null ? null : instanceValue.toString();
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public SOAPBindingStyle createSOAPBindingStyleFromString(EDataType eDataType, String initialValue) {
- SOAPBindingStyle result = SOAPBindingStyle.get(initialValue);
- if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- return result;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public String convertSOAPBindingStyleToString(EDataType eDataType, Object instanceValue) {
- return instanceValue == null ? null : instanceValue.toString();
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public SOAPBindingUse createSOAPBindingUseFromString(EDataType eDataType, String initialValue) {
- SOAPBindingUse result = SOAPBindingUse.get(initialValue);
- if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- return result;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public String convertSOAPBindingUseToString(EDataType eDataType, Object instanceValue) {
- return instanceValue == null ? null : instanceValue.toString();
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public SOAPBindingParameterStyle createSOAPBindingParameterStyleFromString(EDataType eDataType, String initialValue) {
- SOAPBindingParameterStyle result = SOAPBindingParameterStyle.get(initialValue);
- if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- return result;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public String convertSOAPBindingParameterStyleToString(EDataType eDataType, Object instanceValue) {
- return instanceValue == null ? null : instanceValue.toString();
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public DomPackage getDomPackage() {
- return (DomPackage)getEPackage();
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @deprecated
- * @generated
- */
- @Deprecated
- public static DomPackage getPackage() {
- return DomPackage.eINSTANCE;
- }
-
-} //DomFactoryImpl
diff --git a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/internal/impl/DomPackageImpl.java b/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/internal/impl/DomPackageImpl.java
deleted file mode 100755
index 79588a7..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/internal/impl/DomPackageImpl.java
+++ /dev/null
@@ -1,722 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.dom.runtime.internal.impl;
-
-
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EEnum;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.ecore.impl.EPackageImpl;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.DomFactory;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.DomPackage;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.IJavaWebServiceElement;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.IServiceEndpointInterface;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.IWebMethod;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.IWebParam;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.IWebService;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.IWebServiceProject;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.IWebType;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.SOAPBindingParameterStyle;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.SOAPBindingStyle;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.SOAPBindingUse;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.WebParamKind;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model <b>Package</b>.
- * <!-- end-user-doc -->
- * @generated
- */
-public class DomPackageImpl extends EPackageImpl implements DomPackage {
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private EClass idomEClass = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private EClass iJavaWebServiceElementEClass = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private EClass iServiceEndpointInterfaceEClass = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private EClass iWebMethodEClass = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private EClass iWebParamEClass = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private EClass iWebServiceEClass = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private EClass iWebServiceProjectEClass = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private EClass iWebTypeEClass = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private EEnum webParamKindEEnum = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private EEnum soapBindingStyleEEnum = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private EEnum soapBindingUseEEnum = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private EEnum soapBindingParameterStyleEEnum = null;
-
- /**
- * Creates an instance of the model <b>Package</b>, registered with
- * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package
- * package URI value.
- * <p>Note: the correct way to create the package is via the static
- * factory method {@link #init init()}, which also performs
- * initialization of the package, or returns the registered package,
- * if one already exists.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.emf.ecore.EPackage.Registry
- * @see org.eclipse.jst.ws.jaxws.dom.runtime.api.DomPackage#eNS_URI
- * @see #init()
- * @generated
- */
- private DomPackageImpl() {
- super(eNS_URI, DomFactory.eINSTANCE);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private static boolean isInited = false;
-
- /**
- * Creates, registers, and initializes the <b>Package</b> for this
- * model, and for any others upon which it depends. Simple
- * dependencies are satisfied by calling this method on all
- * dependent packages before doing anything else. This method drives
- * initialization for interdependent packages directly, in parallel
- * with this package, itself.
- * <p>Of this package and its interdependencies, all packages which
- * have not yet been registered by their URI values are first created
- * and registered. The packages are then initialized in two steps:
- * meta-model objects for all of the packages are created before any
- * are initialized, since one package's meta-model objects may refer to
- * those of another.
- * <p>Invocation of this method will not affect any packages that have
- * already been initialized.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #eNS_URI
- * @see #createPackageContents()
- * @see #initializePackageContents()
- * @generated
- */
- public static DomPackage init() {
- if (isInited) return (DomPackage)EPackage.Registry.INSTANCE.getEPackage(DomPackage.eNS_URI);
-
- // Obtain or create and register package
- DomPackageImpl theDomPackage = (DomPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(eNS_URI) instanceof DomPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(eNS_URI) : new DomPackageImpl());
-
- isInited = true;
-
- // Create package meta-data objects
- theDomPackage.createPackageContents();
-
- // Initialize created meta-data
- theDomPackage.initializePackageContents();
-
- // Mark meta-data to indicate it can't be changed
- theDomPackage.freeze();
-
- return theDomPackage;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EClass getIDOM() {
- return idomEClass;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EReference getIDOM_WebServiceProjects() {
- return (EReference)idomEClass.getEStructuralFeatures().get(0);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EClass getIJavaWebServiceElement() {
- return iJavaWebServiceElementEClass;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EAttribute getIJavaWebServiceElement_Implementation() {
- return (EAttribute)iJavaWebServiceElementEClass.getEStructuralFeatures().get(0);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EAttribute getIJavaWebServiceElement_Name() {
- return (EAttribute)iJavaWebServiceElementEClass.getEStructuralFeatures().get(1);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EClass getIServiceEndpointInterface() {
- return iServiceEndpointInterfaceEClass;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EAttribute getIServiceEndpointInterface_Implicit() {
- return (EAttribute)iServiceEndpointInterfaceEClass.getEStructuralFeatures().get(0);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EReference getIServiceEndpointInterface_ImplementingWebServices() {
- return (EReference)iServiceEndpointInterfaceEClass.getEStructuralFeatures().get(1);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EReference getIServiceEndpointInterface_WebMethods() {
- return (EReference)iServiceEndpointInterfaceEClass.getEStructuralFeatures().get(2);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EAttribute getIServiceEndpointInterface_TargetNamespace() {
- return (EAttribute)iServiceEndpointInterfaceEClass.getEStructuralFeatures().get(3);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EAttribute getIServiceEndpointInterface_SoapBindingStyle() {
- return (EAttribute)iServiceEndpointInterfaceEClass.getEStructuralFeatures().get(4);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EAttribute getIServiceEndpointInterface_SoapBindingUse() {
- return (EAttribute)iServiceEndpointInterfaceEClass.getEStructuralFeatures().get(5);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EAttribute getIServiceEndpointInterface_SoapBindingParameterStyle() {
- return (EAttribute)iServiceEndpointInterfaceEClass.getEStructuralFeatures().get(6);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EClass getIWebMethod() {
- return iWebMethodEClass;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EReference getIWebMethod_Parameters() {
- return (EReference)iWebMethodEClass.getEStructuralFeatures().get(0);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EAttribute getIWebMethod_Excluded() {
- return (EAttribute)iWebMethodEClass.getEStructuralFeatures().get(1);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EAttribute getIWebMethod_SoapBindingStyle() {
- return (EAttribute)iWebMethodEClass.getEStructuralFeatures().get(2);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EAttribute getIWebMethod_SoapBindingUse() {
- return (EAttribute)iWebMethodEClass.getEStructuralFeatures().get(3);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EAttribute getIWebMethod_SoapBindingParameterStyle() {
- return (EAttribute)iWebMethodEClass.getEStructuralFeatures().get(4);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EClass getIWebParam() {
- return iWebParamEClass;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EAttribute getIWebParam_Kind() {
- return (EAttribute)iWebParamEClass.getEStructuralFeatures().get(0);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EAttribute getIWebParam_TypeName() {
- return (EAttribute)iWebParamEClass.getEStructuralFeatures().get(1);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EAttribute getIWebParam_PartName() {
- return (EAttribute)iWebParamEClass.getEStructuralFeatures().get(2);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EAttribute getIWebParam_TargetNamespace() {
- return (EAttribute)iWebParamEClass.getEStructuralFeatures().get(3);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EAttribute getIWebParam_Header() {
- return (EAttribute)iWebParamEClass.getEStructuralFeatures().get(4);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EClass getIWebService() {
- return iWebServiceEClass;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EReference getIWebService_ServiceEndpoint() {
- return (EReference)iWebServiceEClass.getEStructuralFeatures().get(0);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EAttribute getIWebService_TargetNamespace() {
- return (EAttribute)iWebServiceEClass.getEStructuralFeatures().get(1);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EAttribute getIWebService_PortName() {
- return (EAttribute)iWebServiceEClass.getEStructuralFeatures().get(2);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EAttribute getIWebService_WsdlLocation() {
- return (EAttribute)iWebServiceEClass.getEStructuralFeatures().get(3);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EClass getIWebServiceProject() {
- return iWebServiceProjectEClass;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EReference getIWebServiceProject_WebServices() {
- return (EReference)iWebServiceProjectEClass.getEStructuralFeatures().get(0);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EReference getIWebServiceProject_ServiceEndpointInterfaces() {
- return (EReference)iWebServiceProjectEClass.getEStructuralFeatures().get(1);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EAttribute getIWebServiceProject_Name() {
- return (EAttribute)iWebServiceProjectEClass.getEStructuralFeatures().get(2);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EClass getIWebType() {
- return iWebTypeEClass;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EEnum getWebParamKind() {
- return webParamKindEEnum;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EEnum getSOAPBindingStyle() {
- return soapBindingStyleEEnum;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EEnum getSOAPBindingUse() {
- return soapBindingUseEEnum;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EEnum getSOAPBindingParameterStyle() {
- return soapBindingParameterStyleEEnum;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public DomFactory getDomFactory() {
- return (DomFactory)getEFactoryInstance();
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private boolean isCreated = false;
-
- /**
- * Creates the meta-model objects for the package. This method is
- * guarded to have no affect on any invocation but its first.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void createPackageContents() {
- if (isCreated) return;
- isCreated = true;
-
- // Create classes and their features
- idomEClass = createEClass(IDOM);
- createEReference(idomEClass, IDOM__WEB_SERVICE_PROJECTS);
-
- iJavaWebServiceElementEClass = createEClass(IJAVA_WEB_SERVICE_ELEMENT);
- createEAttribute(iJavaWebServiceElementEClass, IJAVA_WEB_SERVICE_ELEMENT__IMPLEMENTATION);
- createEAttribute(iJavaWebServiceElementEClass, IJAVA_WEB_SERVICE_ELEMENT__NAME);
-
- iServiceEndpointInterfaceEClass = createEClass(ISERVICE_ENDPOINT_INTERFACE);
- createEAttribute(iServiceEndpointInterfaceEClass, ISERVICE_ENDPOINT_INTERFACE__IMPLICIT);
- createEReference(iServiceEndpointInterfaceEClass, ISERVICE_ENDPOINT_INTERFACE__IMPLEMENTING_WEB_SERVICES);
- createEReference(iServiceEndpointInterfaceEClass, ISERVICE_ENDPOINT_INTERFACE__WEB_METHODS);
- createEAttribute(iServiceEndpointInterfaceEClass, ISERVICE_ENDPOINT_INTERFACE__TARGET_NAMESPACE);
- createEAttribute(iServiceEndpointInterfaceEClass, ISERVICE_ENDPOINT_INTERFACE__SOAP_BINDING_STYLE);
- createEAttribute(iServiceEndpointInterfaceEClass, ISERVICE_ENDPOINT_INTERFACE__SOAP_BINDING_USE);
- createEAttribute(iServiceEndpointInterfaceEClass, ISERVICE_ENDPOINT_INTERFACE__SOAP_BINDING_PARAMETER_STYLE);
-
- iWebMethodEClass = createEClass(IWEB_METHOD);
- createEReference(iWebMethodEClass, IWEB_METHOD__PARAMETERS);
- createEAttribute(iWebMethodEClass, IWEB_METHOD__EXCLUDED);
- createEAttribute(iWebMethodEClass, IWEB_METHOD__SOAP_BINDING_STYLE);
- createEAttribute(iWebMethodEClass, IWEB_METHOD__SOAP_BINDING_USE);
- createEAttribute(iWebMethodEClass, IWEB_METHOD__SOAP_BINDING_PARAMETER_STYLE);
-
- iWebParamEClass = createEClass(IWEB_PARAM);
- createEAttribute(iWebParamEClass, IWEB_PARAM__KIND);
- createEAttribute(iWebParamEClass, IWEB_PARAM__TYPE_NAME);
- createEAttribute(iWebParamEClass, IWEB_PARAM__PART_NAME);
- createEAttribute(iWebParamEClass, IWEB_PARAM__TARGET_NAMESPACE);
- createEAttribute(iWebParamEClass, IWEB_PARAM__HEADER);
-
- iWebServiceEClass = createEClass(IWEB_SERVICE);
- createEReference(iWebServiceEClass, IWEB_SERVICE__SERVICE_ENDPOINT);
- createEAttribute(iWebServiceEClass, IWEB_SERVICE__TARGET_NAMESPACE);
- createEAttribute(iWebServiceEClass, IWEB_SERVICE__PORT_NAME);
- createEAttribute(iWebServiceEClass, IWEB_SERVICE__WSDL_LOCATION);
-
- iWebServiceProjectEClass = createEClass(IWEB_SERVICE_PROJECT);
- createEReference(iWebServiceProjectEClass, IWEB_SERVICE_PROJECT__WEB_SERVICES);
- createEReference(iWebServiceProjectEClass, IWEB_SERVICE_PROJECT__SERVICE_ENDPOINT_INTERFACES);
- createEAttribute(iWebServiceProjectEClass, IWEB_SERVICE_PROJECT__NAME);
-
- iWebTypeEClass = createEClass(IWEB_TYPE);
-
- // Create enums
- webParamKindEEnum = createEEnum(WEB_PARAM_KIND);
- soapBindingStyleEEnum = createEEnum(SOAP_BINDING_STYLE);
- soapBindingUseEEnum = createEEnum(SOAP_BINDING_USE);
- soapBindingParameterStyleEEnum = createEEnum(SOAP_BINDING_PARAMETER_STYLE);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private boolean isInitialized = false;
-
- /**
- * Complete the initialization of the package and its meta-model. This
- * method is guarded to have no affect on any invocation but its first.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void initializePackageContents() {
- if (isInitialized) return;
- isInitialized = true;
-
- // Initialize package
- setName(eNAME);
- setNsPrefix(eNS_PREFIX);
- setNsURI(eNS_URI);
-
- // Create type parameters
-
- // Set bounds for type parameters
-
- // Add supertypes to classes
- iServiceEndpointInterfaceEClass.getESuperTypes().add(this.getIJavaWebServiceElement());
- iWebMethodEClass.getESuperTypes().add(this.getIJavaWebServiceElement());
- iWebParamEClass.getESuperTypes().add(this.getIJavaWebServiceElement());
- iWebServiceEClass.getESuperTypes().add(this.getIJavaWebServiceElement());
- iWebTypeEClass.getESuperTypes().add(this.getIJavaWebServiceElement());
-
- // Initialize classes and features; add operations and parameters
- initEClass(idomEClass, org.eclipse.jst.ws.jaxws.dom.runtime.api.IDOM.class, "IDOM", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEReference(getIDOM_WebServiceProjects(), this.getIWebServiceProject(), null, "webServiceProjects", null, 0, -1, org.eclipse.jst.ws.jaxws.dom.runtime.api.IDOM.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
- initEClass(iJavaWebServiceElementEClass, IJavaWebServiceElement.class, "IJavaWebServiceElement", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEAttribute(getIJavaWebServiceElement_Implementation(), ecorePackage.getEString(), "implementation", null, 1, 1, IJavaWebServiceElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getIJavaWebServiceElement_Name(), ecorePackage.getEString(), "name", null, 1, 1, IJavaWebServiceElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
- initEClass(iServiceEndpointInterfaceEClass, IServiceEndpointInterface.class, "IServiceEndpointInterface", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEAttribute(getIServiceEndpointInterface_Implicit(), ecorePackage.getEBoolean(), "implicit", null, 1, 1, IServiceEndpointInterface.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getIServiceEndpointInterface_ImplementingWebServices(), this.getIWebService(), this.getIWebService_ServiceEndpoint(), "implementingWebServices", null, 1, -1, IServiceEndpointInterface.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getIServiceEndpointInterface_WebMethods(), this.getIWebMethod(), null, "webMethods", null, 1, -1, IServiceEndpointInterface.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getIServiceEndpointInterface_TargetNamespace(), ecorePackage.getEString(), "targetNamespace", null, 1, 1, IServiceEndpointInterface.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getIServiceEndpointInterface_SoapBindingStyle(), this.getSOAPBindingStyle(), "soapBindingStyle", "DOCUMENT", 1, 1, IServiceEndpointInterface.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
- initEAttribute(getIServiceEndpointInterface_SoapBindingUse(), this.getSOAPBindingUse(), "soapBindingUse", "LITERAL", 1, 1, IServiceEndpointInterface.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
- initEAttribute(getIServiceEndpointInterface_SoapBindingParameterStyle(), this.getSOAPBindingParameterStyle(), "soapBindingParameterStyle", "WRAPPED", 1, 1, IServiceEndpointInterface.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
-
- initEClass(iWebMethodEClass, IWebMethod.class, "IWebMethod", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEReference(getIWebMethod_Parameters(), this.getIWebParam(), null, "parameters", null, 1, -1, IWebMethod.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getIWebMethod_Excluded(), ecorePackage.getEBoolean(), "excluded", null, 1, 1, IWebMethod.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getIWebMethod_SoapBindingStyle(), this.getSOAPBindingStyle(), "soapBindingStyle", "DOCUMENT", 1, 1, IWebMethod.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
- initEAttribute(getIWebMethod_SoapBindingUse(), this.getSOAPBindingUse(), "soapBindingUse", "LITERAL", 1, 1, IWebMethod.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
- initEAttribute(getIWebMethod_SoapBindingParameterStyle(), this.getSOAPBindingParameterStyle(), "soapBindingParameterStyle", "WRAPPED", 1, 1, IWebMethod.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
-
- initEClass(iWebParamEClass, IWebParam.class, "IWebParam", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEAttribute(getIWebParam_Kind(), this.getWebParamKind(), "kind", null, 1, 1, IWebParam.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getIWebParam_TypeName(), ecorePackage.getEString(), "typeName", null, 1, 1, IWebParam.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getIWebParam_PartName(), ecorePackage.getEString(), "partName", null, 1, 1, IWebParam.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getIWebParam_TargetNamespace(), ecorePackage.getEString(), "targetNamespace", null, 1, 1, IWebParam.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getIWebParam_Header(), ecorePackage.getEBoolean(), "header", "false", 1, 1, IWebParam.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
-
- initEClass(iWebServiceEClass, IWebService.class, "IWebService", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEReference(getIWebService_ServiceEndpoint(), this.getIServiceEndpointInterface(), this.getIServiceEndpointInterface_ImplementingWebServices(), "serviceEndpoint", null, 0, 1, IWebService.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getIWebService_TargetNamespace(), ecorePackage.getEString(), "targetNamespace", null, 1, 1, IWebService.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getIWebService_PortName(), ecorePackage.getEString(), "portName", null, 1, 1, IWebService.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getIWebService_WsdlLocation(), ecorePackage.getEString(), "wsdlLocation", null, 0, 1, IWebService.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
- initEClass(iWebServiceProjectEClass, IWebServiceProject.class, "IWebServiceProject", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEReference(getIWebServiceProject_WebServices(), this.getIWebService(), null, "webServices", null, 0, -1, IWebServiceProject.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getIWebServiceProject_ServiceEndpointInterfaces(), this.getIServiceEndpointInterface(), null, "serviceEndpointInterfaces", null, 0, -1, IWebServiceProject.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getIWebServiceProject_Name(), ecorePackage.getEString(), "name", null, 1, 1, IWebServiceProject.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
- initEClass(iWebTypeEClass, IWebType.class, "IWebType", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-
- // Initialize enums and add enum literals
- initEEnum(webParamKindEEnum, WebParamKind.class, "WebParamKind"); //$NON-NLS-1$
- addEEnumLiteral(webParamKindEEnum, WebParamKind.IN);
- addEEnumLiteral(webParamKindEEnum, WebParamKind.INOUT);
- addEEnumLiteral(webParamKindEEnum, WebParamKind.OUT);
-
- initEEnum(soapBindingStyleEEnum, SOAPBindingStyle.class, "SOAPBindingStyle"); //$NON-NLS-1$
- addEEnumLiteral(soapBindingStyleEEnum, SOAPBindingStyle.DOCUMENT);
- addEEnumLiteral(soapBindingStyleEEnum, SOAPBindingStyle.RPC);
-
- initEEnum(soapBindingUseEEnum, SOAPBindingUse.class, "SOAPBindingUse"); //$NON-NLS-1$
- addEEnumLiteral(soapBindingUseEEnum, SOAPBindingUse.LITERAL);
- addEEnumLiteral(soapBindingUseEEnum, SOAPBindingUse.ENCODED);
-
- initEEnum(soapBindingParameterStyleEEnum, SOAPBindingParameterStyle.class, "SOAPBindingParameterStyle"); //$NON-NLS-1$
- addEEnumLiteral(soapBindingParameterStyleEEnum, SOAPBindingParameterStyle.WRAPPED);
- addEEnumLiteral(soapBindingParameterStyleEEnum, SOAPBindingParameterStyle.BARE);
-
- // Create resource
- createResource(eNS_URI);
- }
-
-} //DomPackageImpl
diff --git a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/internal/impl/IDOMImpl.java b/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/internal/impl/IDOMImpl.java
deleted file mode 100755
index 8ae867c..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/internal/impl/IDOMImpl.java
+++ /dev/null
@@ -1,162 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.dom.runtime.internal.impl;
-
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.DomPackage;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.IDOM;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.IWebServiceProject;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>IDOM</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- * <li>{@link org.eclipse.jst.ws.jaxws.dom.runtime.internal.impl.IDOMImpl#getWebServiceProjects <em>Web Service Projects</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class IDOMImpl extends EObjectImpl implements IDOM {
- /**
- * The cached value of the '{@link #getWebServiceProjects() <em>Web Service Projects</em>}' containment reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getWebServiceProjects()
- * @generated
- * @ordered
- */
- protected EList<IWebServiceProject> webServiceProjects;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected IDOMImpl() {
- super();
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- protected EClass eStaticClass() {
- return DomPackage.Literals.IDOM;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EList<IWebServiceProject> getWebServiceProjects() {
- if (webServiceProjects == null)
- {
- webServiceProjects = new EObjectContainmentEList<IWebServiceProject>(IWebServiceProject.class, this, DomPackage.IDOM__WEB_SERVICE_PROJECTS);
- }
- return webServiceProjects;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
- switch (featureID)
- {
- case DomPackage.IDOM__WEB_SERVICE_PROJECTS:
- return ((InternalEList<?>)getWebServiceProjects()).basicRemove(otherEnd, msgs);
- }
- return super.eInverseRemove(otherEnd, featureID, msgs);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public Object eGet(int featureID, boolean resolve, boolean coreType) {
- switch (featureID)
- {
- case DomPackage.IDOM__WEB_SERVICE_PROJECTS:
- return getWebServiceProjects();
- }
- return super.eGet(featureID, resolve, coreType);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @SuppressWarnings("unchecked")
- @Override
- public void eSet(int featureID, Object newValue) {
- switch (featureID)
- {
- case DomPackage.IDOM__WEB_SERVICE_PROJECTS:
- getWebServiceProjects().clear();
- getWebServiceProjects().addAll((Collection<? extends IWebServiceProject>)newValue);
- return;
- }
- super.eSet(featureID, newValue);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public void eUnset(int featureID) {
- switch (featureID)
- {
- case DomPackage.IDOM__WEB_SERVICE_PROJECTS:
- getWebServiceProjects().clear();
- return;
- }
- super.eUnset(featureID);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public boolean eIsSet(int featureID) {
- switch (featureID)
- {
- case DomPackage.IDOM__WEB_SERVICE_PROJECTS:
- return webServiceProjects != null && !webServiceProjects.isEmpty();
- }
- return super.eIsSet(featureID);
- }
-
-} //IDOMImpl
diff --git a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/internal/impl/IJavaWebServiceElementImpl.java b/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/internal/impl/IJavaWebServiceElementImpl.java
deleted file mode 100755
index d80c124..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/internal/impl/IJavaWebServiceElementImpl.java
+++ /dev/null
@@ -1,227 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.dom.runtime.internal.impl;
-
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.DomPackage;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.IJavaWebServiceElement;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>IJava Web Service Element</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- * <li>{@link org.eclipse.jst.ws.jaxws.dom.runtime.internal.impl.IJavaWebServiceElementImpl#getImplementation <em>Implementation</em>}</li>
- * <li>{@link org.eclipse.jst.ws.jaxws.dom.runtime.internal.impl.IJavaWebServiceElementImpl#getName <em>Name</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class IJavaWebServiceElementImpl extends EObjectImpl implements IJavaWebServiceElement {
- /**
- * The default value of the '{@link #getImplementation() <em>Implementation</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getImplementation()
- * @generated
- * @ordered
- */
- protected static final String IMPLEMENTATION_EDEFAULT = null;
-
- /**
- * The cached value of the '{@link #getImplementation() <em>Implementation</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getImplementation()
- * @generated
- * @ordered
- */
- protected String implementation = IMPLEMENTATION_EDEFAULT;
-
- /**
- * The default value of the '{@link #getName() <em>Name</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getName()
- * @generated
- * @ordered
- */
- protected static final String NAME_EDEFAULT = null;
-
- /**
- * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getName()
- * @generated
- * @ordered
- */
- protected String name = NAME_EDEFAULT;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected IJavaWebServiceElementImpl() {
- super();
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- protected EClass eStaticClass() {
- return DomPackage.Literals.IJAVA_WEB_SERVICE_ELEMENT;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public String getImplementation() {
- return implementation;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setImplementation(String newImplementation) {
- String oldImplementation = implementation;
- implementation = newImplementation;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, DomPackage.IJAVA_WEB_SERVICE_ELEMENT__IMPLEMENTATION, oldImplementation, implementation));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public String getName() {
- return name;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setName(String newName) {
- String oldName = name;
- name = newName;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, DomPackage.IJAVA_WEB_SERVICE_ELEMENT__NAME, oldName, name));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public Object eGet(int featureID, boolean resolve, boolean coreType) {
- switch (featureID)
- {
- case DomPackage.IJAVA_WEB_SERVICE_ELEMENT__IMPLEMENTATION:
- return getImplementation();
- case DomPackage.IJAVA_WEB_SERVICE_ELEMENT__NAME:
- return getName();
- }
- return super.eGet(featureID, resolve, coreType);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public void eSet(int featureID, Object newValue) {
- switch (featureID)
- {
- case DomPackage.IJAVA_WEB_SERVICE_ELEMENT__IMPLEMENTATION:
- setImplementation((String)newValue);
- return;
- case DomPackage.IJAVA_WEB_SERVICE_ELEMENT__NAME:
- setName((String)newValue);
- return;
- }
- super.eSet(featureID, newValue);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public void eUnset(int featureID) {
- switch (featureID)
- {
- case DomPackage.IJAVA_WEB_SERVICE_ELEMENT__IMPLEMENTATION:
- setImplementation(IMPLEMENTATION_EDEFAULT);
- return;
- case DomPackage.IJAVA_WEB_SERVICE_ELEMENT__NAME:
- setName(NAME_EDEFAULT);
- return;
- }
- super.eUnset(featureID);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public boolean eIsSet(int featureID) {
- switch (featureID)
- {
- case DomPackage.IJAVA_WEB_SERVICE_ELEMENT__IMPLEMENTATION:
- return IMPLEMENTATION_EDEFAULT == null ? implementation != null : !IMPLEMENTATION_EDEFAULT.equals(implementation);
- case DomPackage.IJAVA_WEB_SERVICE_ELEMENT__NAME:
- return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
- }
- return super.eIsSet(featureID);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public String toString() {
- if (eIsProxy()) return super.toString();
-
- StringBuffer result = new StringBuffer(super.toString());
- result.append(" (implementation: "); //$NON-NLS-1$
- result.append(implementation);
- result.append(", name: "); //$NON-NLS-1$
- result.append(name);
- result.append(')');
- return result.toString();
- }
-
-} //IJavaWebServiceElementImpl
diff --git a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/internal/impl/IServiceEndpointInterfaceImpl.java b/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/internal/impl/IServiceEndpointInterfaceImpl.java
deleted file mode 100755
index 8d0e51f..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/internal/impl/IServiceEndpointInterfaceImpl.java
+++ /dev/null
@@ -1,522 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.dom.runtime.internal.impl;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.EObjectWithInverseResolvingEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.DomPackage;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.IServiceEndpointInterface;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.IWebMethod;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.IWebService;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.SOAPBindingParameterStyle;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.SOAPBindingStyle;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.SOAPBindingUse;
-
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>IService Endpoint Interface</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- * <li>{@link org.eclipse.jst.ws.jaxws.dom.runtime.internal.impl.IServiceEndpointInterfaceImpl#isImplicit <em>Implicit</em>}</li>
- * <li>{@link org.eclipse.jst.ws.jaxws.dom.runtime.internal.impl.IServiceEndpointInterfaceImpl#getImplementingWebServices <em>Implementing Web Services</em>}</li>
- * <li>{@link org.eclipse.jst.ws.jaxws.dom.runtime.internal.impl.IServiceEndpointInterfaceImpl#getWebMethods <em>Web Methods</em>}</li>
- * <li>{@link org.eclipse.jst.ws.jaxws.dom.runtime.internal.impl.IServiceEndpointInterfaceImpl#getTargetNamespace <em>Target Namespace</em>}</li>
- * <li>{@link org.eclipse.jst.ws.jaxws.dom.runtime.internal.impl.IServiceEndpointInterfaceImpl#getSoapBindingStyle <em>Soap Binding Style</em>}</li>
- * <li>{@link org.eclipse.jst.ws.jaxws.dom.runtime.internal.impl.IServiceEndpointInterfaceImpl#getSoapBindingUse <em>Soap Binding Use</em>}</li>
- * <li>{@link org.eclipse.jst.ws.jaxws.dom.runtime.internal.impl.IServiceEndpointInterfaceImpl#getSoapBindingParameterStyle <em>Soap Binding Parameter Style</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class IServiceEndpointInterfaceImpl extends IJavaWebServiceElementImpl implements IServiceEndpointInterface {
- /**
- * The default value of the '{@link #isImplicit() <em>Implicit</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #isImplicit()
- * @generated
- * @ordered
- */
- protected static final boolean IMPLICIT_EDEFAULT = false;
-
- /**
- * The cached value of the '{@link #isImplicit() <em>Implicit</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #isImplicit()
- * @generated
- * @ordered
- */
- protected boolean implicit = IMPLICIT_EDEFAULT;
-
- /**
- * The cached value of the '{@link #getImplementingWebServices() <em>Implementing Web Services</em>}' reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getImplementingWebServices()
- * @generated
- * @ordered
- */
- protected EList<IWebService> implementingWebServices;
-
- /**
- * The cached value of the '{@link #getWebMethods() <em>Web Methods</em>}' containment reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getWebMethods()
- * @generated
- * @ordered
- */
- protected EList<IWebMethod> webMethods;
-
- /**
- * The default value of the '{@link #getTargetNamespace() <em>Target Namespace</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getTargetNamespace()
- * @generated
- * @ordered
- */
- protected static final String TARGET_NAMESPACE_EDEFAULT = null;
-
- /**
- * The cached value of the '{@link #getTargetNamespace() <em>Target Namespace</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getTargetNamespace()
- * @generated
- * @ordered
- */
- protected String targetNamespace = TARGET_NAMESPACE_EDEFAULT;
-
- /**
- * The default value of the '{@link #getSoapBindingStyle() <em>Soap Binding Style</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getSoapBindingStyle()
- * @generated
- * @ordered
- */
- protected static final SOAPBindingStyle SOAP_BINDING_STYLE_EDEFAULT = SOAPBindingStyle.DOCUMENT;
-
- /**
- * The cached value of the '{@link #getSoapBindingStyle() <em>Soap Binding Style</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getSoapBindingStyle()
- * @generated
- * @ordered
- */
- protected SOAPBindingStyle soapBindingStyle = SOAP_BINDING_STYLE_EDEFAULT;
-
- /**
- * The default value of the '{@link #getSoapBindingUse() <em>Soap Binding Use</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getSoapBindingUse()
- * @generated
- * @ordered
- */
- protected static final SOAPBindingUse SOAP_BINDING_USE_EDEFAULT = SOAPBindingUse.LITERAL;
-
- /**
- * The cached value of the '{@link #getSoapBindingUse() <em>Soap Binding Use</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getSoapBindingUse()
- * @generated
- * @ordered
- */
- protected SOAPBindingUse soapBindingUse = SOAP_BINDING_USE_EDEFAULT;
-
- /**
- * The default value of the '{@link #getSoapBindingParameterStyle() <em>Soap Binding Parameter Style</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getSoapBindingParameterStyle()
- * @generated
- * @ordered
- */
- protected static final SOAPBindingParameterStyle SOAP_BINDING_PARAMETER_STYLE_EDEFAULT = SOAPBindingParameterStyle.WRAPPED;
-
- /**
- * The cached value of the '{@link #getSoapBindingParameterStyle() <em>Soap Binding Parameter Style</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getSoapBindingParameterStyle()
- * @generated
- * @ordered
- */
- protected SOAPBindingParameterStyle soapBindingParameterStyle = SOAP_BINDING_PARAMETER_STYLE_EDEFAULT;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected IServiceEndpointInterfaceImpl() {
- super();
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- protected EClass eStaticClass() {
- return DomPackage.Literals.ISERVICE_ENDPOINT_INTERFACE;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public boolean isImplicit() {
- return implicit;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setImplicit(boolean newImplicit) {
- boolean oldImplicit = implicit;
- implicit = newImplicit;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, DomPackage.ISERVICE_ENDPOINT_INTERFACE__IMPLICIT, oldImplicit, implicit));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EList<IWebService> getImplementingWebServices() {
- if (implementingWebServices == null)
- {
- implementingWebServices = new EObjectWithInverseResolvingEList<IWebService>(IWebService.class, this, DomPackage.ISERVICE_ENDPOINT_INTERFACE__IMPLEMENTING_WEB_SERVICES, DomPackage.IWEB_SERVICE__SERVICE_ENDPOINT);
- }
- return implementingWebServices;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EList<IWebMethod> getWebMethods() {
- if (webMethods == null)
- {
- webMethods = new EObjectContainmentEList<IWebMethod>(IWebMethod.class, this, DomPackage.ISERVICE_ENDPOINT_INTERFACE__WEB_METHODS);
- }
- return webMethods;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public String getTargetNamespace() {
- return targetNamespace;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setTargetNamespace(String newTargetNamespace) {
- String oldTargetNamespace = targetNamespace;
- targetNamespace = newTargetNamespace;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, DomPackage.ISERVICE_ENDPOINT_INTERFACE__TARGET_NAMESPACE, oldTargetNamespace, targetNamespace));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public SOAPBindingStyle getSoapBindingStyle() {
- return soapBindingStyle;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setSoapBindingStyle(SOAPBindingStyle newSoapBindingStyle) {
- SOAPBindingStyle oldSoapBindingStyle = soapBindingStyle;
- soapBindingStyle = newSoapBindingStyle == null ? SOAP_BINDING_STYLE_EDEFAULT : newSoapBindingStyle;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, DomPackage.ISERVICE_ENDPOINT_INTERFACE__SOAP_BINDING_STYLE, oldSoapBindingStyle, soapBindingStyle));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public SOAPBindingUse getSoapBindingUse() {
- return soapBindingUse;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setSoapBindingUse(SOAPBindingUse newSoapBindingUse) {
- SOAPBindingUse oldSoapBindingUse = soapBindingUse;
- soapBindingUse = newSoapBindingUse == null ? SOAP_BINDING_USE_EDEFAULT : newSoapBindingUse;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, DomPackage.ISERVICE_ENDPOINT_INTERFACE__SOAP_BINDING_USE, oldSoapBindingUse, soapBindingUse));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public SOAPBindingParameterStyle getSoapBindingParameterStyle() {
- return soapBindingParameterStyle;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setSoapBindingParameterStyle(SOAPBindingParameterStyle newSoapBindingParameterStyle) {
- SOAPBindingParameterStyle oldSoapBindingParameterStyle = soapBindingParameterStyle;
- soapBindingParameterStyle = newSoapBindingParameterStyle == null ? SOAP_BINDING_PARAMETER_STYLE_EDEFAULT : newSoapBindingParameterStyle;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, DomPackage.ISERVICE_ENDPOINT_INTERFACE__SOAP_BINDING_PARAMETER_STYLE, oldSoapBindingParameterStyle, soapBindingParameterStyle));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @SuppressWarnings("unchecked")
- @Override
- public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
- switch (featureID)
- {
- case DomPackage.ISERVICE_ENDPOINT_INTERFACE__IMPLEMENTING_WEB_SERVICES:
- return ((InternalEList<InternalEObject>)(InternalEList<?>)getImplementingWebServices()).basicAdd(otherEnd, msgs);
- }
- return super.eInverseAdd(otherEnd, featureID, msgs);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
- switch (featureID)
- {
- case DomPackage.ISERVICE_ENDPOINT_INTERFACE__IMPLEMENTING_WEB_SERVICES:
- return ((InternalEList<?>)getImplementingWebServices()).basicRemove(otherEnd, msgs);
- case DomPackage.ISERVICE_ENDPOINT_INTERFACE__WEB_METHODS:
- return ((InternalEList<?>)getWebMethods()).basicRemove(otherEnd, msgs);
- }
- return super.eInverseRemove(otherEnd, featureID, msgs);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public Object eGet(int featureID, boolean resolve, boolean coreType) {
- switch (featureID)
- {
- case DomPackage.ISERVICE_ENDPOINT_INTERFACE__IMPLICIT:
- return isImplicit();
- case DomPackage.ISERVICE_ENDPOINT_INTERFACE__IMPLEMENTING_WEB_SERVICES:
- return getImplementingWebServices();
- case DomPackage.ISERVICE_ENDPOINT_INTERFACE__WEB_METHODS:
- return getWebMethods();
- case DomPackage.ISERVICE_ENDPOINT_INTERFACE__TARGET_NAMESPACE:
- return getTargetNamespace();
- case DomPackage.ISERVICE_ENDPOINT_INTERFACE__SOAP_BINDING_STYLE:
- return getSoapBindingStyle();
- case DomPackage.ISERVICE_ENDPOINT_INTERFACE__SOAP_BINDING_USE:
- return getSoapBindingUse();
- case DomPackage.ISERVICE_ENDPOINT_INTERFACE__SOAP_BINDING_PARAMETER_STYLE:
- return getSoapBindingParameterStyle();
- }
- return super.eGet(featureID, resolve, coreType);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @SuppressWarnings("unchecked")
- @Override
- public void eSet(int featureID, Object newValue) {
- switch (featureID)
- {
- case DomPackage.ISERVICE_ENDPOINT_INTERFACE__IMPLICIT:
- setImplicit((Boolean)newValue);
- return;
- case DomPackage.ISERVICE_ENDPOINT_INTERFACE__IMPLEMENTING_WEB_SERVICES:
- getImplementingWebServices().clear();
- getImplementingWebServices().addAll((Collection<? extends IWebService>)newValue);
- return;
- case DomPackage.ISERVICE_ENDPOINT_INTERFACE__WEB_METHODS:
- getWebMethods().clear();
- getWebMethods().addAll((Collection<? extends IWebMethod>)newValue);
- return;
- case DomPackage.ISERVICE_ENDPOINT_INTERFACE__TARGET_NAMESPACE:
- setTargetNamespace((String)newValue);
- return;
- case DomPackage.ISERVICE_ENDPOINT_INTERFACE__SOAP_BINDING_STYLE:
- setSoapBindingStyle((SOAPBindingStyle)newValue);
- return;
- case DomPackage.ISERVICE_ENDPOINT_INTERFACE__SOAP_BINDING_USE:
- setSoapBindingUse((SOAPBindingUse)newValue);
- return;
- case DomPackage.ISERVICE_ENDPOINT_INTERFACE__SOAP_BINDING_PARAMETER_STYLE:
- setSoapBindingParameterStyle((SOAPBindingParameterStyle)newValue);
- return;
- }
- super.eSet(featureID, newValue);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public void eUnset(int featureID) {
- switch (featureID)
- {
- case DomPackage.ISERVICE_ENDPOINT_INTERFACE__IMPLICIT:
- setImplicit(IMPLICIT_EDEFAULT);
- return;
- case DomPackage.ISERVICE_ENDPOINT_INTERFACE__IMPLEMENTING_WEB_SERVICES:
- getImplementingWebServices().clear();
- return;
- case DomPackage.ISERVICE_ENDPOINT_INTERFACE__WEB_METHODS:
- getWebMethods().clear();
- return;
- case DomPackage.ISERVICE_ENDPOINT_INTERFACE__TARGET_NAMESPACE:
- setTargetNamespace(TARGET_NAMESPACE_EDEFAULT);
- return;
- case DomPackage.ISERVICE_ENDPOINT_INTERFACE__SOAP_BINDING_STYLE:
- setSoapBindingStyle(SOAP_BINDING_STYLE_EDEFAULT);
- return;
- case DomPackage.ISERVICE_ENDPOINT_INTERFACE__SOAP_BINDING_USE:
- setSoapBindingUse(SOAP_BINDING_USE_EDEFAULT);
- return;
- case DomPackage.ISERVICE_ENDPOINT_INTERFACE__SOAP_BINDING_PARAMETER_STYLE:
- setSoapBindingParameterStyle(SOAP_BINDING_PARAMETER_STYLE_EDEFAULT);
- return;
- }
- super.eUnset(featureID);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public boolean eIsSet(int featureID) {
- switch (featureID)
- {
- case DomPackage.ISERVICE_ENDPOINT_INTERFACE__IMPLICIT:
- return implicit != IMPLICIT_EDEFAULT;
- case DomPackage.ISERVICE_ENDPOINT_INTERFACE__IMPLEMENTING_WEB_SERVICES:
- return implementingWebServices != null && !implementingWebServices.isEmpty();
- case DomPackage.ISERVICE_ENDPOINT_INTERFACE__WEB_METHODS:
- return webMethods != null && !webMethods.isEmpty();
- case DomPackage.ISERVICE_ENDPOINT_INTERFACE__TARGET_NAMESPACE:
- return TARGET_NAMESPACE_EDEFAULT == null ? targetNamespace != null : !TARGET_NAMESPACE_EDEFAULT.equals(targetNamespace);
- case DomPackage.ISERVICE_ENDPOINT_INTERFACE__SOAP_BINDING_STYLE:
- return soapBindingStyle != SOAP_BINDING_STYLE_EDEFAULT;
- case DomPackage.ISERVICE_ENDPOINT_INTERFACE__SOAP_BINDING_USE:
- return soapBindingUse != SOAP_BINDING_USE_EDEFAULT;
- case DomPackage.ISERVICE_ENDPOINT_INTERFACE__SOAP_BINDING_PARAMETER_STYLE:
- return soapBindingParameterStyle != SOAP_BINDING_PARAMETER_STYLE_EDEFAULT;
- }
- return super.eIsSet(featureID);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public String toString() {
- if (eIsProxy()) return super.toString();
-
- StringBuffer result = new StringBuffer(super.toString());
- result.append(" (implicit: "); //$NON-NLS-1$
- result.append(implicit);
- result.append(", targetNamespace: "); //$NON-NLS-1$
- result.append(targetNamespace);
- result.append(", soapBindingStyle: "); //$NON-NLS-1$
- result.append(soapBindingStyle);
- result.append(", soapBindingUse: "); //$NON-NLS-1$
- result.append(soapBindingUse);
- result.append(", soapBindingParameterStyle: "); //$NON-NLS-1$
- result.append(soapBindingParameterStyle);
- result.append(')');
- return result.toString();
- }
-
- @Override
- public EObject eContainer()
- {
- if (super.eContainer()!=null) {
- return super.eContainer();
- }
-
- for (IWebService ws : getImplementingWebServices()) {
- if (ws.eContainer()!=null) {
- return ws.eContainer();
- }
- }
-
- return null;
- }
-
-} //IServiceEndpointInterfaceImpl
diff --git a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/internal/impl/IWebMethodImpl.java b/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/internal/impl/IWebMethodImpl.java
deleted file mode 100755
index 6bba49a..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/internal/impl/IWebMethodImpl.java
+++ /dev/null
@@ -1,397 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.dom.runtime.internal.impl;
-
-
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.DomPackage;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.IWebMethod;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.IWebParam;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.SOAPBindingParameterStyle;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.SOAPBindingStyle;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.SOAPBindingUse;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>IWeb Method</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- * <li>{@link org.eclipse.jst.ws.jaxws.dom.runtime.internal.impl.IWebMethodImpl#getParameters <em>Parameters</em>}</li>
- * <li>{@link org.eclipse.jst.ws.jaxws.dom.runtime.internal.impl.IWebMethodImpl#isExcluded <em>Excluded</em>}</li>
- * <li>{@link org.eclipse.jst.ws.jaxws.dom.runtime.internal.impl.IWebMethodImpl#getSoapBindingStyle <em>Soap Binding Style</em>}</li>
- * <li>{@link org.eclipse.jst.ws.jaxws.dom.runtime.internal.impl.IWebMethodImpl#getSoapBindingUse <em>Soap Binding Use</em>}</li>
- * <li>{@link org.eclipse.jst.ws.jaxws.dom.runtime.internal.impl.IWebMethodImpl#getSoapBindingParameterStyle <em>Soap Binding Parameter Style</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class IWebMethodImpl extends IJavaWebServiceElementImpl implements IWebMethod {
- /**
- * The cached value of the '{@link #getParameters() <em>Parameters</em>}' containment reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getParameters()
- * @generated
- * @ordered
- */
- protected EList<IWebParam> parameters;
-
- /**
- * The default value of the '{@link #isExcluded() <em>Excluded</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #isExcluded()
- * @generated
- * @ordered
- */
- protected static final boolean EXCLUDED_EDEFAULT = false;
-
- /**
- * The cached value of the '{@link #isExcluded() <em>Excluded</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #isExcluded()
- * @generated
- * @ordered
- */
- protected boolean excluded = EXCLUDED_EDEFAULT;
-
- /**
- * The default value of the '{@link #getSoapBindingStyle() <em>Soap Binding Style</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getSoapBindingStyle()
- * @generated
- * @ordered
- */
- protected static final SOAPBindingStyle SOAP_BINDING_STYLE_EDEFAULT = SOAPBindingStyle.DOCUMENT;
-
- /**
- * The cached value of the '{@link #getSoapBindingStyle() <em>Soap Binding Style</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getSoapBindingStyle()
- * @generated
- * @ordered
- */
- protected SOAPBindingStyle soapBindingStyle = SOAP_BINDING_STYLE_EDEFAULT;
-
- /**
- * The default value of the '{@link #getSoapBindingUse() <em>Soap Binding Use</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getSoapBindingUse()
- * @generated
- * @ordered
- */
- protected static final SOAPBindingUse SOAP_BINDING_USE_EDEFAULT = SOAPBindingUse.LITERAL;
-
- /**
- * The cached value of the '{@link #getSoapBindingUse() <em>Soap Binding Use</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getSoapBindingUse()
- * @generated
- * @ordered
- */
- protected SOAPBindingUse soapBindingUse = SOAP_BINDING_USE_EDEFAULT;
-
- /**
- * The default value of the '{@link #getSoapBindingParameterStyle() <em>Soap Binding Parameter Style</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getSoapBindingParameterStyle()
- * @generated
- * @ordered
- */
- protected static final SOAPBindingParameterStyle SOAP_BINDING_PARAMETER_STYLE_EDEFAULT = SOAPBindingParameterStyle.WRAPPED;
-
- /**
- * The cached value of the '{@link #getSoapBindingParameterStyle() <em>Soap Binding Parameter Style</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getSoapBindingParameterStyle()
- * @generated
- * @ordered
- */
- protected SOAPBindingParameterStyle soapBindingParameterStyle = SOAP_BINDING_PARAMETER_STYLE_EDEFAULT;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected IWebMethodImpl() {
- super();
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- protected EClass eStaticClass() {
- return DomPackage.Literals.IWEB_METHOD;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EList<IWebParam> getParameters() {
- if (parameters == null)
- {
- parameters = new EObjectContainmentEList<IWebParam>(IWebParam.class, this, DomPackage.IWEB_METHOD__PARAMETERS);
- }
- return parameters;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public boolean isExcluded() {
- return excluded;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setExcluded(boolean newExcluded) {
- boolean oldExcluded = excluded;
- excluded = newExcluded;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, DomPackage.IWEB_METHOD__EXCLUDED, oldExcluded, excluded));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public SOAPBindingStyle getSoapBindingStyle() {
- return soapBindingStyle;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setSoapBindingStyle(SOAPBindingStyle newSoapBindingStyle) {
- SOAPBindingStyle oldSoapBindingStyle = soapBindingStyle;
- soapBindingStyle = newSoapBindingStyle == null ? SOAP_BINDING_STYLE_EDEFAULT : newSoapBindingStyle;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, DomPackage.IWEB_METHOD__SOAP_BINDING_STYLE, oldSoapBindingStyle, soapBindingStyle));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public SOAPBindingUse getSoapBindingUse() {
- return soapBindingUse;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setSoapBindingUse(SOAPBindingUse newSoapBindingUse) {
- SOAPBindingUse oldSoapBindingUse = soapBindingUse;
- soapBindingUse = newSoapBindingUse == null ? SOAP_BINDING_USE_EDEFAULT : newSoapBindingUse;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, DomPackage.IWEB_METHOD__SOAP_BINDING_USE, oldSoapBindingUse, soapBindingUse));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public SOAPBindingParameterStyle getSoapBindingParameterStyle() {
- return soapBindingParameterStyle;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setSoapBindingParameterStyle(SOAPBindingParameterStyle newSoapBindingParameterStyle) {
- SOAPBindingParameterStyle oldSoapBindingParameterStyle = soapBindingParameterStyle;
- soapBindingParameterStyle = newSoapBindingParameterStyle == null ? SOAP_BINDING_PARAMETER_STYLE_EDEFAULT : newSoapBindingParameterStyle;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, DomPackage.IWEB_METHOD__SOAP_BINDING_PARAMETER_STYLE, oldSoapBindingParameterStyle, soapBindingParameterStyle));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
- switch (featureID)
- {
- case DomPackage.IWEB_METHOD__PARAMETERS:
- return ((InternalEList<?>)getParameters()).basicRemove(otherEnd, msgs);
- }
- return super.eInverseRemove(otherEnd, featureID, msgs);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public Object eGet(int featureID, boolean resolve, boolean coreType) {
- switch (featureID)
- {
- case DomPackage.IWEB_METHOD__PARAMETERS:
- return getParameters();
- case DomPackage.IWEB_METHOD__EXCLUDED:
- return isExcluded();
- case DomPackage.IWEB_METHOD__SOAP_BINDING_STYLE:
- return getSoapBindingStyle();
- case DomPackage.IWEB_METHOD__SOAP_BINDING_USE:
- return getSoapBindingUse();
- case DomPackage.IWEB_METHOD__SOAP_BINDING_PARAMETER_STYLE:
- return getSoapBindingParameterStyle();
- }
- return super.eGet(featureID, resolve, coreType);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @SuppressWarnings("unchecked")
- @Override
- public void eSet(int featureID, Object newValue) {
- switch (featureID)
- {
- case DomPackage.IWEB_METHOD__PARAMETERS:
- getParameters().clear();
- getParameters().addAll((Collection<? extends IWebParam>)newValue);
- return;
- case DomPackage.IWEB_METHOD__EXCLUDED:
- setExcluded((Boolean)newValue);
- return;
- case DomPackage.IWEB_METHOD__SOAP_BINDING_STYLE:
- setSoapBindingStyle((SOAPBindingStyle)newValue);
- return;
- case DomPackage.IWEB_METHOD__SOAP_BINDING_USE:
- setSoapBindingUse((SOAPBindingUse)newValue);
- return;
- case DomPackage.IWEB_METHOD__SOAP_BINDING_PARAMETER_STYLE:
- setSoapBindingParameterStyle((SOAPBindingParameterStyle)newValue);
- return;
- }
- super.eSet(featureID, newValue);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public void eUnset(int featureID) {
- switch (featureID)
- {
- case DomPackage.IWEB_METHOD__PARAMETERS:
- getParameters().clear();
- return;
- case DomPackage.IWEB_METHOD__EXCLUDED:
- setExcluded(EXCLUDED_EDEFAULT);
- return;
- case DomPackage.IWEB_METHOD__SOAP_BINDING_STYLE:
- setSoapBindingStyle(SOAP_BINDING_STYLE_EDEFAULT);
- return;
- case DomPackage.IWEB_METHOD__SOAP_BINDING_USE:
- setSoapBindingUse(SOAP_BINDING_USE_EDEFAULT);
- return;
- case DomPackage.IWEB_METHOD__SOAP_BINDING_PARAMETER_STYLE:
- setSoapBindingParameterStyle(SOAP_BINDING_PARAMETER_STYLE_EDEFAULT);
- return;
- }
- super.eUnset(featureID);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public boolean eIsSet(int featureID) {
- switch (featureID)
- {
- case DomPackage.IWEB_METHOD__PARAMETERS:
- return parameters != null && !parameters.isEmpty();
- case DomPackage.IWEB_METHOD__EXCLUDED:
- return excluded != EXCLUDED_EDEFAULT;
- case DomPackage.IWEB_METHOD__SOAP_BINDING_STYLE:
- return soapBindingStyle != SOAP_BINDING_STYLE_EDEFAULT;
- case DomPackage.IWEB_METHOD__SOAP_BINDING_USE:
- return soapBindingUse != SOAP_BINDING_USE_EDEFAULT;
- case DomPackage.IWEB_METHOD__SOAP_BINDING_PARAMETER_STYLE:
- return soapBindingParameterStyle != SOAP_BINDING_PARAMETER_STYLE_EDEFAULT;
- }
- return super.eIsSet(featureID);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public String toString() {
- if (eIsProxy()) return super.toString();
-
- StringBuffer result = new StringBuffer(super.toString());
- result.append(" (excluded: "); //$NON-NLS-1$
- result.append(excluded);
- result.append(", soapBindingStyle: "); //$NON-NLS-1$
- result.append(soapBindingStyle);
- result.append(", soapBindingUse: "); //$NON-NLS-1$
- result.append(soapBindingUse);
- result.append(", soapBindingParameterStyle: "); //$NON-NLS-1$
- result.append(soapBindingParameterStyle);
- result.append(')');
- return result.toString();
- }
-
-} //IWebMethodImpl
diff --git a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/internal/impl/IWebParamImpl.java b/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/internal/impl/IWebParamImpl.java
deleted file mode 100755
index 61504e9..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/internal/impl/IWebParamImpl.java
+++ /dev/null
@@ -1,389 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.dom.runtime.internal.impl;
-
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.DomPackage;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.IWebParam;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.WebParamKind;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>IWeb Param</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- * <li>{@link org.eclipse.jst.ws.jaxws.dom.runtime.internal.impl.IWebParamImpl#getKind <em>Kind</em>}</li>
- * <li>{@link org.eclipse.jst.ws.jaxws.dom.runtime.internal.impl.IWebParamImpl#getTypeName <em>Type Name</em>}</li>
- * <li>{@link org.eclipse.jst.ws.jaxws.dom.runtime.internal.impl.IWebParamImpl#getPartName <em>Part Name</em>}</li>
- * <li>{@link org.eclipse.jst.ws.jaxws.dom.runtime.internal.impl.IWebParamImpl#getTargetNamespace <em>Target Namespace</em>}</li>
- * <li>{@link org.eclipse.jst.ws.jaxws.dom.runtime.internal.impl.IWebParamImpl#isHeader <em>Header</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class IWebParamImpl extends IJavaWebServiceElementImpl implements IWebParam {
- /**
- * The default value of the '{@link #getKind() <em>Kind</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getKind()
- * @generated
- * @ordered
- */
- protected static final WebParamKind KIND_EDEFAULT = WebParamKind.IN;
-
- /**
- * The cached value of the '{@link #getKind() <em>Kind</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getKind()
- * @generated
- * @ordered
- */
- protected WebParamKind kind = KIND_EDEFAULT;
-
- /**
- * The default value of the '{@link #getTypeName() <em>Type Name</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getTypeName()
- * @generated
- * @ordered
- */
- protected static final String TYPE_NAME_EDEFAULT = null;
-
- /**
- * The cached value of the '{@link #getTypeName() <em>Type Name</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getTypeName()
- * @generated
- * @ordered
- */
- protected String typeName = TYPE_NAME_EDEFAULT;
-
- /**
- * The default value of the '{@link #getPartName() <em>Part Name</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getPartName()
- * @generated
- * @ordered
- */
- protected static final String PART_NAME_EDEFAULT = null;
-
- /**
- * The cached value of the '{@link #getPartName() <em>Part Name</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getPartName()
- * @generated
- * @ordered
- */
- protected String partName = PART_NAME_EDEFAULT;
-
- /**
- * The default value of the '{@link #getTargetNamespace() <em>Target Namespace</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getTargetNamespace()
- * @generated
- * @ordered
- */
- protected static final String TARGET_NAMESPACE_EDEFAULT = null;
-
- /**
- * The cached value of the '{@link #getTargetNamespace() <em>Target Namespace</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getTargetNamespace()
- * @generated
- * @ordered
- */
- protected String targetNamespace = TARGET_NAMESPACE_EDEFAULT;
-
- /**
- * The default value of the '{@link #isHeader() <em>Header</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #isHeader()
- * @generated
- * @ordered
- */
- protected static final boolean HEADER_EDEFAULT = false;
-
- /**
- * The cached value of the '{@link #isHeader() <em>Header</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #isHeader()
- * @generated
- * @ordered
- */
- protected boolean header = HEADER_EDEFAULT;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected IWebParamImpl() {
- super();
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- protected EClass eStaticClass() {
- return DomPackage.Literals.IWEB_PARAM;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public WebParamKind getKind() {
- return kind;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setKind(WebParamKind newKind) {
- WebParamKind oldKind = kind;
- kind = newKind == null ? KIND_EDEFAULT : newKind;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, DomPackage.IWEB_PARAM__KIND, oldKind, kind));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public String getTypeName() {
- return typeName;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setTypeName(String newTypeName) {
- String oldTypeName = typeName;
- typeName = newTypeName;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, DomPackage.IWEB_PARAM__TYPE_NAME, oldTypeName, typeName));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public String getPartName() {
- return partName;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setPartName(String newPartName) {
- String oldPartName = partName;
- partName = newPartName;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, DomPackage.IWEB_PARAM__PART_NAME, oldPartName, partName));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public String getTargetNamespace() {
- return targetNamespace;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setTargetNamespace(String newTargetNamespace) {
- String oldTargetNamespace = targetNamespace;
- targetNamespace = newTargetNamespace;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, DomPackage.IWEB_PARAM__TARGET_NAMESPACE, oldTargetNamespace, targetNamespace));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public boolean isHeader() {
- return header;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setHeader(boolean newHeader) {
- boolean oldHeader = header;
- header = newHeader;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, DomPackage.IWEB_PARAM__HEADER, oldHeader, header));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public Object eGet(int featureID, boolean resolve, boolean coreType) {
- switch (featureID)
- {
- case DomPackage.IWEB_PARAM__KIND:
- return getKind();
- case DomPackage.IWEB_PARAM__TYPE_NAME:
- return getTypeName();
- case DomPackage.IWEB_PARAM__PART_NAME:
- return getPartName();
- case DomPackage.IWEB_PARAM__TARGET_NAMESPACE:
- return getTargetNamespace();
- case DomPackage.IWEB_PARAM__HEADER:
- return isHeader();
- }
- return super.eGet(featureID, resolve, coreType);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public void eSet(int featureID, Object newValue) {
- switch (featureID)
- {
- case DomPackage.IWEB_PARAM__KIND:
- setKind((WebParamKind)newValue);
- return;
- case DomPackage.IWEB_PARAM__TYPE_NAME:
- setTypeName((String)newValue);
- return;
- case DomPackage.IWEB_PARAM__PART_NAME:
- setPartName((String)newValue);
- return;
- case DomPackage.IWEB_PARAM__TARGET_NAMESPACE:
- setTargetNamespace((String)newValue);
- return;
- case DomPackage.IWEB_PARAM__HEADER:
- setHeader((Boolean)newValue);
- return;
- }
- super.eSet(featureID, newValue);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public void eUnset(int featureID) {
- switch (featureID)
- {
- case DomPackage.IWEB_PARAM__KIND:
- setKind(KIND_EDEFAULT);
- return;
- case DomPackage.IWEB_PARAM__TYPE_NAME:
- setTypeName(TYPE_NAME_EDEFAULT);
- return;
- case DomPackage.IWEB_PARAM__PART_NAME:
- setPartName(PART_NAME_EDEFAULT);
- return;
- case DomPackage.IWEB_PARAM__TARGET_NAMESPACE:
- setTargetNamespace(TARGET_NAMESPACE_EDEFAULT);
- return;
- case DomPackage.IWEB_PARAM__HEADER:
- setHeader(HEADER_EDEFAULT);
- return;
- }
- super.eUnset(featureID);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public boolean eIsSet(int featureID) {
- switch (featureID)
- {
- case DomPackage.IWEB_PARAM__KIND:
- return kind != KIND_EDEFAULT;
- case DomPackage.IWEB_PARAM__TYPE_NAME:
- return TYPE_NAME_EDEFAULT == null ? typeName != null : !TYPE_NAME_EDEFAULT.equals(typeName);
- case DomPackage.IWEB_PARAM__PART_NAME:
- return PART_NAME_EDEFAULT == null ? partName != null : !PART_NAME_EDEFAULT.equals(partName);
- case DomPackage.IWEB_PARAM__TARGET_NAMESPACE:
- return TARGET_NAMESPACE_EDEFAULT == null ? targetNamespace != null : !TARGET_NAMESPACE_EDEFAULT.equals(targetNamespace);
- case DomPackage.IWEB_PARAM__HEADER:
- return header != HEADER_EDEFAULT;
- }
- return super.eIsSet(featureID);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public String toString() {
- if (eIsProxy()) return super.toString();
-
- StringBuffer result = new StringBuffer(super.toString());
- result.append(" (kind: "); //$NON-NLS-1$
- result.append(kind);
- result.append(", typeName: "); //$NON-NLS-1$
- result.append(typeName);
- result.append(", partName: "); //$NON-NLS-1$
- result.append(partName);
- result.append(", targetNamespace: "); //$NON-NLS-1$
- result.append(targetNamespace);
- result.append(", header: "); //$NON-NLS-1$
- result.append(header);
- result.append(')');
- return result.toString();
- }
-
-} //IWebParamImpl
diff --git a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/internal/impl/IWebServiceImpl.java b/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/internal/impl/IWebServiceImpl.java
deleted file mode 100755
index 4e845e1..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/internal/impl/IWebServiceImpl.java
+++ /dev/null
@@ -1,396 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.dom.runtime.internal.impl;
-
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.DomPackage;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.IServiceEndpointInterface;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.IWebService;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>IWeb Service</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- * <li>{@link org.eclipse.jst.ws.jaxws.dom.runtime.internal.impl.IWebServiceImpl#getServiceEndpoint <em>Service Endpoint</em>}</li>
- * <li>{@link org.eclipse.jst.ws.jaxws.dom.runtime.internal.impl.IWebServiceImpl#getTargetNamespace <em>Target Namespace</em>}</li>
- * <li>{@link org.eclipse.jst.ws.jaxws.dom.runtime.internal.impl.IWebServiceImpl#getPortName <em>Port Name</em>}</li>
- * <li>{@link org.eclipse.jst.ws.jaxws.dom.runtime.internal.impl.IWebServiceImpl#getWsdlLocation <em>Wsdl Location</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class IWebServiceImpl extends IJavaWebServiceElementImpl implements IWebService {
- /**
- * The cached value of the '{@link #getServiceEndpoint() <em>Service Endpoint</em>}' reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getServiceEndpoint()
- * @generated
- * @ordered
- */
- protected IServiceEndpointInterface serviceEndpoint;
-
- /**
- * The default value of the '{@link #getTargetNamespace() <em>Target Namespace</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getTargetNamespace()
- * @generated
- * @ordered
- */
- protected static final String TARGET_NAMESPACE_EDEFAULT = null;
- /**
- * The cached value of the '{@link #getTargetNamespace() <em>Target Namespace</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getTargetNamespace()
- * @generated
- * @ordered
- */
- protected String targetNamespace = TARGET_NAMESPACE_EDEFAULT;
- /**
- * The default value of the '{@link #getPortName() <em>Port Name</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getPortName()
- * @generated
- * @ordered
- */
- protected static final String PORT_NAME_EDEFAULT = null;
- /**
- * The cached value of the '{@link #getPortName() <em>Port Name</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getPortName()
- * @generated
- * @ordered
- */
- protected String portName = PORT_NAME_EDEFAULT;
- /**
- * The default value of the '{@link #getWsdlLocation() <em>Wsdl Location</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getWsdlLocation()
- * @generated
- * @ordered
- */
- protected static final String WSDL_LOCATION_EDEFAULT = null;
- /**
- * The cached value of the '{@link #getWsdlLocation() <em>Wsdl Location</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getWsdlLocation()
- * @generated
- * @ordered
- */
- protected String wsdlLocation = WSDL_LOCATION_EDEFAULT;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected IWebServiceImpl() {
- super();
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- protected EClass eStaticClass() {
- return DomPackage.Literals.IWEB_SERVICE;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public IServiceEndpointInterface getServiceEndpoint() {
- if (serviceEndpoint != null && serviceEndpoint.eIsProxy())
- {
- InternalEObject oldServiceEndpoint = (InternalEObject)serviceEndpoint;
- serviceEndpoint = (IServiceEndpointInterface)eResolveProxy(oldServiceEndpoint);
- if (serviceEndpoint != oldServiceEndpoint)
- {
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.RESOLVE, DomPackage.IWEB_SERVICE__SERVICE_ENDPOINT, oldServiceEndpoint, serviceEndpoint));
- }
- }
- return serviceEndpoint;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public IServiceEndpointInterface basicGetServiceEndpoint() {
- return serviceEndpoint;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public NotificationChain basicSetServiceEndpoint(IServiceEndpointInterface newServiceEndpoint, NotificationChain msgs) {
- IServiceEndpointInterface oldServiceEndpoint = serviceEndpoint;
- serviceEndpoint = newServiceEndpoint;
- if (eNotificationRequired())
- {
- ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, DomPackage.IWEB_SERVICE__SERVICE_ENDPOINT, oldServiceEndpoint, newServiceEndpoint);
- if (msgs == null) msgs = notification; else msgs.add(notification);
- }
- return msgs;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setServiceEndpoint(IServiceEndpointInterface newServiceEndpoint) {
- if (newServiceEndpoint != serviceEndpoint)
- {
- NotificationChain msgs = null;
- if (serviceEndpoint != null)
- msgs = ((InternalEObject)serviceEndpoint).eInverseRemove(this, DomPackage.ISERVICE_ENDPOINT_INTERFACE__IMPLEMENTING_WEB_SERVICES, IServiceEndpointInterface.class, msgs);
- if (newServiceEndpoint != null)
- msgs = ((InternalEObject)newServiceEndpoint).eInverseAdd(this, DomPackage.ISERVICE_ENDPOINT_INTERFACE__IMPLEMENTING_WEB_SERVICES, IServiceEndpointInterface.class, msgs);
- msgs = basicSetServiceEndpoint(newServiceEndpoint, msgs);
- if (msgs != null) msgs.dispatch();
- }
- else if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, DomPackage.IWEB_SERVICE__SERVICE_ENDPOINT, newServiceEndpoint, newServiceEndpoint));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public String getTargetNamespace() {
- return targetNamespace;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setTargetNamespace(String newTargetNamespace) {
- String oldTargetNamespace = targetNamespace;
- targetNamespace = newTargetNamespace;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, DomPackage.IWEB_SERVICE__TARGET_NAMESPACE, oldTargetNamespace, targetNamespace));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public String getPortName() {
- return portName;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setPortName(String newPortName) {
- String oldPortName = portName;
- portName = newPortName;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, DomPackage.IWEB_SERVICE__PORT_NAME, oldPortName, portName));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public String getWsdlLocation() {
- return wsdlLocation;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setWsdlLocation(String newWsdlLocation) {
- String oldWsdlLocation = wsdlLocation;
- wsdlLocation = newWsdlLocation;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, DomPackage.IWEB_SERVICE__WSDL_LOCATION, oldWsdlLocation, wsdlLocation));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
- switch (featureID)
- {
- case DomPackage.IWEB_SERVICE__SERVICE_ENDPOINT:
- if (serviceEndpoint != null)
- msgs = ((InternalEObject)serviceEndpoint).eInverseRemove(this, DomPackage.ISERVICE_ENDPOINT_INTERFACE__IMPLEMENTING_WEB_SERVICES, IServiceEndpointInterface.class, msgs);
- return basicSetServiceEndpoint((IServiceEndpointInterface)otherEnd, msgs);
- }
- return super.eInverseAdd(otherEnd, featureID, msgs);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
- switch (featureID)
- {
- case DomPackage.IWEB_SERVICE__SERVICE_ENDPOINT:
- return basicSetServiceEndpoint(null, msgs);
- }
- return super.eInverseRemove(otherEnd, featureID, msgs);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public Object eGet(int featureID, boolean resolve, boolean coreType) {
- switch (featureID)
- {
- case DomPackage.IWEB_SERVICE__SERVICE_ENDPOINT:
- if (resolve) return getServiceEndpoint();
- return basicGetServiceEndpoint();
- case DomPackage.IWEB_SERVICE__TARGET_NAMESPACE:
- return getTargetNamespace();
- case DomPackage.IWEB_SERVICE__PORT_NAME:
- return getPortName();
- case DomPackage.IWEB_SERVICE__WSDL_LOCATION:
- return getWsdlLocation();
- }
- return super.eGet(featureID, resolve, coreType);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public void eSet(int featureID, Object newValue) {
- switch (featureID)
- {
- case DomPackage.IWEB_SERVICE__SERVICE_ENDPOINT:
- setServiceEndpoint((IServiceEndpointInterface)newValue);
- return;
- case DomPackage.IWEB_SERVICE__TARGET_NAMESPACE:
- setTargetNamespace((String)newValue);
- return;
- case DomPackage.IWEB_SERVICE__PORT_NAME:
- setPortName((String)newValue);
- return;
- case DomPackage.IWEB_SERVICE__WSDL_LOCATION:
- setWsdlLocation((String)newValue);
- return;
- }
- super.eSet(featureID, newValue);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public void eUnset(int featureID) {
- switch (featureID)
- {
- case DomPackage.IWEB_SERVICE__SERVICE_ENDPOINT:
- setServiceEndpoint((IServiceEndpointInterface)null);
- return;
- case DomPackage.IWEB_SERVICE__TARGET_NAMESPACE:
- setTargetNamespace(TARGET_NAMESPACE_EDEFAULT);
- return;
- case DomPackage.IWEB_SERVICE__PORT_NAME:
- setPortName(PORT_NAME_EDEFAULT);
- return;
- case DomPackage.IWEB_SERVICE__WSDL_LOCATION:
- setWsdlLocation(WSDL_LOCATION_EDEFAULT);
- return;
- }
- super.eUnset(featureID);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public boolean eIsSet(int featureID) {
- switch (featureID)
- {
- case DomPackage.IWEB_SERVICE__SERVICE_ENDPOINT:
- return serviceEndpoint != null;
- case DomPackage.IWEB_SERVICE__TARGET_NAMESPACE:
- return TARGET_NAMESPACE_EDEFAULT == null ? targetNamespace != null : !TARGET_NAMESPACE_EDEFAULT.equals(targetNamespace);
- case DomPackage.IWEB_SERVICE__PORT_NAME:
- return PORT_NAME_EDEFAULT == null ? portName != null : !PORT_NAME_EDEFAULT.equals(portName);
- case DomPackage.IWEB_SERVICE__WSDL_LOCATION:
- return WSDL_LOCATION_EDEFAULT == null ? wsdlLocation != null : !WSDL_LOCATION_EDEFAULT.equals(wsdlLocation);
- }
- return super.eIsSet(featureID);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public String toString() {
- if (eIsProxy()) return super.toString();
-
- StringBuffer result = new StringBuffer(super.toString());
- result.append(" (targetNamespace: "); //$NON-NLS-1$
- result.append(targetNamespace);
- result.append(", portName: "); //$NON-NLS-1$
- result.append(portName);
- result.append(", wsdlLocation: "); //$NON-NLS-1$
- result.append(wsdlLocation);
- result.append(')');
- return result.toString();
- }
-
-} //IWebServiceImpl
diff --git a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/internal/impl/IWebServiceProjectImpl.java b/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/internal/impl/IWebServiceProjectImpl.java
deleted file mode 100755
index 9b13f3e..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/internal/impl/IWebServiceProjectImpl.java
+++ /dev/null
@@ -1,270 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.dom.runtime.internal.impl;
-
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.DomPackage;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.IServiceEndpointInterface;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.IWebService;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.IWebServiceProject;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>IWeb Service Project</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- * <li>{@link org.eclipse.jst.ws.jaxws.dom.runtime.internal.impl.IWebServiceProjectImpl#getWebServices <em>Web Services</em>}</li>
- * <li>{@link org.eclipse.jst.ws.jaxws.dom.runtime.internal.impl.IWebServiceProjectImpl#getServiceEndpointInterfaces <em>Service Endpoint Interfaces</em>}</li>
- * <li>{@link org.eclipse.jst.ws.jaxws.dom.runtime.internal.impl.IWebServiceProjectImpl#getName <em>Name</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class IWebServiceProjectImpl extends EObjectImpl implements IWebServiceProject {
- /**
- * The cached value of the '{@link #getWebServices() <em>Web Services</em>}' containment reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getWebServices()
- * @generated
- * @ordered
- */
- protected EList<IWebService> webServices;
-
- /**
- * The cached value of the '{@link #getServiceEndpointInterfaces() <em>Service Endpoint Interfaces</em>}' containment reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getServiceEndpointInterfaces()
- * @generated
- * @ordered
- */
- protected EList<IServiceEndpointInterface> serviceEndpointInterfaces;
-
- /**
- * The default value of the '{@link #getName() <em>Name</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getName()
- * @generated
- * @ordered
- */
- protected static final String NAME_EDEFAULT = null;
-
- /**
- * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getName()
- * @generated
- * @ordered
- */
- protected String name = NAME_EDEFAULT;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected IWebServiceProjectImpl() {
- super();
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- protected EClass eStaticClass() {
- return DomPackage.Literals.IWEB_SERVICE_PROJECT;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EList<IWebService> getWebServices() {
- if (webServices == null)
- {
- webServices = new EObjectContainmentEList<IWebService>(IWebService.class, this, DomPackage.IWEB_SERVICE_PROJECT__WEB_SERVICES);
- }
- return webServices;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EList<IServiceEndpointInterface> getServiceEndpointInterfaces() {
- if (serviceEndpointInterfaces == null)
- {
- serviceEndpointInterfaces = new EObjectContainmentEList<IServiceEndpointInterface>(IServiceEndpointInterface.class, this, DomPackage.IWEB_SERVICE_PROJECT__SERVICE_ENDPOINT_INTERFACES);
- }
- return serviceEndpointInterfaces;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public String getName() {
- return name;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setName(String newName) {
- String oldName = name;
- name = newName;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, DomPackage.IWEB_SERVICE_PROJECT__NAME, oldName, name));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
- switch (featureID)
- {
- case DomPackage.IWEB_SERVICE_PROJECT__WEB_SERVICES:
- return ((InternalEList<?>)getWebServices()).basicRemove(otherEnd, msgs);
- case DomPackage.IWEB_SERVICE_PROJECT__SERVICE_ENDPOINT_INTERFACES:
- return ((InternalEList<?>)getServiceEndpointInterfaces()).basicRemove(otherEnd, msgs);
- }
- return super.eInverseRemove(otherEnd, featureID, msgs);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public Object eGet(int featureID, boolean resolve, boolean coreType) {
- switch (featureID)
- {
- case DomPackage.IWEB_SERVICE_PROJECT__WEB_SERVICES:
- return getWebServices();
- case DomPackage.IWEB_SERVICE_PROJECT__SERVICE_ENDPOINT_INTERFACES:
- return getServiceEndpointInterfaces();
- case DomPackage.IWEB_SERVICE_PROJECT__NAME:
- return getName();
- }
- return super.eGet(featureID, resolve, coreType);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @SuppressWarnings("unchecked")
- @Override
- public void eSet(int featureID, Object newValue) {
- switch (featureID)
- {
- case DomPackage.IWEB_SERVICE_PROJECT__WEB_SERVICES:
- getWebServices().clear();
- getWebServices().addAll((Collection<? extends IWebService>)newValue);
- return;
- case DomPackage.IWEB_SERVICE_PROJECT__SERVICE_ENDPOINT_INTERFACES:
- getServiceEndpointInterfaces().clear();
- getServiceEndpointInterfaces().addAll((Collection<? extends IServiceEndpointInterface>)newValue);
- return;
- case DomPackage.IWEB_SERVICE_PROJECT__NAME:
- setName((String)newValue);
- return;
- }
- super.eSet(featureID, newValue);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public void eUnset(int featureID) {
- switch (featureID)
- {
- case DomPackage.IWEB_SERVICE_PROJECT__WEB_SERVICES:
- getWebServices().clear();
- return;
- case DomPackage.IWEB_SERVICE_PROJECT__SERVICE_ENDPOINT_INTERFACES:
- getServiceEndpointInterfaces().clear();
- return;
- case DomPackage.IWEB_SERVICE_PROJECT__NAME:
- setName(NAME_EDEFAULT);
- return;
- }
- super.eUnset(featureID);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public boolean eIsSet(int featureID) {
- switch (featureID)
- {
- case DomPackage.IWEB_SERVICE_PROJECT__WEB_SERVICES:
- return webServices != null && !webServices.isEmpty();
- case DomPackage.IWEB_SERVICE_PROJECT__SERVICE_ENDPOINT_INTERFACES:
- return serviceEndpointInterfaces != null && !serviceEndpointInterfaces.isEmpty();
- case DomPackage.IWEB_SERVICE_PROJECT__NAME:
- return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
- }
- return super.eIsSet(featureID);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public String toString() {
- if (eIsProxy()) return super.toString();
-
- StringBuffer result = new StringBuffer(super.toString());
- result.append(" (name: "); //$NON-NLS-1$
- result.append(name);
- result.append(')');
- return result.toString();
- }
-
-} //IWebServiceProjectImpl
diff --git a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/internal/impl/IWebTypeImpl.java b/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/internal/impl/IWebTypeImpl.java
deleted file mode 100755
index 51c598e..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/internal/impl/IWebTypeImpl.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.dom.runtime.internal.impl;
-
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.DomPackage;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.IWebType;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>IWeb Type</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * </p>
- *
- * @generated
- */
-public class IWebTypeImpl extends IJavaWebServiceElementImpl implements IWebType {
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected IWebTypeImpl() {
- super();
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- protected EClass eStaticClass() {
- return DomPackage.Literals.IWEB_TYPE;
- }
-
-} //IWebTypeImpl
diff --git a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/internal/plugin/JaxWsDomRuntimeMessages.java b/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/internal/plugin/JaxWsDomRuntimeMessages.java
deleted file mode 100755
index 89af113..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/internal/plugin/JaxWsDomRuntimeMessages.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.dom.runtime.internal.plugin;
-
-import org.eclipse.osgi.util.NLS;
-
-public class JaxWsDomRuntimeMessages extends NLS {
- private static final String BUNDLE_NAME = "org.eclipse.jst.ws.jaxws.dom.runtime.internal.plugin.messages"; //$NON-NLS-1$
-
- public static String AbstractClassNotImplementedException_Error_Message;
- public static String ConstructorNotExposableException_Error_Message;
- public static String EndpointTypeValidator_ERR_MSG_BINARYCLASS;
- public static String EndpointTypeValidator_ERR_MSG_NOTCLASS;
- public static String EndpointTypeValidator_ERR_MSG_ABSTRACT;
- public static String EndpointTypeValidator_ERR_MSG_CONSTRUCTOR;
- public static String EndpointTypeValidator_ERR_MSG_NOTPUBLIC;
- public static String EndpointTypeValidator_ERR_MSG_FINAL;
- public static String EndpointTypeValidator_ERR_MSG_HASFINALYZE;
- public static String HasInadmisableInnerTypesException_Error_Message;
- public static String InheritanceAndImplementationExecption_Error_Message;
- public static String InterfacesNotSupportedException_Error_Message;
- public static String MethodNotPublicException_Error_Message;
- public static String MultipleImplementationException_Error_Message;
- public static String RemoteObjectException_Error_Message;
- public static String WsDomStartupParticipant_Startup_Job_Message;
- public static String WorkspaceCUFinder_LOADING_CANCELED;
- public static String JAXWS_DOM_LOADING;
-
- public static String SeiImplementationValidator_METHOD_NOT_FOUND;
- public static String SeiImplementationValidator_METHOD_HASDIFFERENT_EXCEPTIONS;
- public static String SeiImplementationValidator_METHOD_NOT_PUBLIC;
-
- public static String SeiValidator_NOT_COMPILATIONUNIT_MSG;
- public static String SeiValidator_NOT_INTERFACE_MSG;
- public static String SeiValidator_NOT_OUTER_MSG;
- public static String SeiValidator_NOT_PUBLIC_MSG;
- public static String TypeNotFoundException_Error_Message;
- public static String TargetNsValidUriConstraint_URI_SYNTAX_ERROR;
-
- public static String DomValidationConstraintDescriptor_WS_DOM_VALIDATION_CONSTRAINT;
-
-
- static {
- // initialize resource bundle
- NLS.initializeMessages(BUNDLE_NAME, JaxWsDomRuntimeMessages.class);
- }
-
- private JaxWsDomRuntimeMessages() {
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/internal/plugin/JaxWsDomRuntimePlugin.java b/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/internal/plugin/JaxWsDomRuntimePlugin.java
deleted file mode 100755
index a9f8fd8..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/internal/plugin/JaxWsDomRuntimePlugin.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.dom.runtime.internal.plugin;
-
-import org.eclipse.core.runtime.Plugin;
-import org.osgi.framework.BundleContext;
-
-/**
- * The activator class controls the plug-in life cycle
- */
-public class JaxWsDomRuntimePlugin extends Plugin {
-
- // The plug-in ID
- public static final String PLUGIN_ID = "org.eclipse.jst.ws.jaxws.dom.runtime";
-
- // The shared instance
- private static JaxWsDomRuntimePlugin plugin;
-
- /**
- * The constructor
- */
- public JaxWsDomRuntimePlugin() {
- }
-
- /*
- * (non-Javadoc)
- * @see org.eclipse.core.runtime.Plugins#start(org.osgi.framework.BundleContext)
- */
- public void start(BundleContext context) throws Exception {
- super.start(context);
- plugin = this;
- }
-
- /*
- * (non-Javadoc)
- * @see org.eclipse.core.runtime.Plugin#stop(org.osgi.framework.BundleContext)
- */
- public void stop(BundleContext context) throws Exception {
- plugin = null;
- super.stop(context);
- }
-
- /**
- * Returns the shared instance
- *
- * @return the shared instance
- */
- public static JaxWsDomRuntimePlugin getDefault() {
- return plugin;
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/internal/plugin/messages.properties b/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/internal/plugin/messages.properties
deleted file mode 100755
index d51975e..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/internal/plugin/messages.properties
+++ /dev/null
@@ -1,43 +0,0 @@
-###############################################################################
-# Copyright (c) 2009 by SAP AG, Walldorf.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# SAP AG - initial API and implementation
-###############################################################################
-AbstractClassNotImplementedException_Error_Message=Abstract class {0} cannot be used as runtime class because it is not extended by non abstract class which is suitable for a runtime class
-ConstructorNotExposableException_Error_Message=Constructor {0} cannot be exposed as web service operation
-EndpointTypeValidator_ERR_MSG_BINARYCLASS = Class {0} is binary class and cannot be annotated
-EndpointTypeValidator_ERR_MSG_NOTCLASS = {0} is not a class
-EndpointTypeValidator_ERR_MSG_ABSTRACT = Class {0} is abstract
-EndpointTypeValidator_ERR_MSG_CONSTRUCTOR = Class {0} does not have a default constructor
-EndpointTypeValidator_ERR_MSG_NOTPUBLIC = Class {0} is not public and cannot be used as web service endpoint
-EndpointTypeValidator_ERR_MSG_FINAL = Class {0} is final and cannot be used as web service endpoint
-EndpointTypeValidator_ERR_MSG_HASFINALYZE = Class {0} contains finalize() method and cannot be used as web service endpoint
-HasInadmisableInnerTypesException_Error_Message=Class {0} has inner types that are not public and static
-InheritanceAndImplementationExecption_Error_Message=Class {0} extends {1} and implements custom interface (multiple inheritance is not allowed)
-InterfacesNotSupportedException_Error_Message={0} is a interface, and JAXB cannot handle interfaces
-MethodNotPublicException_Error_Message=Method {0} is not public and cannot be exposed as a web service operation
-MultipleImplementationException_Error_Message=Class {0} implements both interface {1} and interface {2} (multiple inheritance is not allowed)
-RemoteObjectException_Error_Message=Class {0} is a remote Object
-
-
-WsDomStartupParticipant_Startup_Job_Message =Loading Web Service DOM...
-WorkspaceCUFinder_LOADING_CANCELED=JAX-WS DOM loading canceled
-JAXWS_DOM_LOADING=Loading DOM for JAX-WS Web Services
-SeiImplementationValidator_METHOD_NOT_FOUND = Method {0} cannot be found in the implementation bean {1}. It is required that the bean implements all the methods of the specified service endpoint interface
-SeiImplementationValidator_METHOD_HASDIFFERENT_EXCEPTIONS = Method {0} in the implementation bean {1} is declared to throw exceptions that differ from exceptions thrown by the same method in the service endpoint interface
-SeiImplementationValidator_METHOD_NOT_PUBLIC= Method {0} in the implementation bean {1} is not public and therefore cannot be exposed as a web service operation
-
-
-SeiValidator_NOT_COMPILATIONUNIT_MSG = {0} is a binary interface and cannot annotated as a service endpoint interface
-SeiValidator_NOT_INTERFACE_MSG = {0} is not a interface and cannot be used as a service endpoint interface
-SeiValidator_NOT_OUTER_MSG = {0} is not a outer interface and cannot be used as a service endpoint interface
-SeiValidator_NOT_PUBLIC_MSG = {0} is not a public interface and cannot be used as a service endpoint interface
-TypeNotFoundException_Error_Message=Class {0} cannot be found
-
-DomValidationConstraintDescriptor_WS_DOM_VALIDATION_CONSTRAINT=WebService DOM validation constraint
-TargetNsValidUriConstraint_URI_SYNTAX_ERROR=URI syntax error at index {0} of input String ''{1}''. Reason: {2}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/internal/util/NamedExtensionInfo.java b/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/internal/util/NamedExtensionInfo.java
deleted file mode 100755
index 97ca51f..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/internal/util/NamedExtensionInfo.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.dom.runtime.internal.util;
-
-import org.eclipse.jst.ws.jaxws.dom.runtime.INamedExtensionInfo;
-
-/**
- * Implementation class for {@link INamedExtensionInfo}.
- */
-public class NamedExtensionInfo implements INamedExtensionInfo
-{
- private final String id;
-
- private final String name;
-
- protected NamedExtensionInfo(final String pId, final String pLabel)
- {
- this.id = pId;
- this.name = pLabel;
- }
-
- public String getId()
- {
- return id;
- }
-
- public String getName()
- {
- return name;
- }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/internal/util/XpUtil.java b/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/internal/util/XpUtil.java
deleted file mode 100755
index 46422b1..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/internal/util/XpUtil.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.dom.runtime.internal.util;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExtension;
-import org.eclipse.jst.ws.jaxws.utils.logging.ILogger;
-import org.eclipse.jst.ws.jaxws.utils.logging.Logger;
-
-
-/**
- * Utility class for working with extendion points.
- */
-public final class XpUtil
-{
- private static final String EXTENSION_NOT_PROPERLY_REGISTERED = "ConsumerType extension not properly registered (error in plugin.xml)"; //$NON-NLS-1$
-
- /** */
- public static final String XP_IMPLEMENTATION_ELEMENT = "implementation"; //$NON-NLS-1$
-
- /** */
- public static final String XP_IMPLEMENTATION_ELEMENT_CLASS_ATTR = "class"; //$NON-NLS-1$
-
- /**
- * Creates and returns a new instance of the executable extension.
- *
- * @param ext
- * @return instance of extention implementation
- */
- public static Object instantiateImplementation(final IExtension ext)
- {
- for (IConfigurationElement el : ext.getConfigurationElements())
- {
- if (el.getName().equals(XP_IMPLEMENTATION_ELEMENT))
- {
- try
- {
- return el.createExecutableExtension(XP_IMPLEMENTATION_ELEMENT_CLASS_ATTR);
- } catch (final CoreException e)
- {
- logger().logError("Unable to create extension", e); //$NON-NLS-1$
- throw new RuntimeException(e);
- }
- }
- }
- logger().logError(EXTENSION_NOT_PROPERLY_REGISTERED);
- throw new RuntimeException(EXTENSION_NOT_PROPERLY_REGISTERED);
- }
-
- private static ILogger logger()
- {
- return new Logger();
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/internal/validation/provider/TypeAdapter.java b/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/internal/validation/provider/TypeAdapter.java
deleted file mode 100755
index 66dc247..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/internal/validation/provider/TypeAdapter.java
+++ /dev/null
@@ -1,313 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.dom.runtime.internal.validation.provider;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.jdt.core.Flags;
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jst.ws.jaxws.dom.runtime.GeneralTypesNames;
-import org.eclipse.jst.ws.jaxws.dom.runtime.TypeResolver;
-import org.eclipse.jst.ws.jaxws.dom.runtime.validation.provider.exceptions.TypeNotFoundException;
-import org.eclipse.jst.ws.jaxws.utils.ContractChecker;
-
-/**
- * TypeProxy represents a type in a way convienient for type checking.
- *
- * @author Georgi Vachkov
- */
-public class TypeAdapter
-{
- private final IType type;
-
- private String superClassName;
-
- /**
- * Constructor.
- *
- * @param type
- * @throws NullPointerException -
- * in case <code>type</code> is null.
- */
- public TypeAdapter(IType type)
- {
- ContractChecker.nullCheckParam(type, "type");
- this.type = type;
- }
-
- /**
- * Checks for default constructor in analysed class.
- *
- * @return true if public constructor without paramethers exists or class does not have any constructor.
- * @throws JavaModelException
- */
- public boolean hasDefaultConstructor() throws JavaModelException
- {
- boolean hasConstructor = false;
- boolean isPublic = false;
-
- for (IMethod method : type.getMethods())
- {
- isPublic = Flags.isPublic(method.getFlags());
- if (method.isConstructor())
- {
- hasConstructor = true;
- }
-
- if (method.isConstructor() && isPublic && method.getParameterNames().length == 0)
- {
- return true;
- }
- }
-
- return !hasConstructor;
- }
-
- /**
- * Retrieves the direct super interfaces fully qualified names.
- *
- * @return list of interface names - in case no interfaces are implemented an empty array is returned
- * @throws JavaModelException
- */
- public final List<String> getInterfaceNames() throws JavaModelException
- {
- String[] iNames = type.getSuperInterfaceNames();
- List<String> interfaceNames = new ArrayList<String>(iNames.length);
- for (String name : iNames)
- {
- String resolvedName = TypeResolver.resolveType(name, type);
- interfaceNames.add(resolvedName);
- }
-
- return interfaceNames;
- }
-
- /**
- * Checks if the class contains non static and non public inner classes.
- *
- * @return true if contains such
- * @throws JavaModelException
- */
- public boolean hasNonStaticOrNonPublicInnerTypes() throws JavaModelException
- {
- for (IType t : type.getTypes())
- {
- int typeFlags = t.getFlags();
- if (!Flags.isStatic(typeFlags) || !Flags.isPublic(typeFlags))
- {
- return true;
- }
- }
-
- return false;
- }
-
- /**
- * Retrieves the name of it's superclass
- *
- * @return returnes resolved super class name or null if not present
- * @throws JavaModelException
- */
- public final String getSuperClassName() throws JavaModelException
- {
- if (type.getSuperclassName() != null && superClassName == null)
- {
- superClassName = TypeResolver.resolveType(type.getSuperclassName(), type);
- }
-
- return superClassName;
- }
-
- /**
- * Resolves and creates an instance of TypeProxy for super class.
- *
- * @return returns instance of {@link TypeAdapter} for super class or null if not present
- * @throws JavaModelException
- * @throws TypeNotFoundException
- */
- public final TypeAdapter getSuperClassType() throws TypeNotFoundException, JavaModelException
- {
- if (getSuperClassName() == null)
- return null;
-
- return new TypeAdapter(TypeFactory.create(getSuperClassName(), getType()));
- }
-
- /**
- * Defines if this class extends <tt>baseClassType</tt>
- *
- * @param baseClassType
- * @return check if this class type extends <tt>baseClassType</tt>
- * @throws TypeNotFoundException
- * @throws JavaModelException
- */
- public boolean isExtending(String baseClassType) throws TypeNotFoundException, JavaModelException
- {
- String typeName = this.getQualifiedName();
-
- // if we have arrived at object in the hierarchy, the type cannot be an exception
- if (typeName.equals(GeneralTypesNames.JAVA_LANG_OBJECT))
- {
- return false;
- }
- // All exceptions inherit from Throwable
- if (typeName.equals(baseClassType))
- {
- return true;
- }
-
- TypeAdapter parentType = getSuperClassType();
- if (parentType != null)
- {
- return parentType.isExtending(baseClassType);
- }
-
- return false;
- }
-
- /**
- * Checks if <code>type</code> implements interface <code>checkedInterfaceName</code>. Recursive check over the implemented interfaces is
- * done which defines if some of the implemented in <code>type</code> interface is extending the specified interface.
- *
- * @param interfaceName
- * @return true is this class type implements <tt>interfaceName</tt>
- * @throws TypeNotFoundException
- * @throws JavaModelException
- */
- public boolean isImplementing(final String interfaceName) throws TypeNotFoundException, JavaModelException
- {
- return isImplementing(this, interfaceName);
- }
-
- private boolean isImplementing(final TypeAdapter checkedType, final String checkedInterfaceName) throws TypeNotFoundException, JavaModelException
-
- {
- if (checkedType.getQualifiedName().equals(checkedInterfaceName))
- return true;
-
- for (String interfaceName : checkedType.getInterfaceNames())
- {
- TypeAdapter ta = new TypeAdapter(TypeFactory.create(interfaceName, checkedType.getType()));
- if (isImplementing(ta, checkedInterfaceName))
- {
- return true;
- }
- }
-
- // here use ep checker as seriablizable is not required in supertype
- if (checkedType.getSuperClassName() != null)
- {
- TypeAdapter superClass = new TypeAdapter(TypeFactory.create(checkedType.getSuperClassName(), checkedType.getType()));
- return isImplementing(superClass, checkedInterfaceName);
- }
-
- return false;
- }
-
- /**
- * Returns the type fully qualified name
- *
- * @return not <tt>null</tt> string
- */
- public final String getQualifiedName()
- {
- return type.getFullyQualifiedName();
- }
-
- /**
- * Returns the project name in which the type resides.
- *
- * @return not <tt>null</tt> string
- */
- public final String getProjectName()
- {
- return type.getJavaProject().getProject().getName();
- }
-
- /**
- * Returns wrapped IType.
- *
- * @return IType instance
- */
- public final IType getType()
- {
- return type;
- }
-
- @Override
- public int hashCode()
- {
- return type.getFullyQualifiedName().hashCode();
- }
-
- @Override
- public boolean equals(Object obj)
- {
- if (obj == null)
- {
- return false;
- }
-
- if (obj.getClass() == TypeAdapter.class)
- {
- return (getQualifiedName().equals(((TypeAdapter) obj).getQualifiedName()));
- }
-
- return false;
- }
-
- /**
- * Checks if the type is public.
- *
- * @return <tt>true</tt> if the class is public
- * @throws JavaModelException
- */
- public boolean isPublic() throws JavaModelException
- {
- return Flags.isPublic(type.getFlags());
- }
-
- /**
- * Checks if the type is final.
- *
- * @return <tt>true</tt> if the class is final
- * @throws JavaModelException
- */
- public boolean isFinal() throws JavaModelException
- {
- return Flags.isFinal(type.getFlags());
- }
-
- /**
- * Checks if the type is abstract.
- *
- * @return <tt>true</tt> if the class is abstract
- * @throws JavaModelException
- */
- public boolean isAbstract() throws JavaModelException
- {
- return Flags.isAbstract(type.getFlags());
- }
-
- /**
- * Checks if the type is an interface.
- *
- * @return <tt>true</tt> if the class is interface
- * @throws JavaModelException
- */
- public boolean isInterface() throws JavaModelException
- {
- return type.isInterface();
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/internal/validation/provider/TypeFactory.java b/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/internal/validation/provider/TypeFactory.java
deleted file mode 100755
index af4689b..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/internal/validation/provider/TypeFactory.java
+++ /dev/null
@@ -1,177 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.dom.runtime.internal.validation.provider;
-
-import java.util.HashMap;
-import java.util.Hashtable;
-import java.util.Map;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResourceChangeEvent;
-import org.eclipse.core.resources.IResourceChangeListener;
-import org.eclipse.core.resources.IResourceDelta;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jst.ws.jaxws.dom.runtime.PrimitiveTypeHandler;
-import org.eclipse.jst.ws.jaxws.dom.runtime.validation.provider.exceptions.TypeNotFoundException;
-
-/**
- * Factory for IType objects. Contains cache with already found types per project this way minimizing the time needed to obtain an IType instance for
- * concreate type. Registers ResourceChangedListener to listen for changes in projects. If some resource in some projects has been changed the cache
- * for this project is cleaned.
- *
- * @author Georgi Vachkov
- */
-public class TypeFactory
-{
- /**
- * Analysed types cache.
- */
- private static Hashtable<String, Map<String, IType>> typesCache = new Hashtable<String, Map<String, IType>>();
-
- private static TypeCache cache = null;
-
- /**
- * Creates TypeProxy instance for <code>qualifiedName</code> for the project with name <code>projectName</code>.
- *
- * @param projectName
- * @param qualifiedName
- * @return instance of IType in case type has been found
- * @throws TypeNotFoundException
- * if type with fully qualified name <tt>qualifiedName</tt> is not found
- * @throws JavaModelException
- */
- public static IType create(String projectName, String qualifiedName) throws TypeNotFoundException, JavaModelException
- {
- IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(projectName);
-
- return create(JavaCore.create(project), qualifiedName);
- }
-
- /**
- * Finds IType object for <code>qualifiedName</code> for the project in which <code>type</code> resides.
- *
- * @param qualifiedName
- * @param type
- * @return instance of IType in case type has been found
- * @throws TypeNotFoundException
- * if type with fully qualified name <tt>qualifiedName</tt> is not found
- * @throws JavaModelException
- */
- public static IType create(String qualifiedName, IType type) throws TypeNotFoundException, JavaModelException
- {
- return create(type.getJavaProject(), qualifiedName);
- }
-
- /**
- * Finds IType object for <code>qualifiedName</code> type in <code>javaProject</code> project. On first steps tries to find this type in cache
- * and if not found new instance is created.
- *
- * @param javaProject
- * @param qualifiedName
- * @return instance of IType in case type has been found
- * @throws TypeNotFoundException
- * if type with fully qualified name <tt>qualifiedName</tt> is not found
- * @throws JavaModelException
- */
- private static IType create(IJavaProject javaProject, String qualifiedName) throws TypeNotFoundException, JavaModelException
- {
- String localQualifiedName = qualifiedName;
-
- if (PrimitiveTypeHandler.isArrayType(localQualifiedName))
- {
- localQualifiedName = PrimitiveTypeHandler.getTypeFromArrayType(localQualifiedName);
- }
-
- if (PrimitiveTypeHandler.isJavaPrimitiveType(localQualifiedName))
- {
- localQualifiedName = PrimitiveTypeHandler.getObjectTypeForPrimitiveType(localQualifiedName);
- }
-
- if (cache == null)
- {
- cache = new TypeCache();
- ResourcesPlugin.getWorkspace().addResourceChangeListener(cache);
- }
-
- IType type = cache.findType(localQualifiedName, javaProject);
- if (type != null)
- {
- return type;
- }
-
- type = javaProject.findType(localQualifiedName);
- if (type == null)
- {
- throw new TypeNotFoundException(localQualifiedName);
- }
-
- cache.addType(localQualifiedName, type, javaProject);
-
- return type;
- }
-
- /**
- * Caching functionality. All types that have been retrieved are cached. Caching is per project. Search is executen in followin way:<br>
- * 1. Search for chache for the project. If cache is not found an empty cache is created.<br>
- * 2. Type is searched in the projects cache and is returned. If a type is not found <code>null</code> is returned.
- *
- * @author Georgi Vachkov
- */
- private static class TypeCache implements IResourceChangeListener
- {
- public void resourceChanged(IResourceChangeEvent event)
- {
- if (event != null && event.getDelta() != null)
- {
- for (IResourceDelta children : event.getDelta().getAffectedChildren())
- {
- IResourceDelta rDelta = (IResourceDelta) children.getAdapter(IResourceDelta.class);
- if (rDelta.getResource() != null && rDelta.getResource() instanceof IProject)
- {
- removeMapForProject(rDelta.getResource().getName());
- }
- }
- }
- }
-
- protected IType findType(String qualifiedName, IJavaProject javaProject)
- {
- return getMapForProject(javaProject).get(qualifiedName);
- }
-
- protected void addType(String qualifiedName, IType type, IJavaProject javaProject)
- {
- getMapForProject(javaProject).put(qualifiedName, type);
- }
-
- private void removeMapForProject(String projectName)
- {
- typesCache.remove(projectName);
- }
-
- private Map<String, IType> getMapForProject(IJavaProject javaProject)
- {
- String projectName = javaProject.getProject().getName();
- Map<String, IType> projectTypes = typesCache.get(projectName);
- if (projectTypes == null)
- {
- projectTypes = new HashMap<String, IType>();
- typesCache.put(projectName, projectTypes);
- }
-
- return projectTypes;
- }
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/internal/validation/provider/TypeKey.java b/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/internal/validation/provider/TypeKey.java
deleted file mode 100755
index 3d2aa47..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/internal/validation/provider/TypeKey.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.dom.runtime.internal.validation.provider;
-
-import org.eclipse.jst.ws.jaxws.utils.ContractChecker;
-
-/**
- * Type key - represents type in context of project. Overrides hashCode() for usage in maps.
- *
- * @author Georgi Vachkov
- *
- */
-public class TypeKey
-{
- private final String projectName;
-
- private final String qualifiedTypeName;
-
- /**
- * Constructor.
- *
- * @param projectName
- * @param qualifiedTypeName
- * @throws NullPointerException
- * in case some of the params is null.
- */
- public TypeKey(String projectName, String qualifiedTypeName)
- {
- ContractChecker.nullCheckParam(projectName, "projectName");
- ContractChecker.nullCheckParam(qualifiedTypeName, "qualifiedTypeName");
-
- this.projectName = projectName;
- this.qualifiedTypeName = qualifiedTypeName;
- }
-
- @Override
- public int hashCode()
- {
- return projectName.hashCode() + qualifiedTypeName.hashCode();
- }
-
- @Override
- public boolean equals(Object o)
- {
- if (o instanceof TypeKey)
- {
- return ((TypeKey) o).hashCode() == hashCode();
- }
-
- return false;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/persistence/IAnnotationSerializer.java b/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/persistence/IAnnotationSerializer.java
deleted file mode 100755
index ac8eeee..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/persistence/IAnnotationSerializer.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.dom.runtime.persistence;
-
-import org.eclipse.emf.common.notify.Notification;
-
-/**
- * This interface should be implemented by classes that intend to do serialization for
- * DOM objects.
- *
- * @author Georgi Vachkov
- */
-public interface IAnnotationSerializer
-{
- public void save(final Notification msg);
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/persistence/ICompilationUnitFinder.java b/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/persistence/ICompilationUnitFinder.java
deleted file mode 100755
index 3d6690e..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/persistence/ICompilationUnitFinder.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.dom.runtime.persistence;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.WsDOMLoadCanceledException;
-
-/**
- * Implements a visitor pattern for traversing compilation unit. This interface does not define what set of compilation
- * units will be traveresed. This could be a single java project, the whole workspace or just a given package. The set of
- * traversed compilation units is left up to the implementation. Nevertheless as these compilation units are always contained
- * inside a java project, the </c>ICompilationUnitHandler.handleProject(IJavaProject)</c> has to be called exactly once to
- * notify the handler for each project being processed. The compilation unit handler will be first notified that the processing
- * of given project has began and immediately after this it will be notified for all annotations in this project discovered by
- * the given implementation.
- * @author Hristo Sabev
- *
- */
-public interface ICompilationUnitFinder
-{
- /**
- * Starts the traversal of compilation units
- * @param monitor - the progress monitor to be used for the traversal.
- * @param cuHandler - compilation unit handler to be notified for a given project
- * @throws CoreException - thrown if unexpected problem occurred while traversing annotations
- */
- public void find(IProgressMonitor monitor, ICompilationUnitHandler cuHandler) throws CoreException, WsDOMLoadCanceledException;
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/persistence/ICompilationUnitHandler.java b/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/persistence/ICompilationUnitHandler.java
deleted file mode 100755
index 93a315c..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/persistence/ICompilationUnitHandler.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.dom.runtime.persistence;
-
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IJavaProject;
-
-/**
- * A listener for events isseud by an <c>ICompilationUnitFinder</c> instance during compilation unit traversals
- *
- * @author Hristo Sabev
- *
- */
-public interface ICompilationUnitHandler
-{
- /**
- * called by the <c>{@link ICompilationUnitFinder}</c> instance when it has started to traverse the annotation set. All calls to <c>handle(...)</c>
- * methods is inside a started-finished block.
- */
- public void started();
-
- /**
- * called by the <c>{@link ICompilationUnitFinder}</c> instance when it has finished to traverse the annotation set.
- */
- public void finished();
-
- /**
- * Called when the <c>{@link ICompilationUnitFinder}</c> instance found a compilation unit. This method is awlays called after a call to <c>{@link #handle(JavaProject) handle(JavaProject)}</c>.
- * The reported compilation unit is guaranteed to be found inside the <c>JavaProject</c> reported by the last call to <c>{@link#handle(JavaProject) handle(JavaProject)}</c>.
- * This method will be called exactly once for each compilation unit
- *
- * @param cu -
- * the compilation unit found by the finder
- */
- public void handle(ICompilationUnit cu);
-
- /**
- * Called when the <c>{@link ICompilationUnitFinder}</c> instance found a java project. This method is always called before the <c>{@link #handle(ICompilationUnit)}</c>
- * for any compilation unit found in this project. This method will be called exactly once for each found project.
- *
- * @param jprj -
- * the java project found by the finder
- */
- public void handle(IJavaProject jprj);
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/persistence/IModelElementSynchronizer.java b/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/persistence/IModelElementSynchronizer.java
deleted file mode 100755
index e00fc5f..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/persistence/IModelElementSynchronizer.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.dom.runtime.persistence;
-
-import org.eclipse.jdt.core.IJavaModel;
-import org.eclipse.jst.ws.jaxws.dom.runtime.DomUtil;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.DomFactory;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.IDOM;
-import org.eclipse.jst.ws.jaxws.dom.runtime.persistence.JaxWsWorkspaceResource.ServiceModelData;
-import org.eclipse.jst.ws.jaxws.utils.logging.ILogger;
-
-public interface IModelElementSynchronizer
-{
- public DomUtil util();
- public ServiceModelData serviceData();
- public ILogger logger();
- public IDOM getDomBeingLoaded();
- public DomFactory domFactory();
- public IJavaModel javaModel();
- public JaxWsWorkspaceResource resource();
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/persistence/IProjectSelector.java b/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/persistence/IProjectSelector.java
deleted file mode 100755
index b5ad5fd..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/persistence/IProjectSelector.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.dom.runtime.persistence;
-
-import org.eclipse.jdt.core.IJavaProject;
-
-/**
- * Specifies what java projects will be traversed by a given <c>ICompilationUnitFinder</c> instance. If any of the registered
- * selectors approved the project i.e. <c>IProjectSelector.approve(IJavaProject)</c> returned true, then this project will
- * be traversed. I.e. the project needs to be rejected by all the selectors in order not to be traversed.
- *
- * An implementation of this interface should reject a project that it has no knowledge about.
- * @author Hristo Sabev
- *
- */
-public interface IProjectSelector
-{
- /**
- * Approves the specified project for traversal
- * @param prj - the project to approve or reject
- * @return - true if the project should be traversed according to this selector, false otherwise.
- */
- public boolean approve(IJavaProject prj);
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/persistence/JaxWsDefaultsCalculator.java b/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/persistence/JaxWsDefaultsCalculator.java
deleted file mode 100755
index db9d77e..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/persistence/JaxWsDefaultsCalculator.java
+++ /dev/null
@@ -1,185 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.dom.runtime.persistence;
-
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.IServiceEndpointInterface;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.IWebMethod;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.IWebParam;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.SOAPBindingParameterStyle;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.SOAPBindingStyle;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.SOAPBindingUse;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.WebParamKind;
-import org.eclipse.jst.ws.jaxws.utils.annotations.IAnnotation;
-
-/**
- * Contains utility methods for calculating default values of some attributes/properties in
- * annotations and DOM objects.
- *
- * @author Georgi Vachkov
- */
-public class JaxWsDefaultsCalculator
-{
- private static final String ARG = "arg"; //$NON-NLS-1$
- private static final String RETURN = "return"; //$NON-NLS-1$
- private static final String RESPONSE = "Response"; //$NON-NLS-1$
-
- /**
- * Defines the SOAPBindingStyle. If there is a value for style attribute in <code>sbAnnotation</code> returns that value
- * otherwise returns the default value for this attribute.
- * @param sbAnnotation
- * @return the style
- */
- public SOAPBindingStyle defineSBStyle(final IAnnotation<? extends IJavaElement> sbAnnotation)
- {
- final String value = sbAnnotation!=null ? sbAnnotation.getPropertyValue(SBAnnotationFeatures.STYLE_ATTRIBUTE) : null;
- if (value!=null && SBAnnotationFeatures.SB_STYLE_RPC.endsWith(value.trim())) {
- return SOAPBindingStyle.RPC;
- }
-
- return SOAPBindingStyle.DOCUMENT;
- }
-
- /**
- * Defines the SOAPBindingUse. If there is a value for use attribute in <code>sbAnnotation</code> returns that value
- * otherwise returns the default value for this attribute.
- * @param sbAnnotation
- * @return the style
- */
- public SOAPBindingUse defineSBUse(final IAnnotation<? extends IJavaElement> sbAnnotation) {
- final String value = sbAnnotation!=null ? sbAnnotation.getPropertyValue(SBAnnotationFeatures.USE_ATTRIBUTE) : null;
- if(value!=null && SBAnnotationFeatures.SB_USE_ENCODED.endsWith(value.trim())) {
- return SOAPBindingUse.ENCODED;
- }
-
- return SOAPBindingUse.LITERAL;
- }
-
- /**
- * Defines the SOAPBindingUse. If there is a value for parameterStyle attribute in <code>sbAnnotation</code>
- * returns that value otherwise returns the default value for this attribute.
- * @param sbAnnotation
- * @return the style
- */
- public SOAPBindingParameterStyle defineSBParameterStyle(final IAnnotation<? extends IJavaElement> sbAnnotation)
- {
- final String value = sbAnnotation!=null ? sbAnnotation.getPropertyValue(SBAnnotationFeatures.PARAMETER_STYLE_ATTRIBUTE) : null;
- if (value!=null && SBAnnotationFeatures.SB_PARAMETER_STYLE_BARE.endsWith(value.trim())) {
- return SOAPBindingParameterStyle.BARE;
- }
-
- return SOAPBindingParameterStyle.WRAPPED;
- }
-
- /**
- * Defines the default operation parameter name according to JSR-181 point 4.4 - WebParam name
- * attribute
- * @param webMethod the method holding the parameter
- * @param paramPosition the parameter position in method arguments list starting with 0
- * @return calculated name
- */
- public String calcWebParamDefaultName(final IWebMethod webMethod, final int paramPosition)
- {
- if(webMethod.getSoapBindingStyle()==SOAPBindingStyle.DOCUMENT &&
- webMethod.getSoapBindingParameterStyle()==SOAPBindingParameterStyle.BARE)
- {
- return webMethod.getName();
- }
-
- return ARG + paramPosition;
- }
-
- /**
- * Defines the default operation parameter name according to JSR-181 point 4.4 - WebParam name
- * attribute
- * @param webParam
- * @return
- */
- public String calcWebParamDefaultName(final IWebParam webParam)
- {
- final IWebMethod webMethod = (IWebMethod)webParam.eContainer();
- return calcWebParamDefaultName(webMethod, getParamPosition(webMethod, webParam));
- }
-
- /**
- * Calculates the position of <code>param</code> in <code>method</code> signature starting from 0
- * @param webMethod
- * @param param
- * @return the param position
- * @throws IllegalArgumentException in case <code>webMethod</code> does not contain <code>param</code>
- */
- protected int getParamPosition(final IWebMethod webMethod, final IWebParam param)
- {
- int position = 0;
- for (IWebParam webParam : webMethod.getParameters())
- {
- if (webParam.getImplementation().equals("return")) {//$NON-NLS-1$
- continue;
- }
-
- if (webParam==param) {
- return position;
- }
-
- position++;
- }
-
- throw new IllegalStateException("Parameter[" + param.getImplementation() + "] was not found in method [" + webMethod.getImplementation() + "]");//$NON-NLS-1$//$NON-NLS-2$//$NON-NLS-3$
- }
-
- /**
- * Defines the default operation parameter name according to JSR-181 point 4.4 - WebParam target NS.
- * @param webMethod the method holding the parameter
- * @param webParam
- * @return calculated NS
- */
- public String calcWebParamDefaultTargetNS(final IWebMethod webMethod, final IWebParam webParam)
- {
- if(webMethod.getSoapBindingStyle()==SOAPBindingStyle.DOCUMENT &&
- webMethod.getSoapBindingParameterStyle()==SOAPBindingParameterStyle.WRAPPED &&
- !webParam.isHeader())
- {
- return "";//$NON-NLS-1$
- }
-
- return ((IServiceEndpointInterface)webMethod.eContainer()).getTargetNamespace();
- }
-
- /**
- * @return the default kind for web parameters - returns {@link WebParamKind#IN}
- */
- public WebParamKind getDefaultParamKind() {
- return WebParamKind.IN;
- }
-
- /**
- * @return false because the default value for WebParam(header) is false
- */
- public boolean getDefaultParamInHedaer() {
- return false;
- }
-
- /**
- * Defines the default operation parameter name according to JSR-181 point 4.5 - WebResult name.
- * @param webMethod the method holding the parameter
- * @return calculated name
- */
- public String calcWebResultDefaultName(final IWebMethod webMethod)
- {
- if(webMethod.getSoapBindingStyle()==SOAPBindingStyle.DOCUMENT &&
- webMethod.getSoapBindingParameterStyle()==SOAPBindingParameterStyle.BARE)
- {
- return webMethod.getName() + RESPONSE;
- }
-
- return RETURN;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/persistence/JaxWsWorkspaceResource.java b/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/persistence/JaxWsWorkspaceResource.java
deleted file mode 100755
index 1095cde..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/persistence/JaxWsWorkspaceResource.java
+++ /dev/null
@@ -1,326 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.dom.runtime.persistence;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.core.resources.IWorkspaceRunnable;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.jdt.core.ElementChangedEvent;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IElementChangedListener;
-import org.eclipse.jdt.core.IJavaModel;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.IDOM;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.IWebService;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.WsDOMLoadCanceledException;
-import org.eclipse.jst.ws.jaxws.dom.runtime.persistence.serializer.SerializerAdapterFactory;
-import org.eclipse.jst.ws.jaxws.dom.runtime.persistence.sync.InitialModelSynchronizer;
-import org.eclipse.jst.ws.jaxws.dom.runtime.persistence.sync.OnEventModelSynchronizer;
-import org.eclipse.jst.ws.jaxws.utils.annotations.AnnotationFactory;
-import org.eclipse.jst.ws.jaxws.utils.annotations.IAnnotationInspector;
-import org.eclipse.jst.ws.jaxws.utils.facets.FacetUtils;
-import org.eclipse.jst.ws.jaxws.utils.facets.IFacetUtils;
-import org.eclipse.jst.ws.jaxws.utils.logging.ILogger;
-import org.eclipse.jst.ws.jaxws.utils.logging.Logger;
-
-/**
- * Represents the resource for JAX-WS web service DOM model. This class is responsible for loading the
- * model. It is capable to use {@link IProgressMonitor} to track progress and cancel requests.
- *
- * @author
- */
-public class JaxWsWorkspaceResource extends NonStreamResource
-{
- private final IJavaModel javaModel;
- private final ServiceModelData serviceData;
- private final OnEventModelSynchronizer modelSynchronizer;
- private final SerializerAdapterFactory serializerFactory;
-
- private IProgressMonitor monitor;
-
- private boolean saveEnabled;
- private boolean loadCnaceled;
-
- /**
- * Constructor
- * @param javaModel
- */
- public JaxWsWorkspaceResource(final IJavaModel javaModel)
- {
- this.javaModel = javaModel;
- serviceData = new ServiceModelData();
- modelSynchronizer = new OnEventModelSynchronizer(this, serviceData);
- saveEnabled = true;
- serializerFactory = new SerializerAdapterFactory(this);
- }
-
- /**
- * Set progress monitor in case the processing progress should be tracked and
- * also in case it is expected that the processing can be canceled
- * @param pm the monitor - can be <code>null</code>
- */
- public void setProgressMonitor(IProgressMonitor pm)
- {
- this.monitor = pm;
- }
-
- /**
- * @return the loaded DOM in case it is successfully loaded. This method will return <code>null</code>
- * in case loading has not been started at all or in case loading has been canceled. To check if the
- * loading has been canceled call isLoadingCanceled().
- */
- public IDOM getDOM()
- {
- if (getContents().size() == 0) {
- return null;
- }
-
- return (IDOM) getContents().get(0);
- }
-
- /**
- * Adds listener for changes to Java elements in order to keep the model in sync
- * with these changes
- */
- public void startSynchronizing()
- {
- JavaCore.addElementChangedListener(modelSynchronizer, ElementChangedEvent.POST_RECONCILE | ElementChangedEvent.POST_CHANGE);
- }
-
- /**
- * Removes listener for changes to Java elements. Keep in mind that after calling
- * this method changes in java elements will not be reflected in DOM model
- */
- public void stopSynchronizing()
- {
- JavaCore.removeElementChangedListener(modelSynchronizer);
- }
-
- /**
- * @return the logger to use when some event needs to be logged
- */
- public ILogger logger()
- {
- return new Logger();
- }
-
- /**
- * @return the java model
- */
- public IJavaModel javaModel()
- {
- return javaModel;
- }
-
- @Override
- protected void doLoad(final Map<?, ?> options) throws IOException
- {
- loadCnaceled = false;
- getContents().clear();
-
- final IWorkspaceRunnable runnable = new IWorkspaceRunnable()
- {
- public void run(final IProgressMonitor subMonitor) throws CoreException
- {
- try
- {
- new InitialModelSynchronizer(JaxWsWorkspaceResource.this, serviceData).load(options, subMonitor);
- }
- catch (WsDOMLoadCanceledException e) {
- loadCnaceled = true;
- logger().logError("JAX WS Web Services DOM loading has been canceled by the user, some JAX WS Web Services functionalities won't be available", e); //$NON-NLS-1$
- }
- }
- };
-
- try {
- javaModel().getWorkspace().run(runnable, monitor);
- }
- catch (CoreException ce) {
- throw new IOWrappedException(ce);
- }
- }
-
- @Override
- protected void doSave(Map<?, ?> options) throws IOException {
- // no processing needed
- }
-
- protected IElementChangedListener getSynchronizingListener() {
- return modelSynchronizer;
- }
-
- /**
- * Creates compilation unit finder that crawls through javaModel and calls
- * compilation unit handler to process available CU's
- * @param jModel
- * @param projectSelectors
- * @return non <code>null</code> {@link ICompilationUnitFinder} instance
- */
- public ICompilationUnitFinder newCompilationUnitFinder(final IJavaModel jModel, final IProjectSelector[] projectSelectors)
- {
- return new WorkspaceCUFinder(jModel, projectSelectors);
- }
-
- /**
- * Approves that <code>prj</code> is JAX-WS web service enabled
- * @param prj
- * @return <code>true</code> in case this project might contain JAX-WS web services
- */
- public boolean approveProject(final IJavaProject prj)
- {
- final IFacetUtils facetUtils = new FacetUtils();
- try {
- return facetUtils.hasFacetWithVersion(prj.getProject(), FacetUtils.EJB_30_FACET_VERSION, FacetUtils.EJB_30_FACET_ID, true)
- || facetUtils.hasFacetWithVersion(prj.getProject(), FacetUtils.WEB_25_FACET_VERSION, FacetUtils.WEB_25_FACET_ID, true);
- } catch (CoreException ce)
- {
- logger().logError("Unable to read facet on project " + prj.getElementName() + ". Any Web Service elements in this project will not be shown in the navigation tree", ce); //$NON-NLS-1$ //$NON-NLS-2$
- return false;
- }
- }
-
- /**
- * Creates new instance of {@link IAnnotationInspector} for <code>type</code>
- * @param type
- * @return non <code>null</code> inspector
- */
- public IAnnotationInspector newAnnotationInspector(final IType type)
- {
- return AnnotationFactory.createAnnotationInspector(type);
- }
-
- /**
- * @return non empty array of projects selectors responsible for filtering processed projects
- */
- public IProjectSelector[] getProjectSelectors()
- {
- return new IProjectSelector[] { new IProjectSelector()
- {
- public boolean approve(IJavaProject prj)
- {
- return approveProject(prj);
- }
- } };
- }
-
- /**
- * @return the serializer factory used to adapt DOM objects with serializer adapters
- */
- public SerializerAdapterFactory getSerializerFactory() {
- return serializerFactory;
- }
-
- /**
- * @return <code>true</code> if the saving is enabled
- */
- public boolean isSaveEnabled() {
- return saveEnabled;
- }
-
- /**
- * call this method to enable saving of model objects to underlying resources
- */
- synchronized public void enableSaving() {
- this.saveEnabled = true;
- }
-
- /**
- * call this method to disable saving of model objects to underlying resources
- */
- synchronized public void disableSaving() {
- this.saveEnabled = false;
- }
-
- /**
- * @return <code>true</code> in case the load of DOM model has been canceled
- */
- public boolean isLoadCnaceled() {
- return loadCnaceled;
- }
-
- /**
- * Holds model data helpful in model processing
- */
- public class ServiceModelData
- {
- private Map<IWebService, String> ws2sei = new HashMap<IWebService, String>();
-
- private Map<String, Collection<IWebService>> sei2ws = new HashMap<String, Collection<IWebService>>();
-
- private Map<String, Collection<ICompilationUnit>> type2inherited = new HashMap<String, Collection<ICompilationUnit>>();
-
- public void map(IWebService ws, String seiImpl)
- {
- ws2sei.put(ws, seiImpl);
- getImplementingWs(seiImpl).add(ws);
- }
-
- String getSeiImpl(IWebService ws)
- {
- return ws2sei.get(ws);
- }
-
- public Collection<IWebService> getImplementingWs(String seiIml)
- {
- Collection<IWebService> wss = sei2ws.get(seiIml);
- if (wss == null)
- {
- wss = new ArrayList<IWebService>();
- sei2ws.put(seiIml, wss);
- }
- return wss;
- }
-
- public void unmap(IWebService ws)
- {
- final String sei = ws2sei.remove(ws);
- final Collection<IWebService> implementingWebServices = getImplementingWs(sei);
- implementingWebServices.remove(ws);
- if (implementingWebServices.size() == 0)
- {
- sei2ws.remove(sei);
- }
- }
-
- public void recordHierarchy(String fqName, Collection<ICompilationUnit> inheritedTypes)
- {
- type2inherited.put(fqName, inheritedTypes);
- }
-
- /**
- * @param fqName the fully qualified class name
- * @return collection of classes that are super for class <code>fqName</code>
- */
- public Collection<ICompilationUnit> getHierarchy(String fqName)
- {
- return type2inherited.get(fqName);
- }
-
- /**
- * Clears recorder hierarchy for class with FQName <code>fqName</code>
- * @param fqName
- */
- public void clearHierarchy(String fqName)
- {
- type2inherited.remove(fqName);
- }
-
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/persistence/Jee5WsDomRuntimeExtension.java b/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/persistence/Jee5WsDomRuntimeExtension.java
deleted file mode 100755
index 8f12d2c..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/persistence/Jee5WsDomRuntimeExtension.java
+++ /dev/null
@@ -1,135 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.dom.runtime.persistence;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.jdt.core.IJavaModel;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.IDOM;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.IWsDOMRuntimeExtension;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.IWsDomLoadListener;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.WsDOMLoadCanceledException;
-import org.eclipse.jst.ws.jaxws.dom.runtime.internal.plugin.JaxWsDomRuntimeMessages;
-
-import static org.eclipse.jst.ws.jaxws.utils.ContractChecker.nullCheckParam;
-
-public class Jee5WsDomRuntimeExtension implements IWsDOMRuntimeExtension
-{
- public static final String ID = "org.eclipse.jst.ws.jaxws.dom.jee5";//$NON-NLS-1$
-
- private List<IWsDomLoadListener> listeners = new ArrayList<IWsDomLoadListener>();
- private JaxWsWorkspaceResource workspaceResource;
- private boolean finished;
- private boolean started;
-
- public void createDOM(final IProgressMonitor monitor) throws IOException, WsDOMLoadCanceledException
- {
- Job.getJobManager().beginRule(ResourcesPlugin.getWorkspace().getRoot(), monitor);
- try {
- if (workspaceResource == null || workspaceResource.isLoadCnaceled()) {
- performLoad(monitor);
- }
- } finally {
- Job.getJobManager().endRule(ResourcesPlugin.getWorkspace().getRoot());
- }
- }
-
- private void performLoad(final IProgressMonitor monitor) throws IOException, WsDOMLoadCanceledException
- {
- workspaceResource = createResource();
- workspaceResource.setProgressMonitor(monitor);
- try {
- started();
- workspaceResource.load(null);
- if (workspaceResource.isLoadCnaceled()) {
- throw createCanceledException();
- }
- } finally {
- finished();
- }
-
- workspaceResource.startSynchronizing();
- }
-
- public IDOM getDOM() throws WsDOMLoadCanceledException
- {
- if (workspaceResource == null) {
- return null;
- }
-
- if (workspaceResource.isLoadCnaceled()) {
- throw createCanceledException();
- }
-
- return workspaceResource.getDOM();
- }
-
- public void addLoadListener(IWsDomLoadListener listener)
- {
- nullCheckParam(listener, "listener");//$NON-NLS-1$
-
- synchronized (listeners) {
- listeners.add(listener);
- }
-
- if (started) {
- listener.started();
- }
-
- if (finished) {
- listener.finished();
- }
- }
-
- public void removeLoadListener(IWsDomLoadListener listener)
- {
- nullCheckParam(listener, "listener");//$NON-NLS-1$
-
- synchronized (listeners) {
- listeners.remove(listener);
- }
- }
-
- protected IJavaModel javaModel() {
- return JavaCore.create(ResourcesPlugin.getWorkspace().getRoot());
- }
-
- protected JaxWsWorkspaceResource createResource() {
- return new JaxWsWorkspaceResource(javaModel());
- }
-
- protected void finished()
- {
- finished = true;
- for (IWsDomLoadListener listener : listeners) {
- listener.finished();
- }
- }
-
- protected void started()
- {
- started = true;
- finished = false;
- for (IWsDomLoadListener listener : listeners) {
- listener.started();
- }
- }
-
- private WsDOMLoadCanceledException createCanceledException() {
- return new WsDOMLoadCanceledException("JAX-WS DOM loading canceled", JaxWsDomRuntimeMessages.WorkspaceCUFinder_LOADING_CANCELED); //$NON-NLS-1$
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/persistence/NonStreamResource.java b/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/persistence/NonStreamResource.java
deleted file mode 100755
index 8f6a5ae..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/persistence/NonStreamResource.java
+++ /dev/null
@@ -1,128 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.dom.runtime.persistence;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.util.Map;
-import java.util.zip.ZipEntry;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.resource.impl.ResourceImpl;
-
-public abstract class NonStreamResource extends ResourceImpl {
-
- /**
- * Since this Resource is not stream based, this method should never be called.
- * If called it will throw <c>UnsupportedException</c>
- * @param arg0 - ignorred
- */
- @Override
- protected final void doLoad(InputStream inputStream, Map<?,?> options) throws IOException {
- super.doLoad(inputStream, options);
- }
-
- /**
- * Since this Resource is not stream based, this method should never be called.
- * If called it will throw <c>UnsupportedException</c>
- * @param arg0 - ignorred
- */
- @Override
- protected final void doSave(OutputStream arg0, Map<?,?> arg1) throws IOException {
- super.doSave(arg0, arg1);
- }
-
- /**
- * Allwasy throws <c>UnsupportedOperationException</c>. Streams are not supported by this resource.
- * @return nothing. this method allways throws <c>UnsupportedOperationException</c>
- */
- @Override
- protected final boolean isContentZipEntry(ZipEntry arg0) {
- throw new UnsupportedOperationException();
- }
-
- /**
- * Since this resource doesn't support streams this method should never be called. Allwasy throws <c>UnsupportedOperationException</c>.
- * @return nothing. this method allways throws <c>UnsupportedOperationException</c>
- */
- @Override
- protected final ZipEntry newContentZipEntry() {
- throw new UnsupportedOperationException();
- }
-
- /**
- * Since this resource doesn't support streams this method should never be called. Allwasy throws <c>UnsupportedOperationException</c>.
- * @return nothing. this method allways throws <c>UnsupportedOperationException</c>
- */
- @Override
- protected final boolean useZip() {
- throw new UnsupportedOperationException();
- }
-
- @Override
- public final void load(Map<?,?> options) throws IOException {
-
- if (!isLoaded()) {
- Notification notification = setLoaded(true);
- isLoading = true;
- if (errors != null) {
- errors.clear();
- }
- if (warnings != null) {
- warnings.clear();
- }
- try {
- Map<?,?> mergedOptions = mergeMaps(options, defaultLoadOptions);
- doLoad(mergedOptions);
- } finally {
-
- isLoading = false;
- if (notification != null) {
- eNotify(notification);
- }
- setModified(false);
- }
- }
- }
-
- /**
- * Called to load the resource using no streams.
- *
- * @param options - options supplied by the caller. This metod will ignore any options that it doesn't recognize. The keys and the values can be arbitrary objects.
- * @throws IOException - thrown if error occurred while loading the content of this resource
- */
- abstract protected void doLoad(Map<?,?> options) throws IOException;
-
- @Override
- public final void save(Map<?,?> options) throws IOException {
- if (errors != null)
- {
- errors.clear();
- }
- if (warnings != null)
- {
- warnings.clear();
- }
- Map<?,?> mergedOptions = mergeMaps(options, defaultSaveOptions);
- doSave(mergedOptions);
- setModified(false);
- }
-
- /**
- * Called to save the resource using no streams.
- * @param options - options supplied by the caller. This metod will ignore any options that it doesn't recognize. The keys and the values can be arbitrary objects.
- * @throws IOException - if problem during the saving occurred.
- */
- protected abstract void doSave(Map<?,?> options) throws IOException;
-
-
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/persistence/SBAnnotationFeatures.java b/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/persistence/SBAnnotationFeatures.java
deleted file mode 100755
index 3a81fb7..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/persistence/SBAnnotationFeatures.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.dom.runtime.persistence;
-
-/**
- * Contains SOAPBinding annotation name, attributes and possible values
- *
- * @author Georgi Vachkov
- */
-public class SBAnnotationFeatures
-{
- public static final String SB_ANNOTATION = "javax.jws.soap.SOAPBinding";//$NON-NLS-1$
- public static final String STYLE_ATTRIBUTE = "style";//$NON-NLS-1$
- public static final String USE_ATTRIBUTE = "use";//$NON-NLS-1$
- public static final String PARAMETER_STYLE_ATTRIBUTE = "parameterStyle";//$NON-NLS-1$
-
- public static final String SB_STYLE_DOCUMENT = SB_ANNOTATION + ".Style.DOCUMENT";//$NON-NLS-1$
- public static final String SB_STYLE_RPC = SB_ANNOTATION + ".SOAPBinding.Style.RPC";//$NON-NLS-1$
-
- public static final String SB_USE_LITERAL = SB_ANNOTATION + ".Use.LITERAL";//$NON-NLS-1$
- public static final String SB_USE_ENCODED = SB_ANNOTATION + ".Use.ENCODED";//$NON-NLS-1$
-
- public static final String SB_PARAMETER_STYLE_BARE = SB_ANNOTATION + ".ParameterStyle.BARE";//$NON-NLS-1$
- public static final String SB_PARAMETER_STYLE_WRAPPED = SB_ANNOTATION + ".ParameterStyle.WRAPPED";//$NON-NLS-1$
-
-
- private SBAnnotationFeatures() {
- // no instance of this class allowed
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/persistence/WMAnnotationFeatures.java b/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/persistence/WMAnnotationFeatures.java
deleted file mode 100755
index 14989cf..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/persistence/WMAnnotationFeatures.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.dom.runtime.persistence;
-
-public final class WMAnnotationFeatures
-{
-
- public static final String WM_ANNOTATION = "javax.jws.WebMethod";//$NON-NLS-1$
-
- public static final String WM_NAME_ATTRIBUTE = "operationName";//$NON-NLS-1$
-
- public static final String WM_EXCLUDED_ATTRIBUTE = "exclude";//$NON-NLS-1$
-
- private WMAnnotationFeatures()
- {
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/persistence/WPAnnotationFeatures.java b/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/persistence/WPAnnotationFeatures.java
deleted file mode 100755
index 47c32f7..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/persistence/WPAnnotationFeatures.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.dom.runtime.persistence;
-
-
-/**
- * Class that holds information on javax.jws.WebParam annotation name and attribute names.
- *
- * @author Georgi Vachkov
- */
-final public class WPAnnotationFeatures
-{
- public static final String WP_ANNOTATION = "javax.jws.WebParam";//$NON-NLS-1$
- public static final String NAME_ATTRIBUTE = "name";//$NON-NLS-1$
- public static final String PART_NAME_ATTRIBUTE = "partName";//$NON-NLS-1$
- public static final String TARGET_NAMESPACE_ATTRIBUTE = "targetNamespace";//$NON-NLS-1$
- public static final String MODE_ATTRIBUTE = "mode";//$NON-NLS-1$
- public static final String HEADER_ATTRIBUTE = "header";//$NON-NLS-1$
-
- public static final String WEB_PARAM_MODE = "javax.jws.WebParam.Mode";//$NON-NLS-1$
- public static final String WEB_PARAM_MODE_IN = WEB_PARAM_MODE + ".IN";//$NON-NLS-1$
- public static final String WEB_PARAM_MODE_OUT = WEB_PARAM_MODE + ".OUT";//$NON-NLS-1$
- public static final String WEB_PARAM_MODE_INOUT = WEB_PARAM_MODE + ".INOUT";//$NON-NLS-1$
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/persistence/WSAnnotationFeatures.java b/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/persistence/WSAnnotationFeatures.java
deleted file mode 100755
index 09f15f0..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/persistence/WSAnnotationFeatures.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.dom.runtime.persistence;
-
-final public class WSAnnotationFeatures
-{
- private WSAnnotationFeatures()
- {
- }
- public static final String WS_ANNOTATION = "javax.jws.WebService";//$NON-NLS-1$
- public static final String NAME_ATTRIBUTE = "name";//$NON-NLS-1$
- public static final String ENDPOINT_INTERFACE_ATTRIBUTE = "endpointInterface";//$NON-NLS-1$
- public static final String SERVICE_NAME_ATTRIBUTE = "serviceName";//$NON-NLS-1$
- public static final String WSDL_LOCATION_ATTRIBUTE = "wsdlLocation";//$NON-NLS-1$
- public static final String TARGET_NAMESPACE_ATTRIBUTE = "targetNamespace";//$NON-NLS-1$
- public static final String PORT_NAME_ATTRIBUTE = "portName"; //$NON-NLS-1$
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/persistence/WorkspaceCUFinder.java b/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/persistence/WorkspaceCUFinder.java
deleted file mode 100755
index 9dc8f36..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/persistence/WorkspaceCUFinder.java
+++ /dev/null
@@ -1,133 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.dom.runtime.persistence;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IJavaModel;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IPackageFragment;
-import org.eclipse.jdt.core.IPackageFragmentRoot;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.WsDOMLoadCanceledException;
-import org.eclipse.jst.ws.jaxws.dom.runtime.internal.plugin.JaxWsDomRuntimeMessages;
-
-public class WorkspaceCUFinder implements ICompilationUnitFinder
-{
- private final IJavaModel javaModel;
- private final IProjectSelector[] selectors;
-
- public WorkspaceCUFinder(IJavaModel javaModel, IProjectSelector[] selectors) {
- if (javaModel == null) {
- throw new NullPointerException("javaModel");//$NON-NLS-1$
- }
- this.javaModel = javaModel;
- if (selectors == null) {
- throw new NullPointerException("selector");//$NON-NLS-1$
- }
- this.selectors = selectors;
- }
-
- public void find(final IProgressMonitor monitor, final ICompilationUnitHandler cuHandler) throws CoreException, WsDOMLoadCanceledException
- {
- cuHandler.started();
- if (monitor != null) {
- monitor.beginTask(JaxWsDomRuntimeMessages.JAXWS_DOM_LOADING, assumeWork());
- }
- try {
- for (IJavaProject prj : javaModel.getJavaProjects())
- {
- if (monitor!=null && monitor.isCanceled()) {
- throw new WsDOMLoadCanceledException("JAX-WS DOM loading canceled", JaxWsDomRuntimeMessages.WorkspaceCUFinder_LOADING_CANCELED); //$NON-NLS-1$
- }
-
- if (approve(prj))
- {
- cuHandler.handle(prj);
- parseProject(prj, monitor, cuHandler);
- }
- }
- cuHandler.finished();
- } finally {
- if (monitor != null) {
- monitor.done();
- }
- }
- }
-
- protected int assumeWork() throws CoreException, WsDOMLoadCanceledException
- {
- final CountingCUHandler countingHandler = new CountingCUHandler();
- for (IJavaProject prj : javaModel.getJavaProjects()) {
- if (approve(prj)) {
- parseProject(prj, new NullProgressMonitor(), countingHandler);
- }
- }
-
- return countingHandler.count;
- }
-
- private void parseProject(final IJavaProject prj, final IProgressMonitor monitor, final ICompilationUnitHandler cuHandler) throws JavaModelException, WsDOMLoadCanceledException
- {
- for (IPackageFragment packageFragment : prj.getPackageFragments())
- {
- if (packageFragment.getKind() != IPackageFragmentRoot.K_SOURCE) {
- continue;
- }
-
- for (ICompilationUnit cu : packageFragment.getCompilationUnits())
- {
- if (monitor!=null && monitor.isCanceled()) {
- throw new WsDOMLoadCanceledException("JAX-WS DOM loading canceled",JaxWsDomRuntimeMessages.WorkspaceCUFinder_LOADING_CANCELED); //$NON-NLS-1$
- }
-
- cuHandler.handle(cu);
-
- if (monitor != null) {
- monitor.worked(1);
- }
- }
- }
- }
-
- private boolean approve(IJavaProject prj) {
- for (IProjectSelector selector : selectors) {
- if (selector.approve(prj)) {
- return true;
- }
- }
-
- return false;
- }
-
- /**
- * This handler counts the compilation units
- *
- * @author Georgi Vachkov
- */
- protected class CountingCUHandler implements ICompilationUnitHandler
- {
- private int count;
-
- public void started() {
- count = 0;
- }
-
- public void handle(ICompilationUnit cu) {
- count++;
- }
-
- public void finished() { /* no processing needed */ }
- public void handle(IJavaProject jprj) { /* no processing needed */ }
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/persistence/annotation/AnnotationAdapterFactory.java b/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/persistence/annotation/AnnotationAdapterFactory.java
deleted file mode 100755
index feafaf3..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/persistence/annotation/AnnotationAdapterFactory.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.dom.runtime.persistence.annotation;
-
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.common.notify.Notifier;
-import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
-import org.eclipse.jst.ws.jaxws.dom.runtime.persistence.annotation.impl.AnnotationAdapter;
-
-/**
- * Factory that adapts DOM objects to {@link IAnnotationAdapter} interface.
- *
- * @author Georgi Vachkov
- */
-public class AnnotationAdapterFactory extends AdapterFactoryImpl
-{
- /**
- * Singleton - use this static instance to adapt objects
- */
- public static final AnnotationAdapterFactory INSTANCE = new AnnotationAdapterFactory();
-
- private AnnotationAdapterFactory() {
- // singleton
- }
-
- @Override
- public boolean isFactoryForType(Object type) {
- return type == IAnnotationAdapter.class;
- }
-
- @Override
- protected Adapter createAdapter(Notifier target)
- {
- return new AnnotationAdapter();
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/persistence/annotation/IAnnotationAdapter.java b/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/persistence/annotation/IAnnotationAdapter.java
deleted file mode 100755
index df42752..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/persistence/annotation/IAnnotationAdapter.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.dom.runtime.persistence.annotation;
-
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jst.ws.jaxws.utils.annotations.IAnnotation;
-
-/**
- * Adapter that holds location information for the annotations applied on the
- * java artifact/s which is represent by the DOM object adapted to this interface.
- *
- * @author Georgi Vachkov
- */
-public interface IAnnotationAdapter
-{
- /**
- * Provides the {@link IAnnotation} for annotation with <code>annFQName</code>.
- * @param annFQName the fully qualified name of the annotation
- * @return locator instance or <code>null</code> if not existing
- */
- public IAnnotation<? extends IJavaElement> getAnnotation(String annFQName);
-
- /**
- * Adds annotation to the list of used annotations.
- * <code>annotation</code> can be <code>null</code> then the locator for this annotation
- * is removed.
- * @param annFQName the fully qualified name of the annotation
- * @param annotation th annotation instance
- */
- public void addAnnotation(String annFQName, IAnnotation<? extends IJavaElement> annotation);
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/persistence/annotation/impl/AnnotationAdapter.java b/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/persistence/annotation/impl/AnnotationAdapter.java
deleted file mode 100755
index 9d6fbb8..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/persistence/annotation/impl/AnnotationAdapter.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.dom.runtime.persistence.annotation.impl;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.emf.common.notify.impl.AdapterImpl;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jst.ws.jaxws.dom.runtime.persistence.annotation.IAnnotationAdapter;
-import org.eclipse.jst.ws.jaxws.utils.annotations.IAnnotation;
-
-import static org.eclipse.jst.ws.jaxws.utils.ContractChecker.nullCheckParam;
-
-/**
- * Implementation of {@link ILocatorAdapter}.
- *
- * @author Georgi Vachkov
- */
-public class AnnotationAdapter extends AdapterImpl implements IAnnotationAdapter
-{
- private final Map<String, IAnnotation<? extends IJavaElement>> annotationLocators;
-
- /**
- * Constructor
- */
- public AnnotationAdapter() {
- annotationLocators = new HashMap<String, IAnnotation<? extends IJavaElement>>();
- }
-
- public IAnnotation<? extends IJavaElement> getAnnotation(final String annotationFQName)
- {
- nullCheckParam(annotationFQName, "annotationFQName");//$NON-NLS-1$
- return annotationLocators.get(annotationFQName);
- }
-
- public void addAnnotation(final String annFQName, final IAnnotation<? extends IJavaElement> annotation)
- {
- nullCheckParam(annFQName, "annFQName");//$NON-NLS-1$
- annotationLocators.put(annFQName, annotation);
- }
-
- @Override
- public boolean isAdapterForType(Object type) {
- return IAnnotationAdapter.class == type;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/persistence/defaults/MethodPropertyDefaultsAdapter.java b/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/persistence/defaults/MethodPropertyDefaultsAdapter.java
deleted file mode 100755
index f3b74b9..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/persistence/defaults/MethodPropertyDefaultsAdapter.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.dom.runtime.persistence.defaults;
-
-import org.eclipse.emf.common.notify.impl.AdapterImpl;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.jst.ws.jaxws.dom.runtime.IPropertyDefaults;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.DomPackage;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.IWebMethod;
-
-/**
- * Adapter that gives default values for {@link IWebMethod} objects
- *
- * @author Georgi Vachkov
- */
-public class MethodPropertyDefaultsAdapter extends AdapterImpl implements IPropertyDefaults
-{
- @Override
- public boolean isAdapterForType(Object type) {
- return IPropertyDefaults.class == type;
- }
-
- public Object getDefault(final EStructuralFeature feature)
- {
- final IWebMethod webMethod = (IWebMethod)getTarget();
- switch(feature.getFeatureID())
- {
- case DomPackage.IWEB_METHOD__NAME:
- return getMethodName(webMethod);
- }
-
- return webMethod.eGet(feature);
- }
-
- private String getMethodName(final IWebMethod webMethod)
- {
- int pos = webMethod.getImplementation().indexOf('(');
- if (pos > -1) {
- return webMethod.getImplementation().substring(0, pos);
- }
-
- return webMethod.getImplementation();
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/persistence/defaults/ParameterPropertyDefaultsAdapter.java b/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/persistence/defaults/ParameterPropertyDefaultsAdapter.java
deleted file mode 100755
index cbb9e1a..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/persistence/defaults/ParameterPropertyDefaultsAdapter.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.dom.runtime.persistence.defaults;
-
-import org.eclipse.emf.common.notify.impl.AdapterImpl;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.jst.ws.jaxws.dom.runtime.IPropertyDefaults;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.DomPackage;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.IWebMethod;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.IWebParam;
-import org.eclipse.jst.ws.jaxws.dom.runtime.persistence.JaxWsDefaultsCalculator;
-
-/**
- * Class that defines which properties for {@link IWebParam} are editable
- *
- * @author Georgi Vachkov
- */
-public class ParameterPropertyDefaultsAdapter extends AdapterImpl implements IPropertyDefaults
-{
- private final JaxWsDefaultsCalculator defCalc = new JaxWsDefaultsCalculator();
-
- @Override
- public boolean isAdapterForType(Object type) {
- return IPropertyDefaults.class == type;
- }
-
- public Object getDefault(EStructuralFeature feature)
- {
- assert getTarget() instanceof IWebParam;
-
- final IWebParam webParam = (IWebParam)getTarget();
-
- switch(feature.getFeatureID())
- {
- case DomPackage.IWEB_PARAM__NAME:
- return defCalc().calcWebParamDefaultName(webParam);
- case DomPackage.IWEB_PARAM__PART_NAME:
- return defCalc().calcWebParamDefaultName(webParam);
- case DomPackage.IWEB_PARAM__TARGET_NAMESPACE:
- return defCalc().calcWebParamDefaultTargetNS((IWebMethod)webParam.eContainer(), webParam);
- case DomPackage.IWEB_PARAM__HEADER:
- return defCalc().getDefaultParamInHedaer();
- case DomPackage.IWEB_PARAM__KIND:
- return defCalc().getDefaultParamKind();
- }
-
- return webParam.eGet(feature);
- }
-
- protected JaxWsDefaultsCalculator defCalc() {
- return defCalc;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/persistence/defaults/PropertyDefaultsAdapterFactory.java b/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/persistence/defaults/PropertyDefaultsAdapterFactory.java
deleted file mode 100755
index c82be5f..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/persistence/defaults/PropertyDefaultsAdapterFactory.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.dom.runtime.persistence.defaults;
-
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.jst.ws.jaxws.dom.runtime.IPropertyDefaults;
-import org.eclipse.jst.ws.jaxws.dom.runtime.IPropertyState;
-import org.eclipse.jst.ws.jaxws.dom.runtime.util.DomAdapterFactory;
-
-/**
- * Adapter factory for adapters implementing {@link IPropertyState} interface.
- *
- * @author Georgi Vachkov
- */
-public class PropertyDefaultsAdapterFactory extends DomAdapterFactory
-{
- /**
- * Singleton instance for this adapter factory
- */
- public static final PropertyDefaultsAdapterFactory INSTANCE = new PropertyDefaultsAdapterFactory();
-
- @Override
- public boolean isFactoryForType(Object object) {
- return IPropertyDefaults.class == object;
- }
-
- @Override
- public Adapter createIWebServiceAdapter() {
- return new WsPropertyDefaultsAdapter();
- }
-
- @Override
- public Adapter createIServiceEndpointInterfaceAdapter() {
- return new SeiPropertyDefaultsAdapter();
- }
-
- @Override
- public Adapter createIWebMethodAdapter() {
- return new MethodPropertyDefaultsAdapter();
- }
-
- @Override
- public Adapter createIWebParamAdapter(){
- return new ParameterPropertyDefaultsAdapter();
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/persistence/defaults/SeiPropertyDefaultsAdapter.java b/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/persistence/defaults/SeiPropertyDefaultsAdapter.java
deleted file mode 100755
index 29cca7a..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/persistence/defaults/SeiPropertyDefaultsAdapter.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.dom.runtime.persistence.defaults;
-
-import org.eclipse.emf.common.notify.impl.AdapterImpl;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.jst.ws.jaxws.dom.runtime.IPropertyDefaults;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.DomPackage;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.IServiceEndpointInterface;
-import org.eclipse.jst.ws.jaxws.utils.JaxWsUtils;
-
-/**
- * Adapter that provides default values for {@link IServiceEndpointInterface} properties
- *
- * @author Georgi Vachkov
- */
-public class SeiPropertyDefaultsAdapter extends AdapterImpl implements IPropertyDefaults
-{
- public Object getDefault(EStructuralFeature feature)
- {
- final IServiceEndpointInterface sei = (IServiceEndpointInterface)getTarget();
-
- switch(feature.getFeatureID())
- {
- case DomPackage.ISERVICE_ENDPOINT_INTERFACE__NAME:
- return JaxWsUtils.getDefaultPorttypeName(sei.getImplementation());
- case DomPackage.ISERVICE_ENDPOINT_INTERFACE__TARGET_NAMESPACE:
- return JaxWsUtils.composeJaxWsTargetNamespaceByFQName(sei.getImplementation());
- }
-
- return sei.eGet(feature);
- }
-
- @Override
- public boolean isAdapterForType(Object type) {
- return IPropertyDefaults.class == type;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/persistence/defaults/WsPropertyDefaultsAdapter.java b/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/persistence/defaults/WsPropertyDefaultsAdapter.java
deleted file mode 100755
index 07ac941..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/persistence/defaults/WsPropertyDefaultsAdapter.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.dom.runtime.persistence.defaults;
-
-import org.eclipse.emf.common.notify.impl.AdapterImpl;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.jst.ws.jaxws.dom.runtime.IPropertyDefaults;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.DomPackage;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.IWebService;
-import org.eclipse.jst.ws.jaxws.utils.JaxWsUtils;
-
-public class WsPropertyDefaultsAdapter extends AdapterImpl implements IPropertyDefaults
-{
- public Object getDefault(EStructuralFeature feature)
- {
- final IWebService ws = (IWebService)getTarget();
-
- switch(feature.getFeatureID())
- {
- case DomPackage.IWEB_SERVICE__NAME:
- return JaxWsUtils.getDefaultServiceName(ws.getImplementation());
- case DomPackage.IWEB_SERVICE__PORT_NAME:
- return JaxWsUtils.getDefaultPortName(ws.getImplementation());
- case DomPackage.IWEB_SERVICE__TARGET_NAMESPACE:
- return JaxWsUtils.composeJaxWsTargetNamespaceByFQName(ws.getImplementation());
- }
-
- return ws.eGet(feature);
- }
-
- @Override
- public boolean isAdapterForType(Object type) {
- return IPropertyDefaults.class == type;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/persistence/serializer/AbstractSerializerAdapter.java b/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/persistence/serializer/AbstractSerializerAdapter.java
deleted file mode 100755
index 3016816..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/persistence/serializer/AbstractSerializerAdapter.java
+++ /dev/null
@@ -1,236 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.dom.runtime.persistence.serializer;
-
-import java.util.TreeSet;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.impl.AdapterImpl;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jst.ws.jaxws.dom.runtime.DomUtil;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.IWebServiceProject;
-import org.eclipse.jst.ws.jaxws.dom.runtime.persistence.IAnnotationSerializer;
-import org.eclipse.jst.ws.jaxws.dom.runtime.persistence.JaxWsDefaultsCalculator;
-import org.eclipse.jst.ws.jaxws.dom.runtime.persistence.JaxWsWorkspaceResource;
-import org.eclipse.jst.ws.jaxws.dom.runtime.util.ParamValueComparator;
-import org.eclipse.jst.ws.jaxws.utils.ContractChecker;
-import org.eclipse.jst.ws.jaxws.utils.annotations.AnnotationFactory;
-import org.eclipse.jst.ws.jaxws.utils.annotations.AnnotationGeneratorException;
-import org.eclipse.jst.ws.jaxws.utils.annotations.AnnotationWriter;
-import org.eclipse.jst.ws.jaxws.utils.annotations.IAnnotation;
-import org.eclipse.jst.ws.jaxws.utils.annotations.IParamValuePair;
-import org.eclipse.jst.ws.jaxws.utils.annotations.IValue;
-import org.eclipse.jst.ws.jaxws.utils.logging.ILogger;
-import org.eclipse.jst.ws.jaxws.utils.logging.Logger;
-
-/**
- * Base class for DOM adapters that listen to changes in DOM objects and applies it
- * to the underlying java class. Extenders should implement <code>getAnnotation()</code>
- * method to provide the {@link IAnnotation} instance to be saved to java class.
- *
- * @author Georgi Vachkov
- */
-public abstract class AbstractSerializerAdapter extends AdapterImpl implements IAnnotationSerializer
-{
- private final JaxWsWorkspaceResource resource;
- private final DomUtil util = new DomUtil();
- private final JaxWsDefaultsCalculator defCalc = new JaxWsDefaultsCalculator();
-
- /**
- * Constructor
- * @param resource
- * @throws NullPointerException in case <code>resource</code> is <code>null</code>
- */
- public AbstractSerializerAdapter(final JaxWsWorkspaceResource resource)
- {
- ContractChecker.nullCheckParam(resource, "resource");//$NON-NLS-1$
-
- this.resource = resource;
- }
-
- @Override
- public void notifyChanged(final Notification msg)
- {
- if (!resource.isSaveEnabled() || msg.isTouch()) {
- return;
- }
-
- if (msg.getEventType() != Notification.SET && msg.getEventType() != Notification.UNSET) {
- return;
- }
-
- if (checkValue(msg)) {
- save(msg);
- }
- }
-
- /**
- * Default value check - works only for String values, trims the
- * new value checks for <code>null</code> and if it is not null puts the
- * value to the object and returns <code>true</code> otherwise <code>false</code>
- * @param msg
- * @return <code>true</code> in case the value is valid
- */
- protected boolean checkValue(final Notification msg)
- {
- EObject obj = (EObject)getTarget();
- final String newValue = getNewStringValue(msg);
- if (newValue==null) {
- return revertValue(obj, msg);
- }
-
- // this call is needed cause newValue might be trimmed
- putValue(obj, (EStructuralFeature)msg.getFeature(), newValue);
- return true;
- }
-
- public void save(final Notification msg)
- {
- boolean processed = false;
- try {
- final IAnnotation<? extends IJavaElement> annotation = getAnnotation();
- if (annotation == null) {
- return;
- }
-
- if (annotation.getParamValuePairs().size()==0 && !isAnnotationRequired()) {
- getAnnotationWriter().remove(annotation);
- } else {
- getAnnotationWriter().update(annotation);
- }
- processed = true;
- }
- catch (AnnotationGeneratorException e) {
- logger().logError(e.getMessage(), e);
- }
- catch (CoreException e) {
- logger().logError(e.getMessage(), e);
- }
- finally {
- if(!processed) {
- revertValue((EObject)getTarget(), msg);
- }
- }
- }
-
- protected abstract IAnnotation<? extends IJavaElement> getAnnotation() throws JavaModelException;
- protected abstract boolean isAnnotationRequired();
-
- @Override
- public boolean isAdapterForType(Object type)
- {
- return IAnnotationSerializer.class==type;
- }
-
- protected JaxWsWorkspaceResource resource() {
- return resource;
- }
-
- protected DomUtil util() {
- return util;
- }
-
- protected JaxWsDefaultsCalculator defCalc() {
- return defCalc;
- }
-
- protected AnnotationWriter getAnnotationWriter()
- {
- return AnnotationWriter.getInstance();
- }
-
- protected IParamValuePair createParamValue(String param, String value)
- {
- final IValue iValue = AnnotationFactory.createStringValue(value);
- return AnnotationFactory.createParamValuePairValue(param, iValue);
- }
-
- protected IParamValuePair createParamValue(String param, boolean value)
- {
- final IValue iValue = AnnotationFactory.createBooleanValue(value);
- return AnnotationFactory.createParamValuePairValue(param, iValue);
- }
-
- protected IType findType(final EObject object, final String typeFQName) throws JavaModelException
- {
- EObject webProject = object.eContainer();
- while(!(webProject instanceof IWebServiceProject) && webProject!=null) {
- webProject = webProject.eContainer();
- }
-
- if (webProject==null) {
- return null;
- }
-
- final String projectName = ((IWebServiceProject)webProject).getName();
- final IJavaProject javaProject = resource.javaModel().getJavaProject(projectName);
- return javaProject.findType(typeFQName);
- }
-
- /**
- * Reads the new string value from <code>msg</code>.
- * @param msg
- * @return <code>null</code> if the value is empty string or <code>null</code>, otherwise the trimmed string value.
- */
- protected String getNewStringValue(final Notification msg)
- {
- final String newValue = (msg.getNewStringValue() == null) ? null : msg.getNewStringValue().trim();
- if (newValue != null && newValue.length() > 0) {
- return newValue;
- }
-
- return null;
- }
-
- /**
- * Reverts the current value for the changed feature to the old value and returns <code>false</code>
- * @param obj the object to be reverted
- * @param msg the message
- * @return always returns false
- */
- protected boolean revertValue(final EObject obj, final Notification msg)
- {
- putValue(obj, (EStructuralFeature)msg.getFeature(), msg.getOldValue());
- return false;
- }
-
- /**
- * Puts the <code>newValue</code> to the changed feature.
- * @param obj the object to be updated
- * @param msg the notification message
- * @param newValue the new value to be put
- */
- protected void putValue(final EObject obj, final EStructuralFeature feature, final Object newValue)
- {
- try {
- obj.eSetDeliver(false);
- obj.eSet(feature, newValue);
- } finally {
- obj.eSetDeliver(true);
- }
- }
-
- protected TreeSet<IParamValuePair> createParamValueSortedTreeSet()
- {
- return new TreeSet<IParamValuePair>(new ParamValueComparator());
- }
-
- private ILogger logger()
- {
- return new Logger();
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/persistence/serializer/MethodSerializerAdapter.java b/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/persistence/serializer/MethodSerializerAdapter.java
deleted file mode 100755
index 2875f7f..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/persistence/serializer/MethodSerializerAdapter.java
+++ /dev/null
@@ -1,98 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.dom.runtime.persistence.serializer;
-
-import java.util.Set;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EStructuralFeature;
-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.jst.ws.jaxws.dom.runtime.api.DomPackage;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.IServiceEndpointInterface;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.IWebMethod;
-import org.eclipse.jst.ws.jaxws.dom.runtime.persistence.JaxWsWorkspaceResource;
-import org.eclipse.jst.ws.jaxws.dom.runtime.persistence.WMAnnotationFeatures;
-import org.eclipse.jst.ws.jaxws.utils.annotations.AnnotationFactory;
-import org.eclipse.jst.ws.jaxws.utils.annotations.IAnnotation;
-import org.eclipse.jst.ws.jaxws.utils.annotations.IParamValuePair;
-
-/**
- * Adapter for {@link IWebMethod} serialization. Listens for property change notifications and
- * serializes the new object content to the underlying java class.
- *
- * @author Georgi Vachkov
- */
-public class MethodSerializerAdapter extends AbstractSerializerAdapter
-{
- /**
- * Constructor
- * @param resource the DOM resource
- */
- public MethodSerializerAdapter(JaxWsWorkspaceResource resource) {
- super(resource);
- }
-
- @Override
- protected boolean isAnnotationRequired() {
- return false;
- }
-
- @Override
- protected IAnnotation<? extends IJavaElement> getAnnotation() throws JavaModelException
- {
- assert getTarget() instanceof IWebMethod;
-
- final IWebMethod webMethod = (IWebMethod)getTarget();
- final IServiceEndpointInterface sei = (IServiceEndpointInterface)webMethod.eContainer();
- if (sei == null) {
- return null;
- }
- final IType seiType = findType(sei, sei.getImplementation());
- final IMethod method = util().findMethod(seiType, webMethod);
- if (method==null) {
- throw new IllegalStateException("IMethod for DOM method was not found");//$NON-NLS-1$
- }
-
- return AnnotationFactory.createAnnotation(WMAnnotationFeatures.WM_ANNOTATION, method, defineParamValues(webMethod, method));
- }
-
- private Set<IParamValuePair> defineParamValues(final IWebMethod webMethod, final IMethod method)
- {
- final Set<IParamValuePair> paramValuePairs = createParamValueSortedTreeSet();
- if (webMethod.getName()!=null && !webMethod.getName().equals(method.getElementName())) {
- paramValuePairs.add(createParamValue(WMAnnotationFeatures.WM_NAME_ATTRIBUTE, webMethod.getName()));
- }
-
- if (webMethod.isExcluded()) {
- paramValuePairs.add(createParamValue(WMAnnotationFeatures.WM_EXCLUDED_ATTRIBUTE, true));
- }
-
- return paramValuePairs;
- }
-
- @Override
- protected boolean checkValue(final Notification msg)
- {
- final EStructuralFeature feature = (EStructuralFeature)msg.getFeature();
- if (feature.getFeatureID()!=DomPackage.ISERVICE_ENDPOINT_INTERFACE__NAME) {
- return false;
- }
-
- if (!super.checkValue(msg)) {
- return false;
- }
-
- return true;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/persistence/serializer/ParameterSerializerAdapter.java b/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/persistence/serializer/ParameterSerializerAdapter.java
deleted file mode 100755
index de7b1a7..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/persistence/serializer/ParameterSerializerAdapter.java
+++ /dev/null
@@ -1,199 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.dom.runtime.persistence.serializer;
-
-import static org.eclipse.jst.ws.jaxws.dom.runtime.persistence.WPAnnotationFeatures.HEADER_ATTRIBUTE;
-import static org.eclipse.jst.ws.jaxws.dom.runtime.persistence.WPAnnotationFeatures.NAME_ATTRIBUTE;
-import static org.eclipse.jst.ws.jaxws.dom.runtime.persistence.WPAnnotationFeatures.PART_NAME_ATTRIBUTE;
-import static org.eclipse.jst.ws.jaxws.dom.runtime.persistence.WPAnnotationFeatures.TARGET_NAMESPACE_ATTRIBUTE;
-import static org.eclipse.jst.ws.jaxws.dom.runtime.persistence.WPAnnotationFeatures.WP_ANNOTATION;
-
-import java.util.Set;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EStructuralFeature;
-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.jst.ws.jaxws.dom.runtime.api.DomPackage;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.IServiceEndpointInterface;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.IWebMethod;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.IWebParam;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.WebParamKind;
-import org.eclipse.jst.ws.jaxws.dom.runtime.persistence.JaxWsWorkspaceResource;
-import org.eclipse.jst.ws.jaxws.dom.runtime.persistence.WPAnnotationFeatures;
-import org.eclipse.jst.ws.jaxws.dom.runtime.persistence.annotation.AnnotationAdapterFactory;
-import org.eclipse.jst.ws.jaxws.dom.runtime.persistence.annotation.IAnnotationAdapter;
-import org.eclipse.jst.ws.jaxws.dom.runtime.util.Jee5DomUtils;
-import org.eclipse.jst.ws.jaxws.utils.annotations.AnnotationFactory;
-import org.eclipse.jst.ws.jaxws.utils.annotations.IAnnotation;
-import org.eclipse.jst.ws.jaxws.utils.annotations.IParamValuePair;
-import org.eclipse.jst.ws.jaxws.utils.annotations.IValue;
-import org.eclipse.jst.ws.jaxws.utils.logging.Logger;
-
-/**
- * Class that serializes {@link IWebParam} objects to WebParam annotation in underlying java
- * class. Checks the attribute values and omits the defaults.
- *
- * @author Georgi Vachkov
- */
-public class ParameterSerializerAdapter extends AbstractSerializerAdapter
-{
- private final Jee5DomUtils jee5Utils = Jee5DomUtils.getInstance();
-
- /**
- * Constructor
- * @param resource
- */
- public ParameterSerializerAdapter(JaxWsWorkspaceResource resource) {
- super(resource);
- }
-
- @Override
- public void notifyChanged(final Notification msg)
- {
- if (!resource().isSaveEnabled()) {
- return;
- }
-
- final EStructuralFeature feature = (EStructuralFeature)msg.getFeature();
- if (feature.getFeatureID()==DomPackage.ISERVICE_ENDPOINT_INTERFACE__NAME)
- {
- try {
- changePartName(msg);
- }
- catch (JavaModelException e) {
- (new Logger()).logError(e.getMessage(), e);
- }
- }
-
- super.notifyChanged(msg);
- }
-
- private void changePartName(final Notification msg) throws JavaModelException
- {
- final IWebParam webParam = (IWebParam)getTarget();
- if (jee5Utils.isPartNameUsed(webParam))
- {
- final IAnnotationAdapter annAdapter = (IAnnotationAdapter )AnnotationAdapterFactory.INSTANCE.adapt(webParam, IAnnotationAdapter.class);
- final IAnnotation<? extends IJavaElement> ann = annAdapter.getAnnotation(WPAnnotationFeatures.WP_ANNOTATION);
- if (ann!=null && ann.getPropertyValue(WPAnnotationFeatures.PART_NAME_ATTRIBUTE)!=null) {
- return;
- }
- }
-
- if (checkValue(msg)) {
- putValue(webParam, DomPackage.Literals.IWEB_PARAM__PART_NAME, msg.getNewValue());
- }
- }
-
- @Override
- protected boolean isAnnotationRequired() {
- return false;
- }
-
- @Override
- protected IAnnotation<? extends IJavaElement> getAnnotation() throws JavaModelException
- {
- final IWebParam webParam = (IWebParam)getTarget();
- final IWebMethod webMethod = (IWebMethod)webParam.eContainer();
- if (webMethod==null || webMethod.eContainer()==null) {
- return null;
- }
-
- final IType seiType = findType(webMethod, ((IServiceEndpointInterface)webMethod.eContainer()).getImplementation());
- final IMethod method = util().findMethod(seiType, webMethod);
-
- return AnnotationFactory.createAnnotation(WP_ANNOTATION,
- method.getTypeParameter(webParam.getImplementation()),
- defineParamValues(webParam, webMethod));
- }
-
- protected Set<IParamValuePair> defineParamValues(final IWebParam webParam, final IWebMethod webMethod)
- {
- final Set<IParamValuePair> valuePairs = createParamValueSortedTreeSet();
-
- if (webParam.getKind()!=WebParamKind.IN) {
- valuePairs.add(createModeValuePair(webParam));
- }
-
- if (webParam.isHeader()) {
- valuePairs.add(createParamValue(HEADER_ATTRIBUTE, true));
- }
-
- final String defName = defCalc().calcWebParamDefaultName(webParam);
- if (jee5Utils.isNameRequired(webParam) ||
- (!webParam.getName().equals(defName) && jee5Utils.isNameUsed(webParam)))
- {
- valuePairs.add(createParamValue(NAME_ATTRIBUTE, webParam.getName()));
- }
-
- if (jee5Utils.isPartNameUsed(webParam) && !webParam.getPartName().equals(defName)) {
- valuePairs.add(createParamValue(PART_NAME_ATTRIBUTE, webParam.getPartName()));
- }
-
- if (webParam.getTargetNamespace()!=null)
- {
- final String defNs = defCalc().calcWebParamDefaultTargetNS(webMethod, webParam);
- if (webParam.getTargetNamespace().trim().length() != 0 && !webParam.getTargetNamespace().equals(defNs)) {
- valuePairs.add(createParamValue(TARGET_NAMESPACE_ATTRIBUTE, webParam.getTargetNamespace()));
- }
- }
-
- return valuePairs;
- }
-
- protected IParamValuePair createModeValuePair(final IWebParam webParam)
- {
- IValue value = null;
- switch (webParam.getKind())
- {
- case OUT:
- value = AnnotationFactory.createQualifiedNameValue(WPAnnotationFeatures.WEB_PARAM_MODE_OUT);
- break;
- case INOUT:
- value = AnnotationFactory.createQualifiedNameValue(WPAnnotationFeatures.WEB_PARAM_MODE_INOUT);
- break;
- default:
- return null;
- }
-
- return AnnotationFactory.createParamValuePairValue(WPAnnotationFeatures.MODE_ATTRIBUTE, value);
- }
-
- protected boolean hasParamWithSameName(final IWebParam param, final String newName)
- {
- final IWebMethod webMethod = (IWebMethod)param.eContainer();
- for (IWebParam webParam : webMethod.getParameters())
- {
- if(webParam==param) {
- continue;
- }
-
- if(webParam.getName().equals(newName)) {
- return true;
- }
- }
-
- return false;
- }
-
- @Override
- protected boolean checkValue(final Notification msg)
- {
- if(((EStructuralFeature)msg.getFeature()).getFeatureID()==DomPackage.IWEB_PARAM__TARGET_NAMESPACE) {
- return true;
- }
-
- return super.checkValue(msg);
- }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/persistence/serializer/SeiSerializerAdapter.java b/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/persistence/serializer/SeiSerializerAdapter.java
deleted file mode 100755
index a3bba49..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/persistence/serializer/SeiSerializerAdapter.java
+++ /dev/null
@@ -1,92 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.dom.runtime.persistence.serializer;
-
-import static org.eclipse.jst.ws.jaxws.utils.ContractChecker.nullCheckParam;
-
-import java.util.Set;
-
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.IJavaModel;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.IServiceEndpointInterface;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.IWebService;
-import org.eclipse.jst.ws.jaxws.dom.runtime.persistence.JaxWsWorkspaceResource;
-import org.eclipse.jst.ws.jaxws.dom.runtime.persistence.WSAnnotationFeatures;
-import org.eclipse.jst.ws.jaxws.utils.JaxWsUtils;
-import org.eclipse.jst.ws.jaxws.utils.annotations.AnnotationFactory;
-import org.eclipse.jst.ws.jaxws.utils.annotations.IAnnotation;
-import org.eclipse.jst.ws.jaxws.utils.annotations.IParamValuePair;
-
-/**
- * Adapter that on {@link IWebService} object change saves the annotation to
- * the underlying compilation unit. Uses {@link JaxWsWorkspaceResource} to define
- * if save operation is enabled.
- *
- * @author Georgi Vachkov
- */
-public class SeiSerializerAdapter extends AbstractSerializerAdapter
-{
- /**
- * Constructor
- * @param resource
- */
- public SeiSerializerAdapter(JaxWsWorkspaceResource resource) {
- super(resource);
- }
-
- @Override
- protected boolean isAnnotationRequired() {
- return true;
- }
-
- @Override
- protected IAnnotation<? extends IJavaElement> getAnnotation() throws JavaModelException
- {
- assert getTarget() instanceof IServiceEndpointInterface;
-
- return createIAnnotation((IServiceEndpointInterface)getTarget(), resource().javaModel());
- }
-
- protected IAnnotation<? extends IJavaElement> createIAnnotation(final IServiceEndpointInterface sei, final IJavaModel javaModel) throws JavaModelException
- {
- nullCheckParam(sei, "sei");//$NON-NLS-1$
- nullCheckParam(javaModel, "javaModel");//$NON-NLS-1$
-
- if (sei.isImplicit())
- {
- if (sei.getImplementingWebServices().size() == 0) {
- // the implicit SEI has already been removed from the project
- return null;
- }
-
- return new WsSerializerAdapter(resource()).createIAnnotation(sei.getImplementingWebServices().get(0), javaModel);
- }
-
- final IType type = findType(sei, sei.getImplementation());
- if (type == null) {
- // the explicit SEI has already been removed from the project
- return null;
- }
-
- final Set<IParamValuePair> paramValuePairs = createParamValueSortedTreeSet();
-
- if (sei.getName()!=null && !sei.getName().equals(JaxWsUtils.getDefaultPorttypeName(sei.getImplementation()))) {
- paramValuePairs.add(createParamValue(WSAnnotationFeatures.NAME_ATTRIBUTE, sei.getName()));
- }
- if (sei.getTargetNamespace()!=null && !sei.getTargetNamespace().equals(JaxWsUtils.composeJaxWsTargetNamespaceByPackage(type.getPackageFragment().getElementName()))) {
- paramValuePairs.add(createParamValue(WSAnnotationFeatures.TARGET_NAMESPACE_ATTRIBUTE, sei.getTargetNamespace()));
- }
-
- return AnnotationFactory.createAnnotation(WSAnnotationFeatures.WS_ANNOTATION, type, paramValuePairs);
- }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/persistence/serializer/SerializerAdapterFactory.java b/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/persistence/serializer/SerializerAdapterFactory.java
deleted file mode 100755
index 34fbb3c..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/persistence/serializer/SerializerAdapterFactory.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.dom.runtime.persistence.serializer;
-
-import static org.eclipse.jst.ws.jaxws.utils.ContractChecker.nullCheckParam;
-
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.jst.ws.jaxws.dom.runtime.persistence.IAnnotationSerializer;
-import org.eclipse.jst.ws.jaxws.dom.runtime.persistence.JaxWsWorkspaceResource;
-import org.eclipse.jst.ws.jaxws.dom.runtime.util.DomAdapterFactory;
-/**
- * Factory for serialization adapters. This factory is instantiated on construction by
- * {@link JaxWsWorkspaceResource} and it is recommended that you use the same instance
- * in case you need this factory.
- *
- * @author Georgi Vachkov
- */
-public class SerializerAdapterFactory extends DomAdapterFactory
-{
- private final JaxWsWorkspaceResource resource;
-
- /**
- * Constructor
- * @param resource
- * @throws NullPointerException in case <code>resource</code> is <code>null</code>
- */
- public SerializerAdapterFactory(final JaxWsWorkspaceResource resource)
- {
- nullCheckParam(resource, "resource");//$NON-NLS-1$
- this.resource = resource;
- }
-
- @Override
- public Adapter createIWebServiceAdapter() {
- return new WsSerializerAdapter(resource);
- }
-
- @Override
- public Adapter createIServiceEndpointInterfaceAdapter() {
- return new SeiSerializerAdapter(resource);
- }
-
- @Override
- public Adapter createIWebMethodAdapter() {
- return new MethodSerializerAdapter(resource);
- }
-
- @Override
- public Adapter createIWebParamAdapter() {
- return new ParameterSerializerAdapter(resource);
- }
-
- @Override
- public boolean isFactoryForType(Object type)
- {
- return IAnnotationSerializer.class == type;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/persistence/serializer/WsSerializerAdapter.java b/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/persistence/serializer/WsSerializerAdapter.java
deleted file mode 100755
index de1d5c1..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/persistence/serializer/WsSerializerAdapter.java
+++ /dev/null
@@ -1,108 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.dom.runtime.persistence.serializer;
-
-import java.util.Set;
-
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.IJavaModel;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.IServiceEndpointInterface;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.IWebService;
-import org.eclipse.jst.ws.jaxws.dom.runtime.persistence.JaxWsWorkspaceResource;
-import org.eclipse.jst.ws.jaxws.dom.runtime.persistence.WSAnnotationFeatures;
-import org.eclipse.jst.ws.jaxws.utils.JaxWsUtils;
-import org.eclipse.jst.ws.jaxws.utils.annotations.AnnotationFactory;
-import org.eclipse.jst.ws.jaxws.utils.annotations.IAnnotation;
-import org.eclipse.jst.ws.jaxws.utils.annotations.IParamValuePair;
-
-import static org.eclipse.jst.ws.jaxws.utils.ContractChecker.nullCheckParam;
-
-/**
- * Adapter that on {@link IWebService} object change saves the annotation to
- * the underlying compilation unit. Uses {@link JaxWsWorkspaceResource} to define
- * if save operation is enabled.
- *
- * @author Georgi Vachkov
- */
-public class WsSerializerAdapter extends AbstractSerializerAdapter
-{
- /**
- * Constructor
- * @param resource
- */
- public WsSerializerAdapter(JaxWsWorkspaceResource resource)
- {
- super(resource);
- }
-
- @Override
- protected boolean isAnnotationRequired() {
- return true;
- }
-
- @Override
- protected IAnnotation<? extends IJavaElement> getAnnotation() throws JavaModelException
- {
- assert getTarget() instanceof IWebService;
-
- return createIAnnotation((IWebService)getTarget(), resource().javaModel());
- }
-
- protected IAnnotation<? extends IJavaElement> createIAnnotation(final IWebService ws, final IJavaModel javaModel) throws JavaModelException
- {
- nullCheckParam(ws, "ws");//$NON-NLS-1$
- nullCheckParam(javaModel, "javaModel");//$NON-NLS-1$
-
- final IType type = findType(ws, ws.getImplementation());
- if (type==null) {
- return null;
- }
-
- final Set<IParamValuePair> paramValuePairs = createParamValueSortedTreeSet();
-
- final IServiceEndpointInterface sei = ws.getServiceEndpoint();
- if (sei!=null)
- {
- if (sei.isImplicit())
- {
- String seiName = sei.getName();
- if (!JaxWsUtils.getDefaultPorttypeName(sei.getImplementation()).equals(seiName)) {
- paramValuePairs.add(createParamValue(WSAnnotationFeatures.NAME_ATTRIBUTE, ws.getServiceEndpoint().getName()));
- }
- } else {
- paramValuePairs.add(createParamValue(WSAnnotationFeatures.ENDPOINT_INTERFACE_ATTRIBUTE, ws.getServiceEndpoint().getImplementation()));
- }
- }
-
- if (ws.getName()!=null &&
- !ws.getName().equals(JaxWsUtils.getDefaultServiceName(ws.getImplementation())))
- {
- paramValuePairs.add(createParamValue(WSAnnotationFeatures.SERVICE_NAME_ATTRIBUTE, ws.getName()));
- }
- if (ws.getPortName()!=null &&
- !ws.getPortName().equals(JaxWsUtils.getDefaultPortName(ws.getImplementation())))
- {
- paramValuePairs.add(createParamValue(WSAnnotationFeatures.PORT_NAME_ATTRIBUTE, ws.getPortName()));
- }
- if (ws.getTargetNamespace()!=null &&
- !ws.getTargetNamespace().equals(JaxWsUtils.composeJaxWsTargetNamespaceByPackage(type.getPackageFragment().getElementName())))
- {
- paramValuePairs.add(createParamValue(WSAnnotationFeatures.TARGET_NAMESPACE_ATTRIBUTE, ws.getTargetNamespace()));
- }
- if (ws.getWsdlLocation()!=null) {
- paramValuePairs.add(createParamValue(WSAnnotationFeatures.WSDL_LOCATION_ATTRIBUTE, ws.getWsdlLocation()));
- }
-
- return AnnotationFactory.createAnnotation(WSAnnotationFeatures.WS_ANNOTATION, type, paramValuePairs);
- }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/persistence/state/MethodPropertyStateAdapter.java b/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/persistence/state/MethodPropertyStateAdapter.java
deleted file mode 100755
index 9fa8583..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/persistence/state/MethodPropertyStateAdapter.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.dom.runtime.persistence.state;
-
-import org.eclipse.emf.common.notify.impl.AdapterImpl;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.jst.ws.jaxws.dom.runtime.IPropertyState;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.DomPackage;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.IServiceEndpointInterface;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.IWebMethod;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.IWebService;
-
-/**
- * Defines the state of web method properties. In case the method is part of
- * outside-in web service all properties are immutable.
- *
- * @author Georgi Vachkov
- */
-public class MethodPropertyStateAdapter extends AdapterImpl implements IPropertyState
-{
- public boolean isChangeable(EStructuralFeature feature)
- {
- final IWebMethod method = (IWebMethod)getTarget();
- if (isOutideInWs(method)) {
- return false;
- }
-
- switch(feature.getFeatureID())
- {
- case DomPackage.IWEB_METHOD__NAME:
- return true;
- }
-
- return false;
- }
-
- private boolean isOutideInWs(final IWebMethod method)
- {
- final IServiceEndpointInterface sei = (IServiceEndpointInterface)method.eContainer();
- if (sei==null) {
- return false;
- }
-
- for (IWebService webService : sei.getImplementingWebServices()) {
- if (webService.getWsdlLocation()!=null) {
- return true;
- }
- }
-
- return false;
- }
-
- @Override
- public boolean isAdapterForType(Object type) {
- return IPropertyState.class == type;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/persistence/state/ParameterPropertyStateAdapter.java b/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/persistence/state/ParameterPropertyStateAdapter.java
deleted file mode 100755
index 202ea73..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/persistence/state/ParameterPropertyStateAdapter.java
+++ /dev/null
@@ -1,109 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.dom.runtime.persistence.state;
-
-import org.eclipse.emf.common.notify.impl.AdapterImpl;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.jst.ws.jaxws.dom.runtime.DomUtil;
-import org.eclipse.jst.ws.jaxws.dom.runtime.IPropertyState;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.DomPackage;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.IServiceEndpointInterface;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.IWebMethod;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.IWebParam;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.SOAPBindingParameterStyle;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.SOAPBindingStyle;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.SOAPBindingUse;
-import org.eclipse.jst.ws.jaxws.dom.runtime.util.Jee5DomUtils;
-
-/**
- * Class that defines which properties for {@link IWebParam} are editable
- *
- * @author Georgi Vachkov
- */
-public class ParameterPropertyStateAdapter extends AdapterImpl implements IPropertyState
-{
- public boolean isChangeable(EStructuralFeature feature)
- {
- assert getTarget() instanceof IWebParam;
-
- final IWebParam webParam = (IWebParam)getTarget();
- if (webParam.getImplementation().equals("return")) {//$NON-NLS-1$
- return false;
- }
-
- if (isOutsideInWebService(webParam)) {
- return false;
- }
-
- switch(feature.getFeatureID())
- {
- case DomPackage.IWEB_PARAM__NAME:
- return isNameChangeable(webParam);
- case DomPackage.IWEB_PARAM__PART_NAME:
- return isPartNameChangeable(webParam);
- case DomPackage.IWEB_PARAM__TARGET_NAMESPACE:
- return isTargetNSChangeable(webParam);
- }
-
- return false;
- }
-
- protected boolean isPartNameChangeable(final IWebParam webParam)
- {
- final IWebMethod webMethod = (IWebMethod)webParam.eContainer();
-
- return (webMethod.getSoapBindingStyle()==SOAPBindingStyle.RPC &&
- webMethod.getSoapBindingUse()==SOAPBindingUse.LITERAL &&
- webMethod.getSoapBindingParameterStyle()==SOAPBindingParameterStyle.WRAPPED);
- }
-
- protected boolean isNameChangeable(final IWebParam webParam)
- {
- final IWebMethod webMethod = (IWebMethod)webParam.eContainer();
- if (isDocumentLiteralWrapped(webMethod)) {
- return true;
- }
-
- if (Jee5DomUtils.getInstance().isNameRequired(webParam)) {
- return true;
- }
-
- return webParam.isHeader();
- }
-
- protected boolean isTargetNSChangeable(final IWebParam webParam)
- {
- final IWebMethod webMethod = (IWebMethod)webParam.eContainer();
- if (isDocumentLiteralWrapped(webMethod)) {
- return true;
- }
-
- return webParam.isHeader();
- }
-
- protected boolean isDocumentLiteralWrapped(final IWebMethod webMethod)
- {
- return !(webMethod.getSoapBindingStyle()==SOAPBindingStyle.RPC ||
- webMethod.getSoapBindingUse()==SOAPBindingUse.ENCODED ||
- webMethod.getSoapBindingParameterStyle()==SOAPBindingParameterStyle.BARE);
- }
-
- protected boolean isOutsideInWebService(final IWebParam webParam)
- {
- final IServiceEndpointInterface sei = (IServiceEndpointInterface)webParam.eContainer().eContainer();
- return DomUtil.INSTANCE.isOutsideInWebService(sei);
- }
-
- @Override
- public boolean isAdapterForType(Object type) {
- return IPropertyState.class == type;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/persistence/state/PropertyStateAdapterFactory.java b/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/persistence/state/PropertyStateAdapterFactory.java
deleted file mode 100755
index 75785f7..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/persistence/state/PropertyStateAdapterFactory.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.dom.runtime.persistence.state;
-
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.jst.ws.jaxws.dom.runtime.IPropertyState;
-import org.eclipse.jst.ws.jaxws.dom.runtime.util.DomAdapterFactory;
-
-/**
- * Adapter factory for adapters implementing {@link IPropertyState} interface.
- *
- * @author Georgi Vachkov
- */
-public class PropertyStateAdapterFactory extends DomAdapterFactory
-{
- /**
- * Singleton instance for this adapter factory
- */
- public static final PropertyStateAdapterFactory INSTANCE = new PropertyStateAdapterFactory();
-
- @Override
- public boolean isFactoryForType(Object object) {
- return IPropertyState.class == object;
- }
-
- @Override
- public Adapter createIWebServiceAdapter() {
- return new WsPropertyStateAdapter();
- }
-
- @Override
- public Adapter createIServiceEndpointInterfaceAdapter() {
- return new SeiPropertyStateAdapter();
- }
-
- @Override
- public Adapter createIWebMethodAdapter() {
- return new MethodPropertyStateAdapter();
- }
-
- @Override
- public Adapter createIWebParamAdapter(){
- return new ParameterPropertyStateAdapter();
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/persistence/state/SeiPropertyStateAdapter.java b/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/persistence/state/SeiPropertyStateAdapter.java
deleted file mode 100755
index 6bcc6c4..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/persistence/state/SeiPropertyStateAdapter.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.dom.runtime.persistence.state;
-
-import org.eclipse.emf.common.notify.impl.AdapterImpl;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.jst.ws.jaxws.dom.runtime.IPropertyState;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.DomPackage;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.IServiceEndpointInterface;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.IWebService;
-
-/**
- * {@link IPropertyState} adapter for {@link IServiceEndpointInterface} objects.
- *
- * @author Georgi Vachkov
- */
-public class SeiPropertyStateAdapter extends AdapterImpl implements IPropertyState
-{
- public boolean isChangeable(EStructuralFeature feature)
- {
- if (!(getTarget() instanceof IServiceEndpointInterface)) {
- return false;
- }
-
- final IServiceEndpointInterface sei = (IServiceEndpointInterface)getTarget();
- if (isOutsideInWs(sei)) {
- return false;
- }
-
- switch(feature.getFeatureID())
- {
- case DomPackage.ISERVICE_ENDPOINT_INTERFACE__NAME:
- return true;
- case DomPackage.ISERVICE_ENDPOINT_INTERFACE__TARGET_NAMESPACE:
- return !sei.isImplicit();
- }
-
- return false;
- }
-
- protected boolean isOutsideInWs(IServiceEndpointInterface sei)
- {
- for (IWebService webService : sei.getImplementingWebServices()) {
- if (webService.getWsdlLocation()!=null) {
- return true;
- }
- }
-
- return false;
- }
-
- @Override
- public boolean isAdapterForType(Object type) {
- return IPropertyState.class == type;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/persistence/state/WsPropertyStateAdapter.java b/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/persistence/state/WsPropertyStateAdapter.java
deleted file mode 100755
index c703eb8..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/persistence/state/WsPropertyStateAdapter.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.dom.runtime.persistence.state;
-
-import org.eclipse.emf.common.notify.impl.AdapterImpl;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.jst.ws.jaxws.dom.runtime.IPropertyState;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.DomPackage;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.IWebService;
-
-/**
- * {@link IPropertyState} adapter for {@link IWebService} objects.
- *
- * @author Georgi Vachkov
- */
-public class WsPropertyStateAdapter extends AdapterImpl implements IPropertyState
-{
- public boolean isChangeable(final EStructuralFeature feature)
- {
- if (!(getTarget() instanceof IWebService)) {
- return false;
- }
-
- if (isOutsideInWs((IWebService)getTarget())) {
- return false;
- }
-
- switch(feature.getFeatureID())
- {
- case DomPackage.IWEB_SERVICE__NAME:
- return true;
- case DomPackage.IWEB_SERVICE__PORT_NAME:
- return true;
- case DomPackage.IWEB_SERVICE__TARGET_NAMESPACE:
- return true;
- }
-
- return false;
- }
-
- protected boolean isOutsideInWs(final IWebService ws)
- {
- return ws.getWsdlLocation() != null;
- }
-
- @Override
- public boolean isAdapterForType(Object type) {
- return IPropertyState.class == type;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/persistence/sync/AbstractMethodSynchronizer.java b/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/persistence/sync/AbstractMethodSynchronizer.java
deleted file mode 100755
index 45d3d2b..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/persistence/sync/AbstractMethodSynchronizer.java
+++ /dev/null
@@ -1,218 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.dom.runtime.persistence.sync;
-
-import static org.eclipse.jst.ws.jaxws.dom.runtime.persistence.SBAnnotationFeatures.SB_ANNOTATION;
-import static org.eclipse.jst.ws.jaxws.dom.runtime.persistence.WMAnnotationFeatures.WM_ANNOTATION;
-import static org.eclipse.jst.ws.jaxws.dom.runtime.persistence.WMAnnotationFeatures.WM_EXCLUDED_ATTRIBUTE;
-import static org.eclipse.jst.ws.jaxws.dom.runtime.persistence.WMAnnotationFeatures.WM_NAME_ATTRIBUTE;
-
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.LinkedList;
-
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.ITypeHierarchy;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.DomPackage;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.IServiceEndpointInterface;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.IWebMethod;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.SOAPBindingParameterStyle;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.SOAPBindingStyle;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.SOAPBindingUse;
-import org.eclipse.jst.ws.jaxws.dom.runtime.persistence.IAnnotationSerializer;
-import org.eclipse.jst.ws.jaxws.dom.runtime.persistence.IModelElementSynchronizer;
-import org.eclipse.jst.ws.jaxws.dom.runtime.persistence.SBAnnotationFeatures;
-import org.eclipse.jst.ws.jaxws.utils.annotations.IAnnotation;
-import org.eclipse.jst.ws.jaxws.utils.annotations.IAnnotationInspector;
-
-
-public abstract class AbstractMethodSynchronizer extends ElementSynchronizerImpl
-{
- private ParameterSynchronizer parameterSynchronizer = new ParameterSynchronizer(this);
-
- protected interface IMethodVisitor
- {
- void visit(IMethod method, IAnnotationInspector inspector) throws JavaModelException;
- }
-
- public AbstractMethodSynchronizer(IModelElementSynchronizer parent)
- {
- super(parent);
- }
-
- protected abstract void visitExposableMethods(IMethodVisitor visitor, ITypeHierarchy hierarchy, IAnnotationInspector inspector) throws JavaModelException;
-
- public void synchronizeMethods(final IServiceEndpointInterface sei, final IType seiType, final IAnnotationInspector inspector) throws JavaModelException
- {
- final Collection<IWebMethod> mergedMethods = new LinkedList<IWebMethod>();
- final ITypeHierarchy hierarchy = seiType.newSupertypeHierarchy(null);
- final IMethodVisitor visitor = new IMethodVisitor()
- {
- public void visit(IMethod method, IAnnotationInspector inspector) throws JavaModelException
- {
- final IWebMethod wm = obtainInstance(sei, method);
- if (mergedMethods.contains(wm))
- {
- /**
- * check whether this method has been processed in some of the child classes. If so
- * skip it and continue. Only the method in the last child declaring this method needs
- * to be processed because each child is overriding the properties for the every overriden
- * method.
- */
- return;
- }
- mergeMethod(wm, method, inspector);
- mergedMethods.add(wm);
- }
- };
- visitExposableMethods(visitor, hierarchy, inspector);
- removeLeftMethods(sei, mergedMethods);
-
- }
-
- private IWebMethod obtainInstance(IServiceEndpointInterface sei, IMethod method) throws JavaModelException
- {
- for (IWebMethod wm : sei.getWebMethods())
- {
- if (util().calcImplementation(method).equals(wm.getImplementation()))
- {
- return wm;
- }
- }
- final IWebMethod newWebMethod = domFactory().createIWebMethod();
- sei.getWebMethods().add(newWebMethod);
- util().setFeatureValue(newWebMethod, DomPackage.IWEB_METHOD__IMPLEMENTATION, util().calcImplementation(method));
- return newWebMethod;
- }
-
- private void mergeMethod(IWebMethod wm, IMethod m, IAnnotationInspector inspector) throws JavaModelException
- {
- final IAnnotation<IMethod> wmAnnotation = inspector.inspectMethod(m, WM_ANNOTATION);
- final boolean excluded;
- final String name;
- if (wmAnnotation == null)
- {
- excluded = false;
- name = m.getElementName();
- } else
- {
- excluded = wmAnnotation.getPropertyValue(WM_EXCLUDED_ATTRIBUTE) == null ? false : Boolean.parseBoolean(wmAnnotation
- .getPropertyValue(WM_EXCLUDED_ATTRIBUTE));
- name = wmAnnotation.getPropertyValue(WM_NAME_ATTRIBUTE) == null ? m.getElementName() : wmAnnotation.getPropertyValue(WM_NAME_ATTRIBUTE);
- }
- if (!name.equals(wm.getName()))
- {
- util().setFeatureValue(wm, DomPackage.IWEB_METHOD__NAME, name);
- }
- if (excluded != wm.isExcluded())
- {
- util().setFeatureValue(wm, DomPackage.IWEB_METHOD__EXCLUDED, excluded);
- }
- mergeSoapBinding(wm, m, inspector);
- parameterSynchronizer.synchronizeParameters(wm, m, inspector);
-
- resource().getSerializerFactory().adapt(wm, IAnnotationSerializer.class);
- adaptToLocationInterface(wm, WM_ANNOTATION, wmAnnotation);
- }
-
- private void mergeSoapBinding(final IWebMethod webMethod, final IMethod method, final IAnnotationInspector inspector) throws JavaModelException
- {
- final IAnnotation<IMethod> sbAnnotation = inspector.inspectMethod(method, SB_ANNOTATION);
- final IAnnotation<IType> seiSbAnnotation = inspector.inspectType(SB_ANNOTATION);
-
- final SOAPBindingStyle style = defineSBStyle(sbAnnotation, seiSbAnnotation);
- if (webMethod.getSoapBindingStyle() != style) {
- webMethod.setSoapBindingStyle(style);
- }
-
- final SOAPBindingUse use = defineSBUse(sbAnnotation, seiSbAnnotation);
- if (webMethod.getSoapBindingUse() != use) {
- webMethod.setSoapBindingUse(use);
- }
-
- final SOAPBindingParameterStyle paramStyle =defineSBParameterStyle(sbAnnotation, seiSbAnnotation);
- if (webMethod.getSoapBindingParameterStyle() != paramStyle) {
- webMethod.setSoapBindingParameterStyle(paramStyle);
- }
-
- adaptToLocationInterface(webMethod, SB_ANNOTATION, sbAnnotation);
- }
-
- private SOAPBindingStyle defineSBStyle(final IAnnotation<IMethod> methodSBAnnotation, final IAnnotation<IType> seiSbAnnotation)
- {
- final String value = methodSBAnnotation!=null ? methodSBAnnotation.getPropertyValue(SBAnnotationFeatures.STYLE_ATTRIBUTE) : null;
- if(value==null) {
- return defCalc().defineSBStyle(seiSbAnnotation);
- }
-
- if (SBAnnotationFeatures.SB_STYLE_RPC.endsWith(value)) {
- return SOAPBindingStyle.RPC;
- }
-
- if(SBAnnotationFeatures.SB_STYLE_DOCUMENT.endsWith(value)) {
- return SOAPBindingStyle.DOCUMENT;
- }
-
- return defCalc().defineSBStyle(seiSbAnnotation);
- }
-
- private SOAPBindingUse defineSBUse(final IAnnotation<IMethod> methodSBAnnotation, final IAnnotation<IType> seiSbAnnotation)
- {
- final String value = methodSBAnnotation!=null ? methodSBAnnotation.getPropertyValue(SBAnnotationFeatures.USE_ATTRIBUTE) : null;
- if (value==null) {
- return defCalc().defineSBUse(seiSbAnnotation);
- }
-
- if (SBAnnotationFeatures.SB_USE_ENCODED.endsWith(value)) {
- return SOAPBindingUse.ENCODED;
- }
-
- if (SBAnnotationFeatures.SB_USE_LITERAL.endsWith(value)) {
- return SOAPBindingUse.LITERAL;
- }
-
- return defCalc().defineSBUse(seiSbAnnotation);
- }
-
- private SOAPBindingParameterStyle defineSBParameterStyle(final IAnnotation<IMethod> methodSBAnnotation, final IAnnotation<IType> seiSbAnnotation)
- {
- final String value = methodSBAnnotation!=null ? methodSBAnnotation.getPropertyValue(SBAnnotationFeatures.PARAMETER_STYLE_ATTRIBUTE) : null;
- if (value==null) {
- return defCalc().defineSBParameterStyle(seiSbAnnotation);
- }
-
- if (SBAnnotationFeatures.SB_PARAMETER_STYLE_BARE.endsWith(value)) {
- return SOAPBindingParameterStyle.BARE;
- }
-
- if (SBAnnotationFeatures.SB_PARAMETER_STYLE_WRAPPED.endsWith(value)) {
- return SOAPBindingParameterStyle.WRAPPED;
- }
-
- return defCalc().defineSBParameterStyle(seiSbAnnotation);
- }
-
- private void removeLeftMethods(IServiceEndpointInterface sei, Collection<IWebMethod> mergedMethods)
- {
- final Iterator<IWebMethod> iter = sei.getWebMethods().iterator();
- while (iter.hasNext())
- {
- if (!mergedMethods.contains(iter.next()))
- {
- iter.remove();
- }
- }
- }
-
-
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/persistence/sync/AbstractModelSynchronizer.java b/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/persistence/sync/AbstractModelSynchronizer.java
deleted file mode 100755
index ac2333d..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/persistence/sync/AbstractModelSynchronizer.java
+++ /dev/null
@@ -1,259 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.dom.runtime.persistence.sync;
-
-import static org.eclipse.jst.ws.jaxws.dom.runtime.persistence.WSAnnotationFeatures.WS_ANNOTATION;
-
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.LinkedList;
-
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IJavaModel;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jst.ws.jaxws.dom.runtime.DomUtil;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.DomFactory;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.DomPackage;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.IDOM;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.IServiceEndpointInterface;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.IWebService;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.IWebServiceProject;
-import org.eclipse.jst.ws.jaxws.dom.runtime.persistence.ICompilationUnitHandler;
-import org.eclipse.jst.ws.jaxws.dom.runtime.persistence.IModelElementSynchronizer;
-import org.eclipse.jst.ws.jaxws.dom.runtime.persistence.JaxWsWorkspaceResource;
-import org.eclipse.jst.ws.jaxws.dom.runtime.persistence.JaxWsWorkspaceResource.ServiceModelData;
-import org.eclipse.jst.ws.jaxws.utils.annotations.IAnnotation;
-import org.eclipse.jst.ws.jaxws.utils.annotations.IAnnotationInspector;
-import org.eclipse.jst.ws.jaxws.utils.logging.ILogger;
-
-public abstract class AbstractModelSynchronizer implements IModelElementSynchronizer
-{
- private final SeiSynchronizer seiLoader;
-
- private final WsSynchronizer wsLoader;
-
- private final JaxWsWorkspaceResource resource;
-
- private IDOM domBeingLoaded;
-
- private final ServiceModelData serviceData;
-
- private final DomUtil util;
-
- public AbstractModelSynchronizer(JaxWsWorkspaceResource resource, ServiceModelData serviceData)
- {
- this.resource = resource;
- this.util = new DomUtil();
- this.serviceData = serviceData;
- this.seiLoader = new SeiSynchronizer(this);
- this.wsLoader = new WsSynchronizer(this);
- }
-
- public DomFactory domFactory()
- {
- return DomFactory.eINSTANCE;
- }
-
- public IDOM getDomBeingLoaded()
- {
- if (domBeingLoaded == null)
- {
- domBeingLoaded = domFactory().createIDOM();
- }
- return domBeingLoaded;
- }
-
- public IJavaModel javaModel()
- {
- return resource.javaModel();
- }
-
- public ILogger logger()
- {
- return resource.logger();
- }
-
- public JaxWsWorkspaceResource resource()
- {
- return resource;
- }
-
- public ServiceModelData serviceData()
- {
- return serviceData;
- }
-
- public DomUtil util()
- {
- return util;
- }
-
- protected void processCompilationUnit(final IWebServiceProject wsProject, final ICompilationUnit cu) throws JavaModelException
- {
- try {
- resource.disableSaving();
-
- if (cu.findPrimaryType() == null || !(cu.findPrimaryType().isInterface() || cu.findPrimaryType().isClass()))
- {
- if (logger().isDebug())
- {
- logger().logDebug("no primary type in compilation unit" + cu.getPath().toOSString());//$NON-NLS-1$
- }
- return;
- }
-
- final IAnnotationInspector inspector = resource().newAnnotationInspector(cu.findPrimaryType());
- final IAnnotation<IType> wsAnnotation = inspector.inspectType(WS_ANNOTATION);
- if (wsAnnotation == null)
- {
- if (logger().isDebug())
- {
- logger().logDebug("no " + WS_ANNOTATION + " annotation found on type " + cu.findPrimaryType().getFullyQualifiedName());//$NON-NLS-1$//$NON-NLS-2$
- }
- return;
- }
-
- recordHierarchy(cu.findPrimaryType());
-
- if (wsAnnotation.getAppliedElement().isInterface())
- {
- // handle class changed to interface
- removeWsModelElements(wsProject, wsAnnotation.getAppliedElement().getFullyQualifiedName(), false);
-
- seiLoader.synchronizeInterface(wsProject, wsAnnotation, inspector);
- } else if (wsAnnotation.getAppliedElement().isClass())
- {
- // handle interface changed to class
- removeSeiModelElements(wsProject, wsAnnotation.getAppliedElement().getFullyQualifiedName(), false, true);
-
- // if the annotation has changed and endpointInterface has been added the existing
- // SEI in the project should be removed
- final IWebService ws = wsLoader.synchronizeWebService(wsProject, wsAnnotation, inspector);
- if (ws!=null && (ws.getServiceEndpoint()==null || !ws.getServiceEndpoint().isImplicit())) {
- removeSeiModelElements(wsProject, ws.getImplementation(), false, false);
- }
- } else
- {
- if (logger().isDebug())
- {
- logger().logDebug("annotation " + WS_ANNOTATION + " is put on type "//$NON-NLS-1$//$NON-NLS-2$
- + wsAnnotation.getAppliedElement().getFullyQualifiedName()
- + "which is neither interface, nor a class. Ignorring!");//$NON-NLS-1$
- }
- }
- } finally {
- resource.enableSaving();
- }
- }
-
- /**
- * Removes web services from the model.
- * @param wsProject
- * @param implBaseName
- */
- protected void removeWsModelElements(final IWebServiceProject wsProject, final String implBaseName, final boolean isForPackage)
- {
- final Iterator<IWebService> wsIter = wsProject.getWebServices().iterator();
- while (wsIter.hasNext())
- {
- final IWebService ws = wsIter.next();
- if (ws.getImplementation().equals(implBaseName) ||
- (isForPackage && ws.getImplementation().startsWith(implBaseName)))
- {
- serviceData().clearHierarchy(ws.getImplementation());
- wsIter.remove();
- if (ws.getServiceEndpoint() != null)
- {
- ws.getServiceEndpoint().getImplementingWebServices().remove(ws);
- }
- serviceData().unmap(ws);
- }
- }
- }
-
- /**
- * Removes SEI's with <code>implBaseName</code> implementation from the model.
- * @param wsProject
- * @param implBaseName
- * @param onlyExplicit if <code>true</code> implicit interfaces are not removed from model, otherwise both are removed.
- */
- protected void removeSeiModelElements(final IWebServiceProject wsProject, final String implBaseName, final boolean isForPackage, final boolean onlyExplicit)
- {
- final Iterator<IServiceEndpointInterface> seiIter = wsProject.getServiceEndpointInterfaces().iterator();
- while (seiIter.hasNext())
- {
- final IServiceEndpointInterface sei = seiIter.next();
- if (sei.getImplementation().equals(implBaseName) ||
- (isForPackage && sei.getImplementation().startsWith(implBaseName)))
- {
- if ((onlyExplicit && sei.isImplicit())) {
- continue;
- }
- serviceData().clearHierarchy(sei.getImplementation());
- sei.getImplementingWebServices().clear();
- seiIter.remove();
- }
- }
- }
-
- void recordHierarchy(IType type) throws JavaModelException
- {
- final Collection<ICompilationUnit> compilationUnits = new LinkedList<ICompilationUnit>();
-
- for (IType superType : type.newSupertypeHierarchy(null).getAllSupertypes(type)) {
- compilationUnits.add(superType.getCompilationUnit());
- }
-
- serviceData().recordHierarchy(type.getFullyQualifiedName(), compilationUnits);
- }
-
-
- protected IWebServiceProject createProject(final IJavaProject jprj)
- {
- final IWebServiceProject thisProject = domFactory().createIWebServiceProject();
- util().setFeatureValue(thisProject, DomPackage.IWEB_SERVICE_PROJECT__NAME, jprj.getElementName());
-
- util().addToCollectionFeature(getDomBeingLoaded(), DomPackage.IDOM__WEB_SERVICE_PROJECTS, thisProject);
- return thisProject;
- }
-
- protected class LoaderCompilationUnitHandler implements ICompilationUnitHandler
- {
- public void started()
- {
- }
-
- public void finished()
- {
- resource().getContents().add(getDomBeingLoaded());
- }
-
- protected IWebServiceProject wsProject;
-
- public void handle(final IJavaProject jprj)
- {
- wsProject = createProject(jprj);
- }
-
- public void handle(final ICompilationUnit cu)
- {
- try
- {
- processCompilationUnit(wsProject, cu);
- } catch (JavaModelException jme)
- {
- logger().logError("Unable to parse the content of compilation unit" + cu.getPath().toOSString(), jme); //$NON-NLS-1$
- }
- }
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/persistence/sync/ElementSynchronizerImpl.java b/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/persistence/sync/ElementSynchronizerImpl.java
deleted file mode 100755
index 0f81949..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/persistence/sync/ElementSynchronizerImpl.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.dom.runtime.persistence.sync;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.IJavaModel;
-import org.eclipse.jst.ws.jaxws.dom.runtime.DomUtil;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.DomFactory;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.IDOM;
-import org.eclipse.jst.ws.jaxws.dom.runtime.persistence.IModelElementSynchronizer;
-import org.eclipse.jst.ws.jaxws.dom.runtime.persistence.JaxWsDefaultsCalculator;
-import org.eclipse.jst.ws.jaxws.dom.runtime.persistence.JaxWsWorkspaceResource;
-import org.eclipse.jst.ws.jaxws.dom.runtime.persistence.JaxWsWorkspaceResource.ServiceModelData;
-import org.eclipse.jst.ws.jaxws.dom.runtime.persistence.annotation.AnnotationAdapterFactory;
-import org.eclipse.jst.ws.jaxws.dom.runtime.persistence.annotation.IAnnotationAdapter;
-import org.eclipse.jst.ws.jaxws.utils.annotations.IAnnotation;
-import org.eclipse.jst.ws.jaxws.utils.logging.ILogger;
-
-class ElementSynchronizerImpl implements IModelElementSynchronizer
-{
-
- private final IModelElementSynchronizer parent;
- private final DomUtil util;
- private final JaxWsDefaultsCalculator defaultsCalculator;
-
- ElementSynchronizerImpl(IModelElementSynchronizer parent)
- {
- this.parent = parent;
- util = new DomUtil();
- defaultsCalculator = new JaxWsDefaultsCalculator();
- }
-
- public DomUtil util() {
- return util;
- }
-
- public JaxWsDefaultsCalculator defCalc() {
- return defaultsCalculator;
- }
-
- public ServiceModelData serviceData()
- {
- return parent.serviceData();
- }
-
- public ILogger logger()
- {
- return parent.logger();
- }
-
- public IDOM getDomBeingLoaded()
- {
- return parent.getDomBeingLoaded();
- }
-
- public DomFactory domFactory()
- {
- return parent.domFactory();
- }
-
- public IJavaModel javaModel()
- {
- return parent.javaModel();
- }
-
- public JaxWsWorkspaceResource resource()
- {
- return parent.resource();
- }
-
- public void adaptToLocationInterface(final EObject object, final String annFQName, final IAnnotation<? extends IJavaElement> annotation)
- {
- final IAnnotationAdapter locator = (IAnnotationAdapter)AnnotationAdapterFactory.INSTANCE.adapt(object, IAnnotationAdapter.class);
- locator.addAnnotation(annFQName, annotation);
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/persistence/sync/InitialModelSynchronizer.java b/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/persistence/sync/InitialModelSynchronizer.java
deleted file mode 100755
index 4bb01b9..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/persistence/sync/InitialModelSynchronizer.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.dom.runtime.persistence.sync;
-
-import java.util.Map;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.WsDOMLoadCanceledException;
-import org.eclipse.jst.ws.jaxws.dom.runtime.persistence.JaxWsWorkspaceResource;
-import org.eclipse.jst.ws.jaxws.dom.runtime.persistence.JaxWsWorkspaceResource.ServiceModelData;
-
-public class InitialModelSynchronizer extends AbstractModelSynchronizer
-{
- public InitialModelSynchronizer(JaxWsWorkspaceResource resource, ServiceModelData serviceData)
- {
- super(resource, serviceData);
- }
-
- public void load(Map<?,?> options, IProgressMonitor monitor) throws CoreException, WsDOMLoadCanceledException
- {
- try {
- resource().disableSaving();
- resource().newCompilationUnitFinder(resource().javaModel(), resource().getProjectSelectors()).
- find(monitor, new LoaderCompilationUnitHandler());
- } finally {
- resource().enableSaving();
- }
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/persistence/sync/OnEventModelSynchronizer.java b/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/persistence/sync/OnEventModelSynchronizer.java
deleted file mode 100755
index 72ece1e..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/persistence/sync/OnEventModelSynchronizer.java
+++ /dev/null
@@ -1,416 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.dom.runtime.persistence.sync;
-
-import static org.eclipse.jst.ws.jaxws.dom.runtime.persistence.WSAnnotationFeatures.WS_ANNOTATION;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jdt.core.ElementChangedEvent;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IElementChangedListener;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.IJavaElementDelta;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IPackageFragment;
-import org.eclipse.jdt.core.IPackageFragmentRoot;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.IDOM;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.IJavaWebServiceElement;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.IServiceEndpointInterface;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.IWebService;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.IWebServiceProject;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.WsDOMLoadCanceledException;
-import org.eclipse.jst.ws.jaxws.dom.runtime.persistence.ICompilationUnitFinder;
-import org.eclipse.jst.ws.jaxws.dom.runtime.persistence.IProjectSelector;
-import org.eclipse.jst.ws.jaxws.dom.runtime.persistence.JaxWsWorkspaceResource;
-import org.eclipse.jst.ws.jaxws.dom.runtime.persistence.WorkspaceCUFinder;
-import org.eclipse.jst.ws.jaxws.dom.runtime.persistence.JaxWsWorkspaceResource.ServiceModelData;
-import org.eclipse.jst.ws.jaxws.utils.annotations.IAnnotation;
-
-public class OnEventModelSynchronizer extends AbstractModelSynchronizer implements IElementChangedListener
-{
-
- @Override
- public IDOM getDomBeingLoaded()
- {
- return resource().getDOM();
- }
-
- public OnEventModelSynchronizer(JaxWsWorkspaceResource resource, ServiceModelData serviceData)
- {
- super(resource, serviceData);
- }
-
- public void elementChanged(final ElementChangedEvent event)
- {
- try
- {
- if (logger().isDebug())
- {
- logger().logDebug("ElementChangedEvent has been delivered. Event details: " + event.toString());//$NON-NLS-1$
- }
-
- // no processing if DOM load has been canceled
- if (resource().isLoadCnaceled()) {
- return;
- }
-
- resource().disableSaving();
-
- // handles ElementChangedEvent.POST_RECONCILE - the case when the editor sends reconcile event
- if (event.getType() == ElementChangedEvent.POST_RECONCILE)
- {
- handleReconcileEvent(event);
- }
-
- // handles ElementChangedEvent.POST_CHANGE - the case when the compilation unit has been changed
- if (event.getDelta().getElement() != resource().javaModel())
- {
- return;
- }
-
- assert (event.getDelta().getFlags() & (IJavaElementDelta.F_CHILDREN | IJavaElementDelta.F_CONTENT)) != 0;
- for (IJavaElementDelta child : event.getDelta().getAffectedChildren())
- {
- if (child.getElement() instanceof IJavaProject)
- {
- handleChangedProject(child);
- }
- }
- }
- catch (CoreException ce) {
- logger().logError("Unable to synchronize Web Service model upon java element delta "+ event.getDelta(), ce); //$NON-NLS-1$
- }
- catch (WsDOMLoadCanceledException e) {
- logger().logError("Unable to synchronize Web Service model upon java element delta " + event.getDelta(), e); //$NON-NLS-1$
- }
- finally {
- resource().enableSaving();
- }
- }
-
- protected void handleReconcileEvent(final ElementChangedEvent event) throws JavaModelException
- {
- if(!(event.getDelta().getElement() instanceof ICompilationUnit )) {
- return;
- }
-
- int requiredFlags = IJavaElementDelta.F_CONTENT | IJavaElementDelta.F_CHILDREN;
-
- if ((event.getDelta().getFlags() & requiredFlags) == 0) {
- return;
- }
-
- final ICompilationUnit cu = (ICompilationUnit)event.getDelta().getElement();
- if (!resource().approveProject(cu.getJavaProject())) {
- return;
- }
-
- if (isJavaResource(cu)) {
- handleChangedContentCompilationUnit(cu);
- }
- }
-
- private boolean isJavaResource(ICompilationUnit cu) throws JavaModelException
- {
- IJavaElement javaElement = cu;
- while ((javaElement = javaElement.getParent()) != null)
- {
- if (!javaElement.exists()) {
- return false;
- }
- }
-
- return true;
- }
-
- void handleChangedProject(IJavaElementDelta projectDelta) throws CoreException, WsDOMLoadCanceledException
- {
- assert (projectDelta.getElement() instanceof IJavaProject);
-
- if ((((projectDelta.getFlags() & IJavaElementDelta.F_CLOSED) != 0) || projectDelta.getKind() == IJavaElementDelta.REMOVED)
- && null != util().findProjectByName(getDomBeingLoaded(), projectDelta.getElement().getElementName()))
- {
- //if the project has been closed then it's facet's could not be read. Thus the approve method
- //will always return false. That's why we check if the project has already been in the
- handleClosedProject(projectDelta);
- }
- if (!resource().approveProject((IJavaProject)projectDelta.getElement()))
- {
- return;
- }
- if (((projectDelta.getFlags() & IJavaElementDelta.F_OPENED) != 0) || projectDelta.getKind() == IJavaElementDelta.ADDED)
- {
- handleOpenedProject(projectDelta);
- }
-
- for (IJavaElementDelta childDelta : projectDelta.getAffectedChildren())
- {
- if (!(childDelta.getElement() instanceof IPackageFragmentRoot))
- {
- continue;
- }
- if ((childDelta.getFlags() & IJavaElementDelta.F_ADDED_TO_CLASSPATH) != 0)
- {
- handleClosedProject(projectDelta);
- handleOpenedProject(projectDelta);
- }
- if ((childDelta.getFlags() & IJavaElementDelta.F_REMOVED_FROM_CLASSPATH) != 0)
- {
- handleClosedProject(projectDelta);
- handleOpenedProject(projectDelta);
- }
- if ((childDelta.getFlags() & IJavaElementDelta.F_CHILDREN) != 0)
- {
- recursevilyHandleRemovedPackages(childDelta);
- recursevilyHandleAddedPackages(childDelta);
- recursevilyHandleCompilationUnits(childDelta);
- }
- }
- }
-
- protected void recursevilyHandleAddedPackages(IJavaElementDelta rootDelta) throws JavaModelException
- {
- final IWebServiceProject wsPrj = findProjectByDelta(rootDelta);
- if (wsPrj == null) {
- return;
- }
-
- for (IJavaElementDelta childDelta : rootDelta.getAffectedChildren())
- {
- if (childDelta.getElement() instanceof IPackageFragment && childDelta.getKind() == IJavaElementDelta.ADDED)
- {
- for (ICompilationUnit cu : ((IPackageFragment)childDelta.getElement()).getCompilationUnits())
- {
- processCompilationUnit(wsPrj, cu);
- }
- recursevilyHandleAddedPackages(childDelta);
- }
- }
- }
-
- protected IWebServiceProject findProjectByDelta(IJavaElementDelta rootDelta) {
- return util().findProjectByName(getDomBeingLoaded(), rootDelta.getElement().getJavaProject().getElementName());
- }
-
- private void recursevilyHandleRemovedPackages(IJavaElementDelta rootDelta) throws JavaModelException
- {
-
- for (IJavaElementDelta childDelta : rootDelta.getAffectedChildren())
- {
- if (childDelta.getElement() instanceof IPackageFragment)
- {
- if (childDelta.getKind() == IJavaElementDelta.REMOVED)
- {
- final IWebServiceProject wsPrj = findProjectByDelta(rootDelta);
- if (wsPrj != null) {
- removeModelElements(wsPrj, childDelta.getElement().getElementName(), true);
- }
- } else
- {
- recursevilyHandleRemovedPackages(childDelta);
- }
- }
- }
- }
-
- private void handleOpenedProject(IJavaElementDelta projectDelta) throws CoreException, WsDOMLoadCanceledException
- {
- assert projectDelta.getElement() instanceof IJavaProject;
- final IJavaProject changedProject = (IJavaProject) projectDelta.getElement();
- newProjectCUFinder(changedProject).find(null, new LoaderCompilationUnitHandler());
- }
-
- private void handleClosedProject(IJavaElementDelta projectDelta) throws CoreException
- {
- assert projectDelta.getElement() instanceof IJavaProject;
- final IWebServiceProject wsPrj = util().findProjectByName(getDomBeingLoaded(), projectDelta.getElement().getElementName());
- if (wsPrj==null) {
- return;
- }
-
- for (IServiceEndpointInterface sei : wsPrj.getServiceEndpointInterfaces())
- {
- sei.getImplementingWebServices().clear();
- }
- for (IWebService ws : wsPrj.getWebServices())
- {
- serviceData().unmap(ws);
- }
- getDomBeingLoaded().getWebServiceProjects().remove(wsPrj);
- }
-
- private ICompilationUnitFinder newProjectCUFinder(final IJavaProject prj)
- {
- return new WorkspaceCUFinder(resource().javaModel(), new IProjectSelector[] { new IProjectSelector()
- {
- public boolean approve(IJavaProject toApprove)
- {
- return prj.getElementName().equals(toApprove.getElementName());
- }
- } });
- }
-
- // handles compilation units - skips working copies
- private void recursevilyHandleCompilationUnits(IJavaElementDelta delta)
- {
- if (delta.getElement() instanceof ICompilationUnit)
- {
- final ICompilationUnit cu = (ICompilationUnit) delta.getElement();
- if (util().findProjectByName(getDomBeingLoaded(), cu.getJavaProject().getElementName())==null)
- {
- return;
- }
-
- try
- {
- if (delta.getKind() == IJavaElementDelta.ADDED && (delta.getFlags() & IJavaElementDelta.F_MOVED_FROM) == 0)
- {
- handleAddedCompilationUnit(cu);
- }
- if (delta.getKind() == IJavaElementDelta.REMOVED && (delta.getFlags() & IJavaElementDelta.F_MOVED_TO) == 0)
- {
- handleRemovedCompilationUnit(cu);
- }
- if (delta.getKind() == IJavaElementDelta.REMOVED && (delta.getFlags() & IJavaElementDelta.F_MOVED_TO) != 0)
- {
- handleMovedToCompilationUnit(cu, (ICompilationUnit) delta.getMovedToElement());
- }
- if (delta.getKind() == IJavaElementDelta.CHANGED &&
- ((delta.getFlags() & IJavaElementDelta.F_PRIMARY_RESOURCE) != 0) ||
- ((delta.getFlags() & IJavaElementDelta.F_PRIMARY_WORKING_COPY) != 0))
- {
- handleChangedContentCompilationUnit(cu);
- }
- } catch (JavaModelException jme)
- {
- logger().logError("Unable to parse the content of compilation unit" + delta.getElement(), jme); //$NON-NLS-1$
- }
- } else
- {
- for (IJavaElementDelta childDelta : delta.getAffectedChildren())
- {
- recursevilyHandleCompilationUnits(childDelta);
- }
- }
- }
-
- private void handleChangedContentCompilationUnit(ICompilationUnit cu) throws JavaModelException
- {
- final IType type = cu.findPrimaryType();
- final IAnnotation<IType> annotation = type==null ? null : resource().newAnnotationInspector(type).inspectType(WS_ANNOTATION);
- if (type == null || annotation == null)
- {
- updateSubclassingWSElements(cu);
- handleRemovedCompilationUnit(cu);
- } else
- {
- final IWebServiceProject wsProject = util().findProjectByName(getDomBeingLoaded(), cu.getJavaProject().getElementName());
- assert wsProject != null;
- processCompilationUnit(wsProject, cu);
- }
- }
-
- private void updateSubclassingWSElements(ICompilationUnit cu) throws JavaModelException
- {
- for (IWebServiceProject wsPrj : getDomBeingLoaded().getWebServiceProjects())
- {
- final IJavaProject javaPrj = javaModel().getJavaProject(wsPrj.getName());
- for (IServiceEndpointInterface sei : wsPrj.getServiceEndpointInterfaces())
- {
- if(serviceData().getHierarchy(sei.getImplementation())==null) {
- continue;
- }
- if (serviceData().getHierarchy(sei.getImplementation()).contains(cu))
- {
- processCompilationUnit(wsPrj, javaPrj.findType(sei.getImplementation()).getCompilationUnit());
- }
- }
- for (IWebService ws : wsPrj.getWebServices())
- {
- if(serviceData().getHierarchy(ws.getImplementation())==null) {
- continue;
- }
- if (serviceData().getHierarchy(ws.getImplementation()).contains(cu))
- {
- processCompilationUnit(wsPrj, javaPrj.findType(ws.getImplementation()).getCompilationUnit());
- }
- }
- }
- }
-
- private void handleAddedCompilationUnit(ICompilationUnit addedCU) throws JavaModelException
- {
- final IWebServiceProject wsPrj = util().findProjectByName(getDomBeingLoaded(), addedCU.getJavaProject().getElementName());
- this.processCompilationUnit(wsPrj, addedCU);
- }
-
- void handleMovedToCompilationUnit(ICompilationUnit fromCU, ICompilationUnit toCU) throws JavaModelException
- {
- final IJavaWebServiceElement wsElem = guessContainedWSElement(fromCU);
- if (wsElem == null)
- {
- return;
- }
-
- final boolean fqNameChanged = !toCU.getElementName().equals(fromCU.getElementName())
- || !toCU.getParent().getElementName().equals(fromCU.getParent().getElementName());
- if (fqNameChanged)
- {
- handleRemovedCompilationUnit(fromCU);
- handleAddedCompilationUnit(toCU);
- } else
- // then assume that the project only has changed.
- {
- final IWebServiceProject toPrj = util().findProjectByName(getDomBeingLoaded(), toCU.getJavaProject().getElementName());
- if (wsElem instanceof IWebService)
- {
- toPrj.getWebServices().add((IWebService) wsElem);
- } else
- {
- toPrj.getServiceEndpointInterfaces().add((IServiceEndpointInterface) wsElem);
- }
- }
- }
-
- private void handleRemovedCompilationUnit(ICompilationUnit remCU) throws JavaModelException
- {
- final IWebServiceProject wsPrj = util().findProjectByName(getDomBeingLoaded(), remCU.getJavaProject().getElementName());
- removeModelElements(wsPrj, guessPrimaryTypeName(remCU), false);
- }
-
- private void removeModelElements(IWebServiceProject wsPrj, String implBaseName, boolean isForPackage) throws JavaModelException
- {
- if (wsPrj == null) {
- return;
- }
- removeWsModelElements(wsPrj, implBaseName, isForPackage);
- removeSeiModelElements(wsPrj, implBaseName, isForPackage, false);
- }
-
- private IJavaWebServiceElement guessContainedWSElement(ICompilationUnit cu)
- {
- final IWebServiceProject wsPrj = util().findProjectByName(getDomBeingLoaded(), cu.getJavaProject().getElementName());
- return util().findJavaWebServiceElemByImplName(wsPrj, guessPrimaryTypeName(cu));
- }
-
- protected String guessPrimaryTypeName(ICompilationUnit cu)
- {
- final String parentName = cu.getParent().getElementName();
- final StringBuilder assumedPrimaryTypeName = new StringBuilder();
- if (parentName.length() > 0) {
- assumedPrimaryTypeName .append(parentName).append('.');
- }
- return assumedPrimaryTypeName.append(cu.getElementName()).
- delete(assumedPrimaryTypeName.lastIndexOf(".java"), assumedPrimaryTypeName.length()).toString();//$NON-NLS-1$
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/persistence/sync/ParameterSynchronizer.java b/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/persistence/sync/ParameterSynchronizer.java
deleted file mode 100755
index 655903d..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/persistence/sync/ParameterSynchronizer.java
+++ /dev/null
@@ -1,244 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.dom.runtime.persistence.sync;
-
-import static org.eclipse.jst.ws.jaxws.dom.runtime.persistence.WPAnnotationFeatures.HEADER_ATTRIBUTE;
-import static org.eclipse.jst.ws.jaxws.dom.runtime.persistence.WPAnnotationFeatures.MODE_ATTRIBUTE;
-import static org.eclipse.jst.ws.jaxws.dom.runtime.persistence.WPAnnotationFeatures.NAME_ATTRIBUTE;
-import static org.eclipse.jst.ws.jaxws.dom.runtime.persistence.WPAnnotationFeatures.PART_NAME_ATTRIBUTE;
-import static org.eclipse.jst.ws.jaxws.dom.runtime.persistence.WPAnnotationFeatures.TARGET_NAMESPACE_ATTRIBUTE;
-import static org.eclipse.jst.ws.jaxws.dom.runtime.persistence.WPAnnotationFeatures.WP_ANNOTATION;
-
-import java.util.Collection;
-import java.util.LinkedList;
-
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jdt.core.ITypeParameter;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jdt.core.Signature;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.DomPackage;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.IWebMethod;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.IWebParam;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.WebParamKind;
-import org.eclipse.jst.ws.jaxws.dom.runtime.persistence.IAnnotationSerializer;
-import org.eclipse.jst.ws.jaxws.dom.runtime.persistence.IModelElementSynchronizer;
-import org.eclipse.jst.ws.jaxws.dom.runtime.persistence.WPAnnotationFeatures;
-import org.eclipse.jst.ws.jaxws.utils.annotations.IAnnotation;
-import org.eclipse.jst.ws.jaxws.utils.annotations.IAnnotationInspector;
-
-/**
- * Class that synchronizes the parameters for {@link IWebMethod} object;
- *
- * @author
- */
-public class ParameterSynchronizer extends ElementSynchronizerImpl
-{
- private static final String RETURN_PARAM_NAME = "return";//$NON-NLS-1$
- private static final String HOLDER_CLASS_NAME = "Holder"; //$NON-NLS-1$
- private static final String HOLDER_CLASS_FQNAME = "javax.xml.ws.Holder";//$NON-NLS-1$
-
- public ParameterSynchronizer(IModelElementSynchronizer parent)
- {
- super(parent);
- }
-
- public void synchronizeParameters(IWebMethod wm, IMethod method, IAnnotationInspector inspector) throws JavaModelException
- {
- final Collection<IWebParam> mergedParams = new LinkedList<IWebParam>();
- if (!Signature.SIG_VOID.equals(method.getReturnType()))
- {
- final IWebParam retParam = obtainInstance(wm, RETURN_PARAM_NAME);
- mergeParam(retParam, 0, wm, method, method.getReturnType(), inspector);
- mergedParams.add(retParam);
- }
- final String[] names = method.getParameterNames();
- final String[] typeSignatures = method.getParameterTypes();
- for (int i = 0; i < names.length; i++)
- {
- final IWebParam param = obtainInstance(wm, names[i]);
- mergeParam(param, i, wm, method, typeSignatures[i], inspector);
- mergedParams.add(param);
- }
- wm.getParameters().retainAll(mergedParams);
- }
-
- private void mergeParam(IWebParam webParam, int pos, IWebMethod webMethod, IMethod method, String typeSign, IAnnotationInspector inspector) throws JavaModelException
- {
- final ITypeParameter typeParam = method.getTypeParameter(webParam.getImplementation());
- assert typeParam!= null;
-
- final IAnnotation<ITypeParameter> wpAnnotation = isWebResult(webParam) ? null : inspector.inspectParam(typeParam, WP_ANNOTATION);
-
- if (! typeSign.equals(webParam.getTypeName())) {
- util().setFeatureValue(webParam, DomPackage.IWEB_PARAM__TYPE_NAME, typeSign);
- }
-
- final WebParamKind kind = isWebResult(webParam) ? WebParamKind.OUT : calcKind(wpAnnotation, method, typeSign);
- if (!kind.equals(webParam.getKind())) {
- webParam.setKind(kind);
- }
-
- final boolean isHeader = calcHeader(wpAnnotation);
- if (webParam.isHeader() ^ isHeader) {
- webParam.setHeader(isHeader);
- }
-
- final String name = isWebResult(webParam) ? defCalc().calcWebResultDefaultName(webMethod) : calcName(wpAnnotation, webMethod, pos);
- if (!name.equals(webParam.getName())) {
- webParam.setName(name);
- }
-
- final String partName = calcPartName(wpAnnotation, name);
- if (!partName.equals(webParam.getPartName())) {
- webParam.setPartName(partName);
- }
-
- final String targetNamespace = calcTargetNamespace(wpAnnotation, webMethod, webParam);
- if (!targetNamespace.equals(webParam.getTargetNamespace())) {
- webParam.setTargetNamespace(targetNamespace);
- }
-
- resource().getSerializerFactory().adapt(webParam, IAnnotationSerializer.class);
- adaptToLocationInterface(webParam, WP_ANNOTATION, wpAnnotation);
- }
-
- private boolean isWebResult(final IWebParam param)
- {
- return param.getImplementation().equals(RETURN_PARAM_NAME);
- }
-
- protected String resolveFullyQualifiedName(final IMethod method, final String typeSignature) throws JavaModelException, IllegalArgumentException
- {
- if (Signature.getTypeSignatureKind(typeSignature) == Signature.BASE_TYPE_SIGNATURE)
- {
- return Signature.toString(typeSignature);
- }
-
- final String[][] resolvedTypes = method.getDeclaringType().resolveType(Signature.toString(typeSignature));
- if (resolvedTypes == null)
- {
- return "";//$NON-NLS-1$
- }
- final String pack = resolvedTypes[0][0];
- final String className = resolvedTypes[0][1];
- if (pack != null && pack.length() != 0)
- {
- return pack + "." + className;//$NON-NLS-1$
- } else
- {
- return className;
- }
- }
-
- protected WebParamKind calcKind(final IAnnotation<ITypeParameter> parmAnnotation, final IMethod method, final String typeSignature) throws JavaModelException, IllegalArgumentException
- {
- if (parmAnnotation != null && parmAnnotation.getPropertyValue(MODE_ATTRIBUTE) != null)
- {
- final String mode = parmAnnotation.getPropertyValue(MODE_ATTRIBUTE);
- if (WPAnnotationFeatures.WEB_PARAM_MODE_INOUT.endsWith(mode))
- {
- return WebParamKind.INOUT;
- }
- if (WPAnnotationFeatures.WEB_PARAM_MODE_IN.endsWith(mode))
- {
- return WebParamKind.IN;
- }
- if (WPAnnotationFeatures.WEB_PARAM_MODE_OUT.endsWith(mode))
- {
- return WebParamKind.OUT;
- }
- }
-
- if (isPossiblyHolderClass(typeSignature)) {
- final String typeFQName = resolveFullyQualifiedName(method, typeSignature);
- if (typeFQName.startsWith(HOLDER_CLASS_FQNAME)) {
- return WebParamKind.INOUT;
- }
- }
-
- return WebParamKind.IN;
- }
-
- /**
- * Added due to performance issues CSN 0120061532 0002256925 2009.
- * The idea is that before calling {@link #resolveFullyQualifiedName(IMethod, String)}
- * we check if the class is potentially Holder.
- */
- private boolean isPossiblyHolderClass(final String typeSignature) {
- final String erasuteTypeName = Signature.getSignatureSimpleName(Signature.getTypeErasure(typeSignature));
- if (HOLDER_CLASS_NAME.equals(erasuteTypeName)) {
- return true;
- }
-
- return false;
- }
-
- private String calcName(IAnnotation<ITypeParameter> parmAnnotation, IWebMethod webMethod, int paramPosition)
- {
- if (parmAnnotation != null && parmAnnotation.getPropertyValue(NAME_ATTRIBUTE) != null) {
- return parmAnnotation.getPropertyValue(NAME_ATTRIBUTE);
- }
-
- return defCalc().calcWebParamDefaultName(webMethod, paramPosition);
- }
-
- private String calcPartName(final IAnnotation<ITypeParameter> wpAnnotation, final String name)
- {
- if (wpAnnotation!=null && wpAnnotation.getPropertyValue(PART_NAME_ATTRIBUTE)!=null) {
- return wpAnnotation.getPropertyValue(PART_NAME_ATTRIBUTE);
- }
-
- return name;
- }
-
- private boolean calcHeader(final IAnnotation<ITypeParameter> wpAnnotation)
- {
- if (wpAnnotation!=null && wpAnnotation.getPropertyValue(HEADER_ATTRIBUTE)!=null) {
- return Boolean.parseBoolean(wpAnnotation.getPropertyValue(HEADER_ATTRIBUTE));
- }
-
- return false;
- }
-
- private String calcTargetNamespace(final IAnnotation<ITypeParameter> wpAnnotation, final IWebMethod webMethod, final IWebParam webParam)
- {
- if (wpAnnotation!=null && wpAnnotation.getPropertyValue(TARGET_NAMESPACE_ATTRIBUTE)!=null) {
- return wpAnnotation.getPropertyValue(TARGET_NAMESPACE_ATTRIBUTE);
- }
-
- return defCalc().calcWebParamDefaultTargetNS(webMethod, webParam);
- }
-
- private IWebParam obtainInstance(IWebMethod wm, String impl)
- {
- final IWebParam existing = findWebParamByImplName(wm, impl);
- if (existing != null)
- {
- return existing;
- }
- final IWebParam newParam = domFactory().createIWebParam();
- util().setFeatureValue(newParam, DomPackage.IWEB_PARAM__IMPLEMENTATION, impl);
- wm.getParameters().add(newParam);
- return newParam;
- }
-
- private IWebParam findWebParamByImplName(final IWebMethod wm, final String impl)
- {
- for (IWebParam param : wm.getParameters())
- {
- if (impl.equals(param.getImplementation()))
- {
- return param;
- }
- }
- return null;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/persistence/sync/SeiMerger.java b/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/persistence/sync/SeiMerger.java
deleted file mode 100755
index a0ce821..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/persistence/sync/SeiMerger.java
+++ /dev/null
@@ -1,106 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.dom.runtime.persistence.sync;
-
-import static org.eclipse.jst.ws.jaxws.dom.runtime.persistence.SBAnnotationFeatures.SB_ANNOTATION;
-import static org.eclipse.jst.ws.jaxws.dom.runtime.persistence.WSAnnotationFeatures.NAME_ATTRIBUTE;
-import static org.eclipse.jst.ws.jaxws.dom.runtime.persistence.WSAnnotationFeatures.TARGET_NAMESPACE_ATTRIBUTE;
-import static org.eclipse.jst.ws.jaxws.dom.runtime.persistence.WSAnnotationFeatures.WS_ANNOTATION;
-import static org.eclipse.jst.ws.jaxws.utils.ContractChecker.nullCheckParam;
-
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.DomPackage;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.IServiceEndpointInterface;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.SOAPBindingParameterStyle;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.SOAPBindingStyle;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.SOAPBindingUse;
-import org.eclipse.jst.ws.jaxws.dom.runtime.persistence.IModelElementSynchronizer;
-import org.eclipse.jst.ws.jaxws.utils.JaxWsUtils;
-import org.eclipse.jst.ws.jaxws.utils.annotations.IAnnotation;
-import org.eclipse.jst.ws.jaxws.utils.annotations.IAnnotationInspector;
-
-/**
- * Synchronizer that merges content of {@link IServiceEndpointInterface} with the current content of
- * the class implementing it.
- *
- * @author Georgi Vachkov
- */
-public class SeiMerger extends ElementSynchronizerImpl
-{
- private AbstractMethodSynchronizer methodSynchronizer;
-
- /**
- * Constructor
- * @param parent
- * @param methodSync the synchronizer that takes care for the SEI methods
- */
- public SeiMerger(IModelElementSynchronizer parent, AbstractMethodSynchronizer methodSync)
- {
- super(parent);
- nullCheckParam(methodSync);
- this.methodSynchronizer = methodSync;
- }
-
- protected void merge(IServiceEndpointInterface sei, IAnnotation<IType> wsAnnotation, IAnnotationInspector inspector) throws JavaModelException
- {
- final String seiName = wsAnnotation.getPropertyValue(NAME_ATTRIBUTE) == null ?
- JaxWsUtils.getDefaultPorttypeName(wsAnnotation.getAppliedElement().getFullyQualifiedName()) : wsAnnotation.getPropertyValue(NAME_ATTRIBUTE);
-
- if (!seiName.equals(sei.getName())) {
- util().setFeatureValue(sei, DomPackage.ISERVICE_ENDPOINT_INTERFACE__NAME, seiName);
- }
-
- // add targetNamespace
- final String targetNs = extractTargetNamespace(wsAnnotation);
- if (!targetNs.equals(sei.getTargetNamespace())) {
- util().setFeatureValue(sei, DomPackage.ISERVICE_ENDPOINT_INTERFACE__TARGET_NAMESPACE, targetNs);
- }
-
- mergeSoapBinding(sei, inspector);
- methodSynchronizer.synchronizeMethods(sei, wsAnnotation.getAppliedElement(), inspector);
-
- adaptToLocationInterface(sei, WS_ANNOTATION, wsAnnotation);
- }
-
- private String extractTargetNamespace(final IAnnotation<IType> wsAnnotation)
- {
- // add targetNamespace
- final String targetNs = wsAnnotation.getPropertyValue(TARGET_NAMESPACE_ATTRIBUTE);
- if (targetNs==null) {
- return JaxWsUtils.composeJaxWsTargetNamespaceByPackage(wsAnnotation.getAppliedElement().getPackageFragment().getElementName());
- }
-
- return targetNs;
- }
-
- private void mergeSoapBinding(final IServiceEndpointInterface sei, final IAnnotationInspector inspector) throws JavaModelException
- {
- final IAnnotation<IType> sbAnnotation = inspector.inspectType(SB_ANNOTATION);
-
- final SOAPBindingStyle style = defCalc().defineSBStyle(sbAnnotation);
- if (sei.getSoapBindingStyle() != style) {
- sei.setSoapBindingStyle(style);
- }
-
- final SOAPBindingUse use = defCalc().defineSBUse(sbAnnotation);
- if (sei.getSoapBindingUse() != use) {
- sei.setSoapBindingUse(use);
- }
-
- final SOAPBindingParameterStyle paramStyle = defCalc().defineSBParameterStyle(sbAnnotation);
- if (sei.getSoapBindingParameterStyle() != paramStyle) {
- sei.setSoapBindingParameterStyle(paramStyle);
- }
-
- adaptToLocationInterface(sei, SB_ANNOTATION, sbAnnotation);
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/persistence/sync/SeiMethodSynchronizer.java b/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/persistence/sync/SeiMethodSynchronizer.java
deleted file mode 100755
index c354f58..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/persistence/sync/SeiMethodSynchronizer.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.dom.runtime.persistence.sync;
-
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.ITypeHierarchy;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jst.ws.jaxws.dom.runtime.persistence.IModelElementSynchronizer;
-import org.eclipse.jst.ws.jaxws.utils.annotations.IAnnotationInspector;
-
-class SeiMethodSynchronizer extends AbstractMethodSynchronizer
-{
-
- public SeiMethodSynchronizer(IModelElementSynchronizer parent)
- {
- super(parent);
- }
-
- @Override
- protected void visitExposableMethods(IMethodVisitor visitor, ITypeHierarchy hierarchy, IAnnotationInspector inspector) throws JavaModelException
- {
- visitRecursively(visitor, hierarchy.getType(), hierarchy, inspector);
- }
-
- private void visitRecursively(IMethodVisitor visitor, IType type, ITypeHierarchy hierarchy, IAnnotationInspector inspector) throws JavaModelException
- {
- for (IMethod method : type.getMethods())
- {
- visitor.visit(method, inspector);
- }
-
- for (IType superIntf : hierarchy.getSuperInterfaces(type))
- {
- visitRecursively(visitor, superIntf, hierarchy, resource().newAnnotationInspector(superIntf));
- }
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/persistence/sync/SeiSynchronizer.java b/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/persistence/sync/SeiSynchronizer.java
deleted file mode 100755
index 98efa72..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/persistence/sync/SeiSynchronizer.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.dom.runtime.persistence.sync;
-
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.DomPackage;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.IServiceEndpointInterface;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.IWebService;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.IWebServiceProject;
-import org.eclipse.jst.ws.jaxws.dom.runtime.persistence.IAnnotationSerializer;
-import org.eclipse.jst.ws.jaxws.dom.runtime.persistence.IModelElementSynchronizer;
-import org.eclipse.jst.ws.jaxws.utils.annotations.IAnnotation;
-import org.eclipse.jst.ws.jaxws.utils.annotations.IAnnotationInspector;
-
-/**
- * Synchronizer for explicit {@link IServiceEndpointInterface} instance. Updates the DOM instance to the current
- * SEI implementation class by reading relevant annotations and
- *
- * @author
- */
-public class SeiSynchronizer extends ElementSynchronizerImpl
-{
- private final SeiMerger seiMerger;
-
- SeiSynchronizer(IModelElementSynchronizer parent)
- {
- super(parent);
- seiMerger = new SeiMerger(this, new SeiMethodSynchronizer(this));
- }
-
- /* IServiceEndpointInterface */
- void synchronizeInterface(IWebServiceProject wsProject, IAnnotation<IType> wsAnnotation, IAnnotationInspector inspector) throws JavaModelException
- {
- final IServiceEndpointInterface sei = obtainInstance(wsProject, wsAnnotation.getAppliedElement().getFullyQualifiedName());
- seiMerger.merge(sei, wsAnnotation, inspector);
- resolveWsRefsToThisSei(sei);
- resource().getSerializerFactory().adapt(sei, IAnnotationSerializer.class);
- }
-
- private IServiceEndpointInterface obtainInstance(IWebServiceProject wsProject, String implName)
- {
- IServiceEndpointInterface sei = null;
- for (IServiceEndpointInterface existing : wsProject.getServiceEndpointInterfaces())
- {
- if (existing.getImplementation().equals(implName)) {
- sei = existing;
- }
- }
-
- if (sei==null)
- {
- sei = domFactory().createIServiceEndpointInterface();
- util().setFeatureValue(sei, DomPackage.IJAVA_WEB_SERVICE_ELEMENT__IMPLEMENTATION, implName);
- wsProject.getServiceEndpointInterfaces().add(sei);
- }
-
- util().setFeatureValue(sei, DomPackage.ISERVICE_ENDPOINT_INTERFACE__IMPLICIT, false);
-
- return sei;
- }
-
- private void resolveWsRefsToThisSei(IServiceEndpointInterface sei)
- {
- for (IWebService ws : serviceData().getImplementingWs(sei.getImplementation()))
- {
- if (ws.getServiceEndpoint() != sei)
- {
- util().setFeatureValue(ws, DomPackage.IWEB_SERVICE__SERVICE_ENDPOINT, sei);
- }
- }
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/persistence/sync/WSMethodSynchronizer.java b/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/persistence/sync/WSMethodSynchronizer.java
deleted file mode 100755
index 90934ec..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/persistence/sync/WSMethodSynchronizer.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.dom.runtime.persistence.sync;
-
-import static org.eclipse.jst.ws.jaxws.dom.runtime.persistence.WMAnnotationFeatures.WM_ANNOTATION;
-import static org.eclipse.jst.ws.jaxws.dom.runtime.persistence.WSAnnotationFeatures.WS_ANNOTATION;
-
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.ITypeHierarchy;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jdt.core.dom.Modifier;
-import org.eclipse.jst.ws.jaxws.dom.runtime.persistence.IModelElementSynchronizer;
-import org.eclipse.jst.ws.jaxws.dom.runtime.persistence.WMAnnotationFeatures;
-import org.eclipse.jst.ws.jaxws.utils.annotations.IAnnotation;
-import org.eclipse.jst.ws.jaxws.utils.annotations.IAnnotationInspector;
-
-public class WSMethodSynchronizer extends AbstractMethodSynchronizer
-{
-
- public WSMethodSynchronizer(IModelElementSynchronizer parent)
- {
- super(parent);
- }
-
- @Override
- protected void visitExposableMethods(IMethodVisitor visitor, ITypeHierarchy hierarchy, IAnnotationInspector inspector) throws JavaModelException
- {
- visitRecursively(visitor, hierarchy.getType(), hierarchy, inspector);
- }
-
- private void visitRecursively(IMethodVisitor visitor, IType type, ITypeHierarchy hierarchy, IAnnotationInspector inspector) throws JavaModelException
- {
- if (type == null)
- {
- return;
- }
-
- assert type.isClass();
- final boolean isWebService = inspector.inspectType(WS_ANNOTATION) != null;
- for (IMethod method : type.getMethods())
- {
- if(method.isConstructor())
- {
- // Constructors can never take part in the porttype
- continue;
- }
-
- final IAnnotation<IMethod> wmAnnotation = inspector.inspectMethod(method, WM_ANNOTATION);
- final boolean isExcludedWithAnnotation = wmAnnotation == null ? false : "true".equals(wmAnnotation//$NON-NLS-1$
- .getPropertyValue(WMAnnotationFeatures.WM_EXCLUDED_ATTRIBUTE));
- if (Modifier.isPublic(method.getFlags()) && !isExcludedWithAnnotation && (isWebService || wmAnnotation != null))
- {
- visitor.visit(method, inspector);
- }
- }
-
- final IType superType = hierarchy.getSuperclass(type);
- if (superType!=null) {
- visitRecursively(visitor, superType, hierarchy, resource().newAnnotationInspector(superType));
- }
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/persistence/sync/WsSynchronizer.java b/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/persistence/sync/WsSynchronizer.java
deleted file mode 100755
index cd7269c..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/persistence/sync/WsSynchronizer.java
+++ /dev/null
@@ -1,172 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.dom.runtime.persistence.sync;
-
-import static org.eclipse.jst.ws.jaxws.dom.runtime.persistence.WSAnnotationFeatures.ENDPOINT_INTERFACE_ATTRIBUTE;
-import static org.eclipse.jst.ws.jaxws.dom.runtime.persistence.WSAnnotationFeatures.PORT_NAME_ATTRIBUTE;
-import static org.eclipse.jst.ws.jaxws.dom.runtime.persistence.WSAnnotationFeatures.SERVICE_NAME_ATTRIBUTE;
-import static org.eclipse.jst.ws.jaxws.dom.runtime.persistence.WSAnnotationFeatures.TARGET_NAMESPACE_ATTRIBUTE;
-import static org.eclipse.jst.ws.jaxws.dom.runtime.persistence.WSAnnotationFeatures.WSDL_LOCATION_ATTRIBUTE;
-import static org.eclipse.jst.ws.jaxws.dom.runtime.persistence.WSAnnotationFeatures.WS_ANNOTATION;
-
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.DomFactory;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.DomPackage;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.IServiceEndpointInterface;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.IWebService;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.IWebServiceProject;
-import org.eclipse.jst.ws.jaxws.dom.runtime.persistence.IAnnotationSerializer;
-import org.eclipse.jst.ws.jaxws.dom.runtime.persistence.IModelElementSynchronizer;
-import org.eclipse.jst.ws.jaxws.utils.JaxWsUtils;
-import org.eclipse.jst.ws.jaxws.utils.annotations.IAnnotation;
-import org.eclipse.jst.ws.jaxws.utils.annotations.IAnnotationInspector;
-
-public class WsSynchronizer extends ElementSynchronizerImpl
-{
- private final SeiMerger seiMerger;
-
- public WsSynchronizer(IModelElementSynchronizer parent)
- {
- super(parent);
- this.seiMerger = new SeiMerger(this, new WSMethodSynchronizer(this));
- }
-
- private IWebService obtainInstance(IWebServiceProject wsProject, String implName)
- {
- for (IWebService ws : wsProject.getWebServices())
- {
- if (ws.getImplementation().equals(implName))
- {
- return ws;
- }
- }
- final IWebService newWs = DomFactory.eINSTANCE.createIWebService();
- util().setFeatureValue(newWs, DomPackage.IJAVA_WEB_SERVICE_ELEMENT__IMPLEMENTATION, implName);
- util().addToCollectionFeature(wsProject, DomPackage.IWEB_SERVICE_PROJECT__WEB_SERVICES, newWs);
-
- return newWs;
- }
-
- public IWebService synchronizeWebService(IWebServiceProject wsProject, IAnnotation<IType> wsAnnotation, IAnnotationInspector inspector) throws JavaModelException
- {
- final IWebService ws = obtainInstance(wsProject, wsAnnotation.getAppliedElement().getFullyQualifiedName());
- mergeWebService(ws, wsProject, wsAnnotation, inspector);
-
- resource().getSerializerFactory().adapt(ws, IAnnotationSerializer.class);
- adaptToLocationInterface(ws, WS_ANNOTATION, wsAnnotation);
-
- return ws;
- }
-
- private void mergeWebService(IWebService toMerge, IWebServiceProject wsProject, IAnnotation<IType> wsAnnotation, IAnnotationInspector inspector) throws JavaModelException
- {
- // add serviceName name
- final String wsName = wsAnnotation.getPropertyValue(SERVICE_NAME_ATTRIBUTE) == null ?
- JaxWsUtils.getDefaultServiceName(wsAnnotation.getAppliedElement().getFullyQualifiedName()) :
- wsAnnotation.getPropertyValue(SERVICE_NAME_ATTRIBUTE);
-
- if (!wsName.equals(toMerge.getName()))
- {
- util().setFeatureValue(toMerge, DomPackage.IWEB_SERVICE__NAME, wsName);
- }
-
- // add targetNamespace
- final String targetNs = extractTargetNamespace(wsAnnotation);
- if (!targetNs.equals(toMerge.getTargetNamespace())) {
- util().setFeatureValue(toMerge, DomPackage.IWEB_SERVICE__TARGET_NAMESPACE, targetNs);
- }
-
- // add portName
- final String portName = wsAnnotation.getPropertyValue(PORT_NAME_ATTRIBUTE)==null ?
- JaxWsUtils.getDefaultPortName(wsAnnotation.getAppliedElement().getFullyQualifiedName()) :
- wsAnnotation.getPropertyValue(PORT_NAME_ATTRIBUTE);
-
- if (!portName.equals(toMerge.getPortName())) {
- toMerge.setPortName(portName);
- }
-
- // add wsdlLocation
- toMerge.setWsdlLocation(wsAnnotation.getPropertyValue(WSDL_LOCATION_ATTRIBUTE));
-
- // add endpointInterface
- final String newSeiImpl = wsAnnotation.getPropertyValue(ENDPOINT_INTERFACE_ATTRIBUTE);
- if (newSeiImpl == null)
- {
- mergeImplicitInterface(obtainImplicitInterfaceInstance(wsProject, toMerge, wsAnnotation), wsAnnotation, inspector);
- } else
- {
- if (toMerge.getServiceEndpoint() == null || !toMerge.getServiceEndpoint().getImplementation().equals(newSeiImpl))
- {
- serviceData().map(toMerge, newSeiImpl);
- resolveInterface(toMerge, wsProject, wsAnnotation.getPropertyValue(ENDPOINT_INTERFACE_ATTRIBUTE));
- }
- }
- }
-
- private IServiceEndpointInterface obtainImplicitInterfaceInstance(IWebServiceProject wsProject, IWebService ws, IAnnotation<IType> wsAnnotation)
- {
- if (ws.getServiceEndpoint() != null && ws.getServiceEndpoint().isImplicit())
- {
- return ws.getServiceEndpoint();
- }
-
- final IServiceEndpointInterface sei = DomFactory.eINSTANCE.createIServiceEndpointInterface();
- util().setFeatureValue(sei, DomPackage.ISERVICE_ENDPOINT_INTERFACE__IMPLICIT, true);
- util().setFeatureValue(sei, DomPackage.IJAVA_WEB_SERVICE_ELEMENT__IMPLEMENTATION, wsAnnotation.getAppliedElement().getFullyQualifiedName());
- util().setFeatureValue(ws, DomPackage.IWEB_SERVICE__SERVICE_ENDPOINT, sei);
-
- wsProject.getServiceEndpointInterfaces().add(sei);
-
- return sei;
- }
-
- private void mergeImplicitInterface(IServiceEndpointInterface sei, IAnnotation<IType> wsAnnotation, IAnnotationInspector inspector) throws JavaModelException
- {
- seiMerger.merge(sei, wsAnnotation, inspector);
- resource().getSerializerFactory().adapt(sei, IAnnotationSerializer.class);
- }
-
- private String extractTargetNamespace(final IAnnotation<IType> wsAnnotation)
- {
- // add targetNamespace
- final String targetNs = wsAnnotation.getPropertyValue(TARGET_NAMESPACE_ATTRIBUTE);
- if (targetNs==null) {
- return JaxWsUtils.composeJaxWsTargetNamespaceByPackage(wsAnnotation.getAppliedElement().getPackageFragment().getElementName());
- }
-
- return targetNs;
- }
-
- private void resolveInterface(IWebService ws, IWebServiceProject preffered, String implementation)
- {
- IServiceEndpointInterface resolved = null;
- for (IWebServiceProject prj : getDomBeingLoaded().getWebServiceProjects())
- {
- for (IServiceEndpointInterface sei : prj.getServiceEndpointInterfaces())
- {
- if (sei.getImplementation().equals(implementation))
- {
- resolved = sei;
- if (preffered.equals(prj))
- {
- break;
- } else
- {
- resolved = sei;
- }
- }
- }
- }
-
- util().setFeatureValue(ws, DomPackage.IWEB_SERVICE__SERVICE_ENDPOINT, resolved);
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/provider/IEndpointMetadata.java b/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/provider/IEndpointMetadata.java
deleted file mode 100755
index 7864c26..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/provider/IEndpointMetadata.java
+++ /dev/null
@@ -1,136 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.dom.runtime.provider;
-
-import java.util.List;
-import java.util.Set;
-
-import org.eclipse.jst.ws.jaxws.utils.annotations.IAnnotationPropertyContainer;
-
-/**
- * Represents metadata for an endpoint. Contains information about the name and namespace of the endpoint. Contains exposed operations. This interface
- * is intended to be used as input data for implementors of {@link IEndpointGenerator}.
- *
- * @author Plamen Pavlov
- */
-public interface IEndpointMetadata
-{
- /**
- * @return The name of enpoint.
- */
- public String getName();
-
- /**
- * @return The package/namespace of the endpoint.
- */
- public String getPackage();
-
- /**
- * @return the name of the service representing this endpoint
- */
- public String getServiceName();
-
- /**
- * Sets the name of the wsdl:service representing this endpoint.
- *
- * @param serviceName
- */
- public void setServiceName(String serviceName);
-
- /**
- * @return the name of the wsdl:port referencing this endpoint which this
- */
- public String getPortName();
-
- /**
- * Sets the name of the wsdl:port referencing this endpoint which this
- *
- * @param portName
- */
- public void setPortName(String portName);
-
- /**
- * @return the wsdl location in case this endpoint is generated from wsdl otherwise <tt>null</tt>
- */
- public String getWsdlLocation();
-
- /**
- * Sets the wsdl location in case this endpoint is generated from wsdl
- *
- * @param wsdlLocation
- * location
- */
- public void setWsdlLocation(String wsdlLocation);
-
- /**
- * @return the namespace URI
- */
- public String getNamespaceURI();
-
- /**
- * sets the namespace URI
- *
- * @param namespaceURI
- */
- public void setNamespaceURI(String namespaceURI);
-
- /**
- * @return the name of the Service Endpoint Interface containing WebService methods that will be implemented by this endpoint implementation. This
- * method can return <tt>null</tt>
- */
- public String getSEIName();
-
- /**
- * Sets the Service Endpoint Interface referenced by this endpoint.
- *
- * @param seiName
- * @throws NullPointerException
- * in case <tt>seiName</tt> is null
- * @throws IllegalArgumentException
- * in case <tt>seiName</tt> is empty string
- */
- public void setSEIName(String seiName);
-
- /**
- * @return The fully qualified name of endpoint.
- */
- public String getFullyQualifiedName();
-
- /**
- * @return list of added methods
- */
- public List<IEndpointMethod> getMethods();
-
- /**
- * Creates an empty instance of {@link IEndpointMethod} with <tt>name</tt> and <tt>returnTypeFQName</tt> and adds it to the set of available
- * methods.
- *
- * @param name
- * @param returnTypeFQName
- * @return created IEndpointMethod for added method
- */
- public IEndpointMethod addMethod(String name, String returnTypeFQName);
-
- /**
- * Adds {@link IAnnotationPropertyContainer} to the {@link IEndpointMetadata} descriptor.
- *
- * @param annotationsContainer - Container, which will be added.
- *
- */
- public void addAnnotationsContainer(final IAnnotationPropertyContainer annotationsContainer);
-
- /**
- * Returns Set with {@link IAnnotationPropertyContainer} related to the {@link IEndpointMetadata} descriptor.
- *
- * @return Set with {@link IAnnotationPropertyContainer}.
- */
- public Set<IAnnotationPropertyContainer> getAnnotationsContainer();
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/provider/IEndpointMethod.java b/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/provider/IEndpointMethod.java
deleted file mode 100755
index ad21cf0..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/provider/IEndpointMethod.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.dom.runtime.provider;
-
-import java.util.List;
-import java.util.Set;
-
-import org.eclipse.jst.ws.jaxws.utils.annotations.IAnnotationPropertyContainer;
-
-/**
- * An interface representing method in endpoint.
- *
- * @author Georgi Vachkov
- */
-public interface IEndpointMethod
-{
- /**
- * @return the method name
- */
- public String getName();
-
- /**
- * @return the returnFQName
- */
- public String getReturnType();
-
- /**
- * @param returnTypeFQName
- * sets the return type
- */
- public void setReturnType(String returnTypeFQName);
-
- /**
- * @return human readable method representation
- */
- public String getSignature();
-
- /**
- * @return set of thrown exceptions
- */
- public Set<String> getExceptions();
-
- /**
- * @param exceptionFQName
- * add thrown exception to the method
- */
- public void addException(String exceptionFQName);
-
- /**
- * @return list of method params on the order they appear in method
- */
- public List<IMethodParameter> getParameters();
-
- /**
- * creates new param ans adds it to the end of parameters list.
- *
- * @param type fully qualified type name
- * @param name parameter name
- * @return {@link IMethodParameter} creates
- */
- public IMethodParameter addParameter(String type, String name);
-
- /**
- * Adds {@link IAnnotationPropertyContainer} to the {@link IEndpointMethod} descriptor.
- *
- * @param annotationsContainer - Container, which will be added.
- *
- */
- public void addAnnotationsContainer(final IAnnotationPropertyContainer annotationsContainer);
-
- /**
- * Returns Set with {@link IAnnotationPropertyContainer} related to the {@link IEndpointMethod} descriptor.
- *
- * @return Set with {@link IAnnotationPropertyContainer}.
- */
- public Set<IAnnotationPropertyContainer> getAnnotationsContainer();
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/provider/IMethodParameter.java b/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/provider/IMethodParameter.java
deleted file mode 100755
index 8e73e46..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/provider/IMethodParameter.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.dom.runtime.provider;
-
-/**
- * Interface representing parameter in method
- *
- * @author Georgi Vachkov
- *
- */
-public interface IMethodParameter
-{
- /**
- * @return the parameter name
- */
- public String getName();
-
- /**
- * @return parameter fully qualified name
- */
- public String getType();
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/registry/IWsDOMRuntimeInfo.java b/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/registry/IWsDOMRuntimeInfo.java
deleted file mode 100755
index af8cb07..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/registry/IWsDOMRuntimeInfo.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.dom.runtime.registry;
-
-import java.util.Map;
-
-import org.eclipse.jst.ws.jaxws.dom.runtime.INamedExtensionInfo;
-
-/**
- * Defines the information structure which should be instantiated upon reading contributors
- * to the Supported Runtime extension point.
- *
- * @author Georgi Hristov I036201
- *
- */
-public interface IWsDOMRuntimeInfo extends INamedExtensionInfo
-{
- /**
- *
- * @return the map of project facets relevant for a particular runtime where the key is
- * the project facet id and the value is the version of the project facet if specified.
- */
- public abstract Map<String, String> getProjectFacets();
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/registry/WsDOMRuntimeRegistry.java b/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/registry/WsDOMRuntimeRegistry.java
deleted file mode 100755
index 52a82fc..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/registry/WsDOMRuntimeRegistry.java
+++ /dev/null
@@ -1,199 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.dom.runtime.registry;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExtension;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.IWsDOMRuntimeExtension;
-import org.eclipse.jst.ws.jaxws.dom.runtime.internal.plugin.JaxWsDomRuntimePlugin;
-import org.eclipse.jst.ws.jaxws.dom.runtime.internal.util.NamedExtensionInfo;
-import org.eclipse.jst.ws.jaxws.utils.logging.ILogger;
-import org.eclipse.jst.ws.jaxws.utils.logging.Logger;
-
-/**
- *
- *
- * @author Georgi Hristov I036201
- *
- */
-public class WsDOMRuntimeRegistry
-{
- private static final class RuntimeInfo extends NamedExtensionInfo implements IWsDOMRuntimeInfo
- {
- private Map<String, String> projectFacets;
-
- RuntimeInfo(final String pId, final String pLabel, final Map<String, String> projectFacets)
- {
- super(pId, pLabel);
-
- this.projectFacets = projectFacets;
- }
-
- public Map<String,String> getProjectFacets()
- {
- return this.projectFacets;
- }
- }
-
- /** The ID of the extension point for a supported runtime */
- private static final String RUNTIME_XP = JaxWsDomRuntimePlugin.PLUGIN_ID + ".domruntimes"; //$NON-NLS-1$
-
- /** Error message displayed when extension point not properly defined */
- public static final String EXTENSION_NOT_PROPERLY_REGISTERED = "Registered runtime extension not properly registered (error in plugin.xml)"; //$NON-NLS-1$
-
- private static final String XP_IMPLEMENTATION_ELEMENT = "implementation"; //$NON-NLS-1$
-
- private static final String XP_PROJECT_FACET_ELEMENT = "project_facet"; //$NON-NLS-1$
-
- private static final String XP_PROJECT_FACET_ID = "id"; //$NON-NLS-1$
-
- private static final String XP_PROJECT_FACET_VERSION = "version"; //$NON-NLS-1$
-
- private static final String XP_IMPLEMENTATION_ELEMENT_CLASS_ATTR = "class"; //$NON-NLS-1$
-
- /**
- * Creates and returns a new instance of the executable extension.
- *
- * @param info the descriptor object built during extension point load
- * @return instance of runtime extension implementation
- */
- public static IWsDOMRuntimeExtension instantiateRuntime(final IWsDOMRuntimeInfo info)
- {
- final IExtension ext = findExtension(info);
-
- if(ext==null)
- {
- logger().logError(EXTENSION_NOT_PROPERLY_REGISTERED);
- return null;
- }
-
- for (IConfigurationElement el : ext.getConfigurationElements())
- {
- if (el.getName().equals(XP_IMPLEMENTATION_ELEMENT))
- {
- try
- {
- //FIXME ClassCastException showing up in the logs in the WTP build
- Object impl = el.createExecutableExtension(XP_IMPLEMENTATION_ELEMENT_CLASS_ATTR);
- if (impl instanceof IWsDOMRuntimeExtension) {
- return (IWsDOMRuntimeExtension) impl;
- } else {
- return null;
- }
-// return (IWsDOMRuntimeExtension) el.createExecutableExtension(XP_IMPLEMENTATION_ELEMENT_CLASS_ATTR);
- }
- catch (final CoreException e)
- {
- logger().logError("Unable to create extension", e); //$NON-NLS-1$
- return null;
-
- }
-// catch (final ClassCastException e)
-// {
-// logger().logError("Implementation class does not implement proper interface", e); //$NON-NLS-1$
-// return null;
-// }
- }
- }
-
- logger().logError(EXTENSION_NOT_PROPERLY_REGISTERED);
- throw new RuntimeException(EXTENSION_NOT_PROPERLY_REGISTERED);
- }
-
- /**
- * Locates the extension point contribution definition for this particular runtime.
- *
- * @param info the descriptor object built during extension point load
- * @return instance of contribution definition
- */
- public static IExtension findExtension(final IWsDOMRuntimeInfo info)
- {
- if(info!=null)
- {
- final IExtension[] exts = Platform.getExtensionRegistry().getExtensionPoint(RUNTIME_XP).getExtensions();
-
- for (int i = 0; i < exts.length; i++)
- {
- if (exts[i].getSimpleIdentifier().equals(info.getId()))
- {
- return exts[i];
- }
- }
- }
-
- return null;
- }
-
- /**
- * Returns the registered runtimes.
- *
- * @return set of information records for the registered runtimes
- */
- public static Collection<IWsDOMRuntimeInfo> getRegisteredRuntimesInfo()
- {
- final IExtension[] exts = Platform.getExtensionRegistry().getExtensionPoint(RUNTIME_XP).getExtensions();
- final Collection<IWsDOMRuntimeInfo> runtimeDescriptors = new ArrayList<IWsDOMRuntimeInfo>(exts.length);
-
- for (int i = 0; i < exts.length; i++)
- {
- HashMap<String,String> projectFacets = new HashMap<String,String>();
-
- for (IConfigurationElement el : exts[i].getConfigurationElements())
- {
- if (el.getName().equals(XP_PROJECT_FACET_ELEMENT))
- {
- projectFacets.put(el.getAttribute(XP_PROJECT_FACET_ID),el.getAttribute(XP_PROJECT_FACET_VERSION));
- }
- }
-
-
- runtimeDescriptors.add(new RuntimeInfo(exts[i].getSimpleIdentifier(), exts[i].getLabel(), projectFacets));
- }
-
- return runtimeDescriptors;
- }
-
- /**
- * Returns the runtime descriptor object corresponding to this runtime id.
- *
- * @param runtimeId the identifier of the runtime
- * @return descriptor object for the needed runtime
- */
- public static IWsDOMRuntimeInfo getRuntimeInfo(final String runtimeId)
- {
- Iterator<IWsDOMRuntimeInfo> registeredRuntime = getRegisteredRuntimesInfo().iterator();
-
- while(registeredRuntime.hasNext())
- {
- IWsDOMRuntimeInfo runtimeInfo = registeredRuntime.next();
-
- if(runtimeInfo.getId().equals(runtimeId))
- {
- return runtimeInfo;
- }
- }
-
- return null;
- }
-
- private static ILogger logger()
- {
- return new Logger();
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/util/Dom2ResourceMapper.java b/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/util/Dom2ResourceMapper.java
deleted file mode 100755
index 2ef2526..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/util/Dom2ResourceMapper.java
+++ /dev/null
@@ -1,133 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.dom.runtime.util;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jst.ws.jaxws.dom.runtime.DomUtil;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.DomPackage;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.IServiceEndpointInterface;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.IWebMethod;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.IWebParam;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.IWebService;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.IWebServiceProject;
-import org.eclipse.jst.ws.jaxws.utils.ContractChecker;
-
-
-/**
- * Class that takes care for mapping DOM objects to Eclipse resources.
- *
- * @author Georgi Vachkov
- */
-public class Dom2ResourceMapper
-{
- /** the singleton instance */
- public static final Dom2ResourceMapper INSTANCE = new Dom2ResourceMapper();
-
- private DomSwitch<String> implClassFinderSwitch;
-
- /**
- * Singleton Constructor
- */
- private Dom2ResourceMapper() {
- this.implClassFinderSwitch = createImplFinderSwitch();
- }
-
- /**
- * Finds underlying {@link IResource} for this DOM object
- * @param eObject the DOM object
- * @return found resource or <code>null</code>
- * @throws JavaModelException
- */
- public IResource findResource(final EObject eObject) throws JavaModelException
- {
- ContractChecker.nullCheckParam(eObject);
- switch (eObject.eClass().getClassifierID())
- {
- case DomPackage.IWEB_SERVICE:
- case DomPackage.ISERVICE_ENDPOINT_INTERFACE:
- case DomPackage.IWEB_METHOD:
- case DomPackage.IWEB_PARAM:
- final IType type = findType(eObject);
- return type==null ? null : type.getResource();
- case DomPackage.IWEB_SERVICE_PROJECT:
- return findProject((IWebServiceProject)eObject);
- }
-
- return null;
- }
-
- /**
- * Finds IProject instance for the web service project represented by <code>wsProject</code>
- * @param wsProject the project DOM object
- * @return found resource or <code>null</code>
- */
- public IProject findProject(final IWebServiceProject wsProject)
- {
- if (wsProject == null) {
- return null;
- }
-
- return ResourcesPlugin.getWorkspace().getRoot().getProject(wsProject.getName());
- }
-
- /**
- * Finds underlying {@link IType} instance for this <code>eObject</code>
- * @param eObject the DOM object
- * @return the IType containing this <code>eObject</code> or <code>null</code>
- * @throws JavaModelException
- */
- public IType findType(final EObject eObject) throws JavaModelException
- {
- ContractChecker.nullCheckParam(eObject);
-
- final IProject project = findProject(DomUtil.INSTANCE.findWsProject(eObject));
- final IJavaProject javaProject = JavaCore.create(project);
- final String fqName = implClassFinderSwitch.doSwitch(eObject);
- if (javaProject==null || fqName == null) {
- return null;
- }
-
- return javaProject.findType(fqName);
- }
-
- private DomSwitch<String> createImplFinderSwitch()
- {
- return new DomSwitch<String>()
- {
- @Override
- public String caseIWebService(IWebService ws) {
- return ws.getImplementation();
- }
-
- @Override
- public String caseIServiceEndpointInterface(IServiceEndpointInterface sei) {
- return sei == null ? null : sei.getImplementation();
- }
-
- @Override
- public String caseIWebMethod(IWebMethod wm) {
- return wm == null ? null : caseIServiceEndpointInterface((IServiceEndpointInterface) wm.eContainer());
- }
-
- @Override
- public String caseIWebParam(IWebParam wp) {
- return caseIWebMethod((IWebMethod)wp.eContainer());
- }
- };
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/util/DomAdapterFactory.java b/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/util/DomAdapterFactory.java
deleted file mode 100755
index 1fb53cd..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/util/DomAdapterFactory.java
+++ /dev/null
@@ -1,281 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.dom.runtime.util;
-
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.common.notify.Notifier;
-import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.DomPackage;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.IDOM;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.IJavaWebServiceElement;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.IServiceEndpointInterface;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.IWebMethod;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.IWebParam;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.IWebService;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.IWebServiceProject;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.IWebType;
-
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Adapter Factory</b> for the model.
- * It provides an adapter <code>createXXX</code> method for each class of the model.
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.ws.jaxws.dom.runtime.api.DomPackage
- * @generated
- */
-public class DomAdapterFactory extends AdapterFactoryImpl {
- /**
- * The cached model package.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected static DomPackage modelPackage;
-
- /**
- * Creates an instance of the adapter factory.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public DomAdapterFactory() {
- if (modelPackage == null)
- {
- modelPackage = DomPackage.eINSTANCE;
- }
- }
-
- /**
- * Returns whether this factory is applicable for the type of the object.
- * <!-- begin-user-doc -->
- * This implementation returns <code>true</code> if the object is either the model's package or is an instance object of the model.
- * <!-- end-user-doc -->
- * @return whether this factory is applicable for the type of the object.
- * @generated
- */
- @Override
- public boolean isFactoryForType(Object object) {
- if (object == modelPackage)
- {
- return true;
- }
- if (object instanceof EObject)
- {
- return ((EObject)object).eClass().getEPackage() == modelPackage;
- }
- return false;
- }
-
- /**
- * The switch that delegates to the <code>createXXX</code> methods.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected DomSwitch<Adapter> modelSwitch =
- new DomSwitch<Adapter>()
- {
- @Override
- public Adapter caseIDOM(IDOM object)
- {
- return createIDOMAdapter();
- }
- @Override
- public Adapter caseIJavaWebServiceElement(IJavaWebServiceElement object)
- {
- return createIJavaWebServiceElementAdapter();
- }
- @Override
- public Adapter caseIServiceEndpointInterface(IServiceEndpointInterface object)
- {
- return createIServiceEndpointInterfaceAdapter();
- }
- @Override
- public Adapter caseIWebMethod(IWebMethod object)
- {
- return createIWebMethodAdapter();
- }
- @Override
- public Adapter caseIWebParam(IWebParam object)
- {
- return createIWebParamAdapter();
- }
- @Override
- public Adapter caseIWebService(IWebService object)
- {
- return createIWebServiceAdapter();
- }
- @Override
- public Adapter caseIWebServiceProject(IWebServiceProject object)
- {
- return createIWebServiceProjectAdapter();
- }
- @Override
- public Adapter caseIWebType(IWebType object)
- {
- return createIWebTypeAdapter();
- }
- @Override
- public Adapter defaultCase(EObject object)
- {
- return createEObjectAdapter();
- }
- };
-
- /**
- * Creates an adapter for the <code>target</code>.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param target the object to adapt.
- * @return the adapter for the <code>target</code>.
- * @generated
- */
- @Override
- public Adapter createAdapter(Notifier target) {
- return modelSwitch.doSwitch((EObject)target);
- }
-
-
- /**
- * Creates a new adapter for an object of class '{@link org.eclipse.jst.ws.jaxws.dom.runtime.api.IDOM <em>IDOM</em>}'.
- * <!-- begin-user-doc -->
- * This default implementation returns null so that we can easily ignore cases;
- * it's useful to ignore a case when inheritance will catch all the cases anyway.
- * <!-- end-user-doc -->
- * @return the new adapter.
- * @see org.eclipse.jst.ws.jaxws.dom.runtime.api.IDOM
- * @generated
- */
- public Adapter createIDOMAdapter() {
- return null;
- }
-
- /**
- * Creates a new adapter for an object of class '{@link org.eclipse.jst.ws.jaxws.dom.runtime.api.IJavaWebServiceElement <em>IJava Web Service Element</em>}'.
- * <!-- begin-user-doc -->
- * This default implementation returns null so that we can easily ignore cases;
- * it's useful to ignore a case when inheritance will catch all the cases anyway.
- * <!-- end-user-doc -->
- * @return the new adapter.
- * @see org.eclipse.jst.ws.jaxws.dom.runtime.api.IJavaWebServiceElement
- * @generated
- */
- public Adapter createIJavaWebServiceElementAdapter() {
- return null;
- }
-
- /**
- * Creates a new adapter for an object of class '{@link org.eclipse.jst.ws.jaxws.dom.runtime.api.IServiceEndpointInterface <em>IService Endpoint Interface</em>}'.
- * <!-- begin-user-doc -->
- * This default implementation returns null so that we can easily ignore cases;
- * it's useful to ignore a case when inheritance will catch all the cases anyway.
- * <!-- end-user-doc -->
- * @return the new adapter.
- * @see org.eclipse.jst.ws.jaxws.dom.runtime.api.IServiceEndpointInterface
- * @generated
- */
- public Adapter createIServiceEndpointInterfaceAdapter() {
- return null;
- }
-
- /**
- * Creates a new adapter for an object of class '{@link org.eclipse.jst.ws.jaxws.dom.runtime.api.IWebMethod <em>IWeb Method</em>}'.
- * <!-- begin-user-doc -->
- * This default implementation returns null so that we can easily ignore cases;
- * it's useful to ignore a case when inheritance will catch all the cases anyway.
- * <!-- end-user-doc -->
- * @return the new adapter.
- * @see org.eclipse.jst.ws.jaxws.dom.runtime.api.IWebMethod
- * @generated
- */
- public Adapter createIWebMethodAdapter() {
- return null;
- }
-
- /**
- * Creates a new adapter for an object of class '{@link org.eclipse.jst.ws.jaxws.dom.runtime.api.IWebParam <em>IWeb Param</em>}'.
- * <!-- begin-user-doc -->
- * This default implementation returns null so that we can easily ignore cases;
- * it's useful to ignore a case when inheritance will catch all the cases anyway.
- * <!-- end-user-doc -->
- * @return the new adapter.
- * @see org.eclipse.jst.ws.jaxws.dom.runtime.api.IWebParam
- * @generated
- */
- public Adapter createIWebParamAdapter() {
- return null;
- }
-
- /**
- * Creates a new adapter for an object of class '{@link org.eclipse.jst.ws.jaxws.dom.runtime.api.IWebService <em>IWeb Service</em>}'.
- * <!-- begin-user-doc -->
- * This default implementation returns null so that we can easily ignore cases;
- * it's useful to ignore a case when inheritance will catch all the cases anyway.
- * <!-- end-user-doc -->
- * @return the new adapter.
- * @see org.eclipse.jst.ws.jaxws.dom.runtime.api.IWebService
- * @generated
- */
- public Adapter createIWebServiceAdapter() {
- return null;
- }
-
- /**
- * Creates a new adapter for an object of class '{@link org.eclipse.jst.ws.jaxws.dom.runtime.api.IWebServiceProject <em>IWeb Service Project</em>}'.
- * <!-- begin-user-doc -->
- * This default implementation returns null so that we can easily ignore cases;
- * it's useful to ignore a case when inheritance will catch all the cases anyway.
- * <!-- end-user-doc -->
- * @return the new adapter.
- * @see org.eclipse.jst.ws.jaxws.dom.runtime.api.IWebServiceProject
- * @generated
- */
- public Adapter createIWebServiceProjectAdapter() {
- return null;
- }
-
- /**
- * Creates a new adapter for an object of class '{@link org.eclipse.jst.ws.jaxws.dom.runtime.api.IWebType <em>IWeb Type</em>}'.
- * <!-- begin-user-doc -->
- * This default implementation returns null so that we can easily ignore cases;
- * it's useful to ignore a case when inheritance will catch all the cases anyway.
- * <!-- end-user-doc -->
- * @return the new adapter.
- * @see org.eclipse.jst.ws.jaxws.dom.runtime.api.IWebType
- * @generated
- */
- public Adapter createIWebTypeAdapter() {
- return null;
- }
-
- /**
- * Creates a new adapter for the default case.
- * <!-- begin-user-doc -->
- * This default implementation returns null.
- * <!-- end-user-doc -->
- * @return the new adapter.
- * @generated
- */
- public Adapter createEObjectAdapter() {
- return null;
- }
-
- @Override
- public Adapter adapt(Notifier target, Object type)
- {
- synchronized (target) {
- return super.adapt(target, type);
- }
- }
-
-} //DomAdapterFactory
diff --git a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/util/DomSwitch.java b/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/util/DomSwitch.java
deleted file mode 100755
index 8952148..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/util/DomSwitch.java
+++ /dev/null
@@ -1,306 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.dom.runtime.util;
-
-import java.util.List;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.DomPackage;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.IDOM;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.IJavaWebServiceElement;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.IServiceEndpointInterface;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.IWebMethod;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.IWebParam;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.IWebService;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.IWebServiceProject;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.IWebType;
-
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Switch</b> for the model's inheritance hierarchy.
- * It supports the call {@link #doSwitch(EObject) doSwitch(object)}
- * to invoke the <code>caseXXX</code> method for each class of the model,
- * starting with the actual class of the object
- * and proceeding up the inheritance hierarchy
- * until a non-null result is returned,
- * which is the result of the switch.
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.ws.jaxws.dom.runtime.api.DomPackage
- * @generated
- */
-public class DomSwitch<T> {
- /**
- * The cached model package
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected static DomPackage modelPackage;
-
- /**
- * Creates an instance of the switch.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public DomSwitch() {
- if (modelPackage == null)
- {
- modelPackage = DomPackage.eINSTANCE;
- }
- }
-
- /**
- * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the first non-null result returned by a <code>caseXXX</code> call.
- * @generated
- */
- public T doSwitch(EObject theEObject) {
- return doSwitch(theEObject.eClass(), theEObject);
- }
-
- /**
- * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the first non-null result returned by a <code>caseXXX</code> call.
- * @generated
- */
- protected T doSwitch(EClass theEClass, EObject theEObject) {
- if (theEClass.eContainer() == modelPackage)
- {
- return doSwitch(theEClass.getClassifierID(), theEObject);
- }
- else
- {
- List<EClass> eSuperTypes = theEClass.getESuperTypes();
- return
- eSuperTypes.isEmpty() ?
- defaultCase(theEObject) :
- doSwitch(eSuperTypes.get(0), theEObject);
- }
- }
-
- /**
- * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the first non-null result returned by a <code>caseXXX</code> call.
- * @generated
- */
- protected T doSwitch(int classifierID, EObject theEObject) {
- switch (classifierID)
- {
- case DomPackage.IDOM:
- {
- IDOM idom = (IDOM)theEObject;
- T result = caseIDOM(idom);
- if (result == null) result = defaultCase(theEObject);
- return result;
- }
- case DomPackage.IJAVA_WEB_SERVICE_ELEMENT:
- {
- IJavaWebServiceElement iJavaWebServiceElement = (IJavaWebServiceElement)theEObject;
- T result = caseIJavaWebServiceElement(iJavaWebServiceElement);
- if (result == null) result = defaultCase(theEObject);
- return result;
- }
- case DomPackage.ISERVICE_ENDPOINT_INTERFACE:
- {
- IServiceEndpointInterface iServiceEndpointInterface = (IServiceEndpointInterface)theEObject;
- T result = caseIServiceEndpointInterface(iServiceEndpointInterface);
- if (result == null) result = caseIJavaWebServiceElement(iServiceEndpointInterface);
- if (result == null) result = defaultCase(theEObject);
- return result;
- }
- case DomPackage.IWEB_METHOD:
- {
- IWebMethod iWebMethod = (IWebMethod)theEObject;
- T result = caseIWebMethod(iWebMethod);
- if (result == null) result = caseIJavaWebServiceElement(iWebMethod);
- if (result == null) result = defaultCase(theEObject);
- return result;
- }
- case DomPackage.IWEB_PARAM:
- {
- IWebParam iWebParam = (IWebParam)theEObject;
- T result = caseIWebParam(iWebParam);
- if (result == null) result = caseIJavaWebServiceElement(iWebParam);
- if (result == null) result = defaultCase(theEObject);
- return result;
- }
- case DomPackage.IWEB_SERVICE:
- {
- IWebService iWebService = (IWebService)theEObject;
- T result = caseIWebService(iWebService);
- if (result == null) result = caseIJavaWebServiceElement(iWebService);
- if (result == null) result = defaultCase(theEObject);
- return result;
- }
- case DomPackage.IWEB_SERVICE_PROJECT:
- {
- IWebServiceProject iWebServiceProject = (IWebServiceProject)theEObject;
- T result = caseIWebServiceProject(iWebServiceProject);
- if (result == null) result = defaultCase(theEObject);
- return result;
- }
- case DomPackage.IWEB_TYPE:
- {
- IWebType iWebType = (IWebType)theEObject;
- T result = caseIWebType(iWebType);
- if (result == null) result = caseIJavaWebServiceElement(iWebType);
- if (result == null) result = defaultCase(theEObject);
- return result;
- }
- default: return defaultCase(theEObject);
- }
- }
-
- /**
- * Returns the result of interpreting the object as an instance of '<em>IDOM</em>'.
- * <!-- begin-user-doc -->
- * This implementation returns null;
- * returning a non-null result will terminate the switch.
- * <!-- end-user-doc -->
- * @param object the target of the switch.
- * @return the result of interpreting the object as an instance of '<em>IDOM</em>'.
- * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
- * @generated
- */
- public T caseIDOM(IDOM object) {
- return null;
- }
-
- /**
- * Returns the result of interpreting the object as an instance of '<em>IJava Web Service Element</em>'.
- * <!-- begin-user-doc -->
- * This implementation returns null;
- * returning a non-null result will terminate the switch.
- * <!-- end-user-doc -->
- * @param object the target of the switch.
- * @return the result of interpreting the object as an instance of '<em>IJava Web Service Element</em>'.
- * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
- * @generated
- */
- public T caseIJavaWebServiceElement(IJavaWebServiceElement object) {
- return null;
- }
-
- /**
- * Returns the result of interpreting the object as an instance of '<em>IService Endpoint Interface</em>'.
- * <!-- begin-user-doc -->
- * This implementation returns null;
- * returning a non-null result will terminate the switch.
- * <!-- end-user-doc -->
- * @param object the target of the switch.
- * @return the result of interpreting the object as an instance of '<em>IService Endpoint Interface</em>'.
- * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
- * @generated
- */
- public T caseIServiceEndpointInterface(IServiceEndpointInterface object) {
- return null;
- }
-
- /**
- * Returns the result of interpreting the object as an instance of '<em>IWeb Method</em>'.
- * <!-- begin-user-doc -->
- * This implementation returns null;
- * returning a non-null result will terminate the switch.
- * <!-- end-user-doc -->
- * @param object the target of the switch.
- * @return the result of interpreting the object as an instance of '<em>IWeb Method</em>'.
- * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
- * @generated
- */
- public T caseIWebMethod(IWebMethod object) {
- return null;
- }
-
- /**
- * Returns the result of interpreting the object as an instance of '<em>IWeb Param</em>'.
- * <!-- begin-user-doc -->
- * This implementation returns null;
- * returning a non-null result will terminate the switch.
- * <!-- end-user-doc -->
- * @param object the target of the switch.
- * @return the result of interpreting the object as an instance of '<em>IWeb Param</em>'.
- * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
- * @generated
- */
- public T caseIWebParam(IWebParam object) {
- return null;
- }
-
- /**
- * Returns the result of interpreting the object as an instance of '<em>IWeb Service</em>'.
- * <!-- begin-user-doc -->
- * This implementation returns null;
- * returning a non-null result will terminate the switch.
- * <!-- end-user-doc -->
- * @param object the target of the switch.
- * @return the result of interpreting the object as an instance of '<em>IWeb Service</em>'.
- * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
- * @generated
- */
- public T caseIWebService(IWebService object) {
- return null;
- }
-
- /**
- * Returns the result of interpreting the object as an instance of '<em>IWeb Service Project</em>'.
- * <!-- begin-user-doc -->
- * This implementation returns null;
- * returning a non-null result will terminate the switch.
- * <!-- end-user-doc -->
- * @param object the target of the switch.
- * @return the result of interpreting the object as an instance of '<em>IWeb Service Project</em>'.
- * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
- * @generated
- */
- public T caseIWebServiceProject(IWebServiceProject object) {
- return null;
- }
-
- /**
- * Returns the result of interpreting the object as an instance of '<em>IWeb Type</em>'.
- * <!-- begin-user-doc -->
- * This implementation returns null;
- * returning a non-null result will terminate the switch.
- * <!-- end-user-doc -->
- * @param object the target of the switch.
- * @return the result of interpreting the object as an instance of '<em>IWeb Type</em>'.
- * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
- * @generated
- */
- public T caseIWebType(IWebType object) {
- return null;
- }
-
- /**
- * Returns the result of interpreting the object as an instance of '<em>EObject</em>'.
- * <!-- begin-user-doc -->
- * This implementation returns null;
- * returning a non-null result will terminate the switch, but this is the last case anyway.
- * <!-- end-user-doc -->
- * @param object the target of the switch.
- * @return the result of interpreting the object as an instance of '<em>EObject</em>'.
- * @see #doSwitch(org.eclipse.emf.ecore.EObject)
- * @generated
- */
- public T defaultCase(EObject object) {
- return null;
- }
-
-} //DomSwitch
diff --git a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/util/Jee5DomUtils.java b/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/util/Jee5DomUtils.java
deleted file mode 100755
index 7455d79..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/util/Jee5DomUtils.java
+++ /dev/null
@@ -1,123 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.dom.runtime.util;
-
-import static org.eclipse.jst.ws.jaxws.dom.runtime.persistence.WPAnnotationFeatures.WP_ANNOTATION;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.IWebMethod;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.IWebParam;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.SOAPBindingParameterStyle;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.SOAPBindingStyle;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.WebParamKind;
-import org.eclipse.jst.ws.jaxws.dom.runtime.persistence.WPAnnotationFeatures;
-import org.eclipse.jst.ws.jaxws.dom.runtime.persistence.annotation.AnnotationAdapterFactory;
-import org.eclipse.jst.ws.jaxws.dom.runtime.persistence.annotation.IAnnotationAdapter;
-import org.eclipse.jst.ws.jaxws.utils.annotations.IAnnotation;
-
-/**
- * Utility for some specification specific logics that are frequently used
- * while dealing with DOM objects.
- *
- * @author Georgi Vachkov
- */
-public class Jee5DomUtils
-{
- /** the singleton instance */
- private static Jee5DomUtils instance;
-
- private Jee5DomUtils() {
- // singleton
- }
-
- /**
- * Method that decides if the attribute 'partName' is used at all according
- * to JSR-181 section 4.4.1 - attribute 'partName' column 'meaning'.
- * @param webParam the webParam to be checked
- * @return <code>true</code> in case partName is used
- */
- public boolean isPartNameUsed(final IWebParam webParam)
- {
- final IWebMethod webMethod = (IWebMethod)webParam.eContainer();
-
- return webMethod.getSoapBindingStyle()==SOAPBindingStyle.RPC ||
- webMethod.getSoapBindingParameterStyle()==SOAPBindingParameterStyle.BARE;
- }
-
- /**
- * Method that decides is the attribute 'name' is used at all
- * according to JSR-181 section 4.4.1 - attribute 'name' column 'meaning'
- * @param webParam
- * @return return <code>true</code> in case name is used
- */
- public boolean isNameUsed(final IWebParam webParam)
- {
- final IWebMethod webMethod = (IWebMethod)webParam.eContainer();
- if( webMethod.getSoapBindingStyle()==SOAPBindingStyle.DOCUMENT || webParam.isHeader() ) {
- return true;
- }
-
- final IAnnotation<? extends IJavaElement> annotation = findAnnotation(webParam, WP_ANNOTATION);
- if (annotation==null) {
- return false;
- }
-
- return annotation.getPropertyValue(WPAnnotationFeatures.PART_NAME_ATTRIBUTE)==null;
- }
-
- /**
- * Helper method to extract annotation with fully qualified name <code>annFQName</code>
- * @param eObject the object to search in
- * @param annFQName the FQ name of searched annotation
- * @return found annotation or <code>null</code>
- */
- public IAnnotation<? extends IJavaElement> findAnnotation(final EObject eObject, final String annFQName)
- {
- final IAnnotationAdapter adapter = (IAnnotationAdapter)AnnotationAdapterFactory.INSTANCE.adapt(eObject, IAnnotationAdapter.class);
- if (adapter!=null) {
- return adapter.getAnnotation(annFQName);
- }
-
- return null;
- }
-
- /**
- * Method that decides if the param name is required to be put in the annotation according
- * to JSR-181 section 4.4.1 - attribute 'name' column 'meaning'.
- * @param webParam
- * @return <code>true</code> if the name attribute should be put on annotation
- */
- public boolean isNameRequired(final IWebParam webParam)
- {
- final IWebMethod webMethod = (IWebMethod)webParam.eContainer();
-
- if (webMethod.getSoapBindingStyle()==SOAPBindingStyle.DOCUMENT &&
- webMethod.getSoapBindingParameterStyle()==SOAPBindingParameterStyle.BARE &&
- (webParam.getKind()==WebParamKind.INOUT || webParam.getKind()==WebParamKind.OUT)) {
- return true;
- }
-
- return false;
- }
-
- /**
- * @return the singleton instance
- */
- public static Jee5DomUtils getInstance()
- {
- if (instance == null) {
- instance = new Jee5DomUtils();
- }
-
- return instance;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/util/LocatorExtractor.java b/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/util/LocatorExtractor.java
deleted file mode 100755
index aa361cc..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/util/LocatorExtractor.java
+++ /dev/null
@@ -1,128 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.dom.runtime.util;
-
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.IMember;
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jface.text.BadLocationException;
-import org.eclipse.jface.text.Document;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jst.ws.jaxws.dom.runtime.DomUtil;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.DomPackage;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.IWebMethod;
-import org.eclipse.jst.ws.jaxws.utils.annotations.ILocator;
-
-
-/**
- * Class that extracts {@link ILocator} out of DOM object
- *
- * @author Georgi Vachkov
- */
-public class LocatorExtractor
-{
- private static LocatorExtractor instance;
-
- private LocatorExtractor() {
- // singleton instance
- }
-
- /**
- * Extracts the {@link ILocator}
- * @param eObject
- * @return {@link ILocator} instance or <code>null</code> in case the {@link IJavaElement}
- * cannot be found for this <code>eObject</code>.
- * @throws JavaModelException
- * @throws BadLocationException
- * @throws IllegalArgumentException in case <code>eObject</code> is DOM object for which
- * this method is not implemented
- */
- public ILocator find(final EObject eObject) throws JavaModelException, BadLocationException
- {
- final IType seiType = findIType(eObject);
- if (seiType == null) {
- return null;
- }
-
- switch(eObject.eClass().getClassifierID())
- {
- case DomPackage.IWEB_METHOD:
- return getLocatorForMethod(seiType, (IWebMethod)eObject);
- case DomPackage.ISERVICE_ENDPOINT_INTERFACE:
- return getPosition(seiType);
- case DomPackage.IWEB_SERVICE:
- return getPosition(seiType);
- case DomPackage.IWEB_PARAM:
- return getLocatorForMethod(seiType, (IWebMethod)eObject.eContainer());
- }
-
- throw new IllegalArgumentException("Unknown object type");//$NON-NLS-1$
- }
-
- private ILocator getLocatorForMethod(final IType seiType, final IWebMethod webMethod) throws JavaModelException, BadLocationException
- {
- final IMethod method = DomUtil.INSTANCE.findMethod(seiType, webMethod);
- if (method!=null) {
- return getPosition(method);
- }
-
- return null;
- }
-
- private IType findIType(final EObject eObject) throws JavaModelException {
- return Dom2ResourceMapper.INSTANCE.findType(eObject);
- }
-
- private ILocator getPosition(final IMember member) throws JavaModelException, BadLocationException
- {
- final int offset = member.getNameRange().getOffset();
- final int length = member.getNameRange().getLength();
- final int lineNumber = getLineNumber(member);
-
- return new ILocator()
- {
- public int getStartPosition() {
- return offset;
- }
-
- public int getLength() {
- return length;
- }
-
- public int getLineNumber() {
- return lineNumber;
- }
- };
- }
-
- private int getLineNumber(final IMember member) throws JavaModelException, BadLocationException
- {
- final IDocument doc = new Document(member.getCompilationUnit().getBuffer().getContents());
-
- return doc.getLineOfOffset(member.getNameRange().getOffset()) + 1;
- }
-
- /**
- * @return the singleton instance
- */
- public static LocatorExtractor getInstance()
- {
- if (instance==null) {
- instance = new LocatorExtractor();
- }
-
- return instance;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/util/ParamValueComparator.java b/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/util/ParamValueComparator.java
deleted file mode 100755
index 4e77245..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/util/ParamValueComparator.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.dom.runtime.util;
-
-import java.util.Comparator;
-import java.util.TreeSet;
-
-import org.eclipse.jst.ws.jaxws.utils.annotations.IParamValuePair;
-
-/**
- * Class that compares {@link IParamValuePair} by property name. Intended to be used when
- * creating a {@link TreeSet} for annotation properties.
- *
- * @author Georgi Vachkov
- */
-public class ParamValueComparator implements Comparator<IParamValuePair>
-{
- public enum Order {Normal, Reversed};
-
- private final Order order;
-
- public ParamValueComparator() {
- order = Order.Normal;
- }
-
- public ParamValueComparator(final Order order) {
- this.order = order;
- }
-
-
- public int compare(IParamValuePair o1, IParamValuePair o2)
- {
- if(order==Order.Normal) {
- return o1.getParam().compareTo(o2.getParam());
- }
-
- return o2.getParam().compareTo(o1.getParam());
- }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/validation/AbstractValidationConstraint.java b/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/validation/AbstractValidationConstraint.java
deleted file mode 100755
index 3b465ae..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/validation/AbstractValidationConstraint.java
+++ /dev/null
@@ -1,191 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.dom.runtime.validation;
-
-import static org.eclipse.jst.ws.jaxws.utils.ContractChecker.nullCheckParam;
-
-import java.util.HashSet;
-import java.util.Set;
-
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.validation.IValidationContext;
-import org.eclipse.emf.validation.model.IConstraintStatus;
-import org.eclipse.emf.validation.model.ModelConstraint;
-import org.eclipse.emf.validation.service.IConstraintDescriptor;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jface.text.BadLocationException;
-import org.eclipse.jst.ws.jaxws.dom.runtime.persistence.annotation.AnnotationAdapterFactory;
-import org.eclipse.jst.ws.jaxws.dom.runtime.persistence.annotation.IAnnotationAdapter;
-import org.eclipse.jst.ws.jaxws.dom.runtime.util.Dom2ResourceMapper;
-import org.eclipse.jst.ws.jaxws.dom.runtime.util.Jee5DomUtils;
-import org.eclipse.jst.ws.jaxws.dom.runtime.util.LocatorExtractor;
-import org.eclipse.jst.ws.jaxws.dom.runtime.validation.impl.ConstraintStatusExtended;
-import org.eclipse.jst.ws.jaxws.dom.runtime.validation.impl.ProblemLocation;
-import org.eclipse.jst.ws.jaxws.utils.annotations.IAnnotation;
-import org.eclipse.jst.ws.jaxws.utils.annotations.ILocator;
-import org.eclipse.jst.ws.jaxws.utils.annotations.IParamValuePair;
-import org.eclipse.jst.ws.jaxws.utils.logging.ILogger;
-import org.eclipse.jst.ws.jaxws.utils.logging.Logger;
-
-/**
- * Base class to be used by other DOM constraints. Provides useful methods for
- * creating {@link IConstraintStatus} during validation, extraction of
- * error location etc.
- *
- * @author Georgi Vachkov
- */
-public abstract class AbstractValidationConstraint extends ModelConstraint
-{
- private ILogger logger;
- private Jee5DomUtils jee5DomUtil;
-
- /**
- * Constructor
- * @param descriptor - the {@link IConstraintDescriptor} for the specific constraint
- * should not be <code>null</code>
- */
- public AbstractValidationConstraint(IConstraintDescriptor descriptor) {
- super(descriptor);
-
- nullCheckParam(descriptor, "descriptor");//$NON-NLS-1$
- logger = new Logger();
- jee5DomUtil = Jee5DomUtils.getInstance();
- }
-
- /**
- * Abstract method called when the real validation have to take place. Override
- * this method and implement your validation logic.
- * @param ctx the validation context
- * @return the status of your validation
- * @throws CoreException
- */
- protected abstract IStatus doValidate(IValidationContext ctx) throws CoreException;
-
- public IStatus validate(IValidationContext ctx)
- {
- try {
- return doValidate(ctx);
- } catch (CoreException e) {
- logger().logError(e.getMessage(), e);
- }
-
- return Status.OK_STATUS;
- }
-
- /**
- * Creates OK status
- * @param object the validated object
- * @return {@link IConstraintStatus} instance with severity {@link IStatus#OK}
- * @throws JavaModelException
- */
- protected IConstraintStatusExtended createOkStatus(EObject object) throws JavaModelException
- {
- return new ConstraintStatusExtended(this, object, IStatus.OK, 0, "", new HashSet<IProblemLocation>(0));//$NON-NLS-1$
- }
-
- /**
- * Creates {@link IConstraintStatus} instance with severity depending on the severity defined by
- * {@link IConstraintDescriptor#getSeverity()}.
- * @param object the validated object
- * @param message the message to be displayed
- * @param annFQName the fully qualified name on the annotation validated
- * @param attributeName the name of the attribute validated
- * @return created object
- * @throws JavaModelException
- */
- protected IConstraintStatusExtended createStatus(EObject object, String message, String annFQName, String attributeName) throws JavaModelException
- {
- return createStatus(object, message, getLocator(object, annFQName, attributeName));
- }
-
- protected IConstraintStatusExtended createStatus(final EObject object, final String message, final IProblemLocation locator)
- {
- final Set<IProblemLocation> problems = new HashSet<IProblemLocation>(1);
- problems.add(locator);
-
- return new ConstraintStatusExtended(this, object, message, problems);
- }
-
- /**
- * Creates {@link IProblemLocation} instance out of {@link EObject} instance.
- * Defines which is the {@link IResource} containing this DOM object and tries to
- * extract {@link ILocator}.
- * @param eObject
- * @param annFQName
- * @param attributeName
- * @return created location
- * @throws JavaModelException
- */
- protected IProblemLocation getLocator(EObject eObject, String annFQName, String attributeName) throws JavaModelException
- {
- final IAnnotationAdapter adapter = (IAnnotationAdapter)AnnotationAdapterFactory.INSTANCE.adapt(eObject, IAnnotationAdapter.class);
- final IAnnotation<? extends IJavaElement> annotation = annFQName==null ? null : adapter.getAnnotation(annFQName);
- if (annotation==null) {
- return new ProblemLocation(findResource(eObject), getLocatorForImplementation(eObject));
- }
-
- ILocator locator = null;
- if (attributeName != null) {
- locator = getLocatorForAttributeValue(annotation, attributeName);
- }
-
- if (locator == null) {
- locator = annotation.getLocator();
- }
-
- return new ProblemLocation(annotation.getAppliedElement().getResource(), locator);
- }
-
- protected ILocator getLocatorForAttributeValue(IAnnotation<? extends IJavaElement> annotation, String attributeName)
- {
- for (IParamValuePair pair : annotation.getParamValuePairs())
- {
- if(pair.getParam().equals(attributeName)) {
- return pair.getValue().getLocator();
- }
- }
-
- return null;
- }
-
- protected ILocator getLocatorForImplementation(final EObject eObject) throws JavaModelException {
- try {
- return LocatorExtractor.getInstance().find(eObject);
- } catch (BadLocationException e) {
- logger().logError(e.getMessage(), e);
- }
-
- return null;
- }
-
- protected IResource findResource(EObject eObject) throws JavaModelException {
- return Dom2ResourceMapper.INSTANCE.findResource(eObject);
- }
-
- protected IAnnotation<? extends IJavaElement> findAnnotation(final EObject eObject, final String annFQName)
- {
- final IAnnotationAdapter adapter = (IAnnotationAdapter)AnnotationAdapterFactory.INSTANCE.adapt(eObject, IAnnotationAdapter.class);
- return adapter.getAnnotation(annFQName);
- }
-
- protected ILogger logger() {
- return logger;
- }
-
- protected Jee5DomUtils jee5DomUtil() {
- return jee5DomUtil;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/validation/DomValidationConstraintDescriptor.java b/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/validation/DomValidationConstraintDescriptor.java
deleted file mode 100755
index 4070653..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/validation/DomValidationConstraintDescriptor.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.dom.runtime.validation;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.validation.model.CategoryManager;
-import org.eclipse.emf.validation.model.EvaluationMode;
-import org.eclipse.emf.validation.service.AbstractConstraintDescriptor;
-import org.eclipse.jst.ws.jaxws.dom.runtime.internal.plugin.JaxWsDomRuntimeMessages;
-
-public abstract class DomValidationConstraintDescriptor extends AbstractConstraintDescriptor
-{
- public DomValidationConstraintDescriptor() {
- addCategory(CategoryManager.getInstance().getCategory("org.eclipse.jst.ws.jaxws.dom.jee5"));//$NON-NLS-1$
- }
-
- public String getBody() {
- return null;
- }
-
- public String getDescription() {
- return JaxWsDomRuntimeMessages.DomValidationConstraintDescriptor_WS_DOM_VALIDATION_CONSTRAINT;
- }
-
- public EvaluationMode<EObject> getEvaluationMode() {
- return EvaluationMode.BATCH;
- }
-
- public String getMessagePattern() {
- return null;
- }
-
- public String getName() {
- return JaxWsDomRuntimeMessages.DomValidationConstraintDescriptor_WS_DOM_VALIDATION_CONSTRAINT;
- }
-
- public boolean targetsEvent(Notification notification) {
- return true;
- }
-
- public boolean targetsTypeOf(EObject object) {
- return true;
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/validation/DomValidatorFactory.java b/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/validation/DomValidatorFactory.java
deleted file mode 100755
index 7764b9d..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/validation/DomValidatorFactory.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.dom.runtime.validation;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.core.runtime.IExtension;
-import org.eclipse.core.runtime.IExtensionPoint;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.jst.ws.jaxws.dom.runtime.internal.util.XpUtil;
-
-/**
- * Singleton factory used to instantiate registered DOM validators.
- *
- * @author Georgi Vachkov
- */
-public class DomValidatorFactory
-{
- /** The extension point ID */
- public static final String DOM_VALIDATION_XP = "org.eclipse.jst.ws.jaxws.dom.runtime.domValidator"; //$NON-NLS-1$
-
- /** Factory's singleton instance */
- public static final DomValidatorFactory INSTANCE = new DomValidatorFactory();
-
- private DomValidatorFactory() {
- // singleton
- }
-
- /**
- * Extracts all registered DOM validators.
- * @return collection of all registered DOM validators
- */
- public Collection<IDomValidator> getRegisteredValidators()
- {
- final List<IDomValidator> validators = new ArrayList<IDomValidator>();
- final IExtensionPoint extensionPoint = Platform.getExtensionRegistry().getExtensionPoint(DOM_VALIDATION_XP);
- for (IExtension extension : extensionPoint.getExtensions()) {
- validators.add(((IDomValidator) XpUtil.instantiateImplementation(extension)));
- }
-
- return validators;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/validation/IConstraintStatusExtended.java b/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/validation/IConstraintStatusExtended.java
deleted file mode 100755
index eb7c656..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/validation/IConstraintStatusExtended.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.dom.runtime.validation;
-
-import java.util.Set;
-
-import org.eclipse.emf.validation.model.IConstraintStatus;
-
-/**
- * Extended constraint status which carries information about the problem location
- * @author Danail Branekov
- */
-public interface IConstraintStatusExtended extends IConstraintStatus
-{
- /**
- * Gets the set of the problem locations. The result is an unmodifiable set
- * @return set of problem locations; empty set if none
- */
- public Set<IProblemLocation> getProblemLocations();
-
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/validation/IDomValidator.java b/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/validation/IDomValidator.java
deleted file mode 100755
index b9266a9..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/validation/IDomValidator.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.dom.runtime.validation;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * Implement this interface if you intend to implement specific DOM runtime validation.
- * You need to register the validator using org.eclipse.jst.ws.jaxws.dom.runtime.domValidator
- * extension point and specify for which DOM runtime version it will be relevant.
- *
- * @author Georgi Vachkov
- */
-public interface IDomValidator
-{
- /**
- * Called when validation is triggered - for details see WST validation framework and
- * DomValidationManager.
- * @param object object to be validated
- * @return the validation results
- */
- public IStatus validate(EObject object);
-
- /**
- * Here you must return the DOM runtime ID which this validator supports
- * @return DOM runtime ID
- */
- public String getSupportedDomRuntime();
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/validation/IProblemLocation.java b/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/validation/IProblemLocation.java
deleted file mode 100755
index 220ca5a..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/validation/IProblemLocation.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.dom.runtime.validation;
-
-import org.eclipse.core.resources.IResource;
-import org.eclipse.jst.ws.jaxws.utils.annotations.ILocator;
-
-/**
- * Interface that provides information on where the problem marker should be set/removed
- *
- * @author Georgi Vachkov
- */
-public interface IProblemLocation
-{
- /**
- * The resource on which the marker to be set or removed
- * @return not <code>null</code> {@link IResource} instance
- */
- public IResource getResource();
-
- /**
- * The exact location in code where the marker to be put
- * @return the {@link ILocator} instance to define the start char and length of text
- * to be underlined by the marker. This method might return <code>null</code> in case
- * location info is not relevant - for example when marker just needs to be removed.
- */
- public ILocator getLocator();
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/validation/JaxWsDomValidator.java b/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/validation/JaxWsDomValidator.java
deleted file mode 100755
index 92a5860..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/validation/JaxWsDomValidator.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.dom.runtime.validation;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.validation.model.EvaluationMode;
-import org.eclipse.emf.validation.service.IBatchValidator;
-import org.eclipse.emf.validation.service.ITraversalStrategy;
-import org.eclipse.emf.validation.service.ModelValidationService;
-import org.eclipse.jst.ws.jaxws.dom.runtime.persistence.Jee5WsDomRuntimeExtension;
-
-/**
- * JAX-WS runtime DOM validator. Registered to the validation framework
- * to contribute the validation process.
- *
- * @author Georgi Vachkov
- */
-public class JaxWsDomValidator implements IDomValidator
-{
- public IStatus validate(EObject object)
- {
- final IBatchValidator validator = (IBatchValidator) ModelValidationService.getInstance().newValidator(EvaluationMode.BATCH);
- validator.setIncludeLiveConstraints(true);
- validator.setReportSuccesses(true);
- validator.getConstraintFilters();
- validator.setTraversalStrategy(new ITraversalStrategy.Recursive());
-
- validator.validate(object, null);
-
- return Status.OK_STATUS;
- }
-
- public String getSupportedDomRuntime() {
- return Jee5WsDomRuntimeExtension.ID;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/validation/WsDynamicModelConstraintProvider.java b/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/validation/WsDynamicModelConstraintProvider.java
deleted file mode 100755
index 49b64a0..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/validation/WsDynamicModelConstraintProvider.java
+++ /dev/null
@@ -1,87 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.dom.runtime.validation;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.validation.model.IModelConstraint;
-import org.eclipse.emf.validation.service.IModelConstraintProvider;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.IServiceEndpointInterface;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.IWebMethod;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.IWebParam;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.IWebService;
-import org.eclipse.jst.ws.jaxws.dom.runtime.util.DomSwitch;
-import org.eclipse.jst.ws.jaxws.dom.runtime.validation.sei.SeiConstraintProvider;
-import org.eclipse.jst.ws.jaxws.dom.runtime.validation.webmethod.WmConstraintProvider;
-import org.eclipse.jst.ws.jaxws.dom.runtime.validation.webparam.WpConstraintProvider;
-import org.eclipse.jst.ws.jaxws.dom.runtime.validation.webservice.WsConstraintProvider;
-
-public class WsDynamicModelConstraintProvider implements IModelConstraintProvider
-{
- private final DomSwitch<Collection<IModelConstraint>> domSwitch;
- private final WsConstraintProvider wsProvider;
- private final SeiConstraintProvider seiProvider;
- private final WmConstraintProvider wmProvider;
- private final WpConstraintProvider wpProvider;
-
-
- public WsDynamicModelConstraintProvider()
- {
- domSwitch = createDomSwitch();
- wsProvider = new WsConstraintProvider();
- seiProvider = new SeiConstraintProvider();
- wmProvider = new WmConstraintProvider();
- wpProvider = new WpConstraintProvider();
- }
-
- @SuppressWarnings("unchecked")
- public Collection getBatchConstraints(EObject eObject, Collection constraints)
- {
- final Collection<IModelConstraint> modelConstraints = domSwitch.doSwitch(eObject);
- if (modelConstraints!=null) {
- constraints.addAll(modelConstraints);
- }
-
- return constraints;
- }
-
- @SuppressWarnings("unchecked")
- public Collection getLiveConstraints(Notification arg0, Collection constraints) {
- return constraints;
- }
-
- private DomSwitch<Collection<IModelConstraint>> createDomSwitch()
- {
- return new DomSwitch<Collection<IModelConstraint>>()
- {
- public Collection<IModelConstraint> caseIWebService(IWebService object) {
- return wsProvider.getConstraints();
- }
-
- @Override
- public Collection<IModelConstraint> caseIServiceEndpointInterface(IServiceEndpointInterface object) {
- return seiProvider.getConstraints();
- }
-
- @Override
- public Collection<IModelConstraint> caseIWebMethod(IWebMethod object) {
- return wmProvider.getConstraints();
- }
-
- @Override
- public Collection<IModelConstraint> caseIWebParam(IWebParam object) {
- return wpProvider.getConstraints();
- }
- };
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/validation/WsProblemsReporter.java b/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/validation/WsProblemsReporter.java
deleted file mode 100755
index 0cdb38a..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/validation/WsProblemsReporter.java
+++ /dev/null
@@ -1,92 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.dom.runtime.validation;
-
-import java.util.List;
-
-import org.eclipse.core.resources.IMarker;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.emf.validation.model.IConstraintStatus;
-import org.eclipse.emf.validation.service.IValidationListener;
-import org.eclipse.emf.validation.service.ValidationEvent;
-import org.eclipse.jst.ws.jaxws.dom.runtime.DomUtil;
-import org.eclipse.jst.ws.jaxws.utils.dom.validation.DomValidationConstants;
-import org.eclipse.jst.ws.jaxws.utils.logging.ILogger;
-import org.eclipse.jst.ws.jaxws.utils.logging.Logger;
-
-/**
- * Problems reporter. Listens to validation events and reports errors.
- *
- * @author Georgi Vachkov
- */
-public class WsProblemsReporter implements IValidationListener
-{
- /** The validation marker ID */
- public static final String MARKER_ID = DomValidationConstants.MARKER_ID;
-
-
- public void validationOccurred(ValidationEvent event)
- {
- final List<IConstraintStatus> list = event.getValidationResults();
- for (IConstraintStatus cStatus : list)
- {
- assert cStatus instanceof IConstraintStatusExtended;
-
- if (cStatus.isOK()) {
- continue;
- }
-
- processStatus(cStatus);
- }
- }
-
- private void processStatus(final IConstraintStatus status)
- {
- if (!(status instanceof IConstraintStatusExtended)) {
- return;
- }
-
- try {
- final IProblemLocation locator = ((IConstraintStatusExtended)status).getProblemLocations().iterator().next();
- final IMarker marker = locator.getResource().createMarker(MARKER_ID);
- if (locator.getLocator() != null)
- {
- marker.setAttribute(IMarker.CHAR_START, locator.getLocator().getStartPosition());
- marker.setAttribute(IMarker.CHAR_END, locator.getLocator().getStartPosition() + locator.getLocator().getLength());
- marker.setAttribute(IMarker.LINE_NUMBER, locator.getLocator().getLineNumber());
- }
- marker.setAttribute(IMarker.MESSAGE, status.getMessage());
- marker.setAttribute(IMarker.PRIORITY, IMarker.PRIORITY_NORMAL);
- marker.setAttribute(IMarker.SEVERITY, getMarkerSeverity(status.getSeverity()));
- marker.setAttribute(IMarker.SOURCE_ID, status.getConstraint().getDescriptor().getId());
- marker.setAttribute(DomValidationConstants.IMPLEMENTATION, DomUtil.INSTANCE.calcUniqueImpl(status.getTarget()));
- }
- catch (CoreException e) {
- logger().logError(e.getMessage(), e);
- }
- }
-
- private int getMarkerSeverity(int statusSeverity)
- {
- switch(statusSeverity)
- {
- case IStatus.INFO: return IMarker.SEVERITY_INFO;
- case IStatus.WARNING: return IMarker.SEVERITY_WARNING;
- default:
- return IMarker.SEVERITY_ERROR;
- }
- }
-
- private ILogger logger() {
- return new Logger();
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/validation/impl/ConstraintStatusExtended.java b/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/validation/impl/ConstraintStatusExtended.java
deleted file mode 100755
index e41ea0a..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/validation/impl/ConstraintStatusExtended.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.dom.runtime.validation.impl;
-
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.Set;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.validation.model.ConstraintStatus;
-import org.eclipse.emf.validation.model.IModelConstraint;
-import org.eclipse.jst.ws.jaxws.dom.runtime.validation.IConstraintStatusExtended;
-import org.eclipse.jst.ws.jaxws.dom.runtime.validation.IProblemLocation;
-import org.eclipse.jst.ws.jaxws.utils.ContractChecker;
-
-/**
- * Extended constraint status which carries information about the problem location
- * @author Danail Branekov
- */
-public class ConstraintStatusExtended extends ConstraintStatus implements IConstraintStatusExtended
-{
- private final Set<IProblemLocation> problemLocations;
-
- /**
- * Constructs a <code>ConstraintStatusExtended</code> instance with empty result locus
- * @param constraint
- * @param target
- * @param severity
- * @param code
- * @param message
- * @param problemLocations a set of problem locations or empty set if none; cannot be null.<br>
- *
- * @see ConstraintStatus#ConstraintStatus(IModelConstraint, EObject, int, int, String, Set)
- */
- public ConstraintStatusExtended(final IModelConstraint constraint, final EObject target, final int severity, final int code, final String message, final Set<IProblemLocation> problemLocations)
- {
- super(constraint, target, severity, code, message, new HashSet<EObject>());
- ContractChecker.nullCheckParam(problemLocations, "problemLocation");//$NON-NLS-1$
- this.problemLocations = problemLocations;
- }
-
- /**
- * Constructs a <code>ConstraintStatusExtended</code> instance with empty result locus
- * @param constraint
- * @param target
- * @param message
- * @param problemLocations a set of problem locations or empty set if none; cannot be null.<br>
- *
- * @see ConstraintStatus#ConstraintStatus(IModelConstraint, EObject, String, Set)
- */
- public ConstraintStatusExtended(final IModelConstraint constraint, final EObject target, final String message, final Set<IProblemLocation> problemLocations)
- {
- super(constraint, target, message, new HashSet<EObject>());
- this.problemLocations = problemLocations;
- }
-
- public Set<IProblemLocation> getProblemLocations()
- {
- return Collections.unmodifiableSet(this.problemLocations);
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/validation/impl/ProblemLocation.java b/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/validation/impl/ProblemLocation.java
deleted file mode 100755
index 9a54775..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/validation/impl/ProblemLocation.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.dom.runtime.validation.impl;
-
-import static org.eclipse.jst.ws.jaxws.utils.ContractChecker.nullCheckParam;
-
-import org.eclipse.core.resources.IResource;
-import org.eclipse.jst.ws.jaxws.dom.runtime.validation.IProblemLocation;
-import org.eclipse.jst.ws.jaxws.utils.annotations.ILocator;
-
-
-public class ProblemLocation implements IProblemLocation
-{
- private final IResource resource;
- private final ILocator locator;
-
- public ProblemLocation(IResource resource, ILocator locator)
- {
- nullCheckParam(resource, "resource");//$NON-NLS-1$
-
- this.resource = resource;
- this.locator = locator;
- }
-
- public ILocator getLocator() {
- return locator;
- }
-
- public IResource getResource() {
- return resource;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/validation/messages/ValidationMessages.java b/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/validation/messages/ValidationMessages.java
deleted file mode 100755
index ab4c1a4..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/validation/messages/ValidationMessages.java
+++ /dev/null
@@ -1,86 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.dom.runtime.validation.messages;
-
-import org.eclipse.osgi.util.NLS;
-
-public class ValidationMessages extends NLS
-{
- private static final String BUNDLE_NAME = "org.eclipse.jst.ws.jaxws.dom.runtime.validation.messages.ValidationMessages"; //$NON-NLS-1$
-
- public static String BottomUpProviderGenerator_FailedtoAnnotate;
-
- public static String BottomUpProviderGenerator_FailedToCollectMethods;
-
- public static String BottomUpProviderGenerator_MethodNotSupported;
-
- public static String BottomUpProviderGenerator_ProjectNotAccesible;
-
- public static String Ejb3TopDownProviderGenerator_InconsistentMetadata;
-
- public static String Ejb3TopDownProviderGenerator_InternalErrorInterface;
-
- public static String Ejb3TopDownProviderGenerator_InternalErrorOperation;
-
- public static String Ejb3TopDownProviderGenerator_InvalidInterfaceMapping;
-
- public static String Ejb3TopDownProviderGenerator_MappingsEmpty;
-
- public static String ProxyWorkaround_UnableToDeleteProxy;
-
- public static String ProxyWorkaround_UnableToRenameProxy;
-
- public static String Wsdl2JavaGenerator_ErrorDuringGeneration;
-
- public static String Wsdl2JavaGenerator_IncorrectURL;
-
- public static String Wsdl2JavaGenerator_PathInappropriate;
-
- public static String Wsdl2JavaGenerator_WSDLDownloadException;
-
- /** Message for not existing SEI */
- public static String WsValidation_SeiDoesNotExists;
-
- /** Message for non existing WSDL referenced by wsdlLocation */
- public static String WsValidation_WsdlDoesNotExists;
-
- /** On SEI portName, serviceName and endpointInterface should not be used */
- public static String SeiValidation_RedundantAttributes;
-
- /** Message for already existing method name in SEI */
- public static String WebMethodValidation_NameExists;
-
- /** Message for excluded methods inside SEI */
- public static String WebMethodValidation_MethodShouldNotBeExcluded;
-
- /** Excluded method should contain only exclude attribute */
- public static String WebMethodValidation_ExcludedHasOtherAttributes;
-
- /** Message for used 'name' attribute while SEI is referenced */
- public static String WsValidation_NameShouldNotBeUsedWithSei;
-
- /** Message for duplicated web parameter name */
- public static String WebParamValidation_NameExists;
-
- /** Attribute 'name' is not needed due to current SOAPBinding configuration */
- public static String WebParamValidation_NameRedundant;
-
- /** Attribute 'name' is required */
- public static String WebParamValidation_NameRequired;
-
- public static String WsValidation_WsAnnotationOnNonSessionBean_Error;
-
-
- static
- {
- NLS.initializeMessages(BUNDLE_NAME, ValidationMessages.class);
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/validation/messages/ValidationMessages.properties b/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/validation/messages/ValidationMessages.properties
deleted file mode 100755
index ec783a0..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/validation/messages/ValidationMessages.properties
+++ /dev/null
@@ -1,40 +0,0 @@
-###############################################################################
-# Copyright (c) 2009 by SAP AG, Walldorf.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# SAP AG - initial API and implementation
-###############################################################################
-BottomUpProviderGenerator_FailedtoAnnotate=Failed to annotate class
-BottomUpProviderGenerator_FailedToCollectMethods=Failed to collect supported methods
-BottomUpProviderGenerator_MethodNotSupported=Method {0} is not in the supported. Web Service annotations could not be added to endpoint
-BottomUpProviderGenerator_ProjectNotAccesible=The project containing the IType provided should be accessible
-Ejb3TopDownProviderGenerator_InconsistentMetadata=Generated IProviderMetadata should contains IEndpoinMetada
-Ejb3TopDownProviderGenerator_InternalErrorInterface=Internal error, could not find relation between InterfaceMapping: {0} and Configuration entities
-Ejb3TopDownProviderGenerator_InternalErrorOperation=Internal error, could not find relation between OperationMapping: {0} and Configuration entities inside InterfaceData: {1}
-Ejb3TopDownProviderGenerator_InvalidInterfaceMapping=Returned interface mappings could not be null or empty array
-Ejb3TopDownProviderGenerator_MappingsEmpty=Returned opperation mappings for interface mapping {0} could not be null or empty array
-ProxyWorkaround_UnableToDeleteProxy=Unable to delete original proxy source file: {0}
-ProxyWorkaround_UnableToRenameProxy=Unable to rename patched proxy source file to its original name: {0}
-
-Wsdl2JavaGenerator_ErrorDuringGeneration=Error during WSDL to Java generation
-Wsdl2JavaGenerator_IncorrectURL=Incorrect WSDL URL syntax
-Wsdl2JavaGenerator_PathInappropriate=Path of the file {0} isn't appropriate to build an URL
-Wsdl2JavaGenerator_WSDLDownloadException=Exception ocured during WSDL download
-WsValidation_SeiDoesNotExists = The specified service endpoint interface {0} does not exists or not annotated correctly
-WsValidation_WsdlDoesNotExists = The specified WSDL is incorrect, URL parsing error: {0}
-WsValidation_NameShouldNotBeUsedWithSei = Name attribute should not be used if SEI is referenced via endpointInterface attribute
-WsValidation_WsAnnotationOnNonSessionBean_Error = @WebService annotation in EJB modules can be only used on session beans
-
-SeiValidation_RedundantAttributes = @WebService annotation should not include attributes portName, serviceName, endpointInterface and wsdlLocation when used on service endpoint interface
-
-WebMethodValidation_NameExists = Web method with name {0} already exists
-WebMethodValidation_MethodShouldNotBeExcluded = Service endpoint interface methods cannot be excluded
-WebMethodValidation_ExcludedHasOtherAttributes = Excluded Web method should not contain attributes other than exclude attribute
-
-WebParamValidation_NameExists = Web parameter with name {0} already exists
-WebParamValidation_NameRedundant= Name attribute is not used if SOAPBinding.Style is RPC and partName is present
-WebParamValidation_NameRequired = A name should be specified if the operation is document style, the parameter style is BARE, and the mode is OUT or INOUT
\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/validation/provider/EndpointTypeValidator.java b/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/validation/provider/EndpointTypeValidator.java
deleted file mode 100755
index 6cbbd98..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/validation/provider/EndpointTypeValidator.java
+++ /dev/null
@@ -1,185 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.dom.runtime.validation.provider;
-
-import java.text.MessageFormat;
-
-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.JavaModelException;
-import org.eclipse.jst.ws.jaxws.dom.runtime.internal.plugin.JaxWsDomRuntimeMessages;
-import org.eclipse.jst.ws.jaxws.dom.runtime.internal.plugin.JaxWsDomRuntimePlugin;
-import org.eclipse.jst.ws.jaxws.dom.runtime.internal.validation.provider.TypeAdapter;
-
-/**
- * Provides type validation for class intedent to be used as an endpoint in
- * WebService.
- *
- * @author Georgi Vachkov
- */
-
-public class EndpointTypeValidator {
- private static final String EMPTY = ""; //$NON-NLS-1$
-
- private static final String FINALYZE_METHOD_NAME = "finalize"; //$NON-NLS-1$
-
- /**
- * Validates <tt>type</tt> if is cappable to be used as endpoint. Type used
- * as Endpoint should fulfil following requirements:
- *
- * <pre>
- * 1. Must be a source type
- * 2. Must be public
- * 3. Should not be an interface
- * 4. Should not be an abstract class
- * 5. Should not be final
- * 6. Should provide default constructor
- * 7. Should not declare finalyze() method
- * </pre>
- *
- * @param type
- * @return IStatus object - in case <tt>type</tt> can be used as endpoint
- * the {@link IStatus#getSeverity()} will return {@link IStatus#OK},
- * else {@link IStatus#ERROR} is returned and
- * {@link IStatus#getMessage()} will return readable message
- * describing the condition that is not fulfiled.
- * @throws JavaModelException
- */
- public IStatus validate(IType type) throws JavaModelException {
- TypeAdapter typeAdapter = new TypeAdapter(type);
- String typeName = typeAdapter.getQualifiedName();
-
- if (type.isBinary()) {
- return prepareStatus(
- MessageFormat
- .format(
- JaxWsDomRuntimeMessages.EndpointTypeValidator_ERR_MSG_BINARYCLASS,
- typeName),
- new IllegalArgumentException(
- MessageFormat
- .format(
- "Class {0} is binary class and cannot be annotated", //$NON-NLS-1$
- typeName)));
- }
-
- if (!typeAdapter.isPublic()) {
- return prepareStatus(MessageFormat
- .format(
- JaxWsDomRuntimeMessages.EndpointTypeValidator_ERR_MSG_NOTPUBLIC,
- typeName),
- new IllegalArgumentException(
- MessageFormat
- .format(
- "Class {0} is not public and cannot be used as web service endpoint", //$NON-NLS-1$
- typeName)));
- }
-
- if (!typeAdapter.getType().isClass()) {
- return prepareStatus(MessageFormat
- .format(
- JaxWsDomRuntimeMessages.EndpointTypeValidator_ERR_MSG_NOTCLASS,
- typeName),
- new IllegalArgumentException(
- MessageFormat
- .format(
- "{0} is not a class", //$NON-NLS-1$
- typeName)));
- }
-
- if (typeAdapter.isAbstract()) {
- return prepareStatus(MessageFormat
- .format(
- JaxWsDomRuntimeMessages.EndpointTypeValidator_ERR_MSG_ABSTRACT,
- typeName),
- new IllegalArgumentException(
- MessageFormat
- .format(
- "Class {0} is abstract", //$NON-NLS-1$
- typeName)));
- }
-
- if (typeAdapter.isFinal()) {
- return prepareStatus(MessageFormat
- .format(
- JaxWsDomRuntimeMessages.EndpointTypeValidator_ERR_MSG_FINAL,
- typeName),
- new IllegalArgumentException(
- MessageFormat
- .format(
- "Class {0} is final and cannot be used as web service endpoint", //$NON-NLS-1$
- typeName)));
- }
-
- if (!typeAdapter.hasDefaultConstructor()) {
- return prepareStatus(MessageFormat
- .format(
- JaxWsDomRuntimeMessages.EndpointTypeValidator_ERR_MSG_CONSTRUCTOR,
- typeName),
- new IllegalArgumentException(
- MessageFormat
- .format(
- "Class {0} does not have a default constructor", //$NON-NLS-1$
- typeName)));
- }
-
- if (hasFinalyzeMethod(type)) {
- return prepareStatus(MessageFormat
- .format(
- JaxWsDomRuntimeMessages.EndpointTypeValidator_ERR_MSG_HASFINALYZE,
- typeName),
- new IllegalArgumentException(
- MessageFormat
- .format(
- "Class {0} contains finalize() method and cannot be used as web service endpoint", //$NON-NLS-1$
- typeName)));
- }
-
- return prepareStatus(null, null);
- }
-
- /**
- * Checks if type contains finalyze() method
- *
- * @param type
- * @return <tt>true</tt> if has finalyze method
- */
- private boolean hasFinalyzeMethod(IType type) {
- IMethod method = type.getMethod(FINALYZE_METHOD_NAME, new String[0]);
- if (method == null) {
- return false;
- }
-
- if (method.exists()) {
- return true;
- }
-
- return false;
- }
-
- /**
- * Prepares IStatus instance. If <code>errorMessage</code> is
- * <code>null</code> IStatus.OK is set to the IStatus object else the status
- * is IStatus.ERROR.
- *
- * @param errorMessage
- * the message to be used
- * @return always returns an valid IMethodAudit instance.
- */
- private IStatus prepareStatus(String localizedMessage, Throwable excepion) {
- IStatus status = new Status((localizedMessage == null) ? IStatus.OK
- : IStatus.ERROR, JaxWsDomRuntimePlugin.PLUGIN_ID, IStatus.OK,
- (localizedMessage == null) ? EMPTY : localizedMessage, excepion);
-
- return status;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/validation/provider/MethodValidator.java b/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/validation/provider/MethodValidator.java
deleted file mode 100755
index ec9d406..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/validation/provider/MethodValidator.java
+++ /dev/null
@@ -1,151 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.dom.runtime.validation.provider;
-
-import java.util.Collection;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jdt.core.Flags;
-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.jst.ws.jaxws.dom.runtime.PrimitiveTypeHandler;
-import org.eclipse.jst.ws.jaxws.dom.runtime.TypeResolver;
-import org.eclipse.jst.ws.jaxws.dom.runtime.internal.plugin.JaxWsDomRuntimePlugin;
-import org.eclipse.jst.ws.jaxws.dom.runtime.internal.validation.provider.TypeFactory;
-import org.eclipse.jst.ws.jaxws.dom.runtime.validation.provider.exceptions.ConstructorNotExposableException;
-import org.eclipse.jst.ws.jaxws.dom.runtime.validation.provider.exceptions.InadmissableTypeException;
-import org.eclipse.jst.ws.jaxws.dom.runtime.validation.provider.exceptions.MethodNotPublicException;
-
-/**
- * Performes method validation by validating types used. Types are cached between different invocations of check(IMethod method) for better
- * performance.
- *
- * @author Georgi Vachkov
- */
-public class MethodValidator
-{
- private final static String EMPTY = ""; //$NON-NLS-1$
-
- private final RuntimeTypeValidator validator;
-
- /**
- * Constructor.
- */
- public MethodValidator()
- {
- validator = new RuntimeTypeValidator();
- }
-
- /**
- * Performs check on types used in method. Checks return types, paramether types and exception types. Stops validation on the first error. An
- * IStatus object containing information on the result of the check is returned.
- *
- * @param method
- * @return IStatus with severity IStatus.OK if the method can be exposed, or IStatus.ERROR including error message decribing the problem.
- * @throws NullPointerException -
- * in case <code>method</code> is null
- * @throws JavaModelException
- */
- public IStatus check(IMethod method) throws JavaModelException
- {
- if (method.isConstructor()) {
- return prepareStatus(new ConstructorNotExposableException(method.getElementName()));
- }
-
- final IType declaringType = method.getDeclaringType();
-
- if (!Flags.isPublic(method.getFlags()) && !declaringType.isInterface()) {
- return prepareStatus(new MethodNotPublicException(method.getElementName()));
- }
-
- try
- {
- // Handle return type
- validateRuntimeClass(method.getReturnType(), declaringType);
-
- // Handle input parameters and there types
- for (String paramTypeName : method.getParameterTypes())
- {
- validateRuntimeClass(paramTypeName, declaringType);
- }
-
- // handle exception types
- for (String exceptionTypeName : method.getExceptionTypes())
- {
- validateException(exceptionTypeName, declaringType);
- }
-
- return prepareStatus(null);
- } catch (InadmissableTypeException e)
- {
- return prepareStatus(e);
- }
- }
-
- /**
- * Validates <code>typeName</code>. On first steps type is resolved and all resolved types are validated one by one. The resolved types can be
- * more than one in case the type declaration uses generics. Validation propagates the exceptions thrown by RuntimeTypeValidator.
- *
- * @param typeName
- * @param declaringType
- * @throws JavaModelException
- * @throws InadmissableTypeException
- */
- private void validateRuntimeClass(String typeName, IType declaringType) throws JavaModelException, InadmissableTypeException
- {
- Collection<String> names = TypeResolver.resolveTypes(typeName, declaringType);
- for (String name : names)
- {
- if (PrimitiveTypeHandler.isVoidType(name))
- {
- continue;
- }
-
- validator.validate(TypeFactory.create(name, declaringType));
- }
- }
-
- /**
- * Validates if <tt>exceptionType</tt> is a valid exception type for WS operation
- *
- * @param exceptionType -
- * exception type name
- * @param declaringType -
- * type in which it is used
- * @throws JavaModelException
- * @throws InadmissableTypeException
- * @throws JavaModelException
- */
- private void validateException(final String exceptionType, final IType declaringType) throws InadmissableTypeException, JavaModelException
- {
- String exFQName = TypeResolver.resolveType(Signature.toString(exceptionType), declaringType);
-
- validator.validate(TypeFactory.create(exFQName, declaringType));
- }
-
- /**
- * Prepares IMethodAudit instance for <code>method</code>. If <code>throwable</code> is <code>null</code> IStatus.OK is set to the IStatus
- * object contained in returned IMethodAudit instance else IStatus.ERROR is set.
- *
- * @param throwable
- * @return always returns an valid IMethodAudit instance.
- */
- private IStatus prepareStatus(Throwable throwable)
- {
- IStatus status = new Status((throwable == null) ? IStatus.OK : IStatus.ERROR, JaxWsDomRuntimePlugin.PLUGIN_ID, IStatus.OK,
- (throwable == null) ? EMPTY : throwable.getLocalizedMessage(), throwable);
-
- return status;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/validation/provider/RuntimeTypeValidator.java b/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/validation/provider/RuntimeTypeValidator.java
deleted file mode 100755
index 9a3b845..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/validation/provider/RuntimeTypeValidator.java
+++ /dev/null
@@ -1,439 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.dom.runtime.validation.provider;
-
-import java.util.Collection;
-
-import org.eclipse.jdt.core.Flags;
-import org.eclipse.jdt.core.IField;
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.ITypeHierarchy;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jdt.core.Signature;
-import org.eclipse.jst.ws.jaxws.dom.runtime.GeneralTypesNames;
-import org.eclipse.jst.ws.jaxws.dom.runtime.PrimitiveTypeHandler;
-import org.eclipse.jst.ws.jaxws.dom.runtime.TypeResolver;
-import org.eclipse.jst.ws.jaxws.dom.runtime.internal.validation.provider.TypeAdapter;
-import org.eclipse.jst.ws.jaxws.dom.runtime.internal.validation.provider.TypeFactory;
-import org.eclipse.jst.ws.jaxws.dom.runtime.validation.provider.exceptions.AbstractClassNotImplementedException;
-import org.eclipse.jst.ws.jaxws.dom.runtime.validation.provider.exceptions.InadmissableTypeException;
-import org.eclipse.jst.ws.jaxws.dom.runtime.validation.provider.exceptions.InterfacesNotSupportedException;
-import org.eclipse.jst.ws.jaxws.dom.runtime.validation.provider.exceptions.NoDefaultConstructorException;
-import org.eclipse.jst.ws.jaxws.dom.runtime.validation.provider.exceptions.TypeNotFoundException;
-import org.eclipse.jst.ws.jaxws.utils.annotations.AnnotationFactory;
-import org.eclipse.jst.ws.jaxws.utils.annotations.IAnnotation;
-import org.eclipse.jst.ws.jaxws.utils.annotations.IAnnotationInspector;
-
-/**
- * Provides type validation for class intedent to be used as an runtime classes in WebService.Runtime classes should fulfil following requirements:<br>
- * <ul>
- * 1. Should provide default constructor<br>
- * 2. Should not implement java.rmi.Remote<br>
- * 3. If it is a java.* type should be one of allowed java types<br>
- * 4. Class should not contain inner classes that are not public static.<br>
- * 5. Should not have 'multy inheritance'. This means if class extends class other than java.lang.Object it should not implement interface. In oposite
- * if the class extends java.lang.Object it should implement only one interface. Following interfaces are not checked:<br>
- * <br>
- *
- * <ul>
- * java.lang.Comparable<br>
- * java.lang.Clonable<br>
- * java.io.Serializable
- * </ul>
- * </ul>
- *
- * @author Georgi Vachkov
- */
-public class RuntimeTypeValidator extends TypeValidator
-{
- private static final String XML_TRANSIENT_ANNOTATION = "javax.xml.bind.annotation.XmlTransient"; //$NON-NLS-1$
- private static final String XML_TRANSIENT_ANNOTATION_SHORT = "XmlTransient"; //$NON-NLS-1$
-
- private static final String XML_TYPE_ANNOTATION = "javax.xml.bind.annotation.XmlType"; //$NON-NLS-1$
- private static final String WEB_FAULT_ANNOTATION = "javax.xml.ws.WebFault"; //$NON-NLS-1$
-
- private static final String GET = "get"; //$NON-NLS-1$
- private static final String OBJECT_FACTORY = "ObjectFactory"; //$NON-NLS-1$
-
-
- // private static final String SET = "set";
-
-
- private IAnnotationInspector annotationInspector = null;
-
- /**
- * Provides type validation for class intedent to be used as an runtime classes in WebService.Runtime classes should fulfil following
- * requirements:<br>
- * <ul>
- * 1. Should provide default constructor<br>
- * 2. Should not implement java.rmi.Remote<br>
- * 3. If it is a java.* type should be one of allowed java types<br>
- * 4. Class should not contain inner classes that are not public static.<br>
- * 5. Should not have 'multy inheritance'. This means if class extends class other than java.lang.Object it should not implement interface. In
- * oposite if the class extends java.lang.Object it should implement only one interface. Following interfaces are not checked:<br>
- * <br>
- *
- * <ul>
- * java.lang.Comparable<br>
- * java.lang.Clonable<br>
- * java.io.Serializable
- * </ul>
- * </ul>
- *
- * @param type -
- * checked type
- * @throws JavaModelException
- * @throws InadmissableTypeException
- * @see TypeValidator for list of allowed java types.
- */
- @Override
- protected void doValidate(TypeAdapter type) throws InadmissableTypeException, JavaModelException
- {
- final String typeName = type.getQualifiedName();
-
- // check for types from java.* packages
- if (isJavaType(typeName))
- {
- if (isAllowedJavaType(typeName))
- {
- return;
- }
- }
-
- if (Flags.isEnum(type.getType().getFlags()))
- {
- return;
- }
-
- if (isXmlAnnotated(type.getType()))
- {
- return;
- }
-
- if (hasObjectFactoryMethod(type.getType())) {
- return;
- }
-
- if (type.isInterface())
- {
- throw new InterfacesNotSupportedException(typeName);
- }
-
- if (isExtendingCollectionOrMap(type))
- {
- return;
- }
-
- if (!type.hasDefaultConstructor())
- {
- throw new NoDefaultConstructorException(typeName);
- }
-
- checkRemoteNotImplemented(type);
- checkMultipleInheritance(type);
- checkForInadmissableInnerClasses(type);
- checkAbstractNotImplemented(type);
- checkPublicAttributes(type);
- checkTypesUsedInProperties(type);
- }
-
- private boolean hasObjectFactoryMethod(final IType type) throws JavaModelException
- {
- if (type.getJavaProject()==null) {
- return false;
- }
-
- final String pack = type.getPackageFragment().getElementName();
- final String objectFactoryFQName = pack.length()==0 ? OBJECT_FACTORY : pack + '.' + OBJECT_FACTORY;
-
- final IType objectFactory = type.getJavaProject().findType(objectFactoryFQName);
- if (objectFactory == null) {
- return false;
- }
-
- if (containsCreateMethod(objectFactory, type)) {
- return true;
- }
-
- return false;
- }
-
- private boolean containsCreateMethod(final IType objectFactory, final IType type) throws JavaModelException
- {
- for (IMethod method : objectFactory.getMethods())
- {
- if (method.isConstructor()) {
- continue;
- }
-
- for (String name : TypeResolver.resolveTypes(method.getReturnType(), type)) {
- if (type.getFullyQualifiedName().equals(name)) {
- return true;
- }
- }
- }
-
- return false;
- }
-
- /**
- * Checks if <code>type</code> is annotated with annotation affecting mapping to XML.
- * Always returns false in case <code>type</code> is binary class.
- *
- * @param type
- * @return
- * @throws JavaModelException
- */
- private boolean isXmlAnnotated(IType type) throws JavaModelException
- {
- if (type.isBinary()) {
- return false;
- }
-
- annotationInspector = AnnotationFactory.createAnnotationInspector(type);
- IAnnotation<IType> typeAnnotation = annotationInspector.inspectType(XML_TYPE_ANNOTATION);
- if (typeAnnotation!=null) {
- return true;
- }
-
- typeAnnotation = annotationInspector.inspectType(WEB_FAULT_ANNOTATION);
- if (typeAnnotation!=null) {
- return true;
- }
-
- return false;
- }
-
- /**
- * Performs check on public member variables of type. 1. Checks if the type is a java API class whether it is supported. 2. If is other type
- * perform rutime class check using validate(TypeProxy type) method.
- *
- * @see RuntimeTypeValidator - checkType(TypeProxy type) method.
- * @param type
- * @throws InadmissableTypeException
- * @throws JavaModelException
- */
- private void checkPublicAttributes(TypeAdapter type) throws InadmissableTypeException, JavaModelException
- {
- IType iType = type.getType();
- for (IField field : iType.getFields())
- {
- if (Flags.isPublic(field.getFlags()))
- {
- resolveAndCheckType(field.getTypeSignature(), iType);
- }
- }
- }
-
- /**
- * Check if the <code>type</code> implements {@link java.util.Collection} or {@link java.util.Map}
- *
- * @param type
- * @return true - if implements {@link java.util.Collection} or {@link java.util.Map}
- * @throws TypeNotFoundException
- * @throws JavaModelException
- */
- private boolean isExtendingCollectionOrMap(TypeAdapter type) throws TypeNotFoundException, JavaModelException
- {
- if (type.isImplementing(GeneralTypesNames.JAVA_UTIL_COLLECTION))
- {
- return true;
- }
-
- if (type.isImplementing(GeneralTypesNames.JAVA_UTIL_MAP))
- {
- return true;
- }
-
- return false;
- }
-
- /**
- * Checks types used as return value, parameter types.
- *
- * @param type
- * @throws InadmissableTypeException
- * @throws JavaModelException
- */
- private void checkTypesUsedInProperties(TypeAdapter type) throws InadmissableTypeException, JavaModelException
- {
- IType iType = type.getType();
- for (IMethod method : iType.getMethods())
- {
- // Constructors are not validated
- if (method.isConstructor() || isXmlTransient(method))
- {
- continue;
- }
-
- // only getters are validated
- if (!isGetter(method))
- {// || !findSetter(method)) {
- return;
- }
-
- resolveAndCheckType(method.getReturnType(), method.getDeclaringType());
- }
- }
-
- private boolean isGetter(final IMethod method)
- {
- return method.getElementName().startsWith(GET);
- }
-
- private boolean isXmlTransient(IMethod method) throws JavaModelException
- {
- if (method.getDeclaringType().isBinary())
- {
- return false;
- }
-
- annotationInspector = AnnotationFactory.createAnnotationInspector(method.getDeclaringType());
- Collection<IAnnotation<IMethod>> methodAnnotations = annotationInspector.inspectMethod(method);
- boolean result = false;
- for (IAnnotation<IMethod> methodAnnotation : methodAnnotations)
- {
- if(methodAnnotation.getAnnotationName().equals(XML_TRANSIENT_ANNOTATION) ||
- methodAnnotation.getAnnotationName().equals(XML_TRANSIENT_ANNOTATION_SHORT))
- {
- result = true;
- }
-
- }
-
- return result;
- }
-
- /**
- * Provides type check with type resolving.
- *
- * @param typeName
- * @param type
- * @throws JavaModelException
- * @throws TypeNotFoundException
- * @throws InadmissableTypeException
- */
- private void resolveAndCheckType(String typeName, IType type) throws JavaModelException, TypeNotFoundException, InadmissableTypeException
- {
- if(isVariableType(typeName, type))
- {
- return;
- }
-
- for (String resolvedType : TypeResolver.resolveTypes(typeName, type))
- {
- if (PrimitiveTypeHandler.isVoidType(resolvedType))
- {
- continue;
- }
-
- if (isJavaType(resolvedType) && isAllowedJavaType(resolvedType))
- {
- continue;
- }
-
- validateInternal(new TypeAdapter(TypeFactory.create(resolvedType, type)));
- }
- }
-
- /**
- * Validates if <code>type</code> is abstract class whether it is implemented by some class capable for runtime class.
- *
- * @param type
- * @throws InadmissableTypeException
- * @throws JavaModelException
- */
- private void checkAbstractNotImplemented(TypeAdapter type) throws InadmissableTypeException, JavaModelException
- {
- // check for implementor for abstract class
- if (type.isAbstract() && !isImplemented(type.getType()))
- {
- throw new AbstractClassNotImplementedException(type.getQualifiedName());
- }
- }
-
- /**
- * Checks whether <code>base</code> class has some non abstract implementor which is capable for runtime class.
- *
- * @param base
- * checked type
- * @throws JavaModelException
- */
- private boolean isImplemented(IType base) throws JavaModelException
- {
- if (base.getFullyQualifiedName().equals(GeneralTypesNames.JAVA_LANG_OBJECT)
- || base.getFullyQualifiedName().equals(GeneralTypesNames.JAVA_IO_SERIALIZABLE))
- {
- return true;
- }
-
- ITypeHierarchy typeHierarchy = base.newTypeHierarchy(null);
- IType[] classes = typeHierarchy.getAllSubtypes(base);
-
- IType classCandidate = null;
- for (int i = 0; i < classes.length; i++)
- {
- classCandidate = classes[i];
-
- if (canBeUsedAsRTClass(classCandidate))
- {
- return true;
- }
- }
- return false;
- }
-
- /**
- * Check if given type is suitable for class/interface implementor. Class should not be abstract, interface and should comply to the rules defined
- * in checkType documentation.
- *
- * @see RuntimeTypeValidator - checkType(TypeProxy type) method.
- * @param type -
- * checked type
- * @throws JavaModelException
- */
- private boolean canBeUsedAsRTClass(IType type) throws JavaModelException
- {
- int flags = type.getFlags();
-
- if (!type.isClass() || Flags.isAbstract(flags))
- {
- return false;
- }
-
- if (Flags.isInterface(flags) || type.isAnonymous())
- {
- return false;
- }
-
- // check sub type if it is allowed as rt classes
- try
- {
- TypeAdapter tp = new TypeAdapter(type);
- validateInternal(tp);
- } catch (InadmissableTypeException e)
- {
- // $JL-EXC$
- return false;
- }
-
- return true;
- }
-
- /**
- * Checks if the type is a variable type (like e.g. "T" in Holder<T>)
- */
- private boolean isVariableType(final String typeName, final IType type) throws JavaModelException
- {
- return Signature.getTypeSignatureKind(TypeResolver.resolveType(typeName, type)) == Signature.TYPE_VARIABLE_SIGNATURE;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/validation/provider/SeiImplementationValidator.java b/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/validation/provider/SeiImplementationValidator.java
deleted file mode 100755
index 36cd077..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/validation/provider/SeiImplementationValidator.java
+++ /dev/null
@@ -1,272 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.dom.runtime.validation.provider;
-
-import java.text.MessageFormat;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jdt.core.Flags;
-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.jst.ws.jaxws.dom.runtime.TypeResolver;
-import org.eclipse.jst.ws.jaxws.dom.runtime.internal.plugin.JaxWsDomRuntimeMessages;
-import org.eclipse.jst.ws.jaxws.dom.runtime.internal.plugin.JaxWsDomRuntimePlugin;
-import org.eclipse.jst.ws.jaxws.utils.ContractChecker;
-
-/**
- * Validates SEI against implementation bean.
- *
- * @author Georgi Vachkov
- */
-
-public class SeiImplementationValidator
-{
- private final IType seiType;
-
- /**
- * Constructor.
- *
- * @param seiType
- * @throws NullPointerException in case <code>seiType</code> is <code>null</code>
- * @throws IllegalArgumentException in case <code>seiType</code> is not a interface
- * @throws JavaModelException
- */
- public SeiImplementationValidator(final IType seiType) throws JavaModelException
- {
- ContractChecker.nullCheckParam(seiType);
-
- if (!seiType.isInterface()) {
- throw new IllegalArgumentException("seiType should be interface"); //$NON-NLS-1$
- }
-
- this.seiType = seiType;
- }
-
- /**
- * Validates provided in constructor SEI against <tt>beanType</tt>. The <tt>beanType</tt> should implement all
- *
- * @param beanType
- * @return status object with set severity and message
- * @throws JavaModelException
- */
- public IStatus validate(final IType beanType) throws JavaModelException
- {
- final String beanFQName = beanType.getFullyQualifiedName();
- if (implementsSEI(beanType))
- {
- return prepareStatus(null, null);
- }
-
- for (IMethod seiMethod : collectInterfaceMethods(seiType))
- {
- IMethod beanMethod = findMethodInBean(seiMethod, beanType);
- if (beanMethod == null)
- {
- return prepareStatus(MessageFormat.format(JaxWsDomRuntimeMessages.SeiImplementationValidator_METHOD_NOT_FOUND, formatMethodSignature(seiMethod), beanFQName),
- new IllegalArgumentException(
- MessageFormat.format(
- "Method {0} cannot be found in the implementation bean {1}. It is required that the bean implements all the methods of the specified service endpoint interface", //$NON-NLS-1$
- beanFQName)));
- }
-
- if (!Flags.isPublic(beanMethod.getFlags()))
- {
- return prepareStatus(MessageFormat.format(JaxWsDomRuntimeMessages.SeiImplementationValidator_METHOD_NOT_PUBLIC, formatMethodSignature(seiMethod), beanFQName),
- new IllegalArgumentException(
- MessageFormat.format(
- " Method {0} in the implementation bean {1} is not public and therefore cannot be exposed as a web service operation", //$NON-NLS-1$
- beanFQName)));
- }
-
- if (!hasSameExceptions(seiMethod, beanMethod))
- {
- return prepareStatus(MessageFormat.format(JaxWsDomRuntimeMessages.SeiImplementationValidator_METHOD_HASDIFFERENT_EXCEPTIONS, formatMethodSignature(seiMethod), beanFQName),
- new IllegalArgumentException(
- MessageFormat.format(
- "Method {0} in the implementation bean {1} is declared to throw exceptions that differ from exceptions thrown by the same method in the service endpoint interface", //$NON-NLS-1$
- beanFQName)));
- }
- }
-
- return prepareStatus(null, null);
- }
-
- private boolean implementsSEI(final IType beanType) throws JavaModelException
- {
- for (String interfaceName : beanType.getSuperInterfaceNames())
- {
- String interfaceFQName = TypeResolver.resolveType(interfaceName, beanType);
- if (interfaceFQName.equals(seiType.getFullyQualifiedName()))
- {
- return true;
- }
- }
-
- return false;
- }
-
- private IMethod findMethodInBean(final IMethod seiMethod, final IType beanType) throws JavaModelException
- {
- for (IMethod beanMethod : beanType.getMethods())
- {
- if (!seiMethod.getElementName().equals(beanMethod.getElementName()))
- {
- continue;
- }
-
- if (hasSameReturnType(seiMethod, beanMethod) && hasSameParams(seiMethod, beanMethod))
- {
- return beanMethod;
- }
- }
-
- if (beanType.getSuperclassName() == null)
- {
- return null;
- }
-
- final String superTypeName = TypeResolver.resolveType(beanType.getSuperclassName(), beanType);
-
- return findMethodInBean(seiMethod, beanType.getJavaProject().findType(superTypeName));
- }
-
- private boolean hasSameReturnType(final IMethod seiMethod, final IMethod beanMethod) throws JavaModelException
- {
- final List<String> seiRetType = TypeResolver.resolveTypes(seiMethod.getReturnType(), seiMethod.getDeclaringType());
- final List<String> beanRetType = TypeResolver.resolveTypes(beanMethod.getReturnType(), beanMethod.getDeclaringType());
-
- if (!areSameTypes(seiRetType, beanRetType))
- {
- return false;
- }
-
- return true;
- }
-
- private boolean hasSameParams(final IMethod seiMethod, final IMethod beanMethod) throws JavaModelException
- {
- final String[] seiParamTypes = seiMethod.getParameterTypes();
- final String[] beanParamTypes = beanMethod.getParameterTypes();
- if (seiParamTypes.length != beanParamTypes.length)
- {
- return false;
- }
-
- List<String> seiParamType = null;
- List<String> beanParamType = null;
- for (int i = 0; i < seiParamTypes.length; i++)
- {
- seiParamType = TypeResolver.resolveTypes(seiParamTypes[i], seiMethod.getDeclaringType());
- beanParamType = TypeResolver.resolveTypes(beanParamTypes[i], beanMethod.getDeclaringType());
-
- if (!areSameTypes(seiParamType, beanParamType))
- {
- return false;
- }
- }
-
- return true;
- }
-
- private boolean areSameTypes(final List<String> seiTypeNames, final List<String> beanTypeNames)
- {
- if (seiTypeNames.size() != beanTypeNames.size())
- {
- return false;
- }
-
- for (int i = 0; i < seiTypeNames.size(); i++)
- {
- if (!seiTypeNames.get(i).equals(beanTypeNames.get(i)))
- {
- return false;
- }
- }
-
- return true;
- }
-
- private List<IMethod> collectInterfaceMethods(final IType type) throws JavaModelException
- {
- final List<IMethod> allMethods = new ArrayList<IMethod>();
- Collections.addAll(allMethods, type.getMethods());
-
- for (String superInterfaceName : type.getSuperInterfaceNames())
- {
- String superFQName = TypeResolver.resolveType(superInterfaceName, type);
- IType superType = type.getJavaProject().findType(superFQName, (IProgressMonitor) null);
-
- assert (superType != null);
-
- allMethods.addAll(collectInterfaceMethods(superType));
- }
-
- return allMethods;
- }
-
- private boolean hasSameExceptions(IMethod seiMethod, IMethod beanMethod) throws JavaModelException
- {
- if (seiMethod.getExceptionTypes().length != beanMethod.getExceptionTypes().length)
- {
- return false;
- }
-
- final Set<String> seiExceptions = getResolvedExceptions(seiMethod);
- final IType beanType = beanMethod.getDeclaringType();
- for (String beanEx : beanMethod.getExceptionTypes())
- {
- String resolvedName = TypeResolver.resolveType(Signature.toString(beanEx), beanType);
- if (!seiExceptions.contains(resolvedName))
- {
- return false;
- }
- }
-
- return true;
- }
-
- private Set<String> getResolvedExceptions(IMethod method) throws JavaModelException
- {
- final Set<String> exceptionsFQNs = new HashSet<String>(method.getExceptionTypes().length);
- final IType declaringType = method.getDeclaringType();
-
- for (String exception : method.getExceptionTypes())
- {
- exceptionsFQNs.add(TypeResolver.resolveType(Signature.toString(exception), declaringType));
- }
-
- return exceptionsFQNs;
- }
-
- private String formatMethodSignature(final IMethod method) throws JavaModelException
- {
- final StringBuffer name = new StringBuffer(Signature.toString(method.getSignature(), method.getElementName(), method.getParameterNames(),
- true, false));
- name.append(" : "); //$NON-NLS-1$
- name.append(Signature.toString(method.getReturnType()));
-
- return name.toString();
- }
-
- private IStatus prepareStatus(String msg, Throwable cause)
- {
- return new Status((msg == null) ? IStatus.OK : IStatus.ERROR, JaxWsDomRuntimePlugin.PLUGIN_ID, IStatus.OK, msg == null ? "" : msg, cause); //$NON-NLS-1$
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/validation/provider/SeiValidator.java b/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/validation/provider/SeiValidator.java
deleted file mode 100755
index 497ad49..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/validation/provider/SeiValidator.java
+++ /dev/null
@@ -1,135 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.dom.runtime.validation.provider;
-
-import java.text.MessageFormat;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jdt.core.Flags;
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jst.ws.jaxws.dom.runtime.TypeResolver;
-import org.eclipse.jst.ws.jaxws.dom.runtime.internal.plugin.JaxWsDomRuntimeMessages;
-import org.eclipse.jst.ws.jaxws.dom.runtime.internal.plugin.JaxWsDomRuntimePlugin;
-
-/**
- * Interface validator - checks if supplied type is applicable for Service Endpoint Interface (SEI).
- *
- * @author Georgi Vachkov
- */
-
-public class SeiValidator
-{
-
- private final MethodValidator methodValidator;
-
- /**
- * Constructor.
- */
- public SeiValidator()
- {
- methodValidator = new MethodValidator();
- }
-
- /**
- * <pre>
- * Validates <tt>type</tt> if it is applicable for Service Entdpoint Interface.
- *
- * 1. <tt>type</tt> must be interface
- * 2. <tt>type</tt> must be outer
- * 3. <tt>type</tt> must be public
- * 4. all <tt>type</tt> methods must be exposable according to the rules in {@link MethodValidator}
- * </pre>
- *
- * @param type validated type
- * @return IStatus object with status {@link IStatus#OK} in case <tt>type</tt> is applicable for SEI or {@link IStatus#ERROR} in case type is
- * not applicable with some human readble explanation of the problem.
- * @throws NullPointerException in case <tt>type</tt> is null.
- * @throws JavaModelException
- */
- public IStatus validate(IType type) throws JavaModelException
- {
- String seiName = type.getFullyQualifiedName();
- if (!type.isInterface())
- {
- return prepareStatus(MessageFormat.format(JaxWsDomRuntimeMessages.SeiValidator_NOT_INTERFACE_MSG, seiName),
- new IllegalArgumentException(
- MessageFormat.format(
- "{0} is not a interface and cannot be used as a service endpoint interface", //$NON-NLS-1$
- seiName)));
- }
-
- if (type.isBinary())
- {
- return prepareStatus(MessageFormat.format(JaxWsDomRuntimeMessages.SeiValidator_NOT_COMPILATIONUNIT_MSG, seiName),
- new IllegalArgumentException(
- MessageFormat.format(
- "{0} is a binary interface and cannot annotated as a service endpoint interface", //$NON-NLS-1$
- seiName)));
- }
-
- if (type.isMember())
- {
- return prepareStatus(MessageFormat.format(JaxWsDomRuntimeMessages.SeiValidator_NOT_OUTER_MSG, seiName),
- new IllegalArgumentException(
- MessageFormat.format(
- "{0} is not a outer interface and cannot be used as a service endpoint interface", //$NON-NLS-1$
- seiName)));
- }
-
- if (!Flags.isPublic(type.getFlags()))
- {
- return prepareStatus(MessageFormat.format(JaxWsDomRuntimeMessages.SeiValidator_NOT_PUBLIC_MSG, seiName),
- new IllegalArgumentException(
- MessageFormat.format(
- "{0} is not a public interface and cannot be used as a service endpoint interface", //$NON-NLS-1$
- seiName)));
- }
-
- return validateMethods(type);
- }
-
- private IStatus validateMethods(IType type) throws JavaModelException
- {
- IStatus status;
- for (IMethod method : type.getMethods())
- {
- status = methodValidator.check(method);
- if (status.getSeverity() != IStatus.OK)
- {
- return status;
- }
- }
-
- for (String superInterfaceName : type.getSuperInterfaceNames())
- {
- String superFQName = TypeResolver.resolveType(superInterfaceName, type);
- IType superType = type.getJavaProject().findType(superFQName);
-
- assert (superType != null);
-
- status = validateMethods(superType);
- if (status.getSeverity() != IStatus.OK)
- {
- return status;
- }
- }
-
- return prepareStatus(null, null);
- }
-
- private IStatus prepareStatus(String msg, Throwable cause)
- {
- return new Status((msg == null) ? IStatus.OK : IStatus.ERROR, JaxWsDomRuntimePlugin.PLUGIN_ID, IStatus.OK, msg == null ? "" : msg, cause); //$NON-NLS-1$
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/validation/provider/TypeValidator.java b/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/validation/provider/TypeValidator.java
deleted file mode 100755
index 761195c..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/validation/provider/TypeValidator.java
+++ /dev/null
@@ -1,328 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.dom.runtime.validation.provider;
-
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jst.ws.jaxws.dom.runtime.GeneralTypesNames;
-import org.eclipse.jst.ws.jaxws.dom.runtime.internal.plugin.JaxWsDomRuntimePlugin;
-import org.eclipse.jst.ws.jaxws.dom.runtime.internal.validation.provider.TypeAdapter;
-import org.eclipse.jst.ws.jaxws.dom.runtime.internal.validation.provider.TypeKey;
-import org.eclipse.jst.ws.jaxws.dom.runtime.validation.provider.exceptions.HasInadmisableInnerTypesException;
-import org.eclipse.jst.ws.jaxws.dom.runtime.validation.provider.exceptions.InadmissableTypeException;
-import org.eclipse.jst.ws.jaxws.dom.runtime.validation.provider.exceptions.InheritanceAndImplementationExecption;
-import org.eclipse.jst.ws.jaxws.dom.runtime.validation.provider.exceptions.MultipleImplementationException;
-import org.eclipse.jst.ws.jaxws.dom.runtime.validation.provider.exceptions.RemoteObjectException;
-
-/**
- * Provides set of general validation methods which can be reused by subclasses.
- *
- * @i036509
- */
-public abstract class TypeValidator
-{
- // there are types from the java.* packages that are supported by the runtime
- // and are known to it without analysis of there structure, therefore they are
- // stored as elementaries.
- private static final Set<String> JAVA_TYPES = new HashSet<String>(); // $JL-COLLECTION$
-
- // for these java.* types attributes are resolved, i.e they are stored as
- // structure if they contain fields.
- private static final Set<String> ANALYSED_JAVA_TYPES = new HashSet<String>(); // $JL-COLLECTION$
-
- // these types are allowed to be used in case of multy inheritance
- private static final Set<String> ALLOWED_IN_MULTYINHERITANCE = new HashSet<String>(); // $JL-COLLECTION$
-
- private Map<TypeKey, IStatus> statusMap = new HashMap<TypeKey, IStatus>();
-
- // cache of already analyzed types
- private Set<TypeKey> analyzed = new HashSet<TypeKey>();
-
- static
- {
- // There are types from the java.* packages that are supported by the runtime
- // and are known to it without analysis of there structure, therefore they are
- // stored as elementaries.
-
- // Date/Time Specific Types
- JAVA_TYPES.add("java.util.Calendar"); //$NON-NLS-1$
- JAVA_TYPES.add("java.util.Date"); //$NON-NLS-1$
- JAVA_TYPES.add("java.util.GregorianCalendar"); //$NON-NLS-1$
- JAVA_TYPES.add("javax.xml.datatype.XMLGregorianCalendar"); //$NON-NLS-1$
-
- // Array Based Types
- JAVA_TYPES.add("java.util.ArrayList"); //$NON-NLS-1$
- JAVA_TYPES.add("java.util.HashSet"); //$NON-NLS-1$
- JAVA_TYPES.add("java.util.LinkedList"); //$NON-NLS-1$
- JAVA_TYPES.add("java.util.List"); //$NON-NLS-1$
- JAVA_TYPES.add("java.util.Stack"); //$NON-NLS-1$
- JAVA_TYPES.add("java.util.Vector"); //$NON-NLS-1$
-
- // Others
- JAVA_TYPES.add("java.math.BigDecimal"); //$NON-NLS-1$
- JAVA_TYPES.add("java.math.BigInteger"); //$NON-NLS-1$
- JAVA_TYPES.add("java.lang.Object"); //$NON-NLS-1$
- JAVA_TYPES.add("javax.xml.namespace.QName"); //$NON-NLS-1$
- JAVA_TYPES.add("java.util.UUID"); //$NON-NLS-1$
- JAVA_TYPES.add("java.net.URI"); //$NON-NLS-1$
- JAVA_TYPES.add("java.awt.Image"); //$NON-NLS-1$
- JAVA_TYPES.add("javax.xml.datatype.Duration"); //$NON-NLS-1$
- JAVA_TYPES.add("javax.xml.transform.Source"); //$NON-NLS-1$
- JAVA_TYPES.add("javax.activation.DataHandler"); //$NON-NLS-1$
-
- // Java primitive type wrapper classes
- JAVA_TYPES.add("java.lang.String"); //$NON-NLS-1$
- JAVA_TYPES.add("java.lang.Boolean"); //$NON-NLS-1$
- JAVA_TYPES.add("java.lang.Integer"); //$NON-NLS-1$
- JAVA_TYPES.add("java.lang.Character"); //$NON-NLS-1$
- JAVA_TYPES.add("java.lang.Float"); //$NON-NLS-1$
- JAVA_TYPES.add("java.lang.Byte"); //$NON-NLS-1$
- JAVA_TYPES.add("java.lang.Double"); //$NON-NLS-1$
- JAVA_TYPES.add("java.lang.Long"); //$NON-NLS-1$
- JAVA_TYPES.add("java.lang.Short"); //$NON-NLS-1$
- JAVA_TYPES.add("java.lang.Void"); //$NON-NLS-1$
-
- JAVA_TYPES.add("java.rmi.RemoteException"); //$NON-NLS-1$
-
- JAVA_TYPES.add("java.io.Serializable"); //$NON-NLS-1$
- JAVA_TYPES.add("java.lang.Cloneable"); //$NON-NLS-1$
- JAVA_TYPES.add("java.lang.Comparable"); //$NON-NLS-1$
-
- JAVA_TYPES.add("java.util.Map"); //$NON-NLS-1$
- JAVA_TYPES.add("java.util.HashMap"); //$NON-NLS-1$
- JAVA_TYPES.add("java.util.Hashtable"); //$NON-NLS-1$
- JAVA_TYPES.add("java.util.Collection"); //$NON-NLS-1$
-
- // For these java.* types attributes are resolved, i.e they are stored as
- // structure if they contain fields.
- ANALYSED_JAVA_TYPES.add("java.lang.Exception"); //$NON-NLS-1$
- ANALYSED_JAVA_TYPES.add("java.lang.Throwable"); //$NON-NLS-1$
- ANALYSED_JAVA_TYPES.add("java.lang.StackTraceElement"); //$NON-NLS-1$
-
- ALLOWED_IN_MULTYINHERITANCE.add(GeneralTypesNames.JAVA_LANG_CLONEABLE); // $NON-NLS$
- ALLOWED_IN_MULTYINHERITANCE.add(GeneralTypesNames.JAVA_IO_SERIALIZABLE); // $NON-NLS$
- ALLOWED_IN_MULTYINHERITANCE.add(GeneralTypesNames.JAVA_LANG_COMPARABLE); // $NON-NLS$
- }
-
- protected abstract void doValidate(TypeAdapter type) throws InadmissableTypeException, JavaModelException;
-
- /**
- * Validates <code>type</code>. The first step is tho check the cache if this type has been checked already. If yes the previuos validation
- * result is returned if no a check is performed and the result is chached. Internally calls doValidate(type) which should be implemented by
- * extending classes.
- *
- * @param type -
- * checked type
- * @throws InadmissableTypeException
- * @throws JavaModelException
- */
- public void validate(IType type) throws InadmissableTypeException, JavaModelException
- {
- analyzed.clear();
- validateInternal(new TypeAdapter(type));
- }
-
- /**
- * Validates <code>type</code>. The first step is tho check the cache if this type has been checked already. If yes the previuos validation
- * result is returned if no a check is performed and the result is chached. Internally calls doValidate(type) which should be implemented by
- * extending classes.
- *
- * @param type -
- * checked type
- * @throws InadmissableTypeException
- * @throws JavaModelException
- */
- protected void validateInternal(TypeAdapter type) throws InadmissableTypeException, JavaModelException
- {
- final TypeKey key = new TypeKey(type.getProjectName(), type.getQualifiedName());
-
- // check for circular type check
- if (analyzed.contains(key))
- {
- return;
- }
-
- analyzed.add(key);
-
- final IStatus status = statusMap.get(key);
- if (status != null)
- {
- if (status.getSeverity() == IStatus.OK)
- {
- return;
- }
-
- throw (InadmissableTypeException) status.getException();
- }
-
- try
- {
- doValidate(type);
- statusMap.put(key, prepareStatus(null));
- } catch (InadmissableTypeException e)
- {
- statusMap.put(key, prepareStatus(e));
- throw e;
- }
- }
-
- /**
- * if <code>throwable</code> is null prepares status with severity IStatus.OK and empty message. If <code>throwable</code> is not null
- * prepares status with severity IStatus.ERROR and message the contained in <code>throwable</code> error message.
- *
- * @param throwable
- * @return IStatus with severity IStatus.OK if <tt>throwable</tt> is null , or IStatus.ERROR including error message decribing the problem.
- */
- private IStatus prepareStatus(Throwable throwable)
- {
- final IStatus status = new Status((throwable == null) ? IStatus.OK : IStatus.ERROR, JaxWsDomRuntimePlugin.PLUGIN_ID, IStatus.OK,
- (throwable == null) ? "" : throwable.getMessage(), //$NON-NLS-1$
- throwable);
-
- return status;
- }
-
- /**
- * Defines if <code>typeName</code> one form java.* or javax.* packages.
- *
- * @param typeName
- * @return <tt>true</tt> if <tt>typeName</tt> is from java standard classes.
- */
- protected boolean isJavaType(String typeName)
- {
- return typeName.startsWith("java.") //$NON-NLS-1$
- || typeName.startsWith("javax."); //$NON-NLS-1$
- }
-
- /**
- * Defines if <code>typeName</code> is allowed java type. The list of allowed java types can be found in static section of this class.
- *
- * @param typeName
- * @return <tt>true</tt> if <tt>typeName</tt> is allowed to be used in Web Service.
- */
- protected boolean isAllowedJavaType(String typeName)
- {
- return JAVA_TYPES.contains(typeName) || ANALYSED_JAVA_TYPES.contains(typeName);
- }
-
- /**
- * Checks if <code>type</code> implements java.rmi.Remote interface.
- *
- * @param type
- * @throws InadmissableTypeException
- * @throws JavaModelException
- */
- protected void checkRemoteNotImplemented(TypeAdapter type) throws InadmissableTypeException, JavaModelException
- {
- if (type.isImplementing(GeneralTypesNames.JAVA_RMI_REMOTE))
- {
- throw new RemoteObjectException(type.getQualifiedName());
- }
- }
-
- /**
- * Checks if <code>type</code> implements multiple interfaces. Classes that extend class other than java.lang.Object should not implement any
- * interface. Classes that extend java.lang.Object can implement only one interface.<br>
- * <br>
- * Note: The following interfaces are skipped from check:<br>
- * <ul>
- * java.io.Serializble<br>
- * java.lang.Clonable<br>
- * java.lang.Comparable<br>
- * </ul>
- *
- * @param type
- * @throws InadmissableTypeException
- * @throws JavaModelException
- */
- protected void checkMultipleInheritance(TypeAdapter type) throws InadmissableTypeException, JavaModelException
- {
- List<String> interfaceNames = type.getInterfaceNames();
- final String superClassName = type.getSuperClassName();
- if (superClassName == null || superClassName.equals(GeneralTypesNames.JAVA_LANG_OBJECT)
- || superClassName.equals(GeneralTypesNames.JAVA_LANG_EXCEPTION))
- {
- if (!checkInterfaceImplementationCount(interfaceNames, 1))
- {
- throw new MultipleImplementationException(type.getQualifiedName(), interfaceNames.get(0), interfaceNames.get(1));
- }
- } else
- {
- if (!checkInterfaceImplementationCount(interfaceNames, 0))
- {
- throw new InheritanceAndImplementationExecption(type.getQualifiedName(), superClassName);
- }
-
- checkMultipleInheritance(type.getSuperClassType());
- }
- }
-
- /**
- * Checks if <code>interfaceNames</code> are more than <code>maxAllowed</code> interfaces. Note: The following interfaces are skipped from
- * check:<br>
- * <ul>
- * java.io.Serializble<br>
- * java.lang.Clonable<br>
- * java.lang.Comparable<br>
- * </ul>
- *
- * @param interfaceNames
- * @param maxAllowed -
- * number of maximum allowed implementations
- */
- protected boolean checkInterfaceImplementationCount(List<String> interfaceNames, int maxAllowed)
- {
- if (interfaceNames == null || interfaceNames.size() == 0)
- {
- return true;
- }
-
- int noneAllowedInterfaceCount = 0;
- for (String interfaceName : interfaceNames)
- {
- if (ALLOWED_IN_MULTYINHERITANCE.contains(interfaceName))
- {
- continue;
- }
-
- noneAllowedInterfaceCount++;
- if (noneAllowedInterfaceCount > maxAllowed)
- {
- return false;
- }
- }
-
- return true;
- }
-
- /**
- * Inadmissable are member classes that are not "public static".
- *
- * @param type
- * @throws HasInadmisableInnerTypesException
- * @throws JavaModelException
- */
- protected void checkForInadmissableInnerClasses(TypeAdapter type) throws HasInadmisableInnerTypesException, JavaModelException
- {
- if (type.hasNonStaticOrNonPublicInnerTypes())
- {
- throw new HasInadmisableInnerTypesException(type.getQualifiedName());
- }
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/validation/provider/exceptions/AbstractClassNotImplementedException.java b/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/validation/provider/exceptions/AbstractClassNotImplementedException.java
deleted file mode 100755
index 3404c4f..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/validation/provider/exceptions/AbstractClassNotImplementedException.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.dom.runtime.validation.provider.exceptions;
-
-import java.text.MessageFormat;
-
-import org.eclipse.jst.ws.jaxws.dom.runtime.internal.plugin.JaxWsDomRuntimeMessages;
-
-/**
- * Exception used when a RT class is abstract and is not implemented.
- *
- * @author Georgi Vachkov
- */
-public class AbstractClassNotImplementedException extends InadmissableTypeException
-{
-
- private static final long serialVersionUID = -5871458329068966581L;
-
- /**
- * Construction.
- *
- * @param classFQName
- */
- public AbstractClassNotImplementedException(String classFQName)
- {
- super(MessageFormat.format("Abstract class {0} cannot be used as runtime class because it is not extended by non abstract class which is suitable for a runtime class", classFQName), //$NON-NLS-1$
- MessageFormat.format(JaxWsDomRuntimeMessages.AbstractClassNotImplementedException_Error_Message, classFQName));
-
-
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/validation/provider/exceptions/ConstructorNotExposableException.java b/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/validation/provider/exceptions/ConstructorNotExposableException.java
deleted file mode 100755
index 5358ba0..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/validation/provider/exceptions/ConstructorNotExposableException.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.dom.runtime.validation.provider.exceptions;
-
-import java.text.MessageFormat;
-
-import org.eclipse.jst.ws.jaxws.dom.runtime.internal.plugin.JaxWsDomRuntimeMessages;
-
-/**
- * Exception used to describe that the constructor cannot be exposed in WS.
- *
- * @author Georgi Vachkov
- */
-public class ConstructorNotExposableException extends MethodNotExposableException
-{
-
- private static final long serialVersionUID = 4504742824495057956L;
-
- /**
- * Constructor
- *
- * @param methodName
- */
- public ConstructorNotExposableException(String methodName)
- {
- super(MessageFormat.format("Constructor {0} cannot be exposed as web service operation", methodName), //$NON-NLS-1$
- MessageFormat.format(JaxWsDomRuntimeMessages.ConstructorNotExposableException_Error_Message, methodName));
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/validation/provider/exceptions/HasInadmisableInnerTypesException.java b/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/validation/provider/exceptions/HasInadmisableInnerTypesException.java
deleted file mode 100755
index ae1c352..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/validation/provider/exceptions/HasInadmisableInnerTypesException.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.dom.runtime.validation.provider.exceptions;
-
-import java.text.MessageFormat;
-
-import org.eclipse.jst.ws.jaxws.dom.runtime.internal.plugin.JaxWsDomRuntimeMessages;
-
-/**
- * Exception used in case when an RT class contains inner class that does not fulfil the requirements.
- *
- * @author Georgi Vachkov
- */
-public class HasInadmisableInnerTypesException extends InadmissableTypeException
-{
- static final long serialVersionUID = System.currentTimeMillis();
-
- /**
- * Constructor. Creates meaningfull message using <tt>className</tt>
- *
- * @param className
- */
- public HasInadmisableInnerTypesException(String className)
- {
- super(MessageFormat.format("Class {0} has inner types that are not public and static", className) //$NON-NLS-1$
- ,
- MessageFormat.format(JaxWsDomRuntimeMessages.HasInadmisableInnerTypesException_Error_Message, className));
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/validation/provider/exceptions/InadmissableTypeException.java b/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/validation/provider/exceptions/InadmissableTypeException.java
deleted file mode 100755
index 4648230..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/validation/provider/exceptions/InadmissableTypeException.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.dom.runtime.validation.provider.exceptions;
-
-/**
- * Abstract class for exceptions in type validation.
- *
- * @author Georgi Vachkov
- */
-public abstract class InadmissableTypeException extends Exception
-{
- static final long serialVersionUID = System.currentTimeMillis();
- final String localizedMessage;
-
- /**
- * Constructor.
- *
- * @param reason -
- * the error mesage
- */
- public InadmissableTypeException(String reason, String localizedMessage)
- {
- super(reason);
- this.localizedMessage = localizedMessage;
- }
-
- @Override
- public String getLocalizedMessage() {
- return localizedMessage;
- }
-
-
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/validation/provider/exceptions/InheritanceAndImplementationExecption.java b/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/validation/provider/exceptions/InheritanceAndImplementationExecption.java
deleted file mode 100755
index 999e4ae..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/validation/provider/exceptions/InheritanceAndImplementationExecption.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.dom.runtime.validation.provider.exceptions;
-
-import java.text.MessageFormat;
-
-import org.eclipse.jst.ws.jaxws.dom.runtime.internal.plugin.JaxWsDomRuntimeMessages;
-
-/**
- * Exception used in RT validation when an RT class has multy inheritance via extention and implementation.
- */
-public class InheritanceAndImplementationExecption extends InadmissableTypeException
-{
- static final long serialVersionUID = System.currentTimeMillis();
-
- /**
- * Construction.
- *
- * @param className
- * @param interfaceName
- */
- public InheritanceAndImplementationExecption(String className, String interfaceName)
- {
- super(MessageFormat.format("Class {0} extends {1} and implements custom interface (multiple inheritance is not allowed)", className, interfaceName), //$NON-NLS-1$
- MessageFormat.format(JaxWsDomRuntimeMessages.InheritanceAndImplementationExecption_Error_Message, className, interfaceName));
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/validation/provider/exceptions/InterfacesNotSupportedException.java b/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/validation/provider/exceptions/InterfacesNotSupportedException.java
deleted file mode 100755
index a270c4d..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/validation/provider/exceptions/InterfacesNotSupportedException.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.dom.runtime.validation.provider.exceptions;
-
-import java.text.MessageFormat;
-
-import org.eclipse.jst.ws.jaxws.dom.runtime.internal.plugin.JaxWsDomRuntimeMessages;
-
-/**
- * Exception used when an interface is used as RT class.
- *
- * @author Georgi Vachkov
- */
-public class InterfacesNotSupportedException extends InadmissableTypeException
-{
-
- private static final long serialVersionUID = 1L;
-
- /**
- * Construction.
- *
- * @param interfaceFQName
- */
- public InterfacesNotSupportedException(String interfaceFQName)
- {
- super(MessageFormat.format("{0} is a interface, and JAXB cannot handle interfaces", interfaceFQName), //$NON-NLS-1$
- MessageFormat.format(JaxWsDomRuntimeMessages.InterfacesNotSupportedException_Error_Message, interfaceFQName));
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/validation/provider/exceptions/MethodNotExposableException.java b/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/validation/provider/exceptions/MethodNotExposableException.java
deleted file mode 100755
index d9ba663..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/validation/provider/exceptions/MethodNotExposableException.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.dom.runtime.validation.provider.exceptions;
-
-/**
- * Exception used when a method cannot be exposed as WS.
- *
- * @author Georgi Vachkov
- */
-public class MethodNotExposableException extends Exception {
-
- private static final long serialVersionUID = 406641585441090966L;
-
- private final String localizedMessage;
-
- /**
- * Constructor.
- *
- * @param message
- * @param localizedMessage
- */
- public MethodNotExposableException(String message, String localizedMessage) {
- super(message);
- this.localizedMessage = localizedMessage;
- }
-
- /**
- * Provides localized message of exception
- * */
- @Override
- public String getLocalizedMessage() {
- return localizedMessage;
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/validation/provider/exceptions/MethodNotPublicException.java b/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/validation/provider/exceptions/MethodNotPublicException.java
deleted file mode 100755
index 6f55048..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/validation/provider/exceptions/MethodNotPublicException.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.dom.runtime.validation.provider.exceptions;
-
-import java.text.MessageFormat;
-
-import org.eclipse.jst.ws.jaxws.dom.runtime.internal.plugin.JaxWsDomRuntimeMessages;
-
-/**
- * Used when an method is not public and that is why it cannot be exposed as WS.
- *
- * @author Georgi Vachkov
- */
-public class MethodNotPublicException extends MethodNotExposableException
-{
- private static final long serialVersionUID = -4792342187698558687L;
-
- /**
- * Constructor.
- *
- * @param methodName
- */
- public MethodNotPublicException(String methodName)
- {
- super(MessageFormat.format("Method {0} is not public and cannot be exposed as a web service operation", methodName), //$NON-NLS-1$
- MessageFormat.format(JaxWsDomRuntimeMessages.MethodNotPublicException_Error_Message , methodName));
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/validation/provider/exceptions/MultipleImplementationException.java b/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/validation/provider/exceptions/MultipleImplementationException.java
deleted file mode 100755
index aaf759e..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/validation/provider/exceptions/MultipleImplementationException.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.dom.runtime.validation.provider.exceptions;
-
-import java.text.MessageFormat;
-
-import org.eclipse.jst.ws.jaxws.dom.runtime.internal.plugin.JaxWsDomRuntimeMessages;
-
-/**
- * Exception used in case RT class implements more that 1 interface wich is not allowed.
- *
- * @author Georgi Vachkov
- */
-public class MultipleImplementationException extends InadmissableTypeException
-{
- static final long serialVersionUID = System.currentTimeMillis();
-
- /**
- * Construstor.
- *
- * @param className -
- * RT class name
- * @param interface1 -
- * implemented interface 1
- * @param interface2 -
- * implemented interface 2
- */
- public MultipleImplementationException(String className, String interface1, String interface2)
- {
- super(MessageFormat.format("Class {0} implements both interface {1} and interface {2} (multiple inheritance is not allowed)", className, interface1, interface2), //$NON-NLS-1$
- MessageFormat.format(JaxWsDomRuntimeMessages.MultipleImplementationException_Error_Message, className, interface1, interface2));
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/validation/provider/exceptions/NoDefaultConstructorException.java b/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/validation/provider/exceptions/NoDefaultConstructorException.java
deleted file mode 100755
index 3fbe0d9..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/validation/provider/exceptions/NoDefaultConstructorException.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.dom.runtime.validation.provider.exceptions;
-
-import java.text.MessageFormat;
-
-import org.eclipse.jst.ws.jaxws.dom.runtime.internal.plugin.JaxWsDomRuntimeMessages;
-
-/**
- * Exception for RT class when there is no default constructor in class.
- *
- * @author Georgi Vachkov
- */
-public class NoDefaultConstructorException extends InadmissableTypeException
-{
- static final long serialVersionUID = System.currentTimeMillis();
-
- /**
- * Constructor
- *
- * @param typeName -
- * the name of RT class
- */
- public NoDefaultConstructorException(String typeName)
- {
- super(MessageFormat.format("Class {0} does not have a default constructor", typeName), //$NON-NLS-1$
- MessageFormat.format(JaxWsDomRuntimeMessages.EndpointTypeValidator_ERR_MSG_CONSTRUCTOR, typeName));
-
-
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/validation/provider/exceptions/RemoteObjectException.java b/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/validation/provider/exceptions/RemoteObjectException.java
deleted file mode 100755
index 7a6ca0c..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/validation/provider/exceptions/RemoteObjectException.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.dom.runtime.validation.provider.exceptions;
-
-import java.text.MessageFormat;
-
-import org.eclipse.jst.ws.jaxws.dom.runtime.internal.plugin.JaxWsDomRuntimeMessages;
-
-/**
- * Exception wich is used to define that the RT class implements java.rmi.Remote
- *
- * @author Georgi Vachkov
- */
-public class RemoteObjectException extends InadmissableTypeException
-{
- static final long serialVersionUID = System.currentTimeMillis();
-
- /**
- * Constructor.
- *
- * @param className -
- * RT class
- */
- public RemoteObjectException(String className)
- {
- super(MessageFormat.format("Class {0} is a remote Object", className), //$NON-NLS-1$
- MessageFormat.format(JaxWsDomRuntimeMessages.RemoteObjectException_Error_Message, className));
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/validation/provider/exceptions/TypeNotFoundException.java b/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/validation/provider/exceptions/TypeNotFoundException.java
deleted file mode 100755
index 38f8c9d..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/validation/provider/exceptions/TypeNotFoundException.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.dom.runtime.validation.provider.exceptions;
-
-import java.text.MessageFormat;
-
-import org.eclipse.jst.ws.jaxws.dom.runtime.internal.plugin.JaxWsDomRuntimeMessages;
-
-/**
- * Class used when type is searched to define that the class was not found.
- *
- * @author Georgi Vachkov
- *
- */
-public class TypeNotFoundException extends InadmissableTypeException
-{
- static final long serialVersionUID = System.currentTimeMillis();
-
- /**
- * Constructor.
- *
- * @param className -
- * the name of the class that is not found
- */
- public TypeNotFoundException(String className)
- {
- super(MessageFormat.format("Class {0} cannot be found", className), //$NON-NLS-1$
- MessageFormat.format(JaxWsDomRuntimeMessages.TypeNotFoundException_Error_Message, className));
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/validation/sei/RedundantAttributesConstraint.java b/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/validation/sei/RedundantAttributesConstraint.java
deleted file mode 100755
index 4775c36..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/validation/sei/RedundantAttributesConstraint.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.dom.runtime.validation.sei;
-
-import static org.eclipse.jst.ws.jaxws.dom.runtime.persistence.WSAnnotationFeatures.ENDPOINT_INTERFACE_ATTRIBUTE;
-import static org.eclipse.jst.ws.jaxws.dom.runtime.persistence.WSAnnotationFeatures.PORT_NAME_ATTRIBUTE;
-import static org.eclipse.jst.ws.jaxws.dom.runtime.persistence.WSAnnotationFeatures.SERVICE_NAME_ATTRIBUTE;
-import static org.eclipse.jst.ws.jaxws.dom.runtime.persistence.WSAnnotationFeatures.WSDL_LOCATION_ATTRIBUTE;
-import static org.eclipse.jst.ws.jaxws.dom.runtime.persistence.WSAnnotationFeatures.WS_ANNOTATION;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.emf.validation.IValidationContext;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.IServiceEndpointInterface;
-import org.eclipse.jst.ws.jaxws.dom.runtime.validation.AbstractValidationConstraint;
-import org.eclipse.jst.ws.jaxws.dom.runtime.validation.messages.ValidationMessages;
-import org.eclipse.jst.ws.jaxws.utils.annotations.IAnnotation;
-
-/**
- * Checks if WebService annotation set on SEI contains portName, serviceName or endpointInterface attributes.
- * According to jst-181, point 3.2 sub-point 6 this is not allowed.
- *
- * @author Georgi Vachkov
- */
-public class RedundantAttributesConstraint extends AbstractValidationConstraint
-{
- private static final String [] REDUNDANT_ATTRIBUTES = {PORT_NAME_ATTRIBUTE, SERVICE_NAME_ATTRIBUTE, ENDPOINT_INTERFACE_ATTRIBUTE, WSDL_LOCATION_ATTRIBUTE};
-
- /**
- * Constructor - no specific processing here
- */
- public RedundantAttributesConstraint() {
- super(new SeiConstraintDescriptor());
- }
-
- @Override
- protected IStatus doValidate(final IValidationContext ctx) throws JavaModelException
- {
- final IServiceEndpointInterface sei = (IServiceEndpointInterface)ctx.getTarget();
- if (sei.isImplicit()) {
- return createOkStatus(sei);
- }
-
- if (containsRedundantAttribute(sei)) {
- return createStatus(sei, ValidationMessages.SeiValidation_RedundantAttributes, WS_ANNOTATION, null);
- }
-
- return createOkStatus(sei);
- }
-
- protected boolean containsRedundantAttribute(final IServiceEndpointInterface sei)
- {
- final IAnnotation<? extends IJavaElement> annotation = findAnnotation(sei, WS_ANNOTATION);
- if (annotation == null) {
- return false;
- }
-
- for (String redundantAttribute : REDUNDANT_ATTRIBUTES) {
- if (annotation.getPropertyValue(redundantAttribute)!=null) {
- return true;
- }
- }
-
- return false;
- }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/validation/sei/SeiClassCorrectConstraint.java b/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/validation/sei/SeiClassCorrectConstraint.java
deleted file mode 100755
index 8df847a..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/validation/sei/SeiClassCorrectConstraint.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.dom.runtime.validation.sei;
-
-import static org.eclipse.jst.ws.jaxws.dom.runtime.persistence.WSAnnotationFeatures.WS_ANNOTATION;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.emf.validation.IValidationContext;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.IServiceEndpointInterface;
-import org.eclipse.jst.ws.jaxws.dom.runtime.util.Dom2ResourceMapper;
-import org.eclipse.jst.ws.jaxws.dom.runtime.validation.AbstractValidationConstraint;
-import org.eclipse.jst.ws.jaxws.dom.runtime.validation.provider.SeiValidator;
-
-/**
- * Checks the SEI underling interface if is capable to be used as SEI according to
- * jsr-181 point 3.2
- *
- * @author Georgi Vachkov
- */
-public class SeiClassCorrectConstraint extends AbstractValidationConstraint
-{
- /**
- * Constructor - no specific processing here
- */
- public SeiClassCorrectConstraint()
- {
- super(new SeiConstraintDescriptor());
- }
-
- @Override
- protected IStatus doValidate(final IValidationContext ctx) throws JavaModelException
- {
- final SeiValidator validator = new SeiValidator();
- final IServiceEndpointInterface sei = (IServiceEndpointInterface)ctx.getTarget();
- if (sei.isImplicit()) {
- return createOkStatus(sei);
- }
-
- final IType seiType = Dom2ResourceMapper.INSTANCE.findType(sei);
- if (seiType == null) {
- return createOkStatus(sei);
- }
-
- final IStatus status = validator.validate(seiType);
- if (!status.isOK()) {
- return createStatus(sei, status.getMessage(), WS_ANNOTATION, null);
- }
-
- return createOkStatus(sei);
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/validation/sei/SeiConstraintDescriptor.java b/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/validation/sei/SeiConstraintDescriptor.java
deleted file mode 100755
index feb3df8..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/validation/sei/SeiConstraintDescriptor.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.dom.runtime.validation.sei;
-
-import org.eclipse.emf.validation.model.ConstraintSeverity;
-import org.eclipse.jst.ws.jaxws.dom.runtime.internal.plugin.JaxWsDomRuntimePlugin;
-import org.eclipse.jst.ws.jaxws.dom.runtime.validation.DomValidationConstraintDescriptor;
-import org.eclipse.jst.ws.jaxws.utils.dom.validation.DomValidationConstants;
-
-/**
- * The constraint descriptor for SEI validation constraints
- *
- * @author Georgi Vachkov
- */
-class SeiConstraintDescriptor extends DomValidationConstraintDescriptor
-{
- public String getId() {
- return DomValidationConstants.SEI_CONSTRAINT_ID;
- }
-
- public String getPluginId() {
- return JaxWsDomRuntimePlugin.PLUGIN_ID;
- }
-
- public ConstraintSeverity getSeverity() {
- return ConstraintSeverity.ERROR;
- }
-
- public int getStatusCode() {
- return -28;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/validation/sei/SeiConstraintProvider.java b/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/validation/sei/SeiConstraintProvider.java
deleted file mode 100755
index a6c3614..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/validation/sei/SeiConstraintProvider.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.dom.runtime.validation.sei;
-
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.Set;
-
-import org.eclipse.emf.validation.model.IModelConstraint;
-
-/**
- * Constraint provider for SEI DOM objects
- *
- * @author Georgi Vachkov
- */
-public class SeiConstraintProvider
-{
- private Set<IModelConstraint> constraints;
-
- /**
- * @return constraints related to SEI
- */
- public Collection<IModelConstraint> getConstraints()
- {
- if (constraints==null)
- {
- constraints = new HashSet<IModelConstraint>();
- constraints.add(new SeiNameInNCNameConstraint());
- constraints.add(new TargetNsValidUriConstraint());
- constraints.add(new RedundantAttributesConstraint());
- constraints.add(new SeiClassCorrectConstraint());
- }
-
- return constraints;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/validation/sei/SeiNameInNCNameConstraint.java b/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/validation/sei/SeiNameInNCNameConstraint.java
deleted file mode 100755
index 622642a..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/validation/sei/SeiNameInNCNameConstraint.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.dom.runtime.validation.sei;
-
-import static org.eclipse.jst.ws.jaxws.dom.runtime.persistence.WSAnnotationFeatures.NAME_ATTRIBUTE;
-import static org.eclipse.jst.ws.jaxws.dom.runtime.persistence.WSAnnotationFeatures.WS_ANNOTATION;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.emf.validation.IValidationContext;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.IServiceEndpointInterface;
-import org.eclipse.jst.ws.jaxws.dom.runtime.validation.AbstractValidationConstraint;
-import org.eclipse.jst.ws.jaxws.utils.WsdlNamesValidator;
-
-/**
- * Checks if 'name' attribute is valid NCName
- *
- * @author Georgi Vachkov
- */
-public class SeiNameInNCNameConstraint extends AbstractValidationConstraint
-{
- public SeiNameInNCNameConstraint() {
- super(new SeiConstraintDescriptor());
- }
-
- protected IStatus doValidate(final IValidationContext ctx) throws JavaModelException
- {
- final IServiceEndpointInterface sei = (IServiceEndpointInterface)ctx.getTarget();
- final IStatus status = WsdlNamesValidator.validateNCName2(NAME_ATTRIBUTE, sei.getName());
- if (!status.isOK()) {
- return createStatus(sei, status.getMessage(), WS_ANNOTATION, NAME_ATTRIBUTE);
- }
-
- return createOkStatus(sei);
- }
-}
-
diff --git a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/validation/sei/TargetNsValidUriConstraint.java b/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/validation/sei/TargetNsValidUriConstraint.java
deleted file mode 100755
index a634730..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/validation/sei/TargetNsValidUriConstraint.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.dom.runtime.validation.sei;
-
-import static org.eclipse.jst.ws.jaxws.dom.runtime.persistence.WSAnnotationFeatures.TARGET_NAMESPACE_ATTRIBUTE;
-import static org.eclipse.jst.ws.jaxws.dom.runtime.persistence.WSAnnotationFeatures.WS_ANNOTATION;
-
-import java.net.URI;
-import java.net.URISyntaxException;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.emf.validation.IValidationContext;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.IServiceEndpointInterface;
-import org.eclipse.jst.ws.jaxws.dom.runtime.internal.plugin.JaxWsDomRuntimeMessages;
-import org.eclipse.jst.ws.jaxws.dom.runtime.validation.AbstractValidationConstraint;
-
-/**
- * Checks if the 'targetNamesoace' attribute in WebService annotation is valid URI
- *
- * @author Georgi Vachkov
- */
-public class TargetNsValidUriConstraint extends AbstractValidationConstraint
-{
- public TargetNsValidUriConstraint() {
- super(new SeiConstraintDescriptor());
- }
-
- @Override
- protected IStatus doValidate(IValidationContext ctx) throws JavaModelException
- {
- final IServiceEndpointInterface sei = (IServiceEndpointInterface)ctx.getTarget();
- try {
- new URI(sei.getTargetNamespace());
- } catch (URISyntaxException e) {
- return createStatus(sei, JaxWsDomRuntimeMessages.bind(
- JaxWsDomRuntimeMessages.TargetNsValidUriConstraint_URI_SYNTAX_ERROR,
- new Object[] {e.getIndex(), e.getInput(), e.getReason()}),
- WS_ANNOTATION, TARGET_NAMESPACE_ATTRIBUTE);
- }
-
- return createOkStatus(sei);
- }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/validation/webmethod/MethodNotExcludedInSeiConstraint.java b/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/validation/webmethod/MethodNotExcludedInSeiConstraint.java
deleted file mode 100755
index 97f0eaa..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/validation/webmethod/MethodNotExcludedInSeiConstraint.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.dom.runtime.validation.webmethod;
-
-import static org.eclipse.jst.ws.jaxws.dom.runtime.persistence.WMAnnotationFeatures.WM_ANNOTATION;
-import static org.eclipse.jst.ws.jaxws.dom.runtime.persistence.WMAnnotationFeatures.WM_EXCLUDED_ATTRIBUTE;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.emf.validation.IValidationContext;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.IServiceEndpointInterface;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.IWebMethod;
-import org.eclipse.jst.ws.jaxws.dom.runtime.validation.AbstractValidationConstraint;
-import org.eclipse.jst.ws.jaxws.dom.runtime.validation.messages.ValidationMessages;
-
-/**
- * Checks if there is a <b>exclude=true</b> attribute in WebMetod annotation in SEI.
- * According to jsr-181 section 4.2.1 attribute <b>exclude</b> this is not allowed.
- *
- * @author Georgi Vachkov
- */
-public class MethodNotExcludedInSeiConstraint extends AbstractValidationConstraint
-{
- /**
- * Constructor - no specific processing here
- */
- public MethodNotExcludedInSeiConstraint() {
- super(new WmConstraintDescriptor());
- }
-
- @Override
- protected IStatus doValidate(final IValidationContext ctx) throws JavaModelException
- {
- final IWebMethod wm = (IWebMethod)ctx.getTarget();
- final IServiceEndpointInterface sei = (IServiceEndpointInterface)wm.eContainer();
-
- if (wm.isExcluded() && !sei.isImplicit())
- {
- return createStatus(wm, ValidationMessages.WebMethodValidation_MethodShouldNotBeExcluded, WM_ANNOTATION, WM_EXCLUDED_ATTRIBUTE);
- }
-
- return createOkStatus(wm);
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/validation/webmethod/NameIsNCNameConstraint.java b/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/validation/webmethod/NameIsNCNameConstraint.java
deleted file mode 100755
index fbe4524..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/validation/webmethod/NameIsNCNameConstraint.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.dom.runtime.validation.webmethod;
-
-import static org.eclipse.jst.ws.jaxws.dom.runtime.persistence.WMAnnotationFeatures.WM_ANNOTATION;
-import static org.eclipse.jst.ws.jaxws.dom.runtime.persistence.WMAnnotationFeatures.WM_NAME_ATTRIBUTE;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.emf.validation.IValidationContext;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.IWebMethod;
-import org.eclipse.jst.ws.jaxws.dom.runtime.validation.AbstractValidationConstraint;
-import org.eclipse.jst.ws.jaxws.utils.WsdlNamesValidator;
-
-/**
- * Checks if <b>operationName</b> is valid NCName.
- *
- * @author Georgi Vachkov
- */
-public class NameIsNCNameConstraint extends AbstractValidationConstraint
-{
- /**
- * Constructor - no specific processing here
- */
- public NameIsNCNameConstraint() {
- super(new WmConstraintDescriptor());
- }
-
- @Override
- protected IStatus doValidate(final IValidationContext ctx) throws JavaModelException
- {
- final IWebMethod wm = (IWebMethod)ctx.getTarget();
- if(!wm.isExcluded())
- {
- final IStatus status = WsdlNamesValidator.validateNCName2(WM_NAME_ATTRIBUTE, wm.getName());
- if (!status.isOK()) {
- return createStatus(wm, status.getMessage(), WM_ANNOTATION, WM_NAME_ATTRIBUTE);
- }
- }
-
- return createOkStatus(wm);
- }
-}
-
diff --git a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/validation/webmethod/NameIsUniqueConstraint.java b/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/validation/webmethod/NameIsUniqueConstraint.java
deleted file mode 100755
index 18c426c..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/validation/webmethod/NameIsUniqueConstraint.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.dom.runtime.validation.webmethod;
-
-import static org.eclipse.jst.ws.jaxws.dom.runtime.persistence.WMAnnotationFeatures.WM_ANNOTATION;
-import static org.eclipse.jst.ws.jaxws.dom.runtime.persistence.WMAnnotationFeatures.WM_NAME_ATTRIBUTE;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.emf.validation.IValidationContext;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.IServiceEndpointInterface;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.IWebMethod;
-import org.eclipse.jst.ws.jaxws.dom.runtime.validation.AbstractValidationConstraint;
-import org.eclipse.jst.ws.jaxws.dom.runtime.validation.messages.ValidationMessages;
-
-/**
- * Checks if the <b>operationName</b> attribute is unique in the scope of
- * SEI methods. According to WSDL specification operations should have different
- * names e.g. overloading is not supported.
- *
- * @author Georgi Vachkov
- */
-public class NameIsUniqueConstraint extends AbstractValidationConstraint
-{
- /**
- * Constructor - no specific processing here
- */
- public NameIsUniqueConstraint() {
- super(new WmConstraintDescriptor());
- }
-
- @Override
- protected IStatus doValidate(final IValidationContext ctx) throws JavaModelException
- {
- final IWebMethod webMethod = (IWebMethod)ctx.getTarget();
- if (!webMethod.isExcluded() && !isNameUnique(webMethod))
- {
- final String msg = ValidationMessages.bind(ValidationMessages.WebMethodValidation_NameExists, webMethod.getName());
- return createStatus(webMethod, msg, WM_ANNOTATION, WM_NAME_ATTRIBUTE);
- }
-
- return createOkStatus(webMethod);
- }
-
- protected boolean isNameUnique(final IWebMethod webMethod)
- {
- final IServiceEndpointInterface sei = (IServiceEndpointInterface)webMethod.eContainer();
- for(IWebMethod wm : sei.getWebMethods())
- {
- if (wm==webMethod || wm.isExcluded()) {
- continue;
- }
-
- if (wm.getName().equals(webMethod.getName())) {
- return false;
- }
- }
-
- return true;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/validation/webmethod/RedundantAttributesConstraint.java b/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/validation/webmethod/RedundantAttributesConstraint.java
deleted file mode 100755
index dc631ef..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/validation/webmethod/RedundantAttributesConstraint.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.dom.runtime.validation.webmethod;
-
-import static org.eclipse.jst.ws.jaxws.dom.runtime.persistence.WMAnnotationFeatures.WM_ANNOTATION;
-
-import javax.jws.WebMethod;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.emf.validation.IValidationContext;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.IServiceEndpointInterface;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.IWebMethod;
-import org.eclipse.jst.ws.jaxws.dom.runtime.validation.AbstractValidationConstraint;
-import org.eclipse.jst.ws.jaxws.dom.runtime.validation.messages.ValidationMessages;
-import org.eclipse.jst.ws.jaxws.utils.annotations.IAnnotation;
-
-/**
- * Check if in {@link WebMethod} annotation where <b>exclude=true</b> no other attributes
- * are used. According to jsr-181 - point 4.2.1, exclude attribute description this is not
- * allowed.
- *
- * @author Georgi Vachkov
- */
-public class RedundantAttributesConstraint extends AbstractValidationConstraint
-{
- /**
- * Constructor - no specific processing here
- */
- public RedundantAttributesConstraint() {
- super(new WmConstraintDescriptor());
- }
-
- @Override
- protected IStatus doValidate(final IValidationContext ctx) throws JavaModelException
- {
- final IWebMethod webMethod = (IWebMethod)ctx.getTarget();
- final IServiceEndpointInterface sei = (IServiceEndpointInterface)webMethod.eContainer();
-
- // if the method is not excluded we do not need this check
- if (!webMethod.isExcluded() || !sei.isImplicit()) {
- return createOkStatus(webMethod);
- }
-
- if (containsOtherAttributes(webMethod)) {
- return createStatus(webMethod, ValidationMessages.WebMethodValidation_ExcludedHasOtherAttributes, WM_ANNOTATION, null);
- }
-
- return createOkStatus(webMethod);
- }
-
- protected boolean containsOtherAttributes(final IWebMethod webMethod)
- {
- final IAnnotation<? extends IJavaElement> annotation = jee5DomUtil().findAnnotation(webMethod, WM_ANNOTATION);
- if (annotation==null) {
- return false;
- }
-
- if (annotation.getParamValuePairs().size() > 1) {
- return true;
- }
-
- return false;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/validation/webmethod/WmConstraintDescriptor.java b/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/validation/webmethod/WmConstraintDescriptor.java
deleted file mode 100755
index 9a50372..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/validation/webmethod/WmConstraintDescriptor.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.dom.runtime.validation.webmethod;
-
-import org.eclipse.emf.validation.model.ConstraintSeverity;
-import org.eclipse.jst.ws.jaxws.dom.runtime.internal.plugin.JaxWsDomRuntimePlugin;
-import org.eclipse.jst.ws.jaxws.dom.runtime.validation.DomValidationConstraintDescriptor;
-import org.eclipse.jst.ws.jaxws.utils.dom.validation.DomValidationConstants;
-
-class WmConstraintDescriptor extends DomValidationConstraintDescriptor
-{
- public String getId() {
- return DomValidationConstants.WM_CONSTRAINT_ID;
- }
-
- public String getPluginId() {
- return JaxWsDomRuntimePlugin.PLUGIN_ID;
- }
-
- public ConstraintSeverity getSeverity() {
- return ConstraintSeverity.ERROR;
- }
-
- public int getStatusCode() {
- return -27;
- }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/validation/webmethod/WmConstraintProvider.java b/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/validation/webmethod/WmConstraintProvider.java
deleted file mode 100755
index dac9339..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/validation/webmethod/WmConstraintProvider.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.dom.runtime.validation.webmethod;
-
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.Set;
-
-import org.eclipse.emf.validation.model.IModelConstraint;
-
-public class WmConstraintProvider
-{
- private Set<IModelConstraint> constraints;;
-
- public Collection<IModelConstraint> getConstraints()
- {
- if (constraints == null)
- {
- constraints = new HashSet<IModelConstraint>();
- constraints.add(new NameIsNCNameConstraint());
- constraints.add(new NameIsUniqueConstraint());
- constraints.add(new RedundantAttributesConstraint());
- constraints.add(new MethodNotExcludedInSeiConstraint());
- }
-
- return constraints;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/validation/webparam/NameIsNCNameConstraint.java b/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/validation/webparam/NameIsNCNameConstraint.java
deleted file mode 100755
index f73c1e4..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/validation/webparam/NameIsNCNameConstraint.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.dom.runtime.validation.webparam;
-
-import static org.eclipse.jst.ws.jaxws.dom.runtime.persistence.WPAnnotationFeatures.NAME_ATTRIBUTE;
-import static org.eclipse.jst.ws.jaxws.dom.runtime.persistence.WPAnnotationFeatures.WP_ANNOTATION;
-
-import javax.jws.WebParam;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.emf.validation.IValidationContext;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.IWebParam;
-import org.eclipse.jst.ws.jaxws.dom.runtime.util.Jee5DomUtils;
-import org.eclipse.jst.ws.jaxws.dom.runtime.validation.AbstractValidationConstraint;
-import org.eclipse.jst.ws.jaxws.utils.WsdlNamesValidator;
-
-/**
- * Check if name attribute of {@link WebParam} annotation is correct NCName.
- *
- * @author Georgi Vachkov
- */
-public class NameIsNCNameConstraint extends AbstractValidationConstraint
-{
- private static final String RETURN = "return";//$NON-NLS-1$
-
- /**
- * Constructor - no specific processing here
- */
- public NameIsNCNameConstraint() {
- super(new WpConstraintDescriptor());
- }
-
- @Override
- protected IStatus doValidate(final IValidationContext ctx) throws JavaModelException
- {
- final IWebParam webParam = (IWebParam)ctx.getTarget();
- if (RETURN.equals(webParam.getImplementation()) || !isNameUsed(webParam)) {
- return createOkStatus(webParam);
- }
-
- final IStatus status = WsdlNamesValidator.validateNCName2(NAME_ATTRIBUTE, webParam.getName());
- if (!status.isOK()) {
- return createStatus(webParam, status.getMessage(), WP_ANNOTATION, NAME_ATTRIBUTE);
- }
-
- return createOkStatus(webParam);
- }
-
- protected boolean isNameUsed(final IWebParam webParam)
- {
- return Jee5DomUtils.getInstance().isNameUsed(webParam);
- }
-}
-
diff --git a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/validation/webparam/NameIsRedundantConstraint.java b/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/validation/webparam/NameIsRedundantConstraint.java
deleted file mode 100755
index 6d8b0a1..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/validation/webparam/NameIsRedundantConstraint.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.dom.runtime.validation.webparam;
-
-import static org.eclipse.jst.ws.jaxws.dom.runtime.persistence.WPAnnotationFeatures.NAME_ATTRIBUTE;
-import static org.eclipse.jst.ws.jaxws.dom.runtime.persistence.WPAnnotationFeatures.WP_ANNOTATION;
-
-import javax.jws.WebParam;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.emf.validation.IValidationContext;
-import org.eclipse.emf.validation.model.ConstraintSeverity;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.IWebParam;
-import org.eclipse.jst.ws.jaxws.dom.runtime.persistence.WPAnnotationFeatures;
-import org.eclipse.jst.ws.jaxws.dom.runtime.util.Jee5DomUtils;
-import org.eclipse.jst.ws.jaxws.dom.runtime.validation.AbstractValidationConstraint;
-import org.eclipse.jst.ws.jaxws.dom.runtime.validation.messages.ValidationMessages;
-import org.eclipse.jst.ws.jaxws.utils.annotations.IAnnotation;
-
-/**
- * Check if name attribute of {@link WebParam} annotation is redundant.
- * See {@link Jee5DomUtils#isNameUsed(IWebParam)}.
- *
- * @author Georgi Vachkov
- */
-public class NameIsRedundantConstraint extends AbstractValidationConstraint
-{
- private static final String RETURN = "return";//$NON-NLS-1$
-
- /**
- * Constructor - no specific processing here
- */
- public NameIsRedundantConstraint() {
- super(new NameRedundantConstraintDescriptor());
- }
-
- @Override
- protected IStatus doValidate(final IValidationContext ctx) throws JavaModelException
- {
- final IWebParam webParam = (IWebParam)ctx.getTarget();
- if (RETURN.equals(webParam.getImplementation())) {
- return createOkStatus(webParam);
- }
-
- final IAnnotation<? extends IJavaElement> annotation = jee5DomUtil().findAnnotation(webParam, WP_ANNOTATION);
- if (annotation!=null && annotation.getPropertyValue(WPAnnotationFeatures.NAME_ATTRIBUTE)!=null)
- {
- if (!jee5DomUtil().isNameUsed(webParam)) {
- return createStatus(webParam, ValidationMessages.WebParamValidation_NameRedundant, WP_ANNOTATION, NAME_ATTRIBUTE);
- }
- }
-
- return createOkStatus(webParam);
- }
-
- protected static class NameRedundantConstraintDescriptor extends WpConstraintDescriptor
- {
- @Override
- public ConstraintSeverity getSeverity() {
- return ConstraintSeverity.WARNING;
- }
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/validation/webparam/NameIsRequiredConstraint.java b/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/validation/webparam/NameIsRequiredConstraint.java
deleted file mode 100755
index 3866b51..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/validation/webparam/NameIsRequiredConstraint.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.dom.runtime.validation.webparam;
-
-import static org.eclipse.jst.ws.jaxws.dom.runtime.persistence.WPAnnotationFeatures.NAME_ATTRIBUTE;
-import static org.eclipse.jst.ws.jaxws.dom.runtime.persistence.WPAnnotationFeatures.WP_ANNOTATION;
-
-import javax.jws.WebParam;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.emf.validation.IValidationContext;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.IWebParam;
-import org.eclipse.jst.ws.jaxws.dom.runtime.util.Jee5DomUtils;
-import org.eclipse.jst.ws.jaxws.dom.runtime.validation.AbstractValidationConstraint;
-import org.eclipse.jst.ws.jaxws.dom.runtime.validation.messages.ValidationMessages;
-import org.eclipse.jst.ws.jaxws.utils.annotations.IAnnotation;
-
-/**
- * Check if name attribute of {@link WebParam} annotation is required.
- * See {@link Jee5DomUtils#isNameRequired(IWebParam)} for more details.
- *
- * @author Georgi Vachkov
- */
-public class NameIsRequiredConstraint extends AbstractValidationConstraint
-{
- private static final String RETURN = "return";//$NON-NLS-1$
-
- /**
- * Constructor - no specific processing here
- */
- public NameIsRequiredConstraint() {
- super(new WpConstraintDescriptor());
- }
-
- @Override
- protected IStatus doValidate(final IValidationContext ctx) throws JavaModelException
- {
- final IWebParam webParam = (IWebParam)ctx.getTarget();
- if (RETURN.equals(webParam.getImplementation())) {
- return createOkStatus(webParam);
- }
-
- final IAnnotation<? extends IJavaElement> annotation = jee5DomUtil().findAnnotation(webParam, WP_ANNOTATION);
- if (annotation==null) {
- return createOkStatus(webParam);
- }
-
- if (jee5DomUtil().isNameRequired(webParam) && annotation.getPropertyValue(NAME_ATTRIBUTE)==null) {
- return createStatus(webParam, ValidationMessages.WebParamValidation_NameRequired, WP_ANNOTATION, null);
- }
-
- return createOkStatus(webParam);
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/validation/webparam/NameIsUniqueConstraint.java b/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/validation/webparam/NameIsUniqueConstraint.java
deleted file mode 100755
index 4478581..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/validation/webparam/NameIsUniqueConstraint.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.dom.runtime.validation.webparam;
-
-import static org.eclipse.jst.ws.jaxws.dom.runtime.persistence.WPAnnotationFeatures.NAME_ATTRIBUTE;
-import static org.eclipse.jst.ws.jaxws.dom.runtime.persistence.WPAnnotationFeatures.WP_ANNOTATION;
-
-import javax.jws.WebParam;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.emf.validation.IValidationContext;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.IWebMethod;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.IWebParam;
-import org.eclipse.jst.ws.jaxws.dom.runtime.validation.AbstractValidationConstraint;
-import org.eclipse.jst.ws.jaxws.dom.runtime.validation.messages.ValidationMessages;
-
-/**
- * Check if name attribute of {@link WebParam} annotation is unique in the scope of
- * the method.
- *
- * @author Georgi Vachkov
- */
-public class NameIsUniqueConstraint extends AbstractValidationConstraint
-{
- private static final String RETURN = "return";//$NON-NLS-1$
-
- /**
- * Constructor - no specific processing here
- */
- public NameIsUniqueConstraint() {
- super(new WpConstraintDescriptor());
- }
-
- @Override
- protected IStatus doValidate(final IValidationContext ctx) throws JavaModelException
- {
- final IWebParam webParam = (IWebParam)ctx.getTarget();
- if (RETURN.equals(webParam.getImplementation())) {
- return createOkStatus(webParam);
- }
-
- if (!isNameUnique(webParam))
- {
- final String msg = ValidationMessages.bind(ValidationMessages.WebParamValidation_NameExists, webParam.getName());
- return createStatus(webParam, msg, WP_ANNOTATION, NAME_ATTRIBUTE);
- }
-
- return createOkStatus(webParam);
- }
-
- protected boolean isNameUnique(final IWebParam webParam)
- {
- final IWebMethod webMethod = (IWebMethod)webParam.eContainer();
- for (IWebParam wp : webMethod.getParameters())
- {
- if (wp==webParam) {
- continue;
- }
-
- if (wp.getName().equals(webParam.getName())) {
- return false;
- }
- }
-
- return true;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/validation/webparam/PartNameIsNCNameConstraint.java b/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/validation/webparam/PartNameIsNCNameConstraint.java
deleted file mode 100755
index eff485b..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/validation/webparam/PartNameIsNCNameConstraint.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.dom.runtime.validation.webparam;
-
-import static org.eclipse.jst.ws.jaxws.dom.runtime.persistence.WPAnnotationFeatures.PART_NAME_ATTRIBUTE;
-import static org.eclipse.jst.ws.jaxws.dom.runtime.persistence.WPAnnotationFeatures.WP_ANNOTATION;
-
-import javax.jws.WebParam;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.emf.validation.IValidationContext;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.IWebParam;
-import org.eclipse.jst.ws.jaxws.dom.runtime.util.Jee5DomUtils;
-import org.eclipse.jst.ws.jaxws.dom.runtime.validation.AbstractValidationConstraint;
-import org.eclipse.jst.ws.jaxws.utils.WsdlNamesValidator;
-
-/**
- * Check if partName attribute of {@link WebParam} annotation is correct NCName.
- *
- * @author Georgi Vachkov
- */
-public class PartNameIsNCNameConstraint extends AbstractValidationConstraint
-{
- private static final String RETURN = "return";//$NON-NLS-1$
-
- /**
- * Constructor - no specific processing here
- */
- public PartNameIsNCNameConstraint() {
- super(new WpConstraintDescriptor());
- }
-
- @Override
- protected IStatus doValidate(final IValidationContext ctx) throws JavaModelException
- {
- final IWebParam webParam = (IWebParam)ctx.getTarget();
- if (RETURN.equals(webParam.getImplementation()) || !Jee5DomUtils.getInstance().isPartNameUsed(webParam)) {
- return createOkStatus(webParam);
- }
-
- final IStatus status = WsdlNamesValidator.validateNCName2(PART_NAME_ATTRIBUTE, webParam.getPartName());
- if (!status.isOK()) {
- return createStatus(webParam, status.getMessage(), WP_ANNOTATION, PART_NAME_ATTRIBUTE);
- }
-
- return createOkStatus(webParam);
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/validation/webparam/TargetNsValidUriConstraint.java b/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/validation/webparam/TargetNsValidUriConstraint.java
deleted file mode 100755
index a5f520e..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/validation/webparam/TargetNsValidUriConstraint.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.dom.runtime.validation.webparam;
-
-import static org.eclipse.jst.ws.jaxws.dom.runtime.persistence.WPAnnotationFeatures.TARGET_NAMESPACE_ATTRIBUTE;
-import static org.eclipse.jst.ws.jaxws.dom.runtime.persistence.WPAnnotationFeatures.WP_ANNOTATION;
-
-import java.net.URI;
-import java.net.URISyntaxException;
-
-import javax.jws.WebParam;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.emf.validation.IValidationContext;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.IWebParam;
-import org.eclipse.jst.ws.jaxws.dom.runtime.internal.plugin.JaxWsDomRuntimeMessages;
-import org.eclipse.jst.ws.jaxws.dom.runtime.validation.AbstractValidationConstraint;
-
-/**
- * Check if targetNamespace attribute of {@link WebParam} annotation is correct URI.
- *
- * @author Georgi Vachkov
- */
-public class TargetNsValidUriConstraint extends AbstractValidationConstraint
-{
- private static final String RETURN = "return";//$NON-NLS-1$
-
- /**
- * Constructor - no specific processing here
- */
- public TargetNsValidUriConstraint() {
- super(new WpConstraintDescriptor());
- }
-
- @Override
- protected IStatus doValidate(IValidationContext ctx) throws JavaModelException
- {
- final IWebParam wp = (IWebParam)ctx.getTarget();
- if (RETURN.equals(wp.getImplementation())) {
- return createOkStatus(wp);
- }
-
- try {
- new URI(wp.getTargetNamespace());
- } catch (URISyntaxException e) { // $JL-EXC$
- return createStatus(wp, JaxWsDomRuntimeMessages.bind(
- JaxWsDomRuntimeMessages.TargetNsValidUriConstraint_URI_SYNTAX_ERROR,
- new Object[] {e.getIndex(), e.getInput(), e.getReason()}), WP_ANNOTATION, TARGET_NAMESPACE_ATTRIBUTE);
- }
-
- return createOkStatus(wp);
- }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/validation/webparam/WpConstraintDescriptor.java b/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/validation/webparam/WpConstraintDescriptor.java
deleted file mode 100755
index ea22245..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/validation/webparam/WpConstraintDescriptor.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.dom.runtime.validation.webparam;
-
-import org.eclipse.emf.validation.model.ConstraintSeverity;
-import org.eclipse.jst.ws.jaxws.dom.runtime.internal.plugin.JaxWsDomRuntimePlugin;
-import org.eclipse.jst.ws.jaxws.dom.runtime.validation.DomValidationConstraintDescriptor;
-import org.eclipse.jst.ws.jaxws.utils.dom.validation.DomValidationConstants;
-
-/**
- * The constraint descriptor for WebParam validation constraints
- *
- * @author Georgi Vachkov
- */
-class WpConstraintDescriptor extends DomValidationConstraintDescriptor
-{
- public String getId() {
- return DomValidationConstants.WP_CONSTRAINT_ID;
- }
-
- public String getPluginId() {
- return JaxWsDomRuntimePlugin.PLUGIN_ID;
- }
-
- public ConstraintSeverity getSeverity() {
- return ConstraintSeverity.ERROR;
- }
-
- public int getStatusCode() {
- return -29;
- }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/validation/webparam/WpConstraintProvider.java b/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/validation/webparam/WpConstraintProvider.java
deleted file mode 100755
index 4028c4b..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/validation/webparam/WpConstraintProvider.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.dom.runtime.validation.webparam;
-
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.Set;
-
-import org.eclipse.emf.validation.model.IModelConstraint;
-
-/**
- * Constraint provider for validation of webPram. Collects all
- * constraints for WebParam annotation and returns them as collection.
- *
- * @author Georgi Vachkov
- */
-public class WpConstraintProvider
-{
- private Set<IModelConstraint> constraints;
-
- public Collection<IModelConstraint> getConstraints()
- {
- if (constraints == null)
- {
- constraints = new HashSet<IModelConstraint>();
- constraints.add(new NameIsNCNameConstraint());
- constraints.add(new NameIsUniqueConstraint());
- constraints.add(new NameIsRedundantConstraint());
- constraints.add(new NameIsRequiredConstraint());
- constraints.add(new PartNameIsNCNameConstraint());
- constraints.add(new TargetNsValidUriConstraint());
- }
-
- return constraints;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/validation/webservice/EndpointCorrectConstraint.java b/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/validation/webservice/EndpointCorrectConstraint.java
deleted file mode 100755
index c0f154f..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/validation/webservice/EndpointCorrectConstraint.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.dom.runtime.validation.webservice;
-
-import static org.eclipse.jst.ws.jaxws.dom.runtime.persistence.WSAnnotationFeatures.WS_ANNOTATION;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.emf.validation.IValidationContext;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.IWebService;
-import org.eclipse.jst.ws.jaxws.dom.runtime.util.Dom2ResourceMapper;
-import org.eclipse.jst.ws.jaxws.dom.runtime.validation.AbstractValidationConstraint;
-import org.eclipse.jst.ws.jaxws.dom.runtime.validation.provider.EndpointTypeValidator;
-
-/**
- * Checks the endpoint class if it is capable to be used as service implementation bean
- * according to jsr-181 section 3.1
- *
- * @author Georgi Vachkov
- */
-public class EndpointCorrectConstraint extends AbstractValidationConstraint
-{
- private final EndpointTypeValidator validator;
-
- /**
- * Constructor - no specific processing here
- */
- public EndpointCorrectConstraint()
- {
- super(new WsConstraintDescriptor());
- validator = new EndpointTypeValidator();
- }
-
- @Override
- protected IStatus doValidate(IValidationContext ctx) throws JavaModelException
- {
- final IWebService ws = (IWebService) ctx.getTarget();
- final IType wsType = Dom2ResourceMapper.INSTANCE.findType(ws);
- if (wsType==null) {
- return createOkStatus(ws);
- }
-
- final IStatus status = validator.validate(wsType);
- if (!status.isOK()) {
- return createStatus(ws, status.getMessage(), WS_ANNOTATION, null);
- }
-
- return createOkStatus(ws);
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/validation/webservice/EndpointImplementsSeiConstraint.java b/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/validation/webservice/EndpointImplementsSeiConstraint.java
deleted file mode 100755
index 8f46386..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/validation/webservice/EndpointImplementsSeiConstraint.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.dom.runtime.validation.webservice;
-
-import static org.eclipse.jst.ws.jaxws.dom.runtime.persistence.WSAnnotationFeatures.ENDPOINT_INTERFACE_ATTRIBUTE;
-import static org.eclipse.jst.ws.jaxws.dom.runtime.persistence.WSAnnotationFeatures.WS_ANNOTATION;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.validation.IValidationContext;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.IWebService;
-import org.eclipse.jst.ws.jaxws.dom.runtime.util.Dom2ResourceMapper;
-import org.eclipse.jst.ws.jaxws.dom.runtime.validation.AbstractValidationConstraint;
-import org.eclipse.jst.ws.jaxws.dom.runtime.validation.provider.SeiImplementationValidator;
-
-/**
- * Validates if the WebService implementation bean implements methods from
- * referenced service endpoint interface
- *
- * @author Georgi Vachkov
- */
-public class EndpointImplementsSeiConstraint extends AbstractValidationConstraint
-{
- /**
- * Constructor - no specific processing here
- */
- public EndpointImplementsSeiConstraint()
- {
- super(new WsConstraintDescriptor());
- }
-
- @Override
- protected IStatus doValidate(IValidationContext ctx) throws JavaModelException
- {
- final IWebService ws = (IWebService) ctx.getTarget();
-
- if (ws.getServiceEndpoint()==null || ws.getServiceEndpoint().isImplicit()) {
- return createOkStatus(ws);
- }
-
- final IType wsType = findType(ws);
- final IType seiType = findType(ws.getServiceEndpoint());
-
- if (wsType==null || seiType==null) {
- return createOkStatus(ws);
- }
-
- final SeiImplementationValidator validator = new SeiImplementationValidator(seiType);
- final IStatus status = validator.validate(wsType);
- if (!status.isOK()) {
- return createStatus(ws, status.getMessage(), WS_ANNOTATION, ENDPOINT_INTERFACE_ATTRIBUTE);
- }
-
- return createOkStatus(ws);
- }
-
- protected IType findType(final EObject eObject) throws JavaModelException {
- return Dom2ResourceMapper.INSTANCE.findType(eObject);
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/validation/webservice/EndpointInterfaceExistsConstraint.java b/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/validation/webservice/EndpointInterfaceExistsConstraint.java
deleted file mode 100755
index 8f49eb9..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/validation/webservice/EndpointInterfaceExistsConstraint.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.dom.runtime.validation.webservice;
-
-import static org.eclipse.jst.ws.jaxws.dom.runtime.persistence.WSAnnotationFeatures.ENDPOINT_INTERFACE_ATTRIBUTE;
-import static org.eclipse.jst.ws.jaxws.dom.runtime.persistence.WSAnnotationFeatures.WS_ANNOTATION;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.emf.validation.IValidationContext;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.IWebService;
-import org.eclipse.jst.ws.jaxws.dom.runtime.persistence.annotation.AnnotationAdapterFactory;
-import org.eclipse.jst.ws.jaxws.dom.runtime.persistence.annotation.IAnnotationAdapter;
-import org.eclipse.jst.ws.jaxws.dom.runtime.validation.AbstractValidationConstraint;
-import org.eclipse.jst.ws.jaxws.dom.runtime.validation.messages.ValidationMessages;
-import org.eclipse.jst.ws.jaxws.utils.annotations.IAnnotation;
-
-/**
- * Checks if referenced by endpoint SEI exists in the project.
- *
- * @author Georgi Vachkov
- */
-public class EndpointInterfaceExistsConstraint extends AbstractValidationConstraint
-{
- /**
- * Constructor - no specific processing here
- */
- public EndpointInterfaceExistsConstraint() {
- super(new WsConstraintDescriptor());
- }
-
- @Override
- protected IStatus doValidate(IValidationContext ctx) throws JavaModelException
- {
- final IWebService ws = (IWebService)ctx.getTarget();
- final IAnnotationAdapter adapter = (IAnnotationAdapter)AnnotationAdapterFactory.INSTANCE.adapt(ws, IAnnotationAdapter.class);
- final IAnnotation<? extends IJavaElement> annotation = adapter.getAnnotation(WS_ANNOTATION);
- if (annotation == null) {
- return createOkStatus(ws);
- }
-
- final String seiFQName = annotation.getPropertyValue(ENDPOINT_INTERFACE_ATTRIBUTE);
- if (seiFQName == null) {
- return createOkStatus(ws);
- }
-
- if (ws.getServiceEndpoint()==null) {
- final String msg = ValidationMessages.bind(ValidationMessages.WsValidation_SeiDoesNotExists, seiFQName);
- return createStatus(ws, msg, WS_ANNOTATION, ENDPOINT_INTERFACE_ATTRIBUTE);
- }
-
- return createOkStatus(ws);
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/validation/webservice/EndpointIsSessionBeanConstraint.java b/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/validation/webservice/EndpointIsSessionBeanConstraint.java
deleted file mode 100755
index 76b2ac0..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/validation/webservice/EndpointIsSessionBeanConstraint.java
+++ /dev/null
@@ -1,79 +0,0 @@
-package org.eclipse.jst.ws.jaxws.dom.runtime.validation.webservice;
-
-import java.util.List;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.emf.validation.IValidationContext;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jst.j2ee.model.IModelProvider;
-import org.eclipse.jst.j2ee.model.ModelProviderManager;
-import org.eclipse.jst.javaee.ejb.SessionBean;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.IWebService;
-import org.eclipse.jst.ws.jaxws.dom.runtime.persistence.WSAnnotationFeatures;
-import org.eclipse.jst.ws.jaxws.dom.runtime.util.Dom2ResourceMapper;
-import org.eclipse.jst.ws.jaxws.dom.runtime.validation.AbstractValidationConstraint;
-import org.eclipse.jst.ws.jaxws.dom.runtime.validation.messages.ValidationMessages;
-import org.eclipse.jst.ws.jaxws.utils.facets.FacetUtils;
-import org.eclipse.jst.ws.jaxws.utils.facets.IFacetUtils;
-
-/**
- * Constraint for validating whether a class in a EJB module annotated with the "@WebService" annotation is a session bean
- *
- * @author Danail Branekov
- */
-public class EndpointIsSessionBeanConstraint extends AbstractValidationConstraint
-{
- public EndpointIsSessionBeanConstraint()
- {
- super(new WsConstraintDescriptor());
- }
-
- @Override
- protected IStatus doValidate(final IValidationContext ctx) throws CoreException
- {
- final IWebService ws = (IWebService) ctx.getTarget();
- final IType wsType = Dom2ResourceMapper.INSTANCE.findType(ws);
- if (wsType == null || wsType.getResource() == null)
- {
- return createOkStatus(ws);
- }
-
- final IProject project = wsType.getResource().getProject();
- if (!facetUtils().hasFacetWithVersion(project, IFacetUtils.EJB_30_FACET_VERSION, IFacetUtils.EJB_30_FACET_ID))
- {
- return createOkStatus(ws);
- }
-
- if (!isSessionBean(wsType))
- {
- return createStatus(ws, ValidationMessages.WsValidation_WsAnnotationOnNonSessionBean_Error, WSAnnotationFeatures.WS_ANNOTATION, null);
- }
-
- return createOkStatus(ws);
-
- }
-
- private IFacetUtils facetUtils()
- {
- return new FacetUtils();
- }
-
- @SuppressWarnings("unchecked")
- private boolean isSessionBean(final IType endpointType)
- {
- final IModelProvider provider = ModelProviderManager.getModelProvider(endpointType.getResource().getProject());
- final Object modelObject = provider.getModelObject();
- final List<SessionBean> sessionBeans = ((org.eclipse.jst.javaee.ejb.EJBJar) modelObject).getEnterpriseBeans().getSessionBeans();
- for (SessionBean bean : sessionBeans)
- {
- if (bean.getEjbClass().equals(endpointType.getFullyQualifiedName()))
- {
- return true;
- }
- }
-
- return false;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/validation/webservice/NameRedundantConstraint.java b/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/validation/webservice/NameRedundantConstraint.java
deleted file mode 100755
index b8dc37e..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/validation/webservice/NameRedundantConstraint.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.dom.runtime.validation.webservice;
-
-import static org.eclipse.jst.ws.jaxws.dom.runtime.persistence.WSAnnotationFeatures.NAME_ATTRIBUTE;
-import static org.eclipse.jst.ws.jaxws.dom.runtime.persistence.WSAnnotationFeatures.WS_ANNOTATION;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.emf.validation.IValidationContext;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.IWebService;
-import org.eclipse.jst.ws.jaxws.dom.runtime.validation.AbstractValidationConstraint;
-import org.eclipse.jst.ws.jaxws.dom.runtime.validation.messages.ValidationMessages;
-import org.eclipse.jst.ws.jaxws.utils.annotations.IAnnotation;
-
-/**
- * Checks if there is a name attribute on ednpoint that references SEI.
- * According to jsr-181 point 3.1 subpoint 5.
- *
- * @author Georgi Vachkov
- */
-public class NameRedundantConstraint extends AbstractValidationConstraint
-{
- /**
- * Constructor - no specific processing here
- */
- public NameRedundantConstraint() {
- super(new WsConstraintDescriptor());
- }
-
- @Override
- protected IStatus doValidate(final IValidationContext ctx) throws JavaModelException
- {
- final IWebService ws = (IWebService)ctx.getTarget();
- if (ws.getServiceEndpoint()!=null && ws.getServiceEndpoint().isImplicit()) {
- return createOkStatus(ws);
- }
-
- if (hasNameAttribute(ws)) {
- return createStatus(ws, ValidationMessages.WsValidation_NameShouldNotBeUsedWithSei, WS_ANNOTATION, NAME_ATTRIBUTE);
- }
-
- return createOkStatus(ws);
- }
-
- protected boolean hasNameAttribute(final IWebService webService)
- {
- final IAnnotation<? extends IJavaElement> annotation = findAnnotation(webService, WS_ANNOTATION);
- if (annotation==null) {
- return false;
- }
-
- return annotation.getPropertyValue(NAME_ATTRIBUTE)!=null;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/validation/webservice/PortNameIsNCNameConstraint.java b/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/validation/webservice/PortNameIsNCNameConstraint.java
deleted file mode 100755
index 36b5273..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/validation/webservice/PortNameIsNCNameConstraint.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.dom.runtime.validation.webservice;
-
-import static org.eclipse.jst.ws.jaxws.dom.runtime.persistence.WSAnnotationFeatures.PORT_NAME_ATTRIBUTE;
-import static org.eclipse.jst.ws.jaxws.dom.runtime.persistence.WSAnnotationFeatures.WS_ANNOTATION;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.emf.validation.IValidationContext;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.IWebService;
-import org.eclipse.jst.ws.jaxws.dom.runtime.validation.AbstractValidationConstraint;
-import org.eclipse.jst.ws.jaxws.utils.WsdlNamesValidator;
-
-/**
- * Checks if portName attribute of WebService annotation is valid NCName
- *
- * @author Georgi Vachkov
- */
-public class PortNameIsNCNameConstraint extends AbstractValidationConstraint
-{
- /**
- * Constructor - no specific processing here
- */
- public PortNameIsNCNameConstraint() {
- super(new WsConstraintDescriptor());
- }
-
- @Override
- protected IStatus doValidate(IValidationContext ctx) throws JavaModelException
- {
- final IWebService ws = (IWebService)ctx.getTarget();
- final IStatus status = WsdlNamesValidator.validateNCName2(PORT_NAME_ATTRIBUTE, ws.getPortName());
- if (!status.isOK()) {
- return createStatus(ws, status.getMessage(), WS_ANNOTATION, PORT_NAME_ATTRIBUTE);
- }
-
- return createOkStatus(ws);
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/validation/webservice/ServiceNameIsNCNameConstraint.java b/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/validation/webservice/ServiceNameIsNCNameConstraint.java
deleted file mode 100755
index a79dba0..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/validation/webservice/ServiceNameIsNCNameConstraint.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.dom.runtime.validation.webservice;
-
-import static org.eclipse.jst.ws.jaxws.dom.runtime.persistence.WSAnnotationFeatures.SERVICE_NAME_ATTRIBUTE;
-import static org.eclipse.jst.ws.jaxws.dom.runtime.persistence.WSAnnotationFeatures.WS_ANNOTATION;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.emf.validation.IValidationContext;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.IWebService;
-import org.eclipse.jst.ws.jaxws.dom.runtime.validation.AbstractValidationConstraint;
-import org.eclipse.jst.ws.jaxws.utils.WsdlNamesValidator;
-
-/**
- * Checks if serviceName attribute of WebService annotation is valid NCName
- *
- * @author Georgi Vachkov
- */
-public class ServiceNameIsNCNameConstraint extends AbstractValidationConstraint
-{
- /**
- * Constructor - no specific processing here
- */
- public ServiceNameIsNCNameConstraint() {
- super(new WsConstraintDescriptor());
- }
-
- @Override
- protected IStatus doValidate(final IValidationContext ctx) throws JavaModelException
- {
- final IWebService ws = (IWebService)ctx.getTarget();
- final IStatus status = WsdlNamesValidator.validateNCName2(SERVICE_NAME_ATTRIBUTE, ws.getName());
- if (!status.isOK()) {
- return createStatus(ws, status.getMessage(), WS_ANNOTATION, SERVICE_NAME_ATTRIBUTE);
- }
-
- return createOkStatus(ws);
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/validation/webservice/TargetNsValidUriConstraint.java b/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/validation/webservice/TargetNsValidUriConstraint.java
deleted file mode 100755
index fd15c89..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/validation/webservice/TargetNsValidUriConstraint.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.dom.runtime.validation.webservice;
-
-import static org.eclipse.jst.ws.jaxws.dom.runtime.persistence.WSAnnotationFeatures.TARGET_NAMESPACE_ATTRIBUTE;
-import static org.eclipse.jst.ws.jaxws.dom.runtime.persistence.WSAnnotationFeatures.WS_ANNOTATION;
-
-import java.net.URI;
-import java.net.URISyntaxException;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.emf.validation.IValidationContext;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.IWebService;
-import org.eclipse.jst.ws.jaxws.dom.runtime.internal.plugin.JaxWsDomRuntimeMessages;
-import org.eclipse.jst.ws.jaxws.dom.runtime.validation.AbstractValidationConstraint;
-
-/**
- * Checks if targetNamespace attribute of WebService annotation is valid URI
- *
- * @author Georgi Vachkov
- */
-public class TargetNsValidUriConstraint extends AbstractValidationConstraint
-{
- /**
- * Constructor - no specific processing here
- */
- public TargetNsValidUriConstraint() {
- super(new WsConstraintDescriptor());
- }
-
- @Override
- protected IStatus doValidate(IValidationContext ctx) throws JavaModelException
- {
- final IWebService ws = (IWebService)ctx.getTarget();
- try {
- new URI(ws.getTargetNamespace());
- } catch (URISyntaxException e) { // $JL-EXC$
- return createStatus(ws, JaxWsDomRuntimeMessages.bind(
- JaxWsDomRuntimeMessages.TargetNsValidUriConstraint_URI_SYNTAX_ERROR,
- new Object[] {e.getIndex(), e.getInput(), e.getReason()})
- , WS_ANNOTATION, TARGET_NAMESPACE_ATTRIBUTE);
- }
-
- return createOkStatus(ws);
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/validation/webservice/WsConstraintDescriptor.java b/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/validation/webservice/WsConstraintDescriptor.java
deleted file mode 100755
index 5d28cb9..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/validation/webservice/WsConstraintDescriptor.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.dom.runtime.validation.webservice;
-
-import org.eclipse.emf.validation.model.ConstraintSeverity;
-import org.eclipse.jst.ws.jaxws.dom.runtime.internal.plugin.JaxWsDomRuntimePlugin;
-import org.eclipse.jst.ws.jaxws.dom.runtime.validation.DomValidationConstraintDescriptor;
-import org.eclipse.jst.ws.jaxws.utils.dom.validation.DomValidationConstants;
-
-/**
- * The constraint descriptor for WS constraints
- *
- * @author Georgi Vachkov
- */
-class WsConstraintDescriptor extends DomValidationConstraintDescriptor
-{
- public String getId() {
- return DomValidationConstants.WS_CONSTRAINT_ID;
- }
-
- public String getPluginId() {
- return JaxWsDomRuntimePlugin.PLUGIN_ID;
- }
-
- public ConstraintSeverity getSeverity() {
- return ConstraintSeverity.ERROR;
- }
-
- public int getStatusCode() {
- return -26;
- }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/validation/webservice/WsConstraintProvider.java b/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/validation/webservice/WsConstraintProvider.java
deleted file mode 100755
index 279c2ad..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/validation/webservice/WsConstraintProvider.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.dom.runtime.validation.webservice;
-
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.Set;
-
-import org.eclipse.emf.validation.model.IModelConstraint;
-
-/**
- * The constraint provider for WebService objects
- *
- * @author Georgi Vachkov
- */
-public class WsConstraintProvider
-{
- private Set<IModelConstraint> constraints;;
-
- public Collection<IModelConstraint> getConstraints()
- {
- if (constraints == null)
- {
- constraints = new HashSet<IModelConstraint>();
- constraints.add(new ServiceNameIsNCNameConstraint());
- constraints.add(new PortNameIsNCNameConstraint());
- constraints.add(new TargetNsValidUriConstraint());
- constraints.add(new EndpointInterfaceExistsConstraint());
- constraints.add(new WsdlLocationCorrectConstraint());
- constraints.add(new NameRedundantConstraint());
- constraints.add(new EndpointCorrectConstraint());
- constraints.add(new EndpointImplementsSeiConstraint());
- constraints.add(new EndpointIsSessionBeanConstraint());
- }
-
- return constraints;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/validation/webservice/WsdlLocationCorrectConstraint.java b/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/validation/webservice/WsdlLocationCorrectConstraint.java
deleted file mode 100755
index 64a4509..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/validation/webservice/WsdlLocationCorrectConstraint.java
+++ /dev/null
@@ -1,131 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.dom.runtime.validation.webservice;
-
-import static org.eclipse.jst.ws.jaxws.dom.runtime.persistence.WSAnnotationFeatures.WSDL_LOCATION_ATTRIBUTE;
-import static org.eclipse.jst.ws.jaxws.dom.runtime.persistence.WSAnnotationFeatures.WS_ANNOTATION;
-
-import java.net.MalformedURLException;
-import java.net.URL;
-
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.emf.validation.IValidationContext;
-import org.eclipse.emf.validation.model.ConstraintSeverity;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IPackageFragmentRoot;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.IWebService;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.IWebServiceProject;
-import org.eclipse.jst.ws.jaxws.dom.runtime.persistence.annotation.AnnotationAdapterFactory;
-import org.eclipse.jst.ws.jaxws.dom.runtime.persistence.annotation.IAnnotationAdapter;
-import org.eclipse.jst.ws.jaxws.dom.runtime.util.Dom2ResourceMapper;
-import org.eclipse.jst.ws.jaxws.dom.runtime.validation.AbstractValidationConstraint;
-import org.eclipse.jst.ws.jaxws.dom.runtime.validation.messages.ValidationMessages;
-import org.eclipse.jst.ws.jaxws.utils.annotations.IAnnotation;
-
-/**
- * Checks if the WSDL location contains valid value.
- *
- * @author Georgi Vachkov
- */
-public class WsdlLocationCorrectConstraint extends AbstractValidationConstraint
-{
- public WsdlLocationCorrectConstraint() {
- super(new WarningConstraintDescriptor());
- }
-
- @Override
- protected IStatus doValidate(IValidationContext ctx) throws JavaModelException
- { final IWebService ws = (IWebService)ctx.getTarget();
- final IAnnotation<? extends IJavaElement> annotation = findAnnotation(ws, WS_ANNOTATION);
- if (annotation==null || annotation.getPropertyValue(WSDL_LOCATION_ATTRIBUTE)==null) {
- return createOkStatus(ws);
- }
-
- if (checkWsdlLocationInProject(ws)) {
- return createOkStatus(ws);
- }
-
- return checkWsdlUrl(ws, annotation.getPropertyValue(WSDL_LOCATION_ATTRIBUTE));
- }
-
- protected IStatus checkWsdlUrl(final IWebService ws, final String wsdlUrl) throws JavaModelException
- {
- try {
- new URL(wsdlUrl);
- }
- catch (MalformedURLException e) { // $JL-EXC$
- String msg = ValidationMessages.bind(ValidationMessages.WsValidation_WsdlDoesNotExists,
- e.getLocalizedMessage());
- return createStatus(ws, msg, WS_ANNOTATION, WSDL_LOCATION_ATTRIBUTE);
- }
-
- return createOkStatus(ws);
- }
-
- protected boolean checkWsdlLocationInProject(final IWebService webService) throws JavaModelException
- {
- final IAnnotationAdapter adapter = (IAnnotationAdapter)AnnotationAdapterFactory.INSTANCE.adapt(webService, IAnnotationAdapter.class);
- final IAnnotation<? extends IJavaElement> annotation = adapter.getAnnotation(WS_ANNOTATION);
- if (annotation==null) {
- return true;
- }
-
- final String wsdlLocation = annotation.getPropertyValue(WSDL_LOCATION_ATTRIBUTE);
- if (wsdlLocation == null) {
- return true;
- }
-
- if (wsdlLocation.trim().length()==0) {
- return false;
- }
-
- return findFile(webService, wsdlLocation);
- }
-
- protected boolean findFile(final IWebService webService, final String file) throws JavaModelException
- {
- final IProject project = Dom2ResourceMapper.INSTANCE.findProject((IWebServiceProject)webService.eContainer());
- IResource resource = project.findMember(file);
- if (resource!=null) {
- return true;
- }
-
- final IJavaProject javaProject = JavaCore.create(project);
- for (IPackageFragmentRoot root : javaProject.getPackageFragmentRoots())
- {
- if (root.getResource()==null) {
- continue;
- }
-
- if (root.getResource().getType()==IResource.FOLDER) {
- if (((IFolder) root.getResource()).findMember(file) != null) {
- return true;
- }
- }
- }
-
- return false;
- }
-
- protected static class WarningConstraintDescriptor extends WsConstraintDescriptor
- {
- @Override
- public ConstraintSeverity getSeverity() {
- return ConstraintSeverity.WARNING;
- }
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.ui/.classpath b/bundles/org.eclipse.jst.ws.jaxws.ui/.classpath
deleted file mode 100755
index f930cb7..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.ui/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/bundles/org.eclipse.jst.ws.jaxws.ui/.project b/bundles/org.eclipse.jst.ws.jaxws.ui/.project
deleted file mode 100755
index e5a0fde..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.ui/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.jst.ws.jaxws.ui</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
diff --git a/bundles/org.eclipse.jst.ws.jaxws.ui/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.jst.ws.jaxws.ui/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100755
index f6eebfa..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.ui/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,7 +0,0 @@
-#Thu Dec 18 11:00:26 GMT 2008
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.5
diff --git a/bundles/org.eclipse.jst.ws.jaxws.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.jst.ws.jaxws.ui/META-INF/MANIFEST.MF
deleted file mode 100755
index 9fc8d22..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.ui/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,32 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.jst.ws.jaxws.ui;singleton:=true
-Bundle-Version: 0.5.2.qualifier
-Bundle-Localization: plugin
-Bundle-Activator: org.eclipse.jst.ws.internal.jaxws.ui.JAXWSUIPlugin
-Bundle-Vendor: %pluginProvider
-Require-Bundle: org.eclipse.ui;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.jdt.ui;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.jface.text;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.ui.ide;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.core.resources;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.jdt.core;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.wst.command.env;bundle-version="[1.0.305,1.1.0)",
- org.eclipse.wst.command.env.core;bundle-version="[1.0.204,1.1.0)",
- org.eclipse.jst.ws.jaxws.core;bundle-version="0.5.0",
- org.eclipse.ltk.core.refactoring;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.ltk.ui.refactoring;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.ui.editors;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.jdt.launching;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.jst.ws.annotations.core;bundle-version="0.5.0",
- org.eclipse.jdt.apt.core;bundle-version="[3.3.100,4.0.0)"
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Bundle-ActivationPolicy: lazy
-Import-Package: javax.jws,
- javax.jws.soap,
- javax.xml.ws;version="2.1.0",
- javax.xml.ws.http;version="2.1.0",
- javax.xml.ws.soap;version="2.1.0"
-Export-Package: org.eclipse.jst.ws.internal.jaxws.ui.annotations.correction;x-internal:=true
diff --git a/bundles/org.eclipse.jst.ws.jaxws.ui/about.html b/bundles/org.eclipse.jst.ws.jaxws.ui/about.html
deleted file mode 100644
index 5b6a031..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.ui/about.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
-<title>About</title>
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
-
-<p>February 19, 2009</p>
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, "Program" will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is
-being redistributed by another party ("Redistributor") and different terms and conditions may
-apply to your use of any object code in the Content. Check the Redistributor's license that was
-provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
-
-</body>
-</html>
diff --git a/bundles/org.eclipse.jst.ws.jaxws.ui/build.properties b/bundles/org.eclipse.jst.ws.jaxws.ui/build.properties
deleted file mode 100755
index d4e6333..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.ui/build.properties
+++ /dev/null
@@ -1,8 +0,0 @@
-source.. = src/
-output.. = bin/
-bin.includes = plugin.xml,\
- META-INF/,\
- .,\
- icons/,\
- about.html,\
- plugin.properties
diff --git a/bundles/org.eclipse.jst.ws.jaxws.ui/icons/elcl16/filter_ps.gif b/bundles/org.eclipse.jst.ws.jaxws.ui/icons/elcl16/filter_ps.gif
deleted file mode 100644
index a4c9e60..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.ui/icons/elcl16/filter_ps.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.jst.ws.jaxws.ui/icons/eview16/annotation_obj.gif b/bundles/org.eclipse.jst.ws.jaxws.ui/icons/eview16/annotation_obj.gif
deleted file mode 100755
index 435d62e..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.ui/icons/eview16/annotation_obj.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.jst.ws.jaxws.ui/icons/eview16/prop_ps.gif b/bundles/org.eclipse.jst.ws.jaxws.ui/icons/eview16/prop_ps.gif
deleted file mode 100644
index d11c996..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.ui/icons/eview16/prop_ps.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.jst.ws.jaxws.ui/icons/obj16/binding_obj.gif b/bundles/org.eclipse.jst.ws.jaxws.ui/icons/obj16/binding_obj.gif
deleted file mode 100644
index 896e2f0..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.ui/icons/obj16/binding_obj.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.jst.ws.jaxws.ui/icons/obj16/false.gif b/bundles/org.eclipse.jst.ws.jaxws.ui/icons/obj16/false.gif
deleted file mode 100644
index 9bd9b0c..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.ui/icons/obj16/false.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.jst.ws.jaxws.ui/icons/obj16/httpbinding_obj.gif b/bundles/org.eclipse.jst.ws.jaxws.ui/icons/obj16/httpbinding_obj.gif
deleted file mode 100644
index 4428ef3..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.ui/icons/obj16/httpbinding_obj.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.jst.ws.jaxws.ui/icons/obj16/soapbinding_obj.gif b/bundles/org.eclipse.jst.ws.jaxws.ui/icons/obj16/soapbinding_obj.gif
deleted file mode 100644
index 115f6bf..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.ui/icons/obj16/soapbinding_obj.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.jst.ws.jaxws.ui/icons/obj16/true.gif b/bundles/org.eclipse.jst.ws.jaxws.ui/icons/obj16/true.gif
deleted file mode 100644
index 9cacb96..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.ui/icons/obj16/true.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.jst.ws.jaxws.ui/plugin.properties b/bundles/org.eclipse.jst.ws.jaxws.ui/plugin.properties
deleted file mode 100644
index bb1201b..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 Web Tools Platform
-
-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 2a92f10..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.ui/plugin.xml
+++ /dev/null
@@ -1,109 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.2"?>
-<plugin>
-
- <extension point="org.eclipse.ui.views">
- <category
- name="%ANNOTATIONS_VIEW_CATEGORY_NAME"
- id="org.eclipse.jst.ws.jwst.ui">
- </category>
- <view
- name="%ANNOTATIONS_VIEW_NAME"
- icon="icons/eview16/prop_ps.gif"
- category="org.eclipse.jst.ws.jwst.ui"
- class="org.eclipse.jst.ws.internal.jaxws.ui.views.AnnotationsView"
- id="org.eclipse.jst.ws.jaxws.ui.views.AnnotationsView">
- </view>
- </extension>
-
- <!-- <extension point="org.eclipse.ui.perspectiveExtensions">
- <perspectiveExtension targetID="org.eclipse.jdt.ui.JavaPerspective">
- <view
- relative="org.eclipse.ui.views.ProblemView"
- relationship="stack"
- id="org.eclipse.jst.ws.jaxws.ui.views.AnnotationsView">
- </view>
- </perspectiveExtension>
- </extension> -->
-
- <extension point="org.eclipse.jst.ws.annotations.core.annotationInitializer">
- <initializer
- annotation="javax.jws.WebService"
- class="org.eclipse.jst.ws.internal.jaxws.ui.annotations.initialization.WebServiceAttributeInitializer">
- </initializer>
- <initializer
- annotation="javax.jws.WebMethod"
- class="org.eclipse.jst.ws.internal.jaxws.ui.annotations.initialization.WebMethodAttributeInitializer">
- </initializer>
- <initializer
- annotation="javax.jws.WebParam"
- class="org.eclipse.jst.ws.internal.jaxws.ui.annotations.initialization.WebParamAttributeInitializer">
- </initializer>
- <initializer
- annotation="javax.jws.WebResult"
- class="org.eclipse.jst.ws.internal.jaxws.ui.annotations.initialization.WebResultAttributeInitializer">
- </initializer>
- <initializer
- annotation="javax.jws.soap.SOAPBinding"
- class="org.eclipse.jst.ws.internal.jaxws.ui.annotations.initialization.SOAPBindingAttributeInitializer">
- </initializer>
- <initializer
- annotation="javax.xml.ws.RequestWrapper"
- class="org.eclipse.jst.ws.internal.jaxws.ui.annotations.initialization.RequestWrapperAttributeInitializer">
- </initializer>
- <initializer
- annotation="javax.xml.ws.ResponseWrapper"
- class="org.eclipse.jst.ws.internal.jaxws.ui.annotations.initialization.ResponseWrapperAttributeInitializer">
- </initializer>
- <initializer
- annotation="javax.xml.ws.BindingType"
- class="org.eclipse.jst.ws.internal.jaxws.ui.annotations.initialization.BindingTypeAttributeInitializer">
- </initializer>
- </extension>
-
- <extension id="jaxwsProposalComputer"
- name="JAX-WS Proposals"
- point="org.eclipse.jdt.ui.javaCompletionProposalComputer">
- <proposalCategory
- icon="icons/eview16/annotation_obj.gif">
- </proposalCategory>
- </extension>
-
- <extension id="JAXWSJavaCompletionProposalComputer"
- point="org.eclipse.jdt.ui.javaCompletionProposalComputer">
- <javaCompletionProposalComputer
- activate="true"
- categoryId="org.eclipse.jst.ws.jaxws.ui.jaxwsProposalComputer"
- class="org.eclipse.jst.ws.internal.jaxws.ui.annotations.contentassist.AnnotationCompletionProposalComputer">
- <partition
- type="__dftl_partition_content_type">
- </partition>
- <partition
- type="__java_string">
- </partition>
- </javaCompletionProposalComputer>
- </extension>
-
- <extension point="org.eclipse.jdt.ui.quickFixProcessors">
- <quickFixProcessor
- class="org.eclipse.jst.ws.internal.jaxws.ui.annotations.correction.JAXWSQuickFixProcessor"
- id="org.eclipse.jst.ws.jaxws.ui.annotations.correction.JAXWSQuickFixProcessor">
- <handledMarkerTypes>
- <markerType id="org.eclipse.jdt.apt.core.compile.problem"/>
- <markerType id="org.eclipse.jdt.apt.core.nonreconcile.compile.problem"/>
- </handledMarkerTypes>
- </quickFixProcessor>
- </extension>
-
- <extension point="org.eclipse.ui.ide.markerResolution">
- <markerResolutionGenerator
- markerType="org.eclipse.jdt.apt.core.compile.problem"
- class="org.eclipse.jst.ws.internal.jaxws.ui.annotations.correction.APTCompileProblemMarkerResolutionGenerator">
- </markerResolutionGenerator>
- <markerResolutionGenerator
- markerType="org.eclipse.jdt.apt.core.nonreconcile.compile.problem"
- class="org.eclipse.jst.ws.internal.jaxws.ui.annotations.correction.APTCompileProblemMarkerResolutionGenerator">
- </markerResolutionGenerator>
- </extension>
-
-</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 0e47db6..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/JAXWSUIMessages.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Shane Clarke.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Shane Clarke - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.jaxws.ui;
-
-import org.eclipse.osgi.util.NLS;
-
-public class JAXWSUIMessages extends NLS {
- private static final String BUNDLE_NAME = "org.eclipse.jst.ws.internal.jaxws.ui.JAXWSUIMessages"; //$NON-NLS-1$
-
- public static String ANNOTATION_ARRAY_CELL_EDITOR_ADD_LABEL;
- public static String ANNOTATION_ARRAY_CELL_EDITOR_BROWSE_LABEL;
- public static String ANNOTATION_ARRAY_CELL_EDITOR_DOWN_LABEL;
- public static String ANNOTATION_ARRAY_CELL_EDITOR_EDIT_ARRAY_VALUES_TITLE;
- public static String ANNOTATION_ARRAY_CELL_EDITOR_REMOVE_LABEL;
- public static String ANNOTATION_ARRAY_CELL_EDITOR_SELECT_CLASS_TITLE;
- public static String ANNOTATION_ARRAY_CELL_EDITOR_UP_LABEL;
- public static String ANNOTATION_ARRAY_CELL_EDITOR_NESTED_ARRAYS_NOT_SUPPORTED;
-
- public static String ANNOTATION_EDITING_SUPPORT_NOT_VALID_MESSAGE_PREFIX;
-
- public static String ANNOTATIONS_VIEW_ANNOTATIONS_COLUMN_NAME;
- public static String ANNOTATIONS_VIEW_ANNOTATIONS_NOT_AVAILABLE_ON_SELECTION;
- public static String ANNOTATIONS_VIEW_ANNOTATIONS_VALUES_COLUMN_NAME;
-
- public static String ANNOTATIONS_VIEW_FILTER_ACTION_NAME;
- public static String ANNOTATIONS_VIEW_FILTER_ACTION_SELECT_CATEGORIES_MESSAGE;
-
- public static String ANNOTATIONS_VIEW_NO_SUITABLE_LIBRARY_FOUND;
- public static String ANNOTATIONS_VIEW_OTHER_ANNOTATION_LIBRARIES_USE;
-
- public static String CONFIGURE_JAVA_1_6_LIBRARY;
-
- public static String ADD_ANNOTATION;
- public static String ADD_MISSING_METHOD;
- public static String ADD_UNIMPLEMENTED_METHODS;
- public static String CHANGE_METHOD_VISIBILITY;
- public static String CHANGE_METHOD_RETURN_TYPE;
- public static String CREATE_CONSTRUCTOR;
- public static String REMOVE_ANNOTATION;
- public static String REMOVE_METHOD;
- public static String REMOVE_FINAL_MODIFIER;
- public static String REMOVE_ILLEGAL_MODIFIER;
- public static String REMOVE_STATIC_MODIFIER;
- public static String REMOVE_MEMBERVALUEPAIR;
- public static String REMOVE_ALL_OTHER_MEMBERVALUEPAIRS;
-
- 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 da4c333..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/JAXWSUIMessages.properties
+++ /dev/null
@@ -1,46 +0,0 @@
-###############################################################################
-# Copyright (c) 2009 Shane Clarke
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# Shane Clarke - initial API and implementation
-###############################################################################
-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>.
-
-ADD_ANNOTATION=Add annotation ''@{0}''
-ADD_MISSING_METHOD=Add missing method
-ADD_UNIMPLEMENTED_METHODS=Add unimplemented methods
-CHANGE_METHOD_VISIBILITY=Change method visibility to ''{0}''
-CHANGE_METHOD_RETURN_TYPE=Change method return type to match SEI method return type
-CREATE_CONSTRUCTOR=Create constructor ''{0}()''
-REMOVE_ANNOTATION=Remove annotation ''@{0}''
-REMOVE_METHOD=Remove method ''{0}''
-REMOVE_FINAL_MODIFIER=Remove ''final'' modifier of ''{0}''(..)
-REMOVE_ILLEGAL_MODIFIER=Remove Illegal modifier
-REMOVE_STATIC_MODIFIER=Remove ''static'' modifier of ''{0}''(..)
-REMOVE_MEMBERVALUEPAIR=Remove member value pair ''{0}''
-REMOVE_ALL_OTHER_MEMBERVALUEPAIRS=Remove all other member value pairs
diff --git a/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/JAXWSUIPlugin.java b/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/JAXWSUIPlugin.java
deleted file mode 100755
index cc61dc9..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/JAXWSUIPlugin.java
+++ /dev/null
@@ -1,86 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Shane Clarke.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Shane Clarke - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.jaxws.ui;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.osgi.framework.BundleContext;
-
-/**
- * The activator class controls the plug-in life cycle
- */
-public class JAXWSUIPlugin extends AbstractUIPlugin {
-
- // The plug-in ID
- public static final String PLUGIN_ID = "org.eclipse.jst.ws.jaxws.ui"; //$NON-NLS-1$
-
- // The shared instance
- private static JAXWSUIPlugin plugin;
-
- /**
- * The constructor
- */
- public JAXWSUIPlugin() {
- }
-
- /*
- * (non-Javadoc)
- * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
- */
- public void start(BundleContext context) throws Exception {
- super.start(context);
- plugin = this;
- }
-
- /*
- * (non-Javadoc)
- * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
- */
- public void stop(BundleContext context) throws Exception {
- plugin = null;
- super.stop(context);
- }
-
- /**
- * Returns the shared instance
- *
- * @return the shared instance
- */
- public static JAXWSUIPlugin getDefault() {
- return plugin;
- }
-
- /**
- * Returns an image descriptor for the image file at the given
- * plug-in relative path
- *
- * @param path the path
- * @return the image descriptor
- */
- public static ImageDescriptor getImageDescriptor(String path) {
- return imageDescriptorFromPlugin(PLUGIN_ID, path);
- }
-
- public static void logMessage(int severity, String message) {
- JAXWSUIPlugin.log(new Status(severity, JAXWSUIPlugin.PLUGIN_ID, message));
- }
-
- public static void log(IStatus status) {
- JAXWSUIPlugin.getDefault().getLog().log(status);
- }
-
- public static void log(Throwable exception) {
- JAXWSUIPlugin.log(new Status(IStatus.ERROR, JAXWSUIPlugin.PLUGIN_ID,
- exception.toString(), exception));
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/actions/AnnotationsViewFilterAction.java b/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/actions/AnnotationsViewFilterAction.java
deleted file mode 100644
index 6b8f334..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/actions/AnnotationsViewFilterAction.java
+++ /dev/null
@@ -1,92 +0,0 @@
- /*******************************************************************************
- * Copyright (c) 2009 Shane Clarke.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Shane Clarke - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.jaxws.ui.actions;
-
-import java.util.Arrays;
-import java.util.List;
-
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.viewers.IStructuredContentProvider;
-import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.jface.viewers.StructuredViewer;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.window.Window;
-import org.eclipse.jst.ws.annotations.core.AnnotationsManager;
-import org.eclipse.jst.ws.internal.jaxws.ui.JAXWSUIMessages;
-import org.eclipse.jst.ws.internal.jaxws.ui.JAXWSUIPlugin;
-import org.eclipse.jst.ws.internal.jaxws.ui.views.AnnotationsView;
-import org.eclipse.jst.ws.internal.jaxws.ui.views.AnnotationsViewCategoryFilter;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.ui.IMemento;
-import org.eclipse.ui.dialogs.ListSelectionDialog;
-
-public class AnnotationsViewFilterAction extends Action {
- private StructuredViewer viewer;
- private AnnotationsViewCategoryFilter categoryFilter;
-
- public AnnotationsViewFilterAction(AnnotationsView annotationsView, StructuredViewer viewer, String text) {
- super(text);
- this.viewer = viewer;
- this.setImageDescriptor(JAXWSUIPlugin.getImageDescriptor("icons/elcl16/filter_ps.gif")); //$NON-NLS-1$
- categoryFilter = new AnnotationsViewCategoryFilter(annotationsView, viewer);
- }
-
- @Override
- public void run() {
- ListSelectionDialog listSelectionDialog = new ListSelectionDialog(viewer.getControl().getShell(),
- AnnotationsManager.getAnnotationCategories(), new AnnotationsCategoryDialogContentProvider(),
- new AnnotationsCategoryDialogLabelProvider(),
- JAXWSUIMessages.ANNOTATIONS_VIEW_FILTER_ACTION_SELECT_CATEGORIES_MESSAGE);
-
- listSelectionDialog.setInitialElementSelections(categoryFilter.getCategories());
-
- int returnValue = listSelectionDialog.open();
- if (returnValue == Window.OK) {
- Object[] result = listSelectionDialog.getResult();
- categoryFilter.filterAnnotations(Arrays.asList(result));
- }
- }
-
- public void init(IMemento memento) {
- categoryFilter.init(memento);
- }
-
- public void saveState(IMemento memento) {
- categoryFilter.saveState(memento);
- }
-
- private static class AnnotationsCategoryDialogContentProvider implements IStructuredContentProvider {
-
- public Object[] getElements(Object inputElement) {
- if (inputElement instanceof List) {
- return ((List<String>)inputElement).toArray();
- }
- return new Object[] {};
- }
-
- public void dispose() {
- }
-
- public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
- }
-
- }
-
- private static class AnnotationsCategoryDialogLabelProvider extends LabelProvider {
- public String getText(Object element) {
- return element.toString();
- }
-
- public Image getImage(Object element) {
- return null;
- }
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/annotations/contentassist/AnnotationCompletionProposalComputer.java b/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/annotations/contentassist/AnnotationCompletionProposalComputer.java
deleted file mode 100644
index fd43d5a..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/annotations/contentassist/AnnotationCompletionProposalComputer.java
+++ /dev/null
@@ -1,153 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Shane Clarke.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Shane Clarke - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.jaxws.ui.annotations.contentassist;
-
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.jdt.core.CompletionContext;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.ILocalVariable;
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jdt.core.dom.Annotation;
-import org.eclipse.jdt.core.dom.Expression;
-import org.eclipse.jdt.core.dom.MemberValuePair;
-import org.eclipse.jdt.core.dom.NormalAnnotation;
-import org.eclipse.jdt.core.dom.SingleMemberAnnotation;
-import org.eclipse.jdt.ui.text.java.ContentAssistInvocationContext;
-import org.eclipse.jdt.ui.text.java.IJavaCompletionProposalComputer;
-import org.eclipse.jdt.ui.text.java.JavaContentAssistInvocationContext;
-import org.eclipse.jface.text.contentassist.ICompletionProposal;
-import org.eclipse.jst.ws.annotations.core.AnnotationsManager;
-import org.eclipse.jst.ws.annotations.core.initialization.IAnnotationAttributeInitializer;
-import org.eclipse.jst.ws.annotations.core.utils.AnnotationUtils;
-import org.eclipse.jst.ws.internal.jaxws.ui.JAXWSUIPlugin;
-
-public class AnnotationCompletionProposalComputer implements IJavaCompletionProposalComputer {
-
- public AnnotationCompletionProposalComputer() {
- super();
- }
-
- @SuppressWarnings("unchecked")
- public List computeCompletionProposals(ContentAssistInvocationContext context, IProgressMonitor monitor) {
- if (context instanceof JavaContentAssistInvocationContext) {
- return computeCompletionProposals((JavaContentAssistInvocationContext) context);
- }
- return Collections.emptyList();
- }
-
- private List<ICompletionProposal> computeCompletionProposals(JavaContentAssistInvocationContext context) {
- CompletionContext completionContext = context.getCoreContext();
- int tokenStart = completionContext.getOffset();
-
- ICompilationUnit source = context.getCompilationUnit();
- try {
- IJavaElement javaElement = source.getElementAt(tokenStart);
- if (javaElement != null) {
- switch(javaElement.getElementType()) {
- case IJavaElement.PACKAGE_DECLARATION:
- case IJavaElement.TYPE:
- case IJavaElement.FIELD:
- return getCompletionProposalsForJavaElement(AnnotationUtils.getAnnotations(
- javaElement), javaElement, tokenStart);
- case IJavaElement.METHOD:
- ILocalVariable localVariable = AnnotationUtils.getLocalVariable((IMethod) javaElement, tokenStart);
- if (localVariable != null) {
- return getCompletionProposalsForJavaElement(AnnotationUtils.getAnnotations(
- localVariable), localVariable, tokenStart);
- } else {
- return getCompletionProposalsForJavaElement(AnnotationUtils.getAnnotations(
- javaElement), javaElement, tokenStart);
- }
- }
- }
- } catch (JavaModelException jme) {
- JAXWSUIPlugin.log(jme.getStatus());
- }
- return Collections.emptyList();
- }
-
- private List<ICompletionProposal> getCompletionProposalsForJavaElement(List<Annotation> annotations,
- IJavaElement javaElement, int offset) {
- for (Annotation annotation : annotations) {
- if (annotation instanceof NormalAnnotation) {
- NormalAnnotation normalAnnotation = (NormalAnnotation) annotation;
- MemberValuePair memberValuePair = getMemberValuePairForPosition(normalAnnotation, offset);
- if (memberValuePair != null) {
- return getCompletionProposalsForJavaElement(normalAnnotation, memberValuePair,
- javaElement);
- }
- }
- if (annotation instanceof SingleMemberAnnotation) {
- SingleMemberAnnotation singleMemberAnnotation = (SingleMemberAnnotation) annotation;
- return getCompletionProposalsForJavaElement(singleMemberAnnotation, javaElement);
- }
- }
- return Collections.emptyList();
- }
-
- private List<ICompletionProposal> getCompletionProposalsForJavaElement(NormalAnnotation annotation,
- MemberValuePair memberValuePair, IJavaElement javaElement) {
- IAnnotationAttributeInitializer annotationAttributeInitializer = AnnotationsManager
- .getAnnotationAttributeInitializerForName(annotation.getTypeName());
- if (annotationAttributeInitializer != null) {
- return annotationAttributeInitializer.getCompletionProposalsForMemberValuePair(javaElement,
- memberValuePair);
- }
- return Collections.emptyList();
- }
-
- private List<ICompletionProposal> getCompletionProposalsForJavaElement(SingleMemberAnnotation annotation,
- IJavaElement javaElement) {
- IAnnotationAttributeInitializer annotationAttributeInitializer = AnnotationsManager
- .getAnnotationAttributeInitializerForName(annotation.getTypeName());
- if (annotationAttributeInitializer != null) {
- return annotationAttributeInitializer.getCompletionProposalsForSingleMemberAnnotation(javaElement,
- annotation);
- }
- return Collections.emptyList();
- }
-
-
- @SuppressWarnings("unchecked")
- private MemberValuePair getMemberValuePairForPosition(NormalAnnotation normalAnnotation, int offset) {
- List<MemberValuePair> memberValuePairs = normalAnnotation.values();
- for (MemberValuePair memberValuePair : memberValuePairs) {
- Expression value = memberValuePair.getValue();
- int valueStartPosition = value.getStartPosition();
- int valueLength = value.getLength();
- if (offset >= valueStartPosition
- && offset <= valueStartPosition + valueLength) {
- return memberValuePair;
- }
- }
- return null;
- }
-
- @SuppressWarnings("unchecked")
- public List computeContextInformation(ContentAssistInvocationContext context, IProgressMonitor monitor) {
- return Collections.emptyList();
- }
-
- public String getErrorMessage() {
- return null;
- }
-
- public void sessionEnded() {
- }
-
- public void sessionStarted() {
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/annotations/correction/APTCompileProblemMarkerResolutionGenerator.java b/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/annotations/correction/APTCompileProblemMarkerResolutionGenerator.java
deleted file mode 100644
index 9dc9d6a..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/annotations/correction/APTCompileProblemMarkerResolutionGenerator.java
+++ /dev/null
@@ -1,122 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Shane Clarke.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Shane Clarke - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.jaxws.ui.annotations.correction;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IMarker;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.jdt.apt.core.util.EclipseMessager;
-import org.eclipse.jdt.core.CorrectionEngine;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.IJavaModelMarker;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.internal.ui.text.correction.AssistContext;
-import org.eclipse.jdt.internal.ui.text.correction.JavaCorrectionProcessor;
-import org.eclipse.jdt.internal.ui.text.correction.ProblemLocation;
-import org.eclipse.jdt.internal.ui.text.correction.CorrectionMarkerResolutionGenerator.CorrectionMarkerResolution;
-import org.eclipse.jdt.ui.text.java.CompletionProposalComparator;
-import org.eclipse.jdt.ui.text.java.IInvocationContext;
-import org.eclipse.jdt.ui.text.java.IJavaCompletionProposal;
-import org.eclipse.jdt.ui.text.java.IProblemLocation;
-import org.eclipse.jst.ws.internal.jaxws.ui.JAXWSUIPlugin;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.IMarkerResolution;
-import org.eclipse.ui.IMarkerResolutionGenerator2;
-import org.eclipse.ui.part.FileEditorInput;
-
-@SuppressWarnings("restriction")
-public class APTCompileProblemMarkerResolutionGenerator implements IMarkerResolutionGenerator2 {
-
- private final static IMarkerResolution[] NO_RESOLUTIONS = new IMarkerResolution[0];
-
- public boolean hasResolutions(IMarker marker) {
- int id = marker.getAttribute(IJavaModelMarker.ID, -1);
- if (id == EclipseMessager.APT_QUICK_FIX_PROBLEM_ID) {
- return true;
- }
- return false;
- }
-
- @SuppressWarnings("unchecked")
- public IMarkerResolution[] getResolutions(IMarker marker) {
- if (!hasResolutions(marker)) {
- return NO_RESOLUTIONS;
- }
-
- ICompilationUnit compilationUnit = getCompilationUnit(marker);
-
- if (compilationUnit != null) {
- IEditorInput editorInput = new FileEditorInput((IFile) compilationUnit.getResource());
- if (editorInput != null) {
- IProblemLocation problemLocation = createProblemLocation(marker);
- if (problemLocation != null) {
- IInvocationContext invocationContext = new AssistContext(compilationUnit,
- problemLocation.getOffset(), problemLocation.getLength());
-
- List<IJavaCompletionProposal> completionProposals = new ArrayList<IJavaCompletionProposal>();
-
- IStatus status = JavaCorrectionProcessor.collectCorrections(invocationContext,
- new IProblemLocation[] { problemLocation }, completionProposals);
-
- if (status.isOK()) {
- Collections.sort(completionProposals, new CompletionProposalComparator());
-
- IMarkerResolution[] markerResolutions = new IMarkerResolution[completionProposals.size()];
- for (int i= 0; i < completionProposals.size(); i++) {
- markerResolutions[i] = new CorrectionMarkerResolution(compilationUnit,
- problemLocation.getOffset(), problemLocation.getLength(),
- completionProposals.get(i), marker);
- }
- return markerResolutions;
- }
- }
- }
- }
- return NO_RESOLUTIONS;
- }
-
- private IProblemLocation createProblemLocation(IMarker marker) {
- try {
- int id = marker.getAttribute(IJavaModelMarker.ID, -1);
- int offset = marker.getAttribute(IMarker.CHAR_START, -1);
- int end = marker.getAttribute(IMarker.CHAR_END, -1);
- int severity = marker.getAttribute(IMarker.SEVERITY, IMarker.SEVERITY_INFO);
- String[] arguments = CorrectionEngine.getProblemArguments(marker);
- String markerType = marker.getType();
- if (id != -1 && offset != -1 && end != -1 && arguments != null) {
- int length = end - offset;
- boolean isError = (severity == IMarker.SEVERITY_ERROR);
- return new ProblemLocation(offset, length, id, arguments, isError, markerType);
- }
- } catch (CoreException ce) {
- JAXWSUIPlugin.log(ce.getStatus());
- }
- return null;
- }
-
- private ICompilationUnit getCompilationUnit(IMarker marker) {
- IResource resource = marker.getResource();
- if (resource instanceof IFile && resource.isAccessible()) {
- IJavaElement javaElement = JavaCore.create((IFile) resource);
- if (javaElement != null && javaElement instanceof ICompilationUnit) {
- return (ICompilationUnit) javaElement;
- }
- }
- return null;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/annotations/correction/AbstractJavaCorrectionPropsoal.java b/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/annotations/correction/AbstractJavaCorrectionPropsoal.java
deleted file mode 100644
index 816238a..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/annotations/correction/AbstractJavaCorrectionPropsoal.java
+++ /dev/null
@@ -1,113 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Shane Clarke.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Shane Clarke - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.jaxws.ui.annotations.correction;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.ui.text.java.IInvocationContext;
-import org.eclipse.jdt.ui.text.java.IJavaCompletionProposal;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.contentassist.IContextInformation;
-import org.eclipse.jst.ws.internal.jaxws.ui.JAXWSUIPlugin;
-import org.eclipse.ltk.core.refactoring.Change;
-import org.eclipse.ltk.core.refactoring.IUndoManager;
-import org.eclipse.ltk.core.refactoring.RefactoringCore;
-import org.eclipse.ltk.core.refactoring.RefactoringStatus;
-import org.eclipse.ltk.core.refactoring.TextFileChange;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.text.edits.MultiTextEdit;
-
-public abstract class AbstractJavaCorrectionPropsoal implements IJavaCompletionProposal {
-
- private int relevance;
- private String displayString;
- private Image image;
- private TextFileChange textChange;
-
- protected IInvocationContext invocationContext;
-
- public AbstractJavaCorrectionPropsoal(IInvocationContext invocationContext, String displayString, int relevance, Image image) {
- this.invocationContext = invocationContext;
- this.displayString = displayString;
- this.relevance = relevance;
- this.image = image;
- }
-
- public int getRelevance() {
- return relevance;
- }
-
- public abstract void addEdits(TextFileChange textChange) throws CoreException;
-
- private TextFileChange getTextChange() throws CoreException {
- if (textChange == null) {
- ICompilationUnit compilationUnit = invocationContext.getCompilationUnit();
- textChange = new TextFileChange(getDisplayString(), (IFile) compilationUnit.getResource()); //$NON-NLS-1$
- MultiTextEdit multiTextEdit = new MultiTextEdit();
- textChange.setEdit(multiTextEdit);
- textChange.setKeepPreviewEdits(true);
- textChange.setSaveMode(TextFileChange.LEAVE_DIRTY);
- addEdits(textChange);
- }
- return textChange;
- }
-
- public void apply(IDocument document) {
- IProgressMonitor monitor = new NullProgressMonitor();
- IUndoManager manager= RefactoringCore.getUndoManager();
- boolean successful = false;
- Change undoChange = null;
- try {
- textChange = getTextChange();
- textChange.initializeValidationData(monitor);
- RefactoringStatus valid = textChange.isValid(monitor);
- if (valid.isOK()) {
- manager.aboutToPerformChange(textChange);
- undoChange = textChange.perform(monitor);
- successful = true;
- }
- } catch (CoreException ce) {
- JAXWSUIPlugin.log(ce.getStatus());
- } finally {
- manager.changePerformed(textChange, successful);
- }
- if (undoChange != null) {
- undoChange.initializeValidationData(monitor);
- manager.addUndo(undoChange.getName(), undoChange);
- }
- }
-
- public String getAdditionalProposalInfo() {
- return null;
- }
-
-
- public IContextInformation getContextInformation() {
- return null;
- }
-
- public String getDisplayString() {
- return displayString;
- }
-
- public Image getImage() {
- return image;
- }
-
- public Point getSelection(IDocument document) {
- return null;
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/annotations/correction/AddAnnotationToTypeCorrectionProposal.java b/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/annotations/correction/AddAnnotationToTypeCorrectionProposal.java
deleted file mode 100644
index c191a9c..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/annotations/correction/AddAnnotationToTypeCorrectionProposal.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Shane Clarke.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Shane Clarke - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.jaxws.ui.annotations.correction;
-
-import java.util.List;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.dom.AST;
-import org.eclipse.jdt.core.dom.Annotation;
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jdt.core.dom.MemberValuePair;
-import org.eclipse.jdt.core.dom.rewrite.ImportRewrite;
-import org.eclipse.jdt.ui.CodeStyleConfiguration;
-import org.eclipse.jdt.ui.text.java.IInvocationContext;
-import org.eclipse.jst.ws.annotations.core.AnnotationsCore;
-import org.eclipse.jst.ws.annotations.core.AnnotationsManager;
-import org.eclipse.jst.ws.annotations.core.initialization.IAnnotationAttributeInitializer;
-import org.eclipse.jst.ws.annotations.core.utils.AnnotationUtils;
-import org.eclipse.ltk.core.refactoring.TextFileChange;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.text.edits.TextEdit;
-
-public class AddAnnotationToTypeCorrectionProposal extends AbstractJavaCorrectionPropsoal {
-
- private Class<? extends java.lang.annotation.Annotation> annotationClass;
-
- public AddAnnotationToTypeCorrectionProposal(IInvocationContext invocationContext,
- Class<? extends java.lang.annotation.Annotation> annotationClass, String displayString, int relevance, Image image) {
- super(invocationContext, displayString, relevance, image);
- this.annotationClass = annotationClass;
- }
-
- @Override
- public void addEdits(TextFileChange textChange) throws CoreException {
- ICompilationUnit compilationUnit = invocationContext.getCompilationUnit();
-
- CompilationUnit astRoot = invocationContext.getASTRoot();
-
- AST ast = astRoot.getAST();
-
- IAnnotationAttributeInitializer annotationAttributeInitializer =
- AnnotationsManager.getAnnotationDefinitionForClass(annotationClass).
- getAnnotationAttributeInitializer();
-
- List<MemberValuePair> memberValuePairs = annotationAttributeInitializer.getMemberValuePairs(
- compilationUnit.findPrimaryType(), ast, annotationClass);
-
- Annotation annotation = AnnotationsCore.createNormalAnnotation(ast, annotationClass.getSimpleName(),
- memberValuePairs);
-
- textChange.addEdit(AnnotationUtils.createAddAnnotationTextEdit(compilationUnit.findPrimaryType(), annotation));
-
- ImportRewrite importRewrite = CodeStyleConfiguration.createImportRewrite(compilationUnit, true);
- importRewrite.addImport(annotationClass.getCanonicalName());
- if (importRewrite.hasRecordedChanges()) {
- TextEdit importTextEdit = importRewrite.rewriteImports(null);
- textChange.addEdit(importTextEdit);
- }
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/annotations/correction/AddUnimplementedMethodCorrectionProposal.java b/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/annotations/correction/AddUnimplementedMethodCorrectionProposal.java
deleted file mode 100644
index 1a72a01..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/annotations/correction/AddUnimplementedMethodCorrectionProposal.java
+++ /dev/null
@@ -1,145 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Shane Clarke.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Shane Clarke - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.jaxws.ui.annotations.correction;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jdt.core.dom.AST;
-import org.eclipse.jdt.core.dom.ASTNode;
-import org.eclipse.jdt.core.dom.ASTVisitor;
-import org.eclipse.jdt.core.dom.AbstractTypeDeclaration;
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jdt.core.dom.IMethodBinding;
-import org.eclipse.jdt.core.dom.MethodDeclaration;
-import org.eclipse.jdt.core.dom.rewrite.ASTRewrite;
-import org.eclipse.jdt.core.dom.rewrite.ImportRewrite;
-import org.eclipse.jdt.core.dom.rewrite.ListRewrite;
-import org.eclipse.jdt.internal.corext.codemanipulation.CodeGenerationSettings;
-import org.eclipse.jdt.internal.corext.codemanipulation.StubUtility2;
-import org.eclipse.jdt.internal.ui.preferences.JavaPreferencesSettings;
-import org.eclipse.jdt.ui.SharedASTProvider;
-import org.eclipse.jdt.ui.text.java.IInvocationContext;
-import org.eclipse.jst.ws.annotations.core.utils.AnnotationUtils;
-import org.eclipse.jst.ws.internal.jaxws.ui.JAXWSUIPlugin;
-import org.eclipse.ltk.core.refactoring.TextFileChange;
-import org.eclipse.swt.graphics.Image;
-
-@SuppressWarnings("restriction")
-public class AddUnimplementedMethodCorrectionProposal extends AbstractJavaCorrectionPropsoal {
-
- private ASTNode typeDeclaration;
- private String endpointInterface;
-
- public AddUnimplementedMethodCorrectionProposal(IInvocationContext invocationContext, ASTNode typeDeclaration,
- String endpointInterface, String displayString, int relevance, Image image) {
- super(invocationContext, displayString, relevance, image);
- this.endpointInterface = endpointInterface;
- this.typeDeclaration = typeDeclaration;
- }
-
- @Override
- public void addEdits(TextFileChange textChange) throws CoreException {
- IMethodBinding[] unimplementedMethods = getUnimplementedMethods(typeDeclaration, endpointInterface);
- if (unimplementedMethods.length == 0) {
- return;
- }
-
- ICompilationUnit compilationUnit = invocationContext.getCompilationUnit();
-
- CompilationUnit astRoot = invocationContext.getASTRoot();
-
- AST ast = astRoot.getAST();
- ASTRewrite rewriter = ASTRewrite.create(ast);
-
- CodeGenerationSettings settings = JavaPreferencesSettings.getCodeGenerationSettings(compilationUnit.getJavaProject());
- settings.overrideAnnotation = false;
-
- AbstractTypeDeclaration abstractTypeDeclaration = (AbstractTypeDeclaration) typeDeclaration;
- ListRewrite listRewrite = rewriter.getListRewrite(abstractTypeDeclaration,
- abstractTypeDeclaration.getBodyDeclarationsProperty());
-
- ImportRewrite importRewrite = ImportRewrite.create(astRoot, true);
-
- for (int i = 0; i < unimplementedMethods.length; i++) {
- IMethodBinding methodBinding = unimplementedMethods[i];
- MethodDeclaration methodDeclaration = StubUtility2.createImplementationStub(compilationUnit, rewriter,
- importRewrite, importRewrite.getDefaultImportRewriteContext(), methodBinding,
- methodBinding.getDeclaringClass().getName(), settings, false);
- listRewrite.insertLast(methodDeclaration, null);
- }
- textChange.addEdit(rewriter.rewriteAST());
- if (importRewrite.hasRecordedChanges()) {
- textChange.addEdit(importRewrite.rewriteImports(null));
- }
- }
-
- public IMethodBinding[] getMethodsToImplement() {
- return getUnimplementedMethods(typeDeclaration, endpointInterface);
- }
-
- private IMethodBinding[] getUnimplementedMethods(ASTNode typeDeclaration, String endpointInterface) {
- List<IMethodBinding> methodBindings = new ArrayList<IMethodBinding>();
- if (typeDeclaration.getParent() instanceof CompilationUnit) {
- CompilationUnit implementationCompilationUnit = (CompilationUnit) typeDeclaration.getParent();
- if (implementationCompilationUnit.getJavaElement() instanceof ICompilationUnit) {
- try {
- IJavaProject javaProject = implementationCompilationUnit.getJavaElement().getJavaProject();
- IType seiType = javaProject.findType(endpointInterface);
-
- if (seiType != null) {
- ICompilationUnit sei = seiType.getCompilationUnit();
- CompilationUnit seiCompilationUnit = SharedASTProvider.getAST(sei, SharedASTProvider.WAIT_YES, null);
-
- List<MethodDeclaration> implementationMethods = getMethodDeclarations(
- implementationCompilationUnit);
- List<MethodDeclaration> seiMethods = getMethodDeclarations(seiCompilationUnit);
- for (MethodDeclaration seiMethod : seiMethods) {
- boolean implemented = false;
- for (MethodDeclaration implMethod : implementationMethods) {
- if (AnnotationUtils.compareMethods(seiMethod, implMethod)) {
- implemented = true;
- break;
- }
- }
- if (!implemented) {
- methodBindings.add(seiMethod.resolveBinding());
- }
- }
- }
- } catch (JavaModelException jme) {
- JAXWSUIPlugin.log(jme.getStatus());
- }
- }
-
- }
- return methodBindings.toArray(new IMethodBinding[methodBindings.size()]);
- }
-
- private List<MethodDeclaration> getMethodDeclarations(CompilationUnit compilationUnit) {
- final List<MethodDeclaration> methodDeclarations = new ArrayList<MethodDeclaration>();
-
- compilationUnit.accept(new ASTVisitor() {
- @Override
- public boolean visit(MethodDeclaration methodDeclaration) {
- methodDeclarations.add(methodDeclaration);
- return false;
- }
- });
- return methodDeclarations;
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/annotations/correction/ChangeModifierCorrectionProposal.java b/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/annotations/correction/ChangeModifierCorrectionProposal.java
deleted file mode 100644
index e74c7ef..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/annotations/correction/ChangeModifierCorrectionProposal.java
+++ /dev/null
@@ -1,119 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Shane Clarke.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Shane Clarke - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.jaxws.ui.annotations.correction;
-
-import java.util.List;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jdt.core.dom.AST;
-import org.eclipse.jdt.core.dom.ASTNode;
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jdt.core.dom.IBinding;
-import org.eclipse.jdt.core.dom.IExtendedModifier;
-import org.eclipse.jdt.core.dom.MethodDeclaration;
-import org.eclipse.jdt.core.dom.Modifier;
-import org.eclipse.jdt.core.dom.TypeDeclaration;
-import org.eclipse.jdt.core.dom.rewrite.ASTRewrite;
-import org.eclipse.jdt.core.dom.rewrite.ListRewrite;
-import org.eclipse.jdt.ui.text.java.IInvocationContext;
-import org.eclipse.ltk.core.refactoring.TextFileChange;
-import org.eclipse.swt.graphics.Image;
-
-public class ChangeModifierCorrectionProposal extends AbstractJavaCorrectionPropsoal {
-
- private IBinding binding;
- private int includedModifiers;
- private int excludedModifiers;
-
-
- public ChangeModifierCorrectionProposal(IInvocationContext invocationContext, IBinding binding,
- int includedModifiers, int excludedModifiers, String displayString, int relevance, Image image) {
- super(invocationContext, displayString, relevance, image);
- this.binding = binding;
- this.includedModifiers = includedModifiers;
- this.excludedModifiers = excludedModifiers;
- }
-
- @Override
- @SuppressWarnings("unchecked")
- public void addEdits(TextFileChange textChange) throws CoreException {
- CompilationUnit astRoot = invocationContext.getASTRoot();
-
- AST ast = astRoot.getAST();
- ASTRewrite rewriter = ASTRewrite.create(ast);
-
- ASTNode declaringNode = astRoot.findDeclaringNode(binding);
-
- int consideredModifierFlags = includedModifiers | excludedModifiers;
- int newModifierFlags = includedModifiers & consideredModifierFlags;
-
- ListRewrite listRewrite = getListRewrite(declaringNode, rewriter);
- if (listRewrite != null) {
- List<ASTNode> originalList = listRewrite.getOriginalList();
- for (ASTNode astNode : originalList) {
- if (astNode instanceof Modifier) {
- Modifier modifier = (Modifier) astNode;
- int modifierFlag = modifier.getKeyword().toFlagValue();
- if ((consideredModifierFlags & modifierFlag) != 0) {
- if ((newModifierFlags & modifierFlag) == 0) {
- listRewrite.remove(modifier, null);
- }
- newModifierFlags &= ~modifierFlag;
- }
- }
- }
-
- List<Modifier> modifers = ast.newModifiers(newModifierFlags);
- ASTNode lastAnnotation = getLastAnnotation(listRewrite);
- for (Modifier modifier : modifers) {
- int modifierFlag = modifier.getKeyword().toFlagValue();
- if ((modifierFlag & (Modifier.PUBLIC | Modifier.PRIVATE | Modifier.PROTECTED)) != 0) {
- if (lastAnnotation != null) {
- listRewrite.insertAfter(modifier, lastAnnotation, null);
- } else {
- listRewrite.insertFirst(modifier, null);
- }
- }
- }
-
- textChange.addEdit(rewriter.rewriteAST());
- }
- }
-
- @SuppressWarnings("unchecked")
- private ASTNode getLastAnnotation(ListRewrite listRewrite) {
- ASTNode lastAnnotation = null;
- List<ASTNode> rewrittenList = listRewrite.getRewrittenList();
- for (ASTNode astNode : rewrittenList) {
- if (astNode instanceof IExtendedModifier) {
- IExtendedModifier extendedModifier = (IExtendedModifier) astNode;
- if (extendedModifier.isAnnotation()) {
- lastAnnotation = astNode;
- }
- }
- }
- return lastAnnotation;
- }
-
- private ListRewrite getListRewrite(ASTNode astNode, ASTRewrite astRewrite) {
- if (astNode instanceof MethodDeclaration) {
- MethodDeclaration methodDeclaration = (MethodDeclaration) astNode;
- return astRewrite.getListRewrite(methodDeclaration, MethodDeclaration.MODIFIERS2_PROPERTY);
- }
- if (astNode instanceof TypeDeclaration) {
- TypeDeclaration typeDeclaration = (TypeDeclaration) astNode;
- return astRewrite.getListRewrite(typeDeclaration, TypeDeclaration.MODIFIERS2_PROPERTY);
- }
-
- return null;
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/annotations/correction/ChangeReturnTypeCorrectionProposal.java b/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/annotations/correction/ChangeReturnTypeCorrectionProposal.java
deleted file mode 100644
index a96f555..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/annotations/correction/ChangeReturnTypeCorrectionProposal.java
+++ /dev/null
@@ -1,117 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Shane Clarke.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Shane Clarke - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.jaxws.ui.annotations.correction;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jdt.core.dom.AST;
-import org.eclipse.jdt.core.dom.ASTVisitor;
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jdt.core.dom.ITypeBinding;
-import org.eclipse.jdt.core.dom.MethodDeclaration;
-import org.eclipse.jdt.core.dom.Type;
-import org.eclipse.jdt.core.dom.TypeDeclaration;
-import org.eclipse.jdt.core.dom.rewrite.ASTRewrite;
-import org.eclipse.jdt.core.dom.rewrite.ImportRewrite;
-import org.eclipse.jdt.ui.CodeStyleConfiguration;
-import org.eclipse.jdt.ui.SharedASTProvider;
-import org.eclipse.jdt.ui.text.java.IInvocationContext;
-import org.eclipse.jst.ws.annotations.core.utils.AnnotationUtils;
-import org.eclipse.jst.ws.internal.jaxws.ui.JAXWSUIPlugin;
-import org.eclipse.ltk.core.refactoring.TextFileChange;
-import org.eclipse.swt.graphics.Image;
-
-public class ChangeReturnTypeCorrectionProposal extends AbstractJavaCorrectionPropsoal {
-
- private TypeDeclaration implTypeDeclaration;
- private MethodDeclaration implMethodDeclaration;
- private String endpointInterface;
-
- public ChangeReturnTypeCorrectionProposal(
- IInvocationContext invocationContext, TypeDeclaration implTypeDeclaration, MethodDeclaration implMethodDeclaration, String endpointInterface, String displayString,
- int relevance, Image image) {
- super(invocationContext, displayString, relevance, image);
- this.implTypeDeclaration = implTypeDeclaration;
- this.implMethodDeclaration = implMethodDeclaration;
- this.endpointInterface = endpointInterface;
- }
-
- @Override
- public void addEdits(TextFileChange textChange) throws CoreException {
- MethodDeclaration seiMethodDeclaration = getSEIMethodDeclaration();
- if (seiMethodDeclaration == null) {
- return;
- }
-
- ICompilationUnit compilationUnit = invocationContext.getCompilationUnit();
-
- CompilationUnit astRoot = invocationContext.getASTRoot();
-
- AST ast = astRoot.getAST();
- ASTRewrite rewriter = ASTRewrite.create(ast);
- ITypeBinding returnType = seiMethodDeclaration.resolveBinding().getReturnType();
- ImportRewrite importRewrite = CodeStyleConfiguration.createImportRewrite(compilationUnit, true);
- Type type = importRewrite.addImport(returnType, ast);
- rewriter.set(implMethodDeclaration, MethodDeclaration.RETURN_TYPE2_PROPERTY, type, null);
- rewriter.set(implMethodDeclaration, MethodDeclaration.EXTRA_DIMENSIONS_PROPERTY, new Integer(0), null);
-
- textChange.addEdit(rewriter.rewriteAST());
- if (importRewrite.hasRecordedChanges()) {
- textChange.addEdit(importRewrite.rewriteImports(null));
- }
- }
-
- private MethodDeclaration getSEIMethodDeclaration() {
- if (implTypeDeclaration.getParent() instanceof CompilationUnit) {
- CompilationUnit implCompilationUnit = (CompilationUnit) implTypeDeclaration.getParent();
- if (implCompilationUnit.getJavaElement() instanceof ICompilationUnit) {
- try {
- IJavaProject javaProject = implCompilationUnit.getJavaElement().getJavaProject();
- IType seiType = javaProject.findType(endpointInterface);
-
- if (seiType != null) {
- ICompilationUnit seiCompilationUnit = seiType.getCompilationUnit();
- CompilationUnit seiASTRoot = SharedASTProvider.getAST(seiCompilationUnit, SharedASTProvider.WAIT_YES, null);
-
- List<MethodDeclaration> seiMethodDeclarations = getMethodDeclarations(seiASTRoot);
- for (MethodDeclaration seiMethodDeclaration : seiMethodDeclarations) {
- if (AnnotationUtils.compareMethods(implMethodDeclaration, seiMethodDeclaration)) {
- return seiMethodDeclaration;
- }
- }
- }
- } catch (JavaModelException jme) {
- JAXWSUIPlugin.log(jme.getStatus());
- }
- }
- }
- return null;
- }
-
- private List<MethodDeclaration> getMethodDeclarations(CompilationUnit compilationUnit) {
- final List<MethodDeclaration> methodDeclarations = new ArrayList<MethodDeclaration>();
-
- compilationUnit.accept(new ASTVisitor() {
- @Override
- public boolean visit(MethodDeclaration methodDeclaration) {
- methodDeclarations.add(methodDeclaration);
- return false;
- }
- });
- return methodDeclarations;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/annotations/correction/JAXWSQuickFixProcessor.java b/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/annotations/correction/JAXWSQuickFixProcessor.java
deleted file mode 100644
index 41c7301..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/annotations/correction/JAXWSQuickFixProcessor.java
+++ /dev/null
@@ -1,342 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Shane Clarke.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Shane Clarke - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.jaxws.ui.annotations.correction;
-
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-import javax.jws.Oneway;
-import javax.jws.WebMethod;
-import javax.jws.WebParam;
-import javax.jws.WebResult;
-import javax.jws.WebService;
-import javax.jws.soap.SOAPBinding;
-import javax.jws.soap.SOAPMessageHandlers;
-import javax.xml.ws.WebServiceProvider;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jdt.apt.core.util.EclipseMessager;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.dom.ASTNode;
-import org.eclipse.jdt.core.dom.AbstractTypeDeclaration;
-import org.eclipse.jdt.core.dom.Annotation;
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jdt.core.dom.IBinding;
-import org.eclipse.jdt.core.dom.ITypeBinding;
-import org.eclipse.jdt.core.dom.MemberValuePair;
-import org.eclipse.jdt.core.dom.MethodDeclaration;
-import org.eclipse.jdt.core.dom.Modifier;
-import org.eclipse.jdt.core.dom.NormalAnnotation;
-import org.eclipse.jdt.core.dom.SimpleName;
-import org.eclipse.jdt.core.dom.SingleVariableDeclaration;
-import org.eclipse.jdt.core.dom.StringLiteral;
-import org.eclipse.jdt.core.dom.TypeDeclaration;
-import org.eclipse.jdt.internal.ui.JavaPluginImages;
-import org.eclipse.jdt.internal.ui.viewsupport.JavaElementImageProvider;
-import org.eclipse.jdt.ui.JavaElementImageDescriptor;
-import org.eclipse.jdt.ui.text.java.IInvocationContext;
-import org.eclipse.jdt.ui.text.java.IJavaCompletionProposal;
-import org.eclipse.jdt.ui.text.java.IProblemLocation;
-import org.eclipse.jdt.ui.text.java.IQuickFixProcessor;
-import org.eclipse.jst.ws.annotations.core.utils.AnnotationUtils;
-import org.eclipse.jst.ws.internal.jaxws.core.JAXWSCoreMessages;
-import org.eclipse.jst.ws.internal.jaxws.ui.JAXWSUIMessages;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.ui.ISharedImages;
-import org.eclipse.ui.PlatformUI;
-
-@SuppressWarnings({ "restriction", "deprecation" })
-public class JAXWSQuickFixProcessor implements IQuickFixProcessor {
-
- public boolean hasCorrections(ICompilationUnit unit, int problemId) {
- if (problemId == EclipseMessager.APT_QUICK_FIX_PROBLEM_ID) {
- return true;
- }
- return false;
- }
-
- public IJavaCompletionProposal[] getCorrections(IInvocationContext context, IProblemLocation[] locations)
- throws CoreException {
-
- if (locations == null || locations.length == 0) {
- return null;
- }
-
- List<IJavaCompletionProposal> proposals = new ArrayList<IJavaCompletionProposal>();
-
- Set<String> handled = new HashSet<String>();
- for (IProblemLocation problemLocation : locations) {
- String[] problemArguments = problemLocation.getProblemArguments();
- if (problemArguments.length >= 2) {
- String problem = problemArguments[1];
- if (handled.add(problem)) {
- process(context, problemLocation, proposals);
- }
- }
- }
-
- return proposals.toArray(new IJavaCompletionProposal[proposals.size()]);
- }
-
- private void process(IInvocationContext context, IProblemLocation problemLocation,
- List<IJavaCompletionProposal> proposals) throws CoreException {
-
- String problem = problemLocation.getProblemArguments()[1];
-
- if (problem.equals(JAXWSCoreMessages.WEBSERVICE_ENPOINTINTERFACE_MUST_IMPLEMENT)) {
- addUnimplementedMethodsProposal(context, problemLocation, proposals);
- }
-
- if (problem.equals(JAXWSCoreMessages.WEBMETHOD_ONLY_SUPPORTED_ON_CLASSES_WITH_WEBSERVICE)) {
- addAnnotationToTypeProposal(context, proposals, WebService.class);
- }
-
- if (problem.equals(JAXWSCoreMessages.WEBSERVICE_ENPOINTINTERFACE_NO_NAME_ATTRIBUTE)
- || problem.equals(JAXWSCoreMessages.WEBSERVICE_PORTNAME_SEI)
- || problem.equals(JAXWSCoreMessages.WEBSERVICE_SERVICENAME_SEI)
- || problem.equals(JAXWSCoreMessages.WEBSERVICE_ENDPOINTINTERFACE_SEI)
- || problem.equals(JAXWSCoreMessages.WEBMETHOD_EXCLUDE_NOT_ALLOWED_ON_SEI)) {
- addRemoveMemberValuePairProposal(context, problemLocation, proposals, false);
- }
-
- if (problem.equals(JAXWSCoreMessages.WEBMETHOD_EXCLUDE_SPECIFIED_NO_OTHER_ATTRIBUTES_ALLOWED)) {
- addRemoveMemberValuePairProposal(context, problemLocation, proposals, true);
- }
-
- if (problem.equals(JAXWSCoreMessages.WEBSERVICE_ENPOINTINTERFACE_NO_WEBMETHODS)) {
- addRemoveAnnotationProposal(context, problemLocation, proposals, WebMethod.class);
- }
-
- if (problem.equals(JAXWSCoreMessages.WEBSERVICE_ENPOINTINTERFACE_NO_SOAPBINDING)
- || problem.equals(JAXWSCoreMessages.SOAPBINDING_NO_RPC_STYLE_ON_METHODS)) {
- addRemoveAnnotationProposal(context, problemLocation, proposals, SOAPBinding.class);
- }
-
- if (problem.equals(JAXWSCoreMessages.WEBSERVICE_ENPOINTINTERFACE_NO_WEBRESULT)) {
- addRemoveAnnotationProposal(context, problemLocation, proposals, WebResult.class);
- }
-
- if (problem.equals(JAXWSCoreMessages.WEBSERVICE_ENPOINTINTERFACE_NO_WEBPARAM)) {
- addRemoveAnnotationProposal(context, problemLocation, proposals, WebParam.class);
- }
-
- if (problem.equals(JAXWSCoreMessages.WEBSERVICE_ENPOINTINTERFACE_NO_ONEWAY)) {
- addRemoveAnnotationProposal(context, problemLocation, proposals, Oneway.class);
- }
-
- if (problem.equals(JAXWSCoreMessages.WEBSERVICE_PUBLIC_ABSTRACT_FINAL)) {
- addChangeModifierProposal(context, problemLocation, proposals, 5);
- }
-
- if (problem.equals(JAXWSCoreMessages.WEBSERVICE_DEFAULT_PUBLIC_CONSTRUCTOR)) {
- addConstructorProposal(context, problemLocation, proposals, 5);
- }
-
- if (problem.equals(JAXWSCoreMessages.WEBSERVICE_WEBSERVICEPROVIDER_COMBINATION)) {
- addRemoveAnnotationProposal(context, problemLocation, proposals, WebServiceProvider.class);
- }
-
- if (problem.equals(JAXWSCoreMessages.HANDLER_CHAIN_SOAP_MESSAGE_HANDLERS)) {
- addRemoveAnnotationProposal(context, problemLocation, proposals, SOAPMessageHandlers.class);
- }
-
- if (problem.equals(JAXWSCoreMessages.WEBSERVICE_OVERRIDE_FINALIZE)) {
- addRemoveMethodProposal(context, problemLocation, proposals);
- }
-
- if (problem.equals(JAXWSCoreMessages.WEBMETHOD_ONLY_ON_PUBLIC_METHODS)
- || problem.equals(JAXWSCoreMessages.WEBMETHOD_NO_STATIC_MODIFIER_ALLOWED)
- || problem.equals(JAXWSCoreMessages.WEBMETHOD_NO_FINAL_MODIFIER_ALLOWED)) {
- addChangeModifierProposal(context, problemLocation, proposals, 5);
- addRemoveAnnotationProposal(context, problemLocation, proposals, WebMethod.class);
- }
-
- if (problem.equals(JAXWSCoreMessages.WEBSERVICE_ENPOINTINTERFACE_REDUCED_VISIBILITY)) {
- addChangeModifierProposal(context, problemLocation, proposals, 5);
- }
-
- if (problem.equals(JAXWSCoreMessages.WEBSERVICE_ENPOINTINTERFACE_INCOMPATIBLE_RETURN_TYPE)) {
- addChangeReturnTypeProposal(context, problemLocation, proposals);
- }
- }
-
- private void addAnnotationToTypeProposal(IInvocationContext context, List<IJavaCompletionProposal> proposals,
- Class<? extends java.lang.annotation.Annotation> annotationClass) {
-
- String displayString = JAXWSUIMessages.bind(JAXWSUIMessages.ADD_ANNOTATION, annotationClass.getSimpleName());
- Image image = JavaPluginImages.get(JavaPluginImages.IMG_CORRECTION_CHANGE);
- proposals.add(new AddAnnotationToTypeCorrectionProposal(context, annotationClass, displayString, 5, image));
- }
-
- private void addRemoveMethodProposal(IInvocationContext context, IProblemLocation problemLocation,
- List<IJavaCompletionProposal> proposals) {
-
- ASTNode selectedNode = problemLocation.getCoveringNode(context.getASTRoot());
-
- if (selectedNode.getParent() instanceof NormalAnnotation) {
- NormalAnnotation normalAnnotation = (NormalAnnotation) selectedNode.getParent();
- ASTNode parentNode = normalAnnotation.getParent();
- if (parentNode instanceof MethodDeclaration) {
- selectedNode = ((MethodDeclaration) parentNode).getName();
- }
- if (parentNode instanceof SingleVariableDeclaration) {
- SingleVariableDeclaration singleVariableDeclaration = (SingleVariableDeclaration) parentNode;
- selectedNode = ((MethodDeclaration) singleVariableDeclaration.getParent()).getName();
- }
- }
-
- if (selectedNode instanceof SimpleName) {
- SimpleName methodName = (SimpleName) selectedNode;
- String displayString = JAXWSUIMessages.bind(JAXWSUIMessages.REMOVE_METHOD, methodName.getIdentifier());
- Image image = PlatformUI.getWorkbench().getSharedImages().getImage(ISharedImages.IMG_TOOL_DELETE);
-
- proposals.add(new RemoveMethodCorrectionProposal(context, methodName, displayString, 5, image));
- }
- }
-
- private void addRemoveAnnotationProposal(IInvocationContext context, IProblemLocation problemLocation,
- List<IJavaCompletionProposal> proposals, Class<? extends java.lang.annotation.Annotation> annotation) {
-
- ASTNode coveringNode = problemLocation.getCoveringNode(context.getASTRoot());
- ASTNode parentNode = coveringNode.getParent();
-
- String displayString = JAXWSUIMessages.bind(JAXWSUIMessages.REMOVE_ANNOTATION, annotation.getSimpleName());
- Image image = PlatformUI.getWorkbench().getSharedImages().getImage(ISharedImages.IMG_TOOL_DELETE);
- proposals.add(new RemoveAnnotationCorrectionProposal(context, annotation, parentNode, displayString, 5, image));
- }
-
- private void addRemoveMemberValuePairProposal(IInvocationContext context, IProblemLocation problemLocation,
- List<IJavaCompletionProposal> proposals, boolean removeAllOtherMVPs) {
-
- ASTNode coveringNode = problemLocation.getCoveringNode(context.getASTRoot());
-
- if (coveringNode.getParent() instanceof MemberValuePair) {
- MemberValuePair memberValuePair = (MemberValuePair) coveringNode.getParent();
- String displayString = JAXWSUIMessages.bind(JAXWSUIMessages.REMOVE_MEMBERVALUEPAIR, memberValuePair
- .toString());
-
- if (removeAllOtherMVPs) {
- displayString = JAXWSUIMessages.REMOVE_ALL_OTHER_MEMBERVALUEPAIRS;
- }
- Image image = PlatformUI.getWorkbench().getSharedImages().getImage(ISharedImages.IMG_TOOL_DELETE);
- proposals.add(new RemoveMemberValuePairCorrectionProposal(context, memberValuePair,
- removeAllOtherMVPs, displayString, 5, image));
- }
- }
-
- private void addUnimplementedMethodsProposal(IInvocationContext context, IProblemLocation problemLocation,
- List<IJavaCompletionProposal> proposals) {
-
- ASTNode endpointInterfaceValue = problemLocation.getCoveringNode(context.getASTRoot());
- if (endpointInterfaceValue instanceof StringLiteral) {
- ASTNode endpointInterfaceMVP = endpointInterfaceValue.getParent();
- ASTNode webServiceAnnotation = endpointInterfaceMVP.getParent();
- ASTNode typeDeclaration = webServiceAnnotation.getParent();
-
- String endpointInterface = ((StringLiteral) endpointInterfaceValue).getLiteralValue();
-
- Image image = JavaPluginImages.get(JavaPluginImages.IMG_CORRECTION_CHANGE);
- proposals.add(new AddUnimplementedMethodCorrectionProposal(context, typeDeclaration, endpointInterface,
- JAXWSUIMessages.ADD_UNIMPLEMENTED_METHODS, 5, image));
- }
- }
-
- private void addChangeModifierProposal(IInvocationContext context, IProblemLocation problemLocation,
- List<IJavaCompletionProposal> proposals, int relevance) {
-
- CompilationUnit astRoot = context.getASTRoot();
- ASTNode selectedNode = problemLocation.getCoveringNode(astRoot);
-
- if (!(selectedNode instanceof SimpleName)) {
- return;
- }
-
- IBinding binding = ((SimpleName) selectedNode).resolveBinding();
- if (binding != null) {
- String bindingName = binding.getName();
- String displayString = "";
-
- int excludedModifiers = 0;
- int includedModifiers = 0;
-
- String problem = problemLocation.getProblemArguments()[1];
-
- if(problem.equals(JAXWSCoreMessages.WEBMETHOD_ONLY_ON_PUBLIC_METHODS)
- || problem.equals(JAXWSCoreMessages.WEBSERVICE_ENPOINTINTERFACE_REDUCED_VISIBILITY)) {
- excludedModifiers = ~(Modifier.PUBLIC);
- includedModifiers = Modifier.PUBLIC ;
- displayString = JAXWSUIMessages.bind(JAXWSUIMessages.CHANGE_METHOD_VISIBILITY, "public"); //$NON-NLS-1$
- }
-
- if(problem.equals(JAXWSCoreMessages.WEBMETHOD_NO_FINAL_MODIFIER_ALLOWED)) {
- excludedModifiers = Modifier.FINAL;
- displayString = JAXWSUIMessages.bind(JAXWSUIMessages.REMOVE_FINAL_MODIFIER, bindingName);
- }
-
- if(problem.equals(JAXWSCoreMessages.WEBMETHOD_NO_STATIC_MODIFIER_ALLOWED)) {
- excludedModifiers = Modifier.STATIC;
- displayString = JAXWSUIMessages.bind(JAXWSUIMessages.REMOVE_STATIC_MODIFIER, bindingName);
- }
-
- if (problem.equals(JAXWSCoreMessages.WEBSERVICE_PUBLIC_ABSTRACT_FINAL)) {
- excludedModifiers = Modifier.ABSTRACT | Modifier.FINAL;
- displayString = JAXWSUIMessages.REMOVE_ILLEGAL_MODIFIER;
- }
-
- Image image = JavaPluginImages.get(JavaPluginImages.IMG_CORRECTION_CHANGE);
- proposals.add(new ChangeModifierCorrectionProposal(context, binding, includedModifiers,
- excludedModifiers, displayString, 5, image));
- }
- }
-
- private void addConstructorProposal(IInvocationContext context, IProblemLocation problemLocation,
- List<IJavaCompletionProposal> proposals, int relevance) {
-
- CompilationUnit astRoot = context.getASTRoot();
- ASTNode selectedNode = problemLocation.getCoveringNode(astRoot);
-
- ITypeBinding typeBinding = ((AbstractTypeDeclaration) selectedNode.getParent()).resolveBinding();
- if (typeBinding != null && typeBinding.isFromSource()) {
- String displayString = JAXWSUIMessages.bind(JAXWSUIMessages.CREATE_CONSTRUCTOR,
- typeBinding.getTypeDeclaration().getName());
-
- Image image = JavaElementImageProvider.getDecoratedImage(JavaPluginImages.DESC_MISC_PUBLIC,
- JavaElementImageDescriptor.CONSTRUCTOR, JavaElementImageProvider.SMALL_SIZE);
-
- proposals.add(new NewDefaultConstructorCorrectionProposal(context, typeBinding, displayString, 5,
- image));
- }
- }
-
- private void addChangeReturnTypeProposal(IInvocationContext context, IProblemLocation problemLocation,
- List<IJavaCompletionProposal> proposals) {
-
- CompilationUnit astRoot = context.getASTRoot();
- ASTNode selectedNode = problemLocation.getCoveringNode(astRoot);
-
- if (!(selectedNode instanceof SimpleName)) {
- return;
- }
-
- MethodDeclaration implMethodDeclaration = (MethodDeclaration)((SimpleName) selectedNode).getParent();
- TypeDeclaration implTypeDeclaration = (TypeDeclaration)implMethodDeclaration.getParent();
-
- Annotation annotation = AnnotationUtils.getAnnotation(implTypeDeclaration.resolveBinding().getJavaElement(), WebService.class);
-
- String endpointInterface = AnnotationUtils.getStringValue(annotation, "endpointInterface"); //$NON-NLS-1$
- String displayString = JAXWSUIMessages.CHANGE_METHOD_RETURN_TYPE;
- Image image = JavaPluginImages.get(JavaPluginImages.IMG_CORRECTION_CHANGE);
- proposals.add(new ChangeReturnTypeCorrectionProposal(context, implTypeDeclaration,
- implMethodDeclaration, endpointInterface, displayString, 5, image));
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/annotations/correction/NewDefaultConstructorCorrectionProposal.java b/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/annotations/correction/NewDefaultConstructorCorrectionProposal.java
deleted file mode 100644
index ae20733..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/annotations/correction/NewDefaultConstructorCorrectionProposal.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Shane Clarke.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Shane Clarke - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.jaxws.ui.annotations.correction;
-
-import java.util.List;
-import java.util.ListIterator;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jdt.core.dom.AST;
-import org.eclipse.jdt.core.dom.ASTNode;
-import org.eclipse.jdt.core.dom.AbstractTypeDeclaration;
-import org.eclipse.jdt.core.dom.Block;
-import org.eclipse.jdt.core.dom.ChildListPropertyDescriptor;
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jdt.core.dom.ITypeBinding;
-import org.eclipse.jdt.core.dom.MethodDeclaration;
-import org.eclipse.jdt.core.dom.Modifier;
-import org.eclipse.jdt.core.dom.SimpleName;
-import org.eclipse.jdt.core.dom.rewrite.ASTRewrite;
-import org.eclipse.jdt.core.dom.rewrite.ListRewrite;
-import org.eclipse.jdt.ui.CodeGeneration;
-import org.eclipse.jdt.ui.text.java.IInvocationContext;
-import org.eclipse.ltk.core.refactoring.TextFileChange;
-import org.eclipse.swt.graphics.Image;
-
-public class NewDefaultConstructorCorrectionProposal extends AbstractJavaCorrectionPropsoal {
-
- private ITypeBinding typeBinding;
-
- public NewDefaultConstructorCorrectionProposal(
- IInvocationContext invocationContext, ITypeBinding typeBinding, String displayString,
- int relevance, Image image) {
- super(invocationContext, displayString, relevance, image);
- this.typeBinding = typeBinding;
- }
-
- @Override
- @SuppressWarnings("unchecked")
- public void addEdits(TextFileChange textChange) throws CoreException {
- CompilationUnit astRoot = invocationContext.getASTRoot();
- AST ast = astRoot.getAST();
- ASTRewrite rewriter = ASTRewrite.create(ast);
-
- ASTNode typeDeclaration = astRoot.findDeclaringNode(typeBinding);
-
- MethodDeclaration methodDeclaration = ast.newMethodDeclaration();
-
- SimpleName newNameNode = ast.newSimpleName(typeBinding.getName());
-
- methodDeclaration.setConstructor(true);
-
- methodDeclaration.modifiers().addAll(ast.newModifiers(Modifier.PUBLIC));
-
- methodDeclaration.setName(newNameNode);
-
- Block body = ast.newBlock();
-
- String placeHolder = CodeGeneration.getMethodBodyContent(invocationContext.getCompilationUnit(),
- typeBinding.getName(), newNameNode.getIdentifier(), true, "", String.valueOf('\n'));
- if (placeHolder != null) {
- ASTNode todoNode = rewriter.createStringPlaceholder(placeHolder, ASTNode.RETURN_STATEMENT);
- body.statements().add(todoNode);
- }
- methodDeclaration.setBody(body);
-
- ChildListPropertyDescriptor property = ((AbstractTypeDeclaration) typeDeclaration).getBodyDeclarationsProperty();
- List<ASTNode> members = (List<ASTNode>) typeDeclaration.getStructuralProperty(property);
- ListIterator<ASTNode> membersIterator = members.listIterator();
- int insertAt = 0;
- while (membersIterator.hasPrevious()) {
- ASTNode astNode = (ASTNode) membersIterator.previous();
- if (astNode instanceof MethodDeclaration && ((MethodDeclaration) astNode).isConstructor()) {
- insertAt = membersIterator.previousIndex() + 1;
- }
- }
- ListRewrite listRewriter= rewriter.getListRewrite(typeDeclaration, property);
- listRewriter.insertAt(methodDeclaration, insertAt, null);
- textChange.addEdit(rewriter.rewriteAST());
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/annotations/correction/RemoveAnnotationCorrectionProposal.java b/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/annotations/correction/RemoveAnnotationCorrectionProposal.java
deleted file mode 100644
index 97162e8..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/annotations/correction/RemoveAnnotationCorrectionProposal.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Shane Clarke.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Shane Clarke - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.jaxws.ui.annotations.correction;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jdt.core.dom.ASTNode;
-import org.eclipse.jdt.core.dom.Annotation;
-import org.eclipse.jdt.core.dom.MethodDeclaration;
-import org.eclipse.jdt.core.dom.TypeDeclaration;
-import org.eclipse.jdt.core.dom.rewrite.ASTRewrite;
-import org.eclipse.jdt.ui.text.java.IInvocationContext;
-import org.eclipse.jst.ws.annotations.core.utils.AnnotationUtils;
-import org.eclipse.ltk.core.refactoring.TextFileChange;
-import org.eclipse.swt.graphics.Image;
-
-public class RemoveAnnotationCorrectionProposal extends AbstractJavaCorrectionPropsoal {
-
- private Class<? extends java.lang.annotation.Annotation> annotation;
- private ASTNode parentNode;
-
- public RemoveAnnotationCorrectionProposal(IInvocationContext invocationContext,
- Class<? extends java.lang.annotation.Annotation> annotation, ASTNode parentNode, String displayString,
- int relevance, Image image) {
- super(invocationContext, displayString, relevance, image);
- this.annotation = annotation;
- this.parentNode = parentNode;
- }
-
- @Override
- public void addEdits(TextFileChange textChange) throws CoreException {
- ASTRewrite rewriter = ASTRewrite.create(parentNode.getAST());
-
- if (parentNode instanceof Annotation) {
- Annotation jdtDomAnnotation = (Annotation) parentNode;
- rewriter.remove(jdtDomAnnotation, null);
- }
-
- if (parentNode instanceof MethodDeclaration) {
- MethodDeclaration methodDeclaration = (MethodDeclaration) parentNode;
- Annotation jdtDomAnnotation = AnnotationUtils.getAnnotation(methodDeclaration.resolveBinding().getJavaElement(), annotation);
- if (jdtDomAnnotation != null) {
- rewriter.remove(jdtDomAnnotation, null);
- }
- }
-
- if (parentNode.getParent() instanceof TypeDeclaration) {
- TypeDeclaration typeDeclaration = (TypeDeclaration) parentNode.getParent();
- Annotation jdtDomAnnotation = AnnotationUtils.getAnnotation(typeDeclaration.resolveBinding().getJavaElement(), annotation);
- if (jdtDomAnnotation != null) {
- rewriter.remove(jdtDomAnnotation, null);
- }
- }
-
- textChange.addEdit(rewriter.rewriteAST());
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/annotations/correction/RemoveMemberValuePairCorrectionProposal.java b/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/annotations/correction/RemoveMemberValuePairCorrectionProposal.java
deleted file mode 100644
index 6faec6a..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/annotations/correction/RemoveMemberValuePairCorrectionProposal.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Shane Clarke.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Shane Clarke - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.jaxws.ui.annotations.correction;
-
-import java.util.List;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jdt.core.dom.MemberValuePair;
-import org.eclipse.jdt.core.dom.NormalAnnotation;
-import org.eclipse.jdt.core.dom.rewrite.ASTRewrite;
-import org.eclipse.jdt.ui.text.java.IInvocationContext;
-import org.eclipse.ltk.core.refactoring.TextFileChange;
-import org.eclipse.swt.graphics.Image;
-
-public class RemoveMemberValuePairCorrectionProposal extends AbstractJavaCorrectionPropsoal {
-
- private MemberValuePair memberValuePair;
- private boolean removeAllOtherMVPs;
-
- public RemoveMemberValuePairCorrectionProposal(IInvocationContext invocationContext,
- MemberValuePair memberValuePair, boolean removeAllOtherMVPs, String displayString, int relevance,
- Image image) {
- super(invocationContext, displayString, relevance, image);
- this.memberValuePair = memberValuePair;
- this.removeAllOtherMVPs = removeAllOtherMVPs;
- }
-
- @Override
- @SuppressWarnings("unchecked")
- public void addEdits(TextFileChange textChange) throws CoreException {
- if (memberValuePair.getParent() instanceof NormalAnnotation) {
- NormalAnnotation annotation = (NormalAnnotation) memberValuePair.getParent();
-
- ASTRewrite astRewrite = ASTRewrite.create(annotation.getAST());
- if (removeAllOtherMVPs) {
- List<MemberValuePair> memberValuePairs = annotation.values();
- for (MemberValuePair otherMemberValuePair : memberValuePairs) {
- if (!otherMemberValuePair.equals(memberValuePair)) {
- astRewrite.remove(otherMemberValuePair, null);
- }
- }
- } else {
- astRewrite.remove(memberValuePair, null);
- }
- textChange.addEdit(astRewrite.rewriteAST());
- }
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/annotations/correction/RemoveMethodCorrectionProposal.java b/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/annotations/correction/RemoveMethodCorrectionProposal.java
deleted file mode 100644
index caf8042..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/annotations/correction/RemoveMethodCorrectionProposal.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Shane Clarke.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Shane Clarke - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.jaxws.ui.annotations.correction;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jdt.core.dom.AST;
-import org.eclipse.jdt.core.dom.ASTNode;
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jdt.core.dom.IBinding;
-import org.eclipse.jdt.core.dom.IMethodBinding;
-import org.eclipse.jdt.core.dom.SimpleName;
-import org.eclipse.jdt.core.dom.rewrite.ASTRewrite;
-import org.eclipse.jdt.ui.text.java.IInvocationContext;
-import org.eclipse.ltk.core.refactoring.TextFileChange;
-import org.eclipse.swt.graphics.Image;
-
-public class RemoveMethodCorrectionProposal extends AbstractJavaCorrectionPropsoal {
-
- private SimpleName methodName;
-
- public RemoveMethodCorrectionProposal(IInvocationContext invocationContext, SimpleName methodName,
- String displayString, int relevance, Image image) {
- super(invocationContext, displayString, relevance, image);
- this.methodName = methodName;
- }
-
- @Override
- public void addEdits(TextFileChange textChange) throws CoreException {
- IBinding binding = methodName.resolveBinding();
- CompilationUnit astRoot = invocationContext.getASTRoot();
- IMethodBinding methodBinding = ((IMethodBinding) binding).getMethodDeclaration();
- ASTNode declaration = astRoot.findDeclaringNode(methodBinding);
- AST ast = astRoot.getAST();
- ASTRewrite rewriter = ASTRewrite.create(ast);
- rewriter.remove(declaration, null);
- textChange.addEdit(rewriter.rewriteAST());
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/annotations/initialization/BindingTypeAttributeInitializer.java b/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/annotations/initialization/BindingTypeAttributeInitializer.java
deleted file mode 100644
index cc5a1f2..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/annotations/initialization/BindingTypeAttributeInitializer.java
+++ /dev/null
@@ -1,161 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Shane Clarke.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Shane Clarke - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.jaxws.ui.annotations.initialization;
-
-import static org.eclipse.jst.ws.internal.jaxws.core.utils.JAXWSUtils.VALUE;
-import java.lang.annotation.Annotation;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import javax.xml.ws.http.HTTPBinding;
-import javax.xml.ws.soap.SOAPBinding;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.dom.AST;
-import org.eclipse.jdt.core.dom.Expression;
-import org.eclipse.jdt.core.dom.MemberValuePair;
-import org.eclipse.jdt.core.dom.SingleMemberAnnotation;
-import org.eclipse.jface.text.contentassist.ICompletionProposal;
-import org.eclipse.jface.viewers.StyledString;
-import org.eclipse.jst.ws.annotations.core.AnnotationsCore;
-import org.eclipse.jst.ws.annotations.core.initialization.AnnotationAttributeInitializer;
-import org.eclipse.jst.ws.internal.jaxws.ui.JAXWSUIPlugin;
-import org.eclipse.swt.graphics.Image;
-
-public class BindingTypeAttributeInitializer extends AnnotationAttributeInitializer {
-
- private static final String SOAPBinding_SOAP11HTTP_BINDING = "SOAPBinding.SOAP11HTTP_BINDING"; //$NON-NLS-1$
- private static final String SOAPBinding_SOAP12HTTP_BINDING = "SOAPBinding.SOAP12HTTP_BINDING"; //$NON-NLS-1$
- private static final String SOAPBinding_SOAP11HTTP_MTOM_BINDING = "SOAPBinding.SOAP11HTTP_MTOM_BINDING"; //$NON-NLS-1$
- private static final String SOAPBinding_SOAP12HTTP_MTOM_BINDING = "SOAPBinding.SOAP12HTTP_MTOM_BINDING"; //$NON-NLS-1$
- private static final String HTTPBinding_HTTP_BINDING = "HTTPBinding.HTTP_BINDING"; //$NON-NLS-1$
-
- private static final String SOAP_BINDING = "javax.xml.ws.soap.SOAPBinding"; //$NON-NLS-1$
- private static final String HTTP_BINDING = "javax.xml.ws.http.HTTPBinding"; //$NON-NLS-1$
-
- public BindingTypeAttributeInitializer() {
- JAXWSUIPlugin.getDefault().getImageRegistry().put(SOAP_BINDING,
- JAXWSUIPlugin.getImageDescriptor("icons/obj16/soapbinding_obj.gif").createImage()); //$NON-NLS-1$
- JAXWSUIPlugin.getDefault().getImageRegistry().put(HTTP_BINDING,
- JAXWSUIPlugin.getImageDescriptor("icons/obj16/httpbinding_obj.gif").createImage()); //$NON-NLS-1$
- }
-
- @Override
- public List<MemberValuePair> getMemberValuePairs(IJavaElement javaElement, AST ast,
- Class<? extends Annotation> annotationClass) {
- List<MemberValuePair> memberValuePairs = new ArrayList<MemberValuePair>();
- if (javaElement.getElementType() == IJavaElement.TYPE) {
- MemberValuePair value = AnnotationsCore.createStringMemberValuePair(ast, VALUE, getDefault()); //$NON-NLS-1$
- memberValuePairs.add(value);
- }
- return memberValuePairs;
- }
-
- @Override
- public List<ICompletionProposal> getCompletionProposalsForSingleMemberAnnotation(IJavaElement javaElement,
- SingleMemberAnnotation singleMemberAnnotation) {
- List<ICompletionProposal> completionProposals = new ArrayList<ICompletionProposal>();
- if (javaElement.getElementType() == IJavaElement.TYPE) {
- Expression expression = singleMemberAnnotation.getValue();
- if (expression != null) {
- addQualifiedNameBindingsCompletionProposals(completionProposals, expression);
- }
- }
- return completionProposals;
- }
-
- @Override
- public List<ICompletionProposal> getCompletionProposalsForMemberValuePair(IJavaElement javaElement,
- MemberValuePair memberValuePair) {
- List<ICompletionProposal> completionProposals = new ArrayList<ICompletionProposal>();
- if (javaElement.getElementType() == IJavaElement.TYPE) {
- IType type = (IType) javaElement;
- String memberValuePairName = memberValuePair.getName().getIdentifier();
- if (memberValuePairName.equals(VALUE)) { //$NON-NLS-1$
- String value = memberValuePair.getValue().toString();
- if (value.equals(MISSING_IDENTIFER) || value.charAt(0) != '\"') {
- Map<String, String> bindings = getShortNameBindingsMap();
- Iterator<Map.Entry<String, String>> bindingsIter = bindings.entrySet().iterator();
- while (bindingsIter.hasNext()) {
- Map.Entry<String, String> bindingEntry = bindingsIter.next();
- String proposal = bindingEntry.getKey();
- String fullyQualifiedTypeName = bindingEntry.getValue();
- int replacementOffset = memberValuePair.getValue().getStartPosition();
- int replacementLength = memberValuePair.getValue().getLength();
- Image image = JAXWSUIPlugin.getDefault().getImageRegistry().get(fullyQualifiedTypeName);
- completionProposals.add(new BindingTypeCompletionProposal(proposal, type.getCompilationUnit(),
- replacementOffset, replacementLength, image, new StyledString(proposal), 5,
- fullyQualifiedTypeName));
- }
- } else {
- addQualifiedNameBindingsCompletionProposals(completionProposals, memberValuePair.getValue());
- }
- }
- }
- return completionProposals;
- }
-
- private void addQualifiedNameBindingsCompletionProposals(List<ICompletionProposal> completionProposals, Expression value) {
- Map<String, String> bindings = getQualifiedNameBindingsMap();
- Iterator<Map.Entry<String, String>> bindingsIter = bindings.entrySet().iterator();
- while (bindingsIter.hasNext()) {
- Map.Entry<String, String> bindingEntry = bindingsIter.next();
- String proposal = bindingEntry.getKey();
- Image image = JAXWSUIPlugin.getDefault().getImageRegistry().get(bindingEntry.getValue());
- completionProposals.add(createCompletionProposal(proposal, value, image, getDisplayString(proposal)));
- }
- }
-
- public String getDefault() {
- return SOAPBinding.SOAP11HTTP_BINDING;
- }
-
- private String getDisplayString(String binding) {
- if (binding.equals(SOAPBinding.SOAP11HTTP_BINDING)) {
- return SOAPBinding_SOAP11HTTP_BINDING;
- }
- if (binding.equals(SOAPBinding.SOAP12HTTP_BINDING)) {
- return SOAPBinding_SOAP12HTTP_BINDING;
- }
- if (binding.equals(SOAPBinding.SOAP11HTTP_MTOM_BINDING)) {
- return SOAPBinding_SOAP11HTTP_MTOM_BINDING;
- }
- if (binding.equals(SOAPBinding.SOAP12HTTP_MTOM_BINDING)) {
- return SOAPBinding_SOAP12HTTP_MTOM_BINDING;
- }
- if (binding.equals(HTTPBinding.HTTP_BINDING)) {
- return HTTPBinding_HTTP_BINDING;
- }
- return binding;
- }
-
- private Map<String, String> getQualifiedNameBindingsMap() {
- Map<String, String> bindings = new HashMap<String, String>();
- bindings.put(SOAPBinding.SOAP11HTTP_BINDING, SOAPBinding.class.getCanonicalName());
- bindings.put(SOAPBinding.SOAP12HTTP_BINDING, SOAPBinding.class.getCanonicalName());
- bindings.put(SOAPBinding.SOAP11HTTP_MTOM_BINDING, SOAPBinding.class.getCanonicalName());
- bindings.put(SOAPBinding.SOAP12HTTP_MTOM_BINDING, SOAPBinding.class.getCanonicalName());
- bindings.put(HTTPBinding.HTTP_BINDING, HTTPBinding.class.getCanonicalName());
- return bindings;
- }
-
- private Map<String, String> getShortNameBindingsMap() {
- Map<String, String> bindings = new HashMap<String, String>();
- bindings.put("SOAPBinding.SOAP11HTTP_BINDING", SOAPBinding.class.getCanonicalName());
- bindings.put("SOAPBinding.SOAP12HTTP_BINDING", SOAPBinding.class.getCanonicalName());
- bindings.put("SOAPBinding.SOAP11HTTP_MTOM_BINDING", SOAPBinding.class.getCanonicalName());
- bindings.put("SOAPBinding.SOAP12HTTP_MTOM_BINDING", SOAPBinding.class.getCanonicalName());
- bindings.put("HTTPBinding.HTTP_BINDING", HTTPBinding.class.getCanonicalName());
- return bindings;
- }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/annotations/initialization/BindingTypeCompletionProposal.java b/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/annotations/initialization/BindingTypeCompletionProposal.java
deleted file mode 100644
index 67ff087..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/annotations/initialization/BindingTypeCompletionProposal.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Shane Clarke.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Shane Clarke - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.jaxws.ui.annotations.initialization;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.dom.rewrite.ImportRewrite;
-import org.eclipse.jdt.internal.ui.text.java.JavaTypeCompletionProposal;
-import org.eclipse.jface.text.BadLocationException;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.viewers.StyledString;
-import org.eclipse.swt.graphics.Image;
-
-@SuppressWarnings("restriction")
-public class BindingTypeCompletionProposal extends JavaTypeCompletionProposal {
-
- private final String replacementString;
- private final String fullyQualifiedTypeName;
-
- public BindingTypeCompletionProposal(String replacementString, ICompilationUnit compilationUnit,
- int replacementOffset, int replacementLength, Image image, StyledString displayString,
- int relevance, String fullyQualifiedTypeName) {
- super(replacementString, compilationUnit, replacementOffset, replacementLength, image, displayString,
- relevance, fullyQualifiedTypeName);
- this.fullyQualifiedTypeName = fullyQualifiedTypeName;
- this.replacementString = replacementString;
- }
-
- @Override
- protected boolean updateReplacementString(IDocument document, char trigger, int offset,
- ImportRewrite importRewrite) throws CoreException, BadLocationException {
-
- if (importRewrite != null && fullyQualifiedTypeName != null && replacementString != null) {
- if (fullyQualifiedTypeName.indexOf('.') != -1) {
- IType[] types= importRewrite.getCompilationUnit().getTypes();
- if (types.length > 0 && types[0].getSourceRange().getOffset() <= offset) {
- boolean importAdded = !importRewrite.addImport(fullyQualifiedTypeName).equals(fullyQualifiedTypeName);
- if (!importAdded) {
- setReplacementString(fullyQualifiedTypeName
- + replacementString.substring(replacementString.lastIndexOf('.')));
- }
- return importAdded;
- }
- }
- }
- return false;
- }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/annotations/initialization/RequestWrapperAttributeInitializer.java b/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/annotations/initialization/RequestWrapperAttributeInitializer.java
deleted file mode 100644
index 8362477..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/annotations/initialization/RequestWrapperAttributeInitializer.java
+++ /dev/null
@@ -1,146 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Shane Clarke.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Shane Clarke - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.jaxws.ui.annotations.initialization;
-
-import static org.eclipse.jst.ws.internal.jaxws.core.utils.JAXWSUtils.CLASS_NAME;
-import static org.eclipse.jst.ws.internal.jaxws.core.utils.JAXWSUtils.DOT_CHARACTER;
-import static org.eclipse.jst.ws.internal.jaxws.core.utils.JAXWSUtils.JAXWS_SUBPACKAGE;
-import static org.eclipse.jst.ws.internal.jaxws.core.utils.JAXWSUtils.LOCAL_NAME;
-import static org.eclipse.jst.ws.internal.jaxws.core.utils.JAXWSUtils.OPERATION_NAME;
-import static org.eclipse.jst.ws.internal.jaxws.core.utils.JAXWSUtils.TARGET_NAMESPACE;
-
-import java.lang.annotation.Annotation;
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.jws.WebMethod;
-import javax.jws.WebService;
-
-import org.eclipse.jdt.core.IAnnotation;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jdt.core.dom.AST;
-import org.eclipse.jdt.core.dom.MemberValuePair;
-import org.eclipse.jface.text.contentassist.ICompletionProposal;
-import org.eclipse.jst.ws.annotations.core.AnnotationsCore;
-import org.eclipse.jst.ws.annotations.core.initialization.AnnotationAttributeInitializer;
-import org.eclipse.jst.ws.annotations.core.utils.AnnotationUtils;
-import org.eclipse.jst.ws.internal.jaxws.ui.JAXWSUIPlugin;
-import org.eclipse.jst.ws.jaxws.core.utils.JDTUtils;
-
-public class RequestWrapperAttributeInitializer extends AnnotationAttributeInitializer {
-
- @Override
- public List<MemberValuePair> getMemberValuePairs(IJavaElement javaElement, AST ast,
- Class<? extends Annotation> annotationClass) {
- List<MemberValuePair> memberValuePairs = new ArrayList<MemberValuePair>();
- if (javaElement.getElementType() == IJavaElement.METHOD) {
- IMethod method = (IMethod) javaElement;
- IType type = method.getCompilationUnit().findPrimaryType();
-
- MemberValuePair classNameValuePair = AnnotationsCore.createStringMemberValuePair(ast, CLASS_NAME,
- getClassName(type, method));
-
- MemberValuePair localNameValuePair = AnnotationsCore.createStringMemberValuePair(ast, LOCAL_NAME,
- getLocalName(type, method));
-
- MemberValuePair targetNamespaceValuePair = AnnotationsCore.createStringMemberValuePair(ast,
- TARGET_NAMESPACE, getTargetNamespace(type));
-
- memberValuePairs.add(classNameValuePair);
- memberValuePairs.add(localNameValuePair);
- memberValuePairs.add(targetNamespaceValuePair);
- }
- return memberValuePairs;
- }
-
- public List<ICompletionProposal> getCompletionProposalsForMemberValuePair(IJavaElement javaElement,
- MemberValuePair memberValuePair) {
-
- List<ICompletionProposal> completionProposals = new ArrayList<ICompletionProposal>(1);
- if (javaElement.getElementType() == IJavaElement.METHOD) {
- IMethod method = (IMethod) javaElement;
- IType type = method.getCompilationUnit().findPrimaryType();
-
- String memberValuePairName = memberValuePair.getName().getIdentifier();
-
- if (memberValuePairName.equals(CLASS_NAME)) {
- completionProposals.add(createCompletionProposal(getClassName(type, method),
- memberValuePair.getValue()));
- }
- if (memberValuePairName.equals(LOCAL_NAME)) {
- completionProposals.add(createCompletionProposal(getLocalName(type, method),
- memberValuePair.getValue()));
- }
- if (memberValuePairName.equals(TARGET_NAMESPACE)) {
- completionProposals.add(createCompletionProposal(getTargetNamespace(type),
- memberValuePair.getValue()));
- }
- }
- return completionProposals;
- }
-
- protected String getPackageName(IType type) {
- StringBuilder packageName = new StringBuilder(type.getPackageFragment().getElementName());
- if (packageName.length() > 0) {
- packageName.append(DOT_CHARACTER);
- }
- packageName.append(JAXWS_SUBPACKAGE);
- packageName.append(DOT_CHARACTER);
- return packageName.toString();
- }
-
- protected String getClassName(IType type, IMethod method) {
- try {
- String methodName = method.getElementName();
- return getPackageName(type) + methodName.substring(0, 1).toUpperCase()
- + methodName.substring(1) + AnnotationUtils.accountForOverloadedMethods(method);
- } catch (JavaModelException jme) {
- JAXWSUIPlugin.log(jme.getStatus());
- }
- return ""; //$NON-NLS-1$
- }
-
- protected String getLocalName(IType type, IMethod method) {
- try {
- IAnnotation annotation = AnnotationUtils.getAnnotation(WebMethod.class, method);
- if (annotation != null) {
- String operationName = AnnotationUtils.getStringValue(annotation, OPERATION_NAME);
- if (operationName != null) {
- return operationName;
- }
- }
- return method.getElementName() + AnnotationUtils.accountForOverloadedMethods(method);
- } catch (JavaModelException jme) {
- JAXWSUIPlugin.log(jme.getStatus());
- }
- return ""; //$NON-NLS-1$
- }
-
- protected String getTargetNamespace(IType type) {
- try {
- IAnnotation annotation = AnnotationUtils.getAnnotation(WebService.class, type);
- if (annotation != null) {
- String targetNamespace = AnnotationUtils.getStringValue(annotation, TARGET_NAMESPACE);
- if (targetNamespace != null && targetNamespace.length() > 0) {
- return targetNamespace;
- }
- }
- return JDTUtils.getTargetNamespaceFromPackageName(type.getPackageFragment().getElementName());
- } catch (JavaModelException jme) {
- JAXWSUIPlugin.log(jme.getStatus());
- }
- return ""; //$NON-NLS-1$
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/annotations/initialization/ResponseWrapperAttributeInitializer.java b/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/annotations/initialization/ResponseWrapperAttributeInitializer.java
deleted file mode 100644
index 7af6399..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/annotations/initialization/ResponseWrapperAttributeInitializer.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Shane Clarke.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Shane Clarke - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.jaxws.ui.annotations.initialization;
-
-import static org.eclipse.jst.ws.internal.jaxws.core.utils.JAXWSUtils.OPERATION_NAME;
-import static org.eclipse.jst.ws.internal.jaxws.core.utils.JAXWSUtils.RESPONSE_SUFFIX;
-
-import javax.jws.WebMethod;
-
-import org.eclipse.jdt.core.IAnnotation;
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jst.ws.annotations.core.utils.AnnotationUtils;
-import org.eclipse.jst.ws.internal.jaxws.ui.JAXWSUIPlugin;
-
-public class ResponseWrapperAttributeInitializer extends RequestWrapperAttributeInitializer {
-
- @Override
- protected String getClassName(IType type, IMethod method) {
- try {
- String methodName = method.getElementName() + RESPONSE_SUFFIX;
- return getPackageName(type) + methodName.substring(0, 1).toUpperCase()
- + methodName.substring(1) + AnnotationUtils.accountForOverloadedMethods(method);
- } catch (JavaModelException jme) {
- JAXWSUIPlugin.log(jme.getStatus());
- }
- return ""; //$NON-NLS-1$
- }
-
- @Override
- protected String getLocalName(IType type, IMethod method) {
- try {
- IAnnotation annotation = AnnotationUtils.getAnnotation(WebMethod.class, method);
- if (annotation != null) {
- String operationName = AnnotationUtils.getStringValue(annotation, OPERATION_NAME);
- if (operationName != null) {
- return operationName + RESPONSE_SUFFIX;
- }
- }
- return method.getElementName() + RESPONSE_SUFFIX
- + AnnotationUtils.accountForOverloadedMethods(method);
- } catch (JavaModelException jme) {
- JAXWSUIPlugin.log(jme.getStatus());
- }
- return ""; //$NON-NLS-1$
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/annotations/initialization/SOAPBindingAttributeInitializer.java b/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/annotations/initialization/SOAPBindingAttributeInitializer.java
deleted file mode 100644
index dd1124f..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/annotations/initialization/SOAPBindingAttributeInitializer.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Shane Clarke.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Shane Clarke - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.jaxws.ui.annotations.initialization;
-
-import static org.eclipse.jst.ws.internal.jaxws.core.utils.JAXWSUtils.PARAMETER_STYLE;
-import static org.eclipse.jst.ws.internal.jaxws.core.utils.JAXWSUtils.STYLE;
-import static org.eclipse.jst.ws.internal.jaxws.core.utils.JAXWSUtils.USE;
-
-import java.lang.annotation.Annotation;
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.jws.soap.SOAPBinding;
-import javax.jws.soap.SOAPBinding.ParameterStyle;
-import javax.jws.soap.SOAPBinding.Style;
-import javax.jws.soap.SOAPBinding.Use;
-
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.dom.AST;
-import org.eclipse.jdt.core.dom.MemberValuePair;
-import org.eclipse.jst.ws.annotations.core.AnnotationsCore;
-import org.eclipse.jst.ws.annotations.core.initialization.AnnotationAttributeInitializer;
-
-public class SOAPBindingAttributeInitializer extends AnnotationAttributeInitializer {
-
- @Override
- public List<MemberValuePair> getMemberValuePairs(IJavaElement javaElement, AST ast,
- Class<? extends Annotation> annotationClass) {
- List<MemberValuePair> memberValuePairs = new ArrayList<MemberValuePair>();
-
- MemberValuePair styleValuePair = AnnotationsCore.createEnumMemberValuePair(ast,
- SOAPBinding.class.getCanonicalName(), STYLE, Style.DOCUMENT);
-
- MemberValuePair useValuePair = AnnotationsCore.createEnumMemberValuePair(ast,
- SOAPBinding.class.getCanonicalName(), USE, Use.LITERAL);
-
- MemberValuePair parameterStyleValuePair = AnnotationsCore.createEnumMemberValuePair(ast,
- SOAPBinding.class.getCanonicalName(), PARAMETER_STYLE, ParameterStyle.WRAPPED);
-
- memberValuePairs.add(styleValuePair);
- memberValuePairs.add(useValuePair);
- memberValuePairs.add(parameterStyleValuePair);
- return memberValuePairs;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/annotations/initialization/WebMethodAttributeInitializer.java b/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/annotations/initialization/WebMethodAttributeInitializer.java
deleted file mode 100644
index 70c8796..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/annotations/initialization/WebMethodAttributeInitializer.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Shane Clarke.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Shane Clarke - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.jaxws.ui.annotations.initialization;
-
-import static org.eclipse.jst.ws.internal.jaxws.core.utils.JAXWSUtils.ACTION;
-import static org.eclipse.jst.ws.internal.jaxws.core.utils.JAXWSUtils.OPERATION_NAME;
-
-import java.lang.annotation.Annotation;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jdt.core.dom.AST;
-import org.eclipse.jdt.core.dom.MemberValuePair;
-import org.eclipse.jface.text.contentassist.ICompletionProposal;
-import org.eclipse.jst.ws.annotations.core.AnnotationsCore;
-import org.eclipse.jst.ws.annotations.core.initialization.AnnotationAttributeInitializer;
-import org.eclipse.jst.ws.annotations.core.utils.AnnotationUtils;
-import org.eclipse.jst.ws.internal.jaxws.ui.JAXWSUIPlugin;
-
-public class WebMethodAttributeInitializer extends AnnotationAttributeInitializer {
-
- @Override
- public List<MemberValuePair> getMemberValuePairs(IJavaElement javaElement, AST ast,
- Class<? extends Annotation> annotationClass) {
-
- List<MemberValuePair> memberValuePairs = new ArrayList<MemberValuePair>();
-
- if (javaElement.getElementType() == IJavaElement.METHOD) {
- IMethod method = (IMethod) javaElement;
- IType type = method.getCompilationUnit().findPrimaryType();
-
- MemberValuePair operationValuePair = AnnotationsCore.createStringMemberValuePair(ast,
- OPERATION_NAME, getOperationNameValue(type, method));
-
- MemberValuePair actionValuePair = AnnotationsCore.createStringMemberValuePair(ast,
- ACTION, getActionValue(type, method));
-
- memberValuePairs.add(operationValuePair);
- memberValuePairs.add(actionValuePair);
-
- }
- return memberValuePairs;
- }
-
- public List<ICompletionProposal> getCompletionProposalsForMemberValuePair(IJavaElement javaElement,
- MemberValuePair memberValuePair) {
-
- List<ICompletionProposal> completionProposals = new ArrayList<ICompletionProposal>();
-
- if (javaElement.getElementType() == IJavaElement.METHOD) {
- IMethod method = (IMethod) javaElement;
- IType type = method.getCompilationUnit().findPrimaryType();
-
- String memberValuePairName = memberValuePair.getName().getIdentifier();
-
- if (memberValuePairName.equals(OPERATION_NAME)) {
- completionProposals.add(createCompletionProposal(getOperationNameValue(type, method),
- memberValuePair.getValue()));
- }
-
- if (memberValuePairName.equals(ACTION)) {
- completionProposals.add(createCompletionProposal(getActionValue(type, method),
- memberValuePair.getValue()));
- }
-
- }
- return completionProposals;
- }
-
- private String getOperationNameValue(IType type, IMethod method) {
- try {
- return method.getElementName() + AnnotationUtils.accountForOverloadedMethods(method);
- } catch (JavaModelException jme) {
- JAXWSUIPlugin.log(jme.getStatus());
- }
- return ""; //$NON-NLS-1$
- }
-
- private String getActionValue(IType type, IMethod method) {
- try {
- String methodName = method.getElementName();
- return "urn:" + methodName.substring(0, 1).toUpperCase() //$NON-NLS-1$
- + methodName.substring(1) + AnnotationUtils.accountForOverloadedMethods(method);
- } catch (JavaModelException jme) {
- JAXWSUIPlugin.log(jme.getStatus());
- }
- return ""; //$NON-NLS-1$
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/annotations/initialization/WebParamAttributeInitializer.java b/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/annotations/initialization/WebParamAttributeInitializer.java
deleted file mode 100644
index c6916bc..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/annotations/initialization/WebParamAttributeInitializer.java
+++ /dev/null
@@ -1,191 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Shane Clarke.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Shane Clarke - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.jaxws.ui.annotations.initialization;
-
-import static org.eclipse.jst.ws.internal.jaxws.core.utils.JAXWSUtils.ARG;
-import static org.eclipse.jst.ws.internal.jaxws.core.utils.JAXWSUtils.HEADER;
-import static org.eclipse.jst.ws.internal.jaxws.core.utils.JAXWSUtils.NAME;
-import static org.eclipse.jst.ws.internal.jaxws.core.utils.JAXWSUtils.OPERATION_NAME;
-import static org.eclipse.jst.ws.internal.jaxws.core.utils.JAXWSUtils.PART_NAME;
-import static org.eclipse.jst.ws.internal.jaxws.core.utils.JAXWSUtils.TARGET_NAMESPACE;
-
-import java.lang.annotation.Annotation;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-import javax.jws.WebMethod;
-import javax.jws.WebParam;
-import javax.jws.WebService;
-import javax.jws.soap.SOAPBinding;
-
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.ILocalVariable;
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jdt.core.dom.AST;
-import org.eclipse.jdt.core.dom.MemberValuePair;
-import org.eclipse.jface.text.contentassist.ICompletionProposal;
-import org.eclipse.jst.ws.annotations.core.AnnotationsCore;
-import org.eclipse.jst.ws.annotations.core.initialization.AnnotationAttributeInitializer;
-import org.eclipse.jst.ws.annotations.core.utils.AnnotationUtils;
-import org.eclipse.jst.ws.internal.jaxws.core.utils.JAXWSUtils;
-import org.eclipse.jst.ws.internal.jaxws.ui.JAXWSUIPlugin;
-import org.eclipse.jst.ws.jaxws.core.utils.JDTUtils;
-
-public class WebParamAttributeInitializer extends AnnotationAttributeInitializer {
-
- @Override
- public List<MemberValuePair> getMemberValuePairs(IJavaElement javaElement,
- AST ast, Class<? extends Annotation> annotationClass) {
-
- List<MemberValuePair> memberValuePairs = new ArrayList<MemberValuePair>();
-
- if (javaElement.getElementType() == IJavaElement.LOCAL_VARIABLE) {
- ILocalVariable parameter = (ILocalVariable) javaElement;
- MemberValuePair nameValuePair = AnnotationsCore.createStringMemberValuePair(ast, NAME, getName(parameter));
- memberValuePairs.add(nameValuePair);
- }
- return memberValuePairs;
- }
-
- @Override
- public List<ICompletionProposal> getCompletionProposalsForMemberValuePair(IJavaElement javaElement,
- MemberValuePair memberValuePair) {
-
- List<ICompletionProposal> completionProposals = new ArrayList<ICompletionProposal>();
- if (javaElement.getElementType() == IJavaElement.LOCAL_VARIABLE) {
- ILocalVariable parameter = (ILocalVariable) javaElement;
-
- String memberValuePairName = memberValuePair.getName().getIdentifier();
-
- if (memberValuePairName.equals(NAME)) {
- completionProposals.add(createCompletionProposal(getName(parameter),
- memberValuePair.getValue()));
- }
-
- if (memberValuePairName.equals(PART_NAME)) {
- completionProposals.add(createCompletionProposal(getPartName(parameter),
- memberValuePair.getValue()));
- }
-
- if (memberValuePairName.equals(TARGET_NAMESPACE)) {
- completionProposals.add(createCompletionProposal(getTargetNamespace(parameter),
- memberValuePair.getValue()));
- }
-
- }
- return completionProposals;
- }
-
- private String getName(ILocalVariable parameter) {
- IMethod method = (IMethod) parameter.getParent();
- if (hasDocumentBareSOAPBinding(method)) {
- return getWebMethodOperationName(method);
- }
- try {
- List<String> methodNames = Arrays.asList(method.getParameterNames());
- return ARG + methodNames.indexOf(parameter.getElementName());
- } catch (JavaModelException jme) {
- JAXWSUIPlugin.log(jme.getStatus());
- }
- return parameter.getElementName();
- }
-
- private String getPartName(ILocalVariable parameter) {
- org.eclipse.jdt.core.dom.Annotation annotation = AnnotationUtils.getAnnotation(parameter,
- WebParam.class);
- if (annotation != null) {
- String name = AnnotationUtils.getStringValue(annotation, NAME);
- if (name != null) {
- return name;
- }
- }
- return getName(parameter);
- }
-
- private String getTargetNamespace(ILocalVariable parameter) {
- if (hasDocumentWrappedSOAPBinding(parameter) && !isHeader(parameter)) {
- return ""; //$NON-NLS-1$
- }
- return getDefaultTargetNamespace(parameter);
- }
-
- private String getDefaultTargetNamespace(ILocalVariable parameter) {
- IMethod method = (IMethod) parameter.getParent();
- IType type = method.getDeclaringType();
- org.eclipse.jdt.core.dom.Annotation annotation = AnnotationUtils.getAnnotation(type,
- WebService.class);
- if (annotation != null) {
- String targetNamespace = AnnotationUtils.getStringValue(annotation, TARGET_NAMESPACE);
- if (targetNamespace != null) {
- return targetNamespace;
- }
- }
- return JDTUtils.getTargetNamespaceFromPackageName(type.getPackageFragment().getElementName());
- }
-
- private boolean isHeader(ILocalVariable parameter) {
- org.eclipse.jdt.core.dom.Annotation annotation = AnnotationUtils.getAnnotation(parameter, WebParam.class);
- if (annotation != null) {
- Boolean header = AnnotationUtils.getBooleanValue(annotation, HEADER);
- if (header != null) {
- return header.booleanValue();
- }
- }
- return false;
- }
-
- private boolean hasDocumentWrappedSOAPBinding(ILocalVariable parameter) {
- IMethod method = (IMethod) parameter.getParent();
-
- org.eclipse.jdt.core.dom.Annotation annotation = AnnotationUtils.getAnnotation(method,
- SOAPBinding.class);
- if (annotation != null) {
- return JAXWSUtils.isDocumentWrapped(annotation);
- }
-
- org.eclipse.jdt.core.dom.Annotation typeAnnotation = AnnotationUtils.getAnnotation(method.getDeclaringType(),
- SOAPBinding.class);
- if (typeAnnotation != null) {
- return JAXWSUtils.isDocumentWrapped(typeAnnotation);
- }
- return true;
- }
-
- private boolean hasDocumentBareSOAPBinding(IJavaElement javaElement) {
- org.eclipse.jdt.core.dom.Annotation annotation = AnnotationUtils.getAnnotation(javaElement,
- SOAPBinding.class);
- if (annotation != null) {
- return JAXWSUtils.isDocumentBare(annotation);
- }
- if (javaElement.getElementType() == IJavaElement.METHOD) {
- IMethod method = (IMethod) javaElement;
- return hasDocumentBareSOAPBinding(method.getDeclaringType());
- }
- return false;
- }
-
-
- private String getWebMethodOperationName(IMethod method) {
- org.eclipse.jdt.core.dom.Annotation annotation = AnnotationUtils.getAnnotation(method,
- WebMethod.class);
- if (annotation != null) {
- String operationName = AnnotationUtils.getStringValue(annotation, OPERATION_NAME);
- if (operationName != null) {
- return operationName;
- }
- }
- return method.getElementName();
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/annotations/initialization/WebResultAttributeInitializer.java b/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/annotations/initialization/WebResultAttributeInitializer.java
deleted file mode 100644
index bdf5964..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/annotations/initialization/WebResultAttributeInitializer.java
+++ /dev/null
@@ -1,206 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Shane Clarke.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Shane Clarke - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.jaxws.ui.annotations.initialization;
-
-import static org.eclipse.jst.ws.internal.jaxws.core.utils.JAXWSUtils.HEADER;
-import static org.eclipse.jst.ws.internal.jaxws.core.utils.JAXWSUtils.NAME;
-import static org.eclipse.jst.ws.internal.jaxws.core.utils.JAXWSUtils.OPERATION_NAME;
-import static org.eclipse.jst.ws.internal.jaxws.core.utils.JAXWSUtils.PART_NAME;
-import static org.eclipse.jst.ws.internal.jaxws.core.utils.JAXWSUtils.RESPONSE;
-import static org.eclipse.jst.ws.internal.jaxws.core.utils.JAXWSUtils.RETURN;
-import static org.eclipse.jst.ws.internal.jaxws.core.utils.JAXWSUtils.TARGET_NAMESPACE;
-
-import java.lang.annotation.Annotation;
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.jws.WebMethod;
-import javax.jws.WebResult;
-import javax.jws.WebService;
-import javax.jws.soap.SOAPBinding;
-
-import org.eclipse.jdt.core.IAnnotatable;
-import org.eclipse.jdt.core.IAnnotation;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jdt.core.IPackageFragment;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jdt.core.dom.AST;
-import org.eclipse.jdt.core.dom.MemberValuePair;
-import org.eclipse.jface.text.contentassist.ICompletionProposal;
-import org.eclipse.jst.ws.annotations.core.AnnotationsCore;
-import org.eclipse.jst.ws.annotations.core.initialization.AnnotationAttributeInitializer;
-import org.eclipse.jst.ws.annotations.core.utils.AnnotationUtils;
-import org.eclipse.jst.ws.internal.jaxws.core.utils.JAXWSUtils;
-import org.eclipse.jst.ws.internal.jaxws.ui.JAXWSUIPlugin;
-import org.eclipse.jst.ws.jaxws.core.utils.JDTUtils;
-
-public class WebResultAttributeInitializer extends AnnotationAttributeInitializer {
-
- @Override
- public List<MemberValuePair> getMemberValuePairs(IJavaElement javaElement, AST ast,
- Class<? extends Annotation> annotationClass) {
- List<MemberValuePair> memberValuePairs = new ArrayList<MemberValuePair>();
-
- if (javaElement.getElementType() == IJavaElement.METHOD) {
- IMethod method = (IMethod) javaElement;
-
- MemberValuePair nameValuePair = AnnotationsCore.createStringMemberValuePair(ast, NAME, getName(method));
-
- memberValuePairs.add(nameValuePair);
- }
- return memberValuePairs;
- }
-
- public List<ICompletionProposal> getCompletionProposalsForMemberValuePair(IJavaElement javaElement,
- MemberValuePair memberValuePair) {
-
- List<ICompletionProposal> completionProposals = new ArrayList<ICompletionProposal>();
-
- if (javaElement.getElementType() == IJavaElement.METHOD) {
- IMethod method = (IMethod) javaElement;
-
- String memberValuePairName = memberValuePair.getName().getIdentifier();
-
- if (memberValuePairName.equals(NAME)) {
- completionProposals.add(createCompletionProposal(getName(method), memberValuePair
- .getValue()));
- }
-
- if (memberValuePairName.equals(PART_NAME)) {
- completionProposals.add(createCompletionProposal(getPartName(method),
- memberValuePair.getValue()));
- }
-
- if (memberValuePairName.equals(TARGET_NAMESPACE)) {
- completionProposals.add(createCompletionProposal(getTargetNamespace(method),
- memberValuePair.getValue()));
- }
-
- }
- return completionProposals;
- }
-
- private String getName(IMethod method) {
- if (hasDocumentBareSOAPBinding(method)) {
- return getOperationName(method) + RESPONSE;
- }
- return RETURN;
- }
-
- private String getOperationName(IMethod method) {
- try {
- IAnnotation annotation = AnnotationUtils.getAnnotation(WebMethod.class, method);
- if (annotation != null) {
- String operationName = AnnotationUtils.getStringValue(annotation, OPERATION_NAME);
- if (operationName != null) {
- return operationName;
- }
- }
- } catch (JavaModelException jme) {
- JAXWSUIPlugin.log(jme.getStatus());
- }
- return method.getElementName();
- }
-
- private boolean hasDocumentBareSOAPBinding(IAnnotatable annotatable) {
- try {
- IAnnotation annotation = AnnotationUtils.getAnnotation(SOAPBinding.class, annotatable);
- if (annotation != null) {
- return JAXWSUtils.isDocumentBare(annotation);
- }
- if (annotatable instanceof IMethod) {
- IMethod method = (IMethod) annotatable;
- return hasDocumentBareSOAPBinding((IType) method.getParent());
- }
- } catch (JavaModelException jme) {
- JAXWSUIPlugin.log(jme.getStatus());
- }
- return false;
- }
-
- private String getPartName(IMethod method) {
- try {
- IAnnotation annotation = AnnotationUtils.getAnnotation(WebResult.class, method);
- if (annotation != null) {
- String name = AnnotationUtils.getStringValue(annotation, NAME);
- if (name != null) {
- return name;
- }
- }
- } catch (JavaModelException jme) {
- JAXWSUIPlugin.log(jme.getStatus());
- }
- return getName(method);
- }
-
- private String getTargetNamespace(IMethod method) {
- if (hasDocumentWrappedSOAPBinding(method) && !isHeader(method)) {
- return ""; //$NON-NLS-1$
- }
- return getDefaultTargetNamespace(method);
- }
-
- private boolean hasDocumentWrappedSOAPBinding(IAnnotatable annotatable) {
- try {
- IAnnotation annotation = AnnotationUtils.getAnnotation(SOAPBinding.class, annotatable);
- if (annotation != null) {
- return JAXWSUtils.isDocumentWrapped(annotation);
- }
- if (annotatable instanceof IMethod) {
- IMethod method = (IMethod) annotatable;
- return hasDocumentWrappedSOAPBinding((IType) method.getParent());
- }
- } catch (JavaModelException jme) {
- JAXWSUIPlugin.log(jme.getStatus());
- }
- return true;
- }
-
- private boolean isHeader(IMethod method) {
- try {
- IAnnotation annotation = AnnotationUtils.getAnnotation(WebResult.class, method);
- if (annotation != null) {
- Boolean header = AnnotationUtils.getBooleanValue(annotation, HEADER);
- if (header != null) {
- return header.booleanValue();
- }
- }
- } catch (JavaModelException jme) {
- JAXWSUIPlugin.log(jme.getStatus());
- }
- return false;
- }
-
- private String getDefaultTargetNamespace(IMethod method) {
- IType type = method.getDeclaringType();
- try {
- IAnnotation annotation = AnnotationUtils.getAnnotation(WebService.class, type);
- if (annotation != null) {
- String targetNamespace = AnnotationUtils.getStringValue(annotation, TARGET_NAMESPACE);
- if (targetNamespace != null) {
- return targetNamespace;
- }
- }
- } catch (JavaModelException jme) {
- JAXWSUIPlugin.log(jme.getStatus());
- }
-
- return JDTUtils.getTargetNamespaceFromPackageName(getPackageName(type));
- }
-
- private String getPackageName(IType type) {
- IPackageFragment packageFragment = type.getPackageFragment();
- return packageFragment.getElementName();
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/annotations/initialization/WebServiceAttributeInitializer.java b/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/annotations/initialization/WebServiceAttributeInitializer.java
deleted file mode 100644
index 1163586..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/annotations/initialization/WebServiceAttributeInitializer.java
+++ /dev/null
@@ -1,155 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Shane Clarke.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Shane Clarke - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.jaxws.ui.annotations.initialization;
-
-import static org.eclipse.jst.ws.internal.jaxws.core.utils.JAXWSUtils.ENDPOINT_INTERFACE;
-import static org.eclipse.jst.ws.internal.jaxws.core.utils.JAXWSUtils.NAME;
-import static org.eclipse.jst.ws.internal.jaxws.core.utils.JAXWSUtils.PORT_NAME;
-import static org.eclipse.jst.ws.internal.jaxws.core.utils.JAXWSUtils.PORT_SUFFIX;
-import static org.eclipse.jst.ws.internal.jaxws.core.utils.JAXWSUtils.SERVICE_NAME;
-import static org.eclipse.jst.ws.internal.jaxws.core.utils.JAXWSUtils.SERVICE_SUFFIX;
-import static org.eclipse.jst.ws.internal.jaxws.core.utils.JAXWSUtils.TARGET_NAMESPACE;
-
-import java.lang.annotation.Annotation;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.ITypeHierarchy;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jdt.core.dom.AST;
-import org.eclipse.jdt.core.dom.MemberValuePair;
-import org.eclipse.jdt.ui.ISharedImages;
-import org.eclipse.jdt.ui.JavaUI;
-import org.eclipse.jface.text.contentassist.ICompletionProposal;
-import org.eclipse.jst.ws.annotations.core.AnnotationsCore;
-import org.eclipse.jst.ws.annotations.core.initialization.AnnotationAttributeInitializer;
-import org.eclipse.jst.ws.internal.jaxws.ui.JAXWSUIPlugin;
-import org.eclipse.jst.ws.jaxws.core.utils.JDTUtils;
-
-public class WebServiceAttributeInitializer extends AnnotationAttributeInitializer {
-
- @Override
- public List<MemberValuePair> getMemberValuePairs(IJavaElement javaElement, AST ast,
- Class<? extends Annotation> annotationClass) {
-
- List<MemberValuePair> memberValuePairs = new ArrayList<MemberValuePair>();
- if (javaElement.getElementType() == IJavaElement.TYPE) {
- try {
- IType type = (IType)javaElement;
-
- MemberValuePair nameValuePair = AnnotationsCore.createStringMemberValuePair(ast, NAME, getName(type));
-
- MemberValuePair portNameValuePair = AnnotationsCore.createStringMemberValuePair(ast, PORT_NAME,
- getPortName(type));
-
- MemberValuePair serviceNameValuePair = AnnotationsCore.createStringMemberValuePair(ast, SERVICE_NAME,
- getServiceName(type));
-
- MemberValuePair targetNamespaceValuePair = AnnotationsCore.createStringMemberValuePair(ast,
- TARGET_NAMESPACE, getTargetNamespace(type));
-
- if (type.isInterface()) {
- memberValuePairs.add(nameValuePair);
- }
-
- memberValuePairs.add(targetNamespaceValuePair);
-
- if (type.isClass()) {
- memberValuePairs.add(portNameValuePair);
- memberValuePairs.add(serviceNameValuePair);
- }
- } catch (JavaModelException jme) {
- JAXWSUIPlugin.log(jme.getStatus());
- }
- }
- return memberValuePairs;
- }
-
- public List<ICompletionProposal> getCompletionProposalsForMemberValuePair(IJavaElement javaElement,
- MemberValuePair memberValuePair) {
-
- List<ICompletionProposal> completionProposals = new ArrayList<ICompletionProposal>();
- if (javaElement.getElementType() == IJavaElement.TYPE) {
- IType type = (IType) javaElement;
-
- String memberValuePairName = memberValuePair.getName().getIdentifier();
-
- if (memberValuePairName.equals(ENDPOINT_INTERFACE)) {
- List<String> interfaces = getInterfaces(type);
- for (String anInterface : interfaces) {
- completionProposals.add(createCompletionProposal(anInterface,
- memberValuePair.getValue(), JavaUI.getSharedImages().getImage(
- ISharedImages.IMG_OBJS_INTERFACE), anInterface));
- }
- }
- if (memberValuePairName.equals(NAME)) {
- completionProposals.add(createCompletionProposal(getName(type),
- memberValuePair.getValue()));
- }
- if (memberValuePairName.equals(PORT_NAME)) {
- completionProposals.add(createCompletionProposal(getPortName(type),
- memberValuePair.getValue()));
- }
- if (memberValuePairName.equals(SERVICE_NAME)) {
- completionProposals.add(createCompletionProposal(getServiceName(type),
- memberValuePair.getValue()));
- }
- if (memberValuePairName.equals(TARGET_NAMESPACE)) {
- completionProposals.add(createCompletionProposal(getTargetNamespace(type),
- memberValuePair.getValue()));
- }
- }
- return completionProposals;
- }
-
- public String getName(IType type) {
- return type.getElementName();
- }
-
- public String getPortName(IType type) {
- return type.getElementName() + PORT_SUFFIX;
- }
-
- public String getServiceName(IType type) {
- return type.getElementName() + SERVICE_SUFFIX;
- }
-
- public String getTargetNamespace(IType type) {
- return JDTUtils.getTargetNamespaceFromPackageName(type.getPackageFragment().getElementName());
- }
-
- private List<String> getInterfaces(IType type) {
- try {
- List<String> interfaces = new ArrayList<String>();
- ITypeHierarchy typeHierarchy = type.newTypeHierarchy(type.getJavaProject(), null);
- IType[] allInterfaces = typeHierarchy.getAllInterfaces();
- for (IType aInterface : allInterfaces) {
- if (!aInterface.isBinary() && aInterface.getResource().getProject().equals(
- type.getResource().getProject())) {
- String packageName = aInterface.getPackageFragment().getElementName();
- if (packageName.trim().length() > 0) {
- packageName += "."; //$NON-NLS-1$
- }
- String qualifiedName = packageName + aInterface.getPrimaryElement().getElementName();
- interfaces.add(qualifiedName);
- }
- }
- return interfaces;
- } catch (JavaModelException jme) {
- JAXWSUIPlugin.log(jme.getStatus());
- }
- return Collections.emptyList();
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/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 a1bdad9..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/views/AnnotationArrayCellEditor.java
+++ /dev/null
@@ -1,549 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Shane Clarke.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Shane Clarke - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.jaxws.ui.views;
-
-import java.lang.reflect.Method;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.Map.Entry;
-
-import org.eclipse.jdt.core.IAnnotation;
-import org.eclipse.jdt.core.IMemberValuePair;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jdt.core.search.SearchEngine;
-import org.eclipse.jdt.ui.IJavaElementSearchConstants;
-import org.eclipse.jdt.ui.ISharedImages;
-import org.eclipse.jdt.ui.JavaUI;
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.jface.viewers.DialogCellEditor;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.IStructuredContentProvider;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.window.Window;
-import org.eclipse.jst.ws.internal.jaxws.ui.JAXWSUIMessages;
-import org.eclipse.jst.ws.internal.jaxws.ui.JAXWSUIPlugin;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.dialogs.SelectionDialog;
-import org.eclipse.ui.dialogs.SelectionStatusDialog;
-
-public class AnnotationArrayCellEditor extends DialogCellEditor {
- private Method method;
- private Object[] values;
-
- private List<Object> originalValues;
- private List<Object> updatedValues;
-
- private AnnotationArrayDialog annotationArrayDialog;
-
- boolean cancelled;
-
- public AnnotationArrayCellEditor(Composite parent, Object[] values) {
- super(parent, SWT.NONE);
- this.values = values.clone();
- }
-
- @Override
- protected Object openDialogBox(Control cellEditorWindow) {
- annotationArrayDialog = new AnnotationArrayDialog(cellEditorWindow.getShell(), values);
- int returnValue = annotationArrayDialog.open();
-
- if (returnValue == Window.OK) {
- cancelled = false;
- return annotationArrayDialog.getResult();
- } if (returnValue == Window.CANCEL) {
- cancelled = true;
- }
- return values;
- }
-
- public void setMethod(Method method) {
- this.method = method;
- }
-
- @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"); //$NON-NLS-1$
- }
- Button browseClassButton = new Button(typeComposite, SWT.PUSH);
- browseClassButton.setText(JAXWSUIMessages.ANNOTATION_ARRAY_CELL_EDITOR_BROWSE_LABEL);
- browseClassButton.addSelectionListener(new SelectionAdapter() {
- @Override
- public void widgetSelected(SelectionEvent e) {
- SelectionDialog dialog = getClassSelectionDialog();
- dialog.setTitle(JAXWSUIMessages.ANNOTATION_ARRAY_CELL_EDITOR_SELECT_CLASS_TITLE);
- if (dialog.open() == IDialogConstants.OK_ID) {
- Object[] types = dialog.getResult();
-
- if (types != null && types.length > 0) {
- IType type = (IType)types[0];
- if (type.isBinary()) {
- text.setText(type.getClassFile().getElementName());
- }
- }
- }
- }
- });
- controls.put(method.getName(), text);
- }
- 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 c75726a..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/views/AnnotationsColumnLabelProvider.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Shane Clarke.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Shane Clarke - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.jaxws.ui.views;
-
-import java.lang.reflect.Method;
-
-import org.eclipse.jdt.ui.ISharedImages;
-import org.eclipse.jdt.ui.JavaUI;
-import org.eclipse.jface.viewers.ColumnLabelProvider;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.ui.PlatformUI;
-
-public class AnnotationsColumnLabelProvider extends ColumnLabelProvider {
-
- @Override
- public String getText(Object element) {
- if (element instanceof Class) {
- return ((Class<?>)element).getName();
- }
-
- if (element instanceof Method) {
- return ((Method)element).getName();
- }
- return ""; //$NON-NLS-1$
- }
-
- @Override
- public Image getImage(Object element) {
- if (element instanceof Class) {
- return JavaUI.getSharedImages().getImage(ISharedImages.IMG_OBJS_ANNOTATION);
- }
- if (element instanceof Method) {
- return PlatformUI.getWorkbench().getSharedImages().getImage(
- org.eclipse.ui.ISharedImages.IMG_OBJ_FILE);
- }
- return null;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/views/AnnotationsValuesColumnLabelProvider.java b/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/views/AnnotationsValuesColumnLabelProvider.java
deleted file mode 100644
index 046f0be..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/views/AnnotationsValuesColumnLabelProvider.java
+++ /dev/null
@@ -1,180 +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.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.jface.viewers.ColumnLabelProvider;
-import org.eclipse.jface.viewers.TreeViewer;
-import org.eclipse.jst.ws.annotations.core.utils.AnnotationUtils;
-import org.eclipse.jst.ws.internal.jaxws.ui.JAXWSUIPlugin;
-import org.eclipse.swt.graphics.Image;
-
-public class AnnotationsValuesColumnLabelProvider extends ColumnLabelProvider {
- private TreeViewer annotationTreeViewer;
- private Image true_image;
- private Image false_image;
-
- public AnnotationsValuesColumnLabelProvider(TreeViewer annotationTreeViewer) {
- this.annotationTreeViewer = annotationTreeViewer;
- true_image = JAXWSUIPlugin.imageDescriptorFromPlugin(JAXWSUIPlugin.PLUGIN_ID, "icons/obj16/true.gif") //$NON-NLS-1$
- .createImage();
- false_image = JAXWSUIPlugin.imageDescriptorFromPlugin(JAXWSUIPlugin.PLUGIN_ID, "icons/obj16/false.gif") //$NON-NLS-1$
- .createImage();
- }
-
- @Override
- public String getText(Object element) {
- 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());
- }
- 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$
- }
-
- @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());
- }
-
- 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;
- }
-
- 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());
- }
- }
- 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;
- }
-
- @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 9920e65..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/views/AnnotationsValuesEditingSupport.java
+++ /dev/null
@@ -1,539 +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.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.IJavaElement;
-import org.eclipse.jdt.core.IMemberValuePair;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jdt.core.dom.AST;
-import org.eclipse.jdt.core.dom.ASTNode;
-import org.eclipse.jdt.core.dom.Annotation;
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jdt.core.dom.Expression;
-import org.eclipse.jdt.core.dom.MemberValuePair;
-import org.eclipse.jdt.core.dom.NormalAnnotation;
-import org.eclipse.jdt.core.dom.SingleMemberAnnotation;
-import org.eclipse.jdt.ui.SharedASTProvider;
-import org.eclipse.jface.viewers.CellEditor;
-import org.eclipse.jface.viewers.CheckboxCellEditor;
-import org.eclipse.jface.viewers.ComboBoxCellEditor;
-import org.eclipse.jface.viewers.EditingSupport;
-import org.eclipse.jface.viewers.ICellEditorValidator;
-import org.eclipse.jface.viewers.TextCellEditor;
-import org.eclipse.jface.viewers.TreeViewer;
-import org.eclipse.jst.ws.annotations.core.AnnotationsCore;
-import org.eclipse.jst.ws.annotations.core.AnnotationsManager;
-import org.eclipse.jst.ws.annotations.core.initialization.IAnnotationAttributeInitializer;
-import org.eclipse.jst.ws.annotations.core.utils.AnnotationUtils;
-import org.eclipse.jst.ws.internal.jaxws.ui.JAXWSUIMessages;
-import org.eclipse.jst.ws.internal.jaxws.ui.JAXWSUIPlugin;
-import org.eclipse.ltk.core.refactoring.Change;
-import org.eclipse.ltk.core.refactoring.IUndoManager;
-import org.eclipse.ltk.core.refactoring.RefactoringCore;
-import org.eclipse.ltk.core.refactoring.RefactoringStatus;
-import org.eclipse.ltk.core.refactoring.TextFileChange;
-import org.eclipse.text.edits.MultiTextEdit;
-
-public class AnnotationsValuesEditingSupport extends EditingSupport {
- private AnnotationsView annotationsView;
- private TreeViewer treeViewer;
-
- private TextCellEditor textCellEditor;
- private CheckboxCellEditor checkboxCellEditor;
- private ComboBoxCellEditor comboBoxCellEditor;
- private ClassDialogCellEditor classDialogCellEditor;
- private AnnotationArrayCellEditor annotationArrayCellEditor;
-
- public AnnotationsValuesEditingSupport(AnnotationsView annotationsView, TreeViewer treeViewer) {
- super(treeViewer);
- this.treeViewer = treeViewer;
- this.annotationsView = annotationsView;
- textCellEditor = new TextCellEditor(treeViewer.getTree());
- checkboxCellEditor = new CheckboxCellEditor(treeViewer.getTree());
- comboBoxCellEditor = new ComboBoxCellEditor(treeViewer.getTree(), new String[] {});
- classDialogCellEditor = new ClassDialogCellEditor(treeViewer.getTree());
- annotationArrayCellEditor = new AnnotationArrayCellEditor(treeViewer.getTree(), new Object[] {});
- }
-
- @Override
- protected boolean canEdit(Object element) {
- if (element instanceof Method) {
- Method method = (Method)element;
- return (Boolean) getValue(method.getDeclaringClass());
- }
- return true;
- }
-
- @Override
- protected CellEditor getCellEditor(Object element) {
- if (element instanceof Class) {
- return checkboxCellEditor;
- }
- if (element instanceof Method) {
- Method method = (Method) element;
- final Class<?> returnType = method.getReturnType();
- if (returnType.isEnum()) {
- Object[] enumConstants = returnType.getEnumConstants();
- String[] values = new String[enumConstants.length];
- for (int i = 0; i < enumConstants.length; i++) {
- values[i] = enumConstants[i].toString();
- }
- comboBoxCellEditor.setItems(values);
- return comboBoxCellEditor;
- }
- if (returnType.equals(Boolean.TYPE)) {
- return checkboxCellEditor;
- }
-
- if (returnType.equals(Class.class)) {
- return classDialogCellEditor;
- }
-
- if (returnType.isArray()) {
- annotationArrayCellEditor.setMethod(method);
- return annotationArrayCellEditor;
- }
- if (returnType.isPrimitive()) {
- textCellEditor.setValidator(new ICellEditorValidator() {
- public String isValid(Object value) {
- try {
- if (returnType.equals(Byte.TYPE)) {
- Byte.parseByte((String) value);
- }
- if (returnType.equals(Short.TYPE)) {
- Short.parseShort((String) value);
- }
- if (returnType.equals(Integer.TYPE)) {
- Integer.parseInt((String) value);
- }
- if (returnType.equals(Long.TYPE)) {
- Long.parseLong((String) value);
- }
- if (returnType.equals(Float.TYPE)) {
- Float.parseFloat((String) value);
- }
- if (returnType.equals(Double.TYPE)) {
- Double.parseDouble((String) value);
- }
- } catch (NumberFormatException nfe) {
- return JAXWSUIMessages.ANNOTATION_EDITING_SUPPORT_NOT_VALID_MESSAGE_PREFIX
- + returnType.getSimpleName();
- }
- return null;
- }
- });
- return textCellEditor;
- }
- return textCellEditor;
- }
- return checkboxCellEditor;
- }
-
- @Override
- protected Object getValue(Object element) {
- if (element instanceof Class) {
- return getValueForClass((Class<?>) element);
- }
- if (element instanceof Method) {
- return getValueForMethod((Method) element);
- }
- return null;
- }
-
- private Object getValueForClass(Class<?> aClass) {
- if (treeViewer.getInput() instanceof IAnnotatable) {
- return getValueForClass(aClass, (IAnnotatable) treeViewer.getInput());
- }
- return Boolean.FALSE;
- }
-
- private Object getValueForClass(Class<?> aClass, IAnnotatable annotatedElement) {
- try {
- IAnnotation[] annotations = annotatedElement.getAnnotations();
- for (IAnnotation annotation : annotations) {
- String annotationName = annotation.getElementName();
- if (AnnotationUtils.isAnnotationPresent((IJavaElement)annotatedElement, annotationName)
- && (annotationName.equals(aClass.getSimpleName())
- || annotationName.equals(aClass.getCanonicalName()))) {
- return Boolean.TRUE;
- }
- }
- } catch (JavaModelException jme) {
- JAXWSUIPlugin.log(jme.getStatus());
- }
- return Boolean.FALSE;
- }
-
- private Object getValueForMethod(Method method) {
- Object value = null;
- try {
- if (treeViewer.getInput() instanceof IAnnotatable) {
- value = getValueForMethod(method, (IAnnotatable) treeViewer.getInput());
- }
- } catch (JavaModelException jme) {
- JAXWSUIPlugin.log(jme.getStatus());
- }
- return value;
- }
-
- private Object getValueForMethod(Method method, IAnnotatable annotatedElement) throws JavaModelException {
- Class<?> returnType = method.getReturnType();
- IAnnotation[] annotations = annotatedElement.getAnnotations();
- for (IAnnotation annotation : annotations) {
- Class<?> declaringClass = method.getDeclaringClass();
- String annotationName = annotation.getElementName();
- if (annotationName.equals(declaringClass.getSimpleName())
- || annotationName.equals(declaringClass.getCanonicalName())) {
- IMemberValuePair[] memberValuePairs = annotation.getMemberValuePairs();
- for (IMemberValuePair memberValuePair : memberValuePairs) {
- if (memberValuePair.getMemberName().equals(method.getName())) {
- if (returnType.equals(String.class)) {
- return memberValuePair.getValue();
- }
-
- if (returnType.isEnum()) {
- String enumValue = memberValuePair.getValue().toString();
- String literal = enumValue.substring(enumValue.lastIndexOf(".") + 1); //$NON-NLS-1$
- Object[] enumConstants = method.getReturnType().getEnumConstants();
- for (int i = 0; i < enumConstants.length; i++) {
- if (enumConstants[i].toString().equals(literal)) {
- return i;
- }
- }
- }
-
- if (returnType.equals(Class.class)) {
- return memberValuePair.getValue();
- }
-
- if (returnType.equals(Boolean.TYPE)) {
- return memberValuePair.getValue();
- }
-
- if (returnType.isPrimitive()) {
- return ""; //$NON-NLS-1$
- }
- if (returnType.isArray()) {
- if (memberValuePair.getValueKind() == IMemberValuePair.K_CLASS) {
- Object[] arrayValues = (Object[])memberValuePair.getValue();
- for (int i = 0; i < arrayValues.length; i++) {
- String value = arrayValues[i].toString();
- arrayValues[i] = value + ".class"; //$NON-NLS-1$
- }
- return arrayValues;
- }
- return memberValuePair.getValue();
- }
- }
- }
- return getDefaultValueForMethod(returnType);
- }
- }
- return null;
- }
-
- private Object getDefaultValueForMethod(Class<?> returnType) {
- if (returnType.equals(String.class)) {
- return ""; //$NON-NLS-1$
- }
- if (returnType.equals(Boolean.TYPE)) {
- return Boolean.FALSE;
- }
- if (returnType.isEnum()) {
- return -1;
- }
- if (returnType.isPrimitive()) {
- return ""; //$NON-NLS-1$
- }
- if (returnType.isArray()) {
- return new Object[] {};
- }
- return null;
- }
-
- @Override
- protected void setValue(Object element, Object value) {
- if (value == null) {
- return;
- }
-
- try {
- if (element instanceof Class && ((Class<?>) element).isAnnotation()) {
- @SuppressWarnings("unchecked")
- Class<? extends java.lang.annotation.Annotation> annotationClass =
- (Class<? extends java.lang.annotation.Annotation>) element;
- if (annotationClass != null) {
- setValueForClass(annotationClass, (Boolean) value);
- }
- }
- if (element instanceof Method) {
- setValueForMethod((Method) element, value);
- }
- } catch (CoreException ce) {
- JAXWSUIPlugin.log(ce.getStatus());
- }
- }
-
- private void setValueForClass(Class<? extends java.lang.annotation.Annotation> annotationClass,
- Boolean annotate) throws CoreException {
- Object viewerInput = treeViewer.getInput();
-
- IAnnotationAttributeInitializer annotationAttributeInitializer =
- AnnotationsManager.getAnnotationDefinitionForClass(annotationClass).getAnnotationAttributeInitializer();
-
- if (viewerInput instanceof IJavaElement) {
- setValueForClass(annotationClass, annotate, (IJavaElement) viewerInput, annotationAttributeInitializer);
- }
- }
-
- private Annotation getAnnotation(AST ast, Class<? extends java.lang.annotation.Annotation> annotationClass,
- List<MemberValuePair> memberValuePairs) {
-
- Annotation annotation = null;
- int numberOfDeclaredMethods = annotationClass.getDeclaredMethods().length;
- if (numberOfDeclaredMethods == 0) {
- annotation = AnnotationsCore.createMarkerAnnotation(ast, annotationClass.getSimpleName());
- } else if (numberOfDeclaredMethods == 1) {
- Expression value = null;
- if (memberValuePairs != null && memberValuePairs.size() == 1) {
- MemberValuePair memberValuePair = memberValuePairs.get(0);
- if (memberValuePair != null) {
- value = memberValuePair.getValue();
- }
- }
- if (value != null) {
- annotation = AnnotationsCore.createSingleMemberAnnotation(ast, annotationClass.getSimpleName(), value);
- } else {
- annotation = AnnotationsCore.createNormalAnnotation(ast, annotationClass.getSimpleName(), memberValuePairs);
- }
- } else if (numberOfDeclaredMethods > 1) {
- annotation = AnnotationsCore.createNormalAnnotation(ast, annotationClass.getSimpleName(), memberValuePairs);
- }
-
- return annotation;
- }
-
- private void setValueForClass(Class<? extends java.lang.annotation.Annotation> annotationClass,
- Boolean annotate, IJavaElement javaElement, IAnnotationAttributeInitializer annotationAttributeInitializer)
- throws CoreException {
- ICompilationUnit source = AnnotationUtils.getCompilationUnitFromJavaElement(javaElement);
- CompilationUnit compilationUnit = SharedASTProvider.getAST(source, SharedASTProvider.WAIT_YES, null);
- AST ast = compilationUnit.getAST();
-
- List<MemberValuePair> memberValuePairs = getMemberValuePairs(annotationAttributeInitializer, javaElement,
- ast, annotationClass);
-
- Annotation annotation = getAnnotation(ast, annotationClass, memberValuePairs);
-
- TextFileChange change = new TextFileChange("Add/Remove Annotation", (IFile) source.getResource()); //$NON-NLS-1$
- MultiTextEdit multiTextEdit = new MultiTextEdit();
- change.setEdit(multiTextEdit);
-
- if (annotate) {
- if (javaElement.getElementType() == IJavaElement.PACKAGE_DECLARATION
- || javaElement.getElementType() == IJavaElement.TYPE
- || javaElement.getElementType() == IJavaElement.FIELD
- || javaElement.getElementType() == IJavaElement.METHOD
- || javaElement.getElementType() == IJavaElement.LOCAL_VARIABLE) {
- change.addEdit(AnnotationUtils.createAddAnnotationTextEdit(javaElement, annotation));
- change.addEdit(AnnotationUtils.createAddImportTextEdit(javaElement, annotationClass.getCanonicalName()));
- }
- } else {
- if (javaElement.getElementType() == IJavaElement.PACKAGE_DECLARATION
- || javaElement.getElementType() == IJavaElement.TYPE
- || javaElement.getElementType() == IJavaElement.FIELD
- || javaElement.getElementType() == IJavaElement.METHOD
- || javaElement.getElementType() == IJavaElement.LOCAL_VARIABLE) {
- change.addEdit(AnnotationUtils.createRemoveAnnotationTextEdit(javaElement, annotation));
- change.addEdit(AnnotationUtils.createRemoveImportTextEdit(javaElement, annotationClass.getCanonicalName()));
- }
- }
- executeChange(new NullProgressMonitor(), change);
- }
-
- private List<MemberValuePair> getMemberValuePairs(
- IAnnotationAttributeInitializer annotationAttributeInitializer, IJavaElement javaElement, AST ast,
- Class<?extends java.lang.annotation.Annotation> annotationClass) {
- if (annotationAttributeInitializer != null) {
- return annotationAttributeInitializer.getMemberValuePairs(javaElement, ast, annotationClass);
- }
- return Collections.emptyList();
- }
-
-
- private void setValueForMethod(Method method, Object value) throws CoreException {
- if (((Boolean) getValue(method.getDeclaringClass())).booleanValue()) {
- Object viewerInput = treeViewer.getInput();
- if (viewerInput instanceof IAnnotatable) {
- setValueForMethod(method, value, (IJavaElement) viewerInput);
- }
- }
- }
-
- private void setValueForMethod(Method method, Object value, IJavaElement javaElement) throws CoreException {
- ICompilationUnit source = AnnotationUtils.getCompilationUnitFromJavaElement(javaElement);
- CompilationUnit compilationUnit = SharedASTProvider.getAST(source, SharedASTProvider.WAIT_YES, null);
- AST ast = compilationUnit.getAST();
-
- TextFileChange change = new TextFileChange("Add/Update Annotation Value", (IFile) source.getResource());
- MultiTextEdit multiTextEdit = new MultiTextEdit();
- change.setEdit(multiTextEdit);
-
- List<Annotation> annotations = AnnotationUtils.getAnnotations(javaElement);
- for (Annotation annotation : annotations) {
- if (annotation instanceof NormalAnnotation) {
- NormalAnnotation normalAnnotation = (NormalAnnotation) annotation;
- Class<?> declaringClass = method.getDeclaringClass();
- String annotationName = normalAnnotation.getTypeName().getFullyQualifiedName();
- if (annotationName.equals(declaringClass.getSimpleName()) || annotationName.equals(declaringClass.getCanonicalName())) {
- @SuppressWarnings("unchecked")
- List<MemberValuePair> memberValuePairs = normalAnnotation.values();
- boolean hasMemberValuePair = false;
- for (MemberValuePair memberValuePair : memberValuePairs) {
- if (memberValuePair.getName().getIdentifier().equals(method.getName())) {
- ASTNode memberValue = getMemberValuePairValue(ast, method, value);
- if (memberValue != null) {
- change.addEdit(AnnotationUtils.createUpdateMemberValuePairTextEdit(memberValuePair, memberValue));
- hasMemberValuePair = true;
- break;
- }
- }
- }
- if (!hasMemberValuePair) {
- MemberValuePair memberValuePair = getMemberValuePair(ast, method, value);
- if (memberValuePair != null) {
- change.addEdit(AnnotationUtils.createAddMemberValuePairTextEdit(normalAnnotation, memberValuePair));
- break;
- }
- }
- }
- } else if (annotation instanceof SingleMemberAnnotation) {
- SingleMemberAnnotation singleMemberAnnotation = (SingleMemberAnnotation) annotation;
- Class<?> declaringClass = method.getDeclaringClass();
- String annotationName = singleMemberAnnotation.getTypeName().getFullyQualifiedName();
- if (annotationName.equals(declaringClass.getSimpleName()) || annotationName.equals(declaringClass.getCanonicalName())) {
- MemberValuePair memberValuePair = getMemberValuePair(ast, method, value);
- if (memberValuePair != null) {
- change.addEdit(AnnotationUtils.createUpdateSingleMemberAnnotationTextEdit(singleMemberAnnotation, memberValuePair.getValue()));
- break;
- }
- }
-
- }
- }
-
- executeChange(new NullProgressMonitor(), change);
- }
-
- private ASTNode getMemberValuePairValue(AST ast, Method method, Object value) {
- Class<?> returnType = method.getReturnType();
- if (returnType.equals(String.class)) {
- return AnnotationsCore.createStringLiteral(ast, value.toString());
- }
- if (returnType.equals(Boolean.TYPE)) {
- return AnnotationsCore.createBooleanLiteral(ast, ((Boolean) value).booleanValue());
- }
- if (returnType.isPrimitive()
- && (returnType.equals(Byte.TYPE) || returnType.equals(Short.TYPE)
- || returnType.equals(Integer.TYPE) || returnType.equals(Long.TYPE)
- || returnType.equals(Float.TYPE) || returnType.equals(Double.TYPE))) {
- return AnnotationsCore.createNumberLiteral(ast, value.toString());
- }
- if (returnType.isArray()) {
- 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 MemberValuePair getMemberValuePair(AST ast, Method method, Object value) {
- Class<?> returnType = method.getReturnType();
- if (returnType.equals(String.class)) {
- return AnnotationsCore.createStringMemberValuePair(ast, method.getName(), (String) value);
- }
- if (returnType.equals(Boolean.TYPE)) {
- return AnnotationsCore.createBooleanMemberValuePair(ast, method.getName(), (Boolean) value);
- }
- if (returnType.isPrimitive()
- && (returnType.equals(Byte.TYPE) || returnType.equals(Short.TYPE)
- || returnType.equals(Integer.TYPE) || returnType.equals(Long.TYPE)
- || returnType.equals(Float.TYPE) || returnType.equals(Double.TYPE))) {
- return AnnotationsCore.createNumberMemberValuePair(ast, method.getName(), value.toString());
- }
- if (returnType.isArray()) {
- return AnnotationsCore.createArrayMemberValuePair(ast, method, (Object[]) value);
- }
-
- if (returnType.equals(Class.class)) {
- return AnnotationsCore.createTypeMemberValuePair(ast, method.getName(), value.toString());
- }
-
- if (returnType.isEnum()) {
- int selected = ((Integer) value).intValue();
- if (selected != -1) {
- return AnnotationsCore.createEnumMemberValuePair(ast,
- method.getDeclaringClass().getCanonicalName(), method.getName(), method.getReturnType()
- .getEnumConstants()[selected]);
- }
- }
- return null;
- }
-
- private void executeChange(IProgressMonitor monitor, Change change) {
- if (change == null) {
- return;
- }
-
- IUndoManager manager = RefactoringCore.getUndoManager();
- boolean successful = false;
- Change undoChange = null;
- try {
- change.initializeValidationData(monitor);
- RefactoringStatus valid = change.isValid(monitor);
- if (valid.isOK()) {
- manager.aboutToPerformChange(change);
- undoChange = change.perform(monitor);
- successful = true;
- }
- } catch (CoreException ce) {
- JAXWSUIPlugin.log(ce.getStatus());
- } finally {
- manager.changePerformed(change, successful);
- }
- if (undoChange != null) {
- undoChange.initializeValidationData(monitor);
- manager.addUndo(undoChange.getName(), undoChange);
- }
- annotationsView.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 233237d..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/views/AnnotationsView.java
+++ /dev/null
@@ -1,467 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Shane Clarke.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Shane Clarke - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.jaxws.ui.views;
-
-import java.lang.reflect.Method;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IField;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.ILocalVariable;
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jdt.ui.JavaUI;
-import org.eclipse.jface.action.IMenuManager;
-import org.eclipse.jface.text.ITextSelection;
-import org.eclipse.jface.text.TextSelection;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.TreePath;
-import org.eclipse.jface.viewers.TreeViewer;
-import org.eclipse.jface.viewers.TreeViewerColumn;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.viewers.ViewerComparator;
-import org.eclipse.jface.viewers.ViewerFilter;
-import org.eclipse.jst.ws.annotations.core.AnnotationDefinition;
-import org.eclipse.jst.ws.annotations.core.AnnotationsManager;
-import org.eclipse.jst.ws.annotations.core.utils.AnnotationUtils;
-import org.eclipse.jst.ws.internal.jaxws.ui.JAXWSUIMessages;
-import org.eclipse.jst.ws.internal.jaxws.ui.JAXWSUIPlugin;
-import org.eclipse.jst.ws.internal.jaxws.ui.actions.AnnotationsViewFilterAction;
-import org.eclipse.jst.ws.internal.jaxws.ui.widgets.ClasspathComposite;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Tree;
-import org.eclipse.swt.widgets.TreeColumn;
-import org.eclipse.ui.IActionBars;
-import org.eclipse.ui.IEditorDescriptor;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IFileEditorInput;
-import org.eclipse.ui.IMemento;
-import org.eclipse.ui.INullSelectionListener;
-import org.eclipse.ui.IPartListener2;
-import org.eclipse.ui.IViewSite;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.ui.IWorkbenchPartReference;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.ide.IDE;
-import org.eclipse.ui.part.PageBook;
-import org.eclipse.ui.part.ViewPart;
-import org.eclipse.ui.texteditor.ITextEditor;
-
-public class AnnotationsView extends ViewPart implements INullSelectionListener, IPartListener2 {
- private PageBook pageBook;
- private Tree annotationTree;
-
- private Composite notAvaiableComposite;
- private ClasspathComposite setupClasspathComposite;
-
- private TreeViewer annotationTreeViewer;
-
- private IMemento memento;
-
- private AnnotationsViewFilterAction annotationsViewFilterAction;
-
- public AnnotationsView() {
- }
-
- @Override
- public void createPartControl(Composite parent) {
- pageBook = new PageBook(parent, SWT.NONE);
-
- annotationTree = new Tree(pageBook, SWT.SINGLE | SWT.FULL_SELECTION | SWT.BORDER | SWT.V_SCROLL
- | SWT.H_SCROLL);
- annotationTreeViewer = new TreeViewer(annotationTree);
-
- annotationTreeViewer.setContentProvider(new AnnotationsViewContentProvider());
- annotationTreeViewer.getTree().setHeaderVisible(true);
- annotationTreeViewer.getTree().setLinesVisible(true);
-
- TreeViewerColumn annotationsViewerColumn = new TreeViewerColumn(annotationTreeViewer, SWT.NONE);
- annotationsViewerColumn.setLabelProvider(new AnnotationsColumnLabelProvider());
- TreeColumn annotationsColumn = annotationsViewerColumn.getColumn();
- annotationsColumn.setWidth(400);
- annotationsColumn.setMoveable(false);
- annotationsColumn.setText(JAXWSUIMessages.ANNOTATIONS_VIEW_ANNOTATIONS_COLUMN_NAME);
-
- TreeViewerColumn valuesViewerColumn = new TreeViewerColumn(annotationTreeViewer, SWT.NONE);
- valuesViewerColumn.setLabelProvider(new AnnotationsValuesColumnLabelProvider(annotationTreeViewer));
- valuesViewerColumn.setEditingSupport(new AnnotationsValuesEditingSupport(this, annotationTreeViewer));
- TreeColumn valuesColumn = valuesViewerColumn.getColumn();
- valuesColumn.setWidth(400);
- valuesColumn.setMoveable(false);
- valuesColumn.setAlignment(SWT.LEFT);
- valuesColumn.setText(JAXWSUIMessages.ANNOTATIONS_VIEW_ANNOTATIONS_VALUES_COLUMN_NAME);
-
- //Selection Service
- startListeningForSelectionChanges();
- //Part Service
- getViewSite().getWorkbenchWindow().getPartService().addPartListener(this);
-
- contributeToActionBars();
-
- notAvaiableComposite = new Composite(pageBook, SWT.NONE);
- GridLayout gridLayout = new GridLayout();
- notAvaiableComposite.setLayout(gridLayout);
- GridData gridData = new GridData(SWT.FILL, SWT.FILL, true, true);
- notAvaiableComposite.setLayoutData(gridData);
- notAvaiableComposite.setBackground(parent.getDisplay().getSystemColor(SWT.COLOR_WHITE));
- Label label = new Label(notAvaiableComposite, SWT.NONE);
- label.setBackground(parent.getDisplay().getSystemColor(SWT.COLOR_WHITE));
- label.setText(JAXWSUIMessages.ANNOTATIONS_VIEW_ANNOTATIONS_NOT_AVAILABLE_ON_SELECTION);
-
- annotationTreeViewer.setComparator(new ViewerComparator() {
- @Override
- public int compare(Viewer viewer, Object obj1, Object obj2) {
- if ((obj1 instanceof Class<?> && ((Class<?>) obj1).isAnnotation())
- && (obj2 instanceof Class<?> && ((Class<?>) obj2).isAnnotation())) {
- return ((Class<? extends java.lang.annotation.Annotation>) obj1).getCanonicalName().compareTo(
- ((Class<? extends java.lang.annotation.Annotation>) obj2).getCanonicalName());
- }
- if (obj1 instanceof Method && obj2 instanceof Method) {
- return ((Method)obj1).getName().compareTo(((Method)obj2).getName());
- }
- return super.compare(viewer, obj1, obj2);
- }
- });
-
- //TODO Add a Faceted Project composite
- setupClasspathComposite = new ClasspathComposite(pageBook, SWT.NONE);
-
- pageBook.showPage(notAvaiableComposite);
- }
-
- private void startListeningForSelectionChanges() {
- getViewSite().getWorkbenchWindow().getSelectionService().addPostSelectionListener(this);
- }
-
- private void stopListeningForSelectionChanges() {
- getViewSite().getWorkbenchWindow().getSelectionService().removePostSelectionListener(this);
- }
-
- public void selectionChanged(IWorkbenchPart part, ISelection selection) {
- IWorkbenchPage workbenchPage = getViewSite().getWorkbenchWindow().getActivePage();
-
- if (workbenchPage == null) {
- return;
- }
-
- IWorkbenchPartReference workbenchPartReference = workbenchPage.getActivePartReference();
-
- if (workbenchPartReference == null || workbenchPartReference.getId().equals(getViewSite().getId())
- || !workbenchPartReference.getId().equals(JavaUI.ID_CU_EDITOR)) {
- return;
- }
-
- IEditorPart editorPart = workbenchPage.getActiveEditor();
-
- IFileEditorInput fileEditorInput = (IFileEditorInput) editorPart.getEditorInput();
-
- if (selection instanceof TextSelection) {
- ITextSelection txtSelection = (TextSelection) selection;
- ICompilationUnit compilationUnit = JavaCore.createCompilationUnitFrom(fileEditorInput.getFile());
- if (compilationUnit != null) {
- updateView(compilationUnit, txtSelection);
- }
- }
- }
-
- public void updateView(IJavaElement javaElement, ITextSelection textSelection) {
- TreePath[] expandedTreePaths = annotationTreeViewer.getExpandedTreePaths();
-
- IJavaProject javaProject = javaElement.getJavaProject();
-
- if (!checkClasspath(javaProject)) {
- annotationTreeViewer.setInput(null);
- pageBook.showPage(setupClasspathComposite);
- return;
- }
-
- pageBook.showPage(annotationTree);
-
- int offset = textSelection.getOffset();
- try {
- ICompilationUnit compilationUnit = null;
- if (javaElement instanceof ICompilationUnit) {
- compilationUnit = (ICompilationUnit)javaElement;
- javaElement = compilationUnit.getElementAt(offset);
- }
-
- if (javaElement == null) {
- return;
- }
-
- if (javaElement.getElementType() == IJavaElement.PACKAGE_DECLARATION) {
- if (javaElement.getResource().getName().equals("package-info.java")) { //$NON-NLS-1$
- annotationTreeViewer.setInput(javaElement);
- } else {
- annotationTreeViewer.setInput(null);
- }
- }
-
- if (javaElement.getElementType() == IJavaElement.IMPORT_DECLARATION) {
- annotationTreeViewer.setInput(null);
- }
-
- if (javaElement.getElementType() == IJavaElement.TYPE) {
- IType type = (IType)javaElement;
- if (!type.isMember()) {
- 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()) {
- ILocalVariable localVariable = AnnotationUtils.getLocalVariable(method, offset);
- if (localVariable != null) {
- annotationTreeViewer.setInput(localVariable);
- } 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.
- */
- @Override
- 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 = JavaCore.createCompilationUnitFrom(fileEditorInput.getFile());
- if (compilationUnit != null) {
- if (!compilationUnit.isConsistent()) {
- compilationUnit.makeConsistent(new NullProgressMonitor());
- }
- updateView(compilationUnit, (ITextSelection) txtEditor.getSelectionProvider()
- .getSelection());
- }
- }
- } catch (JavaModelException jme) {
- JAXWSUIPlugin.log(jme.getStatus());
- } catch (PartInitException pie) {
- JAXWSUIPlugin.log(pie.getStatus());
- }
- }
- });
- }
- }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/views/AnnotationsViewCategoryFilter.java b/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/views/AnnotationsViewCategoryFilter.java
deleted file mode 100644
index dc6af12..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/views/AnnotationsViewCategoryFilter.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Shane Clarke.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Shane Clarke - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.jaxws.ui.views;
-
-import java.lang.annotation.Annotation;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.jface.viewers.StructuredViewer;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.viewers.ViewerFilter;
-import org.eclipse.jst.ws.annotations.core.AnnotationDefinition;
-import org.eclipse.jst.ws.annotations.core.AnnotationsManager;
-import org.eclipse.ui.IMemento;
-
-public class AnnotationsViewCategoryFilter extends ViewerFilter {
- private static final String TAG_CATEGORY = "AnnotationCategoryFilterInfo"; //$NON-NLS-1$
- private static final String TAG_CATEGORY_NAME = "categoryName"; //$NON-NLS-1$
-
- private AnnotationsView annotationsView;
- private final StructuredViewer viewer;
-
- private List<Object> categories;
-
- public AnnotationsViewCategoryFilter(AnnotationsView annotationsView, StructuredViewer viewer) {
- this.annotationsView = annotationsView;
- this.viewer = viewer;
- categories = new ArrayList<Object>();
- }
-
- @Override
- public boolean select(Viewer viewer, Object parentElement, Object element) {
- if (element instanceof Class && ((Class<?>) element).isAnnotation()) {
- AnnotationDefinition annotationDefinition = AnnotationsManager.
- getAnnotationDefinitionForClass((Class<? extends Annotation>)element);
- if (annotationDefinition != null) {
- return !categories.contains(annotationDefinition.getCategory());
- }
- }
- return true;
- }
-
- public void filterAnnotations(List<Object> categories) {
- this.categories = categories;
- if (categories.size() > 0) {
- viewer.addFilter(this);
- } else {
- viewer.removeFilter(this);
- }
- annotationsView.refresh();
- }
-
- public List<Object> getCategories() {
- return categories;
- }
-
- public void init(IMemento memento) {
- IMemento catMemento = memento.getChild(TAG_CATEGORY);
- if (catMemento == null) {
- return;
- }
- for (int i = 0; i < AnnotationsManager.getAnnotationCategories().size(); i++) {
- String category = catMemento.getString(TAG_CATEGORY_NAME + i);
- if (category != null) {
- categories.add(category);
- }
- }
- filterAnnotations(categories);
- }
-
- public void saveState(IMemento memento) {
- if (categories == null || categories.size() == 0) {
- return;
- }
- IMemento catMemento = memento.createChild(TAG_CATEGORY);
- int i = 0;
- for (Object category : categories) {
- catMemento.putString(TAG_CATEGORY_NAME + i, category.toString());
- i++;
- }
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/views/AnnotationsViewContentProvider.java b/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/views/AnnotationsViewContentProvider.java
deleted file mode 100755
index 4e23056..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/views/AnnotationsViewContentProvider.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 org.eclipse.jface.viewers.ITreeContentProvider;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jst.ws.annotations.core.AnnotationsManager;
-
-public class AnnotationsViewContentProvider implements ITreeContentProvider {
-
- public Object[] getChildren(Object parentElement) {
- if (parentElement instanceof Class) {
- return ((Class<?>)parentElement).getDeclaredMethods();
- }
- return new Object[] {};
- }
-
- public Object getParent(Object element) {
- return null;
- }
-
- public boolean hasChildren(Object element) {
- if (element instanceof Class) {
- return ((Class<?>)element).getDeclaredMethods().length > 0;
- }
- return false;
- }
-
- public Object[] getElements(Object inputElement) {
- if (inputElement != null) {
- return AnnotationsManager.getAnnotations(inputElement).toArray();
- }
- return new Object[] {};
- }
-
- public void dispose() {
-
- }
-
- public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/views/ClassDialogCellEditor.java b/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/views/ClassDialogCellEditor.java
deleted file mode 100644
index ebe786b..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/views/ClassDialogCellEditor.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Shane Clarke.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Shane Clarke - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.jaxws.ui.views;
-
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jdt.core.search.SearchEngine;
-import org.eclipse.jdt.ui.IJavaElementSearchConstants;
-import org.eclipse.jdt.ui.JavaUI;
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.jface.viewers.DialogCellEditor;
-import org.eclipse.jst.ws.internal.jaxws.ui.JAXWSUIPlugin;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.dialogs.SelectionDialog;
-
-public class ClassDialogCellEditor extends DialogCellEditor {
-
- public ClassDialogCellEditor(Composite parent) {
- super(parent, SWT.NONE);
- }
-
- @Override
- protected Object openDialogBox(Control cellEditorWindow) {
- try {
- SelectionDialog dialog = JavaUI.createTypeDialog(cellEditorWindow.getShell(),
- PlatformUI.getWorkbench().getProgressService(),
- SearchEngine.createWorkspaceScope(), IJavaElementSearchConstants.CONSIDER_CLASSES,
- false, "* "); //$NON-NLS-1$
-
- if (dialog.open() == IDialogConstants.OK_ID) {
- Object[] types = dialog.getResult();
-
- if (types != null && types.length > 0) {
- IType type = (IType)types[0];
- if (type.isBinary()) {
- return type.getFullyQualifiedName();
- }
- }
- }
- } catch (JavaModelException jme) {
- JAXWSUIPlugin.log(jme.getStatus());
- }
- return null;
- }
-
- @Override
- protected void updateContents(Object value) {
- if (value != null) {
- getDefaultLabel().setText(value.toString() + ".class"); //$NON-NLS-1$
- } else {
- getDefaultLabel().setText(""); //$NON-NLS-1$
- }
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/widgets/ClasspathComposite.java b/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/widgets/ClasspathComposite.java
deleted file mode 100644
index d9debc5..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/widgets/ClasspathComposite.java
+++ /dev/null
@@ -1,91 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Shane Clarke.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Shane Clarke - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.jaxws.ui.widgets;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.jdt.core.IClasspathEntry;
-import org.eclipse.jdt.launching.JavaRuntime;
-import org.eclipse.jst.ws.internal.jaxws.ui.JAXWSUIMessages;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Link;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.dialogs.PreferencesUtil;
-import org.eclipse.ui.part.FileEditorInput;
-
-public class ClasspathComposite extends Composite {
-
- private String JRE_PREF_PAGE_ID = "org.eclipse.jdt.debug.ui.preferences.VMPreferencePage"; //$NON-NLS-1$
- private String PROP_ID = "org.eclipse.jdt.ui.propertyPages.BuildPathsPropertyPage"; //$NON-NLS-1$
- private Object DATA_REVEAL_ENTRY = "select_classpath_entry"; //$NON-NLS-1$
-
- private Label informationLabel;
-
- public ClasspathComposite(Composite parent, int style) {
- super(parent, style);
- addControls();
- }
-
- public void addControls() {
- GridLayout gridLayout = new GridLayout();
- this.setLayout(gridLayout);
- GridData gridData = new GridData(SWT.FILL, SWT.FILL, true, true);
- this.setLayoutData(gridData);
- this.setBackground(getParent().getDisplay().getSystemColor(SWT.COLOR_WHITE));
- informationLabel = new Label(this, SWT.NONE);
- informationLabel.setBackground(getParent().getDisplay().getSystemColor(SWT.COLOR_WHITE));
- informationLabel.setText(JAXWSUIMessages.bind(
- JAXWSUIMessages.ANNOTATIONS_VIEW_NO_SUITABLE_LIBRARY_FOUND, "JAX-WS")); //$NON-NLS-1$
- Link link = new Link(this, SWT.NONE);
- link.setBackground(getParent().getDisplay().getSystemColor(SWT.COLOR_WHITE));
- link.setText(JAXWSUIMessages.CONFIGURE_JAVA_1_6_LIBRARY);
- link.addSelectionListener(new SelectionAdapter() {
- public void widgetSelected(SelectionEvent selectionEvent) {
- if (selectionEvent.text.equals("1")) { //$NON-NLS-1$
- PreferencesUtil.createPreferenceDialogOn(getShell(), JRE_PREF_PAGE_ID,
- new String[] { JRE_PREF_PAGE_ID }, null).open();
- } else {
- Map<Object, IClasspathEntry> data = new HashMap<Object, IClasspathEntry>();
- data.put(DATA_REVEAL_ENTRY, JavaRuntime.getDefaultJREContainerEntry());
- PreferencesUtil.createPropertyDialogOn(getShell(), getProject(), PROP_ID,
- new String[] { PROP_ID }, data).open();
- }
- }
- });
- //TODO update the labels to provide information for supported annotation libraries that are missing
- //on the selected projects classpath.
- //Label otherLibrariesLabel = new Label(this, SWT.SHADOW_IN);
- //otherLibrariesLabel.setBackground(getParent().getDisplay().getSystemColor(SWT.COLOR_WHITE));
- //otherLibrariesLabel.setText("Annotation Libraries currently supported: " + AnnotationsManager.getAnnotationCategories());
- //otherLibrariesLabel.setText(JAXWSUIMessages.ANNOTATIONS_VIEW_OTHER_ANNOTATION_LIBRARIES_USE);
-
- }
-
- private IProject getProject() {
- return ((FileEditorInput) PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage()
- .getActiveEditor().getEditorInput()).getFile().getProject();
- }
-
-
- public void updateLibraryLabel(String libraryName) {
- informationLabel.setText(JAXWSUIMessages.bind(
- JAXWSUIMessages.ANNOTATIONS_VIEW_NO_SUITABLE_LIBRARY_FOUND, libraryName));
- }
-
- }
diff --git a/bundles/org.eclipse.jst.ws.jaxws.utils/.classpath b/bundles/org.eclipse.jst.ws.jaxws.utils/.classpath
deleted file mode 100755
index 2d1a430..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.utils/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/bundles/org.eclipse.jst.ws.jaxws.utils/.project b/bundles/org.eclipse.jst.ws.jaxws.utils/.project
deleted file mode 100755
index ca99091..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.utils/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.jst.ws.jaxws.utils</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
diff --git a/bundles/org.eclipse.jst.ws.jaxws.utils/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.jst.ws.jaxws.utils/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100755
index ae0484e..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.utils/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,8 +0,0 @@
-#Mon Jul 20 15:25:31 EEST 2009
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.5
diff --git a/bundles/org.eclipse.jst.ws.jaxws.utils/META-INF/MANIFEST.MF b/bundles/org.eclipse.jst.ws.jaxws.utils/META-INF/MANIFEST.MF
deleted file mode 100755
index e51253e..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.utils/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,27 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %Bundle-Name.0
-Bundle-Vendor: %Bundle-Vendor.0
-Bundle-SymbolicName: org.eclipse.jst.ws.jaxws.utils;singleton:=true
-Bundle-Version: 1.0.0.qualifier
-Bundle-Localization: plugin
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.jdt.core,
- org.eclipse.core.resources,
- org.eclipse.text,
- org.eclipse.ui,
- org.eclipse.ui.ide,
- org.eclipse.wst.common.project.facet.core,
- org.apache.axis
-Export-Package: org.eclipse.jst.ws.jaxws.utils,
- org.eclipse.jst.ws.jaxws.utils.annotations,
- org.eclipse.jst.ws.jaxws.utils.clazz,
- org.eclipse.jst.ws.jaxws.utils.dom.validation,
- org.eclipse.jst.ws.jaxws.utils.exception,
- org.eclipse.jst.ws.jaxws.utils.facets,
- org.eclipse.jst.ws.jaxws.utils.internal.annotations.impl,
- org.eclipse.jst.ws.jaxws.utils.internal.text;x-friends:="org.eclipse.jst.ws.jaxws.dom.integration.tests",
- org.eclipse.jst.ws.jaxws.utils.logging,
- org.eclipse.jst.ws.jaxws.utils.resources
-Bundle-Activator: org.eclipse.jst.ws.jaxws.utils.internal.plugin.JaxwsUtilsPlugin
diff --git a/bundles/org.eclipse.jst.ws.jaxws.utils/about.html b/bundles/org.eclipse.jst.ws.jaxws.utils/about.html
deleted file mode 100644
index 8410afb..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.utils/about.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
-<title>About</title>
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
-
-<p>August 15, 2009</p>
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, "Program" will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is
-being redistributed by another party ("Redistributor") and different terms and conditions may
-apply to your use of any object code in the Content. Check the Redistributor's license that was
-provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
-
-</body>
-</html>
diff --git a/bundles/org.eclipse.jst.ws.jaxws.utils/build.properties b/bundles/org.eclipse.jst.ws.jaxws.utils/build.properties
deleted file mode 100755
index 3aae249..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.utils/build.properties
+++ /dev/null
@@ -1,17 +0,0 @@
-###############################################################################
-# Copyright (c) 2009 by SAP AG, Walldorf.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# SAP AG - initial API and implementation
-###############################################################################
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
- .,\
- plugin.xml,\
- about.html,\
- plugin.properties
diff --git a/bundles/org.eclipse.jst.ws.jaxws.utils/plugin.properties b/bundles/org.eclipse.jst.ws.jaxws.utils/plugin.properties
deleted file mode 100755
index 54b40da..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.utils/plugin.properties
+++ /dev/null
@@ -1,13 +0,0 @@
-###############################################################################
-# Copyright (c) 2009 by SAP AG, Walldorf.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# SAP AG - initial API and implementation
-###############################################################################
-
-Bundle-Name.0=UtilsPlugin (Incubation)
-Bundle-Vendor.0=Eclipse Web Tools Platform
diff --git a/bundles/org.eclipse.jst.ws.jaxws.utils/plugin.xml b/bundles/org.eclipse.jst.ws.jaxws.utils/plugin.xml
deleted file mode 100755
index 0029309..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.utils/plugin.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.4"?>
-<!--
- Copyright (c) 2009 by SAP AG, Walldorf.
- All rights reserved. This program and the accompanying materials
- are made available under the terms of the Eclipse Public License v1.0
- which accompanies this distribution, and is available at
- http://www.eclipse.org/legal/epl-v10.html
-
- Contributors:
- SAP AG - initial API and implementation
- -->
-
-<plugin>
- <extension
- point="org.eclipse.ui.startup">
- <startup></startup>
- </extension>
-
-</plugin>
diff --git a/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/ContractChecker.java b/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/ContractChecker.java
deleted file mode 100755
index 7f13b8e..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/ContractChecker.java
+++ /dev/null
@@ -1,132 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.utils;
-
-import java.text.MessageFormat;
-
-/**
- * Contains checks frequently applied on parameters.
- *
- * @author Joerg Dehmel
- */
-public final class ContractChecker
-{
- private ContractChecker()
- {
- // prevent instantiation from outside
- }
-
- /** Checks if the given parameter value is null and reports an <code>NullPointerException</code>
- * in this case.
- * @param paramValue the value to be checked
- * @param paramName name of the parameter, used to report the problem to the user
- * @throws NullPointerException thrown either the paramValue or paramName is null */
- public static void nullCheckParam(final Object paramValue, final String paramName)
- {
- if (paramName == null)
- {
- throw new NullPointerException("paramName must not be null"); //$NON-NLS-1$
- }
- if (paramValue == null)
- {
- throw new NullPointerException(paramName + " must not be null"); //$NON-NLS-1$
- }
- }
-
- /** Checks whether the given parameter value is null and reports an <code>NullPointerException</code>
- * in this case.
- * @param paramValue the value to be checked
- * @throws NullPointerException thrown if the paramValue is null */
- public static void nullCheckParam(final Object paramValue)
- {
- if (paramValue == null)
- {
- throw new NullPointerException("paramValue must not be null"); //$NON-NLS-1$
- }
- }
-
- /** Checks if the given field value is null and reports an <code>IllegalStateException</code>
- * in this case.
- * @param fieldValue the value to be checked
- * @param fieldName name of the field, used to report the problem to the user
- * @throws NullPointerException thrown if the fieldName is null
- * @throws IllegalStateException thrown if the fieldValue is null */
- public static void nullCheckField(final Object fieldValue, final String fieldName)
- {
- if (fieldName == null)
- {
- throw new NullPointerException("fieldName must not be null"); //$NON-NLS-1$
- }
- if (fieldValue == null)
- {
- throw new IllegalStateException(fieldName + " must not be null"); //$NON-NLS-1$
- }
- }
-
- /** Checks whether the given field value is null and reports an <code>IllegalStateException</code>
- * in this case.
- * @param fieldValue the value to be checked
- * @throws IllegalStateException thrown if the fieldValue is null */
- public static void nullCheckField(final Object fieldValue)
- {
- if (fieldValue == null)
- {
- throw new IllegalStateException("fieldValue must not be null"); //$NON-NLS-1$
- }
- }
-
- /** Checks whether the given value of a local variable is null and reports an <code>IllegalStateException</code>
- * in this case.
- * @param varValue the value to be checked
- * @param varName name of the local variable, used to report the problem to the user
- * @throws NullPointerException thrown if the varName is null
- * @throws IllegalStateException thrown if the varValue is null */
- public static void nullCheckVariable(final Object varValue, final String varName)
- {
- if (varName == null)
- {
- throw new NullPointerException("varName must not be null"); //$NON-NLS-1$
- }
- if (varValue == null)
- {
- throw new IllegalStateException(varName + " must not be null"); //$NON-NLS-1$
- }
- }
-
- /** Checks whether the given value of a local variable is null and reports an <code>IllegalStateException</code>
- * in this case.
- * @param varValue the value to be checked
- * @throws IllegalStateException thrown if the varValue is null */
- public static void nullCheckVariable(final Object varValue)
- {
- if (varValue == null)
- {
- throw new IllegalStateException("varValue must not be null"); //$NON-NLS-1$
- }
- }
-
- /**
- * This method checks if <code>param</code> is <code>null</code> or empty string.
- * @param param
- * @param varName
- * @throws NullPointerException in case <code>param</code> is <code>null</code>
- * @throws IllegalArgumentException in case <code>param</code> is empty string or contains only
- * white space characters
- */
- public static void emptyStringCheckParam(final String param, final String varName)
- {
- nullCheckParam(param, varName);
-
- if (param.trim().length() == 0) {
- throw new IllegalArgumentException(MessageFormat.format("Parameter {0} is empty string or contains only white spaces", varName)); //$NON-NLS-1$
- }
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/JaxWsUtils.java b/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/JaxWsUtils.java
deleted file mode 100755
index 5edde7e..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/JaxWsUtils.java
+++ /dev/null
@@ -1,220 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.utils;
-
-import org.eclipse.jdt.core.IType;
-
-/**
- * Utility that contains JAX-WS releated functionality
- *
- * @author Danail Branekov
- *
- */
-public class JaxWsUtils
-{
- private static final String BEAN_SUFFIX = "Bean"; //$NON-NLS-1$
- private static final String PORT_SUFFIX = "Port"; //$NON-NLS-1$
- private static final String SERVICE_SUFFIX = "Service"; //$NON-NLS-1$
-
- private JaxWsUtils()
- {
- // hide default constructor
- }
-
- /**
- * An utility method for composing a default target namespace for JaxWs customization
- * out of a package name.
- * Algorithm:
- * <li>In case the package has 0 fragment (default package) the result would be http:///</li>
- * <li>In case the package has 1 fragment the result would be http://fragment1/</li>
- * <li>In case the package has 2 fragments the result would be http://fragment2.fragment1/</li>
- * <li>In case the package has more than 2 fragments the result would be http://fragment2.fragment1/fragment3/fragment4/.../fragmentn/</li>
- * @param packageName Name of the package
- * @return the composed namespace
- * @thorws NullPointerException when package name specified is null
- */
- public static String composeJaxWsTargetNamespaceByPackage(String packageName)
- {
- if(packageName == null)
- {
- throw new NullPointerException("Package name cannot be null"); //$NON-NLS-1$
- }
-
- String[] pkgFragments = packageName.split("\\."); //$NON-NLS-1$
-
- if(pkgFragments.length > 1)
- {
- // reverse the first two fragments in case there are at least two fragments available
- String frag0 = pkgFragments[0];
- pkgFragments[0] = pkgFragments[1];
- pkgFragments[1] = frag0;
- }
-
- StringBuilder result = new StringBuilder("http://"); //$NON-NLS-1$
- for (int i = 0; i < pkgFragments.length; i++)
- {
- result.append(pkgFragments[i]);
- result.append(i==0 && pkgFragments.length>1 ? "." : "/"); //$NON-NLS-1$ //$NON-NLS-2$
- }
-
- return result.toString();
- }
-
- /**
- * Same as composeJaxWsTargetNamespaceByPackage() but first extracts the package out of class
- * fully qualified name
- * @param fqName the class fully qualified name
- * @return calculated target namespace
- */
- public static String composeJaxWsTargetNamespaceByFQName(String fqName)
- {
- ContractChecker.nullCheckParam(fqName, "fqName"); //$NON-NLS-1$
- return composeJaxWsTargetNamespaceByPackage(extractPackage(fqName));
- }
-
- /**
- * Returns the PortType name from the <code>endpointType</code> and <code>seiName</code>.
- * @param endpoint class.
- * @param seiName
- * @return PortType name for the @WebService annotation, the name of the <code>endpointType</code> with the "Port" suffix.
- * @throws NullPointerException when <code>endpointType</code> specified is null.
- */
- public static String getPorttypeName(IType endpointType, String seiName)
- {
- if(endpointType == null)
- {
- throw new NullPointerException("endpointType could not be null!"); //$NON-NLS-1$
- }
-
- if(seiName != null && seiName.length() > 0)
- {
- return seiName;
- }
-
- return removeBeanSuffixIfRequired(endpointType.getElementName());
- }
-
- /**
- * Removes the "Bean" suffix from the <code>endpointType</code> in case it is present and generates Service name for the specified IType.
- * @param endpoint class.
- * @return Service name for the @WebService annotation, the name of the <code>endpointType</code> without the "Bean" suffix and <code>"Service"</code> at the end.
- * In case the name of the <code>endpointType</code> equals "Bean" then the original name is returned with <code>"Service"</code> ate the end.
- * @throws NullPointerException when <code>endpointType</code> specified is null
- */
- public static String getServiceName(final IType endpointType)
- {
- if(endpointType == null)
- {
- throw new NullPointerException("endpointType could not be null!"); //$NON-NLS-1$
- }
-
- return removeBeanSuffixIfRequired(endpointType.getElementName()) + SERVICE_SUFFIX;
- }
-
- /**
- * Removes the "Bean" suffix from the endpoint name in case it is present.
- * @param endpointName the name of the endpoint
- * @return the name of the endpoint without the "Bean" suffix. In case the name of the endpoint equals "Bean" then the original name is returned
- */
- private static String removeBeanSuffixIfRequired(final String endpointName)
- {
- assert endpointName != null && endpointName.length() > 0;
-
- if(endpointName.equals(BEAN_SUFFIX))
- {
- return endpointName;
- }
-
- if(endpointName.endsWith(BEAN_SUFFIX))
- {
- return endpointName.substring(0, endpointName.lastIndexOf(BEAN_SUFFIX));
- }
-
- return endpointName;
- }
-
- /**
- * Returns the Port name from the <code>endpointType</code>.
- * @param endpoint class.
- * @return Port name for the @WebService annotation, the name of the <code>endpointType</code> with the "Port" suffix.
- * @throws NullPointerException when <code>endpointType</code> specified is null.
- */
- public static String getPortName(final IType endpointType)
- {
- return getDefaultPortName(endpointType.getElementName());
- }
-
- /**
- * Returns the default service name calculated as the specification states.
- * @param fqName
- * @return the default service name
- * @throws NullPointerException in case <code>endpointType</code> is <code>null</code>
- */
- public static String getDefaultServiceName(final String fqName)
- {
- if(fqName == null)
- {
- throw new NullPointerException("endpointType could not be null!"); //$NON-NLS-1$
- }
-
- return extractShortName(fqName) + SERVICE_SUFFIX;
- }
-
- /**
- * Returns the default wsdl:portType name defined as JAX-WS specification states.
- * @param fqName
- * @return
- */
- public static String getDefaultPorttypeName(final String fqName)
- {
- if(fqName == null)
- {
- throw new NullPointerException("fqName could not be null!"); //$NON-NLS-1$
- }
-
- return extractShortName(fqName);
- }
-
- /**
- * Return the default name for a wsdl:port defined as JAX-WS specification states
- * @param fqName
- * @return the calculated name
- */
- public static String getDefaultPortName(final String fqName)
- {
- if(fqName == null)
- {
- throw new NullPointerException("fqName could not be null!"); //$NON-NLS-1$
- }
-
- return extractShortName(fqName) + PORT_SUFFIX;
- }
-
- private static String extractShortName(String fqName)
- {
- int pos = fqName.lastIndexOf('.');
- if (pos ==-1 ) {
- return fqName;
- }
-
- return fqName.substring(pos+1);
- }
-
- private static String extractPackage(final String fqName)
- {
- int pos = fqName.lastIndexOf('.');
- if (pos ==-1 ) {
- return fqName;
- }
-
- return fqName.substring(0, pos);
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/StatusUtils.java b/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/StatusUtils.java
deleted file mode 100755
index 53779a6..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/StatusUtils.java
+++ /dev/null
@@ -1,170 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.utils;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.MultiStatus;
-import org.eclipse.core.runtime.Status;
-
-
-/**
- * Convenience methods to manage status objects.
- *
- * @author Joerg Dehmel
- */
-public final class StatusUtils
-{
- private StatusUtils()
- {
- // no instantiation
- }
-
- /**
- * Finds the most severe status from a array of stati.
- * An error is more severe than a warning, and a warning is more severe
- * than ok.
- */
- public static IStatus getMostSevere(IStatus[] status) {
- IStatus max= null;
- for (int i= 0; i < status.length; i++) {
- IStatus curr= status[i];
- if (curr.matches(IStatus.ERROR)) {
- return curr;
- }
- if (max == null || curr.getSeverity() > max.getSeverity()) {
- max= curr;
- }
- }
- return max;
- }
-
- /**
- * Provides a new status object with severity IStatus.CANCEL.
- *
- * @param message
- * status message
- * @return the cancel status
- */
- public static IStatus statusCancel(final String message)
- {
- return createStatus(IStatus.CANCEL, message);
- }
-
- /**
- * Provides a new status object with severity IStatus.ERROR.
- *
- * @param message
- * status message
- * @return the error status
- */
- public static IStatus statusError(final String message)
- {
- return createStatus(IStatus.ERROR, message);
- }
-
- /**
- * Provides a new status object with severity IStatus.ERROR.
- *
- * @param message
- * status message
- * @param ex
- * exception that corresponds to the status
- * @return the error status
- */
- public static IStatus statusError(final String message, final Throwable ex)
- {
- return createStatus(IStatus.ERROR, message, ex);
- }
-
- /**
- * Provides a new status object with severity IStatus.WARNING.
- *
- * @param message
- * status message
- * @return the warning status
- */
- public static IStatus statusWarning(final String message)
- {
- return createStatus(IStatus.WARNING, message);
- }
-
- /**
- * Provides a new status object with severity IStatus.WARNING.
- *
- * @param message
- * status message
- * @param ex
- * exception that corresponds to the status
- * @return the warning status
- */
- public static IStatus statusWarning(final String message, final Throwable ex)
- {
- return createStatus(IStatus.WARNING, message, ex);
- }
-
- /**
- * Provides a new status object with severity IStatus.INFO.
- *
- * @param message
- * status message
- * @return the info status
- */
- public static IStatus statusInfo(final String message)
- {
- return createStatus(IStatus.INFO, message);
- }
-
- /**
- * Provides a new status object with severity IStatus.INFO.
- *
- * @param message
- * status message
- * @return the info status
- */
- public static IStatus statusInfo(final String message, final Throwable cause)
- {
- return createStatus(IStatus.INFO, message, cause);
- }
-
- /**
- * Provides a new status object with severity IStatus.OK.
- *
- * @param message
- * status message
- * @return the ok status
- */
- public static IStatus statusOk(final String message)
- {
- return createStatus(IStatus.OK, message);
- }
-
- private static IStatus createStatus(final int severity, final String message)
- {
- return new Status(severity, "id", 0, message, null); //$NON-NLS-1$
- }
-
- private static IStatus createStatus(final int severity, final String message, final Throwable ex)
- {
- return new Status(severity, "id", 0, message, ex); //$NON-NLS-1$
- }
-
- /**
- * Provides a new multistatus object
- *
- * @param message
- * status message
- * @return multistatus
- */
- public static MultiStatus createMultiStatus(String message)
- {
- return new MultiStatus("id", 0, message, null); //$NON-NLS-1$
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/WsdlNamesValidator.java b/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/WsdlNamesValidator.java
deleted file mode 100755
index 97dd3fc..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/WsdlNamesValidator.java
+++ /dev/null
@@ -1,87 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.utils;
-
-import java.text.MessageFormat;
-
-import org.apache.axis.types.NCName;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.ws.jaxws.utils.internal.text.JaxWsUtilMessages;
-
-
-/**
- * Class that contains utility methods to validate names used in WSDL.
- *
- * @author Georgi Vachkov
- */
-public class WsdlNamesValidator
-{
- /**
- * Provides validation of NCName
- * @param title the title for the error message
- * @param name the checked name
- * @return error status in case the name is invalid otherwise {@link Status#OK_STATUS}.
- */
- public static IStatus validateNCName(final String title, final String name)
- {
- if (name.trim().length() == 0) {
- return StatusUtils.statusError(MessageFormat.format(JaxWsUtilMessages.WsdlNamesValidator_EmptyXmlName, title));
- }
-
- int errPos = checkNCName(name);
- if (errPos > -1) {
- return StatusUtils.statusError(MessageFormat.format(JaxWsUtilMessages.WsdlNamesValidator_InvalidNCName, name.charAt(errPos), title, name));
- }
-
- return Status.OK_STATUS;
- }
-
- /**
- * Validates <code>name</code> for NCName
- * @param name
- * @return -1 if the name is valid or > -1 which is the position of the wrong character.
- */
- public static IStatus validateNCName2(final String title, final String name)
- {
- if (name==null || name.trim().length() == 0) {
- return StatusUtils.statusError(MessageFormat.format(JaxWsUtilMessages.WsdlNamesValidator_EmptyXmlName2, title));
- }
-
- int errPos = checkNCName(name);
- if (errPos > -1) {
- return StatusUtils.statusError(MessageFormat.format(JaxWsUtilMessages.WsdlNamesValidator_InvalidNCName2, name.charAt(errPos), title));
- }
-
- return Status.OK_STATUS;
- }
-
- /**
- * Checks whether the name specified is a valid NCName
- * @param name the name to check
- * @return index of the first symbol which violates the NCName rules or -1 in case the name is a valid NCName
- * @see NCName#isValid(String)
- */
- private static int checkNCName(final String name)
- {
- final StringBuilder builder = new StringBuilder();
- for(int i = 0; i < name.length(); i++)
- {
- builder.append(name.charAt(i));
- if(!NCName.isValid(builder.toString()))
- {
- return i;
- }
- }
-
- return -1;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/annotations/AnnotationFactory.java b/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/annotations/AnnotationFactory.java
deleted file mode 100755
index af2fd38..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/annotations/AnnotationFactory.java
+++ /dev/null
@@ -1,352 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.utils.annotations;
-
-import static org.eclipse.jst.ws.jaxws.utils.ContractChecker.nullCheckParam;
-
-import java.io.FileNotFoundException;
-import java.util.Set;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jdt.core.IField;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.ITypeParameter;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jface.text.BadLocationException;
-import org.eclipse.jst.ws.jaxws.utils.internal.annotations.impl.AnnotationImpl;
-import org.eclipse.jst.ws.jaxws.utils.internal.annotations.impl.AnnotationInspectorImpl;
-import org.eclipse.jst.ws.jaxws.utils.internal.annotations.impl.AnnotationUtils;
-import org.eclipse.jst.ws.jaxws.utils.internal.annotations.impl.ArrayValueImpl;
-import org.eclipse.jst.ws.jaxws.utils.internal.annotations.impl.BooleanValueImpl;
-import org.eclipse.jst.ws.jaxws.utils.internal.annotations.impl.ClassValueImpl;
-import org.eclipse.jst.ws.jaxws.utils.internal.annotations.impl.IntegerValueImpl;
-import org.eclipse.jst.ws.jaxws.utils.internal.annotations.impl.ParamValuePairImpl;
-import org.eclipse.jst.ws.jaxws.utils.internal.annotations.impl.QualifiedNameValueImpl;
-import org.eclipse.jst.ws.jaxws.utils.internal.annotations.impl.StringValueImpl;
-import org.eclipse.jst.ws.jaxws.utils.internal.text.JaxWsUtilMessages;
-import org.eclipse.text.edits.MalformedTreeException;
-
-
-/**
- * Factory class containing common factory and utility methods Annotation processing.
- *
- * @author Plamen Pavlov
- */
-public class AnnotationFactory
-{
- /**
- * Creates complex Annotation, e.g. Annotation of kind \@WebService(param1="value1", param2="value2").
- *
- * @param annotationQName
- * @param paramValuePairs
- *
- * @return Instantiated Annotation of type IComplexAnnotation.
- *
- * @throws NullPointerException in case <tt>annotationQName</tt> or <tt>paramValuePairs</tt> are null.
- * @throws IllegalArgumentException in case <tt>annotationQName</tt> is empty String.
- */
- public static <T extends IJavaElement> IAnnotation<T> createAnnotation(String annotationQName, Set<IParamValuePair> paramValuePairs, final T appliedElement)
- {
- if (annotationQName == null)
- {
- throw new NullPointerException("annotationQName should not be null!"); //$NON-NLS-1$
- }
- if (annotationQName.trim().length() == 0)
- {
- throw new IllegalArgumentException("annotationQName should not be empty String!"); //$NON-NLS-1$
- }
-
- if (paramValuePairs == null)
- {
- throw new NullPointerException("paramValuePairs should not be null!"); //$NON-NLS-1$
- }
-
- final AnnotationImpl<T> impl = new AnnotationImpl<T>(annotationQName, paramValuePairs);
- impl.setJavaElement(appliedElement);
-
- return impl;
- }
-
-
- /**
- * Creates {@link IAnnotation} instance that references <code>appliedElement</code> java element
- * @param annotationQName the annotation name
- * @param appliedElement the java element that this annotation is applied on
- * @param paramValuePairs the annotation attributes
- * @return {@link IAnnotation} instance
- * @throws NullPointerException in case some of params is <code>null</code>
- * @throws IllegalArgumentException in case <code>annotationQName</code> is empty string
- */
- public static IAnnotation<? extends IJavaElement> createAnnotation(String annotationQName, IJavaElement appliedElement, Set<IParamValuePair> paramValuePairs)
- {
- nullCheckParam(annotationQName, "annotationQName"); //$NON-NLS-1$
- if (annotationQName.trim().length() == 0) {
- throw new IllegalArgumentException("annotationQName should not be empty String!"); //$NON-NLS-1$
- }
-
- nullCheckParam(paramValuePairs, "paramValuePairs"); //$NON-NLS-1$
- nullCheckParam(appliedElement, "appliedElement"); //$NON-NLS-1$
-
- final AnnotationImpl<IJavaElement> annotation = new AnnotationImpl<IJavaElement>(annotationQName, paramValuePairs);
- annotation.setAppliedElementWithoutSave(appliedElement);
-
- return annotation;
- }
-
- /**
- * Creates param-value pair needed in complex Annotations.
- *
- * @param param
- * @param value
- *
- * @return instance of IParamValuePair
- *
- * @throws NullPointerException in case <code>param</code> or <code>value</code> is <code>null</code>.
- * @throws IllegalArgumentException in case <code>param</code> parameter is empty String.
- */
- public static IParamValuePair createParamValuePairValue(String param, IValue value)
- {
- if (param == null)
- {
- throw new NullPointerException("param should not be null!"); //$NON-NLS-1$
- }
- if (param.trim().length() == 0)
- {
- throw new IllegalArgumentException("param should not be empty String!"); //$NON-NLS-1$
- }
-
- if (value == null)
- {
- throw new NullPointerException("value should not be null!"); //$NON-NLS-1$
- }
-
- return new ParamValuePairImpl(param, value);
- }
-
- /**
- * Creates {@link IValue} instance using provided <code>values</code>.
- *
- * @param values
- *
- * @return instance of {@link IValue}
- *
- * @throws NullPointerException in case <code>values</code> is null.
- * @throws IllegalArgumentException in case <code>values</code> is empty Set.
- */
- public static IValue createArrayValue(Set<IValue> values)
- {
- if (values == null)
- {
- throw new NullPointerException("values should not be null!"); //$NON-NLS-1$
- }
- if (values.size() < 1)
- {
- throw new IllegalArgumentException("values should not be empty Set!"); //$NON-NLS-1$
- }
-
- return new ArrayValueImpl(values);
- }
-
- /**
- * Creates {@link IValue} instance out of <code>value</code>.
- *
- * @param value
- *
- * @return instance of {@link IValue}
- */
- public static IValue createBooleanValue(boolean value)
- {
- return new BooleanValueImpl(value);
- }
-
- /**
- * Creates {@link IValue} instance out of <code>value</code>.
- *
- * @param value
- *
- * @return instance of {@link String}
- */
- public static IValue createClassValue(String value)
- {
- if (value == null)
- {
- throw new NullPointerException("value should not be null!"); //$NON-NLS-1$
- }
- if(value.equals("")) //$NON-NLS-1$
- {
- throw new IllegalArgumentException("value should not be empty String"); //$NON-NLS-1$
- }
-
- return new ClassValueImpl(value);
- }
-
- /**
- * Creates {@link IValue} instance out of <code>value</code>.
- *
- * @param value
- *
- * @return instance of {@link IValue}
- */
- public static IValue createIntegerValue(String value)
- {
- return new IntegerValueImpl(value);
- }
-
- /**
- * Creates {@link IValue} instance using provided <code>qualifiedName</code> fully qualified name.
- *
- * @param qualifiedName
- *
- * @return instance of {@link IValue}
- *
- * @throws NullPointerException in case <tt>qualifiedName</tt> is null.
- * @throws IllegalArgumentException in case <code>qualifiedName</code> is not in correct form e.g. could not be empty String, shold be qualified.
- */
- public static IValue createQualifiedNameValue(String qualifiedName)
- {
- if (qualifiedName == null)
- {
- throw new NullPointerException("qualifiedName should not be null!"); //$NON-NLS-1$
- }
-
- if (qualifiedName.trim().length() == 0 || qualifiedName.indexOf('.') == -1)
- {
- throw new IllegalArgumentException("qualifiedName is not in correct form!"); //$NON-NLS-1$
- }
-
- return new QualifiedNameValueImpl(qualifiedName);
- }
-
- /**
- * Creates {@link IValue} instance out of <code>value</code> content.
- *
- * @param value
- *
- * @return instance of {@link IValue}
- * @throws NullPointerException in case <tt>value</tt> is null.
- */
- public static IValue createStringValue(String value)
- {
- if (value == null)
- {
- throw new NullPointerException("value should not be null!"); //$NON-NLS-1$
- }
-
- return new StringValueImpl(value);
- }
-
-
-// /**
-// * Retrieves all Annotations from class.
-// *
-// * @param javaElement
-// *
-// * @return contained annotations in <code>javaElement</code>
-// *
-// * @throws JavaModelException if exception occurs
-// * @throws NullPointerException if <tt>javaElement</tt> is null.
-// * @throws IllegalArgumentException in case <code>javaElement</code> is not of the correct type. Supported types are: Itype, IMethod, IField, ITypeParameter
-// */
-// public static Set<IAnnotation> getAnnotationsFromJavaElement(IJavaElement javaElement) throws JavaModelException
-// {
-// if (javaElement == null)
-// {
-// throw new NullPointerException("javaElement should not be null!");
-// }
-// if(!(javaElement instanceof IType) || !(javaElement instanceof IMethod) || !(javaElement instanceof IField) || !(javaElement instanceof ITypeParameter))
-// {
-// throw new IllegalArgumentException("javaElement is not of correct type!");
-// }
-// pppppp
-// }
-
- /**
- * Removes all Annotations from <code>javaElement</code>.
- *
- * @param javaElement
- *
- * @throws NullPointerException if <tt>javaElement</tt> is null.
- * @throws IllegalArgumentException in case <code>javaElement</code> is not of the correct type. Supported types are: Itype, IMethod, IField, ITypeParameter
- * @throws AnnotationGeneratorException
- */
- public static void removeAnnotationsFromJavaElement(IJavaElement javaElement) throws AnnotationGeneratorException
- {
- if (javaElement == null)
- {
- throw new NullPointerException("javaElement should not be null!"); //$NON-NLS-1$
- }
- if(!(javaElement instanceof IType) && !(javaElement instanceof org.eclipse.jdt.core.IMethod) && !(javaElement instanceof IField) && !(javaElement instanceof ITypeParameter))
- {
- throw new IllegalArgumentException("javaElement is not of correct type!"); //$NON-NLS-1$
- }
- removeAnnotations(javaElement, null);
- }
-
- /**
- * Removes Annotations with names contained in <code>annotations</code> from <code>javaElement</code> and its children, if such exist.
- *
- * @param javaElement
- * @param annotations
- *
- * @throws NullPointerException if <tt>javaElement</tt> or <tt>annotations</tt> is null.
- * @throws IllegalArgumentException in case <code>javaElement</code> is not of the correct type. Supported types are: Itype, IMethod, IField, ITypeParameter
- * @throws AnnotationGeneratorException
- */
- public static void removeAnnotations(IJavaElement javaElement, Set<String> annotations) throws AnnotationGeneratorException
- {
- if (javaElement == null)
- {
- throw new NullPointerException("javaElement should not be null!"); //$NON-NLS-1$
- }
- if(!(javaElement instanceof IType) && !(javaElement instanceof org.eclipse.jdt.core.IMethod) && !(javaElement instanceof IField) && !(javaElement instanceof ITypeParameter))
- {
- throw new IllegalArgumentException("javaElement is not of correct type!"); //$NON-NLS-1$
- }
-
- try
- {
- AnnotationUtils.getInstance().removeAnnotations(javaElement, annotations, true);
- }
- catch (JavaModelException e)
- {
- throw new AnnotationGeneratorException(e.getMessage(), e.getStatus().getMessage(), e);
- }
- catch (MalformedTreeException e)
- {
- throw new AnnotationGeneratorException(e.getMessage(), JaxWsUtilMessages.InvalidTreeStateMsg, e);
- }
- catch (FileNotFoundException e)
- {
- throw new AnnotationGeneratorException(e.getMessage(), JaxWsUtilMessages.CompUnitMissingMsg, e);
- }
- catch (CoreException e)
- {
- throw new AnnotationGeneratorException(e.getMessage(), e.getStatus().getMessage(), e);
- }
- catch (BadLocationException e)
- {
- throw new AnnotationGeneratorException(e.getMessage(), JaxWsUtilMessages.CannotPerformEditMsg, e);
- }
- }
-
- /**
- * Create instance of IAnnotationInspector for a specific IType.
- *
- * @param type - IType, which will be inspected.
- *
- * @return IAnnotationInspector
- */
- public static IAnnotationInspector createAnnotationInspector(IType type)
- {
- return new AnnotationInspectorImpl(type);
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/annotations/AnnotationGeneratorException.java b/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/annotations/AnnotationGeneratorException.java
deleted file mode 100755
index 8558a94..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/annotations/AnnotationGeneratorException.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.utils.annotations;
-
-import org.eclipse.jst.ws.jaxws.utils.exception.LocalizedException;
-
-/**
- * Exception thrown by annotation generator in case when unexpected condition is met
- *
- * @author Plamen Pavlov
- */
-
-public class AnnotationGeneratorException extends LocalizedException
-{
- private static final long serialVersionUID = 1L;
-
- /**
- * Constructor getting error message, localized message and {@link Throwable} to be wrapped
- *
- * @param message
- * @param localizedMessage
- * @param t
- */
- public AnnotationGeneratorException(final String message, final String localizedMessage, final Throwable t)
- {
- super(message, localizedMessage, t);
- }
-
- /**
- * Constructor with error message and a localized message.
- *
- * @param message
- * @param localizedMessage
- */
- public AnnotationGeneratorException(final String message, final String localizedMessage)
- {
- super(message, localizedMessage);
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/annotations/AnnotationWriter.java b/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/annotations/AnnotationWriter.java
deleted file mode 100755
index 3f0732b..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/annotations/AnnotationWriter.java
+++ /dev/null
@@ -1,600 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.utils.annotations;
-
-import java.io.FileNotFoundException;
-import java.util.List;
-import java.util.Set;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IField;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.IMember;
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.ITypeParameter;
-import org.eclipse.jdt.core.dom.AST;
-import org.eclipse.jdt.core.dom.ASTNode;
-import org.eclipse.jdt.core.dom.Annotation;
-import org.eclipse.jdt.core.dom.BodyDeclaration;
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jdt.core.dom.Expression;
-import org.eclipse.jdt.core.dom.FieldDeclaration;
-import org.eclipse.jdt.core.dom.IExtendedModifier;
-import org.eclipse.jdt.core.dom.MethodDeclaration;
-import org.eclipse.jdt.core.dom.SingleVariableDeclaration;
-import org.eclipse.jdt.core.dom.TypeDeclaration;
-import org.eclipse.jface.text.BadLocationException;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jst.ws.jaxws.utils.clazz.ASTUtils;
-import org.eclipse.jst.ws.jaxws.utils.internal.annotations.impl.AnnotationImpl;
-import org.eclipse.jst.ws.jaxws.utils.internal.annotations.impl.AnnotationUtils;
-import org.eclipse.jst.ws.jaxws.utils.internal.text.JaxWsUtilMessages;
-import org.eclipse.jst.ws.jaxws.utils.resources.EditResourcesManager;
-import org.eclipse.jst.ws.jaxws.utils.resources.FileUtils;
-import org.eclipse.jst.ws.jaxws.utils.resources.IFileUtils;
-import org.eclipse.text.edits.MalformedTreeException;
-import org.eclipse.text.edits.TextEdit;
-
-/**
- * Class, which is used to save the annotations.
- *
- * @author Plamen Pavlov
- *
- */
-public class AnnotationWriter
-{
- private static AnnotationWriter writer = null;
- private final IFileUtils fileUtils = FileUtils.getInstance();
-
- /**
- * The factory method.
- *
- * @return a AnnotationWriter instance.
- */
- public static<T extends IJavaElement> AnnotationWriter getInstance()
- {
- if (writer == null)
- {
- writer = new AnnotationWriter();
- }
- return writer;
- }
-
- /**
- * Adds Annotation to specific IJavaElement.
- *
- * @param javaElement
- *
- * @throws NullPointerException if <tt>javaElement</tt> is null.
- * @throws IllegalArgumentException in case <code>javaElement</code> is not of the correct type. Supported types are: IType, IMethod, IField, ITypeParameter.
- * @throws AnnotationGeneratorException.
- */
- public <T extends IJavaElement> void setAppliedElement(final IAnnotation<T> annotation, final T javaElement) throws AnnotationGeneratorException
- {
- AnnotationImpl<T> annotationImpl = (AnnotationImpl<T>)annotation;
- annotationImpl.setJavaElement(javaElement);
-
- setAnnotatationStringVallue(annotationImpl, true, javaElement);
- }
-
- private <T extends IJavaElement> void setAnnotatationStringVallue(AnnotationImpl<T> annotationImpl, boolean needSave, final T javaElement) throws AnnotationGeneratorException
- {
- if (!needSave) {
- return;
- }
-
- if(javaElement instanceof IType)
- {
- addToClass(annotationImpl, (IType)javaElement);
- }
- if(javaElement instanceof IField)
- {
- addToField(annotationImpl, (IField)javaElement);
- }
- if(javaElement instanceof IMethod)
- {
- addToMethod(annotationImpl, (IMethod)javaElement);
- }
- if(javaElement instanceof ITypeParameter)
- {
- addToParam(annotationImpl, (ITypeParameter)javaElement);
- }
- }
-
- private <T extends IJavaElement> void addToClass(AnnotationImpl<T> annotationImpl, IType classType) throws AnnotationGeneratorException
- {
- String className = classType.getElementName();
-
- addToMember(annotationImpl, classType.getCompilationUnit(), classType, className);
- }
-
- private <T extends IJavaElement> void addToField(AnnotationImpl<T> annotationImpl, IField fieldType) throws AnnotationGeneratorException
- {
- String className = fieldType.getParent().getElementName();
-
- addToMember(annotationImpl, fieldType.getCompilationUnit(), fieldType, className);
- }
-
- private <T extends IJavaElement> void addToMethod(AnnotationImpl<T> annotationImpl, IMethod methodType) throws AnnotationGeneratorException
- {
- String className = methodType.getParent().getElementName();
-
- addToMember(annotationImpl, methodType.getCompilationUnit(), methodType, className);
- }
-
- private <T extends IJavaElement> void addToParam(AnnotationImpl<T> annotationImpl, ITypeParameter typeParam) throws AnnotationGeneratorException
- {
- IMember member = typeParam.getDeclaringMember();
- String className = null;
- if (member.getElementType() == IJavaElement.METHOD)
- {
- className = member.getDeclaringType().getElementName();
- } else
- {
- className = member.getElementName();
- }
-
- addToMember(annotationImpl, member.getCompilationUnit(), typeParam, className);
- }
-
- private <T extends IJavaElement> void addToMember(AnnotationImpl<T> annotationImpl, ICompilationUnit cUnit, IJavaElement type, String className) throws AnnotationGeneratorException
- {
- try
- {
- if (cUnit == null)
- {
- return;
- }
-
- CompilationUnit unit = ASTUtils.getInstance().createCompilationUnit(cUnit, null);
- AST ast = unit.getAST();
-
- TypeDeclaration typeDeclaration = (TypeDeclaration)ASTUtils.getInstance().getTypeDeclaration(className, unit);
- if (typeDeclaration != null)
- {
- switch (type.getElementType())
- {
- case IJavaElement.TYPE:
- addAnnotation(annotationImpl, cUnit, unit, ast, typeDeclaration);
- break;
- case IJavaElement.METHOD:
- MethodDeclaration methodDeclaration = ASTUtils.getInstance().getMethodDeclaration((IMethod) type, typeDeclaration);
- addAnnotation(annotationImpl, cUnit, unit, ast, methodDeclaration);
- break;
- case IJavaElement.FIELD:
- FieldDeclaration fieldDeclaration = ASTUtils.getInstance().getFieldDeclaration((IField) type, typeDeclaration);
- addAnnotation(annotationImpl, cUnit, unit, ast, fieldDeclaration);
- break;
- case IJavaElement.TYPE_PARAMETER:
- ITypeParameter typeParameter = (ITypeParameter) type;
- if (typeParameter.getDeclaringMember().getElementType() == IJavaElement.METHOD)
- {
- methodDeclaration = ASTUtils.getInstance().getMethodDeclaration((IMethod) typeParameter.getDeclaringMember(), typeDeclaration);
- SingleVariableDeclaration paramDeclaration = getParamDeclaration(typeParameter, methodDeclaration);
- addAnnotation(annotationImpl, cUnit, unit, ast, paramDeclaration);
- }
- break;
- default:
- throw new IllegalArgumentException("unsupported type for annotation"); //$NON-NLS-1$
- }
- }
- }
- catch (MalformedTreeException e)
- {
- throw new AnnotationGeneratorException(e.getMessage(), JaxWsUtilMessages.InvalidTreeStateMsg, e);
- }
- catch (CoreException e)
- {
- throw new AnnotationGeneratorException(e.getMessage(), e.getStatus().getMessage(), e);
- }
- catch (BadLocationException e)
- {
- throw new AnnotationGeneratorException(e.getMessage(), JaxWsUtilMessages.CannotPerformEditMsg, e);
- }
- catch (FileNotFoundException e)
- {
- throw new AnnotationGeneratorException(e.getMessage(), JaxWsUtilMessages.CompUnitMissingMsg, e);
- }
- }
-
- @SuppressWarnings("unchecked")
- private <T extends IJavaElement> void addAnnotation(AnnotationImpl<T> annotationImpl, ICompilationUnit cUnit, CompilationUnit unit, AST ast, ASTNode declaration)
- throws CoreException, MalformedTreeException, BadLocationException, FileNotFoundException, AnnotationGeneratorException
- {
- editResManager().setFileEditable((IFile) cUnit.getResource());
-
- unit.recordModifications();
- Expression annot = annotationImpl.getExpression(unit, ast);
-
- List modifiers = null;
-
- switch (declaration.getNodeType())
- {
- case ASTNode.METHOD_DECLARATION:
- case ASTNode.FIELD_DECLARATION:
- case ASTNode.TYPE_DECLARATION:
- modifiers = ((BodyDeclaration) declaration).modifiers();
- break;
- case ASTNode.SINGLE_VARIABLE_DECLARATION:
- modifiers = ((SingleVariableDeclaration) declaration).modifiers();
- break;
- default:
- throw new IllegalArgumentException("addAnnotation() illegal declataion type"); //$NON-NLS-1$
- }
-
- modifiers.add(0, annot);
-
- IDocument doc = AnnotationUtils.getInstance().getDocument(cUnit);
-
- TextEdit edit = unit.rewrite(doc, null);
- edit.apply(doc);
-
- IStatus status = editResManager().setFileEditable((IFile) cUnit.getResource());
- if(status.getSeverity() == IStatus.OK)
- {
- fileUtils.setCompilationUnitContentAndSaveDirtyEditors(cUnit, doc.get(), true, null);
- }
- else
- {
- throw new AnnotationGeneratorException("Annotattion could not be stored, the file is not writable", //$NON-NLS-1$
- JaxWsUtilMessages.AnnotationCannotBeStoredMsg);
- }
- }
-
- private static SingleVariableDeclaration getParamDeclaration(ITypeParameter typeParameter, MethodDeclaration methodDeclaration)
- {
- //TODO check this method
- final String paramName = typeParameter.getElementName();
-
- for (Object decl : methodDeclaration.parameters())
- {
- if (!(decl instanceof SingleVariableDeclaration))
- {
- continue;
- }
-
- if (paramName.equals(((SingleVariableDeclaration) decl).getName().toString()))
- {
- return (SingleVariableDeclaration) decl;
- }
- }
-
- return null;
- }
-
- /**
- * Updates the Parameter-Value Pairs of specific Annotation.
- *
- * @param annotation - Annotation, which will be updated.
- * @throws AnnotationGeneratorException
- * @throws CoreException
- */
- public <T extends IJavaElement> void update(final IAnnotation<T> annotation) throws AnnotationGeneratorException, CoreException
- {
- AnnotationImpl<T> annotattionImpl = new AnnotationImpl<T>(annotation.getAnnotationName(), annotation.getParamValuePairs());
- try
- {
- updateTheAnnotation(annotation.getAppliedElement(), annotattionImpl);
- }
- catch(MalformedTreeException e) {
- throw new AnnotationGeneratorException(e.getMessage(), JaxWsUtilMessages.InvalidTreeStateMsg, e);
- }
- catch (BadLocationException e) {
- throw new AnnotationGeneratorException(e.getMessage(), JaxWsUtilMessages.CannotPerformEditMsg, e);
- }
- catch (FileNotFoundException e) {
- throw new AnnotationGeneratorException(e.getMessage(), JaxWsUtilMessages.CompUnitMissingMsg, e);
- }
- }
-
- /**
- * Updates the Param-Value Pairs of specific Annotation.
- *
- * @param annotation - Annotation, which will be updated.
- * @param paramValuePairs which will be updated. Old pairs will be replaced with the new once.
- * @param replacePreviousPairs boolean value which specifies the way, how new IParamValuePairs will be updated. If the value is <tt>true</tt>,
- * the Set with the old IParamValuePairs will be cleared and the new values will be applied. If the value is <tt>false</tt> the old pairs will be kept
- * and will be updated with the values from the new Set, if there are params which do not exist in the old one, they will be added.
- *
- * @throws CoreException
- * @throws AnnotationGeneratorException
- *
- * @deprecated - use public <T extends IJavaElement> void update(final IAnnotation<T> annotation) instead.
- */
- @Deprecated
- public <T extends IJavaElement> void update(final IAnnotation<T> annotation, Set<IParamValuePair> paramValuePairs, boolean replacePreviousPairs) throws AnnotationGeneratorException, CoreException
- {
- updateAnnotation(annotation, annotation.getAppliedElement(), paramValuePairs, replacePreviousPairs);
- }
-
- /**
- *
- * @param <T>
- * @param annotation
- * @param javaElement
- * @param paramValuePairs
- * @param replacePreviousPairs
- * @throws AnnotationGeneratorException
- * @throws CoreException
- *
- */
- private <T extends IJavaElement> void updateAnnotation(final IAnnotation<T> annotation, final T javaElement, Set<IParamValuePair> paramValuePairs, boolean replacePreviousPairs) throws AnnotationGeneratorException, CoreException
- {
- AnnotationImpl<T> annotationImpl = (AnnotationImpl<T>)annotation;
- try
- {
- if(replacePreviousPairs)
- {
- annotationImpl.setParamValuePairs(paramValuePairs);
- }
- else
- {
- for (IParamValuePair pair : paramValuePairs)
- {
- boolean isUpdated = false;
- Set<IParamValuePair> tmpParamValuePairs = annotationImpl.getParamValuePairs();
- for (IParamValuePair thisPair : tmpParamValuePairs)
- {
- if(thisPair.getParam().equals(pair.getParam()))
- {
- tmpParamValuePairs.remove(thisPair);
- tmpParamValuePairs.add(pair);
- isUpdated = true;
- break;
- }
- }
- if(!isUpdated)
- {
- tmpParamValuePairs.add(pair);
- }
- annotationImpl.setParamValuePairs(tmpParamValuePairs);
- }
- }
- updateTheAnnotation(javaElement, annotationImpl);
-
- //remove(annotation);
- //setAppliedElement(annotation, javaElement);
- }
- catch(MalformedTreeException e) {
- throw new AnnotationGeneratorException(e.getMessage(), JaxWsUtilMessages.InvalidTreeStateMsg, e);
- }
- catch (BadLocationException e) {
- throw new AnnotationGeneratorException(e.getMessage(), JaxWsUtilMessages.CannotPerformEditMsg, e);
- }
- catch (FileNotFoundException e) {
- throw new AnnotationGeneratorException(e.getMessage(), JaxWsUtilMessages.CompUnitMissingMsg, e);
- }
- }
-
-
- /**
- * Removes Annotation.
- *
- * @param annotation - Annotation, which will be removed.
- *
- * @throws BadLocationException
- * @throws CoreException
- * @throws AnnotationGeneratorException
- * @throws FileNotFoundException
- */
- public <T extends IJavaElement> void remove(final IAnnotation<T> annotation) throws AnnotationGeneratorException, CoreException
- {
- removeAnnotation(annotation, annotation.getAppliedElement());
- }
-
- private <T extends IJavaElement> void removeAnnotation(final IAnnotation<T> annotation, final T javaElement) throws AnnotationGeneratorException, CoreException
- {
- AnnotationImpl<T> annotationImpl = (AnnotationImpl<T>)annotation;
- try
- {
-// if(annotationImpl.getAnnotationStringValue() == null || annotationImpl.getAnnotationStringValue().trim().equals(""))
-// {
-// annotationImpl.setAnnotationStringValue(createAnnotatationStringVallue(annotationImpl, javaElement));
-// AnnotationUtils.getInstance().removeAnnotation(javaElement, annotationImpl.getAnnotationStringValue());
-// }
-// else
-// {
- AnnotationUtils.getInstance().removeAnnotation(javaElement, annotationImpl.getSimpleAnnotationName());
-// }
- } catch (BadLocationException ble)
- {
- throw new AnnotationGeneratorException(ble.getMessage(), JaxWsUtilMessages.CannotPerformEditMsg, ble);
- } catch (FileNotFoundException fnfe)
- {
- throw new AnnotationGeneratorException(fnfe.getMessage(), JaxWsUtilMessages.CompUnitMissingMsg, fnfe);
- }
- }
-
- // i036509 added
- @SuppressWarnings("unchecked")
- private <T extends IJavaElement> void updateTheAnnotation(final T javaElement, final AnnotationImpl<T> annotationImpl) throws BadLocationException, CoreException, AnnotationGeneratorException, FileNotFoundException
- {
- final ICompilationUnit iCu = getCu(javaElement);
- final CompilationUnit unit = ASTUtils.getInstance().createCompilationUnit(iCu, null);
-
- BodyDeclaration bd = null;
- Annotation found = null;
- if(javaElement instanceof IType)
- {
- bd = ASTUtils.getInstance().getTypeDeclaration(javaElement.getElementName(), unit);
- found = findAnnotation(bd, annotationImpl);
-
- unit.recordModifications();
- if (found!=null) {
- bd.modifiers().remove(found);
- }
-
- final Expression annot = annotationImpl.getExpression(unit, unit.getAST());
- bd.modifiers().add(0, annot);
- }
- if(javaElement instanceof IMethod)
- {
- TypeDeclaration td = (TypeDeclaration)ASTUtils.getInstance().getTypeDeclaration(((IMethod)javaElement).getDeclaringType().getElementName(), unit);
- bd = ASTUtils.getInstance().getMethodDeclaration(((IMethod)javaElement), td);
- found = findAnnotation(bd, annotationImpl);
-
- unit.recordModifications();
- if (found!=null) {
- bd.modifiers().remove(found);
- }
-
- final Expression annot = annotationImpl.getExpression(unit, unit.getAST());
- bd.modifiers().add(0, annot);
- }
- if(javaElement instanceof IField)
- {
- TypeDeclaration td = (TypeDeclaration)ASTUtils.getInstance().getTypeDeclaration(((IField)javaElement).getDeclaringType().getElementName(), unit);
- bd = ASTUtils.getInstance().getFieldDeclaration(((IField)javaElement), td);
- found = findAnnotation(bd, annotationImpl);
-
- unit.recordModifications();
- if (found!=null) {
- bd.modifiers().remove(found);
- }
-
- final Expression annot = annotationImpl.getExpression(unit, unit.getAST());
- bd.modifiers().add(0, annot);
- }
- if(javaElement instanceof ITypeParameter)
- {
- if(((ITypeParameter)javaElement).getDeclaringMember() instanceof IType)
- {
- bd = ASTUtils.getInstance().getTypeDeclaration(((ITypeParameter)javaElement).getDeclaringMember().getElementName(), unit);
- SingleVariableDeclaration param = findParameter(bd, javaElement);
- if(param != null)
- {
- found = findParamAnnotation(param, annotationImpl, javaElement);
- }
-
- unit.recordModifications();
- if (found!=null) {
- param.modifiers().remove(found);
- }
-
- final Expression annot = annotationImpl.getExpression(unit, unit.getAST());
- param.modifiers().add(0, annot);
- }
- else
- {
- TypeDeclaration td = (TypeDeclaration)ASTUtils.getInstance().getTypeDeclaration(((IMethod)((ITypeParameter)javaElement).getParent()).getDeclaringType(). getElementName(), unit);
- bd = ASTUtils.getInstance().getMethodDeclaration(((IMethod)((ITypeParameter)javaElement).getParent()), td);
- SingleVariableDeclaration param = findParameter(bd, javaElement);
- if(param != null)
- {
- found = findParamAnnotation(param, annotationImpl, javaElement);
- }
-
- unit.recordModifications();
- if (found!=null) {
- param.modifiers().remove(found);
- }
-
- final Expression annot = annotationImpl.getExpression(unit, unit.getAST());
- param.modifiers().add(0, annot);
- }
- }
-
- setAnnotatationStringVallue(annotationImpl, false, javaElement);
- final IDocument doc = AnnotationUtils.getInstance().getDocument(iCu);
- final TextEdit edit = unit.rewrite(doc, javaElement.getJavaProject().getOptions(true));
- edit.apply(doc);
-
- IStatus status = editResManager().setFileEditable((IFile) iCu.getResource());
- if(status.getSeverity() == IStatus.OK)
- {
- fileUtils.setCompilationUnitContentAndSaveDirtyEditors(iCu, doc.get(), true, null);
- }
- else
- {
- throw new AnnotationGeneratorException("Annotattion could not be stored, the file is not writable", //$NON-NLS-1$
- JaxWsUtilMessages.AnnotationCannotBeStoredMsg);
- }
- }
-
- @SuppressWarnings("unchecked")
- private Annotation findAnnotation(final BodyDeclaration td, final IAnnotation<? extends IJavaElement> annotation)
- {
- Annotation ann;
- for (IExtendedModifier modifier : (List<IExtendedModifier>)td.modifiers())
- {
- if(!modifier.isAnnotation()) {
- continue;
- }
-
- ann = (Annotation)modifier;
- if (annotation.getAnnotationName().endsWith(ann.getTypeName().getFullyQualifiedName())) {
- return ann;
- }
- }
-
- return null;
- }
-
- private <T extends IJavaElement> SingleVariableDeclaration findParameter(final BodyDeclaration td, T javaElement)
- {
- if (td != null)
- {
- for (Object param : ((MethodDeclaration)td).parameters())
- {
- if (param instanceof SingleVariableDeclaration &&
- ((ITypeParameter)javaElement).getElementName().toString().equals(((SingleVariableDeclaration)param).getName().toString()))
- {
- return (SingleVariableDeclaration)param;
- }
- }
- }
- return null;
- }
-
- @SuppressWarnings("unchecked")
- private <T extends IJavaElement> Annotation findParamAnnotation(final SingleVariableDeclaration param, final IAnnotation<? extends IJavaElement> annotation, T javaElement)
- {
- Annotation ann;
- for (IExtendedModifier modifier : (List<IExtendedModifier>)(param.modifiers()))
- {
- if(!modifier.isAnnotation()) {
- continue;
- }
-
- ann = (Annotation)modifier;
- if (annotation.getAnnotationName().endsWith(ann.getTypeName().getFullyQualifiedName())) {
- return ann;
- }
- }
- return null;
- }
-
- private ICompilationUnit getCu(final IJavaElement javaElement)
- {
- switch (javaElement.getElementType())
- {
- case IJavaElement.TYPE:
- return ((IType) javaElement).getCompilationUnit();
- case IJavaElement.FIELD:
- return ((IField) javaElement).getCompilationUnit();
- case IJavaElement.METHOD:
- return ((IMethod) javaElement).getCompilationUnit();
- case IJavaElement.TYPE_PARAMETER:
- return ((ITypeParameter) javaElement).getDeclaringMember().getCompilationUnit();
- }
-
- return null;
- }
-
- private EditResourcesManager editResManager()
- {
- return new EditResourcesManager();
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/annotations/IAnnotation.java b/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/annotations/IAnnotation.java
deleted file mode 100755
index 0d8d839..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/annotations/IAnnotation.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.utils.annotations;
-
-import java.util.Set;
-
-import org.eclipse.jdt.core.IJavaElement;
-
-/**
- * Interface representing Complex Annotation consisting of param-value pairs.
- *
- * @author Plamen Pavlov
- */
-public interface IAnnotation<T extends IJavaElement>
-{
- /**
- * Return the param-value pairs which this Annotation has.
- *
- * @return Set of param-values pairs.
- */
- public Set<IParamValuePair> getParamValuePairs();
-
- /**
- * Returns the value of the parameter with name param.
- * @param param - the name of the parameter who's value is requested
- * @return - the value represented as a string. Null if such parameter cannot be found or has a value of null.
- * @throws - NullPointerException if param is null
- */
- public String getPropertyValue(String param);
-
- /**
- * Returns the T, to which this annotattion is associated.
- */
- public T getAppliedElement();
-
-
-//From IAnnotattionBase
- /**
- * @return - annotation name
- */
- public String getAnnotationName();
-
- /**
- * Gets the information about location in the source code.
- *
- * @return ILocator
- */
- public ILocator getLocator();
-
-
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/annotations/IAnnotationBase.java b/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/annotations/IAnnotationBase.java
deleted file mode 100755
index 2f900d6..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/annotations/IAnnotationBase.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.utils.annotations;
-
-import java.io.FileNotFoundException;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jface.text.BadLocationException;
-import org.eclipse.text.edits.MalformedTreeException;
-
-/**
- * Base interface representing Annotation and the functionality, required by it.
- *
- * @author Plamen Pavlov
- */
-public interface IAnnotationBase<T extends IJavaElement>
-{
- /** simple annotation type ID */
- public final int SIMPLE_ANNOTATION = 1;
-
- /** single element annotation type ID */
- public final int SINGLE_ELEMENT_ANNOTATION = 2;
-
- /** complex annotation type ID */
- public final int COMPLEX_ANNOTATION = 4;
-
- /**
- * @return - annotation name
- */
- public String getAnnotationName();
-
- /**
- * Getting the TypeID of current Annotation
- *
- * @return Integer value, which represents the Annotation TypeID
- */
- public int getType();
-
- /**
- * Adds current Annotation to specific IJavaElement. It is not possible to have IMember as parameter because there is ITypeParameter as parameter when add to TypParameter is executed.
- *
- * @param javaElement
- *
- * @throws NullPointerException if <tt>javaElement</tt> is null.
- * @throws IllegalArgumentException in case <code>javaElement</code> is not of the correct type. Supported types are: IType, IMethod, IField, ITypeParameter.
- * @throws AnnotationGeneratorException.
- */
- public void setAppliedElement(T javaElement) throws AnnotationGeneratorException;
-
- /**
- * Remove the current Annotation from the associated JavaElement.
- *
- * @throws BadLocationException
- * @throws CoreException
- * @throws AnnotationGeneratorException
- * @throws FileNotFoundException
- * @throws MalformedTreeException
- */
- public void remove() throws MalformedTreeException, FileNotFoundException, AnnotationGeneratorException, CoreException, BadLocationException;
-
- /**
- * Gets the information about location in the source code.
- *
- * @return ILocator
- */
- public ILocator getLocator();
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/annotations/IAnnotationInspector.java b/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/annotations/IAnnotationInspector.java
deleted file mode 100755
index c3f05f5..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/annotations/IAnnotationInspector.java
+++ /dev/null
@@ -1,138 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.utils.annotations;
-
-import java.util.Collection;
-
-import org.eclipse.jdt.core.IField;
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.ITypeParameter;
-import org.eclipse.jdt.core.JavaModelException;
-
-public interface IAnnotationInspector
-{
- /**
- * Retrieves all Type level Annotations from <code>type</code>, which is used to instantiate the IAnnotationInspector.
- *
- * @return contained Type level Annotations in <code>type</code> or empty Collection if not present.
- *
- * @throws JavaModelException
- */
- Collection<IAnnotation<IType>> inspectType() throws JavaModelException;
-
- /**
- * Retrieves a Type level Annotation with specific QName from <code>type</code>, which is used to instantiate the IAnnotationInspector.
- *
- * @param annotationQName - specified QName for the Annotation.
- *
- * @return Type level Annotation in <code>type</code> or <code>null</code>, if such Annotation do not present.
- *
- * @throws NullPointerException if <code>annotationQName</code> is <code>null</code>.
- * @throws IllegalArgumentException if <code>annotationQName</code> is empty String.
- * @throws JavaModelException
- */
- IAnnotation<IType> inspectType(final String annotationQName) throws JavaModelException;
-
- /**
- * Retrieves all Method level Annotations from <code>method</code>.
- *
- * @param method
- *
- * @return contained Method level Annotations in <code>method</code> or empty Collection if not present.
- *
- * @throws NullPointerException if <tt>method</tt> is null.
- * @throws JavaModelException
- */
- Collection<IAnnotation<IMethod>> inspectMethod(IMethod method) throws JavaModelException;
-
- /**
- * Retrieves a Method level Annotation with specific QName from <code>method</code>.
- *
- * @param method
- * @param annotationQName - specified QName for the Annotation.
- *
- * @return contained Method level Annotation in <code>method</code> or <code>null</code>.
- *
- * @throws NullPointerException if <tt>method</tt> or <code>annotationQName</code> are <code>null</code>.
- * @throws IllegalArgumentException if <code>annotationQName</code> is empty String.
- * @throws JavaModelException
- */
- IAnnotation<IMethod> inspectMethod(IMethod method, final String annotationQName) throws JavaModelException;
-
- /**
- * Retrieves all Field level Annotations from <code>field</code>.
- *
- * @param field
- *
- * @return contained Filed level Annotations in <code>field</code> or empty Collection if not present.
- *
- * @throws NullPointerException if <code>field</code> is <code>null</code>.
- * @throws JavaModelException
- */
- Collection<IAnnotation<IField>> inspectField(IField field) throws JavaModelException;
-
- /**
- * Retrieves a Field level Annotation with specific QName from <code>field</code>.
- *
- * @param field
- * @param annotationQName - specified QName for the Annotation.
- *
- * @return contained Filed level Annotations in <code>field</code> or <code>null</code>.
- *
- * @throws NullPointerException if <code>field</code> or <code>annotationQName</code> are <code>null</code>.
- * @throws IllegalArgumentException if <code>annotationQName</code> is empty String.
- * @throws JavaModelException
- */
- IAnnotation<IField> inspectField(IField field, final String annotationQName) throws JavaModelException;
-
- /**
- * Retrieves all TypeParameter level Annotations from <code>param</code>.
- *
- * @param param
- *
- * @return contained TypeParameter level Annotations in <code>param</code> or empty Collection if not present.
- *
- * @throws NullPointerException if <code>param</code> is <code>null</code>.
- * @throws JavaModelException
- */
- Collection<IAnnotation<ITypeParameter>> inspectParam(ITypeParameter param) throws JavaModelException;
-
- /**
- * Retrieves a TypeParameter level Annotation with specific QName from <code>param</code>.
- *
- * @param param
- * @param annotationQName - specified QName for the Annotation.
- *
- * @return contained TypeParameter level Annotations in <code>param</code> or <code>null</code>.
- *
- * @throws NullPointerException if <code>param</code> or <code>annotationQName</code> are <code>null</code>.
- * @throws IllegalArgumentException if <code>annotationQName</code> is empty String.
- * @throws JavaModelException
- */
- IAnnotation<ITypeParameter> inspectParam(ITypeParameter param, final String annotationQName) throws JavaModelException;
-
-
-
-
-// /**
-// * Retrieves all annotations from <code>javaElement</code>.
-// *
-// * @param javaElement
-// *
-// * @return contained annotations in <code>javaElement</code> or empty Colleaction if not present.
-// *
-// * @throws NullPointerException if <tt>javaElement</tt> is null.
-// * @throws IllegalArgumentException in case <code>javaElement</code> is not of the correct type. Supported types are: Itype, IMethod, IField.
-// * @throws JavaModelException
-// */
-// public Collection<IAnnotation> inspect(IJavaElement javaElement) throws JavaModelException;
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/annotations/IAnnotationProperty.java b/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/annotations/IAnnotationProperty.java
deleted file mode 100755
index db90bcb..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/annotations/IAnnotationProperty.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.utils.annotations;
-
-import org.eclipse.jst.ws.jaxws.utils.internal.annotations.impl.AttributeTypeEnum;
-
-public interface IAnnotationProperty
-{
- public String getAnnotationName();
-
- public String getAttributeName();
-
- public String getValue();
-
- public AttributeTypeEnum getAttributeType();
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/annotations/IAnnotationPropertyContainer.java b/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/annotations/IAnnotationPropertyContainer.java
deleted file mode 100755
index 3cc7694..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/annotations/IAnnotationPropertyContainer.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.utils.annotations;
-
-import java.lang.annotation.ElementType;
-import java.util.Set;
-
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.ITypeParameter;
-import org.eclipse.jst.ws.jaxws.utils.internal.annotations.impl.AnnotationProperty;
-
-/**
- * Interface for annotations container.
- *
- * @author Plamen Pavlov
- *
- */
-public interface IAnnotationPropertyContainer
-{
- public void addAnnotationProperty(final AnnotationProperty annotationProperty, final ElementType target);
-
- public Set<IAnnotation<ITypeParameter>> getParameterAnnotations(ITypeParameter tParam);
-
- public Set<IAnnotation<IType>> getTypeAnnotations(IType type);
-
- public Set<IAnnotation<IMethod>> getMethodAnnotations(IMethod method);
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/annotations/ILocator.java b/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/annotations/ILocator.java
deleted file mode 100755
index c47636f..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/annotations/ILocator.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.utils.annotations;
-
-/**
- * Class that holds information to locate specific region in the source code
- *
- */
-public interface ILocator
-{
- /**
- * @return the line number in the source where the region pointed by this locator starts
- */
- public int getLineNumber();
-
-
- /**
- * @return the index of the first character of this region in source code
- */
- public int getStartPosition();
-
- /**
- * @return the length of the region
- */
- public int getLength();
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/annotations/IParamValuePair.java b/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/annotations/IParamValuePair.java
deleted file mode 100755
index ffe6e5c..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/annotations/IParamValuePair.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.utils.annotations;
-
-/**
- * Interface representing param value pair in annotation. Param value pair has the following form: param=value
- *
- * @author Plamen Pavlov
- */
-public interface IParamValuePair
-{
- /**
- * @return param name
- */
- public String getParam();
-
- /**
- * @return the value
- */
- public IValue getValue();
-
- /**
- * Gets the information about location in the source code.
- *
- * @return ILocator
- */
- public ILocator getLocator();
-
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/annotations/IValue.java b/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/annotations/IValue.java
deleted file mode 100755
index 32c4a4c..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/annotations/IValue.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.utils.annotations;
-
-/**
- * Interface representing artifact value in annotation.
- *
- * @author Plamen Pavlov
- */
-public interface IValue
-{
- /**
- * Obtains the string representation of this value. The obtained string representation can later on be used to instantiate
- * an instance of the type of the value that will be considedered equal to the returned value.
- * <p>
- * <c>@AnnotationExample(1)</c> //annoation with one attribute/parameter called "value" with value of "1".
- * </p>
- * The toString method will return the string "1", which can later on be used by Integer.parse(String) to create an instance of Integer
- * equal to the value represented by the integer literal 1
- * @return the string representation of this value
- */
- public String toString();
-
- /**
- * Gets the information about location in the source code.
- *
- * @return ILocator
- */
- public ILocator getLocator();
-
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/clazz/ASTUtils.java b/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/clazz/ASTUtils.java
deleted file mode 100755
index 28d5000..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/clazz/ASTUtils.java
+++ /dev/null
@@ -1,235 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.utils.clazz;
-
-import static org.eclipse.jst.ws.jaxws.utils.ContractChecker.nullCheckParam;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.List;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IField;
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.Signature;
-import org.eclipse.jdt.core.dom.AST;
-import org.eclipse.jdt.core.dom.ASTNode;
-import org.eclipse.jdt.core.dom.ASTParser;
-import org.eclipse.jdt.core.dom.AbstractTypeDeclaration;
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jdt.core.dom.FieldDeclaration;
-import org.eclipse.jdt.core.dom.MethodDeclaration;
-import org.eclipse.jdt.core.dom.SingleVariableDeclaration;
-import org.eclipse.jdt.core.dom.TypeDeclaration;
-import org.eclipse.jdt.core.dom.VariableDeclarationFragment;
-import org.eclipse.jst.ws.jaxws.utils.resources.FileUtils;
-
-/**
- * Utility class that provides helper methods for {@link AST} processing.
- *
- * @author Georgi Vachkov
- */
-public class ASTUtils
-{
- private static ASTUtils instance;
-
- private ASTUtils() {
- // disable construction
- }
-
- /**
- * @return create new instance for this utility
- */
- public static ASTUtils getInstance() {
- if(instance==null) {
- instance = new ASTUtils();
- }
- return instance;
- }
-
- /**
- * Creates AST tree out of {@link File} instance.
- * @param sourceFile java class file
- * @param monitor progress monitor
- * @return created {@link ASTNode}
- * @throws IOException
- */
- public ASTNode createAST(final File sourceFile, final IProgressMonitor monitor) throws IOException
- {
- nullCheckParam(sourceFile, "sourceFile"); //$NON-NLS-1$
-
- final ASTParser parser = ASTParser.newParser(AST.JLS3);
- parser.setSource(FileUtils.getInstance().getFileContent(sourceFile).toCharArray());
- return parser.createAST(monitor);
- }
-
- /**
- * Creates {@link AST} tree out of {@link IType} instance.
- * @param sourceType java class
- * @param monitor progress monitor
- * @return created {@link ASTNode} instance
- */
- public CompilationUnit createCompilationUnit(final ICompilationUnit sourceCu, final IProgressMonitor monitor)
- {
- nullCheckParam(sourceCu, "sourceCu"); //$NON-NLS-1$
- final ASTParser parser = ASTParser.newParser(AST.JLS3);
- parser.setSource(sourceCu);
- parser.setBindingsRecovery(false);
- return (CompilationUnit)parser.createAST(monitor);
- }
-
- /**
- * Finds {@link FieldDeclaration} in {@link TypeDeclaration} with name <code>fieldType.getElementName()</code>.
- *
- * @param fieldType
- * @param typeDeclaration
- * @return found object or <code>null</code>
- */
- public FieldDeclaration getFieldDeclaration(final IField fieldType, final TypeDeclaration typeDeclaration)
- {
- for (FieldDeclaration fd : typeDeclaration.getFields())
- {
- for (Object fr : fd.fragments())
- {
- VariableDeclarationFragment vdf = (VariableDeclarationFragment) fr;
- if (vdf.getName().getFullyQualifiedName().equals(fieldType.getElementName()))
- {
- return fd;
- }
- }
- }
- return null;
- }
-
- @SuppressWarnings("unchecked")
- private boolean compareMethodParams(final IMethod methodType, final MethodDeclaration md)
- {
- List<SingleVariableDeclaration> list = md.parameters();
- if (list.size() == methodType.getNumberOfParameters())
- {
- String[] parameterTypes = methodType.getParameterTypes();
- for (int i = 0; i < list.size(); i++)
- {
- if (!isSameParam(parameterTypes[i], (SingleVariableDeclaration) list.get(i)))
- {
- return false;
- }
- }
- return true;
- }
- return false;
- }
-
- private boolean isSameParam(final String type, final SingleVariableDeclaration svDecl)
- {
- return type.equals(getTypeSignature(svDecl));
- }
-
- /**
- * Retrieves type signature from {@link SingleVariableDeclaration}. As {@link SingleVariableDeclaration} returns only the clean type in case
- * declaration of type <tt>int paraArr[][]</tt> is in code the method adds array identifiers for type declaration int this case.
- *
- * @param svDecl
- * @return the signatyre for the type
- */
- public String getTypeSignature(final SingleVariableDeclaration svDecl)
- {
- String typeName = Signature.createTypeSignature(svDecl.getType().toString(), false);
-
- if (svDecl.getExtraDimensions() > 0 && typeName.indexOf('[') == -1)
- {
- for (int i = 0; i < svDecl.getExtraDimensions(); i++)
- {
- typeName = "[" + typeName;// $JL-STR_CONCAT$ //$NON-NLS-1$
- }
- }
-
- return typeName;
- }
-
- /**
- * Finds {@link MethodDeclaration} in {@link TypeDeclaration} having name <code>methodType.getElementName()</code>.
- *
- * @param methodType
- * @param typeDeclaration
- * @return found object or <code>null</code>
- */
- public MethodDeclaration getMethodDeclaration(final IMethod methodType, final TypeDeclaration typeDeclaration)
- {
- for (MethodDeclaration md : typeDeclaration.getMethods())
- {
- if (md.getName().getFullyQualifiedName().equals(methodType.getElementName()))
- {
- if (compareMethodParams(methodType, md))
- {
- return md;
- }
- }
- }
-
- return null;
- }
-
- /**
- * Retrieves {@link TypeDeclaration} from {@link CompilationUnit} with name <tt>className</tt>
- *
- * @param className
- * @param unit
- * @return found {@link TypeDeclaration} or <code>null</code>
- */
- @SuppressWarnings("unchecked")
- public AbstractTypeDeclaration getTypeDeclaration(final String className, final CompilationUnit unit)
- {
- AbstractTypeDeclaration typeDeclaration = null;
- // looking up the selected type
- for (Object typeObject : unit.types())
- {
- AbstractTypeDeclaration tmpTypeDeclaration = (AbstractTypeDeclaration) typeObject;
- if (tmpTypeDeclaration.getName().getFullyQualifiedName().equals(className))
- {
- typeDeclaration = tmpTypeDeclaration;
- break;
- }
- }
-
- if (typeDeclaration == null)
- {
- List<AbstractTypeDeclaration> list = unit.types();
- typeDeclaration = getInnerClass(list.toArray(new AbstractTypeDeclaration[list.size()]), className);
- }
-
- return typeDeclaration;
- }
-
- private AbstractTypeDeclaration getInnerClass(final AbstractTypeDeclaration[] types, final String className)
- {
- AbstractTypeDeclaration result = null;
- for (AbstractTypeDeclaration abstractType : types)
- {
- if (abstractType.getName().getFullyQualifiedName().equals(className)) {
- return abstractType;
- }
-
- if (!(abstractType instanceof TypeDeclaration)) {
- continue;
- }
-
- result = getInnerClass((AbstractTypeDeclaration[]) ((TypeDeclaration) abstractType).getTypes(), className);
- if (result != null) {
- return result;
- }
- }
-
- return null;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/dom/validation/DomValidationConstants.java b/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/dom/validation/DomValidationConstants.java
deleted file mode 100755
index 6ea7b68..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/dom/validation/DomValidationConstants.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.utils.dom.validation;
-
-public class DomValidationConstants
-{
- public static final String MARKER_ID = "org.eclipse.jst.ws.jaxws.dom.integration.WsValidatorMarker"; //$NON-NLS-1$
-
- public static final String IMPLEMENTATION = "implementation"; //$NON-NLS-1$
-
- public static final String WS_CONSTRAINT_ID = "webServiceConstraint"; //$NON-NLS-1$
- public static final String WP_CONSTRAINT_ID = "webParamConstraint"; //$NON-NLS-1$
- public static final String WM_CONSTRAINT_ID = "webMethodConstraint"; //$NON-NLS-1$
- public static final String SEI_CONSTRAINT_ID = "seiConstraint"; //$NON-NLS-1$
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/exception/LocalizedException.java b/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/exception/LocalizedException.java
deleted file mode 100755
index 1ce0843..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/exception/LocalizedException.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.utils.exception;
-
-import org.eclipse.jst.ws.jaxws.utils.ContractChecker;
-
-
-
-/**
- * This is base class for all CHECKED exceptions for the WS Tools
- * toolset. This exception correctly overrides getLocalizedMessage()
- * of Exception class and provide proper localized message.
- * To achieve that there is a limitation - it will be impossible to return localized
- * message if it haven't been passed to the constructor of exception, so there is no
- * constructor without localized message.
- *
- * @author Mladen Tomov
- **/
-
-public class LocalizedException extends Exception {
-
- private static final long serialVersionUID = 1L;
-
- private final String localizedMessage;
-
- /**
- * Constructs exception with ability to provide localized message
- * @param message - the detail message (which is saved for later retrieval
- * by the {@link #getMessage()} method)
- * @param localizedMessage - the localized message (which is saved for later retrieval
- * by the {@link #getLocalizedMessage()} method)
- *
- * @throws NullPointerException - in case localized message is null
- * */
- public LocalizedException(String message, String localizedMessage) {
- super(message);
- ContractChecker.nullCheckParam(localizedMessage, "localizedMessage"); //$NON-NLS-1$
- this.localizedMessage = localizedMessage;
- }
-
- /**
- * Constructs exception with ability to provide localized message
- * @param message - the detail message (which is saved for later retrieval
- * by the {@link #getMessage()} method)
- * @param localizedMessage - the localized message (which is saved for later retrieval
- * by the {@link #getLocalizedMessage()} method)
- * @param cause - cause the cause (which is saved for later retrieval by the
- * {@link #getCause()} method).
- *
- * @throws NullPointerException - in case localized message is null
- * */
-
- public LocalizedException(String message, String localizedMessage, Throwable cause) {
- super(message, cause);
- ContractChecker.nullCheckParam(localizedMessage, "localizedMessage"); //$NON-NLS-1$
- this.localizedMessage = localizedMessage;
- }
-
- /**
- * Returns localized message with which the exception was constructed.*/
- @Override
- public String getLocalizedMessage() {
- return localizedMessage;
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/exception/MissingResourceException.java b/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/exception/MissingResourceException.java
deleted file mode 100755
index da21294..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/exception/MissingResourceException.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.utils.exception;
-
-
-/**
- * Indicates that a resource of any kind couldn't be found but this was expected.
- *
- * @author Joerg Dehmel
- */
-public class MissingResourceException extends LocalizedException
-{
-
- /**
- *
- */
- private static final long serialVersionUID = 1L;
-
- /**
- * Creates an instance with a message and a localized message.
- *
- * @param message
- * error message
- * @param localizedMessage
- * localized message
- */
- public MissingResourceException(final String message, final String localizedMessage)
- {
- super(message, localizedMessage);
- }
-
- /**
- * Creates an instance with message, localized message and causing exception.
- *
- * @param message
- * error message
- * @param localizedMessage
- * localized message
- * @param cause
- * causing exception
- */
- public MissingResourceException(final String message, final String localizedMessage, final Throwable cause)
- {
- super(message, localizedMessage, cause);
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/facets/FacetUtils.java b/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/facets/FacetUtils.java
deleted file mode 100755
index e88da7f..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/facets/FacetUtils.java
+++ /dev/null
@@ -1,130 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.utils.facets;
-
-import java.util.Comparator;
-import java.util.Iterator;
-import java.util.Set;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jst.ws.jaxws.utils.ContractChecker;
-import org.eclipse.wst.common.project.facet.core.IFacetedProject;
-import org.eclipse.wst.common.project.facet.core.IProjectFacet;
-import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion;
-import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager;
-
-
-public class FacetUtils implements IFacetUtils
-{
- /**
- * @throws NullPointerException
- * if <c>project</c> or <c>facetIds</c> is null
- */
- public boolean hasAnyFacet(IProject project, String... facetIds) throws CoreException
- {
- ContractChecker.nullCheckParam(project);
- ContractChecker.nullCheckParam(facetIds);
-
- if (!isFacetedProject(project))
- {
- return false;
- }
-
- final IFacetedProject facetedProject = getFacetedProject(project);
- for (String facetId : facetIds)
- {
- final IProjectFacet facet = ProjectFacetsManager.getProjectFacet(facetId);
- if (facetedProject.hasProjectFacet(facet))
- {
- return true;
- }
- }
- return false;
- }
-
- public boolean hasFacetWithVersion(IProject project, String facetVersion, String facetId) throws CoreException
- {
- return hasFacetWithVersion(project, facetVersion, facetId, true);
- }
-
- public boolean isFacetedProject(IProject project) throws CoreException
- {
- Set<IFacetedProject> facetedProjects = getAllWorkspaceFacetedProjects();
- final Iterator<IFacetedProject> i = facetedProjects.iterator();
- while (i.hasNext())
- {
- final IFacetedProject fp = (IFacetedProject) i.next();
- if (project.equals(fp.getProject()))
- {
- return true;
- }
- }
- return false;
- }
-
- public boolean hasFacetWithVersion(IProject project, String facetVersion, String facetId, boolean acceptHigherFacetVersion) throws CoreException
- {
- ContractChecker.nullCheckParam(project);
- ContractChecker.nullCheckParam(facetVersion);
- ContractChecker.nullCheckParam(facetId);
-
- if (!isFacetedProject(project))
- {
- return false;
- }
-
- Set<IProjectFacetVersion> allFacetsVersions = getProjectFacets(project);
- for (IProjectFacetVersion ver : allFacetsVersions)
- {
- if (ver.getProjectFacet().getId().equals(facetId))
- {
- return isFacetAcceptable(ver, facetVersion, acceptHigherFacetVersion);
- }
- }
-
- return false;
- }
-
- private boolean isFacetAcceptable(IProjectFacetVersion facetVersion, String facetVersionId, boolean acceptHigherFacetVersion)
- throws CoreException
- {
- assert facetVersion != null;
-
- // Check for exact version
- if (!acceptHigherFacetVersion)
- {
- return facetVersion.getVersionString().equals(facetVersionId);
- }
-
- Comparator<String> comparator = facetVersion.getProjectFacet().getVersionComparator();
- String currentFacetVersion = facetVersion.getVersionString();
- return comparator.compare(currentFacetVersion, facetVersionId) >= 0;
- }
-
- private IFacetedProject getFacetedProject(IProject project) throws CoreException
- {
- return ProjectFacetsManager.create(project);
- }
-
- private Set<IProjectFacetVersion> getProjectFacets(IProject project) throws CoreException
- {
- assert isFacetedProject(project);
-
- return getFacetedProject(project).getProjectFacets();
- }
-
- private Set<IFacetedProject> getAllWorkspaceFacetedProjects() throws CoreException
- {
- return ProjectFacetsManager.getFacetedProjects();
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/facets/IFacetUtils.java b/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/facets/IFacetUtils.java
deleted file mode 100755
index 8727750..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/facets/IFacetUtils.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.utils.facets;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-
-public interface IFacetUtils
-{
- /**
- * Constant for EJB30 facet ID
- */
- public static final String EJB_30_FACET_ID = "jst.ejb"; //$NON-NLS-1$
-
- /**
- * Constant for EJB30 facet version 3.0
- */
- public static final String EJB_30_FACET_VERSION = "3.0"; //$NON-NLS-1$
-
- /**
- * Constant for Web 2.5 facet ID
- */
- public static final String WEB_25_FACET_ID = "jst.web"; //$NON-NLS-1$
-
- /**
- * Constant for Web facet version 2.5
- */
- public static final String WEB_25_FACET_VERSION = "2.5"; //$NON-NLS-1$
-
- /**
- * Constant for Application client facet ID
- */
- public static final String APPCLIENT_25_FACET_ID = "jst.appclient"; //$NON-NLS-1$
-
- /**
- * Constant for Application client facet version 2.5
- */
- public static final String APPCLIENT_25_FACET_VERSION = "5.0"; //$NON-NLS-1$
-
- /**
- * Checks whether <code>project</code> has a facet with id <code>facetId</code> with version <code>facetVersion</code>
- * In case the project specified is not a faceted project, false is returned
- * This is a convenience method that is equivalent to invoking hasFacetWithVersion(project, facetVersion, facetId, false)
- * @param project the project
- * @param facetVersion the facet version
- * @param facetId the facet id
- * @return true in case the project specified is a faceted project and has the facet with the version specified; false otherwise
- * @throws CoreException
- * @throws NullPointerException when any of the input parameters is null
- * @see IFacetUtils#hasFacetWithVersion(IProject, String, String, boolean)
- */
- public boolean hasFacetWithVersion(IProject project, String facetVersion, String facetId) throws CoreException;
-
- /**
- * Checks whether <code>project</code> has a facet with id <code>facetId</code> with version <code>facetVersion</code>
- * In case the project specified is not a faceted project, false is returned
- * @param project the project
- * @param facetVersion the facet version
- * @param facetId the facet id
- * @param acceptHigherFacetVersion a flag indicating whether higher facet versions are acceptable
- * @return true in case the project specified is a faceted project and has the facet with the version specified; false otherwise
- * @throws CoreException
- * @throws NullPointerException when any of the input parameters is null
- */
- public boolean hasFacetWithVersion(IProject project, String facetVersion, String facetId, boolean acceptHigherFacetVersion) throws CoreException;
-
- /**
- * Checks whether the project specified is a faceted project
- * @param project the project
- * @return
- * @throws CoreException
- * @throws NullPointerException if <code>project</code> is null
- */
- public boolean isFacetedProject(IProject project) throws CoreException;
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/internal/annotations/impl/AnnotationBaseImpl.java b/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/internal/annotations/impl/AnnotationBaseImpl.java
deleted file mode 100755
index 32eda2b..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/internal/annotations/impl/AnnotationBaseImpl.java
+++ /dev/null
@@ -1,120 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.utils.internal.annotations.impl;
-
-import org.eclipse.jdt.core.IField;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.ITypeParameter;
-import org.eclipse.jst.ws.jaxws.utils.annotations.IAnnotationBase;
-
-/**
- * Base {@link IAnnotationBase} implementation
- *
- * @author Plamen Pavlov
- */
-public abstract class AnnotationBaseImpl<T extends IJavaElement> extends ValueImpl
-{
- private String annotationName;// Container for Annotation Name;
- protected T javaElement; // Conatiner for the parent IJavaElement;
- //private String annotationStringValue;//Conatiner to current String representation of this annotation
-
- private static final String DOT = "."; //$NON-NLS-1$
-
- /**
- * Constructor.
- *
- * @param annotationName
- *
- * @throws NullPointerException in case <code>annotationName</code> is null.
- * @throws IllegalArgumentException in case <code>annotationName</code> is empty String.
- */
- public AnnotationBaseImpl(String annotationName)
- {
- this.annotationName = annotationName;
- }
-
- /**
- * Extracts only the Annotation name in case it is in fully qualified form.
- *
- * @return the simple Annotation name.
- */
- public String getSimpleAnnotationName()
- {
- int lastDotIndex = annotationName.lastIndexOf(DOT);
-
- if (lastDotIndex == -1)
- {
- return annotationName;
- }
-
- return annotationName.substring(lastDotIndex + 1);
- }
-
- public String getAnnotationName()
- {
- return annotationName;
- }
-
- /**
- * Adds Annotation to specific IJavaElement.
- *
- * @param javaElement
- *
- * @throws NullPointerException if <tt>javaElement</tt> is null.
- * @throws IllegalArgumentException in case <code>javaElement</code> is not of the correct type. Supported types are: IType, IMethod, IField, ITypeParameter.
- */
- public void setAppliedElementWithoutSave(T javaElement)
- {
- setJavaElement(javaElement);
- }
-
- public void setJavaElement(T javaElement)
- {
- if (javaElement == null)
- {
- throw new NullPointerException("javaElement should not be null!"); //$NON-NLS-1$
- }
- if(!(javaElement instanceof IType) && !(javaElement instanceof IMethod) && !(javaElement instanceof IField) && !(javaElement instanceof ITypeParameter))
- {
- throw new IllegalArgumentException("javaElement is not of correct type!"); //$NON-NLS-1$
- }
-
- this.javaElement = javaElement;
- }
-
- @Override
- public int hashCode()
- {
- return annotationName.hashCode();
- }
-
- @SuppressWarnings("unchecked")
- @Override
- public boolean equals(Object obj)
- {
- if (this == obj)
- {
- return true;
- }
- if (obj == null)
- {
- return false;
- }
- if (getClass() != obj.getClass())
- {
- return false;
- }
- final AnnotationBaseImpl<T> other = (AnnotationBaseImpl<T>)obj;
- return annotationName.equals(other.annotationName);
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/internal/annotations/impl/AnnotationImpl.java b/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/internal/annotations/impl/AnnotationImpl.java
deleted file mode 100755
index 5d3b5a3..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/internal/annotations/impl/AnnotationImpl.java
+++ /dev/null
@@ -1,125 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.utils.internal.annotations.impl;
-
-import java.util.Arrays;
-import java.util.Set;
-
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.dom.AST;
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jdt.core.dom.Expression;
-import org.eclipse.jdt.core.dom.MemberValuePair;
-import org.eclipse.jdt.core.dom.Name;
-import org.eclipse.jdt.core.dom.NormalAnnotation;
-import org.eclipse.jdt.core.dom.SimpleName;
-import org.eclipse.jst.ws.jaxws.utils.annotations.IAnnotation;
-import org.eclipse.jst.ws.jaxws.utils.annotations.IParamValuePair;
-
-/**
- * An implementation of {@link IAnnotation}
- *
- * @author Plamen Pavlov
- */
-public class AnnotationImpl<T extends IJavaElement> extends AnnotationBaseImpl<T> implements IAnnotation<T>
-{
-
- /**
- * @see org.eclipse.jst.ws.jaxws.utils.annotations.IAnnotation#getPropertyValue(java.lang.String)
- */
- public String getPropertyValue(String param)
- {
- for (IParamValuePair pair : getParamValuePairs())
- {
- if (param.equals(pair.getParam()))
- {
- return pair.getValue()!=null ? pair.getValue().toString() : null;
- }
- }
- return null;
- }
-
- private Set<IParamValuePair> paramValuePairs;
-
- /**
- * Constructor
- *
- * @param annotationName -
- * the name of annotation
- * @param paramValuePairs -
- * the param=value paris
- */
- public AnnotationImpl(String annotationName, Set<IParamValuePair> paramValuePairs)
- {
- super(annotationName);
- this.paramValuePairs = paramValuePairs;
- }
-
- public Set<IParamValuePair> getParamValuePairs()
- {
- return paramValuePairs;
- }
-
- public void setParamValuePairs(Set<IParamValuePair> paramValuePairs)
- {
- this.paramValuePairs = paramValuePairs;
- }
-
- @SuppressWarnings("unchecked")
- @Override
- public Expression getExpression(CompilationUnit unit, AST ast)
- {
- NormalAnnotation annot = ast.newNormalAnnotation();
- boolean wasAdded = addImports(ast, unit, getAnnotationName());
- if (wasAdded)
- {
- ((SimpleName) annot.getTypeName()).setIdentifier(getSimpleAnnotationName());
- } else
- {
- Name name = ast.newName(getAnnotationName());
- annot.setTypeName(name);
- }
- for (IParamValuePair paramValuePair : paramValuePairs)
- {
- MemberValuePair pair = ast.newMemberValuePair();
- pair.getName().setIdentifier(paramValuePair.getParam());
- pair.setValue(((ValueImpl) paramValuePair.getValue()).getExpression(unit, ast));
- annot.values().add(pair);
- }
- return annot;
- }
-
- @Override
- public int hashCode()
- {
- if(paramValuePairs == null || paramValuePairs.size() < 1)
- {
- return 31 * super.hashCode();
- }
- return 31 * super.hashCode() + Arrays.hashCode(paramValuePairs.toArray(new IParamValuePair[paramValuePairs.size()]));
- }
-
- @Override
- public boolean equals(Object obj)
- {
- if (!super.equals(obj))
- {
- return false;
- }
- final AnnotationImpl<?> other = (AnnotationImpl<?>) obj;
- return (Arrays.equals(paramValuePairs.toArray(new IParamValuePair[paramValuePairs.size()]), other.paramValuePairs.toArray(new IParamValuePair[paramValuePairs.size()])));
- }
-
- public T getAppliedElement()
- {
- return this.javaElement;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/internal/annotations/impl/AnnotationInspectorImpl.java b/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/internal/annotations/impl/AnnotationInspectorImpl.java
deleted file mode 100755
index 2c867e1..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/internal/annotations/impl/AnnotationInspectorImpl.java
+++ /dev/null
@@ -1,670 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.utils.internal.annotations.impl;
-
-import static org.eclipse.jst.ws.jaxws.utils.ContractChecker.nullCheckParam;
-
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Set;
-
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IField;
-import org.eclipse.jdt.core.IImportDeclaration;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.IMember;
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.ITypeParameter;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jdt.core.dom.ASTNode;
-import org.eclipse.jdt.core.dom.AbstractTypeDeclaration;
-import org.eclipse.jdt.core.dom.Annotation;
-import org.eclipse.jdt.core.dom.ArrayInitializer;
-import org.eclipse.jdt.core.dom.BodyDeclaration;
-import org.eclipse.jdt.core.dom.BooleanLiteral;
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jdt.core.dom.Expression;
-import org.eclipse.jdt.core.dom.FieldDeclaration;
-import org.eclipse.jdt.core.dom.IExtendedModifier;
-import org.eclipse.jdt.core.dom.MarkerAnnotation;
-import org.eclipse.jdt.core.dom.MemberValuePair;
-import org.eclipse.jdt.core.dom.MethodDeclaration;
-import org.eclipse.jdt.core.dom.Name;
-import org.eclipse.jdt.core.dom.NormalAnnotation;
-import org.eclipse.jdt.core.dom.NumberLiteral;
-import org.eclipse.jdt.core.dom.QualifiedName;
-import org.eclipse.jdt.core.dom.QualifiedType;
-import org.eclipse.jdt.core.dom.SimpleType;
-import org.eclipse.jdt.core.dom.SingleMemberAnnotation;
-import org.eclipse.jdt.core.dom.SingleVariableDeclaration;
-import org.eclipse.jdt.core.dom.StringLiteral;
-import org.eclipse.jdt.core.dom.Type;
-import org.eclipse.jdt.core.dom.TypeDeclaration;
-import org.eclipse.jdt.core.dom.TypeLiteral;
-import org.eclipse.jst.ws.jaxws.utils.ContractChecker;
-import org.eclipse.jst.ws.jaxws.utils.annotations.AnnotationFactory;
-import org.eclipse.jst.ws.jaxws.utils.annotations.IAnnotation;
-import org.eclipse.jst.ws.jaxws.utils.annotations.IAnnotationInspector;
-import org.eclipse.jst.ws.jaxws.utils.annotations.ILocator;
-import org.eclipse.jst.ws.jaxws.utils.annotations.IParamValuePair;
-import org.eclipse.jst.ws.jaxws.utils.annotations.IValue;
-import org.eclipse.jst.ws.jaxws.utils.clazz.ASTUtils;
-
-/**
- * Class, which is made to load and return annotations from a given IJavaElemet.
- *
- * @author Plamen Pavlov
- */
-public class AnnotationInspectorImpl implements IAnnotationInspector
-{
- private IType iType;
- private CompilationUnit cUnit;
-
- public AnnotationInspectorImpl(final IType type)
- {
- ContractChecker.nullCheckParam(type, "type"); //$NON-NLS-1$
-
- this.iType = type;
- }
-
- public IAnnotation<IMethod> inspectMethod(final IMethod method, final String annotationQName) throws JavaModelException
- {
- ContractChecker.nullCheckParam(method, "method"); //$NON-NLS-1$
- ContractChecker.nullCheckParam(annotationQName, "annotationQName"); //$NON-NLS-1$
- if(!(method instanceof IMethod))
- {
- throw new IllegalArgumentException("method argument is not of correct Type!"); //$NON-NLS-1$
- }
- if(annotationQName.trim().equals("")) //$NON-NLS-1$
- {
- throw new IllegalArgumentException("annotationQName argument is not with propper value!"); //$NON-NLS-1$
- }
-
- return getSpecificAnnotationFromMember(method, method.getParent().getElementName(), annotationQName);
- }
-
- public Collection<IAnnotation<IMethod>> inspectMethod(IMethod method) throws JavaModelException
- {
- ContractChecker.nullCheckParam(method, "method"); //$NON-NLS-1$
-
- if(!(method instanceof IMethod))
- {
- throw new IllegalArgumentException("method argument is not of correct Type!"); //$NON-NLS-1$
- }
-
- return getFromMember(method, method.getParent().getElementName());
- }
-
- public IAnnotation<IField> inspectField(final IField field, final String annotationQName) throws JavaModelException
- {
- nullCheckParam(field, "field"); //$NON-NLS-1$
- nullCheckParam(annotationQName, "annotationQName"); //$NON-NLS-1$
-
- if(!(field instanceof IField))
- {
- throw new IllegalArgumentException("field argument is not of correct Type!"); //$NON-NLS-1$
- }
- if(annotationQName.trim().equals("")) //$NON-NLS-1$
- {
- throw new IllegalArgumentException("annotationQName argument is not with propper value!"); //$NON-NLS-1$
- }
-
- final String className = field.getParent().getElementName();
- return getSpecificAnnotationFromMember(field, className, annotationQName);
- }
-
- public Collection<IAnnotation<IField>> inspectField(IField field) throws JavaModelException
- {
- if (field == null)
- {
- throw new NullPointerException("field should not be null!"); //$NON-NLS-1$
- }
- if(!(field instanceof IField))
- {
- throw new IllegalArgumentException("field argument is not of correct Type!"); //$NON-NLS-1$
- }
-
- final String className = field.getParent().getElementName();
- return getFromMember(field, className);
- }
-
- public IAnnotation<ITypeParameter> inspectParam(final ITypeParameter param, final String annotationQName) throws JavaModelException
- {
- nullCheckParam(param, "param"); //$NON-NLS-1$
- nullCheckParam(annotationQName, "annotationQName"); //$NON-NLS-1$
-
- if(!(param instanceof ITypeParameter))
- {
- throw new IllegalArgumentException("param argument is not of correct Type!"); //$NON-NLS-1$
- }
- if(annotationQName.trim().equals("")) //$NON-NLS-1$
- {
- throw new IllegalArgumentException("annotationQName argument is not with propper value!"); //$NON-NLS-1$
- }
-
- final String className = getClassNameFromParam(param);
- return getSpecificAnnotationFromMember(param, className, annotationQName);
- }
-
- public Collection<IAnnotation<ITypeParameter>> inspectParam(ITypeParameter param) throws JavaModelException
- {
- if (param == null)
- {
- throw new NullPointerException("param should not be null!"); //$NON-NLS-1$
- }
- if(!(param instanceof ITypeParameter))
- {
- throw new IllegalArgumentException("param argument is not of correct Type!"); //$NON-NLS-1$
- }
-
- return getFromMember(param, getClassNameFromParam(param));
- }
-
- public IAnnotation<IType> inspectType(final String annotationQName) throws JavaModelException
- {
- nullCheckParam(annotationQName, "annotationQName"); //$NON-NLS-1$
-
- if (annotationQName.trim().equals("")) //$NON-NLS-1$
- {
- throw new IllegalArgumentException("annotationQName argument is not with propper value!"); //$NON-NLS-1$
- }
-
- return getSpecificAnnotationFromMember(iType, iType.getElementName(), annotationQName);
- }
-
- public Collection<IAnnotation<IType>> inspectType() throws JavaModelException
- {
- return getFromMember(iType, iType.getElementName());
- }
-
- // # implementation
-
- private String getClassNameFromParam(final ITypeParameter param) throws JavaModelException
- {
- if(param.getDeclaringMember() instanceof IMethod)
- {
- return param.getDeclaringMember().getParent().getElementName();
- }
-
- return param.getDeclaringMember().getElementName();
- }
-
- protected <T extends IJavaElement> Set<IAnnotation<T>> getFromMember(T type, String className) throws JavaModelException
- {
- if (!isSupportedJavaElement(type)) {
- throw new IllegalArgumentException("passed argument is not of correct type."); //$NON-NLS-1$
- }
-
- ICompilationUnit cUnit = null;
- if(type instanceof IMember) {
- cUnit = ((IMember)type).getCompilationUnit();
- }
- else {
- cUnit = ((ITypeParameter)type).getDeclaringMember().getCompilationUnit();
- }
-
- if (cUnit == null) {
- return new HashSet<IAnnotation<T>>();
- }
-
- final CompilationUnit unit = getCompilationUnit();
- final AbstractTypeDeclaration typeDeclaration = ASTUtils.getInstance().getTypeDeclaration(className, unit);
-
- switch(type.getElementType())
- {
- case IJavaElement.TYPE:
- return getAnnotations(type, typeDeclaration);
-
- case IJavaElement.FIELD:
- FieldDeclaration fieldDeclaration = ASTUtils.getInstance().getFieldDeclaration((IField) type, (TypeDeclaration)typeDeclaration);
- return getAnnotations(type, fieldDeclaration);
-
- case IJavaElement.METHOD:
- MethodDeclaration methodDeclaration = ASTUtils.getInstance().getMethodDeclaration((IMethod) type, (TypeDeclaration)typeDeclaration);
- return getAnnotations(type, methodDeclaration);
-
- case IJavaElement.TYPE_PARAMETER:
- methodDeclaration = ASTUtils.getInstance().getMethodDeclaration((IMethod)((ITypeParameter) type).getParent(), (TypeDeclaration)typeDeclaration);
- return getParamAnnotations(type, methodDeclaration);
- }
-
- return new HashSet<IAnnotation<T>>();
- }
-
- @SuppressWarnings("unchecked")
- private <T extends IJavaElement> Set<IAnnotation<T>> getAnnotations(T iMember, BodyDeclaration bodyDeclaration) throws JavaModelException
- {
- if (bodyDeclaration != null)
- {
- List list = bodyDeclaration.modifiers();
- return extractAnnotations(iMember, list);
- }
- return new HashSet<IAnnotation<T>>();
- }
-
- @SuppressWarnings("unchecked")
- private <T extends IJavaElement> Set<IAnnotation<T>> getParamAnnotations(T iMember, MethodDeclaration methodDeclaration) throws JavaModelException
- {
- if (methodDeclaration != null)
- {
- for (Object param : methodDeclaration.parameters())
- {
- if (param instanceof SingleVariableDeclaration &&
- ((ITypeParameter)iMember).getElementName().toString().equals(((SingleVariableDeclaration)param).getName().toString()))
- {
- List list = ((SingleVariableDeclaration) param).modifiers();
-
- return extractAnnotations(iMember, list);
- }
- }
- }
- return new HashSet<IAnnotation<T>>();
- }
-
-
- @SuppressWarnings("unchecked")
- private <T extends IJavaElement> Set<IAnnotation<T>> extractAnnotations(T iMember, List list) throws JavaModelException
- {
- Iterator iter = list.iterator();
- Set<IValue> values = new HashSet<IValue>();
- while (iter.hasNext())
- {
- IExtendedModifier element = (IExtendedModifier) iter.next();
- if (element.isAnnotation())
- {
- values.add(convertExpression((Expression) element));
- }
- }
-
- Set<IAnnotation<T>> expressions = new HashSet<IAnnotation<T>>();
- for (IValue value : values)
- {
- AnnotationImpl<T> ann = (AnnotationImpl<T>)value;
- ann.setAppliedElementWithoutSave(iMember);
- expressions.add(ann);
- }
- return expressions;
- }
-
- @SuppressWarnings("unchecked")
- private <T extends IJavaElement> IAnnotation<T> extractSpecificAnnotation(T iMember, List list, IType type, String annotationQName) throws JavaModelException
- {
- Iterator iter = list.iterator();
- Set<IValue> values = new HashSet<IValue>();
- while (iter.hasNext())
- {
- IExtendedModifier element = (IExtendedModifier) iter.next();
- if (element.isAnnotation())
- {
- final Name typeName = ((Annotation)element).getTypeName();
- if (annotationQName.endsWith(typeName.getFullyQualifiedName())) {
- values.add(convertExpression((Expression) element));
- }
- }
- }
-
- for (IValue value : values)
- {
- AnnotationImpl<T> tmpAnnotation = (AnnotationImpl<T>)value;
- if(checkSpecificAnnotattion(tmpAnnotation, type, annotationQName))
- {
- AnnotationImpl<T> result = new AnnotationImpl<T>(annotationQName, tmpAnnotation.getParamValuePairs());
- result.setAppliedElementWithoutSave(iMember);
- result.setLocator(tmpAnnotation.getLocator());
- return result;
- }
- }
- return null;
- }
-
- private <T extends IJavaElement> boolean checkSpecificAnnotattion(final AnnotationImpl<T> annotation, final IType type, final String annotationQName) throws JavaModelException
- {
- if(annotation.getAnnotationName().equals(annotationQName) ||
- (type.getPackageFragment().getElementName() + "." + annotation.getAnnotationName()).equals(annotationQName)) //$NON-NLS-1$
- {
- return true;
- }
-
- ICompilationUnit cUnit = type.getCompilationUnit();
- IImportDeclaration[] imports = cUnit.getImports();
- for (IImportDeclaration importDeclaration : imports)
- {
- if(annotationQName.endsWith(annotation.getAnnotationName()) && importDeclaration.getElementName().equals(annotationQName))
- {
- return true;
- }
- }
-
- for (IImportDeclaration importDeclaration : imports)
- {
- if(importDeclaration.getElementName().endsWith("*")) //$NON-NLS-1$
- {
- String importStr = importDeclaration.getElementName().substring(0, importDeclaration.getElementName().length() - 1);
- if(annotationQName.endsWith(annotation.getAnnotationName()) && annotationQName.indexOf(importStr) == 0)
- {
- return true;
- }
- }
- }
-
- return false;
- }
-
- @SuppressWarnings("unchecked")
- private IValue convertExpression(Expression element) throws JavaModelException
- {
- switch (element.getNodeType())
- {
- case ASTNode.MARKER_ANNOTATION:
- {
- MarkerAnnotation ma = (MarkerAnnotation) element;
- AnnotationImpl annotation = new AnnotationImpl(getFullyQualifiedAnnotationName(ma), new HashSet<IParamValuePair>());
- annotation.setLocator(createLocator(ma));
- return annotation;
- }
- case ASTNode.SINGLE_MEMBER_ANNOTATION:
- {
- final SingleMemberAnnotation sma = (SingleMemberAnnotation) element;
- final Set<IParamValuePair> values = new HashSet<IParamValuePair>();
-
- final IValue value = convertExpression(sma.getValue());
- if (value!=null) {
- values.add(AnnotationFactory.createParamValuePairValue("value", value)); //$NON-NLS-1$
- }
-
- AnnotationImpl annotation = new AnnotationImpl(getFullyQualifiedAnnotationName(sma), values);
- annotation.setLocator(createLocator(sma));
- return annotation;
- }
- case ASTNode.NORMAL_ANNOTATION:
- {
- return getNormalAnnotationValue((NormalAnnotation) element);
- }
- case ASTNode.ARRAY_INITIALIZER:
- {
- ArrayInitializer arr = (ArrayInitializer) element;
- List<Expression> list = arr.expressions();
- Iterator<Expression> iter = list.iterator();
- Set<IValue> result = new HashSet<IValue>();
- while (iter.hasNext())
- {
- Expression expr = (Expression) iter.next();
- result.add(convertExpression(expr));
- }
- return new ArrayValueImpl(result);
- }
- case ASTNode.NULL_LITERAL:
- {
- // return AnnotationFactory.createNullValue();
- break;
- }
- case ASTNode.SIMPLE_NAME:
- {
- break;//return new StringValueImpl(((SimpleName)element).getIdentifier());
- }
- case ASTNode.TYPE_LITERAL:
- {
- return getTypeLiteralValue((TypeLiteral) element);
- }
- case ASTNode.QUALIFIED_NAME:
- {
- QualifiedName qn = (QualifiedName) element;
- QualifiedNameValueImpl qnValue = new QualifiedNameValueImpl(qn.getFullyQualifiedName());
- qnValue.setLocator(createLocator(qn));
- return qnValue;
- }
- case ASTNode.BOOLEAN_LITERAL:
- {
- BooleanLiteral bl = (BooleanLiteral) element;
- BooleanValueImpl bValue = new BooleanValueImpl(bl.booleanValue());
- bValue.setLocator(createLocator(bl));
- return bValue;
- }
- case ASTNode.CHARACTER_LITERAL:
- {
- // CharacterLiteral cl = (CharacterLiteral) element;
- // TODO Finish with this return new CharacterValue(cl.charValue());
- break;
- }
- case ASTNode.NUMBER_LITERAL:
- {
- NumberLiteral nl = (NumberLiteral) element;
- IntegerValueImpl intValue = new IntegerValueImpl(nl.getToken());
- intValue.setLocator(createLocator(nl));
- return intValue;
- }
- case ASTNode.STRING_LITERAL:
- {
- StringLiteral sl = (StringLiteral) element;
- StringValueImpl strValue = new StringValueImpl(sl.getLiteralValue());
- strValue.setLocator(createLocator(sl));
- return strValue;
- }
- }
- return null;
- }
-
- private IValue getTypeLiteralValue(TypeLiteral tl) throws JavaModelException
- {
- Type type = tl.getType();
- Name name = null;
- if (type.isQualifiedType())
- {
- name = ((QualifiedType) type).getName();
- } else
- {
- if (type.isSimpleType())
- {
- name = ((SimpleType) type).getName();
- }
- }
- if (name != null)
- {
- CompilationUnit cu = getCompilationUnit(tl);
- if (cu != null)
- {
- String fullyQualifiedName = name.getFullyQualifiedName();
- if (type.isSimpleType())
- {
- fullyQualifiedName = resolveType((ICompilationUnit) cu.getJavaElement(), fullyQualifiedName);
- }
-
- ClassValueImpl cValue = new ClassValueImpl(fullyQualifiedName);
- cValue.setLocator(createLocator(tl));
- return cValue;
- }
- }
-
- return null;
- }
-
- @SuppressWarnings("unchecked")
- private IValue getNormalAnnotationValue(NormalAnnotation na) throws JavaModelException
- {
- List<MemberValuePair> l = na.values();
- Iterator<MemberValuePair> iter = l.iterator();
- Set<IParamValuePair> result = new HashSet<IParamValuePair>();
- while (iter.hasNext())
- {
- MemberValuePair mvp = (MemberValuePair) iter.next();
- IValue mvpval = convertExpression(mvp.getValue());
- ParamValuePairImpl pair = new ParamValuePairImpl(mvp.getName().getIdentifier(), mvpval);
- pair.setLocator(createLocator(mvp));
- result.add(pair);
- }
-
- AnnotationImpl annotation = new AnnotationImpl(getFullyQualifiedAnnotationName(na), result);
- annotation.setLocator(createLocator(na));
- return annotation;
- }
-
- private String getFullyQualifiedAnnotationName(Annotation anno) throws JavaModelException
- {
- Name typeName = anno.getTypeName();
- String fullyQualifiedName = typeName.getFullyQualifiedName();
- if (typeName.isSimpleName())
- {
- CompilationUnit cu = getCompilationUnit(anno);
- fullyQualifiedName = resolveType((ICompilationUnit) cu.getJavaElement(), fullyQualifiedName);
- }
- return fullyQualifiedName;
- }
-
- private CompilationUnit getCompilationUnit(Expression element)
- {
- ASTNode cu = element;
- while (cu != null && !(cu instanceof CompilationUnit))
- {
- cu = cu.getParent();
- }
- return (CompilationUnit) cu;
- }
-
- private String resolveType(ICompilationUnit icu, String fullyQualifiedName) throws JavaModelException
- {
- String localFullyQualifiedName = fullyQualifiedName;
- IType[] allTypes = icu.getAllTypes();
- if (allTypes == null)
- {
- return localFullyQualifiedName;
- }
-
- for (int i = 0; i < allTypes.length; i++)
- {
- String[][] resolvedType = allTypes[i].resolveType(localFullyQualifiedName);
- if (resolvedType != null && resolvedType.length > 0)
- {
- StringBuffer buf = new StringBuffer();
- for (int j = 0; j < resolvedType[0].length; j++)
- {
- buf = appendDot(j, buf);
- buf.append(resolvedType[0][j]);
- }
- localFullyQualifiedName = buf.toString();
- break;
- }
- }
-
- return localFullyQualifiedName;
- }
-
- private StringBuffer appendDot(int index, StringBuffer buff)
- {
- StringBuffer result = buff;
- if (index != 0)
- {
- result.append('.');
- }
- return result;
- }
-
- protected <T extends IJavaElement> IAnnotation<T> getSpecificAnnotationFromMember(final T type, final String className, final String annotationQName) throws JavaModelException
- {
- if (!isSupportedJavaElement(type))
- {
- throw new IllegalArgumentException("passed argument is not of correct type."); //$NON-NLS-1$
- }
-
- ICompilationUnit cUnit = null;
- if (type instanceof IMember) {
- cUnit = ((IMember)type).getCompilationUnit();
- }
- else {
- cUnit = ((ITypeParameter)type).getDeclaringMember().getCompilationUnit();
- }
-
- if (cUnit == null) {
- return null;
- }
-
- final CompilationUnit unit = getCompilationUnit();
- final AbstractTypeDeclaration typeDeclaration = ASTUtils.getInstance().getTypeDeclaration(className, unit);
-
- switch(type.getElementType())
- {
- case IJavaElement.TYPE:
- return getSpecificAnnotation(type, typeDeclaration, (IType)type, annotationQName);
-
- case IJavaElement.FIELD:
- IField field = (IField) type;
- FieldDeclaration fieldDeclaration = ASTUtils.getInstance().getFieldDeclaration(field, (TypeDeclaration)typeDeclaration);
- return getSpecificAnnotation(type, fieldDeclaration, field.getDeclaringType(), annotationQName);
-
- case IJavaElement.METHOD:
- IMethod method = (IMethod) type;
- MethodDeclaration methodDeclaration = ASTUtils.getInstance().getMethodDeclaration(method, (TypeDeclaration)typeDeclaration);
- return getSpecificAnnotation(type, methodDeclaration, method.getDeclaringType(), annotationQName);
-
- case IJavaElement.TYPE_PARAMETER:
- method = (IMethod)((ITypeParameter) type).getParent();
- methodDeclaration = ASTUtils.getInstance().getMethodDeclaration(method, (TypeDeclaration)typeDeclaration);
- return getSpecificParamAnnotation(type, methodDeclaration, method.getDeclaringType(), annotationQName);
- }
-
- return null;
- }
-
- private <T extends IJavaElement> IAnnotation<T> getSpecificAnnotation(final T iMember, final BodyDeclaration bodyDeclaration, final IType type, final String annotationQName) throws JavaModelException
- {
- if (bodyDeclaration != null)
- {
- @SuppressWarnings("unchecked")
- final List list = bodyDeclaration.modifiers();
- return extractSpecificAnnotation(iMember, list, type, annotationQName);
- }
- return null;
- }
-
- private <T extends IJavaElement> IAnnotation<T> getSpecificParamAnnotation(T iMember, MethodDeclaration methodDeclaration, final IType type, final String annotationQName) throws JavaModelException
- {
- if (methodDeclaration != null)
- {
- for (Object param : methodDeclaration.parameters())
- {
- if (param instanceof SingleVariableDeclaration &&
- ((ITypeParameter)iMember).getElementName().toString().equals(((SingleVariableDeclaration)param).getName().toString()))
- {
- @SuppressWarnings("unchecked")
- final List list = ((SingleVariableDeclaration) param).modifiers();
-
- return extractSpecificAnnotation(iMember, list, type, annotationQName);
- }
- }
- }
- return null;
- }
-
- private boolean isSupportedJavaElement(final IJavaElement javaElement)
- {
- return javaElement.getElementType()==IJavaElement.METHOD ||
- javaElement.getElementType()==IJavaElement.TYPE ||
- javaElement.getElementType()==IJavaElement.FIELD ||
- javaElement.getElementType()==IJavaElement.TYPE_PARAMETER;
- }
-
- private CompilationUnit getCompilationUnit()
- {
- if (cUnit==null) {
- cUnit = ASTUtils.getInstance().createCompilationUnit(iType.getCompilationUnit(), null);
- }
-
- return cUnit;
- }
-
- private ILocator createLocator(final ASTNode node)
- {
- final int lineNumber = getCompilationUnit().getLineNumber(node.getStartPosition());
- return new LocatorImpl(lineNumber, node.getStartPosition(), node.getLength());
- }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/internal/annotations/impl/AnnotationProperty.java b/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/internal/annotations/impl/AnnotationProperty.java
deleted file mode 100755
index 3c17bfc..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/internal/annotations/impl/AnnotationProperty.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.utils.internal.annotations.impl;
-
-import org.eclipse.jst.ws.jaxws.utils.annotations.IAnnotationProperty;
-
-
-public class AnnotationProperty implements IAnnotationProperty
-{
- private String annotationName;
- private String attributeName;
- private String value;
- private AttributeTypeEnum attributeType;
-
- /**
- * Public constructor for AnnotationProperty objects
- *
- * @param annotationName - String representation of the Name for the Annotation.
- * @param attributeName - String representation of the Name for the Attribute.
- * @param value - String representation of the Value for the Attribute.
- */
- public AnnotationProperty(final String annotationName, final String attributeName, final String value, final AttributeTypeEnum attributeType)
- {
- this.annotationName = annotationName;
- this.attributeName = attributeName;
- this.value = value;
- this.attributeType = attributeType;
- }
-
- public String getAnnotationName()
- {
- return this.annotationName;
- }
-
- public String getAttributeName()
- {
- return this.attributeName;
- }
-
- public String getValue()
- {
- return this.value;
- }
-
- public AttributeTypeEnum getAttributeType()
- {
- return this.attributeType;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/internal/annotations/impl/AnnotationPropertyContainer.java b/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/internal/annotations/impl/AnnotationPropertyContainer.java
deleted file mode 100755
index 5b018cd..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/internal/annotations/impl/AnnotationPropertyContainer.java
+++ /dev/null
@@ -1,169 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.utils.internal.annotations.impl;
-
-import java.lang.annotation.ElementType;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
-
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.ITypeParameter;
-import org.eclipse.jst.ws.jaxws.utils.annotations.AnnotationFactory;
-import org.eclipse.jst.ws.jaxws.utils.annotations.IAnnotation;
-import org.eclipse.jst.ws.jaxws.utils.annotations.IAnnotationPropertyContainer;
-import org.eclipse.jst.ws.jaxws.utils.annotations.IParamValuePair;
-import org.eclipse.jst.ws.jaxws.utils.annotations.IValue;
-
-public class AnnotationPropertyContainer implements IAnnotationPropertyContainer
-{
- private Map<String, Set<IParamValuePair>> typeAnnotationName2ParamValuesMap =
- new HashMap<String, Set<IParamValuePair>>();
- private Map<String, Set<IParamValuePair>> methodAnnotationName2ParamValuesMap =
- new HashMap<String, Set<IParamValuePair>>();
- private Map<String, Set<IParamValuePair>> parameterAnnotationName2ParamValuesMap =
- new HashMap<String, Set<IParamValuePair>>();
-
- /**
- * Add Annotation Property to the container.
- *
- * @throws NullPointerException if the <code>target</code> or <code>annotationProperty</code> is <code>null</code>.
- */
- public void addAnnotationProperty(final AnnotationProperty annotationProperty, final ElementType target)
- {
- if(annotationProperty == null)
- {
- throw new NullPointerException("annotationProperty could not be null!"); //$NON-NLS-1$
- }
- if(target == null)
- {
- throw new NullPointerException("target could not be null!"); //$NON-NLS-1$
- }
-
- if(!(target.equals(ElementType.TYPE)) && !(target.equals(ElementType.METHOD)) && !(target.equals(ElementType.PARAMETER)))
- {
- throw new IllegalArgumentException("target parameter is not of correct type"); //$NON-NLS-1$
- }
- Map<String, Set<IParamValuePair>> annotationName2ParamValuesMap = null;
-
- if(target.equals(ElementType.TYPE))
- {
- annotationName2ParamValuesMap = typeAnnotationName2ParamValuesMap;
- }
- if(target.equals(ElementType.METHOD))
- {
- annotationName2ParamValuesMap = methodAnnotationName2ParamValuesMap;
- }
- if(target.equals(ElementType.PARAMETER))
- {
- annotationName2ParamValuesMap = parameterAnnotationName2ParamValuesMap;
- }
-
-
- Set<IParamValuePair> paramValuesSet = annotationName2ParamValuesMap.get(annotationProperty.getAnnotationName());
- if(paramValuesSet == null)
- {
- paramValuesSet = new HashSet<IParamValuePair>();
- annotationName2ParamValuesMap.put(annotationProperty.getAnnotationName(), paramValuesSet);
- }
-
- IValue value = null;
- if(annotationProperty.getAttributeType() == null)
- {
- return;
- }
-
- if(annotationProperty.getAttributeType().equals(AttributeTypeEnum.BOOLEAN))
- {
- value = AnnotationFactory.createBooleanValue(new Boolean(annotationProperty.getValue()));
- }
- if(annotationProperty.getAttributeType().equals(AttributeTypeEnum.CLASS))
- {
- //TODO change this!!!!!!
- //value = AnnotationFactory.createClassValue(annotationProperty.getValue());
- }
- if(annotationProperty.getAttributeType().equals(AttributeTypeEnum.INTEGER))
- {
- value = AnnotationFactory.createIntegerValue(annotationProperty.getValue());
- }
- if(annotationProperty.getAttributeType().equals(AttributeTypeEnum.QUALIFIED_NAME))
- {
- value = AnnotationFactory.createQualifiedNameValue(annotationProperty.getValue());
- }
- if(value == null)
- {
- value = AnnotationFactory.createStringValue(annotationProperty.getValue());
- }
-
- IParamValuePair paramValuePair = AnnotationFactory.createParamValuePairValue(annotationProperty.getAttributeName(), value);
-
- paramValuesSet.add(paramValuePair);
- }
- /**
- * @param ITypeParameter
- * @return Set with all Annotation from the container, which are ITypeParameter relevant.
- */
- public Set<IAnnotation<ITypeParameter>> getParameterAnnotations(ITypeParameter tParam)
- {
- return getAnnotations(ElementType.PARAMETER, tParam);
- }
-
- /**
- * @return Set with all Annotation from the container, which are IType relevant.
- */
- public Set<IAnnotation<IType>> getTypeAnnotations(IType type)
- {
- return getAnnotations(ElementType.TYPE, type);
- }
-
- /**
- * @return Set with all Annotation from the container, which are IMethod relevant.
- */
- public Set<IAnnotation<IMethod>> getMethodAnnotations(IMethod method)
- {
- return getAnnotations(ElementType.METHOD , method);
- }
-
- private <T extends IJavaElement> Set<IAnnotation<T>> getAnnotations(final ElementType target, final T iTarget)
- {
- if(!(target.equals(ElementType.TYPE)) && !(target.equals(ElementType.METHOD)) && !(target.equals(ElementType.PARAMETER)))
- {
- throw new IllegalArgumentException("target parameter is not of correct type"); //$NON-NLS-1$
- }
-
- Map<String, Set<IParamValuePair>> annotationName2ParamValuesMap = null;
- if(target.equals(ElementType.TYPE))
- {
- annotationName2ParamValuesMap = typeAnnotationName2ParamValuesMap;
- }
- if(target.equals(ElementType.METHOD))
- {
- annotationName2ParamValuesMap = methodAnnotationName2ParamValuesMap;
- }
- if(target.equals(ElementType.PARAMETER))
- {
- annotationName2ParamValuesMap = parameterAnnotationName2ParamValuesMap;
- }
- Set<IAnnotation<T>> result = new HashSet<IAnnotation<T>>();
- Set<String> keys = annotationName2ParamValuesMap.keySet();
- for (String key : keys)
- {
- Set<IParamValuePair> paramValuePairsSet = annotationName2ParamValuesMap.get(key);
- IAnnotation<T> annotation = AnnotationFactory.createAnnotation(key, paramValuePairsSet, iTarget);
- result.add(annotation);
- }
-
- return result;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/internal/annotations/impl/AnnotationUtils.java b/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/internal/annotations/impl/AnnotationUtils.java
deleted file mode 100755
index c855a1b..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/internal/annotations/impl/AnnotationUtils.java
+++ /dev/null
@@ -1,528 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.utils.internal.annotations.impl;
-
-import java.io.FileNotFoundException;
-import java.text.MessageFormat;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Set;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IField;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.ITypeParameter;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jdt.core.dom.AbstractTypeDeclaration;
-import org.eclipse.jdt.core.dom.Annotation;
-import org.eclipse.jdt.core.dom.BodyDeclaration;
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jdt.core.dom.IExtendedModifier;
-import org.eclipse.jdt.core.dom.MethodDeclaration;
-import org.eclipse.jdt.core.dom.SingleVariableDeclaration;
-import org.eclipse.jdt.core.dom.TypeDeclaration;
-import org.eclipse.jface.text.BadLocationException;
-import org.eclipse.jface.text.Document;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jst.ws.jaxws.utils.annotations.AnnotationGeneratorException;
-import org.eclipse.jst.ws.jaxws.utils.clazz.ASTUtils;
-import org.eclipse.jst.ws.jaxws.utils.internal.text.JaxWsUtilMessages;
-import org.eclipse.jst.ws.jaxws.utils.resources.EditResourcesManager;
-import org.eclipse.jst.ws.jaxws.utils.resources.FileUtils;
-import org.eclipse.jst.ws.jaxws.utils.resources.IFileUtils;
-import org.eclipse.text.edits.MalformedTreeException;
-import org.eclipse.text.edits.TextEdit;
-
-/**
- * Contains utilities for getting AST objects needed in annotation processing
- *
- * @author Plamen Pavlov
- */
-public class AnnotationUtils
-{
- private static AnnotationUtils utils = null;
- private final IFileUtils fileUtils = FileUtils.getInstance();
-
- /**
- * The factory method.
- *
- * @return a AnnotationUtils instance.
- */
- public static AnnotationUtils getInstance()
- {
- if (utils == null)
- {
- utils = new AnnotationUtils();
- }
- return utils;
- }
-
- /**
- * Gets IDocument, which coresponds to one CompilationUnit.
- *
- * @param unit -
- * Compilation Unit, which will be used as starting point to get the IDocument.
- *
- * @return IDocument which is found.
- *
- * @throws CoreException
- */
- public IDocument getDocument(ICompilationUnit unit) throws CoreException
- {
- String source = unit.getBuffer().getContents();
- return new Document(source);
- }
-
- /**
- * Removes Annotations of specified IJavaElement.
- *
- * @param javaElement - IJavaElement which will be used as starting poin for removing the annotations.
- * @param annotations - Set which contains String values for the annotations which will be removed. If this Set is empty all Annotations will be removed.
- * @param deepRemove - Boolean value, representing whether Annotations from javaElemet childs will be removed.
- * @throws AnnotationGeneratorException
- *
- * @throws AnnotationGeneratorException
- * thown if AST TypeDeclaration cannot be found for <code>type</code> and also is used as wrapper in case {@link CoreException} or
- * {@link BadLocationException} is thrown while processing.
- * @throws BadLocationException
- * @throws CoreException
- * @throws FileNotFoundException
- * @throws MalformedTreeException
- */
- public void removeAnnotations(IJavaElement javaElement, Set<String> annotations, boolean deepRemove) throws AnnotationGeneratorException, MalformedTreeException, FileNotFoundException, CoreException, BadLocationException
- {
- if(javaElement instanceof IType)
- {
- IType type = (IType)javaElement;
- ICompilationUnit cUnit = type.getCompilationUnit();
- String className = type.getElementName();
- CompilationUnit unit = ASTUtils.getInstance().createCompilationUnit(cUnit, null);
-
- AbstractTypeDeclaration typeDeclaration = ASTUtils.getInstance().getTypeDeclaration(className, unit);
- if (typeDeclaration == null)
- {
- throw new AnnotationGeneratorException("typeDeclaration should not be null",//$NON-NLS-1$
- MessageFormat.format(JaxWsUtilMessages.AnnotationUtils_ParamShouldNotBeNullMsg, "typeDeclaration")); //$NON-NLS-1$
- }
-
- removeTypeAnnotations(type, typeDeclaration, unit, cUnit, annotations);
-
- if(!deepRemove)
- {
- return;
- }
-
- IField[] tmpFields = type.getFields();
- if (tmpFields != null && tmpFields.length > 0)
- {
- for (IField tmpField : tmpFields)
- {
- removeFieldAnnotations(tmpField, type, cUnit, annotations);
- }
- }
-
- IMethod[] tmpMethods = type.getMethods();
- if (tmpMethods != null && tmpMethods.length > 0)
- {
- for (IMethod tmpMethod : tmpMethods)
- {
- removeMethodAnnotations(tmpMethod, type, cUnit, annotations);
-
- //Remove params annotations
- for (String paramName : tmpMethod.getParameterNames())
- {
- ITypeParameter typeParameter = tmpMethod.getTypeParameter(paramName);
- removeParamAnnotations(typeParameter, type, cUnit, annotations, paramName);
- }
- }
- }
- }
-
- if(javaElement instanceof IField)
- {
- IField field = (IField)javaElement;
- IType declaringType = field.getDeclaringType();
- ICompilationUnit declaringTypeCompUnit = declaringType.getCompilationUnit();
-
- removeFieldAnnotations(field, declaringType, declaringTypeCompUnit, annotations);
- }
-
- if(javaElement instanceof IMethod)
- {
- IMethod method = (IMethod)javaElement;
- IType declaringType = method.getDeclaringType();
- ICompilationUnit declaringTypeCompUnit = declaringType.getCompilationUnit();
-
- removeMethodAnnotations(method, declaringType, declaringTypeCompUnit, annotations);
- if(!deepRemove)
- {
- return;
- }
-
- //Remove params annotations
- for (String paramName: method.getParameterNames())
- {
- ITypeParameter param = method.getTypeParameter(paramName);
- removeParamAnnotations(param, declaringType, declaringTypeCompUnit, annotations, paramName);
- }
- }
-
- if(javaElement instanceof ITypeParameter)
- {
- ITypeParameter typeParameter = (ITypeParameter)javaElement;
- IMethod tmpMethod = (IMethod) typeParameter.getDeclaringMember();
- //TODO check this
- //param.getParent();
- IType declaringType = tmpMethod.getDeclaringType();
- ICompilationUnit declaringTypeCompUnit = declaringType.getCompilationUnit();
- //TODO FIX THIS
- removeParamAnnotations(typeParameter, declaringType, declaringTypeCompUnit, annotations, null);
- }
- }
-
- private void removeTypeAnnotations(IType type, AbstractTypeDeclaration typeDeclaration, CompilationUnit unit, ICompilationUnit cUnit, Set<String> annotationsSet) throws CoreException, MalformedTreeException, BadLocationException, FileNotFoundException, AnnotationGeneratorException
- {
- unit.recordModifications();
- if (removeAnnotations(typeDeclaration.modifiers(), annotationsSet))
- {
- IDocument doc = AnnotationUtils.getInstance().getDocument(cUnit);
- TextEdit edit = unit.rewrite(doc, null);
- edit.apply(doc);
-
- saveContent(cUnit, doc);
- }
- }
-
- private void removeFieldAnnotations(IField field, IType declaringType, ICompilationUnit declaringTypeCompUnit, Set<String> annotationsSet) throws CoreException, MalformedTreeException, BadLocationException, FileNotFoundException, AnnotationGeneratorException
- {
- ICompilationUnit fcUnit = field.getCompilationUnit();
- String className = declaringType.getElementName();
- CompilationUnit fUnit = ASTUtils.getInstance().createCompilationUnit(fcUnit, null);
-
- BodyDeclaration fBodyDeclaration = ASTUtils.getInstance().getTypeDeclaration(className, fUnit);
- fBodyDeclaration = ASTUtils.getInstance().getFieldDeclaration(field, (TypeDeclaration) fBodyDeclaration);
-
- fUnit.recordModifications();
- if (removeAnnotations(fBodyDeclaration.modifiers(), annotationsSet))
- {
- IDocument doc = getDocument(declaringTypeCompUnit);
- TextEdit edit = fUnit.rewrite(doc, null);
- edit.apply(doc);
-
- saveContent(declaringTypeCompUnit, doc);
- }
- }
-
- private void removeMethodAnnotations(IMethod method, IType declaringType, ICompilationUnit declaringTypeCompUnit, Set<String> annotationsSet) throws CoreException, MalformedTreeException, BadLocationException, FileNotFoundException, AnnotationGeneratorException
- {
- ICompilationUnit mcUnit = method.getCompilationUnit();
- String className = declaringType.getElementName();
- CompilationUnit mUnit = ASTUtils.getInstance().createCompilationUnit(mcUnit, null);
-
- BodyDeclaration mBodyDeclaration = ASTUtils.getInstance().getTypeDeclaration(className, mUnit);
- mBodyDeclaration = ASTUtils.getInstance().getMethodDeclaration(method, (TypeDeclaration) mBodyDeclaration);
- mUnit.recordModifications();
- if (removeAnnotations(mBodyDeclaration.modifiers(), annotationsSet))
- {
- IDocument doc = getDocument(declaringTypeCompUnit);
- TextEdit edit = mUnit.rewrite(doc, null);
- edit.apply(doc);
-
- saveContent(declaringTypeCompUnit, doc);
- }
- }
-
- private void removeParamAnnotations(ITypeParameter param, IType declaringType, ICompilationUnit declaringTypeCompUnit, Set<String> annotationsSet, String paramName) throws CoreException, MalformedTreeException, BadLocationException, FileNotFoundException, AnnotationGeneratorException
- {
- IMethod tmpMethod = (IMethod)param.getDeclaringMember();
- //TODO check this
- //param.getParent();
- String className = declaringType.getElementName();
- ICompilationUnit mcUnit = tmpMethod.getCompilationUnit();
- CompilationUnit mUnit = ASTUtils.getInstance().createCompilationUnit(mcUnit, null);
-
- BodyDeclaration mBodyDeclaration = ASTUtils.getInstance().getTypeDeclaration(className, mUnit);
- mBodyDeclaration = ASTUtils.getInstance().getMethodDeclaration(tmpMethod, (TypeDeclaration) mBodyDeclaration);
- mUnit.recordModifications();
-
- for (Object object : ((MethodDeclaration) mBodyDeclaration).parameters())
- {
- if (object instanceof SingleVariableDeclaration)
- {
- SingleVariableDeclaration svd = (SingleVariableDeclaration) object;
- if ((paramName == null || svd.getName().toString().equals(paramName)) &&
- removeAnnotations(svd.modifiers(), annotationsSet))
- {
- IDocument doc = getDocument(declaringTypeCompUnit);
- TextEdit edit = mUnit.rewrite(doc, null);
- edit.apply(doc);
-
- saveContent(declaringTypeCompUnit, doc);
- }
- }
- }
- }
-
- private void saveContent(ICompilationUnit cUnit, IDocument doc) throws FileNotFoundException, JavaModelException, AnnotationGeneratorException
- {
- IStatus status = (new EditResourcesManager()).setFileEditable((IFile) cUnit.getResource());
- if(status.getSeverity() == IStatus.OK )
- {
- fileUtils.setCompilationUnitContentAndSaveDirtyEditors(cUnit, doc.get(), true, null);
- }
- else
- {
- throw new AnnotationGeneratorException("Annotattion could not be stored, the file is not writable", //$NON-NLS-1$
- JaxWsUtilMessages.AnnotationCannotBeStoredMsg);
- }
- }
-
- /**
- * Removes specific Annotation of specified IJavaElement.
- *
- * @param javaElement - IJavaElement which will be used as starting poin for removing the Annotation.
- * @param annotationName - String which is the representation Name of the Annotation, which will be removed.
- *
- * @throws AnnotationGeneratorException
- * @throws AnnotationGeneratorException
- * thown if AST TypeDeclaration cannot be found for <code>type</code> and also is used as wrapper in case {@link CoreException} or
- * {@link BadLocationException} is thrown while processing.
- * @throws BadLocationException
- * @throws CoreException
- * @throws FileNotFoundException
- * @throws MalformedTreeException
- */
- public void removeAnnotation(IJavaElement javaElement, String annotationName) throws AnnotationGeneratorException, FileNotFoundException, CoreException, BadLocationException
- {
- if(javaElement instanceof IType)
- {
- IType type = (IType)javaElement;
- ICompilationUnit cUnit = type.getCompilationUnit();
- String className = type.getElementName();
- CompilationUnit unit = ASTUtils.getInstance().createCompilationUnit(cUnit, null);
-
- AbstractTypeDeclaration typeDeclaration = ASTUtils.getInstance().getTypeDeclaration(className, unit);
- if (typeDeclaration == null)
- {
- throw new AnnotationGeneratorException("typeDeclaration should not be null", //$NON-NLS-1$
- MessageFormat.format(JaxWsUtilMessages.AnnotationUtils_ParamShouldNotBeNullMsg, "typeDeclaration")); //$NON-NLS-1$
- }
-
- removeTypeAnnotation(type, typeDeclaration, unit, cUnit, annotationName);
-
- }
-
- if(javaElement instanceof IField)
- {
- IField field = (IField)javaElement;
- IType declaringType = field.getDeclaringType();
- ICompilationUnit declaringTypeCompUnit = declaringType.getCompilationUnit();
-
- removeFieldAnnotation(field, declaringType, declaringTypeCompUnit, annotationName);
- }
-
- if(javaElement instanceof IMethod)
- {
- IMethod method = (IMethod)javaElement;
- IType declaringType = method.getDeclaringType();
- ICompilationUnit declaringTypeCompUnit = declaringType.getCompilationUnit();
-
- removeMethodAnnotation(method, declaringType, declaringTypeCompUnit, annotationName);
- }
-
- if(javaElement instanceof ITypeParameter)
- {
- ITypeParameter typeParameter = (ITypeParameter)javaElement;
- IMethod tmpMethod = (IMethod) typeParameter.getDeclaringMember();
- //TODO check this
- //param.getParent();
- IType declaringType = tmpMethod.getDeclaringType();
- ICompilationUnit declaringTypeCompUnit = declaringType.getCompilationUnit();
-
- removeParamAnnotation(typeParameter, declaringType, declaringTypeCompUnit, annotationName);
- }
- }
-
- private void removeTypeAnnotation(IType type, AbstractTypeDeclaration typeDeclaration, CompilationUnit unit, ICompilationUnit cUnit, String annotationName) throws CoreException, MalformedTreeException, BadLocationException, FileNotFoundException, AnnotationGeneratorException
- {
- unit.recordModifications();
- if (removeAnnotation(typeDeclaration.modifiers(), annotationName))
- {
- IDocument doc = AnnotationUtils.getInstance().getDocument(cUnit);
- TextEdit edit = unit.rewrite(doc, null);
- edit.apply(doc);
-
- saveContent(cUnit, doc);
- }
- }
-
- private void removeFieldAnnotation(IField field, IType declaringType, ICompilationUnit declaringTypeCompUnit, String annotationName) throws CoreException, MalformedTreeException, BadLocationException, FileNotFoundException, AnnotationGeneratorException
- {
- ICompilationUnit fcUnit = field.getCompilationUnit();
- String className = declaringType.getElementName();
- CompilationUnit fUnit = ASTUtils.getInstance().createCompilationUnit(fcUnit, null);
-
- BodyDeclaration fBodyDeclaration = ASTUtils.getInstance().getTypeDeclaration(className, fUnit);
- fBodyDeclaration = ASTUtils.getInstance().getFieldDeclaration(field, (TypeDeclaration) fBodyDeclaration);
-
- fUnit.recordModifications();
- if (removeAnnotation(fBodyDeclaration.modifiers(), annotationName))
- {
- IDocument doc = getDocument(declaringTypeCompUnit);
- TextEdit edit = fUnit.rewrite(doc, null);
- edit.apply(doc);
-
- saveContent(declaringTypeCompUnit, doc);
- }
- }
-
- private void removeMethodAnnotation(IMethod method, IType declaringType, ICompilationUnit declaringTypeCompUnit, String annotationName) throws CoreException, MalformedTreeException, BadLocationException, FileNotFoundException, AnnotationGeneratorException
- {
- ICompilationUnit mcUnit = method.getCompilationUnit();
- String className = declaringType.getElementName();
- CompilationUnit mUnit = ASTUtils.getInstance().createCompilationUnit(mcUnit, null);
-
- BodyDeclaration mBodyDeclaration = ASTUtils.getInstance().getTypeDeclaration(className, mUnit);
- mBodyDeclaration = ASTUtils.getInstance().getMethodDeclaration(method, (TypeDeclaration) mBodyDeclaration);
- mUnit.recordModifications();
- if(removeAnnotation(mBodyDeclaration.modifiers(), annotationName))
- {
- IDocument doc = getDocument(declaringTypeCompUnit);
- TextEdit edit = mUnit.rewrite(doc, null);
- edit.apply(doc);
-
- saveContent(declaringTypeCompUnit, doc);
- }
- }
-
- private void removeParamAnnotation(ITypeParameter param, IType declaringType, ICompilationUnit declaringTypeCompUnit, String annotationName) throws CoreException, MalformedTreeException, BadLocationException, FileNotFoundException, AnnotationGeneratorException
- {
- IMethod tmpMethod = (IMethod)param.getDeclaringMember();
- //TODO check this
- //param.getParent();
- String className = declaringType.getElementName();
- ICompilationUnit mcUnit = tmpMethod.getCompilationUnit();
- className = tmpMethod.getParent().getElementName();
- CompilationUnit mUnit = ASTUtils.getInstance().createCompilationUnit(mcUnit, null);
-
- BodyDeclaration mBodyDeclaration = ASTUtils.getInstance().getTypeDeclaration(className, mUnit);
- mBodyDeclaration = ASTUtils.getInstance().getMethodDeclaration(tmpMethod, (TypeDeclaration) mBodyDeclaration);
-
- mUnit.recordModifications();
- for (Object object : ((MethodDeclaration) mBodyDeclaration).parameters())
- {
- if (object instanceof SingleVariableDeclaration)
- {
- if (removeAnnotation(((SingleVariableDeclaration) object).modifiers(), annotationName))
- {
- IDocument doc = getDocument(declaringTypeCompUnit);
- TextEdit edit = mUnit.rewrite(doc, null);
- edit.apply(doc);
-
- saveContent(declaringTypeCompUnit, doc);
- }
- }
- }
- }
-
- /**
- * Removes specific annotation from the list of modifiers.
- *
- * @param modifiers
- * @param annotationName
- *
- * @return boolean value, which represents wheter the annotation is removed or not.
- */
- @SuppressWarnings("unchecked")
- private boolean removeAnnotation(List modifiers, String annotationName)
- {
- Annotation[] mAnnotations = extractAnnotations(modifiers);
- for (Annotation mAnnotation : mAnnotations)
- {
- if(validateAnnotatation(mAnnotation, annotationName))
- {
- modifiers.remove(mAnnotation);
- return true;
- }
- }
-
- return false;
- }
-
- @SuppressWarnings("unchecked")
- private boolean removeAnnotations(List modifiers, Set<String> annotationsSet)
- {
- boolean changed = false;
- Annotation[] mAnnotations = extractAnnotations(modifiers);
- for (int mai = 0; mai < mAnnotations.length; mai++)
- {
- if (annotationsSet != null)
- {
- if (annotationsSet.contains(mAnnotations[mai].getTypeName().getFullyQualifiedName()))
- {
- modifiers.remove(mAnnotations[mai]);
- changed = true;
- }
- } else
- {
- modifiers.remove(mAnnotations[mai]);
- changed = true;
- }
- }
-
- return changed;
- }
-
- @SuppressWarnings("unchecked")
- private Annotation[] extractAnnotations(List modifiers)
- {
- Iterator iterator = modifiers.iterator();
- Set<Annotation> annotationsSet = new HashSet<Annotation>();
-
- while (iterator.hasNext())
- {
- IExtendedModifier modif = (IExtendedModifier) iterator.next();
- if (modif.isAnnotation())
- {
- annotationsSet.add((Annotation) modif);
- }
- }
-
- return annotationsSet.toArray(new Annotation[annotationsSet.size()]);
- }
-
- private boolean validateAnnotatation(Annotation mAnnotation, String annotationName)
- {
- String mAnnotationString = mAnnotation.toString();
- int index = mAnnotationString.indexOf("("); //$NON-NLS-1$
- if(index == -1)
- {
- mAnnotationString = mAnnotationString.trim();
- }
- else
- {
- mAnnotationString = mAnnotationString.substring(0, index).trim();
- }
-
- if(mAnnotationString.endsWith(annotationName))
- {
- return true;
- }
-
- return false;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/internal/annotations/impl/ArrayValueImpl.java b/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/internal/annotations/impl/ArrayValueImpl.java
deleted file mode 100755
index 331862b..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/internal/annotations/impl/ArrayValueImpl.java
+++ /dev/null
@@ -1,108 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.utils.internal.annotations.impl;
-
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.Set;
-
-import org.eclipse.jdt.core.dom.AST;
-import org.eclipse.jdt.core.dom.ArrayInitializer;
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jdt.core.dom.Expression;
-import org.eclipse.jst.ws.jaxws.utils.annotations.IValue;
-
-/**
- * Implementation for {@link IArrayValue}
- *
- * @author Plamen Pavlov
- */
-public class ArrayValueImpl extends ValueImpl
-{
- private Set<IValue> values = new HashSet<IValue>();
-
- /**
- * Construction
- *
- * @param values
- * @throws NullPointerException
- * in case <code>values</code> is <code>null</code>.
- */
- public ArrayValueImpl(Set<IValue> values)
- {
- if (values == null)
- {
- throw new NullPointerException("values should not be null"); //$NON-NLS-1$
- }
-
- this.values = values;
- }
-
- @Override
- public String toString()
- {
- String result = "["; //$NON-NLS-1$
- boolean first = true;
- for (IValue value : values)
- {
- if(first)
- {
- result = result + value.toString();
- first = false;
- }
- else
- {
- result = result + ", " + value.toString(); //$NON-NLS-1$
- }
- }
- result = result + "]"; //$NON-NLS-1$
- return result;
- }
-
- @SuppressWarnings("unchecked")
- @Override
- protected Expression getExpression(CompilationUnit unit, AST ast)
- {
- //TODO check this method
- ArrayInitializer arr = ast.newArrayInitializer();
- for (IValue value : values)
- {
- arr.expressions().add(((ValueImpl) value).getExpression(unit, ast));
- }
-
- return arr;
- }
-
- @Override
- public int hashCode()
- {
- return Arrays.hashCode(values.toArray(new IValue[values.size()]));
- }
-
- @Override
- public boolean equals(Object obj)
- {
- if (this == obj)
- {
- return true;
- }
- if (obj == null)
- {
- return false;
- }
- if (getClass() != obj.getClass())
- {
- return false;
- }
- final ArrayValueImpl other = (ArrayValueImpl) obj;
- return Arrays.equals(values.toArray(new IValue[values.size()]), other.values.toArray(new IValue[values.size()]));
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/internal/annotations/impl/AttributeTypeEnum.java b/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/internal/annotations/impl/AttributeTypeEnum.java
deleted file mode 100755
index a0ba607..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/internal/annotations/impl/AttributeTypeEnum.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.utils.internal.annotations.impl;
-
-public enum AttributeTypeEnum
-{
- BOOLEAN("Boolean"), //$NON-NLS-1$
- CLASS("Class"), //$NON-NLS-1$
- INTEGER("Integer"), //$NON-NLS-1$
- QUALIFIED_NAME("Qualified Name"), //$NON-NLS-1$
- STRING("String"); //$NON-NLS-1$
-
- private final String value;
-
- AttributeTypeEnum(final String value)
- {
- this.value = value;
- }
-
- final String getValue()
- {
- return this.value;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/internal/annotations/impl/BooleanValueImpl.java b/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/internal/annotations/impl/BooleanValueImpl.java
deleted file mode 100755
index 45fe1f9..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/internal/annotations/impl/BooleanValueImpl.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.utils.internal.annotations.impl;
-
-import org.eclipse.jdt.core.dom.AST;
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jdt.core.dom.Expression;
-
-/**
- * Implementation for {@link IBooleanValue}
- *
- * @author Plamen Pavlov
- */
-public class BooleanValueImpl extends ValueImpl
-{ //$JL-EQUALS$
- private boolean value;
-
- /**
- * Constructor
- *
- * @param value
- */
- public BooleanValueImpl(boolean value)
- {
- this.value = value;
- }
-
- @Override
- protected Expression getExpression(CompilationUnit unit, AST ast)
- {
- return ast.newBooleanLiteral(value);
- }
-
- @Override
- public String toString()
- {
- return Boolean.toString(value);
- }
-
- @Override
- public boolean equals(Object obj)
- {
- if (this == obj)
- {
- return true;
- }
- if (obj == null)
- {
- return false;
- }
- if (getClass() != obj.getClass())
- {
- return false;
- }
- final BooleanValueImpl other = (BooleanValueImpl) obj;
- return value == other.value;
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/internal/annotations/impl/ClassValueImpl.java b/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/internal/annotations/impl/ClassValueImpl.java
deleted file mode 100755
index bdcea51..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/internal/annotations/impl/ClassValueImpl.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.utils.internal.annotations.impl;
-
-import org.eclipse.jdt.core.dom.AST;
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jdt.core.dom.Expression;
-import org.eclipse.jdt.core.dom.Name;
-import org.eclipse.jdt.core.dom.SimpleType;
-import org.eclipse.jdt.core.dom.TypeLiteral;
-
-public class ClassValueImpl extends ValueImpl
-{
- private String classQName;
-
- public ClassValueImpl(String classQName)
- {
- this.classQName = classQName;
- }
-
- protected Expression getExpression(CompilationUnit unit, AST ast)
- {
- String clsName = this.classQName;
- if (addImports(ast, unit, clsName))
- {
- clsName = getSimpleName(clsName);
- }
- Name name = ast.newName(clsName);
- SimpleType simpleType = ast.newSimpleType(name);
- TypeLiteral literal = ast.newTypeLiteral();
- literal.setType(simpleType);
- return literal;
- }
-
- @Override
- public String toString()
- {
- return this.classQName;
- }
-
- @Override
- public int hashCode()
- {
- return this.classQName.hashCode();
- }
-
- @Override
- public boolean equals(Object obj)
- {
- if (this == obj)
- {
- return true;
- }
- if (obj == null)
- {
- return false;
- }
- if (getClass() != obj.getClass())
- {
- return false;
- }
- final ClassValueImpl other = (ClassValueImpl) obj;
- return this.classQName.equals(other.classQName);
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/internal/annotations/impl/IntegerValueImpl.java b/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/internal/annotations/impl/IntegerValueImpl.java
deleted file mode 100755
index faffe0f..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/internal/annotations/impl/IntegerValueImpl.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.utils.internal.annotations.impl;
-
-import org.eclipse.jdt.core.dom.AST;
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jdt.core.dom.Expression;
-import org.eclipse.jdt.core.dom.NumberLiteral;
-
-/**
- * Implementor for IIntegerValue
- *
- * @author Plamen Pavlov
- */
-public class IntegerValueImpl extends ValueImpl
-{
- private String value;
-
- /**
- * Constructor
- *
- * @param value
- */
- public IntegerValueImpl(String value)
- {
- this.value = value;
- }
-
- @Override
- protected Expression getExpression(CompilationUnit unit, AST ast)
- {
- NumberLiteral literal = ast.newNumberLiteral();
- literal.setToken(new Integer(value).toString());
- return literal;
- }
-
- @Override
- public int hashCode()
- {
- return new Integer(value);
- }
-
- @Override
- public boolean equals(Object obj)
- {
- if (this == obj)
- {
- return true;
- }
- if (obj == null)
- {
- return false;
- }
- if (getClass() != obj.getClass())
- {
- return false;
- }
- final IntegerValueImpl other = (IntegerValueImpl) obj;
- return value == other.value;
- }
-
- @Override
- public String toString()
- {
- return value;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/internal/annotations/impl/LocatorImpl.java b/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/internal/annotations/impl/LocatorImpl.java
deleted file mode 100755
index 89e859a..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/internal/annotations/impl/LocatorImpl.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.utils.internal.annotations.impl;
-
-import org.eclipse.jst.ws.jaxws.utils.annotations.ILocator;
-
-/**
- * Implementor of {@link ILocator} interface
- */
-public class LocatorImpl implements ILocator
-{
- private int lineNumber;
- private int startPosition;
- private int length;
-
- public LocatorImpl(final int lineNumber, final int startPosition, final int length)
- {
- this.length = length;
- this.startPosition = startPosition;
- this.lineNumber = lineNumber;
- }
-
- public int getLength()
- {
- return this.length;
- }
-
- public int getStartPosition()
- {
- return this.startPosition;
- }
-
- public int getLineNumber()
- {
- return lineNumber;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/internal/annotations/impl/ParamValuePairImpl.java b/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/internal/annotations/impl/ParamValuePairImpl.java
deleted file mode 100755
index 9ce31d7..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/internal/annotations/impl/ParamValuePairImpl.java
+++ /dev/null
@@ -1,98 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.utils.internal.annotations.impl;
-
-import org.eclipse.jst.ws.jaxws.utils.annotations.ILocator;
-import org.eclipse.jst.ws.jaxws.utils.annotations.IParamValuePair;
-import org.eclipse.jst.ws.jaxws.utils.annotations.IValue;
-
-/**
- * @author Plamen Pavlov
- */
-
-public class ParamValuePairImpl implements IParamValuePair
-{
-
- private ILocator locator = null;
-
-
- private String param;
-
- private IValue value;
-
- /**
- * Constructor
- *
- * @param param
- * @param value
- */
- public ParamValuePairImpl(String param, IValue value)
- {
- this.param = param;
- this.value = value;
- }
-
- public String getParam()
- {
- return param;
- }
-
- public IValue getValue()
- {
- return value;
- }
-
- @Override
- public int hashCode()
- {
- if(value != null)
- {
- return 31 * param.hashCode() + value.hashCode();
- }
- else
- {
- return 31 * param.hashCode();
- }
- }
-
- @Override
- public boolean equals(Object obj)
- {
- if (this == obj)
- {
- return true;
- }
- if (obj == null)
- {
- return false;
- }
- if (getClass() != obj.getClass())
- {
- return false;
- }
- final ParamValuePairImpl other = (ParamValuePairImpl) obj;
- if (!param.equals(other.param))
- {
- return false;
- }
- return value.equals(other.value);
- }
-
- public ILocator getLocator()
- {
- return this.locator;
- }
-
- public void setLocator(final ILocator locator)
- {
- this.locator = locator;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/internal/annotations/impl/QualifiedNameValueImpl.java b/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/internal/annotations/impl/QualifiedNameValueImpl.java
deleted file mode 100755
index 5bb66cf..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/internal/annotations/impl/QualifiedNameValueImpl.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.utils.internal.annotations.impl;
-
-import org.eclipse.jdt.core.dom.AST;
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jdt.core.dom.Expression;
-
-/**
- * Implementor for {@link IQualifiedNameValue}
- *
- * @author Plamen Pavlov
- */
-public class QualifiedNameValueImpl extends ValueImpl
-{
- private String value;
-
- /**
- * Constructor
- *
- * @param value
- */
- public QualifiedNameValueImpl(String value)
- {
- this.value = value;
- }
-
- @Override
- protected Expression getExpression(CompilationUnit unit, AST ast)
- {
- // "javax.ejb.TransactionAttributeType.REQUIRED"
- int i = value.lastIndexOf('.');
- if (i != -1)
- {
- String clsName = value.substring(0, i);
- if (addImports(ast, unit, clsName))
- {
- return ast.newName(getSimpleName(clsName) + value.substring(i));
- }
- }
- return ast.newName(value);
- }
-
- @Override
- public int hashCode()
- {
- return value.hashCode();
- }
-
- @Override
- public boolean equals(Object obj)
- {
- if (this == obj)
- {
- return true;
- }
- if (obj == null)
- {
- return false;
- }
- if (getClass() != obj.getClass())
- {
- return false;
- }
- final QualifiedNameValueImpl other = (QualifiedNameValueImpl) obj;
- return value.equals(other.value);
- }
-
- @Override
- public String toString()
- {
- return value;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/internal/annotations/impl/StringValueImpl.java b/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/internal/annotations/impl/StringValueImpl.java
deleted file mode 100755
index 58bd1b7..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/internal/annotations/impl/StringValueImpl.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.utils.internal.annotations.impl;
-
-import org.eclipse.jdt.core.dom.AST;
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jdt.core.dom.Expression;
-import org.eclipse.jdt.core.dom.StringLiteral;
-
-/**
- * Implementor for IStringValue
- *
- * @author Plamen Pavlov
- */
-public class StringValueImpl extends ValueImpl
-{
- private String value;
-
- /**
- * Constructor
- *
- * @param value
- */
- public StringValueImpl(String value)
- {
- this.value = value;
- }
-
- @Override
- protected Expression getExpression(CompilationUnit unit, AST ast)
- {
- StringLiteral literal = ast.newStringLiteral();
- literal.setLiteralValue(value);
- return literal;
- }
-
- @Override
- public int hashCode()
- {
- return value.hashCode();
- }
-
- @Override
- public boolean equals(Object obj)
- {
- if (this == obj)
- {
- return true;
- }
- if (obj == null)
- {
- return false;
- }
- if (getClass() != obj.getClass())
- {
- return false;
- }
- final StringValueImpl other = (StringValueImpl) obj;
- return value.equals(other.value);
- }
-
- @Override
- public String toString()
- {
- return value;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/internal/annotations/impl/ValueImpl.java b/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/internal/annotations/impl/ValueImpl.java
deleted file mode 100755
index 88c5715..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/internal/annotations/impl/ValueImpl.java
+++ /dev/null
@@ -1,144 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.utils.internal.annotations.impl;
-
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.jdt.core.dom.AST;
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jdt.core.dom.Expression;
-import org.eclipse.jdt.core.dom.ImportDeclaration;
-import org.eclipse.jdt.core.dom.Name;
-import org.eclipse.jdt.core.dom.QualifiedName;
-import org.eclipse.jdt.core.dom.SimpleName;
-import org.eclipse.jst.ws.jaxws.utils.annotations.ILocator;
-import org.eclipse.jst.ws.jaxws.utils.annotations.IValue;
-
-/**
- * @author Plamen Pavlov
- */
-
-public abstract class ValueImpl implements IValue
-{
- private ILocator locator = null;
-
- protected abstract Expression getExpression(CompilationUnit unit, AST ast);
-
-
- @SuppressWarnings("unchecked")
- protected boolean addImports(AST ast, CompilationUnit unit, String annotationName)
- {
- String packageAnnotationName = getPackageName(annotationName);
- if (packageAnnotationName == null)
- {
- return false;
- }
-
- if (packageAnnotationName.equals("java.lang")) //$NON-NLS-1$
- {
- return true;
- }
- if (unit != null)
- {
- ImportDeclaration imp = ast.newImportDeclaration();
- imp.setName(ast.newName(annotationName));
- List<ImportDeclaration> imports = unit.imports();
- String imp1 = getImport(imports, getSimpleName(annotationName));
- if (imp1 == null)
- {
- if (getOnDemandImport(imports, packageAnnotationName) == null)
- {
- imports.add(imp);
- }
- } else
- {
- if (!imp1.equals(annotationName))
- {
- return false;
- }
- }
- return true;
- }
-
- return false;
- }
-
- protected static String getImport(List<ImportDeclaration> imports, String imp)
- {
- Iterator<ImportDeclaration> iter = imports.iterator();
- while (iter.hasNext())
- {
- ImportDeclaration next = iter.next();
- Name fqName = next.getName();
- SimpleName name;
- if (fqName.isQualifiedName())
- {
- name = ((QualifiedName) fqName).getName();
- } else
- {
- name = (SimpleName) fqName;
- }
- String simpleName = name.getIdentifier();
- if (imp.equals(simpleName))
- {
- return fqName.getFullyQualifiedName();
- }
- }
- return null;
- }
-
- protected static String getOnDemandImport(List<ImportDeclaration> imports, String imp)
- {
- Iterator<ImportDeclaration> iter = imports.iterator();
- while (iter.hasNext())
- {
- ImportDeclaration next = iter.next();
- if (!next.isOnDemand())
- {
- continue;
- }
- Name fqName = next.getName();
- String name = fqName.getFullyQualifiedName();
- if (imp.equals(name))
- {
- return name;
- }
- }
- return null;
- }
-
- protected static String getPackageName(String name)
- {
- int i = name.lastIndexOf('.');
- if (i == -1)
- return null;
- return name.substring(0, i);
- }
-
- protected static String getSimpleName(String name)
- {
- int i = name.lastIndexOf('.');
- if (i == -1)
- return name;
- return name.substring(i + 1);
- }
-
- public ILocator getLocator()
- {
- return this.locator;
- }
-
- public void setLocator(final ILocator locator)
- {
- this.locator = locator;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/internal/plugin/JaxwsUtilsPlugin.java b/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/internal/plugin/JaxwsUtilsPlugin.java
deleted file mode 100755
index 44d3fa5..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/internal/plugin/JaxwsUtilsPlugin.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.utils.internal.plugin;
-
-import org.eclipse.core.runtime.Plugin;
-import org.eclipse.ui.IStartup;
-import org.osgi.framework.BundleContext;
-
-public class JaxwsUtilsPlugin extends Plugin implements IStartup
-{
- // The plug-in ID
- public static final String PLUGIN_ID = "org.eclipse.jst.ws.jaxws.utils";
-
- // The shared instance
- private static JaxwsUtilsPlugin plugin;
-
- /**
- * The constructor
- */
- public JaxwsUtilsPlugin() {
- }
-
- /*
- * (non-Javadoc)
- * @see org.eclipse.core.runtime.Plugins#start(org.osgi.framework.BundleContext)
- */
- public void start(BundleContext context) throws Exception {
- super.start(context);
- plugin = this;
-
- }
-
- /*
- * (non-Javadoc)
- * @see org.eclipse.core.runtime.Plugin#stop(org.osgi.framework.BundleContext)
- */
- public void stop(BundleContext context) throws Exception {
- plugin = null;
- super.stop(context);
- }
-
- /**
- * Returns the shared instance
- *
- * @return the shared instance
- */
- public static JaxwsUtilsPlugin getDefault() {
- return plugin;
- }
-
- public void earlyStartup()
- {
- // Nothing to do. However, this pugin has to start as early as possible since its services will be used for common logging
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/internal/text/JaxWsUtilMessages.java b/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/internal/text/JaxWsUtilMessages.java
deleted file mode 100755
index e1376b9..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/internal/text/JaxWsUtilMessages.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.utils.internal.text;
-
-import org.eclipse.osgi.util.NLS;
-
-public class JaxWsUtilMessages extends NLS
-{
- private static final String BUNDLE_NAME = "org.eclipse.jst.ws.jaxws.utils.internal.text.JaxWsUtilMessages"; //$NON-NLS-1$
-
-
- public static String CannotPerformEditMsg;
-
-
- public static String CompUnitMissingMsg;
-
-
- public static String InvalidTreeStateMsg;
-
-
- public static String AnnotationCannotBeStoredMsg;
-
-
- public static String AnnotationUtils_ParamShouldNotBeNullMsg;
-
-//
-// public static String EngineDataProvider_UnableToDeterminePortOfDeployServerMsg;
-//
-// public static String EngineDataProvider_UnableToDetermineNameOfDeployServerMsg;
-//
-// public static String EngineDataProvider_UnableToDetermineSapSystemOfDeployServerMsg;
-//
-//
- /** message constant */
- public static String WsdlNamesValidator_EmptyXmlName;
-
- /** message constant */
- public static String WsdlNamesValidator_InvalidNCName;
-
- /** message constant */
- public static String WsdlNamesValidator_EmptyXmlName2;
-
- /** message constant */
- public static String WsdlNamesValidator_InvalidNCName2;
-
- public static String EditResourcesManager_FILE_CONTENTS_CHANGE_FAILED_MSG;
-
- public static String ProjectManagementUtils_ProjectHasNoMetaInfFolderMsg;
-
- static
- {
- NLS.initializeMessages(BUNDLE_NAME, JaxWsUtilMessages.class);
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/internal/text/JaxWsUtilMessages.properties b/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/internal/text/JaxWsUtilMessages.properties
deleted file mode 100755
index 8eca31d..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/internal/text/JaxWsUtilMessages.properties
+++ /dev/null
@@ -1,23 +0,0 @@
-###############################################################################
-# Copyright (c) 2009 by SAP AG, Walldorf.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# SAP AG - initial API and implementation
-###############################################################################
-CannotPerformEditMsg = Edit cannot be performed
-CompUnitMissingMsg = Compilation unit file missing
-InvalidTreeStateMsg = Invalid project tree state
-AnnotationCannotBeStoredMsg = Annotation could not be stored, the file is not writable
-AnnotationUtils_ParamShouldNotBeNullMsg = {0} should not be null
-
-WsdlNamesValidator_EmptyXmlName = Empty {0} name is not allowed. Please enter name.
-WsdlNamesValidator_InvalidNCName = The symbol {0} specified for {1} with name {2} is not allowed for NCName. Please change {1} name.
-WsdlNamesValidator_EmptyXmlName2 = Specified {0} should not be empty
-WsdlNamesValidator_InvalidNCName2 = The symbol \"{0}\" used in {1} is not allowed in NCName
-
-EditResourcesManager_FILE_CONTENTS_CHANGE_FAILED_MSG = File contents could not be set
-ProjectManagementUtils_ProjectHasNoMetaInfFolderMsg = project {0} does not have a META-INF folder
diff --git a/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/logging/ILogger.java b/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/logging/ILogger.java
deleted file mode 100755
index e7f92fb..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/logging/ILogger.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.utils.logging;
-
-public interface ILogger
-{
- /**
- * Logs a message with severity error.
- *
- * @param message
- * message to be logged
- */
- public void logError(final String message);
-
- /**
- * Logs a message with severity error.
- *
- * @param message
- * message to be logged
- * @param cause
- * causing exception
- */
- public void logError(final String message, final Throwable cause);
-
- /**
- * Logs a message with severity warning.
- *
- * @param message
- * message to be logged
- */
- public void logWarn(final String message);
-
- /**
- * Logs a message with severity warning.
- *
- * @param message
- * message to be logged
- * @param cause
- * causing exception
- */
- public void logWarn(final String message, final Throwable cause);
-
- /**
- * Logs a message with severity debug.
- *
- * @param message
- * message to be logged
- */
- public void logDebug(final String message);
-
- /**
- * Logs a message with severity debug.
- *
- * @param message
- * message to be logged
- * @param cause
- * causing exception
- */
- public void logDebug(final String message, final Throwable cause);
-
-
- public boolean isDebug();
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/logging/Logger.java b/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/logging/Logger.java
deleted file mode 100755
index efad315..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/logging/Logger.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.utils.logging;
-
-import org.eclipse.core.runtime.ILog;
-import org.eclipse.jst.ws.jaxws.utils.StatusUtils;
-import org.eclipse.jst.ws.jaxws.utils.internal.plugin.JaxwsUtilsPlugin;
-
-public class Logger implements ILogger
-{
- public void logDebug(String message)
- {
-// log().log(StatusUtils.statusInfo(message));
- }
-
- public void logDebug(String message, Throwable cause)
- {
-// log().log(StatusUtils.statusInfo(message, cause));
- }
-
- public void logError(String message)
- {
- log().log(StatusUtils.statusError(message));
- }
-
- public void logError(String message, Throwable cause)
- {
- log().log(StatusUtils.statusError(message, cause));
- }
-
- public void logWarn(String message)
- {
- log().log(StatusUtils.statusWarning(message));
- }
-
- public void logWarn(String message, Throwable cause)
- {
- log().log(StatusUtils.statusWarning(message, cause));
- }
-
- private ILog log()
- {
- return JaxwsUtilsPlugin.getDefault().getLog();
- }
-
- public boolean isDebug()
- {
- // TODO Auto-generated method stub
- return false;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/resources/EditResourcesManager.java b/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/resources/EditResourcesManager.java
deleted file mode 100755
index 26398a9..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/resources/EditResourcesManager.java
+++ /dev/null
@@ -1,207 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.utils.resources;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.ws.jaxws.utils.StatusUtils;
-import org.eclipse.jst.ws.jaxws.utils.internal.text.JaxWsUtilMessages;
-import org.eclipse.jst.ws.jaxws.utils.logging.ILogger;
-import org.eclipse.jst.ws.jaxws.utils.logging.Logger;
-
-/**
- * This is an utility class which is meant to provide common functionality to save and modify resources. It is a wrapper of the eclipse API and
- * workarounds some DTR issues. Until DTR colleagues fix their coding, this manager must be used on each file modification occasion
- *
- * @author Danail Branekov
- */
-public class EditResourcesManager
-{
- private static final ILogger logger = new Logger();
-
- /**
- * Sets editability of a file. In case the file specified is already writable, <code>Status.OK_STATUS</code> is returned
- *
- * @param file
- * The file to be set editable
- * @param context
- * either {@link IWorkspace#VALIDATE_PROMPT}, or the <code>org.eclipse.swt.widgets.Shell</code> that is to be used to parent any
- * dialogs with the user, or <code>null</code> if there is no UI context (declared as an <code>Object</code> to avoid any direct
- * references on the SWT component)
- * @return the status of the operation
- * @throws NullPointerException
- * when the file specified is null
- * @see IWorkspace#VALIDATE_PROMPT
- */
- public IStatus setFileEditable(IFile file, Object context)
- {
- if (file == null)
- {
- throw new NullPointerException("file"); //$NON-NLS-1$
- }
- if(!file.isReadOnly())
- {
- return Status.OK_STATUS;
- }
-
- IWorkspace workspace = file.getWorkspace();
- return workspace.validateEdit(new IFile[] { file }, context);
- }
-
- /**
- * Sets editablility of a file. This is a convenience method equivalent to invoking
- * <code>setFileEditable(file, IWorkspace.VALIDATE_PROMPT)</code>
- *
- * @param file
- * The file to be set editable
- * @return the status of the operation
- * @throws NullPointerException
- * when the file specified is null
- * @see EditResourcesManager#setFileEditable(IFile, Object)
- * @see IWorkspace#VALIDATE_PROMPT
- *
- */
- public IStatus setFileEditable(IFile file)
- {
- return setFileEditable(file, IWorkspace.VALIDATE_PROMPT);
- }
-
- /**
- * Sets editablility of an array of files. In case all files specified are already writable, <code>Status.OK_STATUS</code> is returned
- *
- * @param files
- * The array of files to be set editable
- * @param context
- * either {@link IWorkspace#VALIDATE_PROMPT}, or the <code>org.eclipse.swt.widgets.Shell</code> that is to be used to parent any
- * dialogs with the user, or <code>null</code> if there is no UI context (declared as an <code>Object</code> to avoid any direct
- * references on the SWT component)
- * @return the status of the operation
- * @throws IllegalArgumentException
- * when the array is empty or null
- */
- public IStatus setFilesEditable(IFile[] files, Object context)
- {
- if (files == null || files.length == 0)
- {
- throw new IllegalArgumentException("Array must not be empty nor null"); //$NON-NLS-1$
- }
- List<IFile> roFiles = new ArrayList<IFile>();
- for(IFile f : files)
- {
- if(f.isReadOnly())
- {
- roFiles.add(f);
- }
- }
-
- if(roFiles.size() == 0)
- {
- return Status.OK_STATUS;
- }
-
- IWorkspace workspace = roFiles.get(0).getWorkspace();
- return workspace.validateEdit(roFiles.toArray(new IFile[roFiles.size()]), context);
- }
-
- /**
- * Sets editablility of an array of files. This is a convenience method equivalent to invoking
- * <code>setFilesEditable(files, IWorkspace.VALIDATE_PROMPT)</code>
- *
- * @param files
- * The array of files to be set editable
- * @return the status of the operation
- * @throws IllegalArgumentException
- * when the array is empty or null
- * @see EditResourcesManager#setFilesEditable(IFile[], Object)
- */
- public IStatus setFilesEditable(IFile[] files)
- {
- return setFilesEditable(files, IWorkspace.VALIDATE_PROMPT);
- }
-
- /**
- * Sets the content of a file
- *
- * @param file
- * the file to be set
- * @param content
- * the content to be set
- * @param updateFlags
- * update flags.
- * @see IFile#setContents(java.io.InputStream, int, IProgressMonitor)
- * @param progressMonitor
- * a progress monitor, or <code>null</code> if progress reporting is not desired
- * @return status of the operation
- * @throws NullPointerException
- * when <code>file</code> or <code>content</code> is null
- */
- public IStatus setFileContents(IFile file, String content, int updateFlags, IProgressMonitor progressMonitor)
- {
- if (file == null)
- {
- throw new NullPointerException("file"); //$NON-NLS-1$
- }
-
- if (content == null)
- {
- throw new NullPointerException("content"); //$NON-NLS-1$
- }
-
- IStatus editStatus = setFileEditable(file);
- if (editStatus.getSeverity() != IStatus.OK)
- {
- // something went wrong with the validateEdit operation
- return editStatus;
- }
-
- try
- {
- file.setContents(new StringInputStreamAdapter(content), updateFlags, progressMonitor);
- return Status.OK_STATUS;
- } catch (CoreException e)
- {
- logger.logError(e.getMessage(), e);
- return StatusUtils.statusError(JaxWsUtilMessages.EditResourcesManager_FILE_CONTENTS_CHANGE_FAILED_MSG, e);
- }
- }
-
- /**
- * Sets the content of a file. This method is equivalent of invoking
- * <code>setFileContens(IFile file, String content, (keepHistory ? IFile.KEEP_HISTORY : IResource.NONE) | (force ? IFile.FORCE : IResource.NONE), IProgressMonitor monitor)</code>
- *
- * @param file
- * the file to be set
- * @param content
- * the content to be set
- * @param force
- * a flag controlling how to deal with resources that are not in sync with the local file system
- * @param keepHistory
- * a flag indicating whether or not store the current contents in the local history
- * @param monitor
- * a progress monitor, or <code>null</code> if progress reporting is not desired
- * @return status of the operation
- * @throws NullPointerException
- * when <code>file</code> or <code>content</code> is null
- * @see EditResourcesManager#setFileContents(IFile, String, int, IProgressMonitor)
- */
- public IStatus setFileContents(IFile file, String content, boolean force, boolean keepHistory, IProgressMonitor monitor)
- {
- return setFileContents(file, content, ((keepHistory ? IFile.KEEP_HISTORY : IResource.NONE) | (force ? IFile.FORCE : IResource.NONE)), monitor);
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/resources/FileUtils.java b/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/resources/FileUtils.java
deleted file mode 100755
index dddb3a1..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/resources/FileUtils.java
+++ /dev/null
@@ -1,438 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.utils.resources;
-
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.FileReader;
-import java.io.IOException;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jst.ws.jaxws.utils.ContractChecker;
-import org.eclipse.ui.IEditorDescriptor;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IEditorReference;
-import org.eclipse.ui.IEditorRegistry;
-import org.eclipse.ui.IFileEditorInput;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.PlatformUI;
-
-/**
- * Implementation for file utilities interface
- *
- * @author Danail Branekov
- *
- */
-public class FileUtils implements IFileUtils {
- private static IFileUtils utils = null;
- private static int index = 0;
-
- public FileUtils() {
- }
-
- /**
- * The factory method
- *
- * @return a FileUtils instance
- */
- public static IFileUtils getInstance() {
- if (utils == null) {
- utils = new FileUtils();
- }
-
- return utils;
- }
-
- public final List<IEditorPart> getEditorsByFileLocation(
- final String fileLocation) throws FileNotFoundException {
- List<ICompilationUnit> units = getCompilationUnits(fileLocation);
- Set<IEditorPart> editors = new HashSet<IEditorPart>();
- for (ICompilationUnit cu : units) {
- final IEditorDescriptor editorDescr = getEditorDescriptor(cu
- .getElementName());
- editors.addAll(getEditorsByCompilationUnit(editorDescr,
- getActiveWorkbenchPage(), cu));
-
- }
-
- return Arrays.asList(editors.toArray(new IEditorPart[editors.size()]));
- }
-
- public final List<ICompilationUnit> getCompilationUnits(
- final String fileLocation) throws FileNotFoundException {
- if (fileLocation == null) {
- throw new NullPointerException("fileLocation"); //$NON-NLS-1$
- }
-
- IFile[] filesFound = ResourcesPlugin.getWorkspace().getRoot()
- .findFilesForLocationURI(new File(fileLocation).toURI());
- if (filesFound == null || filesFound.length == 0) {
- throw new FileNotFoundException("File: " + fileLocation + " does not exist"); //$NON-NLS-1$ //$NON-NLS-2$
- }
-
- List<ICompilationUnit> units = new ArrayList<ICompilationUnit>();
-
- for (IFile file : filesFound) {
- IJavaElement javaElement = JavaCore.create(file);
- if (!(javaElement instanceof ICompilationUnit)) {
- throw new IllegalStateException("File: " + fileLocation + " is not a compilation unit"); //$NON-NLS-1$ //$NON-NLS-2$
- }
-
- units.add((ICompilationUnit) javaElement);
- }
-
- return units;
- }
-
- public IProject getProjectUnit(String fileLocation)
- throws FileNotFoundException {
-
- if (fileLocation == null)
- {
- throw new NullPointerException("fileLocation"); //$NON-NLS-1$
- }
-
- IFile file = getFileForLocation(new Path(fileLocation));
- if (file == null)
- {
- throw new FileNotFoundException("File: " + fileLocation + " does not exist"); //$NON-NLS-1$ //$NON-NLS-2$
- }
-
- return file.getProject();
- }
-
- public final boolean isFileDisplayedInDirtyEditor(final String fileLocation)
- throws FileNotFoundException {
- return isFileDisplayedInDirtyEditor(getEditorsByFileLocation(fileLocation));
- }
-
- public boolean isCompilationUnitDisplayedInDirtyEditor(
- final ICompilationUnit unit) {
- return isFileDisplayedInDirtyEditor(getEditorsByCompilationUnit(unit));
- }
-
- public final void saveEditor(String fileLocation)
- throws FileNotFoundException {
- saveEditor(fileLocation, new NullProgressMonitor());
- }
-
- public void saveEditor(final String fileLocation,
- final IProgressMonitor monitor) throws FileNotFoundException {
- List<IEditorPart> editors = getEditorsByFileLocation(fileLocation);
- if (editors.size() == 0) {
- throw new IllegalStateException("The file is not displayed by an editor"); //$NON-NLS-1$
- }
-
- saveEditors(editors, monitor);
- }
-
- public void saveEditor(final ICompilationUnit cu,
- final IProgressMonitor monitor) {
- List<IEditorPart> editors = getEditorsByCompilationUnit(cu);
- if (editors.size() == 0) {
- throw new IllegalStateException("The file is not displayed by an editor"); //$NON-NLS-1$
- }
-
- saveEditors(editors, monitor);
- }
-
- public void saveEditor(final ICompilationUnit cu) {
- List<IEditorPart> editors = getEditorsByCompilationUnit(cu);
- if (editors.size() == 0) {
- throw new IllegalStateException("The file is not displayed by an editor"); //$NON-NLS-1$
- }
-
- saveEditors(editors, new NullProgressMonitor());
- }
-
- private void saveEditors(final List<IEditorPart> editors,
- final IProgressMonitor monitor) {
- for (IEditorPart e : editors) {
- if (e.isDirty()) {
- e.doSave(monitor);
- }
- }
- }
-
- public Collection<IEditorPart> getDirtyEditors() {
- final Set<IEditorInput> inputs = new HashSet<IEditorInput>();
- final Collection<IEditorPart> result = new ArrayList<IEditorPart>();
- final IWorkbench workbench = PlatformUI.getWorkbench();
- final IWorkbenchWindow[] windows = workbench.getWorkbenchWindows();
- for (int i = 0; i < windows.length; i++) {
- final IWorkbenchPage[] pages = windows[i].getPages();
- for (int x = 0; x < pages.length; x++) {
- final IEditorPart[] editors = pages[x].getDirtyEditors();
- for (int z = 0; z < editors.length; z++) {
- final IEditorPart ep = editors[z];
- final IEditorInput input = ep.getEditorInput();
- if (!inputs.contains(input)) {
- inputs.add(input);
- result.add(ep);
- }
- }
- }
- }
- return result;
- }
-
- private IEditorDescriptor getEditorDescriptor(String fileName) {
- IEditorRegistry editorRegistry = PlatformUI.getWorkbench()
- .getEditorRegistry();
- return editorRegistry.getDefaultEditor(fileName);
- }
-
- /**
- * Converts a String to a URL, assuming 'file:' as a default scheme.
- *
- * @param base
- * @param path
- *
- * @return
- *
- * @throws NullPointerException,
- * if the String is neither a valid URL, nor a valid filename.
- *
- */
- public final URL fileOrURLToURL(final URL base, final String path)
- throws IOException {
- if (path == null) {
- throw new NullPointerException("path"); //$NON-NLS-1$
- }
-
- String localPath = path;
- URL localBase = base;
-
- if (localBase == null) {
- localBase = new URL("file:");//$NON-NLS-1$
- }
-
- localPath = localPath.replace('\\', '/');
- try {
- String protocol = localBase.getProtocol();
- if (!"http".equals(protocol) //$NON-NLS-1$
- && !"https".equals(protocol) //$NON-NLS-1$
- && (localPath.charAt(1) == ':'
- || localPath.charAt(0) == '/' || localPath
- .charAt(0) == '\\')) {
- localPath = (new File(localPath)).toURI().toURL().toExternalForm();
- }
- } catch (IndexOutOfBoundsException e) {
- // $JL-EXC$
- }
-
- if (localPath.startsWith("file:") && localPath.length() > 5 //$NON-NLS-1$
- && localPath.charAt(5) != '/') {
- localPath = "file:/".concat(localPath.substring(5)); //$NON-NLS-1$
- } else {
- if (localPath.startsWith("file://") //$NON-NLS-1$
- && !localPath.startsWith("file:////") //$NON-NLS-1$
- && !localPath.startsWith("file://localhost/")) { //$NON-NLS-1$
- localPath = "file:////".concat(localPath.substring("file://" //$NON-NLS-1$ //$NON-NLS-2$
- .length()));
- }
- }
- URL url = new URL(localBase, localPath);
- return url;
- }
-
- public File createTempDirectory() {
- String tempDir = System.getProperty("java.io.tmpdir"); //$NON-NLS-1$
- index++;
- File temp1 = new File(tempDir, Integer.toString(this.hashCode()) + "_" //$NON-NLS-1$
- + index);
- temp1.mkdir();
- return temp1;
- }
-
- public void deleteDirectory(final File directory) {
- if (directory == null) {
- return;
- }
- if (!directory.exists()) {
- return;
- }
- for (File f : directory.listFiles()) {
- f.delete();
- }
- directory.delete();
- }
-
- public IFile[] getFilesByExtension(IProject project, String extension)
- throws CoreException {
- ContractChecker.nullCheckParam(extension, "extension"); //$NON-NLS-1$
- ArrayList<IFile> foundFiles = new ArrayList<IFile>();
-
- getFilesByExtension(foundFiles, project.members(), extension);
-
- return foundFiles.toArray(new IFile[foundFiles.size()]);
- }
-
- private void getFilesByExtension(ArrayList<IFile> foundFiles,
- IResource[] currentResources, String extension)
- throws CoreException {
- for (int ii = 0; ii < currentResources.length; ii++) {
- if (currentResources[ii].getType() == IResource.FOLDER) {
- getFilesByExtension(foundFiles,
- ((IFolder) currentResources[ii]).members(), extension);
- } else if (currentResources[ii].getType() == IResource.FILE
- && extension
- .equals(currentResources[ii].getFileExtension())) {
- foundFiles.add((IFile) currentResources[ii]);
- }
- }
- }
-
- public IFile getFileForLocation(IPath location) {
- return ResourcesPlugin.getWorkspace().getRoot().getFileForLocation(
- location);
- }
-
- private IWorkbenchPage getActiveWorkbenchPage() {
- if (PlatformUI.getWorkbench().getActiveWorkbenchWindow() == null) {
- return null;
- }
-
- return PlatformUI.getWorkbench().getActiveWorkbenchWindow()
- .getActivePage();
- }
-
- public List<IEditorPart> getEditorsByCompilationUnit(
- final ICompilationUnit cu) {
- ContractChecker.nullCheckParam(cu, "cu"); //$NON-NLS-1$
- final IEditorDescriptor editorDescr = getEditorDescriptor(cu
- .getElementName());
- final IWorkbenchPage wbPage = getActiveWorkbenchPage();
- if (wbPage == null) {
- return new ArrayList<IEditorPart>(0);
- }
-
- return getEditorsByCompilationUnit(editorDescr, wbPage, cu);
- }
-
- private List<IEditorPart> getEditorsByCompilationUnit(
- final IEditorDescriptor editorDescriptor,
- final IWorkbenchPage page, final ICompilationUnit cu) {
- List<IEditorPart> editorPartReturned = new ArrayList<IEditorPart>();
-
- if (editorDescriptor != null && page != null) {
- for (IEditorReference editorReferece : page.getEditorReferences()) {
- IEditorPart editorPart = editorReferece.getEditor(true);
- if (isEditorApplicableForCu(editorPart, cu)) {
- editorPartReturned.add(editorPart);
- }
- }
- }
-
- return editorPartReturned;
- }
-
- private boolean isEditorApplicableForCu(final IEditorPart editor,
- final ICompilationUnit cu) {
- if (editor == null) {
- return false;
- }
-
- if (!(editor.getEditorInput() instanceof IFileEditorInput)
- || !(cu.getResource() instanceof IFile)) {
- return false;
- }
-
- final IFile cuFile = (IFile) cu.getResource();
- final IFileEditorInput editorInput = (IFileEditorInput) editor
- .getEditorInput();
-
- return cuFile.equals(editorInput.getFile());
- }
-
- public final boolean isFileDisplayedInDirtyEditor(
- final List<IEditorPart> displayingEditors) {
- ContractChecker.nullCheckParam(displayingEditors, "displayingEditors"); //$NON-NLS-1$
- for (IEditorPart editor : displayingEditors) {
- if (editor.isDirty()) {
- return true;
- }
- }
-
- return false;
- }
-
- /**
- * Reads file content as text and returns {@link String}
- *
- * @param sourceFile
- * @return the content of file
- * @throws IOException
- */
- public String getFileContent(final File sourceFile) throws IOException {
- final FileReader fr = new FileReader(sourceFile);
- final StringBuilder builder = new StringBuilder();
-
- try {
- final char[] buff = new char[1024];
- for (int cnt = 0; (cnt = fr.read(buff)) > -1;) {
- builder.append(buff, 0, cnt);
- }
- } finally {
- fr.close();
- }
-
- return builder.toString();
- }
-
- public void setCompilationUnitContent(final ICompilationUnit unit,
- final String content, final boolean force,
- final IProgressMonitor monitor) throws JavaModelException {
- ContractChecker.nullCheckParam(unit, "unit"); //$NON-NLS-1$
- ContractChecker.nullCheckParam(content, "content"); //$NON-NLS-1$
-
- unit.becomeWorkingCopy(monitor);
- try {
- unit.getBuffer().setContents(content);
- unit.commitWorkingCopy(force, monitor);
- } finally {
- unit.discardWorkingCopy();
- }
- }
-
- public void setCompilationUnitContentAndSaveDirtyEditors(
- final ICompilationUnit unit, final String content,
- final boolean force, final IProgressMonitor monitor)
- throws JavaModelException {
- setCompilationUnitContent(unit, content, force, monitor);
- if (isCompilationUnitDisplayedInDirtyEditor(unit)) {
- saveEditor(unit);
- }
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/resources/IFileUtils.java b/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/resources/IFileUtils.java
deleted file mode 100755
index 0fdfa06..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/resources/IFileUtils.java
+++ /dev/null
@@ -1,310 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.utils.resources;
-
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.net.URL;
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.ui.IEditorPart;
-
-/**
- * Interface that defines common utilies for file manipulation
- *
- * @author Danail Branekov
- */
-public interface IFileUtils {
-
- /**
- * Retrieves the editors that are currently displaying the file specfied.
- *
- * @param fileLocation
- * Absolute path to the file
- * @see IResource#getLocation().toOSString()
- * @return Current opened editors of the file specified or an empty list if such are not opened
- * @throws FileNotFoundException
- * when the file does not exist
- */
- public abstract List<IEditorPart> getEditorsByFileLocation(
- final String fileLocation) throws FileNotFoundException;
-
- /**
- * Determines whether the file specified is displayed within an editor which
- * has a dirty state.
- *
- * @param fileLocation
- * Absolute path to the file
- * @see IResource#getLocation().toOSString()
- * @return whether the file is dirty
- * @throws FileNotFoundException
- * when the location specified does not exist
- */
- public abstract boolean isFileDisplayedInDirtyEditor(
- final String fileLocation) throws FileNotFoundException;
-
- /**
- * Saves the dirty state editor
- *
- * @param fileLocation
- * Absolute path to the file
- * @see IResource#getLocation()#toOSString()
- * @throws FileNotFoundException
- * when the location specified does not exis
- * @throws IllegalStateException
- * when the file is not displayed by an editor
- */
- public abstract void saveEditor(String fileLocation)
- throws FileNotFoundException;
-
- /**
- * Saves the dirty state editor
- *
- * @param fileLocation
- * Absolute path to the file
- * @see IResource#getLocation()#toOSString()
- * @param monitor
- * Progress monitor
- * @throws FileNotFoundException
- * when the location specified does not exis
- * @throws IllegalStateException
- * when the file is not displayed by an editor
- */
- public abstract void saveEditor(String fileLocation,
- IProgressMonitor monitor) throws FileNotFoundException;
-
- /**
- * Retrieves a list of dirty editors
- *
- * @return collection containing dirty editors
- */
- public abstract Collection<IEditorPart> getDirtyEditors();
-
- /**
- * Retrieve compilation units for the location specified
- *
- * @param fileLocation
- * The absolute path to the file, e.g.
- * <code>C:\\dir1\\dir2\\file.name</code>
- * @see IResource#getLocation()#toOSString()
- *
- * @throws FileNotFoundException
- * when the file specified cannot be found in the workspace
- * @throws IllegalStateException
- * when the file specified is not a compilation unit
- * @throws NullPointerException
- * when fileLocation is null
- * @return The compilation units; cannot be null
- */
- public abstract List<ICompilationUnit> getCompilationUnits(
- final String fileLocation) throws FileNotFoundException;
-
- /**
- * Retrieve project unit for the location specified
- *
- * @param fileLocation
- * The absolute path to the file, e.g.
- * <code>C:\\dir1\\dir2\\file.name</code>
- * @see IResource#getLocation()#toOSString()
- *
- * @throws FileNotFoundException
- * when the file specified cannot be found in the workspace
- * @throws NullPointerException
- * when fileLocation is null
- * @return The compilation units; cannot be null
- */
- public abstract IProject getProjectUnit(
- final String fileLocation) throws FileNotFoundException;
-
- /**
- * Converts a String to a URL, assuming 'file:' as a default scheme.
- *
- * @param base
- * @param path
- *
- * @return
- *
- * @throws NullPointerException,
- * if the String is neither a valid URL, nor a valid filename.
- *
- */
- public abstract URL fileOrURLToURL(final URL base, final String path)
- throws IOException;
-
- /**
- * Creates a new directory in the OS temp folder
- *
- * @return the directory
- */
- public File createTempDirectory();
-
- /**
- * Deletes the specified directory and all its content
- *
- * param directory
- */
- public void deleteDirectory(final File directory);
-
- /**
- * Gets all the files with the provided extension within a project.
- *
- * @param project -
- * to be searched
- * @param extension -
- * types of files of interest
- */
- public IFile[] getFilesByExtension(IProject project, String extension)
- throws CoreException;
-
- /**
- * Retrieves a list of editors that are currently displaying the compilation
- * unit specified.
- *
- * @param cu
- * the compilation unit; must not be null
- * @return Current editors list or an empty list in case there are not
- * editors displaying the file specified
- *
- * @throws NullPointerException
- * when the <code>cu</code> parameter is null
- */
- public abstract List<IEditorPart> getEditorsByCompilationUnit(
- final ICompilationUnit cu);
-
- /**
- * Determines whether the compilation unit specified is displayed within an
- * editor which has a dirty state.
- *
- * @param unit
- * The compilation unit
- *
- * @return whether the compilation unit is dirty
- */
- public abstract boolean isCompilationUnitDisplayedInDirtyEditor(
- final ICompilationUnit unit);
-
- /**
- * Saves all the dirty state editors that are currently displaying the
- * compilation unit specified
- *
- * @param cu
- * the compilation unit
- * @param monitor
- * Progress monitor
- * @throws FileNotFoundException
- * when the location specified does not exist
- * @throws IllegalStateException
- * when the file is not displayed by an editor
- */
- public abstract void saveEditor(ICompilationUnit cu,
- IProgressMonitor monitor);
-
- /**
- * Saves all the dirty state editors that are currently displaying the
- * compilation unit specified
- *
- * @param cu
- * the compilation unit
- * @throws FileNotFoundException
- * when the location specified does not exist
- * @throws IllegalStateException
- * when the file is not displayed by an editor
- */
- public abstract void saveEditor(ICompilationUnit cu);
-
- /**
- * Retrieve a file instance for the location specified. This method is a
- * convenience method equivalent to invoking
- * <code>ResourcesPlugin.getWorkspace().getRoot().getFileForLocation(location)</code>
- *
- * @param location
- * the file location; must be absolute
- * @return the corresponding file in the workspace, or null if none
- * @see IWorkspaceRoot#getFileForLocation(IPath)
- */
- public IFile getFileForLocation(IPath location);
-
- /**
- * Reads file content as text and returns {@link String}
- *
- * @param sourceFile
- * @return the content of file
- * @throws IOException
- */
- public String getFileContent(final File sourceFile) throws IOException;
-
- /**
- * Sets the content of the compilation unit specified with the
- * <code>content</code> provided. There is no validation of the content
- *
- * @param cUnit
- * the compilation unit. Must not be null. If the compilation
- * unit does not exist, it will be created
- * @param content
- * the content to be set. Must not be null
- * @param force
- * a flag to handle the cases when the contents of the original
- * resource have changed since this working copy was created
- * @param monitor
- * the monitor to report progress to or null if no progress
- * monitoring is required
- *
- * @throws JavaModelException
- * when there is a problem with setting compilation unit content
- * @see ICompilationUnit#becomeWorkingCopy(IProgressMonitor)
- * @see ICompilationUnit#commitWorkingCopy(boolean, IProgressMonitor)
- * @see ICompilationUnit#discardWorkingCopy()
- */
- public void setCompilationUnitContent(ICompilationUnit cUnit,
- String content, boolean force, IProgressMonitor monitor)
- throws JavaModelException;
-
- /**
- * Sets the content of the compilation unit specified with the
- * <code>content</code> provided and saves the dirty editors if any which
- * display the compilation unit. There is no validation of the content
- *
- * @param cUnit
- * the compilation unit. Must not be null. If the compilation
- * unit does not exist, it will be created
- * @param content
- * the content to be set. Must not be null
- * @param force
- * a flag to handle the cases when the contents of the original
- * resource have changed since this working copy was created
- * @param monitor
- * the monitor to report progress to or null if no progress
- * monitoring is required
- *
- * @throws JavaModelException
- * when there is a problem with setting compilation unit content
- * @see ICompilationUnit#becomeWorkingCopy(IProgressMonitor)
- * @see ICompilationUnit#commitWorkingCopy(boolean, IProgressMonitor)
- * @see ICompilationUnit#discardWorkingCopy()
- * @see IFileUtils#setCompilationUnitContent(ICompilationUnit, String,
- * boolean, IProgressMonitor)
- * @see IFileUtils#isFileDisplayedInDirtyEditor(String)
- * @see IFileUtils#saveEditor(ICompilationUnit, IProgressMonitor)
- */
- public void setCompilationUnitContentAndSaveDirtyEditors(
- ICompilationUnit cUnit, String content, boolean force,
- IProgressMonitor monitor) throws JavaModelException;
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/resources/ProjectManagementUtils.java b/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/resources/ProjectManagementUtils.java
deleted file mode 100755
index 8f880a3..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/resources/ProjectManagementUtils.java
+++ /dev/null
@@ -1,257 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.utils.resources;
-
-import java.text.MessageFormat;
-
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IPackageFragment;
-import org.eclipse.jdt.core.IPackageFragmentRoot;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jst.ws.jaxws.utils.exception.MissingResourceException;
-import org.eclipse.jst.ws.jaxws.utils.facets.FacetUtils;
-import org.eclipse.jst.ws.jaxws.utils.facets.IFacetUtils;
-import org.eclipse.jst.ws.jaxws.utils.internal.text.JaxWsUtilMessages;
-import org.eclipse.jst.ws.jaxws.utils.logging.ILogger;
-import org.eclipse.jst.ws.jaxws.utils.logging.Logger;
-
-
-/**
- * Utility that provides useful project management services
- *
- * @author Joerg Dehmel
- * @author Danail Branekov
- */
-public final class ProjectManagementUtils
-{
- private static final ILogger logger = new Logger();
-
- /**
- * Provides the meta-inf folder of a EJB project.
- *
- * @param pProjectName
- * project name
- * @return the resource of the meta-inf folder
- * @throws IllegalArgumentException
- * when project name specified is <code>null</code>, empty string, the project does not exist or is not accessible, or the project
- * is not an ejb project
- * @throws MissingResourceException
- * either the project doesn't exist in the workspace or it doesn't contain a meta-inf folder
- * @throws RuntimeException
- * when error occured while accessing java model
- */
- public static IFolder findMetaInfFolder(final String pProjectName) throws MissingResourceException
- {
- final String metaInfName = "META-INF"; //$NON-NLS-1$
- final String ejbModuleName = "ejbModule"; //$NON-NLS-1$
-
- if (!isEjb3Project(pProjectName))
- {
- throw new IllegalArgumentException("Project " + pProjectName + " is not an EJB project"); //$NON-NLS-1$ //$NON-NLS-2$
- }
-
- IProject project = getProjectByName(pProjectName);
- IJavaProject javaProject = getJavaProject(project);
- IPackageFragment ejbModulePkgFragment = null;
-
- try
- {
- for (IPackageFragmentRoot fragmentRoot : javaProject.getPackageFragmentRoots())
- {
- if (fragmentRoot.getKind() == IPackageFragmentRoot.K_SOURCE && fragmentRoot.getElementName().equals(ejbModuleName))
- {
- ejbModulePkgFragment = fragmentRoot.getPackageFragment(metaInfName);
- }
- }
-
- verifyMetaInfFolder(ejbModulePkgFragment, pProjectName);
- return (IFolder) ejbModulePkgFragment.getCorrespondingResource();
- } catch (JavaModelException e)
- {
- logger.logError(e.getMessage(), e);
- throw new RuntimeException(e.getMessage(), e);
- }
- }
-
- private static void verifyMetaInfFolder(IPackageFragment fragment, String projectName) throws MissingResourceException
- {
- if (fragment == null)
- {
- final String msg = MessageFormat.format("project {0} does not have a META-INF folder", new Object[] { projectName }); //$NON-NLS-1$
- final String localizedMsg = MessageFormat.format(JaxWsUtilMessages.ProjectManagementUtils_ProjectHasNoMetaInfFolderMsg, new Object[] { projectName });
- throw new MissingResourceException(msg, localizedMsg);
- }
-
- try
- {
- IResource resource = fragment.getCorrespondingResource();
- // should not happen!
- if (!(resource instanceof IFolder))
- {
- throw new RuntimeException("Resource " + resource.getName() + " is not a folder"); //$NON-NLS-1$ //$NON-NLS-2$
- }
- } catch (JavaModelException e)
- {
- logger.logError(e.getMessage(), e);
- throw new RuntimeException(e.getMessage(), e);
- }
- }
-
- /**
- * Check whether a project is an ejb 3 project
- *
- * @param projectName
- * the name of the project; cannot be <code>null</code> or empty string
- * @return true in case the project specified is a ejb 3 project; false otherwise
- * @throws IllegalArgumentException
- * when the project name specified is <code>null</code>, empty string
- * @throws IllegalStateException
- * when the project does not exist or is not accessible
- * @throws RuntimeException
- * when an error occurred while accessing the project metadata
- */
- public static boolean isEjb3Project(final String projectName)
- {
- IProject project = getProjectByName(projectName);
-
- try
- {
- return facetUtils().hasFacetWithVersion(project, IFacetUtils.EJB_30_FACET_VERSION, IFacetUtils.EJB_30_FACET_ID, true);
- } catch (CoreException e)
- {
- logger.logError(e.getMessage(), e);
- throw new RuntimeException(e.getMessage(), e);
- }
- }
-
- /**
- * Check whether a project is an web 2.5 project
- *
- * @param projectName
- * the name of the project; cannot be <code>null</code> or empty string
- * @return true in case the project specified is a web 2.5 project; false otherwise
- * @throws IllegalArgumentException
- * when the project name specified is <code>null</code>, empty string
- * @throws IllegalStateException
- * when the project does not exist or is not accessible
- * @throws RuntimeException
- * when an error occurred while accessing the project metadata
- */
- public static boolean isWeb25Project(final String projectName)
- {
- IProject project = getProjectByName(projectName);
-
- try
- {
- return facetUtils().hasFacetWithVersion(project, IFacetUtils.WEB_25_FACET_VERSION, IFacetUtils.WEB_25_FACET_ID, true);
- } catch (CoreException e)
- {
- logger.logError(e.getMessage(), e);
- throw new RuntimeException(e.getMessage(), e);
- }
- }
-
- /**
- * Retrieve the project instance by project name
- *
- * @param projectName
- * the project name
- * @return the project instance
- * @throws IllegalArgumentException
- * when the project name specified is null or empty string
- * @throws IllegalStateException
- * when the project does not exist or is not accessible
- *
- */
- public static IProject getProjectByName(String projectName)
- {
- if (projectName == null || projectName.length() == 0)
- {
- throw new IllegalArgumentException("Illegal project name: " + projectName); //$NON-NLS-1$
- }
-
- IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(projectName);
- if (project == null || !project.isAccessible())
- {
- throw new IllegalStateException("Project is not accessible"); //$NON-NLS-1$
- }
-
- return project;
- }
-
- /**
- * Get the java project instance
- *
- * @param project
- * the project as eclipse resource
- * @return the java project instance
- * @throws IllegalArgumentException
- * when <code>project</code> null or the project is not accessible
- */
- public static IJavaProject getJavaProject(IProject project)
- {
- if (project == null || !project.isAccessible())
- {
- throw new IllegalArgumentException("Project is not accessible"); //$NON-NLS-1$
- }
- return JavaCore.create(project);
- }
-
- /**
- * Refresh the resource specified. Refresh depth used is zero
- * @param resource the resource to be refreshed
- * @throws CoreException
- * @see IResource#DEPTH_ZERO
- */
- public static void refreshResource(IResource resource) throws CoreException
- {
- if(resource == null)
- {
- throw new NullPointerException("resource"); //$NON-NLS-1$
- }
-
- resource.refreshLocal(IResource.DEPTH_ZERO, null);
- }
-
- /**
- * Refreshes the project the resource specified belongs to. Refresh depth used is infinite.
- * @param the resource which project is to be refreshed
- * @throws CoreException
- * @throws IllegalArgumentException when the resource specified is a workspace root
- * @see IResource#DEPTH_INFINITE
- */
- public static void refreshProjectByResource(IResource resource) throws CoreException
- {
- if(resource == null)
- {
- throw new NullPointerException("resource"); //$NON-NLS-1$
- }
-
- if(resource instanceof IWorkspaceRoot)
- {
- throw new IllegalArgumentException("Operation is not defined for workspace roots"); //$NON-NLS-1$
- }
-
- resource.getProject().refreshLocal(IResource.DEPTH_INFINITE, null);
- }
-
- private static IFacetUtils facetUtils()
- {
- return new FacetUtils();
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/resources/StringInputStreamAdapter.java b/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/resources/StringInputStreamAdapter.java
deleted file mode 100755
index c0c9629..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/resources/StringInputStreamAdapter.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.utils.resources;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.StringReader;
-
-/**
- * Adapter class that uses a StringReader to organize an InputStream
- *
- * @author Danail Branekov
- *
- */
-public class StringInputStreamAdapter extends InputStream
-{
- private StringReader reader;
-
- /**
- * Constructor
- *
- * @param string
- * @throws NullPointerException
- * when <code>string</code> is null
- */
- public StringInputStreamAdapter(String string)
- {
- if (string == null)
- {
- throw new NullPointerException("string"); //$NON-NLS-1$
- }
-
- reader = new StringReader(string);
- }
-
- @Override
- public int read() throws IOException
- {
- return reader.read();
- }
-
-}
diff --git a/features/org.eclipse.jst.ws.cxf.feature/.project b/features/org.eclipse.jst.ws.cxf.feature/.project
deleted file mode 100644
index 7f8df9b..0000000
--- a/features/org.eclipse.jst.ws.cxf.feature/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.jst.ws.cxf.feature</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.pde.FeatureBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.FeatureNature</nature>
- </natures>
-</projectDescription>
diff --git a/features/org.eclipse.jst.ws.cxf.feature/build.properties b/features/org.eclipse.jst.ws.cxf.feature/build.properties
deleted file mode 100644
index 60e19e5..0000000
--- a/features/org.eclipse.jst.ws.cxf.feature/build.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-bin.includes = eclipse_update_120.jpg,\
- epl-v10.html,\
- feature.properties,\
- feature.xml,\
- license.html
diff --git a/features/org.eclipse.jst.ws.cxf.feature/eclipse_update_120.jpg b/features/org.eclipse.jst.ws.cxf.feature/eclipse_update_120.jpg
deleted file mode 100644
index bfdf708..0000000
--- a/features/org.eclipse.jst.ws.cxf.feature/eclipse_update_120.jpg
+++ /dev/null
Binary files differ
diff --git a/features/org.eclipse.jst.ws.cxf.feature/epl-v10.html b/features/org.eclipse.jst.ws.cxf.feature/epl-v10.html
deleted file mode 100644
index ed4b196..0000000
--- a/features/org.eclipse.jst.ws.cxf.feature/epl-v10.html
+++ /dev/null
@@ -1,328 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office"
-xmlns:w="urn:schemas-microsoft-com:office:word"
-xmlns="http://www.w3.org/TR/REC-html40">
-
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=windows-1252">
-<meta name=ProgId content=Word.Document>
-<meta name=Generator content="Microsoft Word 9">
-<meta name=Originator content="Microsoft Word 9">
-<link rel=File-List
-href="./Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">
-<title>Eclipse Public License - Version 1.0</title>
-<!--[if gte mso 9]><xml>
- <o:DocumentProperties>
- <o:Revision>2</o:Revision>
- <o:TotalTime>3</o:TotalTime>
- <o:Created>2004-03-05T23:03:00Z</o:Created>
- <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
- <o:Pages>4</o:Pages>
- <o:Words>1626</o:Words>
- <o:Characters>9270</o:Characters>
- <o:Lines>77</o:Lines>
- <o:Paragraphs>18</o:Paragraphs>
- <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
- <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
- <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-<style>
-<!--
- /* Font Definitions */
-@font-face
- {font-family:Tahoma;
- panose-1:2 11 6 4 3 5 4 4 2 4;
- mso-font-charset:0;
- mso-generic-font-family:swiss;
- mso-font-pitch:variable;
- mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
- {mso-style-parent:"";
- margin:0in;
- margin-bottom:.0001pt;
- mso-pagination:widow-orphan;
- font-size:12.0pt;
- font-family:"Times New Roman";
- mso-fareast-font-family:"Times New Roman";}
-p
- {margin-right:0in;
- mso-margin-top-alt:auto;
- mso-margin-bottom-alt:auto;
- margin-left:0in;
- mso-pagination:widow-orphan;
- font-size:12.0pt;
- font-family:"Times New Roman";
- mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
- {mso-style-name:"Balloon Text";
- margin:0in;
- margin-bottom:.0001pt;
- mso-pagination:widow-orphan;
- font-size:8.0pt;
- font-family:Tahoma;
- mso-fareast-font-family:"Times New Roman";}
-@page Section1
- {size:8.5in 11.0in;
- margin:1.0in 1.25in 1.0in 1.25in;
- mso-header-margin:.5in;
- mso-footer-margin:.5in;
- mso-paper-source:0;}
-div.Section1
- {page:Section1;}
--->
-</style>
-</head>
-
-<body lang=EN-US style='tab-interval:.5in'>
-
-<div class=Section1>
-
-<p align=center style='text-align:center'><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style='font-size:10.0pt'>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>1. DEFINITIONS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>"Contribution" means:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear=left>
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-changes to the Program, and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-additions to the Program;</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>where
-such changes and/or additions to the Program originate from and are distributed
-by that particular Contributor. A Contribution 'originates' from a Contributor
-if it was added to the Program by such Contributor itself or anyone acting on
-such Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in conjunction
-with the Program under their own license agreement, and (ii) are not derivative
-works of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>"Contributor" means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style='font-size:10.0pt'>"Licensed Patents " mean patent
-claims licensable by a Contributor which are necessarily infringed by the use
-or sale of its Contribution alone or when combined with the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>"Program" means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style='font-size:10.0pt'>"Recipient" means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>2. GRANT OF RIGHTS</span></b> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span
-style='color:red'> </span>reproduce, prepare derivative works of, publicly
-display, publicly perform, distribute and sublicense the Contribution of such
-Contributor, if any, and such derivative works, in source code and object code
-form.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style='color:green'> </span>royalty-free
-patent license under Licensed Patents to make, use, sell, offer to sell, import
-and otherwise transfer the Contribution of such Contributor, if any, in source
-code and object code form. This patent license shall apply to the combination
-of the Contribution and the Program if, at the time the Contribution is added
-by the Contributor, such addition of the Contribution causes such combination
-to be covered by the Licensed Patents. The patent license shall not apply to
-any other combinations which include the Contribution. No hardware per se is
-licensed hereunder. </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>c)
-Recipient understands that although each Contributor grants the licenses to its
-Contributions set forth herein, no assurances are provided by any Contributor
-that the Program does not infringe the patent or other intellectual property
-rights of any other entity. Each Contributor disclaims any liability to Recipient
-for claims brought by any other entity based on infringement of intellectual
-property rights or otherwise. As a condition to exercising the rights and
-licenses granted hereunder, each Recipient hereby assumes sole responsibility
-to secure any other intellectual property rights needed, if any. For example,
-if a third party patent license is required to allow Recipient to distribute
-the Program, it is Recipient's responsibility to acquire that license before
-distributing the Program.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>d)
-Each Contributor represents that to its knowledge it has sufficient copyright
-rights in its Contribution, if any, to grant the copyright license set forth in
-this Agreement. </span></p>
-
-<p><b><span style='font-size:10.0pt'>3. REQUIREMENTS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-its license agreement:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-effectively disclaims on behalf of all Contributors all warranties and
-conditions, express and implied, including warranties or conditions of title
-and non-infringement, and implied warranties or conditions of merchantability
-and fitness for a particular purpose; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iv)
-states that source code for the Program is available from such Contributor, and
-informs licensees how to obtain it in a reasonable manner on or through a
-medium customarily used for software exchange.<span style='color:blue'> </span></span></p>
-
-<p><span style='font-size:10.0pt'>When the Program is made available in source
-code form:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it must be made available under this Agreement; and </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Each Contributor must identify itself as the
-originator of its Contribution, if any, in a manner that reasonably allows
-subsequent Recipients to identify the originator of the Contribution. </span></p>
-
-<p><b><span style='font-size:10.0pt'>4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style='font-size:10.0pt'>Commercial distributors of software may
-accept certain responsibilities with respect to end users, business partners
-and the like. While this license is intended to facilitate the commercial use
-of the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create potential
-liability for other Contributors. Therefore, if a Contributor includes the
-Program in a commercial product offering, such Contributor ("Commercial
-Contributor") hereby agrees to defend and indemnify every other
-Contributor ("Indemnified Contributor") against any losses, damages and
-costs (collectively "Losses") arising from claims, lawsuits and other
-legal actions brought by a third party against the Indemnified Contributor to
-the extent caused by the acts or omissions of such Commercial Contributor in
-connection with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In order
-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor
-to control, and cooperate with the Commercial Contributor in, the defense and
-any related settlement negotiations. The Indemnified Contributor may participate
-in any such claim at its own expense.</span> </p>
-
-<p><span style='font-size:10.0pt'>For example, a Contributor might include the
-Program in a commercial product offering, Product X. That Contributor is then a
-Commercial Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance claims and
-warranties are such Commercial Contributor's responsibility alone. Under this
-section, the Commercial Contributor would have to defend claims against the
-other Contributors related to those performance claims and warranties, and if a
-court requires any other Contributor to pay any damages as a result, the
-Commercial Contributor must pay those damages.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>5. NO WARRANTY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and distributing the
-Program and assumes all risks associated with its exercise of rights under this
-Agreement , including but not limited to the risks and costs of program errors,
-compliance with applicable laws, damage to or loss of data, programs or
-equipment, and unavailability or interruption of operations. </span></p>
-
-<p><b><span style='font-size:10.0pt'>6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>7. GENERAL</span></b> </p>
-
-<p><span style='font-size:10.0pt'>If any provision of this Agreement is invalid
-or unenforceable under applicable law, it shall not affect the validity or
-enforceability of the remainder of the terms of this Agreement, and without
-further action by the parties hereto, such provision shall be reformed to the
-minimum extent necessary to make such provision valid and enforceable.</span> </p>
-
-<p><span style='font-size:10.0pt'>If Recipient institutes patent litigation
-against any entity (including a cross-claim or counterclaim in a lawsuit)
-alleging that the Program itself (excluding combinations of the Program with
-other software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the date
-such litigation is filed. </span></p>
-
-<p><span style='font-size:10.0pt'>All Recipient's rights under this Agreement
-shall terminate if it fails to comply with any of the material terms or
-conditions of this Agreement and does not cure such failure in a reasonable
-period of time after becoming aware of such noncompliance. If all Recipient's
-rights under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive. </span></p>
-
-<p><span style='font-size:10.0pt'>Everyone is permitted to copy and distribute
-copies of this Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The Agreement
-Steward reserves the right to publish new versions (including revisions) of
-this Agreement from time to time. No one other than the Agreement Steward has
-the right to modify this Agreement. The Eclipse Foundation is the initial
-Agreement Steward. The Eclipse Foundation may assign the responsibility to
-serve as the Agreement Steward to a suitable separate entity. Each new version
-of the Agreement will be given a distinguishing version number. The Program
-(including Contributions) may always be distributed subject to the version of
-the Agreement under which it was received. In addition, after a new version of
-the Agreement is published, Contributor may elect to distribute the Program
-(including its Contributions) under the new version. Except as expressly stated
-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
-the intellectual property of any Contributor under this Agreement, whether
-expressly, by implication, estoppel or otherwise. All rights in the Program not
-expressly granted under this Agreement are reserved.</span> </p>
-
-<p><span style='font-size:10.0pt'>This Agreement is governed by the laws of the
-State of New York and the intellectual property laws of the United States of
-America. No party to this Agreement will bring a legal action under this
-Agreement more than one year after the cause of action arose. Each party waives
-its rights to a jury trial in any resulting litigation.</span> </p>
-
-<p class=MsoNormal><![if !supportEmptyParas]> <![endif]><o:p></o:p></p>
-
-</div>
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/features/org.eclipse.jst.ws.cxf.feature/feature.properties b/features/org.eclipse.jst.ws.cxf.feature/feature.properties
deleted file mode 100644
index 1ff79c9..0000000
--- a/features/org.eclipse.jst.ws.cxf.feature/feature.properties
+++ /dev/null
@@ -1,144 +0,0 @@
-###############################################################################
-# Copyright (c) 2008 IONA Technologies PLC
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IONA Technologies PLC - initial API and implementation
-###############################################################################
-# feature.properties
-# contains externalized strings for feature.xml
-# "%foo" in feature.xml corresponds to the key "foo" in this file
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# This file should be translated.
-
-# "featureName" property - name of the feature
-featureName=CXF Web Services (Incubation)
-
-# "featureProvider" property - name of the company that provides the feature
-featureProvider=Eclipse Web Tools Platform
-
-# "description" property - description of the feature
-description=CXF Web Services
-
-# "updateSiteName" property - label for the update site
-updateSiteName=The Eclipse Web Tools Platform (WTP) Project update site
-
-# "copyright" property - text of the "Feature Update Copyright"
-copyright=\
- Copyright (c) 2008 IONA Technologies PLC\n\
- All rights reserved. This program and the accompanying materials\n\
- are made available under the terms of the Eclipse Public License v1.0\n\
- which accompanies this distribution, and is available at\n\
- http://www.eclipse.org/legal/epl-v10.html\n\
-\n\
-Contributors:\n\
- IONA Technologies PLC - initial API and implementation\n
-################ end of copyright property ####################################
-
-# "licenseURL" property - URL of the "Feature License"
-# do not translate value - just change to point to a locale-specific HTML page
-licenseURL=epl-v10.html
-
-# "license" property - text of the "Feature Update License"
-# should be plain text version of license agreement pointed to be "licenseURL"
-license=\
-ECLIPSE FOUNDATION SOFTWARE USER AGREEMENT\n\
-March 17, 2005\n\
-\n\
-Usage Of Content\n\
-\n\
-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
-OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
-USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
-AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU\n\
-AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
-AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
-OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
-OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
-BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
-\n\
-Applicable Licenses\n\
-\n\
-Unless otherwise indicated, all Content made available by the Eclipse Foundation\n\
-is provided to you under the terms and conditions of the Eclipse Public\n\
-License Version 1.0 ("EPL"). A copy of the EPL is provided with this\n\
-Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
-For purposes of the EPL, "Program" will mean the Content.\n\
-\n\
-Content includes, but is not limited to, source code, object code,\n\
-documentation and other files maintained in the Eclipse.org CVS\n\
-repository ("Repository") in CVS modules ("Modules") and made available\n\
-as downloadable archives ("Downloads").\n\
-\n\
- - Content may be structured and packaged into modules to facilitate delivering,\n\
- extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
- plug-in fragments ("Fragments"), and features ("Features").\n\
- - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java? ARchive)\n\
- in a directory named "plugins".\n\
- - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
- Each Feature may be packaged as a sub-directory in a directory named "features".\n\
- Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
- numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
- - Features may also include other Features ("Included Features"). Within a Feature, files\n\
- named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
-\n\
-Features may also include other Features ("Included Features"). Files named\n\
-"feature.xml" may contain a list of the names and version numbers of\n\
-Included Features.\n\
-\n\
-The terms and conditions governing Plug-ins and Fragments should be\n\
-contained in files named "about.html" ("Abouts"). The terms and\n\
-conditions governing Features and Included Features should be contained\n\
-in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
-Licenses may be located in any directory of a Download or Module\n\
-including, but not limited to the following locations:\n\
-\n\
- - The top-level (root) directory\n\
- - Plug-in and Fragment directories\n\
- - Inside Plug-ins and Fragments packaged as JARs\n\
- - Sub-directories of the directory named "src" of certain Plug-ins\n\
- - Feature directories\n\
-\n\
-Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
-Eclipse Update Manager, you must agree to a license ("Feature Update\n\
-License") during the installation process. If the Feature contains\n\
-Included Features, the Feature Update License should either provide you\n\
-with the terms and conditions governing the Included Features or inform\n\
-you where you can locate them. Feature Update Licenses may be found in\n\
-the "license" property of files named "feature.properties". Such Abouts,\n\
-Feature Licenses and Feature Update Licenses contain the terms and\n\
-conditions (or references to such terms and conditions) that govern your\n\
-use of the associated Content in that directory.\n\
-\n\
-THE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER\n\
-TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
-SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
-\n\
- - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
- - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
- - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
- - IBM Public License 1.0 (available at http://oss.software.ibm.com/developerworks/opensource/license10.html)\n\
- - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
- - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
-\n\
-IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
-TO USE OF THE CONTENT. If no About, Feature License or Feature Update License\n\
-is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
-govern that particular Content.\n\
-\n\
-Cryptography\n\
-\n\
-Content may contain encryption software. The country in which you are\n\
-currently may have restrictions on the import, possession, and use,\n\
-and/or re-export to another country, of encryption software. BEFORE\n\
-using any encryption software, please check the country's laws,\n\
-regulations and policies concerning the import, possession, or use,\n\
-and re-export of encryption software, to see if this is permitted.\n\
-\n\
-Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.\n
-########### end of license property ##########################################
diff --git a/features/org.eclipse.jst.ws.cxf.feature/feature.xml b/features/org.eclipse.jst.ws.cxf.feature/feature.xml
deleted file mode 100644
index eb62c90..0000000
--- a/features/org.eclipse.jst.ws.cxf.feature/feature.xml
+++ /dev/null
@@ -1,86 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
- id="org.eclipse.jst.ws.cxf.feature"
- label="%featureName"
- version="0.4.2.qualifier"
- provider-name="%featureProvider"
- plugin="org.eclipse.jst.ws.cxf.core"
- image="eclipse_update_120.jpg">
-
- <description>
- %description
- </description>
-
- <copyright>
- %copyright
- </copyright>
-
- <license url="%licenseURL">
- %license
- </license>
-
- <url>
- <update label="%updateSiteName" url="http://download.eclipse.org/webtools/updates"/>
- </url>
-
- <includes
- id="org.eclipse.jst.ws.jaxws_userdoc.feature"
- version="0.0.0"/>
-
- <plugin
- id="org.jdom"
- download-size="156"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.jst.ws.cxf.consumption.core"
- download-size="20"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.jst.ws.cxf.consumption.ui"
- download-size="44"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.jst.ws.cxf.core"
- download-size="204"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.jst.ws.cxf.creation.core"
- download-size="52"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.jst.ws.cxf.creation.ui"
- download-size="96"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.jst.ws.cxf.ui"
- download-size="120"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="javax.wsdl"
- download-size="0"
- install-size="0"
- version="1.6.2.qualifier"
- unpack="false"/>
-
-</feature>
diff --git a/features/org.eclipse.jst.ws.cxf.feature/license.html b/features/org.eclipse.jst.ws.cxf.feature/license.html
deleted file mode 100644
index c6af966..0000000
--- a/features/org.eclipse.jst.ws.cxf.feature/license.html
+++ /dev/null
@@ -1,79 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=iso-8859-1">
-<title>Eclipse.org Software User Agreement</title>
-</head>
-
-<body lang="EN-US" link=blue vlink=purple>
-<h2>Eclipse Foundation Software User Agreement</h2>
-<p>March 17, 2005</p>
-
-<h3>Usage Of Content</h3>
-
-<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
- (COLLECTIVELY "CONTENT"). USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
- CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU AGREE THAT YOUR USE
- OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
- NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
- CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
-
-<h3>Applicable Licenses</h3>
-
-<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0
- ("EPL"). A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
- For purposes of the EPL, "Program" will mean the Content.</p>
-
-<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse.org CVS repository ("Repository") in CVS
- modules ("Modules") and made available as downloadable archives ("Downloads").</p>
-
-<ul>
- <li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"), plug-in fragments ("Fragments"), and features ("Features").</li>
- <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java™ ARchive) in a directory named "plugins".</li>
- <li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material. Each Feature may be packaged as a sub-directory in a directory named "features". Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of the Plug-ins
- and/or Fragments associated with that Feature.</li>
- <li>Features may also include other Features ("Included Features"). Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of Included Features.</li>
-</ul>
-
-<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named "about.html" ("Abouts"). The terms and conditions governing Features and
-Included Features should be contained in files named "license.html" ("Feature Licenses"). Abouts and Feature Licenses may be located in any directory of a Download or Module
-including, but not limited to the following locations:</p>
-
-<ul>
- <li>The top-level (root) directory</li>
- <li>Plug-in and Fragment directories</li>
- <li>Inside Plug-ins and Fragments packaged as JARs</li>
- <li>Sub-directories of the directory named "src" of certain Plug-ins</li>
- <li>Feature directories</li>
-</ul>
-
-<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Eclipse Update Manager, you must agree to a license ("Feature Update License") during the
-installation process. If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
-inform you where you can locate them. Feature Update Licenses may be found in the "license" property of files named "feature.properties" found within a Feature.
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
-that directory.</p>
-
-<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS. SOME OF THESE
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
-
-<ul>
- <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
- <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
- <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
- <li>IBM Public License 1.0 (available at <a href="http://oss.software.ibm.com/developerworks/opensource/license10.html">http://oss.software.ibm.com/developerworks/opensource/license10.html</a>)</li>
- <li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>
- <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
-</ul>
-
-<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License is provided, please
-contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
-
-<h3>Cryptography</h3>
-
-<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
- another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
- possession, or use, and re-export of encryption software, to see if this is permitted.</p>
-
-<small>Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.</small>
-</body>
-</html>
diff --git a/features/org.eclipse.jst.ws.cxf.feature/sourceTemplateBundle/about.html b/features/org.eclipse.jst.ws.cxf.feature/sourceTemplateBundle/about.html
deleted file mode 100644
index 3d169bf..0000000
--- a/features/org.eclipse.jst.ws.cxf.feature/sourceTemplateBundle/about.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
-<title>About</title>
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
-
-<p>September 12, 2008</p>
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, "Program" will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is
-being redistributed by another party ("Redistributor") and different terms and conditions may
-apply to your use of any object code in the Content. Check the Redistributor's license that was
-provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
-
-</body>
-</html>
diff --git a/features/org.eclipse.jst.ws.cxf.feature/sourceTemplateBundle/about.ini b/features/org.eclipse.jst.ws.cxf.feature/sourceTemplateBundle/about.ini
deleted file mode 100644
index a864727..0000000
--- a/features/org.eclipse.jst.ws.cxf.feature/sourceTemplateBundle/about.ini
+++ /dev/null
@@ -1,13 +0,0 @@
-# about.ini
-# contains information about a feature
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# "%key" are externalized strings defined in about.properties
-# This file does not need to be translated.
-
-# Property "aboutText" contains blurb for feature details in the "About"
-# dialog (translated). Maximum 15 lines and 75 characters per line.
-aboutText=%blurb
-
-# Property "featureImage" contains path to feature image (32x32)
-featureImage=cxf32.gif
-
diff --git a/features/org.eclipse.jst.ws.cxf.feature/sourceTemplateBundle/about.mappings b/features/org.eclipse.jst.ws.cxf.feature/sourceTemplateBundle/about.mappings
deleted file mode 100644
index a28390a..0000000
--- a/features/org.eclipse.jst.ws.cxf.feature/sourceTemplateBundle/about.mappings
+++ /dev/null
@@ -1,6 +0,0 @@
-# about.mappings
-# contains fill-ins for about.properties
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# This file does not need to be translated.
-
-0=@build@
diff --git a/features/org.eclipse.jst.ws.cxf.feature/sourceTemplateBundle/about.properties b/features/org.eclipse.jst.ws.cxf.feature/sourceTemplateBundle/about.properties
deleted file mode 100644
index dd1352e..0000000
--- a/features/org.eclipse.jst.ws.cxf.feature/sourceTemplateBundle/about.properties
+++ /dev/null
@@ -1,26 +0,0 @@
-###############################################################################
-# Copyright (c) 2008 IONA Technologies PLC
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IONA Technologies PLC - initial API and implementation
-###############################################################################
-# about.properties
-# contains externalized strings for about.ini
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# fill-ins are supplied by about.mappings
-# This file should be translated.
-#
-# Do not translate any values surrounded by {}
-
-blurb=CXF Web Services Source (Incubation)\n\
-\n\
-Version: {featureVersion}\n\
-Build id: {0}\n\
-\n\
-(c) Copyright IONA Technologies PLC 2008. All rights reserved.\n\
-Visit http://www.eclipse.org/webtools/incubator/\n\
-\n
diff --git a/features/org.eclipse.jst.ws.cxf.feature/sourceTemplateBundle/build.properties b/features/org.eclipse.jst.ws.cxf.feature/sourceTemplateBundle/build.properties
deleted file mode 100644
index 1c4344d..0000000
--- a/features/org.eclipse.jst.ws.cxf.feature/sourceTemplateBundle/build.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-bin.includes = about.html, about.ini, about.mappings, about.properties, cxf32.png, plugin.properties, plugin.xml, src/**, META-INF/
-sourcePlugin = true
diff --git a/features/org.eclipse.jst.ws.cxf.feature/sourceTemplateBundle/cxf32.gif b/features/org.eclipse.jst.ws.cxf.feature/sourceTemplateBundle/cxf32.gif
deleted file mode 100644
index 811eccb..0000000
--- a/features/org.eclipse.jst.ws.cxf.feature/sourceTemplateBundle/cxf32.gif
+++ /dev/null
Binary files differ
diff --git a/features/org.eclipse.jst.ws.cxf.feature/sourceTemplateBundle/plugin.properties b/features/org.eclipse.jst.ws.cxf.feature/sourceTemplateBundle/plugin.properties
deleted file mode 100644
index b4a9d00..0000000
--- a/features/org.eclipse.jst.ws.cxf.feature/sourceTemplateBundle/plugin.properties
+++ /dev/null
@@ -1,12 +0,0 @@
-###############################################################################
-# Copyright (c) 2008 IONA Technologies PLC
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IONA Technologies PLC - initial API and implementation
-###############################################################################
-pluginName=CXF Web Services Source (Incubation)
-pluginProvider=Eclipse Web Tools Platform
diff --git a/features/org.eclipse.jst.ws.cxf.feature/sourceTemplateFeature/build.properties b/features/org.eclipse.jst.ws.cxf.feature/sourceTemplateFeature/build.properties
deleted file mode 100644
index 60e19e5..0000000
--- a/features/org.eclipse.jst.ws.cxf.feature/sourceTemplateFeature/build.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-bin.includes = eclipse_update_120.jpg,\
- epl-v10.html,\
- feature.properties,\
- feature.xml,\
- license.html
diff --git a/features/org.eclipse.jst.ws.cxf.feature/sourceTemplateFeature/eclipse_update_120.jpg b/features/org.eclipse.jst.ws.cxf.feature/sourceTemplateFeature/eclipse_update_120.jpg
deleted file mode 100644
index bfdf708..0000000
--- a/features/org.eclipse.jst.ws.cxf.feature/sourceTemplateFeature/eclipse_update_120.jpg
+++ /dev/null
Binary files differ
diff --git a/features/org.eclipse.jst.ws.cxf.feature/sourceTemplateFeature/epl-v10.html b/features/org.eclipse.jst.ws.cxf.feature/sourceTemplateFeature/epl-v10.html
deleted file mode 100644
index ed4b196..0000000
--- a/features/org.eclipse.jst.ws.cxf.feature/sourceTemplateFeature/epl-v10.html
+++ /dev/null
@@ -1,328 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office"
-xmlns:w="urn:schemas-microsoft-com:office:word"
-xmlns="http://www.w3.org/TR/REC-html40">
-
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=windows-1252">
-<meta name=ProgId content=Word.Document>
-<meta name=Generator content="Microsoft Word 9">
-<meta name=Originator content="Microsoft Word 9">
-<link rel=File-List
-href="./Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">
-<title>Eclipse Public License - Version 1.0</title>
-<!--[if gte mso 9]><xml>
- <o:DocumentProperties>
- <o:Revision>2</o:Revision>
- <o:TotalTime>3</o:TotalTime>
- <o:Created>2004-03-05T23:03:00Z</o:Created>
- <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
- <o:Pages>4</o:Pages>
- <o:Words>1626</o:Words>
- <o:Characters>9270</o:Characters>
- <o:Lines>77</o:Lines>
- <o:Paragraphs>18</o:Paragraphs>
- <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
- <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
- <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-<style>
-<!--
- /* Font Definitions */
-@font-face
- {font-family:Tahoma;
- panose-1:2 11 6 4 3 5 4 4 2 4;
- mso-font-charset:0;
- mso-generic-font-family:swiss;
- mso-font-pitch:variable;
- mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
- {mso-style-parent:"";
- margin:0in;
- margin-bottom:.0001pt;
- mso-pagination:widow-orphan;
- font-size:12.0pt;
- font-family:"Times New Roman";
- mso-fareast-font-family:"Times New Roman";}
-p
- {margin-right:0in;
- mso-margin-top-alt:auto;
- mso-margin-bottom-alt:auto;
- margin-left:0in;
- mso-pagination:widow-orphan;
- font-size:12.0pt;
- font-family:"Times New Roman";
- mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
- {mso-style-name:"Balloon Text";
- margin:0in;
- margin-bottom:.0001pt;
- mso-pagination:widow-orphan;
- font-size:8.0pt;
- font-family:Tahoma;
- mso-fareast-font-family:"Times New Roman";}
-@page Section1
- {size:8.5in 11.0in;
- margin:1.0in 1.25in 1.0in 1.25in;
- mso-header-margin:.5in;
- mso-footer-margin:.5in;
- mso-paper-source:0;}
-div.Section1
- {page:Section1;}
--->
-</style>
-</head>
-
-<body lang=EN-US style='tab-interval:.5in'>
-
-<div class=Section1>
-
-<p align=center style='text-align:center'><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style='font-size:10.0pt'>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>1. DEFINITIONS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>"Contribution" means:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear=left>
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-changes to the Program, and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-additions to the Program;</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>where
-such changes and/or additions to the Program originate from and are distributed
-by that particular Contributor. A Contribution 'originates' from a Contributor
-if it was added to the Program by such Contributor itself or anyone acting on
-such Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in conjunction
-with the Program under their own license agreement, and (ii) are not derivative
-works of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>"Contributor" means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style='font-size:10.0pt'>"Licensed Patents " mean patent
-claims licensable by a Contributor which are necessarily infringed by the use
-or sale of its Contribution alone or when combined with the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>"Program" means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style='font-size:10.0pt'>"Recipient" means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>2. GRANT OF RIGHTS</span></b> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span
-style='color:red'> </span>reproduce, prepare derivative works of, publicly
-display, publicly perform, distribute and sublicense the Contribution of such
-Contributor, if any, and such derivative works, in source code and object code
-form.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style='color:green'> </span>royalty-free
-patent license under Licensed Patents to make, use, sell, offer to sell, import
-and otherwise transfer the Contribution of such Contributor, if any, in source
-code and object code form. This patent license shall apply to the combination
-of the Contribution and the Program if, at the time the Contribution is added
-by the Contributor, such addition of the Contribution causes such combination
-to be covered by the Licensed Patents. The patent license shall not apply to
-any other combinations which include the Contribution. No hardware per se is
-licensed hereunder. </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>c)
-Recipient understands that although each Contributor grants the licenses to its
-Contributions set forth herein, no assurances are provided by any Contributor
-that the Program does not infringe the patent or other intellectual property
-rights of any other entity. Each Contributor disclaims any liability to Recipient
-for claims brought by any other entity based on infringement of intellectual
-property rights or otherwise. As a condition to exercising the rights and
-licenses granted hereunder, each Recipient hereby assumes sole responsibility
-to secure any other intellectual property rights needed, if any. For example,
-if a third party patent license is required to allow Recipient to distribute
-the Program, it is Recipient's responsibility to acquire that license before
-distributing the Program.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>d)
-Each Contributor represents that to its knowledge it has sufficient copyright
-rights in its Contribution, if any, to grant the copyright license set forth in
-this Agreement. </span></p>
-
-<p><b><span style='font-size:10.0pt'>3. REQUIREMENTS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-its license agreement:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-effectively disclaims on behalf of all Contributors all warranties and
-conditions, express and implied, including warranties or conditions of title
-and non-infringement, and implied warranties or conditions of merchantability
-and fitness for a particular purpose; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iv)
-states that source code for the Program is available from such Contributor, and
-informs licensees how to obtain it in a reasonable manner on or through a
-medium customarily used for software exchange.<span style='color:blue'> </span></span></p>
-
-<p><span style='font-size:10.0pt'>When the Program is made available in source
-code form:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it must be made available under this Agreement; and </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Each Contributor must identify itself as the
-originator of its Contribution, if any, in a manner that reasonably allows
-subsequent Recipients to identify the originator of the Contribution. </span></p>
-
-<p><b><span style='font-size:10.0pt'>4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style='font-size:10.0pt'>Commercial distributors of software may
-accept certain responsibilities with respect to end users, business partners
-and the like. While this license is intended to facilitate the commercial use
-of the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create potential
-liability for other Contributors. Therefore, if a Contributor includes the
-Program in a commercial product offering, such Contributor ("Commercial
-Contributor") hereby agrees to defend and indemnify every other
-Contributor ("Indemnified Contributor") against any losses, damages and
-costs (collectively "Losses") arising from claims, lawsuits and other
-legal actions brought by a third party against the Indemnified Contributor to
-the extent caused by the acts or omissions of such Commercial Contributor in
-connection with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In order
-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor
-to control, and cooperate with the Commercial Contributor in, the defense and
-any related settlement negotiations. The Indemnified Contributor may participate
-in any such claim at its own expense.</span> </p>
-
-<p><span style='font-size:10.0pt'>For example, a Contributor might include the
-Program in a commercial product offering, Product X. That Contributor is then a
-Commercial Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance claims and
-warranties are such Commercial Contributor's responsibility alone. Under this
-section, the Commercial Contributor would have to defend claims against the
-other Contributors related to those performance claims and warranties, and if a
-court requires any other Contributor to pay any damages as a result, the
-Commercial Contributor must pay those damages.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>5. NO WARRANTY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and distributing the
-Program and assumes all risks associated with its exercise of rights under this
-Agreement , including but not limited to the risks and costs of program errors,
-compliance with applicable laws, damage to or loss of data, programs or
-equipment, and unavailability or interruption of operations. </span></p>
-
-<p><b><span style='font-size:10.0pt'>6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>7. GENERAL</span></b> </p>
-
-<p><span style='font-size:10.0pt'>If any provision of this Agreement is invalid
-or unenforceable under applicable law, it shall not affect the validity or
-enforceability of the remainder of the terms of this Agreement, and without
-further action by the parties hereto, such provision shall be reformed to the
-minimum extent necessary to make such provision valid and enforceable.</span> </p>
-
-<p><span style='font-size:10.0pt'>If Recipient institutes patent litigation
-against any entity (including a cross-claim or counterclaim in a lawsuit)
-alleging that the Program itself (excluding combinations of the Program with
-other software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the date
-such litigation is filed. </span></p>
-
-<p><span style='font-size:10.0pt'>All Recipient's rights under this Agreement
-shall terminate if it fails to comply with any of the material terms or
-conditions of this Agreement and does not cure such failure in a reasonable
-period of time after becoming aware of such noncompliance. If all Recipient's
-rights under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive. </span></p>
-
-<p><span style='font-size:10.0pt'>Everyone is permitted to copy and distribute
-copies of this Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The Agreement
-Steward reserves the right to publish new versions (including revisions) of
-this Agreement from time to time. No one other than the Agreement Steward has
-the right to modify this Agreement. The Eclipse Foundation is the initial
-Agreement Steward. The Eclipse Foundation may assign the responsibility to
-serve as the Agreement Steward to a suitable separate entity. Each new version
-of the Agreement will be given a distinguishing version number. The Program
-(including Contributions) may always be distributed subject to the version of
-the Agreement under which it was received. In addition, after a new version of
-the Agreement is published, Contributor may elect to distribute the Program
-(including its Contributions) under the new version. Except as expressly stated
-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
-the intellectual property of any Contributor under this Agreement, whether
-expressly, by implication, estoppel or otherwise. All rights in the Program not
-expressly granted under this Agreement are reserved.</span> </p>
-
-<p><span style='font-size:10.0pt'>This Agreement is governed by the laws of the
-State of New York and the intellectual property laws of the United States of
-America. No party to this Agreement will bring a legal action under this
-Agreement more than one year after the cause of action arose. Each party waives
-its rights to a jury trial in any resulting litigation.</span> </p>
-
-<p class=MsoNormal><![if !supportEmptyParas]> <![endif]><o:p></o:p></p>
-
-</div>
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/features/org.eclipse.jst.ws.cxf.feature/sourceTemplateFeature/feature.properties b/features/org.eclipse.jst.ws.cxf.feature/sourceTemplateFeature/feature.properties
deleted file mode 100644
index f2ac814..0000000
--- a/features/org.eclipse.jst.ws.cxf.feature/sourceTemplateFeature/feature.properties
+++ /dev/null
@@ -1,144 +0,0 @@
-###############################################################################
-# Copyright (c) 2008 IONA Technologies PLC
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IONA Technologies PLC - initial API and implementation
-###############################################################################
-# feature.properties
-# contains externalized strings for feature.xml
-# "%foo" in feature.xml corresponds to the key "foo" in this file
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# This file should be translated.
-
-# "featureName" property - name of the feature
-featureName=CXF Web Services Developer Resources (Incubation)
-
-# "featureProvider" property - name of the company that provides the feature
-featureProvider=Eclipse Web Tools Platform
-
-# "description" property - description of the feature
-description=Source code for CXF Web Services
-
-# "updateSiteName" property - label for the update site
-updateSiteName=The Eclipse Web Tools Platform (WTP) Project update site
-
-# "copyright" property - text of the "Feature Update Copyright"
-copyright=\
- Copyright (c) 2008 IONA Technologies PLC\n\
- All rights reserved. This program and the accompanying materials\n\
- are made available under the terms of the Eclipse Public License v1.0\n\
- which accompanies this distribution, and is available at\n\
- http://www.eclipse.org/legal/epl-v10.html\n\
-\n\
-Contributors:\n\
- IONA Technologies PLC - initial API and implementation\n
-################ end of copyright property ####################################
-
-# "licenseURL" property - URL of the "Feature License"
-# do not translate value - just change to point to a locale-specific HTML page
-licenseURL=epl-v10.html
-
-# "license" property - text of the "Feature Update License"
-# should be plain text version of license agreement pointed to be "licenseURL"
-license=\
-ECLIPSE FOUNDATION SOFTWARE USER AGREEMENT\n\
-March 17, 2005\n\
-\n\
-Usage Of Content\n\
-\n\
-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
-OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
-USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
-AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU\n\
-AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
-AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
-OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
-OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
-BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
-\n\
-Applicable Licenses\n\
-\n\
-Unless otherwise indicated, all Content made available by the Eclipse Foundation\n\
-is provided to you under the terms and conditions of the Eclipse Public\n\
-License Version 1.0 ("EPL"). A copy of the EPL is provided with this\n\
-Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
-For purposes of the EPL, "Program" will mean the Content.\n\
-\n\
-Content includes, but is not limited to, source code, object code,\n\
-documentation and other files maintained in the Eclipse.org CVS\n\
-repository ("Repository") in CVS modules ("Modules") and made available\n\
-as downloadable archives ("Downloads").\n\
-\n\
- - Content may be structured and packaged into modules to facilitate delivering,\n\
- extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
- plug-in fragments ("Fragments"), and features ("Features").\n\
- - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java? ARchive)\n\
- in a directory named "plugins".\n\
- - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
- Each Feature may be packaged as a sub-directory in a directory named "features".\n\
- Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
- numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
- - Features may also include other Features ("Included Features"). Within a Feature, files\n\
- named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
-\n\
-Features may also include other Features ("Included Features"). Files named\n\
-"feature.xml" may contain a list of the names and version numbers of\n\
-Included Features.\n\
-\n\
-The terms and conditions governing Plug-ins and Fragments should be\n\
-contained in files named "about.html" ("Abouts"). The terms and\n\
-conditions governing Features and Included Features should be contained\n\
-in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
-Licenses may be located in any directory of a Download or Module\n\
-including, but not limited to the following locations:\n\
-\n\
- - The top-level (root) directory\n\
- - Plug-in and Fragment directories\n\
- - Inside Plug-ins and Fragments packaged as JARs\n\
- - Sub-directories of the directory named "src" of certain Plug-ins\n\
- - Feature directories\n\
-\n\
-Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
-Eclipse Update Manager, you must agree to a license ("Feature Update\n\
-License") during the installation process. If the Feature contains\n\
-Included Features, the Feature Update License should either provide you\n\
-with the terms and conditions governing the Included Features or inform\n\
-you where you can locate them. Feature Update Licenses may be found in\n\
-the "license" property of files named "feature.properties". Such Abouts,\n\
-Feature Licenses and Feature Update Licenses contain the terms and\n\
-conditions (or references to such terms and conditions) that govern your\n\
-use of the associated Content in that directory.\n\
-\n\
-THE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER\n\
-TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
-SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
-\n\
- - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
- - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
- - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
- - IBM Public License 1.0 (available at http://oss.software.ibm.com/developerworks/opensource/license10.html)\n\
- - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
- - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
-\n\
-IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
-TO USE OF THE CONTENT. If no About, Feature License or Feature Update License\n\
-is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
-govern that particular Content.\n\
-\n\
-Cryptography\n\
-\n\
-Content may contain encryption software. The country in which you are\n\
-currently may have restrictions on the import, possession, and use,\n\
-and/or re-export to another country, of encryption software. BEFORE\n\
-using any encryption software, please check the country's laws,\n\
-regulations and policies concerning the import, possession, or use,\n\
-and re-export of encryption software, to see if this is permitted.\n\
-\n\
-Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.\n
-########### end of license property ##########################################
diff --git a/features/org.eclipse.jst.ws.cxf.feature/sourceTemplateFeature/license.html b/features/org.eclipse.jst.ws.cxf.feature/sourceTemplateFeature/license.html
deleted file mode 100644
index c6af966..0000000
--- a/features/org.eclipse.jst.ws.cxf.feature/sourceTemplateFeature/license.html
+++ /dev/null
@@ -1,79 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=iso-8859-1">
-<title>Eclipse.org Software User Agreement</title>
-</head>
-
-<body lang="EN-US" link=blue vlink=purple>
-<h2>Eclipse Foundation Software User Agreement</h2>
-<p>March 17, 2005</p>
-
-<h3>Usage Of Content</h3>
-
-<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
- (COLLECTIVELY "CONTENT"). USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
- CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU AGREE THAT YOUR USE
- OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
- NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
- CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
-
-<h3>Applicable Licenses</h3>
-
-<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0
- ("EPL"). A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
- For purposes of the EPL, "Program" will mean the Content.</p>
-
-<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse.org CVS repository ("Repository") in CVS
- modules ("Modules") and made available as downloadable archives ("Downloads").</p>
-
-<ul>
- <li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"), plug-in fragments ("Fragments"), and features ("Features").</li>
- <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java™ ARchive) in a directory named "plugins".</li>
- <li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material. Each Feature may be packaged as a sub-directory in a directory named "features". Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of the Plug-ins
- and/or Fragments associated with that Feature.</li>
- <li>Features may also include other Features ("Included Features"). Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of Included Features.</li>
-</ul>
-
-<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named "about.html" ("Abouts"). The terms and conditions governing Features and
-Included Features should be contained in files named "license.html" ("Feature Licenses"). Abouts and Feature Licenses may be located in any directory of a Download or Module
-including, but not limited to the following locations:</p>
-
-<ul>
- <li>The top-level (root) directory</li>
- <li>Plug-in and Fragment directories</li>
- <li>Inside Plug-ins and Fragments packaged as JARs</li>
- <li>Sub-directories of the directory named "src" of certain Plug-ins</li>
- <li>Feature directories</li>
-</ul>
-
-<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Eclipse Update Manager, you must agree to a license ("Feature Update License") during the
-installation process. If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
-inform you where you can locate them. Feature Update Licenses may be found in the "license" property of files named "feature.properties" found within a Feature.
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
-that directory.</p>
-
-<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS. SOME OF THESE
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
-
-<ul>
- <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
- <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
- <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
- <li>IBM Public License 1.0 (available at <a href="http://oss.software.ibm.com/developerworks/opensource/license10.html">http://oss.software.ibm.com/developerworks/opensource/license10.html</a>)</li>
- <li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>
- <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
-</ul>
-
-<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License is provided, please
-contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
-
-<h3>Cryptography</h3>
-
-<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
- another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
- possession, or use, and re-export of encryption software, to see if this is permitted.</p>
-
-<small>Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.</small>
-</body>
-</html>
diff --git a/features/org.eclipse.jst.ws.cxf.feature/sourceTemplatePlugin/about.html b/features/org.eclipse.jst.ws.cxf.feature/sourceTemplatePlugin/about.html
deleted file mode 100644
index 3d169bf..0000000
--- a/features/org.eclipse.jst.ws.cxf.feature/sourceTemplatePlugin/about.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
-<title>About</title>
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
-
-<p>September 12, 2008</p>
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, "Program" will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is
-being redistributed by another party ("Redistributor") and different terms and conditions may
-apply to your use of any object code in the Content. Check the Redistributor's license that was
-provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
-
-</body>
-</html>
diff --git a/features/org.eclipse.jst.ws.cxf.feature/sourceTemplatePlugin/about.ini b/features/org.eclipse.jst.ws.cxf.feature/sourceTemplatePlugin/about.ini
deleted file mode 100644
index a864727..0000000
--- a/features/org.eclipse.jst.ws.cxf.feature/sourceTemplatePlugin/about.ini
+++ /dev/null
@@ -1,13 +0,0 @@
-# about.ini
-# contains information about a feature
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# "%key" are externalized strings defined in about.properties
-# This file does not need to be translated.
-
-# Property "aboutText" contains blurb for feature details in the "About"
-# dialog (translated). Maximum 15 lines and 75 characters per line.
-aboutText=%blurb
-
-# Property "featureImage" contains path to feature image (32x32)
-featureImage=cxf32.gif
-
diff --git a/features/org.eclipse.jst.ws.cxf.feature/sourceTemplatePlugin/about.mappings b/features/org.eclipse.jst.ws.cxf.feature/sourceTemplatePlugin/about.mappings
deleted file mode 100644
index a28390a..0000000
--- a/features/org.eclipse.jst.ws.cxf.feature/sourceTemplatePlugin/about.mappings
+++ /dev/null
@@ -1,6 +0,0 @@
-# about.mappings
-# contains fill-ins for about.properties
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# This file does not need to be translated.
-
-0=@build@
diff --git a/features/org.eclipse.jst.ws.cxf.feature/sourceTemplatePlugin/about.properties b/features/org.eclipse.jst.ws.cxf.feature/sourceTemplatePlugin/about.properties
deleted file mode 100644
index dd1352e..0000000
--- a/features/org.eclipse.jst.ws.cxf.feature/sourceTemplatePlugin/about.properties
+++ /dev/null
@@ -1,26 +0,0 @@
-###############################################################################
-# Copyright (c) 2008 IONA Technologies PLC
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IONA Technologies PLC - initial API and implementation
-###############################################################################
-# about.properties
-# contains externalized strings for about.ini
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# fill-ins are supplied by about.mappings
-# This file should be translated.
-#
-# Do not translate any values surrounded by {}
-
-blurb=CXF Web Services Source (Incubation)\n\
-\n\
-Version: {featureVersion}\n\
-Build id: {0}\n\
-\n\
-(c) Copyright IONA Technologies PLC 2008. All rights reserved.\n\
-Visit http://www.eclipse.org/webtools/incubator/\n\
-\n
diff --git a/features/org.eclipse.jst.ws.cxf.feature/sourceTemplatePlugin/build.properties b/features/org.eclipse.jst.ws.cxf.feature/sourceTemplatePlugin/build.properties
deleted file mode 100644
index 1c4344d..0000000
--- a/features/org.eclipse.jst.ws.cxf.feature/sourceTemplatePlugin/build.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-bin.includes = about.html, about.ini, about.mappings, about.properties, cxf32.png, plugin.properties, plugin.xml, src/**, META-INF/
-sourcePlugin = true
diff --git a/features/org.eclipse.jst.ws.cxf.feature/sourceTemplatePlugin/cxf32.gif b/features/org.eclipse.jst.ws.cxf.feature/sourceTemplatePlugin/cxf32.gif
deleted file mode 100644
index 811eccb..0000000
--- a/features/org.eclipse.jst.ws.cxf.feature/sourceTemplatePlugin/cxf32.gif
+++ /dev/null
Binary files differ
diff --git a/features/org.eclipse.jst.ws.cxf.feature/sourceTemplatePlugin/plugin.properties b/features/org.eclipse.jst.ws.cxf.feature/sourceTemplatePlugin/plugin.properties
deleted file mode 100644
index 61a2e58..0000000
--- a/features/org.eclipse.jst.ws.cxf.feature/sourceTemplatePlugin/plugin.properties
+++ /dev/null
@@ -1,13 +0,0 @@
-###############################################################################
-# Copyright (c) 2008 IONA Technologies PLC
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IONA Technologies PLC - initial API and implementation
-###############################################################################
-
-pluginName=CXF Web Services Source (Incubation)
-pluginProvider=Eclipse Web Tools Platform
diff --git a/features/org.eclipse.jst.ws.cxf_sdk.feature/.project b/features/org.eclipse.jst.ws.cxf_sdk.feature/.project
deleted file mode 100644
index 31251ce..0000000
--- a/features/org.eclipse.jst.ws.cxf_sdk.feature/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.jst.ws.cxf_sdk.feature</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.pde.FeatureBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.FeatureNature</nature>
- </natures>
-</projectDescription>
diff --git a/features/org.eclipse.jst.ws.cxf_sdk.feature/build.properties b/features/org.eclipse.jst.ws.cxf_sdk.feature/build.properties
deleted file mode 100644
index 59f8b76..0000000
--- a/features/org.eclipse.jst.ws.cxf_sdk.feature/build.properties
+++ /dev/null
@@ -1,8 +0,0 @@
-bin.includes = eclipse_update_120.jpg,\
- epl-v10.html,\
- feature.properties,\
- feature.xml,\
- license.html
-
-generate.feature@org.eclipse.jst.ws.cxf.feature.source=org.eclipse.jst.ws.cxf.feature
-
\ No newline at end of file
diff --git a/features/org.eclipse.jst.ws.cxf_sdk.feature/eclipse_update_120.jpg b/features/org.eclipse.jst.ws.cxf_sdk.feature/eclipse_update_120.jpg
deleted file mode 100644
index bfdf708..0000000
--- a/features/org.eclipse.jst.ws.cxf_sdk.feature/eclipse_update_120.jpg
+++ /dev/null
Binary files differ
diff --git a/features/org.eclipse.jst.ws.cxf_sdk.feature/epl-v10.html b/features/org.eclipse.jst.ws.cxf_sdk.feature/epl-v10.html
deleted file mode 100644
index ed4b196..0000000
--- a/features/org.eclipse.jst.ws.cxf_sdk.feature/epl-v10.html
+++ /dev/null
@@ -1,328 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office"
-xmlns:w="urn:schemas-microsoft-com:office:word"
-xmlns="http://www.w3.org/TR/REC-html40">
-
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=windows-1252">
-<meta name=ProgId content=Word.Document>
-<meta name=Generator content="Microsoft Word 9">
-<meta name=Originator content="Microsoft Word 9">
-<link rel=File-List
-href="./Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">
-<title>Eclipse Public License - Version 1.0</title>
-<!--[if gte mso 9]><xml>
- <o:DocumentProperties>
- <o:Revision>2</o:Revision>
- <o:TotalTime>3</o:TotalTime>
- <o:Created>2004-03-05T23:03:00Z</o:Created>
- <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
- <o:Pages>4</o:Pages>
- <o:Words>1626</o:Words>
- <o:Characters>9270</o:Characters>
- <o:Lines>77</o:Lines>
- <o:Paragraphs>18</o:Paragraphs>
- <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
- <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
- <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-<style>
-<!--
- /* Font Definitions */
-@font-face
- {font-family:Tahoma;
- panose-1:2 11 6 4 3 5 4 4 2 4;
- mso-font-charset:0;
- mso-generic-font-family:swiss;
- mso-font-pitch:variable;
- mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
- {mso-style-parent:"";
- margin:0in;
- margin-bottom:.0001pt;
- mso-pagination:widow-orphan;
- font-size:12.0pt;
- font-family:"Times New Roman";
- mso-fareast-font-family:"Times New Roman";}
-p
- {margin-right:0in;
- mso-margin-top-alt:auto;
- mso-margin-bottom-alt:auto;
- margin-left:0in;
- mso-pagination:widow-orphan;
- font-size:12.0pt;
- font-family:"Times New Roman";
- mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
- {mso-style-name:"Balloon Text";
- margin:0in;
- margin-bottom:.0001pt;
- mso-pagination:widow-orphan;
- font-size:8.0pt;
- font-family:Tahoma;
- mso-fareast-font-family:"Times New Roman";}
-@page Section1
- {size:8.5in 11.0in;
- margin:1.0in 1.25in 1.0in 1.25in;
- mso-header-margin:.5in;
- mso-footer-margin:.5in;
- mso-paper-source:0;}
-div.Section1
- {page:Section1;}
--->
-</style>
-</head>
-
-<body lang=EN-US style='tab-interval:.5in'>
-
-<div class=Section1>
-
-<p align=center style='text-align:center'><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style='font-size:10.0pt'>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>1. DEFINITIONS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>"Contribution" means:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear=left>
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-changes to the Program, and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-additions to the Program;</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>where
-such changes and/or additions to the Program originate from and are distributed
-by that particular Contributor. A Contribution 'originates' from a Contributor
-if it was added to the Program by such Contributor itself or anyone acting on
-such Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in conjunction
-with the Program under their own license agreement, and (ii) are not derivative
-works of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>"Contributor" means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style='font-size:10.0pt'>"Licensed Patents " mean patent
-claims licensable by a Contributor which are necessarily infringed by the use
-or sale of its Contribution alone or when combined with the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>"Program" means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style='font-size:10.0pt'>"Recipient" means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>2. GRANT OF RIGHTS</span></b> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span
-style='color:red'> </span>reproduce, prepare derivative works of, publicly
-display, publicly perform, distribute and sublicense the Contribution of such
-Contributor, if any, and such derivative works, in source code and object code
-form.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style='color:green'> </span>royalty-free
-patent license under Licensed Patents to make, use, sell, offer to sell, import
-and otherwise transfer the Contribution of such Contributor, if any, in source
-code and object code form. This patent license shall apply to the combination
-of the Contribution and the Program if, at the time the Contribution is added
-by the Contributor, such addition of the Contribution causes such combination
-to be covered by the Licensed Patents. The patent license shall not apply to
-any other combinations which include the Contribution. No hardware per se is
-licensed hereunder. </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>c)
-Recipient understands that although each Contributor grants the licenses to its
-Contributions set forth herein, no assurances are provided by any Contributor
-that the Program does not infringe the patent or other intellectual property
-rights of any other entity. Each Contributor disclaims any liability to Recipient
-for claims brought by any other entity based on infringement of intellectual
-property rights or otherwise. As a condition to exercising the rights and
-licenses granted hereunder, each Recipient hereby assumes sole responsibility
-to secure any other intellectual property rights needed, if any. For example,
-if a third party patent license is required to allow Recipient to distribute
-the Program, it is Recipient's responsibility to acquire that license before
-distributing the Program.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>d)
-Each Contributor represents that to its knowledge it has sufficient copyright
-rights in its Contribution, if any, to grant the copyright license set forth in
-this Agreement. </span></p>
-
-<p><b><span style='font-size:10.0pt'>3. REQUIREMENTS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-its license agreement:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-effectively disclaims on behalf of all Contributors all warranties and
-conditions, express and implied, including warranties or conditions of title
-and non-infringement, and implied warranties or conditions of merchantability
-and fitness for a particular purpose; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iv)
-states that source code for the Program is available from such Contributor, and
-informs licensees how to obtain it in a reasonable manner on or through a
-medium customarily used for software exchange.<span style='color:blue'> </span></span></p>
-
-<p><span style='font-size:10.0pt'>When the Program is made available in source
-code form:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it must be made available under this Agreement; and </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Each Contributor must identify itself as the
-originator of its Contribution, if any, in a manner that reasonably allows
-subsequent Recipients to identify the originator of the Contribution. </span></p>
-
-<p><b><span style='font-size:10.0pt'>4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style='font-size:10.0pt'>Commercial distributors of software may
-accept certain responsibilities with respect to end users, business partners
-and the like. While this license is intended to facilitate the commercial use
-of the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create potential
-liability for other Contributors. Therefore, if a Contributor includes the
-Program in a commercial product offering, such Contributor ("Commercial
-Contributor") hereby agrees to defend and indemnify every other
-Contributor ("Indemnified Contributor") against any losses, damages and
-costs (collectively "Losses") arising from claims, lawsuits and other
-legal actions brought by a third party against the Indemnified Contributor to
-the extent caused by the acts or omissions of such Commercial Contributor in
-connection with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In order
-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor
-to control, and cooperate with the Commercial Contributor in, the defense and
-any related settlement negotiations. The Indemnified Contributor may participate
-in any such claim at its own expense.</span> </p>
-
-<p><span style='font-size:10.0pt'>For example, a Contributor might include the
-Program in a commercial product offering, Product X. That Contributor is then a
-Commercial Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance claims and
-warranties are such Commercial Contributor's responsibility alone. Under this
-section, the Commercial Contributor would have to defend claims against the
-other Contributors related to those performance claims and warranties, and if a
-court requires any other Contributor to pay any damages as a result, the
-Commercial Contributor must pay those damages.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>5. NO WARRANTY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and distributing the
-Program and assumes all risks associated with its exercise of rights under this
-Agreement , including but not limited to the risks and costs of program errors,
-compliance with applicable laws, damage to or loss of data, programs or
-equipment, and unavailability or interruption of operations. </span></p>
-
-<p><b><span style='font-size:10.0pt'>6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>7. GENERAL</span></b> </p>
-
-<p><span style='font-size:10.0pt'>If any provision of this Agreement is invalid
-or unenforceable under applicable law, it shall not affect the validity or
-enforceability of the remainder of the terms of this Agreement, and without
-further action by the parties hereto, such provision shall be reformed to the
-minimum extent necessary to make such provision valid and enforceable.</span> </p>
-
-<p><span style='font-size:10.0pt'>If Recipient institutes patent litigation
-against any entity (including a cross-claim or counterclaim in a lawsuit)
-alleging that the Program itself (excluding combinations of the Program with
-other software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the date
-such litigation is filed. </span></p>
-
-<p><span style='font-size:10.0pt'>All Recipient's rights under this Agreement
-shall terminate if it fails to comply with any of the material terms or
-conditions of this Agreement and does not cure such failure in a reasonable
-period of time after becoming aware of such noncompliance. If all Recipient's
-rights under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive. </span></p>
-
-<p><span style='font-size:10.0pt'>Everyone is permitted to copy and distribute
-copies of this Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The Agreement
-Steward reserves the right to publish new versions (including revisions) of
-this Agreement from time to time. No one other than the Agreement Steward has
-the right to modify this Agreement. The Eclipse Foundation is the initial
-Agreement Steward. The Eclipse Foundation may assign the responsibility to
-serve as the Agreement Steward to a suitable separate entity. Each new version
-of the Agreement will be given a distinguishing version number. The Program
-(including Contributions) may always be distributed subject to the version of
-the Agreement under which it was received. In addition, after a new version of
-the Agreement is published, Contributor may elect to distribute the Program
-(including its Contributions) under the new version. Except as expressly stated
-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
-the intellectual property of any Contributor under this Agreement, whether
-expressly, by implication, estoppel or otherwise. All rights in the Program not
-expressly granted under this Agreement are reserved.</span> </p>
-
-<p><span style='font-size:10.0pt'>This Agreement is governed by the laws of the
-State of New York and the intellectual property laws of the United States of
-America. No party to this Agreement will bring a legal action under this
-Agreement more than one year after the cause of action arose. Each party waives
-its rights to a jury trial in any resulting litigation.</span> </p>
-
-<p class=MsoNormal><![if !supportEmptyParas]> <![endif]><o:p></o:p></p>
-
-</div>
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/features/org.eclipse.jst.ws.cxf_sdk.feature/feature.properties b/features/org.eclipse.jst.ws.cxf_sdk.feature/feature.properties
deleted file mode 100644
index b06b79b..0000000
--- a/features/org.eclipse.jst.ws.cxf_sdk.feature/feature.properties
+++ /dev/null
@@ -1,144 +0,0 @@
-###############################################################################
-# Copyright (c) 2008 IONA Technologies PLC
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IONA Technologies PLC - initial API and implementation
-###############################################################################
-# feature.properties
-# contains externalized strings for feature.xml
-# "%foo" in feature.xml corresponds to the key "foo" in this file
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# This file should be translated.
-
-# "featureName" property - name of the feature
-featureName=CXF Web Services SDK (Incubation)
-
-# "featureProvider" property - name of the company that provides the feature
-featureProvider=Eclipse Web Tools Platform
-
-# "description" property - description of the feature
-description=CXF Web Services Source
-
-# "updateSiteName" property - label for the update site
-updateSiteName=The Eclipse Web Tools Platform (WTP) Project update site
-
-# "copyright" property - text of the "Feature Update Copyright"
-copyright=\
- Copyright (c) 2008 IONA Technologies PLC\n\
- All rights reserved. This program and the accompanying materials\n\
- are made available under the terms of the Eclipse Public License v1.0\n\
- which accompanies this distribution, and is available at\n\
- http://www.eclipse.org/legal/epl-v10.html\n\
-\n\
-Contributors:\n\
- IONA Technologies PLC - initial API and implementation\n
-################ end of copyright property ####################################
-
-# "licenseURL" property - URL of the "Feature License"
-# do not translate value - just change to point to a locale-specific HTML page
-licenseURL=epl-v10.html
-
-# "license" property - text of the "Feature Update License"
-# should be plain text version of license agreement pointed to be "licenseURL"
-license=\
-ECLIPSE FOUNDATION SOFTWARE USER AGREEMENT\n\
-March 17, 2005\n\
-\n\
-Usage Of Content\n\
-\n\
-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
-OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
-USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
-AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU\n\
-AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
-AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
-OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
-OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
-BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
-\n\
-Applicable Licenses\n\
-\n\
-Unless otherwise indicated, all Content made available by the Eclipse Foundation\n\
-is provided to you under the terms and conditions of the Eclipse Public\n\
-License Version 1.0 ("EPL"). A copy of the EPL is provided with this\n\
-Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
-For purposes of the EPL, "Program" will mean the Content.\n\
-\n\
-Content includes, but is not limited to, source code, object code,\n\
-documentation and other files maintained in the Eclipse.org CVS\n\
-repository ("Repository") in CVS modules ("Modules") and made available\n\
-as downloadable archives ("Downloads").\n\
-\n\
- - Content may be structured and packaged into modules to facilitate delivering,\n\
- extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
- plug-in fragments ("Fragments"), and features ("Features").\n\
- - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java? ARchive)\n\
- in a directory named "plugins".\n\
- - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
- Each Feature may be packaged as a sub-directory in a directory named "features".\n\
- Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
- numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
- - Features may also include other Features ("Included Features"). Within a Feature, files\n\
- named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
-\n\
-Features may also include other Features ("Included Features"). Files named\n\
-"feature.xml" may contain a list of the names and version numbers of\n\
-Included Features.\n\
-\n\
-The terms and conditions governing Plug-ins and Fragments should be\n\
-contained in files named "about.html" ("Abouts"). The terms and\n\
-conditions governing Features and Included Features should be contained\n\
-in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
-Licenses may be located in any directory of a Download or Module\n\
-including, but not limited to the following locations:\n\
-\n\
- - The top-level (root) directory\n\
- - Plug-in and Fragment directories\n\
- - Inside Plug-ins and Fragments packaged as JARs\n\
- - Sub-directories of the directory named "src" of certain Plug-ins\n\
- - Feature directories\n\
-\n\
-Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
-Eclipse Update Manager, you must agree to a license ("Feature Update\n\
-License") during the installation process. If the Feature contains\n\
-Included Features, the Feature Update License should either provide you\n\
-with the terms and conditions governing the Included Features or inform\n\
-you where you can locate them. Feature Update Licenses may be found in\n\
-the "license" property of files named "feature.properties". Such Abouts,\n\
-Feature Licenses and Feature Update Licenses contain the terms and\n\
-conditions (or references to such terms and conditions) that govern your\n\
-use of the associated Content in that directory.\n\
-\n\
-THE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER\n\
-TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
-SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
-\n\
- - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
- - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
- - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
- - IBM Public License 1.0 (available at http://oss.software.ibm.com/developerworks/opensource/license10.html)\n\
- - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
- - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
-\n\
-IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
-TO USE OF THE CONTENT. If no About, Feature License or Feature Update License\n\
-is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
-govern that particular Content.\n\
-\n\
-Cryptography\n\
-\n\
-Content may contain encryption software. The country in which you are\n\
-currently may have restrictions on the import, possession, and use,\n\
-and/or re-export to another country, of encryption software. BEFORE\n\
-using any encryption software, please check the country's laws,\n\
-regulations and policies concerning the import, possession, or use,\n\
-and re-export of encryption software, to see if this is permitted.\n\
-\n\
-Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.\n
-########### end of license property ##########################################
diff --git a/features/org.eclipse.jst.ws.cxf_sdk.feature/feature.xml b/features/org.eclipse.jst.ws.cxf_sdk.feature/feature.xml
deleted file mode 100644
index 9466068..0000000
--- a/features/org.eclipse.jst.ws.cxf_sdk.feature/feature.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
- id="org.eclipse.jst.ws.cxf_sdk.feature"
- label="%featureName"
- version="0.4.2.qualifier"
- provider-name="%featureProvider"
- image="eclipse_update_120.jpg">
-
- <description>
- %description
- </description>
-
- <copyright>
- %copyright
- </copyright>
-
- <license url="%licenseURL">
- %license
- </license>
-
- <url>
- <update label="%updateSiteName" url="http://download.eclipse.org/webtools/updates"/>
- </url>
-
- <includes
- id="org.eclipse.jst.ws.cxf.feature"
- version="0.0.0"/>
-
- <includes
- id="org.eclipse.jst.ws.cxf.feature.source"
- version="0.0.0"/>
-
-</feature>
diff --git a/features/org.eclipse.jst.ws.cxf_sdk.feature/license.html b/features/org.eclipse.jst.ws.cxf_sdk.feature/license.html
deleted file mode 100644
index c6af966..0000000
--- a/features/org.eclipse.jst.ws.cxf_sdk.feature/license.html
+++ /dev/null
@@ -1,79 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=iso-8859-1">
-<title>Eclipse.org Software User Agreement</title>
-</head>
-
-<body lang="EN-US" link=blue vlink=purple>
-<h2>Eclipse Foundation Software User Agreement</h2>
-<p>March 17, 2005</p>
-
-<h3>Usage Of Content</h3>
-
-<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
- (COLLECTIVELY "CONTENT"). USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
- CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU AGREE THAT YOUR USE
- OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
- NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
- CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
-
-<h3>Applicable Licenses</h3>
-
-<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0
- ("EPL"). A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
- For purposes of the EPL, "Program" will mean the Content.</p>
-
-<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse.org CVS repository ("Repository") in CVS
- modules ("Modules") and made available as downloadable archives ("Downloads").</p>
-
-<ul>
- <li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"), plug-in fragments ("Fragments"), and features ("Features").</li>
- <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java™ ARchive) in a directory named "plugins".</li>
- <li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material. Each Feature may be packaged as a sub-directory in a directory named "features". Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of the Plug-ins
- and/or Fragments associated with that Feature.</li>
- <li>Features may also include other Features ("Included Features"). Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of Included Features.</li>
-</ul>
-
-<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named "about.html" ("Abouts"). The terms and conditions governing Features and
-Included Features should be contained in files named "license.html" ("Feature Licenses"). Abouts and Feature Licenses may be located in any directory of a Download or Module
-including, but not limited to the following locations:</p>
-
-<ul>
- <li>The top-level (root) directory</li>
- <li>Plug-in and Fragment directories</li>
- <li>Inside Plug-ins and Fragments packaged as JARs</li>
- <li>Sub-directories of the directory named "src" of certain Plug-ins</li>
- <li>Feature directories</li>
-</ul>
-
-<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Eclipse Update Manager, you must agree to a license ("Feature Update License") during the
-installation process. If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
-inform you where you can locate them. Feature Update Licenses may be found in the "license" property of files named "feature.properties" found within a Feature.
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
-that directory.</p>
-
-<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS. SOME OF THESE
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
-
-<ul>
- <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
- <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
- <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
- <li>IBM Public License 1.0 (available at <a href="http://oss.software.ibm.com/developerworks/opensource/license10.html">http://oss.software.ibm.com/developerworks/opensource/license10.html</a>)</li>
- <li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>
- <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
-</ul>
-
-<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License is provided, please
-contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
-
-<h3>Cryptography</h3>
-
-<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
- another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
- possession, or use, and re-export of encryption software, to see if this is permitted.</p>
-
-<small>Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.</small>
-</body>
-</html>
diff --git a/features/org.eclipse.jst.ws.cxf_tests.feature/.project b/features/org.eclipse.jst.ws.cxf_tests.feature/.project
deleted file mode 100644
index 84fd72a..0000000
--- a/features/org.eclipse.jst.ws.cxf_tests.feature/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.jst.ws.cxf_tests.feature</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.pde.FeatureBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.FeatureNature</nature>
- </natures>
-</projectDescription>
diff --git a/features/org.eclipse.jst.ws.cxf_tests.feature/build.properties b/features/org.eclipse.jst.ws.cxf_tests.feature/build.properties
deleted file mode 100644
index 60e19e5..0000000
--- a/features/org.eclipse.jst.ws.cxf_tests.feature/build.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-bin.includes = eclipse_update_120.jpg,\
- epl-v10.html,\
- feature.properties,\
- feature.xml,\
- license.html
diff --git a/features/org.eclipse.jst.ws.cxf_tests.feature/eclipse_update_120.jpg b/features/org.eclipse.jst.ws.cxf_tests.feature/eclipse_update_120.jpg
deleted file mode 100644
index bfdf708..0000000
--- a/features/org.eclipse.jst.ws.cxf_tests.feature/eclipse_update_120.jpg
+++ /dev/null
Binary files differ
diff --git a/features/org.eclipse.jst.ws.cxf_tests.feature/epl-v10.html b/features/org.eclipse.jst.ws.cxf_tests.feature/epl-v10.html
deleted file mode 100644
index ed4b196..0000000
--- a/features/org.eclipse.jst.ws.cxf_tests.feature/epl-v10.html
+++ /dev/null
@@ -1,328 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office"
-xmlns:w="urn:schemas-microsoft-com:office:word"
-xmlns="http://www.w3.org/TR/REC-html40">
-
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=windows-1252">
-<meta name=ProgId content=Word.Document>
-<meta name=Generator content="Microsoft Word 9">
-<meta name=Originator content="Microsoft Word 9">
-<link rel=File-List
-href="./Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">
-<title>Eclipse Public License - Version 1.0</title>
-<!--[if gte mso 9]><xml>
- <o:DocumentProperties>
- <o:Revision>2</o:Revision>
- <o:TotalTime>3</o:TotalTime>
- <o:Created>2004-03-05T23:03:00Z</o:Created>
- <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
- <o:Pages>4</o:Pages>
- <o:Words>1626</o:Words>
- <o:Characters>9270</o:Characters>
- <o:Lines>77</o:Lines>
- <o:Paragraphs>18</o:Paragraphs>
- <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
- <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
- <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-<style>
-<!--
- /* Font Definitions */
-@font-face
- {font-family:Tahoma;
- panose-1:2 11 6 4 3 5 4 4 2 4;
- mso-font-charset:0;
- mso-generic-font-family:swiss;
- mso-font-pitch:variable;
- mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
- {mso-style-parent:"";
- margin:0in;
- margin-bottom:.0001pt;
- mso-pagination:widow-orphan;
- font-size:12.0pt;
- font-family:"Times New Roman";
- mso-fareast-font-family:"Times New Roman";}
-p
- {margin-right:0in;
- mso-margin-top-alt:auto;
- mso-margin-bottom-alt:auto;
- margin-left:0in;
- mso-pagination:widow-orphan;
- font-size:12.0pt;
- font-family:"Times New Roman";
- mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
- {mso-style-name:"Balloon Text";
- margin:0in;
- margin-bottom:.0001pt;
- mso-pagination:widow-orphan;
- font-size:8.0pt;
- font-family:Tahoma;
- mso-fareast-font-family:"Times New Roman";}
-@page Section1
- {size:8.5in 11.0in;
- margin:1.0in 1.25in 1.0in 1.25in;
- mso-header-margin:.5in;
- mso-footer-margin:.5in;
- mso-paper-source:0;}
-div.Section1
- {page:Section1;}
--->
-</style>
-</head>
-
-<body lang=EN-US style='tab-interval:.5in'>
-
-<div class=Section1>
-
-<p align=center style='text-align:center'><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style='font-size:10.0pt'>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>1. DEFINITIONS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>"Contribution" means:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear=left>
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-changes to the Program, and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-additions to the Program;</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>where
-such changes and/or additions to the Program originate from and are distributed
-by that particular Contributor. A Contribution 'originates' from a Contributor
-if it was added to the Program by such Contributor itself or anyone acting on
-such Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in conjunction
-with the Program under their own license agreement, and (ii) are not derivative
-works of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>"Contributor" means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style='font-size:10.0pt'>"Licensed Patents " mean patent
-claims licensable by a Contributor which are necessarily infringed by the use
-or sale of its Contribution alone or when combined with the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>"Program" means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style='font-size:10.0pt'>"Recipient" means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>2. GRANT OF RIGHTS</span></b> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span
-style='color:red'> </span>reproduce, prepare derivative works of, publicly
-display, publicly perform, distribute and sublicense the Contribution of such
-Contributor, if any, and such derivative works, in source code and object code
-form.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style='color:green'> </span>royalty-free
-patent license under Licensed Patents to make, use, sell, offer to sell, import
-and otherwise transfer the Contribution of such Contributor, if any, in source
-code and object code form. This patent license shall apply to the combination
-of the Contribution and the Program if, at the time the Contribution is added
-by the Contributor, such addition of the Contribution causes such combination
-to be covered by the Licensed Patents. The patent license shall not apply to
-any other combinations which include the Contribution. No hardware per se is
-licensed hereunder. </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>c)
-Recipient understands that although each Contributor grants the licenses to its
-Contributions set forth herein, no assurances are provided by any Contributor
-that the Program does not infringe the patent or other intellectual property
-rights of any other entity. Each Contributor disclaims any liability to Recipient
-for claims brought by any other entity based on infringement of intellectual
-property rights or otherwise. As a condition to exercising the rights and
-licenses granted hereunder, each Recipient hereby assumes sole responsibility
-to secure any other intellectual property rights needed, if any. For example,
-if a third party patent license is required to allow Recipient to distribute
-the Program, it is Recipient's responsibility to acquire that license before
-distributing the Program.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>d)
-Each Contributor represents that to its knowledge it has sufficient copyright
-rights in its Contribution, if any, to grant the copyright license set forth in
-this Agreement. </span></p>
-
-<p><b><span style='font-size:10.0pt'>3. REQUIREMENTS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-its license agreement:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-effectively disclaims on behalf of all Contributors all warranties and
-conditions, express and implied, including warranties or conditions of title
-and non-infringement, and implied warranties or conditions of merchantability
-and fitness for a particular purpose; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iv)
-states that source code for the Program is available from such Contributor, and
-informs licensees how to obtain it in a reasonable manner on or through a
-medium customarily used for software exchange.<span style='color:blue'> </span></span></p>
-
-<p><span style='font-size:10.0pt'>When the Program is made available in source
-code form:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it must be made available under this Agreement; and </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Each Contributor must identify itself as the
-originator of its Contribution, if any, in a manner that reasonably allows
-subsequent Recipients to identify the originator of the Contribution. </span></p>
-
-<p><b><span style='font-size:10.0pt'>4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style='font-size:10.0pt'>Commercial distributors of software may
-accept certain responsibilities with respect to end users, business partners
-and the like. While this license is intended to facilitate the commercial use
-of the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create potential
-liability for other Contributors. Therefore, if a Contributor includes the
-Program in a commercial product offering, such Contributor ("Commercial
-Contributor") hereby agrees to defend and indemnify every other
-Contributor ("Indemnified Contributor") against any losses, damages and
-costs (collectively "Losses") arising from claims, lawsuits and other
-legal actions brought by a third party against the Indemnified Contributor to
-the extent caused by the acts or omissions of such Commercial Contributor in
-connection with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In order
-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor
-to control, and cooperate with the Commercial Contributor in, the defense and
-any related settlement negotiations. The Indemnified Contributor may participate
-in any such claim at its own expense.</span> </p>
-
-<p><span style='font-size:10.0pt'>For example, a Contributor might include the
-Program in a commercial product offering, Product X. That Contributor is then a
-Commercial Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance claims and
-warranties are such Commercial Contributor's responsibility alone. Under this
-section, the Commercial Contributor would have to defend claims against the
-other Contributors related to those performance claims and warranties, and if a
-court requires any other Contributor to pay any damages as a result, the
-Commercial Contributor must pay those damages.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>5. NO WARRANTY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and distributing the
-Program and assumes all risks associated with its exercise of rights under this
-Agreement , including but not limited to the risks and costs of program errors,
-compliance with applicable laws, damage to or loss of data, programs or
-equipment, and unavailability or interruption of operations. </span></p>
-
-<p><b><span style='font-size:10.0pt'>6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>7. GENERAL</span></b> </p>
-
-<p><span style='font-size:10.0pt'>If any provision of this Agreement is invalid
-or unenforceable under applicable law, it shall not affect the validity or
-enforceability of the remainder of the terms of this Agreement, and without
-further action by the parties hereto, such provision shall be reformed to the
-minimum extent necessary to make such provision valid and enforceable.</span> </p>
-
-<p><span style='font-size:10.0pt'>If Recipient institutes patent litigation
-against any entity (including a cross-claim or counterclaim in a lawsuit)
-alleging that the Program itself (excluding combinations of the Program with
-other software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the date
-such litigation is filed. </span></p>
-
-<p><span style='font-size:10.0pt'>All Recipient's rights under this Agreement
-shall terminate if it fails to comply with any of the material terms or
-conditions of this Agreement and does not cure such failure in a reasonable
-period of time after becoming aware of such noncompliance. If all Recipient's
-rights under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive. </span></p>
-
-<p><span style='font-size:10.0pt'>Everyone is permitted to copy and distribute
-copies of this Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The Agreement
-Steward reserves the right to publish new versions (including revisions) of
-this Agreement from time to time. No one other than the Agreement Steward has
-the right to modify this Agreement. The Eclipse Foundation is the initial
-Agreement Steward. The Eclipse Foundation may assign the responsibility to
-serve as the Agreement Steward to a suitable separate entity. Each new version
-of the Agreement will be given a distinguishing version number. The Program
-(including Contributions) may always be distributed subject to the version of
-the Agreement under which it was received. In addition, after a new version of
-the Agreement is published, Contributor may elect to distribute the Program
-(including its Contributions) under the new version. Except as expressly stated
-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
-the intellectual property of any Contributor under this Agreement, whether
-expressly, by implication, estoppel or otherwise. All rights in the Program not
-expressly granted under this Agreement are reserved.</span> </p>
-
-<p><span style='font-size:10.0pt'>This Agreement is governed by the laws of the
-State of New York and the intellectual property laws of the United States of
-America. No party to this Agreement will bring a legal action under this
-Agreement more than one year after the cause of action arose. Each party waives
-its rights to a jury trial in any resulting litigation.</span> </p>
-
-<p class=MsoNormal><![if !supportEmptyParas]> <![endif]><o:p></o:p></p>
-
-</div>
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/features/org.eclipse.jst.ws.cxf_tests.feature/feature.properties b/features/org.eclipse.jst.ws.cxf_tests.feature/feature.properties
deleted file mode 100644
index f0bf7b1..0000000
--- a/features/org.eclipse.jst.ws.cxf_tests.feature/feature.properties
+++ /dev/null
@@ -1,144 +0,0 @@
-###############################################################################
-# Copyright (c) 2008 IONA Technologies PLC
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IONA Technologies PLC - initial API and implementation
-###############################################################################
-# feature.properties
-# contains externalized strings for feature.xml
-# "%foo" in feature.xml corresponds to the key "foo" in this file
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# This file should be translated.
-
-# "featureName" property - name of the feature
-featureName=CXF Web Services Tests (Incubation)
-
-# "featureProvider" property - name of the company that provides the feature
-featureProvider=Eclipse Web Tools Platform
-
-# "description" property - description of the feature
-description=CXF Web Services Tests
-
-# "updateSiteName" property - label for the update site
-updateSiteName=The Eclipse Web Tools Platform (WTP) Project update site
-
-# "copyright" property - text of the "Feature Update Copyright"
-copyright=\
- Copyright (c) 2008 IONA Technologies PLC\n\
- All rights reserved. This program and the accompanying materials\n\
- are made available under the terms of the Eclipse Public License v1.0\n\
- which accompanies this distribution, and is available at\n\
- http://www.eclipse.org/legal/epl-v10.html\n\
-\n\
-Contributors:\n\
- IONA Technologies PLC - initial API and implementation\n
-################ end of copyright property ####################################
-
-# "licenseURL" property - URL of the "Feature License"
-# do not translate value - just change to point to a locale-specific HTML page
-licenseURL=epl-v10.html
-
-# "license" property - text of the "Feature Update License"
-# should be plain text version of license agreement pointed to be "licenseURL"
-license=\
-ECLIPSE FOUNDATION SOFTWARE USER AGREEMENT\n\
-March 17, 2005\n\
-\n\
-Usage Of Content\n\
-\n\
-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
-OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
-USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
-AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU\n\
-AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
-AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
-OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
-OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
-BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
-\n\
-Applicable Licenses\n\
-\n\
-Unless otherwise indicated, all Content made available by the Eclipse Foundation\n\
-is provided to you under the terms and conditions of the Eclipse Public\n\
-License Version 1.0 ("EPL"). A copy of the EPL is provided with this\n\
-Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
-For purposes of the EPL, "Program" will mean the Content.\n\
-\n\
-Content includes, but is not limited to, source code, object code,\n\
-documentation and other files maintained in the Eclipse.org CVS\n\
-repository ("Repository") in CVS modules ("Modules") and made available\n\
-as downloadable archives ("Downloads").\n\
-\n\
- - Content may be structured and packaged into modules to facilitate delivering,\n\
- extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
- plug-in fragments ("Fragments"), and features ("Features").\n\
- - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java? ARchive)\n\
- in a directory named "plugins".\n\
- - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
- Each Feature may be packaged as a sub-directory in a directory named "features".\n\
- Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
- numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
- - Features may also include other Features ("Included Features"). Within a Feature, files\n\
- named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
-\n\
-Features may also include other Features ("Included Features"). Files named\n\
-"feature.xml" may contain a list of the names and version numbers of\n\
-Included Features.\n\
-\n\
-The terms and conditions governing Plug-ins and Fragments should be\n\
-contained in files named "about.html" ("Abouts"). The terms and\n\
-conditions governing Features and Included Features should be contained\n\
-in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
-Licenses may be located in any directory of a Download or Module\n\
-including, but not limited to the following locations:\n\
-\n\
- - The top-level (root) directory\n\
- - Plug-in and Fragment directories\n\
- - Inside Plug-ins and Fragments packaged as JARs\n\
- - Sub-directories of the directory named "src" of certain Plug-ins\n\
- - Feature directories\n\
-\n\
-Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
-Eclipse Update Manager, you must agree to a license ("Feature Update\n\
-License") during the installation process. If the Feature contains\n\
-Included Features, the Feature Update License should either provide you\n\
-with the terms and conditions governing the Included Features or inform\n\
-you where you can locate them. Feature Update Licenses may be found in\n\
-the "license" property of files named "feature.properties". Such Abouts,\n\
-Feature Licenses and Feature Update Licenses contain the terms and\n\
-conditions (or references to such terms and conditions) that govern your\n\
-use of the associated Content in that directory.\n\
-\n\
-THE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER\n\
-TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
-SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
-\n\
- - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
- - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
- - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
- - IBM Public License 1.0 (available at http://oss.software.ibm.com/developerworks/opensource/license10.html)\n\
- - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
- - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
-\n\
-IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
-TO USE OF THE CONTENT. If no About, Feature License or Feature Update License\n\
-is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
-govern that particular Content.\n\
-\n\
-Cryptography\n\
-\n\
-Content may contain encryption software. The country in which you are\n\
-currently may have restrictions on the import, possession, and use,\n\
-and/or re-export to another country, of encryption software. BEFORE\n\
-using any encryption software, please check the country's laws,\n\
-regulations and policies concerning the import, possession, or use,\n\
-and re-export of encryption software, to see if this is permitted.\n\
-\n\
-Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.\n
-########### end of license property ##########################################
diff --git a/features/org.eclipse.jst.ws.cxf_tests.feature/feature.xml b/features/org.eclipse.jst.ws.cxf_tests.feature/feature.xml
deleted file mode 100644
index b774d61..0000000
--- a/features/org.eclipse.jst.ws.cxf_tests.feature/feature.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
- id="org.eclipse.jst.ws.cxf_tests.feature"
- label="%featureName"
- version="0.4.2.qualifier"
- provider-name="%featureProvider"
- image="eclipse_update_120.jpg">
-
- <description>
- %description
- </description>
-
- <copyright>
- %copyright
- </copyright>
-
- <license url="%licenseURL">
- %license
- </license>
-
- <url>
- <update label="%updateSiteName" url="http://download.eclipse.org/webtools/updates"/>
- </url>
-
- <plugin
- id="org.eclipse.jst.ws.cxf.tests"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
-</feature>
diff --git a/features/org.eclipse.jst.ws.cxf_tests.feature/license.html b/features/org.eclipse.jst.ws.cxf_tests.feature/license.html
deleted file mode 100644
index c6af966..0000000
--- a/features/org.eclipse.jst.ws.cxf_tests.feature/license.html
+++ /dev/null
@@ -1,79 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=iso-8859-1">
-<title>Eclipse.org Software User Agreement</title>
-</head>
-
-<body lang="EN-US" link=blue vlink=purple>
-<h2>Eclipse Foundation Software User Agreement</h2>
-<p>March 17, 2005</p>
-
-<h3>Usage Of Content</h3>
-
-<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
- (COLLECTIVELY "CONTENT"). USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
- CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU AGREE THAT YOUR USE
- OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
- NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
- CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
-
-<h3>Applicable Licenses</h3>
-
-<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0
- ("EPL"). A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
- For purposes of the EPL, "Program" will mean the Content.</p>
-
-<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse.org CVS repository ("Repository") in CVS
- modules ("Modules") and made available as downloadable archives ("Downloads").</p>
-
-<ul>
- <li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"), plug-in fragments ("Fragments"), and features ("Features").</li>
- <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java™ ARchive) in a directory named "plugins".</li>
- <li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material. Each Feature may be packaged as a sub-directory in a directory named "features". Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of the Plug-ins
- and/or Fragments associated with that Feature.</li>
- <li>Features may also include other Features ("Included Features"). Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of Included Features.</li>
-</ul>
-
-<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named "about.html" ("Abouts"). The terms and conditions governing Features and
-Included Features should be contained in files named "license.html" ("Feature Licenses"). Abouts and Feature Licenses may be located in any directory of a Download or Module
-including, but not limited to the following locations:</p>
-
-<ul>
- <li>The top-level (root) directory</li>
- <li>Plug-in and Fragment directories</li>
- <li>Inside Plug-ins and Fragments packaged as JARs</li>
- <li>Sub-directories of the directory named "src" of certain Plug-ins</li>
- <li>Feature directories</li>
-</ul>
-
-<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Eclipse Update Manager, you must agree to a license ("Feature Update License") during the
-installation process. If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
-inform you where you can locate them. Feature Update Licenses may be found in the "license" property of files named "feature.properties" found within a Feature.
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
-that directory.</p>
-
-<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS. SOME OF THESE
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
-
-<ul>
- <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
- <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
- <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
- <li>IBM Public License 1.0 (available at <a href="http://oss.software.ibm.com/developerworks/opensource/license10.html">http://oss.software.ibm.com/developerworks/opensource/license10.html</a>)</li>
- <li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>
- <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
-</ul>
-
-<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License is provided, please
-contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
-
-<h3>Cryptography</h3>
-
-<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
- another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
- possession, or use, and re-export of encryption software, to see if this is permitted.</p>
-
-<small>Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.</small>
-</body>
-</html>
diff --git a/features/org.eclipse.jst.ws.jaxws.assembly.feature/.project b/features/org.eclipse.jst.ws.jaxws.assembly.feature/.project
deleted file mode 100644
index 6ad9c30..0000000
--- a/features/org.eclipse.jst.ws.jaxws.assembly.feature/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.jst.ws.jaxws.assembly.feature</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.pde.FeatureBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.FeatureNature</nature>
- </natures>
-</projectDescription>
diff --git a/features/org.eclipse.jst.ws.jaxws.assembly.feature/build.properties b/features/org.eclipse.jst.ws.jaxws.assembly.feature/build.properties
deleted file mode 100644
index 8b13789..0000000
--- a/features/org.eclipse.jst.ws.jaxws.assembly.feature/build.properties
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/features/org.eclipse.jst.ws.jaxws.assembly.feature/feature.xml b/features/org.eclipse.jst.ws.jaxws.assembly.feature/feature.xml
deleted file mode 100644
index 9962276..0000000
--- a/features/org.eclipse.jst.ws.jaxws.assembly.feature/feature.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
- id="org.eclipse.jst.ws.jaxws.assembly.feature"
- label="Assembly Feature"
- version="1.0.0.qualifier"
- provider-name="Webtools Platform Project">
-
- <description>
- This feature is for building only, to assemble the releated features, without forceing them to encoding dependencies on each other.
-This feature should never appear in build distributions or update sites.
- </description>
-
- <copyright>
- %copyright
- </copyright>
-
- <license url="%licenseURL">
- %license
- </license>
-
-
- <includes
- id="org.eclipse.jst.ws.jaxws.feature"
- version="0.0.0"/>
-
- <includes
- id="org.eclipse.jst.ws.cxf.feature"
- version="0.0.0"/>
-
- <includes
- id="org.eclipse.jst.ws.jaxws.dom.feature"
- version="0.0.0"/>
-
-</feature>
diff --git a/features/org.eclipse.jst.ws.jaxws.assembly_sdk.feature/.project b/features/org.eclipse.jst.ws.jaxws.assembly_sdk.feature/.project
deleted file mode 100644
index 13a8962..0000000
--- a/features/org.eclipse.jst.ws.jaxws.assembly_sdk.feature/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.jst.ws.jaxws.assembly_sdk.feature</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.pde.FeatureBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.FeatureNature</nature>
- </natures>
-</projectDescription>
diff --git a/features/org.eclipse.jst.ws.jaxws.assembly_sdk.feature/build.properties b/features/org.eclipse.jst.ws.jaxws.assembly_sdk.feature/build.properties
deleted file mode 100644
index 8b13789..0000000
--- a/features/org.eclipse.jst.ws.jaxws.assembly_sdk.feature/build.properties
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/features/org.eclipse.jst.ws.jaxws.assembly_sdk.feature/feature.xml b/features/org.eclipse.jst.ws.jaxws.assembly_sdk.feature/feature.xml
deleted file mode 100644
index bea8a1f..0000000
--- a/features/org.eclipse.jst.ws.jaxws.assembly_sdk.feature/feature.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
- id="org.eclipse.jst.ws.jaxws.assembly_sdk.feature"
- label="Assembly Feature"
- version="1.0.0.qualifier"
- provider-name="Webtools Platform Project">
-
- <description>
- This feature is for building only, to assemble the releated features, without forceing them to encoding dependencies on each other.
-This feature should never appear in build distributions or update sites.
- </description>
-
- <copyright>
- %copyright
- </copyright>
-
- <license url="%licenseURL">
- %license
- </license>
-
- <includes
- id="org.eclipse.jst.ws.jaxws_sdk.feature"
- version="0.0.0"/>
-
- <includes
- id="org.eclipse.jst.ws.cxf_sdk.feature"
- version="0.0.0"/>
-
- <includes
- id="org.eclipse.jst.ws.jaxws.dom_sdk.feature"
- version="0.0.0"/>
-
-</feature>
diff --git a/features/org.eclipse.jst.ws.jaxws.assembly_tests.feature/.project b/features/org.eclipse.jst.ws.jaxws.assembly_tests.feature/.project
deleted file mode 100644
index 2f03db3..0000000
--- a/features/org.eclipse.jst.ws.jaxws.assembly_tests.feature/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.jst.ws.jaxws.assembly_tests.feature</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.pde.FeatureBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.FeatureNature</nature>
- </natures>
-</projectDescription>
diff --git a/features/org.eclipse.jst.ws.jaxws.assembly_tests.feature/build.properties b/features/org.eclipse.jst.ws.jaxws.assembly_tests.feature/build.properties
deleted file mode 100644
index 8b13789..0000000
--- a/features/org.eclipse.jst.ws.jaxws.assembly_tests.feature/build.properties
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/features/org.eclipse.jst.ws.jaxws.assembly_tests.feature/feature.xml b/features/org.eclipse.jst.ws.jaxws.assembly_tests.feature/feature.xml
deleted file mode 100644
index 7317c54..0000000
--- a/features/org.eclipse.jst.ws.jaxws.assembly_tests.feature/feature.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
- id="org.eclipse.jst.ws.jaxws.assembly_tests.feature"
- label="Assembly Feature"
- version="1.0.0.qualifier"
- provider-name="Webtools Platform Project">
-
- <description>
- This feature is for building only, to assemble the releated features, without forceing them to encoding dependencies on each other.
-This feature should never appear in build distributions or update sites.
- </description>
-
- <copyright>
- %copyright
- </copyright>
-
- <license url="%licenseURL">
- %license
- </license>
-
- <includes
- id="org.eclipse.jst.ws.jaxws_tests.feature"
- version="0.0.0"/>
-
- <includes
- id="org.eclipse.jst.ws.cxf_tests.feature"
- version="0.0.0"/>
-
- <includes
- id="org.eclipse.jst.ws.jaxws.dom_tests.feature"
- version="0.0.0"/>
-
-</feature>
diff --git a/features/org.eclipse.jst.ws.jaxws.dom.feature/.project b/features/org.eclipse.jst.ws.jaxws.dom.feature/.project
deleted file mode 100755
index 30fa25c..0000000
--- a/features/org.eclipse.jst.ws.jaxws.dom.feature/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.jst.ws.jaxws.dom.feature</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.pde.FeatureBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.FeatureNature</nature>
- </natures>
-</projectDescription>
diff --git a/features/org.eclipse.jst.ws.jaxws.dom.feature/build.properties b/features/org.eclipse.jst.ws.jaxws.dom.feature/build.properties
deleted file mode 100755
index 399ea4b..0000000
--- a/features/org.eclipse.jst.ws.jaxws.dom.feature/build.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-bin.includes = feature.xml,\
- eclipse_update_120.jpg,\
- epl-v10.html,\
- feature.properties,\
- license.html
diff --git a/features/org.eclipse.jst.ws.jaxws.dom.feature/eclipse_update_120.jpg b/features/org.eclipse.jst.ws.jaxws.dom.feature/eclipse_update_120.jpg
deleted file mode 100644
index bfdf708..0000000
--- a/features/org.eclipse.jst.ws.jaxws.dom.feature/eclipse_update_120.jpg
+++ /dev/null
Binary files differ
diff --git a/features/org.eclipse.jst.ws.jaxws.dom.feature/epl-v10.html b/features/org.eclipse.jst.ws.jaxws.dom.feature/epl-v10.html
deleted file mode 100644
index ed4b196..0000000
--- a/features/org.eclipse.jst.ws.jaxws.dom.feature/epl-v10.html
+++ /dev/null
@@ -1,328 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office"
-xmlns:w="urn:schemas-microsoft-com:office:word"
-xmlns="http://www.w3.org/TR/REC-html40">
-
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=windows-1252">
-<meta name=ProgId content=Word.Document>
-<meta name=Generator content="Microsoft Word 9">
-<meta name=Originator content="Microsoft Word 9">
-<link rel=File-List
-href="./Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">
-<title>Eclipse Public License - Version 1.0</title>
-<!--[if gte mso 9]><xml>
- <o:DocumentProperties>
- <o:Revision>2</o:Revision>
- <o:TotalTime>3</o:TotalTime>
- <o:Created>2004-03-05T23:03:00Z</o:Created>
- <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
- <o:Pages>4</o:Pages>
- <o:Words>1626</o:Words>
- <o:Characters>9270</o:Characters>
- <o:Lines>77</o:Lines>
- <o:Paragraphs>18</o:Paragraphs>
- <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
- <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
- <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-<style>
-<!--
- /* Font Definitions */
-@font-face
- {font-family:Tahoma;
- panose-1:2 11 6 4 3 5 4 4 2 4;
- mso-font-charset:0;
- mso-generic-font-family:swiss;
- mso-font-pitch:variable;
- mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
- {mso-style-parent:"";
- margin:0in;
- margin-bottom:.0001pt;
- mso-pagination:widow-orphan;
- font-size:12.0pt;
- font-family:"Times New Roman";
- mso-fareast-font-family:"Times New Roman";}
-p
- {margin-right:0in;
- mso-margin-top-alt:auto;
- mso-margin-bottom-alt:auto;
- margin-left:0in;
- mso-pagination:widow-orphan;
- font-size:12.0pt;
- font-family:"Times New Roman";
- mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
- {mso-style-name:"Balloon Text";
- margin:0in;
- margin-bottom:.0001pt;
- mso-pagination:widow-orphan;
- font-size:8.0pt;
- font-family:Tahoma;
- mso-fareast-font-family:"Times New Roman";}
-@page Section1
- {size:8.5in 11.0in;
- margin:1.0in 1.25in 1.0in 1.25in;
- mso-header-margin:.5in;
- mso-footer-margin:.5in;
- mso-paper-source:0;}
-div.Section1
- {page:Section1;}
--->
-</style>
-</head>
-
-<body lang=EN-US style='tab-interval:.5in'>
-
-<div class=Section1>
-
-<p align=center style='text-align:center'><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style='font-size:10.0pt'>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>1. DEFINITIONS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>"Contribution" means:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear=left>
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-changes to the Program, and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-additions to the Program;</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>where
-such changes and/or additions to the Program originate from and are distributed
-by that particular Contributor. A Contribution 'originates' from a Contributor
-if it was added to the Program by such Contributor itself or anyone acting on
-such Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in conjunction
-with the Program under their own license agreement, and (ii) are not derivative
-works of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>"Contributor" means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style='font-size:10.0pt'>"Licensed Patents " mean patent
-claims licensable by a Contributor which are necessarily infringed by the use
-or sale of its Contribution alone or when combined with the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>"Program" means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style='font-size:10.0pt'>"Recipient" means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>2. GRANT OF RIGHTS</span></b> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span
-style='color:red'> </span>reproduce, prepare derivative works of, publicly
-display, publicly perform, distribute and sublicense the Contribution of such
-Contributor, if any, and such derivative works, in source code and object code
-form.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style='color:green'> </span>royalty-free
-patent license under Licensed Patents to make, use, sell, offer to sell, import
-and otherwise transfer the Contribution of such Contributor, if any, in source
-code and object code form. This patent license shall apply to the combination
-of the Contribution and the Program if, at the time the Contribution is added
-by the Contributor, such addition of the Contribution causes such combination
-to be covered by the Licensed Patents. The patent license shall not apply to
-any other combinations which include the Contribution. No hardware per se is
-licensed hereunder. </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>c)
-Recipient understands that although each Contributor grants the licenses to its
-Contributions set forth herein, no assurances are provided by any Contributor
-that the Program does not infringe the patent or other intellectual property
-rights of any other entity. Each Contributor disclaims any liability to Recipient
-for claims brought by any other entity based on infringement of intellectual
-property rights or otherwise. As a condition to exercising the rights and
-licenses granted hereunder, each Recipient hereby assumes sole responsibility
-to secure any other intellectual property rights needed, if any. For example,
-if a third party patent license is required to allow Recipient to distribute
-the Program, it is Recipient's responsibility to acquire that license before
-distributing the Program.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>d)
-Each Contributor represents that to its knowledge it has sufficient copyright
-rights in its Contribution, if any, to grant the copyright license set forth in
-this Agreement. </span></p>
-
-<p><b><span style='font-size:10.0pt'>3. REQUIREMENTS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-its license agreement:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-effectively disclaims on behalf of all Contributors all warranties and
-conditions, express and implied, including warranties or conditions of title
-and non-infringement, and implied warranties or conditions of merchantability
-and fitness for a particular purpose; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iv)
-states that source code for the Program is available from such Contributor, and
-informs licensees how to obtain it in a reasonable manner on or through a
-medium customarily used for software exchange.<span style='color:blue'> </span></span></p>
-
-<p><span style='font-size:10.0pt'>When the Program is made available in source
-code form:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it must be made available under this Agreement; and </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Each Contributor must identify itself as the
-originator of its Contribution, if any, in a manner that reasonably allows
-subsequent Recipients to identify the originator of the Contribution. </span></p>
-
-<p><b><span style='font-size:10.0pt'>4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style='font-size:10.0pt'>Commercial distributors of software may
-accept certain responsibilities with respect to end users, business partners
-and the like. While this license is intended to facilitate the commercial use
-of the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create potential
-liability for other Contributors. Therefore, if a Contributor includes the
-Program in a commercial product offering, such Contributor ("Commercial
-Contributor") hereby agrees to defend and indemnify every other
-Contributor ("Indemnified Contributor") against any losses, damages and
-costs (collectively "Losses") arising from claims, lawsuits and other
-legal actions brought by a third party against the Indemnified Contributor to
-the extent caused by the acts or omissions of such Commercial Contributor in
-connection with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In order
-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor
-to control, and cooperate with the Commercial Contributor in, the defense and
-any related settlement negotiations. The Indemnified Contributor may participate
-in any such claim at its own expense.</span> </p>
-
-<p><span style='font-size:10.0pt'>For example, a Contributor might include the
-Program in a commercial product offering, Product X. That Contributor is then a
-Commercial Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance claims and
-warranties are such Commercial Contributor's responsibility alone. Under this
-section, the Commercial Contributor would have to defend claims against the
-other Contributors related to those performance claims and warranties, and if a
-court requires any other Contributor to pay any damages as a result, the
-Commercial Contributor must pay those damages.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>5. NO WARRANTY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and distributing the
-Program and assumes all risks associated with its exercise of rights under this
-Agreement , including but not limited to the risks and costs of program errors,
-compliance with applicable laws, damage to or loss of data, programs or
-equipment, and unavailability or interruption of operations. </span></p>
-
-<p><b><span style='font-size:10.0pt'>6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>7. GENERAL</span></b> </p>
-
-<p><span style='font-size:10.0pt'>If any provision of this Agreement is invalid
-or unenforceable under applicable law, it shall not affect the validity or
-enforceability of the remainder of the terms of this Agreement, and without
-further action by the parties hereto, such provision shall be reformed to the
-minimum extent necessary to make such provision valid and enforceable.</span> </p>
-
-<p><span style='font-size:10.0pt'>If Recipient institutes patent litigation
-against any entity (including a cross-claim or counterclaim in a lawsuit)
-alleging that the Program itself (excluding combinations of the Program with
-other software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the date
-such litigation is filed. </span></p>
-
-<p><span style='font-size:10.0pt'>All Recipient's rights under this Agreement
-shall terminate if it fails to comply with any of the material terms or
-conditions of this Agreement and does not cure such failure in a reasonable
-period of time after becoming aware of such noncompliance. If all Recipient's
-rights under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive. </span></p>
-
-<p><span style='font-size:10.0pt'>Everyone is permitted to copy and distribute
-copies of this Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The Agreement
-Steward reserves the right to publish new versions (including revisions) of
-this Agreement from time to time. No one other than the Agreement Steward has
-the right to modify this Agreement. The Eclipse Foundation is the initial
-Agreement Steward. The Eclipse Foundation may assign the responsibility to
-serve as the Agreement Steward to a suitable separate entity. Each new version
-of the Agreement will be given a distinguishing version number. The Program
-(including Contributions) may always be distributed subject to the version of
-the Agreement under which it was received. In addition, after a new version of
-the Agreement is published, Contributor may elect to distribute the Program
-(including its Contributions) under the new version. Except as expressly stated
-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
-the intellectual property of any Contributor under this Agreement, whether
-expressly, by implication, estoppel or otherwise. All rights in the Program not
-expressly granted under this Agreement are reserved.</span> </p>
-
-<p><span style='font-size:10.0pt'>This Agreement is governed by the laws of the
-State of New York and the intellectual property laws of the United States of
-America. No party to this Agreement will bring a legal action under this
-Agreement more than one year after the cause of action arose. Each party waives
-its rights to a jury trial in any resulting litigation.</span> </p>
-
-<p class=MsoNormal><![if !supportEmptyParas]> <![endif]><o:p></o:p></p>
-
-</div>
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/features/org.eclipse.jst.ws.jaxws.dom.feature/feature.properties b/features/org.eclipse.jst.ws.jaxws.dom.feature/feature.properties
deleted file mode 100644
index b42b308..0000000
--- a/features/org.eclipse.jst.ws.jaxws.dom.feature/feature.properties
+++ /dev/null
@@ -1,144 +0,0 @@
-###############################################################################
-# Copyright (c) 2009 by SAP AG, Walldorf.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# SAP AG - initial API and implementation
-###############################################################################
-# feature.properties
-# contains externalized strings for feature.xml
-# "%foo" in feature.xml corresponds to the key "foo" in this file
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# This file should be translated.
-
-# "featureName" property - name of the feature
-featureName=JAX-WS DOM Tools (Incubation)
-
-# "featureProvider" property - name of the company that provides the feature
-featureProvider=Eclipse Web Tools Platform
-
-# "description" property - description of the feature
-description=JAX-WS DOM Tools
-
-# "updateSiteName" property - label for the update site
-updateSiteName=Web Tools (WTP) Update Site
-
-# "copyright" property - text of the "Feature Update Copyright"
-copyright=\
- Copyright (c) 2009 SAP AG, Walldorf.\n\
- All rights reserved. This program and the accompanying materials\n\
- are made available under the terms of the Eclipse Public License v1.0\n\
- which accompanies this distribution, and is available at\n\
- http://www.eclipse.org/legal/epl-v10.html\n\
-\n\
-Contributors:\n\
- SAP AG - initial API and implementation\n
-################ end of copyright property ####################################
-
-# "licenseURL" property - URL of the "Feature License"
-# do not translate value - just change to point to a locale-specific HTML page
-licenseURL=epl-v10.html
-
-# "license" property - text of the "Feature Update License"
-# should be plain text version of license agreement pointed to be "licenseURL"
-license=\
-ECLIPSE FOUNDATION SOFTWARE USER AGREEMENT\n\
-March 17, 2005\n\
-\n\
-Usage Of Content\n\
-\n\
-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
-OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
-USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
-AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU\n\
-AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
-AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
-OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
-OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
-BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
-\n\
-Applicable Licenses\n\
-\n\
-Unless otherwise indicated, all Content made available by the Eclipse Foundation\n\
-is provided to you under the terms and conditions of the Eclipse Public\n\
-License Version 1.0 ("EPL"). A copy of the EPL is provided with this\n\
-Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
-For purposes of the EPL, "Program" will mean the Content.\n\
-\n\
-Content includes, but is not limited to, source code, object code,\n\
-documentation and other files maintained in the Eclipse.org CVS\n\
-repository ("Repository") in CVS modules ("Modules") and made available\n\
-as downloadable archives ("Downloads").\n\
-\n\
- - Content may be structured and packaged into modules to facilitate delivering,\n\
- extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
- plug-in fragments ("Fragments"), and features ("Features").\n\
- - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java? ARchive)\n\
- in a directory named "plugins".\n\
- - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
- Each Feature may be packaged as a sub-directory in a directory named "features".\n\
- Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
- numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
- - Features may also include other Features ("Included Features"). Within a Feature, files\n\
- named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
-\n\
-Features may also include other Features ("Included Features"). Files named\n\
-"feature.xml" may contain a list of the names and version numbers of\n\
-Included Features.\n\
-\n\
-The terms and conditions governing Plug-ins and Fragments should be\n\
-contained in files named "about.html" ("Abouts"). The terms and\n\
-conditions governing Features and Included Features should be contained\n\
-in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
-Licenses may be located in any directory of a Download or Module\n\
-including, but not limited to the following locations:\n\
-\n\
- - The top-level (root) directory\n\
- - Plug-in and Fragment directories\n\
- - Inside Plug-ins and Fragments packaged as JARs\n\
- - Sub-directories of the directory named "src" of certain Plug-ins\n\
- - Feature directories\n\
-\n\
-Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
-Eclipse Update Manager, you must agree to a license ("Feature Update\n\
-License") during the installation process. If the Feature contains\n\
-Included Features, the Feature Update License should either provide you\n\
-with the terms and conditions governing the Included Features or inform\n\
-you where you can locate them. Feature Update Licenses may be found in\n\
-the "license" property of files named "feature.properties". Such Abouts,\n\
-Feature Licenses and Feature Update Licenses contain the terms and\n\
-conditions (or references to such terms and conditions) that govern your\n\
-use of the associated Content in that directory.\n\
-\n\
-THE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER\n\
-TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
-SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
-\n\
- - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
- - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
- - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
- - IBM Public License 1.0 (available at http://oss.software.ibm.com/developerworks/opensource/license10.html)\n\
- - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
- - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
-\n\
-IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
-TO USE OF THE CONTENT. If no About, Feature License or Feature Update License\n\
-is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
-govern that particular Content.\n\
-\n\
-Cryptography\n\
-\n\
-Content may contain encryption software. The country in which you are\n\
-currently may have restrictions on the import, possession, and use,\n\
-and/or re-export to another country, of encryption software. BEFORE\n\
-using any encryption software, please check the country's laws,\n\
-regulations and policies concerning the import, possession, or use,\n\
-and re-export of encryption software, to see if this is permitted.\n\
-\n\
-Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.\n
-########### end of license property ##########################################
diff --git a/features/org.eclipse.jst.ws.jaxws.dom.feature/feature.xml b/features/org.eclipse.jst.ws.jaxws.dom.feature/feature.xml
deleted file mode 100755
index df75204..0000000
--- a/features/org.eclipse.jst.ws.jaxws.dom.feature/feature.xml
+++ /dev/null
@@ -1,90 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
- id="org.eclipse.jst.ws.jaxws.dom.feature"
- label="%featureName"
- version="1.0.0.qualifier"
- provider-name="%featureProvider"
- image="eclipse_update_120.jpg">
-
- <description>
- %description
- </description>
-
- <copyright>
- %copyright
- </copyright>
-
- <license url="%licenseURL">
- %license
- </license>
-
- <url>
- <update label="%updateSiteName" url="http://download.eclipse.org/webtools/updates"/>
- </url>
-
- <requires>
- <import plugin="org.eclipse.ui"/>
- <import plugin="org.eclipse.core.runtime"/>
- <import plugin="org.eclipse.core.resources"/>
- <import plugin="org.eclipse.emf.edit.ui"/>
- <import plugin="org.eclipse.jdt.core"/>
- <import plugin="org.eclipse.jst.ws.consumption.ui"/>
- <import plugin="org.eclipse.jst.ws.creation.ui"/>
- <import plugin="org.eclipse.wst.command.env"/>
- <import plugin="org.eclipse.wst.command.env.core"/>
- <import plugin="org.eclipse.wst.command.env.ui"/>
- <import plugin="org.eclipse.ui.ide"/>
- <import plugin="org.eclipse.ui.navigator"/>
- <import plugin="org.eclipse.wst.validation"/>
- <import plugin="org.eclipse.jdt.ui"/>
- <import plugin="org.eclipse.jst.j2ee.core" version="1.1.200" match="greaterOrEqual"/>
- <import plugin="org.eclipse.jst.jee.ui" version="1.0.100" match="greaterOrEqual"/>
- <import plugin="org.eclipse.jst.ws" version="1.0.304" match="greaterOrEqual"/>
- <import plugin="org.eclipse.wst.ws" version="1.1.1" match="greaterOrEqual"/>
- <import plugin="org.eclipse.jem.util" version="2.0.100" match="greaterOrEqual"/>
- <import plugin="org.eclipse.emf" version="2.5.0" match="greaterOrEqual"/>
- <import plugin="org.eclipse.emf.common" version="2.5.0" match="greaterOrEqual"/>
- <import plugin="org.eclipse.emf.ecore" version="2.5.0" match="greaterOrEqual"/>
- <import plugin="org.eclipse.jdt.core" version="3.5.0" match="greaterOrEqual"/>
- <import plugin="org.eclipse.core.resources" version="3.5.0" match="greaterOrEqual"/>
- <import plugin="org.eclipse.ui" version="3.5.0" match="greaterOrEqual"/>
- <import plugin="org.eclipse.emf.validation" version="1.3.0" match="greaterOrEqual"/>
- <import plugin="org.eclipse.jface.text" version="3.5.0" match="greaterOrEqual"/>
- <import plugin="org.eclipse.emf.edit"/>
- <import plugin="org.eclipse.jface" version="3.5.0" match="greaterOrEqual"/>
- <import plugin="org.eclipse.core.runtime" version="3.5.0" match="greaterOrEqual"/>
- <import plugin="org.eclipse.text" version="3.5.0" match="greaterOrEqual"/>
- <import plugin="org.eclipse.ui.ide" version="3.5.0" match="greaterOrEqual"/>
- <import plugin="org.eclipse.wst.common.project.facet.core" version="1.4.0" match="greaterOrEqual"/>
- <import plugin="org.apache.axis" version="1.4.0" match="greaterOrEqual"/>
- </requires>
-
- <plugin
- id="org.eclipse.jst.ws.jaxws.dom.integration"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.jst.ws.jaxws.dom.runtime"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.jst.ws.jaxws.dom.ui"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.jst.ws.jaxws.utils"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
-</feature>
diff --git a/features/org.eclipse.jst.ws.jaxws.dom.feature/license.html b/features/org.eclipse.jst.ws.jaxws.dom.feature/license.html
deleted file mode 100644
index c6af966..0000000
--- a/features/org.eclipse.jst.ws.jaxws.dom.feature/license.html
+++ /dev/null
@@ -1,79 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=iso-8859-1">
-<title>Eclipse.org Software User Agreement</title>
-</head>
-
-<body lang="EN-US" link=blue vlink=purple>
-<h2>Eclipse Foundation Software User Agreement</h2>
-<p>March 17, 2005</p>
-
-<h3>Usage Of Content</h3>
-
-<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
- (COLLECTIVELY "CONTENT"). USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
- CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU AGREE THAT YOUR USE
- OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
- NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
- CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
-
-<h3>Applicable Licenses</h3>
-
-<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0
- ("EPL"). A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
- For purposes of the EPL, "Program" will mean the Content.</p>
-
-<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse.org CVS repository ("Repository") in CVS
- modules ("Modules") and made available as downloadable archives ("Downloads").</p>
-
-<ul>
- <li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"), plug-in fragments ("Fragments"), and features ("Features").</li>
- <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java™ ARchive) in a directory named "plugins".</li>
- <li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material. Each Feature may be packaged as a sub-directory in a directory named "features". Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of the Plug-ins
- and/or Fragments associated with that Feature.</li>
- <li>Features may also include other Features ("Included Features"). Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of Included Features.</li>
-</ul>
-
-<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named "about.html" ("Abouts"). The terms and conditions governing Features and
-Included Features should be contained in files named "license.html" ("Feature Licenses"). Abouts and Feature Licenses may be located in any directory of a Download or Module
-including, but not limited to the following locations:</p>
-
-<ul>
- <li>The top-level (root) directory</li>
- <li>Plug-in and Fragment directories</li>
- <li>Inside Plug-ins and Fragments packaged as JARs</li>
- <li>Sub-directories of the directory named "src" of certain Plug-ins</li>
- <li>Feature directories</li>
-</ul>
-
-<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Eclipse Update Manager, you must agree to a license ("Feature Update License") during the
-installation process. If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
-inform you where you can locate them. Feature Update Licenses may be found in the "license" property of files named "feature.properties" found within a Feature.
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
-that directory.</p>
-
-<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS. SOME OF THESE
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
-
-<ul>
- <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
- <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
- <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
- <li>IBM Public License 1.0 (available at <a href="http://oss.software.ibm.com/developerworks/opensource/license10.html">http://oss.software.ibm.com/developerworks/opensource/license10.html</a>)</li>
- <li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>
- <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
-</ul>
-
-<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License is provided, please
-contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
-
-<h3>Cryptography</h3>
-
-<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
- another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
- possession, or use, and re-export of encryption software, to see if this is permitted.</p>
-
-<small>Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.</small>
-</body>
-</html>
diff --git a/features/org.eclipse.jst.ws.jaxws.dom.feature/sourceTemplateBundle/about.html b/features/org.eclipse.jst.ws.jaxws.dom.feature/sourceTemplateBundle/about.html
deleted file mode 100644
index 8410afb..0000000
--- a/features/org.eclipse.jst.ws.jaxws.dom.feature/sourceTemplateBundle/about.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
-<title>About</title>
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
-
-<p>August 15, 2009</p>
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, "Program" will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is
-being redistributed by another party ("Redistributor") and different terms and conditions may
-apply to your use of any object code in the Content. Check the Redistributor's license that was
-provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
-
-</body>
-</html>
diff --git a/features/org.eclipse.jst.ws.jaxws.dom.feature/sourceTemplateBundle/about.ini b/features/org.eclipse.jst.ws.jaxws.dom.feature/sourceTemplateBundle/about.ini
deleted file mode 100644
index 61fefeb..0000000
--- a/features/org.eclipse.jst.ws.jaxws.dom.feature/sourceTemplateBundle/about.ini
+++ /dev/null
@@ -1,12 +0,0 @@
-# about.ini
-# contains information about a feature
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# "%key" are externalized strings defined in about.properties
-# This file does not need to be translated.
-
-# Property "aboutText" contains blurb for feature details in the "About"
-# dialog (translated). Maximum 15 lines and 75 characters per line.
-aboutText=%blurb
-
-# Property "featureImage" contains path to feature image (32x32)
-featureImage=wtp_prod32.png
diff --git a/features/org.eclipse.jst.ws.jaxws.dom.feature/sourceTemplateBundle/about.mappings b/features/org.eclipse.jst.ws.jaxws.dom.feature/sourceTemplateBundle/about.mappings
deleted file mode 100644
index a28390a..0000000
--- a/features/org.eclipse.jst.ws.jaxws.dom.feature/sourceTemplateBundle/about.mappings
+++ /dev/null
@@ -1,6 +0,0 @@
-# about.mappings
-# contains fill-ins for about.properties
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# This file does not need to be translated.
-
-0=@build@
diff --git a/features/org.eclipse.jst.ws.jaxws.dom.feature/sourceTemplateBundle/about.properties b/features/org.eclipse.jst.ws.jaxws.dom.feature/sourceTemplateBundle/about.properties
deleted file mode 100644
index 932deac..0000000
--- a/features/org.eclipse.jst.ws.jaxws.dom.feature/sourceTemplateBundle/about.properties
+++ /dev/null
@@ -1,26 +0,0 @@
-###############################################################################
-# Copyright (c) 2009 by SAP AG, Walldorf.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# SAP AG - initial API and implementation
-###############################################################################
-# about.properties
-# contains externalized strings for about.ini
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# fill-ins are supplied by about.mappings
-# This file should be translated.
-#
-# Do not translate any values surrounded by {}
-
-blurb=JAX-WS DOM Tools Source (Incubation)\n\
-\n\
-Version: {featureVersion}\n\
-Build id: {0}\n\
-\n\
-(c) Copyright SAP AG, Walldorf. 2009. All rights reserved.\n\
-Visit http://www.eclipse.org/webtools/incubator/\n\
-\n
diff --git a/features/org.eclipse.jst.ws.jaxws.dom.feature/sourceTemplateBundle/build.properties b/features/org.eclipse.jst.ws.jaxws.dom.feature/sourceTemplateBundle/build.properties
deleted file mode 100644
index ead512d..0000000
--- a/features/org.eclipse.jst.ws.jaxws.dom.feature/sourceTemplateBundle/build.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-bin.includes = about.html, about.ini, about.mappings, about.properties, wtp_prod32.png, plugin.properties, plugin.xml, src/**, META-INF/
-sourcePlugin = true
diff --git a/features/org.eclipse.jst.ws.jaxws.dom.feature/sourceTemplateBundle/plugin.properties b/features/org.eclipse.jst.ws.jaxws.dom.feature/sourceTemplateBundle/plugin.properties
deleted file mode 100755
index 92c1472..0000000
--- a/features/org.eclipse.jst.ws.jaxws.dom.feature/sourceTemplateBundle/plugin.properties
+++ /dev/null
@@ -1,17 +0,0 @@
-###############################################################################
-# Copyright (c) 2009 by SAP AG, Walldorf.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# SAP AG - initial API and implementation
-###############################################################################
-###############################################################################
-# Language File for this Plugin
-###############################################################################
-
-# Generic Label and Description
-Bundle-Name.0=JAX-WS DOM Tools Source (Incubation)
-Bundle-Vendor.0=Eclipse Web Tools Platform
diff --git a/features/org.eclipse.jst.ws.jaxws.dom.feature/sourceTemplateBundle/wtp_prod32.gif b/features/org.eclipse.jst.ws.jaxws.dom.feature/sourceTemplateBundle/wtp_prod32.gif
deleted file mode 100644
index eefb44a..0000000
--- a/features/org.eclipse.jst.ws.jaxws.dom.feature/sourceTemplateBundle/wtp_prod32.gif
+++ /dev/null
Binary files differ
diff --git a/features/org.eclipse.jst.ws.jaxws.dom.feature/sourceTemplateBundle/wtp_prod32.png b/features/org.eclipse.jst.ws.jaxws.dom.feature/sourceTemplateBundle/wtp_prod32.png
deleted file mode 100644
index bfceab3..0000000
--- a/features/org.eclipse.jst.ws.jaxws.dom.feature/sourceTemplateBundle/wtp_prod32.png
+++ /dev/null
Binary files differ
diff --git a/features/org.eclipse.jst.ws.jaxws.dom.feature/sourceTemplateFeature/build.properties b/features/org.eclipse.jst.ws.jaxws.dom.feature/sourceTemplateFeature/build.properties
deleted file mode 100755
index 399ea4b..0000000
--- a/features/org.eclipse.jst.ws.jaxws.dom.feature/sourceTemplateFeature/build.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-bin.includes = feature.xml,\
- eclipse_update_120.jpg,\
- epl-v10.html,\
- feature.properties,\
- license.html
diff --git a/features/org.eclipse.jst.ws.jaxws.dom.feature/sourceTemplateFeature/eclipse_update_120.jpg b/features/org.eclipse.jst.ws.jaxws.dom.feature/sourceTemplateFeature/eclipse_update_120.jpg
deleted file mode 100644
index bfdf708..0000000
--- a/features/org.eclipse.jst.ws.jaxws.dom.feature/sourceTemplateFeature/eclipse_update_120.jpg
+++ /dev/null
Binary files differ
diff --git a/features/org.eclipse.jst.ws.jaxws.dom.feature/sourceTemplateFeature/epl-v10.html b/features/org.eclipse.jst.ws.jaxws.dom.feature/sourceTemplateFeature/epl-v10.html
deleted file mode 100644
index ed4b196..0000000
--- a/features/org.eclipse.jst.ws.jaxws.dom.feature/sourceTemplateFeature/epl-v10.html
+++ /dev/null
@@ -1,328 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office"
-xmlns:w="urn:schemas-microsoft-com:office:word"
-xmlns="http://www.w3.org/TR/REC-html40">
-
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=windows-1252">
-<meta name=ProgId content=Word.Document>
-<meta name=Generator content="Microsoft Word 9">
-<meta name=Originator content="Microsoft Word 9">
-<link rel=File-List
-href="./Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">
-<title>Eclipse Public License - Version 1.0</title>
-<!--[if gte mso 9]><xml>
- <o:DocumentProperties>
- <o:Revision>2</o:Revision>
- <o:TotalTime>3</o:TotalTime>
- <o:Created>2004-03-05T23:03:00Z</o:Created>
- <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
- <o:Pages>4</o:Pages>
- <o:Words>1626</o:Words>
- <o:Characters>9270</o:Characters>
- <o:Lines>77</o:Lines>
- <o:Paragraphs>18</o:Paragraphs>
- <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
- <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
- <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-<style>
-<!--
- /* Font Definitions */
-@font-face
- {font-family:Tahoma;
- panose-1:2 11 6 4 3 5 4 4 2 4;
- mso-font-charset:0;
- mso-generic-font-family:swiss;
- mso-font-pitch:variable;
- mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
- {mso-style-parent:"";
- margin:0in;
- margin-bottom:.0001pt;
- mso-pagination:widow-orphan;
- font-size:12.0pt;
- font-family:"Times New Roman";
- mso-fareast-font-family:"Times New Roman";}
-p
- {margin-right:0in;
- mso-margin-top-alt:auto;
- mso-margin-bottom-alt:auto;
- margin-left:0in;
- mso-pagination:widow-orphan;
- font-size:12.0pt;
- font-family:"Times New Roman";
- mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
- {mso-style-name:"Balloon Text";
- margin:0in;
- margin-bottom:.0001pt;
- mso-pagination:widow-orphan;
- font-size:8.0pt;
- font-family:Tahoma;
- mso-fareast-font-family:"Times New Roman";}
-@page Section1
- {size:8.5in 11.0in;
- margin:1.0in 1.25in 1.0in 1.25in;
- mso-header-margin:.5in;
- mso-footer-margin:.5in;
- mso-paper-source:0;}
-div.Section1
- {page:Section1;}
--->
-</style>
-</head>
-
-<body lang=EN-US style='tab-interval:.5in'>
-
-<div class=Section1>
-
-<p align=center style='text-align:center'><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style='font-size:10.0pt'>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>1. DEFINITIONS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>"Contribution" means:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear=left>
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-changes to the Program, and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-additions to the Program;</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>where
-such changes and/or additions to the Program originate from and are distributed
-by that particular Contributor. A Contribution 'originates' from a Contributor
-if it was added to the Program by such Contributor itself or anyone acting on
-such Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in conjunction
-with the Program under their own license agreement, and (ii) are not derivative
-works of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>"Contributor" means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style='font-size:10.0pt'>"Licensed Patents " mean patent
-claims licensable by a Contributor which are necessarily infringed by the use
-or sale of its Contribution alone or when combined with the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>"Program" means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style='font-size:10.0pt'>"Recipient" means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>2. GRANT OF RIGHTS</span></b> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span
-style='color:red'> </span>reproduce, prepare derivative works of, publicly
-display, publicly perform, distribute and sublicense the Contribution of such
-Contributor, if any, and such derivative works, in source code and object code
-form.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style='color:green'> </span>royalty-free
-patent license under Licensed Patents to make, use, sell, offer to sell, import
-and otherwise transfer the Contribution of such Contributor, if any, in source
-code and object code form. This patent license shall apply to the combination
-of the Contribution and the Program if, at the time the Contribution is added
-by the Contributor, such addition of the Contribution causes such combination
-to be covered by the Licensed Patents. The patent license shall not apply to
-any other combinations which include the Contribution. No hardware per se is
-licensed hereunder. </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>c)
-Recipient understands that although each Contributor grants the licenses to its
-Contributions set forth herein, no assurances are provided by any Contributor
-that the Program does not infringe the patent or other intellectual property
-rights of any other entity. Each Contributor disclaims any liability to Recipient
-for claims brought by any other entity based on infringement of intellectual
-property rights or otherwise. As a condition to exercising the rights and
-licenses granted hereunder, each Recipient hereby assumes sole responsibility
-to secure any other intellectual property rights needed, if any. For example,
-if a third party patent license is required to allow Recipient to distribute
-the Program, it is Recipient's responsibility to acquire that license before
-distributing the Program.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>d)
-Each Contributor represents that to its knowledge it has sufficient copyright
-rights in its Contribution, if any, to grant the copyright license set forth in
-this Agreement. </span></p>
-
-<p><b><span style='font-size:10.0pt'>3. REQUIREMENTS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-its license agreement:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-effectively disclaims on behalf of all Contributors all warranties and
-conditions, express and implied, including warranties or conditions of title
-and non-infringement, and implied warranties or conditions of merchantability
-and fitness for a particular purpose; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iv)
-states that source code for the Program is available from such Contributor, and
-informs licensees how to obtain it in a reasonable manner on or through a
-medium customarily used for software exchange.<span style='color:blue'> </span></span></p>
-
-<p><span style='font-size:10.0pt'>When the Program is made available in source
-code form:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it must be made available under this Agreement; and </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Each Contributor must identify itself as the
-originator of its Contribution, if any, in a manner that reasonably allows
-subsequent Recipients to identify the originator of the Contribution. </span></p>
-
-<p><b><span style='font-size:10.0pt'>4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style='font-size:10.0pt'>Commercial distributors of software may
-accept certain responsibilities with respect to end users, business partners
-and the like. While this license is intended to facilitate the commercial use
-of the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create potential
-liability for other Contributors. Therefore, if a Contributor includes the
-Program in a commercial product offering, such Contributor ("Commercial
-Contributor") hereby agrees to defend and indemnify every other
-Contributor ("Indemnified Contributor") against any losses, damages and
-costs (collectively "Losses") arising from claims, lawsuits and other
-legal actions brought by a third party against the Indemnified Contributor to
-the extent caused by the acts or omissions of such Commercial Contributor in
-connection with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In order
-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor
-to control, and cooperate with the Commercial Contributor in, the defense and
-any related settlement negotiations. The Indemnified Contributor may participate
-in any such claim at its own expense.</span> </p>
-
-<p><span style='font-size:10.0pt'>For example, a Contributor might include the
-Program in a commercial product offering, Product X. That Contributor is then a
-Commercial Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance claims and
-warranties are such Commercial Contributor's responsibility alone. Under this
-section, the Commercial Contributor would have to defend claims against the
-other Contributors related to those performance claims and warranties, and if a
-court requires any other Contributor to pay any damages as a result, the
-Commercial Contributor must pay those damages.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>5. NO WARRANTY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and distributing the
-Program and assumes all risks associated with its exercise of rights under this
-Agreement , including but not limited to the risks and costs of program errors,
-compliance with applicable laws, damage to or loss of data, programs or
-equipment, and unavailability or interruption of operations. </span></p>
-
-<p><b><span style='font-size:10.0pt'>6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>7. GENERAL</span></b> </p>
-
-<p><span style='font-size:10.0pt'>If any provision of this Agreement is invalid
-or unenforceable under applicable law, it shall not affect the validity or
-enforceability of the remainder of the terms of this Agreement, and without
-further action by the parties hereto, such provision shall be reformed to the
-minimum extent necessary to make such provision valid and enforceable.</span> </p>
-
-<p><span style='font-size:10.0pt'>If Recipient institutes patent litigation
-against any entity (including a cross-claim or counterclaim in a lawsuit)
-alleging that the Program itself (excluding combinations of the Program with
-other software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the date
-such litigation is filed. </span></p>
-
-<p><span style='font-size:10.0pt'>All Recipient's rights under this Agreement
-shall terminate if it fails to comply with any of the material terms or
-conditions of this Agreement and does not cure such failure in a reasonable
-period of time after becoming aware of such noncompliance. If all Recipient's
-rights under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive. </span></p>
-
-<p><span style='font-size:10.0pt'>Everyone is permitted to copy and distribute
-copies of this Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The Agreement
-Steward reserves the right to publish new versions (including revisions) of
-this Agreement from time to time. No one other than the Agreement Steward has
-the right to modify this Agreement. The Eclipse Foundation is the initial
-Agreement Steward. The Eclipse Foundation may assign the responsibility to
-serve as the Agreement Steward to a suitable separate entity. Each new version
-of the Agreement will be given a distinguishing version number. The Program
-(including Contributions) may always be distributed subject to the version of
-the Agreement under which it was received. In addition, after a new version of
-the Agreement is published, Contributor may elect to distribute the Program
-(including its Contributions) under the new version. Except as expressly stated
-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
-the intellectual property of any Contributor under this Agreement, whether
-expressly, by implication, estoppel or otherwise. All rights in the Program not
-expressly granted under this Agreement are reserved.</span> </p>
-
-<p><span style='font-size:10.0pt'>This Agreement is governed by the laws of the
-State of New York and the intellectual property laws of the United States of
-America. No party to this Agreement will bring a legal action under this
-Agreement more than one year after the cause of action arose. Each party waives
-its rights to a jury trial in any resulting litigation.</span> </p>
-
-<p class=MsoNormal><![if !supportEmptyParas]> <![endif]><o:p></o:p></p>
-
-</div>
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/features/org.eclipse.jst.ws.jaxws.dom.feature/sourceTemplateFeature/feature.properties b/features/org.eclipse.jst.ws.jaxws.dom.feature/sourceTemplateFeature/feature.properties
deleted file mode 100644
index 04d35c3..0000000
--- a/features/org.eclipse.jst.ws.jaxws.dom.feature/sourceTemplateFeature/feature.properties
+++ /dev/null
@@ -1,144 +0,0 @@
-###############################################################################
-# Copyright (c) 2009 by SAP AG, Walldorf.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# SAP AG - initial API and implementation
-###############################################################################
-# feature.properties
-# contains externalized strings for feature.xml
-# "%foo" in feature.xml corresponds to the key "foo" in this file
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# This file should be translated.
-
-# "featureName" property - name of the feature
-featureName=JAX-WS DOM Tools Developer Resources (Incubation)
-
-# "featureProvider" property - name of the company that provides the feature
-featureProvider=Eclipse Web Tools Platform
-
-# "description" property - description of the feature
-description=Source code for JAX-WS DOM Tools
-
-# "updateSiteName" property - label for the update site
-updateSiteName=Web Tools (WTP) Update Site
-
-# "copyright" property - text of the "Feature Update Copyright"
-copyright=\
- Copyright (c) 2009 SAP AG, Walldorf.\n\
- All rights reserved. This program and the accompanying materials\n\
- are made available under the terms of the Eclipse Public License v1.0\n\
- which accompanies this distribution, and is available at\n\
- http://www.eclipse.org/legal/epl-v10.html\n\
-\n\
-Contributors:\n\
- SAP AG - initial API and implementation\n
-################ end of copyright property ####################################
-
-# "licenseURL" property - URL of the "Feature License"
-# do not translate value - just change to point to a locale-specific HTML page
-licenseURL=epl-v10.html
-
-# "license" property - text of the "Feature Update License"
-# should be plain text version of license agreement pointed to be "licenseURL"
-license=\
-ECLIPSE FOUNDATION SOFTWARE USER AGREEMENT\n\
-March 17, 2005\n\
-\n\
-Usage Of Content\n\
-\n\
-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
-OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
-USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
-AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU\n\
-AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
-AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
-OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
-OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
-BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
-\n\
-Applicable Licenses\n\
-\n\
-Unless otherwise indicated, all Content made available by the Eclipse Foundation\n\
-is provided to you under the terms and conditions of the Eclipse Public\n\
-License Version 1.0 ("EPL"). A copy of the EPL is provided with this\n\
-Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
-For purposes of the EPL, "Program" will mean the Content.\n\
-\n\
-Content includes, but is not limited to, source code, object code,\n\
-documentation and other files maintained in the Eclipse.org CVS\n\
-repository ("Repository") in CVS modules ("Modules") and made available\n\
-as downloadable archives ("Downloads").\n\
-\n\
- - Content may be structured and packaged into modules to facilitate delivering,\n\
- extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
- plug-in fragments ("Fragments"), and features ("Features").\n\
- - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java? ARchive)\n\
- in a directory named "plugins".\n\
- - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
- Each Feature may be packaged as a sub-directory in a directory named "features".\n\
- Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
- numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
- - Features may also include other Features ("Included Features"). Within a Feature, files\n\
- named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
-\n\
-Features may also include other Features ("Included Features"). Files named\n\
-"feature.xml" may contain a list of the names and version numbers of\n\
-Included Features.\n\
-\n\
-The terms and conditions governing Plug-ins and Fragments should be\n\
-contained in files named "about.html" ("Abouts"). The terms and\n\
-conditions governing Features and Included Features should be contained\n\
-in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
-Licenses may be located in any directory of a Download or Module\n\
-including, but not limited to the following locations:\n\
-\n\
- - The top-level (root) directory\n\
- - Plug-in and Fragment directories\n\
- - Inside Plug-ins and Fragments packaged as JARs\n\
- - Sub-directories of the directory named "src" of certain Plug-ins\n\
- - Feature directories\n\
-\n\
-Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
-Eclipse Update Manager, you must agree to a license ("Feature Update\n\
-License") during the installation process. If the Feature contains\n\
-Included Features, the Feature Update License should either provide you\n\
-with the terms and conditions governing the Included Features or inform\n\
-you where you can locate them. Feature Update Licenses may be found in\n\
-the "license" property of files named "feature.properties". Such Abouts,\n\
-Feature Licenses and Feature Update Licenses contain the terms and\n\
-conditions (or references to such terms and conditions) that govern your\n\
-use of the associated Content in that directory.\n\
-\n\
-THE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER\n\
-TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
-SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
-\n\
- - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
- - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
- - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
- - IBM Public License 1.0 (available at http://oss.software.ibm.com/developerworks/opensource/license10.html)\n\
- - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
- - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
-\n\
-IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
-TO USE OF THE CONTENT. If no About, Feature License or Feature Update License\n\
-is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
-govern that particular Content.\n\
-\n\
-Cryptography\n\
-\n\
-Content may contain encryption software. The country in which you are\n\
-currently may have restrictions on the import, possession, and use,\n\
-and/or re-export to another country, of encryption software. BEFORE\n\
-using any encryption software, please check the country's laws,\n\
-regulations and policies concerning the import, possession, or use,\n\
-and re-export of encryption software, to see if this is permitted.\n\
-\n\
-Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.\n
-########### end of license property ##########################################
diff --git a/features/org.eclipse.jst.ws.jaxws.dom.feature/sourceTemplateFeature/license.html b/features/org.eclipse.jst.ws.jaxws.dom.feature/sourceTemplateFeature/license.html
deleted file mode 100644
index c6af966..0000000
--- a/features/org.eclipse.jst.ws.jaxws.dom.feature/sourceTemplateFeature/license.html
+++ /dev/null
@@ -1,79 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=iso-8859-1">
-<title>Eclipse.org Software User Agreement</title>
-</head>
-
-<body lang="EN-US" link=blue vlink=purple>
-<h2>Eclipse Foundation Software User Agreement</h2>
-<p>March 17, 2005</p>
-
-<h3>Usage Of Content</h3>
-
-<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
- (COLLECTIVELY "CONTENT"). USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
- CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU AGREE THAT YOUR USE
- OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
- NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
- CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
-
-<h3>Applicable Licenses</h3>
-
-<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0
- ("EPL"). A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
- For purposes of the EPL, "Program" will mean the Content.</p>
-
-<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse.org CVS repository ("Repository") in CVS
- modules ("Modules") and made available as downloadable archives ("Downloads").</p>
-
-<ul>
- <li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"), plug-in fragments ("Fragments"), and features ("Features").</li>
- <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java™ ARchive) in a directory named "plugins".</li>
- <li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material. Each Feature may be packaged as a sub-directory in a directory named "features". Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of the Plug-ins
- and/or Fragments associated with that Feature.</li>
- <li>Features may also include other Features ("Included Features"). Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of Included Features.</li>
-</ul>
-
-<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named "about.html" ("Abouts"). The terms and conditions governing Features and
-Included Features should be contained in files named "license.html" ("Feature Licenses"). Abouts and Feature Licenses may be located in any directory of a Download or Module
-including, but not limited to the following locations:</p>
-
-<ul>
- <li>The top-level (root) directory</li>
- <li>Plug-in and Fragment directories</li>
- <li>Inside Plug-ins and Fragments packaged as JARs</li>
- <li>Sub-directories of the directory named "src" of certain Plug-ins</li>
- <li>Feature directories</li>
-</ul>
-
-<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Eclipse Update Manager, you must agree to a license ("Feature Update License") during the
-installation process. If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
-inform you where you can locate them. Feature Update Licenses may be found in the "license" property of files named "feature.properties" found within a Feature.
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
-that directory.</p>
-
-<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS. SOME OF THESE
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
-
-<ul>
- <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
- <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
- <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
- <li>IBM Public License 1.0 (available at <a href="http://oss.software.ibm.com/developerworks/opensource/license10.html">http://oss.software.ibm.com/developerworks/opensource/license10.html</a>)</li>
- <li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>
- <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
-</ul>
-
-<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License is provided, please
-contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
-
-<h3>Cryptography</h3>
-
-<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
- another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
- possession, or use, and re-export of encryption software, to see if this is permitted.</p>
-
-<small>Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.</small>
-</body>
-</html>
diff --git a/features/org.eclipse.jst.ws.jaxws.dom.feature/sourceTemplatePlugin/about.html b/features/org.eclipse.jst.ws.jaxws.dom.feature/sourceTemplatePlugin/about.html
deleted file mode 100644
index 8410afb..0000000
--- a/features/org.eclipse.jst.ws.jaxws.dom.feature/sourceTemplatePlugin/about.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
-<title>About</title>
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
-
-<p>August 15, 2009</p>
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, "Program" will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is
-being redistributed by another party ("Redistributor") and different terms and conditions may
-apply to your use of any object code in the Content. Check the Redistributor's license that was
-provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
-
-</body>
-</html>
diff --git a/features/org.eclipse.jst.ws.jaxws.dom.feature/sourceTemplatePlugin/about.ini b/features/org.eclipse.jst.ws.jaxws.dom.feature/sourceTemplatePlugin/about.ini
deleted file mode 100644
index 61fefeb..0000000
--- a/features/org.eclipse.jst.ws.jaxws.dom.feature/sourceTemplatePlugin/about.ini
+++ /dev/null
@@ -1,12 +0,0 @@
-# about.ini
-# contains information about a feature
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# "%key" are externalized strings defined in about.properties
-# This file does not need to be translated.
-
-# Property "aboutText" contains blurb for feature details in the "About"
-# dialog (translated). Maximum 15 lines and 75 characters per line.
-aboutText=%blurb
-
-# Property "featureImage" contains path to feature image (32x32)
-featureImage=wtp_prod32.png
diff --git a/features/org.eclipse.jst.ws.jaxws.dom.feature/sourceTemplatePlugin/about.mappings b/features/org.eclipse.jst.ws.jaxws.dom.feature/sourceTemplatePlugin/about.mappings
deleted file mode 100644
index a28390a..0000000
--- a/features/org.eclipse.jst.ws.jaxws.dom.feature/sourceTemplatePlugin/about.mappings
+++ /dev/null
@@ -1,6 +0,0 @@
-# about.mappings
-# contains fill-ins for about.properties
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# This file does not need to be translated.
-
-0=@build@
diff --git a/features/org.eclipse.jst.ws.jaxws.dom.feature/sourceTemplatePlugin/about.properties b/features/org.eclipse.jst.ws.jaxws.dom.feature/sourceTemplatePlugin/about.properties
deleted file mode 100644
index 932deac..0000000
--- a/features/org.eclipse.jst.ws.jaxws.dom.feature/sourceTemplatePlugin/about.properties
+++ /dev/null
@@ -1,26 +0,0 @@
-###############################################################################
-# Copyright (c) 2009 by SAP AG, Walldorf.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# SAP AG - initial API and implementation
-###############################################################################
-# about.properties
-# contains externalized strings for about.ini
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# fill-ins are supplied by about.mappings
-# This file should be translated.
-#
-# Do not translate any values surrounded by {}
-
-blurb=JAX-WS DOM Tools Source (Incubation)\n\
-\n\
-Version: {featureVersion}\n\
-Build id: {0}\n\
-\n\
-(c) Copyright SAP AG, Walldorf. 2009. All rights reserved.\n\
-Visit http://www.eclipse.org/webtools/incubator/\n\
-\n
diff --git a/features/org.eclipse.jst.ws.jaxws.dom.feature/sourceTemplatePlugin/build.properties b/features/org.eclipse.jst.ws.jaxws.dom.feature/sourceTemplatePlugin/build.properties
deleted file mode 100644
index ead512d..0000000
--- a/features/org.eclipse.jst.ws.jaxws.dom.feature/sourceTemplatePlugin/build.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-bin.includes = about.html, about.ini, about.mappings, about.properties, wtp_prod32.png, plugin.properties, plugin.xml, src/**, META-INF/
-sourcePlugin = true
diff --git a/features/org.eclipse.jst.ws.jaxws.dom.feature/sourceTemplatePlugin/plugin.properties b/features/org.eclipse.jst.ws.jaxws.dom.feature/sourceTemplatePlugin/plugin.properties
deleted file mode 100755
index 92c1472..0000000
--- a/features/org.eclipse.jst.ws.jaxws.dom.feature/sourceTemplatePlugin/plugin.properties
+++ /dev/null
@@ -1,17 +0,0 @@
-###############################################################################
-# Copyright (c) 2009 by SAP AG, Walldorf.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# SAP AG - initial API and implementation
-###############################################################################
-###############################################################################
-# Language File for this Plugin
-###############################################################################
-
-# Generic Label and Description
-Bundle-Name.0=JAX-WS DOM Tools Source (Incubation)
-Bundle-Vendor.0=Eclipse Web Tools Platform
diff --git a/features/org.eclipse.jst.ws.jaxws.dom.feature/sourceTemplatePlugin/wtp_prod32.gif b/features/org.eclipse.jst.ws.jaxws.dom.feature/sourceTemplatePlugin/wtp_prod32.gif
deleted file mode 100644
index eefb44a..0000000
--- a/features/org.eclipse.jst.ws.jaxws.dom.feature/sourceTemplatePlugin/wtp_prod32.gif
+++ /dev/null
Binary files differ
diff --git a/features/org.eclipse.jst.ws.jaxws.dom.feature/sourceTemplatePlugin/wtp_prod32.png b/features/org.eclipse.jst.ws.jaxws.dom.feature/sourceTemplatePlugin/wtp_prod32.png
deleted file mode 100644
index bfceab3..0000000
--- a/features/org.eclipse.jst.ws.jaxws.dom.feature/sourceTemplatePlugin/wtp_prod32.png
+++ /dev/null
Binary files differ
diff --git a/features/org.eclipse.jst.ws.jaxws.dom_sdk.feature/.project b/features/org.eclipse.jst.ws.jaxws.dom_sdk.feature/.project
deleted file mode 100644
index 64d6e9f..0000000
--- a/features/org.eclipse.jst.ws.jaxws.dom_sdk.feature/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.jst.ws.jaxws.dom_sdk.feature</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.pde.FeatureBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.FeatureNature</nature>
- </natures>
-</projectDescription>
diff --git a/features/org.eclipse.jst.ws.jaxws.dom_sdk.feature/build.properties b/features/org.eclipse.jst.ws.jaxws.dom_sdk.feature/build.properties
deleted file mode 100644
index e7a2a6a..0000000
--- a/features/org.eclipse.jst.ws.jaxws.dom_sdk.feature/build.properties
+++ /dev/null
@@ -1,7 +0,0 @@
-bin.includes = feature.xml,\
- eclipse_update_120.jpg,\
- epl-v10.html,\
- feature.properties,\
- license.html
-
-generate.feature@org.eclipse.jst.ws.jaxws.dom.feature.source=org.eclipse.jst.ws.jaxws.dom.feature
diff --git a/features/org.eclipse.jst.ws.jaxws.dom_sdk.feature/eclipse_update_120.jpg b/features/org.eclipse.jst.ws.jaxws.dom_sdk.feature/eclipse_update_120.jpg
deleted file mode 100644
index bfdf708..0000000
--- a/features/org.eclipse.jst.ws.jaxws.dom_sdk.feature/eclipse_update_120.jpg
+++ /dev/null
Binary files differ
diff --git a/features/org.eclipse.jst.ws.jaxws.dom_sdk.feature/epl-v10.html b/features/org.eclipse.jst.ws.jaxws.dom_sdk.feature/epl-v10.html
deleted file mode 100644
index ed4b196..0000000
--- a/features/org.eclipse.jst.ws.jaxws.dom_sdk.feature/epl-v10.html
+++ /dev/null
@@ -1,328 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office"
-xmlns:w="urn:schemas-microsoft-com:office:word"
-xmlns="http://www.w3.org/TR/REC-html40">
-
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=windows-1252">
-<meta name=ProgId content=Word.Document>
-<meta name=Generator content="Microsoft Word 9">
-<meta name=Originator content="Microsoft Word 9">
-<link rel=File-List
-href="./Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">
-<title>Eclipse Public License - Version 1.0</title>
-<!--[if gte mso 9]><xml>
- <o:DocumentProperties>
- <o:Revision>2</o:Revision>
- <o:TotalTime>3</o:TotalTime>
- <o:Created>2004-03-05T23:03:00Z</o:Created>
- <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
- <o:Pages>4</o:Pages>
- <o:Words>1626</o:Words>
- <o:Characters>9270</o:Characters>
- <o:Lines>77</o:Lines>
- <o:Paragraphs>18</o:Paragraphs>
- <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
- <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
- <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-<style>
-<!--
- /* Font Definitions */
-@font-face
- {font-family:Tahoma;
- panose-1:2 11 6 4 3 5 4 4 2 4;
- mso-font-charset:0;
- mso-generic-font-family:swiss;
- mso-font-pitch:variable;
- mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
- {mso-style-parent:"";
- margin:0in;
- margin-bottom:.0001pt;
- mso-pagination:widow-orphan;
- font-size:12.0pt;
- font-family:"Times New Roman";
- mso-fareast-font-family:"Times New Roman";}
-p
- {margin-right:0in;
- mso-margin-top-alt:auto;
- mso-margin-bottom-alt:auto;
- margin-left:0in;
- mso-pagination:widow-orphan;
- font-size:12.0pt;
- font-family:"Times New Roman";
- mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
- {mso-style-name:"Balloon Text";
- margin:0in;
- margin-bottom:.0001pt;
- mso-pagination:widow-orphan;
- font-size:8.0pt;
- font-family:Tahoma;
- mso-fareast-font-family:"Times New Roman";}
-@page Section1
- {size:8.5in 11.0in;
- margin:1.0in 1.25in 1.0in 1.25in;
- mso-header-margin:.5in;
- mso-footer-margin:.5in;
- mso-paper-source:0;}
-div.Section1
- {page:Section1;}
--->
-</style>
-</head>
-
-<body lang=EN-US style='tab-interval:.5in'>
-
-<div class=Section1>
-
-<p align=center style='text-align:center'><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style='font-size:10.0pt'>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>1. DEFINITIONS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>"Contribution" means:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear=left>
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-changes to the Program, and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-additions to the Program;</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>where
-such changes and/or additions to the Program originate from and are distributed
-by that particular Contributor. A Contribution 'originates' from a Contributor
-if it was added to the Program by such Contributor itself or anyone acting on
-such Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in conjunction
-with the Program under their own license agreement, and (ii) are not derivative
-works of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>"Contributor" means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style='font-size:10.0pt'>"Licensed Patents " mean patent
-claims licensable by a Contributor which are necessarily infringed by the use
-or sale of its Contribution alone or when combined with the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>"Program" means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style='font-size:10.0pt'>"Recipient" means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>2. GRANT OF RIGHTS</span></b> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span
-style='color:red'> </span>reproduce, prepare derivative works of, publicly
-display, publicly perform, distribute and sublicense the Contribution of such
-Contributor, if any, and such derivative works, in source code and object code
-form.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style='color:green'> </span>royalty-free
-patent license under Licensed Patents to make, use, sell, offer to sell, import
-and otherwise transfer the Contribution of such Contributor, if any, in source
-code and object code form. This patent license shall apply to the combination
-of the Contribution and the Program if, at the time the Contribution is added
-by the Contributor, such addition of the Contribution causes such combination
-to be covered by the Licensed Patents. The patent license shall not apply to
-any other combinations which include the Contribution. No hardware per se is
-licensed hereunder. </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>c)
-Recipient understands that although each Contributor grants the licenses to its
-Contributions set forth herein, no assurances are provided by any Contributor
-that the Program does not infringe the patent or other intellectual property
-rights of any other entity. Each Contributor disclaims any liability to Recipient
-for claims brought by any other entity based on infringement of intellectual
-property rights or otherwise. As a condition to exercising the rights and
-licenses granted hereunder, each Recipient hereby assumes sole responsibility
-to secure any other intellectual property rights needed, if any. For example,
-if a third party patent license is required to allow Recipient to distribute
-the Program, it is Recipient's responsibility to acquire that license before
-distributing the Program.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>d)
-Each Contributor represents that to its knowledge it has sufficient copyright
-rights in its Contribution, if any, to grant the copyright license set forth in
-this Agreement. </span></p>
-
-<p><b><span style='font-size:10.0pt'>3. REQUIREMENTS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-its license agreement:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-effectively disclaims on behalf of all Contributors all warranties and
-conditions, express and implied, including warranties or conditions of title
-and non-infringement, and implied warranties or conditions of merchantability
-and fitness for a particular purpose; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iv)
-states that source code for the Program is available from such Contributor, and
-informs licensees how to obtain it in a reasonable manner on or through a
-medium customarily used for software exchange.<span style='color:blue'> </span></span></p>
-
-<p><span style='font-size:10.0pt'>When the Program is made available in source
-code form:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it must be made available under this Agreement; and </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Each Contributor must identify itself as the
-originator of its Contribution, if any, in a manner that reasonably allows
-subsequent Recipients to identify the originator of the Contribution. </span></p>
-
-<p><b><span style='font-size:10.0pt'>4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style='font-size:10.0pt'>Commercial distributors of software may
-accept certain responsibilities with respect to end users, business partners
-and the like. While this license is intended to facilitate the commercial use
-of the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create potential
-liability for other Contributors. Therefore, if a Contributor includes the
-Program in a commercial product offering, such Contributor ("Commercial
-Contributor") hereby agrees to defend and indemnify every other
-Contributor ("Indemnified Contributor") against any losses, damages and
-costs (collectively "Losses") arising from claims, lawsuits and other
-legal actions brought by a third party against the Indemnified Contributor to
-the extent caused by the acts or omissions of such Commercial Contributor in
-connection with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In order
-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor
-to control, and cooperate with the Commercial Contributor in, the defense and
-any related settlement negotiations. The Indemnified Contributor may participate
-in any such claim at its own expense.</span> </p>
-
-<p><span style='font-size:10.0pt'>For example, a Contributor might include the
-Program in a commercial product offering, Product X. That Contributor is then a
-Commercial Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance claims and
-warranties are such Commercial Contributor's responsibility alone. Under this
-section, the Commercial Contributor would have to defend claims against the
-other Contributors related to those performance claims and warranties, and if a
-court requires any other Contributor to pay any damages as a result, the
-Commercial Contributor must pay those damages.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>5. NO WARRANTY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and distributing the
-Program and assumes all risks associated with its exercise of rights under this
-Agreement , including but not limited to the risks and costs of program errors,
-compliance with applicable laws, damage to or loss of data, programs or
-equipment, and unavailability or interruption of operations. </span></p>
-
-<p><b><span style='font-size:10.0pt'>6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>7. GENERAL</span></b> </p>
-
-<p><span style='font-size:10.0pt'>If any provision of this Agreement is invalid
-or unenforceable under applicable law, it shall not affect the validity or
-enforceability of the remainder of the terms of this Agreement, and without
-further action by the parties hereto, such provision shall be reformed to the
-minimum extent necessary to make such provision valid and enforceable.</span> </p>
-
-<p><span style='font-size:10.0pt'>If Recipient institutes patent litigation
-against any entity (including a cross-claim or counterclaim in a lawsuit)
-alleging that the Program itself (excluding combinations of the Program with
-other software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the date
-such litigation is filed. </span></p>
-
-<p><span style='font-size:10.0pt'>All Recipient's rights under this Agreement
-shall terminate if it fails to comply with any of the material terms or
-conditions of this Agreement and does not cure such failure in a reasonable
-period of time after becoming aware of such noncompliance. If all Recipient's
-rights under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive. </span></p>
-
-<p><span style='font-size:10.0pt'>Everyone is permitted to copy and distribute
-copies of this Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The Agreement
-Steward reserves the right to publish new versions (including revisions) of
-this Agreement from time to time. No one other than the Agreement Steward has
-the right to modify this Agreement. The Eclipse Foundation is the initial
-Agreement Steward. The Eclipse Foundation may assign the responsibility to
-serve as the Agreement Steward to a suitable separate entity. Each new version
-of the Agreement will be given a distinguishing version number. The Program
-(including Contributions) may always be distributed subject to the version of
-the Agreement under which it was received. In addition, after a new version of
-the Agreement is published, Contributor may elect to distribute the Program
-(including its Contributions) under the new version. Except as expressly stated
-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
-the intellectual property of any Contributor under this Agreement, whether
-expressly, by implication, estoppel or otherwise. All rights in the Program not
-expressly granted under this Agreement are reserved.</span> </p>
-
-<p><span style='font-size:10.0pt'>This Agreement is governed by the laws of the
-State of New York and the intellectual property laws of the United States of
-America. No party to this Agreement will bring a legal action under this
-Agreement more than one year after the cause of action arose. Each party waives
-its rights to a jury trial in any resulting litigation.</span> </p>
-
-<p class=MsoNormal><![if !supportEmptyParas]> <![endif]><o:p></o:p></p>
-
-</div>
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/features/org.eclipse.jst.ws.jaxws.dom_sdk.feature/feature.properties b/features/org.eclipse.jst.ws.jaxws.dom_sdk.feature/feature.properties
deleted file mode 100644
index 33b615e..0000000
--- a/features/org.eclipse.jst.ws.jaxws.dom_sdk.feature/feature.properties
+++ /dev/null
@@ -1,144 +0,0 @@
-###############################################################################
-# Copyright (c) 2009 by SAP AG, Walldorf.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# SAP AG - initial API and implementation
-###############################################################################
-# feature.properties
-# contains externalized strings for feature.xml
-# "%foo" in feature.xml corresponds to the key "foo" in this file
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# This file should be translated.
-
-# "featureName" property - name of the feature
-featureName=JAX-WS DOM Tools SDK (Incubation)
-
-# "featureProvider" property - name of the company that provides the feature
-featureProvider=Eclipse Web Tools Platform
-
-# "description" property - description of the feature
-description=JAX-WS DOM Tools Source
-
-# "updateSiteName" property - label for the update site
-updateSiteName=Web Tools (WTP) Update Site
-
-# "copyright" property - text of the "Feature Update Copyright"
-copyright=\
- Copyright (c) 2009 SAP AG, Walldorf.\n\
- All rights reserved. This program and the accompanying materials\n\
- are made available under the terms of the Eclipse Public License v1.0\n\
- which accompanies this distribution, and is available at\n\
- http://www.eclipse.org/legal/epl-v10.html\n\
-\n\
-Contributors:\n\
- SAP AG - initial API and implementation\n
-################ end of copyright property ####################################
-
-# "licenseURL" property - URL of the "Feature License"
-# do not translate value - just change to point to a locale-specific HTML page
-licenseURL=epl-v10.html
-
-# "license" property - text of the "Feature Update License"
-# should be plain text version of license agreement pointed to be "licenseURL"
-license=\
-ECLIPSE FOUNDATION SOFTWARE USER AGREEMENT\n\
-March 17, 2005\n\
-\n\
-Usage Of Content\n\
-\n\
-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
-OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
-USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
-AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU\n\
-AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
-AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
-OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
-OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
-BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
-\n\
-Applicable Licenses\n\
-\n\
-Unless otherwise indicated, all Content made available by the Eclipse Foundation\n\
-is provided to you under the terms and conditions of the Eclipse Public\n\
-License Version 1.0 ("EPL"). A copy of the EPL is provided with this\n\
-Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
-For purposes of the EPL, "Program" will mean the Content.\n\
-\n\
-Content includes, but is not limited to, source code, object code,\n\
-documentation and other files maintained in the Eclipse.org CVS\n\
-repository ("Repository") in CVS modules ("Modules") and made available\n\
-as downloadable archives ("Downloads").\n\
-\n\
- - Content may be structured and packaged into modules to facilitate delivering,\n\
- extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
- plug-in fragments ("Fragments"), and features ("Features").\n\
- - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java? ARchive)\n\
- in a directory named "plugins".\n\
- - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
- Each Feature may be packaged as a sub-directory in a directory named "features".\n\
- Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
- numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
- - Features may also include other Features ("Included Features"). Within a Feature, files\n\
- named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
-\n\
-Features may also include other Features ("Included Features"). Files named\n\
-"feature.xml" may contain a list of the names and version numbers of\n\
-Included Features.\n\
-\n\
-The terms and conditions governing Plug-ins and Fragments should be\n\
-contained in files named "about.html" ("Abouts"). The terms and\n\
-conditions governing Features and Included Features should be contained\n\
-in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
-Licenses may be located in any directory of a Download or Module\n\
-including, but not limited to the following locations:\n\
-\n\
- - The top-level (root) directory\n\
- - Plug-in and Fragment directories\n\
- - Inside Plug-ins and Fragments packaged as JARs\n\
- - Sub-directories of the directory named "src" of certain Plug-ins\n\
- - Feature directories\n\
-\n\
-Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
-Eclipse Update Manager, you must agree to a license ("Feature Update\n\
-License") during the installation process. If the Feature contains\n\
-Included Features, the Feature Update License should either provide you\n\
-with the terms and conditions governing the Included Features or inform\n\
-you where you can locate them. Feature Update Licenses may be found in\n\
-the "license" property of files named "feature.properties". Such Abouts,\n\
-Feature Licenses and Feature Update Licenses contain the terms and\n\
-conditions (or references to such terms and conditions) that govern your\n\
-use of the associated Content in that directory.\n\
-\n\
-THE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER\n\
-TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
-SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
-\n\
- - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
- - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
- - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
- - IBM Public License 1.0 (available at http://oss.software.ibm.com/developerworks/opensource/license10.html)\n\
- - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
- - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
-\n\
-IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
-TO USE OF THE CONTENT. If no About, Feature License or Feature Update License\n\
-is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
-govern that particular Content.\n\
-\n\
-Cryptography\n\
-\n\
-Content may contain encryption software. The country in which you are\n\
-currently may have restrictions on the import, possession, and use,\n\
-and/or re-export to another country, of encryption software. BEFORE\n\
-using any encryption software, please check the country's laws,\n\
-regulations and policies concerning the import, possession, or use,\n\
-and re-export of encryption software, to see if this is permitted.\n\
-\n\
-Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.\n
-########### end of license property ##########################################
diff --git a/features/org.eclipse.jst.ws.jaxws.dom_sdk.feature/feature.xml b/features/org.eclipse.jst.ws.jaxws.dom_sdk.feature/feature.xml
deleted file mode 100644
index 00ea6fd..0000000
--- a/features/org.eclipse.jst.ws.jaxws.dom_sdk.feature/feature.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
- id="org.eclipse.jst.ws.jaxws.dom_sdk.feature"
- label="%featureName"
- version="1.0.0.qualifier"
- provider-name="%featureProvider"
- image="eclipse_update_120.jpg">
-
- <description>
- %description
- </description>
-
- <copyright>
- %copyright
- </copyright>
-
- <license url="%licenseURL">
- %license
- </license>
-
- <url>
- <update label="%updateSiteName" url="http://download.eclipse.org/webtools/updates"/>
- </url>
-
- <includes
- id="org.eclipse.jst.ws.jaxws.dom.feature"
- version="0.0.0"/>
-
- <includes
- id="org.eclipse.jst.ws.jaxws.dom.feature.source"
- version="0.0.0"/>
-
-</feature>
diff --git a/features/org.eclipse.jst.ws.jaxws.dom_sdk.feature/license.html b/features/org.eclipse.jst.ws.jaxws.dom_sdk.feature/license.html
deleted file mode 100644
index c6af966..0000000
--- a/features/org.eclipse.jst.ws.jaxws.dom_sdk.feature/license.html
+++ /dev/null
@@ -1,79 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=iso-8859-1">
-<title>Eclipse.org Software User Agreement</title>
-</head>
-
-<body lang="EN-US" link=blue vlink=purple>
-<h2>Eclipse Foundation Software User Agreement</h2>
-<p>March 17, 2005</p>
-
-<h3>Usage Of Content</h3>
-
-<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
- (COLLECTIVELY "CONTENT"). USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
- CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU AGREE THAT YOUR USE
- OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
- NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
- CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
-
-<h3>Applicable Licenses</h3>
-
-<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0
- ("EPL"). A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
- For purposes of the EPL, "Program" will mean the Content.</p>
-
-<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse.org CVS repository ("Repository") in CVS
- modules ("Modules") and made available as downloadable archives ("Downloads").</p>
-
-<ul>
- <li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"), plug-in fragments ("Fragments"), and features ("Features").</li>
- <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java™ ARchive) in a directory named "plugins".</li>
- <li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material. Each Feature may be packaged as a sub-directory in a directory named "features". Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of the Plug-ins
- and/or Fragments associated with that Feature.</li>
- <li>Features may also include other Features ("Included Features"). Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of Included Features.</li>
-</ul>
-
-<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named "about.html" ("Abouts"). The terms and conditions governing Features and
-Included Features should be contained in files named "license.html" ("Feature Licenses"). Abouts and Feature Licenses may be located in any directory of a Download or Module
-including, but not limited to the following locations:</p>
-
-<ul>
- <li>The top-level (root) directory</li>
- <li>Plug-in and Fragment directories</li>
- <li>Inside Plug-ins and Fragments packaged as JARs</li>
- <li>Sub-directories of the directory named "src" of certain Plug-ins</li>
- <li>Feature directories</li>
-</ul>
-
-<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Eclipse Update Manager, you must agree to a license ("Feature Update License") during the
-installation process. If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
-inform you where you can locate them. Feature Update Licenses may be found in the "license" property of files named "feature.properties" found within a Feature.
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
-that directory.</p>
-
-<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS. SOME OF THESE
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
-
-<ul>
- <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
- <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
- <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
- <li>IBM Public License 1.0 (available at <a href="http://oss.software.ibm.com/developerworks/opensource/license10.html">http://oss.software.ibm.com/developerworks/opensource/license10.html</a>)</li>
- <li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>
- <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
-</ul>
-
-<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License is provided, please
-contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
-
-<h3>Cryptography</h3>
-
-<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
- another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
- possession, or use, and re-export of encryption software, to see if this is permitted.</p>
-
-<small>Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.</small>
-</body>
-</html>
diff --git a/features/org.eclipse.jst.ws.jaxws.dom_tests.feature/.project b/features/org.eclipse.jst.ws.jaxws.dom_tests.feature/.project
deleted file mode 100644
index 03192a5..0000000
--- a/features/org.eclipse.jst.ws.jaxws.dom_tests.feature/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.jst.ws.jaxws.dom_tests.feature</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.pde.FeatureBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.FeatureNature</nature>
- </natures>
-</projectDescription>
diff --git a/features/org.eclipse.jst.ws.jaxws.dom_tests.feature/build.properties b/features/org.eclipse.jst.ws.jaxws.dom_tests.feature/build.properties
deleted file mode 100644
index c6af93f..0000000
--- a/features/org.eclipse.jst.ws.jaxws.dom_tests.feature/build.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-bin.includes = feature.xml,\
- eclipse_update_120.jpg,\
- epl-v10.html,\
- feature.properties,\
- license.html
diff --git a/features/org.eclipse.jst.ws.jaxws.dom_tests.feature/eclipse_update_120.jpg b/features/org.eclipse.jst.ws.jaxws.dom_tests.feature/eclipse_update_120.jpg
deleted file mode 100644
index bfdf708..0000000
--- a/features/org.eclipse.jst.ws.jaxws.dom_tests.feature/eclipse_update_120.jpg
+++ /dev/null
Binary files differ
diff --git a/features/org.eclipse.jst.ws.jaxws.dom_tests.feature/epl-v10.html b/features/org.eclipse.jst.ws.jaxws.dom_tests.feature/epl-v10.html
deleted file mode 100644
index ed4b196..0000000
--- a/features/org.eclipse.jst.ws.jaxws.dom_tests.feature/epl-v10.html
+++ /dev/null
@@ -1,328 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office"
-xmlns:w="urn:schemas-microsoft-com:office:word"
-xmlns="http://www.w3.org/TR/REC-html40">
-
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=windows-1252">
-<meta name=ProgId content=Word.Document>
-<meta name=Generator content="Microsoft Word 9">
-<meta name=Originator content="Microsoft Word 9">
-<link rel=File-List
-href="./Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">
-<title>Eclipse Public License - Version 1.0</title>
-<!--[if gte mso 9]><xml>
- <o:DocumentProperties>
- <o:Revision>2</o:Revision>
- <o:TotalTime>3</o:TotalTime>
- <o:Created>2004-03-05T23:03:00Z</o:Created>
- <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
- <o:Pages>4</o:Pages>
- <o:Words>1626</o:Words>
- <o:Characters>9270</o:Characters>
- <o:Lines>77</o:Lines>
- <o:Paragraphs>18</o:Paragraphs>
- <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
- <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
- <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-<style>
-<!--
- /* Font Definitions */
-@font-face
- {font-family:Tahoma;
- panose-1:2 11 6 4 3 5 4 4 2 4;
- mso-font-charset:0;
- mso-generic-font-family:swiss;
- mso-font-pitch:variable;
- mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
- {mso-style-parent:"";
- margin:0in;
- margin-bottom:.0001pt;
- mso-pagination:widow-orphan;
- font-size:12.0pt;
- font-family:"Times New Roman";
- mso-fareast-font-family:"Times New Roman";}
-p
- {margin-right:0in;
- mso-margin-top-alt:auto;
- mso-margin-bottom-alt:auto;
- margin-left:0in;
- mso-pagination:widow-orphan;
- font-size:12.0pt;
- font-family:"Times New Roman";
- mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
- {mso-style-name:"Balloon Text";
- margin:0in;
- margin-bottom:.0001pt;
- mso-pagination:widow-orphan;
- font-size:8.0pt;
- font-family:Tahoma;
- mso-fareast-font-family:"Times New Roman";}
-@page Section1
- {size:8.5in 11.0in;
- margin:1.0in 1.25in 1.0in 1.25in;
- mso-header-margin:.5in;
- mso-footer-margin:.5in;
- mso-paper-source:0;}
-div.Section1
- {page:Section1;}
--->
-</style>
-</head>
-
-<body lang=EN-US style='tab-interval:.5in'>
-
-<div class=Section1>
-
-<p align=center style='text-align:center'><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style='font-size:10.0pt'>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>1. DEFINITIONS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>"Contribution" means:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear=left>
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-changes to the Program, and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-additions to the Program;</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>where
-such changes and/or additions to the Program originate from and are distributed
-by that particular Contributor. A Contribution 'originates' from a Contributor
-if it was added to the Program by such Contributor itself or anyone acting on
-such Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in conjunction
-with the Program under their own license agreement, and (ii) are not derivative
-works of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>"Contributor" means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style='font-size:10.0pt'>"Licensed Patents " mean patent
-claims licensable by a Contributor which are necessarily infringed by the use
-or sale of its Contribution alone or when combined with the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>"Program" means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style='font-size:10.0pt'>"Recipient" means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>2. GRANT OF RIGHTS</span></b> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span
-style='color:red'> </span>reproduce, prepare derivative works of, publicly
-display, publicly perform, distribute and sublicense the Contribution of such
-Contributor, if any, and such derivative works, in source code and object code
-form.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style='color:green'> </span>royalty-free
-patent license under Licensed Patents to make, use, sell, offer to sell, import
-and otherwise transfer the Contribution of such Contributor, if any, in source
-code and object code form. This patent license shall apply to the combination
-of the Contribution and the Program if, at the time the Contribution is added
-by the Contributor, such addition of the Contribution causes such combination
-to be covered by the Licensed Patents. The patent license shall not apply to
-any other combinations which include the Contribution. No hardware per se is
-licensed hereunder. </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>c)
-Recipient understands that although each Contributor grants the licenses to its
-Contributions set forth herein, no assurances are provided by any Contributor
-that the Program does not infringe the patent or other intellectual property
-rights of any other entity. Each Contributor disclaims any liability to Recipient
-for claims brought by any other entity based on infringement of intellectual
-property rights or otherwise. As a condition to exercising the rights and
-licenses granted hereunder, each Recipient hereby assumes sole responsibility
-to secure any other intellectual property rights needed, if any. For example,
-if a third party patent license is required to allow Recipient to distribute
-the Program, it is Recipient's responsibility to acquire that license before
-distributing the Program.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>d)
-Each Contributor represents that to its knowledge it has sufficient copyright
-rights in its Contribution, if any, to grant the copyright license set forth in
-this Agreement. </span></p>
-
-<p><b><span style='font-size:10.0pt'>3. REQUIREMENTS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-its license agreement:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-effectively disclaims on behalf of all Contributors all warranties and
-conditions, express and implied, including warranties or conditions of title
-and non-infringement, and implied warranties or conditions of merchantability
-and fitness for a particular purpose; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iv)
-states that source code for the Program is available from such Contributor, and
-informs licensees how to obtain it in a reasonable manner on or through a
-medium customarily used for software exchange.<span style='color:blue'> </span></span></p>
-
-<p><span style='font-size:10.0pt'>When the Program is made available in source
-code form:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it must be made available under this Agreement; and </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Each Contributor must identify itself as the
-originator of its Contribution, if any, in a manner that reasonably allows
-subsequent Recipients to identify the originator of the Contribution. </span></p>
-
-<p><b><span style='font-size:10.0pt'>4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style='font-size:10.0pt'>Commercial distributors of software may
-accept certain responsibilities with respect to end users, business partners
-and the like. While this license is intended to facilitate the commercial use
-of the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create potential
-liability for other Contributors. Therefore, if a Contributor includes the
-Program in a commercial product offering, such Contributor ("Commercial
-Contributor") hereby agrees to defend and indemnify every other
-Contributor ("Indemnified Contributor") against any losses, damages and
-costs (collectively "Losses") arising from claims, lawsuits and other
-legal actions brought by a third party against the Indemnified Contributor to
-the extent caused by the acts or omissions of such Commercial Contributor in
-connection with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In order
-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor
-to control, and cooperate with the Commercial Contributor in, the defense and
-any related settlement negotiations. The Indemnified Contributor may participate
-in any such claim at its own expense.</span> </p>
-
-<p><span style='font-size:10.0pt'>For example, a Contributor might include the
-Program in a commercial product offering, Product X. That Contributor is then a
-Commercial Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance claims and
-warranties are such Commercial Contributor's responsibility alone. Under this
-section, the Commercial Contributor would have to defend claims against the
-other Contributors related to those performance claims and warranties, and if a
-court requires any other Contributor to pay any damages as a result, the
-Commercial Contributor must pay those damages.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>5. NO WARRANTY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and distributing the
-Program and assumes all risks associated with its exercise of rights under this
-Agreement , including but not limited to the risks and costs of program errors,
-compliance with applicable laws, damage to or loss of data, programs or
-equipment, and unavailability or interruption of operations. </span></p>
-
-<p><b><span style='font-size:10.0pt'>6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>7. GENERAL</span></b> </p>
-
-<p><span style='font-size:10.0pt'>If any provision of this Agreement is invalid
-or unenforceable under applicable law, it shall not affect the validity or
-enforceability of the remainder of the terms of this Agreement, and without
-further action by the parties hereto, such provision shall be reformed to the
-minimum extent necessary to make such provision valid and enforceable.</span> </p>
-
-<p><span style='font-size:10.0pt'>If Recipient institutes patent litigation
-against any entity (including a cross-claim or counterclaim in a lawsuit)
-alleging that the Program itself (excluding combinations of the Program with
-other software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the date
-such litigation is filed. </span></p>
-
-<p><span style='font-size:10.0pt'>All Recipient's rights under this Agreement
-shall terminate if it fails to comply with any of the material terms or
-conditions of this Agreement and does not cure such failure in a reasonable
-period of time after becoming aware of such noncompliance. If all Recipient's
-rights under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive. </span></p>
-
-<p><span style='font-size:10.0pt'>Everyone is permitted to copy and distribute
-copies of this Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The Agreement
-Steward reserves the right to publish new versions (including revisions) of
-this Agreement from time to time. No one other than the Agreement Steward has
-the right to modify this Agreement. The Eclipse Foundation is the initial
-Agreement Steward. The Eclipse Foundation may assign the responsibility to
-serve as the Agreement Steward to a suitable separate entity. Each new version
-of the Agreement will be given a distinguishing version number. The Program
-(including Contributions) may always be distributed subject to the version of
-the Agreement under which it was received. In addition, after a new version of
-the Agreement is published, Contributor may elect to distribute the Program
-(including its Contributions) under the new version. Except as expressly stated
-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
-the intellectual property of any Contributor under this Agreement, whether
-expressly, by implication, estoppel or otherwise. All rights in the Program not
-expressly granted under this Agreement are reserved.</span> </p>
-
-<p><span style='font-size:10.0pt'>This Agreement is governed by the laws of the
-State of New York and the intellectual property laws of the United States of
-America. No party to this Agreement will bring a legal action under this
-Agreement more than one year after the cause of action arose. Each party waives
-its rights to a jury trial in any resulting litigation.</span> </p>
-
-<p class=MsoNormal><![if !supportEmptyParas]> <![endif]><o:p></o:p></p>
-
-</div>
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/features/org.eclipse.jst.ws.jaxws.dom_tests.feature/feature.properties b/features/org.eclipse.jst.ws.jaxws.dom_tests.feature/feature.properties
deleted file mode 100644
index c751c73..0000000
--- a/features/org.eclipse.jst.ws.jaxws.dom_tests.feature/feature.properties
+++ /dev/null
@@ -1,144 +0,0 @@
-###############################################################################
-# Copyright (c) 2009 by SAP AG, Walldorf.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# SAP AG - initial API and implementation
-###############################################################################
-# feature.properties
-# contains externalized strings for feature.xml
-# "%foo" in feature.xml corresponds to the key "foo" in this file
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# This file should be translated.
-
-# "featureName" property - name of the feature
-featureName=JAX-WS DOM Tools Tests (Incubation)
-
-# "featureProvider" property - name of the company that provides the feature
-featureProvider=Eclipse Web Tools Platform
-
-# "description" property - description of the feature
-description=JAX-WS DOM Tools Tests
-
-# "updateSiteName" property - label for the update site
-updateSiteName=Web Tools (WTP) Update Site
-
-# "copyright" property - text of the "Feature Update Copyright"
-copyright=\
- Copyright (c) 2009 SAP AG, Walldorf.\n\
- All rights reserved. This program and the accompanying materials\n\
- are made available under the terms of the Eclipse Public License v1.0\n\
- which accompanies this distribution, and is available at\n\
- http://www.eclipse.org/legal/epl-v10.html\n\
-\n\
-Contributors:\n\
- SAP AG - initial API and implementation\n
-################ end of copyright property ####################################
-
-# "licenseURL" property - URL of the "Feature License"
-# do not translate value - just change to point to a locale-specific HTML page
-licenseURL=epl-v10.html
-
-# "license" property - text of the "Feature Update License"
-# should be plain text version of license agreement pointed to be "licenseURL"
-license=\
-ECLIPSE FOUNDATION SOFTWARE USER AGREEMENT\n\
-March 17, 2005\n\
-\n\
-Usage Of Content\n\
-\n\
-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
-OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
-USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
-AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU\n\
-AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
-AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
-OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
-OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
-BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
-\n\
-Applicable Licenses\n\
-\n\
-Unless otherwise indicated, all Content made available by the Eclipse Foundation\n\
-is provided to you under the terms and conditions of the Eclipse Public\n\
-License Version 1.0 ("EPL"). A copy of the EPL is provided with this\n\
-Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
-For purposes of the EPL, "Program" will mean the Content.\n\
-\n\
-Content includes, but is not limited to, source code, object code,\n\
-documentation and other files maintained in the Eclipse.org CVS\n\
-repository ("Repository") in CVS modules ("Modules") and made available\n\
-as downloadable archives ("Downloads").\n\
-\n\
- - Content may be structured and packaged into modules to facilitate delivering,\n\
- extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
- plug-in fragments ("Fragments"), and features ("Features").\n\
- - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java? ARchive)\n\
- in a directory named "plugins".\n\
- - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
- Each Feature may be packaged as a sub-directory in a directory named "features".\n\
- Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
- numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
- - Features may also include other Features ("Included Features"). Within a Feature, files\n\
- named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
-\n\
-Features may also include other Features ("Included Features"). Files named\n\
-"feature.xml" may contain a list of the names and version numbers of\n\
-Included Features.\n\
-\n\
-The terms and conditions governing Plug-ins and Fragments should be\n\
-contained in files named "about.html" ("Abouts"). The terms and\n\
-conditions governing Features and Included Features should be contained\n\
-in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
-Licenses may be located in any directory of a Download or Module\n\
-including, but not limited to the following locations:\n\
-\n\
- - The top-level (root) directory\n\
- - Plug-in and Fragment directories\n\
- - Inside Plug-ins and Fragments packaged as JARs\n\
- - Sub-directories of the directory named "src" of certain Plug-ins\n\
- - Feature directories\n\
-\n\
-Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
-Eclipse Update Manager, you must agree to a license ("Feature Update\n\
-License") during the installation process. If the Feature contains\n\
-Included Features, the Feature Update License should either provide you\n\
-with the terms and conditions governing the Included Features or inform\n\
-you where you can locate them. Feature Update Licenses may be found in\n\
-the "license" property of files named "feature.properties". Such Abouts,\n\
-Feature Licenses and Feature Update Licenses contain the terms and\n\
-conditions (or references to such terms and conditions) that govern your\n\
-use of the associated Content in that directory.\n\
-\n\
-THE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER\n\
-TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
-SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
-\n\
- - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
- - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
- - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
- - IBM Public License 1.0 (available at http://oss.software.ibm.com/developerworks/opensource/license10.html)\n\
- - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
- - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
-\n\
-IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
-TO USE OF THE CONTENT. If no About, Feature License or Feature Update License\n\
-is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
-govern that particular Content.\n\
-\n\
-Cryptography\n\
-\n\
-Content may contain encryption software. The country in which you are\n\
-currently may have restrictions on the import, possession, and use,\n\
-and/or re-export to another country, of encryption software. BEFORE\n\
-using any encryption software, please check the country's laws,\n\
-regulations and policies concerning the import, possession, or use,\n\
-and re-export of encryption software, to see if this is permitted.\n\
-\n\
-Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.\n
-########### end of license property ##########################################
diff --git a/features/org.eclipse.jst.ws.jaxws.dom_tests.feature/feature.xml b/features/org.eclipse.jst.ws.jaxws.dom_tests.feature/feature.xml
deleted file mode 100644
index 1d14585..0000000
--- a/features/org.eclipse.jst.ws.jaxws.dom_tests.feature/feature.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
- id="org.eclipse.jst.ws.jaxws.dom_tests.feature"
- label="%featureName"
- version="1.0.0.qualifier"
- provider-name="%featureProvider"
- image="eclipse_update_120.jpg">
-
- <description>
- %description
- </description>
-
- <copyright>
- %copyright
- </copyright>
-
- <license url="%licenseURL">
- %license
- </license>
-
- <url>
- <update label="%updateSiteName" url="http://download.eclipse.org/webtools/updates"/>
- </url>
-
- <plugin
- id="org.eclipse.jst.ws.jaxws.dom.integration.tests"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.jst.ws.jaxws.dom.runtime.tests"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.jst.ws.jaxws.dom.ui.tests"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.jmock"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.jst.ws.jaxws.testutils"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.jst.ws.jaxws.utils.tests"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
-</feature>
diff --git a/features/org.eclipse.jst.ws.jaxws.dom_tests.feature/license.html b/features/org.eclipse.jst.ws.jaxws.dom_tests.feature/license.html
deleted file mode 100644
index c6af966..0000000
--- a/features/org.eclipse.jst.ws.jaxws.dom_tests.feature/license.html
+++ /dev/null
@@ -1,79 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=iso-8859-1">
-<title>Eclipse.org Software User Agreement</title>
-</head>
-
-<body lang="EN-US" link=blue vlink=purple>
-<h2>Eclipse Foundation Software User Agreement</h2>
-<p>March 17, 2005</p>
-
-<h3>Usage Of Content</h3>
-
-<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
- (COLLECTIVELY "CONTENT"). USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
- CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU AGREE THAT YOUR USE
- OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
- NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
- CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
-
-<h3>Applicable Licenses</h3>
-
-<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0
- ("EPL"). A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
- For purposes of the EPL, "Program" will mean the Content.</p>
-
-<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse.org CVS repository ("Repository") in CVS
- modules ("Modules") and made available as downloadable archives ("Downloads").</p>
-
-<ul>
- <li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"), plug-in fragments ("Fragments"), and features ("Features").</li>
- <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java™ ARchive) in a directory named "plugins".</li>
- <li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material. Each Feature may be packaged as a sub-directory in a directory named "features". Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of the Plug-ins
- and/or Fragments associated with that Feature.</li>
- <li>Features may also include other Features ("Included Features"). Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of Included Features.</li>
-</ul>
-
-<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named "about.html" ("Abouts"). The terms and conditions governing Features and
-Included Features should be contained in files named "license.html" ("Feature Licenses"). Abouts and Feature Licenses may be located in any directory of a Download or Module
-including, but not limited to the following locations:</p>
-
-<ul>
- <li>The top-level (root) directory</li>
- <li>Plug-in and Fragment directories</li>
- <li>Inside Plug-ins and Fragments packaged as JARs</li>
- <li>Sub-directories of the directory named "src" of certain Plug-ins</li>
- <li>Feature directories</li>
-</ul>
-
-<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Eclipse Update Manager, you must agree to a license ("Feature Update License") during the
-installation process. If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
-inform you where you can locate them. Feature Update Licenses may be found in the "license" property of files named "feature.properties" found within a Feature.
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
-that directory.</p>
-
-<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS. SOME OF THESE
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
-
-<ul>
- <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
- <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
- <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
- <li>IBM Public License 1.0 (available at <a href="http://oss.software.ibm.com/developerworks/opensource/license10.html">http://oss.software.ibm.com/developerworks/opensource/license10.html</a>)</li>
- <li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>
- <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
-</ul>
-
-<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License is provided, please
-contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
-
-<h3>Cryptography</h3>
-
-<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
- another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
- possession, or use, and re-export of encryption software, to see if this is permitted.</p>
-
-<small>Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.</small>
-</body>
-</html>
diff --git a/features/org.eclipse.jst.ws.jaxws.feature/.project b/features/org.eclipse.jst.ws.jaxws.feature/.project
deleted file mode 100644
index 2eb88eb..0000000
--- a/features/org.eclipse.jst.ws.jaxws.feature/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.jst.ws.jaxws.feature</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.pde.FeatureBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.FeatureNature</nature>
- </natures>
-</projectDescription>
diff --git a/features/org.eclipse.jst.ws.jaxws.feature/build.properties b/features/org.eclipse.jst.ws.jaxws.feature/build.properties
deleted file mode 100644
index c6af93f..0000000
--- a/features/org.eclipse.jst.ws.jaxws.feature/build.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-bin.includes = feature.xml,\
- eclipse_update_120.jpg,\
- epl-v10.html,\
- feature.properties,\
- license.html
diff --git a/features/org.eclipse.jst.ws.jaxws.feature/eclipse_update_120.jpg b/features/org.eclipse.jst.ws.jaxws.feature/eclipse_update_120.jpg
deleted file mode 100644
index bfdf708..0000000
--- a/features/org.eclipse.jst.ws.jaxws.feature/eclipse_update_120.jpg
+++ /dev/null
Binary files differ
diff --git a/features/org.eclipse.jst.ws.jaxws.feature/epl-v10.html b/features/org.eclipse.jst.ws.jaxws.feature/epl-v10.html
deleted file mode 100644
index ed4b196..0000000
--- a/features/org.eclipse.jst.ws.jaxws.feature/epl-v10.html
+++ /dev/null
@@ -1,328 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office"
-xmlns:w="urn:schemas-microsoft-com:office:word"
-xmlns="http://www.w3.org/TR/REC-html40">
-
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=windows-1252">
-<meta name=ProgId content=Word.Document>
-<meta name=Generator content="Microsoft Word 9">
-<meta name=Originator content="Microsoft Word 9">
-<link rel=File-List
-href="./Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">
-<title>Eclipse Public License - Version 1.0</title>
-<!--[if gte mso 9]><xml>
- <o:DocumentProperties>
- <o:Revision>2</o:Revision>
- <o:TotalTime>3</o:TotalTime>
- <o:Created>2004-03-05T23:03:00Z</o:Created>
- <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
- <o:Pages>4</o:Pages>
- <o:Words>1626</o:Words>
- <o:Characters>9270</o:Characters>
- <o:Lines>77</o:Lines>
- <o:Paragraphs>18</o:Paragraphs>
- <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
- <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
- <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-<style>
-<!--
- /* Font Definitions */
-@font-face
- {font-family:Tahoma;
- panose-1:2 11 6 4 3 5 4 4 2 4;
- mso-font-charset:0;
- mso-generic-font-family:swiss;
- mso-font-pitch:variable;
- mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
- {mso-style-parent:"";
- margin:0in;
- margin-bottom:.0001pt;
- mso-pagination:widow-orphan;
- font-size:12.0pt;
- font-family:"Times New Roman";
- mso-fareast-font-family:"Times New Roman";}
-p
- {margin-right:0in;
- mso-margin-top-alt:auto;
- mso-margin-bottom-alt:auto;
- margin-left:0in;
- mso-pagination:widow-orphan;
- font-size:12.0pt;
- font-family:"Times New Roman";
- mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
- {mso-style-name:"Balloon Text";
- margin:0in;
- margin-bottom:.0001pt;
- mso-pagination:widow-orphan;
- font-size:8.0pt;
- font-family:Tahoma;
- mso-fareast-font-family:"Times New Roman";}
-@page Section1
- {size:8.5in 11.0in;
- margin:1.0in 1.25in 1.0in 1.25in;
- mso-header-margin:.5in;
- mso-footer-margin:.5in;
- mso-paper-source:0;}
-div.Section1
- {page:Section1;}
--->
-</style>
-</head>
-
-<body lang=EN-US style='tab-interval:.5in'>
-
-<div class=Section1>
-
-<p align=center style='text-align:center'><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style='font-size:10.0pt'>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>1. DEFINITIONS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>"Contribution" means:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear=left>
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-changes to the Program, and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-additions to the Program;</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>where
-such changes and/or additions to the Program originate from and are distributed
-by that particular Contributor. A Contribution 'originates' from a Contributor
-if it was added to the Program by such Contributor itself or anyone acting on
-such Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in conjunction
-with the Program under their own license agreement, and (ii) are not derivative
-works of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>"Contributor" means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style='font-size:10.0pt'>"Licensed Patents " mean patent
-claims licensable by a Contributor which are necessarily infringed by the use
-or sale of its Contribution alone or when combined with the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>"Program" means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style='font-size:10.0pt'>"Recipient" means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>2. GRANT OF RIGHTS</span></b> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span
-style='color:red'> </span>reproduce, prepare derivative works of, publicly
-display, publicly perform, distribute and sublicense the Contribution of such
-Contributor, if any, and such derivative works, in source code and object code
-form.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style='color:green'> </span>royalty-free
-patent license under Licensed Patents to make, use, sell, offer to sell, import
-and otherwise transfer the Contribution of such Contributor, if any, in source
-code and object code form. This patent license shall apply to the combination
-of the Contribution and the Program if, at the time the Contribution is added
-by the Contributor, such addition of the Contribution causes such combination
-to be covered by the Licensed Patents. The patent license shall not apply to
-any other combinations which include the Contribution. No hardware per se is
-licensed hereunder. </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>c)
-Recipient understands that although each Contributor grants the licenses to its
-Contributions set forth herein, no assurances are provided by any Contributor
-that the Program does not infringe the patent or other intellectual property
-rights of any other entity. Each Contributor disclaims any liability to Recipient
-for claims brought by any other entity based on infringement of intellectual
-property rights or otherwise. As a condition to exercising the rights and
-licenses granted hereunder, each Recipient hereby assumes sole responsibility
-to secure any other intellectual property rights needed, if any. For example,
-if a third party patent license is required to allow Recipient to distribute
-the Program, it is Recipient's responsibility to acquire that license before
-distributing the Program.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>d)
-Each Contributor represents that to its knowledge it has sufficient copyright
-rights in its Contribution, if any, to grant the copyright license set forth in
-this Agreement. </span></p>
-
-<p><b><span style='font-size:10.0pt'>3. REQUIREMENTS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-its license agreement:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-effectively disclaims on behalf of all Contributors all warranties and
-conditions, express and implied, including warranties or conditions of title
-and non-infringement, and implied warranties or conditions of merchantability
-and fitness for a particular purpose; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iv)
-states that source code for the Program is available from such Contributor, and
-informs licensees how to obtain it in a reasonable manner on or through a
-medium customarily used for software exchange.<span style='color:blue'> </span></span></p>
-
-<p><span style='font-size:10.0pt'>When the Program is made available in source
-code form:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it must be made available under this Agreement; and </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Each Contributor must identify itself as the
-originator of its Contribution, if any, in a manner that reasonably allows
-subsequent Recipients to identify the originator of the Contribution. </span></p>
-
-<p><b><span style='font-size:10.0pt'>4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style='font-size:10.0pt'>Commercial distributors of software may
-accept certain responsibilities with respect to end users, business partners
-and the like. While this license is intended to facilitate the commercial use
-of the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create potential
-liability for other Contributors. Therefore, if a Contributor includes the
-Program in a commercial product offering, such Contributor ("Commercial
-Contributor") hereby agrees to defend and indemnify every other
-Contributor ("Indemnified Contributor") against any losses, damages and
-costs (collectively "Losses") arising from claims, lawsuits and other
-legal actions brought by a third party against the Indemnified Contributor to
-the extent caused by the acts or omissions of such Commercial Contributor in
-connection with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In order
-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor
-to control, and cooperate with the Commercial Contributor in, the defense and
-any related settlement negotiations. The Indemnified Contributor may participate
-in any such claim at its own expense.</span> </p>
-
-<p><span style='font-size:10.0pt'>For example, a Contributor might include the
-Program in a commercial product offering, Product X. That Contributor is then a
-Commercial Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance claims and
-warranties are such Commercial Contributor's responsibility alone. Under this
-section, the Commercial Contributor would have to defend claims against the
-other Contributors related to those performance claims and warranties, and if a
-court requires any other Contributor to pay any damages as a result, the
-Commercial Contributor must pay those damages.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>5. NO WARRANTY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and distributing the
-Program and assumes all risks associated with its exercise of rights under this
-Agreement , including but not limited to the risks and costs of program errors,
-compliance with applicable laws, damage to or loss of data, programs or
-equipment, and unavailability or interruption of operations. </span></p>
-
-<p><b><span style='font-size:10.0pt'>6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>7. GENERAL</span></b> </p>
-
-<p><span style='font-size:10.0pt'>If any provision of this Agreement is invalid
-or unenforceable under applicable law, it shall not affect the validity or
-enforceability of the remainder of the terms of this Agreement, and without
-further action by the parties hereto, such provision shall be reformed to the
-minimum extent necessary to make such provision valid and enforceable.</span> </p>
-
-<p><span style='font-size:10.0pt'>If Recipient institutes patent litigation
-against any entity (including a cross-claim or counterclaim in a lawsuit)
-alleging that the Program itself (excluding combinations of the Program with
-other software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the date
-such litigation is filed. </span></p>
-
-<p><span style='font-size:10.0pt'>All Recipient's rights under this Agreement
-shall terminate if it fails to comply with any of the material terms or
-conditions of this Agreement and does not cure such failure in a reasonable
-period of time after becoming aware of such noncompliance. If all Recipient's
-rights under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive. </span></p>
-
-<p><span style='font-size:10.0pt'>Everyone is permitted to copy and distribute
-copies of this Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The Agreement
-Steward reserves the right to publish new versions (including revisions) of
-this Agreement from time to time. No one other than the Agreement Steward has
-the right to modify this Agreement. The Eclipse Foundation is the initial
-Agreement Steward. The Eclipse Foundation may assign the responsibility to
-serve as the Agreement Steward to a suitable separate entity. Each new version
-of the Agreement will be given a distinguishing version number. The Program
-(including Contributions) may always be distributed subject to the version of
-the Agreement under which it was received. In addition, after a new version of
-the Agreement is published, Contributor may elect to distribute the Program
-(including its Contributions) under the new version. Except as expressly stated
-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
-the intellectual property of any Contributor under this Agreement, whether
-expressly, by implication, estoppel or otherwise. All rights in the Program not
-expressly granted under this Agreement are reserved.</span> </p>
-
-<p><span style='font-size:10.0pt'>This Agreement is governed by the laws of the
-State of New York and the intellectual property laws of the United States of
-America. No party to this Agreement will bring a legal action under this
-Agreement more than one year after the cause of action arose. Each party waives
-its rights to a jury trial in any resulting litigation.</span> </p>
-
-<p class=MsoNormal><![if !supportEmptyParas]> <![endif]><o:p></o:p></p>
-
-</div>
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/features/org.eclipse.jst.ws.jaxws.feature/feature.properties b/features/org.eclipse.jst.ws.jaxws.feature/feature.properties
deleted file mode 100644
index ffeced9..0000000
--- a/features/org.eclipse.jst.ws.jaxws.feature/feature.properties
+++ /dev/null
@@ -1,144 +0,0 @@
-###############################################################################
-# Copyright (c) 2008, 2009 Eclipse contributors and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# Shane Clarke - initial API and implementation
-###############################################################################
-# feature.properties
-# contains externalized strings for feature.xml
-# "%foo" in feature.xml corresponds to the key "foo" in this file
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# This file should be translated.
-
-# "featureName" property - name of the feature
-featureName=JAX-WS Tools (Incubation)
-
-# "featureProvider" property - name of the company that provides the feature
-featureProvider=Eclipse Web Tools Platform
-
-# "description" property - description of the feature
-description=JAX-WS Tools
-
-# "updateSiteName" property - label for the update site
-updateSiteName=The Eclipse Web Tools Platform (WTP) Project update site
-
-# "copyright" property - text of the "Feature Update Copyright"
-copyright=\
- Copyright (c) 2008, 2009 Eclipse contributors and others.\n\
- All rights reserved. This program and the accompanying materials\n\
- are made available under the terms of the Eclipse Public License v1.0\n\
- which accompanies this distribution, and is available at\n\
- http://www.eclipse.org/legal/epl-v10.html\n\
-\n\
-Contributors:\n\
- Shane Clarke - initial API and implementation\n
-################ end of copyright property ####################################
-
-# "licenseURL" property - URL of the "Feature License"
-# do not translate value - just change to point to a locale-specific HTML page
-licenseURL=epl-v10.html
-
-# "license" property - text of the "Feature Update License"
-# should be plain text version of license agreement pointed to be "licenseURL"
-license=\
-ECLIPSE FOUNDATION SOFTWARE USER AGREEMENT\n\
-March 17, 2005\n\
-\n\
-Usage Of Content\n\
-\n\
-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
-OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
-USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
-AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU\n\
-AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
-AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
-OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
-OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
-BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
-\n\
-Applicable Licenses\n\
-\n\
-Unless otherwise indicated, all Content made available by the Eclipse Foundation\n\
-is provided to you under the terms and conditions of the Eclipse Public\n\
-License Version 1.0 ("EPL"). A copy of the EPL is provided with this\n\
-Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
-For purposes of the EPL, "Program" will mean the Content.\n\
-\n\
-Content includes, but is not limited to, source code, object code,\n\
-documentation and other files maintained in the Eclipse.org CVS\n\
-repository ("Repository") in CVS modules ("Modules") and made available\n\
-as downloadable archives ("Downloads").\n\
-\n\
- - Content may be structured and packaged into modules to facilitate delivering,\n\
- extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
- plug-in fragments ("Fragments"), and features ("Features").\n\
- - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java? ARchive)\n\
- in a directory named "plugins".\n\
- - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
- Each Feature may be packaged as a sub-directory in a directory named "features".\n\
- Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
- numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
- - Features may also include other Features ("Included Features"). Within a Feature, files\n\
- named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
-\n\
-Features may also include other Features ("Included Features"). Files named\n\
-"feature.xml" may contain a list of the names and version numbers of\n\
-Included Features.\n\
-\n\
-The terms and conditions governing Plug-ins and Fragments should be\n\
-contained in files named "about.html" ("Abouts"). The terms and\n\
-conditions governing Features and Included Features should be contained\n\
-in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
-Licenses may be located in any directory of a Download or Module\n\
-including, but not limited to the following locations:\n\
-\n\
- - The top-level (root) directory\n\
- - Plug-in and Fragment directories\n\
- - Inside Plug-ins and Fragments packaged as JARs\n\
- - Sub-directories of the directory named "src" of certain Plug-ins\n\
- - Feature directories\n\
-\n\
-Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
-Eclipse Update Manager, you must agree to a license ("Feature Update\n\
-License") during the installation process. If the Feature contains\n\
-Included Features, the Feature Update License should either provide you\n\
-with the terms and conditions governing the Included Features or inform\n\
-you where you can locate them. Feature Update Licenses may be found in\n\
-the "license" property of files named "feature.properties". Such Abouts,\n\
-Feature Licenses and Feature Update Licenses contain the terms and\n\
-conditions (or references to such terms and conditions) that govern your\n\
-use of the associated Content in that directory.\n\
-\n\
-THE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER\n\
-TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
-SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
-\n\
- - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
- - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
- - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
- - IBM Public License 1.0 (available at http://oss.software.ibm.com/developerworks/opensource/license10.html)\n\
- - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
- - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
-\n\
-IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
-TO USE OF THE CONTENT. If no About, Feature License or Feature Update License\n\
-is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
-govern that particular Content.\n\
-\n\
-Cryptography\n\
-\n\
-Content may contain encryption software. The country in which you are\n\
-currently may have restrictions on the import, possession, and use,\n\
-and/or re-export to another country, of encryption software. BEFORE\n\
-using any encryption software, please check the country's laws,\n\
-regulations and policies concerning the import, possession, or use,\n\
-and re-export of encryption software, to see if this is permitted.\n\
-\n\
-Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.\n
-########### end of license property ##########################################
diff --git a/features/org.eclipse.jst.ws.jaxws.feature/feature.xml b/features/org.eclipse.jst.ws.jaxws.feature/feature.xml
deleted file mode 100644
index bdd6c8a..0000000
--- a/features/org.eclipse.jst.ws.jaxws.feature/feature.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
- id="org.eclipse.jst.ws.jaxws.feature"
- label="%featureName"
- version="0.5.2.qualifier"
- provider-name="%featureProvider"
- plugin="org.eclipse.jst.ws.jaxws.core"
- image="eclipse_update_120.jpg">
-
- <description>
- %description
- </description>
-
- <copyright>
- %copyright
- </copyright>
-
- <license url="%licenseURL">
- %license
- </license>
-
- <url>
- <update label="%updateSiteName" url="http://download.eclipse.org/webtools/updates"/>
- </url>
-
- <plugin
- id="org.eclipse.jst.ws.jaxws.core"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.jst.ws.jaxws.ui"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="javax.xml.ws"
- download-size="0"
- install-size="0"
- version="2.1.0.qualifier"
- unpack="false"/>
-
- <plugin
- id="javax.jws"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.jst.ws.annotations.core"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="javax.xml.bind"
- download-size="0"
- install-size="0"
- version="2.1.9.qualifier"
- unpack="false"/>
-
- <plugin
- id="javax.xml.stream"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="javax.activation"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.jst.ws.jaxb.core"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
-</feature>
diff --git a/features/org.eclipse.jst.ws.jaxws.feature/license.html b/features/org.eclipse.jst.ws.jaxws.feature/license.html
deleted file mode 100644
index c6af966..0000000
--- a/features/org.eclipse.jst.ws.jaxws.feature/license.html
+++ /dev/null
@@ -1,79 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=iso-8859-1">
-<title>Eclipse.org Software User Agreement</title>
-</head>
-
-<body lang="EN-US" link=blue vlink=purple>
-<h2>Eclipse Foundation Software User Agreement</h2>
-<p>March 17, 2005</p>
-
-<h3>Usage Of Content</h3>
-
-<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
- (COLLECTIVELY "CONTENT"). USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
- CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU AGREE THAT YOUR USE
- OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
- NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
- CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
-
-<h3>Applicable Licenses</h3>
-
-<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0
- ("EPL"). A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
- For purposes of the EPL, "Program" will mean the Content.</p>
-
-<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse.org CVS repository ("Repository") in CVS
- modules ("Modules") and made available as downloadable archives ("Downloads").</p>
-
-<ul>
- <li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"), plug-in fragments ("Fragments"), and features ("Features").</li>
- <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java™ ARchive) in a directory named "plugins".</li>
- <li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material. Each Feature may be packaged as a sub-directory in a directory named "features". Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of the Plug-ins
- and/or Fragments associated with that Feature.</li>
- <li>Features may also include other Features ("Included Features"). Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of Included Features.</li>
-</ul>
-
-<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named "about.html" ("Abouts"). The terms and conditions governing Features and
-Included Features should be contained in files named "license.html" ("Feature Licenses"). Abouts and Feature Licenses may be located in any directory of a Download or Module
-including, but not limited to the following locations:</p>
-
-<ul>
- <li>The top-level (root) directory</li>
- <li>Plug-in and Fragment directories</li>
- <li>Inside Plug-ins and Fragments packaged as JARs</li>
- <li>Sub-directories of the directory named "src" of certain Plug-ins</li>
- <li>Feature directories</li>
-</ul>
-
-<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Eclipse Update Manager, you must agree to a license ("Feature Update License") during the
-installation process. If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
-inform you where you can locate them. Feature Update Licenses may be found in the "license" property of files named "feature.properties" found within a Feature.
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
-that directory.</p>
-
-<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS. SOME OF THESE
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
-
-<ul>
- <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
- <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
- <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
- <li>IBM Public License 1.0 (available at <a href="http://oss.software.ibm.com/developerworks/opensource/license10.html">http://oss.software.ibm.com/developerworks/opensource/license10.html</a>)</li>
- <li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>
- <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
-</ul>
-
-<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License is provided, please
-contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
-
-<h3>Cryptography</h3>
-
-<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
- another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
- possession, or use, and re-export of encryption software, to see if this is permitted.</p>
-
-<small>Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.</small>
-</body>
-</html>
diff --git a/features/org.eclipse.jst.ws.jaxws.feature/sourceTemplateBundle/about.html b/features/org.eclipse.jst.ws.jaxws.feature/sourceTemplateBundle/about.html
deleted file mode 100644
index 5b6a031..0000000
--- a/features/org.eclipse.jst.ws.jaxws.feature/sourceTemplateBundle/about.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
-<title>About</title>
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
-
-<p>February 19, 2009</p>
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, "Program" will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is
-being redistributed by another party ("Redistributor") and different terms and conditions may
-apply to your use of any object code in the Content. Check the Redistributor's license that was
-provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
-
-</body>
-</html>
diff --git a/features/org.eclipse.jst.ws.jaxws.feature/sourceTemplateBundle/about.ini b/features/org.eclipse.jst.ws.jaxws.feature/sourceTemplateBundle/about.ini
deleted file mode 100644
index 61fefeb..0000000
--- a/features/org.eclipse.jst.ws.jaxws.feature/sourceTemplateBundle/about.ini
+++ /dev/null
@@ -1,12 +0,0 @@
-# about.ini
-# contains information about a feature
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# "%key" are externalized strings defined in about.properties
-# This file does not need to be translated.
-
-# Property "aboutText" contains blurb for feature details in the "About"
-# dialog (translated). Maximum 15 lines and 75 characters per line.
-aboutText=%blurb
-
-# Property "featureImage" contains path to feature image (32x32)
-featureImage=wtp_prod32.png
diff --git a/features/org.eclipse.jst.ws.jaxws.feature/sourceTemplateBundle/about.mappings b/features/org.eclipse.jst.ws.jaxws.feature/sourceTemplateBundle/about.mappings
deleted file mode 100644
index a28390a..0000000
--- a/features/org.eclipse.jst.ws.jaxws.feature/sourceTemplateBundle/about.mappings
+++ /dev/null
@@ -1,6 +0,0 @@
-# about.mappings
-# contains fill-ins for about.properties
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# This file does not need to be translated.
-
-0=@build@
diff --git a/features/org.eclipse.jst.ws.jaxws.feature/sourceTemplateBundle/about.properties b/features/org.eclipse.jst.ws.jaxws.feature/sourceTemplateBundle/about.properties
deleted file mode 100644
index dfc6146..0000000
--- a/features/org.eclipse.jst.ws.jaxws.feature/sourceTemplateBundle/about.properties
+++ /dev/null
@@ -1,26 +0,0 @@
-###############################################################################
-# Copyright (c) 2009 Shane Clarke and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# Shane Clarke - initial API and implementation
-###############################################################################
-# about.properties
-# contains externalized strings for about.ini
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# fill-ins are supplied by about.mappings
-# This file should be translated.
-#
-# Do not translate any values surrounded by {}
-
-blurb=JAX-WS Tools Source (Incubation)\n\
-\n\
-Version: {featureVersion}\n\
-Build id: {0}\n\
-\n\
-(c) Copyright Eclipse contributors and others 2008, 2009. All rights reserved.\n\
-Visit http://www.eclipse.org/webtools/incubator/\n\
-\n
diff --git a/features/org.eclipse.jst.ws.jaxws.feature/sourceTemplateBundle/build.properties b/features/org.eclipse.jst.ws.jaxws.feature/sourceTemplateBundle/build.properties
deleted file mode 100644
index ead512d..0000000
--- a/features/org.eclipse.jst.ws.jaxws.feature/sourceTemplateBundle/build.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-bin.includes = about.html, about.ini, about.mappings, about.properties, wtp_prod32.png, plugin.properties, plugin.xml, src/**, META-INF/
-sourcePlugin = true
diff --git a/features/org.eclipse.jst.ws.jaxws.feature/sourceTemplateBundle/plugin.properties b/features/org.eclipse.jst.ws.jaxws.feature/sourceTemplateBundle/plugin.properties
deleted file mode 100644
index 757f1cb..0000000
--- a/features/org.eclipse.jst.ws.jaxws.feature/sourceTemplateBundle/plugin.properties
+++ /dev/null
@@ -1,13 +0,0 @@
-###############################################################################
-# Copyright (c) 2009 Shane Clarke and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# Shane Clarke - initial API and implementation
-###############################################################################
-
-pluginName=JAX-WS Tools Source (Incubation)
-pluginProvider=Eclipse Web Tools Platform
diff --git a/features/org.eclipse.jst.ws.jaxws.feature/sourceTemplateBundle/wtp_prod32.gif b/features/org.eclipse.jst.ws.jaxws.feature/sourceTemplateBundle/wtp_prod32.gif
deleted file mode 100644
index eefb44a..0000000
--- a/features/org.eclipse.jst.ws.jaxws.feature/sourceTemplateBundle/wtp_prod32.gif
+++ /dev/null
Binary files differ
diff --git a/features/org.eclipse.jst.ws.jaxws.feature/sourceTemplateBundle/wtp_prod32.png b/features/org.eclipse.jst.ws.jaxws.feature/sourceTemplateBundle/wtp_prod32.png
deleted file mode 100644
index bfceab3..0000000
--- a/features/org.eclipse.jst.ws.jaxws.feature/sourceTemplateBundle/wtp_prod32.png
+++ /dev/null
Binary files differ
diff --git a/features/org.eclipse.jst.ws.jaxws.feature/sourceTemplateFeature/build.properties b/features/org.eclipse.jst.ws.jaxws.feature/sourceTemplateFeature/build.properties
deleted file mode 100644
index c6af93f..0000000
--- a/features/org.eclipse.jst.ws.jaxws.feature/sourceTemplateFeature/build.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-bin.includes = feature.xml,\
- eclipse_update_120.jpg,\
- epl-v10.html,\
- feature.properties,\
- license.html
diff --git a/features/org.eclipse.jst.ws.jaxws.feature/sourceTemplateFeature/eclipse_update_120.jpg b/features/org.eclipse.jst.ws.jaxws.feature/sourceTemplateFeature/eclipse_update_120.jpg
deleted file mode 100644
index bfdf708..0000000
--- a/features/org.eclipse.jst.ws.jaxws.feature/sourceTemplateFeature/eclipse_update_120.jpg
+++ /dev/null
Binary files differ
diff --git a/features/org.eclipse.jst.ws.jaxws.feature/sourceTemplateFeature/epl-v10.html b/features/org.eclipse.jst.ws.jaxws.feature/sourceTemplateFeature/epl-v10.html
deleted file mode 100644
index ed4b196..0000000
--- a/features/org.eclipse.jst.ws.jaxws.feature/sourceTemplateFeature/epl-v10.html
+++ /dev/null
@@ -1,328 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office"
-xmlns:w="urn:schemas-microsoft-com:office:word"
-xmlns="http://www.w3.org/TR/REC-html40">
-
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=windows-1252">
-<meta name=ProgId content=Word.Document>
-<meta name=Generator content="Microsoft Word 9">
-<meta name=Originator content="Microsoft Word 9">
-<link rel=File-List
-href="./Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">
-<title>Eclipse Public License - Version 1.0</title>
-<!--[if gte mso 9]><xml>
- <o:DocumentProperties>
- <o:Revision>2</o:Revision>
- <o:TotalTime>3</o:TotalTime>
- <o:Created>2004-03-05T23:03:00Z</o:Created>
- <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
- <o:Pages>4</o:Pages>
- <o:Words>1626</o:Words>
- <o:Characters>9270</o:Characters>
- <o:Lines>77</o:Lines>
- <o:Paragraphs>18</o:Paragraphs>
- <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
- <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
- <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-<style>
-<!--
- /* Font Definitions */
-@font-face
- {font-family:Tahoma;
- panose-1:2 11 6 4 3 5 4 4 2 4;
- mso-font-charset:0;
- mso-generic-font-family:swiss;
- mso-font-pitch:variable;
- mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
- {mso-style-parent:"";
- margin:0in;
- margin-bottom:.0001pt;
- mso-pagination:widow-orphan;
- font-size:12.0pt;
- font-family:"Times New Roman";
- mso-fareast-font-family:"Times New Roman";}
-p
- {margin-right:0in;
- mso-margin-top-alt:auto;
- mso-margin-bottom-alt:auto;
- margin-left:0in;
- mso-pagination:widow-orphan;
- font-size:12.0pt;
- font-family:"Times New Roman";
- mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
- {mso-style-name:"Balloon Text";
- margin:0in;
- margin-bottom:.0001pt;
- mso-pagination:widow-orphan;
- font-size:8.0pt;
- font-family:Tahoma;
- mso-fareast-font-family:"Times New Roman";}
-@page Section1
- {size:8.5in 11.0in;
- margin:1.0in 1.25in 1.0in 1.25in;
- mso-header-margin:.5in;
- mso-footer-margin:.5in;
- mso-paper-source:0;}
-div.Section1
- {page:Section1;}
--->
-</style>
-</head>
-
-<body lang=EN-US style='tab-interval:.5in'>
-
-<div class=Section1>
-
-<p align=center style='text-align:center'><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style='font-size:10.0pt'>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>1. DEFINITIONS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>"Contribution" means:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear=left>
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-changes to the Program, and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-additions to the Program;</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>where
-such changes and/or additions to the Program originate from and are distributed
-by that particular Contributor. A Contribution 'originates' from a Contributor
-if it was added to the Program by such Contributor itself or anyone acting on
-such Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in conjunction
-with the Program under their own license agreement, and (ii) are not derivative
-works of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>"Contributor" means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style='font-size:10.0pt'>"Licensed Patents " mean patent
-claims licensable by a Contributor which are necessarily infringed by the use
-or sale of its Contribution alone or when combined with the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>"Program" means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style='font-size:10.0pt'>"Recipient" means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>2. GRANT OF RIGHTS</span></b> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span
-style='color:red'> </span>reproduce, prepare derivative works of, publicly
-display, publicly perform, distribute and sublicense the Contribution of such
-Contributor, if any, and such derivative works, in source code and object code
-form.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style='color:green'> </span>royalty-free
-patent license under Licensed Patents to make, use, sell, offer to sell, import
-and otherwise transfer the Contribution of such Contributor, if any, in source
-code and object code form. This patent license shall apply to the combination
-of the Contribution and the Program if, at the time the Contribution is added
-by the Contributor, such addition of the Contribution causes such combination
-to be covered by the Licensed Patents. The patent license shall not apply to
-any other combinations which include the Contribution. No hardware per se is
-licensed hereunder. </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>c)
-Recipient understands that although each Contributor grants the licenses to its
-Contributions set forth herein, no assurances are provided by any Contributor
-that the Program does not infringe the patent or other intellectual property
-rights of any other entity. Each Contributor disclaims any liability to Recipient
-for claims brought by any other entity based on infringement of intellectual
-property rights or otherwise. As a condition to exercising the rights and
-licenses granted hereunder, each Recipient hereby assumes sole responsibility
-to secure any other intellectual property rights needed, if any. For example,
-if a third party patent license is required to allow Recipient to distribute
-the Program, it is Recipient's responsibility to acquire that license before
-distributing the Program.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>d)
-Each Contributor represents that to its knowledge it has sufficient copyright
-rights in its Contribution, if any, to grant the copyright license set forth in
-this Agreement. </span></p>
-
-<p><b><span style='font-size:10.0pt'>3. REQUIREMENTS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-its license agreement:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-effectively disclaims on behalf of all Contributors all warranties and
-conditions, express and implied, including warranties or conditions of title
-and non-infringement, and implied warranties or conditions of merchantability
-and fitness for a particular purpose; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iv)
-states that source code for the Program is available from such Contributor, and
-informs licensees how to obtain it in a reasonable manner on or through a
-medium customarily used for software exchange.<span style='color:blue'> </span></span></p>
-
-<p><span style='font-size:10.0pt'>When the Program is made available in source
-code form:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it must be made available under this Agreement; and </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Each Contributor must identify itself as the
-originator of its Contribution, if any, in a manner that reasonably allows
-subsequent Recipients to identify the originator of the Contribution. </span></p>
-
-<p><b><span style='font-size:10.0pt'>4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style='font-size:10.0pt'>Commercial distributors of software may
-accept certain responsibilities with respect to end users, business partners
-and the like. While this license is intended to facilitate the commercial use
-of the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create potential
-liability for other Contributors. Therefore, if a Contributor includes the
-Program in a commercial product offering, such Contributor ("Commercial
-Contributor") hereby agrees to defend and indemnify every other
-Contributor ("Indemnified Contributor") against any losses, damages and
-costs (collectively "Losses") arising from claims, lawsuits and other
-legal actions brought by a third party against the Indemnified Contributor to
-the extent caused by the acts or omissions of such Commercial Contributor in
-connection with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In order
-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor
-to control, and cooperate with the Commercial Contributor in, the defense and
-any related settlement negotiations. The Indemnified Contributor may participate
-in any such claim at its own expense.</span> </p>
-
-<p><span style='font-size:10.0pt'>For example, a Contributor might include the
-Program in a commercial product offering, Product X. That Contributor is then a
-Commercial Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance claims and
-warranties are such Commercial Contributor's responsibility alone. Under this
-section, the Commercial Contributor would have to defend claims against the
-other Contributors related to those performance claims and warranties, and if a
-court requires any other Contributor to pay any damages as a result, the
-Commercial Contributor must pay those damages.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>5. NO WARRANTY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and distributing the
-Program and assumes all risks associated with its exercise of rights under this
-Agreement , including but not limited to the risks and costs of program errors,
-compliance with applicable laws, damage to or loss of data, programs or
-equipment, and unavailability or interruption of operations. </span></p>
-
-<p><b><span style='font-size:10.0pt'>6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>7. GENERAL</span></b> </p>
-
-<p><span style='font-size:10.0pt'>If any provision of this Agreement is invalid
-or unenforceable under applicable law, it shall not affect the validity or
-enforceability of the remainder of the terms of this Agreement, and without
-further action by the parties hereto, such provision shall be reformed to the
-minimum extent necessary to make such provision valid and enforceable.</span> </p>
-
-<p><span style='font-size:10.0pt'>If Recipient institutes patent litigation
-against any entity (including a cross-claim or counterclaim in a lawsuit)
-alleging that the Program itself (excluding combinations of the Program with
-other software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the date
-such litigation is filed. </span></p>
-
-<p><span style='font-size:10.0pt'>All Recipient's rights under this Agreement
-shall terminate if it fails to comply with any of the material terms or
-conditions of this Agreement and does not cure such failure in a reasonable
-period of time after becoming aware of such noncompliance. If all Recipient's
-rights under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive. </span></p>
-
-<p><span style='font-size:10.0pt'>Everyone is permitted to copy and distribute
-copies of this Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The Agreement
-Steward reserves the right to publish new versions (including revisions) of
-this Agreement from time to time. No one other than the Agreement Steward has
-the right to modify this Agreement. The Eclipse Foundation is the initial
-Agreement Steward. The Eclipse Foundation may assign the responsibility to
-serve as the Agreement Steward to a suitable separate entity. Each new version
-of the Agreement will be given a distinguishing version number. The Program
-(including Contributions) may always be distributed subject to the version of
-the Agreement under which it was received. In addition, after a new version of
-the Agreement is published, Contributor may elect to distribute the Program
-(including its Contributions) under the new version. Except as expressly stated
-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
-the intellectual property of any Contributor under this Agreement, whether
-expressly, by implication, estoppel or otherwise. All rights in the Program not
-expressly granted under this Agreement are reserved.</span> </p>
-
-<p><span style='font-size:10.0pt'>This Agreement is governed by the laws of the
-State of New York and the intellectual property laws of the United States of
-America. No party to this Agreement will bring a legal action under this
-Agreement more than one year after the cause of action arose. Each party waives
-its rights to a jury trial in any resulting litigation.</span> </p>
-
-<p class=MsoNormal><![if !supportEmptyParas]> <![endif]><o:p></o:p></p>
-
-</div>
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/features/org.eclipse.jst.ws.jaxws.feature/sourceTemplateFeature/feature.properties b/features/org.eclipse.jst.ws.jaxws.feature/sourceTemplateFeature/feature.properties
deleted file mode 100644
index c43a8b3..0000000
--- a/features/org.eclipse.jst.ws.jaxws.feature/sourceTemplateFeature/feature.properties
+++ /dev/null
@@ -1,144 +0,0 @@
-###############################################################################
-# Copyright (c) 2008, 2009 Eclipse contributors and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# Shane Clarke - initial API and implementation
-###############################################################################
-# feature.properties
-# contains externalized strings for feature.xml
-# "%foo" in feature.xml corresponds to the key "foo" in this file
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# This file should be translated.
-
-# "featureName" property - name of the feature
-featureName=JAX-WS Tools Developer Resources (Incubation)
-
-# "featureProvider" property - name of the company that provides the feature
-featureProvider=Eclipse Web Tools Platform
-
-# "description" property - description of the feature
-description=Source code for JAX-WS Tools
-
-# "updateSiteName" property - label for the update site
-updateSiteName=The Eclipse Web Tools Platform (WTP) Project update site
-
-# "copyright" property - text of the "Feature Update Copyright"
-copyright=\
- Copyright (c) 2008, 2009 Eclipse contributors and others.\n\
- All rights reserved. This program and the accompanying materials\n\
- are made available under the terms of the Eclipse Public License v1.0\n\
- which accompanies this distribution, and is available at\n\
- http://www.eclipse.org/legal/epl-v10.html\n\
-\n\
-Contributors:\n\
- Shane Clarke - initial API and implementation\n
-################ end of copyright property ####################################
-
-# "licenseURL" property - URL of the "Feature License"
-# do not translate value - just change to point to a locale-specific HTML page
-licenseURL=epl-v10.html
-
-# "license" property - text of the "Feature Update License"
-# should be plain text version of license agreement pointed to be "licenseURL"
-license=\
-ECLIPSE FOUNDATION SOFTWARE USER AGREEMENT\n\
-March 17, 2005\n\
-\n\
-Usage Of Content\n\
-\n\
-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
-OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
-USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
-AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU\n\
-AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
-AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
-OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
-OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
-BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
-\n\
-Applicable Licenses\n\
-\n\
-Unless otherwise indicated, all Content made available by the Eclipse Foundation\n\
-is provided to you under the terms and conditions of the Eclipse Public\n\
-License Version 1.0 ("EPL"). A copy of the EPL is provided with this\n\
-Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
-For purposes of the EPL, "Program" will mean the Content.\n\
-\n\
-Content includes, but is not limited to, source code, object code,\n\
-documentation and other files maintained in the Eclipse.org CVS\n\
-repository ("Repository") in CVS modules ("Modules") and made available\n\
-as downloadable archives ("Downloads").\n\
-\n\
- - Content may be structured and packaged into modules to facilitate delivering,\n\
- extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
- plug-in fragments ("Fragments"), and features ("Features").\n\
- - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java? ARchive)\n\
- in a directory named "plugins".\n\
- - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
- Each Feature may be packaged as a sub-directory in a directory named "features".\n\
- Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
- numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
- - Features may also include other Features ("Included Features"). Within a Feature, files\n\
- named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
-\n\
-Features may also include other Features ("Included Features"). Files named\n\
-"feature.xml" may contain a list of the names and version numbers of\n\
-Included Features.\n\
-\n\
-The terms and conditions governing Plug-ins and Fragments should be\n\
-contained in files named "about.html" ("Abouts"). The terms and\n\
-conditions governing Features and Included Features should be contained\n\
-in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
-Licenses may be located in any directory of a Download or Module\n\
-including, but not limited to the following locations:\n\
-\n\
- - The top-level (root) directory\n\
- - Plug-in and Fragment directories\n\
- - Inside Plug-ins and Fragments packaged as JARs\n\
- - Sub-directories of the directory named "src" of certain Plug-ins\n\
- - Feature directories\n\
-\n\
-Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
-Eclipse Update Manager, you must agree to a license ("Feature Update\n\
-License") during the installation process. If the Feature contains\n\
-Included Features, the Feature Update License should either provide you\n\
-with the terms and conditions governing the Included Features or inform\n\
-you where you can locate them. Feature Update Licenses may be found in\n\
-the "license" property of files named "feature.properties". Such Abouts,\n\
-Feature Licenses and Feature Update Licenses contain the terms and\n\
-conditions (or references to such terms and conditions) that govern your\n\
-use of the associated Content in that directory.\n\
-\n\
-THE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER\n\
-TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
-SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
-\n\
- - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
- - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
- - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
- - IBM Public License 1.0 (available at http://oss.software.ibm.com/developerworks/opensource/license10.html)\n\
- - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
- - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
-\n\
-IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
-TO USE OF THE CONTENT. If no About, Feature License or Feature Update License\n\
-is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
-govern that particular Content.\n\
-\n\
-Cryptography\n\
-\n\
-Content may contain encryption software. The country in which you are\n\
-currently may have restrictions on the import, possession, and use,\n\
-and/or re-export to another country, of encryption software. BEFORE\n\
-using any encryption software, please check the country's laws,\n\
-regulations and policies concerning the import, possession, or use,\n\
-and re-export of encryption software, to see if this is permitted.\n\
-\n\
-Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.\n
-########### end of license property ##########################################
diff --git a/features/org.eclipse.jst.ws.jaxws.feature/sourceTemplateFeature/license.html b/features/org.eclipse.jst.ws.jaxws.feature/sourceTemplateFeature/license.html
deleted file mode 100644
index c6af966..0000000
--- a/features/org.eclipse.jst.ws.jaxws.feature/sourceTemplateFeature/license.html
+++ /dev/null
@@ -1,79 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=iso-8859-1">
-<title>Eclipse.org Software User Agreement</title>
-</head>
-
-<body lang="EN-US" link=blue vlink=purple>
-<h2>Eclipse Foundation Software User Agreement</h2>
-<p>March 17, 2005</p>
-
-<h3>Usage Of Content</h3>
-
-<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
- (COLLECTIVELY "CONTENT"). USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
- CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU AGREE THAT YOUR USE
- OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
- NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
- CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
-
-<h3>Applicable Licenses</h3>
-
-<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0
- ("EPL"). A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
- For purposes of the EPL, "Program" will mean the Content.</p>
-
-<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse.org CVS repository ("Repository") in CVS
- modules ("Modules") and made available as downloadable archives ("Downloads").</p>
-
-<ul>
- <li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"), plug-in fragments ("Fragments"), and features ("Features").</li>
- <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java™ ARchive) in a directory named "plugins".</li>
- <li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material. Each Feature may be packaged as a sub-directory in a directory named "features". Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of the Plug-ins
- and/or Fragments associated with that Feature.</li>
- <li>Features may also include other Features ("Included Features"). Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of Included Features.</li>
-</ul>
-
-<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named "about.html" ("Abouts"). The terms and conditions governing Features and
-Included Features should be contained in files named "license.html" ("Feature Licenses"). Abouts and Feature Licenses may be located in any directory of a Download or Module
-including, but not limited to the following locations:</p>
-
-<ul>
- <li>The top-level (root) directory</li>
- <li>Plug-in and Fragment directories</li>
- <li>Inside Plug-ins and Fragments packaged as JARs</li>
- <li>Sub-directories of the directory named "src" of certain Plug-ins</li>
- <li>Feature directories</li>
-</ul>
-
-<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Eclipse Update Manager, you must agree to a license ("Feature Update License") during the
-installation process. If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
-inform you where you can locate them. Feature Update Licenses may be found in the "license" property of files named "feature.properties" found within a Feature.
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
-that directory.</p>
-
-<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS. SOME OF THESE
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
-
-<ul>
- <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
- <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
- <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
- <li>IBM Public License 1.0 (available at <a href="http://oss.software.ibm.com/developerworks/opensource/license10.html">http://oss.software.ibm.com/developerworks/opensource/license10.html</a>)</li>
- <li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>
- <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
-</ul>
-
-<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License is provided, please
-contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
-
-<h3>Cryptography</h3>
-
-<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
- another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
- possession, or use, and re-export of encryption software, to see if this is permitted.</p>
-
-<small>Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.</small>
-</body>
-</html>
diff --git a/features/org.eclipse.jst.ws.jaxws.feature/sourceTemplatePlugin/about.html b/features/org.eclipse.jst.ws.jaxws.feature/sourceTemplatePlugin/about.html
deleted file mode 100644
index 5b6a031..0000000
--- a/features/org.eclipse.jst.ws.jaxws.feature/sourceTemplatePlugin/about.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
-<title>About</title>
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
-
-<p>February 19, 2009</p>
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, "Program" will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is
-being redistributed by another party ("Redistributor") and different terms and conditions may
-apply to your use of any object code in the Content. Check the Redistributor's license that was
-provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
-
-</body>
-</html>
diff --git a/features/org.eclipse.jst.ws.jaxws.feature/sourceTemplatePlugin/about.ini b/features/org.eclipse.jst.ws.jaxws.feature/sourceTemplatePlugin/about.ini
deleted file mode 100644
index 61fefeb..0000000
--- a/features/org.eclipse.jst.ws.jaxws.feature/sourceTemplatePlugin/about.ini
+++ /dev/null
@@ -1,12 +0,0 @@
-# about.ini
-# contains information about a feature
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# "%key" are externalized strings defined in about.properties
-# This file does not need to be translated.
-
-# Property "aboutText" contains blurb for feature details in the "About"
-# dialog (translated). Maximum 15 lines and 75 characters per line.
-aboutText=%blurb
-
-# Property "featureImage" contains path to feature image (32x32)
-featureImage=wtp_prod32.png
diff --git a/features/org.eclipse.jst.ws.jaxws.feature/sourceTemplatePlugin/about.mappings b/features/org.eclipse.jst.ws.jaxws.feature/sourceTemplatePlugin/about.mappings
deleted file mode 100644
index a28390a..0000000
--- a/features/org.eclipse.jst.ws.jaxws.feature/sourceTemplatePlugin/about.mappings
+++ /dev/null
@@ -1,6 +0,0 @@
-# about.mappings
-# contains fill-ins for about.properties
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# This file does not need to be translated.
-
-0=@build@
diff --git a/features/org.eclipse.jst.ws.jaxws.feature/sourceTemplatePlugin/about.properties b/features/org.eclipse.jst.ws.jaxws.feature/sourceTemplatePlugin/about.properties
deleted file mode 100644
index dfc6146..0000000
--- a/features/org.eclipse.jst.ws.jaxws.feature/sourceTemplatePlugin/about.properties
+++ /dev/null
@@ -1,26 +0,0 @@
-###############################################################################
-# Copyright (c) 2009 Shane Clarke and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# Shane Clarke - initial API and implementation
-###############################################################################
-# about.properties
-# contains externalized strings for about.ini
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# fill-ins are supplied by about.mappings
-# This file should be translated.
-#
-# Do not translate any values surrounded by {}
-
-blurb=JAX-WS Tools Source (Incubation)\n\
-\n\
-Version: {featureVersion}\n\
-Build id: {0}\n\
-\n\
-(c) Copyright Eclipse contributors and others 2008, 2009. All rights reserved.\n\
-Visit http://www.eclipse.org/webtools/incubator/\n\
-\n
diff --git a/features/org.eclipse.jst.ws.jaxws.feature/sourceTemplatePlugin/build.properties b/features/org.eclipse.jst.ws.jaxws.feature/sourceTemplatePlugin/build.properties
deleted file mode 100644
index ead512d..0000000
--- a/features/org.eclipse.jst.ws.jaxws.feature/sourceTemplatePlugin/build.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-bin.includes = about.html, about.ini, about.mappings, about.properties, wtp_prod32.png, plugin.properties, plugin.xml, src/**, META-INF/
-sourcePlugin = true
diff --git a/features/org.eclipse.jst.ws.jaxws.feature/sourceTemplatePlugin/plugin.properties b/features/org.eclipse.jst.ws.jaxws.feature/sourceTemplatePlugin/plugin.properties
deleted file mode 100644
index 798aebe..0000000
--- a/features/org.eclipse.jst.ws.jaxws.feature/sourceTemplatePlugin/plugin.properties
+++ /dev/null
@@ -1,14 +0,0 @@
-###############################################################################
-# Copyright (c) 2009 Shane Clarke and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# Shane Clarke - initial API and implementation
-###############################################################################
-
-#properties file for JAXWS Core
-pluginName=JAX-WS Tools Source (Incubation)
-pluginProvider=Eclipse Web Tools Platform
diff --git a/features/org.eclipse.jst.ws.jaxws.feature/sourceTemplatePlugin/wtp_prod32.gif b/features/org.eclipse.jst.ws.jaxws.feature/sourceTemplatePlugin/wtp_prod32.gif
deleted file mode 100644
index eefb44a..0000000
--- a/features/org.eclipse.jst.ws.jaxws.feature/sourceTemplatePlugin/wtp_prod32.gif
+++ /dev/null
Binary files differ
diff --git a/features/org.eclipse.jst.ws.jaxws.feature/sourceTemplatePlugin/wtp_prod32.png b/features/org.eclipse.jst.ws.jaxws.feature/sourceTemplatePlugin/wtp_prod32.png
deleted file mode 100644
index bfceab3..0000000
--- a/features/org.eclipse.jst.ws.jaxws.feature/sourceTemplatePlugin/wtp_prod32.png
+++ /dev/null
Binary files differ
diff --git a/features/org.eclipse.jst.ws.jaxws_sdk.feature/.project b/features/org.eclipse.jst.ws.jaxws_sdk.feature/.project
deleted file mode 100644
index d823533..0000000
--- a/features/org.eclipse.jst.ws.jaxws_sdk.feature/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.jst.ws.jaxws_sdk.feature</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.pde.FeatureBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.FeatureNature</nature>
- </natures>
-</projectDescription>
diff --git a/features/org.eclipse.jst.ws.jaxws_sdk.feature/build.properties b/features/org.eclipse.jst.ws.jaxws_sdk.feature/build.properties
deleted file mode 100644
index a4a2a8c..0000000
--- a/features/org.eclipse.jst.ws.jaxws_sdk.feature/build.properties
+++ /dev/null
@@ -1,7 +0,0 @@
-bin.includes = feature.xml,\
- eclipse_update_120.jpg,\
- epl-v10.html,\
- feature.properties,\
- license.html
-
-generate.feature@org.eclipse.jst.ws.jaxws.feature.source=org.eclipse.jst.ws.jaxws.feature
diff --git a/features/org.eclipse.jst.ws.jaxws_sdk.feature/eclipse_update_120.jpg b/features/org.eclipse.jst.ws.jaxws_sdk.feature/eclipse_update_120.jpg
deleted file mode 100644
index bfdf708..0000000
--- a/features/org.eclipse.jst.ws.jaxws_sdk.feature/eclipse_update_120.jpg
+++ /dev/null
Binary files differ
diff --git a/features/org.eclipse.jst.ws.jaxws_sdk.feature/epl-v10.html b/features/org.eclipse.jst.ws.jaxws_sdk.feature/epl-v10.html
deleted file mode 100644
index ed4b196..0000000
--- a/features/org.eclipse.jst.ws.jaxws_sdk.feature/epl-v10.html
+++ /dev/null
@@ -1,328 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office"
-xmlns:w="urn:schemas-microsoft-com:office:word"
-xmlns="http://www.w3.org/TR/REC-html40">
-
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=windows-1252">
-<meta name=ProgId content=Word.Document>
-<meta name=Generator content="Microsoft Word 9">
-<meta name=Originator content="Microsoft Word 9">
-<link rel=File-List
-href="./Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">
-<title>Eclipse Public License - Version 1.0</title>
-<!--[if gte mso 9]><xml>
- <o:DocumentProperties>
- <o:Revision>2</o:Revision>
- <o:TotalTime>3</o:TotalTime>
- <o:Created>2004-03-05T23:03:00Z</o:Created>
- <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
- <o:Pages>4</o:Pages>
- <o:Words>1626</o:Words>
- <o:Characters>9270</o:Characters>
- <o:Lines>77</o:Lines>
- <o:Paragraphs>18</o:Paragraphs>
- <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
- <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
- <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-<style>
-<!--
- /* Font Definitions */
-@font-face
- {font-family:Tahoma;
- panose-1:2 11 6 4 3 5 4 4 2 4;
- mso-font-charset:0;
- mso-generic-font-family:swiss;
- mso-font-pitch:variable;
- mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
- {mso-style-parent:"";
- margin:0in;
- margin-bottom:.0001pt;
- mso-pagination:widow-orphan;
- font-size:12.0pt;
- font-family:"Times New Roman";
- mso-fareast-font-family:"Times New Roman";}
-p
- {margin-right:0in;
- mso-margin-top-alt:auto;
- mso-margin-bottom-alt:auto;
- margin-left:0in;
- mso-pagination:widow-orphan;
- font-size:12.0pt;
- font-family:"Times New Roman";
- mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
- {mso-style-name:"Balloon Text";
- margin:0in;
- margin-bottom:.0001pt;
- mso-pagination:widow-orphan;
- font-size:8.0pt;
- font-family:Tahoma;
- mso-fareast-font-family:"Times New Roman";}
-@page Section1
- {size:8.5in 11.0in;
- margin:1.0in 1.25in 1.0in 1.25in;
- mso-header-margin:.5in;
- mso-footer-margin:.5in;
- mso-paper-source:0;}
-div.Section1
- {page:Section1;}
--->
-</style>
-</head>
-
-<body lang=EN-US style='tab-interval:.5in'>
-
-<div class=Section1>
-
-<p align=center style='text-align:center'><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style='font-size:10.0pt'>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>1. DEFINITIONS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>"Contribution" means:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear=left>
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-changes to the Program, and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-additions to the Program;</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>where
-such changes and/or additions to the Program originate from and are distributed
-by that particular Contributor. A Contribution 'originates' from a Contributor
-if it was added to the Program by such Contributor itself or anyone acting on
-such Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in conjunction
-with the Program under their own license agreement, and (ii) are not derivative
-works of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>"Contributor" means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style='font-size:10.0pt'>"Licensed Patents " mean patent
-claims licensable by a Contributor which are necessarily infringed by the use
-or sale of its Contribution alone or when combined with the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>"Program" means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style='font-size:10.0pt'>"Recipient" means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>2. GRANT OF RIGHTS</span></b> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span
-style='color:red'> </span>reproduce, prepare derivative works of, publicly
-display, publicly perform, distribute and sublicense the Contribution of such
-Contributor, if any, and such derivative works, in source code and object code
-form.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style='color:green'> </span>royalty-free
-patent license under Licensed Patents to make, use, sell, offer to sell, import
-and otherwise transfer the Contribution of such Contributor, if any, in source
-code and object code form. This patent license shall apply to the combination
-of the Contribution and the Program if, at the time the Contribution is added
-by the Contributor, such addition of the Contribution causes such combination
-to be covered by the Licensed Patents. The patent license shall not apply to
-any other combinations which include the Contribution. No hardware per se is
-licensed hereunder. </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>c)
-Recipient understands that although each Contributor grants the licenses to its
-Contributions set forth herein, no assurances are provided by any Contributor
-that the Program does not infringe the patent or other intellectual property
-rights of any other entity. Each Contributor disclaims any liability to Recipient
-for claims brought by any other entity based on infringement of intellectual
-property rights or otherwise. As a condition to exercising the rights and
-licenses granted hereunder, each Recipient hereby assumes sole responsibility
-to secure any other intellectual property rights needed, if any. For example,
-if a third party patent license is required to allow Recipient to distribute
-the Program, it is Recipient's responsibility to acquire that license before
-distributing the Program.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>d)
-Each Contributor represents that to its knowledge it has sufficient copyright
-rights in its Contribution, if any, to grant the copyright license set forth in
-this Agreement. </span></p>
-
-<p><b><span style='font-size:10.0pt'>3. REQUIREMENTS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-its license agreement:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-effectively disclaims on behalf of all Contributors all warranties and
-conditions, express and implied, including warranties or conditions of title
-and non-infringement, and implied warranties or conditions of merchantability
-and fitness for a particular purpose; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iv)
-states that source code for the Program is available from such Contributor, and
-informs licensees how to obtain it in a reasonable manner on or through a
-medium customarily used for software exchange.<span style='color:blue'> </span></span></p>
-
-<p><span style='font-size:10.0pt'>When the Program is made available in source
-code form:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it must be made available under this Agreement; and </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Each Contributor must identify itself as the
-originator of its Contribution, if any, in a manner that reasonably allows
-subsequent Recipients to identify the originator of the Contribution. </span></p>
-
-<p><b><span style='font-size:10.0pt'>4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style='font-size:10.0pt'>Commercial distributors of software may
-accept certain responsibilities with respect to end users, business partners
-and the like. While this license is intended to facilitate the commercial use
-of the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create potential
-liability for other Contributors. Therefore, if a Contributor includes the
-Program in a commercial product offering, such Contributor ("Commercial
-Contributor") hereby agrees to defend and indemnify every other
-Contributor ("Indemnified Contributor") against any losses, damages and
-costs (collectively "Losses") arising from claims, lawsuits and other
-legal actions brought by a third party against the Indemnified Contributor to
-the extent caused by the acts or omissions of such Commercial Contributor in
-connection with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In order
-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor
-to control, and cooperate with the Commercial Contributor in, the defense and
-any related settlement negotiations. The Indemnified Contributor may participate
-in any such claim at its own expense.</span> </p>
-
-<p><span style='font-size:10.0pt'>For example, a Contributor might include the
-Program in a commercial product offering, Product X. That Contributor is then a
-Commercial Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance claims and
-warranties are such Commercial Contributor's responsibility alone. Under this
-section, the Commercial Contributor would have to defend claims against the
-other Contributors related to those performance claims and warranties, and if a
-court requires any other Contributor to pay any damages as a result, the
-Commercial Contributor must pay those damages.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>5. NO WARRANTY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and distributing the
-Program and assumes all risks associated with its exercise of rights under this
-Agreement , including but not limited to the risks and costs of program errors,
-compliance with applicable laws, damage to or loss of data, programs or
-equipment, and unavailability or interruption of operations. </span></p>
-
-<p><b><span style='font-size:10.0pt'>6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>7. GENERAL</span></b> </p>
-
-<p><span style='font-size:10.0pt'>If any provision of this Agreement is invalid
-or unenforceable under applicable law, it shall not affect the validity or
-enforceability of the remainder of the terms of this Agreement, and without
-further action by the parties hereto, such provision shall be reformed to the
-minimum extent necessary to make such provision valid and enforceable.</span> </p>
-
-<p><span style='font-size:10.0pt'>If Recipient institutes patent litigation
-against any entity (including a cross-claim or counterclaim in a lawsuit)
-alleging that the Program itself (excluding combinations of the Program with
-other software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the date
-such litigation is filed. </span></p>
-
-<p><span style='font-size:10.0pt'>All Recipient's rights under this Agreement
-shall terminate if it fails to comply with any of the material terms or
-conditions of this Agreement and does not cure such failure in a reasonable
-period of time after becoming aware of such noncompliance. If all Recipient's
-rights under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive. </span></p>
-
-<p><span style='font-size:10.0pt'>Everyone is permitted to copy and distribute
-copies of this Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The Agreement
-Steward reserves the right to publish new versions (including revisions) of
-this Agreement from time to time. No one other than the Agreement Steward has
-the right to modify this Agreement. The Eclipse Foundation is the initial
-Agreement Steward. The Eclipse Foundation may assign the responsibility to
-serve as the Agreement Steward to a suitable separate entity. Each new version
-of the Agreement will be given a distinguishing version number. The Program
-(including Contributions) may always be distributed subject to the version of
-the Agreement under which it was received. In addition, after a new version of
-the Agreement is published, Contributor may elect to distribute the Program
-(including its Contributions) under the new version. Except as expressly stated
-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
-the intellectual property of any Contributor under this Agreement, whether
-expressly, by implication, estoppel or otherwise. All rights in the Program not
-expressly granted under this Agreement are reserved.</span> </p>
-
-<p><span style='font-size:10.0pt'>This Agreement is governed by the laws of the
-State of New York and the intellectual property laws of the United States of
-America. No party to this Agreement will bring a legal action under this
-Agreement more than one year after the cause of action arose. Each party waives
-its rights to a jury trial in any resulting litigation.</span> </p>
-
-<p class=MsoNormal><![if !supportEmptyParas]> <![endif]><o:p></o:p></p>
-
-</div>
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/features/org.eclipse.jst.ws.jaxws_sdk.feature/feature.properties b/features/org.eclipse.jst.ws.jaxws_sdk.feature/feature.properties
deleted file mode 100644
index 90f2397..0000000
--- a/features/org.eclipse.jst.ws.jaxws_sdk.feature/feature.properties
+++ /dev/null
@@ -1,144 +0,0 @@
-###############################################################################
-# Copyright (c) 2008, 2009 Eclipse contributors and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# Shane Clarke - initial API and implementation
-###############################################################################
-# feature.properties
-# contains externalized strings for feature.xml
-# "%foo" in feature.xml corresponds to the key "foo" in this file
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# This file should be translated.
-
-# "featureName" property - name of the feature
-featureName=JAX-WS Tools SDK (Incubation)
-
-# "featureProvider" property - name of the company that provides the feature
-featureProvider=Eclipse Web Tools Platform
-
-# "description" property - description of the feature
-description=JAX-WS Tools Source
-
-# "updateSiteName" property - label for the update site
-updateSiteName=The Eclipse Web Tools Platform (WTP) Project update site
-
-# "copyright" property - text of the "Feature Update Copyright"
-copyright=\
- Copyright (c) 2008, 2009 Eclipse contributors and others.\n\
- All rights reserved. This program and the accompanying materials\n\
- are made available under the terms of the Eclipse Public License v1.0\n\
- which accompanies this distribution, and is available at\n\
- http://www.eclipse.org/legal/epl-v10.html\n\
-\n\
-Contributors:\n\
- Shane Clarke - initial API and implementation\n
-################ end of copyright property ####################################
-
-# "licenseURL" property - URL of the "Feature License"
-# do not translate value - just change to point to a locale-specific HTML page
-licenseURL=epl-v10.html
-
-# "license" property - text of the "Feature Update License"
-# should be plain text version of license agreement pointed to be "licenseURL"
-license=\
-ECLIPSE FOUNDATION SOFTWARE USER AGREEMENT\n\
-March 17, 2005\n\
-\n\
-Usage Of Content\n\
-\n\
-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
-OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
-USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
-AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU\n\
-AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
-AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
-OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
-OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
-BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
-\n\
-Applicable Licenses\n\
-\n\
-Unless otherwise indicated, all Content made available by the Eclipse Foundation\n\
-is provided to you under the terms and conditions of the Eclipse Public\n\
-License Version 1.0 ("EPL"). A copy of the EPL is provided with this\n\
-Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
-For purposes of the EPL, "Program" will mean the Content.\n\
-\n\
-Content includes, but is not limited to, source code, object code,\n\
-documentation and other files maintained in the Eclipse.org CVS\n\
-repository ("Repository") in CVS modules ("Modules") and made available\n\
-as downloadable archives ("Downloads").\n\
-\n\
- - Content may be structured and packaged into modules to facilitate delivering,\n\
- extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
- plug-in fragments ("Fragments"), and features ("Features").\n\
- - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java? ARchive)\n\
- in a directory named "plugins".\n\
- - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
- Each Feature may be packaged as a sub-directory in a directory named "features".\n\
- Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
- numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
- - Features may also include other Features ("Included Features"). Within a Feature, files\n\
- named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
-\n\
-Features may also include other Features ("Included Features"). Files named\n\
-"feature.xml" may contain a list of the names and version numbers of\n\
-Included Features.\n\
-\n\
-The terms and conditions governing Plug-ins and Fragments should be\n\
-contained in files named "about.html" ("Abouts"). The terms and\n\
-conditions governing Features and Included Features should be contained\n\
-in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
-Licenses may be located in any directory of a Download or Module\n\
-including, but not limited to the following locations:\n\
-\n\
- - The top-level (root) directory\n\
- - Plug-in and Fragment directories\n\
- - Inside Plug-ins and Fragments packaged as JARs\n\
- - Sub-directories of the directory named "src" of certain Plug-ins\n\
- - Feature directories\n\
-\n\
-Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
-Eclipse Update Manager, you must agree to a license ("Feature Update\n\
-License") during the installation process. If the Feature contains\n\
-Included Features, the Feature Update License should either provide you\n\
-with the terms and conditions governing the Included Features or inform\n\
-you where you can locate them. Feature Update Licenses may be found in\n\
-the "license" property of files named "feature.properties". Such Abouts,\n\
-Feature Licenses and Feature Update Licenses contain the terms and\n\
-conditions (or references to such terms and conditions) that govern your\n\
-use of the associated Content in that directory.\n\
-\n\
-THE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER\n\
-TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
-SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
-\n\
- - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
- - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
- - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
- - IBM Public License 1.0 (available at http://oss.software.ibm.com/developerworks/opensource/license10.html)\n\
- - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
- - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
-\n\
-IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
-TO USE OF THE CONTENT. If no About, Feature License or Feature Update License\n\
-is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
-govern that particular Content.\n\
-\n\
-Cryptography\n\
-\n\
-Content may contain encryption software. The country in which you are\n\
-currently may have restrictions on the import, possession, and use,\n\
-and/or re-export to another country, of encryption software. BEFORE\n\
-using any encryption software, please check the country's laws,\n\
-regulations and policies concerning the import, possession, or use,\n\
-and re-export of encryption software, to see if this is permitted.\n\
-\n\
-Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.\n
-########### end of license property ##########################################
diff --git a/features/org.eclipse.jst.ws.jaxws_sdk.feature/feature.xml b/features/org.eclipse.jst.ws.jaxws_sdk.feature/feature.xml
deleted file mode 100644
index 0f2b270..0000000
--- a/features/org.eclipse.jst.ws.jaxws_sdk.feature/feature.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
- id="org.eclipse.jst.ws.jaxws_sdk.feature"
- label="%featureName"
- version="0.5.2.qualifier"
- provider-name="%featureProvider"
- image="eclipse_update_120.jpg">
-
- <description>
- %description
- </description>
-
- <copyright>
- %copyright
- </copyright>
-
- <license url="%licenseURL">
- %license
- </license>
-
- <url>
- <update label="%updateSiteName" url="http://download.eclipse.org/webtools/updates"/>
- </url>
-
- <includes
- id="org.eclipse.jst.ws.jaxws.feature"
- version="0.0.0"/>
-
- <includes
- id="org.eclipse.jst.ws.jaxws.feature.source"
- version="0.0.0"/>
-
-</feature>
diff --git a/features/org.eclipse.jst.ws.jaxws_sdk.feature/license.html b/features/org.eclipse.jst.ws.jaxws_sdk.feature/license.html
deleted file mode 100644
index c6af966..0000000
--- a/features/org.eclipse.jst.ws.jaxws_sdk.feature/license.html
+++ /dev/null
@@ -1,79 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=iso-8859-1">
-<title>Eclipse.org Software User Agreement</title>
-</head>
-
-<body lang="EN-US" link=blue vlink=purple>
-<h2>Eclipse Foundation Software User Agreement</h2>
-<p>March 17, 2005</p>
-
-<h3>Usage Of Content</h3>
-
-<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
- (COLLECTIVELY "CONTENT"). USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
- CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU AGREE THAT YOUR USE
- OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
- NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
- CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
-
-<h3>Applicable Licenses</h3>
-
-<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0
- ("EPL"). A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
- For purposes of the EPL, "Program" will mean the Content.</p>
-
-<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse.org CVS repository ("Repository") in CVS
- modules ("Modules") and made available as downloadable archives ("Downloads").</p>
-
-<ul>
- <li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"), plug-in fragments ("Fragments"), and features ("Features").</li>
- <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java™ ARchive) in a directory named "plugins".</li>
- <li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material. Each Feature may be packaged as a sub-directory in a directory named "features". Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of the Plug-ins
- and/or Fragments associated with that Feature.</li>
- <li>Features may also include other Features ("Included Features"). Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of Included Features.</li>
-</ul>
-
-<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named "about.html" ("Abouts"). The terms and conditions governing Features and
-Included Features should be contained in files named "license.html" ("Feature Licenses"). Abouts and Feature Licenses may be located in any directory of a Download or Module
-including, but not limited to the following locations:</p>
-
-<ul>
- <li>The top-level (root) directory</li>
- <li>Plug-in and Fragment directories</li>
- <li>Inside Plug-ins and Fragments packaged as JARs</li>
- <li>Sub-directories of the directory named "src" of certain Plug-ins</li>
- <li>Feature directories</li>
-</ul>
-
-<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Eclipse Update Manager, you must agree to a license ("Feature Update License") during the
-installation process. If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
-inform you where you can locate them. Feature Update Licenses may be found in the "license" property of files named "feature.properties" found within a Feature.
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
-that directory.</p>
-
-<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS. SOME OF THESE
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
-
-<ul>
- <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
- <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
- <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
- <li>IBM Public License 1.0 (available at <a href="http://oss.software.ibm.com/developerworks/opensource/license10.html">http://oss.software.ibm.com/developerworks/opensource/license10.html</a>)</li>
- <li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>
- <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
-</ul>
-
-<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License is provided, please
-contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
-
-<h3>Cryptography</h3>
-
-<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
- another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
- possession, or use, and re-export of encryption software, to see if this is permitted.</p>
-
-<small>Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.</small>
-</body>
-</html>
diff --git a/features/org.eclipse.jst.ws.jaxws_tests.feature/.project b/features/org.eclipse.jst.ws.jaxws_tests.feature/.project
deleted file mode 100644
index ae2165c..0000000
--- a/features/org.eclipse.jst.ws.jaxws_tests.feature/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.jst.ws.jaxws_tests.feature</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.pde.FeatureBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.FeatureNature</nature>
- </natures>
-</projectDescription>
diff --git a/features/org.eclipse.jst.ws.jaxws_tests.feature/build.properties b/features/org.eclipse.jst.ws.jaxws_tests.feature/build.properties
deleted file mode 100644
index cb50260..0000000
--- a/features/org.eclipse.jst.ws.jaxws_tests.feature/build.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-bin.includes = feature.xml,\
- license.html,\
- feature.properties,\
- epl-v10.html,\
- eclipse_update_120.jpg
diff --git a/features/org.eclipse.jst.ws.jaxws_tests.feature/eclipse_update_120.jpg b/features/org.eclipse.jst.ws.jaxws_tests.feature/eclipse_update_120.jpg
deleted file mode 100644
index bfdf708..0000000
--- a/features/org.eclipse.jst.ws.jaxws_tests.feature/eclipse_update_120.jpg
+++ /dev/null
Binary files differ
diff --git a/features/org.eclipse.jst.ws.jaxws_tests.feature/epl-v10.html b/features/org.eclipse.jst.ws.jaxws_tests.feature/epl-v10.html
deleted file mode 100644
index ed4b196..0000000
--- a/features/org.eclipse.jst.ws.jaxws_tests.feature/epl-v10.html
+++ /dev/null
@@ -1,328 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office"
-xmlns:w="urn:schemas-microsoft-com:office:word"
-xmlns="http://www.w3.org/TR/REC-html40">
-
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=windows-1252">
-<meta name=ProgId content=Word.Document>
-<meta name=Generator content="Microsoft Word 9">
-<meta name=Originator content="Microsoft Word 9">
-<link rel=File-List
-href="./Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">
-<title>Eclipse Public License - Version 1.0</title>
-<!--[if gte mso 9]><xml>
- <o:DocumentProperties>
- <o:Revision>2</o:Revision>
- <o:TotalTime>3</o:TotalTime>
- <o:Created>2004-03-05T23:03:00Z</o:Created>
- <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
- <o:Pages>4</o:Pages>
- <o:Words>1626</o:Words>
- <o:Characters>9270</o:Characters>
- <o:Lines>77</o:Lines>
- <o:Paragraphs>18</o:Paragraphs>
- <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
- <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
- <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-<style>
-<!--
- /* Font Definitions */
-@font-face
- {font-family:Tahoma;
- panose-1:2 11 6 4 3 5 4 4 2 4;
- mso-font-charset:0;
- mso-generic-font-family:swiss;
- mso-font-pitch:variable;
- mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
- {mso-style-parent:"";
- margin:0in;
- margin-bottom:.0001pt;
- mso-pagination:widow-orphan;
- font-size:12.0pt;
- font-family:"Times New Roman";
- mso-fareast-font-family:"Times New Roman";}
-p
- {margin-right:0in;
- mso-margin-top-alt:auto;
- mso-margin-bottom-alt:auto;
- margin-left:0in;
- mso-pagination:widow-orphan;
- font-size:12.0pt;
- font-family:"Times New Roman";
- mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
- {mso-style-name:"Balloon Text";
- margin:0in;
- margin-bottom:.0001pt;
- mso-pagination:widow-orphan;
- font-size:8.0pt;
- font-family:Tahoma;
- mso-fareast-font-family:"Times New Roman";}
-@page Section1
- {size:8.5in 11.0in;
- margin:1.0in 1.25in 1.0in 1.25in;
- mso-header-margin:.5in;
- mso-footer-margin:.5in;
- mso-paper-source:0;}
-div.Section1
- {page:Section1;}
--->
-</style>
-</head>
-
-<body lang=EN-US style='tab-interval:.5in'>
-
-<div class=Section1>
-
-<p align=center style='text-align:center'><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style='font-size:10.0pt'>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>1. DEFINITIONS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>"Contribution" means:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear=left>
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-changes to the Program, and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-additions to the Program;</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>where
-such changes and/or additions to the Program originate from and are distributed
-by that particular Contributor. A Contribution 'originates' from a Contributor
-if it was added to the Program by such Contributor itself or anyone acting on
-such Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in conjunction
-with the Program under their own license agreement, and (ii) are not derivative
-works of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>"Contributor" means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style='font-size:10.0pt'>"Licensed Patents " mean patent
-claims licensable by a Contributor which are necessarily infringed by the use
-or sale of its Contribution alone or when combined with the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>"Program" means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style='font-size:10.0pt'>"Recipient" means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>2. GRANT OF RIGHTS</span></b> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span
-style='color:red'> </span>reproduce, prepare derivative works of, publicly
-display, publicly perform, distribute and sublicense the Contribution of such
-Contributor, if any, and such derivative works, in source code and object code
-form.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style='color:green'> </span>royalty-free
-patent license under Licensed Patents to make, use, sell, offer to sell, import
-and otherwise transfer the Contribution of such Contributor, if any, in source
-code and object code form. This patent license shall apply to the combination
-of the Contribution and the Program if, at the time the Contribution is added
-by the Contributor, such addition of the Contribution causes such combination
-to be covered by the Licensed Patents. The patent license shall not apply to
-any other combinations which include the Contribution. No hardware per se is
-licensed hereunder. </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>c)
-Recipient understands that although each Contributor grants the licenses to its
-Contributions set forth herein, no assurances are provided by any Contributor
-that the Program does not infringe the patent or other intellectual property
-rights of any other entity. Each Contributor disclaims any liability to Recipient
-for claims brought by any other entity based on infringement of intellectual
-property rights or otherwise. As a condition to exercising the rights and
-licenses granted hereunder, each Recipient hereby assumes sole responsibility
-to secure any other intellectual property rights needed, if any. For example,
-if a third party patent license is required to allow Recipient to distribute
-the Program, it is Recipient's responsibility to acquire that license before
-distributing the Program.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>d)
-Each Contributor represents that to its knowledge it has sufficient copyright
-rights in its Contribution, if any, to grant the copyright license set forth in
-this Agreement. </span></p>
-
-<p><b><span style='font-size:10.0pt'>3. REQUIREMENTS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-its license agreement:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-effectively disclaims on behalf of all Contributors all warranties and
-conditions, express and implied, including warranties or conditions of title
-and non-infringement, and implied warranties or conditions of merchantability
-and fitness for a particular purpose; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iv)
-states that source code for the Program is available from such Contributor, and
-informs licensees how to obtain it in a reasonable manner on or through a
-medium customarily used for software exchange.<span style='color:blue'> </span></span></p>
-
-<p><span style='font-size:10.0pt'>When the Program is made available in source
-code form:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it must be made available under this Agreement; and </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Each Contributor must identify itself as the
-originator of its Contribution, if any, in a manner that reasonably allows
-subsequent Recipients to identify the originator of the Contribution. </span></p>
-
-<p><b><span style='font-size:10.0pt'>4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style='font-size:10.0pt'>Commercial distributors of software may
-accept certain responsibilities with respect to end users, business partners
-and the like. While this license is intended to facilitate the commercial use
-of the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create potential
-liability for other Contributors. Therefore, if a Contributor includes the
-Program in a commercial product offering, such Contributor ("Commercial
-Contributor") hereby agrees to defend and indemnify every other
-Contributor ("Indemnified Contributor") against any losses, damages and
-costs (collectively "Losses") arising from claims, lawsuits and other
-legal actions brought by a third party against the Indemnified Contributor to
-the extent caused by the acts or omissions of such Commercial Contributor in
-connection with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In order
-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor
-to control, and cooperate with the Commercial Contributor in, the defense and
-any related settlement negotiations. The Indemnified Contributor may participate
-in any such claim at its own expense.</span> </p>
-
-<p><span style='font-size:10.0pt'>For example, a Contributor might include the
-Program in a commercial product offering, Product X. That Contributor is then a
-Commercial Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance claims and
-warranties are such Commercial Contributor's responsibility alone. Under this
-section, the Commercial Contributor would have to defend claims against the
-other Contributors related to those performance claims and warranties, and if a
-court requires any other Contributor to pay any damages as a result, the
-Commercial Contributor must pay those damages.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>5. NO WARRANTY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and distributing the
-Program and assumes all risks associated with its exercise of rights under this
-Agreement , including but not limited to the risks and costs of program errors,
-compliance with applicable laws, damage to or loss of data, programs or
-equipment, and unavailability or interruption of operations. </span></p>
-
-<p><b><span style='font-size:10.0pt'>6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>7. GENERAL</span></b> </p>
-
-<p><span style='font-size:10.0pt'>If any provision of this Agreement is invalid
-or unenforceable under applicable law, it shall not affect the validity or
-enforceability of the remainder of the terms of this Agreement, and without
-further action by the parties hereto, such provision shall be reformed to the
-minimum extent necessary to make such provision valid and enforceable.</span> </p>
-
-<p><span style='font-size:10.0pt'>If Recipient institutes patent litigation
-against any entity (including a cross-claim or counterclaim in a lawsuit)
-alleging that the Program itself (excluding combinations of the Program with
-other software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the date
-such litigation is filed. </span></p>
-
-<p><span style='font-size:10.0pt'>All Recipient's rights under this Agreement
-shall terminate if it fails to comply with any of the material terms or
-conditions of this Agreement and does not cure such failure in a reasonable
-period of time after becoming aware of such noncompliance. If all Recipient's
-rights under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive. </span></p>
-
-<p><span style='font-size:10.0pt'>Everyone is permitted to copy and distribute
-copies of this Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The Agreement
-Steward reserves the right to publish new versions (including revisions) of
-this Agreement from time to time. No one other than the Agreement Steward has
-the right to modify this Agreement. The Eclipse Foundation is the initial
-Agreement Steward. The Eclipse Foundation may assign the responsibility to
-serve as the Agreement Steward to a suitable separate entity. Each new version
-of the Agreement will be given a distinguishing version number. The Program
-(including Contributions) may always be distributed subject to the version of
-the Agreement under which it was received. In addition, after a new version of
-the Agreement is published, Contributor may elect to distribute the Program
-(including its Contributions) under the new version. Except as expressly stated
-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
-the intellectual property of any Contributor under this Agreement, whether
-expressly, by implication, estoppel or otherwise. All rights in the Program not
-expressly granted under this Agreement are reserved.</span> </p>
-
-<p><span style='font-size:10.0pt'>This Agreement is governed by the laws of the
-State of New York and the intellectual property laws of the United States of
-America. No party to this Agreement will bring a legal action under this
-Agreement more than one year after the cause of action arose. Each party waives
-its rights to a jury trial in any resulting litigation.</span> </p>
-
-<p class=MsoNormal><![if !supportEmptyParas]> <![endif]><o:p></o:p></p>
-
-</div>
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/features/org.eclipse.jst.ws.jaxws_tests.feature/feature.properties b/features/org.eclipse.jst.ws.jaxws_tests.feature/feature.properties
deleted file mode 100644
index f1e2aef..0000000
--- a/features/org.eclipse.jst.ws.jaxws_tests.feature/feature.properties
+++ /dev/null
@@ -1,144 +0,0 @@
-###############################################################################
-# Copyright (c) 2008, 2009 Eclipse contributors and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# Shane Clarke - initial API and implementation
-###############################################################################
-# feature.properties
-# contains externalized strings for feature.xml
-# "%foo" in feature.xml corresponds to the key "foo" in this file
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# This file should be translated.
-
-# "featureName" property - name of the feature
-featureName=JAX-WS Tools Tests (Incubation)
-
-# "featureProvider" property - name of the company that provides the feature
-featureProvider=Eclipse Web Tools Platform
-
-# "description" property - description of the feature
-description=JAX-WS Tools Tests
-
-# "updateSiteName" property - label for the update site
-updateSiteName=The Eclipse Web Tools Platform (WTP) Project update site
-
-# "copyright" property - text of the "Feature Update Copyright"
-copyright=\
- Copyright (c) 2008, 2009 Eclipse contributors and others.\n\
- All rights reserved. This program and the accompanying materials\n\
- are made available under the terms of the Eclipse Public License v1.0\n\
- which accompanies this distribution, and is available at\n\
- http://www.eclipse.org/legal/epl-v10.html\n\
-\n\
-Contributors:\n\
- Shane Clarke - initial API and implementation\n
-################ end of copyright property ####################################
-
-# "licenseURL" property - URL of the "Feature License"
-# do not translate value - just change to point to a locale-specific HTML page
-licenseURL=epl-v10.html
-
-# "license" property - text of the "Feature Update License"
-# should be plain text version of license agreement pointed to be "licenseURL"
-license=\
-ECLIPSE FOUNDATION SOFTWARE USER AGREEMENT\n\
-March 17, 2005\n\
-\n\
-Usage Of Content\n\
-\n\
-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
-OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
-USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
-AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU\n\
-AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
-AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
-OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
-OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
-BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
-\n\
-Applicable Licenses\n\
-\n\
-Unless otherwise indicated, all Content made available by the Eclipse Foundation\n\
-is provided to you under the terms and conditions of the Eclipse Public\n\
-License Version 1.0 ("EPL"). A copy of the EPL is provided with this\n\
-Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
-For purposes of the EPL, "Program" will mean the Content.\n\
-\n\
-Content includes, but is not limited to, source code, object code,\n\
-documentation and other files maintained in the Eclipse.org CVS\n\
-repository ("Repository") in CVS modules ("Modules") and made available\n\
-as downloadable archives ("Downloads").\n\
-\n\
- - Content may be structured and packaged into modules to facilitate delivering,\n\
- extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
- plug-in fragments ("Fragments"), and features ("Features").\n\
- - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java? ARchive)\n\
- in a directory named "plugins".\n\
- - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
- Each Feature may be packaged as a sub-directory in a directory named "features".\n\
- Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
- numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
- - Features may also include other Features ("Included Features"). Within a Feature, files\n\
- named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
-\n\
-Features may also include other Features ("Included Features"). Files named\n\
-"feature.xml" may contain a list of the names and version numbers of\n\
-Included Features.\n\
-\n\
-The terms and conditions governing Plug-ins and Fragments should be\n\
-contained in files named "about.html" ("Abouts"). The terms and\n\
-conditions governing Features and Included Features should be contained\n\
-in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
-Licenses may be located in any directory of a Download or Module\n\
-including, but not limited to the following locations:\n\
-\n\
- - The top-level (root) directory\n\
- - Plug-in and Fragment directories\n\
- - Inside Plug-ins and Fragments packaged as JARs\n\
- - Sub-directories of the directory named "src" of certain Plug-ins\n\
- - Feature directories\n\
-\n\
-Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
-Eclipse Update Manager, you must agree to a license ("Feature Update\n\
-License") during the installation process. If the Feature contains\n\
-Included Features, the Feature Update License should either provide you\n\
-with the terms and conditions governing the Included Features or inform\n\
-you where you can locate them. Feature Update Licenses may be found in\n\
-the "license" property of files named "feature.properties". Such Abouts,\n\
-Feature Licenses and Feature Update Licenses contain the terms and\n\
-conditions (or references to such terms and conditions) that govern your\n\
-use of the associated Content in that directory.\n\
-\n\
-THE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER\n\
-TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
-SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
-\n\
- - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
- - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
- - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
- - IBM Public License 1.0 (available at http://oss.software.ibm.com/developerworks/opensource/license10.html)\n\
- - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
- - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
-\n\
-IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
-TO USE OF THE CONTENT. If no About, Feature License or Feature Update License\n\
-is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
-govern that particular Content.\n\
-\n\
-Cryptography\n\
-\n\
-Content may contain encryption software. The country in which you are\n\
-currently may have restrictions on the import, possession, and use,\n\
-and/or re-export to another country, of encryption software. BEFORE\n\
-using any encryption software, please check the country's laws,\n\
-regulations and policies concerning the import, possession, or use,\n\
-and re-export of encryption software, to see if this is permitted.\n\
-\n\
-Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.\n
-########### end of license property ##########################################
diff --git a/features/org.eclipse.jst.ws.jaxws_tests.feature/feature.xml b/features/org.eclipse.jst.ws.jaxws_tests.feature/feature.xml
deleted file mode 100644
index 0dd9aa5..0000000
--- a/features/org.eclipse.jst.ws.jaxws_tests.feature/feature.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
- id="org.eclipse.jst.ws.jaxws_tests.feature"
- label="%featureName"
- version="0.5.2.qualifier"
- provider-name="%featureProvider"
- image="eclipse_update_120.jpg">
-
- <description>
- %description
- </description>
-
- <copyright>
- %copyright
- </copyright>
-
- <license url="%licenseURL">
- %license
- </license>
-
- <url>
- <update label="%updateSiteName" url="http://download.eclipse.org/webtools/updates"/>
- </url>
-
- <plugin
- id="org.eclipse.jst.ws.jaxws.core.tests"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.jst.ws.jaxb.core.tests"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
-</feature>
diff --git a/features/org.eclipse.jst.ws.jaxws_tests.feature/license.html b/features/org.eclipse.jst.ws.jaxws_tests.feature/license.html
deleted file mode 100644
index c6af966..0000000
--- a/features/org.eclipse.jst.ws.jaxws_tests.feature/license.html
+++ /dev/null
@@ -1,79 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=iso-8859-1">
-<title>Eclipse.org Software User Agreement</title>
-</head>
-
-<body lang="EN-US" link=blue vlink=purple>
-<h2>Eclipse Foundation Software User Agreement</h2>
-<p>March 17, 2005</p>
-
-<h3>Usage Of Content</h3>
-
-<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
- (COLLECTIVELY "CONTENT"). USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
- CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU AGREE THAT YOUR USE
- OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
- NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
- CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
-
-<h3>Applicable Licenses</h3>
-
-<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0
- ("EPL"). A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
- For purposes of the EPL, "Program" will mean the Content.</p>
-
-<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse.org CVS repository ("Repository") in CVS
- modules ("Modules") and made available as downloadable archives ("Downloads").</p>
-
-<ul>
- <li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"), plug-in fragments ("Fragments"), and features ("Features").</li>
- <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java™ ARchive) in a directory named "plugins".</li>
- <li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material. Each Feature may be packaged as a sub-directory in a directory named "features". Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of the Plug-ins
- and/or Fragments associated with that Feature.</li>
- <li>Features may also include other Features ("Included Features"). Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of Included Features.</li>
-</ul>
-
-<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named "about.html" ("Abouts"). The terms and conditions governing Features and
-Included Features should be contained in files named "license.html" ("Feature Licenses"). Abouts and Feature Licenses may be located in any directory of a Download or Module
-including, but not limited to the following locations:</p>
-
-<ul>
- <li>The top-level (root) directory</li>
- <li>Plug-in and Fragment directories</li>
- <li>Inside Plug-ins and Fragments packaged as JARs</li>
- <li>Sub-directories of the directory named "src" of certain Plug-ins</li>
- <li>Feature directories</li>
-</ul>
-
-<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Eclipse Update Manager, you must agree to a license ("Feature Update License") during the
-installation process. If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
-inform you where you can locate them. Feature Update Licenses may be found in the "license" property of files named "feature.properties" found within a Feature.
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
-that directory.</p>
-
-<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS. SOME OF THESE
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
-
-<ul>
- <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
- <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
- <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
- <li>IBM Public License 1.0 (available at <a href="http://oss.software.ibm.com/developerworks/opensource/license10.html">http://oss.software.ibm.com/developerworks/opensource/license10.html</a>)</li>
- <li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>
- <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
-</ul>
-
-<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License is provided, please
-contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
-
-<h3>Cryptography</h3>
-
-<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
- another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
- possession, or use, and re-export of encryption software, to see if this is permitted.</p>
-
-<small>Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.</small>
-</body>
-</html>
diff --git a/tests/org.eclipse.jst.ws.cxf.tests/.classpath b/tests/org.eclipse.jst.ws.cxf.tests/.classpath
deleted file mode 100644
index 64c5e31..0000000
--- a/tests/org.eclipse.jst.ws.cxf.tests/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/tests/org.eclipse.jst.ws.cxf.tests/.cvsignore b/tests/org.eclipse.jst.ws.cxf.tests/.cvsignore
deleted file mode 100644
index ba077a4..0000000
--- a/tests/org.eclipse.jst.ws.cxf.tests/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-bin
diff --git a/tests/org.eclipse.jst.ws.cxf.tests/.project b/tests/org.eclipse.jst.ws.cxf.tests/.project
deleted file mode 100644
index bf045b5..0000000
--- a/tests/org.eclipse.jst.ws.cxf.tests/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.jst.ws.cxf.tests</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
diff --git a/tests/org.eclipse.jst.ws.cxf.tests/.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 2dc91fc..0000000
--- a/tests/org.eclipse.jst.ws.cxf.tests/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,16 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %Bundle-Name.0
-Bundle-SymbolicName: org.eclipse.jst.ws.cxf.tests
-Bundle-Version: 0.4.0.qualifier
-Bundle-Vendor: %Bundle-Vendor.0
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Bundle-Localization: plugin
-Require-Bundle: org.junit;bundle-version="[3.8.0,4.0.0)",
- org.eclipse.jst.ws.jaxws.core.tests;bundle-version="[0.5.0,0.6.0)",
- org.eclipse.jst.ws.jaxb.core.tests;bundle-version="[0.1.0,0.2.0)",
- org.eclipse.jst.ws.jaxws.dom.runtime.tests;bundle-version="[1.0.0,1.1.0)",
- org.eclipse.jst.ws.jaxws.dom.integration.tests;bundle-version="[1.0.0,1.1.0)",
- org.eclipse.jst.ws.jaxws.dom.ui.tests;bundle-version="[1.0.0,1.1.0)",
- org.eclipse.jst.ws.jaxws.utils.tests;bundle-version="[1.0.0,1.1.0)"
-Export-Package: org.eclipse.jst.ws.cxf.tests
diff --git a/tests/org.eclipse.jst.ws.cxf.tests/about.html b/tests/org.eclipse.jst.ws.cxf.tests/about.html
deleted file mode 100644
index 2199df3..0000000
--- a/tests/org.eclipse.jst.ws.cxf.tests/about.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<HTML>
-
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-
-<BODY lang="EN-US">
-
-<H3>About This Content</H3>
-
-<P>June, 2008</P>
-
-<H3>License</H3>
-
-<P>The Eclipse Foundation makes available all content in this plug-in
-("Content"). Unless otherwise indicated below, the Content is provided to you
-under the terms and conditions of the Eclipse Public License Version 1.0
-("EPL"). A copy of the EPL is available at
-<A href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/org/documents/epl-v10.php</A>.
-For purposes of the EPL, "Program" will mean the Content.</P>
-
-<P>If you did not receive this Content directly from the Eclipse Foundation, the
-Content is being redistributed by another party ("Redistributor") and different
-terms and conditions may apply to your use of any object code in the Content.
-Check the RedistributorÂ’s license that was provided with the Content. If no such
-license exists, contact the Redistributor. Unless otherwise indicated below, the
-terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at
-<A href="http://www.eclipse.org/">http://www.eclipse.org/</A>.</P>
-
-</BODY>
-</HTML>
diff --git a/tests/org.eclipse.jst.ws.cxf.tests/build.properties b/tests/org.eclipse.jst.ws.cxf.tests/build.properties
deleted file mode 100644
index 74f90d9..0000000
--- a/tests/org.eclipse.jst.ws.cxf.tests/build.properties
+++ /dev/null
@@ -1,18 +0,0 @@
-###############################################################################
-# Copyright (c) 2008 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
- .,\
- plugin.properties,\
- test.xml,\
- about.html
-source.. = src/
diff --git a/tests/org.eclipse.jst.ws.cxf.tests/plugin.properties b/tests/org.eclipse.jst.ws.cxf.tests/plugin.properties
deleted file mode 100644
index 4904242..0000000
--- a/tests/org.eclipse.jst.ws.cxf.tests/plugin.properties
+++ /dev/null
@@ -1,13 +0,0 @@
-###############################################################################
-# Copyright (c) 2008 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-#Properties file for org.eclipse.jst.ws.cxf.tests
-Bundle-Name.0 = Tests Plug-in
-Bundle-Vendor.0 = Eclipse Web Tools Platform
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.ws.cxf.tests/src/org/eclipse/jst/ws/cxf/tests/AllTestsSuite.java b/tests/org.eclipse.jst.ws.cxf.tests/src/org/eclipse/jst/ws/cxf/tests/AllTestsSuite.java
deleted file mode 100644
index 7644677..0000000
--- a/tests/org.eclipse.jst.ws.cxf.tests/src/org/eclipse/jst/ws/cxf/tests/AllTestsSuite.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.cxf.tests;
-
-import junit.framework.TestSuite;
-
-import org.eclipse.jst.ws.jaxb.core.tests.JAXBCoreTestSuite;
-import org.eclipse.jst.ws.jaxws.core.annotation.validation.tests.JAXWSAnnotationValidationTestSuite;
-import org.eclipse.jst.ws.jaxws.core.tests.JAXWSCoreTestSuite;
-
-/**
- * This class specifies all the bundles of this component that provide a test
- * suite to run during automated testing.
- */
-public class AllTestsSuite extends TestSuite {
-
-
- public AllTestsSuite() {
- super("All JAXWS and JAXB Test Suites");
- addTest(JAXWSCoreTestSuite.suite());
- addTest(JAXWSAnnotationValidationTestSuite.suite());
- addTest(JAXBCoreTestSuite.suite());
-
- //Adding JAX-WS DOM Tools test suites for a trial run
- addTest(org.eclipse.jst.ws.jaxws.dom.integration.tests.dom.AllTestsSuite.suite());
- addTest(org.eclipse.jst.ws.jaxws.dom.runtime.tests.AllTestsSuite.suite());
- addTest(org.eclipse.jst.ws.jaxws.dom.ui.tests.AllTestsSuite.suite());
- addTest(org.eclipse.jst.ws.jaxws.utils.tests.AllTestsSuite.suite());
- }
-
- /**
- * This is just need to run in a development environment workbench.
- */
- public void testAll() {
- // this method needs to exist, but doesn't really do anything
- // other than to signal to create an instance of this class.
- // The rest it automatic from the tests added in constructor.
-
- }
-}
diff --git a/tests/org.eclipse.jst.ws.cxf.tests/src/org/eclipse/jst/ws/cxf/tests/EasyTest.java b/tests/org.eclipse.jst.ws.cxf.tests/src/org/eclipse/jst/ws/cxf/tests/EasyTest.java
deleted file mode 100644
index 812e704..0000000
--- a/tests/org.eclipse.jst.ws.cxf.tests/src/org/eclipse/jst/ws/cxf/tests/EasyTest.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package org.eclipse.jst.ws.cxf.tests;
-
-import junit.framework.TestCase;
-
-public class EasyTest extends TestCase {
-
- /**
- * simple test just to always succeed to demonstrate tests are being called
- */
- public void testThatTestsRun() {
- assertTrue(true);
- }
-
-}
diff --git a/tests/org.eclipse.jst.ws.cxf.tests/test.xml b/tests/org.eclipse.jst.ws.cxf.tests/test.xml
deleted file mode 100644
index 58bafe4..0000000
--- a/tests/org.eclipse.jst.ws.cxf.tests/test.xml
+++ /dev/null
@@ -1,138 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project
- name="testsuite"
- default="run"
- basedir=".">
-
- <!--
- The following properties should be passed into this script
- so we'll fail fast if not.
- ${eclipse-home}
- ${buildDirectory}
- ${buildLabel}
- -->
-
- <fail
- message="Error: missing property. eclipse-home must be provided"
- unless="eclipse-home" />
- <fail
- message="Error: missing property. buildDirectory must be provided"
- unless="buildDirectory" />
- <fail
- message="Error: missing property. buildLabel must be provided"
- unless="buildLabel" />
-
- <!-- should be little need to change what's above -->
-
- <property
- name="plugin-name"
- value="org.eclipse.jst.ws.cxf.tests"/>
- <property
- name="classname"
- value="org.eclipse.jst.ws.cxf.tests.AllTestsSuite"/>
- <property
- name="testType"
- value="ui-test"/>
-
- <!-- should be little need to change what's below -->
- <echo
- message="basedir: ${basedir}"/>
- <echo
- message="eclipse-home: ${eclipse-home}"/>
- <echo
- message="buildDirectory: ${buildDirectory}"/>
- <echo
- message="plugin-name: ${plugin-name}"/>
- <echo
- message="classname: ${classname}"/>
- <echo
- message="testType ${testType}"/>
- <property
- name="library-file"
- value="${eclipse-home}/plugins/org.eclipse.test_3.1.0/library.xml"/>
- <property
- name="workspace"
- value="${eclipse-home}/junitworkspaces/${plugin-name}"/>
- <echo
- message="workspace: ${workspace}" />
- <!--
- This init target holds all initialization code that needs to be done
- for all tests that are to be run. Initialization for individual
- tests should be done within the body of the suite target.
- -->
- <target
- name="init">
- <tstamp/>
- <delete>
- <fileset
- dir="${eclipse-home}"
- includes="${plugin-name}.*xml"/>
- </delete>
- <!-- make directory, in case path doesn't exist yet -->
- <mkdir
- dir="${workspace}"/>
- <!-- but delete to make sure fresh contents-->
- <delete
- dir="${workspace}"
- quiet="true"/>
- </target>
-
- <!-- This target defines the tests that need to be run. -->
- <target
- name="suite">
- <ant
- target="${testType}"
- antfile="${library-file}"
- dir="${eclipse-home}">
- <property
- name="data-dir"
- value="${workspace}"/>
- <property
- name="plugin-name"
- value="${plugin-name}"/>
- <property
- name="classname"
- value="${classname}"/>
- <property
- name="plugin-path"
- value="${eclipse-home}/plugins/${plugin-name}"/>
- </ant>
- <copy
- failonerror="false"
- file="${workspace}/.metadata/.log"
- tofile="${buildDirectory}/${buildLabel}/testResults/consolelogs/${plugin-name}.consolelog.txt"/>
- </target>
-
- <!-- This target holds code to cleanup the testing environment after -->
- <!--
- after all of the tests have been run. You can use this target to
- -->
- <!-- delete temporary files that have been created. -->
- <target
- name="cleanup">
- <!--
- usually no need to delete workspace until next run, and
- leaving it allows inspection
- -->
- <!-- <delete dir="${workspace}" quiet="true" /> -->
- </target>
- <!--
- This target runs the test suite. Any actions that need to happen
- -->
- <!-- after all the tests have been run should go here. -->
- <target
- name="run"
- depends="init,suite,cleanup">
- <ant
- target="collect"
- antfile="${library-file}"
- dir="${eclipse-home}">
- <property
- name="includes"
- value="${plugin-name}.*xml"/>
- <property
- name="output-file"
- value="${plugin-name}.xml"/>
- </ant>
- </target>
-</project>
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.ws.jaxb.core.tests/.classpath b/tests/org.eclipse.jst.ws.jaxb.core.tests/.classpath
deleted file mode 100644
index f930cb7..0000000
--- a/tests/org.eclipse.jst.ws.jaxb.core.tests/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/tests/org.eclipse.jst.ws.jaxb.core.tests/.project b/tests/org.eclipse.jst.ws.jaxb.core.tests/.project
deleted file mode 100644
index 9ee4adc..0000000
--- a/tests/org.eclipse.jst.ws.jaxb.core.tests/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.jst.ws.jaxb.core.tests</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
diff --git a/tests/org.eclipse.jst.ws.jaxb.core.tests/.settings/org.eclipse.jdt.core.prefs b/tests/org.eclipse.jst.ws.jaxb.core.tests/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 9040021..0000000
--- a/tests/org.eclipse.jst.ws.jaxb.core.tests/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,8 +0,0 @@
-#Thu May 07 15:40:23 IST 2009
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.5
diff --git a/tests/org.eclipse.jst.ws.jaxb.core.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.jst.ws.jaxb.core.tests/META-INF/MANIFEST.MF
deleted file mode 100644
index 0596337..0000000
--- a/tests/org.eclipse.jst.ws.jaxb.core.tests/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,27 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.jst.ws.jaxb.core.tests
-Bundle-Version: 0.1.1.qualifier
-Bundle-Vendor: %pluginProvider
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Require-Bundle: org.junit;bundle-version="[3.8.0,4.0.0)",
- org.eclipse.wst.common.project.facet.core;bundle-version="[1.3.0,2.0.0)",
- org.eclipse.core.resources;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.jdt.core;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.jst.ws.jaxws.core;bundle-version="0.5.0",
- org.eclipse.jdt.launching;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.ltk.core.refactoring;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.ltk.ui.refactoring;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.jst.ws.annotations.core;bundle-version="0.5.0",
- org.eclipse.jdt.apt.core;bundle-version="[3.3.100,4.0.0)",
- org.eclipse.text;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.jdt.ui;bundle-version="[3.4.0,4.0.0)"
-Import-Package: javax.xml.bind;version="[2.1.0,2.2.0)",
- javax.xml.bind.annotation;version="[2.1.0,2.2.0)",
- javax.xml.bind.annotation.adapters;version="[2.1.0,2.2.0)",
- javax.xml.bind.attachment;version="[2.1.0,2.2.0)",
- javax.xml.bind.helpers;version="[2.1.0,2.2.0)",
- javax.xml.bind.util;version="[2.1.0,2.2.0)"
-Export-Package: org.eclipse.jst.ws.jaxb.core.tests
diff --git a/tests/org.eclipse.jst.ws.jaxb.core.tests/about.html b/tests/org.eclipse.jst.ws.jaxb.core.tests/about.html
deleted file mode 100644
index 5b6a031..0000000
--- a/tests/org.eclipse.jst.ws.jaxb.core.tests/about.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
-<title>About</title>
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
-
-<p>February 19, 2009</p>
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, "Program" will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is
-being redistributed by another party ("Redistributor") and different terms and conditions may
-apply to your use of any object code in the Content. Check the Redistributor's license that was
-provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
-
-</body>
-</html>
diff --git a/tests/org.eclipse.jst.ws.jaxb.core.tests/build.properties b/tests/org.eclipse.jst.ws.jaxb.core.tests/build.properties
deleted file mode 100644
index 9d3bc75..0000000
--- a/tests/org.eclipse.jst.ws.jaxb.core.tests/build.properties
+++ /dev/null
@@ -1,7 +0,0 @@
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
- .,\
- plugin.properties,\
- build.properties,\
- about.html
diff --git a/tests/org.eclipse.jst.ws.jaxb.core.tests/plugin.properties b/tests/org.eclipse.jst.ws.jaxb.core.tests/plugin.properties
deleted file mode 100644
index 50a7ea5..0000000
--- a/tests/org.eclipse.jst.ws.jaxb.core.tests/plugin.properties
+++ /dev/null
@@ -1,11 +0,0 @@
-###############################################################################
-# Copyright (c) 2009 Progress Software
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-###############################################################################
-
-#properties file for JAXB Tools Tests
-pluginName=JAXB Tools Tests (Incubation)
-providerName=Eclipse Web Tools Platform
diff --git a/tests/org.eclipse.jst.ws.jaxb.core.tests/src/org/eclipse/jst/ws/jaxb/core/tests/AbstractAnnotationTest.java b/tests/org.eclipse.jst.ws.jaxb.core.tests/src/org/eclipse/jst/ws/jaxb/core/tests/AbstractAnnotationTest.java
deleted file mode 100644
index a08e66f..0000000
--- a/tests/org.eclipse.jst.ws.jaxb.core.tests/src/org/eclipse/jst/ws/jaxb/core/tests/AbstractAnnotationTest.java
+++ /dev/null
@@ -1,87 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Progress Software
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxb.core.tests;
-
-import junit.framework.TestCase;
-
-import org.eclipse.core.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.jdt.ui.SharedASTProvider;
-import org.eclipse.ltk.core.refactoring.Change;
-import org.eclipse.ltk.core.refactoring.PerformChangeOperation;
-import org.eclipse.ltk.core.refactoring.TextFileChange;
-import org.eclipse.text.edits.MultiTextEdit;
-
-public abstract class AbstractAnnotationTest extends TestCase {
- protected TestJavaProject testJavaProject;
- protected ICompilationUnit source;
- protected CompilationUnit compilationUnit;
- protected AST ast;
- protected ASTRewrite rewriter;
- protected Annotation annotation;
- protected TextFileChange textFileChange;
-
- @Override
- protected void setUp() throws Exception {
- testJavaProject = new TestJavaProject("JavaProject");
- testJavaProject.setAutoBuilding(isAutoBuildingEnabled());
- testJavaProject.enableAnnotationProcessing(isAnnotationProcessingEnabled());
-
- source = testJavaProject.createCompilationUnit(getPackageName(), getClassName(), getClassContents());
-
- compilationUnit = SharedASTProvider.getAST(source, SharedASTProvider.WAIT_YES, null);
- ast = compilationUnit.getAST();
- rewriter = ASTRewrite.create(ast);
- annotation = getAnnotation();
- textFileChange = new TextFileChange("Add annotation", (IFile) source.getResource());
- MultiTextEdit multiTextEdit = new MultiTextEdit();
- textFileChange.setEdit(multiTextEdit);
- }
-
- protected boolean isAutoBuildingEnabled() {
- return false;
- }
-
- protected boolean isAnnotationProcessingEnabled() {
- return false;
- }
-
- protected abstract String getPackageName();
- protected abstract String getClassName();
- protected abstract String getClassContents();
- protected abstract Annotation getAnnotation();
-
- protected boolean executeChange(IProgressMonitor monitor, Change change) {
- if (change == null) {
- return false;
- }
-
- change.initializeValidationData(monitor);
-
- PerformChangeOperation changeOperation = new PerformChangeOperation(change);
-
- try {
- changeOperation.run(monitor);
- } catch (CoreException ce) {
- ce.printStackTrace();
- }
- return changeOperation.changeExecuted();
- }
-
- @Override
- protected void tearDown() throws Exception {
- testJavaProject.getProject().delete(true, true, null);
- }
-}
diff --git a/tests/org.eclipse.jst.ws.jaxb.core.tests/src/org/eclipse/jst/ws/jaxb/core/tests/AddAnnotationToPackageTest.java b/tests/org.eclipse.jst.ws.jaxb.core.tests/src/org/eclipse/jst/ws/jaxb/core/tests/AddAnnotationToPackageTest.java
deleted file mode 100644
index 016d91d..0000000
--- a/tests/org.eclipse.jst.ws.jaxb.core.tests/src/org/eclipse/jst/ws/jaxb/core/tests/AddAnnotationToPackageTest.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Progress Software
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Shane Clarke - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxb.core.tests;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.xml.bind.annotation.XmlSchema;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.jdt.core.IPackageDeclaration;
-import org.eclipse.jdt.core.dom.Annotation;
-import org.eclipse.jdt.core.dom.MemberValuePair;
-import org.eclipse.jst.ws.annotations.core.AnnotationsCore;
-import org.eclipse.jst.ws.annotations.core.utils.AnnotationUtils;
-
-public class AddAnnotationToPackageTest extends AbstractAnnotationTest {
-
- @Override
- public String getPackageName() {
- return "com.example";
- }
-
- @Override
- public String getClassName() {
- return "package-info.java";
- }
-
- @Override
- public String getClassContents() {
- return "package com.example;\n";
- }
-
- @Override
- public Annotation getAnnotation() {
- List<MemberValuePair> memberValuePairs = new ArrayList<MemberValuePair>();
-
- MemberValuePair locationVP = AnnotationsCore.createStringMemberValuePair(ast,
- "location", "uri:someSchema");
-
- MemberValuePair namespaceVP = AnnotationsCore.createStringMemberValuePair(ast,
- "namespace", "uri:testNS");
-
- memberValuePairs.add(locationVP);
- memberValuePairs.add(namespaceVP);
-
- return AnnotationsCore.createNormalAnnotation(ast, XmlSchema.class.getSimpleName(), memberValuePairs);
- }
-
- public void testAddAnnotationToPackage() {
- try {
- assertNotNull(annotation);
- assertEquals(XmlSchema.class.getSimpleName(), AnnotationUtils.getAnnotationName(annotation));
- IPackageDeclaration myPackage = source.getPackageDeclaration(getPackageName());
- assertNotNull(myPackage);
-
- textFileChange.addEdit(AnnotationUtils.createAddAnnotationTextEdit(myPackage, annotation));
- textFileChange.addEdit(AnnotationUtils.createAddImportTextEdit(myPackage, XmlSchema.class.getCanonicalName()));
-
- assertTrue(executeChange(new NullProgressMonitor(), textFileChange));
-
- assertTrue(AnnotationUtils.isAnnotationPresent(myPackage, AnnotationUtils.getAnnotationName(annotation)));
- assertTrue(source.getImport(XmlSchema.class.getCanonicalName()).exists());
- } catch (CoreException ce) {
- fail(ce.getLocalizedMessage());
- }
- }
-
-}
diff --git a/tests/org.eclipse.jst.ws.jaxb.core.tests/src/org/eclipse/jst/ws/jaxb/core/tests/JAXBCoreTestSuite.java b/tests/org.eclipse.jst.ws.jaxb.core.tests/src/org/eclipse/jst/ws/jaxb/core/tests/JAXBCoreTestSuite.java
deleted file mode 100644
index b7ea011..0000000
--- a/tests/org.eclipse.jst.ws.jaxb.core.tests/src/org/eclipse/jst/ws/jaxb/core/tests/JAXBCoreTestSuite.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Progress Software
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Oisin Hurley - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxb.core.tests;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-public class JAXBCoreTestSuite extends TestSuite {
-
- public static Test suite() {
- return new JAXBCoreTestSuite();
- }
-
- public JAXBCoreTestSuite() {
- super("JAXB Core Tests");
- addTestSuite(AddAnnotationToPackageTest.class);
- addTestSuite(RemoveAnnotationFromPackageTest.class);
- }
-
-}
diff --git a/tests/org.eclipse.jst.ws.jaxb.core.tests/src/org/eclipse/jst/ws/jaxb/core/tests/RemoveAnnotationFromPackageTest.java b/tests/org.eclipse.jst.ws.jaxb.core.tests/src/org/eclipse/jst/ws/jaxb/core/tests/RemoveAnnotationFromPackageTest.java
deleted file mode 100644
index fdaad71..0000000
--- a/tests/org.eclipse.jst.ws.jaxb.core.tests/src/org/eclipse/jst/ws/jaxb/core/tests/RemoveAnnotationFromPackageTest.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Progress Software
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxb.core.tests;
-
-import javax.xml.bind.annotation.XmlSchema;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.jdt.core.IPackageDeclaration;
-import org.eclipse.jdt.core.dom.Annotation;
-import org.eclipse.jst.ws.annotations.core.AnnotationsCore;
-import org.eclipse.jst.ws.annotations.core.utils.AnnotationUtils;
-
-public class RemoveAnnotationFromPackageTest extends AbstractAnnotationTest {
-
- @Override
- public String getPackageName() {
- return "com.example";
- }
-
- @Override
- public String getClassName() {
- return "package-info.java";
- }
-
- @Override
- public String getClassContents() {
- StringBuilder classContents = new StringBuilder("@XmlSchema\n\n");
- classContents.append("package com.example;\n\n");
- classContents.append("import javax.xml.bind.annotation.XmlSchema;\n\n");
- return classContents.toString();
- }
-
- @Override
- public Annotation getAnnotation() {
- return AnnotationsCore.createNormalAnnotation(ast, XmlSchema.class.getSimpleName(), null);
- }
-
- public void testRemoveAnnotationFromPackage() {
- try {
- assertNotNull(annotation);
- assertEquals(XmlSchema.class.getSimpleName(), AnnotationUtils.getAnnotationName(annotation));
- IPackageDeclaration myPackage = source.getPackageDeclaration(getPackageName());
- assertNotNull(myPackage);
-
- assertTrue(AnnotationUtils.isAnnotationPresent(myPackage, AnnotationUtils
- .getAnnotationName(annotation)));
-
- textFileChange.addEdit(AnnotationUtils.createRemoveAnnotationTextEdit(myPackage, annotation));
- textFileChange.addEdit(AnnotationUtils.createRemoveImportTextEdit(myPackage, XmlSchema.class.getCanonicalName()));
-
- assertTrue(executeChange(new NullProgressMonitor(), textFileChange));
-
- assertFalse(AnnotationUtils.isAnnotationPresent(myPackage, AnnotationUtils.getAnnotationName(annotation)));
- assertFalse(source.getImport(XmlSchema.class.getCanonicalName()).exists());
- } catch (CoreException ce) {
- fail(ce.getLocalizedMessage());
- }
- }
-}
diff --git a/tests/org.eclipse.jst.ws.jaxb.core.tests/src/org/eclipse/jst/ws/jaxb/core/tests/TestJavaProject.java b/tests/org.eclipse.jst.ws.jaxb.core.tests/src/org/eclipse/jst/ws/jaxb/core/tests/TestJavaProject.java
deleted file mode 100644
index fdf4fc4..0000000
--- a/tests/org.eclipse.jst.ws.jaxb.core.tests/src/org/eclipse/jst/ws/jaxb/core/tests/TestJavaProject.java
+++ /dev/null
@@ -1,124 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Progress Software
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxb.core.tests;
-
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IWorkspaceDescription;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.jdt.apt.core.util.AptConfig;
-import org.eclipse.jdt.core.IClasspathEntry;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IPackageFragment;
-import org.eclipse.jdt.core.IPackageFragmentRoot;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jdt.launching.IVMInstall;
-import org.eclipse.jdt.launching.IVMInstall2;
-import org.eclipse.jdt.launching.IVMInstallType;
-import org.eclipse.jdt.launching.JavaRuntime;
-
-public class TestJavaProject extends TestProject {
- private IJavaProject javaProject;
-
- public TestJavaProject(String projectName) throws CoreException {
- super(projectName);
- javaProject = JavaCore.create(getProject());
- addProjectNature(getProject(), JavaCore.NATURE_ID);
-
- javaProject.setRawClasspath(new IClasspathEntry[0], null);
-
- createSourceFolder();
- addToClasspath(javaProject, getJREContainerEntry());
- createOutputFolder();
- }
-
- public void setAutoBuilding(boolean autoBuild) throws CoreException {
- IWorkspaceDescription description = ResourcesPlugin.getWorkspace().getDescription();
- description.setAutoBuilding(autoBuild);
- ResourcesPlugin.getWorkspace().setDescription(description);
- }
-
- public void enableAnnotationProcessing(boolean enable) {
- AptConfig.setEnabled(javaProject, enable);
- }
-
- private IClasspathEntry getJREContainerEntry() {
- IVMInstall defaultVMInstall = JavaRuntime.getDefaultVMInstall();
- if (defaultVMInstall != null && isJava6OrGreaterJRE(defaultVMInstall)) {
- return JavaRuntime.getDefaultJREContainerEntry();
- }
-
- IVMInstallType[] installTypes = JavaRuntime.getVMInstallTypes();
- for (IVMInstallType installType : installTypes) {
- IVMInstall[] vmInstalls = installType.getVMInstalls();
- for (IVMInstall vmInstall : vmInstalls) {
- if (isJava6OrGreaterJRE(vmInstall)) {
- return JavaCore.newContainerEntry(JavaRuntime.newJREContainerPath(installType.getId(),
- vmInstall.getName()));
- }
- }
- }
-
- return JavaRuntime.getDefaultJREContainerEntry();
- }
-
- private boolean isJava6OrGreaterJRE(IVMInstall vmInstall) {
- if (vmInstall instanceof IVMInstall2) {
- IVMInstall2 vmInstall2 = (IVMInstall2) vmInstall;
- if (vmInstall2.getJavaVersion().compareTo(JavaCore.VERSION_1_6) > 0) {
- return true;
- }
- }
- return false;
- }
-
- public ICompilationUnit createCompilationUnit(String packageName, String name, String contents) throws JavaModelException {
- return getPackageFragment(packageName).createCompilationUnit(name, contents, false, monitor);
- }
-
- private IPackageFragment getPackageFragment(String packageName) throws JavaModelException {
- return getPackageFragmentRoot().createPackageFragment(packageName, true, monitor);
- }
-
- private IPackageFragmentRoot getPackageFragmentRoot() {
- return getJavaProject().getPackageFragmentRoot(getProject().getFolder("src"));
- }
-
- private void createSourceFolder() throws CoreException {
- IFolder srcDir = getProject().getFolder("src");
- mkdirs(srcDir);
- addToClasspath(javaProject, JavaCore.newSourceEntry(srcDir.getFullPath()));
- }
-
- private void createOutputFolder() throws CoreException {
- IFolder outputDir = getProject().getFolder("bin");
- mkdirs(outputDir);
- getJavaProject().setOutputLocation(outputDir.getFullPath(), monitor);
- }
-
- public IJavaProject getJavaProject() {
- return javaProject;
- }
-
- public void addToClasspath(IJavaProject javaProject, IClasspathEntry classpathEntry) {
- try {
- IClasspathEntry[] currentClasspathEntries = javaProject.getRawClasspath();
- IClasspathEntry[] newClasspathEntries = new IClasspathEntry[currentClasspathEntries.length + 1];
- System.arraycopy(currentClasspathEntries, 0, newClasspathEntries, 0,
- currentClasspathEntries.length);
- newClasspathEntries[currentClasspathEntries.length] = classpathEntry;
- javaProject.setRawClasspath(newClasspathEntries, new NullProgressMonitor());
- } catch (JavaModelException jme) {
- jme.printStackTrace();
- }
- }
-
-}
diff --git a/tests/org.eclipse.jst.ws.jaxb.core.tests/src/org/eclipse/jst/ws/jaxb/core/tests/TestProject.java b/tests/org.eclipse.jst.ws.jaxb.core.tests/src/org/eclipse/jst/ws/jaxb/core/tests/TestProject.java
deleted file mode 100644
index 0855e37..0000000
--- a/tests/org.eclipse.jst.ws.jaxb.core.tests/src/org/eclipse/jst/ws/jaxb/core/tests/TestProject.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Progress Software
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxb.core.tests;
-
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IProjectDescription;
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.NullProgressMonitor;
-
-public class TestProject {
- IProgressMonitor monitor = new NullProgressMonitor();
-
- private IProject testProject;
-
- public TestProject(String projectName) throws CoreException {
- IWorkspaceRoot workspaceRoot = ResourcesPlugin.getWorkspace().getRoot();
- testProject = workspaceRoot.getProject(projectName);
- testProject.create(monitor);
- testProject.open(monitor);
- }
-
- public IProject getProject() {
- return testProject;
- }
-
- public void addProjectNature(IProject project, String nature) {
- try {
- IProjectDescription projectDescription = project.getDescription();
- String[] previousNatures = projectDescription.getNatureIds();
- String[] newNatures = new String[previousNatures.length + 1];
- System.arraycopy(previousNatures, 0, newNatures, 0, previousNatures.length);
- newNatures[previousNatures.length] = nature;
- projectDescription.setNatureIds(newNatures);
- project.setDescription(projectDescription, null);
- } catch (CoreException ce) {
- ce.printStackTrace();
- }
- }
-
- public void mkdirs(final IFolder folder) throws CoreException {
- if (!folder.exists()) {
- if (folder.getParent() instanceof IFolder) {
- mkdirs((IFolder) folder.getParent());
- }
- folder.create(true, true, null);
- }
- }
-}
diff --git a/tests/org.eclipse.jst.ws.jaxws.core.tests/.classpath b/tests/org.eclipse.jst.ws.jaxws.core.tests/.classpath
deleted file mode 100644
index f930cb7..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.core.tests/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/tests/org.eclipse.jst.ws.jaxws.core.tests/.project b/tests/org.eclipse.jst.ws.jaxws.core.tests/.project
deleted file mode 100644
index cb43fcb..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.core.tests/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.jst.ws.jaxws.core.tests</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
diff --git a/tests/org.eclipse.jst.ws.jaxws.core.tests/.settings/org.eclipse.jdt.core.prefs b/tests/org.eclipse.jst.ws.jaxws.core.tests/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 9040021..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.core.tests/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,8 +0,0 @@
-#Thu May 07 15:40:23 IST 2009
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.5
diff --git a/tests/org.eclipse.jst.ws.jaxws.core.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.jst.ws.jaxws.core.tests/META-INF/MANIFEST.MF
deleted file mode 100644
index 1cc3aed..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.core.tests/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,25 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.jst.ws.jaxws.core.tests
-Bundle-Version: 0.5.1.qualifier
-Bundle-Vendor: %pluginProvider
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Require-Bundle: org.junit;bundle-version="[3.8.0,4.0.0)",
- org.eclipse.wst.common.project.facet.core;bundle-version="[1.3.0,2.0.0)",
- org.eclipse.core.resources;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.jdt.core;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.jst.ws.jaxws.core;bundle-version="0.5.0",
- org.eclipse.jdt.launching;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.ltk.core.refactoring;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.ltk.ui.refactoring;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.jst.ws.annotations.core;bundle-version="0.5.0",
- org.eclipse.jdt.apt.core;bundle-version="[3.3.100,4.0.0)",
- org.eclipse.text;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.jdt.ui;bundle-version="[3.4.0,4.0.0)"
-Import-Package: javax.jws,
- javax.jws.soap,
- javax.xml.ws;version="2.1.0"
-Export-Package: org.eclipse.jst.ws.jaxws.core.annotation.validation.tests,
- org.eclipse.jst.ws.jaxws.core.tests
diff --git a/tests/org.eclipse.jst.ws.jaxws.core.tests/about.html b/tests/org.eclipse.jst.ws.jaxws.core.tests/about.html
deleted file mode 100644
index 5b6a031..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.core.tests/about.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
-<title>About</title>
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
-
-<p>February 19, 2009</p>
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, "Program" will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is
-being redistributed by another party ("Redistributor") and different terms and conditions may
-apply to your use of any object code in the Content. Check the Redistributor's license that was
-provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
-
-</body>
-</html>
diff --git a/tests/org.eclipse.jst.ws.jaxws.core.tests/build.properties b/tests/org.eclipse.jst.ws.jaxws.core.tests/build.properties
deleted file mode 100644
index 9d3bc75..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.core.tests/build.properties
+++ /dev/null
@@ -1,7 +0,0 @@
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
- .,\
- plugin.properties,\
- build.properties,\
- about.html
diff --git a/tests/org.eclipse.jst.ws.jaxws.core.tests/plugin.properties b/tests/org.eclipse.jst.ws.jaxws.core.tests/plugin.properties
deleted file mode 100644
index bd99711..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.core.tests/plugin.properties
+++ /dev/null
@@ -1,14 +0,0 @@
-###############################################################################
-# Copyright (c) 2009 Shane Clarke and others
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# Shane Clarke - initial API and implementation
-###############################################################################
-
-#properties file for JAX-WS Tools Tests
-pluginName=JAX-WS Tools Tests (Incubation)
-providerName=Eclipse Web Tools Platform
diff --git a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/AbstractAnnotationValidationTest.java b/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/AbstractAnnotationValidationTest.java
deleted file mode 100644
index 5a5ad00..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/AbstractAnnotationValidationTest.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Shane Clarke.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Shane Clarke - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.core.annotation.validation.tests;
-
-import org.eclipse.jst.ws.jaxws.core.tests.AbstractAnnotationTest;
-
-public abstract class AbstractAnnotationValidationTest extends AbstractAnnotationTest {
-
- @Override
- protected boolean isAutoBuildingEnabled() {
- return true;
- }
-
- @Override
- protected boolean isAnnotationProcessingEnabled() {
- return true;
- }
-
-}
diff --git a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/AbstractDocumentBareValidationTest.java b/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/AbstractDocumentBareValidationTest.java
deleted file mode 100644
index eb4ff53..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/AbstractDocumentBareValidationTest.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Shane Clarke.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Shane Clarke - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.core.annotation.validation.tests;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.jws.soap.SOAPBinding;
-import javax.jws.soap.SOAPBinding.ParameterStyle;
-import javax.jws.soap.SOAPBinding.Style;
-import javax.jws.soap.SOAPBinding.Use;
-
-import org.eclipse.jdt.core.dom.Annotation;
-import org.eclipse.jdt.core.dom.MemberValuePair;
-import org.eclipse.jst.ws.annotations.core.AnnotationsCore;
-
-public abstract class AbstractDocumentBareValidationTest extends AbstractAnnotationValidationTest {
-
- @Override
- protected Annotation getAnnotation() {
- List<MemberValuePair> memberValuePairs = new ArrayList<MemberValuePair>();
-
- MemberValuePair styleValuePair = AnnotationsCore.createEnumMemberValuePair(ast,
- SOAPBinding.class.getCanonicalName(), "style", Style.DOCUMENT);
-
- MemberValuePair useValuePair = AnnotationsCore.createEnumMemberValuePair(ast,
- SOAPBinding.class.getCanonicalName(), "use", Use.LITERAL);
-
- MemberValuePair parameterStyleValuePair = AnnotationsCore.createEnumMemberValuePair(ast,
- SOAPBinding.class.getCanonicalName(), "parameterStyle", ParameterStyle.BARE);
-
- memberValuePairs.add(styleValuePair);
- memberValuePairs.add(useValuePair);
- memberValuePairs.add(parameterStyleValuePair);
-
- return AnnotationsCore.createNormalAnnotation(ast, javax.jws.soap.SOAPBinding.class.getSimpleName(),
- memberValuePairs);
-
- }
-
- @Override
- protected String getClassContents() {
- StringBuilder classContents = new StringBuilder("package com.example;\n\n");
- classContents.append("public class MyClass {\n\n\t");
- classContents.append("public String oneIN(String inOne, String inTwo) {\n\t\treturn \"txt\";\n\t}");
- classContents.append("\n}");
- return classContents.toString();
- }
-
- @Override
- protected String getClassName() {
- return "MyClass.java";
- }
-
- @Override
- protected String getPackageName() {
- return "com.example";
- }
-
-}
diff --git a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/AbstractOnewayValidationTest.java b/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/AbstractOnewayValidationTest.java
deleted file mode 100644
index 19de308..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/AbstractOnewayValidationTest.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Shane Clarke.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Shane Clarke - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.core.annotation.validation.tests;
-
-import javax.jws.Oneway;
-import org.eclipse.core.resources.IMarker;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.OperationCanceledException;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jdt.core.dom.Annotation;
-import org.eclipse.jst.ws.annotations.core.AnnotationsCore;
-import org.eclipse.jst.ws.annotations.core.utils.AnnotationUtils;
-
-public abstract class AbstractOnewayValidationTest extends AbstractAnnotationValidationTest {
-
- @Override
- public Annotation getAnnotation() {
- return AnnotationsCore.createNormalAnnotation(ast, Oneway.class.getSimpleName(), null);
- }
-
- @Override
- public String getClassName() {
- return "MyClass.java";
- }
-
- @Override
- public String getPackageName() {
- return "com.example";
- }
-
- public abstract String getErrorMessage();
-
- public abstract IMethod getMethodToTest();
-
- public void testOnewayRule() {
- try {
- assertNotNull(annotation);
- assertEquals(Oneway.class.getSimpleName(), AnnotationUtils.getAnnotationName(annotation));
-
- IMethod method = getMethodToTest();
- assertNotNull(method);
-
- textFileChange.addEdit(AnnotationUtils.createAddImportTextEdit(method, Oneway.class.getCanonicalName()));
-
- textFileChange.addEdit(AnnotationUtils.createAddAnnotationTextEdit(method, annotation));
-
- assertTrue(executeChange(new NullProgressMonitor(), textFileChange));
-
- assertTrue(AnnotationUtils.isAnnotationPresent(method, AnnotationUtils
- .getAnnotationName(annotation)));
- assertTrue(source.getImport(Oneway.class.getCanonicalName()).exists());
-
- Job.getJobManager().join(ResourcesPlugin.FAMILY_AUTO_BUILD, null);
-
- IMarker[] allmarkers = source.getResource().findMarkers(IMarker.PROBLEM, true,
- IResource.DEPTH_INFINITE);
-
- assertEquals(1, allmarkers.length);
-
- IMarker annotationProblemMarker = allmarkers[0];
-
- assertEquals(source.getResource(), annotationProblemMarker.getResource());
- assertEquals(getErrorMessage(), annotationProblemMarker.getAttribute(IMarker.MESSAGE));
- } catch (CoreException ce) {
- fail(ce.getLocalizedMessage());
- } catch (OperationCanceledException oce) {
- fail(oce.getLocalizedMessage());
- } catch (InterruptedException ie) {
- fail(ie.getLocalizedMessage());
- }
- }
-
-}
diff --git a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/AbstractSOAPBindingValidationTest.java b/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/AbstractSOAPBindingValidationTest.java
deleted file mode 100644
index 7c5e276..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/AbstractSOAPBindingValidationTest.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Shane Clarke.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Shane Clarke - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.core.annotation.validation.tests;
-
-public abstract class AbstractSOAPBindingValidationTest extends AbstractAnnotationValidationTest {
-
- @Override
- protected String getClassContents() {
- StringBuilder classContents = new StringBuilder("package com.example;\n\n");
- classContents.append("public class MyClass {\n\n\tpublic String myMethod(String in) {");
- classContents.append("\n\t\treturn \"txt\";\n\t}\n\n}");
- return classContents.toString();
- }
-
- @Override
- protected String getClassName() {
- return "MyClass.java";
- }
-
- @Override
- protected String getPackageName() {
- return "com.example";
- }
-
-}
diff --git a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/AbstractWebMethodPublicStaticFinalRuleTest.java b/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/AbstractWebMethodPublicStaticFinalRuleTest.java
deleted file mode 100644
index 51ae8c1..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/AbstractWebMethodPublicStaticFinalRuleTest.java
+++ /dev/null
@@ -1,98 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Shane Clarke.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Shane Clarke - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.core.annotation.validation.tests;
-
-import javax.jws.WebMethod;
-import org.eclipse.core.resources.IMarker;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.OperationCanceledException;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jdt.core.dom.Annotation;
-import org.eclipse.jst.ws.annotations.core.AnnotationsCore;
-import org.eclipse.jst.ws.annotations.core.utils.AnnotationUtils;
-
-public abstract class AbstractWebMethodPublicStaticFinalRuleTest extends AbstractAnnotationValidationTest {
-
- @Override
- protected Annotation getAnnotation() {
- return AnnotationsCore.createNormalAnnotation(ast, WebMethod.class.getSimpleName(), null);
- }
-
- @Override
- protected String getClassContents() {
- StringBuilder classContents = new StringBuilder("package com.example;\n\n");
- classContents.append("import javax.jws.WebService;\n\n");
- classContents.append("@WebService(name=\"MyClass\")\n");
- classContents.append("public class MyClass {\n\n");
- classContents.append("\tString myPackagePrivateMethod() {\n\t\treturn \"package-private\";\n\t}\n\n");
- classContents.append("\tprivate String myPrivateMethod() {\n\t\treturn \"private\";\n\t}\n\n");
- classContents.append("\tprotected String myProtectedMethod() {\n\t\tmyPrivateMethod();\n");
- classContents.append("\t\treturn \"protected\";\n\t}\n");
- classContents.append("\tpublic static String myStaticMethod() {\n\t\treturn \"static\";\n\t}\n\n");
- classContents.append("\tpublic final String myFinalMethod() {\n\t\treturn \"final\";\n\t}\n\n}");
- return classContents.toString();
- }
-
- @Override
- protected String getClassName() {
- return "MyClass.java";
- }
-
- @Override
- protected String getPackageName() {
- return "com.example";
- }
-
- public abstract IMethod getMethodToTeset();
- public abstract String getErrorMessage();
-
- public void testWebMethodRestriction() {
- try {
- assertNotNull(annotation);
- assertEquals(WebMethod.class.getSimpleName(), AnnotationUtils.getAnnotationName(annotation));
-
- IMethod method = getMethodToTeset();
- assertNotNull(method);
-
- textFileChange.addEdit(AnnotationUtils.createAddImportTextEdit(method, WebMethod.class.getCanonicalName()));
-
- textFileChange.addEdit(AnnotationUtils.createAddAnnotationTextEdit(method, annotation));
-
- assertTrue(executeChange(new NullProgressMonitor(), textFileChange));
-
- assertTrue(AnnotationUtils.isAnnotationPresent(method, AnnotationUtils
- .getAnnotationName(annotation)));
- assertTrue(source.getImport(WebMethod.class.getCanonicalName()).exists());
-
- Job.getJobManager().join(ResourcesPlugin.FAMILY_AUTO_BUILD, null);
-
- IMarker[] allmarkers = source.getResource().findMarkers(IMarker.PROBLEM, true,
- IResource.DEPTH_INFINITE);
-
- assertEquals(1, allmarkers.length);
-
- IMarker annotationProblemMarker = allmarkers[0];
-
- assertEquals(source.getResource(), annotationProblemMarker.getResource());
- assertEquals(getErrorMessage(), annotationProblemMarker.getAttribute(IMarker.MESSAGE));
- } catch (CoreException ce) {
- fail(ce.getLocalizedMessage());
- } catch (OperationCanceledException oce) {
- fail(oce.getLocalizedMessage());
- } catch (InterruptedException ie) {
- fail(ie.getLocalizedMessage());
- }
- }
-}
diff --git a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/AbstractWebServicePublicAbstractFinalRuleTest.java b/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/AbstractWebServicePublicAbstractFinalRuleTest.java
deleted file mode 100644
index 85b6197..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/AbstractWebServicePublicAbstractFinalRuleTest.java
+++ /dev/null
@@ -1,101 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Shane Clarke.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Shane Clarke - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.core.annotation.validation.tests;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.jws.WebService;
-import org.eclipse.core.resources.IMarker;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.OperationCanceledException;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.jdt.core.dom.Annotation;
-import org.eclipse.jdt.core.dom.MemberValuePair;
-import org.eclipse.jst.ws.annotations.core.AnnotationsCore;
-import org.eclipse.jst.ws.annotations.core.utils.AnnotationUtils;
-import org.eclipse.jst.ws.internal.jaxws.core.JAXWSCoreMessages;
-
-public abstract class AbstractWebServicePublicAbstractFinalRuleTest extends AbstractAnnotationValidationTest {
-
- @Override
- protected Annotation getAnnotation() {
- List<MemberValuePair> memberValuePairs = new ArrayList<MemberValuePair>();
-
- MemberValuePair nameValuePair = AnnotationsCore.createStringMemberValuePair(ast, "name", "MyClass");
-
- MemberValuePair portNameValuePair = AnnotationsCore.createStringMemberValuePair(ast, "portName",
- "MyClassPort");
-
- MemberValuePair serviceNameValuePair = AnnotationsCore.createStringMemberValuePair(ast,
- "serviceName", "MyClassService");
-
- MemberValuePair targetNamespaceValuePair = AnnotationsCore.createStringMemberValuePair(ast,
- "targetNamespace", "http://example.com/");
-
- memberValuePairs.add(nameValuePair);
- memberValuePairs.add(targetNamespaceValuePair);
- memberValuePairs.add(portNameValuePair);
- memberValuePairs.add(serviceNameValuePair);
-
- return AnnotationsCore.createNormalAnnotation(ast, WebService.class.getSimpleName(), memberValuePairs);
- }
-
- @Override
- protected String getClassName() {
- return "MyClass.java";
- }
-
- @Override
- protected String getPackageName() {
- return "com.example";
- }
-
- public void testWebServicePublicAbstractFinalRule() {
- try {
- assertNotNull(annotation);
- assertEquals(WebService.class.getSimpleName(), AnnotationUtils.getAnnotationName(annotation));
-
- textFileChange.addEdit(AnnotationUtils.createAddImportTextEdit(source.findPrimaryType(), WebService.class.getCanonicalName()));
-
- textFileChange.addEdit(AnnotationUtils.createAddAnnotationTextEdit(source.findPrimaryType(), annotation));
-
- assertTrue(executeChange(new NullProgressMonitor(), textFileChange));
-
- assertTrue(AnnotationUtils.isAnnotationPresent(source, AnnotationUtils
- .getAnnotationName(annotation)));
- assertTrue(source.getImport(WebService.class.getCanonicalName()).exists());
-
- Job.getJobManager().join(ResourcesPlugin.FAMILY_AUTO_BUILD, null);
-
- IMarker[] allmarkers = source.getResource().findMarkers(IMarker.PROBLEM, true,
- IResource.DEPTH_INFINITE);
-
- assertEquals(1, allmarkers.length);
-
- IMarker annotationProblemMarker = allmarkers[0];
-
- assertEquals(source.getResource(), annotationProblemMarker.getResource());
- assertEquals(JAXWSCoreMessages.WEBSERVICE_PUBLIC_ABSTRACT_FINAL,
- annotationProblemMarker.getAttribute(IMarker.MESSAGE));
- } catch (CoreException ce) {
- fail(ce.getLocalizedMessage());
- } catch (OperationCanceledException oce) {
- fail(oce.getLocalizedMessage());
- } catch (InterruptedException ie) {
- fail(ie.getLocalizedMessage());
- }
- }
-
-}
diff --git a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/AbstractWebServiceSEIRule.java b/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/AbstractWebServiceSEIRule.java
deleted file mode 100644
index b2a0d8e..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/AbstractWebServiceSEIRule.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Shane Clarke.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Shane Clarke - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.core.annotation.validation.tests;
-
-public abstract class AbstractWebServiceSEIRule extends AbstractAnnotationValidationTest {
-
- @Override
- protected void setUp() throws Exception {
- super.setUp();
- testJavaProject.createCompilationUnit(getPackageName(), getInterfaceName(), getInterfaceContents());
- }
-
- @Override
- protected String getClassContents() {
- StringBuilder classContents = new StringBuilder("package com.example;\n\n");
- classContents.append("import javax.jws.WebService;\n\n");
- classContents.append("@WebService(endpointInterface=\"com.example.MyInterface\", ");
- classContents.append("targetNamespace=\"http://example.com/\", portName=\"MyClassPort\", ");
- classContents.append("serviceName=\"MyClassService\")\n");
- classContents.append("public class MyClass {\n\n");
- classContents.append("\tpublic void methodOne(String in) {\n\t}\n\n");
- classContents.append("\tpublic String myMethod(String in) {" + "\n\t\treturn \"txt\";\n\t}\n\n}");
- return classContents.toString();
- }
-
- private String getInterfaceContents() {
- StringBuilder seiContents = new StringBuilder("package com.example;\n\n");
- seiContents.append("import javax.jws.WebService;\n\n");
- seiContents.append("@WebService(name=\"MyInterface\", targetNamespace=\"http://example.com/\")\n");
- seiContents.append("public interface MyInterface {\n\n");
- seiContents.append("\tpublic String myMethod(String in);\n\n}");
- return seiContents.toString();
- }
-
- @Override
- protected String getClassName() {
- return "MyClass.java";
- }
-
- protected String getInterfaceName() {
- return "MyInterface.java";
- }
-
- @Override
- protected String getPackageName() {
- return "com.example";
- }
-
-}
diff --git a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/DocBareNonVoidNoOutParametersRuleTest.java b/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/DocBareNonVoidNoOutParametersRuleTest.java
deleted file mode 100644
index 5bf6422..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/DocBareNonVoidNoOutParametersRuleTest.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Shane Clarke.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Shane Clarke - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.core.annotation.validation.tests;
-
-import javax.jws.soap.SOAPBinding;
-
-import org.eclipse.core.resources.IMarker;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.OperationCanceledException;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jst.ws.annotations.core.utils.AnnotationUtils;
-import org.eclipse.jst.ws.internal.jaxws.core.JAXWSCoreMessages;
-
-public class DocBareNonVoidNoOutParametersRuleTest extends AbstractDocumentBareValidationTest {
-
- @Override
- protected String getClassContents() {
- StringBuilder classContents = new StringBuilder("package com.example;\n\n");
- classContents.append("import javax.jws.WebParam;\n");
- classContents.append("public class MyClass {\n\n\t");
- classContents.append("public String noOut(String in, @WebParam(name=\"out\", mode=WebParam.Mode.OUT) ");
- classContents.append("String out) {\n\t\treturn \"txt\";\n\t}\n\n}");
- return classContents.toString();
- }
-
- public void testNonVoidNoOUTParameterRule() {
- try {
- assertNotNull(annotation);
- assertEquals(SOAPBinding.class.getSimpleName(), AnnotationUtils.getAnnotationName(annotation));
-
- IMethod method = source.findPrimaryType().getMethod("noOut", new String[] { "QString;",
- "QString; "});
-
- assertNotNull(method);
-
- textFileChange.addEdit(AnnotationUtils.createAddImportTextEdit(method, SOAPBinding.class.getCanonicalName()));
-
- textFileChange.addEdit(AnnotationUtils.createAddAnnotationTextEdit(method, annotation));
-
- assertTrue(executeChange(new NullProgressMonitor(), textFileChange));
-
- assertTrue(AnnotationUtils.isAnnotationPresent(method, AnnotationUtils
- .getAnnotationName(annotation)));
- assertTrue(source.getImport(SOAPBinding.class.getCanonicalName()).exists());
-
- Job.getJobManager().join(ResourcesPlugin.FAMILY_AUTO_BUILD, null);
-
- IMarker[] allmarkers = source.getResource().findMarkers(IMarker.PROBLEM, true,
- IResource.DEPTH_INFINITE);
-
- assertEquals(1, allmarkers.length);
-
- IMarker annotationProblemMarker = allmarkers[0];
-
- assertEquals(source.getResource(), annotationProblemMarker.getResource());
- assertEquals(JAXWSCoreMessages.DOC_BARE_NON_VOID_RETURN_NO_INOUT_OUT_PARAMETER,
- annotationProblemMarker.getAttribute(IMarker.MESSAGE));
- } catch (CoreException ce) {
- fail(ce.getLocalizedMessage());
- } catch (OperationCanceledException oce) {
- fail(oce.getLocalizedMessage());
- } catch (InterruptedException ie) {
- fail(ie.getLocalizedMessage());
- }
- }
-}
diff --git a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/DocBareOneNonHeaderINParameterRuleTest.java b/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/DocBareOneNonHeaderINParameterRuleTest.java
deleted file mode 100644
index 05b8458..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/DocBareOneNonHeaderINParameterRuleTest.java
+++ /dev/null
@@ -1,163 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Shane Clarke.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Shane Clarke - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.core.annotation.validation.tests;
-
-import javax.jws.soap.SOAPBinding;
-
-import org.eclipse.core.resources.IMarker;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.OperationCanceledException;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jst.ws.annotations.core.utils.AnnotationUtils;
-import org.eclipse.jst.ws.internal.jaxws.core.JAXWSCoreMessages;
-
-public class DocBareOneNonHeaderINParameterRuleTest extends AbstractDocumentBareValidationTest {
-
- @Override
- protected String getClassContents() {
- StringBuilder classContents = new StringBuilder("package com.example;\n\n");
- classContents.append("import javax.jws.WebParam;\n\n");
- classContents.append("public class MyClass {\n\n\t");
- //classContents.append("public String oneIN() {\n\t\treturn \"txt\";\n\t}\n\n\t");
- classContents.append("public String oneMore(@WebParam(name=\"inOne\", mode=WebParam.Mode.IN) String ");
- classContents.append("inOne, @WebParam(name=\"inTwo\", mode=WebParam.Mode.IN)String inTwo) {\n\t\t");
- classContents.append("return \"txt\";\n\t}\n\n\tpublic String onlyOneIN(String inOne, String inTwo) {");
- classContents.append("\n\t\treturn \"txt\";\n\t}\n}");
- return classContents.toString();
- }
-
- /*
- public void testOneNonHeaderINParameterRule() {
- try {
- assertNotNull(annotation);
- assertEquals("SOAPBinding", AnnotationUtils.getAnnotationName(annotation));
-
- IMethod method = source.findPrimaryType().getMethod("oneIN", new String[0]);
- assertNotNull(method);
-
- AnnotationUtils.getImportChange(compilationUnit, javax.jws.soap.SOAPBinding.class,
- textFileChange, true);
-
- AnnotationUtils.createMethodAnnotationChange(source, compilationUnit, rewriter, method,
- annotation, textFileChange);
-
- assertTrue(executeChange(new NullProgressMonitor(), textFileChange));
-
- assertTrue(AnnotationUtils.isAnnotationPresent(method, AnnotationUtils
- .getAnnotationName(annotation)));
-
- Job.getJobManager().join(ResourcesPlugin.FAMILY_AUTO_BUILD, null);
-
- IMarker[] allmarkers = source.getResource().findMarkers(IMarker.PROBLEM, true,
- IResource.DEPTH_INFINITE);
-
- assertEquals(1, allmarkers.length);
-
- IMarker annotationProblemMarker = allmarkers[0];
-
- assertEquals(source.getResource(), annotationProblemMarker.getResource());
- assertEquals(JAXWSCoreMessages.DOC_BARE_ONE_NON_HEADER_IN_PARAMETER_ERROR_MESSAGE,
- annotationProblemMarker.getAttribute(IMarker.MESSAGE));
- } catch (CoreException ce) {
- fail(ce.getLocalizedMessage());
- } catch (OperationCanceledException oce) {
- fail(oce.getLocalizedMessage());
- } catch (InterruptedException ie) {
- fail(ie.getLocalizedMessage());
- }
- }*/
-
- public void testOnlyOneNonHeaderINParameterRule() {
- try {
- assertNotNull(annotation);
- assertEquals(SOAPBinding.class.getSimpleName(), AnnotationUtils.getAnnotationName(annotation));
-
- IMethod method = source.findPrimaryType().getMethod("onlyOneIN", new String[] { "QString;",
- "QString;" });
-
- assertNotNull(method);
-
- textFileChange.addEdit(AnnotationUtils.createAddImportTextEdit(method, SOAPBinding.class.getCanonicalName()));
-
- textFileChange.addEdit(AnnotationUtils.createAddAnnotationTextEdit(method, annotation));
-
- assertTrue(executeChange(new NullProgressMonitor(), textFileChange));
-
- assertTrue(AnnotationUtils.isAnnotationPresent(method, AnnotationUtils
- .getAnnotationName(annotation)));
-
- Job.getJobManager().join(ResourcesPlugin.FAMILY_AUTO_BUILD, null);
-
- IMarker[] allmarkers = source.getResource().findMarkers(IMarker.PROBLEM, true,
- IResource.DEPTH_INFINITE);
-
- assertEquals(1, allmarkers.length);
-
- IMarker annotationProblemMarker = allmarkers[0];
-
- assertEquals(source.getResource(), annotationProblemMarker.getResource());
- assertEquals(JAXWSCoreMessages.DOC_BARE_ONLY_ONE_NON_HEADER_IN_PARAMETER,
- annotationProblemMarker.getAttribute(IMarker.MESSAGE));
- } catch (CoreException ce) {
- fail(ce.getLocalizedMessage());
- } catch (OperationCanceledException oce) {
- fail(oce.getLocalizedMessage());
- } catch (InterruptedException ie) {
- fail(ie.getLocalizedMessage());
- }
- }
-
- public void testOnlyOneNonHeaderINParameterWithWebParamsRule() {
- try {
- assertNotNull(annotation);
- assertEquals(SOAPBinding.class.getSimpleName(), AnnotationUtils.getAnnotationName(annotation));
-
- IMethod method = source.findPrimaryType().getMethod("oneMore", new String[] { "QString;",
- "QString;" });
-
- assertNotNull(method);
-
- textFileChange.addEdit(AnnotationUtils.createAddImportTextEdit(method, SOAPBinding.class.getCanonicalName()));
-
- textFileChange.addEdit(AnnotationUtils.createAddAnnotationTextEdit(method, annotation));
-
- assertTrue(executeChange(new NullProgressMonitor(), textFileChange));
-
- assertTrue(AnnotationUtils.isAnnotationPresent(method, AnnotationUtils
- .getAnnotationName(annotation)));
- assertTrue(source.getImport(SOAPBinding.class.getCanonicalName()).exists());
-
- Job.getJobManager().join(ResourcesPlugin.FAMILY_AUTO_BUILD, null);
-
- IMarker[] allmarkers = source.getResource().findMarkers(IMarker.PROBLEM, true,
- IResource.DEPTH_INFINITE);
-
- assertEquals(1, allmarkers.length);
-
- IMarker annotationProblemMarker = allmarkers[0];
-
- assertEquals(source.getResource(), annotationProblemMarker.getResource());
- assertEquals(JAXWSCoreMessages.DOC_BARE_ONLY_ONE_NON_HEADER_IN_PARAMETER,
- annotationProblemMarker.getAttribute(IMarker.MESSAGE));
- } catch (CoreException ce) {
- fail(ce.getLocalizedMessage());
- } catch (OperationCanceledException oce) {
- fail(oce.getLocalizedMessage());
- } catch (InterruptedException ie) {
- fail(ie.getLocalizedMessage());
- }
- }
-
-}
diff --git a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/DocBareVoidOneINOneOutParameterRuleTest.java b/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/DocBareVoidOneINOneOutParameterRuleTest.java
deleted file mode 100644
index b565123..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/DocBareVoidOneINOneOutParameterRuleTest.java
+++ /dev/null
@@ -1,123 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Shane Clarke.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Shane Clarke - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.core.annotation.validation.tests;
-
-import javax.jws.soap.SOAPBinding;
-
-import org.eclipse.core.resources.IMarker;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.OperationCanceledException;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jst.ws.annotations.core.utils.AnnotationUtils;
-import org.eclipse.jst.ws.internal.jaxws.core.JAXWSCoreMessages;
-
-public class DocBareVoidOneINOneOutParameterRuleTest extends AbstractDocumentBareValidationTest {
- @Override
- protected String getClassContents() {
- StringBuilder classContents = new StringBuilder("package com.example;\n\n");
- classContents.append("import javax.jws.WebParam;\n");
- classContents.append("import javax.xml.ws.Holder;\n\n");
- classContents.append("public class MyClass {\n\n\t");
- classContents.append("public void oneIn(@WebParam(name=\"inOne\", mode=WebParam.Mode.INOUT) ");
- classContents.append("Holder<String> inOne, @WebParam(name=\"inTwo\", mode=WebParam.Mode.IN) ");
- classContents.append("String inTwo) {\n\n\t}\n\n\t");
- classContents.append("public void oneOut(@WebParam(name=\"outOne\", mode=WebParam.Mode.INOUT) ");
- classContents.append("Holder<String> outOne, @WebParam(name=\"outTwo\", mode=WebParam.Mode.OUT) ");
- classContents.append("Holder<String> outTwo) {\n\n\t}\n\n}");
- return classContents.toString();
- }
-
- public void testVoidOneInParameterRule() {
- try {
- assertNotNull(annotation);
- assertEquals(SOAPBinding.class.getSimpleName(), AnnotationUtils.getAnnotationName(annotation));
-
- IMethod method = source.findPrimaryType().getMethod("oneIn", new String[] { "QHolder<QString;>;",
- "QString;"});
-
- assertNotNull(method);
-
- textFileChange.addEdit(AnnotationUtils.createAddImportTextEdit(method, SOAPBinding.class.getCanonicalName()));
-
- textFileChange.addEdit(AnnotationUtils.createAddAnnotationTextEdit(method, annotation));
-
- assertTrue(executeChange(new NullProgressMonitor(), textFileChange));
-
- assertTrue(AnnotationUtils.isAnnotationPresent(method, AnnotationUtils
- .getAnnotationName(annotation)));
-
- Job.getJobManager().join(ResourcesPlugin.FAMILY_AUTO_BUILD, null);
-
- IMarker[] allmarkers = source.getResource().findMarkers(IMarker.PROBLEM, true,
- IResource.DEPTH_INFINITE);
-
- assertEquals(1, allmarkers.length);
-
- IMarker annotationProblemMarker = allmarkers[0];
-
- assertEquals(source.getResource(), annotationProblemMarker.getResource());
- assertEquals(JAXWSCoreMessages.DOC_BARE_VOID_RETURN_ONE_IN_PARAMETER,
- annotationProblemMarker.getAttribute(IMarker.MESSAGE));
- } catch (CoreException ce) {
- fail(ce.getLocalizedMessage());
- } catch (OperationCanceledException oce) {
- fail(oce.getLocalizedMessage());
- } catch (InterruptedException ie) {
- fail(ie.getLocalizedMessage());
- }
- }
-
- public void testVoidOneOutParameterRule() {
- try {
- assertNotNull(annotation);
- assertEquals(SOAPBinding.class.getSimpleName(), AnnotationUtils.getAnnotationName(annotation));
-
- IMethod method = source.findPrimaryType().getMethod("oneOut", new String[] { "QHolder<QString;>;",
- "QHolder<QString;>;"});
-
- assertNotNull(method);
-
- textFileChange.addEdit(AnnotationUtils.createAddImportTextEdit(method, SOAPBinding.class.getCanonicalName()));
-
- textFileChange.addEdit(AnnotationUtils.createAddAnnotationTextEdit(method, annotation));
-
- assertTrue(executeChange(new NullProgressMonitor(), textFileChange));
-
- assertTrue(AnnotationUtils.isAnnotationPresent(method, AnnotationUtils
- .getAnnotationName(annotation)));
- assertTrue(source.getImport(SOAPBinding.class.getCanonicalName()).exists());
-
- Job.getJobManager().join(ResourcesPlugin.FAMILY_AUTO_BUILD, null);
-
- IMarker[] allmarkers = source.getResource().findMarkers(IMarker.PROBLEM, true,
- IResource.DEPTH_INFINITE);
-
- assertEquals(1, allmarkers.length);
-
- IMarker annotationProblemMarker = allmarkers[0];
-
- assertEquals(source.getResource(), annotationProblemMarker.getResource());
- assertEquals(JAXWSCoreMessages.DOC_BARE_VOID_RETURN_ONE_OUT_PARAMETER,
- annotationProblemMarker.getAttribute(IMarker.MESSAGE));
- } catch (CoreException ce) {
- fail(ce.getLocalizedMessage());
- } catch (OperationCanceledException oce) {
- fail(oce.getLocalizedMessage());
- } catch (InterruptedException ie) {
- fail(ie.getLocalizedMessage());
- }
- }
-
-}
diff --git a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/HolderTypeParameterRuleTest.java b/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/HolderTypeParameterRuleTest.java
deleted file mode 100644
index 1f7d515..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/HolderTypeParameterRuleTest.java
+++ /dev/null
@@ -1,88 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Shane Clarke.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Shane Clarke - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.core.annotation.validation.tests;
-
-import javax.jws.WebService;
-import org.eclipse.core.resources.IMarker;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.OperationCanceledException;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.jdt.core.dom.Annotation;
-import org.eclipse.jst.ws.annotations.core.AnnotationsCore;
-import org.eclipse.jst.ws.annotations.core.utils.AnnotationUtils;
-import org.eclipse.jst.ws.internal.jaxws.core.JAXWSCoreMessages;
-
-public class HolderTypeParameterRuleTest extends AbstractAnnotationValidationTest {
-
- @Override
- public Annotation getAnnotation() {
- return AnnotationsCore.createNormalAnnotation(ast, WebService.class.getSimpleName(), null);
- }
-
- @Override
- public String getPackageName() {
- return "com.example";
- }
-
- @Override
- public String getClassName() {
- return "MyClass.java";
- }
-
- @Override
- public String getClassContents() {
- StringBuilder classContents = new StringBuilder("package com.example;\n\n");
- classContents.append("import javax.jws.WebParam;\n");
- classContents.append("import javax.xml.ws.Holder;\n\n");
- classContents.append("public class MyClass {\n\n\tpublic void myMethod(");
- classContents.append("@WebParam(mode=WebParam.Mode.IN) Holder<java.lang.String> param) {\n\n\t}\n}");
- return classContents.toString();
- }
-
- public void testHolderTypeParameterRule() {
- try {
- assertNotNull(annotation);
- assertEquals(WebService.class.getSimpleName(), AnnotationUtils.getAnnotationName(annotation));
-
- textFileChange.addEdit(AnnotationUtils.createAddImportTextEdit(source.findPrimaryType(), WebService.class.getCanonicalName()));
-
- textFileChange.addEdit(AnnotationUtils.createAddAnnotationTextEdit(source.findPrimaryType(), annotation));
-
- assertTrue(executeChange(new NullProgressMonitor(), textFileChange));
-
- assertTrue(AnnotationUtils.isAnnotationPresent(source, AnnotationUtils
- .getAnnotationName(annotation)));
- assertTrue(source.getImport(WebService.class.getCanonicalName()).exists());
-
- Job.getJobManager().join(ResourcesPlugin.FAMILY_AUTO_BUILD, null);
-
- IMarker[] allmarkers = source.getResource().findMarkers(IMarker.PROBLEM, true,
- IResource.DEPTH_INFINITE);
-
- assertEquals(1, allmarkers.length);
-
- IMarker annotationProblemMarker = allmarkers[0];
-
- assertEquals(source.getResource(), annotationProblemMarker.getResource());
- assertEquals(JAXWSCoreMessages.HOLDER_TYPE_MUST_BE_OUT_INOUT,
- annotationProblemMarker.getAttribute(IMarker.MESSAGE));
- } catch (CoreException ce) {
- fail(ce.getLocalizedMessage());
- }catch (OperationCanceledException oce) {
- fail(oce.getLocalizedMessage());
- } catch (InterruptedException ie) {
- fail(ie.getLocalizedMessage());
- }
- }
-}
diff --git a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/JAXWSAnnotationValidationTestSuite.java b/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/JAXWSAnnotationValidationTestSuite.java
deleted file mode 100644
index 3684a1d..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/JAXWSAnnotationValidationTestSuite.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Shane Clarke.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Shane Clarke - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.core.annotation.validation.tests;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-public class JAXWSAnnotationValidationTestSuite extends TestSuite {
-
- public static Test suite() {
- return new JAXWSAnnotationValidationTestSuite();
- }
-
- public JAXWSAnnotationValidationTestSuite() {
- super("JAX-WS Annotation Validation Tests");
- addTestSuite(DocBareNonVoidNoOutParametersRuleTest.class);
- addTestSuite(DocBareOneNonHeaderINParameterRuleTest.class);
- addTestSuite(DocBareVoidOneINOneOutParameterRuleTest.class);
- addTestSuite(OnewayNoReturnValueRuleTest.class);
- addTestSuite(OnewayNoCheckedExceptionsRuleTest.class);
- addTestSuite(HolderTypeParameterRuleTest.class);
- addTestSuite(OnewayNoHolderParametersRuleTest.class);
- addTestSuite(SOAPBindingRPCStyleOnMethodRuleTest.class);
- addTestSuite(SOAPBindingRPCEncodedRuleTest.class);
- addTestSuite(SOAPBindingDocumentEncodedRuleTest.class);
- addTestSuite(SOAPBindingRCPBareRuleTest.class);
- addTestSuite(SOAPBindingMixedBindingsRuleTest.class);
- addTestSuite(WebMethodCheckForWebServiceRuleTest.class);
- addTestSuite(WebMethodExcludeRuleOnSEITest.class);
- addTestSuite(WebMethodExcludeRuleOnImplTest.class);
- addTestSuite(WebMethodNoPackagePrivateMethodRuleTest.class);
- addTestSuite(WebMethodNoPrivateMethodRuleTest.class);
- addTestSuite(WebMethodNoProtectedMethodRuleTest.class);
- addTestSuite(WebMethodNoFinalModifierRuleTest.class);
- addTestSuite(WebMethodNoStaticModifierRuleTest.class);
- addTestSuite(WebParamModeHolderTypeRuleTest.class);
- addTestSuite(WebServiceDefaultPublicConstructorRuleTest.class);
- addTestSuite(WebServiceNoFinalizeMethodRuleTest.class);
- addTestSuite(WebServiceNoFinalModiferRuleTest.class);
- addTestSuite(WebServiceNoAbstractModifierRuleTest.class);
- addTestSuite(WebServiceSEINoServiceNameRuleTest.class);
- addTestSuite(WebServiceSEINoEndpointInterfaceRuleTest.class);
- addTestSuite(WebServiceSEINoPortNameRuleTest.class);
- addTestSuite(WebServiceSEINoWebMethodRuleTest.class);
- addTestSuite(WebServiceSEINoWebResultRuleTest.class);
- addTestSuite(WebServiceSEINoWebParamRuleTest.class);
- addTestSuite(WebServiceSEINoOnewayRuleTest.class);
- addTestSuite(WebServiceSEINoSOAPBindingRuleTest.class);
- addTestSuite(WebServiceWebServiceProviderCoExistRuleTest.class);
- }
-
-}
diff --git a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/OnewayNoCheckedExceptionsRuleTest.java b/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/OnewayNoCheckedExceptionsRuleTest.java
deleted file mode 100644
index 8f9d09a..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/OnewayNoCheckedExceptionsRuleTest.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Shane Clarke.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Shane Clarke - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.core.annotation.validation.tests;
-
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jst.ws.internal.jaxws.core.JAXWSCoreMessages;
-
-public class OnewayNoCheckedExceptionsRuleTest extends AbstractOnewayValidationTest {
-
- @Override
- protected String getClassContents() {
- StringBuilder classContents = new StringBuilder("package com.example;\n\n");
- classContents.append("public class MyClass {\n\n\tpublic void myMethod(int i) throws Exception {\n\t}\n}");
- return classContents.toString();
- }
-
- @Override
- public String getErrorMessage() {
- return JAXWSCoreMessages.ONEWAY_NO_CHECKED_EXCEPTIONS;
- }
-
- @Override
- public IMethod getMethodToTest() {
- return source.findPrimaryType().getMethod("myMethod", new String[]{"I"});
- }
-
-}
diff --git a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/OnewayNoHolderParametersRuleTest.java b/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/OnewayNoHolderParametersRuleTest.java
deleted file mode 100644
index e5f4a8a..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/OnewayNoHolderParametersRuleTest.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Shane Clarke.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Shane Clarke - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.core.annotation.validation.tests;
-
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jst.ws.internal.jaxws.core.JAXWSCoreMessages;
-
-public class OnewayNoHolderParametersRuleTest extends AbstractOnewayValidationTest {
-
- @Override
- protected String getClassContents() {
- StringBuilder classContents = new StringBuilder("package com.example;\n\n");
- classContents.append("import javax.xml.ws.Holder;\n\n");
- classContents.append("public class MyClass {\n\n\tpublic void myMethod(");
- classContents.append("Holder<String> in) {\n\t}\n}");
- return classContents.toString();
- }
-
- @Override
- public String getErrorMessage() {
- return JAXWSCoreMessages.ONEWAY_NO_HOLDER_PARAMETERS;
- }
-
- @Override
- public IMethod getMethodToTest() {
- return source.findPrimaryType().getMethod("myMethod", new String[]{"QHolder<QString;>;"});
- }
-
-}
diff --git a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/OnewayNoReturnValueRuleTest.java b/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/OnewayNoReturnValueRuleTest.java
deleted file mode 100644
index 71a0f91..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/OnewayNoReturnValueRuleTest.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Shane Clarke.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Shane Clarke - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.core.annotation.validation.tests;
-
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jst.ws.internal.jaxws.core.JAXWSCoreMessages;
-
-public class OnewayNoReturnValueRuleTest extends AbstractOnewayValidationTest {
-
- @Override
- public String getClassContents() {
- StringBuilder classContents = new StringBuilder("package com.example;\n\n");
- classContents.append("public class MyClass {\n\n\tpublic int myMethod(int i) {\n\t\treturn 0;\n\t}\n}");
- return classContents.toString();
- }
-
- public String getErrorMessage() {
- return JAXWSCoreMessages.ONEWAY_NO_RETURN_VALUE;
- }
-
- @Override
- public IMethod getMethodToTest() {
- return source.findPrimaryType().getMethod("myMethod", new String[]{"I"});
- }
-
-}
diff --git a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/SOAPBindingDocumentEncodedRuleTest.java b/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/SOAPBindingDocumentEncodedRuleTest.java
deleted file mode 100644
index def8420..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/SOAPBindingDocumentEncodedRuleTest.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Shane Clarke.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Shane Clarke - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.core.annotation.validation.tests;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.jws.soap.SOAPBinding;
-import javax.jws.soap.SOAPBinding.ParameterStyle;
-import javax.jws.soap.SOAPBinding.Style;
-import javax.jws.soap.SOAPBinding.Use;
-
-import org.eclipse.core.resources.IMarker;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.OperationCanceledException;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jdt.core.dom.Annotation;
-import org.eclipse.jdt.core.dom.MemberValuePair;
-import org.eclipse.jst.ws.annotations.core.AnnotationsCore;
-import org.eclipse.jst.ws.annotations.core.utils.AnnotationUtils;
-import org.eclipse.jst.ws.internal.jaxws.core.JAXWSCoreMessages;
-
-public class SOAPBindingDocumentEncodedRuleTest extends AbstractSOAPBindingValidationTest {
-
- @Override
- protected Annotation getAnnotation() {
- List<MemberValuePair> memberValuePairs = new ArrayList<MemberValuePair>();
-
- MemberValuePair styleValuePair = AnnotationsCore.createEnumMemberValuePair(ast,
- SOAPBinding.class.getCanonicalName(), "style", Style.DOCUMENT);
-
- MemberValuePair useValuePair = AnnotationsCore.createEnumMemberValuePair(ast,
- SOAPBinding.class.getCanonicalName(), "use", Use.ENCODED);
-
- MemberValuePair parameterStyleValuePair = AnnotationsCore.createEnumMemberValuePair(ast,
- SOAPBinding.class.getCanonicalName(), "parameterStyle", ParameterStyle.BARE);
-
- memberValuePairs.add(styleValuePair);
- memberValuePairs.add(useValuePair);
- memberValuePairs.add(parameterStyleValuePair);
-
- return AnnotationsCore.createNormalAnnotation(ast, SOAPBinding.class.getSimpleName(), memberValuePairs);
- }
-
- public void testSOAPBindingDocumentEncodedRule() {
- try {
- assertNotNull(annotation);
- assertEquals(SOAPBinding.class.getSimpleName(), AnnotationUtils.getAnnotationName(annotation));
-
- IMethod method = source.findPrimaryType().getMethod("myMethod", new String[] { "QString;" });
- assertNotNull(method);
-
- textFileChange.addEdit(AnnotationUtils.createAddImportTextEdit(method, SOAPBinding.class.getCanonicalName()));
-
- textFileChange.addEdit(AnnotationUtils.createAddAnnotationTextEdit(method, annotation));
-
- assertTrue(executeChange(new NullProgressMonitor(), textFileChange));
-
- assertTrue(AnnotationUtils.isAnnotationPresent(method, AnnotationUtils
- .getAnnotationName(annotation)));
- assertTrue(source.getImport(SOAPBinding.class.getCanonicalName()).exists());
-
- Job.getJobManager().join(ResourcesPlugin.FAMILY_AUTO_BUILD, null);
-
- IMarker[] allmarkers = source.getResource().findMarkers(IMarker.PROBLEM, true,
- IResource.DEPTH_INFINITE);
-
- assertEquals(1, allmarkers.length);
-
- IMarker annotationProblemMarker = allmarkers[0];
-
- assertEquals(source.getResource(), annotationProblemMarker.getResource());
- assertEquals(JAXWSCoreMessages.SOAPBINDING_DOCUMENT_ENCODED_NOT_SUPPORTED,
- annotationProblemMarker.getAttribute(IMarker.MESSAGE));
- } catch (CoreException ce) {
- fail(ce.getLocalizedMessage());
- } catch (OperationCanceledException oce) {
- fail(oce.getLocalizedMessage());
- } catch (InterruptedException ie) {
- fail(ie.getLocalizedMessage());
- }
- }
-}
diff --git a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/SOAPBindingMixedBindingsRuleTest.java b/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/SOAPBindingMixedBindingsRuleTest.java
deleted file mode 100644
index 58900ce..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/SOAPBindingMixedBindingsRuleTest.java
+++ /dev/null
@@ -1,106 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Shane Clarke.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Shane Clarke - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.core.annotation.validation.tests;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.jws.soap.SOAPBinding;
-import javax.jws.soap.SOAPBinding.ParameterStyle;
-import javax.jws.soap.SOAPBinding.Style;
-import javax.jws.soap.SOAPBinding.Use;
-
-import org.eclipse.core.resources.IMarker;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.OperationCanceledException;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jdt.core.dom.Annotation;
-import org.eclipse.jdt.core.dom.MemberValuePair;
-import org.eclipse.jst.ws.annotations.core.AnnotationsCore;
-import org.eclipse.jst.ws.annotations.core.utils.AnnotationUtils;
-import org.eclipse.jst.ws.internal.jaxws.core.JAXWSCoreMessages;
-
-public class SOAPBindingMixedBindingsRuleTest extends AbstractSOAPBindingValidationTest {
-
- @Override
- protected Annotation getAnnotation() {
- List<MemberValuePair> memberValuePairs = new ArrayList<MemberValuePair>();
-
- MemberValuePair styleValuePair = AnnotationsCore.createEnumMemberValuePair(ast,
- SOAPBinding.class.getCanonicalName(), "style", Style.DOCUMENT);
-
- MemberValuePair useValuePair = AnnotationsCore.createEnumMemberValuePair(ast,
- SOAPBinding.class.getCanonicalName(), "use", Use.LITERAL);
-
- MemberValuePair parameterStyleValuePair = AnnotationsCore.createEnumMemberValuePair(ast,
- SOAPBinding.class.getCanonicalName(), "parameterStyle", ParameterStyle.WRAPPED);
-
- memberValuePairs.add(styleValuePair);
- memberValuePairs.add(useValuePair);
- memberValuePairs.add(parameterStyleValuePair);
-
- return AnnotationsCore.createNormalAnnotation(ast, SOAPBinding.class.getSimpleName(), memberValuePairs);
- }
-
- @Override
- protected String getClassContents() {
- StringBuilder classContents = new StringBuilder("package com.example;\n\n");
- classContents.append("import javax.jws.soap.SOAPBinding;\n\n");
- classContents.append("@SOAPBinding(style=SOAPBinding.Style.RPC, use=SOAPBinding.Use.LITERAL, ");
- classContents.append("parameterStyle=SOAPBinding.ParameterStyle.WRAPPED)\n");
- classContents.append("public class MyClass {\n\n\tpublic String myMethod(String in) {");
- classContents.append("\n\t\treturn \"txt\";\n\t}\n\n}");
- return classContents.toString();
- }
-
- public void testSOAPBindingMixedBindingsRule() {
- try {
- assertNotNull(annotation);
- assertEquals(SOAPBinding.class.getSimpleName(), AnnotationUtils.getAnnotationName(annotation));
-
- IMethod method = source.findPrimaryType().getMethod("myMethod", new String[] { "QString;" });
- assertNotNull(method);
-
- textFileChange.addEdit(AnnotationUtils.createAddImportTextEdit(method, SOAPBinding.class.getCanonicalName()));
-
- textFileChange.addEdit(AnnotationUtils.createAddAnnotationTextEdit(method, annotation));
-
- assertTrue(executeChange(new NullProgressMonitor(), textFileChange));
-
- assertTrue(AnnotationUtils.isAnnotationPresent(method, AnnotationUtils
- .getAnnotationName(annotation)));
- assertTrue(source.getImport(SOAPBinding.class.getCanonicalName()).exists());
-
- Job.getJobManager().join(ResourcesPlugin.FAMILY_AUTO_BUILD, null);
-
- IMarker[] allmarkers = source.getResource().findMarkers(IMarker.PROBLEM, true,
- IResource.DEPTH_INFINITE);
-
- assertEquals(1, allmarkers.length);
-
- IMarker annotationProblemMarker = allmarkers[0];
-
- assertEquals(source.getResource(), annotationProblemMarker.getResource());
- assertEquals(JAXWSCoreMessages.SOAPBINDING_NO_MIXED_BINDINGS,
- annotationProblemMarker.getAttribute(IMarker.MESSAGE));
- } catch (CoreException ce) {
- fail(ce.getLocalizedMessage());
- } catch (OperationCanceledException oce) {
- fail(oce.getLocalizedMessage());
- } catch (InterruptedException ie) {
- fail(ie.getLocalizedMessage());
- }
- }
-}
diff --git a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/SOAPBindingRCPBareRuleTest.java b/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/SOAPBindingRCPBareRuleTest.java
deleted file mode 100644
index 9862694..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/SOAPBindingRCPBareRuleTest.java
+++ /dev/null
@@ -1,92 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Shane Clarke.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Shane Clarke - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.core.annotation.validation.tests;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.jws.soap.SOAPBinding;
-import javax.jws.soap.SOAPBinding.ParameterStyle;
-import javax.jws.soap.SOAPBinding.Style;
-import javax.jws.soap.SOAPBinding.Use;
-
-import org.eclipse.core.resources.IMarker;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.OperationCanceledException;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.jdt.core.dom.Annotation;
-import org.eclipse.jdt.core.dom.MemberValuePair;
-import org.eclipse.jst.ws.annotations.core.AnnotationsCore;
-import org.eclipse.jst.ws.annotations.core.utils.AnnotationUtils;
-import org.eclipse.jst.ws.internal.jaxws.core.JAXWSCoreMessages;
-
-public class SOAPBindingRCPBareRuleTest extends AbstractSOAPBindingValidationTest {
-
- @Override
- protected Annotation getAnnotation() {
- List<MemberValuePair> memberValuePairs = new ArrayList<MemberValuePair>();
-
- MemberValuePair styleValuePair = AnnotationsCore.createEnumMemberValuePair(ast,
- SOAPBinding.class.getCanonicalName(), "style", Style.RPC);
-
- MemberValuePair useValuePair = AnnotationsCore.createEnumMemberValuePair(ast,
- SOAPBinding.class.getCanonicalName(), "use", Use.LITERAL);
-
- MemberValuePair parameterStyleValuePair = AnnotationsCore.createEnumMemberValuePair(ast,
- SOAPBinding.class.getCanonicalName(), "parameterStyle", ParameterStyle.BARE);
-
- memberValuePairs.add(styleValuePair);
- memberValuePairs.add(useValuePair);
- memberValuePairs.add(parameterStyleValuePair);
-
- return AnnotationsCore.createNormalAnnotation(ast, SOAPBinding.class.getSimpleName(), memberValuePairs);
- }
-
- public void testSOAPBindingRPCBareRule() {
- try {
- assertNotNull(annotation);
- assertEquals(SOAPBinding.class.getSimpleName(), AnnotationUtils.getAnnotationName(annotation));
-
- textFileChange.addEdit(AnnotationUtils.createAddImportTextEdit(source.findPrimaryType(), SOAPBinding.class.getCanonicalName()));
-
- textFileChange.addEdit(AnnotationUtils.createAddAnnotationTextEdit(source.findPrimaryType(), annotation));
-
- assertTrue(executeChange(new NullProgressMonitor(), textFileChange));
-
- assertTrue(AnnotationUtils.isAnnotationPresent(source, AnnotationUtils
- .getAnnotationName(annotation)));
- assertTrue(source.getImport(SOAPBinding.class.getCanonicalName()).exists());
-
- Job.getJobManager().join(ResourcesPlugin.FAMILY_AUTO_BUILD, null);
-
- IMarker[] allmarkers = source.getResource().findMarkers(IMarker.PROBLEM, true,
- IResource.DEPTH_INFINITE);
-
- assertEquals(1, allmarkers.length);
-
- IMarker annotationProblemMarker = allmarkers[0];
-
- assertEquals(source.getResource(), annotationProblemMarker.getResource());
- assertEquals(JAXWSCoreMessages.SOAPBINDING_RPC_NO_BARE_PARAMETER_STYLE,
- annotationProblemMarker.getAttribute(IMarker.MESSAGE));
- } catch (CoreException ce) {
- fail(ce.getLocalizedMessage());
- } catch (OperationCanceledException oce) {
- fail(oce.getLocalizedMessage());
- } catch (InterruptedException ie) {
- fail(ie.getLocalizedMessage());
- }
- }
-
-}
diff --git a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/SOAPBindingRPCEncodedRuleTest.java b/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/SOAPBindingRPCEncodedRuleTest.java
deleted file mode 100644
index 01b0a27..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/SOAPBindingRPCEncodedRuleTest.java
+++ /dev/null
@@ -1,92 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Shane Clarke.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Shane Clarke - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.core.annotation.validation.tests;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.jws.soap.SOAPBinding;
-import javax.jws.soap.SOAPBinding.ParameterStyle;
-import javax.jws.soap.SOAPBinding.Style;
-import javax.jws.soap.SOAPBinding.Use;
-
-import org.eclipse.core.resources.IMarker;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.OperationCanceledException;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.jdt.core.dom.Annotation;
-import org.eclipse.jdt.core.dom.MemberValuePair;
-import org.eclipse.jst.ws.annotations.core.AnnotationsCore;
-import org.eclipse.jst.ws.annotations.core.utils.AnnotationUtils;
-import org.eclipse.jst.ws.internal.jaxws.core.JAXWSCoreMessages;
-
-public class SOAPBindingRPCEncodedRuleTest extends AbstractSOAPBindingValidationTest {
-
- @Override
- protected Annotation getAnnotation() {
- List<MemberValuePair> memberValuePairs = new ArrayList<MemberValuePair>();
-
- MemberValuePair styleValuePair = AnnotationsCore.createEnumMemberValuePair(ast,
- SOAPBinding.class.getCanonicalName(), "style", Style.RPC);
-
- MemberValuePair useValuePair = AnnotationsCore.createEnumMemberValuePair(ast,
- SOAPBinding.class.getCanonicalName(), "use", Use.ENCODED);
-
- MemberValuePair parameterStyleValuePair = AnnotationsCore.createEnumMemberValuePair(ast,
- SOAPBinding.class.getCanonicalName(), "parameterStyle", ParameterStyle.WRAPPED);
-
- memberValuePairs.add(styleValuePair);
- memberValuePairs.add(useValuePair);
- memberValuePairs.add(parameterStyleValuePair);
-
- return AnnotationsCore.createNormalAnnotation(ast, SOAPBinding.class.getSimpleName(), memberValuePairs);
- }
-
- public void testSOAPBindingRPCEncodedRule() {
- try {
- assertNotNull(annotation);
- assertEquals(SOAPBinding.class.getSimpleName(), AnnotationUtils.getAnnotationName(annotation));
-
- textFileChange.addEdit(AnnotationUtils.createAddImportTextEdit(source.findPrimaryType(), SOAPBinding.class.getCanonicalName()));
-
- textFileChange.addEdit(AnnotationUtils.createAddAnnotationTextEdit(source.findPrimaryType(), annotation));
-
- assertTrue(executeChange(new NullProgressMonitor(), textFileChange));
-
- assertTrue(AnnotationUtils.isAnnotationPresent(source, AnnotationUtils
- .getAnnotationName(annotation)));
- assertTrue(source.getImport(SOAPBinding.class.getCanonicalName()).exists());
-
- Job.getJobManager().join(ResourcesPlugin.FAMILY_AUTO_BUILD, null);
-
- IMarker[] allmarkers = source.getResource().findMarkers(IMarker.PROBLEM, true,
- IResource.DEPTH_INFINITE);
-
- assertEquals(1, allmarkers.length);
-
- IMarker annotationProblemMarker = allmarkers[0];
-
- assertEquals(source.getResource(), annotationProblemMarker.getResource());
- assertEquals(JAXWSCoreMessages.SOAPBINDING_RPC_ENCODED_NOT_SUPPORTED,
- annotationProblemMarker.getAttribute(IMarker.MESSAGE));
- } catch (CoreException ce) {
- fail(ce.getLocalizedMessage());
- } catch (OperationCanceledException oce) {
- fail(oce.getLocalizedMessage());
- } catch (InterruptedException ie) {
- fail(ie.getLocalizedMessage());
- }
- }
-
-}
diff --git a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/SOAPBindingRPCStyleOnMethodRuleTest.java b/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/SOAPBindingRPCStyleOnMethodRuleTest.java
deleted file mode 100644
index 49424a0..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/SOAPBindingRPCStyleOnMethodRuleTest.java
+++ /dev/null
@@ -1,96 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Shane Clarke.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Shane Clarke - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.core.annotation.validation.tests;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.jws.soap.SOAPBinding;
-import javax.jws.soap.SOAPBinding.ParameterStyle;
-import javax.jws.soap.SOAPBinding.Style;
-import javax.jws.soap.SOAPBinding.Use;
-
-import org.eclipse.core.resources.IMarker;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.OperationCanceledException;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jdt.core.dom.Annotation;
-import org.eclipse.jdt.core.dom.MemberValuePair;
-import org.eclipse.jst.ws.annotations.core.AnnotationsCore;
-import org.eclipse.jst.ws.annotations.core.utils.AnnotationUtils;
-import org.eclipse.jst.ws.internal.jaxws.core.JAXWSCoreMessages;
-
-public class SOAPBindingRPCStyleOnMethodRuleTest extends AbstractSOAPBindingValidationTest {
-
- @Override
- protected Annotation getAnnotation() {
- List<MemberValuePair> memberValuePairs = new ArrayList<MemberValuePair>();
-
- MemberValuePair styleValuePair = AnnotationsCore.createEnumMemberValuePair(ast,
- SOAPBinding.class.getCanonicalName(), "style", Style.RPC);
-
- MemberValuePair useValuePair = AnnotationsCore.createEnumMemberValuePair(ast,
- SOAPBinding.class.getCanonicalName(), "use", Use.LITERAL);
-
- MemberValuePair parameterStyleValuePair = AnnotationsCore.createEnumMemberValuePair(ast,
- SOAPBinding.class.getCanonicalName(), "parameterStyle", ParameterStyle.WRAPPED);
-
- memberValuePairs.add(styleValuePair);
- memberValuePairs.add(useValuePair);
- memberValuePairs.add(parameterStyleValuePair);
-
- return AnnotationsCore.createNormalAnnotation(ast, SOAPBinding.class.getSimpleName(), memberValuePairs);
- }
-
- public void testSOAPBindingRPCStyleOnMethodsRule() {
- try {
- assertNotNull(annotation);
- assertEquals(SOAPBinding.class.getSimpleName(), AnnotationUtils.getAnnotationName(annotation));
-
- IMethod method = source.findPrimaryType().getMethod("myMethod", new String[] { "QString;" });
- assertNotNull(method);
-
- textFileChange.addEdit(AnnotationUtils.createAddImportTextEdit(method, SOAPBinding.class.getCanonicalName()));
-
- textFileChange.addEdit(AnnotationUtils.createAddAnnotationTextEdit(method, annotation));
-
- assertTrue(executeChange(new NullProgressMonitor(), textFileChange));
-
- assertTrue(AnnotationUtils.isAnnotationPresent(method, AnnotationUtils
- .getAnnotationName(annotation)));
- assertTrue(source.getImport(SOAPBinding.class.getCanonicalName()).exists());
-
- Job.getJobManager().join(ResourcesPlugin.FAMILY_AUTO_BUILD, null);
-
- IMarker[] allmarkers = source.getResource().findMarkers(IMarker.PROBLEM, true,
- IResource.DEPTH_INFINITE);
-
- assertEquals(1, allmarkers.length);
-
- IMarker annotationProblemMarker = allmarkers[0];
-
- assertEquals(source.getResource(), annotationProblemMarker.getResource());
- assertEquals(JAXWSCoreMessages.SOAPBINDING_NO_RPC_STYLE_ON_METHODS,
- annotationProblemMarker.getAttribute(IMarker.MESSAGE));
- } catch (CoreException ce) {
- fail(ce.getLocalizedMessage());
- } catch (OperationCanceledException oce) {
- fail(oce.getLocalizedMessage());
- } catch (InterruptedException ie) {
- fail(ie.getLocalizedMessage());
- }
- }
-
-}
diff --git a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/WebMethodCheckForWebServiceRuleTest.java b/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/WebMethodCheckForWebServiceRuleTest.java
deleted file mode 100644
index 0440c4d..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/WebMethodCheckForWebServiceRuleTest.java
+++ /dev/null
@@ -1,105 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Shane Clarke.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Shane Clarke - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.core.annotation.validation.tests;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.jws.WebMethod;
-import org.eclipse.core.resources.IMarker;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.OperationCanceledException;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jdt.core.dom.Annotation;
-import org.eclipse.jdt.core.dom.MemberValuePair;
-import org.eclipse.jst.ws.annotations.core.AnnotationsCore;
-import org.eclipse.jst.ws.annotations.core.utils.AnnotationUtils;
-import org.eclipse.jst.ws.internal.jaxws.core.JAXWSCoreMessages;
-
-public class WebMethodCheckForWebServiceRuleTest extends AbstractAnnotationValidationTest {
-
- @Override
- protected Annotation getAnnotation() {
- List<MemberValuePair> memberValuePairs = new ArrayList<MemberValuePair>();
-
- MemberValuePair operationValuePair = AnnotationsCore.createStringMemberValuePair(ast,
- "operationName", "myMethod");
-
- MemberValuePair actionValuePair = AnnotationsCore.createStringMemberValuePair(ast, "action",
- "urn:MyMethod");
-
- memberValuePairs.add(operationValuePair);
- memberValuePairs.add(actionValuePair);
-
- return AnnotationsCore.createNormalAnnotation(ast, WebMethod.class.getSimpleName(), memberValuePairs);
- }
-
- @Override
- protected String getClassContents() {
- StringBuilder classContents = new StringBuilder("package com.example;\n\n");
- classContents.append("public class MyClass {\n\n\tpublic String myMethod() {");
- classContents.append("\n\t\treturn \"txt\";\n\t}\n}");
- return classContents.toString();
- }
-
- @Override
- protected String getClassName() {
- return "MyClass.java";
- }
-
- @Override
- protected String getPackageName() {
- return "com.example";
- }
-
- public void testWebMethodCheckForWebServiceRule() {
- try {
- assertNotNull(annotation);
- assertEquals(WebMethod.class.getSimpleName(), AnnotationUtils.getAnnotationName(annotation));
-
- IMethod method = source.findPrimaryType().getMethod("myMethod", new String[0]);
- assertNotNull(method);
-
- textFileChange.addEdit(AnnotationUtils.createAddImportTextEdit(method, WebMethod.class.getCanonicalName()));
-
- textFileChange.addEdit(AnnotationUtils.createAddAnnotationTextEdit(method, annotation));
-
- assertTrue(executeChange(new NullProgressMonitor(), textFileChange));
-
- assertTrue(AnnotationUtils.isAnnotationPresent(method, AnnotationUtils
- .getAnnotationName(annotation)));
- assertTrue(source.getImport(WebMethod.class.getCanonicalName()).exists());
-
- Job.getJobManager().join(ResourcesPlugin.FAMILY_AUTO_BUILD, null);
-
- IMarker[] allmarkers = source.getResource().findMarkers(IMarker.PROBLEM, true,
- IResource.DEPTH_INFINITE);
-
- assertEquals(1, allmarkers.length);
-
- IMarker annotationProblemMarker = allmarkers[0];
-
- assertEquals(source.getResource(), annotationProblemMarker.getResource());
- assertEquals(JAXWSCoreMessages.WEBMETHOD_ONLY_SUPPORTED_ON_CLASSES_WITH_WEBSERVICE,
- annotationProblemMarker.getAttribute(IMarker.MESSAGE));
- } catch (CoreException ce) {
- fail(ce.getLocalizedMessage());
- } catch (OperationCanceledException oce) {
- fail(oce.getLocalizedMessage());
- } catch (InterruptedException ie) {
- fail(ie.getLocalizedMessage());
- }
- }
-}
diff --git a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/WebMethodExcludeRuleOnImplTest.java b/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/WebMethodExcludeRuleOnImplTest.java
deleted file mode 100644
index 70e88ba..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/WebMethodExcludeRuleOnImplTest.java
+++ /dev/null
@@ -1,111 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Shane Clarke.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Shane Clarke - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.core.annotation.validation.tests;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.jws.WebMethod;
-import org.eclipse.core.resources.IMarker;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.OperationCanceledException;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jdt.core.dom.Annotation;
-import org.eclipse.jdt.core.dom.MemberValuePair;
-import org.eclipse.jst.ws.annotations.core.AnnotationsCore;
-import org.eclipse.jst.ws.annotations.core.utils.AnnotationUtils;
-import org.eclipse.jst.ws.internal.jaxws.core.JAXWSCoreMessages;
-
-public class WebMethodExcludeRuleOnImplTest extends AbstractAnnotationValidationTest {
-
- @Override
- protected Annotation getAnnotation() {
- List<MemberValuePair> memberValuePairs = new ArrayList<MemberValuePair>();
-
- MemberValuePair operationValuePair = AnnotationsCore.createStringMemberValuePair(ast,
- "operationName", "myMethod");
-
- MemberValuePair actionValuePair = AnnotationsCore.createStringMemberValuePair(ast, "action",
- "urn:MyMethod");
-
- MemberValuePair excludeValuePair = AnnotationsCore.createBooleanMemberValuePair(ast, "exclude",
- Boolean.TRUE);
-
- memberValuePairs.add(operationValuePair);
- memberValuePairs.add(actionValuePair);
- memberValuePairs.add(excludeValuePair);
-
- return AnnotationsCore.createNormalAnnotation(ast, WebMethod.class.getSimpleName(), memberValuePairs);
- }
-
- @Override
- protected String getClassContents() {
- StringBuilder classContents = new StringBuilder("package com.example;\n\n");
- classContents.append("import javax.jws.WebService;\n\n");
- classContents.append("@WebService(name=\"MyClass\")\n");
- classContents.append("public class MyClass {\n\n\tpublic String myMethod() {");
- classContents.append("\n\t\treturn \"txt\";\n\t}\n}");
- return classContents.toString();
- }
-
- @Override
- protected String getClassName() {
- return "MyClass.java";
- }
-
- @Override
- protected String getPackageName() {
- return "com.example";
- }
-
- public void testWebMethodCheckForWebServiceRule() {
- try {
- assertNotNull(annotation);
- assertEquals(WebMethod.class.getSimpleName(), AnnotationUtils.getAnnotationName(annotation));
-
- IMethod method = source.findPrimaryType().getMethod("myMethod", new String[0]);
- assertNotNull(method);
-
- textFileChange.addEdit(AnnotationUtils.createAddImportTextEdit(method, WebMethod.class.getCanonicalName()));
-
- textFileChange.addEdit(AnnotationUtils.createAddAnnotationTextEdit(method, annotation));
-
- assertTrue(executeChange(new NullProgressMonitor(), textFileChange));
-
- assertTrue(AnnotationUtils.isAnnotationPresent(method, AnnotationUtils
- .getAnnotationName(annotation)));
- assertTrue(source.getImport(WebMethod.class.getCanonicalName()).exists());
-
- Job.getJobManager().join(ResourcesPlugin.FAMILY_AUTO_BUILD, null);
-
- IMarker[] allmarkers = source.getResource().findMarkers(IMarker.PROBLEM, true,
- IResource.DEPTH_INFINITE);
-
- assertEquals(1, allmarkers.length);
-
- IMarker annotationProblemMarker = allmarkers[0];
-
- assertEquals(source.getResource(), annotationProblemMarker.getResource());
- assertEquals(JAXWSCoreMessages.WEBMETHOD_EXCLUDE_SPECIFIED_NO_OTHER_ATTRIBUTES_ALLOWED,
- annotationProblemMarker.getAttribute(IMarker.MESSAGE));
- } catch (CoreException ce) {
- fail(ce.getLocalizedMessage());
- } catch (OperationCanceledException oce) {
- fail(oce.getLocalizedMessage());
- } catch (InterruptedException ie) {
- fail(ie.getLocalizedMessage());
- }
- }
-}
diff --git a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/WebMethodExcludeRuleOnSEITest.java b/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/WebMethodExcludeRuleOnSEITest.java
deleted file mode 100644
index 1b80249..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/WebMethodExcludeRuleOnSEITest.java
+++ /dev/null
@@ -1,103 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Shane Clarke.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Shane Clarke - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.core.annotation.validation.tests;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.jws.WebMethod;
-import org.eclipse.core.resources.IMarker;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.OperationCanceledException;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jdt.core.dom.Annotation;
-import org.eclipse.jdt.core.dom.MemberValuePair;
-import org.eclipse.jst.ws.annotations.core.AnnotationsCore;
-import org.eclipse.jst.ws.annotations.core.utils.AnnotationUtils;
-import org.eclipse.jst.ws.internal.jaxws.core.JAXWSCoreMessages;
-
-public class WebMethodExcludeRuleOnSEITest extends AbstractAnnotationValidationTest {
-
- @Override
- protected Annotation getAnnotation() {
- List<MemberValuePair> memberValuePairs = new ArrayList<MemberValuePair>();
-
- MemberValuePair excludeValuePair = AnnotationsCore.createBooleanMemberValuePair(ast, "exclude",
- Boolean.TRUE);
-
- memberValuePairs.add(excludeValuePair);
-
- return AnnotationsCore.createNormalAnnotation(ast, WebMethod.class.getSimpleName(), memberValuePairs);
- }
-
- @Override
- protected String getClassContents() {
- StringBuilder classContents = new StringBuilder("package com.example;\n\n");
- classContents.append("import javax.jws.WebService;\n\n");
- classContents.append("@WebService(name=\"MyInterface\")\n");
- classContents.append("public interface MyClass {\n\n\tpublic String myMethod();\n}");
- return classContents.toString();
- }
-
- @Override
- protected String getClassName() {
- return "MyClass.java";
- }
-
- @Override
- protected String getPackageName() {
- return "com.example";
- }
-
- public void testWebMethodExcludeRuleOnInterface() {
- try {
- assertNotNull(annotation);
- assertEquals(WebMethod.class.getSimpleName(), AnnotationUtils.getAnnotationName(annotation));
-
- IMethod method = source.findPrimaryType().getMethod("myMethod", new String[0]);
- assertNotNull(method);
-
- textFileChange.addEdit(AnnotationUtils.createAddImportTextEdit(source.findPrimaryType(), WebMethod.class.getCanonicalName()));
-
- textFileChange.addEdit(AnnotationUtils.createAddAnnotationTextEdit(method, annotation));
-
- assertTrue(executeChange(new NullProgressMonitor(), textFileChange));
-
- assertTrue(AnnotationUtils.isAnnotationPresent(method, AnnotationUtils
- .getAnnotationName(annotation)));
- assertTrue(source.getImport(WebMethod.class.getCanonicalName()).exists());
-
- Job.getJobManager().join(ResourcesPlugin.FAMILY_AUTO_BUILD, null);
-
- IMarker[] allmarkers = source.getResource().findMarkers(IMarker.PROBLEM, true,
- IResource.DEPTH_INFINITE);
-
- assertEquals(1, allmarkers.length);
-
- IMarker annotationProblemMarker = allmarkers[0];
-
- assertEquals(source.getResource(), annotationProblemMarker.getResource());
- assertEquals(JAXWSCoreMessages.WEBMETHOD_EXCLUDE_NOT_ALLOWED_ON_SEI,
- annotationProblemMarker.getAttribute(IMarker.MESSAGE));
- } catch (CoreException ce) {
- fail(ce.getLocalizedMessage());
- } catch (OperationCanceledException oce) {
- fail(oce.getLocalizedMessage());
- } catch (InterruptedException ie) {
- fail(ie.getLocalizedMessage());
- }
- }
-
-}
diff --git a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/WebMethodNoFinalModifierRuleTest.java b/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/WebMethodNoFinalModifierRuleTest.java
deleted file mode 100644
index fd4d56d..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/WebMethodNoFinalModifierRuleTest.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Shane Clarke.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Shane Clarke - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.core.annotation.validation.tests;
-
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jst.ws.internal.jaxws.core.JAXWSCoreMessages;
-
-public class WebMethodNoFinalModifierRuleTest extends AbstractWebMethodPublicStaticFinalRuleTest {
-
- @Override
- public IMethod getMethodToTeset() {
- return source.findPrimaryType().getMethod("myFinalMethod", new String[0]);
- }
-
- @Override
- public String getErrorMessage() {
- return JAXWSCoreMessages.WEBMETHOD_NO_FINAL_MODIFIER_ALLOWED;
- }
-
-}
diff --git a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/WebMethodNoPackagePrivateMethodRuleTest.java b/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/WebMethodNoPackagePrivateMethodRuleTest.java
deleted file mode 100644
index 84e8eb2..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/WebMethodNoPackagePrivateMethodRuleTest.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Shane Clarke.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Shane Clarke - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.core.annotation.validation.tests;
-
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jst.ws.internal.jaxws.core.JAXWSCoreMessages;
-
-public class WebMethodNoPackagePrivateMethodRuleTest extends AbstractWebMethodPublicStaticFinalRuleTest {
-
- @Override
- public IMethod getMethodToTeset() {
- return source.findPrimaryType().getMethod("myPackagePrivateMethod", new String[0]);
- }
-
- @Override
- public String getErrorMessage() {
- return JAXWSCoreMessages.WEBMETHOD_ONLY_ON_PUBLIC_METHODS;
- }
-
-}
diff --git a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/WebMethodNoPrivateMethodRuleTest.java b/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/WebMethodNoPrivateMethodRuleTest.java
deleted file mode 100644
index 88241c1..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/WebMethodNoPrivateMethodRuleTest.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Shane Clarke.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Shane Clarke - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.core.annotation.validation.tests;
-
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jst.ws.internal.jaxws.core.JAXWSCoreMessages;
-
-public class WebMethodNoPrivateMethodRuleTest extends AbstractWebMethodPublicStaticFinalRuleTest {
-
- @Override
- public IMethod getMethodToTeset() {
- return source.findPrimaryType().getMethod("myPrivateMethod", new String[0]);
- }
-
- @Override
- public String getErrorMessage() {
- return JAXWSCoreMessages.WEBMETHOD_ONLY_ON_PUBLIC_METHODS;
- }
-
-}
diff --git a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/WebMethodNoProtectedMethodRuleTest.java b/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/WebMethodNoProtectedMethodRuleTest.java
deleted file mode 100644
index 3a58354..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/WebMethodNoProtectedMethodRuleTest.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Shane Clarke.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Shane Clarke - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.core.annotation.validation.tests;
-
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jst.ws.internal.jaxws.core.JAXWSCoreMessages;
-
-public class WebMethodNoProtectedMethodRuleTest extends AbstractWebMethodPublicStaticFinalRuleTest {
-
- @Override
- public IMethod getMethodToTeset() {
- return source.findPrimaryType().getMethod("myProtectedMethod", new String[0]);
- }
-
- @Override
- public String getErrorMessage() {
- return JAXWSCoreMessages.WEBMETHOD_ONLY_ON_PUBLIC_METHODS;
- }
-
-}
diff --git a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/WebMethodNoStaticModifierRuleTest.java b/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/WebMethodNoStaticModifierRuleTest.java
deleted file mode 100644
index 7aae53e..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/WebMethodNoStaticModifierRuleTest.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Shane Clarke.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Shane Clarke - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.core.annotation.validation.tests;
-
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jst.ws.internal.jaxws.core.JAXWSCoreMessages;
-
-public class WebMethodNoStaticModifierRuleTest extends AbstractWebMethodPublicStaticFinalRuleTest {
-
- @Override
- public IMethod getMethodToTeset() {
- return source.findPrimaryType().getMethod("myStaticMethod", new String[0]);
- }
-
- @Override
- public String getErrorMessage() {
- return JAXWSCoreMessages.WEBMETHOD_NO_STATIC_MODIFIER_ALLOWED;
- }
-
-}
diff --git a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/WebParamModeHolderTypeRuleTest.java b/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/WebParamModeHolderTypeRuleTest.java
deleted file mode 100644
index a423f02..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/WebParamModeHolderTypeRuleTest.java
+++ /dev/null
@@ -1,106 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Shane Clarke.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Shane Clarke - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.core.annotation.validation.tests;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.jws.WebParam;
-import javax.jws.WebParam.Mode;
-import org.eclipse.core.resources.IMarker;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.OperationCanceledException;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.jdt.core.ILocalVariable;
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jdt.core.dom.Annotation;
-import org.eclipse.jdt.core.dom.MemberValuePair;
-import org.eclipse.jst.ws.annotations.core.AnnotationsCore;
-import org.eclipse.jst.ws.annotations.core.utils.AnnotationUtils;
-import org.eclipse.jst.ws.internal.jaxws.core.JAXWSCoreMessages;
-
-public class WebParamModeHolderTypeRuleTest extends AbstractAnnotationValidationTest {
-
- @Override
- public Annotation getAnnotation() {
- List<MemberValuePair> memberValuePairs = new ArrayList<MemberValuePair>();
-
- MemberValuePair modeValuePair = AnnotationsCore.createEnumMemberValuePair(ast,
- WebParam.class.getCanonicalName(), "mode", Mode.OUT);
-
- memberValuePairs.add(modeValuePair);
-
- return AnnotationsCore.createNormalAnnotation(ast, WebParam.class.getSimpleName(), memberValuePairs);
- }
-
- @Override
- public String getPackageName() {
- return "com.example";
- }
-
- @Override
- public String getClassName() {
- return "MyClass.java";
- }
-
- @Override
- public String getClassContents() {
- StringBuilder classContents = new StringBuilder("package com.example;\n\n");
- classContents.append("import javax.jws.WebService;\n\n");
- classContents.append("@WebService(name=\"MyClass\")\n");
- classContents.append("public class MyClass {\n\n\tpublic String myMethod(String param) {");
- classContents.append("\n\t\treturn \"txt\";\n\t}\n}");
- return classContents.toString();
- }
-
- public void testWebParamModeHolderTypeRule() {
- try {
- assertNotNull(annotation);
- assertEquals(WebParam.class.getSimpleName(), AnnotationUtils.getAnnotationName(annotation));
-
- IMethod method = source.findPrimaryType().getMethod("myMethod", new String[] { "QString;" });
- assertNotNull(method);
-
- ILocalVariable localVariable = AnnotationUtils.getLocalVariable(method, "param");
-
- textFileChange.addEdit(AnnotationUtils.createAddImportTextEdit(localVariable, WebParam.class.getCanonicalName()));
-
- textFileChange.addEdit(AnnotationUtils.createAddAnnotationTextEdit(localVariable, annotation));
-
- assertTrue(executeChange(new NullProgressMonitor(), textFileChange));
-
- assertTrue(AnnotationUtils.isAnnotationPresent(localVariable, annotation));
- assertTrue(source.getImport(WebParam.class.getCanonicalName()).exists());
-
- Job.getJobManager().join(ResourcesPlugin.FAMILY_AUTO_BUILD, null);
-
- IMarker[] allmarkers = source.getResource().findMarkers(IMarker.PROBLEM, true,
- IResource.DEPTH_INFINITE);
-
- assertEquals(1, allmarkers.length);
-
- IMarker annotationProblemMarker = allmarkers[0];
-
- assertEquals(source.getResource(), annotationProblemMarker.getResource());
- assertEquals(JAXWSCoreMessages.WEBPARAM_MODE_OUT_INOUT_HOLDER_TYPE,
- annotationProblemMarker.getAttribute(IMarker.MESSAGE));
- } catch (CoreException ce) {
- fail(ce.getLocalizedMessage());
- }catch (OperationCanceledException oce) {
- fail(oce.getLocalizedMessage());
- } catch (InterruptedException ie) {
- fail(ie.getLocalizedMessage());
- }
- }
-}
diff --git a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/WebServiceDefaultPublicConstructorRuleTest.java b/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/WebServiceDefaultPublicConstructorRuleTest.java
deleted file mode 100644
index 7fa8fdf..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/WebServiceDefaultPublicConstructorRuleTest.java
+++ /dev/null
@@ -1,109 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Shane Clarke.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Shane Clarke - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.core.annotation.validation.tests;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.jws.WebService;
-import org.eclipse.core.resources.IMarker;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.OperationCanceledException;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.jdt.core.dom.Annotation;
-import org.eclipse.jdt.core.dom.MemberValuePair;
-import org.eclipse.jst.ws.annotations.core.AnnotationsCore;
-import org.eclipse.jst.ws.annotations.core.utils.AnnotationUtils;
-import org.eclipse.jst.ws.internal.jaxws.core.JAXWSCoreMessages;
-
-public class WebServiceDefaultPublicConstructorRuleTest extends AbstractAnnotationValidationTest {
-
- @Override
- protected Annotation getAnnotation() {
- List<MemberValuePair> memberValuePairs = new ArrayList<MemberValuePair>();
-
- MemberValuePair nameValuePair = AnnotationsCore.createStringMemberValuePair(ast, "name", "MyClass");
-
- MemberValuePair portNameValuePair = AnnotationsCore.createStringMemberValuePair(ast, "portName",
- "MyClassPort");
-
- MemberValuePair serviceNameValuePair = AnnotationsCore.createStringMemberValuePair(ast,
- "serviceName", "MyClassService");
-
- MemberValuePair targetNamespaceValuePair = AnnotationsCore.createStringMemberValuePair(ast,
- "targetNamespace", "http://example.com/");
-
- memberValuePairs.add(nameValuePair);
- memberValuePairs.add(targetNamespaceValuePair);
- memberValuePairs.add(portNameValuePair);
- memberValuePairs.add(serviceNameValuePair);
-
- return AnnotationsCore.createNormalAnnotation(ast, WebService.class.getSimpleName(), memberValuePairs);
- }
-
- @Override
- protected String getClassContents() {
- StringBuilder classContents = new StringBuilder("package com.example;\n\n");
- classContents.append("public class MyClass {\n\n\tpublic MyClass(String arg) {\n\t}\n}");
- return classContents.toString();
- }
-
- @Override
- protected String getClassName() {
- return "MyClass.java";
- }
-
- @Override
- protected String getPackageName() {
- return "com.example";
- }
-
- public void testWebServiceDefaultPublicConstructorRule() {
- try {
- assertNotNull(annotation);
- assertEquals(WebService.class.getSimpleName(), AnnotationUtils.getAnnotationName(annotation));
-
- textFileChange.addEdit(AnnotationUtils.createAddImportTextEdit(source.findPrimaryType(), WebService.class.getCanonicalName()));
-
- textFileChange.addEdit(AnnotationUtils.createAddAnnotationTextEdit(source.findPrimaryType(), annotation));
-
- assertTrue(executeChange(new NullProgressMonitor(), textFileChange));
-
- assertTrue(AnnotationUtils.isAnnotationPresent(source, AnnotationUtils
- .getAnnotationName(annotation)));
-
- assertTrue(source.getImport(WebService.class.getCanonicalName()).exists());
-
- Job.getJobManager().join(ResourcesPlugin.FAMILY_AUTO_BUILD, null);
-
- IMarker[] allmarkers = source.getResource().findMarkers(IMarker.PROBLEM, true,
- IResource.DEPTH_INFINITE);
-
- assertEquals(1, allmarkers.length);
-
- IMarker annotationProblemMarker = allmarkers[0];
-
- assertEquals(source.getResource(), annotationProblemMarker.getResource());
- assertEquals(JAXWSCoreMessages.WEBSERVICE_DEFAULT_PUBLIC_CONSTRUCTOR,
- annotationProblemMarker.getAttribute(IMarker.MESSAGE));
- } catch (CoreException ce) {
- fail(ce.getLocalizedMessage());
- } catch (OperationCanceledException oce) {
- fail(oce.getLocalizedMessage());
- } catch (InterruptedException ie) {
- fail(ie.getLocalizedMessage());
- }
- }
-
-}
diff --git a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/WebServiceNoAbstractModifierRuleTest.java b/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/WebServiceNoAbstractModifierRuleTest.java
deleted file mode 100644
index 2a08327..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/WebServiceNoAbstractModifierRuleTest.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Shane Clarke.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Shane Clarke - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.core.annotation.validation.tests;
-
-public class WebServiceNoAbstractModifierRuleTest extends AbstractWebServicePublicAbstractFinalRuleTest {
-
- @Override
- protected String getClassContents() {
- StringBuilder classContents = new StringBuilder("package com.example;\n\n");
- classContents.append("public abstract class MyClass {\n\n");
- classContents.append("\tpublic String myMethod() {" + "\n\t\treturn \"txt\";\n\t}\n\n}");
- return classContents.toString();
- }
-
-}
diff --git a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/WebServiceNoFinalModiferRuleTest.java b/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/WebServiceNoFinalModiferRuleTest.java
deleted file mode 100644
index bfc91f7..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/WebServiceNoFinalModiferRuleTest.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Shane Clarke.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Shane Clarke - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.core.annotation.validation.tests;
-
-public class WebServiceNoFinalModiferRuleTest extends AbstractWebServicePublicAbstractFinalRuleTest {
-
- @Override
- protected String getClassContents() {
- StringBuilder classContents = new StringBuilder("package com.example;\n\n");
- classContents.append("public final class MyClass {\n\n");
- classContents.append("\tpublic String myMethod() {" + "\n\t\treturn \"txt\";\n\t}\n\n}");
- return classContents.toString();
- }
-
-}
diff --git a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/WebServiceNoFinalizeMethodRuleTest.java b/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/WebServiceNoFinalizeMethodRuleTest.java
deleted file mode 100644
index d84c431..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/WebServiceNoFinalizeMethodRuleTest.java
+++ /dev/null
@@ -1,108 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Shane Clarke.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Shane Clarke - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.core.annotation.validation.tests;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.jws.WebService;
-import org.eclipse.core.resources.IMarker;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.OperationCanceledException;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.jdt.core.dom.Annotation;
-import org.eclipse.jdt.core.dom.MemberValuePair;
-import org.eclipse.jst.ws.annotations.core.AnnotationsCore;
-import org.eclipse.jst.ws.annotations.core.utils.AnnotationUtils;
-import org.eclipse.jst.ws.internal.jaxws.core.JAXWSCoreMessages;
-
-public class WebServiceNoFinalizeMethodRuleTest extends AbstractAnnotationValidationTest {
-
- @Override
- protected Annotation getAnnotation() {
- List<MemberValuePair> memberValuePairs = new ArrayList<MemberValuePair>();
-
- MemberValuePair nameValuePair = AnnotationsCore.createStringMemberValuePair(ast, "name", "MyClass");
-
- MemberValuePair portNameValuePair = AnnotationsCore.createStringMemberValuePair(ast, "portName",
- "MyClassPort");
-
- MemberValuePair serviceNameValuePair = AnnotationsCore.createStringMemberValuePair(ast,
- "serviceName", "MyClassService");
-
- MemberValuePair targetNamespaceValuePair = AnnotationsCore.createStringMemberValuePair(ast,
- "targetNamespace", "http://example.com/");
-
- memberValuePairs.add(nameValuePair);
- memberValuePairs.add(targetNamespaceValuePair);
- memberValuePairs.add(portNameValuePair);
- memberValuePairs.add(serviceNameValuePair);
-
- return AnnotationsCore.createNormalAnnotation(ast, WebService.class.getSimpleName(), memberValuePairs);
- }
-
- @Override
- protected String getClassContents() {
- StringBuilder classContents = new StringBuilder("package com.example;\n\n");
- classContents.append("public class MyClass {\n\n\tpublic void finalize() {\n\t}\n}");
- return classContents.toString();
- }
-
- @Override
- protected String getClassName() {
- return "MyClass.java";
- }
-
- @Override
- protected String getPackageName() {
- return "com.example";
- }
-
- public void testWebServiceNoFinalizeMethodRule() {
- try {
- assertNotNull(annotation);
- assertEquals(WebService.class.getSimpleName(), AnnotationUtils.getAnnotationName(annotation));
-
- textFileChange.addEdit(AnnotationUtils.createAddImportTextEdit(source.findPrimaryType(), WebService.class.getCanonicalName()));
-
- textFileChange.addEdit(AnnotationUtils.createAddAnnotationTextEdit(source.findPrimaryType(), annotation));
-
- assertTrue(executeChange(new NullProgressMonitor(), textFileChange));
-
- assertTrue(AnnotationUtils.isAnnotationPresent(source, AnnotationUtils
- .getAnnotationName(annotation)));
- assertTrue(source.getImport(WebService.class.getCanonicalName()).exists());
-
- Job.getJobManager().join(ResourcesPlugin.FAMILY_AUTO_BUILD, null);
-
- IMarker[] allmarkers = source.getResource().findMarkers(IMarker.PROBLEM, true,
- IResource.DEPTH_INFINITE);
-
- assertEquals(1, allmarkers.length);
-
- IMarker annotationProblemMarker = allmarkers[0];
-
- assertEquals(source.getResource(), annotationProblemMarker.getResource());
- assertEquals(JAXWSCoreMessages.WEBSERVICE_OVERRIDE_FINALIZE,
- annotationProblemMarker.getAttribute(IMarker.MESSAGE));
- } catch (CoreException ce) {
- fail(ce.getLocalizedMessage());
- } catch (OperationCanceledException oce) {
- fail(oce.getLocalizedMessage());
- } catch (InterruptedException ie) {
- fail(ie.getLocalizedMessage());
- }
- }
-
-}
diff --git a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/WebServiceSEINoEndpointInterfaceRuleTest.java b/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/WebServiceSEINoEndpointInterfaceRuleTest.java
deleted file mode 100644
index 230de1e..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/WebServiceSEINoEndpointInterfaceRuleTest.java
+++ /dev/null
@@ -1,104 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Shane Clarke.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Shane Clarke - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.core.annotation.validation.tests;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.jws.WebService;
-import org.eclipse.core.resources.IMarker;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.OperationCanceledException;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.jdt.core.dom.Annotation;
-import org.eclipse.jdt.core.dom.MemberValuePair;
-import org.eclipse.jst.ws.annotations.core.AnnotationsCore;
-import org.eclipse.jst.ws.annotations.core.utils.AnnotationUtils;
-import org.eclipse.jst.ws.internal.jaxws.core.JAXWSCoreMessages;
-
-public class WebServiceSEINoEndpointInterfaceRuleTest extends AbstractAnnotationValidationTest {
-
- @Override
- protected Annotation getAnnotation() {
- List<MemberValuePair> memberValuePairs = new ArrayList<MemberValuePair>();
-
- MemberValuePair nameValuePair = AnnotationsCore.createStringMemberValuePair(ast, "name", "MyClass");
-
- MemberValuePair endpointInterfaceValuePair = AnnotationsCore.createStringMemberValuePair(ast,
- "endpointInterface", "MyInterface");
-
- MemberValuePair targetNamespaceValuePair = AnnotationsCore.createStringMemberValuePair(ast,
- "targetNamespace", "http://example.com/");
-
- memberValuePairs.add(nameValuePair);
- memberValuePairs.add(endpointInterfaceValuePair);
- memberValuePairs.add(targetNamespaceValuePair);
-
- return AnnotationsCore.createNormalAnnotation(ast, WebService.class.getSimpleName(), memberValuePairs);
- }
-
- @Override
- protected String getClassContents() {
- StringBuilder classContents = new StringBuilder("package com.example;\n\n");
- classContents.append("public interface MyInterface {\n\n\tpublic String myeMethod();\n\n}");
- return classContents.toString();
- }
-
- @Override
- protected String getClassName() {
- return "MyInterface.java";
- }
-
- @Override
- protected String getPackageName() {
- return "com.example";
- }
-
- public void testWebServiceSEINoEndpointInterfaceRule() {
- try {
- assertNotNull(annotation);
- assertEquals(WebService.class.getSimpleName(), AnnotationUtils.getAnnotationName(annotation));
-
- textFileChange.addEdit(AnnotationUtils.createAddImportTextEdit(source.findPrimaryType(), WebService.class.getCanonicalName()));
-
- textFileChange.addEdit(AnnotationUtils.createAddAnnotationTextEdit(source.findPrimaryType(), annotation));
-
- assertTrue(executeChange(new NullProgressMonitor(), textFileChange));
-
- assertTrue(AnnotationUtils.isAnnotationPresent(source, AnnotationUtils
- .getAnnotationName(annotation)));
- assertTrue(source.getImport(WebService.class.getCanonicalName()).exists());
-
- Job.getJobManager().join(ResourcesPlugin.FAMILY_AUTO_BUILD, null);
-
- IMarker[] allmarkers = source.getResource().findMarkers(IMarker.PROBLEM, true,
- IResource.DEPTH_INFINITE);
-
- assertEquals(1, allmarkers.length);
-
- IMarker annotationProblemMarker = allmarkers[0];
-
- assertEquals(source.getResource(), annotationProblemMarker.getResource());
- assertEquals(JAXWSCoreMessages.WEBSERVICE_ENDPOINTINTERFACE_SEI,
- annotationProblemMarker.getAttribute(IMarker.MESSAGE));
- } catch (CoreException ce) {
- fail(ce.getLocalizedMessage());
- } catch (OperationCanceledException oce) {
- fail(oce.getLocalizedMessage());
- } catch (InterruptedException ie) {
- fail(ie.getLocalizedMessage());
- }
- }
-
-}
diff --git a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/WebServiceSEINoOnewayRuleTest.java b/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/WebServiceSEINoOnewayRuleTest.java
deleted file mode 100644
index d0c7f37..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/WebServiceSEINoOnewayRuleTest.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Shane Clarke.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Shane Clarke - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.core.annotation.validation.tests;
-
-import javax.jws.Oneway;
-import org.eclipse.core.resources.IMarker;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.OperationCanceledException;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jdt.core.dom.Annotation;
-import org.eclipse.jst.ws.annotations.core.AnnotationsCore;
-import org.eclipse.jst.ws.annotations.core.utils.AnnotationUtils;
-import org.eclipse.jst.ws.internal.jaxws.core.JAXWSCoreMessages;
-
-public class WebServiceSEINoOnewayRuleTest extends AbstractWebServiceSEIRule {
-
- @Override
- protected Annotation getAnnotation() {
- return AnnotationsCore.createNormalAnnotation(ast, Oneway.class.getSimpleName(), null);
- }
-
- public void testWebServiceSEIPresentNoOnewayRule() {
- try {
- assertNotNull(annotation);
- assertEquals(Oneway.class.getSimpleName(), AnnotationUtils.getAnnotationName(annotation));
-
- IMethod method = source.findPrimaryType().getMethod("methodOne", new String[] { "QString;" });
- assertNotNull(method);
-
- textFileChange.addEdit(AnnotationUtils.createAddImportTextEdit(method, Oneway.class.getCanonicalName()));
-
- textFileChange.addEdit(AnnotationUtils.createAddAnnotationTextEdit(method, annotation));
-
- assertTrue(executeChange(new NullProgressMonitor(), textFileChange));
-
- assertTrue(AnnotationUtils.isAnnotationPresent(method, AnnotationUtils
- .getAnnotationName(annotation)));
- assertTrue(source.getImport(Oneway.class.getCanonicalName()).exists());
-
- Job.getJobManager().join(ResourcesPlugin.FAMILY_AUTO_BUILD, null);
-
- IMarker[] allmarkers = source.getResource().findMarkers(IMarker.PROBLEM, true,
- IResource.DEPTH_INFINITE);
-
- assertEquals(1, allmarkers.length);
-
- IMarker annotationProblemMarker = allmarkers[0];
-
- assertEquals(source.getResource(), annotationProblemMarker.getResource());
- assertEquals(JAXWSCoreMessages.WEBSERVICE_ENPOINTINTERFACE_NO_ONEWAY,
- annotationProblemMarker.getAttribute(IMarker.MESSAGE));
- } catch (CoreException ce) {
- fail(ce.getLocalizedMessage());
- } catch (OperationCanceledException oce) {
- fail(oce.getLocalizedMessage());
- } catch (InterruptedException ie) {
- fail(ie.getLocalizedMessage());
- }
- }
-
-}
diff --git a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/WebServiceSEINoPortNameRuleTest.java b/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/WebServiceSEINoPortNameRuleTest.java
deleted file mode 100644
index 4f9f045..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/WebServiceSEINoPortNameRuleTest.java
+++ /dev/null
@@ -1,104 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Shane Clarke.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Shane Clarke - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.core.annotation.validation.tests;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.jws.WebService;
-import org.eclipse.core.resources.IMarker;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.OperationCanceledException;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.jdt.core.dom.Annotation;
-import org.eclipse.jdt.core.dom.MemberValuePair;
-import org.eclipse.jst.ws.annotations.core.AnnotationsCore;
-import org.eclipse.jst.ws.annotations.core.utils.AnnotationUtils;
-import org.eclipse.jst.ws.internal.jaxws.core.JAXWSCoreMessages;
-
-public class WebServiceSEINoPortNameRuleTest extends AbstractAnnotationValidationTest {
-
- @Override
- protected Annotation getAnnotation() {
- List<MemberValuePair> memberValuePairs = new ArrayList<MemberValuePair>();
-
- MemberValuePair nameValuePair = AnnotationsCore.createStringMemberValuePair(ast, "name", "MyClass");
-
- MemberValuePair targetNamespaceValuePair = AnnotationsCore.createStringMemberValuePair(ast,
- "targetNamespace", "http://example.com/");
-
- MemberValuePair portNameValuePair = AnnotationsCore.createStringMemberValuePair(ast, "portName",
- "MyClassPort");
-
- memberValuePairs.add(nameValuePair);
- memberValuePairs.add(targetNamespaceValuePair);
- memberValuePairs.add(portNameValuePair);
-
- return AnnotationsCore.createNormalAnnotation(ast, WebService.class.getSimpleName(), memberValuePairs);
- }
-
- @Override
- protected String getClassContents() {
- StringBuilder classContents = new StringBuilder("package com.example;\n\n");
- classContents.append("public interface MyInterface {\n\n\tpublic String myeMethod();\n\n}");
- return classContents.toString();
- }
-
- @Override
- protected String getClassName() {
- return "MyInterface.java";
- }
-
- @Override
- protected String getPackageName() {
- return "com.example";
- }
-
- public void testWebServiceSEINoPortNameRule() {
- try {
- assertNotNull(annotation);
- assertEquals(WebService.class.getSimpleName(), AnnotationUtils.getAnnotationName(annotation));
-
- textFileChange.addEdit(AnnotationUtils.createAddImportTextEdit(source.findPrimaryType(), WebService.class.getCanonicalName()));
-
- textFileChange.addEdit(AnnotationUtils.createAddAnnotationTextEdit(source.findPrimaryType(), annotation));
-
- assertTrue(executeChange(new NullProgressMonitor(), textFileChange));
-
- assertTrue(AnnotationUtils.isAnnotationPresent(source, AnnotationUtils
- .getAnnotationName(annotation)));
- assertTrue(source.getImport(WebService.class.getCanonicalName()).exists());
-
- Job.getJobManager().join(ResourcesPlugin.FAMILY_AUTO_BUILD, null);
-
- IMarker[] allmarkers = source.getResource().findMarkers(IMarker.PROBLEM, true,
- IResource.DEPTH_INFINITE);
-
- assertEquals(1, allmarkers.length);
-
- IMarker annotationProblemMarker = allmarkers[0];
-
- assertEquals(source.getResource(), annotationProblemMarker.getResource());
- assertEquals(JAXWSCoreMessages.WEBSERVICE_PORTNAME_SEI,
- annotationProblemMarker.getAttribute(IMarker.MESSAGE));
- } catch (CoreException ce) {
- fail(ce.getLocalizedMessage());
- } catch (OperationCanceledException oce) {
- fail(oce.getLocalizedMessage());
- } catch (InterruptedException ie) {
- fail(ie.getLocalizedMessage());
- }
- }
-
-}
diff --git a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/WebServiceSEINoSOAPBindingRuleTest.java b/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/WebServiceSEINoSOAPBindingRuleTest.java
deleted file mode 100644
index cad1b99..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/WebServiceSEINoSOAPBindingRuleTest.java
+++ /dev/null
@@ -1,112 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Shane Clarke.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Shane Clarke - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.core.annotation.validation.tests;
-
-import javax.jws.soap.SOAPBinding;
-
-import org.eclipse.core.resources.IMarker;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.OperationCanceledException;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jdt.core.dom.Annotation;
-import org.eclipse.jst.ws.annotations.core.AnnotationsCore;
-import org.eclipse.jst.ws.annotations.core.utils.AnnotationUtils;
-import org.eclipse.jst.ws.internal.jaxws.core.JAXWSCoreMessages;
-
-public class WebServiceSEINoSOAPBindingRuleTest extends AbstractWebServiceSEIRule {
-
- @Override
- protected Annotation getAnnotation() {
- return AnnotationsCore.createNormalAnnotation(ast, SOAPBinding.class.getSimpleName(), null);
- }
-
- public void testNoSOAPBindingOnMethodRule() {
- try {
- assertNotNull(annotation);
- assertEquals(SOAPBinding.class.getSimpleName(), AnnotationUtils.getAnnotationName(annotation));
-
- IMethod method = source.findPrimaryType().getMethod("myMethod", new String[] { "QString;" });
- assertNotNull(method);
-
- textFileChange.addEdit(AnnotationUtils.createAddImportTextEdit(method, SOAPBinding.class.getCanonicalName()));
-
- textFileChange.addEdit(AnnotationUtils.createAddAnnotationTextEdit(method, annotation));
-
- assertTrue(executeChange(new NullProgressMonitor(), textFileChange));
-
- assertTrue(AnnotationUtils.isAnnotationPresent(method, AnnotationUtils
- .getAnnotationName(annotation)));
- assertTrue(source.getImport(SOAPBinding.class.getCanonicalName()).exists());
-
- Job.getJobManager().join(ResourcesPlugin.FAMILY_AUTO_BUILD, null);
-
- IMarker[] allmarkers = source.getResource().findMarkers(IMarker.PROBLEM, true,
- IResource.DEPTH_INFINITE);
-
- assertEquals(1, allmarkers.length);
-
- IMarker annotationProblemMarker = allmarkers[0];
-
- assertEquals(source.getResource(), annotationProblemMarker.getResource());
- assertEquals(JAXWSCoreMessages.WEBSERVICE_ENPOINTINTERFACE_NO_SOAPBINDING,
- annotationProblemMarker.getAttribute(IMarker.MESSAGE));
- } catch (CoreException ce) {
- fail(ce.getLocalizedMessage());
- } catch (OperationCanceledException oce) {
- fail(oce.getLocalizedMessage());
- } catch (InterruptedException ie) {
- fail(ie.getLocalizedMessage());
- }
- }
-
- public void testNoSOAPBindingOnTypeRule() {
- try {
- assertNotNull(annotation);
- assertEquals(SOAPBinding.class.getSimpleName(), AnnotationUtils.getAnnotationName(annotation));
-
- textFileChange.addEdit(AnnotationUtils.createAddImportTextEdit(source.findPrimaryType(), SOAPBinding.class.getCanonicalName()));
-
- textFileChange.addEdit(AnnotationUtils.createAddAnnotationTextEdit(source.findPrimaryType(), annotation));
-
- assertTrue(executeChange(new NullProgressMonitor(), textFileChange));
-
- assertTrue(AnnotationUtils.isAnnotationPresent(source, AnnotationUtils
- .getAnnotationName(annotation)));
-
- Job.getJobManager().join(ResourcesPlugin.FAMILY_AUTO_BUILD, null);
-
- IMarker[] allmarkers = source.getResource().findMarkers(IMarker.PROBLEM, true,
- IResource.DEPTH_INFINITE);
-
- assertEquals(1, allmarkers.length);
-
- IMarker annotationProblemMarker = allmarkers[0];
-
- assertEquals(source.getResource(), annotationProblemMarker.getResource());
- assertEquals(JAXWSCoreMessages.WEBSERVICE_ENPOINTINTERFACE_NO_SOAPBINDING,
- annotationProblemMarker.getAttribute(IMarker.MESSAGE));
- } catch (CoreException ce) {
- fail(ce.getLocalizedMessage());
- } catch (OperationCanceledException oce) {
- fail(oce.getLocalizedMessage());
- } catch (InterruptedException ie) {
- fail(ie.getLocalizedMessage());
- }
- }
-
-
-
-
-}
diff --git a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/WebServiceSEINoServiceNameRuleTest.java b/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/WebServiceSEINoServiceNameRuleTest.java
deleted file mode 100644
index 86335fb..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/WebServiceSEINoServiceNameRuleTest.java
+++ /dev/null
@@ -1,104 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Shane Clarke.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Shane Clarke - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.core.annotation.validation.tests;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.jws.WebService;
-import org.eclipse.core.resources.IMarker;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.OperationCanceledException;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.jdt.core.dom.Annotation;
-import org.eclipse.jdt.core.dom.MemberValuePair;
-import org.eclipse.jst.ws.annotations.core.AnnotationsCore;
-import org.eclipse.jst.ws.annotations.core.utils.AnnotationUtils;
-import org.eclipse.jst.ws.internal.jaxws.core.JAXWSCoreMessages;
-
-public class WebServiceSEINoServiceNameRuleTest extends AbstractAnnotationValidationTest {
-
- @Override
- protected Annotation getAnnotation() {
- List<MemberValuePair> memberValuePairs = new ArrayList<MemberValuePair>();
-
- MemberValuePair nameValuePair = AnnotationsCore.createStringMemberValuePair(ast, "name", "MyClass");
-
- MemberValuePair targetNamespaceValuePair = AnnotationsCore.createStringMemberValuePair(ast,
- "targetNamespace", "http://example.com/");
-
- MemberValuePair serviceNameValuePair = AnnotationsCore.createStringMemberValuePair(ast,
- "serviceName", "MyClassService");
-
- memberValuePairs.add(nameValuePair);
- memberValuePairs.add(targetNamespaceValuePair);
- memberValuePairs.add(serviceNameValuePair);
-
- return AnnotationsCore.createNormalAnnotation(ast, WebService.class.getSimpleName(), memberValuePairs);
- }
-
- @Override
- protected String getClassContents() {
- StringBuilder classContents = new StringBuilder("package com.example;\n\n");
- classContents.append("public interface MyInterface {\n\n\tpublic String myeMethod();\n\n}");
- return classContents.toString();
- }
-
- @Override
- protected String getClassName() {
- return "MyInterface.java";
- }
-
- @Override
- protected String getPackageName() {
- return "com.example";
- }
-
- public void testWebServiceSEINoServiceNameRule() {
- try {
- assertNotNull(annotation);
- assertEquals(WebService.class.getSimpleName(), AnnotationUtils.getAnnotationName(annotation));
-
- textFileChange.addEdit(AnnotationUtils.createAddImportTextEdit(source.findPrimaryType(), WebService.class.getCanonicalName()));
-
- textFileChange.addEdit(AnnotationUtils.createAddAnnotationTextEdit(source.findPrimaryType(), annotation));
-
- assertTrue(executeChange(new NullProgressMonitor(), textFileChange));
-
- assertTrue(AnnotationUtils.isAnnotationPresent(source, AnnotationUtils
- .getAnnotationName(annotation)));
- assertTrue(source.getImport(WebService.class.getCanonicalName()).exists());
-
- Job.getJobManager().join(ResourcesPlugin.FAMILY_AUTO_BUILD, null);
-
- IMarker[] allmarkers = source.getResource().findMarkers(IMarker.PROBLEM, true,
- IResource.DEPTH_INFINITE);
-
- assertEquals(1, allmarkers.length);
-
- IMarker annotationProblemMarker = allmarkers[0];
-
- assertEquals(source.getResource(), annotationProblemMarker.getResource());
- assertEquals(JAXWSCoreMessages.WEBSERVICE_SERVICENAME_SEI,
- annotationProblemMarker.getAttribute(IMarker.MESSAGE));
- } catch (CoreException ce) {
- fail(ce.getLocalizedMessage());
- } catch (OperationCanceledException oce) {
- fail(oce.getLocalizedMessage());
- } catch (InterruptedException ie) {
- fail(ie.getLocalizedMessage());
- }
- }
-
-}
diff --git a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/WebServiceSEINoWebMethodRuleTest.java b/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/WebServiceSEINoWebMethodRuleTest.java
deleted file mode 100644
index ae49209..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/WebServiceSEINoWebMethodRuleTest.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Shane Clarke.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Shane Clarke - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.core.annotation.validation.tests;
-
-import javax.jws.WebMethod;
-import org.eclipse.core.resources.IMarker;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.OperationCanceledException;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jdt.core.dom.Annotation;
-import org.eclipse.jst.ws.annotations.core.AnnotationsCore;
-import org.eclipse.jst.ws.annotations.core.utils.AnnotationUtils;
-import org.eclipse.jst.ws.internal.jaxws.core.JAXWSCoreMessages;
-
-public class WebServiceSEINoWebMethodRuleTest extends AbstractWebServiceSEIRule {
-
- @Override
- protected Annotation getAnnotation() {
- return AnnotationsCore.createNormalAnnotation(ast, WebMethod.class.getSimpleName(), null);
- }
-
- public void testWebServiceSEIPresentNoWebMethodRule() {
- try {
- assertNotNull(annotation);
- assertEquals(WebMethod.class.getSimpleName(), AnnotationUtils.getAnnotationName(annotation));
-
- IMethod method = source.findPrimaryType().getMethod("myMethod", new String[] { "QString;" });
- assertNotNull(method);
-
- textFileChange.addEdit(AnnotationUtils.createAddImportTextEdit(method, WebMethod.class.getCanonicalName()));
-
- textFileChange.addEdit(AnnotationUtils.createAddAnnotationTextEdit(method, annotation));
-
- assertTrue(executeChange(new NullProgressMonitor(), textFileChange));
-
- assertTrue(AnnotationUtils.isAnnotationPresent(method, AnnotationUtils
- .getAnnotationName(annotation)));
- assertTrue(source.getImport(WebMethod.class.getCanonicalName()).exists());
-
- Job.getJobManager().join(ResourcesPlugin.FAMILY_AUTO_BUILD, null);
-
- IMarker[] allmarkers = source.getResource().findMarkers(IMarker.PROBLEM, true,
- IResource.DEPTH_INFINITE);
-
- assertEquals(1, allmarkers.length);
-
- IMarker annotationProblemMarker = allmarkers[0];
-
- assertEquals(source.getResource(), annotationProblemMarker.getResource());
- assertEquals(JAXWSCoreMessages.WEBSERVICE_ENPOINTINTERFACE_NO_WEBMETHODS,
- annotationProblemMarker.getAttribute(IMarker.MESSAGE));
- } catch (CoreException ce) {
- fail(ce.getLocalizedMessage());
- } catch (OperationCanceledException oce) {
- fail(oce.getLocalizedMessage());
- } catch (InterruptedException ie) {
- fail(ie.getLocalizedMessage());
- }
- }
-
-}
diff --git a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/WebServiceSEINoWebParamRuleTest.java b/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/WebServiceSEINoWebParamRuleTest.java
deleted file mode 100644
index 58b94c9..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/WebServiceSEINoWebParamRuleTest.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Shane Clarke.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Shane Clarke - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.core.annotation.validation.tests;
-
-import javax.jws.WebParam;
-import org.eclipse.core.resources.IMarker;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.OperationCanceledException;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.jdt.core.ILocalVariable;
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jdt.core.dom.Annotation;
-import org.eclipse.jst.ws.annotations.core.AnnotationsCore;
-import org.eclipse.jst.ws.annotations.core.utils.AnnotationUtils;
-import org.eclipse.jst.ws.internal.jaxws.core.JAXWSCoreMessages;
-
-public class WebServiceSEINoWebParamRuleTest extends AbstractWebServiceSEIRule {
-
- @Override
- protected Annotation getAnnotation() {
- return AnnotationsCore.createNormalAnnotation(ast, WebParam.class.getSimpleName(), null);
- }
-
- public void testWebServiceSEIPresentNoWebParamRule() {
- try {
- assertNotNull(annotation);
- assertEquals(WebParam.class.getSimpleName(), AnnotationUtils.getAnnotationName(annotation));
-
- IMethod method = source.findPrimaryType().getMethod("methodOne", new String[] { "QString;" });
- assertNotNull(method);
-
- ILocalVariable localVariable = AnnotationUtils.getLocalVariable(method, "in");
-
- textFileChange.addEdit(AnnotationUtils.createAddImportTextEdit(localVariable, WebParam.class.getCanonicalName()));
-
- textFileChange.addEdit(AnnotationUtils.createAddAnnotationTextEdit(localVariable, annotation));
-
- assertTrue(executeChange(new NullProgressMonitor(), textFileChange));
-
- assertTrue(AnnotationUtils.isAnnotationPresent(localVariable, annotation));
- assertTrue(source.getImport(WebParam.class.getCanonicalName()).exists());
-
- Job.getJobManager().join(ResourcesPlugin.FAMILY_AUTO_BUILD, null);
-
- IMarker[] allmarkers = source.getResource().findMarkers(IMarker.PROBLEM, true,
- IResource.DEPTH_INFINITE);
-
- assertEquals(1, allmarkers.length);
-
- IMarker annotationProblemMarker = allmarkers[0];
-
- assertEquals(source.getResource(), annotationProblemMarker.getResource());
- assertEquals(JAXWSCoreMessages.WEBSERVICE_ENPOINTINTERFACE_NO_WEBPARAM,
- annotationProblemMarker.getAttribute(IMarker.MESSAGE));
- } catch (CoreException ce) {
- fail(ce.getLocalizedMessage());
- } catch (OperationCanceledException oce) {
- fail(oce.getLocalizedMessage());
- } catch (InterruptedException ie) {
- fail(ie.getLocalizedMessage());
- }
- }
-}
diff --git a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/WebServiceSEINoWebResultRuleTest.java b/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/WebServiceSEINoWebResultRuleTest.java
deleted file mode 100644
index 4b0f28b..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/WebServiceSEINoWebResultRuleTest.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Shane Clarke.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Shane Clarke - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.core.annotation.validation.tests;
-
-import javax.jws.WebResult;
-import org.eclipse.core.resources.IMarker;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.OperationCanceledException;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jdt.core.dom.Annotation;
-import org.eclipse.jst.ws.annotations.core.AnnotationsCore;
-import org.eclipse.jst.ws.annotations.core.utils.AnnotationUtils;
-import org.eclipse.jst.ws.internal.jaxws.core.JAXWSCoreMessages;
-
-public class WebServiceSEINoWebResultRuleTest extends AbstractWebServiceSEIRule {
-
- @Override
- protected Annotation getAnnotation() {
- return AnnotationsCore.createNormalAnnotation(ast, WebResult.class.getSimpleName(), null);
- }
-
- public void testWebServiceSEIPresentNoWebResultRule() {
- try {
- assertNotNull(annotation);
- assertEquals(WebResult.class.getSimpleName(), AnnotationUtils.getAnnotationName(annotation));
-
- IMethod method = source.findPrimaryType().getMethod("myMethod", new String[] { "QString;" });
- assertNotNull(method);
-
- textFileChange.addEdit(AnnotationUtils.createAddImportTextEdit(method, WebResult.class.getCanonicalName()));
-
- textFileChange.addEdit(AnnotationUtils.createAddAnnotationTextEdit(method, annotation));
-
- assertTrue(executeChange(new NullProgressMonitor(), textFileChange));
-
- assertTrue(AnnotationUtils.isAnnotationPresent(method, AnnotationUtils
- .getAnnotationName(annotation)));
- assertTrue(source.getImport(WebResult.class.getCanonicalName()).exists());
-
- Job.getJobManager().join(ResourcesPlugin.FAMILY_AUTO_BUILD, null);
-
- IMarker[] allmarkers = source.getResource().findMarkers(IMarker.PROBLEM, true,
- IResource.DEPTH_INFINITE);
-
- assertEquals(1, allmarkers.length);
-
- IMarker annotationProblemMarker = allmarkers[0];
-
- assertEquals(source.getResource(), annotationProblemMarker.getResource());
- assertEquals(JAXWSCoreMessages.WEBSERVICE_ENPOINTINTERFACE_NO_WEBRESULT,
- annotationProblemMarker.getAttribute(IMarker.MESSAGE));
- } catch (CoreException ce) {
- fail(ce.getLocalizedMessage());
- } catch (OperationCanceledException oce) {
- fail(oce.getLocalizedMessage());
- } catch (InterruptedException ie) {
- fail(ie.getLocalizedMessage());
- }
- }
-}
diff --git a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/WebServiceWebServiceProviderCoExistRuleTest.java b/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/WebServiceWebServiceProviderCoExistRuleTest.java
deleted file mode 100644
index 150d340..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/WebServiceWebServiceProviderCoExistRuleTest.java
+++ /dev/null
@@ -1,91 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Shane Clarke.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Shane Clarke - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.core.annotation.validation.tests;
-
-import javax.jws.WebService;
-
-import org.eclipse.core.resources.IMarker;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.OperationCanceledException;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.jdt.core.dom.Annotation;
-import org.eclipse.jst.ws.annotations.core.AnnotationsCore;
-import org.eclipse.jst.ws.annotations.core.utils.AnnotationUtils;
-import org.eclipse.jst.ws.internal.jaxws.core.JAXWSCoreMessages;
-
-public class WebServiceWebServiceProviderCoExistRuleTest extends AbstractAnnotationValidationTest {
-
- @Override
- protected Annotation getAnnotation() {
- return AnnotationsCore.createNormalAnnotation(ast, WebService.class.getSimpleName(), null);
- }
-
- @Override
- protected String getClassContents() {
- StringBuilder classContents = new StringBuilder("package com.example;\n\n");
- classContents.append("import javax.xml.transform.Source;\n");
- classContents.append("import javax.xml.ws.Provider;\n");
- classContents.append("import javax.xml.ws.WebServiceProvider;\n\n");
- classContents.append("@WebServiceProvider\n");
- classContents.append("public class MyClass implements Provider<Source> {\n\n");
- classContents.append("\tpublic Source invoke(Source arg0) {" + "\n\t\treturn null;\n\t}\n\n}");
- return classContents.toString();
- }
-
- @Override
- protected String getClassName() {
- return "MyClass.java";
- }
-
- @Override
- protected String getPackageName() {
- return "com.example";
- }
-
- public void testWebServiceWebServiceProviderCoExistRule() {
- try {
- assertNotNull(annotation);
- assertEquals(WebService.class.getSimpleName(), AnnotationUtils.getAnnotationName(annotation));
-
- textFileChange.addEdit(AnnotationUtils.createAddImportTextEdit(source.findPrimaryType(), WebService.class.getCanonicalName()));
-
- textFileChange.addEdit(AnnotationUtils.createAddAnnotationTextEdit(source.findPrimaryType(), annotation));
-
- assertTrue(executeChange(new NullProgressMonitor(), textFileChange));
-
- assertTrue(AnnotationUtils.isAnnotationPresent(source, AnnotationUtils.getAnnotationName(annotation)));
- assertTrue(source.getImport(WebService.class.getCanonicalName()).exists());
-
- Job.getJobManager().join(ResourcesPlugin.FAMILY_AUTO_BUILD, null);
-
- IMarker[] allmarkers = source.getResource().findMarkers(IMarker.PROBLEM, true,
- IResource.DEPTH_INFINITE);
-
- assertEquals(1, allmarkers.length);
-
- IMarker annotationProblemMarker = allmarkers[0];
-
- assertEquals(source.getResource(), annotationProblemMarker.getResource());
- assertEquals(JAXWSCoreMessages.WEBSERVICE_WEBSERVICEPROVIDER_COMBINATION,
- annotationProblemMarker.getAttribute(IMarker.MESSAGE));
- } catch (CoreException ce) {
- fail(ce.getLocalizedMessage());
- } catch (OperationCanceledException oce) {
- fail(oce.getLocalizedMessage());
- } catch (InterruptedException ie) {
- fail(ie.getLocalizedMessage());
- }
- }
-
-}
diff --git a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/tests/AbstractAnnotationTest.java b/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/tests/AbstractAnnotationTest.java
deleted file mode 100644
index bac3649..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/tests/AbstractAnnotationTest.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Shane Clarke.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Shane Clarke - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.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.jdt.ui.SharedASTProvider;
-import org.eclipse.ltk.core.refactoring.Change;
-import org.eclipse.ltk.core.refactoring.PerformChangeOperation;
-import org.eclipse.ltk.core.refactoring.TextFileChange;
-import org.eclipse.text.edits.MultiTextEdit;
-
-public abstract class AbstractAnnotationTest extends TestCase {
- protected TestJavaProject testJavaProject;
- protected ICompilationUnit source;
- protected CompilationUnit compilationUnit;
- protected AST ast;
- protected ASTRewrite rewriter;
- protected Annotation annotation;
- protected TextFileChange textFileChange;
-
- @Override
- protected void setUp() throws Exception {
- testJavaProject = new TestJavaProject("JavaProject");
- testJavaProject.setAutoBuilding(isAutoBuildingEnabled());
- testJavaProject.enableAnnotationProcessing(isAnnotationProcessingEnabled());
-
- source = testJavaProject.createCompilationUnit(getPackageName(), getClassName(), getClassContents());
-
- compilationUnit = SharedASTProvider.getAST(source, SharedASTProvider.WAIT_YES, null);
- ast = compilationUnit.getAST();
- rewriter = ASTRewrite.create(ast);
- annotation = getAnnotation();
- textFileChange = new TextFileChange("Add annotation", (IFile) source.getResource());
- MultiTextEdit multiTextEdit = new MultiTextEdit();
- textFileChange.setEdit(multiTextEdit);
- }
-
- protected boolean isAutoBuildingEnabled() {
- return false;
- }
-
- protected boolean isAnnotationProcessingEnabled() {
- return false;
- }
-
- protected abstract String getPackageName();
- protected abstract String getClassName();
- protected abstract String getClassContents();
- protected abstract Annotation getAnnotation();
-
- protected boolean executeChange(IProgressMonitor monitor, Change change) {
- if (change == null) {
- return false;
- }
-
- change.initializeValidationData(monitor);
-
- PerformChangeOperation changeOperation = new PerformChangeOperation(change);
-
- try {
- changeOperation.run(monitor);
- } catch (CoreException ce) {
- ce.printStackTrace();
- }
- return changeOperation.changeExecuted();
- }
-
- @Override
- protected void tearDown() throws Exception {
- 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 bac692e..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/tests/AddAnnotationToFieldTest.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Shane Clarke.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Shane Clarke - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.core.tests;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.xml.ws.WebServiceRef;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.jdt.core.IField;
-import org.eclipse.jdt.core.dom.Annotation;
-import org.eclipse.jdt.core.dom.MemberValuePair;
-import org.eclipse.jst.ws.annotations.core.AnnotationsCore;
-import org.eclipse.jst.ws.annotations.core.utils.AnnotationUtils;
-
-public class AddAnnotationToFieldTest extends AbstractAnnotationTest {
-
- @Override
- public String getPackageName() {
- return "com.example";
- }
-
- @Override
- public String getClassName() {
- return "MyClass.java";
- }
-
- @Override
- public String getClassContents() {
- return "package com.example;\n\npublic class MyClass {\n\n\tstatic String service;\n\n}";
- }
-
- @Override
- public Annotation getAnnotation() {
- List<MemberValuePair> memberValuePairs = new ArrayList<MemberValuePair>();
-
- MemberValuePair wsdlLocationValuePair = AnnotationsCore.createStringMemberValuePair(ast,
- "wsdlLocation", "http://localhost:8083/ServiceProject/servives/MyService?WSDL");
-
- memberValuePairs.add(wsdlLocationValuePair);
-
- return AnnotationsCore.createNormalAnnotation(ast, WebServiceRef.class.getSimpleName(), memberValuePairs);
- }
-
- public void testAddAnnotationToField() {
- try {
- assertNotNull(annotation);
- assertEquals(WebServiceRef.class.getSimpleName(), AnnotationUtils.getAnnotationName(annotation));
-
- IField field = source.findPrimaryType().getField("service");
- assertNotNull(field);
-
- textFileChange.addEdit(AnnotationUtils.createAddImportTextEdit(field, WebServiceRef.class.getCanonicalName()));
- textFileChange.addEdit(AnnotationUtils.createAddAnnotationTextEdit(field, annotation));
-
- assertTrue(executeChange(new NullProgressMonitor(), textFileChange));
-
- assertTrue(AnnotationUtils.isAnnotationPresent(field, AnnotationUtils.getAnnotationName(annotation)));
- assertTrue(source.getImport(WebServiceRef.class.getCanonicalName()).exists());
- } catch (CoreException ce) {
- fail(ce.getLocalizedMessage());
- }
- }
-
-}
diff --git a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/tests/AddAnnotationToMethodParameterTest.java b/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/tests/AddAnnotationToMethodParameterTest.java
deleted file mode 100644
index a12295b..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/tests/AddAnnotationToMethodParameterTest.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Shane Clarke.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Shane Clarke - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.core.tests;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.jws.WebParam;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.jdt.core.ILocalVariable;
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jdt.core.dom.Annotation;
-import org.eclipse.jdt.core.dom.MemberValuePair;
-import org.eclipse.jst.ws.annotations.core.AnnotationsCore;
-import org.eclipse.jst.ws.annotations.core.utils.AnnotationUtils;
-
-public class AddAnnotationToMethodParameterTest extends AbstractAnnotationTest {
-
- @Override
- public String getPackageName() {
- return "com.example";
- }
-
- @Override
- public String getClassName() {
- return "Calculator.java";
- }
-
- @Override
- public String getClassContents() {
- StringBuilder classContents = new StringBuilder("package com.example;\n\n");
- classContents.append("public class Calculator {\n\n\tpublic int add(int i, int k) {");
- classContents.append("\n\t\treturn i + k;\n\t}\n}");
- return classContents.toString();
- }
-
- @Override
- public Annotation getAnnotation() {
- List<MemberValuePair> memberValuePairs = new ArrayList<MemberValuePair>();
-
- MemberValuePair nameValuePair = AnnotationsCore.createStringMemberValuePair(ast, "name", "i");
-
- memberValuePairs.add(nameValuePair);
-
- return AnnotationsCore.createNormalAnnotation(ast, WebParam.class.getSimpleName(), memberValuePairs);
- }
-
- public void testAddAnnotationToMethodParameter() {
- try {
- assertNotNull(annotation);
- assertEquals(WebParam.class.getSimpleName(), AnnotationUtils.getAnnotationName(annotation));
-
- IMethod method = source.findPrimaryType().getMethod("add", new String[] { "I", "I" });
- assertNotNull(method);
-
- ILocalVariable localVariable = AnnotationUtils.getLocalVariable(method, "i");
-
- textFileChange.addEdit(AnnotationUtils.createAddImportTextEdit(localVariable, WebParam.class.getCanonicalName()));
- textFileChange.addEdit(AnnotationUtils.createAddAnnotationTextEdit(localVariable, annotation));
-
- assertTrue(executeChange(new NullProgressMonitor(), textFileChange));
-
- assertTrue(AnnotationUtils.isAnnotationPresent(localVariable, annotation));
- assertTrue(source.getImport(WebParam.class.getCanonicalName()).exists());
- } catch (CoreException ce) {
- fail(ce.getLocalizedMessage());
- }
- }
-}
diff --git a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/tests/AddAnnotationToMethodTest.java b/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/tests/AddAnnotationToMethodTest.java
deleted file mode 100644
index 1efe61d..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/tests/AddAnnotationToMethodTest.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Shane Clarke.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Shane Clarke - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.core.tests;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.jws.WebMethod;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jdt.core.dom.Annotation;
-import org.eclipse.jdt.core.dom.MemberValuePair;
-import org.eclipse.jst.ws.annotations.core.AnnotationsCore;
-import org.eclipse.jst.ws.annotations.core.utils.AnnotationUtils;
-
-public class AddAnnotationToMethodTest extends AbstractAnnotationTest {
-
- @Override
- public String getPackageName() {
- return "com.example";
- }
-
- @Override
- public String getClassName() {
- return "Calculator.java";
- }
-
- @Override
- public String getClassContents() {
- StringBuilder classContents = new StringBuilder("package com.example;\n\n");
- classContents.append("public class Calculator {\n\n\tpublic int add(int i, int k) {");
- classContents.append("\n\t\treturn i + k;\n\t}\n}");
- return classContents.toString();
- }
-
- @Override
- public Annotation getAnnotation() {
- List<MemberValuePair> memberValuePairs = new ArrayList<MemberValuePair>();
-
- MemberValuePair operationValuePair = AnnotationsCore.createStringMemberValuePair(ast,
- "operationName", "add");
-
- memberValuePairs.add(operationValuePair);
-
- return AnnotationsCore.createNormalAnnotation(ast, WebMethod.class.getSimpleName(), memberValuePairs);
- }
-
- public void testAddAnnotationToMethod() {
- try {
- assertNotNull(annotation);
- assertEquals(WebMethod.class.getSimpleName(), AnnotationUtils.getAnnotationName(annotation));
-
- IMethod method = source.findPrimaryType().getMethod("add", new String[] { "I", "I" });
- assertNotNull(method);
-
- textFileChange.addEdit(AnnotationUtils.createAddImportTextEdit(method, WebMethod.class.getCanonicalName()));
- textFileChange.addEdit(AnnotationUtils.createAddAnnotationTextEdit(method, annotation));
-
- assertTrue(executeChange(new NullProgressMonitor(), textFileChange));
-
- assertTrue(AnnotationUtils.isAnnotationPresent(method, AnnotationUtils.getAnnotationName(annotation)));
- assertTrue(source.getImport(WebMethod.class.getCanonicalName()).exists());
- } catch (CoreException ce) {
- fail(ce.getLocalizedMessage());
- }
- }
-}
diff --git a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/tests/AddAnnotationToTypeTest.java b/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/tests/AddAnnotationToTypeTest.java
deleted file mode 100644
index 044fad3..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/tests/AddAnnotationToTypeTest.java
+++ /dev/null
@@ -1,86 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Shane Clarke.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Shane Clarke - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.core.tests;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.jws.WebService;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.jdt.core.dom.Annotation;
-import org.eclipse.jdt.core.dom.MemberValuePair;
-import org.eclipse.jst.ws.annotations.core.AnnotationsCore;
-import org.eclipse.jst.ws.annotations.core.utils.AnnotationUtils;
-import org.eclipse.jst.ws.jaxws.core.utils.JDTUtils;
-
-public class AddAnnotationToTypeTest extends AbstractAnnotationTest {
-
- @Override
- public String getPackageName() {
- return "com.example";
- }
-
- @Override
- public String getClassName() {
- return "Calculator.java";
- }
-
- @Override
- public String getClassContents() {
- StringBuilder classContents = new StringBuilder("package com.example;\n\n");
- classContents.append("public class Calculator {\n\n\tpublic int add(int i, int k) {");
- classContents.append("\n\t\treturn i + k;\n\t}\n}");
- return classContents.toString();
- }
-
- @Override
- public Annotation getAnnotation() {
- List<MemberValuePair> memberValuePairs = new ArrayList<MemberValuePair>();
-
- MemberValuePair nameValuePair = AnnotationsCore
- .createStringMemberValuePair(ast, "name", "Calculator");
-
- MemberValuePair targetNamespaceValuePair = AnnotationsCore.createStringMemberValuePair(ast,
- "targetNamespace", JDTUtils.getTargetNamespaceFromPackageName(getPackageName()));
-
- MemberValuePair portNameValuePair = AnnotationsCore.createStringMemberValuePair(ast, "portName",
- "CalculatorPort");
-
- MemberValuePair serviceNameValuePair = AnnotationsCore.createStringMemberValuePair(ast,
- "serviceName", "CalculatorService");
-
- memberValuePairs.add(nameValuePair);
- memberValuePairs.add(targetNamespaceValuePair);
- memberValuePairs.add(portNameValuePair);
- memberValuePairs.add(serviceNameValuePair);
-
- return AnnotationsCore.createNormalAnnotation(ast, WebService.class.getSimpleName(), memberValuePairs);
- }
-
- public void testAddAnnotationToType() {
- try {
- assertNotNull(annotation);
- assertEquals(WebService.class.getSimpleName(), AnnotationUtils.getAnnotationName(annotation));
-
- textFileChange.addEdit(AnnotationUtils.createAddImportTextEdit(source.findPrimaryType(), WebService.class.getCanonicalName()));
- textFileChange.addEdit(AnnotationUtils.createAddAnnotationTextEdit(source.findPrimaryType(), annotation));
-
- assertTrue(executeChange(new NullProgressMonitor(), textFileChange));
-
- assertTrue(AnnotationUtils.isAnnotationPresent(source, AnnotationUtils.getAnnotationName(annotation)));
- assertTrue(source.getImport(WebService.class.getCanonicalName()).exists());
- } catch (CoreException ce) {
- fail(ce.getLocalizedMessage());
- }
- }
-}
diff --git a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/tests/AddMemberValuePairToAnnotationTest.java b/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/tests/AddMemberValuePairToAnnotationTest.java
deleted file mode 100644
index 56ff519..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/tests/AddMemberValuePairToAnnotationTest.java
+++ /dev/null
@@ -1,132 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Shane Clarke.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Shane Clarke - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.core.tests;
-
-import javax.jws.WebMethod;
-import javax.jws.WebParam;
-import javax.jws.WebService;
-import javax.xml.ws.WebServiceRef;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jdt.core.IField;
-import org.eclipse.jdt.core.ILocalVariable;
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.dom.Annotation;
-import org.eclipse.jdt.core.dom.MemberValuePair;
-import org.eclipse.jdt.core.dom.NormalAnnotation;
-import org.eclipse.jst.ws.annotations.core.AnnotationsCore;
-import org.eclipse.jst.ws.annotations.core.utils.AnnotationUtils;
-
-public class AddMemberValuePairToAnnotationTest extends AbstractAnnotationTest {
-
- @Override
- protected Annotation getAnnotation() {
- return null;
- }
-
- @Override
- protected String getClassContents() {
- StringBuilder classContents = new StringBuilder("package com.example;\n\n");
- classContents.append("import javax.jws.WebService;\n");
- classContents.append("import javax.jws.WebMethod;\n");
- classContents.append("import javax.jws.WebParam;\n");
- classContents.append("import javax.xml.ws.WebServiceRef;\n\n");
- classContents.append("@WebService()\n");
- classContents.append("public class Calculator {\n\n");
- classContents.append("\t@WebServiceRef()\n");
- classContents.append("\tpublic String myField;\n\n");
- classContents.append("\t@WebMethod()\n");
- classContents.append("\tpublic int add(@WebParam() int i, int k) {");
- classContents.append("\n\t\treturn i + k;\n\t}\n}");
- return classContents.toString();
- }
-
- @Override
- protected String getClassName() {
- return "Calculator.java";
- }
-
- @Override
- protected String getPackageName() {
- return "com.example";
- }
-
- public void testAddMemberValuePairToAnnotation() {
- try {
- //@WebService
- IType type = source.findPrimaryType();
- assertTrue(AnnotationUtils.isAnnotationPresent(source, "WebService"));
- Annotation webService = AnnotationUtils.getAnnotation(type, WebService.class);
- assertNotNull(webService);
- assertTrue(webService instanceof NormalAnnotation);
-
- NormalAnnotation webServiceAnnotation = (NormalAnnotation) webService;
- assertTrue(webServiceAnnotation.values().size() == 0);
-
- MemberValuePair nameValuePair = AnnotationsCore.createStringMemberValuePair(ast, "name", "Calculator");
-
- AnnotationUtils.addMemberValuePair(webServiceAnnotation, nameValuePair);
- webServiceAnnotation = (NormalAnnotation) AnnotationUtils.getAnnotation(type, WebService.class);
- assertTrue(webServiceAnnotation.values().size() == 1);
-
- //@WebServiceRef
- IField field = type.getField("myField");
- assertTrue(AnnotationUtils.isAnnotationPresent(field, "WebServiceRef"));
- Annotation webServiceRef = AnnotationUtils.getAnnotation(field, WebServiceRef.class);
- assertNotNull(webServiceRef);
- assertTrue(webServiceRef instanceof NormalAnnotation);
-
- NormalAnnotation webServiceRefAnnotation = (NormalAnnotation) webServiceRef;
- assertTrue(webServiceRefAnnotation.values().size() == 0);
-
- MemberValuePair mappedNameValuePair = AnnotationsCore.createStringMemberValuePair(ast, "mappedName", "myField");
-
- AnnotationUtils.addMemberValuePair(webServiceRefAnnotation, mappedNameValuePair);
- webServiceRefAnnotation = (NormalAnnotation) AnnotationUtils.getAnnotation(field, WebServiceRef.class);
- assertTrue(webServiceRefAnnotation.values().size() == 1);
-
- //@WebMethod
- IMethod method = type.getMethod("add", new String[] { "I", "I" });
- assertTrue(AnnotationUtils.isAnnotationPresent(method, "WebMethod"));
- Annotation webMethod = AnnotationUtils.getAnnotation(method, WebMethod.class);
- assertNotNull(webMethod);
- assertTrue(webMethod instanceof NormalAnnotation);
-
- NormalAnnotation webMethodAnnotation = (NormalAnnotation) webMethod;
- assertTrue(webMethodAnnotation.values().size() == 0);
-
- MemberValuePair operationNameValuePair = AnnotationsCore.createStringMemberValuePair(ast, "operationName", "add");
-
- AnnotationUtils.addMemberValuePair(webMethodAnnotation, operationNameValuePair);
- webMethodAnnotation = (NormalAnnotation) AnnotationUtils.getAnnotation(method, WebMethod.class);
- assertTrue(webMethodAnnotation.values().size() == 1);
-
- //@WebParam
- ILocalVariable localVariable = AnnotationUtils.getLocalVariable(method, "i");
- assertTrue(AnnotationUtils.isAnnotationPresent(localVariable, "WebParam"));
- Annotation webParam = AnnotationUtils.getAnnotation(localVariable, WebParam.class);
- assertNotNull(webParam);
- assertTrue(webParam instanceof NormalAnnotation);
-
- NormalAnnotation webParamAnnotation = (NormalAnnotation) webParam;
- assertTrue(webParamAnnotation.values().size() == 0);
-
- MemberValuePair partNameValuePair = AnnotationsCore.createStringMemberValuePair(ast, "partName", "i");
-
- AnnotationUtils.addMemberValuePair(webParamAnnotation, partNameValuePair);
- webParamAnnotation = (NormalAnnotation) AnnotationUtils.getAnnotation(localVariable, WebParam.class);
- assertTrue(webParamAnnotation.values().size() == 1);
- } catch (CoreException ce) {
- fail(ce.getLocalizedMessage());
- }
- }
-}
diff --git a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/tests/JAXWSCoreTestSuite.java b/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/tests/JAXWSCoreTestSuite.java
deleted file mode 100644
index 8bebf15..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/tests/JAXWSCoreTestSuite.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Shane Clarke.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Shane Clarke - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.core.tests;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-public class JAXWSCoreTestSuite extends TestSuite {
-
- public static Test suite() {
- return new JAXWSCoreTestSuite();
- }
-
- public JAXWSCoreTestSuite() {
- super("JAX-WS Core Tests");
- addTestSuite(AddAnnotationToTypeTest.class);
- addTestSuite(RemoveAnnotationFromTypeTest.class);
- addTestSuite(AddAnnotationToFieldTest.class);
- addTestSuite(RemoveAnnotationFromFieldTest.class);
- addTestSuite(AddAnnotationToMethodTest.class);
- addTestSuite(RemoveAnnotationFromMethodTest.class);
- addTestSuite(AddAnnotationToMethodParameterTest.class);
- addTestSuite(RemoveAnnotationFromMethodParameterTest.class);
- addTestSuite(AddMemberValuePairToAnnotationTest.class);
- addTestSuite(RemoveMemberValuePairTest.class);
- addTestSuite(UpdateMemberValuePairTest.class);
- addTestSuite(UpdateSingleMemberAnnotationTest.class);
- }
-
-}
diff --git a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/tests/RemoveAnnotationFromFieldTest.java b/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/tests/RemoveAnnotationFromFieldTest.java
deleted file mode 100644
index 4abfdf7..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/tests/RemoveAnnotationFromFieldTest.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Shane Clarke.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Shane Clarke - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.core.tests;
-
-import javax.xml.ws.WebServiceRef;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.jdt.core.IField;
-import org.eclipse.jdt.core.dom.Annotation;
-import org.eclipse.jst.ws.annotations.core.AnnotationsCore;
-import org.eclipse.jst.ws.annotations.core.utils.AnnotationUtils;
-
-public class RemoveAnnotationFromFieldTest extends AbstractAnnotationTest {
-
- @Override
- public String getPackageName() {
- return "com.example";
- }
-
- @Override
- public String getClassName() {
- return "MyClass.java";
- }
-
- @Override
- public String getClassContents() {
- StringBuilder classContents = new StringBuilder("package com.example;\n\n");
- classContents.append("import javax.xml.ws.WebServiceRef;\n\n");
- classContents.append("public class MyClass {\n\n\t@WebServiceRef()\n\tstatic String service;\n\n}");
- return classContents.toString();
- }
-
- @Override
- public Annotation getAnnotation() {
- return AnnotationsCore.createNormalAnnotation(ast, WebServiceRef.class.getSimpleName(), null);
- }
-
- public void testRemoveAnnotationFromField() {
- try {
- assertNotNull(annotation);
- assertEquals(WebServiceRef.class.getSimpleName(), AnnotationUtils.getAnnotationName(annotation));
-
- IField field = source.findPrimaryType().getField("service");
- assertNotNull(field);
-
- assertTrue(AnnotationUtils.isAnnotationPresent(field, AnnotationUtils
- .getAnnotationName(annotation)));
-
- assertNotNull(source.getImport(WebServiceRef.class.getCanonicalName()));
-
- textFileChange.addEdit(AnnotationUtils.createRemoveAnnotationTextEdit(field, annotation));
- textFileChange.addEdit(AnnotationUtils.createRemoveImportTextEdit(field, WebServiceRef.class.getCanonicalName()));
-
- assertTrue(executeChange(new NullProgressMonitor(), textFileChange));
-
- assertFalse(AnnotationUtils.isAnnotationPresent(field, AnnotationUtils.getAnnotationName(annotation)));
- assertFalse(source.getImport(WebServiceRef.class.getCanonicalName()).exists());
- } catch (CoreException ce) {
- fail(ce.getLocalizedMessage());
- }
- }
-}
diff --git a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/tests/RemoveAnnotationFromMethodParameterTest.java b/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/tests/RemoveAnnotationFromMethodParameterTest.java
deleted file mode 100644
index 9070b14..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/tests/RemoveAnnotationFromMethodParameterTest.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Shane Clarke.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Shane Clarke - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.core.tests;
-
-import javax.jws.WebParam;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.jdt.core.ILocalVariable;
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jdt.core.dom.Annotation;
-import org.eclipse.jst.ws.annotations.core.AnnotationsCore;
-import org.eclipse.jst.ws.annotations.core.utils.AnnotationUtils;
-
-public class RemoveAnnotationFromMethodParameterTest extends AbstractAnnotationTest {
-
- @Override
- public String getPackageName() {
- return "com.example";
- }
-
- @Override
- public String getClassName() {
- return "Calculator.java";
- }
-
- @Override
- public String getClassContents() {
- StringBuilder classContents = new StringBuilder("package com.example;\n\n");
- classContents.append("import javax.jws.WebParam;\n\n");
- classContents.append("public class Calculator {\n\n\tpublic int add(@WebParam(name=\"i\")");
- classContents.append("int i, int k) {\n\t\treturn i + k;\n\t}\n}");
- return classContents.toString();
- }
-
- @Override
- public Annotation getAnnotation() {
- return AnnotationsCore.createNormalAnnotation(ast, WebParam.class.getSimpleName(), null);
- }
-
- public void testRemoveAnnotationFromMethodParameter() {
- try {
- assertNotNull(annotation);
- assertEquals(WebParam.class.getSimpleName(), AnnotationUtils.getAnnotationName(annotation));
-
- IMethod method = source.findPrimaryType().getMethod("add", new String[] { "I", "I" });
- assertNotNull(method);
-
- ILocalVariable localVariable = AnnotationUtils.getLocalVariable(method, "i");
-
- assertTrue(AnnotationUtils.isAnnotationPresent(localVariable, annotation));
- assertNotNull(source.getImport(WebParam.class.getCanonicalName()));
-
- textFileChange.addEdit(AnnotationUtils.createRemoveAnnotationTextEdit(localVariable, annotation));
- textFileChange.addEdit(AnnotationUtils.createRemoveImportTextEdit(localVariable, WebParam.class.getCanonicalName()));
-
- assertTrue(executeChange(new NullProgressMonitor(), textFileChange));
-
- assertFalse(AnnotationUtils.isAnnotationPresent(localVariable, annotation));
- assertFalse(source.getImport(WebParam.class.getCanonicalName()).exists());
- } catch (CoreException ce) {
- fail(ce.getLocalizedMessage());
- }
- }
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/tests/RemoveAnnotationFromMethodTest.java b/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/tests/RemoveAnnotationFromMethodTest.java
deleted file mode 100644
index b92a1a4..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/tests/RemoveAnnotationFromMethodTest.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Shane Clarke.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Shane Clarke - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.core.tests;
-
-import javax.jws.WebMethod;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jdt.core.dom.Annotation;
-import org.eclipse.jst.ws.annotations.core.AnnotationsCore;
-import org.eclipse.jst.ws.annotations.core.utils.AnnotationUtils;
-
-public class RemoveAnnotationFromMethodTest extends AbstractAnnotationTest {
-
- @Override
- public String getPackageName() {
- return "com.example";
- }
-
- @Override
- public String getClassName() {
- return "Calculator.java";
- }
-
- @Override
- public String getClassContents() {
- StringBuilder classContents = new StringBuilder("package com.example;\n\n");
- classContents.append("import javax.jws.WebMethod;\n\n");
- classContents.append("public class Calculator {\n\n\t@WebMethod\n\tpublic int add(int i, int k) {");
- classContents.append("\n\t\treturn i + k;\n\t}\n}");
- return classContents.toString();
- }
-
- @Override
- public Annotation getAnnotation() {
- return AnnotationsCore.createNormalAnnotation(ast, WebMethod.class.getSimpleName(), null);
- }
-
- public void testRemoveAnnotationFromMethod() {
- try {
- assertNotNull(annotation);
- assertEquals(WebMethod.class.getSimpleName(), AnnotationUtils.getAnnotationName(annotation));
-
- IMethod method = source.findPrimaryType().getMethod("add", new String[] { "I", "I" });
- assertNotNull(method);
-
- assertTrue(AnnotationUtils.isAnnotationPresent(method, AnnotationUtils
- .getAnnotationName(annotation)));
- assertNotNull(source.getImport(WebMethod.class.getCanonicalName()));
-
- textFileChange.addEdit(AnnotationUtils.createRemoveAnnotationTextEdit(method, annotation));
- textFileChange.addEdit(AnnotationUtils.createRemoveImportTextEdit(method, WebMethod.class.getCanonicalName()));
-
- assertTrue(executeChange(new NullProgressMonitor(), textFileChange));
-
- assertFalse(AnnotationUtils.isAnnotationPresent(method, AnnotationUtils
- .getAnnotationName(annotation)));
- assertFalse(source.getImport(WebMethod.class.getCanonicalName()).exists());
- } catch (CoreException ce) {
- fail(ce.getLocalizedMessage());
- }
- }
-}
diff --git a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/tests/RemoveAnnotationFromTypeTest.java b/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/tests/RemoveAnnotationFromTypeTest.java
deleted file mode 100644
index 69337d6..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/tests/RemoveAnnotationFromTypeTest.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Shane Clarke.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Shane Clarke - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.core.tests;
-
-import javax.jws.WebService;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.jdt.core.dom.Annotation;
-import org.eclipse.jst.ws.annotations.core.AnnotationsCore;
-import org.eclipse.jst.ws.annotations.core.utils.AnnotationUtils;
-
-public class RemoveAnnotationFromTypeTest extends AbstractAnnotationTest {
-
- @Override
- public String getPackageName() {
- return "com.example";
- }
-
- @Override
- public String getClassName() {
- return "MyClass.java";
- }
-
- @Override
- public String getClassContents() {
- StringBuilder classContents = new StringBuilder("package com.example;\n\n");
- classContents.append("import javax.jws.WebService;\n\n");
- classContents.append("@WebService(name=\"MyClass\", endpointInterface=\"MyInterface\", ");
- classContents.append("targetNamespace=\"http://example.com/\", portName=\"MyClassPort\", ");
- classContents.append("serviceName=\"MyClassService\")\n");
- classContents.append("public class MyClass {\n\n");
- classContents.append("\tpublic String myMethod() {" + "\n\t\treturn \"txt\";\n\t}\n\n}");
- return classContents.toString();
- }
-
- @Override
- public Annotation getAnnotation() {
- return AnnotationsCore.createNormalAnnotation(ast, WebService.class.getSimpleName(), null);
- }
-
- public void testRemoveAnnotationFromType() {
- try {
- assertNotNull(annotation);
- assertEquals(WebService.class.getSimpleName(), AnnotationUtils.getAnnotationName(annotation));
-
- assertTrue(AnnotationUtils.isAnnotationPresent(source, AnnotationUtils.getAnnotationName(annotation)));
- assertNotNull(source.getImport(WebService.class.getCanonicalName()));
-
- textFileChange.addEdit(AnnotationUtils.createRemoveAnnotationTextEdit(source.findPrimaryType(), annotation));
- textFileChange.addEdit(AnnotationUtils.createRemoveImportTextEdit(source.findPrimaryType(), WebService.class.getCanonicalName()));
-
- assertTrue(executeChange(new NullProgressMonitor(), textFileChange));
-
- assertFalse(AnnotationUtils.isAnnotationPresent(source, AnnotationUtils.getAnnotationName(annotation)));
- assertFalse(source.getImport(WebService.class.getCanonicalName()).exists());
- } catch (CoreException ce) {
- fail(ce.getLocalizedMessage());
- }
- }
-}
diff --git a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/tests/RemoveMemberValuePairTest.java b/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/tests/RemoveMemberValuePairTest.java
deleted file mode 100644
index 84032f4..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/tests/RemoveMemberValuePairTest.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Shane Clarke.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Shane Clarke - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.core.tests;
-
-import javax.jws.WebService;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.dom.Annotation;
-import org.eclipse.jdt.core.dom.MemberValuePair;
-import org.eclipse.jdt.core.dom.NormalAnnotation;
-import org.eclipse.jst.ws.annotations.core.utils.AnnotationUtils;
-
-public class RemoveMemberValuePairTest extends AbstractAnnotationTest {
-
- @Override
- protected Annotation getAnnotation() {
- return null;
- }
-
- @Override
- protected String getClassContents() {
- StringBuilder classContents = new StringBuilder("package com.example;\n\n");
- classContents.append("import javax.jws.WebService;\n\n");
- classContents.append("@WebService(name=\"Calculator\")\n");
- classContents.append("public class Calculator {\n}");
- return classContents.toString();
- }
-
- @Override
- protected String getClassName() {
- return "Calculator.java";
- }
-
- @Override
- protected String getPackageName() {
- return "com.example";
- }
-
- public void testRemoveMemberValuePairFromAnnotation() {
- try {
- IType type = source.findPrimaryType();
- assertTrue(AnnotationUtils.isAnnotationPresent(source, "WebService"));
- Annotation webService = AnnotationUtils.getAnnotation(type, WebService.class);
- assertNotNull(webService);
- assertTrue(webService instanceof NormalAnnotation);
-
- NormalAnnotation webServiceAnnotation = (NormalAnnotation) webService;
- assertTrue(webServiceAnnotation.values().size() == 1);
-
- MemberValuePair nameValuePair = AnnotationUtils.getMemberValuePair(webServiceAnnotation, "name");
-
- AnnotationUtils.removeMemberValuePair(webServiceAnnotation, nameValuePair);
- webServiceAnnotation = (NormalAnnotation) AnnotationUtils.getAnnotation(type, WebService.class);
- assertTrue(webServiceAnnotation.values().size() == 0);
- } catch (CoreException ce) {
- fail(ce.getLocalizedMessage());
- }
- }
-
-}
diff --git a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/tests/TestJavaProject.java b/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/tests/TestJavaProject.java
deleted file mode 100644
index 5a0b5b8..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/tests/TestJavaProject.java
+++ /dev/null
@@ -1,127 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Shane Clarke.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Shane Clarke - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.core.tests;
-
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IWorkspaceDescription;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.jdt.apt.core.util.AptConfig;
-import org.eclipse.jdt.core.IClasspathEntry;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IPackageFragment;
-import org.eclipse.jdt.core.IPackageFragmentRoot;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jdt.launching.IVMInstall;
-import org.eclipse.jdt.launching.IVMInstall2;
-import org.eclipse.jdt.launching.IVMInstallType;
-import org.eclipse.jdt.launching.JavaRuntime;
-
-public class TestJavaProject extends TestProject {
- private IJavaProject javaProject;
-
- public TestJavaProject(String projectName) throws CoreException {
- super(projectName);
- javaProject = JavaCore.create(getProject());
- addProjectNature(getProject(), JavaCore.NATURE_ID);
-
- javaProject.setRawClasspath(new IClasspathEntry[0], null);
-
- createSourceFolder();
- addToClasspath(javaProject, getJREContainerEntry());
- createOutputFolder();
- }
-
- public void setAutoBuilding(boolean autoBuild) throws CoreException {
- IWorkspaceDescription description = ResourcesPlugin.getWorkspace().getDescription();
- description.setAutoBuilding(autoBuild);
- ResourcesPlugin.getWorkspace().setDescription(description);
- }
-
- public void enableAnnotationProcessing(boolean enable) {
- AptConfig.setEnabled(javaProject, enable);
- }
-
- private IClasspathEntry getJREContainerEntry() {
- IVMInstall defaultVMInstall = JavaRuntime.getDefaultVMInstall();
- if (defaultVMInstall != null && isJava6OrGreaterJRE(defaultVMInstall)) {
- return JavaRuntime.getDefaultJREContainerEntry();
- }
-
- IVMInstallType[] installTypes = JavaRuntime.getVMInstallTypes();
- for (IVMInstallType installType : installTypes) {
- IVMInstall[] vmInstalls = installType.getVMInstalls();
- for (IVMInstall vmInstall : vmInstalls) {
- if (isJava6OrGreaterJRE(vmInstall)) {
- return JavaCore.newContainerEntry(JavaRuntime.newJREContainerPath(installType.getId(),
- vmInstall.getName()));
- }
- }
- }
-
- return JavaRuntime.getDefaultJREContainerEntry();
- }
-
- private boolean isJava6OrGreaterJRE(IVMInstall vmInstall) {
- if (vmInstall instanceof IVMInstall2) {
- IVMInstall2 vmInstall2 = (IVMInstall2) vmInstall;
- if (vmInstall2.getJavaVersion().compareTo(JavaCore.VERSION_1_6) > 0) {
- return true;
- }
- }
- return false;
- }
-
- public ICompilationUnit createCompilationUnit(String packageName, String name, String contents) throws JavaModelException {
- return getPackageFragment(packageName).createCompilationUnit(name, contents, false, monitor);
- }
-
- private IPackageFragment getPackageFragment(String packageName) throws JavaModelException {
- return getPackageFragmentRoot().createPackageFragment(packageName, true, monitor);
- }
-
- private IPackageFragmentRoot getPackageFragmentRoot() {
- return getJavaProject().getPackageFragmentRoot(getProject().getFolder("src"));
- }
-
- private void createSourceFolder() throws CoreException {
- IFolder srcDir = getProject().getFolder("src");
- mkdirs(srcDir);
- addToClasspath(javaProject, JavaCore.newSourceEntry(srcDir.getFullPath()));
- }
-
- private void createOutputFolder() throws CoreException {
- IFolder outputDir = getProject().getFolder("bin");
- mkdirs(outputDir);
- getJavaProject().setOutputLocation(outputDir.getFullPath(), monitor);
- }
-
- public IJavaProject getJavaProject() {
- return javaProject;
- }
-
- public void addToClasspath(IJavaProject javaProject, IClasspathEntry classpathEntry) {
- try {
- IClasspathEntry[] currentClasspathEntries = javaProject.getRawClasspath();
- IClasspathEntry[] newClasspathEntries = new IClasspathEntry[currentClasspathEntries.length + 1];
- System.arraycopy(currentClasspathEntries, 0, newClasspathEntries, 0,
- currentClasspathEntries.length);
- newClasspathEntries[currentClasspathEntries.length] = classpathEntry;
- javaProject.setRawClasspath(newClasspathEntries, new NullProgressMonitor());
- } catch (JavaModelException jme) {
- jme.printStackTrace();
- }
- }
-
-}
diff --git a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/tests/TestProject.java b/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/tests/TestProject.java
deleted file mode 100644
index e446286..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/tests/TestProject.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Shane Clarke.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Shane Clarke - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.core.tests;
-
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IProjectDescription;
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.NullProgressMonitor;
-
-public class TestProject {
- IProgressMonitor monitor = new NullProgressMonitor();
-
- private IProject testProject;
-
- public TestProject(String projectName) throws CoreException {
- IWorkspaceRoot workspaceRoot = ResourcesPlugin.getWorkspace().getRoot();
- testProject = workspaceRoot.getProject(projectName);
- testProject.create(monitor);
- testProject.open(monitor);
- }
-
- public IProject getProject() {
- return testProject;
- }
-
- public void addProjectNature(IProject project, String nature) {
- try {
- IProjectDescription projectDescription = project.getDescription();
- String[] previousNatures = projectDescription.getNatureIds();
- String[] newNatures = new String[previousNatures.length + 1];
- System.arraycopy(previousNatures, 0, newNatures, 0, previousNatures.length);
- newNatures[previousNatures.length] = nature;
- projectDescription.setNatureIds(newNatures);
- project.setDescription(projectDescription, null);
- } catch (CoreException ce) {
- ce.printStackTrace();
- }
- }
-
- public void mkdirs(final IFolder folder) throws CoreException {
- if (!folder.exists()) {
- if (folder.getParent() instanceof IFolder) {
- mkdirs((IFolder) folder.getParent());
- }
- folder.create(true, true, null);
- }
- }
-}
diff --git a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/tests/UpdateMemberValuePairTest.java b/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/tests/UpdateMemberValuePairTest.java
deleted file mode 100644
index 29daf1a..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/tests/UpdateMemberValuePairTest.java
+++ /dev/null
@@ -1,154 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Shane Clarke.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Shane Clarke - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.core.tests;
-
-import javax.jws.WebMethod;
-import javax.jws.WebParam;
-import javax.jws.WebService;
-import javax.xml.ws.WebServiceRef;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jdt.core.IField;
-import org.eclipse.jdt.core.ILocalVariable;
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.dom.Annotation;
-import org.eclipse.jdt.core.dom.MemberValuePair;
-import org.eclipse.jdt.core.dom.NormalAnnotation;
-import org.eclipse.jdt.core.dom.StringLiteral;
-import org.eclipse.jst.ws.annotations.core.AnnotationsCore;
-import org.eclipse.jst.ws.annotations.core.utils.AnnotationUtils;
-
-public class UpdateMemberValuePairTest extends AbstractAnnotationTest {
-
- @Override
- protected Annotation getAnnotation() {
- return null;
- }
-
- @Override
- protected String getClassContents() {
- StringBuilder classContents = new StringBuilder("package com.example;\n\n");
- classContents.append("import javax.jws.WebService;\n");
- classContents.append("import javax.jws.WebMethod;\n");
- classContents.append("import javax.jws.WebParam;\n");
- classContents.append("import javax.xml.ws.WebServiceRef;\n\n");
- classContents.append("@WebService(name=\"Calculator\")\n");
- classContents.append("public class Calculator {\n\n");
- classContents.append("\t@WebServiceRef(mappedName=\"myField\")\n");
- classContents.append("\tpublic String myField;\n\n");
- classContents.append("\t@WebMethod(operationName=\"add\")\n");
- classContents.append("\tpublic int add(@WebParam(partName=\"i\") int i, int k) {");
- classContents.append("\n\t\treturn i + k;\n\t}\n}");
- return classContents.toString();
- }
-
- @Override
- protected String getClassName() {
- return "Calculator.java";
- }
-
- @Override
- protected String getPackageName() {
- return "com.example";
- }
-
- public void testUpdateMemberValuePair() {
- try {
- //@WebService
- IType type = source.findPrimaryType();
- assertTrue(AnnotationUtils.isAnnotationPresent(source, "WebService"));
- Annotation webService = AnnotationUtils.getAnnotation(type, WebService.class);
- assertNotNull(webService);
- assertTrue(webService instanceof NormalAnnotation);
-
- NormalAnnotation webServiceAnnotation = (NormalAnnotation) webService;
- assertTrue(webServiceAnnotation.values().size() == 1);
-
- MemberValuePair nameValuePair = AnnotationUtils.getMemberValuePair(webServiceAnnotation, "name");
- assertNotNull(nameValuePair);
- StringLiteral nameValue = (StringLiteral) nameValuePair.getValue();
- assertTrue(nameValue.getLiteralValue().equals("Calculator"));
-
- AnnotationUtils.updateMemberValuePair(nameValuePair, AnnotationsCore.createStringLiteral(ast, "ScientificCalculator"));
- webServiceAnnotation = (NormalAnnotation) AnnotationUtils.getAnnotation(type, WebService.class);
- nameValuePair = AnnotationUtils.getMemberValuePair(webServiceAnnotation, "name");
- nameValue = (StringLiteral) nameValuePair.getValue();
- assertTrue(nameValue.getLiteralValue().equals("ScientificCalculator"));
-
- //@WebServiceRef
- IField field = type.getField("myField");
- assertTrue(AnnotationUtils.isAnnotationPresent(field, "WebServiceRef"));
- Annotation webServiceRef = AnnotationUtils.getAnnotation(field, WebServiceRef.class);
- assertNotNull(webServiceRef);
- assertTrue(webServiceRef instanceof NormalAnnotation);
-
- NormalAnnotation webServiceRefAnnotation = (NormalAnnotation) webServiceRef;
- assertTrue(webServiceRefAnnotation.values().size() == 1);
-
- MemberValuePair mappedNameValuePair = AnnotationUtils.getMemberValuePair(webServiceRefAnnotation, "mappedName");
- assertNotNull(mappedNameValuePair);
- StringLiteral mappedNameValue = (StringLiteral) mappedNameValuePair.getValue();
- assertTrue(mappedNameValue.getLiteralValue().equals("myField"));
-
- AnnotationUtils.updateMemberValuePair(mappedNameValuePair, AnnotationsCore.createStringLiteral(ast, "anotherField"));
- webServiceRefAnnotation = (NormalAnnotation) AnnotationUtils.getAnnotation(field, WebServiceRef.class);
- mappedNameValuePair = AnnotationUtils.getMemberValuePair(webServiceRefAnnotation, "mappedName");
- mappedNameValue = (StringLiteral) mappedNameValuePair.getValue();
- assertTrue(mappedNameValue.getLiteralValue().equals("anotherField"));
-
- //@WebMethod
- IMethod method = type.getMethod("add", new String[] { "I", "I" });
- assertTrue(AnnotationUtils.isAnnotationPresent(method, "WebMethod"));
- Annotation webMethod = AnnotationUtils.getAnnotation(method, WebMethod.class);
- assertNotNull(webMethod);
- assertTrue(webMethod instanceof NormalAnnotation);
-
- NormalAnnotation webMethodAnnotation = (NormalAnnotation) webMethod;
- assertTrue(webMethodAnnotation.values().size() == 1);
-
- MemberValuePair operationNameValuePair = AnnotationUtils.getMemberValuePair(webMethodAnnotation, "operationName");
- assertNotNull(operationNameValuePair);
- StringLiteral operationNameValue = (StringLiteral) operationNameValuePair.getValue();
- assertTrue(operationNameValue.getLiteralValue().equals("add"));
-
- AnnotationUtils.updateMemberValuePair(operationNameValuePair, AnnotationsCore.createStringLiteral(ast, "multiply"));
- webMethodAnnotation = (NormalAnnotation) AnnotationUtils.getAnnotation(method, WebMethod.class);
- operationNameValuePair = AnnotationUtils.getMemberValuePair(webMethodAnnotation, "operationName");
- operationNameValue = (StringLiteral) operationNameValuePair.getValue();
- assertTrue(operationNameValue.getLiteralValue().equals("multiply"));
-
- //@WebParam
- ILocalVariable localVariable = AnnotationUtils.getLocalVariable(method, "i");
- assertTrue(AnnotationUtils.isAnnotationPresent(localVariable, "WebParam"));
- Annotation webParam = AnnotationUtils.getAnnotation(localVariable, WebParam.class);
- assertNotNull(webParam);
- assertTrue(webParam instanceof NormalAnnotation);
-
- NormalAnnotation webParamAnnotation = (NormalAnnotation) webParam;
- assertTrue(webParamAnnotation.values().size() == 1);
-
- MemberValuePair partNameValuePair = AnnotationUtils.getMemberValuePair(webParamAnnotation, "partName");
- assertNotNull(partNameValuePair);
- StringLiteral partNameValue = (StringLiteral) partNameValuePair.getValue();
- assertTrue(partNameValue.getLiteralValue().equals("i"));
-
- AnnotationUtils.updateMemberValuePair(partNameValuePair, AnnotationsCore.createStringLiteral(ast, "iii"));
- webParamAnnotation = (NormalAnnotation) AnnotationUtils.getAnnotation(localVariable, WebParam.class);
- partNameValuePair = AnnotationUtils.getMemberValuePair(webParamAnnotation, "partName");
- partNameValue = (StringLiteral) partNameValuePair.getValue();
- assertTrue(partNameValue.getLiteralValue().equals("iii"));
- } catch (CoreException ce) {
- fail(ce.getLocalizedMessage());
- }
- }
-
-}
diff --git a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/tests/UpdateSingleMemberAnnotationTest.java b/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/tests/UpdateSingleMemberAnnotationTest.java
deleted file mode 100644
index 29da147..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/tests/UpdateSingleMemberAnnotationTest.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Shane Clarke.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Shane Clarke - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.core.tests;
-
-import javax.xml.ws.BindingType;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.dom.Annotation;
-import org.eclipse.jdt.core.dom.SingleMemberAnnotation;
-import org.eclipse.jdt.core.dom.StringLiteral;
-import org.eclipse.jst.ws.annotations.core.AnnotationsCore;
-import org.eclipse.jst.ws.annotations.core.utils.AnnotationUtils;
-
-public class UpdateSingleMemberAnnotationTest extends AbstractAnnotationTest {
-
- @Override
- protected Annotation getAnnotation() {
- return null;
- }
-
- @Override
- protected String getClassContents() {
- StringBuilder classContents = new StringBuilder("package com.example;\n\n");
- classContents.append("import javax.xml.ws.BindingType;\n\n");
- classContents.append("@BindingType(\"http://schemas.xmlsoap.org/wsdl/soap/http\")\n");
- classContents.append("public class Calculator {\n\n}");
- return classContents.toString();
- }
-
- @Override
- protected String getClassName() {
- return "Calculator.java";
- }
-
- @Override
- protected String getPackageName() {
- return "com.example";
- }
-
- public void testUpdateSingleMemberAnnotation() {
- try {
- IType type = source.findPrimaryType();
- assertTrue(AnnotationUtils.isAnnotationPresent(source, "BindingType"));
- Annotation bindingType = AnnotationUtils.getAnnotation(type, BindingType.class);
- assertNotNull(bindingType);
- assertTrue(bindingType instanceof SingleMemberAnnotation);
-
- SingleMemberAnnotation bindingTypeAnnotation = (SingleMemberAnnotation) bindingType;
- StringLiteral bindingTypeValue = (StringLiteral) bindingTypeAnnotation.getValue();
- assertTrue(bindingTypeValue.getLiteralValue().equals("http://schemas.xmlsoap.org/wsdl/soap/http"));
-
- AnnotationUtils.updateSingleMemberAnnotation(bindingTypeAnnotation, AnnotationsCore.createStringLiteral(ast, "http://www.w3.org/2003/05/soap/bindings/HTTP/"));
- bindingTypeAnnotation = (SingleMemberAnnotation) AnnotationUtils.getAnnotation(type, BindingType.class);
- bindingTypeValue = (StringLiteral) bindingTypeAnnotation.getValue();
- assertTrue(bindingTypeValue.getLiteralValue().equals("http://www.w3.org/2003/05/soap/bindings/HTTP/"));
- } catch (CoreException ce) {
- fail(ce.getLocalizedMessage());
- }
- }
-
-}
diff --git a/tests/org.eclipse.jst.ws.jaxws.dom.integration.tests/.classpath b/tests/org.eclipse.jst.ws.jaxws.dom.integration.tests/.classpath
deleted file mode 100755
index 2d1a430..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.dom.integration.tests/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/tests/org.eclipse.jst.ws.jaxws.dom.integration.tests/.project b/tests/org.eclipse.jst.ws.jaxws.dom.integration.tests/.project
deleted file mode 100755
index c53675b..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.dom.integration.tests/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.jst.ws.jaxws.dom.integration.tests</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
diff --git a/tests/org.eclipse.jst.ws.jaxws.dom.integration.tests/.settings/org.eclipse.jdt.core.prefs b/tests/org.eclipse.jst.ws.jaxws.dom.integration.tests/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100755
index ae0484e..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.dom.integration.tests/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,8 +0,0 @@
-#Mon Jul 20 15:25:31 EEST 2009
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.5
diff --git a/tests/org.eclipse.jst.ws.jaxws.dom.integration.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.jst.ws.jaxws.dom.integration.tests/META-INF/MANIFEST.MF
deleted file mode 100755
index 89bb687..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.dom.integration.tests/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,29 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %Bundle-Name.0
-Bundle-Vendor: %Bundle-Vendor.0
-Bundle-SymbolicName: org.eclipse.jst.ws.jaxws.dom.integration.tests
-Bundle-Localization: plugin
-Bundle-Version: 1.0.0.qualifier
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.core.resources,
- org.eclipse.jst.ws.jaxws.dom.integration,
- org.eclipse.jst.ws.jaxws.utils,
- org.eclipse.jst.ws.jaxws.testutils,
- org.jmock,
- org.eclipse.jdt.core,
- org.eclipse.ui.navigator,
- org.eclipse.jst.ws.jaxws.dom.ui,
- org.eclipse.jst.j2ee.core,
- org.eclipse.jst.jee.ui,
- org.eclipse.ui.ide,
- org.eclipse.emf.edit.ui,
- org.eclipse.jface.text,
- org.junit,
- org.eclipse.jdt.ui,
- org.eclipse.wst.validation
-Export-Package: org.eclipse.jst.ws.jaxws.dom.integration.tests.dom,
- org.eclipse.jst.ws.jaxws.dom.integration.tests.dom.validation,
- org.eclipse.jst.ws.jaxws.dom.integration.tests.navigator,
- org.eclipse.jst.ws.jaxws.dom.integration.tests.navigator.actions
diff --git a/tests/org.eclipse.jst.ws.jaxws.dom.integration.tests/about.html b/tests/org.eclipse.jst.ws.jaxws.dom.integration.tests/about.html
deleted file mode 100644
index d2b7ace..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.dom.integration.tests/about.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
-<title>About</title>
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
-
-<p>August 20, 2009</p>
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, "Program" will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is
-being redistributed by another party ("Redistributor") and different terms and conditions may
-apply to your use of any object code in the Content. Check the Redistributor's license that was
-provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
-
-</body>
-</html>
diff --git a/tests/org.eclipse.jst.ws.jaxws.dom.integration.tests/build.properties b/tests/org.eclipse.jst.ws.jaxws.dom.integration.tests/build.properties
deleted file mode 100755
index cc88efd..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.dom.integration.tests/build.properties
+++ /dev/null
@@ -1,16 +0,0 @@
-###############################################################################
-# Copyright (c) 2009 by SAP AG, Walldorf.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# SAP AG - initial API and implementation
-###############################################################################
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
- .,\
- about.html,\
- plugin.properties
diff --git a/tests/org.eclipse.jst.ws.jaxws.dom.integration.tests/plugin.properties b/tests/org.eclipse.jst.ws.jaxws.dom.integration.tests/plugin.properties
deleted file mode 100755
index 5c451af..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.dom.integration.tests/plugin.properties
+++ /dev/null
@@ -1,13 +0,0 @@
-###############################################################################
-# Copyright (c) 2009 by SAP AG, Walldorf.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# SAP AG - initial API and implementation
-###############################################################################
-
-Bundle-Name.0=DOM Integration Tests (Incubation)
-Bundle-Vendor.0=Eclipse Web Tools Platform
diff --git a/tests/org.eclipse.jst.ws.jaxws.dom.integration.tests/src/org/eclipse/jst/ws/jaxws/dom/integration/tests/dom/AllTestsSuite.java b/tests/org.eclipse.jst.ws.jaxws.dom.integration.tests/src/org/eclipse/jst/ws/jaxws/dom/integration/tests/dom/AllTestsSuite.java
deleted file mode 100755
index 74ca458..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.dom.integration.tests/src/org/eclipse/jst/ws/jaxws/dom/integration/tests/dom/AllTestsSuite.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.dom.integration.tests.dom;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.jst.ws.jaxws.dom.integration.tests.dom.validation.DomValidationHelperTest;
-import org.eclipse.jst.ws.jaxws.dom.integration.tests.dom.validation.DomValidationManagerTest;
-import org.eclipse.jst.ws.jaxws.dom.integration.tests.navigator.DOMAdapterFactoryContentProviderTest;
-import org.eclipse.jst.ws.jaxws.dom.integration.tests.navigator.DOMAdapterFactoryLabelProviderTest;
-import org.eclipse.jst.ws.jaxws.dom.integration.tests.navigator.DOMPropertyViewAdapterFactoryTest;
-import org.eclipse.jst.ws.jaxws.dom.integration.tests.navigator.WebServiceDecoratorTest;
-
-public class AllTestsSuite
-{
- public static Test suite()
- {
- TestSuite suite = new TestSuite();
-
- suite.addTestSuite(DOMAdapterFactoryContentProviderTest.class);
- suite.addTestSuite(DOMAdapterFactoryLabelProviderTest.class);
- suite.addTestSuite(DOMPropertyViewAdapterFactoryTest.class);
- suite.addTestSuite(DomValidationHelperTest.class);
- suite.addTestSuite(DomValidationManagerTest.class);
- suite.addTestSuite(WebServiceDecoratorTest.class);
-
- return suite;
- }
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.ws.jaxws.dom.integration.tests/src/org/eclipse/jst/ws/jaxws/dom/integration/tests/dom/validation/DomValidationHelperTest.java b/tests/org.eclipse.jst.ws.jaxws.dom.integration.tests/src/org/eclipse/jst/ws/jaxws/dom/integration/tests/dom/validation/DomValidationHelperTest.java
deleted file mode 100755
index e99d5c5..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.dom.integration.tests/src/org/eclipse/jst/ws/jaxws/dom/integration/tests/dom/validation/DomValidationHelperTest.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.dom.integration.tests.dom.validation;
-
-import org.eclipse.jdt.core.IPackageFragment;
-import org.eclipse.jst.ws.jaxws.dom.integration.validation.DomValidationHelper;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.IWsDOMRuntimeExtension;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.WsDOMLoadCanceledException;
-import org.eclipse.jst.ws.jaxws.testutils.jmock.Mock;
-import org.eclipse.jst.ws.jaxws.testutils.jmock.MockObjectTestCase;
-import org.eclipse.jst.ws.jaxws.testutils.project.TestEjb3Project;
-import org.eclipse.jst.ws.jaxws.testutils.project.TestProject;
-
-/**
- * Test class for {@link DomValidationHelper}.
- *
- * @author Georgi Vachkov
- */
-@SuppressWarnings("restriction")
-public class DomValidationHelperTest extends MockObjectTestCase
-{
- private DomValidationHelper helper;
- @Override
- public void setUp() {
- helper = new DomValidationHelper();
- }
-
- public void testDomValidationHelper() {
- assertTrue(helper.isRegistered("webServiceProject"));
- }
-
- public void testGetWebServiceProject() throws Exception
- {
- TestEjb3Project ejbProject = new TestEjb3Project("EjbProject");
- TestProject testProject = new TestProject(ejbProject.getProject());
- IPackageFragment pack = testProject.getSourceFolder().createPackageFragment("org.elcipse.test", true, null);
- testProject.createType(pack, "Sei.java", "@javax.jws.WebService public interface Sei {}");
-
- helper.setProject(testProject.getProject());
- assertNotNull("DOM project not retrieved", helper.getWebServiceProject("org.eclipse.jst.ws.jaxws.dom.jee5"));
-
- try {
- testProject.dispose();
- } catch (Exception _) {
- }
- }
-
- public void testGetWebServiceProjectDOMLoadingCanceled() throws Exception
- {
- final Mock<IWsDOMRuntimeExtension> extMock = mock(IWsDOMRuntimeExtension.class);
- extMock.expects(once()).method("getDOM").will(throwException(new WsDOMLoadCanceledException("", "")));
- helper = new DomValidationHelper() {
- @Override
- protected IWsDOMRuntimeExtension getDomRuntime(final String domId) {
- return extMock.proxy();
- }
- };
- assertNull("The helper returned dom instance", helper.getWebServiceProject("some.dom"));
- }
-}
diff --git a/tests/org.eclipse.jst.ws.jaxws.dom.integration.tests/src/org/eclipse/jst/ws/jaxws/dom/integration/tests/dom/validation/DomValidationManagerTest.java b/tests/org.eclipse.jst.ws.jaxws.dom.integration.tests/src/org/eclipse/jst/ws/jaxws/dom/integration/tests/dom/validation/DomValidationManagerTest.java
deleted file mode 100755
index f8d9f8e..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.dom.integration.tests/src/org/eclipse/jst/ws/jaxws/dom/integration/tests/dom/validation/DomValidationManagerTest.java
+++ /dev/null
@@ -1,258 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.dom.integration.tests.dom.validation;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-import junit.framework.TestCase;
-
-import org.eclipse.core.resources.IMarker;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IWorkspaceDescription;
-import org.eclipse.core.resources.IncrementalProjectBuilder;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExtension;
-import org.eclipse.core.runtime.IExtensionPoint;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IPackageFragment;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jst.ws.jaxws.dom.integration.navigator.DOMAdapterFactoryLabelProvider;
-import org.eclipse.jst.ws.jaxws.dom.integration.navigator.ISEIChildList;
-import org.eclipse.jst.ws.jaxws.dom.integration.navigator.IWebServiceChildList;
-import org.eclipse.jst.ws.jaxws.dom.integration.validation.DomValidationHelper;
-import org.eclipse.jst.ws.jaxws.dom.integration.validation.DomValidationManager;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.DomFactory;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.IServiceEndpointInterface;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.IWebMethod;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.IWebParam;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.IWebService;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.IWebServiceProject;
-import org.eclipse.jst.ws.jaxws.dom.runtime.validation.IDomValidator;
-import org.eclipse.jst.ws.jaxws.testutils.IWaitCondition;
-import org.eclipse.jst.ws.jaxws.testutils.assertions.Assertions;
-import org.eclipse.jst.ws.jaxws.testutils.assertions.ConditionCheckException;
-import org.eclipse.jst.ws.jaxws.testutils.project.TestEjb3Project;
-import org.eclipse.jst.ws.jaxws.testutils.project.TestProject;
-import org.eclipse.jst.ws.jaxws.utils.dom.validation.DomValidationConstants;
-import org.eclipse.jst.ws.jaxws.utils.internal.text.JaxWsUtilMessages;
-import org.eclipse.jst.ws.jaxws.utils.resources.FileUtils;
-
-@SuppressWarnings("nls")
-public class DomValidationManagerTest extends TestCase
-{
- private static final String WST_VALIDATION_XP = "org.eclipse.wst.validation.validator";
-
- public void testRegistered()
- {
- final IExtensionPoint extensionPoint = Platform.getExtensionRegistry().getExtensionPoint(WST_VALIDATION_XP);
- IExtension extension = extensionPoint.getExtension("org.eclipse.jst.ws.jaxws.dom.integration.wsValidator");
- assertNotNull(extension);
-
- IConfigurationElement element = findElement(extension.getConfigurationElements(), "validator");
- element = findElement(element.getChildren(), "run");
- assertEquals(DomValidationManager.class.getName(), element.getAttribute("class"));
- }
-
- private IConfigurationElement findElement(IConfigurationElement [] configElements, String name)
- {
- for (IConfigurationElement configElement : configElements) {
- if (configElement.getName().equals(name)) {
- return configElement;
- }
- }
-
- return null;
- }
-
- @SuppressWarnings("restriction")
- public void testValidateCalled() throws Exception
- {
- TestEjb3Project ejbProject = new TestEjb3Project("EjbProject" + System.currentTimeMillis());
- TestProject testProject = new TestProject(ejbProject.getProject());
- IPackageFragment pack = testProject.getSourceFolder().createPackageFragment("org.eclipse.test", true, null);
- testProject.createType(pack, "Sei.java", "@javax.jws.WebService public interface Sei {}");
-
- DomValidationHelper helper = new DomValidationHelper();
- helper.setProject(testProject.getProject());
-
- MyDomValidationManager manager = new MyDomValidationManager("org.eclipse.jst.ws.jaxws.dom.jee5");
- manager.validate(helper, null);
- assertTrue(manager.validationCalled);
-
- manager = new MyDomValidationManager("sample.not.existing");
- manager.validate(helper, null);
- assertFalse(manager.validationCalled);
- }
-
- @SuppressWarnings("restriction")
- public void testValidateCleansUpErrorMarkers() throws Exception
- {
- final TestProject testProject = createProject();
- IType seiType = testProject.getJavaProject().findType("org.eclipse.test.Sei");
- seiType.getResource().createMarker(DomValidationConstants.MARKER_ID);
- IMarker [] markers = seiType.getResource().findMarkers(DomValidationConstants.MARKER_ID, false, IResource.DEPTH_ZERO);
- assertEquals(1, markers.length);
-
- DomValidationHelper helper = new DomValidationHelper();
- helper.setProject(testProject.getProject());
- MyDomValidationManager manager = new MyDomValidationManager("org.eclipse.jst.ws.jaxws.dom.jee5");
- manager.validate(helper, null);
-
- markers = seiType.getResource().findMarkers(DomValidationConstants.MARKER_ID, false, IResource.DEPTH_ZERO);
- assertEquals(0, markers.length);
- }
-
- public void testRefreshTree() throws Exception
- {
- IWebService ws = DomFactory.eINSTANCE.createIWebService();
- IServiceEndpointInterface sei = DomFactory.eINSTANCE.createIServiceEndpointInterface();
-
- IWebMethod wm = DomFactory.eINSTANCE.createIWebMethod();
- wm.getParameters().add(DomFactory.eINSTANCE.createIWebParam());
-
- sei.getImplementingWebServices().add(ws);
- sei.getWebMethods().add(wm);
-
- IWebServiceProject wsProject = DomFactory.eINSTANCE.createIWebServiceProject();
- wsProject.getWebServices().add(ws);
- wsProject.getServiceEndpointInterfaces().add(sei);
-
- final Set<Object> elements = new HashSet<Object>();
- DOMAdapterFactoryLabelProvider labelProvider = new DOMAdapterFactoryLabelProvider()
- {
- @Override
- public void fireLabelProviderChanged (Object element) {
- elements.add(element.getClass().getInterfaces()[0]);
- }
- };
-
- Runnable refresh = new MyDomValidationManager("").getRefreshRunnable(labelProvider, wsProject);
- refresh.run();
-
- assertTrue(elements.contains(IWebServiceProject.class));
- assertTrue(elements.contains(IWebServiceChildList.class));
- assertTrue(elements.contains(ISEIChildList.class));
- assertTrue(elements.contains(IServiceEndpointInterface.class));
- assertTrue(elements.contains(IWebService.class));
- assertTrue(elements.contains(IWebMethod.class));
- assertTrue(elements.contains(IWebParam.class));
- }
-
- public void testValidationFrameworkTriggersValidation() throws Exception
- {
- final TestEjb3Project ejbProject = new TestEjb3Project("EjbProject" + System.currentTimeMillis());
- final TestProject testProject = new TestProject(ejbProject.getProject());
- final IPackageFragment pack = testProject.getSourceFolder().createPackageFragment("org.eclipse.test", true, null);
- final IType wsType = testProject.createType(pack, "Ws.java", "@javax.jws.WebService(name=\"Test\") public class Ws {}");
- testProject.getProject().build(IncrementalProjectBuilder.INCREMENTAL_BUILD, null);
-
- boolean autoBuild = ResourcesPlugin.getWorkspace().getDescription().isAutoBuilding();
- try {
- setAutoBuild(false);
- setContents(wsType.getCompilationUnit(), "@javax.jws.WebService(name=\"^^^\") public class Ws {}");
- testProject.getProject().build(IncrementalProjectBuilder.INCREMENTAL_BUILD, null);
- Assertions.waitAssert(new IWaitCondition() {
- public boolean checkCondition() throws ConditionCheckException {
- try {
- IMarker[] markers= wsType.getResource().findMarkers(DomValidationConstants.MARKER_ID, false, IResource.DEPTH_ZERO);
- for(IMarker m : markers)
- {
- if((m.getAttribute(IMarker.SEVERITY) == null) || (m.getAttribute(IMarker.MESSAGE) == null))
- {
- return false;
- }
- if((Integer)m.getAttribute(IMarker.SEVERITY) == IMarker.SEVERITY_ERROR || JaxWsUtilMessages.WsdlNamesValidator_InvalidNCName2.equals(m.getAttribute(IMarker.MESSAGE)))
- {
- return true;
- }
- }
- return false;
- } catch (CoreException e) {
- throw new ConditionCheckException(e);
- }
- }
- },
- "Expected error marker was not found");
- }
- finally {
- setAutoBuild(autoBuild);
- }
- }
-
- public void setContents(ICompilationUnit cu, String contents) throws JavaModelException
- {
- final String contentToSet = "package "+cu.getParent().getElementName()+";\n"+contents;
- FileUtils.getInstance().setCompilationUnitContent(cu, contentToSet, true, null);
- }
-
- private void setAutoBuild(boolean auto) throws CoreException
- {
- final IWorkspaceDescription desc = ResourcesPlugin.getWorkspace().getDescription();
- desc.setAutoBuilding(auto);
- ResourcesPlugin.getWorkspace().setDescription(desc);
- }
-
- private TestProject createProject() throws Exception
- {
- TestEjb3Project ejbProject = new TestEjb3Project("EjbProject" + System.currentTimeMillis());
- TestProject testProject = new TestProject(ejbProject.getProject());
- IPackageFragment pack = testProject.getSourceFolder().createPackageFragment("org.eclipse.test", true, null);
- testProject.createType(pack, "Sei.java", "@javax.jws.WebService(endpointInterface=\"\") public interface Sei {}");
-
- return testProject;
- }
-
- protected class MyDomValidationManager extends DomValidationManager
- {
- public boolean validationCalled;
- private String domId;
-
- public MyDomValidationManager(String domId)
- {
- this.domId = domId;
- }
-
- @Override
- protected Collection<IDomValidator> getValidators()
- {
- IDomValidator validator = new IDomValidator()
- {
- public String getSupportedDomRuntime() {
- return domId;
- }
-
- public IStatus validate(EObject object) {
- validationCalled = true;
- return null;
- }};
-
- List<IDomValidator> validators = new ArrayList<IDomValidator>();
- validators.add(validator);
-
- return validators;
- }
-
- public RefreshRunnable getRefreshRunnable(DOMAdapterFactoryLabelProvider labelProvider, IWebServiceProject wsProject)
- {
- return new RefreshRunnable(labelProvider, wsProject);
- }
- }
-}
diff --git a/tests/org.eclipse.jst.ws.jaxws.dom.integration.tests/src/org/eclipse/jst/ws/jaxws/dom/integration/tests/navigator/DOMAdapterFactoryContentProviderTest.java b/tests/org.eclipse.jst.ws.jaxws.dom.integration.tests/src/org/eclipse/jst/ws/jaxws/dom/integration/tests/navigator/DOMAdapterFactoryContentProviderTest.java
deleted file mode 100755
index 8d9efb4..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.dom.integration.tests/src/org/eclipse/jst/ws/jaxws/dom/integration/tests/navigator/DOMAdapterFactoryContentProviderTest.java
+++ /dev/null
@@ -1,351 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.dom.integration.tests.navigator;
-
-import java.util.Iterator;
-
-import junit.framework.TestCase;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jdt.core.IPackageFragment;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jst.ws.jaxws.dom.integration.navigator.DOMAdapterFactoryContentProvider;
-import org.eclipse.jst.ws.jaxws.dom.integration.navigator.ILoadingWsProject;
-import org.eclipse.jst.ws.jaxws.dom.integration.navigator.ISEIChildList;
-import org.eclipse.jst.ws.jaxws.dom.integration.navigator.IWebServiceChildList;
-import org.eclipse.jst.ws.jaxws.dom.integration.navigator.ILoadingWsProject.ILoadingCanceled;
-import org.eclipse.jst.ws.jaxws.dom.integration.navigator.ILoadingWsProject.ILoadingDummy;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.IDOM;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.IServiceEndpointInterface;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.IWebMethod;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.IWebParam;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.IWebService;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.IWebServiceProject;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.IWsDOMRuntimeExtension;
-import org.eclipse.jst.ws.jaxws.dom.runtime.persistence.JaxWsWorkspaceResource;
-import org.eclipse.jst.ws.jaxws.dom.ui.DomItemProviderAdapterFactory;
-import org.eclipse.jst.ws.jaxws.testutils.project.TestProject;
-import org.eclipse.jst.ws.jaxws.testutils.project.TestProjectsUtils;
-
-public class DOMAdapterFactoryContentProviderTest extends TestCase
-{
- private static TestProject testPrj1;
-
- private static IPackageFragment modelSync1;
-
- private IWebServiceProject wsProject;
-
- protected JaxWsWorkspaceResource targetResource;
- protected DOMAdapterFactoryContentProvider adapterFactory;
-
- @Override
- public void setUp() throws Exception
- {
- if(testPrj1==null)
- {
- IProject ejbProject = TestProjectsUtils.createEjb3Project("DOMCntProvTestProject1" + System.currentTimeMillis());
- testPrj1 = new TestProject(ejbProject.getProject());
- testPrj1.createSourceFolder("src");
- modelSync1 = testPrj1.createPackage("org.eclipse.test.modelsync1");
- testPrj1.createType(modelSync1, "Sei1.java", "@javax.jws.WebService(name=\"Sei1Name\") public interface Sei1{\n" +
- "@javax.jws.WebMethod(name=\"parentMethod\") public void voidMethodWithNoArgsInParent();\n" +
- "}");
- testPrj1.createType(modelSync1, "Sei2.java", "@javax.jws.WebService(name=\"Sei2Name\") public interface Sei2 extends Sei1 {\n" +
- "@javax.jws.WebMethod(name=\"voidMethodWithArgs\") public void voidMethodWithArgs(@javax.jws.WebParam(name=\"param1\") java.util.List<String> param1);\n" +
- "}");
- testPrj1.createType(modelSync1, "WS1.java", "@javax.jws.WebService(serviceName=\"WS1Name\", endpointInterface=\"org.eclipse.test.modelsync1.Sei2\") public class WS1 {}");
- testPrj1.createType(modelSync1, "WS2.java", "@javax.jws.WebService(serviceName=\"WS2Name\") public class WS2 {}");
- }
-
- targetResource = new JaxWsWorkspaceResource(JavaCore.create(ResourcesPlugin.getWorkspace().getRoot()));
- targetResource.load(null);
- Iterator<IWebServiceProject> wsProjects = targetResource.getDOM().getWebServiceProjects().iterator();
-
- while(wsProjects.hasNext())
- {
- IWebServiceProject wsProj = wsProjects.next();
-
- if(wsProj.getName().equals(testPrj1.getProject().getName()))
- {
- this.wsProject = wsProj;
- }
- }
-
- assertNotNull(this.wsProject);
-
- adapterFactory = new DOMAdapterFactoryContentProvider()
- {
- @Override
- protected IWebServiceProject getWsProject(final IDOM dom, final IProject project) {
- return wsProject;
- }
- };
-
- targetResource.startSynchronizing();
- }
-
- @Override
- public void tearDown() throws CoreException
- {
- targetResource.stopSynchronizing();
- }
-
- public void testDOMAdapterFactoryContentProvider()
- {
- assertNotNull(adapterFactory.getAdapterFactory());
- assertTrue(adapterFactory.getAdapterFactory() instanceof DomItemProviderAdapterFactory);
- }
-
- public void testDOMAdapterFactoryContentProviderAdapterFactory()
- {
- adapterFactory = new DOMAdapterFactoryContentProvider(new DomItemProviderAdapterFactory());
-
- assertNotNull(adapterFactory.getAdapterFactory());
- assertTrue(adapterFactory.getAdapterFactory() instanceof DomItemProviderAdapterFactory);
- }
-
- public void testGetChildrenListsObject()
- {
- Object[] children = adapterFactory.getChildren(testPrj1.getProject());
-
- assertNotNull(children);
- assertEquals(children.length, 1);
- assertTrue(children[0] instanceof IWebServiceProject);
-
- children = adapterFactory.getChildren(children[0]);
-
- assertNotNull(children);
- assertEquals(children.length, 2);
- assertTrue(children[0] instanceof ISEIChildList);
- assertTrue(children[1] instanceof IWebServiceChildList);
-
- Object[] sEIs = adapterFactory.getChildren(children[0]);
-
- assertNotNull(sEIs);
- assertEquals(3, sEIs.length);
- assertTrue(sEIs[0] instanceof IServiceEndpointInterface);
- assertTrue(sEIs[1] instanceof IServiceEndpointInterface);
- assertTrue(sEIs[2] instanceof IServiceEndpointInterface);
-
- Object[] wSs = adapterFactory.getChildren(children[1]);
-
- assertNotNull(wSs);
- assertEquals(wSs.length, 2);
- assertTrue(wSs[0] instanceof IWebService);
- assertTrue(wSs[1] instanceof IWebService);
- }
-
- public void testHasChildrenObject()
- {
- // IWebServiceProject
- Object[] children = adapterFactory.getChildren(testPrj1.getProject());
-
- assertTrue(adapterFactory.hasChildren(children[0]));
-
- // ISEIChildList & IWebServiceChildList
- children = adapterFactory.getChildren(children[0]);
-
- assertTrue(adapterFactory.hasChildren(children[0]));
- assertTrue(adapterFactory.hasChildren(children[1]));
-
- // null parameter
- assertFalse(adapterFactory.hasChildren(null));
- }
-
- public void testChildrenIWebService()
- {
- IWebService ws = findWs("org.eclipse.test.modelsync1.WS1");
- assertNotNull(ws);
- assertTrue(adapterFactory.hasChildren(ws));
- assertEquals(1, adapterFactory.getChildren(ws).length);
- assertTrue(adapterFactory.getChildren(ws)[0] instanceof IServiceEndpointInterface);
-
- // check if adapted only once
- DOMAdapterFactoryContentProvider otherFactory = new DOMAdapterFactoryContentProvider();
- otherFactory.getChildren(ws);
- assertEquals(2, ws.eAdapters().size());
- }
-
- public void testChildrenIServiceEndpointInterface()
- {
- IServiceEndpointInterface sei = findSei("org.eclipse.test.modelsync1.Sei2");
- assertNotNull(sei);
- assertTrue(adapterFactory.hasChildren(sei));
- assertEquals(2, adapterFactory.getChildren(sei).length);
- assertTrue(adapterFactory.getChildren(sei)[0] instanceof IWebMethod);
- DOMAdapterFactoryContentProvider otherFactory = new DOMAdapterFactoryContentProvider();
- otherFactory.getChildren(sei);
- assertEquals(2, sei.eAdapters().size());
-
- IWebService ws = findWs("org.eclipse.test.modelsync1.WS2");
- assertNotNull(ws);
- assertFalse(adapterFactory.hasChildren(ws.getServiceEndpoint()));
- assertEquals(0, adapterFactory.getChildren(ws.getServiceEndpoint()).length);
- // check if adapted only once
- otherFactory.getChildren(ws.getServiceEndpoint());
- assertEquals(2, ws.getServiceEndpoint().eAdapters().size());
- }
-
- public void testChildrenWebMethod()
- {
- IServiceEndpointInterface sei = findSei("org.eclipse.test.modelsync1.Sei2");
- assertNotNull(sei);
-
- IWebMethod method = findMethod(sei, "voidMethodWithArgs");
- assertNotNull(method);
- assertTrue(adapterFactory.hasChildren(method));
- assertEquals(1, adapterFactory.getChildren(method).length);
- assertTrue(adapterFactory.getChildren(method)[0] instanceof IWebParam);
-
- method = findMethod(sei, "voidMethodWithNoArgsInParent");
- assertNotNull(method);
- assertFalse(adapterFactory.hasChildren(method));
- assertEquals(0, adapterFactory.getChildren(method).length);
- }
-
- public void testChildrenWebParam()
- {
- IServiceEndpointInterface sei = findSei("org.eclipse.test.modelsync1.Sei2");
- assertNotNull(sei);
-
- IWebMethod method = findMethod(sei, "voidMethodWithArgs");
- assertNotNull(method);
- assertFalse(adapterFactory.hasChildren(method.getParameters().get(0)));
- assertEquals(0, adapterFactory.getChildren(method.getParameters().get(0)).length);
- }
-
-
- private IServiceEndpointInterface findSei(final String implName)
- {
- for(IServiceEndpointInterface sei : wsProject.getServiceEndpointInterfaces())
- {
- if(sei.getImplementation().equals(implName)) {
- return sei;
- }
- }
-
- return null;
- }
-
- private IWebService findWs(final String implName)
- {
- for(IWebService ws : wsProject.getWebServices())
- {
- if(ws.getImplementation().equals(implName)) {
- return ws;
- }
- }
-
- return null;
- }
-
- private IWebMethod findMethod(IServiceEndpointInterface sei, final String methodName)
- {
- for(IWebMethod method : sei.getWebMethods())
- {
- if(method.getName().equals(methodName)) {
- return method;
- }
- }
-
- return null;
- }
-
-// public void testNotifyChanged()
-// {
-// Object[] children = adapterFactory.getChildren(testPrj1.getProject());
-//
-// try
-// {
-// testPrj1.createType(modelSync1, "Sei3.java", "@javax.jws.WebService(name=\"Sei3Name\") public interface Sei3 {}");
-// testPrj1.createType(modelSync1, "WS3.java", "@javax.jws.WebService(serviceName=\"WS3Name\", endpointInterface=\"org.eclipse.test.modelsync1.Sei3\") public class WS3 {}");
-// }
-// catch(JavaModelException e)
-// {
-// fail(e.toString());
-// }
-//
-// children = adapterFactory.getChildren(children[0]);
-//
-// Object[] sEIs = adapterFactory.getChildren(children[0]);
-//
-// assertEquals(sEIs.length, 3);
-//
-// Object[] wSs = adapterFactory.getChildren(children[1]);
-//
-// assertEquals(wSs.length, 3);
-// }
-
- public void testGetWSProject()
- {
- adapterFactory = new DOMAdapterFactoryContentProvider();
-
- Object[] children = adapterFactory.getChildren(testPrj1.getProject());
- assertNotNull(children);
- }
-
- public void testGetWsProjectDomNotLoaded()
- {
- adapterFactory = new DOMAdapterFactoryContentProvider() {
- @Override
- protected IWebServiceProject getWsProject(final IDOM dom, final IProject project) {
- return null;
- }
- };
- Object[] children = adapterFactory.getChildren(testPrj1.getProject());
- assertEquals(1, children.length);
- assertTrue(children[0] instanceof ILoadingWsProject);
- children = adapterFactory.getChildren(children[0]);
- assertEquals(1, children.length);
- assertTrue(children[0] instanceof ILoadingDummy);
- }
-
- public void testGetWsProjectChildsDomLoadNotCanceled()
- {
- ILoadingWsProject loadingProject = new ILoadingWsProject() {
- public IProject getProject() { return null; }
- public boolean isLoadCanceled() {return false;}
- };
-
- Object[] children = adapterFactory.getChildren(loadingProject);
- assertEquals(1, children.length);
- assertTrue(children[0] instanceof ILoadingDummy);
- }
-
- public void testGetWsProjectChildsDomLoadCanceled()
- {
- ILoadingWsProject loadingProject = new ILoadingWsProject() {
- public IProject getProject() { return null; }
- public boolean isLoadCanceled() {return true;}
- };
-
- Object[] children = adapterFactory.getChildren(loadingProject);
- assertEquals(1, children.length);
- assertTrue(children[0] instanceof ILoadingCanceled);
- }
-
- public void testGetSupportingRuntime()
- {
- DOMAdapterFactoryContentProviderMy provider = new DOMAdapterFactoryContentProviderMy();
- IWsDOMRuntimeExtension runtime = provider.getSupportingRuntime(testPrj1.getProject());
- assertNotNull(runtime);
- }
-
- protected class DOMAdapterFactoryContentProviderMy extends DOMAdapterFactoryContentProvider
- {
- @Override
- public IWsDOMRuntimeExtension getSupportingRuntime(final IProject project) {
- return super.getSupportingRuntime(project);
- }
- };
-}
diff --git a/tests/org.eclipse.jst.ws.jaxws.dom.integration.tests/src/org/eclipse/jst/ws/jaxws/dom/integration/tests/navigator/DOMAdapterFactoryLabelProviderTest.java b/tests/org.eclipse.jst.ws.jaxws.dom.integration.tests/src/org/eclipse/jst/ws/jaxws/dom/integration/tests/navigator/DOMAdapterFactoryLabelProviderTest.java
deleted file mode 100755
index a548760..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.dom.integration.tests/src/org/eclipse/jst/ws/jaxws/dom/integration/tests/navigator/DOMAdapterFactoryLabelProviderTest.java
+++ /dev/null
@@ -1,182 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.dom.integration.tests.navigator;
-
-import java.util.Iterator;
-
-import junit.framework.TestCase;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.jdt.core.IPackageFragment;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jst.ws.jaxws.dom.integration.navigator.DOMAdapterFactoryContentProvider;
-import org.eclipse.jst.ws.jaxws.dom.integration.navigator.DOMAdapterFactoryLabelProvider;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.IDOM;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.IWebServiceProject;
-import org.eclipse.jst.ws.jaxws.dom.runtime.persistence.JaxWsWorkspaceResource;
-import org.eclipse.jst.ws.jaxws.testutils.project.TestProject;
-import org.eclipse.jst.ws.jaxws.testutils.project.TestProjectsUtils;
-
-public class DOMAdapterFactoryLabelProviderTest extends TestCase
-{
- private static TestProject testPrj1;
-
- protected JaxWsWorkspaceResource targetResource;
- protected DOMAdapterFactoryContentProvider adapterFactory;
- protected DOMAdapterFactoryLabelProvider labelProvider;
-
- private IWebServiceProject wsProject;
-
- @Override
- public void setUp() throws Exception
- {
- if(testPrj1==null)
- {
- IProject ejbProject = TestProjectsUtils.createEjb3Project("DOMLblProvTestProject1" + System.currentTimeMillis());
- testPrj1 = new TestProject(ejbProject.getProject());
- testPrj1.createSourceFolder("src");
- final IPackageFragment modelSync1 = testPrj1.createPackage("org.eclipse.test.modelsync1");
- testPrj1.createType(modelSync1, "Sei1.java", "@javax.jws.WebService(name=\"Sei1Name\") public interface Sei1{\n" +
- "@javax.jws.WebMethod(name=\"parentMethod\") public void voidMethodWithNoArgsInParent();\n" +
- "}");
- testPrj1.createType(modelSync1, "Sei2.java", "@javax.jws.WebService(name=\"Sei2Name\") public interface Sei2 extends Sei1 {\n" +
- "@javax.jws.WebMethod(name=\"webMethod\") public void voidMethodWithNoArgsNotInParent();\n" +
- "}");
- testPrj1.createType(modelSync1, "WS1.java", "@javax.jws.WebService(serviceName=\"WS1Name\", endpointInterface=\"org.eclipse.test.modelsync1.Sei2\") public class WS1 {}");
- testPrj1.createType(modelSync1, "WS2.java", "@javax.jws.WebService(serviceName=\"WS2Name\", endpointInterface=\"org.eclipse.test.modelsync1.Sei2\") public class WS2 {}");
- }
-
- targetResource = new JaxWsWorkspaceResource(JavaCore.create(ResourcesPlugin.getWorkspace().getRoot()));
- targetResource.load(null);
- Iterator<IWebServiceProject> wsProjects = targetResource.getDOM().getWebServiceProjects().iterator();
-
- while(wsProjects.hasNext())
- {
- IWebServiceProject wsProj = wsProjects.next();
-
- if(wsProj.getName().equals(testPrj1.getProject().getName()))
- {
- this.wsProject = wsProj;
- }
- }
-
- assertNotNull(this.wsProject);
-
- labelProvider = new DOMAdapterFactoryLabelProvider();
- adapterFactory = new DOMAdapterFactoryContentProvider()
- {
- @Override
- protected IWebServiceProject getWsProject(final IDOM dom, final IProject project) {
- return wsProject;
- }
- };
- }
-
- public void testGetImageObject()
- {
- Object[] children = adapterFactory.getChildren(testPrj1.getProject());
-
- assertNotNull(labelProvider.getImage(children[0]));
-
- children = adapterFactory.getChildren(children[0]);
-
- assertNotNull(labelProvider.getImage(children[0]));
- assertNotNull(labelProvider.getImage(children[1]));
-
- Object[] sEIs = adapterFactory.getChildren(children[0]);
-
- assertNotNull(labelProvider.getImage(sEIs[0]));
-
- assertNotSame(labelProvider.getImage(null), labelProvider.getImage(sEIs[0]));
- assertNotSame(labelProvider.getImage(testPrj1), labelProvider.getImage(sEIs[0]));
-
- Object[] wSs = adapterFactory.getChildren(children[1]);
-
- assertNotNull(labelProvider.getImage(wSs[0]));
-
- assertNotSame(labelProvider.getImage(null), labelProvider.getImage(wSs[0]));
- assertNotSame(labelProvider.getImage(testPrj1), labelProvider.getImage(wSs[0]));
-
- Object[] webMethods = adapterFactory.getChildren(sEIs[0]);
-
- assertNotNull(labelProvider.getImage(webMethods[0]));
-
- assertNotSame(labelProvider.getImage(null), labelProvider.getImage(webMethods[0]));
- assertNotSame(labelProvider.getImage(testPrj1), labelProvider.getImage(webMethods[0]));
- }
-
- public void testGetTextObject()
- {
- Object[] children = adapterFactory.getChildren(testPrj1.getProject());
-
- assertNotNull(labelProvider.getText(children[0]));
-
- children = adapterFactory.getChildren(children[0]);
-
- assertNotNull(labelProvider.getText(children[0]));
- assertNotNull(labelProvider.getText(children[1]));
-
- Object[] sEIs = adapterFactory.getChildren(children[0]);
-
- assertNotNull(labelProvider.getText(sEIs[0]));
-
- assertNotSame(labelProvider.getText(null), labelProvider.getText(sEIs[0]));
- assertNotSame(labelProvider.getText(testPrj1), labelProvider.getText(sEIs[0]));
-
- Object[] wSs = adapterFactory.getChildren(children[1]);
-
- assertNotNull(labelProvider.getText(wSs[0]));
-
- assertNotSame(labelProvider.getText(null), labelProvider.getText(wSs[0]));
- assertNotSame(labelProvider.getText(testPrj1), labelProvider.getText(wSs[0]));
-
- Object[] webMethods = adapterFactory.getChildren(sEIs[0]);
-
- assertNotNull(labelProvider.getText(webMethods[0]));
-
- assertNotSame(labelProvider.getText(null), labelProvider.getText(webMethods[0]));
- assertNotSame(labelProvider.getText(testPrj1), labelProvider.getText(webMethods[0]));
- }
-
- public void testGetDescription()
- {
- Object[] children = adapterFactory.getChildren(testPrj1.getProject());
-
- assertNotNull(labelProvider.getDescription(children[0]));
-
- children = adapterFactory.getChildren(children[0]);
-
- assertNotNull(labelProvider.getDescription(children[0]));
- assertNotNull(labelProvider.getDescription(children[1]));
-
- Object[] sEIs = adapterFactory.getChildren(children[0]);
-
- assertNotNull(labelProvider.getDescription(sEIs[0]));
-
- assertNotSame(labelProvider.getDescription(null), labelProvider.getDescription(sEIs[0]));
- assertNotSame(labelProvider.getDescription(testPrj1), labelProvider.getDescription(sEIs[0]));
-
- Object[] wSs = adapterFactory.getChildren(children[1]);
-
- assertNotNull(labelProvider.getDescription(wSs[0]));
-
- assertNotSame(labelProvider.getDescription(null), labelProvider.getDescription(wSs[0]));
- assertNotSame(labelProvider.getDescription(testPrj1), labelProvider.getDescription(wSs[0]));
-
- Object[] webMethods = adapterFactory.getChildren(sEIs[0]);
-
- assertNotNull(labelProvider.getDescription(webMethods[0]));
-
- assertNotSame(labelProvider.getDescription(null), labelProvider.getDescription(webMethods[0]));
- assertNotSame(labelProvider.getDescription(testPrj1), labelProvider.getDescription(webMethods[0]));
- }
-}
diff --git a/tests/org.eclipse.jst.ws.jaxws.dom.integration.tests/src/org/eclipse/jst/ws/jaxws/dom/integration/tests/navigator/DOMPropertyViewAdapterFactoryTest.java b/tests/org.eclipse.jst.ws.jaxws.dom.integration.tests/src/org/eclipse/jst/ws/jaxws/dom/integration/tests/navigator/DOMPropertyViewAdapterFactoryTest.java
deleted file mode 100755
index a7f9117..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.dom.integration.tests/src/org/eclipse/jst/ws/jaxws/dom/integration/tests/navigator/DOMPropertyViewAdapterFactoryTest.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.dom.integration.tests.navigator;
-
-import junit.framework.TestCase;
-
-import org.eclipse.jst.ws.jaxws.dom.integration.navigator.DOMAdapterFactoryContentProvider;
-import org.eclipse.jst.ws.jaxws.dom.integration.navigator.DOMPropertyViewAdapterFactory;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.IWebService;
-import org.eclipse.ui.views.properties.IPropertySourceProvider;
-
-public class DOMPropertyViewAdapterFactoryTest extends TestCase
-{
- public void testGetAdapter()
- {
- DOMPropertyViewAdapterFactory propertyAdapterFactory = new DOMPropertyViewAdapterFactory();
-
- assertNotNull(propertyAdapterFactory.getAdapter(propertyAdapterFactory, IPropertySourceProvider.class));
- assertNull(propertyAdapterFactory.getAdapter(propertyAdapterFactory, IWebService.class));
- assertTrue(propertyAdapterFactory.getAdapter(propertyAdapterFactory, IPropertySourceProvider.class) instanceof DOMAdapterFactoryContentProvider);
- assertTrue(propertyAdapterFactory.getAdapter(propertyAdapterFactory, DOMPropertyViewAdapterFactory.class) instanceof DOMPropertyViewAdapterFactory);
- }
-
- public void testGetAdapterList()
- {
- DOMPropertyViewAdapterFactory propertyAdapterFactory = new DOMPropertyViewAdapterFactory();
-
- assertNotNull(propertyAdapterFactory.getAdapterList());
- assertEquals(propertyAdapterFactory.getAdapterList().length, 1);
- assertEquals(propertyAdapterFactory.getAdapterList()[0], DOMAdapterFactoryContentProvider.class);
- }
-
- public void testGetAdapterUsesSameFactory()
- {
- DOMPropertyViewAdapterFactory propertyAdapterFactory = new DOMPropertyViewAdapterFactory();
- Object adapter1 = propertyAdapterFactory.getAdapter(propertyAdapterFactory, IPropertySourceProvider.class);
- assertNotNull(adapter1);
- Object adapter2 = propertyAdapterFactory.getAdapter(propertyAdapterFactory, IPropertySourceProvider.class);
- assertTrue(adapter1==adapter2);
- }
-
-}
diff --git a/tests/org.eclipse.jst.ws.jaxws.dom.integration.tests/src/org/eclipse/jst/ws/jaxws/dom/integration/tests/navigator/WebServiceDecoratorTest.java b/tests/org.eclipse.jst.ws.jaxws.dom.integration.tests/src/org/eclipse/jst/ws/jaxws/dom/integration/tests/navigator/WebServiceDecoratorTest.java
deleted file mode 100755
index efc95f4..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.dom.integration.tests/src/org/eclipse/jst/ws/jaxws/dom/integration/tests/navigator/WebServiceDecoratorTest.java
+++ /dev/null
@@ -1,274 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.dom.integration.tests.navigator;
-
-import junit.framework.TestCase;
-
-import org.eclipse.core.resources.IMarker;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.jdt.core.IPackageFragment;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jst.ws.jaxws.dom.integration.navigator.CustomDomItemProviderAdapterFactory;
-import org.eclipse.jst.ws.jaxws.dom.integration.navigator.ISEIChildList;
-import org.eclipse.jst.ws.jaxws.dom.integration.navigator.IWebServiceChildList;
-import org.eclipse.jst.ws.jaxws.dom.integration.navigator.WebServiceProblemsDecorator;
-import org.eclipse.jst.ws.jaxws.dom.integration.navigator.WebServiceProblemsDecorator.Severity;
-import org.eclipse.jst.ws.jaxws.dom.runtime.DomUtil;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.DomFactory;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.DomPackage;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.IServiceEndpointInterface;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.IWebMethod;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.IWebParam;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.IWebService;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.IWebServiceProject;
-import org.eclipse.jst.ws.jaxws.testutils.project.TestProject;
-import org.eclipse.jst.ws.jaxws.utils.dom.validation.DomValidationConstants;
-
-/**
- * Tests for {@link WebServiceDecorator} class
- *
- * @author Georgi Vachkov
- */
-public class WebServiceDecoratorTest extends TestCase
-{
- private TestWebServiceDecorator decorator = new TestWebServiceDecorator();;
- private TestProject testProject;
- private IType seiType;
- private IType wsType;
-
- private DomUtil domUtil = DomUtil.INSTANCE;
- private IWebService ws;
- private IServiceEndpointInterface sei;
- private IWebServiceProject wsProject;
-
- @Override
- public void setUp() throws CoreException
- {
- testProject = new TestProject();
- testProject.createSourceFolder("src");
- IPackageFragment pack = testProject.createPackage("test");
- seiType = testProject.createType(pack, "Sei.java", "public interface Sei {}");
-
- sei = DomFactory.eINSTANCE.createIServiceEndpointInterface();
- sei.eSet(DomPackage.Literals.IJAVA_WEB_SERVICE_ELEMENT__IMPLEMENTATION, seiType.getFullyQualifiedName());
-
- wsType = testProject.createType(pack, "Ws.java", "public class Ws {}");
- ws = DomFactory.eINSTANCE.createIWebService();
- ws.eSet(DomPackage.Literals.IJAVA_WEB_SERVICE_ELEMENT__IMPLEMENTATION, wsType.getFullyQualifiedName());
-
- wsProject = DomFactory.eINSTANCE.createIWebServiceProject();
- wsProject.eSet(DomPackage.Literals.IWEB_SERVICE_PROJECT__NAME, testProject.getProject().getName());
- wsProject.getServiceEndpointInterfaces().add(sei);
- wsProject.getWebServices().add(ws);
- }
-
- public void testDefineSeverityForObject() throws CoreException
- {
- assertEquals(Severity.OK, decorator.defineSeverity(new Integer(1)));
- }
-
- public void testDefineSeverityForProject() throws CoreException
- {
- assertEquals(Severity.OK, decorator.defineSeverity(wsProject));
-
- IMarker marker = seiType.getResource().createMarker(DomValidationConstants.MARKER_ID);
- marker.setAttribute(IMarker.SEVERITY, IMarker.SEVERITY_ERROR);
- assertEquals(Severity.ERROR, decorator.defineSeverity(wsProject));
-
- seiType.getResource().deleteMarkers(DomValidationConstants.MARKER_ID, true, IResource.DEPTH_ZERO);
- assertEquals(Severity.OK, decorator.defineSeverity(wsProject));
-
- marker = seiType.getResource().createMarker(DomValidationConstants.MARKER_ID);
- marker.setAttribute(IMarker.SEVERITY, IMarker.SEVERITY_ERROR);
- assertEquals(Severity.ERROR, decorator.defineSeverity(wsProject));
- }
-
- public void testDefineSeverityForISEIChildList() throws CoreException
- {
- Adapter adapter = CustomDomItemProviderAdapterFactory.INSTANCE.adapt(wsProject, ISEIChildList.class);
- assertEquals(Severity.OK, decorator.defineSeverity(adapter));
-
- IMarker marker = seiType.getResource().createMarker(DomValidationConstants.MARKER_ID);
- marker.setAttribute(IMarker.SEVERITY, IMarker.SEVERITY_ERROR);
-
- assertEquals(Severity.ERROR, decorator.defineSeverity(adapter));
-
- adapter = CustomDomItemProviderAdapterFactory.INSTANCE.adapt(wsProject, IWebServiceChildList.class);
- assertEquals(Severity.OK, decorator.defineSeverity(adapter));
- }
-
- public void testDefineSeverityForIWebServiceChildList() throws CoreException
- {
- Adapter adapter = CustomDomItemProviderAdapterFactory.INSTANCE.adapt(wsProject, IWebServiceChildList.class);
- assertEquals(Severity.OK, decorator.defineSeverity(adapter));
-
- IMarker marker = wsType.getResource().createMarker(DomValidationConstants.MARKER_ID);
- marker.setAttribute(IMarker.SEVERITY, IMarker.SEVERITY_ERROR);
-
- assertEquals(Severity.ERROR, decorator.defineSeverity(adapter));
-
- adapter = CustomDomItemProviderAdapterFactory.INSTANCE.adapt(wsProject, ISEIChildList.class);
- assertEquals(Severity.OK, decorator.defineSeverity(adapter));
- }
-
- public void testDefineSeverityIWebService() throws CoreException
- {
- assertEquals(Severity.OK, decorator.defineSeverity(ws));
-
- IMarker marker = wsType.getResource().createMarker(DomValidationConstants.MARKER_ID);
- marker.setAttribute(IMarker.SEVERITY, IMarker.SEVERITY_ERROR);
-
- assertEquals(Severity.ERROR, decorator.defineSeverity(ws));
- }
-
- public void testDefineSeverityIWebServiceWrongSei() throws CoreException
- {
- IMarker marker = seiType.getResource().createMarker(DomValidationConstants.MARKER_ID);
- marker.setAttribute(IMarker.SEVERITY, IMarker.SEVERITY_ERROR);
-
- assertEquals(Severity.OK, decorator.defineSeverity(ws));
-
- sei.getImplementingWebServices().add(ws);
- assertEquals(Severity.ERROR, decorator.defineSeverity(ws));
- }
-
- public void testDefineSeveritySei() throws CoreException
- {
- assertEquals(Severity.OK, decorator.defineSeverity(sei));
-
- IMarker marker = seiType.getResource().createMarker(DomValidationConstants.MARKER_ID);
- marker.setAttribute(IMarker.SEVERITY, IMarker.SEVERITY_ERROR);
- assertEquals(Severity.ERROR, decorator.defineSeverity(sei));
-
- }
-
- public void testDefineSeveritySeiWrongMethod() throws CoreException
- {
- assertEquals(Severity.OK, decorator.defineSeverity(sei));
-
- IWebMethod webMethod = createMethod(true);
- IMarker marker = seiType.getResource().createMarker(DomValidationConstants.MARKER_ID);
- marker.setAttribute(IMarker.SEVERITY, IMarker.SEVERITY_ERROR);
- marker.setAttribute(DomValidationConstants.IMPLEMENTATION, domUtil.calcUniqueImpl(webMethod));
-
- assertEquals(Severity.ERROR, decorator.defineSeverity(sei));
- }
-
- public void testDefineSeveritySeiWrongParam() throws CoreException
- {
- assertEquals(Severity.OK, decorator.defineSeverity(sei));
-
- IWebMethod webMethod = createMethod(true);
- IMarker marker = seiType.getResource().createMarker(DomValidationConstants.MARKER_ID);
- marker.setAttribute(IMarker.SEVERITY, IMarker.SEVERITY_ERROR);
- marker.setAttribute(DomValidationConstants.IMPLEMENTATION, domUtil.calcUniqueImpl(webMethod.getParameters().get(0)));
-
- assertEquals(Severity.ERROR, decorator.defineSeverity(sei));
- }
-
- public void testDefineSeverityEObjectIResource() throws CoreException
- {
- IMarker marker = seiType.getResource().createMarker(DomValidationConstants.MARKER_ID);
- marker.setAttribute(IMarker.SEVERITY, IMarker.SEVERITY_ERROR);
- assertEquals(Severity.ERROR, decorator.defineSeverity(sei, seiType.getResource()));
-
- assertEquals(Severity.ERROR, decorator.defineSeverity(wsProject, testProject.getProject()));
-
- marker.setAttribute(IMarker.SEVERITY, IMarker.SEVERITY_WARNING);
- assertEquals(Severity.WARNING, decorator.defineSeverity(sei, seiType.getResource()));
-
- marker.setAttribute(IMarker.SEVERITY, IMarker.SEVERITY_INFO);
- assertEquals(Severity.OK, decorator.defineSeverity(sei, seiType.getResource()));
- }
-
- public void testIsRelevantForMethod() throws CoreException
- {
- final IWebMethod webMethod = createMethod(false);
-
- IMarker marker = seiType.getResource().createMarker(DomValidationConstants.MARKER_ID);
- marker.setAttribute(DomValidationConstants.IMPLEMENTATION, domUtil.calcUniqueImpl(webMethod));
- assertTrue(decorator.isRelevantForMethod(webMethod, marker));
- marker.setAttribute(DomValidationConstants.IMPLEMENTATION, "other");
- assertFalse(decorator.isRelevantForMethod(webMethod, marker));
- }
-
- public void testIsRelevant() throws CoreException
- {
- IMarker marker = seiType.getResource().createMarker(DomValidationConstants.MARKER_ID);
- assertFalse(decorator.isRelevant("impl", marker));
- marker.setAttribute(DomValidationConstants.IMPLEMENTATION, "impl");
- assertTrue(decorator.isRelevant("impl", marker));
- marker.setAttribute(DomValidationConstants.IMPLEMENTATION, "impl");
- assertFalse(decorator.isRelevant("newImpl", marker));
- }
-
- public void testIsRelevantFor() throws CoreException
- {
- IMarker marker = seiType.getResource().createMarker(DomValidationConstants.MARKER_ID);
- assertTrue(decorator.isRelevantFor(sei, marker));
- IWebMethod webMethod = createMethod(false);
- marker.setAttribute(DomValidationConstants.IMPLEMENTATION, domUtil.calcUniqueImpl(webMethod));
- assertTrue(decorator.isRelevantFor(webMethod, marker));
- webMethod = createMethod(true);
- marker.setAttribute(DomValidationConstants.IMPLEMENTATION, domUtil.calcUniqueImpl(webMethod.getParameters().get(0)));
- assertTrue(decorator.isRelevantFor(webMethod, marker));
- assertTrue(decorator.isRelevantFor(webMethod.getParameters().get(0), marker));
- marker.setAttribute(DomValidationConstants.IMPLEMENTATION, "impl");
- assertFalse(decorator.isRelevantFor(webMethod, marker));
- assertFalse(decorator.isRelevantFor(webMethod.getParameters().get(0), marker));
- }
-
- private IWebMethod createMethod(boolean withParam)
- {
- final IWebMethod webMethod = DomFactory.eINSTANCE.createIWebMethod();
- webMethod.eSet(DomPackage.Literals.IJAVA_WEB_SERVICE_ELEMENT__IMPLEMENTATION, "method(I)");
-
- if (withParam)
- {
- final IWebParam webParam = DomFactory.eINSTANCE.createIWebParam();
- webParam.eSet(DomPackage.Literals.IJAVA_WEB_SERVICE_ELEMENT__IMPLEMENTATION, "a");
- webMethod.getParameters().add(webParam);
- }
-
- return webMethod;
- }
-
- protected static class TestWebServiceDecorator extends WebServiceProblemsDecorator
- {
- @Override
- protected boolean isRelevant(final String implementation, final IMarker marker) throws CoreException {
- return super.isRelevant(implementation, marker);
- }
-
- @Override
- protected boolean isRelevantFor(final EObject eObject, final IMarker marker) throws CoreException {
- return super.isRelevantFor(eObject, marker);
- }
-
- @Override
- protected boolean isRelevantForMethod(final IWebMethod webMethod, final IMarker marker) throws CoreException {
- return super.isRelevantForMethod(webMethod, marker);
- }
-
- @Override
- protected Severity defineSeverity(final EObject eObject, final IResource resource) throws CoreException {
- return super.defineSeverity(eObject, resource);
- }
-
- @Override
- protected Severity defineSeverity(final Object obj) {
- return super.defineSeverity(obj);
- }
- }
-}
diff --git a/tests/org.eclipse.jst.ws.jaxws.dom.integration.tests/src/org/eclipse/jst/ws/jaxws/dom/integration/tests/navigator/actions/WSActionAbstractTest.java b/tests/org.eclipse.jst.ws.jaxws.dom.integration.tests/src/org/eclipse/jst/ws/jaxws/dom/integration/tests/navigator/actions/WSActionAbstractTest.java
deleted file mode 100755
index 59845c8..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.dom.integration.tests/src/org/eclipse/jst/ws/jaxws/dom/integration/tests/navigator/actions/WSActionAbstractTest.java
+++ /dev/null
@@ -1,831 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.dom.integration.tests.navigator.actions;
-
-import java.util.Iterator;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.jdt.core.IPackageFragment;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jface.action.IContributionItem;
-import org.eclipse.jface.action.MenuManager;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.viewers.StructuredViewer;
-import org.eclipse.jface.viewers.TreePath;
-import org.eclipse.jface.viewers.TreeSelection;
-import org.eclipse.jface.viewers.TreeViewer;
-import org.eclipse.jst.ws.jaxws.dom.integration.navigator.DOMAdapterFactoryContentProvider;
-import org.eclipse.jst.ws.jaxws.dom.integration.navigator.ISEIChildList;
-import org.eclipse.jst.ws.jaxws.dom.integration.navigator.IWebServiceChildList;
-import org.eclipse.jst.ws.jaxws.dom.integration.navigator.actions.WSActionProvider;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.IDOM;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.IServiceEndpointInterface;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.IWebMethod;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.IWebService;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.IWebServiceProject;
-import org.eclipse.jst.ws.jaxws.dom.runtime.persistence.JaxWsWorkspaceResource;
-import org.eclipse.jst.ws.jaxws.testutils.jmock.Mock;
-import org.eclipse.jst.ws.jaxws.testutils.jmock.MockObjectTestCase;
-import org.eclipse.jst.ws.jaxws.testutils.project.TestProject;
-import org.eclipse.jst.ws.jaxws.testutils.project.TestProjectsUtils;
-import org.eclipse.ui.actions.ActionContext;
-import org.eclipse.ui.internal.navigator.NavigatorContentService;
-import org.eclipse.ui.internal.navigator.extensions.CommonActionExtensionSite;
-import org.eclipse.ui.navigator.ICommonViewerSite;
-import org.eclipse.ui.navigator.NavigatorContentServiceFactory;
-
-@SuppressWarnings("restriction")
-public class WSActionAbstractTest extends MockObjectTestCase
-{
- protected static TestProject testPrj1;
- protected static TestProject testPrj2;
- protected static TestProject testPrj3;
- protected static TestProject testPrj4;
-
- private IWebServiceProject wsProject1;
- private IWebServiceProject wsProject2;
- private IWebServiceProject wsProject3;
- private IWebServiceProject wsProject4;
-
- protected IPackageFragment modelSync1;
- protected IPackageFragment modelSync2;
- protected IPackageFragment modelSync3;
- protected IPackageFragment modelSync4;
-
- protected JaxWsWorkspaceResource targetResource;
- protected DOMAdapterFactoryContentProvider adapterFactory;
-
- protected WSActionProvider wsActionProv = null;
-
- @Override
- public void setUp() throws Exception
- {
- if(testPrj1==null)
- {
- IProject ejbProject = TestProjectsUtils.createEjb3Project("DOMWSActionTestProject1" + System.currentTimeMillis());
- testPrj1 = new TestProject(ejbProject.getProject());
- testPrj1.createSourceFolder("src");
- modelSync1 = testPrj1.createPackage("org.eclipse.test.modelsync1");
- testPrj1.createType(modelSync1, "Sei1.java", "@javax.jws.WebService(name=\"Sei1Name\") public interface Sei1{\n" +
- "@javax.jws.WebMethod(operationName=\"parentMethod\") public void voidMethodWithNoArgsInParent();\n" +
- "}");
- testPrj1.createType(modelSync1, "Sei2.java", "@javax.jws.WebService(name=\"Sei2Name\") public interface Sei2 extends Sei1 {\n" +
- "@javax.jws.WebMethod(operationName=\"webMethod\") public void voidMethodWithNoArgsNotInParent();\n" +
- "}");
- testPrj1.createType(modelSync1, "WS1.java", "@javax.ejb.Stateless\n" + "@javax.jws.WebService(serviceName=\"WS1Name\", endpointInterface=\"org.eclipse.test.modelsync1.Sei2\") public class WS1 {}");
-
- }
-
- if(testPrj2==null)
- {
- IProject webProject = TestProjectsUtils.createWeb25Project("DOMWSActionTestProject2" + System.currentTimeMillis());
- testPrj2 = new TestProject(webProject.getProject());
- testPrj2.createSourceFolder("src");
- modelSync2 = testPrj2.createPackage("org.eclipse.test.modelsync2");
- testPrj2.createType(modelSync2, "Sei1.java", "@javax.jws.WebService(name=\"Sei1Name\") public interface Sei1{\n" +
- "@javax.jws.WebMethod(operationName=\"parentMethod\") public void voidMethodWithNoArgsInParent();\n" +
- "}");
- testPrj2.createType(modelSync2, "Sei2.java", "@javax.jws.WebService(name=\"Sei2Name\") public interface Sei2 extends Sei1 {\n" +
- "@javax.jws.WebMethod(operationName=\"webMethod\") public void voidMethodWithNoArgsNotInParent();\n" +
- "}");
- testPrj2.createType(modelSync2, "WS1.java", "@javax.jws.WebService(serviceName=\"WS1Name\", endpointInterface=\"org.eclipse.test.modelsync1.Sei2\") public class WS1 {}");
- }
-
- if(testPrj3==null)
- {
- IProject ejbProject = TestProjectsUtils.createEjb3Project("DOMWSActionTestProject3" + System.currentTimeMillis());
- testPrj3 = new TestProject(ejbProject.getProject());
- testPrj3.createSourceFolder("src");
- modelSync3 = testPrj3.createPackage("org.eclipse.test.modelsync3");
- testPrj3.createType(modelSync3,
- "WS1.java",
- "@javax.jws.WebService(name=\"ImplicitSei1Name\") public class WS1 {\n"
- + "@javax.jws.WebMethod(operationName=\"superParentMethod\") public void superParentMethod() {}\n"
- + "}");
-
- testPrj3.createType(modelSync3,
- "WS2.java",
- "@javax.jws.WebService(name=\"ImplicitSei2Name\") public class WS2 extends WS1 {\n"
- + "@javax.jws.WebMethod(operationName=\"parentMethod\") public void parentMethod() {}\n"
- + "}");
-
- testPrj3.createType(modelSync3,
- "WS3.java",
- "@javax.jws.WebService(name=\"ImplicitSei3Name\") public class WS3 extends WS2 {\n"
- + "@javax.jws.WebMethod(operationName=\"webMethod\") public void webMethod(int param) {}\n"
- + "}");
- }
-
- if(testPrj4==null)
- {
- IProject webProject = TestProjectsUtils.createWeb25Project("DOMWSActionTestProject4" + System.currentTimeMillis());
- testPrj4 = new TestProject(webProject.getProject());
- testPrj4.createSourceFolder("src");
- modelSync4 = testPrj4.createPackage("org.eclipse.test.modelsync4");
- testPrj4.createType(modelSync4,
- "WS1.java",
- "@javax.jws.WebService(name=\"ImplicitSei1Name\") public class WS1 {\n"
- + "@javax.jws.WebMethod(operationName=\"superParentMethod\") public void superParentMethod() {}\n"
- + "}");
-
- testPrj4.createType(modelSync4,
- "WS2.java",
- "@javax.jws.WebService(name=\"ImplicitSei2Name\") public class WS2 extends WS1 {\n"
- + "@javax.jws.WebMethod(operationName=\"parentMethod\") public void parentMethod() {}\n"
- + "}");
-
- testPrj4.createType(modelSync4,
- "WS3.java",
- "@javax.jws.WebService(name=\"ImplicitSei3Name\") public class WS3 extends WS2 {\n"
- + "@javax.jws.WebMethod(operationName=\"webMethod\") public void webMethod() {}\n"
- + "}");
- }
-
- targetResource = new JaxWsWorkspaceResource(JavaCore.create(ResourcesPlugin.getWorkspace().getRoot()));
- targetResource.load(null);
-
- Iterator<IWebServiceProject> wsProjects = targetResource.getDOM().getWebServiceProjects().iterator();
-
- while(wsProjects.hasNext())
- {
- IWebServiceProject wsProject = wsProjects.next();
-
- if(wsProject.getName().equals(testPrj1.getProject().getName()))
- {
- this.wsProject1 = wsProject;
- }
- else if(wsProject.getName().equals(testPrj2.getProject().getName()))
- {
- this.wsProject2 = wsProject;
- }
- else if(wsProject.getName().equals(testPrj3.getProject().getName()))
- {
- this.wsProject3 = wsProject;
- }
- else if(wsProject.getName().equals(testPrj4.getProject().getName()))
- {
- this.wsProject4 = wsProject;
- }
- }
-
- assertNotNull(this.wsProject1);
- assertNotNull(this.wsProject2);
- assertNotNull(this.wsProject3);
- assertNotNull(this.wsProject4);
-
- adapterFactory = new DOMAdapterFactoryContentProvider()
- {
- @Override
- protected IWebServiceProject getWsProject(final IDOM dom, final IProject project) {
- if(project.getName().equals(wsProject1.getName()))
- {
- return wsProject1;
- }
- else if(project.getName().equals(wsProject2.getName()))
- {
- return wsProject2;
- }
- else if(project.getName().equals(wsProject3.getName()))
- {
- return wsProject3;
- }
- else if(project.getName().equals(wsProject4.getName()))
- {
- return wsProject4;
- }
- throw new junit.framework.AssertionFailedError("project " + project + "not found in DOM");
- }
- };
-
- }
-
- protected IWebService getWSFromEjbProject()
- {
- Object[] children = adapterFactory.getChildren(testPrj1.getProject());
- children = adapterFactory.getChildren(children[0]);
-
- for(int ii=0; ii<children.length; ii++)
- {
- if(children[ii] instanceof IWebServiceChildList)
- {
- Object[] wSs = adapterFactory.getChildren(children[ii]);
-
- return (IWebService)wSs[0];
- }
- }
-
- return null;
- }
-
- protected IWebService getWSFromWebProject()
- {
- Object[] children = adapterFactory.getChildren(testPrj2.getProject());
- children = adapterFactory.getChildren(children[0]);
-
- for(int ii=0; ii<children.length; ii++)
- {
- if(children[ii] instanceof IWebServiceChildList)
- {
- Object[] wSs = adapterFactory.getChildren(children[ii]);
-
- return (IWebService)wSs[0];
- }
- }
-
- return null;
- }
-
- protected IServiceEndpointInterface getSEIExpFromEjbProject()
- {
- Object[] children = adapterFactory.getChildren(testPrj1.getProject());
- children = adapterFactory.getChildren(children[0]);
-
- for(int ii=0; ii<children.length; ii++)
- {
- if(children[ii] instanceof ISEIChildList)
- {
- Object[] sEIs = adapterFactory.getChildren(children[ii]);
-
- return (IServiceEndpointInterface)sEIs[0];
- }
- }
-
- return null;
- }
-
- protected IServiceEndpointInterface getSEIFromTestPrj1(String seiName)
- {
- Object[] children = adapterFactory.getChildren(testPrj1.getProject());
- children = adapterFactory.getChildren(children[0]);
-
- for(int ii=0; ii<children.length; ii++)
- {
- if(children[ii] instanceof ISEIChildList)
- {
- Object[] sEIs = adapterFactory.getChildren(children[ii]);
-
- for(int jj=0; jj<sEIs.length; jj++)
- {
- if(((IServiceEndpointInterface)sEIs[jj]).getName().equals(seiName))
- {
- return (IServiceEndpointInterface)sEIs[jj];
- }
- }
- }
- }
-
- return null;
- }
-
- protected IWebService getWSFromTestPrj(TestProject testPrj, String wsName)
- {
- Object[] children = adapterFactory.getChildren(testPrj.getProject());
- children = adapterFactory.getChildren(children[0]);
-
- for(int ii=0; ii<children.length; ii++)
- {
- if(children[ii] instanceof IWebServiceChildList)
- {
- Object[] wSs = adapterFactory.getChildren(children[ii]);
-
- for(int jj=0; jj<wSs.length; jj++)
- {
- if(((IWebService)wSs[jj]).getImplementation().equals(wsName))
- {
- return (IWebService)wSs[jj];
- }
- }
- }
- }
-
- return null;
- }
-
-// protected IWebService getWSFromTestPrj1(String wsName)
-// {
-// Object[] children = adapterFactory.getChildren(testPrj1.getProject());
-// children = adapterFactory.getChildren(children[0]);
-//
-// for(int ii=0; ii<children.length; ii++)
-// {
-// if(children[ii] instanceof IWebServiceChildList)
-// {
-// Object[] wSs = adapterFactory.getChildren(children[ii]);
-//
-// for(int jj=0; jj<wSs.length; jj++)
-// {
-// if(((IWebService)wSs[jj]).getName().equals(wsName))
-// {
-// return (IWebService)wSs[jj];
-// }
-// }
-// }
-// }
-//
-// return null;
-// }
-
- protected IServiceEndpointInterface getSEIFromTestPrj3(String seiName)
- {
- Object[] children = adapterFactory.getChildren(testPrj3.getProject());
- children = adapterFactory.getChildren(children[0]);
-
- for(int ii=0; ii<children.length; ii++)
- {
- if(children[ii] instanceof IWebServiceChildList)
- {
- Object[] wSs = adapterFactory.getChildren(children[ii]);
-
- for(int jj=0; jj<wSs.length; jj++)
- {
- if(((IWebService)wSs[jj]).getServiceEndpoint().getName().equals(seiName))
- {
- return ((IWebService)wSs[jj]).getServiceEndpoint();
- }
- }
- }
- }
-
- return null;
- }
-
- protected IServiceEndpointInterface getSEIExpFromWebProject()
- {
- Object[] children = adapterFactory.getChildren(testPrj2.getProject());
- children = adapterFactory.getChildren(children[0]);
-
- for(int ii=0; ii<children.length; ii++)
- {
- if(children[ii] instanceof ISEIChildList)
- {
- Object[] sEIs = adapterFactory.getChildren(children[ii]);
-
- return (IServiceEndpointInterface)sEIs[0];
- }
- }
-
- return null;
- }
-
- protected IServiceEndpointInterface getSEIImpFromEjbProject()
- {
- Object[] children = adapterFactory.getChildren(testPrj3.getProject());
- children = adapterFactory.getChildren(children[0]);
-
- for(int ii=0; ii<children.length; ii++)
- {
- if(children[ii] instanceof IWebServiceChildList)
- {
- Object[] wSs = adapterFactory.getChildren(children[ii]);
-
- return ((IWebService)wSs[0]).getServiceEndpoint();
- }
- }
-
- return null;
- }
-
- protected IServiceEndpointInterface getSEIImpFromWebProject()
- {
-
- Object[] children = adapterFactory.getChildren(testPrj4.getProject());
- children = adapterFactory.getChildren(children[0]);
-
- for(int ii=0; ii<children.length; ii++)
- {
- if(children[ii] instanceof IWebServiceChildList)
- {
- Object[] wSs = adapterFactory.getChildren(children[ii]);
-
- return ((IWebService)wSs[0]).getServiceEndpoint();
- }
- }
-
- return null;
- }
-
- protected IWebMethod getWSMethodInheritedFromEjbProject()
- {
- Object[] children = adapterFactory.getChildren(testPrj3.getProject());
- children = adapterFactory.getChildren(children[0]);
- Object[] wSs = null;
- Object[] webMethods = null;
-
- for(int ii=0; ii<children.length; ii++)
- {
- if(children[ii] instanceof IWebServiceChildList)
- {
- wSs = adapterFactory.getChildren(children[ii]);
-
- break;
- }
- }
-
- assertNotNull(wSs);
-
- for(int ii=0; ii<wSs.length; ii++)
- {
- if(((IWebService)wSs[ii]).getImplementation().equals("org.eclipse.test.modelsync3.WS3"))
- {
- webMethods = adapterFactory.getChildren(((IWebService)wSs[ii]).getServiceEndpoint());
-
- break;
- }
- }
-
- assertNotNull(webMethods);
-
- for(int ii=0; ii<webMethods.length; ii++)
- {
- if(((IWebMethod)webMethods[ii]).getName().equals("superParentMethod"))
- {
- return (IWebMethod)webMethods[ii];
- }
- }
-
- return null;
- }
-
- protected IWebMethod getWSMethodInheritedFromWebProject()
- {
- Object[] children = adapterFactory.getChildren(testPrj4.getProject());
- children = adapterFactory.getChildren(children[0]);
-
- Object[] wSs = null;
- Object[] webMethods = null;
-
- for(int ii=0; ii<children.length; ii++)
- {
- if(children[ii] instanceof IWebServiceChildList)
- {
- wSs = adapterFactory.getChildren(children[ii]);
-
- break;
- }
- }
-
- assertNotNull(wSs);
-
- for(int ii=0; ii<wSs.length; ii++)
- {
- if(((IWebService)wSs[ii]).getImplementation().equals("org.eclipse.test.modelsync4.WS3"))
- {
- webMethods = adapterFactory.getChildren(((IWebService)wSs[ii]).getServiceEndpoint());
-
- break;
- }
- }
-
- assertNotNull(webMethods);
-
- for(int ii=0; ii<webMethods.length; ii++)
- {
- if(((IWebMethod)webMethods[ii]).getName().equals("superParentMethod"))
- {
- return (IWebMethod)webMethods[ii];
- }
- }
-
- return null;
- }
-
- protected IWebMethod getWSMethodNotInheritedFromEjbProject()
- {
- Object[] children = adapterFactory.getChildren(testPrj3.getProject());
- children = adapterFactory.getChildren(children[0]);
-
- Object[] wSs = null;
- Object[] webMethods = null;
-
- for(int ii=0; ii<children.length; ii++)
- {
- if(children[ii] instanceof IWebServiceChildList)
- {
- wSs = adapterFactory.getChildren(children[ii]);
-
- break;
- }
- }
-
- assertNotNull(wSs);
-
- for(int ii=0; ii<wSs.length; ii++)
- {
- if(((IWebService)wSs[ii]).getImplementation().equals("org.eclipse.test.modelsync3.WS3"))
- {
- webMethods = adapterFactory.getChildren(((IWebService)wSs[ii]).getServiceEndpoint());
-
- break;
- }
- }
-
- assertNotNull(webMethods);
-
- for(int ii=0; ii<webMethods.length; ii++)
- {
- if(((IWebMethod)webMethods[ii]).getName().equals("webMethod"))
- {
- return (IWebMethod)webMethods[ii];
- }
- }
-
- return null;
- }
-
- protected IWebMethod getWSMethodNotInheritedFromWebProject()
- {
- Object[] children = adapterFactory.getChildren(testPrj4.getProject());
- children = adapterFactory.getChildren(children[0]);
-
- Object[] wSs = null;
- Object[] webMethods = null;
-
- for(int ii=0; ii<children.length; ii++)
- {
- if(children[ii] instanceof IWebServiceChildList)
- {
- wSs = adapterFactory.getChildren(children[ii]);
-
- break;
- }
- }
-
- assertNotNull(wSs);
-
- for(int ii=0; ii<wSs.length; ii++)
- {
- if(((IWebService)wSs[ii]).getImplementation().equals("org.eclipse.test.modelsync4.WS3"))
- {
- webMethods = adapterFactory.getChildren(((IWebService)wSs[ii]).getServiceEndpoint());
-
- break;
- }
- }
-
- assertNotNull(webMethods);
-
- for(int ii=0; ii<webMethods.length; ii++)
- {
- if(((IWebMethod)webMethods[ii]).getName().equals("webMethod"))
- {
- return (IWebMethod)webMethods[ii];
- }
- }
-
- return null;
- }
-
- protected IWebMethod getSEIMethodInheritedFromEjbProject()
- {
- Object[] children = adapterFactory.getChildren(testPrj1.getProject());
- children = adapterFactory.getChildren(children[0]);
-
- Object[] sEIs = null;
- Object[] webMethods = null;
-
- for(int ii=0; ii<children.length; ii++)
- {
- if(children[ii] instanceof ISEIChildList)
- {
- sEIs = adapterFactory.getChildren(children[ii]);
-
- break;
- }
- }
-
- assertNotNull(sEIs);
-
- for(int ii=0; ii<sEIs.length; ii++)
- {
- if(((IServiceEndpointInterface)sEIs[ii]).getName().equals("Sei2Name"))
- {
- webMethods = adapterFactory.getChildren(((IServiceEndpointInterface)sEIs[ii]));
-
- break;
- }
- }
-
- assertNotNull(webMethods);
-
- for(int ii=0; ii<webMethods.length; ii++)
- {
- if(((IWebMethod)webMethods[ii]).getName().equals("parentMethod"))
- {
- return (IWebMethod)webMethods[ii];
- }
- }
-
- return null;
- }
-
- protected IWebMethod getSEIMethodInheritedFromWebProject()
- {
- Object[] children = adapterFactory.getChildren(testPrj2.getProject());
- children = adapterFactory.getChildren(children[0]);
-
- Object[] sEIs = null;
- Object[] webMethods = null;
-
- for(int ii=0; ii<children.length; ii++)
- {
- if(children[ii] instanceof ISEIChildList)
- {
- sEIs = adapterFactory.getChildren(children[ii]);
-
- break;
- }
- }
-
- assertNotNull(sEIs);
-
- for(int ii=0; ii<sEIs.length; ii++)
- {
- if(((IServiceEndpointInterface)sEIs[ii]).getName().equals("Sei2Name"))
- {
- webMethods = adapterFactory.getChildren(((IServiceEndpointInterface)sEIs[ii]));
-
- break;
- }
- }
-
- assertNotNull(webMethods);
-
- for(int ii=0; ii<webMethods.length; ii++)
- {
- if(((IWebMethod)webMethods[ii]).getName().equals("parentMethod"))
- {
- return (IWebMethod)webMethods[ii];
- }
- }
-
- return null;
- }
-
- protected IWebMethod getSEIMethodNotInheritedFromEjbProject()
- {
- Object[] children = adapterFactory.getChildren(testPrj1.getProject());
- children = adapterFactory.getChildren(children[0]);
-
- Object[] sEIs = null;
- Object[] webMethods = null;
-
- for(int ii=0; ii<children.length; ii++)
- {
- if(children[ii] instanceof ISEIChildList)
- {
- sEIs = adapterFactory.getChildren(children[ii]);
-
- break;
- }
- }
-
- assertNotNull(sEIs);
-
- for(int ii=0; ii<sEIs.length; ii++)
- {
- if(((IServiceEndpointInterface)sEIs[ii]).getName().equals("Sei2Name"))
- {
- webMethods = adapterFactory.getChildren(((IServiceEndpointInterface)sEIs[ii]));
-
- break;
- }
- }
-
- assertNotNull(webMethods);
-
- for(int ii=0; ii<webMethods.length; ii++)
- {
- if(((IWebMethod)webMethods[ii]).getName().equals("webMethod"))
- {
- return (IWebMethod)webMethods[ii];
- }
- }
-
- return null;
- }
-
- protected IWebMethod getSEIMethodNotInheritedFromWebProject()
- {
- Object[] children = adapterFactory.getChildren(testPrj2.getProject());
- children = adapterFactory.getChildren(children[0]);
-
- Object[] sEIs = null;
- Object[] webMethods = null;
-
- for(int ii=0; ii<children.length; ii++)
- {
- if(children[ii] instanceof ISEIChildList)
- {
- sEIs = adapterFactory.getChildren(children[ii]);
-
- break;
- }
- }
-
- assertNotNull(sEIs);
-
- for(int ii=0; ii<sEIs.length; ii++)
- {
- if(((IServiceEndpointInterface)sEIs[ii]).getName().equals("Sei2Name"))
- {
- webMethods = adapterFactory.getChildren(((IServiceEndpointInterface)sEIs[ii]));
-
- break;
- }
- }
-
- assertNotNull(webMethods);
-
- for(int ii=0; ii<webMethods.length; ii++)
- {
- if(((IWebMethod)webMethods[ii]).getName().equals("webMethod"))
- {
- return (IWebMethod)webMethods[ii];
- }
- }
-
- return null;
- }
-
- protected void initWsActionProviderWithTreeSelection(Object[] selection)
- {
- wsActionProv = new WSActionProvider();
-
- Mock<TreeViewer> treeViewer = mock(TreeViewer.class);
- CommonActionExtensionSite cAExtSite = createCommonActionExtensionSiteMock(treeViewer.proxy());
-
- wsActionProv.init(cAExtSite);
-
- TreePath path = new TreePath(selection);
- StructuredSelection sel = new TreeSelection(path);
- ActionContext actCnt = new ActionContext(sel);
-
- wsActionProv.setContext(actCnt);
- }
-
- protected void initWsActionProviderWithStructuredSelection(Object[] selection)
- {
- wsActionProv = new WSActionProvider();
-
- Mock<TreeViewer> treeViewer = mock(TreeViewer.class);
- CommonActionExtensionSite cAExtSite = createCommonActionExtensionSiteMock(treeViewer.proxy());
-
- wsActionProv.init(cAExtSite);
-
- StructuredSelection sel = new StructuredSelection(selection);
- ActionContext actCnt = new ActionContext(sel);
-
- wsActionProv.setContext(actCnt);
- }
-
- protected IWebServiceProject getWsProject(IProject project)
- {
- Iterator<IWebServiceProject> wsProjects = targetResource.getDOM().getWebServiceProjects().iterator();
-
- while(wsProjects.hasNext())
- {
- IWebServiceProject wsProject = wsProjects.next();
-
- if(wsProject.getName().equals(project.getName()))
- {
- return wsProject;
- }
- }
- throw new junit.framework.AssertionFailedError("project " + project + "not found in DOM");
- }
-
- protected CommonActionExtensionSite createCommonActionExtensionSiteMock(final StructuredViewer viewer)
- {
- final NavigatorContentService contentService = (NavigatorContentService)NavigatorContentServiceFactory.INSTANCE.createContentService("myviewer");
-
- //Eclipse 3.5 constructor required for WTP build
- return new CommonActionExtensionSite("myextensionid", "mypluginid", (ICommonViewerSite)mock(ICommonViewerSite.class).proxy(), contentService, viewer);
- }
-
- protected IContributionItem createContributionItemMock(final String itemId)
- {
- Mock<IContributionItem> cntrbItem = mock(IContributionItem.class);
- cntrbItem.stubs().method("getId").will(returnValue(itemId));
- cntrbItem.stubs().method("setParent").will(returnValue(null));
- cntrbItem.stubs().method("isDynamic").will(returnValue(false));
- return cntrbItem.proxy();
- }
-
- protected void fillMenuWithContributionItems(final MenuManager menu, final String... itemIds)
- {
- for(String id : itemIds)
- {
- IContributionItem cntrbItem = createContributionItemMock(id);
- menu.add(cntrbItem);
- }
- }
-}
diff --git a/tests/org.eclipse.jst.ws.jaxws.dom.ui.tests/.classpath b/tests/org.eclipse.jst.ws.jaxws.dom.ui.tests/.classpath
deleted file mode 100755
index 2d1a430..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.dom.ui.tests/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/tests/org.eclipse.jst.ws.jaxws.dom.ui.tests/.project b/tests/org.eclipse.jst.ws.jaxws.dom.ui.tests/.project
deleted file mode 100755
index e347d1e..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.dom.ui.tests/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.jst.ws.jaxws.dom.ui.tests</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
diff --git a/tests/org.eclipse.jst.ws.jaxws.dom.ui.tests/.settings/org.eclipse.jdt.core.prefs b/tests/org.eclipse.jst.ws.jaxws.dom.ui.tests/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100755
index ae0484e..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.dom.ui.tests/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,8 +0,0 @@
-#Mon Jul 20 15:25:31 EEST 2009
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.5
diff --git a/tests/org.eclipse.jst.ws.jaxws.dom.ui.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.jst.ws.jaxws.dom.ui.tests/META-INF/MANIFEST.MF
deleted file mode 100755
index 43cbc5f..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.dom.ui.tests/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,15 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %Bundle-Name.0
-Bundle-Vendor: %Bundle-Vendor.0
-Bundle-SymbolicName: org.eclipse.jst.ws.jaxws.dom.ui.tests
-Bundle-Localization: plugin
-Bundle-Version: 1.0.0.qualifier
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Require-Bundle: org.eclipse.jst.ws.jaxws.dom.runtime,
- org.eclipse.jst.ws.jaxws.dom.ui,
- org.eclipse.jst.ws.jaxws.testutils,
- org.jmock,
- org.junit
-Export-Package: org.eclipse.jst.ws.jaxws.dom.ui.tests,
- org.eclipse.jst.ws.jaxws.dom.ui.tests.internal
diff --git a/tests/org.eclipse.jst.ws.jaxws.dom.ui.tests/about.html b/tests/org.eclipse.jst.ws.jaxws.dom.ui.tests/about.html
deleted file mode 100644
index d2b7ace..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.dom.ui.tests/about.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
-<title>About</title>
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
-
-<p>August 20, 2009</p>
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, "Program" will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is
-being redistributed by another party ("Redistributor") and different terms and conditions may
-apply to your use of any object code in the Content. Check the Redistributor's license that was
-provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
-
-</body>
-</html>
diff --git a/tests/org.eclipse.jst.ws.jaxws.dom.ui.tests/build.properties b/tests/org.eclipse.jst.ws.jaxws.dom.ui.tests/build.properties
deleted file mode 100755
index cc88efd..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.dom.ui.tests/build.properties
+++ /dev/null
@@ -1,16 +0,0 @@
-###############################################################################
-# Copyright (c) 2009 by SAP AG, Walldorf.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# SAP AG - initial API and implementation
-###############################################################################
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
- .,\
- about.html,\
- plugin.properties
diff --git a/tests/org.eclipse.jst.ws.jaxws.dom.ui.tests/plugin.properties b/tests/org.eclipse.jst.ws.jaxws.dom.ui.tests/plugin.properties
deleted file mode 100755
index a168b6f..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.dom.ui.tests/plugin.properties
+++ /dev/null
@@ -1,13 +0,0 @@
-###############################################################################
-# Copyright (c) 2009 by SAP AG, Walldorf.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# SAP AG - initial API and implementation
-###############################################################################
-
-Bundle-Name.0=DOM UI Tests (Incubation)
-Bundle-Vendor.0=Eclipse Web Tools Platform
diff --git a/tests/org.eclipse.jst.ws.jaxws.dom.ui.tests/src/org/eclipse/jst/ws/jaxws/dom/ui/tests/AllTestsSuite.java b/tests/org.eclipse.jst.ws.jaxws.dom.ui.tests/src/org/eclipse/jst/ws/jaxws/dom/ui/tests/AllTestsSuite.java
deleted file mode 100755
index 92b4d86..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.dom.ui.tests/src/org/eclipse/jst/ws/jaxws/dom/ui/tests/AllTestsSuite.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.dom.ui.tests;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.jst.ws.jaxws.dom.ui.tests.internal.AllDomItemProviderTest;
-import org.eclipse.jst.ws.jaxws.dom.ui.tests.internal.DOMItemPropertyProviderTest;
-
-public class AllTestsSuite
-{
- public static Test suite()
- {
- final TestSuite suite = new TestSuite();
-
- suite.addTestSuite(AllDomItemProviderTest.class);
- suite.addTestSuite(DOMItemPropertyProviderTest.class);
-
- return suite;
- }
-}
diff --git a/tests/org.eclipse.jst.ws.jaxws.dom.ui.tests/src/org/eclipse/jst/ws/jaxws/dom/ui/tests/internal/AllDomItemProviderTest.java b/tests/org.eclipse.jst.ws.jaxws.dom.ui.tests/src/org/eclipse/jst/ws/jaxws/dom/ui/tests/internal/AllDomItemProviderTest.java
deleted file mode 100755
index e638ceb..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.dom.ui.tests/src/org/eclipse/jst/ws/jaxws/dom/ui/tests/internal/AllDomItemProviderTest.java
+++ /dev/null
@@ -1,265 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.dom.ui.tests.internal;
-
-import java.util.List;
-
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.common.notify.Notifier;
-import org.eclipse.emf.common.util.BasicEList;
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor.PropertyValueWrapper;
-import org.eclipse.jst.ws.jaxws.dom.runtime.IPropertyState;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.DomFactory;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.DomPackage;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.IJavaWebServiceElement;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.IServiceEndpointInterface;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.IWebMethod;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.IWebParam;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.IWebService;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.IWebServiceProject;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.WebParamKind;
-import org.eclipse.jst.ws.jaxws.dom.ui.DomItemProviderAdapterFactory;
-import org.eclipse.jst.ws.jaxws.dom.ui.IJavaWebServiceElementItemProvider;
-import org.eclipse.jst.ws.jaxws.dom.ui.IServiceEndpointInterfaceItemProvider;
-import org.eclipse.jst.ws.jaxws.dom.ui.IWebMethodItemProvider;
-import org.eclipse.jst.ws.jaxws.dom.ui.IWebParamItemProvider;
-import org.eclipse.jst.ws.jaxws.dom.ui.IWebServiceItemProvider;
-import org.eclipse.jst.ws.jaxws.dom.ui.IWebServiceProjectItemProvider;
-import org.eclipse.jst.ws.jaxws.testutils.jmock.MockObjectTestCase;
-import org.jmock.Mock;
-
-public class AllDomItemProviderTest extends MockObjectTestCase
-{
- private DomItemProviderAdapterFactory itemProvider;
-
- @Override
- public void setUp()
- {
- itemProvider = new DomItemProviderAdapterFactory();
- }
-
- @Override
- public void tearDown()
- {
- itemProvider.dispose();
- }
-
- public void testDOMItemProvider()
- {
- assertNotNull(itemProvider.getRootAdapterFactory());
- itemProvider.setParentAdapterFactory(null);
- assertNotNull(itemProvider.getRootAdapterFactory());
- itemProvider.removeListener(null);
- assertNotNull(itemProvider.getRootAdapterFactory());
- }
-
- public void testIJavaWebServiceElementItemProvider()
- {
- IJavaWebServiceElementItemProvider javaItemProvider = (IJavaWebServiceElementItemProvider) itemProvider.createIJavaWebServiceElementAdapter();
-
- assertNotNull(javaItemProvider);
-
- List<IItemPropertyDescriptor> propDescs = javaItemProvider.getPropertyDescriptors(null);
-
- assertNotNull(propDescs);
- assertTrue(propDescs.size() > 0);
-
- Mock javaWSElem = mock(IJavaWebServiceElement.class);
- javaWSElem.expects(once()).method("getName").will(returnValue("TestName"));
- assertNotNull(javaItemProvider.getImage(new Object()));
- assertNotNull(javaItemProvider.getText(javaWSElem.proxy()));
- assertNull(javaItemProvider.getNameCategory());
- }
-
- public void testIServiceEndpointItemProvider()
- {
- IServiceEndpointInterfaceItemProvider seiItemProvider = (IServiceEndpointInterfaceItemProvider) itemProvider.createIServiceEndpointInterfaceAdapter();
-
- assertNotNull(seiItemProvider);
-
- List<IItemPropertyDescriptor> propDescs = seiItemProvider.getPropertyDescriptors(null);
-
- assertNotNull(propDescs);
- assertTrue(propDescs.size() > 0);
-
- Mock sEIElem = mock(IServiceEndpointInterface.class);
- sEIElem.expects(once()).method("getName").will(returnValue("TestName"));
- assertNotNull(seiItemProvider.getImage(new Object()));
- assertNotNull(seiItemProvider.getText(sEIElem.proxy()));
- assertNotNull(seiItemProvider.getChildrenFeatures(null));
- assertNotNull(seiItemProvider.getNameCategory());
- }
-
- public void testIWebMethodItemProvider()
- {
- IWebMethodItemProvider methodItemProvider = (IWebMethodItemProvider) itemProvider.createIWebMethodAdapter();
-
- assertNotNull(methodItemProvider);
-
- List<IItemPropertyDescriptor> propDescs = methodItemProvider.getPropertyDescriptors(null);
-
- assertNotNull(propDescs);
- assertTrue(propDescs.size() > 0);
-
- Mock wMElem = mock(IWebMethod.class);
- wMElem.expects(once()).method("getName").will(returnValue("TestName"));
- assertNotNull(methodItemProvider.getImage(new Object()));
- assertNotNull(methodItemProvider.getText(wMElem.proxy()));
- assertNotNull(methodItemProvider.getChildrenFeatures(null));
- assertNotNull(methodItemProvider.getNameCategory());
- }
-
- public void testIWebServiceItemProvider()
- {
- IWebServiceItemProvider wsItemProvider = (IWebServiceItemProvider) itemProvider.createIWebServiceAdapter();
-
- assertNotNull(wsItemProvider);
-
- List<IItemPropertyDescriptor> propDescs = wsItemProvider.getPropertyDescriptors(null);
-
- assertNotNull(propDescs);
- assertTrue(propDescs.size() > 0);
-
- Mock wsElem = mock(IWebService.class);
- wsElem.expects(once()).method("getName").will(returnValue("TestName"));
- assertNotNull(wsItemProvider.getImage(new Object()));
- assertNotNull(wsItemProvider.getText(wsElem.proxy()));
- assertNotNull(wsItemProvider.getNameCategory());
- }
-
- public void testIWebServiceProjectItemProvider()
- {
- IWebServiceProjectItemProvider wsProjItemProvider = (IWebServiceProjectItemProvider) itemProvider.createIWebServiceProjectAdapter();
-
- assertNotNull(wsProjItemProvider);
-
- List<IItemPropertyDescriptor> propDescs = wsProjItemProvider.getPropertyDescriptors(null);
-
- assertNotNull(propDescs);
- assertTrue(propDescs.size() > 0);
-
- Mock wsProjElem = mock(IWebServiceProject.class);
- wsProjElem.expects(once()).method("getName").will(returnValue("TestName"));
- assertNotNull(wsProjItemProvider.getImage(new Object()));
- assertNotNull(wsProjItemProvider.getText(wsProjElem.proxy()));
- assertNotNull(wsProjItemProvider.getChildrenFeatures(null));
- }
-
- public void testIWebMethodItemProviderGetImplementation()
- {
- IWebMethodItemProvider methodItemProvider = (IWebMethodItemProvider) itemProvider.createIWebMethodAdapter();
- assertNotNull(methodItemProvider);
-
- Mock webParam1 = mock(IWebParam.class);
- webParam1.expects(atLeastOnce()).method("getName").will(returnValue("Param1"));
- webParam1.expects(atLeastOnce()).method("getTypeName").will(returnValue("boolean"));
- Mock webParam2 = mock(IWebParam.class);
- webParam2.expects(atLeastOnce()).method("getName").will(returnValue("return"));
- webParam2.expects(atLeastOnce()).method("getTypeName").will(returnValue("java.lang.String"));
- org.eclipse.emf.common.util.EList<IWebParam> webParams = new org.eclipse.emf.common.util.BasicEList<IWebParam>();
- webParams.add((IWebParam)webParam1.proxy());
- webParams.add((IWebParam)webParam2.proxy());
- Mock webMethod = mock(IWebMethod.class);
- webMethod.expects(atLeastOnce()).method("getParameters").will(returnValue(webParams));
- webMethod.expects(atLeastOnce()).method("getImplementation").will(returnValue("testMethod(B)QString"));
-
- BasicEList<StateAdapter> adapters = new org.eclipse.emf.common.util.BasicEList<StateAdapter>();
- Mock adapter = mock(StateAdapter.class);
- adapter.stubs().method("isAdapterForType").will(returnValue(true));
- adapter.stubs().method("isChangeable").will(returnValue(false));
- adapters.add((StateAdapter)adapter.proxy());
-
- webMethod.expects(atLeastOnce()).method("eAdapters").will(returnValue(adapters));
- ((IWebMethod)webMethod.proxy()).eAdapters();
- methodItemProvider.setTarget((Notifier)webMethod.proxy());
- List<IItemPropertyDescriptor> propDescs = methodItemProvider.getPropertyDescriptors(webMethod.proxy());
-
- assertNotNull(propDescs);
- assertTrue(propDescs.size() > 0);
-
- for(IItemPropertyDescriptor propDesc : propDescs)
- {
- if(propDesc.getFeature(null).equals(DomPackage.Literals.IJAVA_WEB_SERVICE_ELEMENT__IMPLEMENTATION))
- {
- assertEquals(((PropertyValueWrapper)propDesc.getPropertyValue(webMethod.proxy())).getText(null), "String testMethod(boolean)");
- }
- }
- }
-
- public void testIWebParamItemProvider()
- {
- IWebParamItemProvider itemProvider = (IWebParamItemProvider) new DomItemProviderAdapterFactory().createIWebParamAdapter();
- Mock paramMock = mock(IWebParam.class);
- assertNotNull(itemProvider.getImage(new Object()));
-
- paramMock.stubs().method("getName").will(returnValue("myParam"));
- paramMock.stubs().method("getTypeName").will(returnValue("java.util.List"));
- paramMock.stubs().method("getImplementation").will(returnValue("test"));
- paramMock.stubs().method("eContainer").will(returnValue(null));
- paramMock.stubs().method("eResource").will(returnValue(null));
-
- assertEquals("myParam", itemProvider.getText(paramMock.proxy()));
- assertNotNull(itemProvider.getImage(paramMock.proxy()));
- assertNotNull(itemProvider.getNameCategory());
- paramMock.stubs().method("getImplementation").will(returnValue("return"));
- assertNotNull(itemProvider.getImage(paramMock.proxy()));
- }
-
- public void testIWebParamItemProviderForTypeName()
- {
- // IWebParamItemProvider itemProvider = (IWebParamItemProvider) new DomItemProviderAdapterFactory().createIWebParamAdapter();
- final IItemPropertyDescriptor typeNamePropertyDescriptor = findWebParamItemPropertyDescriptor(DomPackage.Literals.IWEB_PARAM__TYPE_NAME);
-
- final IWebParam webParam = DomFactory.eINSTANCE.createIWebParam();
- webParam.setHeader(true);
- webParam.setKind(WebParamKind.INOUT);
- webParam.setName("anyName"); //$NON-NLS-1$
- webParam.setPartName("anyPartName"); //$NON-NLS-1$
- webParam.setTargetNamespace("anyTargetNamespace"); //$NON-NLS-1$
- ((EObject) webParam).eSet(DomPackage.Literals.IWEB_PARAM__TYPE_NAME, null);
-
- assertNull("Unexpected value.", typeNamePropertyDescriptor.getPropertyValue(webParam)); //$NON-NLS-1$
-
- Object propertyValueWrapper = null;
-
- ((EObject) webParam).eSet(DomPackage.Literals.IWEB_PARAM__TYPE_NAME, "I"); //$NON-NLS-1$
- propertyValueWrapper = typeNamePropertyDescriptor.getPropertyValue(webParam);
- assertEquals("Unresolved value.", "int", ((IItemPropertySource) propertyValueWrapper).getEditableValue(null)); //$NON-NLS-1$ //$NON-NLS-2$
-
- ((EObject) webParam).eSet(DomPackage.Literals.IWEB_PARAM__TYPE_NAME, "[QString;"); //$NON-NLS-1$
- propertyValueWrapper = typeNamePropertyDescriptor.getPropertyValue(webParam);
- assertEquals("Unresolved value.", "String[]", ((IItemPropertySource) propertyValueWrapper).getEditableValue(null)); //$NON-NLS-1$ //$NON-NLS-2$
- }
-
- private IItemPropertyDescriptor findWebParamItemPropertyDescriptor(final EAttribute attribute)
- {
- final IWebParamItemProvider itemProvider = (IWebParamItemProvider) new DomItemProviderAdapterFactory().createIWebParamAdapter();
- List<IItemPropertyDescriptor> descriptors = itemProvider.getPropertyDescriptors(null);
-
- for (IItemPropertyDescriptor descriptor : descriptors)
- {
- if (descriptor.getFeature(null).equals(attribute))
- {
- return descriptor;
- }
- }
-
- return null;
- }
-
- public interface StateAdapter extends IPropertyState, Adapter
- {
- }
-}
diff --git a/tests/org.eclipse.jst.ws.jaxws.dom.ui.tests/src/org/eclipse/jst/ws/jaxws/dom/ui/tests/internal/DOMItemPropertyProviderTest.java b/tests/org.eclipse.jst.ws.jaxws.dom.ui.tests/src/org/eclipse/jst/ws/jaxws/dom/ui/tests/internal/DOMItemPropertyProviderTest.java
deleted file mode 100755
index 8fbfcdd..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.dom.ui.tests/src/org/eclipse/jst/ws/jaxws/dom/ui/tests/internal/DOMItemPropertyProviderTest.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.dom.ui.tests.internal;
-
-import junit.framework.TestCase;
-
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.DomFactory;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.DomPackage;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.IWebService;
-import org.eclipse.jst.ws.jaxws.dom.ui.internal.impl.DOMItemPropertyProvider;
-
-/**
- * Tests for {@link DOMItemPropertyProvider} class
- * @author Georgi Vachkov
- */
-public class DOMItemPropertyProviderTest extends TestCase
-{
- private DOMItemPropertyProvider provider;
-
- public void setUp()
- {
- provider = new DOMItemPropertyProvider(
- null,
- null,
- "display name",
- "description",
- DomPackage.Literals.IJAVA_WEB_SERVICE_ELEMENT__NAME,
- true,
- false,
- false,
- null,
- "category",
- new String[0]);
- }
-
- public void testResetPropertyValue()
- {
- final IWebService ws = DomFactory.eINSTANCE.createIWebService();
- ws.eSet(DomPackage.Literals.IJAVA_WEB_SERVICE_ELEMENT__IMPLEMENTATION, "org.eclipse.test.Sei");
- ws.setName("Test");
- provider.resetPropertyValue(ws);
- assertEquals("SeiService", ws.getName());
- }
-}
diff --git a/tests/org.eclipse.jst.ws.jaxws.testutils/.classpath b/tests/org.eclipse.jst.ws.jaxws.testutils/.classpath
deleted file mode 100755
index 2d1a430..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.testutils/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/tests/org.eclipse.jst.ws.jaxws.testutils/.project b/tests/org.eclipse.jst.ws.jaxws.testutils/.project
deleted file mode 100755
index f7a3803..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.testutils/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.jst.ws.jaxws.testutils</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
diff --git a/tests/org.eclipse.jst.ws.jaxws.testutils/.settings/org.eclipse.jdt.core.prefs b/tests/org.eclipse.jst.ws.jaxws.testutils/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100755
index ae0484e..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.testutils/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,8 +0,0 @@
-#Mon Jul 20 15:25:31 EEST 2009
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.5
diff --git a/tests/org.eclipse.jst.ws.jaxws.testutils/META-INF/MANIFEST.MF b/tests/org.eclipse.jst.ws.jaxws.testutils/META-INF/MANIFEST.MF
deleted file mode 100755
index 6527c52..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.testutils/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,25 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %Bundle-Name.0
-Bundle-Vendor: %Bundle-Vendor.0
-Bundle-SymbolicName: org.eclipse.jst.ws.jaxws.testutils
-Bundle-Localization: plugin
-Bundle-Version: 1.0.0.qualifier
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Require-Bundle: org.jmock,
- org.eclipse.core.resources,
- org.eclipse.core.runtime,
- org.eclipse.jdt.core,
- org.eclipse.ui,
- org.eclipse.jdt.launching,
- org.eclipse.wst.common.project.facet.core,
- org.eclipse.jst.ws.jaxws.utils,
- org.junit
-Export-Package: org.eclipse.jst.ws.jaxws.testutils,
- org.eclipse.jst.ws.jaxws.testutils.assertions,
- org.eclipse.jst.ws.jaxws.testutils.files,
- org.eclipse.jst.ws.jaxws.testutils.jmock,
- org.eclipse.jst.ws.jaxws.testutils.jmock.testcases,
- org.eclipse.jst.ws.jaxws.testutils.jobs,
- org.eclipse.jst.ws.jaxws.testutils.project,
- org.eclipse.jst.ws.jaxws.testutils.threading
diff --git a/tests/org.eclipse.jst.ws.jaxws.testutils/about.html b/tests/org.eclipse.jst.ws.jaxws.testutils/about.html
deleted file mode 100644
index d2b7ace..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.testutils/about.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
-<title>About</title>
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
-
-<p>August 20, 2009</p>
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, "Program" will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is
-being redistributed by another party ("Redistributor") and different terms and conditions may
-apply to your use of any object code in the Content. Check the Redistributor's license that was
-provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
-
-</body>
-</html>
diff --git a/tests/org.eclipse.jst.ws.jaxws.testutils/build.properties b/tests/org.eclipse.jst.ws.jaxws.testutils/build.properties
deleted file mode 100755
index cc88efd..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.testutils/build.properties
+++ /dev/null
@@ -1,16 +0,0 @@
-###############################################################################
-# Copyright (c) 2009 by SAP AG, Walldorf.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# SAP AG - initial API and implementation
-###############################################################################
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
- .,\
- about.html,\
- plugin.properties
diff --git a/tests/org.eclipse.jst.ws.jaxws.testutils/plugin.properties b/tests/org.eclipse.jst.ws.jaxws.testutils/plugin.properties
deleted file mode 100755
index 5830398..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.testutils/plugin.properties
+++ /dev/null
@@ -1,13 +0,0 @@
-###############################################################################
-# Copyright (c) 2009 by SAP AG, Walldorf.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# SAP AG - initial API and implementation
-###############################################################################
-
-Bundle-Name.0=Utilities for JUnit tests (Incubation)
-Bundle-Vendor.0=Eclipse Web Tools Platform
diff --git a/tests/org.eclipse.jst.ws.jaxws.testutils/src/org/eclipse/jst/ws/jaxws/testutils/IWaitCondition.java b/tests/org.eclipse.jst.ws.jaxws.testutils/src/org/eclipse/jst/ws/jaxws/testutils/IWaitCondition.java
deleted file mode 100755
index da08e8f..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.testutils/src/org/eclipse/jst/ws/jaxws/testutils/IWaitCondition.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.testutils;
-
-import org.eclipse.jst.ws.jaxws.testutils.assertions.ConditionCheckException;
-
-/**
- * Interface which defines a condition upon which the execution can continue
- * @author Danail Branekov
- */
-public interface IWaitCondition
-{
- /**
- * Method which checks whether a given condition is met
- * @return <code>true</code> in case the condition is met, <code>false</code> otherwise
- * @throws ConditionCheckException when implementors decide that they cannot deal with a given exceptional situation
- */
- public boolean checkCondition() throws ConditionCheckException;
-}
diff --git a/tests/org.eclipse.jst.ws.jaxws.testutils/src/org/eclipse/jst/ws/jaxws/testutils/assertions/Assertions.java b/tests/org.eclipse.jst.ws.jaxws.testutils/src/org/eclipse/jst/ws/jaxws/testutils/assertions/Assertions.java
deleted file mode 100755
index cfb9ff5..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.testutils/src/org/eclipse/jst/ws/jaxws/testutils/assertions/Assertions.java
+++ /dev/null
@@ -1,120 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.testutils.assertions;
-
-import java.io.PrintWriter;
-import java.io.StringWriter;
-import java.lang.reflect.InvocationTargetException;
-
-import junit.framework.Assert;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.jface.operation.IRunnableWithProgress;
-import org.eclipse.jst.ws.jaxws.testutils.IWaitCondition;
-import org.eclipse.jst.ws.jaxws.testutils.threading.TestContext;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.PlatformUI;
-
-/**
- * Utility class which provides methods which assert that a given condition is met. If necessary, methods will block the execution of the caller until
- * the condition is met for a reasonable time. If the conditions is not met, <code>Assert.fail()</code> is invoked
- *
- * @author Danail Branekov
- *
- */
-public class Assertions
-{
- private final static int MAX_CONDITION_CHECKS = 5000;
-
- private final static int SLEEP_TIMEOUT = 42;
-
- /**
- * Asserts that waits some time until the condition specified is met. If the condition is not met after some reasonable time, the method calls Assert.fail()
- * @param condition the condition to check
- * @param failMessage the message which will be passed to <code>Assert.fail()</code> thus indicating a test failure
- */
- public static void waitAssert(final IWaitCondition condition, final String failMessage)
- {
- try
- {
- if (!waitForConditionLoop(condition))
- {
- Assert.fail(failMessage);
- }
- } catch (ConditionCheckException e)
- {
- failUponThrowable(e);
- }
- }
-
- /**
- * Blocks the execution of the caller until the <code>condition</code> is met or MAX_CONDITION_CHECKS attempts have been reached.<br>
- * The method behaviour slightly depends on whether the method is invoked from the UI thread or not
- * <li>If the caller is the UI thread, a new modal context thread is started which sleeps for {@link #SLEEP_TIMEOUT}
- * <li>If the caller is not the UI thread, then the current thread sleeps for {@link #SLEEP_TIMEOUT} <br>
- *
- * @param condition
- * condition on which the method will return if met
- * @throws ConditionCheckException
- */
- private static boolean waitForConditionLoop(final IWaitCondition condition) throws ConditionCheckException
- {
- int attempts = 0;
- while (attempts < MAX_CONDITION_CHECKS)
- {
- if (condition.checkCondition())
- {
- return true;
- }
-
- attempts++;
- final IRunnableWithProgress sleepRunnable = getSleepRunnable();
-
- try
- {
- TestContext.run(sleepRunnable, Display.getCurrent() != null, new NullProgressMonitor(), PlatformUI.getWorkbench().getDisplay());
- } catch (InvocationTargetException e)
- {
- throw new ConditionCheckException(e);
- } catch (InterruptedException e)
- {
- throw new ConditionCheckException(e);
- }
- }
-
- return false;
- }
-
- private static IRunnableWithProgress getSleepRunnable()
- {
- return new IRunnableWithProgress()
- {
- public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException
- {
- Thread.sleep(SLEEP_TIMEOUT);
- }
- };
- }
-
- private static void failUponThrowable(final Throwable t)
- {
- final StringBuilder msgBuilder = new StringBuilder(t.getMessage());
- StringWriter stringWriter = new StringWriter();
- PrintWriter printWriter = new PrintWriter(stringWriter);
- t.printStackTrace(printWriter);
- msgBuilder.append(stringWriter.toString());
- msgBuilder.append("------------------------------------\n\n");
-
- Assert.fail(msgBuilder.toString());
- }
-
-}
diff --git a/tests/org.eclipse.jst.ws.jaxws.testutils/src/org/eclipse/jst/ws/jaxws/testutils/assertions/ConditionCheckException.java b/tests/org.eclipse.jst.ws.jaxws.testutils/src/org/eclipse/jst/ws/jaxws/testutils/assertions/ConditionCheckException.java
deleted file mode 100755
index 9e691db..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.testutils/src/org/eclipse/jst/ws/jaxws/testutils/assertions/ConditionCheckException.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.testutils.assertions;
-
-import org.eclipse.jst.ws.jaxws.testutils.IWaitCondition;
-
-
-/**
- * Exception which can be thrown by {@link IWaitCondition#checkCondition()} method. This is a wrapper exception which encloses the exception cause
- *
- * @author Danail Branekov
- */
-public class ConditionCheckException extends Exception
-{
- private static final long serialVersionUID = -4929080285506788984L;
-
- public ConditionCheckException(final Throwable cause)
- {
- super(cause);
- }
-
- public ConditionCheckException(final String message)
- {
- super(message);
- }
-}
diff --git a/tests/org.eclipse.jst.ws.jaxws.testutils/src/org/eclipse/jst/ws/jaxws/testutils/files/TestFileUtils.java b/tests/org.eclipse.jst.ws.jaxws.testutils/src/org/eclipse/jst/ws/jaxws/testutils/files/TestFileUtils.java
deleted file mode 100755
index 3532cbd..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.testutils/src/org/eclipse/jst/ws/jaxws/testutils/files/TestFileUtils.java
+++ /dev/null
@@ -1,517 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.testutils.files;
-
-import java.io.BufferedOutputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.io.PrintWriter;
-import java.net.URL;
-import java.nio.channels.FileChannel;
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipInputStream;
-
-
-public class TestFileUtils
-{
- // Hide default constructor
- private TestFileUtils()
- {
- };
-
- /** Get new instance of the FileUtilities object */
- public static TestFileUtils getInstance()
- {
- return new TestFileUtils();
- }
-
- /**
- * Utility method. Copies the contents of the source folder to the destination folder.
- */
- public boolean copyFiles(final File dest, final File src) throws IOException
- {
-
- if (src.isDirectory())
- {
- dest.mkdirs();
- final String list[] = src.list();
-
- for (int i = 0; i < list.length; i++)
- {
- final String dest1 = dest.getAbsolutePath() + "\\" + list[i];
- final String src1 = src.getAbsolutePath() + "\\" + list[i];
- copyFiles(new File(dest1), new File(src1));
- }
- } else
- {
- return copy(dest, src);
- }
-
- return false;
- }
-
- /**
- * Utility method for copying a file! - not a directory
- *
- * @param target
- * @param source
- * @throws IOException
- */
- public boolean copy(final File target, final File source) throws IOException
- {
- if (!source.isFile())
- return false;
-
- final FileChannel sourceChannel = new FileInputStream(source).getChannel();
- final FileChannel targetChannel = new FileInputStream(target).getChannel();
- sourceChannel.transferTo(0, sourceChannel.size(), targetChannel);
- sourceChannel.close();
- targetChannel.close();
-
- return true;
- }
-
- /**
- *
- * @param destDir
- * @param srcRelativePath -
- * the relative path of the resource or <code>null</code> if it is in the same package
- * @param resourceName
- * @param resourceClass
- * @return
- * @throws IOException
- */
- public File copyResourceToDir(File destDir, InputStream srcStream, String resourceName) throws IOException
- {
- File destFile = new File(destDir.getAbsolutePath(), resourceName);
- copyFile(srcStream, new FileOutputStream(destFile));
- return destFile;
- }
- /**
- *
- * @param destDir
- * @param srcRelativePath -
- * the relative path of the resource or <code>null</code> if it is in the same package
- * @param srcFileName
- * @param resourceClass
- * @return
- * @throws IOException
- */
- public File copyResourceToDir(File destDir, String srcRelativePath, String srcFileName, Class<?> resourceClass) throws IOException
- {
- File destFile = new File(destDir.getAbsolutePath(), srcFileName);
- copyFile(createInputStreamForResource(srcRelativePath, srcFileName, resourceClass), new FileOutputStream(destFile));
- return destFile;
- }
-
- private InputStream createInputStreamForResource(String srcRelativePath, String srcFileName, Class<?> resourceClass)
- {
- return resourceClass.getResourceAsStream(createResourcePath(srcRelativePath) + srcFileName);
- }
-
- private String createResourcePath(String srcRelativePath)
- {
- return (srcRelativePath == null) ? "" : srcRelativePath + "/";
- }
-
- /** Closes the streams after completion */
- public void copyFile(InputStream in, OutputStream out) throws IOException
- {
- if (in == null || out == null)
- throw new IllegalArgumentException("Stream not initialized");
- try
- {
- byte[] buf = new byte[1024];
- int len;
- while ((len = in.read(buf)) > 0)
- {
- out.write(buf, 0, len);
- }
- } finally
- {
- in.close();
- out.close();
- }
- }
-
- /**
- * Utility method for deleting the contents of a given folder path
- *
- * @param folderPath
- * @return <code>true</code> if the process was completed successfully.
- * @throws IOException
- */
- public boolean deleteFolderAndContents(final String folderPath) throws IOException
- {
- final File path = new File(folderPath);
- return deleteFolderAndContents(path);
- }
-
- /**
- * Deletes the specified directory and all its contents including all sub directories.
- *
- * @param tempDir
- * the directory that is being deleted.
- */
- public boolean deleteFolderAndContents(File tempDir)
- {
- boolean status = true;
- if (tempDir != null)
- {
- File[] files = tempDir.listFiles();
-
- if (files != null)
- {
- for (int i = 0; i < files.length; i++)
- {
- if (files[i].isDirectory())
- {
- status = deleteFolderAndContents(files[i]) && status;
- } else
- {
- status = files[i].delete() && status;
- }
- }
- }
- status = tempDir.delete() && status;
- } else
- {
- status = false;
- }
- return status;
- }
-
- /**
- * Extracts the contents of the given input stream file to the given directory.
- *
- * @param istr
- * The input stream of the jar file
- * @param srcFileName
- * The name of the archive - where the contents of the input stream will be copied
- * @param destDir
- * The destination directory object
- * @return <code>true</code> if the process was completed successfully
- * @throws IOException
- */
- public boolean unzipArchiveToDir(final InputStream istr, final String srcFileName, final File destDir) throws IOException
- {
-
- if (!destDir.exists())
- throw new IOException("Directory does not exist");
- if (!destDir.canWrite())
- throw new IOException("Could not write to directory");
-
- final File sourceFile = new File(destDir, srcFileName);
-
- final FileOutputStream fos = new FileOutputStream(sourceFile);
- final BufferedOutputStream bufOutStream = new BufferedOutputStream(fos);
-
- try
- {
- Unzipper.INSTANCE.copyInputStream(istr, bufOutStream);
- } finally
- {
- bufOutStream.close();
- fos.close();
- }
-
- // check if the archive was copied successfully
- if (!sourceFile.exists())
- {
- throw new FileNotFoundException("Archive could not be found");
- }
-
- Unzipper.INSTANCE.unzip(sourceFile, destDir, false);
-
- return true;
- }
-
- /** Utility method for getting the contents of a file through URL */
- public String readURLResource(URL url) throws IOException
- {
- String readInf = null;
- final InputStream in = url.openStream();
-
- try
- {
- int inRead = in.read();
-
- readInf = "";
- while (inRead != -1)
- {
- readInf += String.valueOf((char) inRead);
- inRead = in.read();
- }
- } finally
- {
- in.close();
- }
-
- return readInf;
- }
-
- /**
- * Method for replacing the text occurrence in a file with the provided replacement.
- *
- * @param file
- * @param find
- * @param replacement
- * @return
- * @throws IOException
- */
- public boolean replaceContentsInFile(File file, String find, String replacement) throws IOException
- {
- if (!file.exists())
- return false;
-
- String fileContents = readFileContents(file);
-
- fileContents = fileContents.replaceAll(find, replacement);
-
- file.delete();
- file.createNewFile();
-
- writeContentsToFile(file, fileContents);
-
- return true;
- }
-
- /**
- * Writes the string to the given file.
- *
- * @param file -
- * the file to write to
- * @param fileContents -
- * the contents to be written to the file
- * @throws IOException
- * @throws FileNotFoundException
- */
- public void writeContentsToFile(File file, String fileContents) throws IOException, FileNotFoundException
- {
-
- PrintWriter pout = new PrintWriter(file);
-
- try
- {
- pout.println(fileContents);
- pout.flush();
- } finally
- {
- pout.close();
- }
- }
-
- /**
- * Reads the contents of a file and returns it as String.
- *
- * @param file -
- * the file to read from
- * @return the contents of the file
- * @throws IOException
- */
- public String readFileContents(File file) throws IOException
- {
- String readInf = null;
- final InputStream in = new FileInputStream(file);
-
- try
- {
- int inRead = in.read();
-
- readInf = "";
- while (inRead != -1)
- {
- readInf += String.valueOf((char) inRead);
- inRead = in.read();
- }
- } catch (IOException e)
- {
- throw e;
- } finally
- {
- in.close();
- }
-
- return readInf;
- }
-
- /** @return the resource input stream of the projects archive */
- @SuppressWarnings("unchecked")
- public InputStream getResourceInputStream(final String archiveName, final String projectSourceFolder, Class relativeResourceBaseClass)
- {
- return relativeResourceBaseClass.getResourceAsStream(projectSourceFolder + "/" + archiveName);
- }
-
- /** Method for handling the unzipping of the test projects */
- public void unzipTestProjects(final InputStream archiveStream, final String archiveName, final File destDir) throws IOException
- {
-
- if (archiveStream == null)
- throw new IOException("The archive resource stream is not initialized! archive: " + archiveName + " - dir: " + destDir);
-
- try
- {
- unzipArchiveToDir(archiveStream, archiveName, destDir);
- } finally
- {
- archiveStream.close();
- }
- }
-
- /**
- * Unzips the content of <tt>zipFileLocation</tt> into <tt>outFolder</tt>.
- *
- * @param zipFileLocation
- * @param outFolder
- * @throws IOException
- */
- public static void addZippedContent(File zipFileLocation, File outFolder) throws IOException
- {
- FileInputStream fis = new FileInputStream(zipFileLocation);
- addZippedContent(fis, outFolder);
- }
-
- /**
- * Unzips the content of <tt>is</tt> into <tt>outFolder</tt>.
- *
- * @param zipFileLocation
- * @param outFolder
- * @throws IOException
- */
- public static void addZippedContent(InputStream is, File outFolder) throws IOException
- {
- ZipInputStream zis = new ZipInputStream(is);
- ZipEntry entry = null;
- while ((entry = zis.getNextEntry()) != null)
- {
- File outFile = new File(outFolder, entry.getName());
-
- if (entry.isDirectory())
- {
- outFile.mkdirs();
- } else
- {
- OutputStream out = new FileOutputStream(outFile);
- byte[] buff = new byte[2048];
- int read;
- while ((read = zis.read(buff)) > 0)
- {
- out.write(buff, 0, read);
- }
- out.close();
- }
-
- zis.closeEntry();
- }
-
- zis.close();
- }
-
- /**
- * Deletes directory with its content
- *
- * @param dir
- */
- public static void deleteDirectory(File dir)
- {
- if (!dir.isDirectory())
- {
- throw new IllegalArgumentException("Not a directory" + dir.getName());
- }
-
- for (String s : dir.list())
- {
- File f = new File(dir.getAbsolutePath() + File.separator + s);
- if (f.isDirectory())
- {
- deleteDirectory(f);
- } else
- {
- f.delete();
- }
- }
-
- dir.delete();
- }
-
- /**
- * Create a directory named via the pattern System.getProperty("java.io.tmpdir") + File.separator + dirName
- *
- * @param dirName
- * @return
- */
- public static File createTempDirectory(String dirName)
- {
- File tempDir = new File(System.getProperty("java.io.tmpdir"), dirName);
- if (tempDir.exists())
- {
- deleteDirectory(tempDir);
- }
-
- if (!tempDir.mkdir())
- {
- throw new IllegalStateException("Temp direcory " + tempDir.getAbsolutePath() + " could not be created");
- }
- // tempDir.deleteOnExit();
-
- return tempDir;
- }
-
- /**
- * Copy the content of <code>filePath</code> and copies it to temporary file in system temp directory.
- *
- * @param classContext
- * @param filePath
- * @return created temporary file
- * @throws IOException
- */
- public static File copyToTempLocation(Class<?> classContext, String filePath) throws IOException
- {
- final InputStream is = classContext.getResourceAsStream(filePath);
- final File dir = new File(System.getProperty("java.io.tmpdir"));
- final File tempFile = new File(dir, System.currentTimeMillis() + ".java");
- tempFile.deleteOnExit();
-
- final FileOutputStream fos = new FileOutputStream(tempFile);
- try
- {
- byte[] buff = new byte[1024];
- for (int cnt = 0; (cnt = is.read(buff)) > -1;)
- {
- fos.write(buff, 0, cnt);
- }
- } finally
- {
- is.close();
- fos.close();
- }
-
- return tempFile;
- }
-
- public static void setFileContent(File file, String content) throws IOException
- {
- final FileWriter fw = new FileWriter(file);
- try
- {
- fw.write(content);
- } finally
- {
- fw.close();
- }
- }
-}
diff --git a/tests/org.eclipse.jst.ws.jaxws.testutils/src/org/eclipse/jst/ws/jaxws/testutils/files/Unzipper.java b/tests/org.eclipse.jst.ws.jaxws.testutils/src/org/eclipse/jst/ws/jaxws/testutils/files/Unzipper.java
deleted file mode 100755
index d9bfdfb..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.testutils/src/org/eclipse/jst/ws/jaxws/testutils/files/Unzipper.java
+++ /dev/null
@@ -1,146 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.testutils.files;
-
-import java.io.BufferedOutputStream;
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.util.Enumeration;
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipFile;
-
-/**
- * A simple utility for unzipping ZIP archives
- *
- * @author Danail Branekov
- */
-public class Unzipper {
- public static final Unzipper INSTANCE = new Unzipper();
-
- // Hide default constructor
- private Unzipper() {
-
- }
-
- /**
- * Copy the content from the <code>sourceStream</code> to the
- * <code>destinationStream</code>
- *
- * @param sourceStream
- * @param destStream
- * @throws IOException
- */
- public void copyInputStream(final InputStream sourceStream,
- final OutputStream destStream) throws IOException {
- byte[] buffer = new byte[1024];
- int len;
-
- while ((len = sourceStream.read(buffer)) >= 0) {
- destStream.write(buffer, 0, len);
- }
-
- destStream.flush();
- }
-
- /**
- * Unzip the zip file specified to the destination directory
- *
- * @param sourceFile
- * the source zip file
- * @param destinationDir
- * the destination directory
- * @param toLowerCase
- * if true, all the unzipped entries would be lowercased (for *IX
- * compatibility) The background behind this parameter is the
- * case inconsistency between ABAP xml test data directory names
- * and the real directory names in the ABAP ZIP
- * @throws IOException
- * @throws NullPointerException
- * when any of the input parameters is null
- * @throws IllegalArgumentException
- * when <code>sourceFile</code> does not exist or points to a
- * directory
- * @throws IllegalArgumentException
- * when <code>destinationDir</code> does not exist or is not a
- * directory
- */
- public void unzip(final File sourceFile, final File destinationDir,
- final boolean toLowerCase) throws IOException {
- checkInputParams(sourceFile, destinationDir);
- ZipFile zipFile = null;
-
- try {
- zipFile = new ZipFile(sourceFile);
- Enumeration<? extends ZipEntry> entries = zipFile.entries();
-
- // Create dir structure
- while (entries.hasMoreElements()) {
- final ZipEntry entry = entries.nextElement();
-
- if (entry.isDirectory()) {
- // This is not robust, just for demonstration purposes.
- (new File(destinationDir, toLowerCase ? entry.getName()
- .toLowerCase() : entry.getName())).mkdirs();
- }
- }
-
- // Create files
- entries = zipFile.entries();
- while (entries.hasMoreElements()) {
- final ZipEntry entry = entries.nextElement();
-
- if (entry.isDirectory()) {
- continue;
- }
-
- FileOutputStream fos = null;
- BufferedOutputStream bufOutStream = null;
-
- try {
- fos = new FileOutputStream(new File(destinationDir,
- toLowerCase ? entry.getName().toLowerCase() : entry
- .getName()));
- bufOutStream = new BufferedOutputStream(fos);
- copyInputStream(zipFile.getInputStream(entry), bufOutStream);
- fos.flush();
- bufOutStream.flush();
- } finally {
- if (fos != null) {
- fos.close();
- }
- if (bufOutStream != null) {
- bufOutStream.close();
- }
- }
- }
- } finally {
- if (zipFile != null) {
- zipFile.close();
- }
- }
- }
-
- private void checkInputParams(final File zipFile, final File destination) {
- // ContractChecker.nullCheckParam(zipFile, "zipFile");
- // ContractChecker.nullCheckParam(destination, "destination");
- if (!zipFile.exists() || zipFile.isDirectory()) {
- throw new IllegalArgumentException(
- "ZIP file does not exist or is a directory");
- }
- if (!destination.exists() || !destination.isDirectory()) {
- throw new IllegalArgumentException(
- "Destination does not exist or is not a directory");
- }
- }
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.ws.jaxws.testutils/src/org/eclipse/jst/ws/jaxws/testutils/jmock/AbstractDynamicMock.java b/tests/org.eclipse.jst.ws.jaxws.testutils/src/org/eclipse/jst/ws/jaxws/testutils/jmock/AbstractDynamicMock.java
deleted file mode 100755
index 15314b2..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.testutils/src/org/eclipse/jst/ws/jaxws/testutils/jmock/AbstractDynamicMock.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.testutils.jmock;
-
-import org.jmock.core.InvocationDispatcher;
-
-/**
- * This class is equivalent to <c>org.jmock.core.AbstractDynamicMock</c>. The difference is that this class is parameterized. It extends from
- * <c>org.jmock.core.AbstractDynamicMock</c> and is thus backward compatible.
- *
- * @author Hristo Sabev
- *
- * @param <T>
- */
-public abstract class AbstractDynamicMock<T> extends org.jmock.core.AbstractDynamicMock
-{
-
- public AbstractDynamicMock(Class<T> mockedType, String name, InvocationDispatcher invocationDispatcher)
- {
- super(mockedType, name, invocationDispatcher);
- }
-
- public AbstractDynamicMock(Class<T> mockedType, String name)
- {
- super(mockedType, name);
- }
-
- @Override
- @SuppressWarnings("unchecked")
- public Class<T> getMockedType()
- {
- return super.getMockedType();
- }
-
- @Override
- public abstract T proxy();
-}
diff --git a/tests/org.eclipse.jst.ws.jaxws.testutils/src/org/eclipse/jst/ws/jaxws/testutils/jmock/AbstractMockObjectTestCase.java b/tests/org.eclipse.jst.ws.jaxws.testutils/src/org/eclipse/jst/ws/jaxws/testutils/jmock/AbstractMockObjectTestCase.java
deleted file mode 100755
index 25c1367..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.testutils/src/org/eclipse/jst/ws/jaxws/testutils/jmock/AbstractMockObjectTestCase.java
+++ /dev/null
@@ -1,225 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.testutils.jmock;
-
-import java.util.Collection;
-
-import org.jmock.core.Constraint;
-import org.jmock.core.DynamicMock;
-import org.jmock.core.Formatting;
-import org.jmock.core.InvocationMatcher;
-import org.jmock.core.MockObjectSupportTestCase;
-import org.jmock.core.Stub;
-import org.jmock.core.matcher.InvokeAtLeastOnceMatcher;
-import org.jmock.core.matcher.InvokeAtMostOnceMatcher;
-import org.jmock.core.matcher.InvokeCountMatcher;
-import org.jmock.core.matcher.InvokeOnceMatcher;
-import org.jmock.core.matcher.TestFailureMatcher;
-import org.jmock.core.stub.ReturnIteratorStub;
-import org.jmock.core.stub.ReturnStub;
-import org.jmock.core.stub.ThrowStub;
-
-/**
- * An abstract class from which sub-classing test cases can inherit. This class is equivalent to org.jmock.MockObjectTestCase with the difference that
- * id does not provide an implementation to <c>newCoreMock</c> method and thus is not able to create any proxies. The other major difference is that
- * this class is parameterized. It should be used as a base class for sub-classes that provide strongly typed mocks. This class also take advantage of
- * some of the java 5 sugars. For example "varargs".
- *
- * @author Hristo Sabev
- *
- */
-public abstract class AbstractMockObjectTestCase extends MockObjectSupportTestCase
-{
-
- public AbstractMockObjectTestCase()
- {
- }
-
- public AbstractMockObjectTestCase(String name)
- {
- super(name);
- }
-
- /**
- * Creates a mock object that mocks the given type. The mock object is named after the type; the exact name is calculated by
- * {@link #defaultMockNameForType}.
- *
- * @param mockedType
- * The type to be mocked.
- * @return A {@link Mock} object that mocks <var>mockedType</var>.
- */
- @SuppressWarnings("unchecked")
- public <T> Mock<T> mock(Class mockedType)
- {
- return mock(mockedType, defaultMockNameForType(mockedType));
- }
-
- /**
- * Creates a mock object that mocks the given type and is explicitly given a name. The mock object is named after the type; the exact name is
- * calculated by {@link #defaultMockNameForType}.
- *
- * @param mockedType
- * The type to be mocked.
- * @param roleName
- * The name of the mock object
- * @return A {@link Mock} object that mocks <var>mockedType</var>.
- */
- @SuppressWarnings("unchecked")
- public <T> Mock<T> mock(Class mockedType, String roleName)
- {
- final Mock<T> newMock = new Mock<T>(newCoreMock(mockedType, roleName));
- registerToVerify(newMock);
- return newMock;
- }
-
- protected abstract <T> DynamicMock newCoreMock(Class<T> mockedType, String roleName);
-
- /**
- * Calculates
- *
- * @param mockedType
- * @return
- */
- public String defaultMockNameForType(Class<?> mockedType)
- {
- return "mock" + Formatting.classShortName(mockedType);
- }
-
- public Stub returnValue(Object o)
- {
- return new ReturnStub(o);
- }
-
- public Stub returnValue(boolean result)
- {
- return returnValue(new Boolean(result));
- }
-
- public Stub returnValue(byte result)
- {
- return returnValue(new Byte(result));
- }
-
- public Stub returnValue(char result)
- {
- return returnValue(new Character(result));
- }
-
- public Stub returnValue(short result)
- {
- return returnValue(new Short(result));
- }
-
- public Stub returnValue(int result)
- {
- return returnValue(new Integer(result));
- }
-
- public Stub returnValue(long result)
- {
- return returnValue(new Long(result));
- }
-
- public Stub returnValue(float result)
- {
- return returnValue(new Float(result));
- }
-
- public Stub returnValue(double result)
- {
- return returnValue(new Double(result));
- }
-
- public Stub returnIterator(Collection<?> collection)
- {
- return new ReturnIteratorStub(collection);
- }
-
- public Stub returnIterator(Object[] array)
- {
- return new ReturnIteratorStub(array);
- }
-
- public Stub throwException(Throwable throwable)
- {
- return new ThrowStub(throwable);
- }
-
- public InvocationMatcher once()
- {
- return new InvokeOnceMatcher();
- }
-
- public InvocationMatcher atLeastOnce()
- {
- return new InvokeAtLeastOnceMatcher();
- }
-
- public InvocationMatcher atMostOnce()
- {
- return new InvokeAtMostOnceMatcher();
- }
-
- public InvocationMatcher exactly(int expectedCount)
- {
- return new InvokeCountMatcher(expectedCount);
- }
-
- public InvocationMatcher never()
- {
- return new TestFailureMatcher("not expected");
- }
-
- public InvocationMatcher never(String errorMessage)
- {
- return new TestFailureMatcher("not expected (" + errorMessage + ")");
- }
-
- /**
- * @since 1.0.1
- */
- public Stub onConsecutiveCalls(Stub... stubs)
- {
- return onConsecutiveCalls(stubs);
- }
-
- /**
- * @since 1.1.0
- */
- public Stub doAll(Stub... stubs)
- {
- return doAll(stubs);
- }
-
- public Constraint collectionWithElements(final int expectedCollectionSize, final Object... objects)
- {
- return new Constraint(){
-
- public boolean eval(Object arg0)
- {
- final Collection<?> col = (Collection<?>)arg0;
- for(Object o : objects)
- {
- if(!col.contains(o))
- {
- return false;
- }
- }
-
- return objects.length == expectedCollectionSize;
- }
-
- public StringBuffer describeTo(StringBuffer arg0)
- {
- return arg0;
- }};
- }
-}
diff --git a/tests/org.eclipse.jst.ws.jaxws.testutils/src/org/eclipse/jst/ws/jaxws/testutils/jmock/Mock.java b/tests/org.eclipse.jst.ws.jaxws.testutils/src/org/eclipse/jst/ws/jaxws/testutils/jmock/Mock.java
deleted file mode 100755
index 7c3b9a8..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.testutils/src/org/eclipse/jst/ws/jaxws/testutils/jmock/Mock.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.testutils.jmock;
-
-import org.jmock.core.DynamicMock;
-
-/**
- * This class is equivalent to <c>org.jmock.Mock</c> class from JMock. The only difference is that this a parameterized (generic) version. This makes
- * it a lot easier for use as no manual casts to the mocked type are required by the programmer. This class extends from <c>org.jmock.Mock</c> so its
- * fully backward compatible.
- *
- * @see org.jmock.Mock
- */
-public class Mock<T> extends org.jmock.Mock
-{
-
- /**
- * Constructs a new mock for the specified type. The new mock has the specified name. This name will be shown by all reports concerning this mock
- * instance. Such reports are unmached invocations and so on.
- *
- * @param mockedType -
- * the type to be mocked. This could be either class or interface.
- * @param name -
- * name of this mock
- */
- public Mock(Class<T> mockedType, String name)
- {
- super(mockedType, name);
- }
-
- /**
- * Constructs a new mock for the specified type.
- *
- * @param mockedType -
- * the type to be mocked. This class needs to be either class or interface.
- */
- public Mock(Class<T> mockedType)
- {
- super(mockedType);
- }
-
- /**
- * Constructs new Mock that wraps the supplied <c>DynamicMock</c> instance.
- *
- * @param arg0 -
- * the dynamic mock instance
- */
- public Mock(DynamicMock arg0)
- {
- super(arg0);
- }
-
- /**
- * Obtains the proxy instance for this mock.
- *
- * @return the proxy instance for this mock.
- */
- @Override
- @SuppressWarnings("unchecked")
- public T proxy()
- {
- return (T) super.proxy();
- }
-}
diff --git a/tests/org.eclipse.jst.ws.jaxws.testutils/src/org/eclipse/jst/ws/jaxws/testutils/jmock/MockObjectTestCase.java b/tests/org.eclipse.jst.ws.jaxws.testutils/src/org/eclipse/jst/ws/jaxws/testutils/jmock/MockObjectTestCase.java
deleted file mode 100755
index d126061..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.testutils/src/org/eclipse/jst/ws/jaxws/testutils/jmock/MockObjectTestCase.java
+++ /dev/null
@@ -1,106 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.testutils.jmock;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Vector;
-
-import org.eclipse.jst.ws.jaxws.testutils.jmock.testcases.BeforeAfterEnabler;
-import org.eclipse.jst.ws.jaxws.testutils.jmock.testcases.IBeforeAfterEnabled;
-import org.jmock.core.CoreMock;
-import org.jmock.core.DynamicMock;
-import org.jmock.core.Verifiable;
-
-
-/**
- * An test case base class for mock objects test case. This one is roughly equivalent to org.jmock.cglib.MockObjectTestCase. There are several
- * important differences though. This test case class assumes that the loader of the test case class is able to load both the class being mocked and
- * the jmock classes. Thus test case class loader is used to create the mock type. This mock test case also provides two new <c>mock</c> methods.
- * These methods can instantiate a mock for a given class by executing the class's constructor. The methods <c></c> and <c></c> inherited from
- * <c>AbstractMockObjectTestCase</c> create mocks without executing the constructor of the mocked class. They use the SUN's reflection mechanism and
- * are able to create classes without a visible default constructor or without constructor at all. This functionallity however is platform specific.
- * It can be compiled and executed only on SUN VMs. Should the code be executed on another VM most likely a <c>NoClassDefFoundError</c> will ocurr.
- *
- * @author Hristo Sabev
- *
- */
-public abstract class MockObjectTestCase extends AbstractMockObjectTestCase implements IBeforeAfterEnabled
-{
- private final BeforeAfterEnabler bae = new BeforeAfterEnabler(this);
- public void afterTestCase() throws Exception
- {
- }
-
- public void beforeTestCase() throws Exception
- {
- }
-
- public void runBareInternal() throws Throwable
- {
- super.runBare();
- }
-
- @Override
- public void runBare() throws Throwable
- {
- bae.runBare();
- }
-
- private List<Mock<?>> mocksToVerify = new Vector<Mock<?>>();
-
- /**
- * Constructs a new <c>MockObjectTestCase</c> instance with no name
- *
- */
- public MockObjectTestCase()
- {
- }
-
- public List<Mock<?>> getMocksToVerify()
- {
- final List<Mock<?>> copy = new ArrayList<Mock<?>>();
- copy.addAll(mocksToVerify);
- return copy;
- }
-
- @Override
- public void unregisterToVerify(Verifiable arg0)
- {
- mocksToVerify.remove(arg0);
- super.unregisterToVerify(arg0);
- }
-
- @Override
- public void verify()
- {
- mocksToVerify.clear();
- super.verify();
- }
-
- /**
- * Constructs a new <c>MockObjectTestCase</c> instance with the specified name
- *
- * @param name -
- * the name of this test case.
- * @see junit.framework.TestCase
- */
- public MockObjectTestCase(String name)
- {
- super(name);
- }
-
- @Override
- protected <T> DynamicMock newCoreMock(Class<T> mockedType, String roleName)
- {
- return new CoreMock(mockedType, roleName);
- }
-}
diff --git a/tests/org.eclipse.jst.ws.jaxws.testutils/src/org/eclipse/jst/ws/jaxws/testutils/jmock/StubUtils.java b/tests/org.eclipse.jst.ws.jaxws.testutils/src/org/eclipse/jst/ws/jaxws/testutils/jmock/StubUtils.java
deleted file mode 100755
index 95ac877..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.testutils/src/org/eclipse/jst/ws/jaxws/testutils/jmock/StubUtils.java
+++ /dev/null
@@ -1,105 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.testutils.jmock;
-
-import java.util.ArrayList;
-import java.util.Collection;
-
-import org.jmock.core.Stub;
-import org.jmock.core.stub.ReturnStub;
-import org.jmock.core.stub.StubSequence;
-
-/**
- * Utils for creating more complex jmock stubs
- *
- * @author Hristo Sabev
- *
- */
-public class StubUtils
-{
-
- /**
- * Creates a stub that will return the proxy for the next mock in the supplied array on a consequtive call. I.e. the first call returns the proxy
- * at <c>returnValues[0]</c>, the second call will return the proxy for the mock at <c>returnValues[1]</c>, and so forth
- *
- * @param returnValues -
- * the mocks which will be returned on consequtive calls
- * @return - a stub that will return the proxies for the specified mocks on each consequtive call
- */
- public static Stub onConsequtiveCallsWillReturnMocks(Mock<?>[] returnValues)
- {
- final Stub[] returnStubs = new Stub[returnValues.length];
- for (int i = 0; i < returnValues.length; i++)
- {
- returnStubs[i] = new ReturnStub(returnValues[i].proxy());
- }
- return new StubSequence(returnStubs);
- }
-
- /**
- * Converts an array of mocks to an array of proxies for these mocks. All mocks should be mocks for one and the
- * same type.
- * @param <T> - the type of the mocked class
- * @param mocks - the array of mocks to be converted to proxies
- * @param proxies - an array of the type of the proxy. It will be used to store the proxies for the mocks
- * @throws IndexOutOfBoundsException - thrown if the arrays are with different sizes.
- */
- public static <T> void mocksToProxies(Mock<T>[] mocks, T[] proxies) {
- for (int i = 0; i < mocks.length; i++)
- {
- proxies[i] = mocks[i].proxy();
- }
- }
-
- /**
- * Creates a return stub that will return an array of mock proxies for the supplied array of mocks.
- * @param returnValues - an array of mocks, whose proxies has to be returned
- * @return - a stub wich will return an array of proxies in the same order as the passed mocks.
- * @throws IndexOutOfBoundsException - if the two arrays are with different lengths
- */
- public static <T>Stub returnArrayOfMocks(Mock<T>[] returnValues, T[] proxies)
- {
- mocksToProxies(returnValues, proxies);
- return new ReturnStub(proxies);
- }
-
- /**
- * Creates a stub that on consequtive calls will return the next boolean in the supplied array I.e. the first call returns the boolean at
- * <c>returnValues[0]</c>, the second call will return the boolean at <c>returnValues[1]</c>, and so forth
- *
- * @param returnValues -
- * the booleans which will be returned on consequtive calls
- * @return - a stub that will return the booleans for each consequtive call
- */
- public static Stub onConsecutiveCallsWillReturnBoolean(boolean[] returnValues)
- {
- final Stub[] returnStubs = new Stub[returnValues.length];
- for (int i = 0; i < returnValues.length; i++)
- {
- returnStubs[i] = new ReturnStub(returnValues[i]);
- }
- return new StubSequence(returnStubs);
- }
-
- public static <T> Stub returnCollectionContaining(T[] contained) {
- final Collection<T> coll = new ArrayList<T>();
- for(T o : contained) {
- coll.add(o);
- }
- return new ReturnStub(coll);
- }
-
- public static <T> Stub returnCollectionContaining(T contained) {
- final Collection<T> coll = new ArrayList<T>(1);
- coll.add(contained);
- return new ReturnStub(coll);
- }
-}
diff --git a/tests/org.eclipse.jst.ws.jaxws.testutils/src/org/eclipse/jst/ws/jaxws/testutils/jmock/testcases/BeforeAfterEnabler.java b/tests/org.eclipse.jst.ws.jaxws.testutils/src/org/eclipse/jst/ws/jaxws/testutils/jmock/testcases/BeforeAfterEnabler.java
deleted file mode 100755
index 49d1650..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.testutils/src/org/eclipse/jst/ws/jaxws/testutils/jmock/testcases/BeforeAfterEnabler.java
+++ /dev/null
@@ -1,109 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * This class is based on work by Shay Banon (http://www.kimchy.org/before_after_testcase_with_junit/)
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.testutils.jmock.testcases;
-
-import java.lang.reflect.Method;
-import java.util.Vector;
-
-import junit.framework.Test;
-
-public class BeforeAfterEnabler {
-
- private final IBeforeAfterEnabled tc;
-
- private int testCount = 0;
-
- private final int totalTestCount;
-
- private boolean disableAfterTestCase = false;
-
- public BeforeAfterEnabler(IBeforeAfterEnabled tc) {
- this.tc = tc;
- totalTestCount = countTotalTests();
- }
-
- public void runBare() throws Throwable {
- Throwable exception = null;
- if (testCount == 0) {
- beforeTestCase();
- }
- testCount++;
- try {
- tc.runBareInternal();
- } catch (Throwable running) {
- exception = running;
- }
- if (testCount == totalTestCount) {
- if (!disableAfterTestCase) {
- try {
- afterTestCase();
- } catch (Exception afterTestCase) {
- if (exception == null) exception = afterTestCase;
- }
- } else {
- disableAfterTestCase = false;
- }
- }
- if (exception != null) throw exception;
- }
-
- public void disableAfterTestCase() {
- disableAfterTestCase = true;
- }
-
- /**
- * Called before any tests within this test case.
- *
- * @throws Exception
- */
- protected void beforeTestCase() throws Exception {
- tc.beforeTestCase();
- }
-
- /**
- * Called after all the tests within the test case
- * have executed.
- *
- * @throws Exception
- */
- protected void afterTestCase() throws Exception {
- tc.afterTestCase();
- }
-
- private int countTotalTests() {
- int count = 0;
- Class<?> superClass = tc.getClass();
- Vector<String> names = new Vector<String>();
- while (Test.class.isAssignableFrom(superClass)) {
- Method[] methods = superClass.getDeclaredMethods();
- for (Method method : methods) {
- String name = method.getName();
- if (names.contains(name))
- continue;
- names.addElement(name);
- if (isTestMethod(method)) {
- count++;
- }
- }
- superClass = superClass.getSuperclass();
- }
- return count;
- }
-
- private boolean isTestMethod(Method m) {
- String name = m.getName();
- Class<?>[] parameters = m.getParameterTypes();
- Class<?> returnType = m.getReturnType();
- return parameters.length == 0 && name.startsWith("test") && returnType.equals(Void.TYPE);
- }
-}
diff --git a/tests/org.eclipse.jst.ws.jaxws.testutils/src/org/eclipse/jst/ws/jaxws/testutils/jmock/testcases/BeforeAfterTestCase.java b/tests/org.eclipse.jst.ws.jaxws.testutils/src/org/eclipse/jst/ws/jaxws/testutils/jmock/testcases/BeforeAfterTestCase.java
deleted file mode 100755
index 9eaba7f..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.testutils/src/org/eclipse/jst/ws/jaxws/testutils/jmock/testcases/BeforeAfterTestCase.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.testutils.jmock.testcases;
-
-import junit.framework.TestCase;
-
-public abstract class BeforeAfterTestCase extends TestCase implements IBeforeAfterEnabled {
-
- private final BeforeAfterEnabler bfe = new BeforeAfterEnabler(this);
-
- public void runBareInternal() throws Throwable {
- super.runBare();
- }
-
- @Override
- public void runBare() throws Throwable {
- bfe.runBare();
- }
-}
diff --git a/tests/org.eclipse.jst.ws.jaxws.testutils/src/org/eclipse/jst/ws/jaxws/testutils/jmock/testcases/EqualsTestCase.java b/tests/org.eclipse.jst.ws.jaxws.testutils/src/org/eclipse/jst/ws/jaxws/testutils/jmock/testcases/EqualsTestCase.java
deleted file mode 100755
index 5ed0e24..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.testutils/src/org/eclipse/jst/ws/jaxws/testutils/jmock/testcases/EqualsTestCase.java
+++ /dev/null
@@ -1,333 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.testutils.jmock.testcases;
-
-import java.lang.reflect.Modifier;
-import java.util.Iterator;
-
-import junit.framework.TestCase;
-
-/**
- * An abstract test case for the <c>Object.equals(Object)</c> and <c>Object.hashCode()</c> methods. This test case performs the tests for <c>equals</c>
- * and <c>hashCode</c> simultaniesly as they are tightly connected. The tescase test the following properties of equals/hasCode:
- * <p>
- * 1. equals reflexivity 2. equals symetricity 3. equals transitivyte 4. hashCode statbility 5. hashCode immutability 6. equals is suitable for
- * subclasses
- * </p>
- *
- * The test cases is abstract and need to be sublcassed by concrete test case. Several abstract methods need to be implemented by concrete test cases.
- *
- * @author Hristo Sabev
- *
- * @param <T>
- */
-public abstract class EqualsTestCase<T> extends TestCase
-{
-
- private final Class<T> testClass;
-
- /**
- * Creates a new <c>EqualsTestCase</c> instance to test the equals method of the supplied class
- *
- * @param testClass -
- * the class whose equals method will be tested
- */
- public EqualsTestCase(Class<T> testClass)
- {
- this(null, testClass);
- }
-
- /**
- * Creates a new <c>EqualsTestCase</c> instance to test the equals method of the supplied class. This test case also takes a name paramter, which
- * i passed to <c>TestCase</c> super constructor. I.e. this is the name of the test case
- *
- * @param name -
- * name of the test case
- * @param testClass -
- * the class whose equals method will be tested
- */
- public EqualsTestCase(String name, Class<T> testClass)
- {
- assertNotNull("test class passed in constructor was null", testClass);
- this.testClass = testClass;
- }
-
- /**
- * Obtains a new iterator of instances for the tested class.
- *
- * @param iterations -
- * number of iterations i.e the number of times one can invoke <c>Iterator.next()</c> withouth getting <c>NoSuchElementException</c>
- * exception
- * @return a new iterator of instanced for the tested class;
- */
- abstract public Iterator<T> newObjectIterator(int iterations);
-
- /**
- * Obtains a new instance of the tested class. Each call to this method should return a new instance, which is considered equal to the instance
- * returned by the prefvious call but is not identical. For example if the tested class was <c>String</c> the most obvious implementation of this
- * method would be <c>
- * <p>
- * return new String("test string")
- * </p>
- * </c>
- *
- * @return a new instance of the test class assumed to be equal to the previously returned instances
- */
- abstract public T newEqualInstance();
-
- /**
- * Obtains a new instance of a single class, which is a subclass of the tested class. The subclass must not override the <c>equals</c> method of
- * the tested class. All instances should be equal. The returned instances should have the same values of all the inherited fields as the
- * instances retured by <c>newEqualInstance</c>
- *
- * @return returns a new instance of single sublcass of the tested class. Each call should return an instance equal to the previously returned but
- * not identical. Null if the tested class is final
- */
- abstract public T newAncestorEqualInstance();
-
- /**
- * Obtains a new instance of the the tested class. The single restriction on the returned instances is that they should not be equal to the
- * instances returned by <c>newEqualInstance</c>
- *
- * @return a new instance of the test class. The newly returned instance is not equal to the instances returned by <c>newEqualInstance</c>
- */
- abstract public T newNonEqualInstance();
-
- /**
- * Modifies a given instance of the tested class. The instance should be modified in such a way that it's not equal to the instances retured by
- * <c>newEqualInstance</c> ans <c>newNoneEqualInstance()</c>. If the tested class is immutable then the implementation of this method should be
- * empty
- *
- * @param instance -
- * the instance to be modified.
- */
- abstract public void modifyObjectInstance(T instance);
-
- /**
- * Obtains the number of comparisons that will be made for the reflexivity test. This method can be overriden by subclasses to specify a different
- * value. By default this number is 100.
- *
- * @return - the number of comparisons that will be made for the reflexivity test.
- */
- public int getIterationsForReflixivityTest()
- {
- return 100;
- }
-
- /**
- * Obatains the number of comparisons that will be made for the symitricity test. This method can be override by subclasses to specify a different
- * value. By default this number is 1000
- *
- * @return - the number of comparisons that will be made for the reflixivity test.
- */
- public int getIterationsForSymetricityTest()
- {
- return 1000;
- }
-
- /**
- * Obatains the number of comparisons that will be made for the transitivity test. This method can be override by subclasses to specify a
- * different value. By default this number is 2000
- *
- * @return - the number of comparisons that will be made for the transitivity test.
- */
- public int getIterationsForTransitivityTest()
- {
- return 2000;
- }
-
- /**
- * Tests that equals is reflexive. It enforces the rule a.equals(a) == true. This test also tests that hashCode function is stable(). I.e.
- * hashCode doesn't change it's value between several invocations, as well as that hashCode is immutable over object change. The test strategy is
- * to create an new object iterator and then for each returned instance:
- *
- * <ol>
- * <li>Compare it with itself</li>
- * <li>check that its hash code stays the same</li>
- * <li>modify the returned instance by calling <c>modifyInstance</c> and then check the hashCode again</li>
- * </ol>
- *
- */
- public void testEqulsReflexive()
- {
- final int iterationsForThisTest = getIterationsForReflixivityTest();
- final Iterator<T> objectTiterator = newObjectIterator(iterationsForThisTest);
- while (objectTiterator.hasNext())
- {
- final T objectT = objectTiterator.next();
- assertTrue("equals is not reflexive", objectT.equals(objectT));
- final int initialHashCode = objectT.hashCode();
- for (int i = 0; i < iterationsForThisTest; i++)
- {
- assertEquals("hashCode is not stable upon multiple calls", initialHashCode, objectT.hashCode());
- }
- modifyObjectInstance(objectT);
- assertEquals("hashCode is not stable upon modification of the object", initialHashCode, objectT.hashCode());
- }
- }
-
- /**
- * Tests that equals is symetric i.e. a.equals(b) <==> b.equals(a). This method also tests that hashCode behaves correctly in sense a.quals(b) =>
- * a.hashCode() == b.hashCode(). This test uses two object iterators. One for a and one for b, where a and b are from the above rule. Each of
- * these iterators are instantiated with the same number of elements. This method also checks that whenever two instances returned by the two
- * iterators are equal then their hascode is equal.
- *
- */
- public void testEqualsSymetric()
- {
- final int iterationsForThisTest = getIterationsForSymetricityTest();
- final Iterator<T> objectTIterator1 = newObjectIterator(iterationsForThisTest);
- final Iterator<T> objectTIterator2 = newObjectIterator(iterationsForThisTest);
- while (objectTIterator1.hasNext())
- {
- assertTrue("The two object iterators don't have equal number of objects", objectTIterator2.hasNext());
- final T objectT1 = objectTIterator1.next();
- final T objectT2 = objectTIterator2.next();
- if (objectT1.equals(objectT2))
- {
- assertTrue("Equals is not symetric", objectT2.equals(objectT1));
- assertTrue("Hashcode is not the same for equal instances", objectT1.hashCode() == objectT2.hashCode());
- } else if (objectT2.equals(objectT1))
- {
- fail("Equals is not symetric");
- }
- }
- }
-
- /**
- * Tests that equals is transitive i.e. a.equals(b) & b.equals(c) => a.equals(c). This test uses three object iterators. One for a, one for b, and
- * one for c, where a,b,c are from the above rule. Each of these iterators are instantiated with the same number of elements.
- */
- public void testEqualsTransitive()
- {
- final int iterationsForThisTest = getIterationsForTransitivityTest();
- final Iterator<T> objectTIterator1 = newObjectIterator(iterationsForThisTest);
- final Iterator<T> objectTIterator2 = newObjectIterator(iterationsForThisTest);
- final Iterator<T> objectTIterator3 = newObjectIterator(iterationsForThisTest);
-
- while (objectTIterator1.hasNext())
- {
- assertTrue("The three object iterators don't have equal number of objects", objectTIterator2.hasNext());
- assertTrue("The three object iterators don't have equal number of objects", objectTIterator3.hasNext());
- final T objectT1 = objectTIterator1.next();
- final T objectT2 = objectTIterator2.next();
- final T objectT3 = objectTIterator3.next();
-
- if (objectT1.equals(objectT2) && objectT1.equals(objectT3))
- {
- assertTrue("equals is not transitive", objectT2.equals(objectT3));
- }
- }
- }
-
- /**
- * Tests that <c>equal</c> returns false if <c>null</c> is passed as argument
- *
- */
- public void testEqualsReturnsFalseIfNullPassed()
- {
- final T objectT = this.newEqualInstanceCheckCorrect();
- assertFalse("equals returned true when null passed for other object", objectT.equals(null));
- }
-
- /**
- * Tests that <c>equal</c> returns false if a non-equal object is passed as an argument. The two non equal instances are created by calling
- * <c>newEqualInstance</c> and <c> newNonEqualInstance</c>
- *
- */
- public void testEqualsReturnsFalseOnNonEquals()
- {
- final T objectT1 = this.newEqualInstanceCheckCorrect();
- final T objectT2 = this.newNonEqualInstanceCheckCorrect();
- assertTrue("Equals reported true for instances assumed non equal.", !objectT1.equals(objectT2) && !objectT2.equals(objectT1));
- }
-
- /**
- * Tests that <c>equal</cL returns true if an equal object is passed as an argument. The instances that are compared are obtained by two
- * consecutive calls to <c>newEqualInstance</c>
- *
- */
- public void testEqualsReturnsTrueOnEquals()
- {
- final T objectT1 = this.newEqualInstanceCheckCorrect();
- final T objectT2 = this.newEqualInstanceCheckCorrect();
- assertTrue("Equals reported false for instances assumed equal.", objectT1.equals(objectT2) && objectT2.equals(objectT1));
- }
-
- /**
- * Tests that equals returns false if an object of another class is passed. In case that the tested class is not final this test passes a subclass
- * of the test class as an argument to <c>equals</c>. The passed ancestor object has the same value for all its field. This is intended to cahtch
- * wrong implementations using "instanceof" rather than <c>getClass() == other.getClass()</c>
- *
- */
- public void testEqualsReturnsFalseIfOtherClassPassed()
- {
- final T objectT = newEqualInstanceCheckCorrect();
- Object object = newAncestorEqualInstanceCheckCorrect();
- if (object == null)
- {
- // class is final. No ancestor could be created. Use some other class.
- object = new Object();
- }
- assertFalse("equals returned true when object of another type passed", objectT.equals(object));
- }
-
- /**
- * Tests that <c>equals</c> is properly implemented for use in subclasses. It takes two equal ancestor instances and compares them for equality.
- * Since the ancestor class does not override the equals method. The tests asserts that equals should return true.
- *
- */
- public void testEqualsSuitableForAncestors()
- {
- final T ancestorT1 = newAncestorEqualInstanceCheckCorrect();
- final T ancestorT2 = newAncestorEqualInstanceCheckCorrect();
- if (ancestorT1 == null)
- {
- assertNull(
- "The newAncestorInstance() method returned null on the second invocation, while it return a value differet than null from the first",
- ancestorT2);
- return;
- }
- assertTrue(ancestorT1.equals(ancestorT2) && ancestorT2.equals(ancestorT1));
-
- }
-
- private T newAncestorEqualInstanceCheckCorrect()
- {
- final T ancestorT = newAncestorEqualInstance();
- if (ancestorT == null)
- {
- assertTrue("newAncestorEqualInstance returned null, although the test class ", Modifier.isFinal(testClass.getModifiers()));
- } else
- {
- assertTrue("newAncestorEqualInstance returned object of class " + ancestorT.getClass() + ", which is not subtype of "
- + testClass.getName(), testClass.isAssignableFrom(ancestorT.getClass()));
- }
- return ancestorT;
- }
-
- private T newEqualInstanceCheckCorrect()
- {
- final T objectT = newEqualInstance();
- assertTrue("newEqualInstance returned object of class " + objectT.getClass().getName() + "Expected was class " + testClass.getName(),
- testClass == objectT.getClass());
- return objectT;
- }
-
- private T newNonEqualInstanceCheckCorrect()
- {
- final T objectT = newNonEqualInstance();
- assertTrue("newNonEqualInstance returned object of class " + objectT.getClass().getName() + "Expected was class " + testClass.getName(),
- testClass == objectT.getClass());
- return objectT;
- }
-
-}
diff --git a/tests/org.eclipse.jst.ws.jaxws.testutils/src/org/eclipse/jst/ws/jaxws/testutils/jmock/testcases/IBeforeAfterEnabled.java b/tests/org.eclipse.jst.ws.jaxws.testutils/src/org/eclipse/jst/ws/jaxws/testutils/jmock/testcases/IBeforeAfterEnabled.java
deleted file mode 100755
index 9115eed..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.testutils/src/org/eclipse/jst/ws/jaxws/testutils/jmock/testcases/IBeforeAfterEnabled.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.testutils.jmock.testcases;
-
-public interface IBeforeAfterEnabled {
-
- public void beforeTestCase() throws Exception;
-
- public void afterTestCase() throws Exception;
-
- public void runBareInternal() throws Throwable;
-
-
-}
diff --git a/tests/org.eclipse.jst.ws.jaxws.testutils/src/org/eclipse/jst/ws/jaxws/testutils/jobs/JobUtils.java b/tests/org.eclipse.jst.ws.jaxws.testutils/src/org/eclipse/jst/ws/jaxws/testutils/jobs/JobUtils.java
deleted file mode 100755
index d5e208a..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.testutils/src/org/eclipse/jst/ws/jaxws/testutils/jobs/JobUtils.java
+++ /dev/null
@@ -1,248 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.testutils.jobs;
-
-import java.lang.reflect.InvocationTargetException;
-
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.resources.IWorkspaceRunnable;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jdt.core.search.IJavaSearchConstants;
-import org.eclipse.jdt.core.search.SearchEngine;
-import org.eclipse.jdt.core.search.SearchPattern;
-import org.eclipse.jdt.core.search.TypeNameRequestor;
-import org.eclipse.jface.operation.IRunnableWithProgress;
-import org.eclipse.jst.ws.jaxws.testutils.threading.TestContext;
-import org.eclipse.jst.ws.jaxws.utils.logging.ILogger;
-import org.eclipse.jst.ws.jaxws.utils.logging.Logger;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.PlatformUI;
-
-public class JobUtils
-{
- @SuppressWarnings("deprecation")
- public static void waitForJobsInterruptable() throws InterruptedException
- {
- while (Platform.getJobManager().currentJob() != null)
- {
- delay(5);
- }
- }
-
- public static void waitForJobs() throws JavaModelException
- {
- waitForDummyJob(Job.INTERACTIVE);
-
- while (true)
- {
- try
- {
- waitForJobsInterruptable();
- break;
- } catch (InterruptedException ie)
- {
-
- }
- }
-
- // i036509 added couse waiting for jobs is not enought
- waitForIndexer();
-
- // Force notifications
- waitForNotifications();
- }
-
- public static void delay(final long millis) throws InterruptedException
- {
- Display display = Display.getCurrent();
- // if this is the UI thread, then process the input
- if (display != null)
- {
- final long entTimeMillis = System.currentTimeMillis() + millis;
- while (System.currentTimeMillis() < entTimeMillis)
- {
- if (!display.readAndDispatch())
- {
- display.sleep();
- }
- }
- display.update();
- } else
- {
- Thread.sleep(1000);
- }
- }
-
- public static void waitForIndexer() throws JavaModelException
- {
- new SearchEngine().searchAllTypeNames(null,SearchPattern.R_EXACT_MATCH, null,
- SearchPattern.R_CASE_SENSITIVE, IJavaSearchConstants.CLASS, SearchEngine
- .createJavaSearchScope(new IJavaElement[0]), new TypeNameRequestor()
- {
- @SuppressWarnings("unused")
- public void acceptClass(char[] packageName, char[] simpleTypeName, char[][] enclosingTypeNames,
- String path)
- {
- }
- @SuppressWarnings("unused")
- public void acceptInterface(char[] packageName, char[] simpleTypeName, char[][] enclosingTypeNames,
- String path)
- {
- }
- }, IJavaSearchConstants.WAIT_UNTIL_READY_TO_SEARCH, null);
- }
-
- /**
- * Schedule a dummy job with the priority specified and wait for it is done
- */
- private static void waitForDummyJob(final int priority)
- {
- try
- {
- waitForDummyJobWithPrio(priority);
- }
- catch(InterruptedException e)
- {
-
- }
- }
-
- private static void waitForDummyJobWithPrio(final int prio) throws InterruptedException
- {
- Job myDummyJob = new Job("DUMMY"){
-
- @Override
- protected IStatus run(IProgressMonitor monitor)
- {
- return Status.OK_STATUS;
- }};
-
- myDummyJob.setPriority(prio);
- myDummyJob.setUser(false);
- myDummyJob.schedule();
-
- myDummyJob.join();
- }
-
-
- /**
- * Forces delivering of notification events. The implementation of the method is "inspired" by NotificationManager's notification job
- * @throws InterruptedException
- */
- private static void waitForNotifications()
- {
- final IWorkspace workspace = ResourcesPlugin.getWorkspace();
- final IWorkspaceRunnable dummyRunnable = new IWorkspaceRunnable(){
- public void run(IProgressMonitor monitor) throws CoreException
- {
- }
- };
-
- final Job notifForcingJob = new Job("Delivering notifications..."){
-
- @Override
- protected IStatus run(IProgressMonitor monitor)
- {
- try
- {
- workspace.run(dummyRunnable, null, IWorkspace.AVOID_UPDATE, null);
- } catch (CoreException e)
- {
- logger().logDebug( e.getMessage(), e );
- }
- return Status.OK_STATUS;
- }};
-
- syncExecJob(notifForcingJob, PlatformUI.getWorkbench().getDisplay());
- }
-
- public static void waitForJobsSlow() throws JavaModelException
- {
- waitForJobs();
- waitForDummyJob(Job.DECORATE);
-
- waitForEventLoop();
- }
-
- private static void waitForEventLoop()
- {
- final Display display = PlatformUI.getWorkbench().getDisplay();
-
- final Runnable runnable = new Runnable(){
-
- public void run()
- {
- // Let the display process the events in its queue
- while(display.readAndDispatch()){};
- }};
-
- if(Display.getCurrent() != null)
- {
- runnable.run();
- }
- else
- {
- display.syncExec(runnable);
- }
-
- }
-
- /**
- * Executes synchronously (schedules and joins) the job specified.<br>
- * If the method is called from the UI thread, the job is scheduled and joined in a modal context thread thus letting the event loop process asynchronous events<br>
- * If the method is called from a worker thread, the job is scheduled and joined in the caller thread.
- *
- * @param job
- * @param display
- */
- private static void syncExecJob(final Job job, final Display display)
- {
- final IRunnableWithProgress runnable = new IRunnableWithProgress()
- {
-
- public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException
- {
- job.schedule();
- try
- {
- job.join();
- } catch (InterruptedException e)
- {
- logger().logDebug(e.getMessage(), e);
- }
- }
- };
- try
- {
- TestContext.run(runnable, Display.getCurrent() != null, new NullProgressMonitor(), display);
- } catch (InvocationTargetException e)
- {
- logger().logDebug(e.getMessage(), e);
- } catch (InterruptedException e)
- {
- logger().logDebug(e.getMessage(), e);
- }
- }
-
- private static ILogger logger()
- {
- return new Logger();
- }
-}
diff --git a/tests/org.eclipse.jst.ws.jaxws.testutils/src/org/eclipse/jst/ws/jaxws/testutils/project/ClassLoadingTest.java b/tests/org.eclipse.jst.ws.jaxws.testutils/src/org/eclipse/jst/ws/jaxws/testutils/project/ClassLoadingTest.java
deleted file mode 100755
index d3cac49..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.testutils/src/org/eclipse/jst/ws/jaxws/testutils/project/ClassLoadingTest.java
+++ /dev/null
@@ -1,153 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.testutils.project;
-
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jdt.core.IPackageFragment;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.JavaModelException;
-
-/**
- * Extends {@link ProjectBasedTest} by adding finctionalities to create classes in some package eider by reading it from text file or passed as
- * strings.
- *
- * </pre>
- *
- * @author Georgi Vachkov
- */
-@SuppressWarnings("nls")
-public abstract class ClassLoadingTest extends ProjectBasedTest
-{
- private final static String JAVA_EXT = ".java";
-
- private final static char SEPARATOR = '#';
-
- protected IPackageFragment defaultPackage;
-
- public void createJavaProject(String srcFolder, String defaultPackageName) throws CoreException
- {
- createJavaProject(srcFolder);
-
- if (defaultPackageName != null)
- {
- defaultPackage = getSourceFolder().createPackageFragment(defaultPackageName, true, null);
- }
- }
-
- /**
- * Creates class in test project. <code>sourceFilePath</code> must contain the class source without package declaration. The class is created in
- * default package.
- *
- * Project must be created before this method is called.
- *
- * @param sourceFilePath
- * @param className
- * @return IType object for the created class
- * @throws IOException
- * @throws JavaModelException
- */
- protected IType createClass(String sourceFilePath, String className) throws IOException, JavaModelException
- {
- if (sourceFilePath == null)
- {
- throw new NullPointerException("sourceFilePath should not be null.");
- }
-
- String source = TestProjectsUtils.readSource(this.getClass(), sourceFilePath);
-
- return createClass(defaultPackage, className, source);
- }
-
- /**
- * Creates class in <code>pck</code> package with name and source <code>className, source</code>. Source must not incluse package
- * declaration. Project must be created before this method is called.
- *
- * @param pck
- * @param className
- * @param source
- * @return
- * @throws NullPointerException
- * in case some of the params is null.
- * @throws JavaModelException
- */
- protected IType createClass(IPackageFragment pck, String className, String source) throws JavaModelException
- {
- if (className == null)
- {
- throw new NullPointerException("param 'className' should not be null.");
- }
-
- if (source == null)
- {
- throw new NullPointerException("param 'source' should not be null.");
- }
-
- if (getTestProject() == null)
- {
- throw new NullPointerException("project must be created before classes can be added to it");
- }
-
- return getTestProject().createType(pck, className + JAVA_EXT, source);
- }
-
- /**
- * Reads the content of <code>sourcesFilePath</code> and creates classes in test project. The content of <code>sourcesFilePath</code> sould be -
- * '#' char (separator for classes) followed by Class name, new line and after that class source without package declaration.<br>
- * Example:
- *
- * <pre>
- * #ImplementsRemote
- * public class ImplementsRemote implements java.rmi.Remote
- * {
- * }
- *
- * #NoDefaultConstructor
- * public class NoDefaultConstructor implements java.io.Serializable
- * {
- * public NoDefaultConstructor(String param) {
- * }
- * }
- * </pre>
- *
- * This method is useful if lots of small classes should be created from a source file. Project must be created before this method is called.
- *
- * @param sourcesFilePath
- * @return map of className->IType. that have been created
- * @throws Exception
- */
- protected Map<String, IType> createClasses(String sourcesFilePath) throws Exception
- {
- Map<String, IType> types = new HashMap<String, IType>();
- String source = TestProjectsUtils.readSource(this.getClass(), sourcesFilePath);
-
- int startPos = 0;
- while ((startPos = source.indexOf(SEPARATOR)) > -1)
- {
- int endPos = source.indexOf(SEPARATOR, startPos + 1);
- if (endPos == -1)
- endPos = source.length();
-
- String src = source.substring(startPos + 1, endPos);
- source = source.substring(endPos);
-
- String className = src.substring(0, src.indexOf('\n')).replaceAll("\r", "");
- src = src.substring(src.indexOf('\n') + 1);
-
- types.put(className, createClass(defaultPackage, className, src));
- }
-
- return types;
- }
-}
diff --git a/tests/org.eclipse.jst.ws.jaxws.testutils/src/org/eclipse/jst/ws/jaxws/testutils/project/ProjectBasedTest.java b/tests/org.eclipse.jst.ws.jaxws.testutils/src/org/eclipse/jst/ws/jaxws/testutils/project/ProjectBasedTest.java
deleted file mode 100755
index 44e0898..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.testutils/src/org/eclipse/jst/ws/jaxws/testutils/project/ProjectBasedTest.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.testutils.project;
-
-import junit.framework.TestCase;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jdt.core.IPackageFragmentRoot;
-
-/**
- * General class for tests that should be started as JUnit Plugin tests. Provides basic functionalities for functional testing: 1. Create Java project
- * in junit-runtime-workbench. 2. Create default source folder. 3. Create default package.
- *
- * @author Georgi Vachkov
- */
-public abstract class ProjectBasedTest extends TestCase
-{
- private TestProject project;
-
- /**
- * <code>srcFolderName</code> the source folder where classes will be created, <code>packageName</code> is the package where classes will be
- * created.
- *
- * @param srcFolderName
- * @throws CoreException
- * @throws NullPointerException -
- * in case srcFolderName is null
- */
- protected void createJavaProject(String srcFolderName) throws CoreException
- {
- if (srcFolderName == null)
- {
- throw new NullPointerException("srcFolderName should not be null.");
- }
-
- project = new TestProject();
- project.createSourceFolder(srcFolderName);
- }
-
- @Override
- protected void tearDown() throws Exception
- {
- if (project != null)
- {
- project.dispose();
- }
- }
-
- protected final TestProject getTestProject()
- {
- return project;
- }
-
- protected IPackageFragmentRoot getSourceFolder()
- {
- return project.getSourceFolder();
- }
-
- protected String getProjectName()
- {
- return project.getProject().getName();
- }
-}
diff --git a/tests/org.eclipse.jst.ws.jaxws.testutils/src/org/eclipse/jst/ws/jaxws/testutils/project/TestEjb3Project.java b/tests/org.eclipse.jst.ws.jaxws.testutils/src/org/eclipse/jst/ws/jaxws/testutils/project/TestEjb3Project.java
deleted file mode 100755
index a0a79b5..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.testutils/src/org/eclipse/jst/ws/jaxws/testutils/project/TestEjb3Project.java
+++ /dev/null
@@ -1,149 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.testutils.project;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.URL;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IPackageFragment;
-import org.eclipse.jdt.core.IPackageFragmentRoot;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jst.ws.jaxws.utils.ContractChecker;
-import org.eclipse.jst.ws.jaxws.utils.exception.MissingResourceException;
-
-public class TestEjb3Project
-{
- private IProject ejbProject;
-
- public TestEjb3Project(final String name) throws Exception
- {
- ejbProject = createEjbModule(name + "_" + Long.toString(System.currentTimeMillis()));
- }
-
- public TestEjb3Project(final String name, final boolean appendUid, final boolean reuseExisting) throws Exception
- {
- final StringBuilder projectName = new StringBuilder(name);
- if (appendUid)
- {
- projectName.append("_");
- projectName.append(Long.toString(System.currentTimeMillis()));
- }
- IProject existingProject = null;
- if (reuseExisting)
- {
- existingProject = ResourcesPlugin.getWorkspace().getRoot().getProject(projectName.toString());
- }
- if (existingProject == null)
- {
- this.ejbProject = createEjbModule(projectName.toString());
- } else
- {
- this.ejbProject = existingProject;
- }
- }
-
- private IProject createEjbModule(final String name) throws Exception {
- return TestProjectsUtils.createEjb3Project(name);
- }
-
- public IProject getProject()
- {
- return ejbProject.getProject();
- }
-
- public IFolder getMetaInfFolder() throws MissingResourceException
- {
- return ejbProject.getProject().getFolder("ejbModule").getFolder("META-INF");
- }
-
- public IPackageFragment createPackage(String sourceFolder, String packageName) throws JavaModelException
- {
- final IJavaProject javaProject = JavaCore.create(getProject());
- final IFolder folder = getProject().getFolder(sourceFolder);
- final IPackageFragmentRoot srcFolder = javaProject.getPackageFragmentRoot(folder);
- return srcFolder.createPackageFragment(packageName, false, new NullProgressMonitor());
- }
-
- public IFile createFile(final IFolder folder, final String fileName, final URL inputUrl) throws IOException, CoreException
- {
- ContractChecker.nullCheckParam(folder, "folder");
- ContractChecker.nullCheckParam(fileName, "fileName");
- ContractChecker.nullCheckParam(inputUrl, "inputUrl");
-
- final IFile file = folder.getFile(fileName);
- final InputStream inputStream = inputUrl.openStream();
- try
- {
- file.create(inputStream, false, new NullProgressMonitor());
- return file;
- }
- finally
- {
- inputStream.close();
- }
- }
-
- /** To get a handle to a file located in this project specified by the relative file path.
- * @param filePath file path relative inside of the project, i.e. the project name must NOT
- * be part of the path
- * @return the file handle */
- public final IFile getFile(final String filePath)
- {
- ContractChecker.nullCheckParam(filePath, "filePath");
- return this.ejbProject.getProject().getFile(filePath);
- }
-
- public final void deleteFile(final IFolder folder, final String fileName) throws CoreException, IOException
- {
- ContractChecker.nullCheckParam(folder, "folder");
- ContractChecker.nullCheckParam(fileName, "fileName");
-
- final IFile file = folder.getFile(fileName);
- if (file.exists())
- {
- file.delete(true, new NullProgressMonitor());
- }
- }
-
- /** To create a project folder specified by the relative folder path. All folder segments
- * have already to exist apart from the last one, i.e. parent folders are not created automatically.
- * @param folderPath folder path relative inside of the project, i.e. the project name must NOT
- * be part of the path
- * @return the created folder
- * @throws CoreException */
- public final IFolder createFolder(final String folderPath) throws CoreException
- {
- ContractChecker.nullCheckParam(folderPath, "folderPath");
-
- final IFolder folder = this.ejbProject.getProject().getFolder(folderPath);
- folder.create(true, true, null);
- return folder;
- }
-
- /** To get a handle to a project folder specified by the relative folder path.
- * @param folderPath folder path relative inside of the project, i.e. the project name must NOT
- * be part of the path
- * @return the folder handle */
- public final IFolder getFolder(final String folderPath)
- {
- ContractChecker.nullCheckParam(folderPath, "folderPath");
- return this.ejbProject.getProject().getFolder(folderPath);
- }
-}
diff --git a/tests/org.eclipse.jst.ws.jaxws.testutils/src/org/eclipse/jst/ws/jaxws/testutils/project/TestProject.java b/tests/org.eclipse.jst.ws.jaxws.testutils/src/org/eclipse/jst/ws/jaxws/testutils/project/TestProject.java
deleted file mode 100755
index 020758b..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.testutils/src/org/eclipse/jst/ws/jaxws/testutils/project/TestProject.java
+++ /dev/null
@@ -1,390 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.testutils.project;
-
-import java.io.IOException;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.core.internal.resources.ResourceException;
-import org.eclipse.core.resources.IContainer;
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IProjectDescription;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.FileLocator;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jdt.core.IClasspathEntry;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IPackageFragment;
-import org.eclipse.jdt.core.IPackageFragmentRoot;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jdt.launching.JavaRuntime;
-import org.eclipse.jst.ws.jaxws.testutils.jobs.JobUtils;
-import org.eclipse.jst.ws.jaxws.utils.ContractChecker;
-import org.osgi.framework.Bundle;
-
-@SuppressWarnings("restriction")
-public class TestProject
-{
- public final static char CLASS_SEPARATOR = '#';
-
- private int idInMillis = 0;
-
- private IProject project;
-
- private IJavaProject javaProject;
-
- private IPackageFragmentRoot sourceFolder;
-
- public TestProject() throws CoreException
- {
- this("");
- }
-
- public TestProject(String name) throws CoreException
- {
- IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot();
- /*
- * Calculate the name of the test project. The formula: JavaProj_ + <current_time_in_millis? + <idInMillis> is ussed. In this formula
- * JavaProj_ is a string litteral, current_time_in_millis is obvious. idInMillis is an integer incremented each time a project name is
- * calculated. This is necessary because the system timer has precision about 10 ms. Thus it's possible that two consecutive project creations
- * give the same project name. For example the project is creted then the test executes very fast and a new project is created again. In the
- * same time simply the id is not enough as a different test run might produce the same project name. Thus the combination tim_millis +
- * idInMillis gives a unique project name
- */
- final String testProjectName = "JavaProj_" + Long.toString(System.currentTimeMillis()) + "_" + idInMillis++ + name;
- project = root.getProject(testProjectName);
- project.create(null);
- project.open(null);
-
- configureJavaProject();
- }
-
- private void configureJavaProject() throws CoreException
- {
- javaProject = JavaCore.create(project);
-
- IFolder binFolder = createBinFolder();
-
- setJavaNature();
- javaProject.setRawClasspath(new IClasspathEntry[0], null);
-
- createOutputFolder(binFolder);
- addSystemLibraries();
- }
-
- public TestProject(final IProject project) throws CoreException
- {
- if (project == null)
- {
- throw new NullPointerException("project should not be null");
- }
-
- this.project = project;
- this.javaProject = JavaCore.create(project);
- this.sourceFolder = findSourceFolder();
- }
-
- private IPackageFragmentRoot findSourceFolder() throws JavaModelException
- {
- for (IPackageFragmentRoot pfr : javaProject.getAllPackageFragmentRoots())
- {
- if (pfr.getKind() == IPackageFragmentRoot.K_SOURCE)
- {
- return pfr;
- }
- }
-
- return null;
- }
-
- public IProject getProject()
- {
- return project;
- }
-
- public IJavaProject getJavaProject()
- {
- return javaProject;
- }
-
- public void addJar(String plugin, String jar) throws MalformedURLException, IOException, JavaModelException
- {
- Path result = findFileInPlugin(plugin, jar);
- IClasspathEntry[] oldEntries = javaProject.getRawClasspath();
- IClasspathEntry[] newEntries = new IClasspathEntry[oldEntries.length + 1];
- System.arraycopy(oldEntries, 0, newEntries, 0, oldEntries.length);
- newEntries[oldEntries.length] = JavaCore.newLibraryEntry(result, null, null);
- javaProject.setRawClasspath(newEntries, null);
-
- String log = "\n"+javaProject.getProject().getName()+"\n"+String.valueOf(javaProject.getRawClasspath().length)+"\n";
-
- for(int ii=0; ii < javaProject.getRawClasspath().length; ii++)
- {
- log = log + javaProject.getRawClasspath()[ii].getPath().toString()+"\n";
- }
-
- if(javaProject.getRawClasspath().length==0)
- {
- log = log + "Classpath not initialized !\n";
- }
-
- ResourcesPlugin.getPlugin().getLog().log(new Status(0,"testOutput",log));
- }
-
- public IPackageFragment createPackage(String name) throws CoreException
- {
- if (sourceFolder == null)
- sourceFolder = createSourceFolder("src");
- return sourceFolder.createPackageFragment(name, false, null);
- }
-
- public IType createType(IPackageFragment pack, String cuName, String source) throws JavaModelException
- {
- StringBuffer buf = new StringBuffer();
- buf.append("package " + pack.getElementName() + ";\n");
- buf.append("\n");
- buf.append(source);
- ICompilationUnit cu = pack.createCompilationUnit(cuName, buf.toString(), false, null);
- return cu.getTypes()[0];
- }
-
-
- /**
- * Creates multiple classes in project. The content of <code>source</code> should be in form -
- * '#' char (separator for classes) followed by Class name, new line and after that class source without package declaration.<br>
- * Example:
- *
- * <pre>
- * #ImplementsRemote
- * public class ImplementsRemote implements java.rmi.Remote
- * {
- * }
- *
- * #NoDefaultConstructor
- * public class NoDefaultConstructor implements java.io.Serializable
- * {
- * public NoDefaultConstructor(String param) {
- * }
- * }
- * </pre>
- *
- * This method is useful if lots of small classes should be created from a source file.
- *
- * @param sourcesFilePath
- * @return map of className->IType. that have been created
- * @throws Exception
- */
- public Map<String, IType> createTypes(IPackageFragment pack, String source) throws Exception
- {
- Map<String, IType> types = new HashMap<String, IType>();
- int startPos = 0;
- while ((startPos = source.indexOf(CLASS_SEPARATOR)) > -1)
- {
- int endPos = source.indexOf(CLASS_SEPARATOR, startPos + 1);
- if (endPos == -1) {
- endPos = source.length();
- }
-
- String src = source.substring(startPos + 1, endPos);
- source = source.substring(endPos);
-
- String className = src.substring(0, src.indexOf('\n')).replaceAll("\r", "").trim();
- src = src.substring(src.indexOf('\n') + 1);
-
- types.put(className, createType(pack, className + ".java", src));
- }
-
- return types;
- }
-
- public void dispose() throws CoreException
- {
- JobUtils.waitForJobs();
- try {
- project.refreshLocal(IResource.DEPTH_INFINITE, null);
- project.delete(true, true, null);
- } catch (ResourceException re) {
- /*
- * silently swallow the resource exception. For some reason this exception gets thrown
- * from time to time and reports the test failing. The project deletion itself happens
- * after the test has completed and a failure will not report a problem in the test.
- * Only ResourceException is caught in order not to hide unexpected errors.
- */
- return;
- }
- }
- public void close() throws CoreException
- {
- JobUtils.waitForJobs();
-
- project.close(new NullProgressMonitor());
- }
-
- private IFolder createBinFolder() throws CoreException
- {
- IFolder binFolder = project.getFolder("bin");
- binFolder.create(false, true, null);
- return binFolder;
- }
-
- private void setJavaNature() throws CoreException
- {
- IProjectDescription description = project.getDescription();
- description.setNatureIds(new String[] { JavaCore.NATURE_ID });
- project.setDescription(description, null);
- }
-
- private void createOutputFolder(IFolder binFolder) throws JavaModelException
- {
- IPath outputLocation = binFolder.getFullPath();
- javaProject.setOutputLocation(outputLocation, null);
- }
-
- public IPackageFragmentRoot createSourceFolder(String name) throws CoreException
- {
- IFolder folder = project.getFolder(name);
- folder.create(false, true, null);
- IPackageFragmentRoot root = javaProject.getPackageFragmentRoot(folder);
-
- IClasspathEntry[] oldEntries = javaProject.getRawClasspath();
- IClasspathEntry[] newEntries = new IClasspathEntry[oldEntries.length + 1];
- System.arraycopy(oldEntries, 0, newEntries, 0, oldEntries.length);
- newEntries[oldEntries.length] = JavaCore.newSourceEntry(root.getPath());
- javaProject.setRawClasspath(newEntries, null);
- this.sourceFolder = root;
-
- String log = "\n"+javaProject.getProject().getName()+"\n"+String.valueOf(javaProject.getRawClasspath().length)+"\n";
-
- for(int ii=0; ii < javaProject.getRawClasspath().length; ii++)
- {
- log = log + javaProject.getRawClasspath()[ii].getPath().toString()+"\n";
- }
-
- if(javaProject.getRawClasspath().length==0)
- {
- log = log + "Classpath not initialized !\n";
- }
-
- ResourcesPlugin.getPlugin().getLog().log(new Status(0,"testOutput",log));
-
- return root;
- }
-
- private void addSystemLibraries() throws JavaModelException
- {
- IClasspathEntry[] oldEntries = javaProject.getRawClasspath();
- IClasspathEntry[] newEntries = new IClasspathEntry[oldEntries.length + 1];
- System.arraycopy(oldEntries, 0, newEntries, 0, oldEntries.length);
- newEntries[oldEntries.length] = JavaRuntime.getDefaultJREContainerEntry();
- javaProject.setRawClasspath(newEntries, null);
-
- String log = "\n"+javaProject.getProject().getName()+"\n"+String.valueOf(javaProject.getRawClasspath().length)+"\n";
-
- for(int ii=0; ii < javaProject.getRawClasspath().length; ii++)
- {
- log = log + javaProject.getRawClasspath()[ii].getPath().toString()+"\n";
- }
-
- if(javaProject.getRawClasspath().length==0)
- {
- log = log + "Classpath not initialized !\n";
- }
-
- ResourcesPlugin.getPlugin().getLog().log(new Status(0,"testOutput",log));
- }
-
- private Path findFileInPlugin(String plugin, String file) throws MalformedURLException, IOException
- {
- Bundle pluginBundle = Platform.getBundle(plugin);
- URL jarURL = new URL(pluginBundle.getEntry("/"), file);
- URL localJarURL = FileLocator.toFileURL(jarURL);
- return new Path(localJarURL.getPath());
- }
-
- public IPackageFragmentRoot getSourceFolder()
- {
- return sourceFolder;
- }
-
- /**
- *
- * @return the container corresponding to the package fragment root, i.e. the source folder.<br>
- * If this project is a jar/zip (if this is possible at all), the method will return null.
- */
- public IContainer getSourceFolderContainer()
- {
- try{
- IResource res = getSourceFolder().getCorrespondingResource();
- if(res==null) {
- return null;
- }else {
- IContainer retVal = (IContainer) res;
- return retVal;
- }
- }catch(JavaModelException ex) {
- return null;
- }catch(ClassCastException ex) {
- return null;
- }
- }
-
- public IFolder createFolder(final String folderName) throws CoreException
- {
- ContractChecker.nullCheckParam(folderName, "folderName");
- final IFolder folder = this.project.getFolder(folderName);
- folder.create(false, true, null);
- return folder;
- }
-
- /**
- * Set the project root as source folder
- * @throws JavaModelException
- */
- public void assignProjectRootAsSourceFolder() throws JavaModelException
- {
- IClasspathEntry defaultSrcFolderEntry = JavaCore.newSourceEntry(project.getFullPath());
- IClasspathEntry[] oldCp = javaProject.getRawClasspath();
- IClasspathEntry[] newCp = new IClasspathEntry[oldCp.length + 1];
- System.arraycopy(oldCp, 0, newCp, 0, oldCp.length);
- newCp[newCp.length - 1] = defaultSrcFolderEntry;
-
- javaProject.setRawClasspath(newCp, null);
- this.sourceFolder = TestProjectsUtils.getSourceFolder(project, "");
-
- String log = "\n"+javaProject.getProject().getName()+"\n"+String.valueOf(javaProject.getRawClasspath().length)+"\n";
-
- for(int ii=0; ii < javaProject.getRawClasspath().length; ii++)
- {
- log = log + javaProject.getRawClasspath()[ii].getPath().toString()+"\n";
- }
-
- if(javaProject.getRawClasspath().length==0)
- {
- log = log + "Classpath not initialized !\n";
- }
-
- ResourcesPlugin.getPlugin().getLog().log(new Status(0,"testOutput",log));
- }
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.ws.jaxws.testutils/src/org/eclipse/jst/ws/jaxws/testutils/project/TestProjectsUtils.java b/tests/org.eclipse.jst.ws.jaxws.testutils/src/org/eclipse/jst/ws/jaxws/testutils/project/TestProjectsUtils.java
deleted file mode 100755
index ebb3382..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.testutils/src/org/eclipse/jst/ws/jaxws/testutils/project/TestProjectsUtils.java
+++ /dev/null
@@ -1,303 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.testutils.project;
-
-import java.io.BufferedWriter;
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.io.OutputStreamWriter;
-import java.lang.reflect.InvocationTargetException;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.resources.IContainer;
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IProjectDescription;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.jdt.core.IClasspathEntry;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IPackageFragmentRoot;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jdt.core.search.IJavaSearchConstants;
-import org.eclipse.jdt.core.search.SearchEngine;
-import org.eclipse.jdt.core.search.SearchPattern;
-import org.eclipse.jdt.core.search.TypeNameRequestor;
-import org.eclipse.jdt.launching.JavaRuntime;
-import org.eclipse.jface.operation.IRunnableWithProgress;
-import org.eclipse.jst.ws.jaxws.testutils.jobs.JobUtils;
-import org.eclipse.jst.ws.jaxws.testutils.threading.TestContext;
-import org.eclipse.jst.ws.jaxws.utils.logging.Logger;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.wst.common.project.facet.core.IFacetedProject;
-import org.eclipse.wst.common.project.facet.core.IProjectFacet;
-import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager;
-
-public class TestProjectsUtils
-{
- /**
- * Reads content of text file and returns it as String.
- *
- * @param class context
- * @param name
- * @return
- * @throws IOException
- */
- public static String readSource(Class<?> classContext, String filePath) throws IOException
- {
- InputStreamReader isr = new InputStreamReader(classContext.getResourceAsStream(filePath));
- try
- {
- StringBuffer sb = new StringBuffer();
- char[] buff = new char[512];
-
- int len = 0;
- while ((len = isr.read(buff)) > 0)
- {
- sb.append(String.valueOf(buff, 0, len));
- }
-
- return sb.toString();
-
- } finally
- {
- isr.close();
- }
- }
-
- /**
- * Starts an indexer job. This method is useful to make sure that all workbench refresh/build processes are over
- * @throws JavaModelException
- */
- public static void waitForIndexer() throws JavaModelException
- {
- new SearchEngine().searchAllTypeNames(null, SearchPattern.R_EXACT_MATCH,
- null, SearchPattern.R_CASE_SENSITIVE,
- IJavaSearchConstants.CLASS,
- SearchEngine.createJavaSearchScope(new IJavaElement[0]), new TypeNameRequestor()
- {
- @SuppressWarnings("unused")
- public void acceptClass(char[] packageName, char[] simpleTypeName, char[][] enclosingTypeNames,
- String path)
- {
- }
- @SuppressWarnings("unused")
- public void acceptInterface(char[] packageName, char[] simpleTypeName, char[][] enclosingTypeNames,
- String path)
- {
- }
- },
- IJavaSearchConstants.WAIT_UNTIL_READY_TO_SEARCH, null);
- }
-
-
- public static IProject createJavaProject(String projectName) throws CoreException
- {
- IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(projectName);
- project.create(null);
- project.open(null);
- JobUtils.waitForIndexer();
-
- IProjectDescription description = project.getDescription();
- description.setNatureIds(new String[] { JavaCore.NATURE_ID });
- project.setDescription(description, null);
- IJavaProject javaP = JavaCore.create(project);
- addToClasspath(javaP, JavaRuntime.getDefaultJREContainerEntry());
-
- return project;
- }
-
- private static void addToClasspath(final IJavaProject javaProject, final IClasspathEntry cpEntry) throws JavaModelException
- {
- IClasspathEntry[] oldEntries = javaProject.getRawClasspath();
- IClasspathEntry[] newEntries = new IClasspathEntry[oldEntries.length + 1];
- System.arraycopy(oldEntries, 0, newEntries, 0, oldEntries.length);
- newEntries[oldEntries.length] = cpEntry;
- javaProject.setRawClasspath(newEntries, null);
- }
-
- public static IPackageFragmentRoot getSourceFolder(IProject project, String folderName) throws JavaModelException
- {
- IJavaProject javaProject = JavaCore.create(project);
- for(IPackageFragmentRoot root : javaProject.getPackageFragmentRoots())
- {
- if(root.getElementName().equals(folderName))
- {
- return root;
- }
- }
-
- return null;
- }
-
- public static IPackageFragmentRoot createSourceFolder(IProject project, String folderName) throws CoreException
- {
- if(getSourceFolder(project, folderName) != null)
- {
- throw new IllegalStateException("Source folder already exists: " + folderName);
- }
-
- IFolder srcFolder = project.getFolder(folderName);
- srcFolder.create(true, true, null);
-
- IJavaProject javaProject = JavaCore.create(project);
- IClasspathEntry srcCpEntry = JavaCore.newSourceEntry(srcFolder.getFullPath().makeAbsolute());
- IClasspathEntry[] oldEntries = javaProject.getRawClasspath();
- IClasspathEntry[] newEntries = new IClasspathEntry[oldEntries.length + 1];
- System.arraycopy(oldEntries, 0, newEntries, 0, oldEntries.length);
- newEntries[newEntries.length - 1] = srcCpEntry;
- javaProject.setRawClasspath(newEntries, null);
-
- return getSourceFolder(project, folderName);
- }
-
- /**
- * Imports a file into a project
- * @param classContext the class which classloader is used to get the source resource
- * @param relativeSrcFileLocation source file location relative to the <code>classContext</code> parameter
- * @param targetResource the target resource;
- * @param targetFileName the name of the file to be created
- * @throws IOException
- * @returns the file imported
- */
- public static File importFileIntoProject(Class<?> classContext, String relativeSrcFileLocation, IContainer targetResource, String targetFileName) throws IOException
- {
- String src = TestProjectsUtils.readSource(classContext, relativeSrcFileLocation);
- File f = new File(targetResource.getLocation().toOSString() + "\\" + targetFileName);
-
- if(f.exists())
- {
- throw new IllegalStateException("File already exists: " + f.getAbsolutePath());
- }
-
- if(f.isDirectory())
- {
- throw new IllegalStateException(f.getAbsolutePath() + " is a directory");
- }
- if( f.createNewFile() )
- {
- BufferedWriter out = new BufferedWriter(new OutputStreamWriter(new FileOutputStream(f)));
- out.write(src);
- out.flush();
- out.close();
- }
-
- return f;
- }
-
- public static void deleteWorkspaceProjects() throws JavaModelException
- {
- final IProgressMonitor monitor = new NullProgressMonitor();
- JobUtils.waitForJobs();
- for(IProject project : ResourcesPlugin.getWorkspace().getRoot().getProjects())
- {
- try
- {
- project.delete(false, monitor);
- } catch (CoreException e)
- {
- (new Logger()).logError(e.getMessage());
- }
- JobUtils.waitForJobs();
- }
- }
-
- public static IProject createEjb3Project(final String projectName) throws CoreException
- {
- final IProject ejbProject = createProjectWithFacet(projectName, new String[]{"jst.java", "jst.ejb"}, new String[]{"5.0", "3.0"});
- final IJavaProject javaP = JavaCore.create(ejbProject);
-
- removeAllSourceFolders(javaP);
-
- // Set ejbModule folder (created during jst.ejb facet installation) as source folder
- final IFolder srcFolder = ejbProject.getFolder("ejbModule");
- final IClasspathEntry ejbModuleCpEntry = JavaCore.newSourceEntry(srcFolder.getFullPath().makeAbsolute());
- addToClasspath(JavaCore.create(ejbProject), ejbModuleCpEntry);
-
- return ejbProject;
- }
-
- private static void removeAllSourceFolders(final IJavaProject javaP) throws JavaModelException
- {
- final List<IClasspathEntry> newClasspath = new ArrayList<IClasspathEntry>();
- for(IClasspathEntry cpEntry : javaP.getRawClasspath())
- {
- if(cpEntry.getEntryKind() == IClasspathEntry.CPE_SOURCE)
- {
- continue;
- }
- newClasspath.add(cpEntry);
- }
- javaP.setRawClasspath(newClasspath.toArray(new IClasspathEntry[newClasspath.size()]), new NullProgressMonitor());
- }
-
- private static IProject createProjectWithFacet(final String projectName, final String[] facetId, final String[] facetVersion) throws CoreException
- {
- assert facetId.length == facetVersion.length;
- final IProject[] result = new IProject[1];
- try
- {
- TestContext.run(new IRunnableWithProgress(){
- public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException
- {
- try
- {
- result[0] = createJavaProject(projectName);
- final IFacetedProject facetedProject = ProjectFacetsManager.create(result[0], true, new NullProgressMonitor());
-
- for(int i = 0; i < facetId.length; i++)
- {
- final IProjectFacet facet = ProjectFacetsManager.getProjectFacet(facetId[i]);
- facetedProject.installProjectFacet(facet.getVersion(facetVersion[i]), null, monitor);
- }
-
- } catch (CoreException e)
- {
- throw new InvocationTargetException(e);
- }
- }}, true, new NullProgressMonitor(), PlatformUI.getWorkbench().getDisplay());
- } catch (InvocationTargetException e)
- {
- if(e.getCause() instanceof CoreException)
- {
- throw (CoreException)e.getCause();
- }
- throw new RuntimeException(e);
- } catch (InterruptedException e)
- {
- throw new RuntimeException(e);
- }
-
- return result[0];
- }
-
- /**
- * Creates a dynamic web module project with "jst.web" facet ver. 2.5 installed
- * @param projectName
- * @throws CoreException
- */
- public static IProject createWeb25Project(final String projectName) throws CoreException
- {
- final IProject webProject = createProjectWithFacet(projectName, new String[]{"jst.java", "jst.web"}, new String[]{"5.0", "2.5"});
- final IJavaProject javaP = JavaCore.create(webProject);
-
- removeAllSourceFolders(javaP);
-
- return webProject;
- }
-}
diff --git a/tests/org.eclipse.jst.ws.jaxws.testutils/src/org/eclipse/jst/ws/jaxws/testutils/threading/TestContext.java b/tests/org.eclipse.jst.ws.jaxws.testutils/src/org/eclipse/jst/ws/jaxws/testutils/threading/TestContext.java
deleted file mode 100755
index 7f76886..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.testutils/src/org/eclipse/jst/ws/jaxws/testutils/threading/TestContext.java
+++ /dev/null
@@ -1,104 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.testutils.threading;
-
-import java.lang.reflect.InvocationTargetException;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.jface.operation.IRunnableWithProgress;
-import org.eclipse.jface.operation.ModalContext;
-import org.eclipse.jst.ws.jaxws.utils.ContractChecker;
-import org.eclipse.swt.widgets.Display;
-
-/**
- * Utility to execute runnable instances in a separate thread. Implementation is pretty similar to {@link ModalContext} but it uses {@link TestContextThread} to perform forking
- *
- * @author Danail Branekov
- *
- */
-public class TestContext
-{
- /**
- * Executes the operation specified in the caller or in a {@link TestContextThread} thread depending on the <code>fork</code> value. In case the caller of this method is a {@link TestContextThread} instance, the execution of the <code>operation</code> is performed in the current thread no matter
- * of the <code>fork</code> value
- *
- * @param operation
- * the operation; must not be null
- * @param fork
- * true to perform the <code>operation</code> in a {@link TestContextThread}; false to perform the <code>operation</code> in the current thread
- * @param monitor
- * progress monitor
- * @param display TODO
- * @throws InvocationTargetException
- * @throws InterruptedException
- */
- public static void run(final IRunnableWithProgress operation, final boolean fork, final IProgressMonitor monitor, final Display display) throws InvocationTargetException, InterruptedException
- {
- ContractChecker.nullCheckParam(operation, "operation");
-
- final boolean willFork = !isInTestContextThread() && fork;
- if (willFork)
- {
- runInTestContextThread(operation, monitor, display);
- } else
- {
- runInCurrentThread(operation, monitor);
- }
- }
-
- /**
- * Runs the operation in the current thread
- *
- * @param operation
- * the operation
- * @throws InvocationTargetException
- * if a {@link Throwable} has been thrown during operation execution. The exception wraps that {@link Throwable}
- */
- private static void runInCurrentThread(final IRunnableWithProgress operation, final IProgressMonitor monitor) throws InvocationTargetException, InterruptedException
- {
- operation.run(monitor);
- }
-
- /**
- * Runs the operation in a {@link TestContextThread}.
- *
- * @param runnable
- * operation
- * @throws InvocationTargetException
- * if the {@link TestContextThread} finished with error
- * @see TestContextThread#getError()
- */
- private static void runInTestContextThread(final IRunnableWithProgress runnable, final IProgressMonitor monitor, final Display display) throws InvocationTargetException
- {
- final TestContextThread contextThread = new TestContextThread(runnable, monitor, display);
- contextThread.start();
- contextThread.block();
-
- if (contextThread.getError() != null)
- {
- if(contextThread.getError() instanceof InvocationTargetException) {
- throw (InvocationTargetException)contextThread.getError();
- }
- else {
- throw new InvocationTargetException(contextThread.getError());
- }
- }
- }
-
- /**
- * Checks whether the current thread is instance of {@link TestContextThread}
- */
- private static boolean isInTestContextThread()
- {
- final Thread t = Thread.currentThread();
- return t instanceof TestContextThread;
- }
-}
diff --git a/tests/org.eclipse.jst.ws.jaxws.testutils/src/org/eclipse/jst/ws/jaxws/testutils/threading/TestContextThread.java b/tests/org.eclipse.jst.ws.jaxws.testutils/src/org/eclipse/jst/ws/jaxws/testutils/threading/TestContextThread.java
deleted file mode 100755
index ad1bb91..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.testutils/src/org/eclipse/jst/ws/jaxws/testutils/threading/TestContextThread.java
+++ /dev/null
@@ -1,139 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.testutils.threading;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.jface.operation.IRunnableWithProgress;
-import org.eclipse.jst.ws.jaxws.utils.ContractChecker;
-import org.eclipse.jst.ws.jaxws.utils.logging.Logger;
-import org.eclipse.swt.widgets.Display;
-
-/**
- * {@link Thread} extender which is capable of providing event loop processing while the runnable is executed<br>
- * A typical usage of this class should be:
- *
- * <pre>
- * TestContextThread t = new TestContextThread(someRunnable());
- * t.start();
- * t.block();
- * </pre>
- *
- * The implementation of this thread resembles to the ModalContextThread with the difference that it does not call {@link Display#sleep()} and is simplified in order to meet test requirements. The reason not to call {@link Display#sleep()} is that under certain conditions putting the display to
- * sleep causes junit tests to wait forever
- *
- * @author Danail Branekov
- */
-class TestContextThread extends Thread
-{
- private boolean isRunning;
- private Throwable errorThrowable;
- private final IProgressMonitor monitor;
- private final IRunnableWithProgress runnable;
- private final Display display;
-
- TestContextThread(final IRunnableWithProgress runnable, final IProgressMonitor monitor, final Display display)
- {
- super();
- ContractChecker.nullCheckParam(runnable, "runnable");
- ContractChecker.nullCheckParam(monitor, "monitor");
-
- isRunning = true;
- this.monitor = monitor;
- this.runnable = runnable;
- this.setName("TestContext");
- this.setDaemon(true);
- this.display = display;
- }
-
- /**
- * Retrieves the error throwable which happened during execution
- *
- * @return the error throwable or null if none
- */
- public Throwable getError()
- {
- return errorThrowable;
- }
-
- @Override
- public void run()
- {
- isRunning = true;
- try
- {
- runnable.run(monitor);
- } catch (Throwable t)
- {
- errorThrowable = t;
- } finally
- {
- // Make sure that asynchronous events are processed by the event loop via sync execution of an "empty" runnable
- display().syncExec(new Runnable()
- {
- public void run()
- {
- }
- });
- isRunning = false;
-
- // Force the display to wake up
- display().asyncExec(null);
- }
- }
-
- /**
- * Blocks the caller while the {@link Runnable} specified in the constructor is being executed.<br>
- * If the caller is the UI thread, {@link Display#readAndDispatch()} is invoked in order to ensure that the event loop is processed<br>
- * If the caller is not a UI thread, this method simply joins. <br>
- *
- * @throws IllegalStateException
- * in case the method is invoked within its own thread
- */
- public void block()
- {
- if (Thread.currentThread() == this)
- {
- throw new IllegalStateException("The method should not be called from inside the same thread");
- }
-
- if (Display.getCurrent() == null)
- {
- try
- {
- join();
- } catch (Throwable e)
- {
- errorThrowable = e;
- }
- } else
- {
- while (isRunning)
- {
- if(!display().readAndDispatch())
- {
- try
- {
- Thread.sleep(50);
- } catch (InterruptedException e)
- {
- // ignore
- (new Logger()).logDebug(e.getMessage(), e);
- }
- }
- }
- }
- }
-
- private Display display()
- {
- return display;
- }
-}
diff --git a/tests/org.eclipse.jst.ws.jaxws.utils.tests/.classpath b/tests/org.eclipse.jst.ws.jaxws.utils.tests/.classpath
deleted file mode 100755
index 2d1a430..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.utils.tests/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/tests/org.eclipse.jst.ws.jaxws.utils.tests/.project b/tests/org.eclipse.jst.ws.jaxws.utils.tests/.project
deleted file mode 100755
index 4fb0308..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.utils.tests/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.jst.ws.jaxws.utils.tests</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
diff --git a/tests/org.eclipse.jst.ws.jaxws.utils.tests/.settings/org.eclipse.jdt.core.prefs b/tests/org.eclipse.jst.ws.jaxws.utils.tests/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100755
index ae0484e..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.utils.tests/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,8 +0,0 @@
-#Mon Jul 20 15:25:31 EEST 2009
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.5
diff --git a/tests/org.eclipse.jst.ws.jaxws.utils.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.jst.ws.jaxws.utils.tests/META-INF/MANIFEST.MF
deleted file mode 100755
index 5d929dc..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.utils.tests/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,20 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %Bundle-Name.0
-Bundle-Vendor: %Bundle-Vendor.0
-Bundle-SymbolicName: org.eclipse.jst.ws.jaxws.utils.tests
-Bundle-Localization: plugin
-Bundle-Version: 1.0.0.qualifier
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.core.resources,
- org.eclipse.jdt.core,
- org.eclipse.jst.ws.jaxws.utils,
- org.eclipse.jst.ws.jaxws.testutils,
- org.jmock,
- org.junit
-Export-Package: org.eclipse.jst.ws.jaxws.utils.resources,
- org.eclipse.jst.ws.jaxws.utils.tests,
- org.eclipse.jst.ws.jaxws.utils.tests.internal,
- org.eclipse.jst.ws.jaxws.utils.tests.internal.annotations,
- org.eclipse.jst.ws.jaxws.utils.tests.internal.clazz
diff --git a/tests/org.eclipse.jst.ws.jaxws.utils.tests/about.html b/tests/org.eclipse.jst.ws.jaxws.utils.tests/about.html
deleted file mode 100644
index d2b7ace..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.utils.tests/about.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
-<title>About</title>
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
-
-<p>August 20, 2009</p>
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, "Program" will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is
-being redistributed by another party ("Redistributor") and different terms and conditions may
-apply to your use of any object code in the Content. Check the Redistributor's license that was
-provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
-
-</body>
-</html>
diff --git a/tests/org.eclipse.jst.ws.jaxws.utils.tests/build.properties b/tests/org.eclipse.jst.ws.jaxws.utils.tests/build.properties
deleted file mode 100755
index cc88efd..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.utils.tests/build.properties
+++ /dev/null
@@ -1,16 +0,0 @@
-###############################################################################
-# Copyright (c) 2009 by SAP AG, Walldorf.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# SAP AG - initial API and implementation
-###############################################################################
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
- .,\
- about.html,\
- plugin.properties
diff --git a/tests/org.eclipse.jst.ws.jaxws.utils.tests/plugin.properties b/tests/org.eclipse.jst.ws.jaxws.utils.tests/plugin.properties
deleted file mode 100755
index e4c600b..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.utils.tests/plugin.properties
+++ /dev/null
@@ -1,13 +0,0 @@
-###############################################################################
-# Copyright (c) 2009 by SAP AG, Walldorf.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# SAP AG - initial API and implementation
-###############################################################################
-
-Bundle-Name.0=Utils Tests (Incubation)
-Bundle-Vendor.0=Eclipse Web Tools Platform
diff --git a/tests/org.eclipse.jst.ws.jaxws.utils.tests/src/org/eclipse/jst/ws/jaxws/utils/resources/StringInputStreamAdapterTest.java b/tests/org.eclipse.jst.ws.jaxws.utils.tests/src/org/eclipse/jst/ws/jaxws/utils/resources/StringInputStreamAdapterTest.java
deleted file mode 100755
index f2bfd9c..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.utils.tests/src/org/eclipse/jst/ws/jaxws/utils/resources/StringInputStreamAdapterTest.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.utils.resources;
-
-import java.io.IOException;
-
-import org.eclipse.jst.ws.jaxws.utils.resources.StringInputStreamAdapter;
-
-import junit.framework.TestCase;
-
-/**
- * Test case for StringInputStreamAdapter class
- *
- * @author Danail Branekov
- *
- */
-public class StringInputStreamAdapterTest extends TestCase
-{
- public void testCreation()
- {
- try
- {
- new StringInputStreamAdapter(null);
- fail("NPE expected");
- } catch (NullPointerException e)
- {
- // expected
- assertTrue(true);
- }
-
- StringInputStreamAdapter adapter = new StringInputStreamAdapter("ABC");
- assertNotNull(adapter);
- }
-
- public void testRead()
- {
- try
- {
- StringInputStreamAdapter adapter = new StringInputStreamAdapter("ABC");
- assertTrue(adapter.read() > 0);
-
- adapter = new StringInputStreamAdapter("");
- assertTrue(adapter.read() == -1);
- } catch (IOException e)
- {
- fail(e.getMessage());
- }
- }
-}
diff --git a/tests/org.eclipse.jst.ws.jaxws.utils.tests/src/org/eclipse/jst/ws/jaxws/utils/tests/AllTestsSuite.java b/tests/org.eclipse.jst.ws.jaxws.utils.tests/src/org/eclipse/jst/ws/jaxws/utils/tests/AllTestsSuite.java
deleted file mode 100755
index f8c1bfe..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.utils.tests/src/org/eclipse/jst/ws/jaxws/utils/tests/AllTestsSuite.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.utils.tests;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.jst.ws.jaxws.utils.resources.StringInputStreamAdapterTest;
-import org.eclipse.jst.ws.jaxws.utils.tests.internal.FileUtilsUnitTest;
-import org.eclipse.jst.ws.jaxws.utils.tests.internal.JaxWsUtilsTest;
-import org.eclipse.jst.ws.jaxws.utils.tests.internal.annotations.AnnotationFactoryTest;
-import org.eclipse.jst.ws.jaxws.utils.tests.internal.annotations.AnnotationInspectorImplTest;
-import org.eclipse.jst.ws.jaxws.utils.tests.internal.annotations.AnnotationPropertyContainerTest;
-import org.eclipse.jst.ws.jaxws.utils.tests.internal.annotations.AnnotationUtilsTest;
-import org.eclipse.jst.ws.jaxws.utils.tests.internal.annotations.AnnotationsBaseImplTest;
-import org.eclipse.jst.ws.jaxws.utils.tests.internal.annotations.ArrayValueImplTest;
-import org.eclipse.jst.ws.jaxws.utils.tests.internal.annotations.BooleanValueImplTest;
-import org.eclipse.jst.ws.jaxws.utils.tests.internal.annotations.ClassValueImplTest;
-import org.eclipse.jst.ws.jaxws.utils.tests.internal.annotations.IntegerValueImplTest;
-import org.eclipse.jst.ws.jaxws.utils.tests.internal.annotations.ParamValuePairImplTest;
-import org.eclipse.jst.ws.jaxws.utils.tests.internal.annotations.QualifiedNameValueImplTest;
-import org.eclipse.jst.ws.jaxws.utils.tests.internal.annotations.StringValueImplTest;
-import org.eclipse.jst.ws.jaxws.utils.tests.internal.clazz.ASTUtilsTest;
-
-
-public class AllTestsSuite
-{
- /**
- * Returns a test suite containing the tests to be run by Java Developer Test Dispatcher
- *
- * @return - a suite of junit pde test
- */
- public static Test suite()
- {
- final TestSuite suite = new TestSuite();
-
- suite.addTestSuite(AnnotationFactoryTest.class);
- suite.addTestSuite(ArrayValueImplTest.class);
- suite.addTestSuite(AnnotationsBaseImplTest.class);
- suite.addTestSuite(AnnotationInspectorImplTest.class);
- suite.addTestSuite(AnnotationUtilsTest.class);
- suite.addTestSuite(BooleanValueImplTest.class);
- suite.addTestSuite(IntegerValueImplTest.class);
- suite.addTestSuite(ParamValuePairImplTest.class);
- suite.addTestSuite(QualifiedNameValueImplTest.class);
- suite.addTestSuite(StringValueImplTest.class);
- suite.addTestSuite(ClassValueImplTest.class);
- suite.addTestSuite(AnnotationPropertyContainerTest.class);
- suite.addTestSuite(ASTUtilsTest.class);
- suite.addTestSuite(FileUtilsUnitTest.class);
- suite.addTestSuite(JaxWsUtilsTest.class);
- suite.addTestSuite(StringInputStreamAdapterTest.class);
-
- return suite;
- }
-}
diff --git a/tests/org.eclipse.jst.ws.jaxws.utils.tests/src/org/eclipse/jst/ws/jaxws/utils/tests/internal/FileUtilsUnitTest.java b/tests/org.eclipse.jst.ws.jaxws.utils.tests/src/org/eclipse/jst/ws/jaxws/utils/tests/internal/FileUtilsUnitTest.java
deleted file mode 100755
index 5d4a914..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.utils.tests/src/org/eclipse/jst/ws/jaxws/utils/tests/internal/FileUtilsUnitTest.java
+++ /dev/null
@@ -1,139 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.utils.tests.internal;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.jdt.core.IBuffer;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jst.ws.jaxws.testutils.jmock.Mock;
-import org.eclipse.jst.ws.jaxws.testutils.jmock.MockObjectTestCase;
-import org.eclipse.jst.ws.jaxws.utils.StatusUtils;
-import org.eclipse.jst.ws.jaxws.utils.resources.FileUtils;
-import org.eclipse.jst.ws.jaxws.utils.resources.IFileUtils;
-import org.jmock.core.constraint.IsEqual;
-import org.jmock.core.constraint.IsSame;
-
-public class FileUtilsUnitTest extends MockObjectTestCase
-{
- private final IFileUtils fileUtils = FileUtils.getInstance();
- private Mock<ICompilationUnit> cuMock;
- private final IProgressMonitor monitor = new NullProgressMonitor();
-
- @Override
- protected void setUp() throws Exception
- {
- cuMock = mock(ICompilationUnit.class);
- }
-
- public void testSetCompilationUnitContentDealsCorrectlyWithWorkingCopy() throws JavaModelException
- {
- final String testContent = "MyTestContent";
- final Mock<IBuffer> bufferMock = mock(IBuffer.class);
- bufferMock.expects(once()).method("setContents").with(new IsSame(testContent));
-
- cuMock.expects(once()).method("becomeWorkingCopy");
- cuMock.expects(once()).method("getBuffer").will(returnValue(bufferMock.proxy()));
- cuMock.expects(once()).method("commitWorkingCopy").with(new IsEqual(true), new IsSame(monitor));
- cuMock.expects(once()).method("discardWorkingCopy");
-
- fileUtils.setCompilationUnitContent(cuMock.proxy(), testContent, true, monitor);
- }
-
- public void testSetCompilationUnitContentDoesNotDiscardWorkingCopyOnJME()
- {
- final JavaModelException testException = new JavaModelException(new CoreException(StatusUtils.statusError("TEST")));
- cuMock.expects(once()).method("becomeWorkingCopy").will(throwException(testException));
- cuMock.expects(never()).method("discardWorkingCopy");
- cuMock.expects(never()).method("commitWorkingCopy");
-
- try
- {
- fileUtils.setCompilationUnitContent(cuMock.proxy(), "123", true, monitor);
- }
- catch(JavaModelException e)
- {
- assertTrue("Test exception was not caught", e == testException);
- }
- }
-
- public void testSetCuContentSavesDirtyEditors() throws JavaModelException
- {
- final boolean[] saveEditorInvoked = new boolean[]{false};
- final boolean[] setContentsInvoked = new boolean[]{false};
-
- final IFileUtils myFileUtils = new FileUtils(){
- public boolean isCompilationUnitDisplayedInDirtyEditor(final ICompilationUnit cu)
- {
- assertTrue("Unexpected compilation unit", cu == cuMock.proxy());
- return true;
- }
-
- @Override
- public void saveEditor(final ICompilationUnit cu)
- {
- assertTrue("Save editors invoked before set CU content", setContentsInvoked[0]);
- assertTrue("Unexpected compilation unit", cu == cuMock.proxy());
- saveEditorInvoked[0] = true;
- }
-
- @Override
- public void setCompilationUnitContent(ICompilationUnit unit, String content, boolean force, IProgressMonitor monitor)
- throws JavaModelException
- {
- assertFalse("Set CU content invoked after editor saved", saveEditorInvoked[0]);
- assertEquals("Unexpected CU content", "MyContent", content);
- setContentsInvoked[0] = true;
- }
- };
-
- myFileUtils.setCompilationUnitContentAndSaveDirtyEditors(cuMock.proxy(), "MyContent", true, null);
- assertTrue("Set contents not invoked", setContentsInvoked[0]);
- assertTrue("Save editors not invoked", saveEditorInvoked[0]);
- }
-
- public void testSetCuContentDoesNotSavesCleanEditors() throws JavaModelException
- {
- final boolean[] isDisplayedInvoked = new boolean[]{false};
- final boolean[] setContentsInvoked = new boolean[]{false};
-
- final IFileUtils myFileUtils = new FileUtils(){
- public boolean isCompilationUnitDisplayedInDirtyEditor(final ICompilationUnit cu)
- {
- assertTrue("Unexpected compilation unit", cu == cuMock.proxy());
- isDisplayedInvoked[0] = true;
- return false;
- }
-
- @Override
- public void saveEditor(final ICompilationUnit cu)
- {
- fail("Unexpected invocation");
- }
-
- @Override
- public void setCompilationUnitContent(ICompilationUnit unit, String content, boolean force, IProgressMonitor monitor)
- throws JavaModelException
- {
- assertFalse("Set CU content invoked after editor saved", isDisplayedInvoked[0]);
- assertEquals("Unexpected CU content", "MyContent", content);
- setContentsInvoked[0] = true;
- }
- };
-
- myFileUtils.setCompilationUnitContentAndSaveDirtyEditors(cuMock.proxy(), "MyContent", true, null);
- assertTrue("Set contents not invoked", setContentsInvoked[0]);
- assertTrue("Is displayed in dirty editor not invoked", isDisplayedInvoked[0]);
- }
-
-}
diff --git a/tests/org.eclipse.jst.ws.jaxws.utils.tests/src/org/eclipse/jst/ws/jaxws/utils/tests/internal/JaxWsUtilsTest.java b/tests/org.eclipse.jst.ws.jaxws.utils.tests/src/org/eclipse/jst/ws/jaxws/utils/tests/internal/JaxWsUtilsTest.java
deleted file mode 100755
index 010f4b5..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.utils.tests/src/org/eclipse/jst/ws/jaxws/utils/tests/internal/JaxWsUtilsTest.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.utils.tests.internal;
-
-import org.eclipse.jst.ws.jaxws.testutils.jmock.MockObjectTestCase;
-import org.eclipse.jst.ws.jaxws.utils.JaxWsUtils;
-
-public class JaxWsUtilsTest extends MockObjectTestCase
-{
- private static final String CLASS_NAME = "TestBean";
- private static final String CLASS_FQ_NAME = "org.eclipse.test." + CLASS_NAME;
-
-
- public void testComposeJaxWsTargetNamespaceByPackage_WithNull()
- {
- try
- {
- JaxWsUtils.composeJaxWsTargetNamespaceByPackage(null);
- fail("NPE expected");
- } catch (Exception e)
- {
- // expected
- assertTrue(true);
- }
- }
-
- public void testComposeJaxWsTargetNamespaceByPackage()
- {
- String ns = JaxWsUtils.composeJaxWsTargetNamespaceByPackage("");
- assertTrue(ns.equals("http:///"));
- ns = JaxWsUtils.composeJaxWsTargetNamespaceByPackage("a");
- assertTrue(ns.equals("http://a/"));
- ns = JaxWsUtils.composeJaxWsTargetNamespaceByPackage("a.b.c");
- assertTrue(ns.equals("http://b.a/c/"));
- ns = JaxWsUtils.composeJaxWsTargetNamespaceByPackage("a.b.c.d");
- assertTrue(ns.equals("http://b.a/c/d/"));
- ns = JaxWsUtils.composeJaxWsTargetNamespaceByPackage("a.b.c.d.e");
- assertTrue(ns.equals("http://b.a/c/d/e/"));
- }
-
- public void testGetDefaultServiceName()
- {
- try {
- JaxWsUtils.getDefaultServiceName(null);
- fail("NullPointerException not thrown");
- } catch (NullPointerException _){}
-
- assertEquals(CLASS_NAME + "Service", JaxWsUtils.getDefaultServiceName(CLASS_FQ_NAME));
- }
-
- public void testGetDefaultPorttypeName()
- {
- try {
- JaxWsUtils.getDefaultPorttypeName(null);
- fail("NullPointerException not thrown");
- } catch (NullPointerException _){}
-
- assertEquals(CLASS_NAME, JaxWsUtils.getDefaultPorttypeName(CLASS_FQ_NAME));
- }
-
- public void testGetDefaultPortName()
- {
- try {
- JaxWsUtils.getDefaultPortName(null);
- fail("NullPointerException not thrown");
- } catch (NullPointerException _){}
-
- assertEquals(CLASS_NAME + "Port", JaxWsUtils.getDefaultPortName(CLASS_FQ_NAME));
- }
-
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.ws.jaxws.utils.tests/src/org/eclipse/jst/ws/jaxws/utils/tests/internal/annotations/AnnotationFactoryTest.java b/tests/org.eclipse.jst.ws.jaxws.utils.tests/src/org/eclipse/jst/ws/jaxws/utils/tests/internal/annotations/AnnotationFactoryTest.java
deleted file mode 100755
index dd0cb95..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.utils.tests/src/org/eclipse/jst/ws/jaxws/utils/tests/internal/annotations/AnnotationFactoryTest.java
+++ /dev/null
@@ -1,386 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.utils.tests.internal.annotations;
-
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.Set;
-
-import org.eclipse.jdt.core.IField;
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jst.ws.jaxws.testutils.project.ClassLoadingTest;
-import org.eclipse.jst.ws.jaxws.utils.annotations.AnnotationFactory;
-import org.eclipse.jst.ws.jaxws.utils.annotations.IAnnotation;
-import org.eclipse.jst.ws.jaxws.utils.annotations.IParamValuePair;
-import org.eclipse.jst.ws.jaxws.utils.annotations.IValue;
-
-/**
- * AnnotationFactory class test cases.
- *
- * @author Georgi Vachkov
- */
-@SuppressWarnings("nls")
-public class AnnotationFactoryTest extends ClassLoadingTest
-{
- private static final String SRC = "src";
-
- private static final String PCK = "org.eclipse.demo";
-
- private IType endpoint;
-
-
- public void testCreateStringValue()
- {
- try
- {
- AnnotationFactory.createStringValue(null);
- fail("NullPointerException not thrown");
- } catch (NullPointerException e)
- {
- }
-
- IValue strValue = AnnotationFactory.createStringValue("value");
- assertNotNull(strValue);
- assertTrue(strValue.toString().equals("value"));
- }
-
- public void testCreateParamValuePair()
- {
- IValue strValue = AnnotationFactory.createStringValue("value");
-
- try
- {
- AnnotationFactory.createParamValuePairValue(null, strValue);
- fail("NullPointerException not thrown");
- } catch (NullPointerException e)
- {
- }
-
- try
- {
- AnnotationFactory.createParamValuePairValue("", null);
- fail("NullPointerException not thrown");
- fail("IllegalArgumentException not thrown");
- }
- catch (NullPointerException e)
- {
- }
- catch (IllegalArgumentException e)
- {
- }
-
- try
- {
- AnnotationFactory.createParamValuePairValue("param", null);
- fail("NullPointerException not thrown");
- }
- catch (NullPointerException e)
- {
- }
-
- IParamValuePair valuePair = AnnotationFactory.createParamValuePairValue("param", strValue);
- assertNotNull(valuePair);
- assertTrue(valuePair.getValue() instanceof IValue);
- assertTrue(valuePair.getParam().equals("param"));
- }
-
- public void testCreateComplexAnnotation() throws Exception
- {
- IValue strValue1 = AnnotationFactory.createStringValue("value");
- IParamValuePair valuePair1 = AnnotationFactory.createParamValuePairValue("param", strValue1);
-
- IValue strValue2 = AnnotationFactory.createStringValue("value1");
- IParamValuePair valuePair2 = AnnotationFactory.createParamValuePairValue("param1", strValue2);
- Set<IParamValuePair> paramValues = new HashSet<IParamValuePair>();
- paramValues.add(valuePair1);
- paramValues.add(valuePair2);
-
- try
- {
- AnnotationFactory.createAnnotation(null, paramValues, endpoint);
- fail("NullPointerException not thrown");
- } catch (NullPointerException e)
- {
- }
-
- try
- {
- AnnotationFactory.createAnnotation("", null, endpoint);
- fail("NullPointerException not thrown");
- fail("IllegalArgumentException not thrown");
- }
- catch (NullPointerException e)
- {
- }
- catch (IllegalArgumentException e)
- {
- }
-
- try
- {
- AnnotationFactory.createAnnotation("MyName", null, endpoint);
- fail("NullPointerException not thrown");
- }
- catch (NullPointerException e)
- {
- }
-
-// try
-// {
-// AnnotationFactory.createAnnotation("MyName", new HashSet<IParamValuePair>());
-// fail("IllegalArgumentException not thrown");
-// }
-// catch (IllegalArgumentException e)
-// {
-// }
-
-
- prepareProject();
- IAnnotation<IType> ca = AnnotationFactory.createAnnotation("name", paramValues, endpoint);
- assertNotNull(ca);
- assertEquals(ca.getParamValuePairs().size(), 2);
- }
-
- public void testCreateValuePair()
- {
- try
- {
- AnnotationFactory.createParamValuePairValue("", null);
- fail("NullPointerException not thrown");
- fail("IllegalArgumentException not thrown");
- }
- catch (NullPointerException e)
- {
- }
- catch (IllegalArgumentException e)
- {
- }
-
- try
- {
- AnnotationFactory.createParamValuePairValue(null, null);
- fail("NullPointerException not thrown");
- } catch (NullPointerException e)
- {
- }
- }
-
- public void testCreateArrayValue()
- {
- try
- {
- AnnotationFactory.createArrayValue(null);
- fail("NullPointerException not thrown");
- } catch (NullPointerException e)
- {
- }
-
- try
- {
- AnnotationFactory.createArrayValue(new HashSet<IValue>());
- fail("IllegalArgumentException not thrown");
- } catch (IllegalArgumentException e)
- {
- }
-
- IValue strValue1 = AnnotationFactory.createStringValue("value1");
- IValue strValue2 = AnnotationFactory.createStringValue("value2");
- Set<IValue> values = new HashSet<IValue>();
- values.add(strValue1);
- values.add(strValue2);
-
-
- IValue arrValue = AnnotationFactory.createArrayValue(values);
- assertNotNull(arrValue);
- assertTrue(arrValue.toString().equals("[value1, value2]"));
- }
-
- public void testCreateQualifiedNameValue()
- {
-
- try
- {
- AnnotationFactory.createQualifiedNameValue("QName");
- fail("IllegalArgumentException not thrown");
- }
- catch (IllegalArgumentException e)
- {
- }
-
- try
- {
- AnnotationFactory.createQualifiedNameValue(null);
- fail("NullPointerException not thrown");
- } catch (NullPointerException e)
- {
- }
-
- IValue qName = AnnotationFactory.createQualifiedNameValue("org.eclipse.demo.Test");
- assertNotNull(qName);
- assertTrue(qName.toString().equals("org.eclipse.demo.Test"));
- }
-
- public void testCreateBooleanValue()
- {
- IValue boolValue = AnnotationFactory.createBooleanValue(true);
- assertNotNull(boolValue);
- assertEquals(boolValue.toString(), "true");
- }
-
- public void testGetAnnotationsFromClass() throws Exception // $JL-EXC$
- {
- prepareProject();
-
- Collection<IAnnotation<IType>> annotations = AnnotationFactory.createAnnotationInspector(endpoint).inspectType();
- assertNotNull(annotations);
- assertTrue(annotations.size() == 2);
- }
-
-// public void testGetAnnotationsFromField() throws Exception // $JL-EXC$
-// {
-// prepareProject();
-//
-// IField field = endpoint.getField("field1");
-// assertNotNull(field);
-//
-// IAnnotation[] annotations = AnnotationFactory.createAnnotattionInspector(endpoint).inspectMethod(method) getAnnotationsFromField(field);
-// assertNotNull(annotations);
-// assertTrue(annotations.length == 1);
-// }
-
- public void testGetAnnotationsFromMethod() throws Exception // $JL-EXC$
- {
- prepareProject();
-
- IMethod method = endpoint.getMethod("annotatedMethod", new String[] { "QString;" });
- Collection<IAnnotation<IMethod>> annotations = AnnotationFactory.createAnnotationInspector(endpoint).inspectMethod(method);;
- assertNotNull(annotations);
- assertTrue(annotations.size() == 1);
- }
-
- public void testRemoveAnnotationsIType() throws Exception // $JL-EXC$
- {
- prepareProject();
-
- try
- {
- AnnotationFactory.removeAnnotationsFromJavaElement(null);
- fail("NullPointerException not thrown");
- }
- catch (NullPointerException e)
- {
- }
-
- try
- {
- AnnotationFactory.removeAnnotationsFromJavaElement(endpoint.getPackageFragment());
- fail("IllegalArgumentException not thrown");
- }
- catch (IllegalArgumentException e)
- {
- }
-
- AnnotationFactory.removeAnnotationsFromJavaElement(endpoint);
-
- Collection<IAnnotation<IType>> annotations = AnnotationFactory.createAnnotationInspector(endpoint). inspectType();
- assertTrue(annotations.size() == 0);
-
- IMethod method = endpoint.getMethod("annotatedMethod", new String[] { "QString;" });
- @SuppressWarnings("unused")
- Collection<IAnnotation<IMethod>> annotationsMethod = AnnotationFactory.createAnnotationInspector(endpoint).inspectMethod(method);
- assertTrue(annotations.size() == 0);
- }
-
- public void testRemoveAnnotationsITypeSetOfString() throws Exception // $JL-EXC$
- {
- prepareProject();
-
- Set<String> toRemove = new HashSet<String>();
- toRemove.add("WebService");
- toRemove.add("WebMethod");
-
- try
- {
- AnnotationFactory.removeAnnotations(null, toRemove);
- fail("NullPointerException not thrown");
- }
- catch (NullPointerException e)
- {
- }
-
- try
- {
- AnnotationFactory.removeAnnotations(endpoint.getPackageFragment(), toRemove);
- fail("IllegalArgumentException not thrown");
- }
- catch (IllegalArgumentException e)
- {
- }
-
-
- AnnotationFactory.removeAnnotations(endpoint, toRemove);
-
- Collection<IAnnotation<IType>> annotations = AnnotationFactory.createAnnotationInspector(endpoint).inspectType();
- assertTrue(annotations.size() == 1);
-
- IMethod method = endpoint.getMethod("annotatedMethod", new String[] { "QString;" });
- Collection<IAnnotation<IMethod>> annotationsMethod = AnnotationFactory.createAnnotationInspector(endpoint).inspectMethod(method);
- assertTrue(annotationsMethod.size() == 0);
- }
-
- public void testRemoveAnnotationsIField() throws Exception // $JL-EXC$
- {
- prepareProject();
-
- IField field = endpoint.getField("field1");
- assertNotNull(field);
-
- AnnotationFactory.removeAnnotationsFromJavaElement(field);
-
- Collection<IAnnotation<IType>> annotations = AnnotationFactory.createAnnotationInspector(endpoint).inspectType();
- assertTrue(annotations.size() == 2);
-
- IMethod method = endpoint.getMethod("annotatedMethod", new String[] { "QString;" });
- Collection<IAnnotation<IMethod>> annotationsMethod = AnnotationFactory.createAnnotationInspector(endpoint).inspectMethod(method);
- assertTrue(annotationsMethod.size() == 1);
-
-// annotations = AnnotationFactory.getAnnotationsFromField(field);
-// assertNotNull(annotations);
-// assertTrue(annotations.length == 0);
- }
-
- public void testRemoveAnnotationsIMethod() throws Exception // $JL-EXC$
- {
- prepareProject();
-
- IMethod method = endpoint.getMethod("annotatedMethod", new String[] { "QString;" });
- endpoint.getField("field1");
-
- AnnotationFactory.removeAnnotationsFromJavaElement(method);
-
- Collection<IAnnotation<IType>> annotations = AnnotationFactory.createAnnotationInspector(endpoint).inspectType();
- assertTrue(annotations.size() == 2);
-
- Collection<IAnnotation<IMethod>> annotationsMethod = AnnotationFactory.createAnnotationInspector(endpoint).inspectMethod(method);
- assertTrue(annotationsMethod.size()== 0);
-
-// annotations = AnnotationFactory.getAnnotationsFromField(field);
-// assertNotNull(annotations);
-// assertTrue(annotations.length == 0);
- }
-
- private void prepareProject() throws Exception // $JL-EXC$
- {
- createJavaProject(SRC, PCK);
- endpoint = createClass("Endpoint.src", "Endpoint");
- }
-}
diff --git a/tests/org.eclipse.jst.ws.jaxws.utils.tests/src/org/eclipse/jst/ws/jaxws/utils/tests/internal/annotations/AnnotationInspectorImplTest.java b/tests/org.eclipse.jst.ws.jaxws.utils.tests/src/org/eclipse/jst/ws/jaxws/utils/tests/internal/annotations/AnnotationInspectorImplTest.java
deleted file mode 100755
index 10845b8..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.utils.tests/src/org/eclipse/jst/ws/jaxws/utils/tests/internal/annotations/AnnotationInspectorImplTest.java
+++ /dev/null
@@ -1,239 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.utils.tests.internal.annotations;
-
-import java.io.IOException;
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.Set;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jdt.core.IField;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.ITypeParameter;
-import org.eclipse.jst.ws.jaxws.testutils.project.ClassLoadingTest;
-import org.eclipse.jst.ws.jaxws.utils.annotations.AnnotationFactory;
-import org.eclipse.jst.ws.jaxws.utils.annotations.AnnotationGeneratorException;
-import org.eclipse.jst.ws.jaxws.utils.annotations.AnnotationWriter;
-import org.eclipse.jst.ws.jaxws.utils.annotations.IAnnotation;
-import org.eclipse.jst.ws.jaxws.utils.annotations.IParamValuePair;
-import org.eclipse.jst.ws.jaxws.utils.annotations.IValue;
-
-public class AnnotationInspectorImplTest extends ClassLoadingTest
-{
- private static final String SRC = "src";
-
- private static final String PCK = "org.eclipse.demo";
-
- private IType endpoint;
-
- public void setUp() throws CoreException, IOException, AnnotationGeneratorException
- {
- createJavaProject(SRC, PCK);
- endpoint = createClass("Endpoint.src", "Endpoint");
- AnnotationFactory.removeAnnotationsFromJavaElement(endpoint);
- }
-
- public void setUpSpecific() throws CoreException, IOException, AnnotationGeneratorException
- {
- createJavaProject(SRC, PCK);
- endpoint = createClass("EndpointAnnInspector.src", "EndpointAnnInspector");
- }
-
- public void testInspector() throws Exception
- {
- setUp();
-
- try
- {
- AnnotationFactory.createAnnotationInspector(null).inspectType();
- fail("NullPointerException should be thrown!");
- }
- catch (NullPointerException e)
- {
- assertTrue(true);
- }
-
- try
- {
- AnnotationFactory.createAnnotationInspector(endpoint).inspectMethod(null);
- fail("NullPointerException should be thrown!");
- }
- catch (NullPointerException e)
- {
- assertTrue(true);
- }
-
- try
- {
- AnnotationFactory.createAnnotationInspector(endpoint).inspectField(null);
- fail("NullPointerException should be thrown!");
- }
- catch (NullPointerException e)
- {
- assertTrue(true);
- }
-
- try
- {
- AnnotationFactory.createAnnotationInspector(endpoint).inspectParam(null);
- fail("NullPointerException should be thrown!");
- }
- catch (NullPointerException e)
- {
- assertTrue(true);
- }
-
- IValue sv = AnnotationFactory.createStringValue("My Value");
-
- Set<IParamValuePair> pv = new HashSet<IParamValuePair>();
- pv.add(AnnotationFactory.createParamValuePairValue("param", sv));
-
- IAnnotation<IField> ann = AnnotationFactory.createAnnotation("org.eclipse.test.MyAnnotation", pv, endpoint.getField("field1"));
- AnnotationWriter.getInstance().setAppliedElement(ann, endpoint.getField("field1"));
-
- Collection<IAnnotation<IField>> annotations = AnnotationFactory.createAnnotationInspector(endpoint).inspectField(endpoint.getField("field1"));
- assertNotNull(annotations);
- assertTrue(annotations.size() == 1);
- IAnnotation<IField> annP = annotations.iterator().next();
- AnnotationWriter.getInstance().remove(annP);
-
- annotations = AnnotationFactory.createAnnotationInspector(endpoint).inspectField(endpoint.getField("field1"));
- assertNotNull(annotations);
- assertTrue(annotations.size() == 0);
-
-
- IMethod[] methods = endpoint.getMethods();
- for (IMethod method : methods)
- {
- if(method.getRawParameterNames() != null && method.getRawParameterNames().length > 0)
- {
- for(int i = 0; i < method.getRawParameterNames().length; i++)
- {
- ITypeParameter param = method.getTypeParameter(method.getRawParameterNames()[i]);
-
- IValue svParam = AnnotationFactory.createStringValue("String Valu Param");
- Set<IParamValuePair> pvParam = new HashSet<IParamValuePair>();
- pvParam.add(AnnotationFactory.createParamValuePairValue("ParamAtribute", svParam));
- IAnnotation<ITypeParameter> annPam = AnnotationFactory.createAnnotation("ParamAnnotation", pvParam, param);
- AnnotationWriter.getInstance().setAppliedElement(annPam, param);
- Collection<IAnnotation<ITypeParameter>> paramAnnotations = AnnotationFactory.createAnnotationInspector(endpoint).inspectParam(param);
- assertNotNull(paramAnnotations);
- assertTrue(paramAnnotations.size() == 1);
- IAnnotation<ITypeParameter> tmpAnn = paramAnnotations.iterator().next();
-
- AnnotationWriter.getInstance().remove(tmpAnn);
- paramAnnotations = AnnotationFactory.createAnnotationInspector(endpoint).inspectParam(param);
- assertNotNull(paramAnnotations);
- assertTrue(paramAnnotations.size() == 0);
-
- annPam = AnnotationFactory.createAnnotation("ParamAnnotation2", pvParam, param);
- AnnotationWriter.getInstance().setAppliedElement(annPam, param);
- paramAnnotations = AnnotationFactory.createAnnotationInspector(endpoint).inspectParam(param);
- assertNotNull(paramAnnotations);
- assertTrue(paramAnnotations.size() == 1);
- AnnotationFactory.removeAnnotationsFromJavaElement(param);
- paramAnnotations = AnnotationFactory.createAnnotationInspector(endpoint).inspectParam(param);
- assertNotNull(paramAnnotations);
- assertTrue(paramAnnotations.size() == 0);
- }
- }
- }
- }
-
- public void testInspectorSpecificAnnotation() throws Exception
- {
- setUpSpecific();
-
- IAnnotation<IType> inspectedTypeAnnotation = AnnotationFactory.createAnnotationInspector(endpoint).inspectType("org.eclipse.demo.MyAnnotation");
- assertNotNull(inspectedTypeAnnotation);
- assertEquals(inspectedTypeAnnotation.getPropertyValue("myValue"), "MyString");
-
- inspectedTypeAnnotation = null;
-
- inspectedTypeAnnotation = AnnotationFactory.createAnnotationInspector(endpoint).inspectType("javax.jws.WebService");
- assertNotNull(inspectedTypeAnnotation);
- assertTrue("javax.jws.WebService".endsWith(inspectedTypeAnnotation.getAnnotationName()));
- assertEquals(inspectedTypeAnnotation.getPropertyValue("serviceName"), "WSImplBeanService");
- assertEquals(inspectedTypeAnnotation.getPropertyValue("name"), "WSImplBean");
- assertEquals(inspectedTypeAnnotation.getPropertyValue("targetNamespace"), "http://demo/eclipse/org/");
- assertEquals(inspectedTypeAnnotation.getPropertyValue("portName"), "WSImplBeanPort");
-
- IField field = endpoint.getField("field1");
- IAnnotation<IField> inspectedFieldAnnotation = AnnotationFactory.createAnnotationInspector(endpoint).inspectField(field, "org.eclipse.demo.MyFieldAnnotation");
- assertNotNull(inspectedFieldAnnotation);
- assertTrue("org.eclipse.demo.MyFieldAnnotation".endsWith(inspectedFieldAnnotation.getAnnotationName()));
- assertEquals(inspectedFieldAnnotation.getPropertyValue("name"), "field1");
-
- inspectedFieldAnnotation = null;
-
- inspectedFieldAnnotation = AnnotationFactory.createAnnotationInspector(endpoint).inspectField(field, "javax.jws.WebField");
- assertNotNull(inspectedFieldAnnotation);
- assertTrue("javax.jws.WebField".endsWith(inspectedFieldAnnotation.getAnnotationName()));
- assertEquals(inspectedFieldAnnotation.getPropertyValue("name"), "MyField");
-
- IMethod method = endpoint.getMethods()[0];
- IAnnotation<IMethod> inspectedMethodAnnotation = AnnotationFactory.createAnnotationInspector(endpoint).inspectMethod(method, "org.eclipse.demo.MyMethodAnnotation");
- assertNotNull(inspectedMethodAnnotation);
- assertTrue("org.eclipse.demo.MyMethodAnnotation".endsWith(inspectedMethodAnnotation.getAnnotationName()));
- assertEquals(inspectedMethodAnnotation.getPropertyValue("name"), "annotatedMethod");
-
- inspectedMethodAnnotation = null;
-
- inspectedMethodAnnotation = AnnotationFactory.createAnnotationInspector(endpoint).inspectMethod(method, "javax.jws.WebMethod");
- assertNotNull(inspectedMethodAnnotation);
- assertTrue("javax.jws.WebMethod".endsWith(inspectedMethodAnnotation.getAnnotationName()));
- assertEquals(inspectedMethodAnnotation.getPropertyValue("exclude"), "false");
- assertEquals(inspectedMethodAnnotation.getPropertyValue("operationName"), "test");
-
- ITypeParameter typeParameter = method.getTypeParameter("annotatedParam");
- IAnnotation<ITypeParameter> inspectedParamAnnotation = AnnotationFactory.createAnnotationInspector(endpoint).inspectParam(typeParameter, "org.eclipse.demo.MyParamAnnotation");
- assertNotNull(inspectedParamAnnotation);
- assertTrue("org.eclipse.demo.MyParamAnnotation".endsWith(inspectedParamAnnotation.getAnnotationName()));
- assertEquals(inspectedParamAnnotation.getPropertyValue("name"), "annotatedMyParam");
-
- inspectedParamAnnotation = null;
-
- inspectedParamAnnotation = AnnotationFactory.createAnnotationInspector(endpoint).inspectParam(typeParameter, "javax.jws.WebParam");
- assertNotNull(inspectedParamAnnotation);
- assertTrue("javax.jws.WebParam".endsWith(inspectedParamAnnotation.getAnnotationName()));
- assertEquals(inspectedParamAnnotation.getPropertyValue("name"), "annotatedParam");
- }
-
- public void testInspectorLocatorRetrieved() throws Exception
- {
- setUpSpecific();
- IAnnotation<IType> annotation = AnnotationFactory.createAnnotationInspector(endpoint).inspectType("javax.jws.WebService");
- assertNotNull(annotation);
-
- assertEquals(11, annotation.getLocator().getLineNumber());
- assertEquals(226, annotation.getLocator().getStartPosition());
- assertEquals(134, annotation.getLocator().getLength());
-
- assertEquals(11, getParam("portName", annotation).getLocator().getLineNumber());
- assertEquals(334, getParam("portName", annotation).getLocator().getStartPosition());
- assertEquals(25, getParam("portName", annotation).getLocator().getLength());
- }
-
- private IParamValuePair getParam(final String name, final IAnnotation<? extends IJavaElement> annotation)
- {
- for (IParamValuePair param : annotation.getParamValuePairs()) {
- if(param.getParam().equals(name)) {
- return param;
- }
- }
-
- return null;
- }
-
-}
diff --git a/tests/org.eclipse.jst.ws.jaxws.utils.tests/src/org/eclipse/jst/ws/jaxws/utils/tests/internal/annotations/AnnotationPropertyContainerTest.java b/tests/org.eclipse.jst.ws.jaxws.utils.tests/src/org/eclipse/jst/ws/jaxws/utils/tests/internal/annotations/AnnotationPropertyContainerTest.java
deleted file mode 100755
index f0dbe7f..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.utils.tests/src/org/eclipse/jst/ws/jaxws/utils/tests/internal/annotations/AnnotationPropertyContainerTest.java
+++ /dev/null
@@ -1,365 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.utils.tests.internal.annotations;
-
-import java.lang.annotation.ElementType;
-import java.util.HashSet;
-import java.util.Set;
-
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.ITypeParameter;
-import org.eclipse.jst.ws.jaxws.testutils.jmock.Mock;
-import org.eclipse.jst.ws.jaxws.testutils.jmock.MockObjectTestCase;
-import org.eclipse.jst.ws.jaxws.utils.annotations.IAnnotation;
-import org.eclipse.jst.ws.jaxws.utils.internal.annotations.impl.AnnotationProperty;
-import org.eclipse.jst.ws.jaxws.utils.internal.annotations.impl.AnnotationPropertyContainer;
-import org.eclipse.jst.ws.jaxws.utils.internal.annotations.impl.AttributeTypeEnum;
-
-public class AnnotationPropertyContainerTest extends MockObjectTestCase
-{
- private Mock<IType> type = mock(IType.class);
- private Mock<IMethod> method = mock(IMethod.class);
- private Mock<ITypeParameter> typeParameter = mock(ITypeParameter.class);
-
- public void testBase() throws Exception
- {
- AnnotationPropertyContainer container = new AnnotationPropertyContainer();
- try
- {
- container.addAnnotationProperty(null, null);
- fail("NullPointerException was not thrown!");
- }
- catch (NullPointerException e)
- {
- assertTrue(true);
- }
-
- try
- {
- AnnotationProperty annotationProperty = new AnnotationProperty("annotationName", "attributeName", "value", AttributeTypeEnum.STRING);
- container.addAnnotationProperty(annotationProperty, null);
- fail("NullPointerException was not thrown!");
- }
- catch (NullPointerException e)
- {
- assertTrue(true);
- }
-
- try
- {
- AnnotationProperty annotationProperty = new AnnotationProperty("annotationName", "attributeName", "value", AttributeTypeEnum.STRING);
- container.addAnnotationProperty(annotationProperty, ElementType.PACKAGE);
- fail("IllegalArgumentException was not thrown!");
- }
- catch (IllegalArgumentException e)
- {
- assertTrue(true);
- }
-
- }
-
- public void testTypeLevel() throws Exception
- {
- AnnotationPropertyContainer container = new AnnotationPropertyContainer();
- AnnotationProperty annotationProperty = new AnnotationProperty("annotationName", "attributeNameBoolean", "true", AttributeTypeEnum.BOOLEAN);
- container.addAnnotationProperty(annotationProperty, ElementType.TYPE);
- annotationProperty = new AnnotationProperty("annotationName", "attributeNameInteger", "100", AttributeTypeEnum.INTEGER);
- container.addAnnotationProperty(annotationProperty, ElementType.TYPE);
- annotationProperty = new AnnotationProperty("annotationName", "attributeNameQualified", "org.eclipse.testEnumeration.VALUE", AttributeTypeEnum.QUALIFIED_NAME);
- container.addAnnotationProperty(annotationProperty, ElementType.TYPE);
- annotationProperty = new AnnotationProperty("annotationName", "attributeNameString", "valueString", AttributeTypeEnum.STRING);
- container.addAnnotationProperty(annotationProperty, ElementType.TYPE);
-
- assertTrue(container.getTypeAnnotations(type.proxy()).size() == 1);
- assertTrue(container.getParameterAnnotations(typeParameter.proxy()).size() == 0);
- assertTrue(container.getMethodAnnotations(method.proxy()).size() == 0);
- Set<IAnnotation<IType>> typeAnnotations = container.getTypeAnnotations(type.proxy());
-
- for (IAnnotation<IType> annotation : typeAnnotations)
- {
- assertTrue(annotation.getAnnotationName().equals("annotationName"));
- assertTrue(annotation.getParamValuePairs().size() == 4);
- assertTrue(annotation.getPropertyValue("attributeNameBoolean").equals("true"));
- assertTrue(annotation.getPropertyValue("attributeNameInteger").equals("100"));
- assertTrue(annotation.getPropertyValue("attributeNameQualified").equals("org.eclipse.testEnumeration.VALUE"));
- assertTrue(annotation.getPropertyValue("attributeNameString").equals("valueString"));
- }
-
- container = new AnnotationPropertyContainer();
- annotationProperty = new AnnotationProperty("annotationName1", "attributeNameBoolean", "true", AttributeTypeEnum.BOOLEAN);
- container.addAnnotationProperty(annotationProperty, ElementType.TYPE);
- annotationProperty = new AnnotationProperty("annotationName2", "attributeNameInteger", "100", AttributeTypeEnum.INTEGER);
- container.addAnnotationProperty(annotationProperty, ElementType.TYPE);
- annotationProperty = new AnnotationProperty("annotationName3", "attributeNameQualified", "org.eclipse.testEnumeration.VALUE", AttributeTypeEnum.QUALIFIED_NAME);
- container.addAnnotationProperty(annotationProperty, ElementType.TYPE);
- annotationProperty = new AnnotationProperty("annotationName4", "attributeNameString", "valueString", AttributeTypeEnum.STRING);
- container.addAnnotationProperty(annotationProperty, ElementType.TYPE);
-
- assertTrue(container.getTypeAnnotations(type.proxy()).size() == 4);
- assertTrue(container.getParameterAnnotations(typeParameter.proxy()).size() == 0);
- assertTrue(container.getMethodAnnotations(method.proxy()).size() == 0);
- typeAnnotations = container.getTypeAnnotations(type.proxy());
-
- Set<String> names = new HashSet<String>();
- names.clear();
- names.add("annotationName1");
- names.add("annotationName2");
- names.add("annotationName3");
- names.add("annotationName4");
-
- for (IAnnotation<IType> annotation : typeAnnotations)
- {
- assertTrue(names.contains(annotation.getAnnotationName()));
- names.remove(annotation.getAnnotationName());
- if(annotation.getAnnotationName().equals("annotationName1"))
- {
- assertTrue(annotation.getParamValuePairs().size() == 1);
- assertTrue(annotation.getPropertyValue("attributeNameBoolean").equals("true"));
- }
- if(annotation.getAnnotationName().equals("annotationName2"))
- {
- assertTrue(annotation.getParamValuePairs().size() == 1);
- assertTrue(annotation.getPropertyValue("attributeNameInteger").equals("100"));
- }
- if(annotation.getAnnotationName().equals("annotationName3"))
- {
- assertTrue(annotation.getParamValuePairs().size() == 1);
- assertTrue(annotation.getPropertyValue("attributeNameQualified").equals("org.eclipse.testEnumeration.VALUE"));
- }
- if(annotation.getAnnotationName().equals("annotationName4"))
- {
- assertTrue(annotation.getParamValuePairs().size() == 1);
- assertTrue(annotation.getPropertyValue("attributeNameString").equals("valueString"));
- }
- }
- }
-
- public void testMethodLevel() throws Exception
- {
- AnnotationPropertyContainer container = new AnnotationPropertyContainer();
- AnnotationProperty annotationProperty = new AnnotationProperty("annotationName", "attributeNameBoolean", "true", AttributeTypeEnum.BOOLEAN);
- container.addAnnotationProperty(annotationProperty, ElementType.METHOD);
- annotationProperty = new AnnotationProperty("annotationName", "attributeNameInteger", "100", AttributeTypeEnum.INTEGER);
- container.addAnnotationProperty(annotationProperty, ElementType.METHOD);
- annotationProperty = new AnnotationProperty("annotationName", "attributeNameQualified", "org.eclipse.testEnumeration.VALUE", AttributeTypeEnum.QUALIFIED_NAME);
- container.addAnnotationProperty(annotationProperty, ElementType.METHOD);
- annotationProperty = new AnnotationProperty("annotationName", "attributeNameString", "valueString", AttributeTypeEnum.STRING);
- container.addAnnotationProperty(annotationProperty, ElementType.METHOD);
-
- assertTrue(container.getTypeAnnotations(type.proxy()).size() == 0);
- assertTrue(container.getParameterAnnotations(typeParameter.proxy()).size() == 0);
- assertTrue(container.getMethodAnnotations(method.proxy()).size() == 1);
- Set<IAnnotation<IMethod>> methodAnnotations = container.getMethodAnnotations(method.proxy());
-
- for (IAnnotation<IMethod> annotation : methodAnnotations)
- {
- assertTrue(annotation.getAnnotationName().equals("annotationName"));
- assertTrue(annotation.getParamValuePairs().size() == 4);
- assertTrue(annotation.getPropertyValue("attributeNameBoolean").equals("true"));
- assertTrue(annotation.getPropertyValue("attributeNameInteger").equals("100"));
- assertTrue(annotation.getPropertyValue("attributeNameQualified").equals("org.eclipse.testEnumeration.VALUE"));
- assertTrue(annotation.getPropertyValue("attributeNameString").equals("valueString"));
- }
-
- container = new AnnotationPropertyContainer();
- annotationProperty = new AnnotationProperty("annotationName1", "attributeNameBoolean", "true", AttributeTypeEnum.BOOLEAN);
- container.addAnnotationProperty(annotationProperty, ElementType.METHOD);
- annotationProperty = new AnnotationProperty("annotationName2", "attributeNameInteger", "100", AttributeTypeEnum.INTEGER);
- container.addAnnotationProperty(annotationProperty, ElementType.METHOD);
- annotationProperty = new AnnotationProperty("annotationName3", "attributeNameQualified", "org.eclipse.testEnumeration.VALUE", AttributeTypeEnum.QUALIFIED_NAME);
- container.addAnnotationProperty(annotationProperty, ElementType.METHOD);
- annotationProperty = new AnnotationProperty("annotationName4", "attributeNameString", "valueString", AttributeTypeEnum.STRING);
- container.addAnnotationProperty(annotationProperty, ElementType.METHOD);
-
- assertTrue(container.getTypeAnnotations(type.proxy()).size() == 0);
- assertTrue(container.getParameterAnnotations(typeParameter.proxy()).size() == 0);
- assertTrue(container.getMethodAnnotations(method.proxy()).size() == 4);
- methodAnnotations = container.getMethodAnnotations(method.proxy());
-
- Set<String> names = new HashSet<String>();
- names.clear();
- names.add("annotationName1");
- names.add("annotationName2");
- names.add("annotationName3");
- names.add("annotationName4");
-
- for (IAnnotation<IMethod> annotation : methodAnnotations)
- {
- assertTrue(names.contains(annotation.getAnnotationName()));
- names.remove(annotation.getAnnotationName());
- if(annotation.getAnnotationName().equals("annotationName1"))
- {
- assertTrue(annotation.getParamValuePairs().size() == 1);
- assertTrue(annotation.getPropertyValue("attributeNameBoolean").equals("true"));
- }
- if(annotation.getAnnotationName().equals("annotationName2"))
- {
- assertTrue(annotation.getParamValuePairs().size() == 1);
- assertTrue(annotation.getPropertyValue("attributeNameInteger").equals("100"));
- }
- if(annotation.getAnnotationName().equals("annotationName3"))
- {
- assertTrue(annotation.getParamValuePairs().size() == 1);
- assertTrue(annotation.getPropertyValue("attributeNameQualified").equals("org.eclipse.testEnumeration.VALUE"));
- }
- if(annotation.getAnnotationName().equals("annotationName4"))
- {
- assertTrue(annotation.getParamValuePairs().size() == 1);
- assertTrue(annotation.getPropertyValue("attributeNameString").equals("valueString"));
- }
- }
- }
-
- public void testParameterLevel() throws Exception
- {
- AnnotationPropertyContainer container = new AnnotationPropertyContainer();
- AnnotationProperty annotationProperty = new AnnotationProperty("annotationName", "attributeNameBoolean", "true", AttributeTypeEnum.BOOLEAN);
- container.addAnnotationProperty(annotationProperty, ElementType.PARAMETER);
- annotationProperty = new AnnotationProperty("annotationName", "attributeNameInteger", "100", AttributeTypeEnum.INTEGER);
- container.addAnnotationProperty(annotationProperty, ElementType.PARAMETER);
- annotationProperty = new AnnotationProperty("annotationName", "attributeNameQualified", "org.eclipse.testEnumeration.VALUE", AttributeTypeEnum.QUALIFIED_NAME);
- container.addAnnotationProperty(annotationProperty, ElementType.PARAMETER);
- annotationProperty = new AnnotationProperty("annotationName", "attributeNameString", "valueString", AttributeTypeEnum.STRING);
- container.addAnnotationProperty(annotationProperty, ElementType.PARAMETER);
-
- assertTrue(container.getTypeAnnotations(type.proxy()).size() == 0);
- assertTrue(container.getParameterAnnotations(typeParameter.proxy()).size() == 1);
- assertTrue(container.getMethodAnnotations(method.proxy()).size() == 0);
- Set<IAnnotation<ITypeParameter>> parameterAnnotations = container.getParameterAnnotations(typeParameter.proxy());
-
- for (IAnnotation<ITypeParameter> annotation : parameterAnnotations)
- {
- assertTrue(annotation.getAnnotationName().equals("annotationName"));
- assertTrue(annotation.getParamValuePairs().size() == 4);
- assertTrue(annotation.getPropertyValue("attributeNameBoolean").equals("true"));
- assertTrue(annotation.getPropertyValue("attributeNameInteger").equals("100"));
- assertTrue(annotation.getPropertyValue("attributeNameQualified").equals("org.eclipse.testEnumeration.VALUE"));
- assertTrue(annotation.getPropertyValue("attributeNameString").equals("valueString"));
- }
-
- container = new AnnotationPropertyContainer();
- annotationProperty = new AnnotationProperty("annotationName1", "attributeNameBoolean", "true", AttributeTypeEnum.BOOLEAN);
- container.addAnnotationProperty(annotationProperty, ElementType.PARAMETER);
- annotationProperty = new AnnotationProperty("annotationName2", "attributeNameInteger", "100", AttributeTypeEnum.INTEGER);
- container.addAnnotationProperty(annotationProperty, ElementType.PARAMETER);
- annotationProperty = new AnnotationProperty("annotationName3", "attributeNameQualified", "org.eclipse.testEnumeration.VALUE", AttributeTypeEnum.QUALIFIED_NAME);
- container.addAnnotationProperty(annotationProperty, ElementType.PARAMETER);
- annotationProperty = new AnnotationProperty("annotationName4", "attributeNameString", "valueString", AttributeTypeEnum.STRING);
- container.addAnnotationProperty(annotationProperty, ElementType.PARAMETER);
-
- assertTrue(container.getTypeAnnotations(type.proxy()).size() == 0);
- assertTrue(container.getParameterAnnotations(typeParameter.proxy()).size() == 4);
- assertTrue(container.getMethodAnnotations(method.proxy()).size() == 0);
- parameterAnnotations = container.getParameterAnnotations(typeParameter.proxy());
-
- Set<String> names = new HashSet<String>();
- names.clear();
- names.add("annotationName1");
- names.add("annotationName2");
- names.add("annotationName3");
- names.add("annotationName4");
-
- for (IAnnotation<ITypeParameter> annotation : parameterAnnotations)
- {
- assertTrue(names.contains(annotation.getAnnotationName()));
- names.remove(annotation.getAnnotationName());
- if(annotation.getAnnotationName().equals("annotationName1"))
- {
- assertTrue(annotation.getParamValuePairs().size() == 1);
- assertTrue(annotation.getPropertyValue("attributeNameBoolean").equals("true"));
- }
- if(annotation.getAnnotationName().equals("annotationName2"))
- {
- assertTrue(annotation.getParamValuePairs().size() == 1);
- assertTrue(annotation.getPropertyValue("attributeNameInteger").equals("100"));
- }
- if(annotation.getAnnotationName().equals("annotationName3"))
- {
- assertTrue(annotation.getParamValuePairs().size() == 1);
- assertTrue(annotation.getPropertyValue("attributeNameQualified").equals("org.eclipse.testEnumeration.VALUE"));
- }
- if(annotation.getAnnotationName().equals("annotationName4"))
- {
- assertTrue(annotation.getParamValuePairs().size() == 1);
- assertTrue(annotation.getPropertyValue("attributeNameString").equals("valueString"));
- }
- }
- }
-
- public void testCombined() throws Exception
- {
- AnnotationPropertyContainer container = new AnnotationPropertyContainer();
- AnnotationProperty annotationProperty = new AnnotationProperty("paramAnnotationName", "paramAttributeNameBoolean", "true", AttributeTypeEnum.BOOLEAN);
- container.addAnnotationProperty(annotationProperty, ElementType.PARAMETER);
- annotationProperty = new AnnotationProperty("paramAnnotationName", "paramAttributeNameInteger", "100", AttributeTypeEnum.INTEGER);
- container.addAnnotationProperty(annotationProperty, ElementType.PARAMETER);
- annotationProperty = new AnnotationProperty("paramAnnotationName", "paramAttributeNameQualified", "org.eclipse.testEnumeration.PARAM_VALUE", AttributeTypeEnum.QUALIFIED_NAME);
- container.addAnnotationProperty(annotationProperty, ElementType.PARAMETER);
- annotationProperty = new AnnotationProperty("paramAnnotationName", "paramAttributeNameString", "paramValueString", AttributeTypeEnum.STRING);
- container.addAnnotationProperty(annotationProperty, ElementType.PARAMETER);
-
- annotationProperty = new AnnotationProperty("methodAnnotationName", "methodAttributeNameBoolean", "false", AttributeTypeEnum.BOOLEAN);
- container.addAnnotationProperty(annotationProperty, ElementType.METHOD);
- annotationProperty = new AnnotationProperty("methodAnnotationName", "methodAttributeNameInteger", "101", AttributeTypeEnum.INTEGER);
- container.addAnnotationProperty(annotationProperty, ElementType.METHOD);
- annotationProperty = new AnnotationProperty("methodAnnotationName", "methodAttributeNameQualified", "org.eclipse.testEnumeration.METHOD_VALUE", AttributeTypeEnum.QUALIFIED_NAME);
- container.addAnnotationProperty(annotationProperty, ElementType.METHOD);
- annotationProperty = new AnnotationProperty("methodAnnotationName", "methodAttributeNameString", "methodValueString", AttributeTypeEnum.STRING);
- container.addAnnotationProperty(annotationProperty, ElementType.METHOD);
-
- annotationProperty = new AnnotationProperty("typeAnnotationName", "typeAttributeNameBoolean", "false", AttributeTypeEnum.BOOLEAN);
- container.addAnnotationProperty(annotationProperty, ElementType.TYPE);
- annotationProperty = new AnnotationProperty("typeAnnotationName", "typeAttributeNameInteger", "1", AttributeTypeEnum.INTEGER);
- container.addAnnotationProperty(annotationProperty, ElementType.TYPE);
- annotationProperty = new AnnotationProperty("typeAnnotationName", "typeAttributeNameQualified", "org.eclipse.testEnumeration.TYPE_VALUE", AttributeTypeEnum.QUALIFIED_NAME);
- container.addAnnotationProperty(annotationProperty, ElementType.TYPE);
- annotationProperty = new AnnotationProperty("typeAnnotationName", "typeAttributeNameString", "typeValueString", AttributeTypeEnum.STRING);
- container.addAnnotationProperty(annotationProperty, ElementType.TYPE);
-
- assertTrue(container.getTypeAnnotations(type.proxy()).size() == 1);
- assertTrue(container.getParameterAnnotations(typeParameter.proxy()).size() == 1);
- assertTrue(container.getMethodAnnotations(method.proxy()).size() == 1);
-
- Set<IAnnotation<ITypeParameter>> parameterAnnotations = container.getParameterAnnotations(typeParameter.proxy());
- for (IAnnotation<ITypeParameter> annotation : parameterAnnotations)
- {
- assertTrue(annotation.getAnnotationName().equals("paramAnnotationName"));
- assertTrue(annotation.getParamValuePairs().size() == 4);
- assertTrue(annotation.getPropertyValue("paramAttributeNameBoolean").equals("true"));
- assertTrue(annotation.getPropertyValue("paramAttributeNameInteger").equals("100"));
- assertTrue(annotation.getPropertyValue("paramAttributeNameQualified").equals("org.eclipse.testEnumeration.PARAM_VALUE"));
- assertTrue(annotation.getPropertyValue("paramAttributeNameString").equals("paramValueString"));
- }
-
- Set<IAnnotation<IMethod>> methodAnnotations = container.getMethodAnnotations(method.proxy());
- for (IAnnotation<IMethod> annotation : methodAnnotations)
- {
- assertTrue(annotation.getAnnotationName().equals("methodAnnotationName"));
- assertTrue(annotation.getParamValuePairs().size() == 4);
- assertTrue(annotation.getPropertyValue("methodAttributeNameBoolean").equals("false"));
- assertTrue(annotation.getPropertyValue("methodAttributeNameInteger").equals("101"));
- assertTrue(annotation.getPropertyValue("methodAttributeNameQualified").equals("org.eclipse.testEnumeration.METHOD_VALUE"));
- assertTrue(annotation.getPropertyValue("methodAttributeNameString").equals("methodValueString"));
- }
-
- Set<IAnnotation<IType>> typeAnnotations = container.getTypeAnnotations(type.proxy());
- for (IAnnotation<IType> annotation : typeAnnotations)
- {
- assertTrue(annotation.getAnnotationName().equals("typeAnnotationName"));
- assertTrue(annotation.getParamValuePairs().size() == 4);
- assertTrue(annotation.getPropertyValue("typeAttributeNameBoolean").equals("false"));
- assertTrue(annotation.getPropertyValue("typeAttributeNameInteger").equals("1"));
- assertTrue(annotation.getPropertyValue("typeAttributeNameQualified").equals("org.eclipse.testEnumeration.TYPE_VALUE"));
- assertTrue(annotation.getPropertyValue("typeAttributeNameString").equals("typeValueString"));
- }
- }
-}
diff --git a/tests/org.eclipse.jst.ws.jaxws.utils.tests/src/org/eclipse/jst/ws/jaxws/utils/tests/internal/annotations/AnnotationUtilsTest.java b/tests/org.eclipse.jst.ws.jaxws.utils.tests/src/org/eclipse/jst/ws/jaxws/utils/tests/internal/annotations/AnnotationUtilsTest.java
deleted file mode 100755
index ed2452f..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.utils.tests/src/org/eclipse/jst/ws/jaxws/utils/tests/internal/annotations/AnnotationUtilsTest.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.utils.tests.internal.annotations;
-
-import java.io.IOException;
-import java.util.HashSet;
-import java.util.Set;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jdt.core.IField;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jst.ws.jaxws.testutils.project.ClassLoadingTest;
-import org.eclipse.jst.ws.jaxws.utils.annotations.AnnotationFactory;
-import org.eclipse.jst.ws.jaxws.utils.annotations.AnnotationGeneratorException;
-import org.eclipse.jst.ws.jaxws.utils.annotations.AnnotationWriter;
-import org.eclipse.jst.ws.jaxws.utils.annotations.IAnnotation;
-import org.eclipse.jst.ws.jaxws.utils.annotations.IParamValuePair;
-import org.eclipse.jst.ws.jaxws.utils.annotations.IValue;
-
-public class AnnotationUtilsTest extends ClassLoadingTest
-{
- private static final String SRC = "src";
-
- private static final String PCK = "org.eclipse.demo";
-
- private IType endpoint;
-
- public void setUp() throws CoreException, IOException, AnnotationGeneratorException
- {
- createJavaProject(SRC, PCK);
- endpoint = createClass("Endpoint.src", "Endpoint");
- AnnotationFactory.removeAnnotationsFromJavaElement(endpoint);
- }
-
- public void testRemove() throws Exception
- {
- setUp();
-
- IValue sv = AnnotationFactory.createStringValue("My String Value");
-
- Set<IParamValuePair> pv = new HashSet<IParamValuePair>();
- pv.add(AnnotationFactory.createParamValuePairValue("Param", sv));
-
- IAnnotation<IField> ann = AnnotationFactory.createAnnotation("org.eclipse.test.MyAnnotation", pv, endpoint.getField("field1"));
- AnnotationWriter.getInstance().setAppliedElement(ann, endpoint.getField("field1"));
- assertEquals(ann.getAppliedElement(), endpoint.getField("field1"));
-
- AnnotationWriter.getInstance().remove(ann);
- }
-}
diff --git a/tests/org.eclipse.jst.ws.jaxws.utils.tests/src/org/eclipse/jst/ws/jaxws/utils/tests/internal/annotations/AnnotationsBaseImplTest.java b/tests/org.eclipse.jst.ws.jaxws.utils.tests/src/org/eclipse/jst/ws/jaxws/utils/tests/internal/annotations/AnnotationsBaseImplTest.java
deleted file mode 100755
index 815d146..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.utils.tests/src/org/eclipse/jst/ws/jaxws/utils/tests/internal/annotations/AnnotationsBaseImplTest.java
+++ /dev/null
@@ -1,570 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.utils.tests.internal.annotations;
-
-import java.io.IOException;
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.Set;
-
-import org.eclipse.core.resources.IWorkspaceRunnable;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.jdt.core.IField;
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.ITypeParameter;
-import org.eclipse.jst.ws.jaxws.testutils.project.ClassLoadingTest;
-import org.eclipse.jst.ws.jaxws.utils.annotations.AnnotationFactory;
-import org.eclipse.jst.ws.jaxws.utils.annotations.AnnotationGeneratorException;
-import org.eclipse.jst.ws.jaxws.utils.annotations.AnnotationWriter;
-import org.eclipse.jst.ws.jaxws.utils.annotations.IAnnotation;
-import org.eclipse.jst.ws.jaxws.utils.annotations.ILocator;
-import org.eclipse.jst.ws.jaxws.utils.annotations.IParamValuePair;
-import org.eclipse.jst.ws.jaxws.utils.annotations.IValue;
-import org.eclipse.jst.ws.jaxws.utils.internal.annotations.impl.AnnotationImpl;
-
-public class AnnotationsBaseImplTest extends ClassLoadingTest
-{
- private static final String SRC = "src";
-
- private static final String PCK = "org.eclipse.demo";
-
- private IType endpoint;
-
- public void setUp() throws CoreException, IOException, AnnotationGeneratorException
- {
- setUpWitoutRemove();
- AnnotationFactory.removeAnnotationsFromJavaElement(endpoint);
- }
-
- public void setUpWitoutRemove() throws CoreException, IOException, AnnotationGeneratorException
- {
- createJavaProject(SRC, PCK);
- endpoint = createClass("Endpoint.src", "Endpoint");
- }
-
- public void setUpWitoutRemove2() throws CoreException, IOException, AnnotationGeneratorException
- {
- createJavaProject(SRC, PCK);
- endpoint = createClass("EndpointAnnInspector.src", "EndpointAnnInspector");
- }
-
- public void testBaseAnnotattionFunctionality()
- {
- AnnotationImpl<IType> ann = new AnnotationImpl<IType>("com.spa.test.MyAnnotation", new HashSet<IParamValuePair>());
- assertEquals(ann.getAnnotationName(), "com.spa.test.MyAnnotation");
- assertEquals(ann.getSimpleAnnotationName(), "MyAnnotation");
- //assertEquals(ann.getValueType(), IValue.ANNOTATION_VALUE);
-
- ann = new AnnotationImpl<IType>("MyNewAnnotation", new HashSet<IParamValuePair>());
- assertEquals(ann.getAnnotationName(), "MyNewAnnotation");
- assertEquals(ann.getSimpleAnnotationName(), "MyNewAnnotation");
- //assertEquals(ann.getValueType(), IValue.ANNOTATION_VALUE);
- }
-
- public void testAddAnnotation() throws Exception
- {
- setUp();
-
- IValue qv = AnnotationFactory.createQualifiedNameValue("full.qualified.Name");
-
- Set<IParamValuePair> pv = new HashSet<IParamValuePair>();
- pv.add(AnnotationFactory.createParamValuePairValue("param", qv));
-
- IAnnotation<IType> ann = AnnotationFactory.createAnnotation("org.eclipse.test.MyAnnotation", pv, endpoint);
- AnnotationWriter.getInstance().setAppliedElement(ann, endpoint);
-
- Collection<IAnnotation<IType>> annotations = AnnotationFactory.createAnnotationInspector(endpoint).inspectType();
- assertNotNull(annotations);
- assertTrue(annotations.size() == 1);
- IAnnotation<IType> tmpAnn = annotations.iterator().next();
-
- AnnotationWriter.getInstance().remove(tmpAnn);
-
- annotations = AnnotationFactory.createAnnotationInspector(endpoint).inspectType();
- assertTrue(annotations.size() == 0);
-
- IMethod[] methods = endpoint.getMethods();
- for (IMethod method : methods)
- {
- if(method.getRawParameterNames() != null && method.getRawParameterNames().length > 0)
- {
- IAnnotation<IMethod> annM = AnnotationFactory.createAnnotation("org.eclipse.test.MyAnnotationMethod", pv, method);
- AnnotationWriter.getInstance().setAppliedElement(annM, method);
- assertEquals("full.qualified.Name", annM.getPropertyValue("param"));
- assertNull(annM.getPropertyValue("paramNotExists"));
- Collection<IAnnotation<IMethod>> annotationsM = AnnotationFactory.createAnnotationInspector(endpoint).inspectMethod(method);
- IAnnotation<IMethod> annotatM = annotationsM.iterator().next();
- assertEquals("qualified.Name", annotatM.getPropertyValue("param"));
-
- IValue sv = AnnotationFactory.createStringValue("New String Value");
- annM.getParamValuePairs().add(AnnotationFactory.createParamValuePairValue("NewParam", sv));
- AnnotationWriter.getInstance().update(annM);
- annotationsM = AnnotationFactory.createAnnotationInspector(endpoint).inspectMethod(method);
- assertTrue(annotationsM.size() == 1);
- annotatM = annotationsM.iterator().next();
- assertEquals("New String Value", annotatM.getPropertyValue("NewParam"));
- assertEquals("qualified.Name", annotatM.getPropertyValue("param"));
- AnnotationWriter.getInstance().remove(annotatM);
- annotationsM = AnnotationFactory.createAnnotationInspector(endpoint).inspectMethod(method);
- assertTrue(annotationsM.size() == 0);
-
- IValue sv3 = AnnotationFactory.createStringValue("New String Value3");
- annM.getParamValuePairs().clear();
- annM.getParamValuePairs().add(AnnotationFactory.createParamValuePairValue("NewParam", sv3));
- AnnotationWriter.getInstance().update(annM);
- annotationsM = AnnotationFactory.createAnnotationInspector(endpoint).inspectMethod(method);
- assertTrue(annotationsM.size() == 1);
- annotatM = annotationsM.iterator().next();
- assertEquals("New String Value3", annotatM.getPropertyValue("NewParam"));
-
- // clear annotation
- AnnotationWriter.getInstance().remove(annM);
-
- annotationsM = AnnotationFactory.createAnnotationInspector(endpoint).inspectMethod(method);
- assertTrue(annotationsM.size() == 0);
-
- for(int i = 0; i < method.getRawParameterNames().length; i++)
- {
- ITypeParameter param = method.getTypeParameter(method.getRawParameterNames()[i]);
-
- IValue svParam = AnnotationFactory.createStringValue("String Valu Param");
- Set<IParamValuePair> pvParam = new HashSet<IParamValuePair>();
- pvParam.add(AnnotationFactory.createParamValuePairValue("ParamAtribute", svParam));
- IAnnotation<ITypeParameter> annP = AnnotationFactory.createAnnotation("ParamAnnotation", pvParam, param);
- AnnotationWriter.getInstance().setAppliedElement(annP, param);
-
- AnnotationWriter.getInstance().remove(annP);
- }
- }
- }
- }
-
- public void testAnnotattionUpdate() throws Exception
- {
- setUp();
-
- IValue sv = AnnotationFactory.createStringValue("StringValue");
- Set<IParamValuePair> spv = new HashSet<IParamValuePair>();
- spv.add(AnnotationFactory.createParamValuePairValue("stringParam", sv));
- IAnnotation<IType> typeAnnotation = AnnotationFactory.createAnnotation("org.eclipse.test.MyTypeAnnotation", spv, endpoint);
- AnnotationWriter.getInstance().setAppliedElement(typeAnnotation, endpoint);
-
- Collection<IAnnotation<IType>> typeAnnotations = AnnotationFactory.createAnnotationInspector(endpoint).inspectType();
- assertNotNull(typeAnnotations);
- assertTrue(typeAnnotations.size() == 1);
- IAnnotation<IType> tempTypeAnnotation = typeAnnotations.iterator().next();
- assertEquals(tempTypeAnnotation.getPropertyValue("stringParam"), "StringValue");
-
- IValue newSV = AnnotationFactory.createStringValue("NewStringValue");
- Set<IParamValuePair> newSPV = new HashSet<IParamValuePair>();
- newSPV.add(AnnotationFactory.createParamValuePairValue("stringParam", newSV));
- AnnotationImpl<IType> newTypeAnnotation = new AnnotationImpl<IType>("org.eclipse.test.MyTypeAnnotation", newSPV);
- newTypeAnnotation.setAppliedElementWithoutSave(endpoint);
-
- AnnotationWriter.getInstance().update(newTypeAnnotation);
-
- typeAnnotations = AnnotationFactory.createAnnotationInspector(endpoint).inspectType();
- assertNotNull(typeAnnotations);
- assertTrue(typeAnnotations.size() == 1);
- tempTypeAnnotation = typeAnnotations.iterator().next();
- assertEquals(tempTypeAnnotation.getPropertyValue("stringParam"), "NewStringValue");
-
- newSV = AnnotationFactory.createStringValue("NewestStringValue");
- newSPV = new HashSet<IParamValuePair>();
- newSPV.add(AnnotationFactory.createParamValuePairValue("newestStringParam", newSV));
- newTypeAnnotation = new AnnotationImpl<IType>("org.eclipse.test.MyTypeAnnotation", newSPV);
- newTypeAnnotation.setAppliedElementWithoutSave(endpoint);
-
- AnnotationWriter.getInstance().update(newTypeAnnotation);
-
- typeAnnotations = AnnotationFactory.createAnnotationInspector(endpoint).inspectType();
- assertNotNull(typeAnnotations);
- assertTrue(typeAnnotations.size() == 1);
- tempTypeAnnotation = typeAnnotations.iterator().next();
- assertNull(tempTypeAnnotation.getPropertyValue("stringParam"));
- assertEquals(tempTypeAnnotation.getPropertyValue("newestStringParam"), "NewestStringValue");
-
- IMethod firstMethod = endpoint.getMethods()[0];
-
- IValue iv = AnnotationFactory.createIntegerValue("10");
- Set<IParamValuePair> ipv = new HashSet<IParamValuePair>();
- ipv.add(AnnotationFactory.createParamValuePairValue("integerParam", iv));
- IAnnotation<IMethod> methodAnnotation = AnnotationFactory.createAnnotation("org.eclipse.test.MyMethodAnnotation", ipv, firstMethod);
- AnnotationWriter.getInstance().setAppliedElement(methodAnnotation, firstMethod);
-
- Collection<IAnnotation<IMethod>> methodAnnotations = AnnotationFactory.createAnnotationInspector(endpoint).inspectMethod(firstMethod);
- assertNotNull(methodAnnotations);
- assertTrue(methodAnnotations.size() == 1);
- IAnnotation<IMethod> tempMethodAnnotation = methodAnnotations.iterator().next();
- assertEquals(tempMethodAnnotation.getPropertyValue("integerParam"), "10");
-
- IValue newIV = AnnotationFactory.createIntegerValue("11");
- Set<IParamValuePair> newIPV = new HashSet<IParamValuePair>();
- newIPV.add(AnnotationFactory.createParamValuePairValue("integerParam", newIV));
- AnnotationImpl<IMethod> newMethodAnnotation = new AnnotationImpl<IMethod>("org.eclipse.test.MyMethodAnnotation", newIPV);
- newMethodAnnotation.setAppliedElementWithoutSave(firstMethod);
-
- AnnotationWriter.getInstance().update(newMethodAnnotation);
-
- methodAnnotations = AnnotationFactory.createAnnotationInspector(endpoint).inspectMethod(firstMethod);
- assertNotNull(methodAnnotations);
- assertTrue(methodAnnotations.size() == 1);
- tempMethodAnnotation = methodAnnotations.iterator().next();
- assertEquals(tempMethodAnnotation.getPropertyValue("integerParam"), "11");
-
- newIV = AnnotationFactory.createIntegerValue("100");
- newIPV = new HashSet<IParamValuePair>();
- newIPV.add(AnnotationFactory.createParamValuePairValue("newestIntegerParam", newIV));
- newMethodAnnotation = new AnnotationImpl<IMethod>("org.eclipse.test.MyMethodAnnotation", newIPV);
- newMethodAnnotation.setAppliedElementWithoutSave(firstMethod);
-
- AnnotationWriter.getInstance().update(newMethodAnnotation);
-
- methodAnnotations = AnnotationFactory.createAnnotationInspector(endpoint).inspectMethod(firstMethod);
- assertNotNull(methodAnnotations);
- assertTrue(methodAnnotations.size() == 1);
- tempMethodAnnotation = methodAnnotations.iterator().next();
- assertNull(tempMethodAnnotation.getPropertyValue("integerParam"));
- assertEquals(tempMethodAnnotation.getPropertyValue("newestIntegerParam"), "100");
-
- ITypeParameter typeParameter = firstMethod.getTypeParameter("annotatedParam");
-
- IValue bv = AnnotationFactory.createBooleanValue(true);
- Set<IParamValuePair> bpv = new HashSet<IParamValuePair>();
- bpv.add(AnnotationFactory.createParamValuePairValue("booleanParam", bv));
- IAnnotation<ITypeParameter> parameterAnnotation = AnnotationFactory.createAnnotation("org.eclipse.test.MyParameterAnnotation", bpv, typeParameter);
- AnnotationWriter.getInstance().setAppliedElement(parameterAnnotation, typeParameter);
-
- Collection<IAnnotation<ITypeParameter>> parameterAnnotations = AnnotationFactory.createAnnotationInspector(endpoint).inspectParam(typeParameter);
- assertNotNull(parameterAnnotations);
- assertTrue(parameterAnnotations.size() == 1);
- IAnnotation<ITypeParameter> tempParameterAnnotation = parameterAnnotations.iterator().next();
- assertEquals(tempParameterAnnotation.getPropertyValue("booleanParam"), "true");
-
- IValue newBV = AnnotationFactory.createBooleanValue(false);
- Set<IParamValuePair> newBPV = new HashSet<IParamValuePair>();
- newBPV.add(AnnotationFactory.createParamValuePairValue("booleanParam", newBV));
- AnnotationImpl<ITypeParameter> newParameterAnnotation = new AnnotationImpl<ITypeParameter>("org.eclipse.test.MyParameterAnnotation", newBPV);
- newParameterAnnotation.setAppliedElementWithoutSave(typeParameter);
-
- AnnotationWriter.getInstance().update(newParameterAnnotation);
-
- parameterAnnotations = AnnotationFactory.createAnnotationInspector(endpoint).inspectParam(typeParameter);
- assertNotNull(parameterAnnotations);
- assertTrue(parameterAnnotations.size() == 1);
- tempParameterAnnotation = parameterAnnotations.iterator().next();
- assertEquals(tempParameterAnnotation.getPropertyValue("booleanParam"), "false");
-
- newBV = AnnotationFactory.createBooleanValue(true);
- newBPV = new HashSet<IParamValuePair>();
- newBPV.add(AnnotationFactory.createParamValuePairValue("newestBooleanParam", newBV));
- newParameterAnnotation = new AnnotationImpl<ITypeParameter>("org.eclipse.test.MyParameterAnnotation", newBPV);
- newParameterAnnotation.setAppliedElementWithoutSave(typeParameter);
-
- AnnotationWriter.getInstance().update(newParameterAnnotation);
-
- parameterAnnotations = AnnotationFactory.createAnnotationInspector(endpoint).inspectParam(typeParameter);
- assertNotNull(parameterAnnotations);
- assertTrue(parameterAnnotations.size() == 1);
- tempParameterAnnotation = parameterAnnotations.iterator().next();
- assertNull(tempParameterAnnotation.getPropertyValue("booleanParam"));
- assertEquals(tempParameterAnnotation.getPropertyValue("newestBooleanParam"), "true");
-
-
- }
-
- public void testSetAppliedElementWithoutSave() throws Exception
- {
- setUp();
- IValue qv = AnnotationFactory.createQualifiedNameValue("full.qualified.Name");
-
- Set<IParamValuePair> pv = new HashSet<IParamValuePair>();
- pv.add(AnnotationFactory.createParamValuePairValue("param", qv));
-
- IAnnotation<IType> ann = AnnotationFactory.createAnnotation("org.eclipse.test.MyAnnotation", pv, endpoint);
- try
- {
- AnnotationWriter.getInstance().setAppliedElement(ann, null);
- fail("NullPointerException was not thrown.");
- }
- catch (NullPointerException e)
- {
- assertTrue(true);
- }
- }
-
- public void testMultyAddAnnotation() throws Exception
- {
- setUpWitoutRemove();
-
- IWorkspaceRunnable runnable = new IWorkspaceRunnable()
- {
- public void run(IProgressMonitor monitor) throws CoreException
- {
- try
- {
- Set<String> annoSet = new HashSet<String>();
- annoSet.add("Stateless");
-
- AnnotationFactory.removeAnnotations(endpoint, annoSet);
-
- IValue qv = AnnotationFactory.createQualifiedNameValue("full.qualified.Name");
-
- Set<IParamValuePair> pv = new HashSet<IParamValuePair>();
- pv.add(AnnotationFactory.createParamValuePairValue("param", qv));
-
- IAnnotation<IType> ann = AnnotationFactory.createAnnotation("org.eclipse.test.MyAnnotation", pv, endpoint);
- AnnotationWriter.getInstance().setAppliedElement(ann, endpoint);
-
- IValue sv = AnnotationFactory.createStringValue("StringValue");
-
- Set<IParamValuePair> spv = new HashSet<IParamValuePair>();
- spv.add(AnnotationFactory.createParamValuePairValue("stringParam", sv));
-
- IAnnotation<IType> sAnn = AnnotationFactory.createAnnotation("org.eclipse.test.MyStringAnnotation", spv, endpoint);
- AnnotationWriter.getInstance().setAppliedElement(sAnn, endpoint);
-
-
- Collection<IAnnotation<IType>> annotations = AnnotationFactory.createAnnotationInspector(endpoint).inspectType();
- assertNotNull(annotations);
- assertTrue(annotations.size() == 3);
- IAnnotation<IType> tmpAnn = annotations.iterator().next();
-
- AnnotationWriter.getInstance().remove(tmpAnn);
-
- annotations = AnnotationFactory.createAnnotationInspector(endpoint).inspectType();
- assertTrue(annotations.size() == 2);
-
- IMethod[] methods = endpoint.getMethods();
- for (IMethod method : methods)
- {
- IValue smv = AnnotationFactory.createStringValue("StringValue");
- Set<IParamValuePair> smpv = new HashSet<IParamValuePair>();
- smpv.add(AnnotationFactory.createParamValuePairValue("stringParam", smv));
-
- IAnnotation<IMethod> smAnn = AnnotationFactory.createAnnotation("org.eclipse.test.MyAnnotationMethod", smpv, method);
- AnnotationWriter.getInstance().setAppliedElement(smAnn, method);
- Collection<IAnnotation<IMethod>> annotationsM = AnnotationFactory.createAnnotationInspector(endpoint).inspectMethod(method);
- assertNotNull(annotationsM);
- assertTrue(annotationsM.size() == 2);
-
- annotations = AnnotationFactory.createAnnotationInspector(endpoint).inspectType();
- assertNotNull(annotations);
- assertTrue(annotations.size() == 2);
-
- }
-
- } catch (Exception e)
- {
- fail(e.getMessage());
- }
- }
- };
-
- getTestProject().getSourceFolder().getResource().getWorkspace().run(runnable, null);
-
-
-
-
- }
-
- public void testEquals()
- {
- IValue qv = AnnotationFactory.createQualifiedNameValue("full.qualified.Name");
-
- Set<IParamValuePair> pv = new HashSet<IParamValuePair>();
- pv.add(AnnotationFactory.createParamValuePairValue("param", qv));
-
- IAnnotation<IType> ann1 = AnnotationFactory.createAnnotation("org.eclipse.test.MyAnnotation1", pv, endpoint);
- IAnnotation<IType> ann2 = AnnotationFactory.createAnnotation("org.eclipse.test.MyAnnotation2", pv, endpoint);
- IAnnotation<IType> ann3 = AnnotationFactory.createAnnotation("org.eclipse.test.MyAnnotation1", pv, endpoint);
-
- assertTrue(ann1.equals(ann1));
- assertFalse(ann1.equals(null));
- assertFalse(ann1.equals(qv));
- assertFalse(ann1.equals(ann2));
- assertTrue(ann1.equals(ann3));
- }
-
- public void testField() throws Exception
- {
- setUp();
-
- IValue qv = AnnotationFactory.createQualifiedNameValue("full.qualified.Name");
-
- Set<IParamValuePair> pv = new HashSet<IParamValuePair>();
- pv.add(AnnotationFactory.createParamValuePairValue("param", qv));
-
- IAnnotation<IField> ann = AnnotationFactory.createAnnotation("org.eclipse.test.MyAnnotation", pv, endpoint.getField("field1"));
- AnnotationWriter.getInstance().setAppliedElement(ann, endpoint.getField("field1"));
- assertEquals(ann.getAppliedElement(), endpoint.getField("field1"));
- }
-
- public void testLocator() throws Exception
- {
- setUpWitoutRemove2();
-
- IAnnotation<IType> inspectedTypeAnnotation = AnnotationFactory.createAnnotationInspector(endpoint).inspectType("org.eclipse.demo.MyAnnotation");
- assertNotNull(inspectedTypeAnnotation);
- ILocator locator = inspectedTypeAnnotation.getLocator();
- assertEquals("Unexpected annotation start position", 191, locator.getStartPosition());
- assertEquals("Unexpected length", 33, locator.getLength());
- Set<IParamValuePair> parmValues = inspectedTypeAnnotation.getParamValuePairs();
- for (IParamValuePair paramValuePair : parmValues)
- {
- if(paramValuePair.getParam().equals("myValue"))
- {
- locator = paramValuePair.getLocator();
- assertEquals("Unexpected annotation parameter start position", 205, locator.getStartPosition());
- assertEquals("Unexpected annotation parameter length", 18, locator.getLength());
- }
- }
-
- inspectedTypeAnnotation = AnnotationFactory.createAnnotationInspector(endpoint).inspectType("javax.jws.WebService");
- assertNotNull(inspectedTypeAnnotation);
- locator = inspectedTypeAnnotation.getLocator();
- assertEquals("Unexpected @WebService annotation start position", 226, locator.getStartPosition());
- assertEquals("Unexpected @WebService annotation length", 134, locator.getLength());
- parmValues = inspectedTypeAnnotation.getParamValuePairs();
- for (IParamValuePair paramValuePair : parmValues)
- {
- if(paramValuePair.getParam().equals("serviceName"))
- {
- locator = paramValuePair.getLocator();
- assertEquals("Unexpected serviceName annotation parameter start position", 238, locator.getStartPosition());
- assertEquals("Unexpected serviceName annotation parameter length", 31, locator.getLength());
- }
-
- if(paramValuePair.getParam().equals("name"))
- {
- locator = paramValuePair.getLocator();
- assertEquals("Unexpected serviceName annotation parameter start position", 271, locator.getStartPosition());
- assertEquals("Unexpected serviceName annotation parameter length", 17, locator.getLength());
- }
-
- if(paramValuePair.getParam().equals("targetNamespace"))
- {
- locator = paramValuePair.getLocator();
- assertEquals("Unexpected targetNamespace annotation parameter start position", 290, locator.getStartPosition());
- assertEquals("Unexpected targetNamespace annotation parameter length", 42, locator.getLength());
- }
-
- if(paramValuePair.getParam().equals("portName"))
- {
- locator = paramValuePair.getLocator();
- assertEquals("Unexpected portName annotation parameter start position", 334, locator.getStartPosition());
- assertEquals("Unexpected portName annotation parameter length", 25, locator.getLength());
- }
- }
-
- IField field = endpoint.getField("field1");
- IAnnotation<IField> inspectedFieldAnnotation = AnnotationFactory.createAnnotationInspector(endpoint).inspectField(field, "org.eclipse.demo.MyFieldAnnotation");
- locator = inspectedFieldAnnotation.getLocator();
- assertEquals("Unexpected MyFieldAnnotation annotation parameter start position", 401, locator.getStartPosition());
- assertEquals("Unexpected MyFieldAnnotation annotation parameter length", 33, locator.getLength());
- parmValues = inspectedFieldAnnotation.getParamValuePairs();
- for (IParamValuePair paramValuePair : parmValues)
- {
- if(paramValuePair.getParam().equals("name"))
- {
- locator = paramValuePair.getLocator();
- assertEquals("Unexpected name annotation parameter start position", 420, locator.getStartPosition());
- assertEquals("Unexpected name annotation parameter length", 13, locator.getLength());
- }
- }
-
- inspectedFieldAnnotation = AnnotationFactory.createAnnotationInspector(endpoint).inspectField(field, "javax.jws.WebField");
- locator = inspectedFieldAnnotation.getLocator();
- assertEquals("Unexpected WebField annotation parameter start position", 437, locator.getStartPosition());
- assertEquals("Unexpected WebField annotation parameter length", 25, locator.getLength());
- parmValues = inspectedFieldAnnotation.getParamValuePairs();
- for (IParamValuePair paramValuePair : parmValues)
- {
- if(paramValuePair.getParam().equals("name"))
- {
- locator = paramValuePair.getLocator();
- assertEquals("Unexpected name annotation parameter start position", 447, locator.getStartPosition());
- assertEquals("Unexpected name annotation parameter length", 14, locator.getLength());
- }
- }
-
- IMethod method = endpoint.getMethods()[0];
- IAnnotation<IMethod> inspectedMethodAnnotation = AnnotationFactory.createAnnotationInspector(endpoint).inspectMethod(method, "org.eclipse.demo.MyMethodAnnotation");
- locator = inspectedMethodAnnotation.getLocator();
- assertEquals("Unexpected MyMethodAnnotation annotation parameter start position", 492, locator.getStartPosition());
- assertEquals("Unexpected MyMethodAnnotation annotation parameter length", 43, locator.getLength());
- parmValues = inspectedMethodAnnotation.getParamValuePairs();
- for (IParamValuePair paramValuePair : parmValues)
- {
- if(paramValuePair.getParam().equals("name"))
- {
- locator = paramValuePair.getLocator();
- assertEquals("Unexpected name annotation parameter start position", 512, locator.getStartPosition());
- assertEquals("Unexpected name annotation parameter length", 22, locator.getLength());
- }
- }
-
- inspectedMethodAnnotation = AnnotationFactory.createAnnotationInspector(endpoint).inspectMethod(method, "javax.jws.WebMethod");
- locator = inspectedMethodAnnotation.getLocator();
- assertEquals("Unexpected WebMethod annotation parameter start position", 538, locator.getStartPosition());
- assertEquals("Unexpected WebMethod annotation parameter length", 46, locator.getLength());
- parmValues = inspectedMethodAnnotation.getParamValuePairs();
- for (IParamValuePair paramValuePair : parmValues)
- {
- if(paramValuePair.getParam().equals("exclude"))
- {
- locator = paramValuePair.getLocator();
- assertEquals("Unexpected exclude annotation parameter start position", 549, locator.getStartPosition());
- assertEquals("Unexpected exclude annotation parameter length", 13, locator.getLength());
- }
-
- if(paramValuePair.getParam().equals("operationName"))
- {
- locator = paramValuePair.getLocator();
- assertEquals("Unexpected operationName annotation parameter start position", 563, locator.getStartPosition());
- assertEquals("Unexpected operationName annotation parameter length", 20, locator.getLength());
- }
- }
-
- ITypeParameter typeParameter = method.getTypeParameter("annotatedParam");
- IAnnotation<ITypeParameter> inspectedParamAnnotation = AnnotationFactory.createAnnotationInspector(endpoint).inspectParam(typeParameter, "org.eclipse.demo.MyParamAnnotation");
- locator = inspectedParamAnnotation.getLocator();
- assertEquals("Unexpected MyParamAnnotation annotation parameter start position", 649, locator.getStartPosition());
- assertEquals("Unexpected MyParamAnnotation annotation parameter length", 43, locator.getLength());
- parmValues = inspectedParamAnnotation.getParamValuePairs();
- for (IParamValuePair paramValuePair : parmValues)
- {
- if(paramValuePair.getParam().equals("name"))
- {
- locator = paramValuePair.getLocator();
- assertEquals("Unexpected name annotation parameter start position", 668, locator.getStartPosition());
- assertEquals("Unexpected name annotation parameter length", 23, locator.getLength());
- }
- }
-
- inspectedParamAnnotation = AnnotationFactory.createAnnotationInspector(endpoint).inspectParam(typeParameter, "javax.jws.WebParam");
- locator = inspectedParamAnnotation.getLocator();
- assertEquals("Unexpected WebParam annotation parameter start position", 616, locator.getStartPosition());
- assertEquals("Unexpected WebParam annotation parameter length", 32, locator.getLength());
- parmValues = inspectedParamAnnotation.getParamValuePairs();
- for (IParamValuePair paramValuePair : parmValues)
- {
- if(paramValuePair.getParam().equals("name"))
- {
- locator = paramValuePair.getLocator();
- assertEquals("Unexpected name annotation parameter start position", 626, locator.getStartPosition());
- assertEquals("Unexpected name annotation parameter length", 21, locator.getLength());
- }
- }
- }
-}
diff --git a/tests/org.eclipse.jst.ws.jaxws.utils.tests/src/org/eclipse/jst/ws/jaxws/utils/tests/internal/annotations/AnnotationsTest.java b/tests/org.eclipse.jst.ws.jaxws.utils.tests/src/org/eclipse/jst/ws/jaxws/utils/tests/internal/annotations/AnnotationsTest.java
deleted file mode 100755
index 31433a7..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.utils.tests/src/org/eclipse/jst/ws/jaxws/utils/tests/internal/annotations/AnnotationsTest.java
+++ /dev/null
@@ -1,237 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.utils.tests.internal.annotations;
-
-import java.io.IOException;
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.Set;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.ITypeParameter;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jst.ws.jaxws.testutils.project.ClassLoadingTest;
-import org.eclipse.jst.ws.jaxws.utils.annotations.AnnotationFactory;
-import org.eclipse.jst.ws.jaxws.utils.annotations.AnnotationGeneratorException;
-import org.eclipse.jst.ws.jaxws.utils.annotations.AnnotationWriter;
-import org.eclipse.jst.ws.jaxws.utils.annotations.IAnnotation;
-import org.eclipse.jst.ws.jaxws.utils.annotations.IParamValuePair;
-import org.eclipse.jst.ws.jaxws.utils.annotations.IValue;
-import org.eclipse.jst.ws.jaxws.utils.internal.annotations.impl.AnnotationInspectorImpl;
-
-public class AnnotationsTest extends ClassLoadingTest
-{
- private static final String SRC = "src";
-
- private static final String PCK = "org.eclipse.demo";
-
- private IType endpoint;
-
- public void setUp() throws CoreException, IOException, AnnotationGeneratorException
- {
- createJavaProject(SRC, PCK);
- endpoint = createClass("Endpoint.src", "Endpoint");
- AnnotationFactory.removeAnnotationsFromJavaElement(endpoint);
- }
-
- public void testAddComplexAnnotationQNValue() throws JavaModelException, AnnotationGeneratorException
- {
- IValue qv = AnnotationFactory.createQualifiedNameValue("full.qualified.Name");
-
- IParamValuePair pv = AnnotationFactory.createParamValuePairValue("param", qv);
- Set<IParamValuePair> paramValues = new HashSet<IParamValuePair>();
- paramValues.add(pv);
- IAnnotation<IType> annotation = AnnotationFactory.createAnnotation("javax.jws.WebService", paramValues, endpoint);
- AnnotationWriter.getInstance().setAppliedElement(annotation, endpoint);
-
- assertTrue(AnnotationFactory.createAnnotationInspector(endpoint).inspectType().size() > 0);
- }
-
-// public void testAddSingleElementAnnotationArrayValues() throws JavaModelException, AnnotationGeneratorException
-// {
-// IAnnotation annotation = AnnotationFactory.createSingleElementAnnotation("javax.jws.WebService", new String[] { "val1", "val2" });
-// annotation.addToClass(endpoint);
-//
-// assertTrue(AnnotationFactory.getAnnotationsFromClass(endpoint).length > 0);
-// }
-//
-// public void testAddSimpleAnnotation() throws JavaModelException, AnnotationGeneratorException
-// {
-// IAnnotation annotation = AnnotationFactory.createSimpleAnnotation("javax.jws.WebService");
-// annotation.addToClass(endpoint);
-//
-// assertTrue(AnnotationFactory.getAnnotationsFromClass(endpoint).length > 0);
-// }
-
- /**
- * Creates complex annotation and adds it to class. The annotation has the form:
- *
- * <pre>
- * @WebService(serviceName="serviceName",
- * name="portTypeName",
- * targetNamespace="http://demo.sap.com/",
- * wsdlLocation="http://wsdl/url/",
- * portName="portName",
- * endpointInterface="org.eclipse.demo.ISei")
- * </pre>
- *
- * @throws JavaModelException
- * @throws AnnotationGeneratorException
- */
- public void testAddComplexClassAnnotation() throws JavaModelException, AnnotationGeneratorException
- {
- Set<IParamValuePair> paramValues = new HashSet<IParamValuePair>();
-
- addStringProperty(paramValues, "serviceName", "serviceName");
- addStringProperty(paramValues, "name", "portTypeName");
- addStringProperty(paramValues, "targetNamespace", "http://demo.sap.com/");
- addStringProperty(paramValues, "wsdlLocation", "http://wsdl/url/");
- addStringProperty(paramValues, "portName", "portName");
- addStringProperty(paramValues, "endpointInterface", "org.eclipse.demo.ISei");
-
- IAnnotation<IType> annotation = AnnotationFactory.createAnnotation("javax.jws.WebService", paramValues, endpoint);
- AnnotationWriter.getInstance().setAppliedElement(annotation, endpoint);
-
- AnnotationInspectorImpl annotationInspector = new AnnotationInspectorImpl(endpoint);
- Collection<IAnnotation<IType>> typeAnnotations = annotationInspector.inspectType();
-
- boolean result = false;
- for (IAnnotation<IType> typeAnnotation : typeAnnotations)
- {
- if(typeAnnotation.getAnnotationName().equals("javax.jws.WebService") || typeAnnotation.getAnnotationName().equals("WebService"))
- {
- if(typeAnnotation.getParamValuePairs().size() != 6)
- {
- break;
- }
- if(!typeAnnotation.getPropertyValue("serviceName").equals("serviceName"))
- {
- break;
- }
- if(!typeAnnotation.getPropertyValue("name").equals("portTypeName"))
- {
- break;
- }
- if(!typeAnnotation.getPropertyValue("targetNamespace").equals("http://demo.sap.com/"))
- {
- break;
- }
- if(!typeAnnotation.getPropertyValue("wsdlLocation").equals("http://wsdl/url/"))
- {
- break;
- }
- if(!typeAnnotation.getPropertyValue("portName").equals("portName"))
- {
- break;
- }
- if(!typeAnnotation.getPropertyValue("endpointInterface").equals("org.eclipse.demo.ISei"))
- {
- break;
- }
-
- result = true;
- }
- }
-
- assertTrue("Class is not annotated correctly", result);
- }
-
- /**
- * Creates complex annotation and adds it to method declaration. Annotation has the form:
- *
- * <pre>
- * \@WebMethod(exclude=false,operationName="annotatedMethod",action="go")
- * </pre>
- *
- * @throws JavaModelException
- * @throws AnnotationGeneratorException
- */
- public void testAddComplexMethodAnnotation() throws JavaModelException, AnnotationGeneratorException
- {
- Set<IParamValuePair> paramValues = new HashSet<IParamValuePair>();
-
- IValue emValue = AnnotationFactory.createBooleanValue(false);
- paramValues.add(AnnotationFactory.createParamValuePairValue("exclude", emValue));
-
- addStringProperty(paramValues, "operationName", "annotatedMethod");
- addStringProperty(paramValues, "action", "go");
-
- IMethod method = endpoint.getMethod("annotatedMethod", new String[] { "QString;" });
-
- IAnnotation<IMethod> annotation = AnnotationFactory.createAnnotation("javax.jws.WebMethod", paramValues, method);
- AnnotationWriter.getInstance().setAppliedElement(annotation, method);
-
- AnnotationInspectorImpl annotationInspector = new AnnotationInspectorImpl(endpoint);
- Collection<IAnnotation<IMethod>> methodAnnotations = annotationInspector.inspectMethod(method);
-
- boolean result = false;
- for (IAnnotation<IMethod> methodAnnotation : methodAnnotations)
- {
- if(methodAnnotation.getAnnotationName().equals("javax.jws.WebMethod") || methodAnnotation.getAnnotationName().equals("WebMethod"))
- {
- if(methodAnnotation.getParamValuePairs().size() != 3)
- {
- break;
- }
- if(!methodAnnotation.getPropertyValue("exclude").equals("false"))
- {
- break;
- }
- if(!methodAnnotation.getPropertyValue("operationName").equals("annotatedMethod"))
- {
- break;
- }
- if(!methodAnnotation.getPropertyValue("action").equals("go"))
- {
- break;
- }
-
- result = true;
- }
- }
-
- assertTrue("Method is not annotated correctly", result);
- }
-
- /**
- * Creates complex annotation and adds it to a method parameter. The annotation has the form:
- *
- * <pre>
- * \@WebParam(operationName="annotatedParam", targetNamespace="http://demo.sap.com/params/", partName="partName")
- * </pre>
- *
- * @throws JavaModelException
- * @throws AnnotationGeneratorException
- */
- public void testAddComplexParamAnnotation() throws JavaModelException, AnnotationGeneratorException
- {
- IMethod method = endpoint.getMethod("annotatedMethod", new String[] { "QString;" });
- ITypeParameter typeParameter = method.getTypeParameter("annotatedParam");
-
- Set<IParamValuePair> paramValues = new HashSet<IParamValuePair>();
-
- addStringProperty(paramValues, "annotatedParam", "param");
- addStringProperty(paramValues, "targetNamespace", "http://demo.sap.com/params/");
- addStringProperty(paramValues, "partName", "partName");
-
- IAnnotation<ITypeParameter> annotation = AnnotationFactory.createAnnotation("javax.jws.WebParam", paramValues, typeParameter);
- AnnotationWriter.getInstance().setAppliedElement(annotation, typeParameter);
- }
-
- private void addStringProperty(Set<IParamValuePair> paramValues, String property, String value)
- {
- IValue pValue = AnnotationFactory.createStringValue(value);
- IParamValuePair pair = AnnotationFactory.createParamValuePairValue(property, pValue);
- paramValues.add(pair);
- }
-}
diff --git a/tests/org.eclipse.jst.ws.jaxws.utils.tests/src/org/eclipse/jst/ws/jaxws/utils/tests/internal/annotations/ArrayValueImplTest.java b/tests/org.eclipse.jst.ws.jaxws.utils.tests/src/org/eclipse/jst/ws/jaxws/utils/tests/internal/annotations/ArrayValueImplTest.java
deleted file mode 100755
index bf5e4df..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.utils.tests/src/org/eclipse/jst/ws/jaxws/utils/tests/internal/annotations/ArrayValueImplTest.java
+++ /dev/null
@@ -1,125 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.utils.tests.internal.annotations;
-
-import java.io.IOException;
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.Set;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jst.ws.jaxws.testutils.project.ClassLoadingTest;
-import org.eclipse.jst.ws.jaxws.utils.annotations.AnnotationFactory;
-import org.eclipse.jst.ws.jaxws.utils.annotations.AnnotationGeneratorException;
-import org.eclipse.jst.ws.jaxws.utils.annotations.AnnotationWriter;
-import org.eclipse.jst.ws.jaxws.utils.annotations.IAnnotation;
-import org.eclipse.jst.ws.jaxws.utils.annotations.IParamValuePair;
-import org.eclipse.jst.ws.jaxws.utils.annotations.IValue;
-import org.eclipse.jst.ws.jaxws.utils.internal.annotations.impl.ArrayValueImpl;
-import org.eclipse.jst.ws.jaxws.utils.internal.annotations.impl.StringValueImpl;
-
-public class ArrayValueImplTest extends ClassLoadingTest
-{
- private static final String SRC = "src";
-
- private static final String PCK = "org.eclipse.demo";
-
- private IType endpoint;
-
- public void setUp() throws CoreException, IOException, AnnotationGeneratorException
- {
- createJavaProject(SRC, PCK);
- endpoint = createClass("Endpoint.src", "Endpoint");
- AnnotationFactory.removeAnnotationsFromJavaElement(endpoint);
- }
-
- public void testHashCode()
- {
- Set<IValue> values1 = new HashSet<IValue>();
- values1.clear();
- values1.add(new StringValueImpl("val1"));
- ArrayValueImpl av1 = new ArrayValueImpl(values1);
-
- Set<IValue> values2 = new HashSet<IValue>();
- values2.clear();
- values2.add(new StringValueImpl("val2"));
- ArrayValueImpl av2 = new ArrayValueImpl(values2);
-
- assertTrue(av1.hashCode() != av2.hashCode());
- }
-
- public void testArrayValueImpl()
- {
- try
- {
- new ArrayValueImpl(null);
- fail("NullPointerException not thrown");
- } catch (NullPointerException e)
- {
- assertTrue(true);
- }
- }
-
- public void testEqualsObject()
- {
- Set<IValue> values1 = new HashSet<IValue>();
- values1.clear();
- values1.add(new StringValueImpl("val1"));
- ArrayValueImpl av1 = new ArrayValueImpl(values1);
-
- Set<IValue> values2 = new HashSet<IValue>();
- values2.clear();
- values2.add(new StringValueImpl("val2"));
- ArrayValueImpl av2 = new ArrayValueImpl(values2);
-
- Set<IValue> values3 = new HashSet<IValue>();
- values3.clear();
- values3.add(new StringValueImpl("val1"));
- ArrayValueImpl av3 = new ArrayValueImpl(values3);
-
- assertFalse(av1.equals(null));
- assertFalse(av1.equals(123));
- assertFalse(av1.equals(av2));
-
- assertTrue(av1.equals(av3));
- assertTrue(av1.equals(av1));
- }
-
- public void testArrays() throws Exception
- {
- setUp();
-
- Set<IValue> values = new HashSet<IValue>();
- values.clear();
- values.add(new StringValueImpl("val1"));
- values.add(new StringValueImpl("val2"));
- ArrayValueImpl av = new ArrayValueImpl(values);
-
- Set<IParamValuePair> pv = new HashSet<IParamValuePair>();
- pv.add(AnnotationFactory.createParamValuePairValue("param", av));
-
- IAnnotation<IType> ann = AnnotationFactory.createAnnotation("org.eclipse.test.MyAnnotation", pv, endpoint);
- AnnotationWriter.getInstance().setAppliedElement(ann, endpoint);
- Collection<IAnnotation<IType>> annotattions = AnnotationFactory.createAnnotationInspector(endpoint).inspectType();
-
- assertNotNull(annotattions);
- assertTrue(annotattions.size() == 1);
- IAnnotation<IType> readAnnotation = annotattions.iterator().next();
- readAnnotation.equals(ann);
- AnnotationWriter.getInstance().remove(ann);
- annotattions = AnnotationFactory.createAnnotationInspector(endpoint).inspectType();
-
- assertNotNull(annotattions);
- assertTrue(annotattions.size() == 0);
-
- }
-}
diff --git a/tests/org.eclipse.jst.ws.jaxws.utils.tests/src/org/eclipse/jst/ws/jaxws/utils/tests/internal/annotations/BooleanValueImplTest.java b/tests/org.eclipse.jst.ws.jaxws.utils.tests/src/org/eclipse/jst/ws/jaxws/utils/tests/internal/annotations/BooleanValueImplTest.java
deleted file mode 100755
index 6dad8ea8..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.utils.tests/src/org/eclipse/jst/ws/jaxws/utils/tests/internal/annotations/BooleanValueImplTest.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.utils.tests.internal.annotations;
-
-import java.io.IOException;
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.Set;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jst.ws.jaxws.testutils.project.ClassLoadingTest;
-import org.eclipse.jst.ws.jaxws.utils.annotations.AnnotationFactory;
-import org.eclipse.jst.ws.jaxws.utils.annotations.AnnotationGeneratorException;
-import org.eclipse.jst.ws.jaxws.utils.annotations.AnnotationWriter;
-import org.eclipse.jst.ws.jaxws.utils.annotations.IAnnotation;
-import org.eclipse.jst.ws.jaxws.utils.annotations.IParamValuePair;
-import org.eclipse.jst.ws.jaxws.utils.internal.annotations.impl.ArrayValueImpl;
-import org.eclipse.jst.ws.jaxws.utils.internal.annotations.impl.BooleanValueImpl;
-
-public class BooleanValueImplTest extends ClassLoadingTest
-{
- private static final String SRC = "src";
-
- private static final String PCK = "org.eclipse.demo";
-
- private IType endpoint;
-
- public void setUp() throws CoreException, IOException, AnnotationGeneratorException
- {
- createJavaProject(SRC, PCK);
- endpoint = createClass("Endpoint.src", "Endpoint");
- AnnotationFactory.removeAnnotationsFromJavaElement(endpoint);
- }
-
-
- public void testBooleanValueImpl()
- {
- try
- {
- new ArrayValueImpl(null);
- fail("NullPointerException not thrown");
- } catch (NullPointerException e)
- {
- assertTrue(true);
- }
- }
-
- public void testBooleans() throws Exception
- {
- setUp();
-
- BooleanValueImpl bv = new BooleanValueImpl(true);
-
- Set<IParamValuePair> pv = new HashSet<IParamValuePair>();
- pv.add(AnnotationFactory.createParamValuePairValue("param", bv));
-
- IAnnotation<IType> ann = AnnotationFactory.createAnnotation("org.eclipse.test.MyAnnotation", pv, endpoint);
- AnnotationWriter.getInstance().setAppliedElement(ann, endpoint);
- Collection<IAnnotation<IType>> annotattions = AnnotationFactory.createAnnotationInspector(endpoint).inspectType();
-
- assertNotNull(annotattions);
- assertTrue(annotattions.size() == 1);
- IAnnotation<IType> readAnnotation = annotattions.iterator().next();
- readAnnotation.equals(ann);
- AnnotationWriter.getInstance().remove(ann);
- annotattions = AnnotationFactory.createAnnotationInspector(endpoint).inspectType();
-
- assertNotNull(annotattions);
- assertTrue(annotattions.size() == 0);
- }
-
- public void testEqualsObject()
- {
- BooleanValueImpl bv1 = new BooleanValueImpl(true);
- BooleanValueImpl bv2 = new BooleanValueImpl(false);
- BooleanValueImpl bv3 = new BooleanValueImpl(true);
-
- assertFalse(bv1.equals(null));
- assertFalse(bv1.equals(123));
- assertFalse(bv1.equals(bv2));
-
- assertTrue(bv1.equals(bv3));
- assertTrue(bv1.equals(bv1));
- }
-
-}
diff --git a/tests/org.eclipse.jst.ws.jaxws.utils.tests/src/org/eclipse/jst/ws/jaxws/utils/tests/internal/annotations/ClassValueImplTest.java b/tests/org.eclipse.jst.ws.jaxws.utils.tests/src/org/eclipse/jst/ws/jaxws/utils/tests/internal/annotations/ClassValueImplTest.java
deleted file mode 100755
index 2400a28..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.utils.tests/src/org/eclipse/jst/ws/jaxws/utils/tests/internal/annotations/ClassValueImplTest.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.utils.tests.internal.annotations;
-
-import java.io.IOException;
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.Set;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jst.ws.jaxws.testutils.project.ClassLoadingTest;
-import org.eclipse.jst.ws.jaxws.utils.annotations.AnnotationFactory;
-import org.eclipse.jst.ws.jaxws.utils.annotations.AnnotationGeneratorException;
-import org.eclipse.jst.ws.jaxws.utils.annotations.AnnotationWriter;
-import org.eclipse.jst.ws.jaxws.utils.annotations.IAnnotation;
-import org.eclipse.jst.ws.jaxws.utils.annotations.IParamValuePair;
-import org.eclipse.jst.ws.jaxws.utils.internal.annotations.impl.ClassValueImpl;
-
-public class ClassValueImplTest extends ClassLoadingTest
-{
- private static final String SRC = "src";
-
- private static final String PCK = "org.eclipse.demo";
-
- private IType endpoint;
-
- public void setUp() throws CoreException, IOException, AnnotationGeneratorException
- {
- createJavaProject(SRC, PCK);
- endpoint = createClass("Endpoint.src", "Endpoint");
- AnnotationFactory.removeAnnotationsFromJavaElement(endpoint);
- }
-
- public void testIntegers() throws Exception
- {
- setUp();
-
- ClassValueImpl cv = new ClassValueImpl(endpoint.getFullyQualifiedName());
-
- Set<IParamValuePair> pv = new HashSet<IParamValuePair>();
- pv.add(AnnotationFactory.createParamValuePairValue("param", cv));
-
- IAnnotation<IType> ann = AnnotationFactory.createAnnotation("org.eclipse.test.MyAnnotation", pv, endpoint);
- AnnotationWriter.getInstance().setAppliedElement(ann, endpoint);
- Collection<IAnnotation<IType>> annotattions = AnnotationFactory.createAnnotationInspector(endpoint).inspectType();
-
- assertNotNull(annotattions);
- assertTrue(annotattions.size() == 1);
- IAnnotation<IType> readAnnotation = annotattions.iterator().next();
- readAnnotation.equals(ann);
- assertEquals(ann.getPropertyValue("param").toString(), endpoint.getFullyQualifiedName());
- AnnotationWriter.getInstance().remove(ann);
- annotattions = AnnotationFactory.createAnnotationInspector(endpoint).inspectType();
-
- assertNotNull(annotattions);
- assertTrue(annotattions.size() == 0);
- }
-
- public void testEqualsObject()
- {
- ClassValueImpl cv1 = new ClassValueImpl(endpoint.getFullyQualifiedName());
- ClassValueImpl cv2 = new ClassValueImpl(null);
- ClassValueImpl cv3 = new ClassValueImpl(endpoint.getFullyQualifiedName());
-
- assertFalse(cv1.equals(null));
- assertFalse(cv1.equals(true));
- assertFalse(cv1.equals(cv2));
-
- assertTrue(cv1.equals(cv3));
- assertTrue(cv1.equals(cv1));
- }
-
-}
diff --git a/tests/org.eclipse.jst.ws.jaxws.utils.tests/src/org/eclipse/jst/ws/jaxws/utils/tests/internal/annotations/ComplexAnnotationImplTest.java b/tests/org.eclipse.jst.ws.jaxws.utils.tests/src/org/eclipse/jst/ws/jaxws/utils/tests/internal/annotations/ComplexAnnotationImplTest.java
deleted file mode 100755
index 6f56d2d..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.utils.tests/src/org/eclipse/jst/ws/jaxws/utils/tests/internal/annotations/ComplexAnnotationImplTest.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.utils.tests.internal.annotations;
-
-import java.util.HashSet;
-import java.util.Set;
-
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jst.ws.jaxws.testutils.jmock.Mock;
-import org.eclipse.jst.ws.jaxws.testutils.jmock.MockObjectTestCase;
-import org.eclipse.jst.ws.jaxws.utils.annotations.AnnotationFactory;
-import org.eclipse.jst.ws.jaxws.utils.annotations.IAnnotation;
-import org.eclipse.jst.ws.jaxws.utils.annotations.IParamValuePair;
-import org.eclipse.jst.ws.jaxws.utils.annotations.IValue;
-
-public class ComplexAnnotationImplTest extends MockObjectTestCase
-{
- private Mock<IType> typeElement = mock(IType.class);
-
- public void testHashCode()
- {
- IValue value = AnnotationFactory.createStringValue("value");
- IParamValuePair pvp = AnnotationFactory.createParamValuePairValue("param", value);
- Set<IParamValuePair> paramValues = new HashSet<IParamValuePair>();
- paramValues.add(pvp);
- IAnnotation<IType> annotation1 = AnnotationFactory.createAnnotation("annotationName", paramValues, typeElement.proxy());
- IAnnotation<IType> annotation2 = AnnotationFactory.createAnnotation("annotationName2", paramValues, typeElement.proxy());
-
- assertTrue(annotation1.hashCode() != annotation2.hashCode());
- }
-
- public void testEqualsObject()
- {
- IValue value = AnnotationFactory.createStringValue("value");
- IParamValuePair pvp = AnnotationFactory.createParamValuePairValue("param", value);
- Set<IParamValuePair> paramValues = new HashSet<IParamValuePair>();
- paramValues.add(pvp);
- IAnnotation<IType> annotation1 = AnnotationFactory.createAnnotation("annotationName", paramValues, typeElement.proxy());
- IAnnotation<IType> annotation2 = AnnotationFactory.createAnnotation("annotationName2", paramValues, typeElement.proxy());
- IAnnotation<IType> annotation3 = AnnotationFactory.createAnnotation("annotationName", paramValues, typeElement.proxy());
-
- assertFalse(annotation1.equals(annotation2));
- assertFalse(annotation1.equals(null));
- assertFalse(annotation1.equals(123));
- assertTrue(annotation1.equals(annotation3));
- }
-}
diff --git a/tests/org.eclipse.jst.ws.jaxws.utils.tests/src/org/eclipse/jst/ws/jaxws/utils/tests/internal/annotations/Endpoint.src b/tests/org.eclipse.jst.ws.jaxws.utils.tests/src/org/eclipse/jst/ws/jaxws/utils/tests/internal/annotations/Endpoint.src
deleted file mode 100755
index db699b7..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.utils.tests/src/org/eclipse/jst/ws/jaxws/utils/tests/internal/annotations/Endpoint.src
+++ /dev/null
@@ -1,15 +0,0 @@
-import java.util.List;
-import java.util.Map;
-
-@WebService(serviceName="WSImplBeanService", name="WSImplBean", targetNamespace="http://demo/eclipse/org/", portName="WSImplBeanPort")
-@Stateless
-public class Endpoint
-{
- @MyAnnotation(name="field1")
- public String field1;
-
- @WebMethod(exclude=false,operationName="test")
- public void annotatedMethod( @WebParam(name="annotatedParam") String annotatedParam)
- {
- }
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.ws.jaxws.utils.tests/src/org/eclipse/jst/ws/jaxws/utils/tests/internal/annotations/EndpointAnnInspector.src b/tests/org.eclipse.jst.ws.jaxws.utils.tests/src/org/eclipse/jst/ws/jaxws/utils/tests/internal/annotations/EndpointAnnInspector.src
deleted file mode 100755
index d250d57..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.utils.tests/src/org/eclipse/jst/ws/jaxws/utils/tests/internal/annotations/EndpointAnnInspector.src
+++ /dev/null
@@ -1,22 +0,0 @@
-import java.util.List;
-import java.util.Map;
-import javax.jws.WebService;
-import javax.jws.WebField;
-import javax.jws.WebMethod;
-import javax.jws.WebParam;
-
-@MyAnnotation(myValue="MyString")
-@WebService(serviceName="WSImplBeanService", name="WSImplBean", targetNamespace="http://demo/eclipse/org/", portName="WSImplBeanPort")
-@Stateless
-public class Endpoint
-{
- @MyFieldAnnotation(name="field1")
- @WebField(name="MyField")
- public String field1;
-
- @MyMethodAnnotation(name="annotatedMethod")
- @WebMethod(exclude=false,operationName="test")
- public void annotatedMethod( @WebParam(name="annotatedParam") @MyParamAnnotation(name="annotatedMyParam") String annotatedParam)
- {
- }
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.ws.jaxws.utils.tests/src/org/eclipse/jst/ws/jaxws/utils/tests/internal/annotations/IntegerValueImplTest.java b/tests/org.eclipse.jst.ws.jaxws.utils.tests/src/org/eclipse/jst/ws/jaxws/utils/tests/internal/annotations/IntegerValueImplTest.java
deleted file mode 100755
index 48d8cc6..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.utils.tests/src/org/eclipse/jst/ws/jaxws/utils/tests/internal/annotations/IntegerValueImplTest.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.utils.tests.internal.annotations;
-
-import java.io.IOException;
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.Set;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jst.ws.jaxws.testutils.project.ClassLoadingTest;
-import org.eclipse.jst.ws.jaxws.utils.annotations.AnnotationFactory;
-import org.eclipse.jst.ws.jaxws.utils.annotations.AnnotationGeneratorException;
-import org.eclipse.jst.ws.jaxws.utils.annotations.AnnotationWriter;
-import org.eclipse.jst.ws.jaxws.utils.annotations.IAnnotation;
-import org.eclipse.jst.ws.jaxws.utils.annotations.IParamValuePair;
-import org.eclipse.jst.ws.jaxws.utils.internal.annotations.impl.IntegerValueImpl;
-
-public class IntegerValueImplTest extends ClassLoadingTest
-{
- private static final String SRC = "src";
-
- private static final String PCK = "org.eclipse.demo";
-
- private IType endpoint;
-
- public void setUp() throws CoreException, IOException, AnnotationGeneratorException
- {
- createJavaProject(SRC, PCK);
- endpoint = createClass("Endpoint.src", "Endpoint");
- AnnotationFactory.removeAnnotationsFromJavaElement(endpoint);
- }
-
- public void testIntegers() throws Exception
- {
- setUp();
-
- IntegerValueImpl iv = new IntegerValueImpl("10");
-
- Set<IParamValuePair> pv = new HashSet<IParamValuePair>();
- pv.add(AnnotationFactory.createParamValuePairValue("param", iv));
-
- IAnnotation<IType> ann = AnnotationFactory.createAnnotation("org.eclipse.test.MyAnnotation", pv, endpoint);
- AnnotationWriter.getInstance().setAppliedElement(ann, endpoint);
- Collection<IAnnotation<IType>> annotattions = AnnotationFactory.createAnnotationInspector(endpoint).inspectType();
-
- assertNotNull(annotattions);
- assertTrue(annotattions.size() == 1);
- IAnnotation<IType> readAnnotation = annotattions.iterator().next();
- readAnnotation.equals(ann);
- assertEquals(ann.getPropertyValue("param").toString(), "10");
- AnnotationWriter.getInstance().remove(ann);
- annotattions = AnnotationFactory.createAnnotationInspector(endpoint).inspectType();
-
- assertNotNull(annotattions);
- assertTrue(annotattions.size() == 0);
- }
-
- public void testEqualsObject()
- {
- IntegerValueImpl iv1 = new IntegerValueImpl("10");
- IntegerValueImpl iv2 = new IntegerValueImpl("11");
- IntegerValueImpl iv3 = new IntegerValueImpl("10");
-
- assertFalse(iv1.equals(null));
- assertFalse(iv1.equals(true));
- assertFalse(iv1.equals(iv2));
-
- assertTrue(iv1.equals(iv3));
- assertTrue(iv1.equals(iv1));
- }
-
-}
diff --git a/tests/org.eclipse.jst.ws.jaxws.utils.tests/src/org/eclipse/jst/ws/jaxws/utils/tests/internal/annotations/ParamValuePairImplTest.java b/tests/org.eclipse.jst.ws.jaxws.utils.tests/src/org/eclipse/jst/ws/jaxws/utils/tests/internal/annotations/ParamValuePairImplTest.java
deleted file mode 100755
index 32eb628..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.utils.tests/src/org/eclipse/jst/ws/jaxws/utils/tests/internal/annotations/ParamValuePairImplTest.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.utils.tests.internal.annotations;
-
-import junit.framework.TestCase;
-
-import org.eclipse.jst.ws.jaxws.utils.annotations.IValue;
-import org.eclipse.jst.ws.jaxws.utils.internal.annotations.impl.ParamValuePairImpl;
-import org.eclipse.jst.ws.jaxws.utils.internal.annotations.impl.StringValueImpl;
-
-public class ParamValuePairImplTest extends TestCase
-{
-
- public void testHashCode()
- {
- IValue value = new StringValueImpl("value");
- ParamValuePairImpl pvp = new ParamValuePairImpl("param", value);
-
- IValue value1 = new StringValueImpl("value1");
- ParamValuePairImpl pvp1 = new ParamValuePairImpl("param1", value1);
-
- assertFalse(pvp.hashCode() == pvp1.hashCode());
- assertFalse(pvp.equals(null));
- assertFalse(pvp.equals(123));
- }
-
- public void testEqualsObject()
- {
- IValue value = new StringValueImpl("value");
- ParamValuePairImpl pvp = new ParamValuePairImpl("param", value);
-
- IValue value1 = new StringValueImpl("value");
- ParamValuePairImpl pvp1 = new ParamValuePairImpl("param", value1);
-
- IValue value2 = new StringValueImpl("value2");
- ParamValuePairImpl pvp2 = new ParamValuePairImpl("param2", value2);
-
- assertTrue(pvp.equals(pvp1));
- assertFalse(pvp.equals(pvp2));
- assertTrue(pvp.equals(pvp));
-
- assertFalse(pvp.equals(null));
- assertFalse(pvp.equals(123));
- }
-}
diff --git a/tests/org.eclipse.jst.ws.jaxws.utils.tests/src/org/eclipse/jst/ws/jaxws/utils/tests/internal/annotations/QualifiedNameValueImplTest.java b/tests/org.eclipse.jst.ws.jaxws.utils.tests/src/org/eclipse/jst/ws/jaxws/utils/tests/internal/annotations/QualifiedNameValueImplTest.java
deleted file mode 100755
index 476119d..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.utils.tests/src/org/eclipse/jst/ws/jaxws/utils/tests/internal/annotations/QualifiedNameValueImplTest.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.utils.tests.internal.annotations;
-
-import junit.framework.TestCase;
-
-import org.eclipse.jst.ws.jaxws.utils.annotations.AnnotationFactory;
-import org.eclipse.jst.ws.jaxws.utils.annotations.IValue;
-
-public class QualifiedNameValueImplTest extends TestCase
-{
-
- public void testHashCode()
- {
- IValue qv1 = AnnotationFactory.createQualifiedNameValue("full.qualified.Name1");
- IValue qv2 = AnnotationFactory.createQualifiedNameValue("full.qualified.Name");
-
- assertFalse(qv1.hashCode() == qv2.hashCode());
- }
-
- public void testEqualsObject()
- {
- IValue qv = AnnotationFactory.createQualifiedNameValue("full.qualified.Name");
- IValue qv1 = AnnotationFactory.createQualifiedNameValue("full.qualified.Name1");
- IValue qv2 = AnnotationFactory.createQualifiedNameValue("full.qualified.Name");
-
- assertFalse(qv.equals(qv1));
- assertTrue(qv.equals(qv2));
- assertTrue(qv.equals(qv));
- assertFalse(qv.equals(null));
- assertFalse(qv.equals(123));
- }
-}
diff --git a/tests/org.eclipse.jst.ws.jaxws.utils.tests/src/org/eclipse/jst/ws/jaxws/utils/tests/internal/annotations/StringValueImplTest.java b/tests/org.eclipse.jst.ws.jaxws.utils.tests/src/org/eclipse/jst/ws/jaxws/utils/tests/internal/annotations/StringValueImplTest.java
deleted file mode 100755
index ad19b03..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.utils.tests/src/org/eclipse/jst/ws/jaxws/utils/tests/internal/annotations/StringValueImplTest.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.utils.tests.internal.annotations;
-
-import java.io.IOException;
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.Set;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jst.ws.jaxws.testutils.project.ClassLoadingTest;
-import org.eclipse.jst.ws.jaxws.utils.annotations.AnnotationFactory;
-import org.eclipse.jst.ws.jaxws.utils.annotations.AnnotationGeneratorException;
-import org.eclipse.jst.ws.jaxws.utils.annotations.AnnotationWriter;
-import org.eclipse.jst.ws.jaxws.utils.annotations.IAnnotation;
-import org.eclipse.jst.ws.jaxws.utils.annotations.IParamValuePair;
-import org.eclipse.jst.ws.jaxws.utils.internal.annotations.impl.StringValueImpl;
-
-public class StringValueImplTest extends ClassLoadingTest
-{
- private static final String SRC = "src";
-
- private static final String PCK = "org.eclipse.demo";
-
- private IType endpoint;
-
- public void setUp() throws CoreException, IOException, AnnotationGeneratorException
- {
- createJavaProject(SRC, PCK);
- endpoint = createClass("Endpoint.src", "Endpoint");
- AnnotationFactory.removeAnnotationsFromJavaElement(endpoint);
- }
-
- public void testIntegers() throws Exception
- {
- setUp();
-
- StringValueImpl sv = new StringValueImpl("10");
-
- Set<IParamValuePair> pv = new HashSet<IParamValuePair>();
- pv.add(AnnotationFactory.createParamValuePairValue("param", sv));
-
- IAnnotation<IType> ann = AnnotationFactory.createAnnotation("org.eclipse.test.MyAnnotation", pv, endpoint);
- AnnotationWriter.getInstance().setAppliedElement(ann, endpoint);
- Collection<IAnnotation<IType>> annotattions = AnnotationFactory.createAnnotationInspector(endpoint).inspectType();
-
- assertNotNull(annotattions);
- assertTrue(annotattions.size() == 1);
- IAnnotation<IType> readAnnotation = annotattions.iterator().next();
- readAnnotation.equals(ann);
- assertEquals(ann.getPropertyValue("param").toString(), "10");
- AnnotationWriter.getInstance().remove(ann);
- annotattions = AnnotationFactory.createAnnotationInspector(endpoint).inspectType();
-
- assertNotNull(annotattions);
- assertTrue(annotattions.size() == 0);
- }
-
- public void testEqualsObject()
- {
- StringValueImpl sv1 = new StringValueImpl("10");
- StringValueImpl sv2 = new StringValueImpl("11");
- StringValueImpl sv3 = new StringValueImpl("10");
-
- assertFalse(sv1.equals(null));
- assertFalse(sv1.equals(true));
- assertFalse(sv1.equals(sv2));
-
- assertTrue(sv1.equals(sv3));
- assertTrue(sv1.equals(sv1));
- }
-
-}
diff --git a/tests/org.eclipse.jst.ws.jaxws.utils.tests/src/org/eclipse/jst/ws/jaxws/utils/tests/internal/clazz/ASTUtilsTest.java b/tests/org.eclipse.jst.ws.jaxws.utils.tests/src/org/eclipse/jst/ws/jaxws/utils/tests/internal/clazz/ASTUtilsTest.java
deleted file mode 100755
index 7b438ee..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.utils.tests/src/org/eclipse/jst/ws/jaxws/utils/tests/internal/clazz/ASTUtilsTest.java
+++ /dev/null
@@ -1,124 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.utils.tests.internal.clazz;
-
-import java.io.File;
-import java.io.FileWriter;
-
-import junit.framework.TestCase;
-
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.dom.ASTNode;
-import org.eclipse.jdt.core.dom.AbstractTypeDeclaration;
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jst.ws.jaxws.testutils.files.TestFileUtils;
-import org.eclipse.jst.ws.jaxws.testutils.project.TestProject;
-import org.eclipse.jst.ws.jaxws.utils.clazz.ASTUtils;
-
-/**
- * Tests for {@link ASTUtils} class.
- *
- * @author Georgi Vachkov
- */
-public class ASTUtilsTest extends TestCase
-{
- private static final String PCK = "org.eclipse.test";
- private static final String SRC =
- "import javax.xml.namespace.QName;" + "\n" +
- "public class Test {" + "\n" +
- " private final static String name = \"are\";" + "\n" +
- " public Test() {}" + "\n" +
- " public int createInt() {return 0;}" + "\n" +
- "}";
-
- private TestProject project;
-
- public void manualSetUp() throws Exception
- {
- project = new TestProject("JavaProj_" + System.currentTimeMillis());
- project.createSourceFolder("src");
- }
-
- @Override
- public void tearDown() throws Exception
- {
- if (project != null) {
- project.dispose();
- }
- }
-
- public void testCreateASTFileNpe() throws Exception
- {
- try {
- ASTUtils.getInstance().createAST((File)null, null);
- } catch(NullPointerException _) {}
- }
-
- public void testCreateASTFile() throws Exception
- {
- final File tempJavaFile = createTempJavaFile();
- ASTNode node = ASTUtils.getInstance().createAST(tempJavaFile, null);
- assertNotNull(node);
- assertTrue(node instanceof CompilationUnit);
- }
-
- public void testCreateASTITypeNpe() throws Exception
- {
- try {
- ASTUtils.getInstance().createCompilationUnit((ICompilationUnit)null, null);
- } catch(NullPointerException _) {}
- }
-
- public void testCreateASTIType() throws Exception
- {
- manualSetUp();
- final IType sourceType = project.createType(project.createPackage(PCK), "Test.java", SRC);
- ASTNode node = ASTUtils.getInstance().createCompilationUnit(sourceType.getCompilationUnit(), null);
- assertNotNull(node);
- assertTrue(node instanceof CompilationUnit);
- }
-
- public void testGetTypeDeclaration() throws Exception
- {
- manualSetUp();
- final IType sourceType = project.createType(project.createPackage(PCK), "Test.java", SRC);
- CompilationUnit unit = ASTUtils.getInstance().createCompilationUnit(sourceType.getCompilationUnit(), null);
-
- AbstractTypeDeclaration abstractType = ASTUtils.getInstance().getTypeDeclaration("Test", unit);
- assertNotNull(abstractType);
- }
-
- public void testGetTypeDeclarationForInnerType() throws Exception
- {
- manualSetUp();
- String source = "public class Test {" +
- "public static class Parameters {}" +
- "}";
-
- final IType sourceType = project.createType(project.createPackage(PCK), "Test.java", source);
- CompilationUnit unit = ASTUtils.getInstance().createCompilationUnit(sourceType.getCompilationUnit(), null);
-
- AbstractTypeDeclaration abstractType = ASTUtils.getInstance().getTypeDeclaration("Parameters", unit);
- assertNotNull(abstractType);
- }
-
- private File createTempJavaFile() throws Exception
- {
- File dir = TestFileUtils.createTempDirectory("" + System.currentTimeMillis());
- File tempClassFile = new File(dir, "Test.java");
- FileWriter fw = new FileWriter(tempClassFile);
- fw.write("package " + PCK + ";\n" + SRC);
- fw.close();
-
- return tempClassFile;
- }
-}
diff --git a/tests/org.eclipse.jst.ws.jaxws.utils.tests/src/org/eclipse/jst/ws/jaxws/utils/tests/internal/mock/EndpointFormat.src b/tests/org.eclipse.jst.ws.jaxws.utils.tests/src/org/eclipse/jst/ws/jaxws/utils/tests/internal/mock/EndpointFormat.src
deleted file mode 100755
index 7bf6fb8..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.utils.tests/src/org/eclipse/jst/ws/jaxws/utils/tests/internal/mock/EndpointFormat.src
+++ /dev/null
@@ -1 +0,0 @@
-public class Endpoint{public Endpoint(){}public void useVoid(){}public String echoString(String s){return s}}
\ No newline at end of file
diff --git a/tests/org.jmock/.classpath b/tests/org.jmock/.classpath
deleted file mode 100755
index aee050d..0000000
--- a/tests/org.jmock/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry exported="true" kind="lib" path="lib/jmock-core-1.2.0.jar"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/tests/org.jmock/.project b/tests/org.jmock/.project
deleted file mode 100755
index 63f6b47..0000000
--- a/tests/org.jmock/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.jmock</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
diff --git a/tests/org.jmock/.settings/org.eclipse.jdt.core.prefs b/tests/org.jmock/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100755
index c611078..0000000
--- a/tests/org.jmock/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,8 +0,0 @@
-#Tue Jun 23 18:41:55 EEST 2009
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.5
diff --git a/tests/org.jmock/META-INF/MANIFEST.MF b/tests/org.jmock/META-INF/MANIFEST.MF
deleted file mode 100755
index c1e3479..0000000
--- a/tests/org.jmock/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,19 +0,0 @@
-Manifest-Version: 1.0
-Require-Bundle: org.junit;visibility:=reexport
-Export-Package: org.jmock,
- org.jmock.builder,
- org.jmock.core,
- org.jmock.core.constraint,
- org.jmock.core.matcher,
- org.jmock.core.stub,
- org.jmock.expectation,
- org.jmock.util
-Bundle-Vendor: org.jmock
-Bundle-ClassPath: lib/jmock-core-1.2.0.jar
-Bundle-Version: 1.2.0
-Eclipse-BuddyPolicy: global
-Bundle-Name: JMock
-Bundle-ManifestVersion: 2
-Bundle-SymbolicName: org.jmock;singleton:=true
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-
diff --git a/tests/org.jmock/about.html b/tests/org.jmock/about.html
deleted file mode 100644
index d2b7ace..0000000
--- a/tests/org.jmock/about.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
-<title>About</title>
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
-
-<p>August 20, 2009</p>
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, "Program" will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is
-being redistributed by another party ("Redistributor") and different terms and conditions may
-apply to your use of any object code in the Content. Check the Redistributor's license that was
-provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
-
-</body>
-</html>
diff --git a/tests/org.jmock/build.properties b/tests/org.jmock/build.properties
deleted file mode 100755
index 502f1c9..0000000
--- a/tests/org.jmock/build.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-bin.includes = lib/,\
- META-INF/,\
- build.properties
diff --git a/tests/org.jmock/lib/jmock-core-1.2.0.jar b/tests/org.jmock/lib/jmock-core-1.2.0.jar
deleted file mode 100755
index b9d317f..0000000
--- a/tests/org.jmock/lib/jmock-core-1.2.0.jar
+++ /dev/null
Binary files differ
