Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to 'bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/wsrt/Selection.java')
-rw-r--r--bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/wsrt/Selection.java30
1 files changed, 0 insertions, 30 deletions
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/wsrt/Selection.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/wsrt/Selection.java
deleted file mode 100644
index a5bf53a87..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/wsrt/Selection.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.wsrt;
-
-import org.eclipse.wst.ws.internal.provisional.wsrt.ISelection;
-
-public class Selection implements ISelection {
-
- private Object[] selection;
-
- public Object[] getSelection()
- {
- return selection;
- }
-
- public void setSelection(Object[] selection)
- {
- this.selection = selection;
- }
-
-}

Back to the top

IAnnotationAttributeInitializer.java?h=v201203062228'>bundles/org.eclipse.jst.ws.annotations.core/src/org/eclipse/jst/ws/annotations/core/initialization/IAnnotationAttributeInitializer.java77
-rw-r--r--bundles/org.eclipse.jst.ws.annotations.core/src/org/eclipse/jst/ws/annotations/core/processor/AbstractAnnotationProcessor.java212
-rw-r--r--bundles/org.eclipse.jst.ws.annotations.core/src/org/eclipse/jst/ws/annotations/core/utils/AnnotationUtils.java1444
-rw-r--r--bundles/org.eclipse.jst.ws.annotations.core/src/org/eclipse/jst/ws/internal/annotations/core/processor/AnnotationsCoreProcessorFactory.java84
-rw-r--r--bundles/org.eclipse.jst.ws.annotations.core/src/org/eclipse/jst/ws/internal/annotations/core/utils/SignatureUtils.java124
-rw-r--r--bundles/org.eclipse.jst.ws.cxf.consumption.core/.classpath7
-rw-r--r--bundles/org.eclipse.jst.ws.cxf.consumption.core/.project28
-rw-r--r--bundles/org.eclipse.jst.ws.cxf.consumption.core/.settings/org.eclipse.jdt.core.prefs7
-rw-r--r--bundles/org.eclipse.jst.ws.cxf.consumption.core/META-INF/MANIFEST.MF24
-rw-r--r--bundles/org.eclipse.jst.ws.cxf.consumption.core/about.html28
-rw-r--r--bundles/org.eclipse.jst.ws.cxf.consumption.core/ant/cxf_bujava.properties50
-rw-r--r--bundles/org.eclipse.jst.ws.cxf.consumption.core/ant/cxf_bujava.xml13
-rw-r--r--bundles/org.eclipse.jst.ws.cxf.consumption.core/ant/cxf_client.properties89
-rw-r--r--bundles/org.eclipse.jst.ws.cxf.consumption.core/ant/cxf_client.xml13
-rw-r--r--bundles/org.eclipse.jst.ws.cxf.consumption.core/ant/cxf_tdjava.properties83
-rw-r--r--bundles/org.eclipse.jst.ws.cxf.consumption.core/ant/cxf_tdjava.xml13
-rw-r--r--bundles/org.eclipse.jst.ws.cxf.consumption.core/build.properties7
-rw-r--r--bundles/org.eclipse.jst.ws.cxf.consumption.core/plugin.properties21
-rw-r--r--bundles/org.eclipse.jst.ws.cxf.consumption.core/plugin.xml46
-rw-r--r--bundles/org.eclipse.jst.ws.cxf.consumption.core/src/org/eclipse/jst/ws/internal/cxf/consumption/core/CXFConsumptionCoreMessages.java26
-rw-r--r--bundles/org.eclipse.jst.ws.cxf.consumption.core/src/org/eclipse/jst/ws/internal/cxf/consumption/core/CXFConsumptionCoreMessages.properties10
-rw-r--r--bundles/org.eclipse.jst.ws.cxf.consumption.core/src/org/eclipse/jst/ws/internal/cxf/consumption/core/CXFConsumptionCorePlugin.java79
-rw-r--r--bundles/org.eclipse.jst.ws.cxf.consumption.core/src/org/eclipse/jst/ws/internal/cxf/consumption/core/commands/WSDL2JavaClientCommand.java179
-rw-r--r--bundles/org.eclipse.jst.ws.cxf.consumption.core/src/org/eclipse/jst/ws/internal/cxf/consumption/core/commands/WSDL2JavaClientDefaultingCommand.java119
-rw-r--r--bundles/org.eclipse.jst.ws.cxf.consumption.core/src/org/eclipse/jst/ws/internal/cxf/consumption/core/locator/CXFWebServiceLocator.java61
-rw-r--r--bundles/org.eclipse.jst.ws.cxf.consumption.ui/.classpath7
-rw-r--r--bundles/org.eclipse.jst.ws.cxf.consumption.ui/.project28
-rw-r--r--bundles/org.eclipse.jst.ws.cxf.consumption.ui/.settings/org.eclipse.jdt.core.prefs7
-rw-r--r--bundles/org.eclipse.jst.ws.cxf.consumption.ui/META-INF/MANIFEST.MF31
-rw-r--r--bundles/org.eclipse.jst.ws.cxf.consumption.ui/about.html28
-rw-r--r--bundles/org.eclipse.jst.ws.cxf.consumption.ui/build.properties6
-rw-r--r--bundles/org.eclipse.jst.ws.cxf.consumption.ui/plugin.properties17
-rw-r--r--bundles/org.eclipse.jst.ws.cxf.consumption.ui/plugin.xml135
-rw-r--r--bundles/org.eclipse.jst.ws.cxf.consumption.ui/src/org/eclipse/jst/ws/internal/cxf/consumption/ui/CXFConsumptionUIMessages.java37
-rw-r--r--bundles/org.eclipse.jst.ws.cxf.consumption.ui/src/org/eclipse/jst/ws/internal/cxf/consumption/ui/CXFConsumptionUIMessages.properties24
-rw-r--r--bundles/org.eclipse.jst.ws.cxf.consumption.ui/src/org/eclipse/jst/ws/internal/cxf/consumption/ui/CXFConsumptionUIPlugin.java79
-rw-r--r--bundles/org.eclipse.jst.ws.cxf.consumption.ui/src/org/eclipse/jst/ws/internal/cxf/consumption/ui/widgets/CXFJAXWSSelectionLaunchable.java205
-rw-r--r--bundles/org.eclipse.jst.ws.cxf.consumption.ui/src/org/eclipse/jst/ws/internal/cxf/consumption/ui/widgets/WSDL2JavaClientConfigWidget.java278
-rw-r--r--bundles/org.eclipse.jst.ws.cxf.consumption.ui/src/org/eclipse/jst/ws/internal/cxf/consumption/ui/widgets/WSDL2JavaClientConfigWidgetFactory.java87
-rw-r--r--bundles/org.eclipse.jst.ws.cxf.consumption.ui/src/org/eclipse/jst/ws/internal/cxf/consumption/ui/widgets/WSDL2JavaClientDefaultsConfigWidget.java98
-rw-r--r--bundles/org.eclipse.jst.ws.cxf.consumption.ui/src/org/eclipse/jst/ws/internal/cxf/consumption/ui/widgets/object/JAXWSSelectionTransformer.java75
-rw-r--r--bundles/org.eclipse.jst.ws.cxf.consumption.ui/src/org/eclipse/jst/ws/internal/cxf/consumption/ui/wsrt/CXFWebServiceClient.java72
-rw-r--r--bundles/org.eclipse.jst.ws.jaxb.core/.classpath7
-rw-r--r--bundles/org.eclipse.jst.ws.jaxb.core/.project28
-rw-r--r--bundles/org.eclipse.jst.ws.jaxb.core/.settings/org.eclipse.jdt.core.prefs7
-rw-r--r--bundles/org.eclipse.jst.ws.jaxb.core/META-INF/MANIFEST.MF13
-rw-r--r--bundles/org.eclipse.jst.ws.jaxb.core/about.html28
-rw-r--r--bundles/org.eclipse.jst.ws.jaxb.core/about.ini12
-rw-r--r--bundles/org.eclipse.jst.ws.jaxb.core/about.mappings6
-rw-r--r--bundles/org.eclipse.jst.ws.jaxb.core/about.properties26
-rw-r--r--bundles/org.eclipse.jst.ws.jaxb.core/build.properties11
-rw-r--r--bundles/org.eclipse.jst.ws.jaxb.core/icons/WTP_icon_x32_v2.pngbin5616 -> 0 bytes-rw-r--r--bundles/org.eclipse.jst.ws.jaxb.core/plugin.properties15
-rw-r--r--bundles/org.eclipse.jst.ws.jaxb.core/plugin.xml172
-rw-r--r--bundles/org.eclipse.jst.ws.jaxb.core/src/org/eclipse/jst/ws/internal/jaxb/core/JAXBCoreMessages.java30
-rw-r--r--bundles/org.eclipse.jst.ws.jaxb.core/src/org/eclipse/jst/ws/internal/jaxb/core/JAXBCoreMessages.properties12
-rw-r--r--bundles/org.eclipse.jst.ws.jaxb.core/src/org/eclipse/jst/ws/internal/jaxb/core/JAXBCorePlugin.java47
-rw-r--r--bundles/org.eclipse.jst.ws.jaxws.core/.classpath7
-rw-r--r--bundles/org.eclipse.jst.ws.jaxws.core/.project28
-rw-r--r--bundles/org.eclipse.jst.ws.jaxws.core/.settings/org.eclipse.jdt.core.prefs7
-rw-r--r--bundles/org.eclipse.jst.ws.jaxws.core/META-INF/MANIFEST.MF39
-rw-r--r--bundles/org.eclipse.jst.ws.jaxws.core/about.html28
-rw-r--r--bundles/org.eclipse.jst.ws.jaxws.core/about.ini12
-rw-r--r--bundles/org.eclipse.jst.ws.jaxws.core/about.mappings6
-rw-r--r--bundles/org.eclipse.jst.ws.jaxws.core/about.properties26
-rw-r--r--bundles/org.eclipse.jst.ws.jaxws.core/build.properties11
-rw-r--r--bundles/org.eclipse.jst.ws.jaxws.core/icons/WTP_icon_x32_v2.pngbin5616 -> 0 bytes-rw-r--r--bundles/org.eclipse.jst.ws.jaxws.core/plugin.properties37
-rw-r--r--bundles/org.eclipse.jst.ws.jaxws.core/plugin.xml292
-rw-r--r--bundles/org.eclipse.jst.ws.jaxws.core/src/org/eclipse/jst/ws/internal/jaxws/core/JAXWSCoreMessages.java128
-rw-r--r--bundles/org.eclipse.jst.ws.jaxws.core/src/org/eclipse/jst/ws/internal/jaxws/core/JAXWSCoreMessages.properties94
-rw-r--r--bundles/org.eclipse.jst.ws.jaxws.core/src/org/eclipse/jst/ws/internal/jaxws/core/JAXWSCorePlugin.java50
-rw-r--r--bundles/org.eclipse.jst.ws.jaxws.core/src/org/eclipse/jst/ws/internal/jaxws/core/annotations/validation/HandlerChainRules.java66
-rw-r--r--bundles/org.eclipse.jst.ws.jaxws.core/src/org/eclipse/jst/ws/internal/jaxws/core/annotations/validation/HolderTypeParametersRule.java92
-rw-r--r--bundles/org.eclipse.jst.ws.jaxws.core/src/org/eclipse/jst/ws/internal/jaxws/core/annotations/validation/OnewayRules.java66
-rw-r--r--bundles/org.eclipse.jst.ws.jaxws.core/src/org/eclipse/jst/ws/internal/jaxws/core/annotations/validation/SOAPBindingDocumentBareRules.java236
-rw-r--r--bundles/org.eclipse.jst.ws.jaxws.core/src/org/eclipse/jst/ws/internal/jaxws/core/annotations/validation/SOAPBindingRules.java139
-rw-r--r--bundles/org.eclipse.jst.ws.jaxws.core/src/org/eclipse/jst/ws/internal/jaxws/core/annotations/validation/UniqueNamesRule.java497
-rw-r--r--bundles/org.eclipse.jst.ws.jaxws.core/src/org/eclipse/jst/ws/internal/jaxws/core/annotations/validation/WebMethodCheckForWebServiceRule.java55
-rw-r--r--bundles/org.eclipse.jst.ws.jaxws.core/src/org/eclipse/jst/ws/internal/jaxws/core/annotations/validation/WebMethodExcludeRules.java69
-rw-r--r--bundles/org.eclipse.jst.ws.jaxws.core/src/org/eclipse/jst/ws/internal/jaxws/core/annotations/validation/WebMethodPublicStaticFinalRule.java60
-rw-r--r--bundles/org.eclipse.jst.ws.jaxws.core/src/org/eclipse/jst/ws/internal/jaxws/core/annotations/validation/WebServiceDefaultPublicConstructorRule.java68
-rw-r--r--bundles/org.eclipse.jst.ws.jaxws.core/src/org/eclipse/jst/ws/internal/jaxws/core/annotations/validation/WebServiceEJBModuleRule.java91
-rw-r--r--bundles/org.eclipse.jst.ws.jaxws.core/src/org/eclipse/jst/ws/internal/jaxws/core/annotations/validation/WebServiceNoFinalizeMethodRule.java58
-rw-r--r--bundles/org.eclipse.jst.ws.jaxws.core/src/org/eclipse/jst/ws/internal/jaxws/core/annotations/validation/WebServiceParametersReturnTypesRule.java352
-rw-r--r--bundles/org.eclipse.jst.ws.jaxws.core/src/org/eclipse/jst/ws/internal/jaxws/core/annotations/validation/WebServiceProviderRules.java203
-rw-r--r--bundles/org.eclipse.jst.ws.jaxws.core/src/org/eclipse/jst/ws/internal/jaxws/core/annotations/validation/WebServicePublicAbstractFinalRule.java87
-rw-r--r--bundles/org.eclipse.jst.ws.jaxws.core/src/org/eclipse/jst/ws/internal/jaxws/core/annotations/validation/WebServiceRefsRules.java83
-rw-r--r--bundles/org.eclipse.jst.ws.jaxws.core/src/org/eclipse/jst/ws/internal/jaxws/core/annotations/validation/WebServiceSEIAllowedAttributesRule.java68
-rw-r--r--bundles/org.eclipse.jst.ws.jaxws.core/src/org/eclipse/jst/ws/internal/jaxws/core/annotations/validation/WebServiceSEIRestrictionsRule.java206
-rw-r--r--bundles/org.eclipse.jst.ws.jaxws.core/src/org/eclipse/jst/ws/internal/jaxws/core/annotations/validation/WebServiceTargetNamespaceRule.java88
-rw-r--r--bundles/org.eclipse.jst.ws.jaxws.core/src/org/eclipse/jst/ws/internal/jaxws/core/annotations/validation/WebServiceWSDLLocationRule.java316
-rw-r--r--bundles/org.eclipse.jst.ws.jaxws.core/src/org/eclipse/jst/ws/internal/jaxws/core/annotations/validation/WebServiceWebServiceProviderCoExistRule.java50
-rw-r--r--bundles/org.eclipse.jst.ws.jaxws.core/src/org/eclipse/jst/ws/internal/jaxws/core/utils/JAXWSHandlerUtils.java264
-rw-r--r--bundles/org.eclipse.jst.ws.jaxws.core/src/org/eclipse/jst/ws/internal/jaxws/core/utils/JAXWSUtils.java168
-rw-r--r--bundles/org.eclipse.jst.ws.jaxws.core/src/org/eclipse/jst/ws/jaxws/core/utils/JDTUtils.java328
-rw-r--r--bundles/org.eclipse.jst.ws.jaxws.core/src/org/eclipse/jst/ws/jaxws/core/utils/WSDLUtils.java305
-rwxr-xr-xbundles/org.eclipse.jst.ws.jaxws.dom.integration/.classpath7
-rwxr-xr-xbundles/org.eclipse.jst.ws.jaxws.dom.integration/.project28
-rwxr-xr-xbundles/org.eclipse.jst.ws.jaxws.dom.integration/.settings/org.eclipse.jdt.core.prefs8
-rwxr-xr-xbundles/org.eclipse.jst.ws.jaxws.dom.integration/META-INF/MANIFEST.MF26
-rw-r--r--bundles/org.eclipse.jst.ws.jaxws.dom.integration/about.html28
-rwxr-xr-xbundles/org.eclipse.jst.ws.jaxws.dom.integration/build.properties18
-rw-r--r--bundles/org.eclipse.jst.ws.jaxws.dom.integration/icons/jaxws_navcontent.gifbin563 -> 0 bytes-rwxr-xr-xbundles/org.eclipse.jst.ws.jaxws.dom.integration/plugin.properties22
-rwxr-xr-xbundles/org.eclipse.jst.ws.jaxws.dom.integration/plugin.xml134
-rwxr-xr-xbundles/org.eclipse.jst.ws.jaxws.dom.integration/src/org/eclipse/jst/ws/jaxws/dom/integration/internal/plugin/DomIntegrationMessages.java40
-rwxr-xr-xbundles/org.eclipse.jst.ws.jaxws.dom.integration/src/org/eclipse/jst/ws/jaxws/dom/integration/internal/plugin/DomIntegrationMessages.properties19
-rwxr-xr-xbundles/org.eclipse.jst.ws.jaxws.dom.integration/src/org/eclipse/jst/ws/jaxws/dom/integration/internal/plugin/DomIntegrationPlugin.java75
-rw-r--r--bundles/org.eclipse.jst.ws.jaxws.dom.integration/src/org/eclipse/jst/ws/jaxws/dom/integration/internal/util/LoadingWsProjectNodesCollector.java56
-rwxr-xr-xbundles/org.eclipse.jst.ws.jaxws.dom.integration/src/org/eclipse/jst/ws/jaxws/dom/integration/internal/util/ProjectExplorerUtil.java40
-rwxr-xr-xbundles/org.eclipse.jst.ws.jaxws.dom.integration/src/org/eclipse/jst/ws/jaxws/dom/integration/navigator/CustomDomItemProviderAdapterFactory.java156
-rwxr-xr-xbundles/org.eclipse.jst.ws.jaxws.dom.integration/src/org/eclipse/jst/ws/jaxws/dom/integration/navigator/DOMAdapterFactoryContentProvider.java342
-rwxr-xr-xbundles/org.eclipse.jst.ws.jaxws.dom.integration/src/org/eclipse/jst/ws/jaxws/dom/integration/navigator/DOMAdapterFactoryLabelProvider.java136
-rwxr-xr-xbundles/org.eclipse.jst.ws.jaxws.dom.integration/src/org/eclipse/jst/ws/jaxws/dom/integration/navigator/DOMItemValuePropertySourceFactory.java49
-rwxr-xr-xbundles/org.eclipse.jst.ws.jaxws.dom.integration/src/org/eclipse/jst/ws/jaxws/dom/integration/navigator/DOMPropertyViewAdapterFactory.java52
-rwxr-xr-xbundles/org.eclipse.jst.ws.jaxws.dom.integration/src/org/eclipse/jst/ws/jaxws/dom/integration/navigator/ILoadingWsProject.java37
-rwxr-xr-xbundles/org.eclipse.jst.ws.jaxws.dom.integration/src/org/eclipse/jst/ws/jaxws/dom/integration/navigator/ISEIChildList.java20
-rwxr-xr-xbundles/org.eclipse.jst.ws.jaxws.dom.integration/src/org/eclipse/jst/ws/jaxws/dom/integration/navigator/IWebServiceChildList.java20
-rwxr-xr-xbundles/org.eclipse.jst.ws.jaxws.dom.integration/src/org/eclipse/jst/ws/jaxws/dom/integration/navigator/WebServiceProblemsDecorator.java324
-rwxr-xr-xbundles/org.eclipse.jst.ws.jaxws.dom.integration/src/org/eclipse/jst/ws/jaxws/dom/integration/navigator/actions/NavigateToImplementationAction.java509
-rwxr-xr-xbundles/org.eclipse.jst.ws.jaxws.dom.integration/src/org/eclipse/jst/ws/jaxws/dom/integration/navigator/actions/OpenWSResourceAction.java314
-rwxr-xr-xbundles/org.eclipse.jst.ws.jaxws.dom.integration/src/org/eclipse/jst/ws/jaxws/dom/integration/navigator/actions/WSActionProvider.java127
-rwxr-xr-xbundles/org.eclipse.jst.ws.jaxws.dom.runtime/.classpath7
-rwxr-xr-xbundles/org.eclipse.jst.ws.jaxws.dom.runtime/.project28
-rwxr-xr-xbundles/org.eclipse.jst.ws.jaxws.dom.runtime/.settings/org.eclipse.jdt.core.prefs8
-rwxr-xr-xbundles/org.eclipse.jst.ws.jaxws.dom.runtime/META-INF/MANIFEST.MF34
-rw-r--r--bundles/org.eclipse.jst.ws.jaxws.dom.runtime/about.html28
-rwxr-xr-xbundles/org.eclipse.jst.ws.jaxws.dom.runtime/build.properties17
-rwxr-xr-xbundles/org.eclipse.jst.ws.jaxws.dom.runtime/plugin.properties20
-rwxr-xr-xbundles/org.eclipse.jst.ws.jaxws.dom.runtime/plugin.xml34
-rwxr-xr-xbundles/org.eclipse.jst.ws.jaxws.dom.runtime/schema/runtimes.exsd156
-rwxr-xr-xbundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/DomUtil.java241
-rwxr-xr-xbundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/INamedExtensionInfo.java33
-rwxr-xr-xbundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/IPropertyDefaults.java32
-rwxr-xr-xbundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/IPropertyState.java30
-rwxr-xr-xbundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/api/DomFactory.java114
-rwxr-xr-xbundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/api/DomPackage.java1372
-rwxr-xr-xbundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/api/IDOM.java50
-rwxr-xr-xbundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/api/IJavaWebServiceElement.java43
-rwxr-xr-xbundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/api/IServiceEndpointInterface.java145
-rwxr-xr-xbundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/api/IWSDOMRuntimeManager.java47
-rwxr-xr-xbundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/api/IWebMethod.java132
-rwxr-xr-xbundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/api/IWebParam.java122
-rwxr-xr-xbundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/api/IWebService.java71
-rwxr-xr-xbundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/api/IWebServiceProject.java39
-rwxr-xr-xbundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/api/IWebType.java20
-rwxr-xr-xbundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/api/IWsDOMRuntimeExtension.java64
-rwxr-xr-xbundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/api/IWsDomLoadListener.java32
-rwxr-xr-xbundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/api/SOAPBindingParameterStyle.java223
-rwxr-xr-xbundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/api/SOAPBindingStyle.java223
-rwxr-xr-xbundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/api/SOAPBindingUse.java223
-rwxr-xr-xbundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/api/WebParamKind.java207
-rwxr-xr-xbundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/api/WsDOMLoadCanceledException.java47
-rwxr-xr-xbundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/api/WsDOMRuntimeManager.java147
-rwxr-xr-xbundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/dom.ecore132
-rwxr-xr-xbundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/dom.ws.genmodel76
-rwxr-xr-xbundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/internal/impl/DomFactoryImpl.java320
-rwxr-xr-xbundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/internal/impl/DomPackageImpl.java722
-rwxr-xr-xbundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/internal/impl/IDOMImpl.java162
-rwxr-xr-xbundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/internal/impl/IJavaWebServiceElementImpl.java227
-rwxr-xr-xbundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/internal/impl/IServiceEndpointInterfaceImpl.java522
-rwxr-xr-xbundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/internal/impl/IWebMethodImpl.java397
-rwxr-xr-xbundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/internal/impl/IWebParamImpl.java389
-rwxr-xr-xbundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/internal/impl/IWebServiceImpl.java396
-rwxr-xr-xbundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/internal/impl/IWebServiceProjectImpl.java270
-rwxr-xr-xbundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/internal/impl/IWebTypeImpl.java47
-rwxr-xr-xbundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/internal/plugin/JaxWsDomRuntimeMessages.java29
-rwxr-xr-xbundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/internal/plugin/JaxWsDomRuntimePlugin.java60
-rwxr-xr-xbundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/internal/plugin/messages.properties13
-rwxr-xr-xbundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/internal/util/NamedExtensionInfo.java39
-rwxr-xr-xbundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/internal/util/XpUtil.java63
-rwxr-xr-xbundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/persistence/IAnnotationSerializer.java24
-rwxr-xr-xbundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/persistence/ICompilationUnitFinder.java37
-rwxr-xr-xbundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/persistence/ICompilationUnitHandler.java53
-rwxr-xr-xbundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/persistence/IModelElementSynchronizer.java29
-rwxr-xr-xbundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/persistence/IProjectSelector.java32
-rwxr-xr-xbundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/persistence/JaxWsDefaultsCalculator.java185
-rwxr-xr-xbundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/persistence/JaxWsWorkspaceResource.java326
-rwxr-xr-xbundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/persistence/Jee5WsDomRuntimeExtension.java135
-rwxr-xr-xbundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/persistence/NonStreamResource.java128
-rwxr-xr-xbundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/persistence/SBAnnotationFeatures.java38
-rwxr-xr-xbundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/persistence/WMAnnotationFeatures.java25
-rwxr-xr-xbundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/persistence/WPAnnotationFeatures.java32
-rwxr-xr-xbundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/persistence/WSAnnotationFeatures.java25
-rwxr-xr-xbundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/persistence/WorkspaceCUFinder.java133
-rwxr-xr-xbundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/persistence/annotation/AnnotationAdapterFactory.java44
-rwxr-xr-xbundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/persistence/annotation/IAnnotationAdapter.java39
-rwxr-xr-xbundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/persistence/annotation/impl/AnnotationAdapter.java55
-rwxr-xr-xbundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/persistence/defaults/MethodPropertyDefaultsAdapter.java52
-rwxr-xr-xbundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/persistence/defaults/ParameterPropertyDefaultsAdapter.java61
-rwxr-xr-xbundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/persistence/defaults/PropertyDefaultsAdapterFactory.java54
-rwxr-xr-xbundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/persistence/defaults/SeiPropertyDefaultsAdapter.java46
-rwxr-xr-xbundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/persistence/defaults/WsPropertyDefaultsAdapter.java43
-rw-r--r--bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/persistence/load/IWsDomCallback.java45
-rw-r--r--bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/persistence/load/IWsDomObtainer.java26
-rw-r--r--bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/persistence/load/WsDomObtainer.java137
-rw-r--r--bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/persistence/load/WsDomObtainerFactory.java37
-rwxr-xr-xbundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/persistence/serializer/AbstractSerializerAdapter.java236
-rwxr-xr-xbundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/persistence/serializer/MethodSerializerAdapter.java98
-rwxr-xr-xbundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/persistence/serializer/ParameterSerializerAdapter.java199
-rwxr-xr-xbundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/persistence/serializer/SeiSerializerAdapter.java92
-rwxr-xr-xbundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/persistence/serializer/SerializerAdapterFactory.java66
-rwxr-xr-xbundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/persistence/serializer/WsSerializerAdapter.java108
-rwxr-xr-xbundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/persistence/state/MethodPropertyStateAdapter.java65
-rwxr-xr-xbundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/persistence/state/ParameterPropertyStateAdapter.java109
-rwxr-xr-xbundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/persistence/state/PropertyStateAdapterFactory.java53
-rwxr-xr-xbundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/persistence/state/SeiPropertyStateAdapter.java64
-rwxr-xr-xbundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/persistence/state/WsPropertyStateAdapter.java58
-rwxr-xr-xbundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/persistence/sync/AbstractMethodSynchronizer.java218
-rwxr-xr-xbundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/persistence/sync/AbstractModelSynchronizer.java259
-rwxr-xr-xbundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/persistence/sync/ElementSynchronizerImpl.java85
-rwxr-xr-xbundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/persistence/sync/InitialModelSynchronizer.java38
-rwxr-xr-xbundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/persistence/sync/OnEventModelSynchronizer.java416
-rwxr-xr-xbundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/persistence/sync/ParameterSynchronizer.java244
-rwxr-xr-xbundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/persistence/sync/SeiMerger.java106
-rwxr-xr-xbundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/persistence/sync/SeiMethodSynchronizer.java46
-rwxr-xr-xbundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/persistence/sync/SeiSynchronizer.java85
-rwxr-xr-xbundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/persistence/sync/WSMethodSynchronizer.java72
-rwxr-xr-xbundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/persistence/sync/WsSynchronizer.java176
-rwxr-xr-xbundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/registry/IWsDOMRuntimeInfo.java32
-rwxr-xr-xbundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/registry/WsDOMRuntimeRegistry.java199
-rwxr-xr-xbundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/util/Dom2ResourceMapper.java133
-rwxr-xr-xbundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/util/DomAdapterFactory.java281
-rwxr-xr-xbundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/util/DomSwitch.java306
-rwxr-xr-xbundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/util/Jee5DomUtils.java123
-rwxr-xr-xbundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/util/ParamValueComparator.java47
-rwxr-xr-xbundles/org.eclipse.jst.ws.jaxws.dom.ui/.classpath7
-rwxr-xr-xbundles/org.eclipse.jst.ws.jaxws.dom.ui/.project28
-rwxr-xr-xbundles/org.eclipse.jst.ws.jaxws.dom.ui/.settings/org.eclipse.jdt.core.prefs8
-rwxr-xr-xbundles/org.eclipse.jst.ws.jaxws.dom.ui/META-INF/MANIFEST.MF19
-rw-r--r--bundles/org.eclipse.jst.ws.jaxws.dom.ui/about.html28
-rwxr-xr-xbundles/org.eclipse.jst.ws.jaxws.dom.ui/build.properties20
-rwxr-xr-xbundles/org.eclipse.jst.ws.jaxws.dom.ui/icons/SEI.gifbin576 -> 0 bytes-rwxr-xr-xbundles/org.eclipse.jst.ws.jaxws.dom.ui/icons/SEI_Group.gifbin603 -> 0 bytes-rwxr-xr-xbundles/org.eclipse.jst.ws.jaxws.dom.ui/icons/Web_Method.gifbin150 -> 0 bytes-rwxr-xr-xbundles/org.eclipse.jst.ws.jaxws.dom.ui/icons/Web_Param_In.gifbin338 -> 0 bytes-rwxr-xr-xbundles/org.eclipse.jst.ws.jaxws.dom.ui/icons/Web_Param_Out.gifbin347 -> 0 bytes-rwxr-xr-xbundles/org.eclipse.jst.ws.jaxws.dom.ui/icons/Web_Service.gifbin542 -> 0 bytes-rwxr-xr-xbundles/org.eclipse.jst.ws.jaxws.dom.ui/icons/Web_Service_Group.gifbin580 -> 0 bytes-rwxr-xr-xbundles/org.eclipse.jst.ws.jaxws.dom.ui/icons/Web_Service_Item_Provider.gifbin563 -> 0 bytes-rwxr-xr-xbundles/org.eclipse.jst.ws.jaxws.dom.ui/icons/error_obj.gifbin339 -> 0 bytes-rwxr-xr-xbundles/org.eclipse.jst.ws.jaxws.dom.ui/icons/full/ctool16/CreateIDOM_webServiceProjects_IWebServiceProject.gifbin223 -> 0 bytes-rwxr-xr-xbundles/org.eclipse.jst.ws.jaxws.dom.ui/icons/full/ctool16/CreateIServiceEndpointInterface_webMethods_IWebMethod.gifbin223 -> 0 bytes-rwxr-xr-xbundles/org.eclipse.jst.ws.jaxws.dom.ui/icons/full/ctool16/CreateIWebMethod_parameters_IWebParam.gifbin223 -> 0 bytes-rwxr-xr-xbundles/org.eclipse.jst.ws.jaxws.dom.ui/icons/full/ctool16/CreateIWebServiceProject_serviceEndpointInterfaces_IServiceEndpointInterface.gifbin223 -> 0 bytes-rwxr-xr-xbundles/org.eclipse.jst.ws.jaxws.dom.ui/icons/full/ctool16/CreateIWebServiceProject_webServices_IWebService.gifbin223 -> 0 bytes-rwxr-xr-xbundles/org.eclipse.jst.ws.jaxws.dom.ui/icons/full/obj16/IDOM.gifbin129 -> 0 bytes-rwxr-xr-xbundles/org.eclipse.jst.ws.jaxws.dom.ui/icons/full/obj16/IJavaWebServiceElement.gifbin129 -> 0 bytes-rwxr-xr-xbundles/org.eclipse.jst.ws.jaxws.dom.ui/icons/full/obj16/IServiceEndpointInterface.gifbin129 -> 0 bytes-rwxr-xr-xbundles/org.eclipse.jst.ws.jaxws.dom.ui/icons/full/obj16/IWebMethod.gifbin129 -> 0 bytes-rwxr-xr-xbundles/org.eclipse.jst.ws.jaxws.dom.ui/icons/full/obj16/IWebParam.gifbin129 -> 0 bytes-rwxr-xr-xbundles/org.eclipse.jst.ws.jaxws.dom.ui/icons/full/obj16/IWebService.gifbin129 -> 0 bytes-rwxr-xr-xbundles/org.eclipse.jst.ws.jaxws.dom.ui/icons/full/obj16/IWebServiceProject.gifbin129 -> 0 bytes-rwxr-xr-xbundles/org.eclipse.jst.ws.jaxws.dom.ui/icons/full/obj16/IWebType.gifbin129 -> 0 bytes-rwxr-xr-xbundles/org.eclipse.jst.ws.jaxws.dom.ui/icons/warning_obj.gifbin324 -> 0 bytes-rwxr-xr-xbundles/org.eclipse.jst.ws.jaxws.dom.ui/plugin.properties83
-rwxr-xr-xbundles/org.eclipse.jst.ws.jaxws.dom.ui/plugin.xml29
-rwxr-xr-xbundles/org.eclipse.jst.ws.jaxws.dom.ui/src/org/eclipse/jst/ws/jaxws/dom/ui/DomItemProviderAdapterFactory.java375
-rwxr-xr-xbundles/org.eclipse.jst.ws.jaxws.dom.ui/src/org/eclipse/jst/ws/jaxws/dom/ui/IDOMItemProvider.java172
-rwxr-xr-xbundles/org.eclipse.jst.ws.jaxws.dom.ui/src/org/eclipse/jst/ws/jaxws/dom/ui/IDOMPropertyValue.java23
-rwxr-xr-xbundles/org.eclipse.jst.ws.jaxws.dom.ui/src/org/eclipse/jst/ws/jaxws/dom/ui/IJavaWebServiceElementItemProvider.java197
-rwxr-xr-xbundles/org.eclipse.jst.ws.jaxws.dom.ui/src/org/eclipse/jst/ws/jaxws/dom/ui/IServiceEndpointInterfaceItemProvider.java320
-rwxr-xr-xbundles/org.eclipse.jst.ws.jaxws.dom.ui/src/org/eclipse/jst/ws/jaxws/dom/ui/IWebMethodItemProvider.java330
-rwxr-xr-xbundles/org.eclipse.jst.ws.jaxws.dom.ui/src/org/eclipse/jst/ws/jaxws/dom/ui/IWebParamItemProvider.java299
-rwxr-xr-xbundles/org.eclipse.jst.ws.jaxws.dom.ui/src/org/eclipse/jst/ws/jaxws/dom/ui/IWebServiceItemProvider.java234
-rwxr-xr-xbundles/org.eclipse.jst.ws.jaxws.dom.ui/src/org/eclipse/jst/ws/jaxws/dom/ui/IWebServiceProjectItemProvider.java208
-rwxr-xr-xbundles/org.eclipse.jst.ws.jaxws.dom.ui/src/org/eclipse/jst/ws/jaxws/dom/ui/IWebTypeItemProvider.java129
-rwxr-xr-xbundles/org.eclipse.jst.ws.jaxws.dom.ui/src/org/eclipse/jst/ws/jaxws/dom/ui/Images.java122
-rwxr-xr-xbundles/org.eclipse.jst.ws.jaxws.dom.ui/src/org/eclipse/jst/ws/jaxws/dom/ui/internal/impl/DOMItemPropertyProvider.java79
-rwxr-xr-xbundles/org.eclipse.jst.ws.jaxws.dom.ui/src/org/eclipse/jst/ws/jaxws/dom/ui/internal/impl/DOMPropertyValue.java32
-rwxr-xr-xbundles/org.eclipse.jst.ws.jaxws.dom.ui/src/org/eclipse/jst/ws/jaxws/dom/ui/internal/plugin/DomUi.java113
-rwxr-xr-xbundles/org.eclipse.jst.ws.jaxws.dom.ui/src/org/eclipse/jst/ws/jaxws/dom/ui/internal/plugin/WSImageBundle.properties20
-rwxr-xr-xbundles/org.eclipse.jst.ws.jaxws.ui/.classpath7
-rwxr-xr-xbundles/org.eclipse.jst.ws.jaxws.ui/.project28
-rwxr-xr-xbundles/org.eclipse.jst.ws.jaxws.ui/.settings/org.eclipse.jdt.core.prefs7
-rwxr-xr-xbundles/org.eclipse.jst.ws.jaxws.ui/META-INF/MANIFEST.MF33
-rw-r--r--bundles/org.eclipse.jst.ws.jaxws.ui/about.html28
-rwxr-xr-xbundles/org.eclipse.jst.ws.jaxws.ui/build.properties8
-rw-r--r--bundles/org.eclipse.jst.ws.jaxws.ui/icons/elcl16/filter_ps.gifbin219 -> 0 bytes-rw-r--r--bundles/org.eclipse.jst.ws.jaxws.ui/icons/etool16/newhandler_wiz.gifbin162 -> 0 bytes-rwxr-xr-xbundles/org.eclipse.jst.ws.jaxws.ui/icons/eview16/annotation_obj.gifbin350 -> 0 bytes-rw-r--r--bundles/org.eclipse.jst.ws.jaxws.ui/icons/eview16/prop_ps.gifbin343 -> 0 bytes-rw-r--r--bundles/org.eclipse.jst.ws.jaxws.ui/icons/obj16/binding_obj.gifbin610 -> 0 bytes-rw-r--r--bundles/org.eclipse.jst.ws.jaxws.ui/icons/obj16/false.gifbin896 -> 0 bytes-rw-r--r--bundles/org.eclipse.jst.ws.jaxws.ui/icons/obj16/httpbinding_obj.gifbin376 -> 0 bytes-rw-r--r--bundles/org.eclipse.jst.ws.jaxws.ui/icons/obj16/soapbinding_obj.gifbin637 -> 0 bytes-rw-r--r--bundles/org.eclipse.jst.ws.jaxws.ui/icons/obj16/true.gifbin343 -> 0 bytes-rw-r--r--bundles/org.eclipse.jst.ws.jaxws.ui/icons/wizban/new_wiz.pngbin7124 -> 0 bytes-rw-r--r--bundles/org.eclipse.jst.ws.jaxws.ui/plugin.properties24
-rwxr-xr-xbundles/org.eclipse.jst.ws.jaxws.ui/plugin.xml174
-rwxr-xr-xbundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/JAXWSUIMessages.java141
-rw-r--r--bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/JAXWSUIMessages.properties124
-rwxr-xr-xbundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/JAXWSUIPlugin.java86
-rw-r--r--bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/actions/AnnotationsViewFilterAction.java93
-rw-r--r--bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/annotations/contentassist/AnnotationCompletionProposalComputer.java166
-rw-r--r--bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/annotations/correction/APTCompileProblemMarkerResolutionGenerator.java122
-rw-r--r--bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/annotations/correction/AbstractJavaCorrectionPropsoal.java113
-rw-r--r--bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/annotations/correction/AddAnnotationToTypeCorrectionProposal.java75
-rw-r--r--bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/annotations/correction/AddUnimplementedMethodCorrectionProposal.java145
-rw-r--r--bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/annotations/correction/ChangeModifierCorrectionProposal.java119
-rw-r--r--bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/annotations/correction/ChangeReturnTypeCorrectionProposal.java117
-rw-r--r--bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/annotations/correction/JAXWSQuickFixProcessor.java342
-rw-r--r--bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/annotations/correction/NewDefaultConstructorCorrectionProposal.java89
-rw-r--r--bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/annotations/correction/RemoveAnnotationCorrectionProposal.java65
-rw-r--r--bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/annotations/correction/RemoveMemberValuePairCorrectionProposal.java57
-rw-r--r--bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/annotations/correction/RemoveMethodCorrectionProposal.java47
-rw-r--r--bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/annotations/initialization/BindingTypeAttributeInitializer.java162
-rw-r--r--bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/annotations/initialization/BindingTypeCompletionProposal.java57
-rw-r--r--bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/annotations/initialization/RequestWrapperAttributeInitializer.java145
-rw-r--r--bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/annotations/initialization/ResponseWrapperAttributeInitializer.java58
-rw-r--r--bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/annotations/initialization/SOAPBindingAttributeInitializer.java52
-rw-r--r--bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/annotations/initialization/WebMethodAttributeInitializer.java98
-rw-r--r--bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/annotations/initialization/WebParamAttributeInitializer.java189
-rw-r--r--bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/annotations/initialization/WebResultAttributeInitializer.java204
-rw-r--r--bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/annotations/initialization/WebServiceAttributeInitializer.java153
-rw-r--r--bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/dialogs/HandlerChainSelectionDialog.java61
-rw-r--r--bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/dialogs/NewHandlerChainDialog.java142
-rw-r--r--bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/filters/NewHandlerChainViewerFilter.java72
-rw-r--r--bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/handlers/ConfigureHandlerChainHandler.java63
-rw-r--r--bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/views/AnnotationArrayCellEditor.java607
-rwxr-xr-xbundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/views/AnnotationsColumnLabelProvider.java46
-rw-r--r--bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/views/AnnotationsValuesColumnLabelProvider.java209
-rw-r--r--bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/views/AnnotationsValuesEditingSupport.java706
-rwxr-xr-xbundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/views/AnnotationsView.java474
-rw-r--r--bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/views/AnnotationsViewCategoryFilter.java79
-rwxr-xr-xbundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/views/AnnotationsViewContentProvider.java64
-rw-r--r--bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/views/ClassDialogCellEditor.java65
-rw-r--r--bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/widgets/ClasspathComposite.java101
-rw-r--r--bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/wizards/AddHandlerChainPage.java376
-rw-r--r--bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/wizards/ConfigureHandlerWizard.java206
-rw-r--r--bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/wizards/NewJAXWSHandlerWizard.java208
-rw-r--r--bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/wizards/NewJAXWSHandlerWizardPage.java652
-rw-r--r--bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/wizards/OrderHandlerChainPage.java528
-rwxr-xr-xbundles/org.eclipse.jst.ws.jaxws.utils/.classpath7
-rwxr-xr-xbundles/org.eclipse.jst.ws.jaxws.utils/.project28
-rwxr-xr-xbundles/org.eclipse.jst.ws.jaxws.utils/.settings/org.eclipse.jdt.core.prefs8
-rwxr-xr-xbundles/org.eclipse.jst.ws.jaxws.utils/META-INF/MANIFEST.MF40
-rw-r--r--bundles/org.eclipse.jst.ws.jaxws.utils/about.html28
-rwxr-xr-xbundles/org.eclipse.jst.ws.jaxws.utils/build.properties17
-rwxr-xr-xbundles/org.eclipse.jst.ws.jaxws.utils/plugin.properties13
-rwxr-xr-xbundles/org.eclipse.jst.ws.jaxws.utils/plugin.xml20
-rwxr-xr-xbundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/ContractChecker.java132
-rwxr-xr-xbundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/JaxWsUtils.java220
-rwxr-xr-xbundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/StatusUtils.java170
-rwxr-xr-xbundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/annotations/AnnotationFactory.java352
-rwxr-xr-xbundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/annotations/AnnotationGeneratorException.java48
-rwxr-xr-xbundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/annotations/AnnotationWriter.java600
-rwxr-xr-xbundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/annotations/IAnnotation.java59
-rwxr-xr-xbundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/annotations/IAnnotationBase.java76
-rwxr-xr-xbundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/annotations/IAnnotationInspector.java138
-rwxr-xr-xbundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/annotations/IAnnotationProperty.java24
-rwxr-xr-xbundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/annotations/IAnnotationPropertyContainer.java36
-rwxr-xr-xbundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/annotations/ILocator.java34
-rwxr-xr-xbundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/annotations/IParamValuePair.java37
-rwxr-xr-xbundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/annotations/IValue.java39
-rwxr-xr-xbundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/clazz/ASTUtils.java253
-rwxr-xr-xbundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/exception/LocalizedException.java74
-rwxr-xr-xbundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/exception/MissingResourceException.java55
-rwxr-xr-xbundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/facets/FacetUtils.java130
-rwxr-xr-xbundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/facets/IFacetUtils.java83
-rwxr-xr-xbundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/internal/annotations/impl/AnnotationBaseImpl.java120
-rwxr-xr-xbundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/internal/annotations/impl/AnnotationImpl.java125
-rwxr-xr-xbundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/internal/annotations/impl/AnnotationInspectorImpl.java670
-rwxr-xr-xbundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/internal/annotations/impl/AnnotationProperty.java57
-rwxr-xr-xbundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/internal/annotations/impl/AnnotationPropertyContainer.java169
-rwxr-xr-xbundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/internal/annotations/impl/AnnotationUtils.java528
-rwxr-xr-xbundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/internal/annotations/impl/ArrayValueImpl.java108
-rwxr-xr-xbundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/internal/annotations/impl/AttributeTypeEnum.java32
-rwxr-xr-xbundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/internal/annotations/impl/BooleanValueImpl.java67
-rwxr-xr-xbundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/internal/annotations/impl/ClassValueImpl.java73
-rwxr-xr-xbundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/internal/annotations/impl/IntegerValueImpl.java75
-rwxr-xr-xbundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/internal/annotations/impl/LocatorImpl.java45
-rwxr-xr-xbundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/internal/annotations/impl/ParamValuePairImpl.java98
-rwxr-xr-xbundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/internal/annotations/impl/QualifiedNameValueImpl.java82
-rwxr-xr-xbundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/internal/annotations/impl/StringValueImpl.java75
-rwxr-xr-xbundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/internal/annotations/impl/ValueImpl.java144
-rwxr-xr-xbundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/internal/plugin/JaxwsUtilsPlugin.java63
-rwxr-xr-xbundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/internal/text/JaxWsUtilMessages.java42
-rwxr-xr-xbundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/internal/text/JaxWsUtilMessages.properties18
-rwxr-xr-xbundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/logging/ILogger.java71
-rwxr-xr-xbundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/logging/Logger.java59
-rw-r--r--bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/operation/IOperationRunner.java29
-rw-r--r--bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/operation/OperationInJobRunner.java77
-rwxr-xr-xbundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/resources/EditResourcesManager.java207
-rwxr-xr-xbundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/resources/FileUtils.java438
-rwxr-xr-xbundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/resources/IFileUtils.java310
-rwxr-xr-xbundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/resources/ProjectManagementUtils.java257
-rwxr-xr-xbundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/resources/StringInputStreamAdapter.java50
-rwxr-xr-xdocs/org.eclipse.jst.ws.cxf.doc.user/.project22
-rwxr-xr-xdocs/org.eclipse.jst.ws.cxf.doc.user/META-INF/MANIFEST.MF9
-rwxr-xr-xdocs/org.eclipse.jst.ws.cxf.doc.user/about.html28
-rwxr-xr-xdocs/org.eclipse.jst.ws.cxf.doc.user/book.css22
-rwxr-xr-xdocs/org.eclipse.jst.ws.cxf.doc.user/build.properties15
-rwxr-xr-xdocs/org.eclipse.jst.ws.cxf.doc.user/cheatsheets/bottomUp-cxf-composite.xml63
-rwxr-xr-xdocs/org.eclipse.jst.ws.cxf.doc.user/cheatsheets/configure-cxf-runtime.xml56
-rwxr-xr-xdocs/org.eclipse.jst.ws.cxf.doc.user/cheatsheets/create-bottomUp-cxf.xml67
-rwxr-xr-xdocs/org.eclipse.jst.ws.cxf.doc.user/cheatsheets/create-client-cxf.xml49
-rwxr-xr-xdocs/org.eclipse.jst.ws.cxf.doc.user/cheatsheets/create-cxf-project.xml52
-rwxr-xr-xdocs/org.eclipse.jst.ws.cxf.doc.user/cheatsheets/create-tomcat-server.xml57
-rwxr-xr-xdocs/org.eclipse.jst.ws.cxf.doc.user/cheatsheets/create-topDown-cxf.xml55
-rwxr-xr-xdocs/org.eclipse.jst.ws.cxf.doc.user/cheatsheets/generate-cxf-wsdl-client-composite.xml53
-rwxr-xr-xdocs/org.eclipse.jst.ws.cxf.doc.user/cheatsheets/topdown-cxf-composite.xml63
-rwxr-xr-xdocs/org.eclipse.jst.ws.cxf.doc.user/gettingstarted/quickstart.html27
-rwxr-xr-xdocs/org.eclipse.jst.ws.cxf.doc.user/images/ngrelc.pngbin671 -> 0 bytes-rwxr-xr-xdocs/org.eclipse.jst.ws.cxf.doc.user/images/ngrelr.pngbin619 -> 0 bytes-rwxr-xr-xdocs/org.eclipse.jst.ws.cxf.doc.user/images/ngrelt.pngbin585 -> 0 bytes-rwxr-xr-xdocs/org.eclipse.jst.ws.cxf.doc.user/legal.html18
-rwxr-xr-xdocs/org.eclipse.jst.ws.cxf.doc.user/plugin.properties16
-rwxr-xr-xdocs/org.eclipse.jst.ws.cxf.doc.user/plugin.xml35
-rwxr-xr-xdocs/org.eclipse.jst.ws.cxf.doc.user/reference/cxf_facet.html32
-rwxr-xr-xdocs/org.eclipse.jst.ws.cxf.doc.user/reference/endpoint_config_tab.html73
-rwxr-xr-xdocs/org.eclipse.jst.ws.cxf.doc.user/reference/images/apt_processing.pngbin11410 -> 0 bytes-rwxr-xr-xdocs/org.eclipse.jst.ws.cxf.doc.user/reference/images/cxf2x_preferences.pngbin18116 -> 0 bytes-rwxr-xr-xdocs/org.eclipse.jst.ws.cxf.doc.user/reference/images/cxf_runtime_tab.pngbin30443 -> 0 bytes-rw-r--r--docs/org.eclipse.jst.ws.cxf.doc.user/reference/images/cxf_runtime_tab_export.pngbin8707 -> 0 bytes-rwxr-xr-xdocs/org.eclipse.jst.ws.cxf.doc.user/reference/images/java2ws_tab.pngbin34317 -> 0 bytes-rwxr-xr-xdocs/org.eclipse.jst.ws.cxf.doc.user/reference/images/jaxws_annotations.pngbin17216 -> 0 bytes-rwxr-xr-xdocs/org.eclipse.jst.ws.cxf.doc.user/reference/images/server_runtime.pngbin17058 -> 0 bytes-rwxr-xr-xdocs/org.eclipse.jst.ws.cxf.doc.user/reference/images/spring_config.pngbin13294 -> 0 bytes-rwxr-xr-xdocs/org.eclipse.jst.ws.cxf.doc.user/reference/images/wsdl2java.pngbin42496 -> 0 bytes-rwxr-xr-xdocs/org.eclipse.jst.ws.cxf.doc.user/reference/images/xjc.pngbin38289 -> 0 bytes-rwxr-xr-xdocs/org.eclipse.jst.ws.cxf.doc.user/reference/java2ws_tab.html153
-rwxr-xr-xdocs/org.eclipse.jst.ws.cxf.doc.user/reference/jaxws_tab.html23
-rwxr-xr-xdocs/org.eclipse.jst.ws.cxf.doc.user/reference/preferences.html41
-rwxr-xr-xdocs/org.eclipse.jst.ws.cxf.doc.user/reference/server_runtime.html21
-rwxr-xr-xdocs/org.eclipse.jst.ws.cxf.doc.user/reference/wsdl2java_tab.html275
-rw-r--r--docs/org.eclipse.jst.ws.cxf.doc.user/tasks/ant_tasks.html53
-rwxr-xr-xdocs/org.eclipse.jst.ws.cxf.doc.user/tasks/configuring_jaxws_annotation_processing.html22
-rwxr-xr-xdocs/org.eclipse.jst.ws.cxf.doc.user/tasks/create_bottomup.html76
-rwxr-xr-xdocs/org.eclipse.jst.ws.cxf.doc.user/tasks/create_client.html56
-rwxr-xr-xdocs/org.eclipse.jst.ws.cxf.doc.user/tasks/create_cxf_project.html40
-rw-r--r--docs/org.eclipse.jst.ws.cxf.doc.user/tasks/create_jaxws_handler.html51
-rwxr-xr-xdocs/org.eclipse.jst.ws.cxf.doc.user/tasks/create_topdown.html77
-rw-r--r--docs/org.eclipse.jst.ws.cxf.doc.user/tasks/cxf_ant_bu_prop_ref.html135
-rw-r--r--docs/org.eclipse.jst.ws.cxf.doc.user/tasks/cxf_ant_client_prop_ref.html155
-rw-r--r--docs/org.eclipse.jst.ws.cxf.doc.user/tasks/cxf_ant_cmd.html57
-rw-r--r--docs/org.eclipse.jst.ws.cxf.doc.user/tasks/cxf_ant_td_prop_ref.html214
-rw-r--r--docs/org.eclipse.jst.ws.cxf.doc.user/tasks/cxf_ant_ws.html53
-rw-r--r--docs/org.eclipse.jst.ws.cxf.doc.user/tasks/cxf_ant_ws_client.html47
-rwxr-xr-xdocs/org.eclipse.jst.ws.cxf.doc.user/tasks/images/annotation_processing.pngbin152781 -> 0 bytes-rwxr-xr-xdocs/org.eclipse.jst.ws.cxf.doc.user/tasks/images/bottom_up_wizard.pngbin177742 -> 0 bytes-rwxr-xr-xdocs/org.eclipse.jst.ws.cxf.doc.user/tasks/images/facet_configuration.pngbin20012 -> 0 bytes-rw-r--r--docs/org.eclipse.jst.ws.cxf.doc.user/tasks/images/jaxws_handler_wizard.pngbin120346 -> 0 bytes-rwxr-xr-xdocs/org.eclipse.jst.ws.cxf.doc.user/tasks/images/module_dependencies.pngbin10851 -> 0 bytes-rwxr-xr-xdocs/org.eclipse.jst.ws.cxf.doc.user/tasks/images/project_facets.pngbin22721 -> 0 bytes-rwxr-xr-xdocs/org.eclipse.jst.ws.cxf.doc.user/tasks/images/top_down_wizard.pngbin173307 -> 0 bytes-rwxr-xr-xdocs/org.eclipse.jst.ws.cxf.doc.user/tasks/images/ws_client_wizard.pngbin119392 -> 0 bytes-rwxr-xr-xdocs/org.eclipse.jst.ws.cxf.doc.user/tasks/install_cxf_facet.html25
-rwxr-xr-xdocs/org.eclipse.jst.ws.cxf.doc.user/tasks/manage_cxf_lib_export.html22
-rwxr-xr-xdocs/org.eclipse.jst.ws.cxf.doc.user/tocgettingstarted.xml6
-rwxr-xr-xdocs/org.eclipse.jst.ws.cxf.doc.user/tocreference.xml14
-rwxr-xr-xdocs/org.eclipse.jst.ws.cxf.doc.user/toctasks.xml32
-rw-r--r--docs/org.eclipse.jst.ws.jaxws.doc.isv/.project22
-rw-r--r--docs/org.eclipse.jst.ws.jaxws.doc.isv/META-INF/MANIFEST.MF7
-rw-r--r--docs/org.eclipse.jst.ws.jaxws.doc.isv/about.html28
-rw-r--r--docs/org.eclipse.jst.ws.jaxws.doc.isv/book.css1
-rw-r--r--docs/org.eclipse.jst.ws.jaxws.doc.isv/build.properties9
-rw-r--r--docs/org.eclipse.jst.ws.jaxws.doc.isv/plugin.properties12
-rw-r--r--docs/org.eclipse.jst.ws.jaxws.doc.isv/plugin.xml16
-rw-r--r--docs/org.eclipse.jst.ws.jaxws.doc.isv/reference/api/allclasses-frame.html49
-rw-r--r--docs/org.eclipse.jst.ws.jaxws.doc.isv/reference/api/allclasses-noframe.html49
-rw-r--r--docs/org.eclipse.jst.ws.jaxws.doc.isv/reference/api/constant-values.html174
-rw-r--r--docs/org.eclipse.jst.ws.jaxws.doc.isv/reference/api/deprecated-list.html186
-rw-r--r--docs/org.eclipse.jst.ws.jaxws.doc.isv/reference/api/help-doc.html223
-rw-r--r--docs/org.eclipse.jst.ws.jaxws.doc.isv/reference/api/index-files/index-1.html167
-rw-r--r--docs/org.eclipse.jst.ws.jaxws.doc.isv/reference/api/index-files/index-10.html158
-rw-r--r--docs/org.eclipse.jst.ws.jaxws.doc.isv/reference/api/index-files/index-11.html148
-rw-r--r--docs/org.eclipse.jst.ws.jaxws.doc.isv/reference/api/index-files/index-12.html148
-rw-r--r--docs/org.eclipse.jst.ws.jaxws.doc.isv/reference/api/index-files/index-13.html154
-rw-r--r--docs/org.eclipse.jst.ws.jaxws.doc.isv/reference/api/index-files/index-14.html148
-rw-r--r--docs/org.eclipse.jst.ws.jaxws.doc.isv/reference/api/index-files/index-2.html238
-rw-r--r--docs/org.eclipse.jst.ws.jaxws.doc.isv/reference/api/index-files/index-3.html145
-rw-r--r--docs/org.eclipse.jst.ws.jaxws.doc.isv/reference/api/index-files/index-4.html149
-rw-r--r--docs/org.eclipse.jst.ws.jaxws.doc.isv/reference/api/index-files/index-5.html359
-rw-r--r--docs/org.eclipse.jst.ws.jaxws.doc.isv/reference/api/index-files/index-6.html167
-rw-r--r--docs/org.eclipse.jst.ws.jaxws.doc.isv/reference/api/index-files/index-7.html142
-rw-r--r--docs/org.eclipse.jst.ws.jaxws.doc.isv/reference/api/index-files/index-8.html142
-rw-r--r--docs/org.eclipse.jst.ws.jaxws.doc.isv/reference/api/index-files/index-9.html145
-rw-r--r--docs/org.eclipse.jst.ws.jaxws.doc.isv/reference/api/index.html39
-rw-r--r--docs/org.eclipse.jst.ws.jaxws.doc.isv/reference/api/org/eclipse/jst/ws/annotations/core/AnnotationDefinition.html560
-rw-r--r--docs/org.eclipse.jst.ws.jaxws.doc.isv/reference/api/org/eclipse/jst/ws/annotations/core/AnnotationsCore.html694
-rw-r--r--docs/org.eclipse.jst.ws.jaxws.doc.isv/reference/api/org/eclipse/jst/ws/annotations/core/AnnotationsCorePlugin.html428
-rw-r--r--docs/org.eclipse.jst.ws.jaxws.doc.isv/reference/api/org/eclipse/jst/ws/annotations/core/AnnotationsManager.html458
-rw-r--r--docs/org.eclipse.jst.ws.jaxws.doc.isv/reference/api/org/eclipse/jst/ws/annotations/core/class-use/AnnotationDefinition.html224
-rw-r--r--docs/org.eclipse.jst.ws.jaxws.doc.isv/reference/api/org/eclipse/jst/ws/annotations/core/class-use/AnnotationsCore.html144
-rw-r--r--docs/org.eclipse.jst.ws.jaxws.doc.isv/reference/api/org/eclipse/jst/ws/annotations/core/class-use/AnnotationsManager.html144
-rw-r--r--docs/org.eclipse.jst.ws.jaxws.doc.isv/reference/api/org/eclipse/jst/ws/annotations/core/initialization/AnnotationAttributeInitializer.html342
-rw-r--r--docs/org.eclipse.jst.ws.jaxws.doc.isv/reference/api/org/eclipse/jst/ws/annotations/core/initialization/DefaultsAnnotationAttributeInitializer.html319
-rw-r--r--docs/org.eclipse.jst.ws.jaxws.doc.isv/reference/api/org/eclipse/jst/ws/annotations/core/initialization/IAnnotationAttributeInitializer.html306
-rw-r--r--docs/org.eclipse.jst.ws.jaxws.doc.isv/reference/api/org/eclipse/jst/ws/annotations/core/initialization/class-use/AnnotationAttributeInitializer.html180
-rw-r--r--docs/org.eclipse.jst.ws.jaxws.doc.isv/reference/api/org/eclipse/jst/ws/annotations/core/initialization/class-use/DefaultsAnnotationAttributeInitializer.html144
-rw-r--r--docs/org.eclipse.jst.ws.jaxws.doc.isv/reference/api/org/eclipse/jst/ws/annotations/core/initialization/class-use/IAnnotationAttributeInitializer.html229
-rw-r--r--docs/org.eclipse.jst.ws.jaxws.doc.isv/reference/api/org/eclipse/jst/ws/annotations/core/initialization/package-frame.html45
-rw-r--r--docs/org.eclipse.jst.ws.jaxws.doc.isv/reference/api/org/eclipse/jst/ws/annotations/core/initialization/package-summary.html176
-rw-r--r--docs/org.eclipse.jst.ws.jaxws.doc.isv/reference/api/org/eclipse/jst/ws/annotations/core/initialization/package-tree.html161
-rw-r--r--docs/org.eclipse.jst.ws.jaxws.doc.isv/reference/api/org/eclipse/jst/ws/annotations/core/initialization/package-use.html196
-rw-r--r--docs/org.eclipse.jst.ws.jaxws.doc.isv/reference/api/org/eclipse/jst/ws/annotations/core/package-frame.html36
-rw-r--r--docs/org.eclipse.jst.ws.jaxws.doc.isv/reference/api/org/eclipse/jst/ws/annotations/core/package-summary.html172
-rw-r--r--docs/org.eclipse.jst.ws.jaxws.doc.isv/reference/api/org/eclipse/jst/ws/annotations/core/package-tree.html153
-rw-r--r--docs/org.eclipse.jst.ws.jaxws.doc.isv/reference/api/org/eclipse/jst/ws/annotations/core/package-use.html173
-rw-r--r--docs/org.eclipse.jst.ws.jaxws.doc.isv/reference/api/org/eclipse/jst/ws/annotations/core/processor/AbstractAnnotationProcessor.html263
-rw-r--r--docs/org.eclipse.jst.ws.jaxws.doc.isv/reference/api/org/eclipse/jst/ws/annotations/core/processor/class-use/AbstractAnnotationProcessor.html144
-rw-r--r--docs/org.eclipse.jst.ws.jaxws.doc.isv/reference/api/org/eclipse/jst/ws/annotations/core/processor/package-frame.html32
-rw-r--r--docs/org.eclipse.jst.ws.jaxws.doc.isv/reference/api/org/eclipse/jst/ws/annotations/core/processor/package-summary.html158
-rw-r--r--docs/org.eclipse.jst.ws.jaxws.doc.isv/reference/api/org/eclipse/jst/ws/annotations/core/processor/package-tree.html154
-rw-r--r--docs/org.eclipse.jst.ws.jaxws.doc.isv/reference/api/org/eclipse/jst/ws/annotations/core/processor/package-use.html144
-rw-r--r--docs/org.eclipse.jst.ws.jaxws.doc.isv/reference/api/org/eclipse/jst/ws/annotations/core/utils/AnnotationUtils.html1517
-rw-r--r--docs/org.eclipse.jst.ws.jaxws.doc.isv/reference/api/org/eclipse/jst/ws/annotations/core/utils/class-use/AnnotationUtils.html144
-rw-r--r--docs/org.eclipse.jst.ws.jaxws.doc.isv/reference/api/org/eclipse/jst/ws/annotations/core/utils/package-frame.html32
-rw-r--r--docs/org.eclipse.jst.ws.jaxws.doc.isv/reference/api/org/eclipse/jst/ws/annotations/core/utils/package-summary.html157
-rw-r--r--docs/org.eclipse.jst.ws.jaxws.doc.isv/reference/api/org/eclipse/jst/ws/annotations/core/utils/package-tree.html153
-rw-r--r--docs/org.eclipse.jst.ws.jaxws.doc.isv/reference/api/org/eclipse/jst/ws/annotations/core/utils/package-use.html144
-rw-r--r--docs/org.eclipse.jst.ws.jaxws.doc.isv/reference/api/org/eclipse/jst/ws/jaxws/core/utils/JDTUtils.html631
-rw-r--r--docs/org.eclipse.jst.ws.jaxws.doc.isv/reference/api/org/eclipse/jst/ws/jaxws/core/utils/WSDLUtils.html470
-rw-r--r--docs/org.eclipse.jst.ws.jaxws.doc.isv/reference/api/org/eclipse/jst/ws/jaxws/core/utils/class-use/JDTUtils.html144
-rw-r--r--docs/org.eclipse.jst.ws.jaxws.doc.isv/reference/api/org/eclipse/jst/ws/jaxws/core/utils/class-use/WSDLUtils.html144
-rw-r--r--docs/org.eclipse.jst.ws.jaxws.doc.isv/reference/api/org/eclipse/jst/ws/jaxws/core/utils/package-frame.html34
-rw-r--r--docs/org.eclipse.jst.ws.jaxws.doc.isv/reference/api/org/eclipse/jst/ws/jaxws/core/utils/package-summary.html161
-rw-r--r--docs/org.eclipse.jst.ws.jaxws.doc.isv/reference/api/org/eclipse/jst/ws/jaxws/core/utils/package-tree.html153
-rw-r--r--docs/org.eclipse.jst.ws.jaxws.doc.isv/reference/api/org/eclipse/jst/ws/jaxws/core/utils/package-use.html144
-rw-r--r--docs/org.eclipse.jst.ws.jaxws.doc.isv/reference/api/overview-frame.html50
-rw-r--r--docs/org.eclipse.jst.ws.jaxws.doc.isv/reference/api/overview-summary.html167
-rw-r--r--docs/org.eclipse.jst.ws.jaxws.doc.isv/reference/api/overview-tree.html161
-rw-r--r--docs/org.eclipse.jst.ws.jaxws.doc.isv/reference/api/package-list5
-rw-r--r--docs/org.eclipse.jst.ws.jaxws.doc.isv/reference/api/resources/inherit.gifbin57 -> 0 bytes-rw-r--r--docs/org.eclipse.jst.ws.jaxws.doc.isv/reference/api/stylesheet.css29
-rw-r--r--docs/org.eclipse.jst.ws.jaxws.doc.isv/reference/extension-points/index.html21
-rw-r--r--docs/org.eclipse.jst.ws.jaxws.doc.isv/reference/extension-points/org_eclipse_jst_ws_annotations_core_annotationCategory.html56
-rw-r--r--docs/org.eclipse.jst.ws.jaxws.doc.isv/reference/extension-points/org_eclipse_jst_ws_annotations_core_annotationDefinition.html66
-rw-r--r--docs/org.eclipse.jst.ws.jaxws.doc.isv/reference/extension-points/org_eclipse_jst_ws_annotations_core_annotationInitializer.html57
-rw-r--r--docs/org.eclipse.jst.ws.jaxws.doc.isv/reference/extension-points/org_eclipse_jst_ws_annotations_core_annotationProcessor.html65
-rw-r--r--docs/org.eclipse.jst.ws.jaxws.doc.isv/schema.css71
-rw-r--r--docs/org.eclipse.jst.ws.jaxws.doc.isv/topics_api_reference.xml14
-rw-r--r--docs/org.eclipse.jst.ws.jaxws.doc.isv/topics_extension_points_reference.xml12
-rwxr-xr-xdocs/org.eclipse.jst.ws.jaxws.doc.user/.project22
-rwxr-xr-xdocs/org.eclipse.jst.ws.jaxws.doc.user/META-INF/MANIFEST.MF9
-rwxr-xr-xdocs/org.eclipse.jst.ws.jaxws.doc.user/about.html28
-rwxr-xr-xdocs/org.eclipse.jst.ws.jaxws.doc.user/book.css22
-rwxr-xr-xdocs/org.eclipse.jst.ws.jaxws.doc.user/build.properties13
-rwxr-xr-xdocs/org.eclipse.jst.ws.jaxws.doc.user/concepts/jaxws.html20
-rwxr-xr-xdocs/org.eclipse.jst.ws.jaxws.doc.user/gettingstarted/getting_started.html27
-rwxr-xr-xdocs/org.eclipse.jst.ws.jaxws.doc.user/gettingstarted/requirements.html39
-rwxr-xr-xdocs/org.eclipse.jst.ws.jaxws.doc.user/images/ngrelc.pngbin671 -> 0 bytes-rwxr-xr-xdocs/org.eclipse.jst.ws.jaxws.doc.user/images/ngrelr.pngbin619 -> 0 bytes-rwxr-xr-xdocs/org.eclipse.jst.ws.jaxws.doc.user/images/ngrelt.pngbin585 -> 0 bytes-rw-r--r--docs/org.eclipse.jst.ws.jaxws.doc.user/images/wtp_logo_2010.pngbin41749 -> 0 bytes-rwxr-xr-xdocs/org.eclipse.jst.ws.jaxws.doc.user/legal.html18
-rwxr-xr-xdocs/org.eclipse.jst.ws.jaxws.doc.user/mainpage.html18
-rwxr-xr-xdocs/org.eclipse.jst.ws.jaxws.doc.user/plugin.properties14
-rwxr-xr-xdocs/org.eclipse.jst.ws.jaxws.doc.user/plugin.xml19
-rwxr-xr-xdocs/org.eclipse.jst.ws.jaxws.doc.user/reference/annotation_processors.html20
-rwxr-xr-xdocs/org.eclipse.jst.ws.jaxws.doc.user/reference/annotation_view.html26
-rwxr-xr-xdocs/org.eclipse.jst.ws.jaxws.doc.user/reference/images/annotations_view.pngbin57857 -> 0 bytes-rwxr-xr-xdocs/org.eclipse.jst.ws.jaxws.doc.user/reference/images/annotations_view_expanded.pngbin26743 -> 0 bytes-rwxr-xr-xdocs/org.eclipse.jst.ws.jaxws.doc.user/tips/images/content_assist.pngbin42362 -> 0 bytes-rwxr-xr-xdocs/org.eclipse.jst.ws.jaxws.doc.user/tips/images/quick_fixes.pngbin28476 -> 0 bytes-rwxr-xr-xdocs/org.eclipse.jst.ws.jaxws.doc.user/tips/tips_tricks.html56
-rwxr-xr-xdocs/org.eclipse.jst.ws.jaxws.doc.user/toc.xml23
-rwxr-xr-xdocs/org.eclipse.jst.ws.jaxws.doc.user/tocconcepts.xml7
-rwxr-xr-xdocs/org.eclipse.jst.ws.jaxws.doc.user/tocreference.xml16
-rwxr-xr-xdocs/org.eclipse.jst.ws.jaxws.doc.user/toctasks.xml6
-rw-r--r--docs/org.eclipse.jst.ws.jaxws.dom.doc.isv/.project22
-rw-r--r--docs/org.eclipse.jst.ws.jaxws.dom.doc.isv/META-INF/MANIFEST.MF7
-rw-r--r--docs/org.eclipse.jst.ws.jaxws.dom.doc.isv/about.html28
-rw-r--r--docs/org.eclipse.jst.ws.jaxws.dom.doc.isv/book.css1
-rw-r--r--docs/org.eclipse.jst.ws.jaxws.dom.doc.isv/build.properties9
-rw-r--r--docs/org.eclipse.jst.ws.jaxws.dom.doc.isv/plugin.properties12
-rw-r--r--docs/org.eclipse.jst.ws.jaxws.dom.doc.isv/plugin.xml16
-rw-r--r--docs/org.eclipse.jst.ws.jaxws.dom.doc.isv/reference/api/allclasses-frame.html74
-rw-r--r--docs/org.eclipse.jst.ws.jaxws.dom.doc.isv/reference/api/allclasses-noframe.html74
-rw-r--r--docs/org.eclipse.jst.ws.jaxws.dom.doc.isv/reference/api/constant-values.html626
-rw-r--r--docs/org.eclipse.jst.ws.jaxws.dom.doc.isv/reference/api/deprecated-list.html142
-rw-r--r--docs/org.eclipse.jst.ws.jaxws.dom.doc.isv/reference/api/help-doc.html219
-rw-r--r--docs/org.eclipse.jst.ws.jaxws.dom.doc.isv/reference/api/index-files/index-1.html141
-rw-r--r--docs/org.eclipse.jst.ws.jaxws.dom.doc.isv/reference/api/index-files/index-10.html141
-rw-r--r--docs/org.eclipse.jst.ws.jaxws.dom.doc.isv/reference/api/index-files/index-11.html150
-rw-r--r--docs/org.eclipse.jst.ws.jaxws.dom.doc.isv/reference/api/index-files/index-12.html210
-rw-r--r--docs/org.eclipse.jst.ws.jaxws.dom.doc.isv/reference/api/index-files/index-13.html150
-rw-r--r--docs/org.eclipse.jst.ws.jaxws.dom.doc.isv/reference/api/index-files/index-14.html178
-rw-r--r--docs/org.eclipse.jst.ws.jaxws.dom.doc.isv/reference/api/index-files/index-15.html153
-rw-r--r--docs/org.eclipse.jst.ws.jaxws.dom.doc.isv/reference/api/index-files/index-2.html141
-rw-r--r--docs/org.eclipse.jst.ws.jaxws.dom.doc.isv/reference/api/index-files/index-3.html175
-rw-r--r--docs/org.eclipse.jst.ws.jaxws.dom.doc.isv/reference/api/index-files/index-4.html148
-rw-r--r--docs/org.eclipse.jst.ws.jaxws.dom.doc.isv/reference/api/index-files/index-5.html156
-rw-r--r--docs/org.eclipse.jst.ws.jaxws.dom.doc.isv/reference/api/index-files/index-6.html141
-rw-r--r--docs/org.eclipse.jst.ws.jaxws.dom.doc.isv/reference/api/index-files/index-7.html441
-rw-r--r--docs/org.eclipse.jst.ws.jaxws.dom.doc.isv/reference/api/index-files/index-8.html424
-rw-r--r--docs/org.eclipse.jst.ws.jaxws.dom.doc.isv/reference/api/index-files/index-9.html141
-rw-r--r--docs/org.eclipse.jst.ws.jaxws.dom.doc.isv/reference/api/index.html39
-rw-r--r--docs/org.eclipse.jst.ws.jaxws.dom.doc.isv/reference/api/org/eclipse/jst/ws/jaxws/dom/runtime/INamedExtensionInfo.html232
-rw-r--r--docs/org.eclipse.jst.ws.jaxws.dom.doc.isv/reference/api/org/eclipse/jst/ws/jaxws/dom/runtime/IPropertyDefaults.html217
-rw-r--r--docs/org.eclipse.jst.ws.jaxws.dom.doc.isv/reference/api/org/eclipse/jst/ws/jaxws/dom/runtime/IPropertyState.html217
-rw-r--r--docs/org.eclipse.jst.ws.jaxws.dom.doc.isv/reference/api/org/eclipse/jst/ws/jaxws/dom/runtime/api/DomFactory.html518
-rw-r--r--docs/org.eclipse.jst.ws.jaxws.dom.doc.isv/reference/api/org/eclipse/jst/ws/jaxws/dom/runtime/api/DomPackage.Literals.html1071
-rw-r--r--docs/org.eclipse.jst.ws.jaxws.dom.doc.isv/reference/api/org/eclipse/jst/ws/jaxws/dom/runtime/api/DomPackage.html2775
-rw-r--r--docs/org.eclipse.jst.ws.jaxws.dom.doc.isv/reference/api/org/eclipse/jst/ws/jaxws/dom/runtime/api/IDOM.html255
-rw-r--r--docs/org.eclipse.jst.ws.jaxws.dom.doc.isv/reference/api/org/eclipse/jst/ws/jaxws/dom/runtime/api/IJavaWebServiceElement.html283
-rw-r--r--docs/org.eclipse.jst.ws.jaxws.dom.doc.isv/reference/api/org/eclipse/jst/ws/jaxws/dom/runtime/api/IServiceEndpointInterface.html524
-rw-r--r--docs/org.eclipse.jst.ws.jaxws.dom.doc.isv/reference/api/org/eclipse/jst/ws/jaxws/dom/runtime/api/IWSDOMRuntimeManager.html278
-rw-r--r--docs/org.eclipse.jst.ws.jaxws.dom.doc.isv/reference/api/org/eclipse/jst/ws/jaxws/dom/runtime/api/IWebMethod.html478
-rw-r--r--docs/org.eclipse.jst.ws.jaxws.dom.doc.isv/reference/api/org/eclipse/jst/ws/jaxws/dom/runtime/api/IWebParam.html468
-rw-r--r--docs/org.eclipse.jst.ws.jaxws.dom.doc.isv/reference/api/org/eclipse/jst/ws/jaxws/dom/runtime/api/IWebService.html388
-rw-r--r--docs/org.eclipse.jst.ws.jaxws.dom.doc.isv/reference/api/org/eclipse/jst/ws/jaxws/dom/runtime/api/IWebServiceProject.html279
-rw-r--r--docs/org.eclipse.jst.ws.jaxws.dom.doc.isv/reference/api/org/eclipse/jst/ws/jaxws/dom/runtime/api/IWebType.html212
-rw-r--r--docs/org.eclipse.jst.ws.jaxws.dom.doc.isv/reference/api/org/eclipse/jst/ws/jaxws/dom/runtime/api/IWsDOMRuntimeExtension.html302
-rw-r--r--docs/org.eclipse.jst.ws.jaxws.dom.doc.isv/reference/api/org/eclipse/jst/ws/jaxws/dom/runtime/api/IWsDomLoadListener.html241
-rw-r--r--docs/org.eclipse.jst.ws.jaxws.dom.doc.isv/reference/api/org/eclipse/jst/ws/jaxws/dom/runtime/api/SOAPBindingParameterStyle.html618
-rw-r--r--docs/org.eclipse.jst.ws.jaxws.dom.doc.isv/reference/api/org/eclipse/jst/ws/jaxws/dom/runtime/api/SOAPBindingStyle.html618
-rw-r--r--docs/org.eclipse.jst.ws.jaxws.dom.doc.isv/reference/api/org/eclipse/jst/ws/jaxws/dom/runtime/api/SOAPBindingUse.html618
-rw-r--r--docs/org.eclipse.jst.ws.jaxws.dom.doc.isv/reference/api/org/eclipse/jst/ws/jaxws/dom/runtime/api/WebParamKind.html648
-rw-r--r--docs/org.eclipse.jst.ws.jaxws.dom.doc.isv/reference/api/org/eclipse/jst/ws/jaxws/dom/runtime/api/WsDOMLoadCanceledException.html289
-rw-r--r--docs/org.eclipse.jst.ws.jaxws.dom.doc.isv/reference/api/org/eclipse/jst/ws/jaxws/dom/runtime/api/WsDOMRuntimeManager.html421
-rw-r--r--docs/org.eclipse.jst.ws.jaxws.dom.doc.isv/reference/api/org/eclipse/jst/ws/jaxws/dom/runtime/api/class-use/DomFactory.html262
-rw-r--r--docs/org.eclipse.jst.ws.jaxws.dom.doc.isv/reference/api/org/eclipse/jst/ws/jaxws/dom/runtime/api/class-use/DomPackage.Literals.html144
-rw-r--r--docs/org.eclipse.jst.ws.jaxws.dom.doc.isv/reference/api/org/eclipse/jst/ws/jaxws/dom/runtime/api/class-use/DomPackage.html235
-rw-r--r--docs/org.eclipse.jst.ws.jaxws.dom.doc.isv/reference/api/org/eclipse/jst/ws/jaxws/dom/runtime/api/class-use/IDOM.html367
-rw-r--r--docs/org.eclipse.jst.ws.jaxws.dom.doc.isv/reference/api/org/eclipse/jst/ws/jaxws/dom/runtime/api/class-use/IJavaWebServiceElement.html287
-rw-r--r--docs/org.eclipse.jst.ws.jaxws.dom.doc.isv/reference/api/org/eclipse/jst/ws/jaxws/dom/runtime/api/class-use/IServiceEndpointInterface.html464
-rw-r--r--docs/org.eclipse.jst.ws.jaxws.dom.doc.isv/reference/api/org/eclipse/jst/ws/jaxws/dom/runtime/api/class-use/IWSDOMRuntimeManager.html196
-rw-r--r--docs/org.eclipse.jst.ws.jaxws.dom.doc.isv/reference/api/org/eclipse/jst/ws/jaxws/dom/runtime/api/class-use/IWebMethod.html457
-rw-r--r--docs/org.eclipse.jst.ws.jaxws.dom.doc.isv/reference/api/org/eclipse/jst/ws/jaxws/dom/runtime/api/class-use/IWebParam.html430
-rw-r--r--docs/org.eclipse.jst.ws.jaxws.dom.doc.isv/reference/api/org/eclipse/jst/ws/jaxws/dom/runtime/api/class-use/IWebService.html473
-rw-r--r--docs/org.eclipse.jst.ws.jaxws.dom.doc.isv/reference/api/org/eclipse/jst/ws/jaxws/dom/runtime/api/class-use/IWebServiceProject.html488
-rw-r--r--docs/org.eclipse.jst.ws.jaxws.dom.doc.isv/reference/api/org/eclipse/jst/ws/jaxws/dom/runtime/api/class-use/IWebType.html209
-rw-r--r--docs/org.eclipse.jst.ws.jaxws.dom.doc.isv/reference/api/org/eclipse/jst/ws/jaxws/dom/runtime/api/class-use/IWsDOMRuntimeExtension.html389
-rw-r--r--docs/org.eclipse.jst.ws.jaxws.dom.doc.isv/reference/api/org/eclipse/jst/ws/jaxws/dom/runtime/api/class-use/IWsDomLoadListener.html270
-rw-r--r--docs/org.eclipse.jst.ws.jaxws.dom.doc.isv/reference/api/org/eclipse/jst/ws/jaxws/dom/runtime/api/class-use/SOAPBindingParameterStyle.html298
-rw-r--r--docs/org.eclipse.jst.ws.jaxws.dom.doc.isv/reference/api/org/eclipse/jst/ws/jaxws/dom/runtime/api/class-use/SOAPBindingStyle.html298
-rw-r--r--docs/org.eclipse.jst.ws.jaxws.dom.doc.isv/reference/api/org/eclipse/jst/ws/jaxws/dom/runtime/api/class-use/SOAPBindingUse.html298
-rw-r--r--docs/org.eclipse.jst.ws.jaxws.dom.doc.isv/reference/api/org/eclipse/jst/ws/jaxws/dom/runtime/api/class-use/WebParamKind.html313
-rw-r--r--docs/org.eclipse.jst.ws.jaxws.dom.doc.isv/reference/api/org/eclipse/jst/ws/jaxws/dom/runtime/api/class-use/WsDOMLoadCanceledException.html290
-rw-r--r--docs/org.eclipse.jst.ws.jaxws.dom.doc.isv/reference/api/org/eclipse/jst/ws/jaxws/dom/runtime/api/class-use/WsDOMRuntimeManager.html144
-rw-r--r--docs/org.eclipse.jst.ws.jaxws.dom.doc.isv/reference/api/org/eclipse/jst/ws/jaxws/dom/runtime/api/package-frame.html97
-rw-r--r--docs/org.eclipse.jst.ws.jaxws.dom.doc.isv/reference/api/org/eclipse/jst/ws/jaxws/dom/runtime/api/package-summary.html274
-rw-r--r--docs/org.eclipse.jst.ws.jaxws.dom.doc.isv/reference/api/org/eclipse/jst/ws/jaxws/dom/runtime/api/package-tree.html192
-rw-r--r--docs/org.eclipse.jst.ws.jaxws.dom.doc.isv/reference/api/org/eclipse/jst/ws/jaxws/dom/runtime/api/package-use.html730
-rw-r--r--docs/org.eclipse.jst.ws.jaxws.dom.doc.isv/reference/api/org/eclipse/jst/ws/jaxws/dom/runtime/class-use/INamedExtensionInfo.html140
-rw-r--r--docs/org.eclipse.jst.ws.jaxws.dom.doc.isv/reference/api/org/eclipse/jst/ws/jaxws/dom/runtime/class-use/IPropertyDefaults.html140
-rw-r--r--docs/org.eclipse.jst.ws.jaxws.dom.doc.isv/reference/api/org/eclipse/jst/ws/jaxws/dom/runtime/class-use/IPropertyState.html140
-rw-r--r--docs/org.eclipse.jst.ws.jaxws.dom.doc.isv/reference/api/org/eclipse/jst/ws/jaxws/dom/runtime/package-frame.html36
-rw-r--r--docs/org.eclipse.jst.ws.jaxws.dom.doc.isv/reference/api/org/eclipse/jst/ws/jaxws/dom/runtime/package-summary.html162
-rw-r--r--docs/org.eclipse.jst.ws.jaxws.dom.doc.isv/reference/api/org/eclipse/jst/ws/jaxws/dom/runtime/package-tree.html147
-rw-r--r--docs/org.eclipse.jst.ws.jaxws.dom.doc.isv/reference/api/org/eclipse/jst/ws/jaxws/dom/runtime/package-use.html140
-rw-r--r--docs/org.eclipse.jst.ws.jaxws.dom.doc.isv/reference/api/overview-frame.html44
-rw-r--r--docs/org.eclipse.jst.ws.jaxws.dom.doc.isv/reference/api/overview-summary.html152
-rw-r--r--docs/org.eclipse.jst.ws.jaxws.dom.doc.isv/reference/api/overview-tree.html217
-rw-r--r--docs/org.eclipse.jst.ws.jaxws.dom.doc.isv/reference/api/package-list2
-rw-r--r--docs/org.eclipse.jst.ws.jaxws.dom.doc.isv/reference/api/resources/inherit.gifbin57 -> 0 bytes-rw-r--r--docs/org.eclipse.jst.ws.jaxws.dom.doc.isv/reference/api/serialized-form.html178
-rw-r--r--docs/org.eclipse.jst.ws.jaxws.dom.doc.isv/reference/api/stylesheet.css29
-rw-r--r--docs/org.eclipse.jst.ws.jaxws.dom.doc.isv/reference/extension-points/index.html18
-rw-r--r--docs/org.eclipse.jst.ws.jaxws.dom.doc.isv/reference/extension-points/org_eclipse_jst_ws_jaxws_dom_runtime_runtimes.html76
-rw-r--r--docs/org.eclipse.jst.ws.jaxws.dom.doc.isv/schema.css71
-rw-r--r--docs/org.eclipse.jst.ws.jaxws.dom.doc.isv/topics_api_reference.xml10
-rw-r--r--docs/org.eclipse.jst.ws.jaxws.dom.doc.isv/topics_extension_points_reference.xml9
-rw-r--r--features/org.eclipse.jst.ws.cxf.feature/.project17
-rw-r--r--features/org.eclipse.jst.ws.cxf.feature/build.properties3
-rw-r--r--features/org.eclipse.jst.ws.cxf.feature/eclipse_update_120.jpgbin21695 -> 0 bytes-rw-r--r--features/org.eclipse.jst.ws.cxf.feature/feature.properties48
-rw-r--r--features/org.eclipse.jst.ws.cxf.feature/feature.xml112
-rw-r--r--features/org.eclipse.jst.ws.cxf.feature/sourceTemplateBundle/about.html28
-rw-r--r--features/org.eclipse.jst.ws.cxf.feature/sourceTemplateBundle/about.ini13
-rw-r--r--features/org.eclipse.jst.ws.cxf.feature/sourceTemplateBundle/about.mappings6
-rw-r--r--features/org.eclipse.jst.ws.cxf.feature/sourceTemplateBundle/about.properties26
-rw-r--r--features/org.eclipse.jst.ws.cxf.feature/sourceTemplateBundle/build.properties2
-rw-r--r--features/org.eclipse.jst.ws.cxf.feature/sourceTemplateBundle/cxf32.gifbin1669 -> 0 bytes-rw-r--r--features/org.eclipse.jst.ws.cxf.feature/sourceTemplateBundle/plugin.properties12
-rw-r--r--features/org.eclipse.jst.ws.cxf.feature/sourceTemplateFeature/build.properties3
-rw-r--r--features/org.eclipse.jst.ws.cxf.feature/sourceTemplateFeature/eclipse_update_120.jpgbin21695 -> 0 bytes-rw-r--r--features/org.eclipse.jst.ws.cxf.feature/sourceTemplateFeature/feature.properties48
-rw-r--r--features/org.eclipse.jst.ws.cxf.feature/sourceTemplatePlugin/about.html28
-rw-r--r--features/org.eclipse.jst.ws.cxf.feature/sourceTemplatePlugin/about.ini13
-rw-r--r--features/org.eclipse.jst.ws.cxf.feature/sourceTemplatePlugin/about.mappings6
-rw-r--r--features/org.eclipse.jst.ws.cxf.feature/sourceTemplatePlugin/about.properties26
-rw-r--r--features/org.eclipse.jst.ws.cxf.feature/sourceTemplatePlugin/build.properties2
-rw-r--r--features/org.eclipse.jst.ws.cxf.feature/sourceTemplatePlugin/cxf32.gifbin1669 -> 0 bytes-rw-r--r--features/org.eclipse.jst.ws.cxf.feature/sourceTemplatePlugin/plugin.properties13
-rw-r--r--features/org.eclipse.jst.ws.cxf_sdk.feature/.project17
-rw-r--r--features/org.eclipse.jst.ws.cxf_sdk.feature/build.properties6
-rw-r--r--features/org.eclipse.jst.ws.cxf_sdk.feature/eclipse_update_120.jpgbin21695 -> 0 bytes-rw-r--r--features/org.eclipse.jst.ws.cxf_sdk.feature/feature.properties48
-rw-r--r--features/org.eclipse.jst.ws.cxf_sdk.feature/feature.xml31
-rw-r--r--features/org.eclipse.jst.ws.cxf_tests.feature/.project17
-rw-r--r--features/org.eclipse.jst.ws.cxf_tests.feature/build.properties3
-rw-r--r--features/org.eclipse.jst.ws.cxf_tests.feature/eclipse_update_120.jpgbin21695 -> 0 bytes-rw-r--r--features/org.eclipse.jst.ws.cxf_tests.feature/feature.properties48
-rw-r--r--features/org.eclipse.jst.ws.cxf_tests.feature/feature.xml29
-rw-r--r--features/org.eclipse.jst.ws.jaxws.assembly.feature/.project17
-rw-r--r--features/org.eclipse.jst.ws.jaxws.assembly.feature/build.properties1
-rw-r--r--features/org.eclipse.jst.ws.jaxws.assembly.feature/feature.xml34
-rw-r--r--features/org.eclipse.jst.ws.jaxws.assembly_sdk.feature/.project17
-rw-r--r--features/org.eclipse.jst.ws.jaxws.assembly_sdk.feature/build.properties1
-rw-r--r--features/org.eclipse.jst.ws.jaxws.assembly_sdk.feature/feature.xml33
-rw-r--r--features/org.eclipse.jst.ws.jaxws.assembly_tests.feature/.project17
-rw-r--r--features/org.eclipse.jst.ws.jaxws.assembly_tests.feature/build.properties1
-rw-r--r--features/org.eclipse.jst.ws.jaxws.assembly_tests.feature/feature.xml33
-rwxr-xr-xfeatures/org.eclipse.jst.ws.jaxws.dom.feature/.project17
-rwxr-xr-xfeatures/org.eclipse.jst.ws.jaxws.dom.feature/build.properties3
-rw-r--r--features/org.eclipse.jst.ws.jaxws.dom.feature/eclipse_update_120.jpgbin21695 -> 0 bytes-rw-r--r--features/org.eclipse.jst.ws.jaxws.dom.feature/feature.properties48
-rwxr-xr-xfeatures/org.eclipse.jst.ws.jaxws.dom.feature/feature.xml79
-rw-r--r--features/org.eclipse.jst.ws.jaxws.dom.feature/sourceTemplateBundle/about.html28
-rw-r--r--features/org.eclipse.jst.ws.jaxws.dom.feature/sourceTemplateBundle/about.ini12
-rw-r--r--features/org.eclipse.jst.ws.jaxws.dom.feature/sourceTemplateBundle/about.mappings6
-rw-r--r--features/org.eclipse.jst.ws.jaxws.dom.feature/sourceTemplateBundle/about.properties26
-rw-r--r--features/org.eclipse.jst.ws.jaxws.dom.feature/sourceTemplateBundle/build.properties2
-rwxr-xr-xfeatures/org.eclipse.jst.ws.jaxws.dom.feature/sourceTemplateBundle/plugin.properties17
-rw-r--r--features/org.eclipse.jst.ws.jaxws.dom.feature/sourceTemplateBundle/wtp_prod32.gifbin1752 -> 0 bytes-rw-r--r--features/org.eclipse.jst.ws.jaxws.dom.feature/sourceTemplateBundle/wtp_prod32.pngbin2672 -> 0 bytes-rwxr-xr-xfeatures/org.eclipse.jst.ws.jaxws.dom.feature/sourceTemplateFeature/build.properties3
-rw-r--r--features/org.eclipse.jst.ws.jaxws.dom.feature/sourceTemplateFeature/eclipse_update_120.jpgbin21695 -> 0 bytes-rw-r--r--features/org.eclipse.jst.ws.jaxws.dom.feature/sourceTemplateFeature/feature.properties48
-rw-r--r--features/org.eclipse.jst.ws.jaxws.dom.feature/sourceTemplatePlugin/about.html28
-rw-r--r--features/org.eclipse.jst.ws.jaxws.dom.feature/sourceTemplatePlugin/about.ini12
-rw-r--r--features/org.eclipse.jst.ws.jaxws.dom.feature/sourceTemplatePlugin/about.mappings6
-rw-r--r--features/org.eclipse.jst.ws.jaxws.dom.feature/sourceTemplatePlugin/about.properties26
-rw-r--r--features/org.eclipse.jst.ws.jaxws.dom.feature/sourceTemplatePlugin/build.properties2
-rwxr-xr-xfeatures/org.eclipse.jst.ws.jaxws.dom.feature/sourceTemplatePlugin/plugin.properties17
-rw-r--r--features/org.eclipse.jst.ws.jaxws.dom.feature/sourceTemplatePlugin/wtp_prod32.gifbin1752 -> 0 bytes-rw-r--r--features/org.eclipse.jst.ws.jaxws.dom.feature/sourceTemplatePlugin/wtp_prod32.pngbin2672 -> 0 bytes-rw-r--r--features/org.eclipse.jst.ws.jaxws.dom_sdk.feature/.project17
-rw-r--r--features/org.eclipse.jst.ws.jaxws.dom_sdk.feature/build.properties5
-rw-r--r--features/org.eclipse.jst.ws.jaxws.dom_sdk.feature/eclipse_update_120.jpgbin21695 -> 0 bytes-rw-r--r--features/org.eclipse.jst.ws.jaxws.dom_sdk.feature/feature.properties48
-rw-r--r--features/org.eclipse.jst.ws.jaxws.dom_sdk.feature/feature.xml38
-rw-r--r--features/org.eclipse.jst.ws.jaxws.dom_tests.feature/.project17
-rw-r--r--features/org.eclipse.jst.ws.jaxws.dom_tests.feature/build.properties3
-rw-r--r--features/org.eclipse.jst.ws.jaxws.dom_tests.feature/eclipse_update_120.jpgbin21695 -> 0 bytes-rw-r--r--features/org.eclipse.jst.ws.jaxws.dom_tests.feature/feature.properties48
-rw-r--r--features/org.eclipse.jst.ws.jaxws.dom_tests.feature/feature.xml65
-rw-r--r--features/org.eclipse.jst.ws.jaxws.feature/.project17
-rw-r--r--features/org.eclipse.jst.ws.jaxws.feature/build.properties3
-rw-r--r--features/org.eclipse.jst.ws.jaxws.feature/eclipse_update_120.jpgbin21695 -> 0 bytes-rw-r--r--features/org.eclipse.jst.ws.jaxws.feature/feature.properties48
-rw-r--r--features/org.eclipse.jst.ws.jaxws.feature/feature.xml94
-rw-r--r--features/org.eclipse.jst.ws.jaxws.feature/sourceTemplateBundle/about.html28
-rw-r--r--features/org.eclipse.jst.ws.jaxws.feature/sourceTemplateBundle/about.ini12
-rw-r--r--features/org.eclipse.jst.ws.jaxws.feature/sourceTemplateBundle/about.mappings6
-rw-r--r--features/org.eclipse.jst.ws.jaxws.feature/sourceTemplateBundle/about.properties26
-rw-r--r--features/org.eclipse.jst.ws.jaxws.feature/sourceTemplateBundle/build.properties2
-rw-r--r--features/org.eclipse.jst.ws.jaxws.feature/sourceTemplateBundle/plugin.properties13
-rw-r--r--features/org.eclipse.jst.ws.jaxws.feature/sourceTemplateBundle/wtp_prod32.gifbin1752 -> 0 bytes-rw-r--r--features/org.eclipse.jst.ws.jaxws.feature/sourceTemplateBundle/wtp_prod32.pngbin2672 -> 0 bytes-rw-r--r--features/org.eclipse.jst.ws.jaxws.feature/sourceTemplateFeature/build.properties3
-rw-r--r--features/org.eclipse.jst.ws.jaxws.feature/sourceTemplateFeature/eclipse_update_120.jpgbin21695 -> 0 bytes-rw-r--r--features/org.eclipse.jst.ws.jaxws.feature/sourceTemplateFeature/feature.properties48
-rw-r--r--features/org.eclipse.jst.ws.jaxws.feature/sourceTemplatePlugin/about.html28
-rw-r--r--features/org.eclipse.jst.ws.jaxws.feature/sourceTemplatePlugin/about.ini12
-rw-r--r--features/org.eclipse.jst.ws.jaxws.feature/sourceTemplatePlugin/about.mappings6
-rw-r--r--features/org.eclipse.jst.ws.jaxws.feature/sourceTemplatePlugin/about.properties26
-rw-r--r--features/org.eclipse.jst.ws.jaxws.feature/sourceTemplatePlugin/build.properties2
-rw-r--r--features/org.eclipse.jst.ws.jaxws.feature/sourceTemplatePlugin/plugin.properties14
-rw-r--r--features/org.eclipse.jst.ws.jaxws.feature/sourceTemplatePlugin/wtp_prod32.gifbin1752 -> 0 bytes-rw-r--r--features/org.eclipse.jst.ws.jaxws.feature/sourceTemplatePlugin/wtp_prod32.pngbin2672 -> 0 bytes-rw-r--r--features/org.eclipse.jst.ws.jaxws_sdk.feature/.project17
-rw-r--r--features/org.eclipse.jst.ws.jaxws_sdk.feature/build.properties5
-rw-r--r--features/org.eclipse.jst.ws.jaxws_sdk.feature/eclipse_update_120.jpgbin21695 -> 0 bytes-rw-r--r--features/org.eclipse.jst.ws.jaxws_sdk.feature/feature.properties48
-rw-r--r--features/org.eclipse.jst.ws.jaxws_sdk.feature/feature.xml38
-rw-r--r--features/org.eclipse.jst.ws.jaxws_tests.feature/.project17
-rw-r--r--features/org.eclipse.jst.ws.jaxws_tests.feature/build.properties3
-rw-r--r--features/org.eclipse.jst.ws.jaxws_tests.feature/eclipse_update_120.jpgbin21695 -> 0 bytes-rw-r--r--features/org.eclipse.jst.ws.jaxws_tests.feature/feature.properties48
-rw-r--r--features/org.eclipse.jst.ws.jaxws_tests.feature/feature.xml37
-rw-r--r--features/org.eclipse.jst.ws.jaxws_userdoc.feature/.project17
-rw-r--r--features/org.eclipse.jst.ws.jaxws_userdoc.feature/build.properties3
-rw-r--r--features/org.eclipse.jst.ws.jaxws_userdoc.feature/eclipse_update_120.jpgbin21695 -> 0 bytes-rw-r--r--features/org.eclipse.jst.ws.jaxws_userdoc.feature/feature.properties48
-rw-r--r--features/org.eclipse.jst.ws.jaxws_userdoc.feature/feature.xml36
-rw-r--r--tests/org.eclipse.jst.ws.cxf.tests/.classpath7
-rw-r--r--tests/org.eclipse.jst.ws.cxf.tests/.cvsignore1
-rw-r--r--tests/org.eclipse.jst.ws.cxf.tests/.project28
-rw-r--r--tests/org.eclipse.jst.ws.cxf.tests/META-INF/MANIFEST.MF16
-rw-r--r--tests/org.eclipse.jst.ws.cxf.tests/about.html34
-rw-r--r--tests/org.eclipse.jst.ws.cxf.tests/build.properties18
-rw-r--r--tests/org.eclipse.jst.ws.cxf.tests/plugin.properties13
-rw-r--r--tests/org.eclipse.jst.ws.cxf.tests/src/org/eclipse/jst/ws/cxf/tests/AllTestsSuite.java52
-rw-r--r--tests/org.eclipse.jst.ws.cxf.tests/src/org/eclipse/jst/ws/cxf/tests/EasyTest.java14
-rw-r--r--tests/org.eclipse.jst.ws.cxf.tests/test.xml138
-rw-r--r--tests/org.eclipse.jst.ws.jaxb.core.tests/.classpath7
-rw-r--r--tests/org.eclipse.jst.ws.jaxb.core.tests/.project28
-rw-r--r--tests/org.eclipse.jst.ws.jaxb.core.tests/.settings/org.eclipse.jdt.core.prefs8
-rw-r--r--tests/org.eclipse.jst.ws.jaxb.core.tests/META-INF/MANIFEST.MF27
-rw-r--r--tests/org.eclipse.jst.ws.jaxb.core.tests/about.html28
-rw-r--r--tests/org.eclipse.jst.ws.jaxb.core.tests/build.properties7
-rw-r--r--tests/org.eclipse.jst.ws.jaxb.core.tests/plugin.properties11
-rw-r--r--tests/org.eclipse.jst.ws.jaxb.core.tests/src/org/eclipse/jst/ws/jaxb/core/tests/AbstractAnnotationTest.java107
-rw-r--r--tests/org.eclipse.jst.ws.jaxb.core.tests/src/org/eclipse/jst/ws/jaxb/core/tests/AddAnnotationToPackageTest.java78
-rw-r--r--tests/org.eclipse.jst.ws.jaxb.core.tests/src/org/eclipse/jst/ws/jaxb/core/tests/JAXBCoreTestSuite.java28
-rw-r--r--tests/org.eclipse.jst.ws.jaxb.core.tests/src/org/eclipse/jst/ws/jaxb/core/tests/RemoveAnnotationFromPackageTest.java65
-rw-r--r--tests/org.eclipse.jst.ws.jaxb.core.tests/src/org/eclipse/jst/ws/jaxb/core/tests/TestJavaProject.java124
-rw-r--r--tests/org.eclipse.jst.ws.jaxb.core.tests/src/org/eclipse/jst/ws/jaxb/core/tests/TestProject.java58
-rw-r--r--tests/org.eclipse.jst.ws.jaxws.core.tests/.classpath7
-rw-r--r--tests/org.eclipse.jst.ws.jaxws.core.tests/.project28
-rw-r--r--tests/org.eclipse.jst.ws.jaxws.core.tests/.settings/org.eclipse.jdt.core.prefs8
-rw-r--r--tests/org.eclipse.jst.ws.jaxws.core.tests/META-INF/MANIFEST.MF25
-rw-r--r--tests/org.eclipse.jst.ws.jaxws.core.tests/about.html28
-rw-r--r--tests/org.eclipse.jst.ws.jaxws.core.tests/build.properties7
-rw-r--r--tests/org.eclipse.jst.ws.jaxws.core.tests/plugin.properties14
-rw-r--r--tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/AbstractAnnotationValidationTest.java27
-rw-r--r--tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/AbstractDocumentBareValidationTest.java68
-rw-r--r--tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/AbstractOnewayValidationTest.java85
-rw-r--r--tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/AbstractSOAPBindingValidationTest.java33
-rw-r--r--tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/AbstractWebMethodPublicStaticFinalRuleTest.java98
-rw-r--r--tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/AbstractWebServicePublicAbstractFinalRuleTest.java101
-rw-r--r--tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/AbstractWebServiceSEIRule.java57
-rw-r--r--tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/DocBareNonVoidNoOutParametersRuleTest.java78
-rw-r--r--tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/DocBareOneNonHeaderINParameterRuleTest.java163
-rw-r--r--tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/DocBareVoidOneINOneOutParameterRuleTest.java123
-rw-r--r--tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/HolderTypeParameterRuleTest.java88
-rw-r--r--tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/JAXWSAnnotationValidationTestSuite.java60
-rw-r--r--tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/OnewayNoCheckedExceptionsRuleTest.java35
-rw-r--r--tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/OnewayNoHolderParametersRuleTest.java37
-rw-r--r--tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/OnewayNoReturnValueRuleTest.java34
-rw-r--r--tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/SOAPBindingDocumentEncodedRuleTest.java95
-rw-r--r--tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/SOAPBindingMixedBindingsRuleTest.java106
-rw-r--r--tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/SOAPBindingRCPBareRuleTest.java92
-rw-r--r--tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/SOAPBindingRPCEncodedRuleTest.java92
-rw-r--r--tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/SOAPBindingRPCStyleOnMethodRuleTest.java96
-rw-r--r--tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/WebMethodCheckForWebServiceRuleTest.java105
-rw-r--r--tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/WebMethodExcludeRuleOnImplTest.java111
-rw-r--r--tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/WebMethodExcludeRuleOnSEITest.java103
-rw-r--r--tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/WebMethodNoFinalModifierRuleTest.java28
-rw-r--r--tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/WebMethodNoPackagePrivateMethodRuleTest.java28
-rw-r--r--tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/WebMethodNoPrivateMethodRuleTest.java28
-rw-r--r--tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/WebMethodNoProtectedMethodRuleTest.java28
-rw-r--r--tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/WebMethodNoStaticModifierRuleTest.java28
-rw-r--r--tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/WebParamModeHolderTypeRuleTest.java106
-rw-r--r--tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/WebServiceDefaultPublicConstructorRuleTest.java109
-rw-r--r--tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/WebServiceNoAbstractModifierRuleTest.java23
-rw-r--r--tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/WebServiceNoFinalModiferRuleTest.java23
-rw-r--r--tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/WebServiceNoFinalizeMethodRuleTest.java108
-rw-r--r--tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/WebServiceSEINoEndpointInterfaceRuleTest.java104
-rw-r--r--tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/WebServiceSEINoOnewayRuleTest.java73
-rw-r--r--tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/WebServiceSEINoPortNameRuleTest.java104
-rw-r--r--tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/WebServiceSEINoSOAPBindingRuleTest.java112
-rw-r--r--tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/WebServiceSEINoServiceNameRuleTest.java104
-rw-r--r--tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/WebServiceSEINoWebMethodRuleTest.java73
-rw-r--r--tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/WebServiceSEINoWebParamRuleTest.java74
-rw-r--r--tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/WebServiceSEINoWebResultRuleTest.java72
-rw-r--r--tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/WebServiceWebServiceProviderCoExistRuleTest.java91
-rw-r--r--tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/tests/AbstractAnnotationTest.java107
-rw-r--r--tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/tests/AddAnnotationToFieldTest.java75
-rw-r--r--tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/tests/AddAnnotationToMethodParameterTest.java79
-rw-r--r--tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/tests/AddAnnotationToMethodTest.java77
-rw-r--r--tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/tests/AddAnnotationToTypeTest.java86
-rw-r--r--tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/tests/AddMemberValuePairToAnnotationTest.java132
-rw-r--r--tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/tests/JAXWSCoreTestSuite.java38
-rw-r--r--tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/tests/RemoveAnnotationFromFieldTest.java71
-rw-r--r--tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/tests/RemoveAnnotationFromMethodParameterTest.java73
-rw-r--r--tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/tests/RemoveAnnotationFromMethodTest.java72
-rw-r--r--tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/tests/RemoveAnnotationFromTypeTest.java69
-rw-r--r--tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/tests/RemoveMemberValuePairTest.java68
-rw-r--r--tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/tests/TestJavaProject.java127
-rw-r--r--tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/tests/TestProject.java61
-rw-r--r--tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/tests/UpdateMemberValuePairTest.java154
-rw-r--r--tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/tests/UpdateSingleMemberAnnotationTest.java70
-rwxr-xr-xtests/org.eclipse.jst.ws.jaxws.dom.integration.tests/.classpath7
-rwxr-xr-xtests/org.eclipse.jst.ws.jaxws.dom.integration.tests/.project28
-rwxr-xr-xtests/org.eclipse.jst.ws.jaxws.dom.integration.tests/.settings/org.eclipse.jdt.core.prefs8
-rwxr-xr-xtests/org.eclipse.jst.ws.jaxws.dom.integration.tests/META-INF/MANIFEST.MF27
-rw-r--r--tests/org.eclipse.jst.ws.jaxws.dom.integration.tests/about.html28
-rwxr-xr-xtests/org.eclipse.jst.ws.jaxws.dom.integration.tests/build.properties16
-rwxr-xr-xtests/org.eclipse.jst.ws.jaxws.dom.integration.tests/plugin.properties13
-rwxr-xr-xtests/org.eclipse.jst.ws.jaxws.dom.integration.tests/src/org/eclipse/jst/ws/jaxws/dom/integration/tests/dom/AllTestsSuite.java36
-rwxr-xr-xtests/org.eclipse.jst.ws.jaxws.dom.integration.tests/src/org/eclipse/jst/ws/jaxws/dom/integration/tests/navigator/DOMAdapterFactoryContentProviderTest.java301
-rwxr-xr-xtests/org.eclipse.jst.ws.jaxws.dom.integration.tests/src/org/eclipse/jst/ws/jaxws/dom/integration/tests/navigator/DOMAdapterFactoryLabelProviderTest.java169
-rwxr-xr-xtests/org.eclipse.jst.ws.jaxws.dom.integration.tests/src/org/eclipse/jst/ws/jaxws/dom/integration/tests/navigator/DOMPropertyViewAdapterFactoryTest.java50
-rwxr-xr-xtests/org.eclipse.jst.ws.jaxws.dom.integration.tests/src/org/eclipse/jst/ws/jaxws/dom/integration/tests/navigator/WebServiceDecoratorTest.java336
-rwxr-xr-xtests/org.eclipse.jst.ws.jaxws.dom.integration.tests/src/org/eclipse/jst/ws/jaxws/dom/integration/tests/navigator/actions/WSActionAbstractTest.java831
-rw-r--r--tests/org.eclipse.jst.ws.jaxws.dom.integration.tests/src/org/eclipse/jst/ws/jaxws/dom/integration/tests/util/LoadingWsProjectNodesCollectorTest.java75
-rwxr-xr-xtests/org.eclipse.jst.ws.jaxws.dom.runtime.tests/.classpath7
-rwxr-xr-xtests/org.eclipse.jst.ws.jaxws.dom.runtime.tests/.project28
-rwxr-xr-xtests/org.eclipse.jst.ws.jaxws.dom.runtime.tests/.settings/org.eclipse.jdt.core.prefs8
-rwxr-xr-xtests/org.eclipse.jst.ws.jaxws.dom.runtime.tests/META-INF/MANIFEST.MF34
-rw-r--r--tests/org.eclipse.jst.ws.jaxws.dom.runtime.tests/about.html28
-rwxr-xr-xtests/org.eclipse.jst.ws.jaxws.dom.runtime.tests/build.properties17
-rwxr-xr-xtests/org.eclipse.jst.ws.jaxws.dom.runtime.tests/plugin.properties13
-rwxr-xr-xtests/org.eclipse.jst.ws.jaxws.dom.runtime.tests/plugin.xml48
-rwxr-xr-xtests/org.eclipse.jst.ws.jaxws.dom.runtime.tests/src/org/eclipse/jst/ws/jaxws/dom/runtime/tests/AllTestsSuite.java132
-rwxr-xr-xtests/org.eclipse.jst.ws.jaxws.dom.runtime.tests/src/org/eclipse/jst/ws/jaxws/dom/runtime/tests/annotations/AnnotationFactoryTest.java303
-rwxr-xr-xtests/org.eclipse.jst.ws.jaxws.dom.runtime.tests/src/org/eclipse/jst/ws/jaxws/dom/runtime/tests/annotations/AnnotationsTest.java237
-rwxr-xr-xtests/org.eclipse.jst.ws.jaxws.dom.runtime.tests/src/org/eclipse/jst/ws/jaxws/dom/runtime/tests/annotations/ArrayValueImplTest.java75
-rwxr-xr-xtests/org.eclipse.jst.ws.jaxws.dom.runtime.tests/src/org/eclipse/jst/ws/jaxws/dom/runtime/tests/annotations/ComplexAnnotationImplTest.java55
-rwxr-xr-xtests/org.eclipse.jst.ws.jaxws.dom.runtime.tests/src/org/eclipse/jst/ws/jaxws/dom/runtime/tests/annotations/Endpoint.src15
-rwxr-xr-xtests/org.eclipse.jst.ws.jaxws.dom.runtime.tests/src/org/eclipse/jst/ws/jaxws/dom/runtime/tests/annotations/ParamValuePairImplTest.java49
-rwxr-xr-xtests/org.eclipse.jst.ws.jaxws.dom.runtime.tests/src/org/eclipse/jst/ws/jaxws/dom/runtime/tests/annotations/QualifiedNameValueImplTest.java40
-rwxr-xr-xtests/org.eclipse.jst.ws.jaxws.dom.runtime.tests/src/org/eclipse/jst/ws/jaxws/dom/runtime/tests/dom/TestWsDOMRuntimeExtension.java58
-rwxr-xr-xtests/org.eclipse.jst.ws.jaxws.dom.runtime.tests/src/org/eclipse/jst/ws/jaxws/dom/runtime/tests/dom/WsDOMRuntimeManagerTest.java107
-rwxr-xr-xtests/org.eclipse.jst.ws.jaxws.dom.runtime.tests/src/org/eclipse/jst/ws/jaxws/dom/runtime/tests/dom/WsDOMRuntimeRegistryTest.java146
-rwxr-xr-xtests/org.eclipse.jst.ws.jaxws.dom.runtime.tests/src/org/eclipse/jst/ws/jaxws/dom/runtime/tests/dom/persistence/CompilationUnitFinderContractTest.java183
-rwxr-xr-xtests/org.eclipse.jst.ws.jaxws.dom.runtime.tests/src/org/eclipse/jst/ws/jaxws/dom/runtime/tests/dom/persistence/DomTestUtils.java72
-rwxr-xr-xtests/org.eclipse.jst.ws.jaxws.dom.runtime.tests/src/org/eclipse/jst/ws/jaxws/dom/runtime/tests/dom/persistence/JaxWsDefaultsCalculatorTest.java165
-rwxr-xr-xtests/org.eclipse.jst.ws.jaxws.dom.runtime.tests/src/org/eclipse/jst/ws/jaxws/dom/runtime/tests/dom/persistence/JaxWsWorkspaceResourceTests.java144
-rwxr-xr-xtests/org.eclipse.jst.ws.jaxws.dom.runtime.tests/src/org/eclipse/jst/ws/jaxws/dom/runtime/tests/dom/persistence/Jee5WsDomRuntimeExtensionTest.java154
-rwxr-xr-xtests/org.eclipse.jst.ws.jaxws.dom.runtime.tests/src/org/eclipse/jst/ws/jaxws/dom/runtime/tests/dom/persistence/ProjectAddingTests.java95
-rwxr-xr-xtests/org.eclipse.jst.ws.jaxws.dom.runtime.tests/src/org/eclipse/jst/ws/jaxws/dom/runtime/tests/dom/persistence/WorkspaceCUFinderTest.java92
-rwxr-xr-xtests/org.eclipse.jst.ws.jaxws.dom.runtime.tests/src/org/eclipse/jst/ws/jaxws/dom/runtime/tests/dom/persistence/annotation/AnnotationAdapterFactoryTest.java39
-rwxr-xr-xtests/org.eclipse.jst.ws.jaxws.dom.runtime.tests/src/org/eclipse/jst/ws/jaxws/dom/runtime/tests/dom/persistence/annotation/impl/AbstractLocatorsTest.java67
-rwxr-xr-xtests/org.eclipse.jst.ws.jaxws.dom.runtime.tests/src/org/eclipse/jst/ws/jaxws/dom/runtime/tests/dom/persistence/annotation/impl/AnnotationAdapterTest.java57
-rwxr-xr-xtests/org.eclipse.jst.ws.jaxws.dom.runtime.tests/src/org/eclipse/jst/ws/jaxws/dom/runtime/tests/dom/persistence/defaults/MethodPropertyDefaultsAdapterTest.java51
-rwxr-xr-xtests/org.eclipse.jst.ws.jaxws.dom.runtime.tests/src/org/eclipse/jst/ws/jaxws/dom/runtime/tests/dom/persistence/defaults/ParameterPropertyDefaultsAdapterTest.java112
-rwxr-xr-xtests/org.eclipse.jst.ws.jaxws.dom.runtime.tests/src/org/eclipse/jst/ws/jaxws/dom/runtime/tests/dom/persistence/defaults/SeiPropertyDefaultsAdapterTest.java57
-rwxr-xr-xtests/org.eclipse.jst.ws.jaxws.dom.runtime.tests/src/org/eclipse/jst/ws/jaxws/dom/runtime/tests/dom/persistence/defaults/WsPropertyDefaultsAdapterTest.java62
-rw-r--r--tests/org.eclipse.jst.ws.jaxws.dom.runtime.tests/src/org/eclipse/jst/ws/jaxws/dom/runtime/tests/dom/persistence/load/WsDomObtainerTest.java194
-rwxr-xr-xtests/org.eclipse.jst.ws.jaxws.dom.runtime.tests/src/org/eclipse/jst/ws/jaxws/dom/runtime/tests/dom/persistence/serializer/AbstractSerializerAdapterTest.java310
-rwxr-xr-xtests/org.eclipse.jst.ws.jaxws.dom.runtime.tests/src/org/eclipse/jst/ws/jaxws/dom/runtime/tests/dom/persistence/serializer/MethodSerializerAdapterTest.java94
-rwxr-xr-xtests/org.eclipse.jst.ws.jaxws.dom.runtime.tests/src/org/eclipse/jst/ws/jaxws/dom/runtime/tests/dom/persistence/serializer/ParameterSerializerAdapterTest.java221
-rwxr-xr-xtests/org.eclipse.jst.ws.jaxws.dom.runtime.tests/src/org/eclipse/jst/ws/jaxws/dom/runtime/tests/dom/persistence/serializer/SeiSerializerAdapterTest.java98
-rwxr-xr-xtests/org.eclipse.jst.ws.jaxws.dom.runtime.tests/src/org/eclipse/jst/ws/jaxws/dom/runtime/tests/dom/persistence/serializer/SerializerAdapterFactoryTest.java72
-rwxr-xr-xtests/org.eclipse.jst.ws.jaxws.dom.runtime.tests/src/org/eclipse/jst/ws/jaxws/dom/runtime/tests/dom/persistence/serializer/SerializerAdapterTestFixture.java99
-rwxr-xr-xtests/org.eclipse.jst.ws.jaxws.dom.runtime.tests/src/org/eclipse/jst/ws/jaxws/dom/runtime/tests/dom/persistence/serializer/WsSerializerAdapterTest.java140
-rwxr-xr-xtests/org.eclipse.jst.ws.jaxws.dom.runtime.tests/src/org/eclipse/jst/ws/jaxws/dom/runtime/tests/dom/persistence/state/MethodPropertyStateAdapterTest.java65
-rwxr-xr-xtests/org.eclipse.jst.ws.jaxws.dom.runtime.tests/src/org/eclipse/jst/ws/jaxws/dom/runtime/tests/dom/persistence/state/ParameterPropertyStateAdapterTest.java160
-rwxr-xr-xtests/org.eclipse.jst.ws.jaxws.dom.runtime.tests/src/org/eclipse/jst/ws/jaxws/dom/runtime/tests/dom/persistence/state/PropertyStateAdapterFactoryTest.java68
-rwxr-xr-xtests/org.eclipse.jst.ws.jaxws.dom.runtime.tests/src/org/eclipse/jst/ws/jaxws/dom/runtime/tests/dom/persistence/state/SeiPropertyStateAdapterTest.java71
-rwxr-xr-xtests/org.eclipse.jst.ws.jaxws.dom.runtime.tests/src/org/eclipse/jst/ws/jaxws/dom/runtime/tests/dom/persistence/state/WsPropertyStateAdapterTest.java74
-rwxr-xr-xtests/org.eclipse.jst.ws.jaxws.dom.runtime.tests/src/org/eclipse/jst/ws/jaxws/dom/runtime/tests/dom/persistence/sync/AbstractModelSynchronizerTest.java73
-rwxr-xr-xtests/org.eclipse.jst.ws.jaxws.dom.runtime.tests/src/org/eclipse/jst/ws/jaxws/dom/runtime/tests/dom/persistence/sync/ImplicitSeiMethodSynchronizationTests.java213
-rwxr-xr-xtests/org.eclipse.jst.ws.jaxws.dom.runtime.tests/src/org/eclipse/jst/ws/jaxws/dom/runtime/tests/dom/persistence/sync/MethodParamsSynchronizationTests.java375
-rwxr-xr-xtests/org.eclipse.jst.ws.jaxws.dom.runtime.tests/src/org/eclipse/jst/ws/jaxws/dom/runtime/tests/dom/persistence/sync/ModelSynchronizationTests.java608
-rwxr-xr-xtests/org.eclipse.jst.ws.jaxws.dom.runtime.tests/src/org/eclipse/jst/ws/jaxws/dom/runtime/tests/dom/persistence/sync/OnEventModelSyncronizerTest.java110
-rwxr-xr-xtests/org.eclipse.jst.ws.jaxws.dom.runtime.tests/src/org/eclipse/jst/ws/jaxws/dom/runtime/tests/dom/persistence/sync/SeiMethodSyncronizationTest.java297
-rw-r--r--tests/org.eclipse.jst.ws.jaxws.dom.runtime.tests/src/org/eclipse/jst/ws/jaxws/dom/runtime/tests/dom/persistence/sync/SeiSynchronizerTest.java44
-rwxr-xr-xtests/org.eclipse.jst.ws.jaxws.dom.runtime.tests/src/org/eclipse/jst/ws/jaxws/dom/runtime/tests/dom/persistence/sync/SeiSyncronizationTest.java92
-rwxr-xr-xtests/org.eclipse.jst.ws.jaxws.dom.runtime.tests/src/org/eclipse/jst/ws/jaxws/dom/runtime/tests/dom/persistence/sync/SynchronizationTestFixture.java165
-rwxr-xr-xtests/org.eclipse.jst.ws.jaxws.dom.runtime.tests/src/org/eclipse/jst/ws/jaxws/dom/runtime/tests/dom/persistence/sync/WsSynchronizationTest.java130
-rw-r--r--tests/org.eclipse.jst.ws.jaxws.dom.runtime.tests/src/org/eclipse/jst/ws/jaxws/dom/runtime/tests/dom/persistence/sync/WsSynchronizerTest.java28
-rwxr-xr-xtests/org.eclipse.jst.ws.jaxws.dom.runtime.tests/src/org/eclipse/jst/ws/jaxws/dom/runtime/tests/dom/util/Dom2ResourceMapperTest.java141
-rwxr-xr-xtests/org.eclipse.jst.ws.jaxws.dom.runtime.tests/src/org/eclipse/jst/ws/jaxws/dom/runtime/tests/dom/util/DomUtilTest.java72
-rwxr-xr-xtests/org.eclipse.jst.ws.jaxws.dom.runtime.tests/src/org/eclipse/jst/ws/jaxws/dom/runtime/tests/dom/validation/EndpointIsSessionBeanRuleTest.java148
-rwxr-xr-xtests/org.eclipse.jst.ws.jaxws.dom.runtime.tests/src/org/eclipse/jst/ws/jaxws/dom/runtime/tests/dom/validation/SeiValidationTest.java116
-rwxr-xr-xtests/org.eclipse.jst.ws.jaxws.dom.runtime.tests/src/org/eclipse/jst/ws/jaxws/dom/runtime/tests/dom/validation/ValidationTestsSetUp.java282
-rwxr-xr-xtests/org.eclipse.jst.ws.jaxws.dom.runtime.tests/src/org/eclipse/jst/ws/jaxws/dom/runtime/tests/dom/validation/WmValidationTest.java150
-rwxr-xr-xtests/org.eclipse.jst.ws.jaxws.dom.runtime.tests/src/org/eclipse/jst/ws/jaxws/dom/runtime/tests/dom/validation/WpValidationTest.java118
-rwxr-xr-xtests/org.eclipse.jst.ws.jaxws.dom.runtime.tests/src/org/eclipse/jst/ws/jaxws/dom/runtime/tests/dom/validation/WsValidationTest.java189
-rwxr-xr-xtests/org.eclipse.jst.ws.jaxws.dom.ui.tests/.classpath7
-rwxr-xr-xtests/org.eclipse.jst.ws.jaxws.dom.ui.tests/.project28
-rwxr-xr-xtests/org.eclipse.jst.ws.jaxws.dom.ui.tests/.settings/org.eclipse.jdt.core.prefs8
-rwxr-xr-xtests/org.eclipse.jst.ws.jaxws.dom.ui.tests/META-INF/MANIFEST.MF15
-rw-r--r--tests/org.eclipse.jst.ws.jaxws.dom.ui.tests/about.html28
-rwxr-xr-xtests/org.eclipse.jst.ws.jaxws.dom.ui.tests/build.properties16
-rwxr-xr-xtests/org.eclipse.jst.ws.jaxws.dom.ui.tests/plugin.properties13
-rwxr-xr-xtests/org.eclipse.jst.ws.jaxws.dom.ui.tests/src/org/eclipse/jst/ws/jaxws/dom/ui/tests/AllTestsSuite.java30
-rwxr-xr-xtests/org.eclipse.jst.ws.jaxws.dom.ui.tests/src/org/eclipse/jst/ws/jaxws/dom/ui/tests/internal/AllDomItemProviderTest.java265
-rwxr-xr-xtests/org.eclipse.jst.ws.jaxws.dom.ui.tests/src/org/eclipse/jst/ws/jaxws/dom/ui/tests/internal/DOMItemPropertyProviderTest.java52
-rwxr-xr-xtests/org.eclipse.jst.ws.jaxws.testutils/.classpath7
-rwxr-xr-xtests/org.eclipse.jst.ws.jaxws.testutils/.project28
-rwxr-xr-xtests/org.eclipse.jst.ws.jaxws.testutils/.settings/org.eclipse.jdt.core.prefs8
-rwxr-xr-xtests/org.eclipse.jst.ws.jaxws.testutils/META-INF/MANIFEST.MF28
-rw-r--r--tests/org.eclipse.jst.ws.jaxws.testutils/about.html28
-rwxr-xr-xtests/org.eclipse.jst.ws.jaxws.testutils/build.properties16
-rwxr-xr-xtests/org.eclipse.jst.ws.jaxws.testutils/plugin.properties13
-rwxr-xr-xtests/org.eclipse.jst.ws.jaxws.testutils/src/org/eclipse/jst/ws/jaxws/testutils/IWaitCondition.java27
-rwxr-xr-xtests/org.eclipse.jst.ws.jaxws.testutils/src/org/eclipse/jst/ws/jaxws/testutils/assertions/Assertions.java120
-rwxr-xr-xtests/org.eclipse.jst.ws.jaxws.testutils/src/org/eclipse/jst/ws/jaxws/testutils/assertions/ConditionCheckException.java34
-rw-r--r--tests/org.eclipse.jst.ws.jaxws.testutils/src/org/eclipse/jst/ws/jaxws/testutils/dom/WaitingDomUtil.java51
-rwxr-xr-xtests/org.eclipse.jst.ws.jaxws.testutils/src/org/eclipse/jst/ws/jaxws/testutils/files/TestFileUtils.java517
-rwxr-xr-xtests/org.eclipse.jst.ws.jaxws.testutils/src/org/eclipse/jst/ws/jaxws/testutils/files/Unzipper.java146
-rwxr-xr-xtests/org.eclipse.jst.ws.jaxws.testutils/src/org/eclipse/jst/ws/jaxws/testutils/jmock/AbstractDynamicMock.java45
-rwxr-xr-xtests/org.eclipse.jst.ws.jaxws.testutils/src/org/eclipse/jst/ws/jaxws/testutils/jmock/AbstractMockObjectTestCase.java225
-rwxr-xr-xtests/org.eclipse.jst.ws.jaxws.testutils/src/org/eclipse/jst/ws/jaxws/testutils/jmock/Mock.java72
-rwxr-xr-xtests/org.eclipse.jst.ws.jaxws.testutils/src/org/eclipse/jst/ws/jaxws/testutils/jmock/MockObjectTestCase.java106
-rwxr-xr-xtests/org.eclipse.jst.ws.jaxws.testutils/src/org/eclipse/jst/ws/jaxws/testutils/jmock/StubUtils.java105
-rwxr-xr-xtests/org.eclipse.jst.ws.jaxws.testutils/src/org/eclipse/jst/ws/jaxws/testutils/jmock/testcases/BeforeAfterEnabler.java109
-rwxr-xr-xtests/org.eclipse.jst.ws.jaxws.testutils/src/org/eclipse/jst/ws/jaxws/testutils/jmock/testcases/BeforeAfterTestCase.java27
-rwxr-xr-xtests/org.eclipse.jst.ws.jaxws.testutils/src/org/eclipse/jst/ws/jaxws/testutils/jmock/testcases/EqualsTestCase.java333
-rwxr-xr-xtests/org.eclipse.jst.ws.jaxws.testutils/src/org/eclipse/jst/ws/jaxws/testutils/jmock/testcases/IBeforeAfterEnabled.java22
-rwxr-xr-xtests/org.eclipse.jst.ws.jaxws.testutils/src/org/eclipse/jst/ws/jaxws/testutils/jobs/JobUtils.java248
-rwxr-xr-xtests/org.eclipse.jst.ws.jaxws.testutils/src/org/eclipse/jst/ws/jaxws/testutils/project/ClassLoadingTest.java153
-rwxr-xr-xtests/org.eclipse.jst.ws.jaxws.testutils/src/org/eclipse/jst/ws/jaxws/testutils/project/ProjectBasedTest.java71
-rwxr-xr-xtests/org.eclipse.jst.ws.jaxws.testutils/src/org/eclipse/jst/ws/jaxws/testutils/project/TestEjb3Project.java149
-rwxr-xr-xtests/org.eclipse.jst.ws.jaxws.testutils/src/org/eclipse/jst/ws/jaxws/testutils/project/TestProject.java488
-rwxr-xr-xtests/org.eclipse.jst.ws.jaxws.testutils/src/org/eclipse/jst/ws/jaxws/testutils/project/TestProjectsUtils.java365
-rwxr-xr-xtests/org.eclipse.jst.ws.jaxws.testutils/src/org/eclipse/jst/ws/jaxws/testutils/threading/TestContext.java104
-rwxr-xr-xtests/org.eclipse.jst.ws.jaxws.testutils/src/org/eclipse/jst/ws/jaxws/testutils/threading/TestContextThread.java139
-rwxr-xr-xtests/org.eclipse.jst.ws.jaxws.utils.tests/.classpath7
-rwxr-xr-xtests/org.eclipse.jst.ws.jaxws.utils.tests/.project28
-rwxr-xr-xtests/org.eclipse.jst.ws.jaxws.utils.tests/.settings/org.eclipse.jdt.core.prefs8
-rwxr-xr-xtests/org.eclipse.jst.ws.jaxws.utils.tests/META-INF/MANIFEST.MF22
-rw-r--r--tests/org.eclipse.jst.ws.jaxws.utils.tests/about.html28
-rwxr-xr-xtests/org.eclipse.jst.ws.jaxws.utils.tests/build.properties16
-rwxr-xr-xtests/org.eclipse.jst.ws.jaxws.utils.tests/plugin.properties13
-rwxr-xr-xtests/org.eclipse.jst.ws.jaxws.utils.tests/src/org/eclipse/jst/ws/jaxws/utils/resources/StringInputStreamAdapterTest.java57
-rwxr-xr-xtests/org.eclipse.jst.ws.jaxws.utils.tests/src/org/eclipse/jst/ws/jaxws/utils/tests/AllTestsSuite.java66
-rwxr-xr-xtests/org.eclipse.jst.ws.jaxws.utils.tests/src/org/eclipse/jst/ws/jaxws/utils/tests/internal/FileUtilsUnitTest.java139
-rwxr-xr-xtests/org.eclipse.jst.ws.jaxws.utils.tests/src/org/eclipse/jst/ws/jaxws/utils/tests/internal/JaxWsUtilsTest.java79
-rwxr-xr-xtests/org.eclipse.jst.ws.jaxws.utils.tests/src/org/eclipse/jst/ws/jaxws/utils/tests/internal/annotations/AnnotationFactoryTest.java386
-rwxr-xr-xtests/org.eclipse.jst.ws.jaxws.utils.tests/src/org/eclipse/jst/ws/jaxws/utils/tests/internal/annotations/AnnotationInspectorImplTest.java239
-rwxr-xr-xtests/org.eclipse.jst.ws.jaxws.utils.tests/src/org/eclipse/jst/ws/jaxws/utils/tests/internal/annotations/AnnotationPropertyContainerTest.java365
-rwxr-xr-xtests/org.eclipse.jst.ws.jaxws.utils.tests/src/org/eclipse/jst/ws/jaxws/utils/tests/internal/annotations/AnnotationUtilsTest.java58
-rwxr-xr-xtests/org.eclipse.jst.ws.jaxws.utils.tests/src/org/eclipse/jst/ws/jaxws/utils/tests/internal/annotations/AnnotationsBaseImplTest.java570
-rwxr-xr-xtests/org.eclipse.jst.ws.jaxws.utils.tests/src/org/eclipse/jst/ws/jaxws/utils/tests/internal/annotations/AnnotationsTest.java237
-rwxr-xr-xtests/org.eclipse.jst.ws.jaxws.utils.tests/src/org/eclipse/jst/ws/jaxws/utils/tests/internal/annotations/ArrayValueImplTest.java125
-rwxr-xr-xtests/org.eclipse.jst.ws.jaxws.utils.tests/src/org/eclipse/jst/ws/jaxws/utils/tests/internal/annotations/BooleanValueImplTest.java95
-rwxr-xr-xtests/org.eclipse.jst.ws.jaxws.utils.tests/src/org/eclipse/jst/ws/jaxws/utils/tests/internal/annotations/ClassValueImplTest.java82
-rwxr-xr-xtests/org.eclipse.jst.ws.jaxws.utils.tests/src/org/eclipse/jst/ws/jaxws/utils/tests/internal/annotations/ComplexAnnotationImplTest.java55
-rwxr-xr-xtests/org.eclipse.jst.ws.jaxws.utils.tests/src/org/eclipse/jst/ws/jaxws/utils/tests/internal/annotations/Endpoint.src15
-rwxr-xr-xtests/org.eclipse.jst.ws.jaxws.utils.tests/src/org/eclipse/jst/ws/jaxws/utils/tests/internal/annotations/EndpointAnnInspector.src22
-rwxr-xr-xtests/org.eclipse.jst.ws.jaxws.utils.tests/src/org/eclipse/jst/ws/jaxws/utils/tests/internal/annotations/IntegerValueImplTest.java82
-rwxr-xr-xtests/org.eclipse.jst.ws.jaxws.utils.tests/src/org/eclipse/jst/ws/jaxws/utils/tests/internal/annotations/ParamValuePairImplTest.java53
-rwxr-xr-xtests/org.eclipse.jst.ws.jaxws.utils.tests/src/org/eclipse/jst/ws/jaxws/utils/tests/internal/annotations/QualifiedNameValueImplTest.java41
-rwxr-xr-xtests/org.eclipse.jst.ws.jaxws.utils.tests/src/org/eclipse/jst/ws/jaxws/utils/tests/internal/annotations/StringValueImplTest.java82
-rwxr-xr-xtests/org.eclipse.jst.ws.jaxws.utils.tests/src/org/eclipse/jst/ws/jaxws/utils/tests/internal/clazz/ASTUtilsTest.java175
-rwxr-xr-xtests/org.eclipse.jst.ws.jaxws.utils.tests/src/org/eclipse/jst/ws/jaxws/utils/tests/internal/mock/EndpointFormat.src1
-rw-r--r--tests/org.eclipse.jst.ws.jaxws.utils.tests/src/org/eclipse/jst/ws/jaxws/utils/tests/internal/operation/OperationInJobRunnerTest.java156
-rwxr-xr-xtests/org.jmock/.classpath7
-rwxr-xr-xtests/org.jmock/.project28
-rwxr-xr-xtests/org.jmock/.settings/org.eclipse.jdt.core.prefs8
-rwxr-xr-xtests/org.jmock/META-INF/MANIFEST.MF19
-rw-r--r--tests/org.jmock/about.html28
-rwxr-xr-xtests/org.jmock/build.properties4
-rwxr-xr-xtests/org.jmock/lib/jmock-core-1.2.0.jarbin172657 -> 0 bytes
1032 files changed, 0 insertions, 112985 deletions
diff --git a/bundles/org.eclipse.jst.ws.annotations.core/.classpath b/bundles/org.eclipse.jst.ws.annotations.core/.classpath
deleted file mode 100644
index f930cb7..0000000
--- a/bundles/org.eclipse.jst.ws.annotations.core/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/bundles/org.eclipse.jst.ws.annotations.core/.project b/bundles/org.eclipse.jst.ws.annotations.core/.project
deleted file mode 100644
index 133e566..0000000
--- a/bundles/org.eclipse.jst.ws.annotations.core/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.jst.ws.annotations.core</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
diff --git a/bundles/org.eclipse.jst.ws.annotations.core/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.jst.ws.annotations.core/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 6ee33b2..0000000
--- a/bundles/org.eclipse.jst.ws.annotations.core/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,7 +0,0 @@
-#Mon Mar 09 20:36:45 GMT 2009
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.5
diff --git a/bundles/org.eclipse.jst.ws.annotations.core/META-INF/MANIFEST.MF b/bundles/org.eclipse.jst.ws.annotations.core/META-INF/MANIFEST.MF
deleted file mode 100644
index 4cba698..0000000
--- a/bundles/org.eclipse.jst.ws.annotations.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.annotations.core;singleton:=true
-Bundle-Version: 1.1.0.qualifier
-Bundle-Localization: plugin
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Bundle-Vendor: %pluginProvider
-Eclipse-BuddyPolicy: registered
-Require-Bundle: org.eclipse.jdt.core;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.jface.text;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.core.resources;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.jdt.apt.core;bundle-version="[3.3.100,4.0.0)",
- org.eclipse.jdt.ui;bundle-version="[3.4.0,4.0.0)"
-Export-Package: org.eclipse.jst.ws.annotations.core,
- org.eclipse.jst.ws.annotations.core.initialization,
- org.eclipse.jst.ws.annotations.core.processor,
- org.eclipse.jst.ws.annotations.core.utils,
- org.eclipse.jst.ws.internal.annotations.core.utils;x-friends:="org.eclipse.jst.ws.jaxws.ui"
-Bundle-Activator: org.eclipse.jst.ws.annotations.core.AnnotationsCorePlugin
-Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.jst.ws.annotations.core/about.html b/bundles/org.eclipse.jst.ws.annotations.core/about.html
deleted file mode 100644
index 5b6a031..0000000
--- a/bundles/org.eclipse.jst.ws.annotations.core/about.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
-<title>About</title>
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
-
-<p>February 19, 2009</p>
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;). Unless otherwise
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;). 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, &quot;Program&quot; 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 (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content. Check the Redistributor's license that was
-provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
-
-</body>
-</html>
diff --git a/bundles/org.eclipse.jst.ws.annotations.core/build.properties b/bundles/org.eclipse.jst.ws.annotations.core/build.properties
deleted file mode 100644
index 921a77d..0000000
--- a/bundles/org.eclipse.jst.ws.annotations.core/build.properties
+++ /dev/null
@@ -1,8 +0,0 @@
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
- .,\
- plugin.xml,\
- schema/,\
- plugin.properties,\
- about.html
diff --git a/bundles/org.eclipse.jst.ws.annotations.core/plugin.properties b/bundles/org.eclipse.jst.ws.annotations.core/plugin.properties
deleted file mode 100644
index 278e1e8..0000000
--- a/bundles/org.eclipse.jst.ws.annotations.core/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 Annotations Core
-pluginName= Annotations Core
-pluginProvider=Eclipse Web Tools Platform
diff --git a/bundles/org.eclipse.jst.ws.annotations.core/plugin.xml b/bundles/org.eclipse.jst.ws.annotations.core/plugin.xml
deleted file mode 100644
index ac23fee..0000000
--- a/bundles/org.eclipse.jst.ws.annotations.core/plugin.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.2"?>
-<plugin>
- <extension-point id="annotationCategory" name="Annotation Category" schema="schema/annotationCategory.exsd"/>
- <extension-point id="annotationDefinition" name="Annotation Definition" schema="schema/annotationDefinition.exsd"/>
- <extension-point id="annotationInitializer" name="Annotation Initializer" schema="schema/annotationInitializer.exsd"/>
- <extension-point id="annotationProcessor" name="Annotation Processor" schema="schema/annotationProcessor.exsd"/>
-
- <extension point="org.eclipse.jdt.apt.core.annotationProcessorFactory">
- <factories enableDefault="true">
- <factory
- class="org.eclipse.jst.ws.internal.annotations.core.processor.AnnotationsCoreProcessorFactory">
- </factory>
- </factories>
- </extension>
-
-</plugin>
diff --git a/bundles/org.eclipse.jst.ws.annotations.core/schema/annotationCategory.exsd b/bundles/org.eclipse.jst.ws.annotations.core/schema/annotationCategory.exsd
deleted file mode 100644
index 366152d..0000000
--- a/bundles/org.eclipse.jst.ws.annotations.core/schema/annotationCategory.exsd
+++ /dev/null
@@ -1,115 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.jst.ws.annotations.core" xmlns="http://www.w3.org/2001/XMLSchema">
-<annotation>
- <appInfo>
- <meta.schema plugin="org.eclipse.jst.ws.annotations.core" id="annotationCategory" name="Annotation Category"/>
- </appInfo>
- <documentation>
- This extension point is used to contribute an annotation category.
- </documentation>
- </annotation>
-
- <element name="extension">
- <annotation>
- <appInfo>
- <meta.element />
- </appInfo>
- </annotation>
- <complexType>
- <sequence>
- <element ref="category" minOccurs="0" maxOccurs="unbounded"/>
- </sequence>
- <attribute name="point" type="string" use="required">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- <attribute name="id" type="string">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- <attribute name="name" type="string">
- <annotation>
- <documentation>
-
- </documentation>
- <appInfo>
- <meta.attribute translatable="true"/>
- </appInfo>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <element name="category">
- <annotation>
- <documentation>
- An annotation category contribution defines categories of annotations used to group them in the UI.
- </documentation>
- </annotation>
- <complexType>
- <attribute name="id" type="string" use="required">
- <annotation>
- <documentation>
- a unique identifier for the annotation category.
- </documentation>
- </annotation>
- </attribute>
- <attribute name="name" type="string" use="required">
- <annotation>
- <documentation>
- A uniqure annotation cateogory name.
- </documentation>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <annotation>
- <appInfo>
- <meta.section type="since"/>
- </appInfo>
- <documentation>
- 1.0
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="examples"/>
- </appInfo>
- <documentation>
- The following is an example of an annotation category contribution:
-
-&lt;p&gt;
-&lt;pre&gt;
- &lt;extension point=&quot;org.eclipse.jst.ws.annotations.core.annotationCategory&quot;&gt;
- &lt;category
- id=&quot;jaxws.category&quot;
- name=&quot;JAX-WS&quot;&gt;
- &lt;/category&gt;
- &lt;/extension&gt;
-&lt;/pre&gt;
-&lt;/p&gt;
- </documentation>
- </annotation>
-
-
-
- <annotation>
- <appInfo>
- <meta.section type="copyright"/>
- </appInfo>
- <documentation>
- Copyright (c) 2009 Shane Clarke. &lt;br&gt;
-All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at &lt;ahref=&quot;http://www.eclipse.org/legal/epl-v10.html&quot;&gt;http://www.eclipse.org/legal/epl-v10.html&lt;/a&gt;
- </documentation>
- </annotation>
-
-</schema>
diff --git a/bundles/org.eclipse.jst.ws.annotations.core/schema/annotationDefinition.exsd b/bundles/org.eclipse.jst.ws.annotations.core/schema/annotationDefinition.exsd
deleted file mode 100644
index 7aa03d5..0000000
--- a/bundles/org.eclipse.jst.ws.annotations.core/schema/annotationDefinition.exsd
+++ /dev/null
@@ -1,179 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.jst.ws.annotations.core" xmlns="http://www.w3.org/2001/XMLSchema">
-<annotation>
- <appInfo>
- <meta.schema plugin="org.eclipse.jst.ws.annotations.core" id="annotationDefinition" name="Annotation Definition"/>
- </appInfo>
- <documentation>
- This extension point allows clients to contribute annotations &lt;? extends java.lang.annotation.Annotation&gt; which are in turn consumed by the UI.
- </documentation>
- </annotation>
-
- <element name="extension">
- <annotation>
- <appInfo>
- <meta.element />
- </appInfo>
- </annotation>
- <complexType>
- <sequence>
- <element ref="annotation" minOccurs="0" maxOccurs="unbounded"/>
- </sequence>
- <attribute name="point" type="string" use="required">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- <attribute name="id" type="string">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- <attribute name="name" type="string">
- <annotation>
- <documentation>
-
- </documentation>
- <appInfo>
- <meta.attribute translatable="true"/>
- </appInfo>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <element name="annotation">
- <complexType>
- <sequence>
- <element ref="targetFilter" minOccurs="0" maxOccurs="7"/>
- </sequence>
- <attribute name="class" type="string" use="required">
- <annotation>
- <documentation>
- the fully qualified annotation class name that extends &lt;code&gt;java.lang.annotation.Annotation&lt;/code&gt;
- </documentation>
- <appInfo>
- <meta.attribute kind="java" basedOn="java.lang.annotation.Annotation:"/>
- </appInfo>
- </annotation>
- </attribute>
- <attribute name="category" type="string" use="required">
- <annotation>
- <documentation>
- the id of a &lt;tt&gt;annotationCategory&lt;/tt&gt;
- </documentation>
- <appInfo>
- <meta.attribute kind="identifier" basedOn="org.eclipse.jst.ws.annotations.core.annotationCategory/category/@id"/>
- </appInfo>
- </annotation>
- </attribute>
- <attribute name="name" type="string" use="required">
- <annotation>
- <documentation>
- The simple name of the annotation class.
- </documentation>
- </annotation>
- </attribute>
- <attribute name="restrictedTo">
- <annotation>
- <documentation>
- Used in addition to the java.lang.annotation.ElementType(s) that are specified in the value element of the @Target annotation on the contributed annotation to add further restrictions.
- </documentation>
- </annotation>
- <simpleType>
- <restriction base="string">
- <enumeration value="CLASS_ONLY">
- </enumeration>
- <enumeration value="INTERFACE_ONLY">
- </enumeration>
- <enumeration value="ENUM_ONLY">
- </enumeration>
- </restriction>
- </simpleType>
- </attribute>
- </complexType>
- </element>
-
- <element name="targetFilter">
- <complexType>
- <attribute name="target" use="required">
- <annotation>
- <documentation>
- The annotations core automatically knows where to permit annotations as it inspects the contributed annotation and
- reads the @Target that has been defined for it. These filters are only used when there might be an extra restriction
- you want to add, for example, if version 2 of an annotation allows adding the annotation to a field, and then version
- 3 deprecates that usage, you can add a filter here to disallow the usage in the UI.
- </documentation>
- </annotation>
- <simpleType>
- <restriction base="string">
- <enumeration value="TYPE">
- </enumeration>
- <enumeration value="FIELD">
- </enumeration>
- <enumeration value="METHOD">
- </enumeration>
- <enumeration value="PARAMETER">
- </enumeration>
- <enumeration value="CONSTRUCTOR">
- </enumeration>
- <enumeration value="LOCAL_VARIABLE">
- </enumeration>
- <enumeration value="ANNOTATION_TYPE">
- </enumeration>
- <enumeration value="PACKAGE">
- </enumeration>
- </restriction>
- </simpleType>
- </attribute>
- </complexType>
- </element>
-
- <annotation>
- <appInfo>
- <meta.section type="since"/>
- </appInfo>
- <documentation>
- 1.0
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="examples"/>
- </appInfo>
- <documentation>
- The following is an example of an annotation definition contribution:
-
-&lt;p&gt;
-&lt;pre&gt;
- &lt;extension point=&quot;org.eclipse.jst.ws.annotations.core.annotationDefinition&quot;&gt;
- &lt;annotation
- category=&quot;jaxws.category&quot;
- class=&quot;javax.jws.WebService&quot;
- name=&quot;WebService&quot;&gt;
- &lt;/annotation&gt;
- &lt;/extension&gt;
-&lt;/pre&gt;
-&lt;/p&gt;
- </documentation>
- </annotation>
-
-
-
- <annotation>
- <appInfo>
- <meta.section type="copyright"/>
- </appInfo>
- <documentation>
- Copyright (c) 2009 Shane Clarke. &lt;br&gt;
-All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at &lt;a href=&quot;http://www.eclipse.org/legal/epl-v10.html&quot;&gt;http://www.eclipse.org/legal/epl-v10.html&lt;/a&gt;
- </documentation>
- </annotation>
-
-</schema>
diff --git a/bundles/org.eclipse.jst.ws.annotations.core/schema/annotationInitializer.exsd b/bundles/org.eclipse.jst.ws.annotations.core/schema/annotationInitializer.exsd
deleted file mode 100644
index 4d4d0a8..0000000
--- a/bundles/org.eclipse.jst.ws.annotations.core/schema/annotationInitializer.exsd
+++ /dev/null
@@ -1,120 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.jst.ws.annotations.core" xmlns="http://www.w3.org/2001/XMLSchema">
-<annotation>
- <appInfo>
- <meta.schema plugin="org.eclipse.jst.ws.annotations.core" id="annotationInitializer" name="Annotation Initializer"/>
- </appInfo>
- <documentation>
- This extension point allows clients to associate an annotation initializer with an annotation definition.
-
-The annotation initializers role is to construct values for the annotations member value pairs.
- </documentation>
- </annotation>
-
- <element name="extension">
- <annotation>
- <appInfo>
- <meta.element />
- </appInfo>
- </annotation>
- <complexType>
- <sequence>
- <element ref="initializer" minOccurs="0" maxOccurs="unbounded"/>
- </sequence>
- <attribute name="point" type="string" use="required">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- <attribute name="id" type="string">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- <attribute name="name" type="string">
- <annotation>
- <documentation>
-
- </documentation>
- <appInfo>
- <meta.attribute translatable="true"/>
- </appInfo>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <element name="initializer">
- <complexType>
- <attribute name="annotation" type="string" use="required">
- <annotation>
- <documentation>
- the class name of the annotation definition that this initializers handles.
- </documentation>
- <appInfo>
- <meta.attribute kind="identifier" basedOn="org.eclipse.jst.ws.annotations.core.annotationDefinition/annotation/@class"/>
- </appInfo>
- </annotation>
- </attribute>
- <attribute name="class" type="string" use="required">
- <annotation>
- <documentation>
- the name of the class that implements the contributed initializer. The
-class must be a public and extend
-&lt;code&gt;org.eclipse.jst.ws.annotations.core.initialization.AnnotationAttributeInitializer&lt;/code&gt; with a public 0-argument constructor.
- </documentation>
- <appInfo>
- <meta.attribute kind="java" basedOn="org.eclipse.jst.ws.annotations.core.initialization.AnnotationAttributeInitializer:"/>
- </appInfo>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <annotation>
- <appInfo>
- <meta.section type="since"/>
- </appInfo>
- <documentation>
- 1.0
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="examples"/>
- </appInfo>
- <documentation>
- The following is an example of an annotation initializer contribution:
-
-&lt;p&gt;
-&lt;pre&gt;
- &lt;extension point=&quot;org.eclipse.jst.ws.annotations.core.annotationInitializer&quot;&gt;
- &lt;initializer
- annotation=&quot;javax.jws.WebService&quot;
- class=&quot;org.eclipse.jst.ws.internal.jaxws.core.annotations.initialization.WebServiceAttributeInitializer&quot;&gt;
- &lt;/initializer&gt;
- &lt;/extension&gt;
-&lt;/pre&gt;
-&lt;/p&gt;
- </documentation>
- </annotation>
-
-
-
- <annotation>
- <appInfo>
- <meta.section type="copyright"/>
- </appInfo>
- <documentation>
- Copyright (c) 2009 Shane Clarke. &lt;br&gt;
-All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at &lt;a href=&quot;http://www.eclipse.org/legal/epl-v10.html&quot;&gt;http://www.eclipse.org/legal/epl-v10.html&lt;/a&gt;
- </documentation>
- </annotation>
-
-</schema>
diff --git a/bundles/org.eclipse.jst.ws.annotations.core/schema/annotationProcessor.exsd b/bundles/org.eclipse.jst.ws.annotations.core/schema/annotationProcessor.exsd
deleted file mode 100644
index 3c6daa8..0000000
--- a/bundles/org.eclipse.jst.ws.annotations.core/schema/annotationProcessor.exsd
+++ /dev/null
@@ -1,134 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.jst.ws.annotations.core" xmlns="http://www.w3.org/2001/XMLSchema">
-<annotation>
- <appInfo>
- <meta.schema plugin="org.eclipse.jst.ws.annotations.core" id="annotationProcessor" name="Annotation Processor"/>
- </appInfo>
- <documentation>
- This extension point allows clients to contribute annotation procesoors. These processors are associated with contributed annotation definitions.
-
-The goal of the processor is to validate annotation rules.
- </documentation>
- </annotation>
-
- <element name="extension">
- <annotation>
- <appInfo>
- <meta.element />
- </appInfo>
- </annotation>
- <complexType>
- <sequence>
- <element ref="processor" minOccurs="0" maxOccurs="unbounded"/>
- </sequence>
- <attribute name="point" type="string" use="required">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- <attribute name="id" type="string">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- <attribute name="name" type="string">
- <annotation>
- <documentation>
-
- </documentation>
- <appInfo>
- <meta.attribute translatable="true"/>
- </appInfo>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <element name="processor">
- <complexType>
- <sequence>
- <element ref="description" minOccurs="0" maxOccurs="1"/>
- </sequence>
- <attribute name="annotation" type="string" use="required">
- <annotation>
- <documentation>
- the class name of the annotation definition that this processor handles.
- </documentation>
- <appInfo>
- <meta.attribute kind="identifier" basedOn="org.eclipse.jst.ws.annotations.core.annotationDefinition/annotation/@class"/>
- </appInfo>
- </annotation>
- </attribute>
- <attribute name="class" type="string" use="required">
- <annotation>
- <documentation>
- the name of the class that implements the contributed procesor. The
-class must be a public subclass of
-&lt;code&gt;org.eclipse.jst.ws.annotations.core.processor.AbstractAnnotationProcessor&lt;/code&gt;and must have a public 0-argument constructor.
- </documentation>
- <appInfo>
- <meta.attribute kind="java" basedOn="org.eclipse.jst.ws.annotations.core.processor.AbstractAnnotationProcessor:"/>
- </appInfo>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <element name="description" type="string">
- <annotation>
- <documentation>
- An optional attribute to hold a short text describing what &quot;rule&quot; the processor handles.
- </documentation>
- </annotation>
- </element>
-
- <annotation>
- <appInfo>
- <meta.section type="since"/>
- </appInfo>
- <documentation>
- 1.0
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="examples"/>
- </appInfo>
- <documentation>
- The following is an example of an annotation processor contribution:
-
-&lt;p&gt;
-&lt;pre&gt;
- &lt;extension point=&quot;org.eclipse.jst.ws.annotations.core.annotationProcessor&quot;&gt;
- &lt;processor
- annotation=&quot;javax.jws.WebService&quot;
- class=&quot;org.eclipse.jst.ws.internal.jaxws.core.annotations.validation.WebServiceSEIPresentNoWebMethodRule&quot;&gt;
- &lt;description&gt;
- %WEBSERVICE_SEI_NO_WEBMETHOS_RULE
- &lt;/description&gt;
- &lt;/processor&gt;
- &lt;/extension&gt;
-&lt;/pre&gt;
-&lt;/p&gt;
- </documentation>
- </annotation>
-
-
-
- <annotation>
- <appInfo>
- <meta.section type="copyright"/>
- </appInfo>
- <documentation>
- Copyright (c) 2009 Shane Clarke. &lt;br&gt;
-All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at &lt;a href=&quot;http://www.eclipse.org/legal/epl-v10.html&quot;&gt;http://www.eclipse.org/legal/epl-v10.html&lt;/a&gt;
- </documentation>
- </annotation>
-
-</schema>
diff --git a/bundles/org.eclipse.jst.ws.annotations.core/src/org/eclipse/jst/ws/annotations/core/AnnotationDefinition.java b/bundles/org.eclipse.jst.ws.annotations.core/src/org/eclipse/jst/ws/annotations/core/AnnotationDefinition.java
deleted file mode 100644
index d8a5ce8..0000000
--- a/bundles/org.eclipse.jst.ws.annotations.core/src/org/eclipse/jst/ws/annotations/core/AnnotationDefinition.java
+++ /dev/null
@@ -1,341 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Shane Clarke.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Shane Clarke - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.annotations.core;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Target;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.LinkedList;
-import java.util.List;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.jdt.core.IAnnotation;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IMemberValuePair;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jst.ws.annotations.core.initialization.IAnnotationAttributeInitializer;
-
-/**
- * An <code>AnnotationDefinition</code> is a representation of the information contributed through the
- * <code>org.eclipse.jst.ws.annotations.core.annotationDefinition</code>,
- * <code>org.eclipse.jst.ws.annotations.core.annotationCategory</code> and
- * <code>org.eclipse.jst.ws.annotations.core.annotationInitializer</code> extension points.
- * <p>
- * It supplies the annotation class name, its annotation category, the applicable targets for the annotation
- * and an <code>IAnnotationAttributeInitializer</code> to initialize the annotations element-value pairs.
- * </p>
- * <strong>Provisional API:</strong> This class/interface is part of an interim API that is still under
- * development and expected to change significantly before reaching stability. It is being made available at
- * this early stage to solicit feedback from pioneering adopters on the understanding that any code that uses
- * this API will almost certainly be broken (repeatedly) as the API evolves.
- * </p>
- */
-public final class AnnotationDefinition {
- private static final String ATT_CLASS = "class"; //$NON-NLS-1$
- private static final String ATT_NAME = "name"; //$NON-NLS-1$
- private static final String ATT_RESTRICTED_TO = "restrictedTo"; //$NON-NLS-1$
-
- private static final String RESTRICTED_TO_CLASS_ONLY = "CLASS_ONLY";
- private static final String RESTRICTED_TO_INTERFACE_ONLY = "INTERFACE_ONLY";
- private static final String RESTRICTED_TO_ENUM_ONLY = "ENUM_ONLY";
-
- private static final String ELEM_TARGET_FILTER = "targetFilter"; //$NON-NLS-1$
- private static final String ATT_TARGET = "target"; //$NON-NLS-1$
-
- private IConfigurationElement configurationElement;
- private String category;
- private String annotationClassName;
- private Class<? extends java.lang.annotation.Annotation> annotationClass;
- private List<ElementType> targets;
- private String name;
- private IAnnotationAttributeInitializer annotationInitializer;
- private String restictedTo;
- private boolean interfaceOnly;
- private boolean classOnly;
- private boolean enumOnly;
-
- private IType annotationType;
- private List<ElementType> annotationTypeTargets;
- private IJavaProject javaProject;
- private Boolean deprecated;
-
- /**
- * Constructs an <code>AnnotationDefinition</code> using information from the
- * <code>org.eclipse.jst.ws.annotations.core.annotationDefinition</code> extension point and category name.
- * @param configurationElement the <code>annotation</code> element from the <code>org.eclipse.jst.ws.annotations.core.annotationDefinition</code> extension point
- * @param category the category name
- */
- public AnnotationDefinition(IConfigurationElement configurationElement, String category) {
- this.configurationElement = configurationElement;
- this.category = category;
-
- this.annotationClassName = AnnotationsManager.getAttributeValue(configurationElement, ATT_CLASS);
- this.name = AnnotationsManager.getAttributeValue(configurationElement, ATT_NAME);
- this.restictedTo = AnnotationsManager.getAttributeValue(configurationElement, ATT_RESTRICTED_TO);
- this.classOnly = restictedTo.equals(RESTRICTED_TO_CLASS_ONLY);
- this.interfaceOnly = restictedTo.equals(RESTRICTED_TO_INTERFACE_ONLY);
- this.enumOnly = restictedTo.equals(RESTRICTED_TO_ENUM_ONLY);
- }
-
- /**
- * Returns the annotation name.
- * @return the annotation name.
- */
- public String getName() {
- return name;
- }
-
- /**
- * Returns the category the annotation belongs to.
- * @return the annotation category.
- */
- public String getCategory() {
- return category;
- }
-
- /**
- * Returns the fully qualified class name of the annotation.
- * @return the fully qualified class name of the annotation.
- */
- public String getAnnotationClassName() {
- return annotationClassName;
- }
-
- /**
- * Returns whether the annotation is restricted to class types.
- * @return <code>true</code> if the annotation is restricted to classes only.
- */
- public boolean isClassOnly() {
- return classOnly;
- }
-
- /**
- * Returns whether the annotation is restricted to interface types.
- * @return <code>true</code> if the annotation is restricted to interfaces only.
- */
- public boolean isInterfaceOnly() {
- return interfaceOnly;
- }
-
- /**
- * Returns whether the annotation is restricted to enum types.
- * @return <code>true</code> if the annotation is restricted to enums only.
- */
- public boolean isEnumOnly() {
- return enumOnly;
- }
-
- /**
- * Returns the annotation class as specified by the <code>class</code> attribute of the
- * <code>annotation<annotation> element in the <code>org.eclipse.jst.ws.annotations.core.annotationDefinition</code>
- * extension point.
- *
- * @return the annotation class or null if not found.
- * @deprecated As of 1.1 replaced by {@link #getAnnotationType()}
- */
- @SuppressWarnings("unchecked")
- @Deprecated
- public Class<? extends java.lang.annotation.Annotation> getAnnotationClass() {
- if (annotationClass == null) {
- try {
- Class<?> aClass = Class.forName(annotationClassName);
- if (aClass.isAnnotation()) {
- annotationClass = (Class<java.lang.annotation.Annotation>) Class.forName(annotationClassName);
- }
- } catch(ClassNotFoundException cnfe) {
- AnnotationsCorePlugin.log(cnfe);
- }
- }
- return annotationClass;
- }
-
- /**
- * Returns the annotation type as specified by the <code>class</code> attribute of the
- * <code>annotation<annotation> element in the <code>org.eclipse.jst.ws.annotations.core.annotationDefinition</code>
- * extension point.
- *
- * @return the <code>org.eclipse.jdt.core.IType</code> which represents an annotation type or null if the java project
- * has not been set, if the type cannot be found or if the type does not represent an annotation type.
- *
- * @see #setJavaProject(IJavaProject)
- * @since 1.1
- */
- public IType getAnnotationType() {
- if (annotationType == null) {
- try {
- if (javaProject != null) {
- IType type = javaProject.findType(annotationClassName);
- if (type != null && type.isAnnotation()) {
- annotationType = type;
- }
- }
- } catch (JavaModelException jme) {
- AnnotationsCorePlugin.log(jme.getStatus());
- }
- }
- return annotationType;
- }
-
- /**
- * Returns a list of {@link ElementType} that specify the Java elements to which the annotation
- * can be applied.
- * <p>
- * The element types are retrieved from the annotations
- * {@link java.lang.annotation.Target} meta-annotation type. This list can be filtered using
- * the <code>targetFilter</code> element on the
- * <code>org.eclipse.jst.ws.annotations.core.annotationDefinition</code> extension point when defining
- * the annotation.
- * </p>
- * @return a list of element types.
- * @deprecated as of 1.1 replaced by {@link #getAnnotationTypeTargets()}
- */
- @Deprecated
- public List<ElementType> getTargets() {
- if (targets == null) {
- targets = new LinkedList<ElementType>();
-
- Class<? extends java.lang.annotation.Annotation> annotation = getAnnotationClass();
- if (annotation != null) {
- Target target = annotation.getAnnotation(Target.class);
- if (target != null) {
- targets.addAll(Arrays.asList(target.value()));
-
- List<ElementType> filteredTargets = getFilteredTargets(configurationElement);
- if (targets.containsAll(filteredTargets) && filteredTargets.size() < targets.size()) {
- targets.removeAll(filteredTargets);
- }
- }
- }
- }
- return targets;
- }
-
- /**
- * Returns a list of {@link java.lang.annotation.ElementType} that specify the Java elements to which the annotation can be applied.
- * <p>
- * The element types are retrieved from the annotations
- * {@link java.lang.annotation.Target} meta-annotation type. This list can
- * be filtered using the <code>targetFilter</code> element on the
- * <code>org.eclipse.jst.ws.annotations.core.annotationDefinition</code>
- * extension point when defining the annotation.
- * </p>
- * @return a list of element types or null if the java project has not been set or if the annotation type cannot be
- * found.
- * @see #setJavaProject(IJavaProject)
- * @since 1.1
- */
- public List<ElementType> getAnnotationTypeTargets() {
- if (annotationTypeTargets == null) {
- annotationTypeTargets = new LinkedList<ElementType>();
- try {
- IType type = getAnnotationType();
- if (type != null) {
- IAnnotation target = type.getAnnotation(Target.class.getCanonicalName());
- if (!target.exists()) {
- target = type.getAnnotation(Target.class.getSimpleName());
- }
- if (target.exists()) {
- IMemberValuePair[] memberValuePairs = target.getMemberValuePairs();
- for (IMemberValuePair memberValuePair : memberValuePairs) {
- Object value = memberValuePair.getValue();
- if (value.getClass().isArray() && value.getClass().getComponentType().equals(String.class)) {
- String[] objs = (String[]) value;
- for (String obj : objs) {
- annotationTypeTargets.add(ElementType.valueOf(obj.substring(obj.lastIndexOf('.') + 1)));
- }
- } else {
- annotationTypeTargets.add(ElementType.valueOf(value.toString().substring(value.toString().lastIndexOf('.') + 1)));
- }
- }
- }
- List<ElementType> filteredTargets = getFilteredTargets(configurationElement);
- if (annotationTypeTargets.containsAll(filteredTargets) && filteredTargets.size() < annotationTypeTargets.size()) {
- annotationTypeTargets.removeAll(filteredTargets);
- }
- }
- } catch (JavaModelException jme) {
- AnnotationsCorePlugin.log(jme.getStatus());
- }
- }
- return annotationTypeTargets;
- }
-
- /**
- * Returns the annotations attribute initializer as specified in the
- * <code>org.eclipse.jst.ws.annotations.core.annotationInitializer</code> extension point or null if no
- * initializer can be found.
- *
- * @return the <code>IAnnotationAttributeInitializer</code>
- */
- public IAnnotationAttributeInitializer getAnnotationAttributeInitializer() {
- if (annotationInitializer == null) {
- try {
- IConfigurationElement configurationElement =
- AnnotationsManager.getAnnotationInitializerCache().get(getAnnotationClassName());
- if (configurationElement != null) {
- annotationInitializer = (IAnnotationAttributeInitializer) configurationElement.createExecutableExtension(ATT_CLASS);
- }
- } catch (CoreException ce) {
- AnnotationsCorePlugin.log(ce.getStatus());
- }
- }
- return annotationInitializer;
- }
-
- private List<ElementType> getFilteredTargets(IConfigurationElement configurationElement) {
- List<ElementType> targets = new ArrayList<ElementType>(7);
- try {
- IConfigurationElement[] deprecatedTargets = configurationElement.getChildren(ELEM_TARGET_FILTER);
- for (IConfigurationElement deprecatedTargetElement : deprecatedTargets) {
- String target = AnnotationsManager.getAttributeValue(deprecatedTargetElement, ATT_TARGET);
- targets.add(ElementType.valueOf(target));
- }
- } catch (IllegalArgumentException iae) {
- AnnotationsCorePlugin.log(iae);
- }
- return targets;
- }
-
- boolean isDeprecated() {
- if (deprecated == null) {
- IType type = getAnnotationType();
- if (type != null) {
- IAnnotation annotation = type.getAnnotation(Deprecated.class.getCanonicalName());
- if (!annotation.exists()) {
- annotation = type.getAnnotation(Deprecated.class.getSimpleName());
- }
- deprecated = annotation.exists();
- } else {
- deprecated = false;
- }
- }
- return deprecated;
- }
-
- /**
- * Sets the <code>org.eclipse.jdt.core.IJavaProject</code> which is used to find the annotation type.
- *
- * @see #getAnnotationType()
- * @see #getAnnotationTypeTargets()
- * @since 1.1
- */
- public void setJavaProject(IJavaProject javaProject) {
- if (this.javaProject == null || !this.javaProject.equals(javaProject)) {
- this.javaProject = javaProject;
- this.annotationType = null;
- this.annotationTypeTargets = null;
- this.deprecated = null;
- }
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.annotations.core/src/org/eclipse/jst/ws/annotations/core/AnnotationsCore.java b/bundles/org.eclipse.jst.ws.annotations.core/src/org/eclipse/jst/ws/annotations/core/AnnotationsCore.java
deleted file mode 100644
index d9e691a..0000000
--- a/bundles/org.eclipse.jst.ws.annotations.core/src/org/eclipse/jst/ws/annotations/core/AnnotationsCore.java
+++ /dev/null
@@ -1,407 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Shane Clarke.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Shane Clarke - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.annotations.core;
-
-import java.util.List;
-
-import org.eclipse.jdt.core.IField;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jdt.core.dom.AST;
-import org.eclipse.jdt.core.dom.ArrayInitializer;
-import org.eclipse.jdt.core.dom.BooleanLiteral;
-import org.eclipse.jdt.core.dom.Expression;
-import org.eclipse.jdt.core.dom.MarkerAnnotation;
-import org.eclipse.jdt.core.dom.MemberValuePair;
-import org.eclipse.jdt.core.dom.Name;
-import org.eclipse.jdt.core.dom.NormalAnnotation;
-import org.eclipse.jdt.core.dom.NumberLiteral;
-import org.eclipse.jdt.core.dom.QualifiedName;
-import org.eclipse.jdt.core.dom.QualifiedType;
-import org.eclipse.jdt.core.dom.SimpleName;
-import org.eclipse.jdt.core.dom.SingleMemberAnnotation;
-import org.eclipse.jdt.core.dom.StringLiteral;
-import org.eclipse.jdt.core.dom.TypeLiteral;
-/**
- * Utility class for creating annotations and member value pairs.
- * <p>
- * <strong>Provisional API:</strong> This class/interface is part of an interim API that is still under
- * development and expected to change significantly before reaching stability. It is being made available at
- * this early stage to solicit feedback from pioneering adopters on the understanding that any code that uses
- * this API will almost certainly be broken (repeatedly) as the API evolves.
- * </p>
- */
-public final class AnnotationsCore {
-
- private AnnotationsCore() {
- }
-
- /**
- * Creates a new {@link NormalAnnotation}.
- *
- * @param ast the {@link AST} that will be used to create the annotation.
- * @param annotationName the name of the annotation.
- * @param memberValuePairs a list of {@link MemberValuePair} to add to the normal annotation.
- * @return a normal annotation with the given member value pairs.
- */
- public static NormalAnnotation createNormalAnnotation(AST ast, String annotationName, List<MemberValuePair> memberValuePairs) {
- NormalAnnotation annotation = ast.newNormalAnnotation();
-
- Name annotationTypeName = ast.newName(annotationName);
-
- annotation.setTypeName(annotationTypeName);
-
- if (memberValuePairs != null) {
- for (MemberValuePair memberValuePair : memberValuePairs) {
- @SuppressWarnings("unchecked")
- List<MemberValuePair> annotationValues = annotation.values();
- annotationValues.add(memberValuePair);
- }
- }
- return annotation;
- }
-
- /**
- * Creates a new {@link SingleMemberAnnotation}.
- *
- * @param ast the {@link AST} that will be used to create the annotation.
- * @param annotationName the name of the annotation.
- * @param value the {@link Expression} to set as the single member annotation value.
- * @return a single member annotation with the given value.
- */
- public static SingleMemberAnnotation createSingleMemberAnnotation(AST ast, String annotationName, Expression value) {
- SingleMemberAnnotation annotation = ast.newSingleMemberAnnotation();
-
- Name annotationTypeName = ast.newName(annotationName);
-
- annotation.setTypeName(annotationTypeName);
-
- if (value != null) {
- value = (Expression)Expression.copySubtree(ast, value);
- annotation.setValue(value);
- }
-
- return annotation;
- }
-
- /**
- * Creates a new {@link MarkerAnnotation}.
- *
- * @param ast the {@link AST} that will be used to create the annotation.
- * @param annotationName the name of the annotation.
- * @return a marker annotation.
- */
- public static MarkerAnnotation createMarkerAnnotation(AST ast, String annotationName) {
- MarkerAnnotation annotation = ast.newMarkerAnnotation();
-
- Name annotationTypeName = ast.newName(annotationName);
-
- annotation.setTypeName(annotationTypeName);
-
- return annotation;
- }
-
- /**
- * Creates a new {@link MemberValuePair}.
- *
- * @param ast the {@link AST} that will be used to create the member value pair.
- * @param name the {@link MemberValuePair} "name".
- * @param expression the {@link Expression} "value" of the member value pair.
- * @return a new member value pair with the given name and value.
- */
- public static MemberValuePair createMemberValuePair(AST ast, String name, Expression expression) {
- MemberValuePair memberValuePair = ast.newMemberValuePair();
- memberValuePair.setName(ast.newSimpleName(name));
- memberValuePair.setValue(expression);
- return memberValuePair;
- }
-
- /**
- * Creates a new {@link MemberValuePair} with a {@link StringLiteral} value.
- *
- * @param ast the {@link AST} that will be used to create the member value pair.
- * @param name the member value pair "name".
- * @param value the <code>String</code> "value".
- * @return a new member value pair with the given name and value.
- */
- public static MemberValuePair createStringMemberValuePair(AST ast, String name, String value) {
- MemberValuePair stringMemberValuePair = AnnotationsCore.createMemberValuePair(ast, name,
- AnnotationsCore.createStringLiteral(ast, value.toString()));
-
- return stringMemberValuePair;
- }
-
- /**
- * Creates a new {@link MemberValuePair} with a {@link BooleanLiteral} value.
- *
- * @param ast the {@link AST} that will be used to create the member value pair.
- * @param name the member value pair "name".
- * @param value the <code>Boolean</code> "value".
- * @return a new member value pair with the given name and value.
- */
- public static MemberValuePair createBooleanMemberValuePair(AST ast, String name, Boolean value) {
- MemberValuePair booleanValuePair = AnnotationsCore.createMemberValuePair(ast, name, AnnotationsCore
- .createBooleanLiteral(ast, value.booleanValue()));
-
- return booleanValuePair;
- }
-
- /**
- * Creates a new {@link MemberValuePair} with a {@link NumberLiteral} value.
- *
- * @param ast the {@link AST} that will be used to create the member value pair.
- * @param name the member value pair "name".
- * @param value the <code>String</code> "value" representing the number.
- * @return a new member value pair with the given name and value.
- */
- public static MemberValuePair createNumberMemberValuePair(AST ast, String name, String value) {
- MemberValuePair primitiveValuePair = AnnotationsCore.createMemberValuePair(ast, name,
- AnnotationsCore.createNumberLiteral(ast, value.toString()));
- return primitiveValuePair;
- }
-
- /**
- * Creates a new {@link MemberValuePair} with a {@link Name} value.
- *
- * @param ast the {@link AST} that will be used to create the member value pair.
- * @param className the enclosing class name.
- * @param name the member value pair "name".
- * @param value an object representing the <code>enum</code> value.
- * @return a new member value pair with the given name and value.
- */
- public static MemberValuePair createEnumMemberValuePair(AST ast, String className, String name, Object value) {
- if (value instanceof IField) {
- return AnnotationsCore.createMemberValuePair(ast, name, createEnumLiteral(ast, className, (IField) value));
- }
- return AnnotationsCore.createMemberValuePair(ast, name, createEnumLiteral(ast, className, value));
- }
-
- /**
- * Creates a new {@link MemberValuePair} with a {@link TypeLiteral} value.
- *
- * @param ast the {@link AST} that will be used to create the member value pair.
- * @param name the member value pair "name".
- * @param value an object representing the type value.
- * @return a new member value pair with the given name and value.
- */
- public static MemberValuePair createTypeMemberValuePair(AST ast, String name, Object value) {
- return AnnotationsCore.createMemberValuePair(ast, name,
- createTypeLiteral(ast, value));
- }
-
- /**
- * Creates a new {@link MemberValuePair} with an {@link ArrayInitializer} value.
- *
- * @param ast the {@link AST} that will be used to create the member value pair.
- * @param name the member value pair "name".
- * @param values an array of <code>Object</code> values. Supports {@link java.lang.String}, {@link java.lang.Boolean}, {@link java.lang.Class} values.
- * @return a new member value pair with the given name and array of values.
- */
- public static MemberValuePair createArrayMemberValuePair(AST ast, String name, Object[] values) {
- return AnnotationsCore.createMemberValuePair(ast, name, createArrayValueLiteral(ast, values));
- }
-
- /**
- * Creates a new {@link ArrayInitializer}.
- * @param ast the {@link AST} that will be used to create the {@link ArrayInitializer}.
- * @param values an array of <code>Object</code> values. Supports {@link java.lang.String}, {@link java.lang.Boolean}, {@link java.lang.Class} values.
- * @return a new srray initializer.
- */
- @SuppressWarnings("unchecked")
- public static ArrayInitializer createArrayValueLiteral(AST ast, Object[] values) {
- ArrayInitializer arrayInitializer = ast.newArrayInitializer();
- for (Object value : values) {
- if (value.equals(Class.class)) {
- arrayInitializer.expressions().add(createTypeLiteral(ast, value.toString()));
- }
-
- if (value instanceof String) {
- String stringValue = value.toString();
- if (stringValue.endsWith(".class")) { //$NON-NLS-1$
- arrayInitializer.expressions().add(createTypeLiteral(ast, stringValue.substring(0,
- stringValue.lastIndexOf(".")))); //$NON-NLS-1$
- } else {
- arrayInitializer.expressions().add(createStringLiteral(ast, stringValue));
- }
- }
-
- if (value.equals(Boolean.TYPE)) {
- arrayInitializer.expressions().add(createBooleanLiteral(ast, (Boolean) value));
- }
-
- }
- return arrayInitializer;
- }
-
- /**
- * Creates a new {@link QualifiedName} to represent an <code>enum</code> literal value.
- *
- * @param ast the {@link AST} that will be used to create the qualified name.
- * @param className the fully qualified name of the enclosing class.
- * @param value an object representing the <code>enum</code> value.
- * @return a new qualified name.
- */
- public static QualifiedName createEnumLiteral(AST ast, String className, Object value) {
- QualifiedName enumName = null;
- SimpleName enumClassName = ast.newSimpleName(value.getClass().getSimpleName());
- SimpleName enumLiteral = ast.newSimpleName(value.toString());
- if (value.getClass().isMemberClass()) {
- Name enumEnclosingClassName = null;
- String enclosingClassName = value.getClass().getEnclosingClass().getCanonicalName();
- if (enclosingClassName.equals(className)) {
- enumEnclosingClassName = ast.newSimpleName(value.getClass().getEnclosingClass()
- .getSimpleName());
- } else {
- enumEnclosingClassName = ast.newName(enclosingClassName);
- }
- QualifiedName qualifiedName = ast.newQualifiedName(enumEnclosingClassName, enumClassName);
- enumName = ast.newQualifiedName(qualifiedName, enumLiteral);
- } else {
- Name qualifiedName = ast.newName(value.getClass().getCanonicalName());
- enumName = ast.newQualifiedName(qualifiedName, enumLiteral);
- }
- return enumName;
- }
-
- /**
- * Creates a new {@link QualifiedName} to represent an <code>enum</code> literal value.
- *
- * @param ast the {@link AST} that will be used to create the qualified name.
- * @param className the fully qualified name of the enclosing class.
- * @param enumConstant a {@link org.eclipse.jdt.core.IField} where <code>isEnumConstant()</code> is <code>true</code>.
- * @return a new qualified name.
- * @throws JavaModelException
- * @since 1.1
- */
- public static QualifiedName createEnumLiteral(AST ast, String className, IField enumConstant) {
- QualifiedName enumName = null;
- SimpleName enumClassName = ast.newSimpleName(enumConstant.getDeclaringType().getElementName());
- SimpleName enumLiteral = ast.newSimpleName(enumConstant.getElementName());
- try {
- if (enumConstant.getDeclaringType().isMember()) {
- Name enumEnclosingClassName = null;
- String enclosingClassName = enumConstant.getDeclaringType().getDeclaringType().getFullyQualifiedName();
- if (enclosingClassName.equals(className)) {
- enumEnclosingClassName = ast.newSimpleName(enumConstant.getDeclaringType().getDeclaringType().getElementName());
- } else {
- enumEnclosingClassName = ast.newName(enclosingClassName);
- }
- QualifiedName qualifiedName = ast.newQualifiedName(enumEnclosingClassName, enumClassName);
- enumName = ast.newQualifiedName(qualifiedName, enumLiteral);
- } else {
- Name qualifiedName = ast.newName(enumConstant.getDeclaringType().getFullyQualifiedName());
- enumName = ast.newQualifiedName(qualifiedName, enumLiteral);
- }
- } catch (JavaModelException jme) {
- AnnotationsCorePlugin.log(jme.getStatus());
- }
- return enumName;
- }
-
- /**
- * Creates a new {@link TypeLiteral}.
- *
- * @param ast the {@link AST} that will be used to create the {@link TypeLiteral}.
- * @param value a <code>Class</code> or a <code>String</code> from which to create the type literal.
- * @return a new type literal or null it the value is not of type <code>Class</code> or <code>String</code>.
- */
- public static TypeLiteral createTypeLiteral(AST ast, Object value) {
- TypeLiteral typeLiteral = null;
- if (value instanceof Class<?>) {
- typeLiteral = createTypeLiteral(ast, (Class<?>) value);
- }
- if (value instanceof String) {
- typeLiteral = createTypeLiteral(ast, (String) value);
- }
- return typeLiteral;
- }
-
- /**
- * Creates a new {@link TypeLiteral}.
- *
- * @param ast the {@link AST} that will be used to create the type literal.
- * @param value the class value.
- * @return a new type literal.
- */
- public static TypeLiteral createTypeLiteral(AST ast, Class<?> value) {
- TypeLiteral typeLiteral = ast.newTypeLiteral();
-
- Class<?> aClass = value;
- SimpleName className = ast.newSimpleName(aClass.getSimpleName());
-
- if (aClass.isMemberClass()) {
- Name enclosingClassName = ast.newName(aClass.getEnclosingClass().getCanonicalName());
- QualifiedType qualifiedType = ast.newQualifiedType(ast.newSimpleType(enclosingClassName), className);
- typeLiteral.setType(qualifiedType);
- return typeLiteral;
- }
- return createTypeLiteral(ast, value.getCanonicalName());
- }
-
- /**
- * Creates a new {@link TypeLiteral}
- *
- * @param ast the {@link AST} that will be used to create the type literal.
- * @param value the name of the class.
- * @return a new type literal.
- */
- public static TypeLiteral createTypeLiteral(AST ast, String value) {
- TypeLiteral typeLiteral = ast.newTypeLiteral();
-
- if (value.indexOf(".") == -1) { //$NON-NLS-1$
- typeLiteral.setType(ast.newSimpleType(ast.newSimpleName(value)));
- } else {
- String qualifier = value.substring(0, value.lastIndexOf(".")); //$NON-NLS-1$
- String identifier = value.substring(value.lastIndexOf(".") + 1); //$NON-NLS-1$
- if (qualifier.equals("java.lang")) { //$NON-NLS-1$
- typeLiteral.setType(ast.newSimpleType(ast.newSimpleName(identifier)));
- } else {
- typeLiteral.setType(ast.newQualifiedType(ast.newSimpleType(ast.newName(qualifier)), ast
- .newSimpleName(identifier)));
- }
- }
- return typeLiteral;
- }
-
- /**
- * Creates a new {@link StringLiteral}.
- * @param ast the {@link AST} that will be used to create the string literal.
- * @param literalValue the string value.
- * @return a new string literal.
- */
- public static StringLiteral createStringLiteral(AST ast, String literalValue) {
- StringLiteral stringLiteral = ast.newStringLiteral();
- stringLiteral.setLiteralValue(literalValue);
- return stringLiteral;
- }
-
- /**
- * Creates a new {@link BooleanLiteral}.
- * @param ast the {@link AST} that will be used to create the boolean literal.
- * @param value the boolean value.
- * @return a new boolean literal.
- */
- public static BooleanLiteral createBooleanLiteral(AST ast, boolean value) {
- BooleanLiteral booleanLiteral = ast.newBooleanLiteral(value);
- return booleanLiteral;
- }
-
- /**
- * Creates a new {@link NumberLiteral}.
- * @param ast the {@link AST} that will be used to create the {@link NumberLiteral}.
- * @param value the number value.
- * @return a new number literal.
- */
- public static NumberLiteral createNumberLiteral(AST ast, String value) {
- NumberLiteral primitiveLiteral = ast.newNumberLiteral();
- primitiveLiteral.setToken(value);
- return primitiveLiteral;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.annotations.core/src/org/eclipse/jst/ws/annotations/core/AnnotationsCorePlugin.java b/bundles/org.eclipse.jst.ws.annotations.core/src/org/eclipse/jst/ws/annotations/core/AnnotationsCorePlugin.java
deleted file mode 100644
index ed04679..0000000
--- a/bundles/org.eclipse.jst.ws.annotations.core/src/org/eclipse/jst/ws/annotations/core/AnnotationsCorePlugin.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.annotations.core;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Plugin;
-import org.eclipse.core.runtime.Status;
-import org.osgi.framework.BundleContext;
-
-/**
- *
- * <p>
- * <strong>Provisional API:</strong> This class/interface is part of an interim API that is still under
- * development and expected to change significantly before reaching stability. It is being made available at
- * this early stage to solicit feedback from pioneering adopters on the understanding that any code that uses
- * this API will almost certainly be broken (repeatedly) as the API evolves.
- * </p>
- *
- */
-public class AnnotationsCorePlugin extends Plugin {
- public static final String PLUGIN_ID = "org.eclipse.jst.ws.annotations.core"; //$NON-NLS-1$
-
- // The shared instance
- private static AnnotationsCorePlugin plugin;
-
- public static AnnotationsCorePlugin getDefault() {
- return plugin;
- }
-
- public void start(BundleContext context) throws Exception {
- super.start(context);
- plugin = this;
- }
-
- public void stop(BundleContext context) throws Exception {
- plugin = null;
- super.stop(context);
- }
-
- public static void logMessage(int severity, String message) {
- AnnotationsCorePlugin.log(new Status(severity, AnnotationsCorePlugin.PLUGIN_ID, message));
- }
-
- public static void log(IStatus status) {
- AnnotationsCorePlugin.getDefault().getLog().log(status);
- }
-
- public static void log(Throwable exception) {
- AnnotationsCorePlugin.log(new Status(IStatus.ERROR, AnnotationsCorePlugin.PLUGIN_ID, exception
- .getLocalizedMessage(), exception));
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.annotations.core/src/org/eclipse/jst/ws/annotations/core/AnnotationsManager.java b/bundles/org.eclipse.jst.ws.annotations.core/src/org/eclipse/jst/ws/annotations/core/AnnotationsManager.java
deleted file mode 100644
index db2d3cc..0000000
--- a/bundles/org.eclipse.jst.ws.annotations.core/src/org/eclipse/jst/ws/annotations/core/AnnotationsManager.java
+++ /dev/null
@@ -1,507 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Shane Clarke.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Shane Clarke - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.annotations.core;
-
-import java.lang.annotation.Annotation;
-import java.lang.annotation.ElementType;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExtensionPoint;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.jdt.core.IAnnotation;
-import org.eclipse.jdt.core.IField;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.ILocalVariable;
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jdt.core.IPackageDeclaration;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jdt.core.dom.Name;
-import org.eclipse.jdt.core.dom.SimpleName;
-import org.eclipse.jst.ws.annotations.core.initialization.IAnnotationAttributeInitializer;
-
-/**
- * Manages the annotation categories, definitions, processors and initializers contributed through the
- * <code>org.eclipse.jst.ws.annotations.core.annotationDefinition</code>,
- * <code>org.eclipse.jst.ws.annotations.core.annotationCategory</code>,
- * <code>org.eclipse.jst.ws.annotations.core.annotationInitializer</code> and
- * <code>org.eclipse.jst.ws.annotations.core.annotationProcessor</code> extension points.
- * <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 AnnotationsManager {
- private static final String ANNOTATION_DEFINITION = "annotationDefinition"; //$NON-NLS-1$
- private static final String ANNOTATION_CATEGORY = "annotationCategory"; //$NON-NLS-1$
- private static final String ANNOTATION_INITIALIZER = "annotationInitializer"; //$NON-NLS-1$
- private static final String ANNOTATION_PROCESSOR = "annotationProcessor"; //$NON-NLS-1$
- private static final String ANNOTATION = "annotation"; //$NON-NLS-1$
-
- private static List<AnnotationDefinition> annotationCache = null;
- private static Map<String, String> annotationCategoryCache = null;
- private static Map<String, IConfigurationElement> annotationInitializerCache = null;
- private static Map<String, List<IConfigurationElement>> annotationProcessorCache = null;
- private static Map<String, List<AnnotationDefinition>> annotationsByCategoryMap = null;
- private static Map<String, AnnotationDefinition> annotationClassNameToDefinitionMap;
- private static Map<String, AnnotationDefinition> annotationSimpleNameToDefinitionMap;
- private static Map<String, AnnotationDefinition> annotationQualifiedNameToDefinitionMap;
-
- private static final String ATT_ID = "id"; //$NON-NLS-1$
- private static final String ATT_NAME = "name"; //$NON-NLS-1$
- private static final String ATT_CATEGORY = "category"; //$NON-NLS-1$
-
- private AnnotationsManager() {
- }
-
- /**
- * Returns a list of {@link AnnotationDefinition} constructed from contributions to the
- * <code>org.eclipse.jst.ws.annotations.core.annotationDefinition</code> extension point.
- *
- * @return a list of annotation definitions.
- */
- public static synchronized List<AnnotationDefinition> getAnnotations() {
- if (annotationCache == null) {
- annotationCache = new ArrayList<AnnotationDefinition>();
-
- IExtensionPoint extensionPoint = Platform.getExtensionRegistry().getExtensionPoint(
- AnnotationsCorePlugin.PLUGIN_ID, ANNOTATION_DEFINITION);
- if (extensionPoint != null) {
- IConfigurationElement[] elements = extensionPoint.getConfigurationElements();
- for (int i = 0; i < elements.length; i++) {
- IConfigurationElement element = elements[i];
- if (element.getName().equals(ANNOTATION)) {
- AnnotationDefinition annotationDefinition = new AnnotationDefinition(element,
- getAnnotationCategory(getAttributeValue(element, ATT_CATEGORY)));
- annotationCache.add(annotationDefinition);
- }
- }
- }
- }
- return annotationCache;
- }
-
- /**
- * Returns a list of all the contributed annotations that target the given {@link org.eclipse.jdt.core.IJavaElement}.
- *
- * @param javaElement one of
- * <li>org.eclipse.jdt.core.IPackageDeclaration</li>
- * <li>org.eclipse.jdt.core.IType</li>
- * <li>org.eclipse.jdt.core.IField</li>
- * <li>org.eclipse.jdt.core.IMethod</li>
- * <li>org.eclipse.jdt.core.ILocalVariable</li>
- *
- * @return a list of types which represent annotation types.
- * @since 1.1
- */
- public static List<IType> getAnnotationTypes(IJavaElement javaElement) {
- List<IType> annotations = new ArrayList<IType>();
-
- try {
- List<AnnotationDefinition> annotationDefinitions = getAllAnnotationsForElement(javaElement);
-
- filterAnnotationsList(javaElement, annotationDefinitions);
-
- for (AnnotationDefinition annotationDefinition : annotationDefinitions) {
- IType type = annotationDefinition.getAnnotationType();
- if (type != null) {
- annotations.add(type);
- }
- }
- } catch (JavaModelException jme) {
- AnnotationsCorePlugin.log(jme.getStatus());
- }
- return annotations;
- }
-
- /**
- * Returns a list of all the contributed {@link java.lang.annotation.Annotation} that target the given java element type.
- *
- * @param javaElement one of
- * <li>org.eclipse.jdt.core.IPackageDeclaration</li>
- * <li>org.eclipse.jdt.core.IType</li>
- * <li>org.eclipse.jdt.core.IField</li>
- * <li>org.eclipse.jdt.core.IMethod</li>
- * <li>org.eclipse.jdt.core.ILocalVariable</li>
- *
- * @return a list of annotations.
- * @deprecated As of 1.1 replaced by {@link #getAnnotationTypes(IJavaElement)}
- */
- @Deprecated
- public static List<Class<? extends Annotation>> getAnnotations(IJavaElement javaElement) {
- List<Class<? extends Annotation>> annotations = new ArrayList<Class<? extends Annotation>>();
-
- try {
- List<AnnotationDefinition> annotationDefinitions = getAllAnnotationsForElement(javaElement);
-
- filterAnnotationsList(javaElement, annotationDefinitions);
-
- for (AnnotationDefinition annotationDefinition : annotationDefinitions) {
- annotations.add(annotationDefinition.getAnnotationClass());
- }
- } catch (JavaModelException jme) {
- AnnotationsCorePlugin.log(jme.getStatus());
- }
- return annotations;
- }
-
- private static synchronized Map<String, AnnotationDefinition> getAnnotationToClassNameDefinitionMap() {
- if (annotationClassNameToDefinitionMap == null) {
- List<AnnotationDefinition> annotationDefinitions = getAnnotations();
-
- annotationClassNameToDefinitionMap = new HashMap<String, AnnotationDefinition>();
-
- for (AnnotationDefinition annotationDefinition : annotationDefinitions) {
- if (annotationDefinition.getAnnotationClassName() != null) {
- annotationClassNameToDefinitionMap.put(annotationDefinition.getAnnotationClassName(), annotationDefinition);
- }
- }
- }
- return annotationClassNameToDefinitionMap;
- }
-
- private static synchronized Map<String, AnnotationDefinition> getSimpleNameToDefinitionMap() {
- if (annotationSimpleNameToDefinitionMap == null) {
- List<AnnotationDefinition> annotationDefinitions = getAnnotations();
-
- annotationSimpleNameToDefinitionMap = new HashMap<String, AnnotationDefinition>();
-
- for (AnnotationDefinition annotationDefinition : annotationDefinitions) {
- annotationSimpleNameToDefinitionMap.put(annotationDefinition.getName(), annotationDefinition);
- }
- }
- return annotationSimpleNameToDefinitionMap;
- }
-
- private static synchronized Map<String, AnnotationDefinition> getQualifiedNameToDefinitionMap() {
- if (annotationQualifiedNameToDefinitionMap == null) {
- List<AnnotationDefinition> annotationDefinitions = getAnnotations();
-
- annotationQualifiedNameToDefinitionMap = new HashMap<String, AnnotationDefinition>();
-
- for (AnnotationDefinition annotationDefinition : annotationDefinitions) {
- annotationQualifiedNameToDefinitionMap.put(annotationDefinition.getAnnotationClassName(),
- annotationDefinition);
- }
- }
- return annotationQualifiedNameToDefinitionMap;
- }
-
- /**
- * Returns the {@link AnnotationDefinition} for the given {@link java.lang.annotation.Annotation} class
- * or null if no annotation definition can be found.
- * @param annotationClass the <code>java.lang.annotation.Annotation</code> class.
- * @return the annotation definition for the <code>java.lang.annotation.Annotation</code> class.
- */
- public static AnnotationDefinition getAnnotationDefinitionForClass(Class<? extends Annotation> annotationClass) {
- return getAnnotationToClassNameDefinitionMap().get(annotationClass.getCanonicalName());
- }
-
- /**
- * Returns the {@link AnnotationDefinition} for the given fully qualified {@link java.lang.annotation.Annotation} class
- * name or null if no annotation definition can be found.
- * @param canonicalName the fully qualified name of the <code>java.lang.annotation.Annotation</code> class.
- * @return the annotation definition for the fully qualified <code>java.lang.annotation.Annotation</code> class name.
- */
- public static AnnotationDefinition getAnnotationDefinitionForClass(String canonicalName) {
- return getAnnotationToClassNameDefinitionMap().get(canonicalName);
- }
-
- /**
- * Returns the {@link AnnotationDefinition} for the given {@link org.eclipse.jdt.core.IType}
- * or null if no annotation definition can be found.
- *
- * @param annotationType an <code>org.eclipse.jdt.core.IType</code> which represents an annotation type.
- * @return the annotation definition for the <code>org.eclipse.jdt.core.IType</code>.
- * @since 1.1
- */
- public static AnnotationDefinition getAnnotationDefinitionForType(IType annotationType) {
- return getAnnotationToClassNameDefinitionMap().get(annotationType.getFullyQualifiedName());
- }
-
- /**
- * Returns the {@link IAnnotationAttributeInitializer} for the given {@link org.eclipse.jdt.core.dom.Name}
- * or null if none can be found.
- * @param name a {@link org.eclipse.jdt.core.dom.SimpleName} or {@link org.eclipse.jdt.core.dom.QualifiedName} for the annotation to search for.
- * @return an <code>IAnnotationAttributeInitializer</code> for the given name.
- */
- public static IAnnotationAttributeInitializer getAnnotationAttributeInitializerForName(Name name) {
- if (name != null) {
- if (name.isSimpleName() && getSimpleNameToDefinitionMap().containsKey(((SimpleName) name).getIdentifier())) {
- return getSimpleNameToDefinitionMap().get(((SimpleName) name).getIdentifier()).getAnnotationAttributeInitializer();
- } else if (name.isQualifiedName() && getQualifiedNameToDefinitionMap().containsKey(name.getFullyQualifiedName())) {
- return getQualifiedNameToDefinitionMap().get(name.getFullyQualifiedName()).getAnnotationAttributeInitializer();
- }
- }
- return null;
- }
-
- /**
- * Returns a list of all the {@link AnnotationDefinition} with the given annotation category name.
- * @param categoryName the annotation category name.
- * @return a list of annotation definitions.
- */
- public static synchronized List<AnnotationDefinition> getAnnotationsByCategory(String categoryName) {
- if (annotationsByCategoryMap == null) {
- annotationsByCategoryMap = new HashMap<String, List<AnnotationDefinition>>();
- for (AnnotationDefinition annotationDefinition : getAnnotations()) {
-
- List<AnnotationDefinition> annotationDefinitionList = annotationsByCategoryMap.get(
- annotationDefinition.getCategory());
-
- if (annotationDefinitionList == null) {
- annotationDefinitionList = new ArrayList<AnnotationDefinition>();
- annotationDefinitionList.add(annotationDefinition);
- annotationsByCategoryMap.put(annotationDefinition.getCategory(),
- annotationDefinitionList);
- continue;
- }
- annotationDefinitionList.add(annotationDefinition);
- }
- }
- return annotationsByCategoryMap.get(categoryName);
- }
-
- /**
- * Returns a list of the annotation categories.
- * @return a list of annotation categories.
- */
- public static List<String> getAnnotationCategories() {
- return Arrays.asList(getAnnotationCategoryCache().values().toArray(
- new String[getAnnotationCategoryCache().size()]));
- }
-
- private static String getAnnotationCategory(String categoryId) {
- return getAnnotationCategoryCache().get(categoryId);
- }
-
- private static synchronized Map<String, String> getAnnotationCategoryCache() {
- if (annotationCategoryCache != null) {
- return annotationCategoryCache;
- }
- annotationCategoryCache = new HashMap<String, String>();
-
- IExtensionPoint extensionPoint = Platform.getExtensionRegistry().getExtensionPoint(
- AnnotationsCorePlugin.PLUGIN_ID, ANNOTATION_CATEGORY);
- if (extensionPoint != null) {
- IConfigurationElement[] elements = extensionPoint.getConfigurationElements();
- for (int i = 0; i < elements.length; i++) {
- IConfigurationElement element = elements[i];
- annotationCategoryCache.put(getAttributeValue(element, ATT_ID),
- getAttributeValue(element, ATT_NAME));
- }
- }
- return annotationCategoryCache;
- }
-
- protected static synchronized Map<String, IConfigurationElement> getAnnotationInitializerCache() {
- if (annotationInitializerCache != null) {
- return annotationInitializerCache;
- }
- annotationInitializerCache = new HashMap<String, IConfigurationElement>();
-
- IExtensionPoint extensionPoint = Platform.getExtensionRegistry().getExtensionPoint(
- AnnotationsCorePlugin.PLUGIN_ID, ANNOTATION_INITIALIZER);
- if (extensionPoint != null) {
- IConfigurationElement[] elements = extensionPoint.getConfigurationElements();
- for (int i = 0; i < elements.length; i++) {
- IConfigurationElement element = elements[i];
- annotationInitializerCache.put(getAttributeValue(element, ANNOTATION),
- element);
- }
- }
- return annotationInitializerCache;
- }
-
- public static synchronized Map<String, List<IConfigurationElement>> getAnnotationProcessorsCache() {
- if (annotationProcessorCache == null) {
- annotationProcessorCache = new HashMap<String, List<IConfigurationElement>>();
-
- IExtensionPoint extensionPoint = Platform.getExtensionRegistry().getExtensionPoint(
- AnnotationsCorePlugin.PLUGIN_ID, ANNOTATION_PROCESSOR);
- if (extensionPoint != null) {
- IConfigurationElement[] elements = extensionPoint.getConfigurationElements();
- for (int i = 0; i < elements.length; i++) {
- IConfigurationElement element = elements[i];
- if (element.getName().equalsIgnoreCase("processor")) {
- String annotationKey = getAttributeValue(element, ANNOTATION);
- List<IConfigurationElement> configurationElements = annotationProcessorCache.get(
- annotationKey);
- if (configurationElements == null) {
- configurationElements = new ArrayList<IConfigurationElement>();
- configurationElements.add(element);
- annotationProcessorCache.put(annotationKey, configurationElements);
- continue;
- }
- configurationElements.add(element);
- }
- }
- }
- }
- return annotationProcessorCache;
- }
-
- static String getAttributeValue(IConfigurationElement configurationElement, String attributeName) {
- String attribute = configurationElement.getAttribute(attributeName);
- if (attribute != null) {
- return attribute;
- }
- return ""; //$NON-NLS-1$
- }
-
- private static List<AnnotationDefinition> getAllAnnotationsForElement(IJavaElement javaElement) throws JavaModelException {
- if (javaElement instanceof IPackageDeclaration) {
- return getAnnotationsForElementType(javaElement, ElementType.PACKAGE);
- }
-
- if (javaElement instanceof IType) {
- IType type = (IType) javaElement;
- if (type.isAnnotation()) {
- return getAnnotationsForElementType(javaElement, ElementType.ANNOTATION_TYPE);
- }
- return getAnnotationsForElementType(javaElement, ElementType.TYPE);
- }
-
- if (javaElement instanceof IField) {
- return getAnnotationsForElementType(javaElement, ElementType.FIELD);
- }
-
- if (javaElement instanceof IMethod) {
- return getAnnotationsForElementType(javaElement, ElementType.METHOD);
- }
-
- if (javaElement instanceof ILocalVariable) {
- return getAnnotationsForElementType(javaElement, ElementType.PARAMETER);
- }
-
- if (javaElement instanceof IAnnotation) {
- return getAnnotationsForElementType(javaElement, ElementType.ANNOTATION_TYPE);
- }
-
- return Collections.emptyList();
- }
-
- private static List<AnnotationDefinition> getAnnotationsForElementType(IJavaElement javaElement, ElementType elementType) {
- List<AnnotationDefinition> annotationDefinitions = new ArrayList<AnnotationDefinition>();
-
- if (annotationCache == null) {
- getAnnotations();
- }
-
- for (AnnotationDefinition annotationDefinition : annotationCache) {
- annotationDefinition.setJavaProject(javaElement.getJavaProject());
-
- if (annotationDefinition.getAnnotationTypeTargets().contains(elementType) &&
- !annotationDefinition.isDeprecated()) {
- annotationDefinitions.add(annotationDefinition);
- }
- }
- return annotationDefinitions;
- }
-
- private static void filterAnnotationsList(IJavaElement javaElement,
- List<AnnotationDefinition> annotationDefinitions) throws JavaModelException {
- Iterator<AnnotationDefinition> annotationIter = annotationDefinitions.iterator();
- while (annotationIter.hasNext()) {
- AnnotationDefinition annotationDefinition = annotationIter.next();
-
- if (javaElement instanceof IType) {
- IType type = (IType) javaElement;
- if (isClassRestricted(type, annotationDefinition)
- || isInterfaceRestricted(type, annotationDefinition)
- || isEnumRestricted(type, annotationDefinition)) {
- annotationIter.remove();
- }
- }
- if (javaElement instanceof IMethod) {
- IMethod method = (IMethod) javaElement;
- if (method.isMainMethod()) {
- annotationIter.remove();
- }
- if (method.isConstructor()
- && !annotationDefinition.getAnnotationTypeTargets().contains(ElementType.CONSTRUCTOR)) {
- annotationIter.remove();
- }
-
- if (isClassRestricted(method, annotationDefinition)
- || isInterfaceRestricted(method, annotationDefinition)
- || isEnumRestricted(method, annotationDefinition)) {
- annotationIter.remove();
- }
- }
-
- if (javaElement instanceof IField) {
- if(isClassRestricted(javaElement, annotationDefinition)
- || isInterfaceRestricted(javaElement, annotationDefinition)
- ||isEnumRestricted(javaElement, annotationDefinition)) {
- annotationIter.remove();
- }
- }
- }
- }
-
- private static boolean isClassRestricted(IJavaElement javaElement,
- AnnotationDefinition annotationDefinition) throws JavaModelException {
- if (javaElement.getElementType() == IJavaElement.TYPE) {
- return !((IType)javaElement).isClass() && annotationDefinition.isClassOnly();
- }
- if (javaElement.getElementType() == IJavaElement.METHOD) {
- IType type = (IType)javaElement.getParent();
- return !type.isClass() && annotationDefinition.isClassOnly();
- }
- if (javaElement.getElementType() == IJavaElement.FIELD) {
- IType type = (IType)javaElement.getParent();
- return !type.isClass() && annotationDefinition.isClassOnly();
- }
- return false;
- }
-
- private static boolean isInterfaceRestricted(IJavaElement javaElement,
- AnnotationDefinition annotationDefinition) throws JavaModelException {
- if (javaElement.getElementType() == IJavaElement.TYPE) {
- return !((IType)javaElement).isInterface() && annotationDefinition.isInterfaceOnly();
- }
- if (javaElement.getElementType() == IJavaElement.METHOD) {
- IType type = (IType)javaElement.getParent();
- return !type.isInterface() && annotationDefinition.isInterfaceOnly();
- }
- if (javaElement.getElementType() == IJavaElement.FIELD) {
- IType type = (IType)javaElement.getParent();
- return !type.isInterface() && annotationDefinition.isInterfaceOnly();
- }
- return false;
- }
-
- private static boolean isEnumRestricted(IJavaElement javaElement,
- AnnotationDefinition annotationDefinition) throws JavaModelException {
- if (javaElement.getElementType() == IJavaElement.TYPE) {
- return !((IType)javaElement).isEnum() && annotationDefinition.isEnumOnly();
- }
- if (javaElement.getElementType() == IJavaElement.METHOD) {
- IType type = (IType)javaElement.getParent();
- return !type.isEnum() && annotationDefinition.isEnumOnly();
- }
- if (javaElement.getElementType() == IJavaElement.FIELD) {
- IType type = (IType)javaElement.getParent();
- return !type.isEnum() && annotationDefinition.isEnumOnly();
- }
- return false;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.annotations.core/src/org/eclipse/jst/ws/annotations/core/initialization/AnnotationAttributeInitializer.java b/bundles/org.eclipse.jst.ws.annotations.core/src/org/eclipse/jst/ws/annotations/core/initialization/AnnotationAttributeInitializer.java
deleted file mode 100644
index 0bc843e..0000000
--- a/bundles/org.eclipse.jst.ws.annotations.core/src/org/eclipse/jst/ws/annotations/core/initialization/AnnotationAttributeInitializer.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.annotations.core.initialization;
-
-import java.lang.annotation.Annotation;
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.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.CompletionProposal;
-import org.eclipse.jface.text.contentassist.ICompletionProposal;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.ui.PlatformUI;
-
-/**
- * Abstract base class for initializers contributed to the
- * <code>org.eclipse.jst.ws.annotations.core.annotationInitializer</code> extension point.
- * <p>
- * Provides default implementations for all methods.
- * </p>
- * <p>
- * <strong>Provisional API:</strong> This class/interface is part of an interim API that is still under development and
- * expected to change significantly before reaching stability. It is being made available at this early stage
- * to solicit feedback from pioneering adopters on the understanding that any code that uses this API will
- * almost certainly be broken (repeatedly) as the API evolves.
- * </p>
- *
- */
-public abstract class AnnotationAttributeInitializer implements IAnnotationAttributeInitializer {
-
- protected static final String MISSING_IDENTIFER = "$missing$";
-
- protected AnnotationAttributeInitializer() {
- }
-
-
- /**
- * @deprecated as of 1.1 replaced by {@link #getMemberValuePairs(IJavaElement, AST, IType)}
- */
- @Deprecated
- public List<MemberValuePair> getMemberValuePairs(IJavaElement javaElement, AST ast, Class<? extends Annotation> annotationClass) {
- return Collections.emptyList();
- }
-
- /**
- * @since 1.1
- */
- public List<MemberValuePair> getMemberValuePairs(IJavaElement javaElement, AST ast, IType type) {
- return Collections.emptyList();
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.ws.annotations.core.initialization.IAnnotationAttributeInitializer#getCompletionProposalsForMemberValuePair(org.eclipse.jdt.core.IJavaElement, org.eclipse.jdt.core.dom.MemberValuePair)
- */
- public List<ICompletionProposal> getCompletionProposalsForMemberValuePair(IJavaElement javaElement,
- MemberValuePair memberValuePair) {
- return Collections.emptyList();
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.ws.annotations.core.initialization.IAnnotationAttributeInitializer#getCompletionProposalsForSingleMemberAnnotation(org.eclipse.jdt.core.IJavaElement, org.eclipse.jdt.core.dom.SingleMemberAnnotation)
- */
- public List<ICompletionProposal> getCompletionProposalsForSingleMemberAnnotation(IJavaElement javaElement,
- SingleMemberAnnotation singleMemberAnnotation) {
- return Collections.emptyList();
- }
-
- protected CompletionProposal createCompletionProposal(String proposal, Expression value) {
- Image image = PlatformUI.getWorkbench().getSharedImages().getImage(org.eclipse.ui.ISharedImages.IMG_OBJ_FILE);
- return createCompletionProposal(proposal, value, image, proposal);
- }
-
- protected CompletionProposal createCompletionProposal(String proposal, Expression value, Image image, String displayString) {
- int replacementOffset = value.getStartPosition();
- int replacementLength = 0;
- if (value.toString().equals(MISSING_IDENTIFER)) {
- if (proposal.charAt(0) != '\"') {
- proposal = "\"" + proposal;
- }
- if (proposal.charAt(proposal.length() - 1) != '\"') {
- proposal = proposal + "\"";
- }
- } else {
- replacementOffset += 1;
- replacementLength = value.getLength() - 2;
- }
-
- return new CompletionProposal(proposal, replacementOffset, replacementLength, proposal.length(),
- image, displayString, null, null);
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.annotations.core/src/org/eclipse/jst/ws/annotations/core/initialization/DefaultsAnnotationAttributeInitializer.java b/bundles/org.eclipse.jst.ws.annotations.core/src/org/eclipse/jst/ws/annotations/core/initialization/DefaultsAnnotationAttributeInitializer.java
deleted file mode 100644
index 0756bb4..0000000
--- a/bundles/org.eclipse.jst.ws.annotations.core/src/org/eclipse/jst/ws/annotations/core/initialization/DefaultsAnnotationAttributeInitializer.java
+++ /dev/null
@@ -1,176 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Shane Clarke.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Shane Clarke - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.annotations.core.initialization;
-
-import java.lang.annotation.Annotation;
-import java.lang.reflect.Method;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.jdt.core.IField;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.IMemberValuePair;
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jdt.core.Signature;
-import org.eclipse.jdt.core.dom.AST;
-import org.eclipse.jdt.core.dom.MemberValuePair;
-import org.eclipse.jst.ws.annotations.core.AnnotationsCore;
-import org.eclipse.jst.ws.annotations.core.AnnotationsCorePlugin;
-import org.eclipse.jst.ws.internal.annotations.core.utils.SignatureUtils;
-
-/**
- * Constructs a list of {@link MemberValuePair} using the annotation elements default values.
- * <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 class DefaultsAnnotationAttributeInitializer extends AnnotationAttributeInitializer {
-
- public DefaultsAnnotationAttributeInitializer() {
- }
-
- /**
- * Constructs a list of {@link MemberValuePair} using the declared method names and default values in
- * the given {@link java.lang.annotation.Annotation}.
- * @deprecated as of 1.1 replaced by {@link #getMemberValuePairs(IJavaElement, AST, IType)}
- */
- @Override
- @Deprecated
- public List<MemberValuePair> getMemberValuePairs(IJavaElement javaElement, AST ast, Class<? extends Annotation> annotationClass) {
- return getMemberValuePairs(ast, annotationClass);
- }
-
- /**
- * Constructs a list of {@link MemberValuePair} from the annotation type element names and default values.
- */
- @Override
- public List<MemberValuePair> getMemberValuePairs(IJavaElement javaElement, AST ast, IType type) {
- return interalGetMemberValuePairs(javaElement, ast, type);
- }
-
- private List<MemberValuePair> interalGetMemberValuePairs(IJavaElement javaElement, AST ast, IType type) {
- List<MemberValuePair> memberValuePairs = new ArrayList<MemberValuePair>();
-
- try {
- IMethod[] methods = type.getMethods();
- for (IMethod method : methods) {
- String name = method.getElementName();
- String returnType = method.getReturnType();
- IMemberValuePair defaultValue = method.getDefaultValue();
- if (defaultValue != null) {
- if (SignatureUtils.isString(returnType)) {
- memberValuePairs.add(AnnotationsCore.createStringMemberValuePair(ast,
- name, defaultValue.getValue().toString()));
- }
-
- if (SignatureUtils.isBoolean(returnType)) {
- memberValuePairs.add(AnnotationsCore.createBooleanMemberValuePair(ast,
- name, Boolean.parseBoolean(defaultValue.getValue().toString())));
- }
-
- int signatureKind = Signature.getTypeSignatureKind(returnType);
- if (signatureKind == Signature.BASE_TYPE_SIGNATURE) {
- if (returnType.charAt(0) == Signature.C_BYTE
- || returnType.charAt(0) == Signature.C_SHORT
- || returnType.charAt(0) == Signature.C_INT
- || returnType.charAt(0) == Signature.C_LONG
- || returnType.charAt(0) == Signature.C_FLOAT
- || returnType.charAt(0) == Signature.C_DOUBLE) {
- memberValuePairs.add(AnnotationsCore.createNumberMemberValuePair(ast, name, defaultValue.getValue().toString()));
- }
- }
-
- if (SignatureUtils.isArray(returnType)) {
- memberValuePairs.add(AnnotationsCore.createArrayMemberValuePair(ast, method.getElementName(),
- (Object[]) defaultValue.getValue()));
- }
-
- if (SignatureUtils.isEnum(method)) {
- if (defaultValue.getValueKind() == IMemberValuePair.K_QUALIFIED_NAME) {
- String value = defaultValue.getValue().toString();
- String enumName = value.substring(0, value.lastIndexOf("."));
- String constant = value.substring(value.lastIndexOf(".") + 1, value.length());
- IType enumType = javaElement.getJavaProject().findType(enumName);
- if (enumType != null && enumType.isEnum()) {
- IField[] fields = enumType.getFields();
- for (IField field : fields) {
- if (field.isEnumConstant() && field.getElementName().equals(constant)) {
- memberValuePairs.add(AnnotationsCore.createEnumMemberValuePair(ast,
- method.getDeclaringType().getFullyQualifiedName(), name, field));
- }
- }
- }
- }
- }
-
- if (SignatureUtils.isClass(returnType)) {
- memberValuePairs.add(AnnotationsCore.createTypeMemberValuePair(ast, name,
- defaultValue.getValue()));
- }
- }
- }
- } catch (JavaModelException jme) {
- AnnotationsCorePlugin.log(jme.getStatus());
- }
-
- return memberValuePairs;
- }
-
- private List<MemberValuePair> getMemberValuePairs(AST ast, Class<? extends Annotation> annotationClass) {
- List<MemberValuePair> memberValuePairs = new ArrayList<MemberValuePair>();
-
- Method[] declaredMethods = annotationClass.getDeclaredMethods();
- for (Method method : declaredMethods) {
- String name = method.getName();
- Class<?> returnType = method.getReturnType();
- Object defaultValue = method.getDefaultValue();
-
- if (defaultValue != null) {
- if (returnType.equals(String.class)) {
- memberValuePairs.add(AnnotationsCore.createStringMemberValuePair(ast,
- name, defaultValue.toString()));
- }
-
- if (returnType.equals(Boolean.TYPE)) {
- memberValuePairs.add(AnnotationsCore.createBooleanMemberValuePair(ast,
- name, Boolean.parseBoolean(defaultValue.toString())));
- }
-
- if (returnType.isPrimitive() && (returnType.equals(Byte.TYPE) || returnType.equals(Short.TYPE)
- || returnType.equals(Integer.TYPE) || returnType.equals(Long.TYPE)
- || returnType.equals(Float.TYPE) || returnType.equals(Double.TYPE))) {
- memberValuePairs.add(AnnotationsCore.createNumberMemberValuePair(ast, name, defaultValue.toString()));
- }
-
- if (returnType.isArray()) {
- memberValuePairs.add(AnnotationsCore.createArrayMemberValuePair(ast, method.getName(),
- (Object[]) defaultValue));
- }
-
- if (returnType.isEnum()) {
- memberValuePairs.add(AnnotationsCore.createEnumMemberValuePair(ast,
- method.getDeclaringClass().getCanonicalName(), name, defaultValue));
- }
-
- if (returnType.equals(Class.class)) {
- memberValuePairs.add(AnnotationsCore.createTypeMemberValuePair(ast, name,
- defaultValue));
- }
- }
- }
- return memberValuePairs;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.annotations.core/src/org/eclipse/jst/ws/annotations/core/initialization/IAnnotationAttributeInitializer.java b/bundles/org.eclipse.jst.ws.annotations.core/src/org/eclipse/jst/ws/annotations/core/initialization/IAnnotationAttributeInitializer.java
deleted file mode 100644
index 23b3cb6..0000000
--- a/bundles/org.eclipse.jst.ws.annotations.core/src/org/eclipse/jst/ws/annotations/core/initialization/IAnnotationAttributeInitializer.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.annotations.core.initialization;
-
-import java.util.List;
-
-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.MemberValuePair;
-import org.eclipse.jdt.core.dom.SingleMemberAnnotation;
-import org.eclipse.jface.text.contentassist.ICompletionProposal;
-
-/**
- * Base interface for annotation attribute initializers.
- * <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>
- * @noimplement This interface is not intended to be implemented by clients.
- * @noextend This interface is not intended to be extended by clients.
- */
-public interface IAnnotationAttributeInitializer {
-
- /**
- * Returns a list of {@link MemberValuePair} that may be added to a {@link org.eclipse.jdt.core.dom.NormalAnnotation}.
- * @param javaElement the java element on which the annotation is declared.
- * @param ast the <code>AST</code> with which to create the member value pairs.
- * @param annotationClass the {@link java.lang.annotation.Annotation} class which may be
- * used to query the declared members of the annotation type and the members default values.
- * @return a list of member value pairs.
- * @deprecated as of 1.1 replaced by {@link #getMemberValuePairs(IJavaElement, AST, IType)}
- */
- @Deprecated
- public List<MemberValuePair> getMemberValuePairs(IJavaElement javaElement, AST ast,
- Class<? extends java.lang.annotation.Annotation> annotationClass);
-
- /**
- * Returns a list of {@link MemberValuePair} that may be added to a {@link org.eclipse.jdt.core.dom.NormalAnnotation}.
- * @param javaElement the java element on which the annotation is declared.
- * @param ast the <code>AST</code> with which to create the member value pairs.
- * @param type the {@link org.eclipse.jdt.core.IType} which represents an annotation type,.
- * @return a list of member value pairs.
- * @since 1.1
- */
- public List<MemberValuePair> getMemberValuePairs(IJavaElement javaElement, AST ast, IType type);
-
- /**
- * Used to provide a list of {@link ICompletionProposal} for a {@link MemberValuePair} value.
- * @param javaElement the java element on which the annotation is declared.
- * @param memberValuePair the member value pair in which content assist was invoked.
- * @return a list of completion proposals.
- */
- public List<ICompletionProposal> getCompletionProposalsForMemberValuePair(IJavaElement javaElement,
- MemberValuePair memberValuePair);
-
- /**
- * Used to provide a list of {@link ICompletionProposal} for a {@link SingleMemberAnnotation} value.
- * @param javaElement the java element on which the annotation is declared.
- * @param singleMemberAnnotation the single member annotation in which content assist was invoked.
- * @return a list of completion proposals.
- */
- public List<ICompletionProposal> getCompletionProposalsForSingleMemberAnnotation(IJavaElement javaElement,
- SingleMemberAnnotation singleMemberAnnotation);
-
-
-}
diff --git a/bundles/org.eclipse.jst.ws.annotations.core/src/org/eclipse/jst/ws/annotations/core/processor/AbstractAnnotationProcessor.java b/bundles/org.eclipse.jst.ws.annotations.core/src/org/eclipse/jst/ws/annotations/core/processor/AbstractAnnotationProcessor.java
deleted file mode 100644
index 315479a..0000000
--- a/bundles/org.eclipse.jst.ws.annotations.core/src/org/eclipse/jst/ws/annotations/core/processor/AbstractAnnotationProcessor.java
+++ /dev/null
@@ -1,212 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Shane Clarke.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Shane Clarke - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.annotations.core.processor;
-
-import org.eclipse.jdt.apt.core.util.EclipseMessager;
-
-import com.sun.mirror.apt.AnnotationProcessor;
-import com.sun.mirror.apt.AnnotationProcessorEnvironment;
-import com.sun.mirror.util.SourcePosition;
-
-/**
- * Abstract base class for processors contributed to the
- * <code>org.eclipse.jst.ws.annotations.core.annotationProcessor</code> extension point.
- *
- * <p>
- * <strong>Provisional API:</strong> This class/interface is part of an interim API that is still under
- * development and expected to change significantly before reaching stability. It is being made available at
- * this early stage to solicit feedback from pioneering adopters on the understanding that any code that uses
- * this API will almost certainly be broken (repeatedly) as the API evolves.
- * </p>
- *
- */
-public abstract class AbstractAnnotationProcessor implements AnnotationProcessor {
-
- protected AnnotationProcessorEnvironment environment;
-
- protected AbstractAnnotationProcessor() {
-
- }
-
- /**
- * Set the {@link AnnotationProcessorEnvironment} environment to use during processing.
- * @param environment the annotation processor environment.
- */
- public void setAnnotationProcessorEnvironment(AnnotationProcessorEnvironment environment) {
- this.environment = environment;
- }
-
- /**
- * Process all program elements supported by this annotation processor.
- *
- * @see com.sun.mirror.apt.AnnotationProcessor
- */
- public abstract void process();
-
- /**
- * Prints an error message.
- * @param position the position where the error occured, or null if it is unknown or not applicable
- * @param message the message, or an empty string if none
- */
- protected void printError(SourcePosition position, String message) {
- environment.getMessager().printError(position, message);
- }
-
- /**
- * Prints an error message.
- * @param message the message, or an empty string if none
- */
- protected void printError(String message) {
- environment.getMessager().printError(message);
- }
-
- /**
- * Prints a warning message.
- * @param position the position where the warning occured, or null if it is unknown or not applicable
- * @param message the message, or an empty string if none
- */
- protected void printWarning(SourcePosition position, String message) {
- environment.getMessager().printWarning(position, message);
- }
-
- /**
- * Prints a warning message.
- * @param message the message, or an empty string if none
- */
- protected void printWarning(String message) {
- environment.getMessager().printWarning(message);
- }
-
- /**
- * Prints a notice.
- * @param position the position where the notice occured, or null if it is unknown or not applicable
- * @param message the message, or an empty string if none
- */
- protected void printNotice(SourcePosition position, String message) {
- environment.getMessager().printNotice(position, message);
- }
-
- /**
- * Prints a notice.
- * @param message the message, or an empty string if none
- */
- protected void printNotice(String message) {
- environment.getMessager().printNotice(message);
- }
-
- /**
- * Print an error including the given arguments for use in quick-fixes.
- * @param position position of the error
- * @param message message to display to the user
- */
- protected void printFixableError(SourcePosition position, String message) {
- if (environment.getMessager() instanceof EclipseMessager) {
- EclipseMessager messager = (EclipseMessager) environment.getMessager();
- messager.printFixableError(position, message, "", message);
- } else {
- printError(position, message);
- }
- }
-
- /**
- * Print an error including the given arguments for use in quick-fixes.
- * @param position position of the error
- * @param message message to display to the user
- * @param pluginId plug-in which will provide a java quick fix processor for this error. Cannot be null.
- * @param errorId a plug-in provided error code which will be meaningful to the java quick fix processor. Cannot be null.
- */
- protected void printFixableError(SourcePosition position, String message, String pluginId, String errorId) {
- if (environment.getMessager() instanceof EclipseMessager) {
- EclipseMessager messager = (EclipseMessager) environment.getMessager();
- messager.printFixableError(position, message, pluginId, errorId);
- } else {
- printError(position, message);
- }
- }
-
- /**
- * Print an error including the given arguments for use in quick-fixes.
- * @param message message to display to the user
- * @param pluginId plug-in which will provide a java quick fix processor for this error. Cannot be null.
- * @param errorId a plug-in provided error code which will be meaningful to the java quick fix processor. Cannot be null.
- */
- protected void printFixableError(String message, String pluginId, String errorId) {
- if (environment.getMessager() instanceof EclipseMessager) {
- EclipseMessager messager = (EclipseMessager) environment.getMessager();
- messager.printFixableError(message, pluginId, errorId);
- } else {
- printError(message);
- }
- }
-
- /**
- * Print a warning including the given arguments for use in quick-fixes.
- * @param position position of the warning
- * @param message message to display to the user
- * @param pluginId plug-in which will provide a java quick fix processor for this error. Cannot be null.
- * @param errorId a plug-in provided error code which will be meaningful to the java quick fix processor. Cannot be null.
- */
- protected void printFixableWarning(SourcePosition position, String message, String pluginId, String errorId) {
- if (environment.getMessager() instanceof EclipseMessager) {
- EclipseMessager messager = (EclipseMessager) environment.getMessager();
- messager.printFixableWarning(position, message, pluginId, errorId);
- } else {
- printWarning(position, message);
- }
- }
-
- /**
- * Print a warning including the given arguments for use in quick-fixes.
- * @param message message to display to the user
- * @param pluginId plug-in which will provide a java quick fix processor for this error. Cannot be null.
- * @param errorId a plug-in provided error code which will be meaningful to the java quick fix processor. Cannot be null.
- */
- protected void printFixableWarning(String message, String pluginId, String errorId) {
- if (environment.getMessager() instanceof EclipseMessager) {
- EclipseMessager messager = (EclipseMessager) environment.getMessager();
- messager.printFixableWarning(message, pluginId, errorId);
- } else {
- printWarning(message);
- }
- }
-
- /**
- * Print a notice including the given arguments for use in quick-fixes.
- * @param position position of the notice
- * @param message message to display to the user
- * @param pluginId plug-in which will provide a java quick fix processor for this error. Cannot be null.
- * @param errorId a plug-in provided error code which will be meaningful to the java quick fix processor. Cannot be null.
- */
- protected void printFixableNotice(SourcePosition position, String message, String pluginId, String errorId) {
- if (environment.getMessager() instanceof EclipseMessager) {
- EclipseMessager messager = (EclipseMessager) environment.getMessager();
- messager.printFixableNotice(position, message, pluginId, errorId);
- } else {
- printNotice(position, message);
- }
- }
-
- /**
- * Print a notice including the given arguments for use in quick-fixes.
- * @param message message to display to the user
- * @param pluginId plug-in which will provide a java quick fix processor for this error. Cannot be null.
- * @param errorId a plug-in provided error code which will be meaningful to the java quick fix processor. Cannot be null.
- */
- protected void printFixableNotice(String message, String pluginId, String errorId) {
- if (environment.getMessager() instanceof EclipseMessager) {
- EclipseMessager messager = (EclipseMessager) environment.getMessager();
- messager.printFixableNotice(message, pluginId, errorId);
- } else {
- printNotice(message);
- }
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.annotations.core/src/org/eclipse/jst/ws/annotations/core/utils/AnnotationUtils.java b/bundles/org.eclipse.jst.ws.annotations.core/src/org/eclipse/jst/ws/annotations/core/utils/AnnotationUtils.java
deleted file mode 100644
index cbb7d5e..0000000
--- a/bundles/org.eclipse.jst.ws.annotations.core/src/org/eclipse/jst/ws/annotations/core/utils/AnnotationUtils.java
+++ /dev/null
@@ -1,1444 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IONA Technologies PLC, Shane Clarke
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms 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
- * Shane Clarke - Rewrote API
- *******************************************************************************/
-package org.eclipse.jst.ws.annotations.core.utils;
-
-import java.lang.annotation.ElementType;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.jdt.core.IAnnotatable;
-import org.eclipse.jdt.core.IAnnotation;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IField;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.ILocalVariable;
-import org.eclipse.jdt.core.IMemberValuePair;
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jdt.core.IPackageDeclaration;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jdt.core.Signature;
-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.Annotation;
-import org.eclipse.jdt.core.dom.AnnotationTypeDeclaration;
-import org.eclipse.jdt.core.dom.BodyDeclaration;
-import org.eclipse.jdt.core.dom.BooleanLiteral;
-import org.eclipse.jdt.core.dom.ChildListPropertyDescriptor;
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jdt.core.dom.EnumDeclaration;
-import org.eclipse.jdt.core.dom.Expression;
-import org.eclipse.jdt.core.dom.FieldDeclaration;
-import org.eclipse.jdt.core.dom.IExtendedModifier;
-import org.eclipse.jdt.core.dom.MemberValuePair;
-import org.eclipse.jdt.core.dom.MethodDeclaration;
-import org.eclipse.jdt.core.dom.Name;
-import org.eclipse.jdt.core.dom.NormalAnnotation;
-import org.eclipse.jdt.core.dom.PackageDeclaration;
-import org.eclipse.jdt.core.dom.QualifiedName;
-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.TypeDeclaration;
-import org.eclipse.jdt.core.dom.VariableDeclarationFragment;
-import org.eclipse.jdt.core.dom.rewrite.ASTRewrite;
-import org.eclipse.jdt.core.dom.rewrite.ImportRewrite;
-import org.eclipse.jdt.core.dom.rewrite.ListRewrite;
-import org.eclipse.jdt.ui.CodeStyleConfiguration;
-import org.eclipse.jdt.ui.SharedASTProvider;
-import org.eclipse.jst.ws.annotations.core.AnnotationDefinition;
-import org.eclipse.jst.ws.annotations.core.AnnotationsCorePlugin;
-import org.eclipse.jst.ws.annotations.core.AnnotationsManager;
-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.text.edits.TextEdit;
-
-import com.sun.mirror.declaration.AnnotationMirror;
-import com.sun.mirror.declaration.AnnotationTypeElementDeclaration;
-import com.sun.mirror.declaration.AnnotationValue;
-import com.sun.mirror.declaration.Declaration;
-import com.sun.mirror.declaration.ParameterDeclaration;
-
-/**
- * Utility class for adding, removing and updating annotations and member value pairs.
- * <p>
- * <strong>Provisional API:</strong> This class/interface is part of an interim API that is still under
- * development and expected to change significantly before reaching stability. It is being made available at
- * this early stage to solicit feedback from pioneering adopters on the understanding that any code that uses
- * this API will almost certainly be broken (repeatedly) as the API evolves.
- * </p>
- */
-public final class AnnotationUtils {
-
- private AnnotationUtils() {
- }
-
- /**
- * Adds an import to the compilation unit of the given {@link IJavaElement}.
- * @param javaElement the java element which is used to get the compilation unit to add the import to.
- * The following types of java elements are supported:
- * <li>IJavaElement.COMPILATION_UNIT</li>
- * <li>IJavaElement.PACKAGE_DECLARATION</li>
- * <li>IJavaElement.TYPE</li>
- * <li>IJavaElement.FIELD</li>
- * <li>IJavaElement.METHOD</li>
- * <li>IJavaElement.LOCAL_VARIABLE</li>
- * @param qualifiedName the import to add.
- * @throws CoreException the exception is thrown if the import rewrite fails.
- */
- public static void addImport(IJavaElement javaElement, String qualifiedName) throws CoreException {
- TextFileChange change = new TextFileChange("Add Import", (IFile) javaElement.getResource());
- MultiTextEdit multiTextEdit = new MultiTextEdit();
- change.setEdit(multiTextEdit);
-
- TextEdit annotationEdit = AnnotationUtils.createAddImportTextEdit(javaElement, qualifiedName);
- change.addEdit(annotationEdit);
- applyChange(null, change);
- }
-
- /**
- * Removes an import from the compilation unit of the given {@link IJavaElement}. The import will not be removed if the
- * import type is referenced on more than one annotatable element in the source code. This method
- * is intended to be used in conjunction with {@link AnnotationUtils#removeAnnotation(IJavaElement, Annotation)}}.
- * @param javaElement the java element which is used to get the compilation unit to remove the import from.
- * The following types of java elements are supported:
- * <li>IJavaElement.COMPILATION_UNIT</li>
- * <li>IJavaElement.PACKAGE_DECLARATION</li>
- * <li>IJavaElement.TYPE</li>
- * <li>IJavaElement.FIELD</li>
- * <li>IJavaElement.METHOD</li>
- * <li>IJavaElement.LOCAL_VARIABLE</li>
- * @param qualifiedName the import to remove.
- * @throws CoreException the exception is thrown if the import rewrite fails.
- */
- public static void removeImport(IJavaElement javaElement, String qualifiedName) throws CoreException {
- TextFileChange change = new TextFileChange("Remove Import", (IFile) javaElement.getResource());
- MultiTextEdit multiTextEdit = new MultiTextEdit();
- change.setEdit(multiTextEdit);
-
- TextEdit annotationEdit = AnnotationUtils.createRemoveImportTextEdit(javaElement, qualifiedName);
- change.addEdit(annotationEdit);
- applyChange(null, change);
- }
-
- /**
- * Adds the given {@link Annotation} to the {@link IJavaElement}.
- * @param javaElement the following types of java elements are supported:
- * <li>IJavaElement.PACKAGE_DECLARATION</li>
- * <li>IJavaElement.TYPE</li>
- * <li>IJavaElement.FIELD</li>
- * <li>IJavaElement.METHOD</li>
- * <li>IJavaElement.LOCAL_VARIABLE</li>
- * @param annotation the annotation to add.
- * @throws JavaModelException A {@link JavaModelException} is thrown when the underlying compilation units
- * buffer could not be accessed.
- */
- public static void addAnnotation(IJavaElement javaElement, Annotation annotation) throws JavaModelException {
- TextFileChange change = new TextFileChange("Add annotation", (IFile) javaElement.getResource());
- MultiTextEdit multiTextEdit = new MultiTextEdit();
- change.setEdit(multiTextEdit);
-
- TextEdit annotationEdit = AnnotationUtils.createAddAnnotationTextEdit(javaElement, annotation);
- change.addEdit(annotationEdit);
- applyChange(null, change);
- }
-
- /**
- * Removes the given {@link Annotation} from the {@link IJavaElement}.
- * @param javaElement the following types of java elements are supported:
- * <li>IJavaElement.PACKAGE_DECLARATION</li>
- * <li>IJavaElement.TYPE</li>
- * <li>IJavaElement.FIELD</li>
- * <li>IJavaElement.METHOD</li>
- * <li>IJavaElement.LOCAL_VARIABLE</li>
- * @param annotation the annotation to remove.
- * @throws JavaModelException A {@link JavaModelException} is thrown when the underlying compilation units
- * buffer could not be accessed.
- */
- public static void removeAnnotation(IJavaElement javaElement, Annotation annotation) throws JavaModelException {
- TextFileChange change = new TextFileChange("Remove annotation", (IFile) javaElement.getResource());
- MultiTextEdit multiTextEdit = new MultiTextEdit();
- change.setEdit(multiTextEdit);
-
- TextEdit textEdit = AnnotationUtils.createRemoveAnnotationTextEdit(javaElement, annotation);
- change.addEdit(textEdit);
- applyChange(null, change);
- }
-
- /**
- * Adds the {@link MemberValuePair} to the {@link NormalAnnotation}.
- * @param annotation the normal annotation to add the member value pair to.
- * @param memberValuePair the member value pair to add.
- * @throws JavaModelException A {@link JavaModelException} is thrown when the underlying compilation units
- * buffer could not be accessed.
- */
- public static void addMemberValuePair(NormalAnnotation annotation, MemberValuePair memberValuePair) throws JavaModelException {
- if (annotation.getRoot() instanceof CompilationUnit) {
- CompilationUnit compilationUnit = (CompilationUnit) annotation.getRoot();
- TextFileChange change = new TextFileChange("Add Member Value Pair", (IFile) compilationUnit.getJavaElement().getResource());
- MultiTextEdit multiTextEdit = new MultiTextEdit();
- change.setEdit(multiTextEdit);
-
- TextEdit annotationEdit = AnnotationUtils.createAddMemberValuePairTextEdit(annotation, memberValuePair);
- change.addEdit(annotationEdit);
- applyChange(null, change);
- }
- }
-
- /**
- * Removes the {@link MemberValuePair} from the {@link NormalAnnotation}.
- * @param annotation the normal annotation from which to remove the member value pair.
- * @param memberValuePair the member value pair to remove.
- * @throws JavaModelException A {@link JavaModelException} is thrown when the underlying compilation units
- * buffer could not be accessed.
- */
- public static void removeMemberValuePair(NormalAnnotation annotation, MemberValuePair memberValuePair) throws JavaModelException {
- if (annotation.getRoot() instanceof CompilationUnit) {
- CompilationUnit compilationUnit = (CompilationUnit) annotation.getRoot();
- TextFileChange change = new TextFileChange("Remove Member Value Pair", (IFile) compilationUnit.getJavaElement().getResource());
- MultiTextEdit multiTextEdit = new MultiTextEdit();
- change.setEdit(multiTextEdit);
-
- TextEdit annotationEdit = AnnotationUtils.createRemoveMemberValuePairTextEdit(annotation, memberValuePair);
- change.addEdit(annotationEdit);
- applyChange(null, change);
- }
- }
-
- /**
- * Updates the {@link MemberValuePair} value with the given {@link ASTNode}.
- * @param memberValuePair the member value pair to update.
- * @param value the value to set.
- * @throws JavaModelException A {@link JavaModelException} is thrown when the underlying compilation units
- * buffer could not be accessed.
- */
- public static void updateMemberValuePair(MemberValuePair memberValuePair, ASTNode value) throws JavaModelException {
- if (memberValuePair.getRoot() instanceof CompilationUnit) {
- CompilationUnit compilationUnit = (CompilationUnit) memberValuePair.getRoot();
- TextFileChange change = new TextFileChange("Update Member Value Pair", (IFile) compilationUnit.getJavaElement().getResource());
- MultiTextEdit multiTextEdit = new MultiTextEdit();
- change.setEdit(multiTextEdit);
-
- TextEdit annotationEdit = AnnotationUtils.createUpdateMemberValuePairTextEdit(memberValuePair, value);
- change.addEdit(annotationEdit);
- applyChange(null, change);
- }
- }
-
- /**
- * Updates the value of the {@link SingleMemberAnnotation} with the given {@link ASTNode}.
- * @param annotation the single member annotation to update.
- * @param value the value to set.
- * @throws JavaModelException A {@link JavaModelException} is thrown when the underlying compilation units
- * buffer could not be accessed.
- */
- public static void updateSingleMemberAnnotation(SingleMemberAnnotation annotation, ASTNode value) throws JavaModelException {
- if (annotation.getRoot() instanceof CompilationUnit) {
- CompilationUnit compilationUnit = (CompilationUnit) annotation.getRoot();
- TextFileChange change = new TextFileChange("Update Single Member Annotation", (IFile) compilationUnit.getJavaElement().getResource());
- MultiTextEdit multiTextEdit = new MultiTextEdit();
- change.setEdit(multiTextEdit);
-
- TextEdit annotationEdit = AnnotationUtils.createUpdateSingleMemberAnnotationTextEdit(annotation, value);
- change.addEdit(annotationEdit);
- applyChange(null, change);
- }
- }
-
- /**
- * Creates a {@link TextEdit} object representing the add import change to the source code of the java elements compilation unit.
- * The compilation unit itself is not modified.
- * @param javaElement one of the following types of java element:
- * <li>IJavaElement.COMPILATION_UNIT</li>
- * <li>IJavaElement.PACKAGE_DECLARATION</li>
- * <li>IJavaElement.TYPE</li>
- * <li>IJavaElement.FIELD</li>
- * <li>IJavaElement.METHOD</li>
- * <li>IJavaElement.LOCAL_VARIABLE</li>
- * <p>
- * The java element will be used to create a {@link CompilationUnit} which will in turn be used to create an {@link ImportRewrite}.
- * </p>
- * @param qualifiedName the import to add.
- * @return text edit object describing the add import changes.
- * @throws CoreException the exception is thrown if the import rewrite fails.
- */
- public static TextEdit createAddImportTextEdit(IJavaElement javaElement, String qualifiedName) throws CoreException {
- CompilationUnit compilationUnit = SharedASTProvider.getAST(getCompilationUnitFromJavaElement(javaElement), SharedASTProvider.WAIT_YES, null);
- ImportRewrite importRewrite = CodeStyleConfiguration.createImportRewrite(compilationUnit, true);
- importRewrite.addImport(qualifiedName);
- return importRewrite.rewriteImports(null);
- }
-
- /**
- * Creates a {@link TextEdit} object representing the remove import change to the source code of the java elements compilation unit.
- * The compilation unit itself is not modified. No change will be recorded if the import type is referenced on more than one an annotatable
- * element in the source code. This method should be called in conjunction with {@link AnnotationUtils#createRemoveAnnotationTextEdit(IJavaElement, Annotation)}}.
- * @param javaElement one of the following types of java element:
- * <li>IJavaElement.COMPILATION_UNIT</li>
- * <li>IJavaElement.PACKAGE_DECLARATION</li>
- * <li>IJavaElement.TYPE</li>
- * <li>IJavaElement.FIELD</li>
- * <li>IJavaElement.METHOD</li>
- * <li>IJavaElement.LOCAL_VARIABLE</li>
- * <p>
- * The java element will be used to create a {@link CompilationUnit} which will in turn be used to create an {@link ImportRewrite}.
- * </p>
- * @param qualifiedName the annotation import to remove.
- * @return text edit object describing the remove import changes.
- * @throws CoreException the exception is thrown if the import rewrite fails.
- */
- @SuppressWarnings("unchecked")
- public static TextEdit createRemoveImportTextEdit(IJavaElement javaElement, String qualifiedName) throws CoreException {
- CompilationUnit compilationUnit = SharedASTProvider.getAST(getCompilationUnitFromJavaElement(javaElement), SharedASTProvider.WAIT_YES, null);
- ImportRewrite importRewrite = CodeStyleConfiguration.createImportRewrite(compilationUnit, true);
- final String annotationSimpleName = qualifiedName.substring(qualifiedName.lastIndexOf(".") + 1);
- final List<String> occurences = new ArrayList<String>();
- AnnotationDefinition annotationDefinition = AnnotationsManager.getAnnotationDefinitionForClass(qualifiedName);
- annotationDefinition.setJavaProject(javaElement.getJavaProject());
- List<ElementType> elementTypes = Collections.emptyList();
- if (annotationDefinition != null) {
- elementTypes = annotationDefinition.getAnnotationTypeTargets();
- }
- for (ElementType elementType : elementTypes) {
- if (elementType == ElementType.PACKAGE) {
- compilationUnit.accept(new ASTVisitor() {
- @Override
- public boolean visit(PackageDeclaration packageDeclaration) {
- countAnnotationOccurrences(packageDeclaration.annotations(),
- annotationSimpleName, occurences);
- return false;
- }
- });
- }
- if (elementType == ElementType.TYPE) {
- compilationUnit.accept(new ASTVisitor() {
- @Override
- public boolean visit(TypeDeclaration typeDeclaration) {
- countAnnotationOccurrences(typeDeclaration.modifiers(),
- annotationSimpleName, occurences);
- return false;
- }
- });
- }
- if (elementType == ElementType.FIELD) {
- compilationUnit.accept(new ASTVisitor() {
- @Override
- public boolean visit(FieldDeclaration fieldDeclaration) {
- countAnnotationOccurrences(
- fieldDeclaration.modifiers(),
- annotationSimpleName, occurences);
- return false;
- }
- });
- }
- if (elementType == ElementType.METHOD) {
- compilationUnit.accept(new ASTVisitor() {
- @Override
- public boolean visit(MethodDeclaration methodDeclaration) {
- countAnnotationOccurrences(methodDeclaration
- .modifiers(), annotationSimpleName, occurences);
- return false;
- }
- });
- }
- if (elementType == ElementType.PARAMETER) {
- compilationUnit.accept(new ASTVisitor() {
- @Override
- public boolean visit(
- SingleVariableDeclaration singleVariableDeclaration) {
- countAnnotationOccurrences(singleVariableDeclaration
- .modifiers(), annotationSimpleName, occurences);
- return false;
- }
- });
- }
- }
- if (occurences.size() == 1) {
- importRewrite.removeImport(qualifiedName);
- }
- // TODO Cleanup imports. Repeatedly adding and removing an import
- // where none existed before will
- // insert a new line on each insert.
- return importRewrite.rewriteImports(null);
- }
-
- private static void countAnnotationOccurrences(List<IExtendedModifier> modifiers, String annotationSimpleName,
- List<String> occurences) {
- for (IExtendedModifier extendedModifier : modifiers) {
- if (extendedModifier instanceof Annotation) {
- Annotation existingAnnotation = (Annotation) extendedModifier;
- if (AnnotationUtils.getAnnotationName(existingAnnotation).equals(annotationSimpleName)) {
- occurences.add(annotationSimpleName);
- }
- }
- }
- }
-
- /**
- * Creates a {@link TextEdit} object representing the add annotation change to the source code of the java elements compilation unit.
- * The compilation unit itself is not modified.
- * @param javaElement one of the following types of java element:
- * <li>IJavaElement.PACKAGE_DECLARATION</li>
- * <li>IJavaElement.TYPE</li>
- * <li>IJavaElement.FIELD</li>
- * <li>IJavaElement.METHOD</li>
- * <li>IJavaElement.LOCAL_VARIABLE</li>
- * @param annotation the annotation to add.
- * @return text edit object describing the add annotation changes. Returns a {@link MultiTextEdit} if the given java element isn't supported.
- * @throws JavaModelException A {@link JavaModelException} is thrown when the underlying compilation units
- * buffer could not be accessed.
- */
- public static TextEdit createAddAnnotationTextEdit(IJavaElement javaElement, Annotation annotation) throws JavaModelException {
- switch(javaElement.getElementType()) {
- case IJavaElement.PACKAGE_DECLARATION:
- return createAddAnnotationTextEdit((IPackageDeclaration) javaElement, annotation);
- case IJavaElement.TYPE:
- return createAddAnnotationTextEdit((IType) javaElement, annotation);
- case IJavaElement.FIELD:
- return createAddAnnotationTextEdit((IField) javaElement, annotation);
- case IJavaElement.METHOD:
- return createAddAnnotationTextEdit((IMethod) javaElement, annotation);
- case IJavaElement.LOCAL_VARIABLE:
- return createAddAnnotationTextEdit((ILocalVariable) javaElement, annotation);
- default:
- return new MultiTextEdit();
- }
- }
-
- /**
- * Creates a {@link TextEdit} object representing the remove annotation change to the source code of the java elements compilation unit.
- * The compilation unit itself is not modified.
- * @param javaElement one of the following types of java element:
- * <li>IJavaElement.PACKAGE_DECLARATION</li>
- * <li>IJavaElement.TYPE</li>
- * <li>IJavaElement.FIELD</li>
- * <li>IJavaElement.METHOD</li>
- * <li>IJavaElement.LOCAL_VARIABLE</li>
- * @param annotation the annotation to add.
- * @return text edit object describing the add annotation changes. Returns a {@link MultiTextEdit} if the given java element isn't supported.
- * @throws JavaModelException A {@link JavaModelException} is thrown when the underlying compilation units
- * buffer could not be accessed.
- */
- public static TextEdit createRemoveAnnotationTextEdit(IJavaElement javaElement, Annotation annotation) throws JavaModelException {
- switch(javaElement.getElementType()) {
- case IJavaElement.PACKAGE_DECLARATION:
- return createRemoveAnnotationTextEdit((IPackageDeclaration) javaElement, annotation);
- case IJavaElement.TYPE:
- return createRemoveAnnotationTextEdit((IType) javaElement, annotation);
- case IJavaElement.FIELD:
- return createRemoveAnnotationTextEdit((IField) javaElement, annotation);
- case IJavaElement.METHOD:
- return createRemoveAnnotationTextEdit((IMethod) javaElement, annotation);
- case IJavaElement.LOCAL_VARIABLE:
- return createRemoveAnnotationTextEdit((ILocalVariable) javaElement, annotation);
- default:
- return new MultiTextEdit();
- }
- }
-
- private static void applyChange(IProgressMonitor monitor, Change change) {
- if (change == null) {
- return;
- }
-
- if (monitor == null) {
- monitor = new NullProgressMonitor();
- }
-
- 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) {
- AnnotationsCorePlugin.log(ce.getStatus());
- } finally {
- manager.changePerformed(change, successful);
- }
- if (undoChange != null) {
- undoChange.initializeValidationData(monitor);
- manager.addUndo(undoChange.getName(), undoChange);
- }
- }
-
- private static TextEdit createAddAnnotationTextEdit(IPackageDeclaration packageDeclaration, Annotation annotation) throws JavaModelException {
- if (packageDeclaration != null && !isAnnotationPresent(packageDeclaration, AnnotationUtils.getAnnotationName(annotation))) {
- ICompilationUnit source = getCompilationUnitFromJavaElement(packageDeclaration);
- CompilationUnit compilationUnit = SharedASTProvider.getAST(source, SharedASTProvider.WAIT_YES, null);
- ASTRewrite rewriter = ASTRewrite.create(compilationUnit.getAST());
-
- ListRewrite listRewrite = rewriter.getListRewrite(compilationUnit.getPackage(), PackageDeclaration.ANNOTATIONS_PROPERTY);
-
- listRewrite.insertFirst(annotation, null);
-
- return rewriter.rewriteAST();
- }
- return new MultiTextEdit();
- }
-
- private static TextEdit createRemoveAnnotationTextEdit(IPackageDeclaration packageDeclaration, Annotation annotation) throws JavaModelException {
- if (packageDeclaration != null && isAnnotationPresent(packageDeclaration, getAnnotationName(annotation))) {
- ICompilationUnit source = getCompilationUnitFromJavaElement(packageDeclaration);
- CompilationUnit compilationUnit = SharedASTProvider.getAST(source, SharedASTProvider.WAIT_YES, null);
- ASTRewrite rewriter = ASTRewrite.create(compilationUnit.getAST());
-
- PackageDeclaration pkgDeclaration = compilationUnit.getPackage();
-
- ListRewrite listRewrite = rewriter.getListRewrite(pkgDeclaration, PackageDeclaration.ANNOTATIONS_PROPERTY);
-
- @SuppressWarnings("unchecked")
- List originalList = listRewrite.getOriginalList();
- for (Object object : originalList) {
- if (object instanceof Annotation && compareAnnotationNames((Annotation) object, annotation)) {
- listRewrite.remove((Annotation) object, null);
- }
- }
- return rewriter.rewriteAST();
- }
- return new MultiTextEdit();
- }
-
- private static TextEdit createAddAnnotationTextEdit(IType type, Annotation annotation) throws JavaModelException {
- AbstractTypeDeclaration typeDeclaration = getTypeDeclaration(type);
- if(typeDeclaration != null && !isAnnotationPresent(type, annotation)) {
- ASTRewrite rewriter = ASTRewrite.create(typeDeclaration.getAST());
-
- ListRewrite listRewrite = rewriter.getListRewrite(typeDeclaration, getChildListPropertyDescriptorForType(typeDeclaration));
-
- listRewrite.insertFirst(annotation, null);
-
- return rewriter.rewriteAST();
- }
- return new MultiTextEdit();
- }
-
- private static TextEdit createRemoveAnnotationTextEdit(IType type, Annotation annotation) throws JavaModelException {
- AbstractTypeDeclaration typeDeclaration = getTypeDeclaration(type);
- if (typeDeclaration != null && isAnnotationPresent(type, annotation)) {
- ASTRewrite rewriter = ASTRewrite.create(typeDeclaration.getAST());
-
- ListRewrite listRewrite = rewriter.getListRewrite(typeDeclaration, getChildListPropertyDescriptorForType(typeDeclaration));
-
- @SuppressWarnings("unchecked")
- List originalList = listRewrite.getOriginalList();
- for (Object object : originalList) {
- if (object instanceof Annotation && compareAnnotationNames((Annotation)object, annotation)) {
- listRewrite.remove((Annotation)object, null);
- }
- }
- return rewriter.rewriteAST();
- }
- return new MultiTextEdit();
- }
-
- private static TextEdit createAddAnnotationTextEdit(IMethod method, Annotation annotation) throws JavaModelException {
- MethodDeclaration methodDeclaration = getMethodDeclaration(method);
- if (methodDeclaration != null && !isAnnotationPresent(method, annotation)) {
- ASTRewrite rewriter = ASTRewrite.create(methodDeclaration.getAST());
-
- ListRewrite listRewrite = rewriter.getListRewrite(methodDeclaration, MethodDeclaration.MODIFIERS2_PROPERTY);
-
- listRewrite.insertAt(annotation, 0, null);
-
- return rewriter.rewriteAST();
- }
- return new MultiTextEdit();
- }
-
- private static TextEdit createRemoveAnnotationTextEdit(IMethod method, Annotation annotation) throws JavaModelException {
- MethodDeclaration methodDeclaration = getMethodDeclaration(method);
- if (methodDeclaration != null && isAnnotationPresent(method, annotation)) {
- ASTRewrite rewriter = ASTRewrite.create(methodDeclaration.getAST());
-
- ListRewrite listRewrite = rewriter.getListRewrite(methodDeclaration, MethodDeclaration.MODIFIERS2_PROPERTY);
-
- @SuppressWarnings("unchecked")
- List originalList = listRewrite.getOriginalList();
- for (Object object : originalList) {
- if (object instanceof Annotation && compareAnnotationNames((Annotation) object, annotation)) {
- listRewrite.remove((Annotation) object, null);
- }
- }
- return rewriter.rewriteAST();
- }
- return new MultiTextEdit();
- }
-
- private static TextEdit createAddAnnotationTextEdit(IField field, Annotation annotation) throws JavaModelException {
- FieldDeclaration fieldDeclaration = getFieldDeclaration(field);
- if (fieldDeclaration != null && !isAnnotationPresent(field, annotation)) {
-
- ASTRewrite rewriter = ASTRewrite.create(fieldDeclaration.getAST());
-
- ListRewrite listRewrite = rewriter.getListRewrite(fieldDeclaration, FieldDeclaration.MODIFIERS2_PROPERTY);
- listRewrite.insertAt(annotation, 0, null);
-
- return rewriter.rewriteAST();
- }
-
- return new MultiTextEdit();
- }
-
- private static TextEdit createRemoveAnnotationTextEdit(IField field, Annotation annotation) throws JavaModelException {
- FieldDeclaration fieldDeclaration = getFieldDeclaration(field);
- if (fieldDeclaration != null && isAnnotationPresent(field, annotation)) {
- ASTRewrite rewriter = ASTRewrite.create(fieldDeclaration.getAST());
-
- ListRewrite listRewrite = rewriter.getListRewrite(fieldDeclaration, FieldDeclaration.MODIFIERS2_PROPERTY);
-
- @SuppressWarnings("unchecked")
- List originalList = listRewrite.getOriginalList();
- for (Object object : originalList) {
- if (object instanceof Annotation && compareAnnotationNames((Annotation) object, annotation)) {
- listRewrite.remove((Annotation) object, null);
- }
- }
- return rewriter.rewriteAST();
- }
- return new MultiTextEdit();
- }
-
- private static TextEdit createAddAnnotationTextEdit(ILocalVariable methodParameter, Annotation annotation) throws JavaModelException {
- SingleVariableDeclaration parameter = getSingleVariableDeclaration(methodParameter);
- if (parameter != null && !isAnnotationPresent(methodParameter, AnnotationUtils.getAnnotationName(annotation))) {
- ASTRewrite rewriter = ASTRewrite.create(parameter.getAST());
-
- ListRewrite listRewrite = rewriter.getListRewrite(parameter, SingleVariableDeclaration.MODIFIERS2_PROPERTY);
-
- listRewrite.insertAt(annotation, -1, null);
-
- return rewriter.rewriteAST();
- }
- return new MultiTextEdit();
- }
-
- private static TextEdit createRemoveAnnotationTextEdit(ILocalVariable methodParameter, Annotation annotation) throws JavaModelException {
- SingleVariableDeclaration parameter = getSingleVariableDeclaration(methodParameter);
- if (isAnnotationPresent(methodParameter, AnnotationUtils.getAnnotationName(annotation))) {
- ASTRewrite rewriter = ASTRewrite.create(parameter.getAST());
-
- ListRewrite listRewrite = rewriter.getListRewrite(parameter, SingleVariableDeclaration.MODIFIERS2_PROPERTY);
-
- @SuppressWarnings("unchecked")
- List originalList = listRewrite.getOriginalList();
- for (Object object : originalList) {
- if (object instanceof Annotation && compareAnnotationNames((Annotation)object, annotation)) {
- listRewrite.remove((Annotation)object, null);
- }
- }
-
- return rewriter.rewriteAST();
- }
- return new MultiTextEdit();
- }
-
- /**
- * Creates a {@link TextEdit} object representing the change of adding the {@link MemberValuePair} to the {@link NormalAnnotation}.
- * The underlying compilation unit itself is not modified.
- * @param annotation the normal annotation to add the member value pair to.
- * @param memberValuePair the member value pair to add.
- * @return text edit object describing the add member value pair change.
- * @throws JavaModelException A {@link JavaModelException} is thrown when
- * the underlying compilation units buffer could not be accessed.
- */
- public static TextEdit createAddMemberValuePairTextEdit(NormalAnnotation annotation, MemberValuePair memberValuePair) throws JavaModelException {
- ASTRewrite rewriter = ASTRewrite.create(annotation.getAST());
-
- ListRewrite listRewrite = rewriter.getListRewrite(annotation, NormalAnnotation.VALUES_PROPERTY);
-
- listRewrite.insertLast(memberValuePair, null);
-
- return rewriter.rewriteAST();
- }
-
- /**
- * Creates a {@link TextEdit} object representing the change of removing the {@link MemberValuePair} from the {@link NormalAnnotation}.
- * The underlying compilation unit itself is not modified.
- * @param annotation the normal annotation to remove the member value pair from.
- * @param memberValuePair the member value pair to remove.
- * @return text edit object describing the remove member value pair change.
- * @throws JavaModelException A {@link JavaModelException} is thrown when
- * the underlying compilation units buffer could not be accessed.
- */
- public static TextEdit createRemoveMemberValuePairTextEdit(NormalAnnotation annotation, MemberValuePair memberValuePair) throws JavaModelException {
- ASTRewrite rewriter = ASTRewrite.create(annotation.getAST());
-
- ListRewrite listRewrite = rewriter.getListRewrite(annotation, NormalAnnotation.VALUES_PROPERTY);
-
- @SuppressWarnings("unchecked")
- List originalList = listRewrite.getOriginalList();
- for (Object object : originalList) {
- if (object instanceof MemberValuePair) {
- MemberValuePair mvp = (MemberValuePair) object;
- if (mvp.getName().getIdentifier().equals(memberValuePair.getName().getIdentifier())) {
- listRewrite.remove(mvp, null);
- }
- }
- }
- return rewriter.rewriteAST();
- }
-
- /**
- * Creates a {@link TextEdit} object representing the change of updating the {@link MemberValuePair} with the {@link ASTNode} value.
- * The underlying compilation unit itself is not modified.
- * @param memberValuePair the member value pair to update.
- * @param value the value to set.
- * @return text edit object describing the update member value pair change.
- * @throws JavaModelException A {@link JavaModelException} is thrown when
- * the underlying compilation units buffer could not be accessed.
- */
- public static TextEdit createUpdateMemberValuePairTextEdit(MemberValuePair memberValuePair, ASTNode value) throws JavaModelException {
- ASTRewrite rewriter = ASTRewrite.create(memberValuePair.getAST());
-
- rewriter.set(memberValuePair, MemberValuePair.VALUE_PROPERTY, value, null);
-
- return rewriter.rewriteAST();
- }
-
- /**
- * Creates a {@link TextEdit} object representing the change of updating the {@link SingleMemberAnnotation} with the {@link ASTNode} value.
- * The underlying compilation unit itself is not modified.
- * @param annotation the single memeber annotation to update.
- * @param value the value to set.
- * @return text edit object describing the update single member annotation change.
- * @throws JavaModelException A {@link JavaModelException} is thrown when
- * the underlying compilation units buffer could not be accessed.
- */
- public static TextEdit createUpdateSingleMemberAnnotationTextEdit(SingleMemberAnnotation annotation, ASTNode value) throws JavaModelException {
- ASTRewrite rewriter = ASTRewrite.create(annotation.getAST());
-
- rewriter.set(annotation, SingleMemberAnnotation.VALUE_PROPERTY, value, null);
-
- return rewriter.rewriteAST();
- }
-
- /**
- * Returns a {@link ICompilationUnit} for the given {@link IJavaElement}.
- * @param javaElement one of the following types of java element:
- * <li>IJavaElement.COMPILATION_UNIT</li>
- * <li>IJavaElement.PACKAGE_DECLARATION</li>
- * <li>IJavaElement.TYPE</li>
- * <li>IJavaElement.FIELD</li>
- * <li>IJavaElement.METHOD</li>
- * <li>IJavaElement.LOCAL_VARIABLE</li>
- * @return a compilation unit.
- */
- public static ICompilationUnit getCompilationUnitFromJavaElement(IJavaElement javaElement) {
- switch(javaElement.getElementType()) {
- case IJavaElement.COMPILATION_UNIT:
- return (ICompilationUnit) javaElement;
- case IJavaElement.PACKAGE_DECLARATION:
- IPackageDeclaration packageDeclaration = (IPackageDeclaration) javaElement;
- return (ICompilationUnit) packageDeclaration.getParent();
- case IJavaElement.TYPE:
- IType type = (IType) javaElement;
- return type.getCompilationUnit();
- case IJavaElement.METHOD:
- IMethod method = (IMethod) javaElement;
- return method.getCompilationUnit();
- case IJavaElement.FIELD:
- IField field = (IField) javaElement;
- return field.getCompilationUnit();
- case IJavaElement.LOCAL_VARIABLE:
- ILocalVariable localVariable = (ILocalVariable) javaElement;
- if (localVariable.getParent() instanceof IMethod) {
- return getCompilationUnitFromJavaElement(localVariable.getParent());
- }
- default:
- return JavaCore.createCompilationUnitFrom((IFile) javaElement.getResource());
- }
- }
-
- /**
- * Returns the {@link AbstractTypeDeclaration} that corresponds to the given {@link IType}.
- * @param type the type.
- * @return a type declaration or null if not found.
- */
- @SuppressWarnings("unchecked")
- public static AbstractTypeDeclaration getTypeDeclaration(IType type) {
- CompilationUnit compilationUnit = SharedASTProvider.getAST(type.getCompilationUnit(), SharedASTProvider.WAIT_YES, null);
- List<TypeDeclaration> types = compilationUnit.types();
- for (AbstractTypeDeclaration abstractTypeDeclaration : types) {
- if (compareTypeNames(abstractTypeDeclaration, type)) {
- return abstractTypeDeclaration;
- }
- }
- return null;
- }
-
- /**
- * Returns the {@link MethodDeclaration} that corresponds to the given {@link IMethod}.
- * @param method the method
- * @return a method declaration or null if not found.
- */
- @SuppressWarnings("unchecked")
- public static MethodDeclaration getMethodDeclaration(IMethod method) {
- AbstractTypeDeclaration typeDeclaration = getTypeDeclaration(method.getDeclaringType());
- if (typeDeclaration != null) {
- List<BodyDeclaration> bodyDeclarations = typeDeclaration.bodyDeclarations();
- for (BodyDeclaration bodyDeclaration : bodyDeclarations) {
- if (bodyDeclaration instanceof MethodDeclaration) {
- MethodDeclaration methodDeclaration = (MethodDeclaration) bodyDeclaration;
- if (compareMethods(methodDeclaration, method)) {
- return methodDeclaration;
- }
- }
- }
- }
- return null;
- }
-
- /**
- * Returns the {@link FieldDeclaration} that corresponds to the given {@link IField}.
- * @param field the field
- * @return a field declaration or null if not found.
- */
- @SuppressWarnings("unchecked")
- public static FieldDeclaration getFieldDeclaration(IField field) {
- AbstractTypeDeclaration typeDeclaration = getTypeDeclaration(field.getDeclaringType());
- if (typeDeclaration != null) {
- List<BodyDeclaration> bodyDeclarations = typeDeclaration.bodyDeclarations();
- for (BodyDeclaration bodyDeclaration : bodyDeclarations) {
- if (bodyDeclaration instanceof FieldDeclaration) {
- FieldDeclaration fieldDeclaration = (FieldDeclaration) bodyDeclaration;
- if (compareFieldNames(fieldDeclaration, field)) {
- return fieldDeclaration;
- }
- }
- }
- }
- return null;
- }
-
- /**
- * Returns the {@link SingleVariableDeclaration} that corresponds to the given {@link ILocalVariable}.
- * @param javaElement the local variable
- * @return a single variable declaration or null if not found.
- */
- public static SingleVariableDeclaration getSingleVariableDeclaration(ILocalVariable javaElement) {
- if (javaElement instanceof ILocalVariable && javaElement.getParent() instanceof IMethod) {
- ILocalVariable localVariable = javaElement;
- IMethod method = (IMethod) localVariable.getParent();
- MethodDeclaration methodDeclaration = getMethodDeclaration(method);
-
- @SuppressWarnings("unchecked")
- List<SingleVariableDeclaration> parameters = methodDeclaration.parameters();
- for (SingleVariableDeclaration singleVariableDeclaration : parameters) {
- if (singleVariableDeclaration.getName().getIdentifier().equals(localVariable.getElementName())) {
- return singleVariableDeclaration;
- }
- }
- }
- return null;
- }
-
- private static ChildListPropertyDescriptor getChildListPropertyDescriptorForType(AbstractTypeDeclaration
- abstractTypeDeclaration) {
- ChildListPropertyDescriptor childListPropertyDescriptor = null;
- if (abstractTypeDeclaration instanceof TypeDeclaration) {
- childListPropertyDescriptor = TypeDeclaration.MODIFIERS2_PROPERTY;
- }
- if (abstractTypeDeclaration instanceof EnumDeclaration) {
- childListPropertyDescriptor = EnumDeclaration.MODIFIERS2_PROPERTY;
- }
- if (abstractTypeDeclaration instanceof AnnotationTypeDeclaration) {
- childListPropertyDescriptor = AnnotationTypeDeclaration.MODIFIERS2_PROPERTY;
- }
- return childListPropertyDescriptor;
- }
-
- /**
- * Returns the annotations type name. If the annotation name is a simple name, the result is the
- * name's identifier. If the name is a qualified name, the result is the name of the qualifier
- * followed by "." followed by the name's identifier.
-
- * @param annotation the annotation.
- * @return the annotation name. The simple name or the fully qualified name.
- */
- public static String getAnnotationName(Annotation annotation) {
- Name annotationTypeName = annotation.getTypeName();
- return annotationTypeName.getFullyQualifiedName();
- }
-
- /**
- * Compares the {@link AbstractTypeDeclaration} and {@link IType}.
- * @param abstractTypeDeclaration the type declaration.
- * @param type the type.
- * @return <code>true</code> if the names match.
- */
- public static boolean compareTypeNames(AbstractTypeDeclaration abstractTypeDeclaration, IType type) {
- return abstractTypeDeclaration.getName().getIdentifier().equals(type.getElementName());
- }
-
- /**
- * Compares the {@link MethodDeclaration} and {@link IMethod}.
- * @param methodDeclaration the method declaration.
- * @param method the method.
- * @return <code>true</code> if the method names and parameter types match.
- */
- @SuppressWarnings("unchecked")
- public static boolean compareMethods(MethodDeclaration methodDeclaration, IMethod method) {
- if (methodDeclaration.getName().getIdentifier().equals(method.getElementName())) {
- String[] parametetTypes = method.getParameterTypes();
- List<SingleVariableDeclaration> methodDeclarationParameters = methodDeclaration.parameters();
- if (parametetTypes.length == methodDeclarationParameters.size()) {
- for (int i = 0; i < parametetTypes.length; i++) {
- String simpleName1 = Signature.toString(parametetTypes[i]);
- String simpleName2 = methodDeclarationParameters.get(i).getType().toString();
- if (!simpleName1.equals(simpleName2)) {
- return false;
- }
- }
- return true;
- }
- }
- return false;
- }
-
- /**
- * Compares the two {@link MethodDeclaration}.
- * @param methodOne the first method declaration.
- * @param methodTwo the second method declaration.
- * @return <code>true</code> if the method names and parameter types match.
- */
- @SuppressWarnings("unchecked")
- public static boolean compareMethods(MethodDeclaration methodOne, MethodDeclaration methodTwo) {
- if (methodOne.getName().getIdentifier().equals(methodTwo.getName().getIdentifier())) {
- List<SingleVariableDeclaration> methodParametersOne = methodOne.parameters();
- List<SingleVariableDeclaration> methodParametersTwo = methodTwo.parameters();
- if (methodParametersOne.size() == methodParametersTwo.size()) {
- for (int i = 0; i < methodParametersOne.size(); i++) {
- String simpleName1 = methodParametersOne.get(i).getType().toString();
- String simpleName2 = methodParametersTwo.get(i).getType().toString();
- if (!simpleName1.equals(simpleName2)) {
- return false;
- }
- }
- return true;
- }
- }
- return false;
- }
-
- /**
- * Compares the two {@link com.sun.mirror.declaration.MethodDeclaration}.
- * @param methodOne the first method declaration.
- * @param methodTwo the second method declaration.
- * @return <code>true</code> if the method names and parameter types match.
- */
- public static boolean compareMethods(com.sun.mirror.declaration.MethodDeclaration methodOne,
- com.sun.mirror.declaration.MethodDeclaration methodTwo) {
- return compareMethodNames(methodOne, methodTwo) && compareMethodParameterTypes(methodOne, methodTwo);
- }
-
- private static boolean compareMethodNames(com.sun.mirror.declaration.MethodDeclaration methodOne,
- com.sun.mirror.declaration.MethodDeclaration methodTwo) {
- return methodOne.getSimpleName().equals(methodTwo.getSimpleName());
- }
-
- private static boolean compareMethodParameterTypes(com.sun.mirror.declaration.MethodDeclaration methodOne,
- com.sun.mirror.declaration.MethodDeclaration methodTwo) {
- int numberOfParametersOne = methodOne.getParameters().size();
- int numberOfParametersTwo = methodTwo.getParameters().size();
-
- if (numberOfParametersOne == numberOfParametersTwo) {
- List<ParameterDeclaration> parametersOne = (List<ParameterDeclaration>) methodOne.getParameters();
- List<ParameterDeclaration> parametersTwo = (List<ParameterDeclaration>) methodTwo.getParameters();
- for (int i = 0; i < parametersOne.size(); i++) {
- if (!parametersOne.get(i).getType().equals(parametersTwo.get(i).getType())) {
- return false;
- }
- }
- return true;
- }
- return false;
- }
-
- /**
- * Compares the {@link FieldDeclaration} and {@link IField}.
- * @param fieldDeclaration the field declaration.
- * @param field the field.
- * @return <code>true</code> if the field names match.
- */
- @SuppressWarnings("unchecked")
- public static boolean compareFieldNames(FieldDeclaration fieldDeclaration, IField field) {
- List<VariableDeclarationFragment> fragments = fieldDeclaration.fragments();
- for (VariableDeclarationFragment variableDeclarationFragment : fragments) {
- if (variableDeclarationFragment.getName().getIdentifier().equals(field.getElementName())) {
- return true;
- }
- }
- return false;
- }
-
- private static boolean compareAnnotationNames(Annotation newAnnotation, Annotation existingAnnotation) {
- return AnnotationUtils.getAnnotationName(existingAnnotation).equals(
- AnnotationUtils.getAnnotationName(newAnnotation));
- }
-
- /**
- * Checks if the given {@link Annotation} is present on the {@link IJavaElement}.
- * @param javaElement one of the following types of java element:
- * <li>IJavaElement.PACKAGE_DECLARATION</li>
- * <li>IJavaElement.TYPE</li>
- * <li>IJavaElement.FIELD</li>
- * <li>IJavaElement.METHOD</li>
- * <li>IJavaElement.LOCAL_VARIABLE</li>
- * @param annotation the annotation.
- * @return <code>true</code> if the annotation is present.
- */
- public static boolean isAnnotationPresent(IJavaElement javaElement, Annotation annotation) {
- return AnnotationUtils.isAnnotationPresent(javaElement, AnnotationUtils.getAnnotationName(annotation));
- }
-
- /**
- * Checks if the annotation with the given name is present on the {@link IJavaElement}.
- * @param javaElement one of the following types of java element:
- * <li>IJavaElement.PACKAGE_DECLARATION</li>
- * <li>IJavaElement.TYPE</li>
- * <li>IJavaElement.FIELD</li>
- * <li>IJavaElement.METHOD</li>
- * <li>IJavaElement.LOCAL_VARIABLE</li>
- * @param annotationName the annotation name.
- * @return <code>true</code> if the annotation is present.
- */
- public static boolean isAnnotationPresent(IJavaElement javaElement, String annotationName) {
- if (javaElement.getElementType() == IJavaElement.COMPILATION_UNIT) {
- return isAnnotationPresent(((ICompilationUnit)javaElement).findPrimaryType(), annotationName);
- }
-
- int elementType = javaElement.getElementType();
-
- if (elementType == IJavaElement.PACKAGE_DECLARATION
- || elementType == IJavaElement.TYPE
- || elementType == IJavaElement.METHOD
- || elementType == IJavaElement.LOCAL_VARIABLE
- || elementType == IJavaElement.FIELD) {
-
- List<Annotation> annotations = getAnnotations(javaElement);
- for (Annotation annotation : annotations) {
- if (AnnotationUtils.getAnnotationName(annotation).equals(annotationName)) {
- return true;
- }
- }
- }
- return false;
- }
-
- /**
- * Returns a list of all the {@link Annotation} that are present on the given {@link IJavaElement}
- * @param javaElement one of the following types of java element:
- * <li>IJavaElement.PACKAGE_DECLARATION</li>
- * <li>IJavaElement.TYPE</li>
- * <li>IJavaElement.FIELD</li>
- * <li>IJavaElement.METHOD</li>
- * <li>IJavaElement.LOCAL_VARIABLE</li>
- * @return a list of annotations.
- */
- @SuppressWarnings("unchecked")
- public static List<Annotation> getAnnotations(IJavaElement javaElement) {
- ICompilationUnit source = AnnotationUtils.getCompilationUnitFromJavaElement(javaElement);
- CompilationUnit compilationUnit = SharedASTProvider.getAST(source, SharedASTProvider.WAIT_YES, null);
-
- if (javaElement.getElementType() == IJavaElement.PACKAGE_DECLARATION) {
- PackageDeclaration packageDeclaration = compilationUnit.getPackage();
- return packageDeclaration.annotations();
- }
-
-
- if (javaElement.getElementType() == IJavaElement.TYPE) {
- IType type = (IType) javaElement;
- AbstractTypeDeclaration typeDeclaration = AnnotationUtils.getTypeDeclaration(type);
- if (typeDeclaration != null) {
- return extractAnnotations(typeDeclaration.modifiers());
- }
- }
-
- if (javaElement.getElementType() == IJavaElement.METHOD) {
- IMethod method = (IMethod) javaElement;
- MethodDeclaration methodDeclaration = AnnotationUtils.getMethodDeclaration(method);
- if (methodDeclaration != null) {
- return extractAnnotations(methodDeclaration.modifiers());
- }
- }
-
- if (javaElement.getElementType() == IJavaElement.FIELD) {
- IField field = (IField) javaElement;
- FieldDeclaration fieldDeclaration = AnnotationUtils.getFieldDeclaration(field);
- if (fieldDeclaration != null) {
- return extractAnnotations(fieldDeclaration.modifiers());
- }
- }
-
- if (javaElement.getElementType() == IJavaElement.LOCAL_VARIABLE) {
- SingleVariableDeclaration singleVariableDeclaration = getSingleVariableDeclaration((ILocalVariable) javaElement);
- if (singleVariableDeclaration != null) {
- return extractAnnotations(singleVariableDeclaration.modifiers());
- }
- }
-
- return Collections.emptyList();
- }
-
- private static List<Annotation> extractAnnotations(List<IExtendedModifier> extendedModifiers) {
- List<Annotation> annotations = new ArrayList<Annotation>();
- for (IExtendedModifier extendedModifier : extendedModifiers) {
- if (extendedModifier.isAnnotation()) {
- annotations.add((Annotation) extendedModifier);
- }
- }
- return annotations;
- }
-
- /**
- * Returns a list of all the {@link SingleVariableDeclaration} for the given {@link IMethod}.
- * @param method the method.
- * @return a list of single variable declarations.
- */
- @SuppressWarnings("unchecked")
- public static List<SingleVariableDeclaration> getSingleVariableDeclarations(final IMethod method) {
- ICompilationUnit source = method.getCompilationUnit();
- CompilationUnit compilationUnit = SharedASTProvider.getAST(source, SharedASTProvider.WAIT_YES, null);
- final List<SingleVariableDeclaration> parameters = new ArrayList<SingleVariableDeclaration>();
- compilationUnit.accept(new ASTVisitor() {
- @Override
- public boolean visit(MethodDeclaration methodDeclaration) {
- if (compareMethods(methodDeclaration, method)) {
- parameters.addAll(methodDeclaration.parameters());
- }
- return false;
- }
- });
- return parameters;
- }
-
- /**
- * Returns the {@link ILocalVariable} at the given offset position in the source file.
- * @param method the method in which the local variable is declared.
- * @param offset the character index of the local variable in the source file.
- * The offset must be >= to the start position of the node representing the local variable and
- * <= the nodes start position plus length.
- * @return the local variable or null if not found.
- */
- public static ILocalVariable getLocalVariable(IMethod method, int offset) {
- List<SingleVariableDeclaration> parameters = getSingleVariableDeclarations(method);
- for (SingleVariableDeclaration parameter : parameters) {
- int parameterStartPosition = parameter.getStartPosition();
- int parameterLength = parameter.getLength();
- if (offset >= parameterStartPosition
- && offset <= parameterStartPosition + parameterLength) {
- return (ILocalVariable) parameter.resolveBinding().getJavaElement();
- }
- }
- return null;
- }
-
- /**
- * Returns the {@link ILocalVariable} with the given name within the declared {@link IMethod}.
- * @param method the method in which the local variable is declared.
- * @param paramName the local variable name.
- * @return the local variable or null if not found.
- */
- public static ILocalVariable getLocalVariable(IMethod method, String paramName) {
- List<SingleVariableDeclaration> parameters = getSingleVariableDeclarations(method);
- for (SingleVariableDeclaration parameter : parameters) {
- if (parameter.getName().getIdentifier().equals(paramName)) {
- return (ILocalVariable) parameter.resolveBinding().getJavaElement();
- }
- }
- return null;
- }
-
- /**
- * Returns the AST {@link Annotation} that corresponds to the given {@link java.lang.annotation.Annotation} class
- * on the {@link IJavaElement}.
- * @param javaElement one of the following types of java element:
- * <li>IJavaElement.PACKAGE_DECLARATION</li>
- * <li>IJavaElement.TYPE</li>
- * <li>IJavaElement.FIELD</li>
- * <li>IJavaElement.METHOD</li>
- * <li>IJavaElement.LOCAL_VARIABLE</li>
- * @param annotation the {@link java.lang.annotation.Annotation} class.
- * @return the AST annotation or null if not found.
- */
- public static Annotation getAnnotation(IJavaElement javaElement, Class<? extends java.lang.annotation.Annotation> annotation) {
- List<Annotation> annotations = getAnnotations(javaElement);
- for (Annotation astAnnotation : annotations) {
- String typeName = astAnnotation.getTypeName().getFullyQualifiedName();
- if (typeName.equals(annotation.getCanonicalName())
- || typeName.equals(annotation.getSimpleName())) {
- return astAnnotation;
- }
- }
- return null;
- }
-
- /**
- * Returns the {@link AnnotationMirror} that corresponds to the given {@link java.lang.annotation.Annotation} class
- * on the {@link Declaration}.
- * @param declaration the declaration
- * @param annotation the {@link java.lang.annotation.Annotation} class.
- * @return the annotation mirror or null if not found.
- */
- public static AnnotationMirror getAnnotation(Declaration declaration,
- Class<? extends java.lang.annotation.Annotation> annotation) {
- Collection<AnnotationMirror> aannotationMirrors = declaration.getAnnotationMirrors();
-
- for (AnnotationMirror annotationMirror : aannotationMirrors) {
- com.sun.mirror.declaration.AnnotationTypeDeclaration annotationTypeDeclaration = annotationMirror
- .getAnnotationType().getDeclaration();
- if (annotationTypeDeclaration != null
- && annotationTypeDeclaration.getQualifiedName().equals(annotation.getCanonicalName())) {
- return annotationMirror;
- }
- }
- return null;
- }
-
- /**
- * Returns the JDT {@link IAnnotation} that corresponds to the given {@link java.lang.annotation.Annotation} class
- * on the {@link IAnnotatable} element.
- * @param annotation the {@link java.lang.annotation.Annotation} class.
- * @param annotatable a package declaration, a type, a method, a field or a local variable in a compilation unit.
- * @return the annotation or null if not found.
- * @throws JavaModelException if the annotatable element does not exist or if an exception occurs while accessing its corresponding resource.
- */
- public static IAnnotation getAnnotation(Class<? extends java.lang.annotation.Annotation> annotation,
- IAnnotatable annotatable) throws JavaModelException {
- IAnnotation[] annotations = annotatable.getAnnotations();
- for (IAnnotation jdtAnnotation : annotations) {
- String annotationName = jdtAnnotation.getElementName();
- if (annotationName.equals(annotation.getCanonicalName())
- || annotationName.equals(annotation.getSimpleName())) {
- return jdtAnnotation;
- }
- }
- return null;
- }
-
- /**
- * Returns the {@link AnnotationValue} with the given member name that is declared within the {@link AnnotationMirror}.
- * @param mirror the annotation mirror.
- * @param memberName the member name.
- * @return the annotation value or null if not found.
- */
- public static AnnotationValue getAnnotationValue(AnnotationMirror mirror, String memberName) {
- Map<AnnotationTypeElementDeclaration, AnnotationValue> values = mirror.getElementValues();
- Set<Map.Entry<AnnotationTypeElementDeclaration, AnnotationValue>> entrySet = values.entrySet();
- for (Map.Entry<AnnotationTypeElementDeclaration, AnnotationValue> entry : entrySet) {
- AnnotationTypeElementDeclaration element = entry.getKey();
- if (element.getSimpleName().equals(memberName)) {
- return entry.getValue();
- }
- }
- return null;
- }
-
- /**
- * Returns the {@link NormalAnnotation} member value pair value with the given member name.
- * @param normalAnnotation the normal annotation.
- * @param memberName the member value pair member name.
- * @return the value expression or null if not found.
- */
- @SuppressWarnings("unchecked")
- public static Expression getAnnotationValue(NormalAnnotation normalAnnotation, String memberName) {
- List<MemberValuePair> memberValuePairs = normalAnnotation.values();
- for (MemberValuePair memberValuePair : memberValuePairs) {
- if (memberValuePair.getName().getIdentifier().equals(memberName)) {
- return memberValuePair.getValue();
- }
- }
- return null;
- }
-
- /**
- * Returns the JDT {@link IAnnotation} member value pair value with the given member name.
- * @param annotation the annotation.
- * @param memberName the member name.
- * @return an object representing the member value pairs value.
- * @throws JavaModelException if the annotation does not exist or if an exception occurs while accessing its corresponding resource.
- */
- public static Object getAnnotationValue(IAnnotation annotation, String memberName) throws JavaModelException {
- IMemberValuePair[] memberValuePairs = annotation.getMemberValuePairs();
- if (memberValuePairs.length > 0) {
- for (IMemberValuePair memberValuePair : memberValuePairs) {
- if (memberValuePair.getMemberName().equals(memberName)) {
- return memberValuePair.getValue();
- }
- }
- }
- return null;
- }
-
- /**
- * Returns the {@link MemberValuePair} with the given member name from the {@link NormalAnnotation}.
- * @param normalAnnotation the normal annotation.
- * @param memberName the member name of the member value pair to return.
- * @return a member value pair or null if no member value pair with the given member name can be found.
- */
- @SuppressWarnings("unchecked")
- public static MemberValuePair getMemberValuePair(NormalAnnotation normalAnnotation, String memberName) {
- List<MemberValuePair> memberValuesPairs = normalAnnotation.values();
- for (MemberValuePair memberValuePair : memberValuesPairs) {
- if (memberValuePair.getName().getIdentifier().equals(memberName)) {
- return memberValuePair;
- }
- }
- return null;
- }
-
- /**
- * Returns the member value with the given member name from the {@link AnnotationMirror} as a {@link String} value.
- * @param mirror the annotation mirror.
- * @param memberName the member name.
- * @return the member value as a String or null if no member with the member name can be found.
- */
- public static String getStringValue(AnnotationMirror mirror, String memberName) {
- AnnotationValue annotationValue = getAnnotationValue(mirror, memberName);
- if (annotationValue != null) {
- return annotationValue.getValue().toString();
- }
- return null;
- }
-
- /**
- * Returns the member value with the given member name from the {@link Annotation} as a {@link String} value.
- * @param annotation the AST annotation.
- * @param memberName the member name.
- * @return the member value as a String or null if no member with the member name can be found.
- */
- public static String getStringValue(Annotation annotation, String memberName) {
- if (annotation instanceof NormalAnnotation) {
- Expression expression = getAnnotationValue((NormalAnnotation) annotation, memberName);
- if (expression != null && expression instanceof StringLiteral) {
- return ((StringLiteral) expression).getLiteralValue();
- }
- }
- return null;
- }
-
- /**
- * Returns the member value with the given member name from the {@link IAnnotation} as a {@link String} value.
- * @param annotation the JDT annotation.
- * @param memberName the member name.
- * @return the member value as a String or null if no member with the member name can be found.
- * @throws JavaModelException if the annotation does not exist or if an exception occurs while accessing
- * its corresponding resource.
- */
- public static String getStringValue(IAnnotation annotation, String memberName) throws JavaModelException {
- Object value = AnnotationUtils.getAnnotationValue(annotation, memberName);
- if (value != null) {
- return value.toString();
- }
- return null;
- }
-
- /**
- * Returns the member value with the given member name from the {@link AnnotationMirror} as a {@link Boolean} value.
- * @param mirror the annotation mirror.
- * @param memberName the member name.
- * @return the member value as a Boolean or null if no member with the member name can be found.
- */
- public static Boolean getBooleanValue(AnnotationMirror mirror, String memberName) {
- String value = getStringValue(mirror, memberName);
- if (value != null) {
- return Boolean.valueOf(value);
- }
- return null;
- }
-
- /**
- * Returns the member value with the given member name from the {@link Annotation} as a {@link Boolean} value.
- * @param annotation the AST annotation.
- * @param memberName the member name.
- * @return the member value as a Boolean or null if no member with the member name can be found.
- */
- public static Boolean getBooleanValue(Annotation annotation, String memberName) {
- if (annotation instanceof NormalAnnotation) {
- Expression expression = getAnnotationValue((NormalAnnotation) annotation, memberName);
- if (expression != null && expression instanceof BooleanLiteral) {
- return Boolean.valueOf(((BooleanLiteral) expression).booleanValue());
- }
- }
- return null;
- }
-
- /**
- * Returns the member value with the given member name from the {@link IAnnotation} as a {@link Boolean} value.
- * @param annotation the JDT annotation.
- * @param memberName the member name.
- * @return the member value as a Boolean or null if no member with the member name can be found.
- * @throws JavaModelException if the annotation does not exist or if an exception occurs while accessing
- * its corresponding resource.
- */
- public static Boolean getBooleanValue(IAnnotation annotation, String memberName) throws JavaModelException {
- String value = AnnotationUtils.getStringValue(annotation, memberName);
- if (value != null) {
- return Boolean.valueOf(value);
- }
- return null;
- }
-
- /**
- * Returns the member value with the given member name from the {@link Annotation} as a {@link String} value.
- * The returned String value is the name of the enum constant.
- * @param annotation the AST annotation.
- * @param memberName the member name.
- * @return the member value as a String or null if no member with the member name can be found.
- */
- public static String getEnumValue(Annotation annotation, String memberName) {
- if (annotation instanceof NormalAnnotation) {
- Expression expression = getAnnotationValue((NormalAnnotation) annotation, memberName);
- if (expression != null && expression instanceof QualifiedName) {
- return ((QualifiedName) expression).getName().getIdentifier();
- }
- }
- return null;
- }
-
- /**
- * Returns the member value with the given member name from the {@link IAnnotation} as a {@link String} value.
- * The returned String value is the name of the enum constant.
- * @param annotation the JDT annotation.
- * @param memberName the member name.
- * @return the member value as a String or null if no member with the member name can be found.
- * @throws JavaModelException if the annotation does not exist or if an exception occurs while accessing
- * its corresponding resource.
- */
- public static String getEnumValue(IAnnotation annotation, String memberName) throws JavaModelException {
- String value = AnnotationUtils.getStringValue(annotation, memberName);
- if (value != null && value.indexOf(".") != -1) {
- return value.substring(value.lastIndexOf(".") + 1);
- }
- return null;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.annotations.core/src/org/eclipse/jst/ws/internal/annotations/core/processor/AnnotationsCoreProcessorFactory.java b/bundles/org.eclipse.jst.ws.annotations.core/src/org/eclipse/jst/ws/internal/annotations/core/processor/AnnotationsCoreProcessorFactory.java
deleted file mode 100644
index 4663665..0000000
--- a/bundles/org.eclipse.jst.ws.annotations.core/src/org/eclipse/jst/ws/internal/annotations/core/processor/AnnotationsCoreProcessorFactory.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Shane Clarke.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Shane Clarke - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.annotations.core.processor;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.jst.ws.annotations.core.AnnotationsCorePlugin;
-import org.eclipse.jst.ws.annotations.core.AnnotationsManager;
-import org.eclipse.jst.ws.annotations.core.processor.AbstractAnnotationProcessor;
-
-import com.sun.mirror.apt.AnnotationProcessor;
-import com.sun.mirror.apt.AnnotationProcessorEnvironment;
-import com.sun.mirror.apt.AnnotationProcessorFactory;
-import com.sun.mirror.apt.AnnotationProcessors;
-import com.sun.mirror.declaration.AnnotationTypeDeclaration;
-
-public class AnnotationsCoreProcessorFactory implements AnnotationProcessorFactory {
-
- public AnnotationProcessor getProcessorFor(Set<AnnotationTypeDeclaration> annotationSet,
- AnnotationProcessorEnvironment processorEnvironment) {
-
- if (annotationSet.size() == 0) {
- return AnnotationProcessors.NO_OP;
- }
- List<AnnotationProcessor> annotationProcessors = new ArrayList<AnnotationProcessor>();
-
- Map<String, List<IConfigurationElement>> annotationProcessorCache =
- AnnotationsManager.getAnnotationProcessorsCache();
-
- for (AnnotationTypeDeclaration annotationTypeDeclaration : annotationSet) {
- List<IConfigurationElement> processorElements = annotationProcessorCache.get(
- annotationTypeDeclaration.getQualifiedName());
-
- for (IConfigurationElement configurationElement : processorElements) {
- if (configurationElement != null) {
- AnnotationProcessor processor = getAnnotationProcessor(configurationElement,
- processorEnvironment);
- if (processor != null) {
- annotationProcessors.add(processor);
- }
- }
- }
- }
-
- return AnnotationProcessors.getCompositeAnnotationProcessor(annotationProcessors);
- }
-
- private AnnotationProcessor getAnnotationProcessor(IConfigurationElement configurationElement,
- AnnotationProcessorEnvironment processorEnvironment) {
- try {
- AbstractAnnotationProcessor annotationProcessor =
- (AbstractAnnotationProcessor)configurationElement.createExecutableExtension("class");
- annotationProcessor.setAnnotationProcessorEnvironment(processorEnvironment);
- return annotationProcessor;
- } catch (CoreException ce) {
- AnnotationsCorePlugin.log(ce.getStatus());
- }
- return null;
- }
-
- public Collection<String> supportedAnnotationTypes() {
- return AnnotationsManager.getAnnotationProcessorsCache().keySet();
- }
-
- public Collection<String> supportedOptions() {
- return Collections.emptyList();
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.annotations.core/src/org/eclipse/jst/ws/internal/annotations/core/utils/SignatureUtils.java b/bundles/org.eclipse.jst.ws.annotations.core/src/org/eclipse/jst/ws/internal/annotations/core/utils/SignatureUtils.java
deleted file mode 100644
index 28ea61e..0000000
--- a/bundles/org.eclipse.jst.ws.annotations.core/src/org/eclipse/jst/ws/internal/annotations/core/utils/SignatureUtils.java
+++ /dev/null
@@ -1,124 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2011 Shane Clarke.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Shane Clarke - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.annotations.core.utils;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.jdt.core.IField;
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jdt.core.Signature;
-
-public final class SignatureUtils {
-
- private SignatureUtils() {
- }
-
- public static boolean isString(String returnType) {
- int signatureKind = Signature.getTypeSignatureKind(returnType);
- if (signatureKind == Signature.CLASS_TYPE_SIGNATURE) {
- if (returnType.charAt(0) == Signature.C_RESOLVED) {
- return Signature.toString(returnType).equals(java.lang.String.class.getCanonicalName());
- }
- if (returnType.charAt(0) == Signature.C_UNRESOLVED) {
- return Signature.toString(returnType).equals(java.lang.String.class.getSimpleName());
- }
- }
- return false;
- }
-
- public static boolean isClass(String returnType) {
- int signatureKind = Signature.getTypeSignatureKind(returnType);
- if (signatureKind == Signature.CLASS_TYPE_SIGNATURE) {
- if (returnType.charAt(0) == Signature.C_RESOLVED) {
- returnType = Signature.getTypeErasure(returnType);
- return Signature.toString(returnType).equals(java.lang.Class.class.getCanonicalName());
- }
- if (returnType.charAt(0) == Signature.C_UNRESOLVED) {
- returnType = Signature.getTypeErasure(returnType);
- return Signature.toString(returnType).equals(java.lang.Class.class.getSimpleName());
- }
- }
- return false;
- }
-
- public static boolean isBoolean(String returnType) {
- int signatureKind = Signature.getTypeSignatureKind(returnType);
- if (signatureKind == Signature.CLASS_TYPE_SIGNATURE) {
- if (returnType.charAt(0) == Signature.C_RESOLVED) {
- return Signature.toString(returnType).equals(java.lang.Boolean.class.getCanonicalName());
- }
- if (returnType.charAt(0) == Signature.C_UNRESOLVED) {
- return Signature.toString(returnType).equals(java.lang.Boolean.class.getSimpleName());
- }
- }
- if (signatureKind == Signature.BASE_TYPE_SIGNATURE) {
- return returnType.charAt(0) == Signature.C_BOOLEAN;
- }
- return false;
- }
-
- public static boolean isArray(String returnType) {
- return Signature.getTypeSignatureKind(returnType) == Signature.ARRAY_TYPE_SIGNATURE;
- }
-
- public static boolean isPrimitive(String returnType) {
- return Signature.getTypeSignatureKind(returnType) == Signature.BASE_TYPE_SIGNATURE;
- }
-
- public static boolean isEnum(IMethod method) throws JavaModelException {
- return getEnumReturnType(method) != null;
- }
-
- public static IType getEnumReturnType(IMethod method) throws JavaModelException {
- String returnType = method.getReturnType();
- int signatureKind = Signature.getTypeSignatureKind(returnType);
- if (signatureKind == Signature.CLASS_TYPE_SIGNATURE) {
- if (returnType.charAt(0) == Signature.C_RESOLVED) {
- IType type = method.getJavaProject().findType(Signature.toString(returnType));
- if (type != null && type.isEnum()) {
- return type;
- }
- }
- }
- return null;
- }
-
- public static String[] getEnumConstantsNames(IType enumType) throws JavaModelException {
- if (enumType.isEnum()) {
- List<String> enumConstants = new ArrayList<String>();
- IField[] fields = getEnumConstants(enumType);
- for (IField field : fields) {
- enumConstants.add(field.getElementName());
- }
- return enumConstants.toArray(new String[enumConstants.size()]);
- }
- return new String[] {};
- }
-
- public static IField[] getEnumConstants(IType enumType) throws JavaModelException {
- if (enumType.isEnum()) {
- List<IField> enumConstants = new ArrayList<IField>();
- IField[] fields = enumType.getFields();
- for (IField field : fields) {
- if (field.isEnumConstant()) {
- enumConstants.add(field);
- }
- }
- return enumConstants.toArray(new IField[enumConstants.size()]);
- }
- return new IField[] {};
- }
-
-
-}
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 a1aca4d..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: 1.0.200.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="[1.0.0,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
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 (&quot;Content&quot;). Unless otherwise
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;). 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, &quot;Program&quot; 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 (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content. Check the Redistributor's license that was
-provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
-
-</body>
-</html>
diff --git a/bundles/org.eclipse.jst.ws.cxf.consumption.core/ant/cxf_bujava.properties b/bundles/org.eclipse.jst.ws.cxf.consumption.core/ant/cxf_bujava.properties
deleted file mode 100644
index 35664a5..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.consumption.core/ant/cxf_bujava.properties
+++ /dev/null
@@ -1,50 +0,0 @@
-###############################################################################
-# Copyright (c) 2008 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-# Shane Clarke - Apache CXF support
-###############################################################################
-!-- ScenarioType REQUIRED. Differentiates from "client" scenario.
-ScenarioType=service
-
-!-- InitialSelection REQUIRED. Workspace relative URI to the input WSDL or Java
-InitialSelection=/dynamicWebProjectName/src/packagename/myService.java
-
-!--Utility property values - use these to list valid values for the following properties:
-!-- Service.RuntimeId, Service.ServerId
-ListRuntimes=true
-ListServers=true
-!-- Verbose will list informational messages as well as errors if set to true
-Verbose=true
-
-!-- Service.RuntimeId - ID of web service runtime
-Service.RuntimeId=org.eclipse.jst.ws.cxf.cxfWebServiceRT
-!-- Service.ServerId - ID of target server
-Service.ServerId=org.eclipse.jst.server.tomcat.60
-!-- Service.TypeId - Java Bean is default for both Top Down and Bottom Up
-!-- Service.TypeId=Java Bean
-
-!-- ServiceProjectName - !--type:String - name of Service project - this property can be used to give the service project a different name than the project containing the initial selection. type: String
-!--ServiceProjectName=serviceProjectName
-!-- ServiceEarProjectName - !--type:String - name of Service EAR project - this property can be used to give the service EAR project a different name than the EAR project already associated with the service project. type: String
-!--ServiceEarProjectName=serviceEarProjectName
-
-!-- Generate a client mainline using JAX-WS APIs
-!--GenClient=false
-!-- Generate a server mainline using JAX-WS APIs
-!--GenServer=false
-!-- Specify to generate the wrapper and fault beans
-!--GenWrapperFaultBeans=true
-!-- Specify to generate the WSDL file
-!--GenWSDL=true
-!-- Output schemas to separate files and use imports to load them instead of inlining them into the wsdl
-!--GenXSDImports=true
-!--Specifies that the generated WSDL is to include a SOAP 1.2 binding
-!--UseSOAP12Binding=false
-!--Set the name of the generated WSDL file
-!--WsdlFileName=myWSDLFileName.wsdl
diff --git a/bundles/org.eclipse.jst.ws.cxf.consumption.core/ant/cxf_bujava.xml b/bundles/org.eclipse.jst.ws.cxf.consumption.core/ant/cxf_bujava.xml
deleted file mode 100644
index 1d5f8b8..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.consumption.core/ant/cxf_bujava.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0"?>
-
-<project default="main" basedir=".">
-
-<echo message="pulling in property files"/>
-<property file="cxf_bujava.properties"/>
-
-<echo message="calling the web services generation ant task: cxf_bujava"/>
- <target name="main" >
- <wsgen/>
- </target>
-
-</project>
diff --git a/bundles/org.eclipse.jst.ws.cxf.consumption.core/ant/cxf_client.properties b/bundles/org.eclipse.jst.ws.cxf.consumption.core/ant/cxf_client.properties
deleted file mode 100644
index 90292ce..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.consumption.core/ant/cxf_client.properties
+++ /dev/null
@@ -1,89 +0,0 @@
-###############################################################################
-# Copyright (c) 2008 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-# Shane Clarke - Apache CXF support
-###############################################################################
-!--ScenarioType REQUIRED. Differentiates from "service" scenario.
-ScenarioType=client
-
-!--InitialSelection REQUIRED. Workspace relative URI to the input WSDL or Java.
-InitialSelection=/dynamicWebProjectName/WebContent/wsdl/myService.wsdl
-
-!--Utility property values - use these to list values for the following properties:
-!-- Client.RuntimeId, Client.ServerId
-ListRuntimes=true
-ListServers=true
-!-- Verbose will list informational messages as well as errors if set to true
-Verbose=true
-
-!--Client.RuntimeId - ID of web service runtime
-Client.RuntimeId=org.eclipse.jst.ws.cxf.cxfWebServiceRT
-!--Client.ServerId - ID of target server
-Client.ServerId=org.eclipse.jst.server.tomcat.60
-
-!--ClientProjectName - name of Client project - this property can be used to give the client project a
-!-- different name than the project containing the initial selection
-!--ClientProjectName=clientProjectName
-
-!--ClientEarProjectName- name of Client EAR project - set only if applicable for selected server type
-!--ClientEarProjectName=clientEARProjectName
-
-!--ClientComponentType - type of Client project
-!--ClientComponentType=template.cxf.core
-
-!-- JavaOutput
-!-- Top down - String: the workspace relative URI for a Java source folder for the generated Java code - must be existing workspace source folder
-!--JavaOutput=/projectName/JavaSource
-
-!--Generate Client : REQUIRED
-GenClient=true
-
-!--Generate a server mainline using JAX-WS APIs
-!--GenServer=false
-!--Generate starting point code for an implementation object
-!--GenImpl=true
-!--Generate default values in the implementation and client. Ignored if implementation or client is not being generated
-!--DefaultValues=true
-!--Enables or disables processing of extended soap header message binding
-!--ExtSOAPHeaders=false
-!--Enables or disables loading of the default namespace package name mapping
-!--DefaultNamespace=true
-!--Enables or disables loading of the default excludes namespace mapping
-!--DefaultExcludesNamespace=true
-!--Enable Auto Name Resolution
-!--AutoNameResolution=false
-
-!--Specify the name of the WSDL service for which code is to be generated. The default is to generate code for every service in the WSDL document
-!--ServiceName=myService
-
-!--XJC Args: Specify the arguments to be passed directly to the XJC
-
-!--Initialise fields mapped from elements with their default values
-!--xjc_dv=false
-!--Activate plugin to add a toString() method to generated classes
-!--xjc_ts=false
-!--Have toString produce multi line output
-!--xjc_ts_multi=false
-!--Have toString produce single line terse output
-!--xjc_ts_simple=false
-!--Enable source location support for generated code
-!--xjc_locator=false
-!--Generate accessor methods with the 'synchronized' keyword
-!--xjc_sync_methods=false
-!--Add @Generated annotations to the generated code
-!--xjc_mark_generated=false
-
-!-- Mappings
-!-- Top down scenario. Workspace relative URI to property file containing mappings.
-!-- Mappings are used to override the default package names of the generated Java template classes.
-!-- The content of the properties file must be of the format namespace=package
-!--Mappings=/dynamicWebProjectName/mappings.txt
-
-!--Binding Files. Comma delimited string of absolute paths in the local file system of JAXWS or JAXB binding files.
-!--Bindings=C:/workspace1/dynamicWebProjectName/binding1.xml,C:/workspace1/dynamicWebProjectName/binding2.xml \ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.cxf.consumption.core/ant/cxf_client.xml b/bundles/org.eclipse.jst.ws.cxf.consumption.core/ant/cxf_client.xml
deleted file mode 100644
index 2d3a566..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.consumption.core/ant/cxf_client.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0"?>
-
-<project default="main" basedir=".">
-
-<echo message="pulling in property files"/>
-<property file="cxf_client.properties"/>
-
-<echo message="calling the web services generation ant task: cxf_client"/>
- <target name="main" >
- <wsgen/>
- </target>
-
-</project>
diff --git a/bundles/org.eclipse.jst.ws.cxf.consumption.core/ant/cxf_tdjava.properties b/bundles/org.eclipse.jst.ws.cxf.consumption.core/ant/cxf_tdjava.properties
deleted file mode 100644
index 8e6e887..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.consumption.core/ant/cxf_tdjava.properties
+++ /dev/null
@@ -1,83 +0,0 @@
-###############################################################################
-# Copyright (c) 2008 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-# Shane Clarke - Apache CXF support
-###############################################################################
-!-- ScenarioType REQUIRED. Differentiates from "client" scenario.
-ScenarioType=service
-
-!-- InitialSelection REQUIRED. Workspace relative URI to the input WSDL or Java
-InitialSelection=/dynamicWebProjectName/WebContent/wsdl/myService.wsdl
-
-!--Utility property values - use these to list valid values for the following properties:
-!-- Service.RuntimeId, Service.ServerId
-ListRuntimes=true
-ListServers=true
-!-- Verbose will list informational messages as well as errors if set to true
-Verbose=true
-
-!-- Service.RuntimeId - ID of web service runtime
-Service.RuntimeId=org.eclipse.jst.ws.cxf.cxfWebServiceRT
-!-- Service.ServerId - ID of target server
-Service.ServerId=org.eclipse.jst.server.tomcat.60
-!-- Service.TypeId - Java Bean is default for both Top Down and Bottom Up
-!-- Service.TypeId=Java Bean
-
-!-- ServiceProjectName - !--type:String - name of Service project - this property can be used to give the service project a different name than the project containing the initial selection. type: String
-!--ServiceProjectName=serviceProjectName
-!-- ServiceEarProjectName - !--type:String - name of Service EAR project - this property can be used to give the service EAR project a different name than the EAR project already associated with the service project. type: String
-!--ServiceEarProjectName=serviceEarProjectName
-
-!-- JavaOutput
-!-- Top down - String: the workspace relative URI for a Java source folder for the generated Java code - must be existing workspace source folder
-!--JavaOutput=/projectName/JavaSource
-
-!--Specify the name of the WSDL service for which code is to be generated. The default is to generate code for every service in the WSDL document
-!--ServiceName=myService
-
-!--Generate a server mainline using JAX-WS APIs
-!--GenServer=false
-!--Generate starting point code for an implementation object
-!--GenImpl=true
-!--Generate default values in the implementation and client. Ignored if implementation or client is not being generated
-!--DefaultValues=true
-!--Enables or disables processing of extended soap header message binding
-!--ExtSOAPHeaders=false
-!--Enables or disables loading of the default namespace package name mapping
-!--DefaultNamespace=true
-!--Enables or disables loading of the default excludes namespace mapping
-!--DefaultExcludesNamespace=true
-!--Enable Auto Name Resolution
-!--AutoNameResolution=false
-
-!--XJC Args: Specify the arguments to be passed directly to the XJC
-
-!--Initialise fields mapped from elements with their default values
-!--xjc_dv=false
-!--Activate plugin to add a toString() method to generated classes
-!--xjc_ts=false
-!--Have toString produce multi line output
-!--xjc_ts_multi=false
-!--Have toString produce single line terse output
-!--xjc_ts_simple=false
-!--Enable source location support for generated code
-!--xjc_locator=false
-!--Generate accessor methods with the 'synchronized' keyword
-!--xjc_sync_methods=false
-!--Add @Generated annotations to the generated code
-!--xjc_mark_generated=false
-
-!-- Mappings
-!-- Top down scenario. Workspace relative URI to property file containing mappings.
-!-- Mappings are used to override the default package names of the generated Java template classes.
-!-- The content of the properties file must be of the format namespace=package
-!--Mappings=/dynamicWebProjectName/mappings.txt
-
-!--Binding Files. Comma delimited string of absolute paths in the local file system of JAXWS or JAXB binding files.
-!--Bindings=C:/workspace1/dynamicWebProjectName/binding1.xml,C:/workspace1/dynamicWebProjectName/binding2.xml \ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.cxf.consumption.core/ant/cxf_tdjava.xml b/bundles/org.eclipse.jst.ws.cxf.consumption.core/ant/cxf_tdjava.xml
deleted file mode 100644
index 2c79c6b..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.consumption.core/ant/cxf_tdjava.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0"?>
-
-<project default="main" basedir=".">
-
-<echo message="pulling in property files"/>
-<property file="cxf_tdjava.properties"/>
-
-<echo message="calling the web services generation ant task: cxf_tdjava"/>
- <target name="main" >
- <wsgen/>
- </target>
-
-</project>
diff --git a/bundles/org.eclipse.jst.ws.cxf.consumption.core/build.properties b/bundles/org.eclipse.jst.ws.cxf.consumption.core/build.properties
deleted file mode 100644
index d0ad5cd..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.consumption.core/build.properties
+++ /dev/null
@@ -1,7 +0,0 @@
-source.. = src/
-bin.includes = META-INF/,\
- about.html,\
- .,\
- plugin.properties,\
- plugin.xml,\
- ant/
diff --git a/bundles/org.eclipse.jst.ws.cxf.consumption.core/plugin.properties b/bundles/org.eclipse.jst.ws.cxf.consumption.core/plugin.properties
deleted file mode 100644
index f6814ae..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.consumption.core/plugin.properties
+++ /dev/null
@@ -1,21 +0,0 @@
-###############################################################################
-# Copyright (c) 2008 IONA Technologies PLC
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IONA Technologies PLC - initial API and implementation
-###############################################################################
-
-pluginName=CXF Web Services Consumption Core
-pluginProvider=Eclipse Web Tools Platform
-
-WEB_SERVICE_LOCATOR_CXF=Apache CXF Web Service Locator
-WEB_SERVICE_LOCATOR_CATEGORY_CXF=Apache CXF Components
-
-LABEL_RUNTIME_CXF=Apache CXF
-LABEL_BOTTOM_UP_JAVA_BEAN=Bottom up Java bean Web Service
-LABEL_TOP_DOWN_JAVA_BEAN=Top down Java bean Web Service
-LABEL_CLIENT=Client
diff --git a/bundles/org.eclipse.jst.ws.cxf.consumption.core/plugin.xml b/bundles/org.eclipse.jst.ws.cxf.consumption.core/plugin.xml
deleted file mode 100644
index 2137477..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.consumption.core/plugin.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.2"?>
-<plugin>
- <extension point="org.eclipse.wst.ws.locator">
- <webServiceLocatorCategory
- id="ws.locator.category.cxf"
- label="%WEB_SERVICE_LOCATOR_CATEGORY_CXF"/>
-
- <webServiceLocator
- class="org.eclipse.jst.ws.internal.cxf.consumption.core.locator.CXFWebServiceLocator"
- id="ws.locator.cxf"
- category="ws.locator.category.cxf"
- label="%WEB_SERVICE_LOCATOR_CXF">
- </webServiceLocator>
- </extension>
-
- <extension point="org.eclipse.wst.command.env.ui.antfiles">
- <antfiles
- id="org.eclipse.jst.ws.cxf.creation.cxfWebServiceRTBUJava"
- runtimeid="cxf"
- pluginlocation="org.eclipse.jst.ws.cxf.consumption.core"
- path="ant/cxf_bujava.properties"
- wsgenpath="ant/cxf_bujava.xml"
- runtimelabel="%LABEL_RUNTIME_CXF"
- scenariolabel="%LABEL_BOTTOM_UP_JAVA_BEAN">
- </antfiles>
- <antfiles
- id="org.eclipse.jst.ws.cxf.creation.cxfWebServiceRTTopJava"
- runtimeid="cxf"
- pluginlocation="org.eclipse.jst.ws.cxf.consumption.core"
- path="ant/cxf_tdjava.properties"
- wsgenpath="ant/cxf_tdjava.xml"
- runtimelabel="%LABEL_RUNTIME_CXF"
- scenariolabel="%LABEL_TOP_DOWN_JAVA_BEAN">
- </antfiles>
- <antfiles
- id="org.eclipse.jst.ws.cxf.creation.cxfWebServiceRTZClient"
- runtimeid="cxf"
- pluginlocation="org.eclipse.jst.ws.cxf.consumption.core"
- path="ant/cxf_client.properties"
- wsgenpath="ant/cxf_client.xml"
- runtimelabel="%LABEL_RUNTIME_CXF"
- scenariolabel="%LABEL_CLIENT">
- </antfiles>
- </extension>
-</plugin>
diff --git a/bundles/org.eclipse.jst.ws.cxf.consumption.core/src/org/eclipse/jst/ws/internal/cxf/consumption/core/CXFConsumptionCoreMessages.java b/bundles/org.eclipse.jst.ws.cxf.consumption.core/src/org/eclipse/jst/ws/internal/cxf/consumption/core/CXFConsumptionCoreMessages.java
deleted file mode 100644
index 63eb001..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.consumption.core/src/org/eclipse/jst/ws/internal/cxf/consumption/core/CXFConsumptionCoreMessages.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IONA Technologies PLC
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IONA Technologies PLC - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.cxf.consumption.core;
-
-import org.eclipse.osgi.util.NLS;
-
-public class CXFConsumptionCoreMessages extends NLS {
- private static final String BUNDLE_NAME =
- "org.eclipse.jst.ws.internal.cxf.consumption.core.CXFConsumptionCoreMessages"; //$NON-NLS-1$
-
- static {
- // initialize resource bundle
- NLS.initializeMessages(CXFConsumptionCoreMessages.BUNDLE_NAME, CXFConsumptionCoreMessages.class);
- }
-
- private CXFConsumptionCoreMessages() {
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.cxf.consumption.core/src/org/eclipse/jst/ws/internal/cxf/consumption/core/CXFConsumptionCoreMessages.properties b/bundles/org.eclipse.jst.ws.cxf.consumption.core/src/org/eclipse/jst/ws/internal/cxf/consumption/core/CXFConsumptionCoreMessages.properties
deleted file mode 100644
index 5d980bc..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.consumption.core/src/org/eclipse/jst/ws/internal/cxf/consumption/core/CXFConsumptionCoreMessages.properties
+++ /dev/null
@@ -1,10 +0,0 @@
-###############################################################################
-# Copyright (c) 2008 IONA Technologies PLC
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IONA Technologies PLC - initial API and implementation
-############################################################################### \ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.cxf.consumption.core/src/org/eclipse/jst/ws/internal/cxf/consumption/core/CXFConsumptionCorePlugin.java b/bundles/org.eclipse.jst.ws.cxf.consumption.core/src/org/eclipse/jst/ws/internal/cxf/consumption/core/CXFConsumptionCorePlugin.java
deleted file mode 100644
index e920fe6..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.consumption.core/src/org/eclipse/jst/ws/internal/cxf/consumption/core/CXFConsumptionCorePlugin.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IONA Technologies PLC
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IONA Technologies PLC - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.cxf.consumption.core;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.osgi.framework.BundleContext;
-
-/**
- * The activator class controls the plug-in life cycle.
- *
- */
-public class CXFConsumptionCorePlugin extends AbstractUIPlugin {
- // The plug-in ID
- public static final String PLUGIN_ID = "org.eclipse.jst.ws.cxf.consumption.core"; //$NON-NLS-1$
-
- // The shared instance
- private static CXFConsumptionCorePlugin plugin;
-
- /**
- * The constructor.
- */
- public CXFConsumptionCorePlugin() {
- }
-
- /**
- * Returns the shared instance.
- *
- * @return the shared instance
- */
- public static CXFConsumptionCorePlugin getDefault() {
- return plugin;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
- */
- @Override
- public void start(BundleContext context) throws Exception {
- super.start(context);
- plugin = this;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
- */
- @Override
- public void stop(BundleContext context) throws Exception {
- plugin = null;
- super.stop(context);
- }
-
- public static void logMessage(int severity, String message) {
- CXFConsumptionCorePlugin.log(new Status(severity, CXFConsumptionCorePlugin.PLUGIN_ID,
- message));
- }
-
- public static void log(IStatus status) {
- CXFConsumptionCorePlugin.getDefault().getLog().log(status);
- }
-
- public static void log(Throwable exception) {
- CXFConsumptionCorePlugin.log(new Status(IStatus.ERROR, CXFConsumptionCorePlugin.PLUGIN_ID,
- exception.toString(), exception));
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.cxf.consumption.core/src/org/eclipse/jst/ws/internal/cxf/consumption/core/commands/WSDL2JavaClientCommand.java b/bundles/org.eclipse.jst.ws.cxf.consumption.core/src/org/eclipse/jst/ws/internal/cxf/consumption/core/commands/WSDL2JavaClientCommand.java
deleted file mode 100644
index 971283c..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.consumption.core/src/org/eclipse/jst/ws/internal/cxf/consumption/core/commands/WSDL2JavaClientCommand.java
+++ /dev/null
@@ -1,179 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IONA Technologies PLC
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IONA Technologies PLC - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.cxf.consumption.core.commands;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IResourceChangeEvent;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jst.ws.internal.cxf.consumption.core.CXFConsumptionCorePlugin;
-import org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaDataModel;
-import org.eclipse.jst.ws.internal.cxf.core.resources.JavaResourceChangeListener;
-import org.eclipse.jst.ws.internal.cxf.core.utils.CommandLineUtils;
-import org.eclipse.jst.ws.internal.cxf.core.utils.FileUtils;
-import org.eclipse.jst.ws.internal.cxf.core.utils.LaunchUtils;
-import org.eclipse.jst.ws.jaxws.core.utils.JDTUtils;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-
-/**
- * Executes the <code>org.apache.cxf.tools.wsdlto.WSDLToJava</code> command with the arguments
- * necessary to generate a client.
- *
- */
-public class WSDL2JavaClientCommand extends AbstractDataModelOperation {
- public static final String CXF_TOOL_CLASS_NAME = "org.apache.cxf.tools.wsdlto.WSDLToJava"; //$NON-NLS-1$
-
- private WSDL2JavaDataModel model;
-
- private JavaResourceChangeListener javaResourceChangeListener;
-
- /**
- * Constructs a <code>WSDL2JavaClientCommand</code> object.
- * @param model the <code>WSDL2JavaDataModel</code> used to pass information
- * between commands.
- */
- public WSDL2JavaClientCommand(WSDL2JavaDataModel model) {
- this.model = model;
- }
-
- @Override
- public IStatus execute(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
- IStatus status = Status.OK_STATUS;
- javaResourceChangeListener = new JavaResourceChangeListener(new Path(model.getJavaSourceFolder()));
- ResourcesPlugin.getWorkspace().addResourceChangeListener(javaResourceChangeListener,
- IResourceChangeEvent.POST_CHANGE);
-
- String[] progArgs = CommandLineUtils.getWSDL2JavaGenerateClientArguments(model);
-
- try {
- String projectName = model.getProjectName();
-
- IJavaProject javaProject = JDTUtils.getJavaProject(projectName);
- LaunchUtils.launch(javaProject, WSDL2JavaClientCommand.CXF_TOOL_CLASS_NAME, progArgs);
- FileUtils.copyW2JFilesFromTmp(model, getEnvironment());
- } catch (CoreException ce) {
- status = ce.getStatus();
- CXFConsumptionCorePlugin.log(status);
- }
-
- ResourcesPlugin.getWorkspace().removeResourceChangeListener(javaResourceChangeListener);
- return status;
- }
-
- @Override
- public IStatus undo(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
- IStatus status = Status.OK_STATUS;
- List<IResource> changedResources = new ArrayList<IResource>();
- changedResources.addAll(javaResourceChangeListener.getChangedResources());
- if (changedResources.size() > 0) {
- for (IResource resource : changedResources) {
- try {
- resource.delete(true, monitor);
- } catch (CoreException ce) {
- status = ce.getStatus();
- CXFConsumptionCorePlugin.log(status);
- }
- }
- }
- return status;
- }
-
- //ANT Environment Mappings
- public void setJavaSourceFolder(String javaSourceFolder) {
- model.setJavaSourceFolder(javaSourceFolder);
- }
-
- public void setServiceName(String serviceName) {
- model.setServiceName(serviceName);
- }
-
- public void setGenerateServer(boolean generateServer) {
- model.setGenerateServer(generateServer);
- }
-
- public void setGenerateClient(boolean generateClient) {
- model.setGenerateClient(generateClient);
- }
-
- public void setGenerateImplementation(boolean generateImplementation) {
- model.setGenerateImplementation(generateImplementation);
- }
-
- public void setUseDefaultValues(boolean useDefaultValues) {
- model.setUseDefaultValues(useDefaultValues);
- }
-
- public void setProcessSOAPHeaders(boolean processSOAPHeaders) {
- model.setProcessSOAPHeaders(processSOAPHeaders);
- }
-
- public void setLoadDefaultNamespacePackageNameMapping(boolean loadDefaultNamespacePackageNameMapping) {
- model.setLoadDefaultNamespacePackageNameMapping(loadDefaultNamespacePackageNameMapping);
- }
-
- public void setLoadDefaultExcludesNamepsaceMapping(boolean loadDefaultExcludesNamepsaceMapping) {
- model.setLoadDefaultExcludesNamepsaceMapping(loadDefaultExcludesNamepsaceMapping);
- }
-
- public void setAutoNameResolution(boolean autoNameResolution) {
- model.setAutoNameResolution(autoNameResolution);
- }
-
- public void setXjcUseDefaultValues(boolean xjcUseDefaultValues) {
- model.setXjcUseDefaultValues(xjcUseDefaultValues);
- }
-
- public void setXjcToString(boolean xjcToString) {
- model.setXjcToStringSimple(xjcToString);
- }
-
- public void setXjcToStringSimple(boolean xjcToStringSimple) {
- model.setXjcToStringSimple(xjcToStringSimple);
- }
-
- public void setXjcToStringMultiLine(boolean xjcToStringMultiLine) {
- model.setXjcToStringMultiLine(xjcToStringMultiLine);
- }
-
- public void setXjcLocator(boolean xjcLocator) {
- model.setXjcLocator(xjcLocator);
- }
-
- public void setXjcSyncMethods(boolean xjcSyncMethods) {
- model.setXjcSyncMethods(xjcSyncMethods);
- }
-
- public void setXjcMarkGenerated(boolean xjcMarkGenerated) {
- model.setXjcMarkGenerated(xjcMarkGenerated);
- }
-
- @SuppressWarnings("unchecked")
- public void setIncludedNamespaces(Map value) {
- model.setIncludedNamespaces(value);
- }
-
- public void setBindingFiles(List<String> bindingFiles) {
- for (String path : bindingFiles) {
- model.getBindingFiles().add(path);
- }
- }
-} \ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.cxf.consumption.core/src/org/eclipse/jst/ws/internal/cxf/consumption/core/commands/WSDL2JavaClientDefaultingCommand.java b/bundles/org.eclipse.jst.ws.cxf.consumption.core/src/org/eclipse/jst/ws/internal/cxf/consumption/core/commands/WSDL2JavaClientDefaultingCommand.java
deleted file mode 100644
index f0b4800..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.consumption.core/src/org/eclipse/jst/ws/internal/cxf/consumption/core/commands/WSDL2JavaClientDefaultingCommand.java
+++ /dev/null
@@ -1,119 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IONA Technologies PLC
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IONA Technologies PLC - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.cxf.consumption.core.commands;
-
-import java.io.IOException;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.HashMap;
-
-import javax.wsdl.Definition;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.ws.internal.cxf.consumption.core.CXFConsumptionCorePlugin;
-import org.eclipse.jst.ws.internal.cxf.core.CXFCorePlugin;
-import org.eclipse.jst.ws.internal.cxf.core.context.WSDL2JavaPersistentContext;
-import org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaDataModel;
-import org.eclipse.jst.ws.jaxws.core.utils.JDTUtils;
-import org.eclipse.jst.ws.jaxws.core.utils.WSDLUtils;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-
-/**
- * Loads the <code>WSDL2JavaDataModel</code> with the persisted defaults
- * from the preferences and with the initial runtime information such as the
- * starting point WSDL URL.
- *
- */
-public class WSDL2JavaClientDefaultingCommand extends AbstractDataModelOperation {
- private WSDL2JavaDataModel model;
- private String projectName;
- private String inputURL;
-
- /**
- * Constructs a WSDL2JavaClientDefaultingCommand object.
- * @param model the <code>WSDL2JavaDataModel</code> used to pass information
- * between commands.
- */
- public WSDL2JavaClientDefaultingCommand(WSDL2JavaDataModel model, String projectName, String inputURL) {
- this.model = model;
- this.projectName = projectName;
- this.inputURL = inputURL;
- }
-
- @Override
- public IStatus execute(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
- IStatus status = Status.OK_STATUS;
- WSDL2JavaPersistentContext context = CXFCorePlugin.getDefault().getWSDL2JavaContext();
- model.setDefaultRuntimeVersion(context.getDefaultRuntimeVersion());
- model.setDefaultRuntimeType(context.getDefaultRuntimeType());
- model.setProjectName(projectName);
-
- model.setIncludedNamespaces(new HashMap<String, String>());
- model.setExcludedNamespaces(new HashMap<String, String>());
-
- // XJC
- model.setXjcUseDefaultValues(context.isXjcUseDefaultValues());
- model.setXjcToString(context.isXjcToString());
- model.setXjcToStringMultiLine(context.isXjcToStringMultiLine());
- model.setXjcToStringSimple(context.isXjcToStringSimple());
- model.setXjcLocator(context.isXjcLocator());
- model.setXjcSyncMethods(context.isXjcSyncMethods());
- model.setXjcMarkGenerated(context.isXjcMarkGenerated());
-
- model.setValidate(context.isValidate());
- model.setProcessSOAPHeaders(context.isProcessSOAPHeaders());
- model.setLoadDefaultExcludesNamepsaceMapping(context.isLoadDefaultExcludesNamepsaceMapping());
- model.setLoadDefaultNamespacePackageNameMapping(context.isLoadDefaultNamespacePackageNameMapping());
- model.setUseDefaultValues(context.isUseDefaultValues());
- model.setNoAddressBinding(context.isNoAddressBinding());
- model.setAutoNameResolution(context.isAutoNameResolution());
-
- model.setJavaSourceFolder(JDTUtils.getJavaProjectSourceDirectoryPath(model.getProjectName()).toOSString());
-
- try {
- URL wsdlUrl = new URL(inputURL);
- model.setWsdlURL(wsdlUrl);
-
- Definition definition = WSDLUtils.readWSDL(model.getWsdlURL());
- if (definition != null) {
- String targetNamespace = definition.getTargetNamespace();
- String packageName = WSDLUtils.getPackageNameFromNamespace(targetNamespace);
- model.setTargetNamespace(targetNamespace);
- model.getIncludedNamespaces().put(targetNamespace, packageName);
-
- String wsdlLocation = WSDLUtils.getWSDLLocation(definition);
- if (wsdlLocation != null) {
- model.setWsdlLocation(wsdlLocation);
- }
-
- model.setWsdlDefinition(definition);
- }
-
- } catch (MalformedURLException murle) {
- status = new Status(IStatus.ERROR, CXFConsumptionCorePlugin.PLUGIN_ID,
- murle.getLocalizedMessage());
- CXFConsumptionCorePlugin.log(status);
- } catch (IOException ioe) {
- status = new Status(IStatus.ERROR, CXFConsumptionCorePlugin.PLUGIN_ID,
- ioe.getLocalizedMessage());
- CXFConsumptionCorePlugin.log(status);
- }
- return status;
- }
-
- public WSDL2JavaDataModel getWSDL2JavaDataModel() {
- return model;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.cxf.consumption.core/src/org/eclipse/jst/ws/internal/cxf/consumption/core/locator/CXFWebServiceLocator.java b/bundles/org.eclipse.jst.ws.cxf.consumption.core/src/org/eclipse/jst/ws/internal/cxf/consumption/core/locator/CXFWebServiceLocator.java
deleted file mode 100644
index a150dea..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.consumption.core/src/org/eclipse/jst/ws/internal/cxf/consumption/core/locator/CXFWebServiceLocator.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IONA Technologies PLC
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IONA Technologies PLC - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.cxf.consumption.core.locator;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.jst.ws.internal.common.J2EEUtils;
-import org.eclipse.wst.ws.internal.wsfinder.AbstractWebServiceLocator;
-
-@SuppressWarnings("restriction")
-public class CXFWebServiceLocator extends AbstractWebServiceLocator {
-
- @Override
- @SuppressWarnings("unchecked")
- public List getWebServiceClients(IProgressMonitor monitor) {
- return super.getWebServiceClients(monitor);
- }
-
- @Override
- @SuppressWarnings("unchecked")
- public List getWebServiceClients(IProject[] projects, IProgressMonitor monitor) {
- return super.getWebServiceClients(projects, monitor);
- }
-
- @Override
- @SuppressWarnings("unchecked")
- public List getWebServices(IProgressMonitor monitor) {
- IProject[] projects = ResourcesPlugin.getWorkspace().getRoot().getProjects();
- return getWebServices(projects, monitor);
- }
-
- @Override
- @SuppressWarnings("unchecked")
- public List getWebServices(IProject[] projects, IProgressMonitor monitor) {
- List webServices = new ArrayList();
- for (IProject project : projects) {
- if (J2EEUtils.isWebComponent(project)) {
- webServices.addAll(getWebServicesFromProject(project));
- }
- }
- return webServices;
- }
-
- @SuppressWarnings("unchecked")
- private List getWebServicesFromProject(IProject project) {
- return null;
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.cxf.consumption.ui/.classpath b/bundles/org.eclipse.jst.ws.cxf.consumption.ui/.classpath
deleted file mode 100644
index e721d0c..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.consumption.ui/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="src" path="src/"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/bundles/org.eclipse.jst.ws.cxf.consumption.ui/.project b/bundles/org.eclipse.jst.ws.cxf.consumption.ui/.project
deleted file mode 100644
index f8721ed..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.consumption.ui/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.jst.ws.cxf.consumption.ui</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
diff --git a/bundles/org.eclipse.jst.ws.cxf.consumption.ui/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.jst.ws.cxf.consumption.ui/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index fc358c6..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.consumption.ui/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,7 +0,0 @@
-#Fri Nov 07 23:58:53 EST 2008
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
diff --git a/bundles/org.eclipse.jst.ws.cxf.consumption.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.jst.ws.cxf.consumption.ui/META-INF/MANIFEST.MF
deleted file mode 100644
index 6a612b4..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: 1.0.200.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="[1.0.0,1.1.0)",
- 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="[1.0.0,1.2.0)",
- org.eclipse.jst.ws.cxf.ui;bundle-version="[1.0.0,1.1.0)",
- javax.wsdl;bundle-version="[1.6.2,1.7.0)",
- org.eclipse.jst.ws.jaxws.core;bundle-version="[1.0.0,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
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 (&quot;Content&quot;). Unless otherwise
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;). 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, &quot;Program&quot; 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 (&quot;Redistributor&quot;) 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 1427506..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
-pluginProvider=Eclipse Web Tools Platform
-
-JAXWS_WEBSERVICETYPE=POJO Web Service
-
-JAXWS_CLIENT=JAX-WS Stub \ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.cxf.consumption.ui/plugin.xml b/bundles/org.eclipse.jst.ws.cxf.consumption.ui/plugin.xml
deleted file mode 100644
index 29981a1..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.consumption.ui/plugin.xml
+++ /dev/null
@@ -1,135 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.2"?>
-<plugin>
- <extension point="org.eclipse.jst.ws.consumption.ui.wsImpl">
- <webServiceImpl
- id="org.eclipse.jst.ws.cxf.wsImpl.java"
- label="%JAXWS_WEBSERVICETYPE"
- resourceTypeMetadata="File IResource CompilationUnit"
- extensionMetadata=".java .class"
- objectSelectionWidget="org.eclipse.jst.ws.cxf.consumption.ui.widgets.object.CXFJAXWSSelectionWidget"
- mergerClass="org.eclipse.jst.ws.internal.consumption.common.JavaMerger">
- </webServiceImpl>
- </extension>
-
- <!--<extension point="org.eclipse.jst.ws.consumption.ui.wsClientImpl">
- <webServiceClientImpl
- id="org.eclipse.jst.ws.cxf.client.type.java"
- label="%JAXWS_CLIENT">
- </webServiceClientImpl>
- </extension>-->
-
- <extension point="org.eclipse.jst.ws.consumption.ui.objectSelectionWidget">
- <objectSelectionWidget
- class=" org.eclipse.jst.ws.internal.cxf.consumption.ui.widgets.CXFJAXWSSelectionLaunchable"
- external_modify="true"
- id=" org.eclipse.jst.ws.cxf.consumption.ui.widgets.object.CXFJAXWSSelectionWidget"
- transformer="org.eclipse.jst.ws.internal.cxf.consumption.ui.widgets.object.JAXWSSelectionTransformer">
- </objectSelectionWidget>
- </extension>
-
- <extension point="org.eclipse.wst.command.env.ui.widgetRegistry">
- <widgetFactory
- class="org.eclipse.jst.ws.internal.cxf.consumption.ui.widgets.WSDL2JavaClientConfigWidgetFactory"
- id="WSDL2JavaClientConfig"
- insertBeforeCommandId="org.eclipse.jst.ws.internal.cxf.consumption.core.commands.WSDL2JavaClientCommand">
- </widgetFactory>
- </extension>
-
- <!-- WSDL2Java -->
- <extension point="org.eclipse.wst.command.env.antDataMapping">
- <map
- key="Mappings"
- operation="org.eclipse.jst.ws.internal.cxf.consumption.core.commands.WSDL2JavaClientCommand"
- property="IncludedNamespaces"
- transform="org.eclipse.jst.ws.internal.cxf.core.env.ant.MappingsTransformer"/>
- <map
- key="Bindings"
- operation="org.eclipse.jst.ws.internal.cxf.consumption.core.commands.WSDL2JavaClientCommand"
- property="BindingFiles"
- transform="org.eclipse.jst.ws.internal.cxf.core.env.ant.BindingsTransformer"/>
- <map
- key="JavaOutput"
- operation="org.eclipse.jst.ws.internal.cxf.consumption.core.commands.WSDL2JavaClientCommand"
- property="JavaSourceFolder"/>
- <map
- key="ServiceName"
- operation="org.eclipse.jst.ws.internal.cxf.consumption.core.commands.WSDL2JavaClientCommand"
- property="ServiceName"/>
- <map
- key="GenClient"
- operation="org.eclipse.jst.ws.internal.cxf.consumption.core.commands.WSDL2JavaClientCommand"
- property="GenerateClient"
- transform="org.eclipse.wst.command.internal.env.ant.String2BooleanTransformer"/>
- <map
- key="GenServer"
- operation="org.eclipse.jst.ws.internal.cxf.consumption.core.commands.WSDL2JavaClientCommand"
- property="GenerateServer"
- transform="org.eclipse.wst.command.internal.env.ant.String2BooleanTransformer"/>
- <map
- key="GenImpl"
- operation="org.eclipse.jst.ws.internal.cxf.consumption.core.commands.WSDL2JavaClientCommand"
- property="GenerateImplementation"
- transform="org.eclipse.wst.command.internal.env.ant.String2BooleanTransformer"/>
- <map
- key="DefaultValues"
- operation="org.eclipse.jst.ws.internal.cxf.consumption.core.commands.WSDL2JavaClientCommand"
- property="UseDefaultValues"
- transform="org.eclipse.wst.command.internal.env.ant.String2BooleanTransformer"/>
- <map
- key="ExtSOAPHeaders"
- operation="org.eclipse.jst.ws.internal.cxf.consumption.core.commands.WSDL2JavaClientCommand"
- property="ProcessSOAPHeaders"
- transform="org.eclipse.wst.command.internal.env.ant.String2BooleanTransformer"/>
- <map
- key="DefaultNamespace"
- operation="org.eclipse.jst.ws.internal.cxf.consumption.core.commands.WSDL2JavaClientCommand"
- property="LoadDefaultNamespacePackageNameMapping"
- transform="org.eclipse.wst.command.internal.env.ant.String2BooleanTransformer"/>
- <map
- key="DefaultExcludesNamespace"
- operation="org.eclipse.jst.ws.internal.cxf.consumption.core.commands.WSDL2JavaClientCommand"
- property="LoadDefaultExcludesNamepsaceMapping"
- transform="org.eclipse.wst.command.internal.env.ant.String2BooleanTransformer"/>
- <map
- key="AutoNameResolution"
- operation="org.eclipse.jst.ws.internal.cxf.consumption.core.commands.WSDL2JavaClientCommand"
- property="AutoNameResolution"
- transform="org.eclipse.wst.command.internal.env.ant.String2BooleanTransformer"/>
- <map
- key="xjc_dv"
- operation="org.eclipse.jst.ws.internal.cxf.consumption.core.commands.WSDL2JavaClientCommand"
- property="XjcUseDefaultValues"
- transform="org.eclipse.wst.command.internal.env.ant.String2BooleanTransformer"/>
- <map
- key="xjc_ts"
- operation="org.eclipse.jst.ws.internal.cxf.consumption.core.commands.WSDL2JavaClientCommand"
- property="XjcToString"
- transform="org.eclipse.wst.command.internal.env.ant.String2BooleanTransformer"/>
- <map
- key="xjc_ts_multi"
- operation="org.eclipse.jst.ws.internal.cxf.consumption.core.commands.WSDL2JavaClientCommand"
- property="XjcToStringMultiLine"
- transform="org.eclipse.wst.command.internal.env.ant.String2BooleanTransformer"/>
- <map
- key="xjc_ts_simple"
- operation="org.eclipse.jst.ws.internal.cxf.consumption.core.commands.WSDL2JavaClientCommand"
- property="XjcToStringSimple"
- transform="org.eclipse.wst.command.internal.env.ant.String2BooleanTransformer"/>
- <map
- key="xjc_locator"
- operation="org.eclipse.jst.ws.internal.cxf.consumption.core.commands.WSDL2JavaClientCommand"
- property="XjcLocator"
- transform="org.eclipse.wst.command.internal.env.ant.String2BooleanTransformer"/>
- <map
- key="xjc_sync_methods"
- operation="org.eclipse.jst.ws.internal.cxf.consumption.core.commands.WSDL2JavaClientCommand"
- property="XjcSyncMethods"
- transform="org.eclipse.wst.command.internal.env.ant.String2BooleanTransformer"/>
- <map
- key="xjc_mark_generated"
- operation="org.eclipse.jst.ws.internal.cxf.consumption.core.commands.WSDL2JavaClientCommand"
- property="XjcMarkGenerated"
- transform="org.eclipse.wst.command.internal.env.ant.String2BooleanTransformer"/>
- </extension>
- </plugin> \ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.cxf.consumption.ui/src/org/eclipse/jst/ws/internal/cxf/consumption/ui/CXFConsumptionUIMessages.java b/bundles/org.eclipse.jst.ws.cxf.consumption.ui/src/org/eclipse/jst/ws/internal/cxf/consumption/ui/CXFConsumptionUIMessages.java
deleted file mode 100644
index 5f847b8..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.consumption.ui/src/org/eclipse/jst/ws/internal/cxf/consumption/ui/CXFConsumptionUIMessages.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IONA Technologies PLC
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IONA Technologies PLC - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.cxf.consumption.ui;
-
-import org.eclipse.osgi.util.NLS;
-
-public class CXFConsumptionUIMessages extends NLS {
- private static final String BUNDLE_NAME =
- "org.eclipse.jst.ws.internal.cxf.consumption.ui.CXFConsumptionUIMessages"; //$NON-NLS-1$
- public static String CXFJAXWSSELECTIONLAUNCHABLE_SELECTION_DIALOG_MESSAGE;
- public static String CXFJAXWSSELECTIONLAUNCHABLE_SELECTION_DIALOG_TITLE;
-
- public static String WSDL2JAVA_CLIENT_PAGE_TITLE;
- public static String WSDL2JAVA_CLIENT_PAGE_DESCRIPTION;
-
- public static String WSDL2JAVA_ClIENT_DEFAULTS_PAGE_TITLE;
- public static String WSDL2JAVA_CLIENT_DEFAULTS_PAGE_DESCRIPTION;
-
- public static String WSDL2JAVA_GROUP_LABEL;
- public static String WSDL2JAVA_XJC_ARG_GROUP_LABEL;
-
- static {
- // initialize resource bundle
- NLS.initializeMessages(CXFConsumptionUIMessages.BUNDLE_NAME, CXFConsumptionUIMessages.class);
- }
-
- private CXFConsumptionUIMessages() {
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.cxf.consumption.ui/src/org/eclipse/jst/ws/internal/cxf/consumption/ui/CXFConsumptionUIMessages.properties b/bundles/org.eclipse.jst.ws.cxf.consumption.ui/src/org/eclipse/jst/ws/internal/cxf/consumption/ui/CXFConsumptionUIMessages.properties
deleted file mode 100644
index 9406b55..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.consumption.ui/src/org/eclipse/jst/ws/internal/cxf/consumption/ui/CXFConsumptionUIMessages.properties
+++ /dev/null
@@ -1,24 +0,0 @@
-###############################################################################
-# Copyright (c) 2008 IONA Technologies PLC
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IONA Technologies PLC - initial API and implementation
-###############################################################################
-
-CXFJAXWSSELECTIONLAUNCHABLE_SELECTION_DIALOG_TITLE=Browse Workspace Classes and Interfaces
-CXFJAXWSSELECTIONLAUNCHABLE_SELECTION_DIALOG_MESSAGE=Select the Java Class or Interface which will be used to create the Web Service
-
-#WSDL2Java Client Congih Widget Factory
-WSDL2JAVA_CLIENT_PAGE_TITLE={0} {1} Web Service WSDL2Java Client Configuration
-WSDL2JAVA_CLIENT_PAGE_DESCRIPTION=Customise your Web Service generation by selecting options on this page
-
-WSDL2JAVA_ClIENT_DEFAULTS_PAGE_TITLE={0} {1} Web Service WSDL2Java Client Configuration
-WSDL2JAVA_CLIENT_DEFAULTS_PAGE_DESCRIPTION=Customise your Web Service generation by selecting options on this page
-
-#WSDL2Java Client Defaults Config Widget
-WSDL2JAVA_GROUP_LABEL=WSDL2Java Generation Options
-WSDL2JAVA_XJC_ARG_GROUP_LABEL=XJC Arguments \ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.cxf.consumption.ui/src/org/eclipse/jst/ws/internal/cxf/consumption/ui/CXFConsumptionUIPlugin.java b/bundles/org.eclipse.jst.ws.cxf.consumption.ui/src/org/eclipse/jst/ws/internal/cxf/consumption/ui/CXFConsumptionUIPlugin.java
deleted file mode 100644
index 269b5e6..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.consumption.ui/src/org/eclipse/jst/ws/internal/cxf/consumption/ui/CXFConsumptionUIPlugin.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IONA Technologies PLC
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IONA Technologies PLC - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.cxf.consumption.ui;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.osgi.framework.BundleContext;
-
-/**
- * The activator class controls the plug-in life cycle
- *
- */
-public class CXFConsumptionUIPlugin extends AbstractUIPlugin {
-
- // The plug-in ID
- public static final String PLUGIN_ID = "org.eclipse.jst.ws.cxf.consumption.ui"; //$NON-NLS-1$
-
- // The shared instance
- private static CXFConsumptionUIPlugin plugin;
-
- /**
- * The constructor
- */
- public CXFConsumptionUIPlugin() {
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
- */
- @Override
- public void start(BundleContext context) throws Exception {
- super.start(context);
- plugin = this;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
- */
- @Override
- public void stop(BundleContext context) throws Exception {
- plugin = null;
- super.stop(context);
- }
-
- /**
- * Returns the shared instance
- *
- * @return the shared instance
- */
- public static CXFConsumptionUIPlugin getDefault() {
- return plugin;
- }
-
- public static void logMessage(int severity, String message) {
- CXFConsumptionUIPlugin.log(new Status(severity, CXFConsumptionUIPlugin.PLUGIN_ID, message));
- }
-
- public static void log(IStatus status) {
- CXFConsumptionUIPlugin.getDefault().getLog().log(status);
- }
-
- public static void log(Throwable exception) {
- CXFConsumptionUIPlugin.log(new Status(IStatus.ERROR, CXFConsumptionUIPlugin.PLUGIN_ID,
- exception.toString(), exception));
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.cxf.consumption.ui/src/org/eclipse/jst/ws/internal/cxf/consumption/ui/widgets/CXFJAXWSSelectionLaunchable.java b/bundles/org.eclipse.jst.ws.cxf.consumption.ui/src/org/eclipse/jst/ws/internal/cxf/consumption/ui/widgets/CXFJAXWSSelectionLaunchable.java
deleted file mode 100644
index 053d1d9..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.consumption.ui/src/org/eclipse/jst/ws/internal/cxf/consumption/ui/widgets/CXFJAXWSSelectionLaunchable.java
+++ /dev/null
@@ -1,205 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IONA Technologies PLC
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IONA Technologies PLC - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.cxf.consumption.ui.widgets;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IPackageFragment;
-import org.eclipse.jdt.core.IPackageFragmentRoot;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jdt.ui.JavaElementLabelProvider;
-import org.eclipse.jdt.ui.StandardJavaElementContentProvider;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.viewers.TreeSelection;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.viewers.ViewerFilter;
-import org.eclipse.jface.window.Window;
-import org.eclipse.jst.ws.internal.common.ResourceUtils;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.AbstractObjectSelectionLaunchable;
-import org.eclipse.jst.ws.internal.cxf.consumption.ui.CXFConsumptionUIMessages;
-import org.eclipse.jst.ws.internal.cxf.consumption.ui.CXFConsumptionUIPlugin;
-import org.eclipse.jst.ws.jaxws.core.utils.JDTUtils;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.ISelectionService;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.dialogs.ElementTreeSelectionDialog;
-import org.eclipse.ui.dialogs.ISelectionStatusValidator;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-
-@SuppressWarnings("restriction")
-public class CXFJAXWSSelectionLaunchable extends AbstractObjectSelectionLaunchable {
- private IStatus validationStatus = Status.OK_STATUS;
-
- private IProject project;
- private String serverComponentName;
- private String className = "";
-
- @Override
- public void setInitialSelection(IStructuredSelection initialSelection) {
- if (initialSelection != null && !initialSelection.isEmpty()) {
- Object firstElement = initialSelection.getFirstElement();
- if (firstElement instanceof String) {
- className = firstElement.toString();
- }
- }
- }
-
- @Override
- public int launch(Shell shell) {
- IStatus status = Status.OK_STATUS;
- ElementTreeSelectionDialog selectionDialog = new ElementTreeSelectionDialog(shell,
- new JavaElementLabelProvider(), new StandardJavaElementContentProvider());
- selectionDialog.setTitle(CXFConsumptionUIMessages.CXFJAXWSSELECTIONLAUNCHABLE_SELECTION_DIALOG_TITLE);
- selectionDialog
- .setMessage(CXFConsumptionUIMessages.CXFJAXWSSELECTIONLAUNCHABLE_SELECTION_DIALOG_MESSAGE);
- selectionDialog.setAllowMultiple(false);
- selectionDialog.setInput(JavaCore.create(ResourcesPlugin.getWorkspace().getRoot()));
- selectionDialog.addFilter(new JavaViewerFilter());
-
- selectionDialog.setValidator(new JavaSelectionStatusValidator());
-
- int returnCode = selectionDialog.open();
- if (returnCode == Window.OK) {
- ICompilationUnit selectedCompilationUnit = (ICompilationUnit) selectionDialog.getFirstResult();
- IType type = selectedCompilationUnit.findPrimaryType();
- className = type.getFullyQualifiedName();
- try {
- IResource typeResource = type.getUnderlyingResource();
- if (typeResource != null) {
- this.project = typeResource.getProject();
- IVirtualComponent comp = ResourceUtils.getComponentOf(typeResource);
- if (comp != null) {
- serverComponentName = comp.getName();
- }
- } else {
- project = null;
- serverComponentName = null;
- }
- return status.getSeverity();
- } catch (JavaModelException jme) {
- project = null;
- serverComponentName = null;
- status = jme.getStatus();
- CXFConsumptionUIPlugin.log(status);
- return status.getSeverity();
- }
- }
-
- return IStatus.CANCEL;
- }
-
- @Override
- public IStructuredSelection getObjectSelection() {
- return new StructuredSelection(className);
- }
-
- public String getComponentName() {
- return serverComponentName;
- }
-
- public IProject getProject() {
- ISelectionService selectionService = PlatformUI.getWorkbench().getActiveWorkbenchWindow()
- .getSelectionService();
- ISelection selection = selectionService.getSelection();
-
- if (selection != null && !selection.isEmpty() && selection instanceof TreeSelection) {
- TreeSelection treeSelection = (TreeSelection) selection;
- Object firstElement = treeSelection.getFirstElement();
- if (firstElement instanceof ICompilationUnit) {
- ICompilationUnit compilationUnit = (ICompilationUnit) firstElement;
- project = compilationUnit.getResource().getProject();
- }
- }
- return project;
- }
-
- @Override
- public IStatus validateSelection(IStructuredSelection objectSelection) {
- return validationStatus;
- }
-
- @Override
- public String getObjectSelectionDisplayableString() {
- return className;
- }
-
- @Override
- public boolean validate(String stringToValidate) {
- className = stringToValidate;
-
- IProject project = getProject();
- if (project != null) {
- validationStatus = JDTUtils.validateJavaTypeName(project.getName(), className);
- } else {
- validationStatus = JDTUtils.validateJavaTypeName(className);
- }
-
-// IProject project = getProject();
-// if (project != null) {
-// IType type = JDTUtils.getType(project, className);
-// if (type == null || !type.exists()) {
-// validationStatus = new Status(IStatus.ERROR, CXFConsumptionUIPlugin.PLUGIN_ID, "");
-// } else {
-// validationStatus = JDTUtils.validateJavaTypeName(project.getName(), className);
-// }
-// return validationStatus.isOK();
-// }
- return validationStatus.isOK();
- }
-
- private static class JavaViewerFilter extends ViewerFilter {
- @Override
- public boolean select(Viewer viewer, Object parentElement, Object element) {
- try {
- if (element instanceof IJavaProject) {
- return true;
- }
- if (element instanceof IPackageFragmentRoot) {
- IPackageFragmentRoot packageFragmentRoot = (IPackageFragmentRoot) element;
- return packageFragmentRoot.getKind() == IPackageFragmentRoot.K_SOURCE;
- }
- if (element instanceof IPackageFragment) {
- IPackageFragment packageFragment = (IPackageFragment) element;
- return packageFragment.hasChildren();
- }
- if (element instanceof ICompilationUnit) {
- ICompilationUnit compilationUnit = (ICompilationUnit) element;
- IType type = compilationUnit.findPrimaryType();
- return type.isClass() || type.isInterface();
-
- }
- } catch (JavaModelException jme) {
- CXFConsumptionUIPlugin.log(jme.getStatus());
- }
- return false;
- }
- }
-
- private static class JavaSelectionStatusValidator implements ISelectionStatusValidator {
- public IStatus validate(Object[] selection) {
- if (selection.length == 1) {
- if (selection[0] instanceof ICompilationUnit) {
- return new Status(IStatus.OK, CXFConsumptionUIPlugin.PLUGIN_ID, ""); //$NON-NLS-1$
- }
- }
- return new Status(IStatus.ERROR, CXFConsumptionUIPlugin.PLUGIN_ID, ""); //$NON-NLS-1$
- }
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.cxf.consumption.ui/src/org/eclipse/jst/ws/internal/cxf/consumption/ui/widgets/WSDL2JavaClientConfigWidget.java b/bundles/org.eclipse.jst.ws.cxf.consumption.ui/src/org/eclipse/jst/ws/internal/cxf/consumption/ui/widgets/WSDL2JavaClientConfigWidget.java
deleted file mode 100644
index 0494f83..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.consumption.ui/src/org/eclipse/jst/ws/internal/cxf/consumption/ui/widgets/WSDL2JavaClientConfigWidget.java
+++ /dev/null
@@ -1,278 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IONA Technologies PLC
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IONA Technologies PLC - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.cxf.consumption.ui.widgets;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jface.viewers.ColumnWeightData;
-import org.eclipse.jface.viewers.ICellEditorListener;
-import org.eclipse.jface.viewers.ICellEditorValidator;
-import org.eclipse.jface.viewers.TableLayout;
-import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.jface.viewers.TableViewerColumn;
-import org.eclipse.jface.viewers.TextCellEditor;
-import org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaDataModel;
-import org.eclipse.jst.ws.internal.cxf.ui.viewers.PackageNameEditingSupport;
-import org.eclipse.jst.ws.internal.cxf.ui.viewers.PackageNameTableContentProvider;
-import org.eclipse.jst.ws.internal.cxf.ui.widgets.WSDL2JavaWidgetFactory;
-import org.eclipse.jst.ws.jaxws.core.utils.JDTUtils;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.List;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.swt.widgets.TableItem;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.wst.command.internal.env.ui.widgets.SimpleWidgetDataContributor;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetDataEvents;
-
-@SuppressWarnings("restriction")
-public class WSDL2JavaClientConfigWidget extends SimpleWidgetDataContributor {
- private IStatus status = Status.OK_STATUS;
- private Listener statusListener;
-
- private WSDL2JavaDataModel model;
-
- private Composite namespaceCompositeHolder;
- private Composite namespaceComposite;
- private int namespaceCompositeHeight = -1;
-
- public WSDL2JavaClientConfigWidget() {
- }
-
- public void setWSDL2JavaDataModel(WSDL2JavaDataModel model) {
- this.model = model;
- }
-
- @Override
- public WidgetDataEvents addControls(final Composite parent, final Listener statusListener) {
- this.statusListener = statusListener;
-
- final Composite mainComposite = new Composite(parent, SWT.NONE);
- GridLayout gridLayout = new GridLayout(3, false);
- mainComposite.setLayout(gridLayout);
-
- GridData gridData = new GridData(SWT.FILL, SWT.FILL, true, true);
- mainComposite.setLayoutData(gridData);
-
- // Output Dir
- WSDL2JavaWidgetFactory.createOutputDirectoryLabel(mainComposite);
-
- Combo outputDirCombo = WSDL2JavaWidgetFactory.createOutputDirectoryCombo(mainComposite, model);
- gridData = new GridData(SWT.FILL, SWT.CENTER, true, false);
- gridData.horizontalSpan = 2;
- outputDirCombo.setLayoutData(gridData);
-
- // Package Name:
- WSDL2JavaWidgetFactory.createPackageNameLabel(mainComposite);
-
- final Text packageNameText = WSDL2JavaWidgetFactory.createPackageNameText(mainComposite, model);
- gridData = new GridData(SWT.FILL, SWT.CENTER, true, false);
- gridData.horizontalSpan = 2;
- packageNameText.setLayoutData(gridData);
-
- packageNameText.addModifyListener(new ModifyListener() {
- public void modifyText(ModifyEvent e) {
- String packageName = packageNameText.getText();
- status = JDTUtils.validatePackageName(model.getProjectName(), packageName);
- statusListener.handleEvent(null);
- }
- });
-
- final Button namespaceMappingButton = WSDL2JavaWidgetFactory.createNamespacePackageMappingButton(mainComposite);
- gridData = new GridData(SWT.FILL, SWT.FILL, true, false);
- gridData.horizontalSpan = 3;
- namespaceMappingButton.setLayoutData(gridData);
- namespaceMappingButton.addSelectionListener(new SelectionAdapter() {
- @Override
- public void widgetSelected(SelectionEvent e) {
- if (namespaceMappingButton.getSelection()) {
- if (namespaceComposite == null) {
- GridData gridData = new GridData(SWT.FILL, SWT.FILL, true, false);
- gridData.horizontalSpan = 3;
- gridData.verticalSpan = 7;
- namespaceCompositeHolder.setLayoutData(gridData);
- namespaceCompositeHolder.pack();
-
- namespaceComposite = getNamespaceMappingComposite(namespaceCompositeHolder);
- if (namespaceCompositeHeight == -1) {
- Point groupSize = namespaceComposite.computeSize(SWT.DEFAULT, SWT.DEFAULT, true);
- namespaceCompositeHeight = groupSize.y;
- }
- Shell shell = parent.getShell();
- Point shellSize = shell.getSize();
- shell.setSize(shellSize.x, shellSize.y + namespaceCompositeHeight);
-
- namespaceCompositeHolder.layout();
- }
- } else {
- if (namespaceComposite != null) {
- GridData gridData = new GridData(SWT.FILL, SWT.FILL, false, false);
- gridData.horizontalSpan = 3;
- namespaceCompositeHolder.setLayoutData(gridData);
- namespaceCompositeHolder.pack();
- namespaceComposite.dispose();
- namespaceComposite = null;
- namespaceCompositeHolder.layout();
- Shell shell = parent.getShell();
- Point shellSize = shell.getSize();
- shell.setSize(shellSize.x, shellSize.y - namespaceCompositeHeight);
- }
- }
- }
- });
-
- namespaceCompositeHolder = new Composite(mainComposite, SWT.NONE);
- gridLayout = new GridLayout(1, true);
- namespaceCompositeHolder.setLayout(gridLayout);
- gridData = new GridData(SWT.FILL, SWT.FILL, false, false);
- gridData.horizontalSpan = 3;
- namespaceCompositeHolder.setLayoutData(gridData);
-
- // Service Name:
- // WSDL2JavaWidgetFactory.createServiceNameLabel(mainComposite);
- //
- // Combo serviceNameCombo = WSDL2JavaWidgetFactory.createServiceNameCombo(mainComposite, model);
- // gridData = new GridData(SWT.FILL, SWT.FILL, true, false);
- // gridData.horizontalSpan = 2;
- // serviceNameCombo.setLayoutData(gridData);
-
- Label bindingFilesLabel = WSDL2JavaWidgetFactory.createBindingFilesLabel(mainComposite);
- gridData = new GridData(SWT.FILL, SWT.FILL, false, false);
- gridData.verticalSpan = 3;
- bindingFilesLabel.setLayoutData(gridData);
-
- List bindingFilesList = WSDL2JavaWidgetFactory.createBindingFilesList(mainComposite);
- gridData = new GridData(SWT.FILL, SWT.FILL, true, false);
- gridData.verticalSpan = 3;
- bindingFilesList.setLayoutData(gridData);
-
- Button addBindingFileButton = WSDL2JavaWidgetFactory.createAddBindingFileButton(mainComposite, model,
- bindingFilesList);
- gridData = new GridData(SWT.FILL, SWT.FILL, false, false);
- addBindingFileButton.setLayoutData(gridData);
-
- Button removeBindingFileButton = WSDL2JavaWidgetFactory.createRemoveBindingFileButton(mainComposite,
- model, bindingFilesList);
- gridData = new GridData(SWT.FILL, SWT.FILL, false, false);
- removeBindingFileButton.setLayoutData(gridData);
-
- WSDL2JavaWidgetFactory.createPaddingLabel(mainComposite);
-
- /*
- WSDL2JavaWidgetFactory.createXMLCatalogLabel(mainComposite);
-
- Text xmlCatalogText = WSDL2JavaWidgetFactory.createXMLCatalogText(mainComposite, model);
- gridData = new GridData(SWT.FILL, SWT.FILL, true, false);
- xmlCatalogText.setLayoutData(gridData);
-
- WSDL2JavaWidgetFactory.createXMLCatalogBrowseButton(mainComposite);
- */
- return this;
- }
-
- public Table createNamespaceMappingTable(Composite parent) {
- TableViewer packageNameTableViewer = new TableViewer(parent, SWT.CHECK | SWT.MULTI | SWT.BORDER
- | SWT.FULL_SELECTION);
-
- final Table packageNameTable = packageNameTableViewer.getTable();
- packageNameTable.setLinesVisible(true);
- packageNameTable.setHeaderVisible(true);
-
- TableLayout tableLayout = new TableLayout();
- packageNameTable.setLayout(tableLayout);
-
- WSDL2JavaWidgetFactory.createWSDLNamespaceViewerColumn(packageNameTableViewer);
-
- ColumnWeightData columnWeightData = new ColumnWeightData(100, 100, true);
- tableLayout.addColumnData(columnWeightData);
-
- TableViewerColumn packageNameViewerColumn = WSDL2JavaWidgetFactory.createPackageNameColumn(
- packageNameTableViewer, model);
-
- TextCellEditor textCellEditor = new TextCellEditor(packageNameTableViewer.getTable());
- textCellEditor.addListener( new ICellEditorListener() {
-
- public void editorValueChanged(boolean oldValidState, boolean newValidState) {
- statusListener.handleEvent(null);
- }
-
- public void cancelEditor() {
- }
-
- public void applyEditorValue() {
- }
- });
-
- textCellEditor.setValidator(new ICellEditorValidator() {
-
- public String isValid(Object packageName) {
- status = JDTUtils.validatePackageName(model.getProjectName(), packageName.toString());
- if (status.getSeverity() == IStatus.OK) {
- return null;
- }
- return status.getMessage();
- }
- });
-
- packageNameViewerColumn.setEditingSupport(new PackageNameEditingSupport(packageNameTableViewer,
- textCellEditor, model));
-
- columnWeightData = new ColumnWeightData(100, 100, true);
- tableLayout.addColumnData(columnWeightData);
-
- packageNameTableViewer.setContentProvider(new PackageNameTableContentProvider());
- packageNameTableViewer.setInput(model.getWsdlDefinition());
-
- TableItem[] tableItems = packageNameTableViewer.getTable().getItems();
- for (int i = 0; i < tableItems.length; i++) {
- TableItem tableItem = tableItems[i];
- if (model.getIncludedNamespaces().containsKey(tableItem.getText(0))) {
- tableItem.setChecked(true);
- }
- }
- return packageNameTable;
- }
-
- private Composite getNamespaceMappingComposite(Composite parent) {
- namespaceComposite = new Composite(parent, SWT.NONE);
- GridLayout gridLayout = new GridLayout(1, true);
- namespaceComposite.setLayout(gridLayout);
- GridData gridData = new GridData(SWT.FILL, SWT.FILL, true, true);
- namespaceComposite.setLayoutData(gridData);
-
- Table packageNameTable = createNamespaceMappingTable(namespaceComposite);
-
- gridData = new GridData(SWT.FILL, SWT.FILL, true, true);
- gridData.horizontalSpan = 3;
- gridData.verticalSpan = 6;
- packageNameTable.setLayoutData(gridData);
-
- return namespaceComposite;
- }
-
- @Override
- public IStatus getStatus() {
- return status;
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.cxf.consumption.ui/src/org/eclipse/jst/ws/internal/cxf/consumption/ui/widgets/WSDL2JavaClientConfigWidgetFactory.java b/bundles/org.eclipse.jst.ws.cxf.consumption.ui/src/org/eclipse/jst/ws/internal/cxf/consumption/ui/widgets/WSDL2JavaClientConfigWidgetFactory.java
deleted file mode 100644
index 48828a1..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.consumption.ui/src/org/eclipse/jst/ws/internal/cxf/consumption/ui/widgets/WSDL2JavaClientConfigWidgetFactory.java
+++ /dev/null
@@ -1,87 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IONA Technologies PLC
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IONA Technologies PLC - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.cxf.consumption.ui.widgets;
-
-import org.eclipse.jst.ws.internal.cxf.consumption.core.commands.WSDL2JavaClientDefaultingCommand;
-import org.eclipse.jst.ws.internal.cxf.consumption.ui.CXFConsumptionUIMessages;
-import org.eclipse.jst.ws.internal.cxf.core.CXFCorePlugin;
-import org.eclipse.jst.ws.internal.cxf.core.model.CXFContext;
-import org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaDataModel;
-import org.eclipse.wst.command.internal.env.core.data.DataMappingRegistry;
-import org.eclipse.wst.command.internal.env.ui.widgets.INamedWidgetContributor;
-import org.eclipse.wst.command.internal.env.ui.widgets.INamedWidgetContributorFactory;
-import org.eclipse.wst.command.internal.env.ui.widgets.SimpleWidgetContributor;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetContributor;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetContributorFactory;
-
-@SuppressWarnings("restriction")
-public class WSDL2JavaClientConfigWidgetFactory implements INamedWidgetContributorFactory {
- private SimpleWidgetContributor wsdl2JavaClientWidgetContributor;
- private SimpleWidgetContributor wsdl2JavaClientDefaultsWidgetContributor;
-
- private WSDL2JavaClientConfigWidget wsdl2JavaConfigWidget = new WSDL2JavaClientConfigWidget();
- private WSDL2JavaClientDefaultsConfigWidget wsdl2JavaClientDefaultsConfigWidget = new WSDL2JavaClientDefaultsConfigWidget();
-
- public INamedWidgetContributor getFirstNamedWidget() {
- if (wsdl2JavaClientWidgetContributor == null
- || wsdl2JavaClientDefaultsWidgetContributor == null) {
- init();
- }
- return wsdl2JavaClientWidgetContributor;
- }
-
- public INamedWidgetContributor getNextNamedWidget(INamedWidgetContributor widgetContributor) {
- if (widgetContributor == wsdl2JavaClientWidgetContributor) {
- return wsdl2JavaClientDefaultsWidgetContributor;
- }
- return null;
- }
-
- public void registerDataMappings(DataMappingRegistry dataRegistry) {
- dataRegistry.addMapping(WSDL2JavaClientDefaultingCommand.class,
- "WSDL2JavaDataModel", WSDL2JavaClientConfigWidgetFactory.class); //$NON-NLS-1$
- }
-
- public void setWSDL2JavaDataModel(WSDL2JavaDataModel model) {
- wsdl2JavaConfigWidget.setWSDL2JavaDataModel(model);
- wsdl2JavaClientDefaultsConfigWidget.setWSDL2JavaDataModel(model);
- }
-
- private void init() {
- wsdl2JavaClientWidgetContributor = new SimpleWidgetContributor();
- CXFContext context = CXFCorePlugin.getDefault().getWSDL2JavaContext();
- String wsdl2JavaClientPageTitle = CXFConsumptionUIMessages.bind(
- CXFConsumptionUIMessages.WSDL2JAVA_CLIENT_PAGE_TITLE, new Object[]{
- context.getDefaultRuntimeType(), context.getDefaultRuntimeVersion()});
- wsdl2JavaClientWidgetContributor.setTitle(wsdl2JavaClientPageTitle);
- wsdl2JavaClientWidgetContributor
- .setDescription(CXFConsumptionUIMessages.WSDL2JAVA_CLIENT_PAGE_DESCRIPTION);
- wsdl2JavaClientWidgetContributor.setFactory(new WidgetContributorFactory() {
- public WidgetContributor create() {
- return wsdl2JavaConfigWidget;
- }
- });
-
- wsdl2JavaClientDefaultsWidgetContributor = new SimpleWidgetContributor();
- String wsdl2JavaClientDefaultsPageTitle = CXFConsumptionUIMessages.bind(
- CXFConsumptionUIMessages.WSDL2JAVA_ClIENT_DEFAULTS_PAGE_TITLE, new Object[] {
- context.getDefaultRuntimeType(), context.getDefaultRuntimeVersion()});
- wsdl2JavaClientDefaultsWidgetContributor.setTitle(wsdl2JavaClientDefaultsPageTitle);
- wsdl2JavaClientDefaultsWidgetContributor
- .setDescription(CXFConsumptionUIMessages.WSDL2JAVA_CLIENT_DEFAULTS_PAGE_DESCRIPTION);
- wsdl2JavaClientDefaultsWidgetContributor.setFactory(new WidgetContributorFactory() {
- public WidgetContributor create() {
- return wsdl2JavaClientDefaultsConfigWidget;
- }
- });
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.cxf.consumption.ui/src/org/eclipse/jst/ws/internal/cxf/consumption/ui/widgets/WSDL2JavaClientDefaultsConfigWidget.java b/bundles/org.eclipse.jst.ws.cxf.consumption.ui/src/org/eclipse/jst/ws/internal/cxf/consumption/ui/widgets/WSDL2JavaClientDefaultsConfigWidget.java
deleted file mode 100644
index ac49f67..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.consumption.ui/src/org/eclipse/jst/ws/internal/cxf/consumption/ui/widgets/WSDL2JavaClientDefaultsConfigWidget.java
+++ /dev/null
@@ -1,98 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IONA Technologies PLC
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IONA Technologies PLC - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.cxf.consumption.ui.widgets;
-
-import org.eclipse.jst.ws.internal.cxf.consumption.ui.CXFConsumptionUIMessages;
-import org.eclipse.jst.ws.internal.cxf.core.CXFCorePlugin;
-import org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaDataModel;
-import org.eclipse.jst.ws.internal.cxf.core.utils.CXFModelUtils;
-import org.eclipse.jst.ws.internal.cxf.ui.widgets.WSDL2JavaWidgetFactory;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Group;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.wst.command.internal.env.ui.widgets.SimpleWidgetDataContributor;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetDataEvents;
-
-@SuppressWarnings("restriction")
-public class WSDL2JavaClientDefaultsConfigWidget extends SimpleWidgetDataContributor {
-
- private WSDL2JavaDataModel model;
-
- public WSDL2JavaClientDefaultsConfigWidget() {
- }
-
- public void setWSDL2JavaDataModel(WSDL2JavaDataModel model) {
- this.model = model;
- }
-
- @Override
- public WidgetDataEvents addControls(final Composite parent, final Listener statusListener) {
- final Composite mainComposite = new Composite(parent, SWT.NONE);
- GridLayout gridLayout = new GridLayout(1, false);
- mainComposite.setLayout(gridLayout);
-
- GridData gridData = new GridData(SWT.FILL, SWT.FILL, true, true);
- mainComposite.setLayoutData(gridData);
-
- Group wsdl2javaGroup = new Group(mainComposite, SWT.SHADOW_IN);
- wsdl2javaGroup.setText(CXFConsumptionUIMessages.WSDL2JAVA_GROUP_LABEL);
- GridLayout wsdl2javalayout = new GridLayout(1, true);
- wsdl2javaGroup.setLayout(wsdl2javalayout);
- gridData = new GridData(SWT.FILL, SWT.FILL, true, false);
- wsdl2javaGroup.setLayoutData(gridData);
-
- // WSDL2JavaWidgetFactory.createGenerateServerButton(wsdl2javaGroup, model);
- WSDL2JavaWidgetFactory.createGenerateImplementationButton(wsdl2javaGroup, model);
-
- WSDL2JavaWidgetFactory.createDefaultValuesButton(wsdl2javaGroup, model);
-
- WSDL2JavaWidgetFactory.createProcessSOAPHeadersButton(wsdl2javaGroup, model);
-
- WSDL2JavaWidgetFactory.createNamespacePackageMappingButton(wsdl2javaGroup, model);
-
- WSDL2JavaWidgetFactory.createExcludesNamespaceMappingButton(wsdl2javaGroup, model);
-
- if (CXFModelUtils.isAutoNameResolutionPermitted()) {
- WSDL2JavaWidgetFactory.createAutoNameResolutionButton(wsdl2javaGroup, model);
- }
-
- if (model.getDefaultRuntimeVersion().compareTo(CXFCorePlugin.CXF_VERSION_2_1) >= 0) {
- WSDL2JavaWidgetFactory.createNoAddressBindingButton(wsdl2javaGroup, model);
- }
-
- Group xjcArgGroup = new Group(mainComposite, SWT.SHADOW_IN);
- xjcArgGroup.setText(CXFConsumptionUIMessages.WSDL2JAVA_XJC_ARG_GROUP_LABEL);
- GridLayout xjcArgLayout = new GridLayout(1, true);
- xjcArgGroup.setLayout(xjcArgLayout);
- gridData = new GridData(SWT.FILL, SWT.FILL, true, false);
- xjcArgGroup.setLayoutData(gridData);
-
- Table xjcArgsTable = WSDL2JavaWidgetFactory.createXJCArgTable(xjcArgGroup, model);
- gridData = new GridData(SWT.FILL, SWT.FILL, true, true);
- gridData.horizontalSpan = 3;
- gridData.verticalSpan = 6;
- xjcArgsTable.setLayoutData(gridData);
-
- WSDL2JavaWidgetFactory.createXJCDefaultValuesTableItem(xjcArgsTable, model);
- WSDL2JavaWidgetFactory.createXJCToStringTableItem(xjcArgsTable, model);
- WSDL2JavaWidgetFactory.createXJCToStringMultiLineTableItem(xjcArgsTable, model);
- WSDL2JavaWidgetFactory.createXJCToStringSimpleTableItem(xjcArgsTable, model);
- WSDL2JavaWidgetFactory.createXJCLocatorTableItem(xjcArgsTable, model);
- WSDL2JavaWidgetFactory.createXJCSyncMethodsTableItem(xjcArgsTable, model);
- WSDL2JavaWidgetFactory.createXJCMarkGeneratedTableItem(xjcArgsTable, model);
- return this;
- }
-}
-
diff --git a/bundles/org.eclipse.jst.ws.cxf.consumption.ui/src/org/eclipse/jst/ws/internal/cxf/consumption/ui/widgets/object/JAXWSSelectionTransformer.java b/bundles/org.eclipse.jst.ws.cxf.consumption.ui/src/org/eclipse/jst/ws/internal/cxf/consumption/ui/widgets/object/JAXWSSelectionTransformer.java
deleted file mode 100644
index 2417e78..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.consumption.ui/src/org/eclipse/jst/ws/internal/cxf/consumption/ui/widgets/object/JAXWSSelectionTransformer.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IONA Technologies PLC
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IONA Technologies PLC - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.cxf.consumption.ui.widgets.object;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IPackageFragment;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jst.ws.internal.cxf.consumption.ui.CXFConsumptionUIPlugin;
-import org.eclipse.wst.command.internal.env.core.data.Transformer;
-
-@SuppressWarnings("restriction")
-public class JAXWSSelectionTransformer implements Transformer {
-
- public Object transform(Object value) {
- if (value instanceof IStructuredSelection) {
- IStructuredSelection structuredSelection = (IStructuredSelection) value;
- Object selection = structuredSelection.getFirstElement();
- if (selection instanceof IFile) {
- IFile file = (IFile) selection;
- String fullyQualifiedJavaName = this.getFullyQualifiedJavaName(file);
- return new StructuredSelection(fullyQualifiedJavaName);
- } else if (selection instanceof ICompilationUnit) {
- IResource resource = ((ICompilationUnit) selection).getResource();
- if (resource instanceof IFile) {
- IFile file = (IFile) resource;
- String fullyQualifiedJavaName = this.getFullyQualifiedJavaName(file);
- return new StructuredSelection(fullyQualifiedJavaName);
- }
- }
- if (selection instanceof String) {
- return structuredSelection;
- }
- }
- return value;
- }
-
- private String getFullyQualifiedJavaName(IFile resource) {
- IProject project = resource.getProject();
-
- IPath path = resource.getFullPath();
-
- if (path.getFileExtension() != null) {
- path = path.removeFileExtension();
- }
-
- String javaFileName = path.lastSegment();
-
- if (path.isAbsolute()) {
- try {
- IPath javaFolderPath = path.removeLastSegments(1);
- IPackageFragment packageFragment = JavaCore.create(project).findPackageFragment(
- javaFolderPath);
- return packageFragment.getElementName() + "." + javaFileName; //$NON-NLS-1$
- } catch (JavaModelException jme) {
- CXFConsumptionUIPlugin.log(jme.getStatus());
- }
- }
- return javaFileName;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.cxf.consumption.ui/src/org/eclipse/jst/ws/internal/cxf/consumption/ui/wsrt/CXFWebServiceClient.java b/bundles/org.eclipse.jst.ws.cxf.consumption.ui/src/org/eclipse/jst/ws/internal/cxf/consumption/ui/wsrt/CXFWebServiceClient.java
deleted file mode 100644
index 84086c2..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.consumption.ui/src/org/eclipse/jst/ws/internal/cxf/consumption/ui/wsrt/CXFWebServiceClient.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IONA Technologies PLC
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IONA Technologies PLC - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.cxf.consumption.ui.wsrt;
-
-import java.util.Vector;
-
-import org.eclipse.jst.ws.internal.cxf.consumption.core.commands.WSDL2JavaClientCommand;
-import org.eclipse.jst.ws.internal.cxf.consumption.core.commands.WSDL2JavaClientDefaultingCommand;
-import org.eclipse.jst.ws.internal.cxf.core.model.CXFFactory;
-import org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaDataModel;
-import org.eclipse.wst.command.internal.env.core.ICommandFactory;
-import org.eclipse.wst.command.internal.env.core.SimpleCommandFactory;
-import org.eclipse.wst.common.environment.IEnvironment;
-import org.eclipse.wst.ws.internal.wsrt.AbstractWebServiceClient;
-import org.eclipse.wst.ws.internal.wsrt.IContext;
-import org.eclipse.wst.ws.internal.wsrt.ISelection;
-import org.eclipse.wst.ws.internal.wsrt.WebServiceClientInfo;
-
-@SuppressWarnings("restriction")
-public class CXFWebServiceClient extends AbstractWebServiceClient {
-
- public CXFWebServiceClient(WebServiceClientInfo info) {
- super(info);
- }
-
- @Override
- public ICommandFactory assemble(IEnvironment env, IContext ctx, ISelection sel, String project,
- String earProject) {
- return null;
- }
-
- @Override
- public ICommandFactory deploy(IEnvironment env, IContext ctx, ISelection sel, String project,
- String earProject) {
- return null;
- }
-
- @Override
- @SuppressWarnings("unchecked")
- public ICommandFactory develop(IEnvironment env, IContext ctx, ISelection sel, String projectName,
- String earProject) {
-
- Vector commands = new Vector();
-
- WSDL2JavaDataModel wsdl2JavaModel = CXFFactory.eINSTANCE.createWSDL2JavaDataModel();
- commands.add(new WSDL2JavaClientDefaultingCommand(wsdl2JavaModel, projectName,
- getWebServiceClientInfo().getWsdlURL()));
- commands.add(new WSDL2JavaClientCommand(wsdl2JavaModel));
-
- return new SimpleCommandFactory(commands);
- }
-
- @Override
- public ICommandFactory install(IEnvironment env, IContext ctx, ISelection sel, String project,
- String earProject) {
- return null;
- }
-
- @Override
- public ICommandFactory run(IEnvironment env, IContext ctx, ISelection sel, String project,
- String earProject) {
- return null;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.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 4acabdc..0000000
--- a/bundles/org.eclipse.jst.ws.jaxb.core/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,13 +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: 1.0.100.qualifier
-Bundle-ClassPath: .
-Bundle-Localization: plugin
-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.jst.ws.annotations.core;bundle-version="1.1.0"
-Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.jst.ws.jaxb.core/about.html b/bundles/org.eclipse.jst.ws.jaxb.core/about.html
deleted file mode 100644
index 5b6a031..0000000
--- a/bundles/org.eclipse.jst.ws.jaxb.core/about.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
-<title>About</title>
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
-
-<p>February 19, 2009</p>
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;). Unless otherwise
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;). 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, &quot;Program&quot; 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 (&quot;Redistributor&quot;) 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 43ceb29..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\n\
-\n\
-Version: {featureVersion}\n\
-Build id: {0}\n\
-\n\
-(c) Copyright Eclipse contributors and others 2009, 2010. All rights reserved.\n\
-Visit http://www.eclipse.org/webtools/\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 12e17e6..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
-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 4e39150..0000000
--- a/bundles/org.eclipse.jst.ws.jaxb.core/plugin.xml
+++ /dev/null
@@ -1,172 +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"/>
- <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 e1260c1..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.core/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,39 +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: 1.0.200.qualifier
-Bundle-ClassPath: .
-Bundle-Localization: plugin
-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.jst.ws.annotations.core;bundle-version="[1.0.0,1.2.0)",
- javax.wsdl;bundle-version="[1.6.2,1.7.0)",
- javax.xml.soap;bundle-version="[1.2.0,1.3.0)",
- org.apache.xerces;bundle-version="[2.9.0,3.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.4.0)",
- org.eclipse.wst.common.project.facet.core;bundle-version="[1.3.0,1.5.0)",
- org.eclipse.wst.common.modulecore;bundle-version="[1.1.0,1.3.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.jaxws.dom.runtime.tests",
- 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.bind.annotation;version="2.1.0",
- javax.xml.ws;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",
- org.jdom;version="1.1.1",
- org.jdom.input;version="1.1.1",
- org.jdom.output;version="1.1.1"
-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 (&quot;Content&quot;). Unless otherwise
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;). 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, &quot;Program&quot; 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 (&quot;Redistributor&quot;) 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 64788e1..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\n\
-\n\
-Version: {featureVersion}\n\
-Build id: {0}\n\
-\n\
-(c) Copyright Eclipse contributors and others 2008, 2010. All rights reserved.\n\
-Visit http://www.eclipse.org/webtools/\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 07b6e31..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.core/plugin.properties
+++ /dev/null
@@ -1,37 +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
-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
-WEBSERVICE_METHOD_PARAMETERS_RETURN_TYPE_RULE=Validates Method Parameters and Return Types
-WEBSERVICE_EJB_STATELESS_SESSION=@WebService may only be added to stateless session beans in an EJB module
-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 f1fa134..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.core/plugin.xml
+++ /dev/null
@@ -1,292 +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>
- <processor
- annotation="javax.jws.WebService"
- class="org.eclipse.jst.ws.internal.jaxws.core.annotations.validation.WebServiceParametersReturnTypesRule">
- <description>
- %WEBSERVICE_METHOD_PARAMETERS_RETURN_TYPE_RULE
- </description>
- </processor>
- <processor
- annotation="javax.jws.WebService"
- class="org.eclipse.jst.ws.internal.jaxws.core.annotations.validation.WebServiceEJBModuleRule">
- <description>
- %WEBSERVICE_EJB_STATELESS_SESSION
- </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 704772e..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.core/src/org/eclipse/jst/ws/internal/jaxws/core/JAXWSCoreMessages.java
+++ /dev/null
@@ -1,128 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Shane Clarke.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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_CLASS_OR_INTERFACE_ONLY;
- 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_INCOMPATIBLE_EXCEPTIONS;
- 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_NCNAME_ATTRIBUTE;
-
- public static String PARAMETER_NAME_CLASH;
- public static String GENERATED_PARAMETER_NAME_CLASH;
-
- public static String INTERFACES_NOT_SUPPORTED;
- public static String HAS_INADMISSIBLE_INNER_TYPES;
- public static String IS_REMOTE_OBJECT;
- public static String ABSTRACT_CLASS_NOT_IMPLEMENTED;
- public static String INHERITANCE_AND_IMPLEMENTATION;
- public static String IMPLEMENTS_MULTIPLE_INTERFACES;
-
- public static String WEBPARAM_NAME_REDUNDANT;
- public static String WEBSERVICE_ONLY_ON_STATELESS_SESSION_BEANS;
- public static String TARGET_NAMESPACE_URI_SYNTAX_ERROR;
-
- public static String EMPTY_ATTRIBUTE_VALUE;
- 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 7d0ff2f..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.core/src/org/eclipse/jst/ws/internal/jaxws/core/JAXWSCoreMessages.properties
+++ /dev/null
@@ -1,94 +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_CLASS_OR_INTERFACE_ONLY=@WebService may only be added to a class or interface
-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_NCNAME_ATTRIBUTE=The @{0} {1} attribute value ''{2}'' 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
-EMPTY_ATTRIBUTE_VALUE=The @{0} {1} attribute should not be empty
-WEBPARAM_NAME_REDUNDANT=Name attribute is not used if SOAPBinding.Style is RPC and partName is present
-WEBSERVICE_ONLY_ON_STATELESS_SESSION_BEANS=@WebService annotation in EJB modules can be only used on stateless session beans
-WEBSERVICE_ENPOINTINTERFACE_INCOMPATIBLE_EXCEPTIONS=Method {0} declares exceptions that are not compatible with the throws clause of the {0} method in the service endpoint interface {1}
-INTERFACES_NOT_SUPPORTED={0} is an interface and may not be used as a return type or method parameter as JAXB cannot handle interfaces
-HAS_INADMISSIBLE_INNER_TYPES=Class {0} may not be used as a return type or method parameter as it has inner types that are not public and static
-IS_REMOTE_OBJECT=Class {0} is a remote Object and may not used as a method return type or parameter
-ABSTRACT_CLASS_NOT_IMPLEMENTED=Abstract class {0} cannot be used as a runtime class because it is not extended by a non abstract class which is suitable as a runtime class
-INHERITANCE_AND_IMPLEMENTATION=Class {0} extends {1} and implements interface {2} (multiple inheritance is not allowed)
-IMPLEMENTS_MULTIPLE_INTERFACES=Class {0} implements multiple interfaces (multiple inheritance is not allowed)
-TARGET_NAMESPACE_URI_SYNTAX_ERROR=URI syntax error at index {0} of input String ''{1}''. Reason: {2}
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 7d06428..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.core/src/org/eclipse/jst/ws/internal/jaxws/core/annotations/validation/OnewayRules.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.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.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.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())) {
- AnnotationMirror oneway = AnnotationUtils.getAnnotation(methodDeclaration, Oneway.class);
- printError(oneway.getPosition(), JAXWSCoreMessages.ONEWAY_NO_RETURN_VALUE);
- }
- if (methodDeclaration.getThrownTypes().size() > 0) {
- AnnotationMirror oneway = AnnotationUtils.getAnnotation(methodDeclaration, Oneway.class);
- printError(oneway.getPosition(), 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())) {
- AnnotationMirror oneway = AnnotationUtils.getAnnotation(methodDeclaration, Oneway.class);
- printError(oneway.getPosition(), 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 55fccb8..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);
- }
- }
- }
- }
- }
- }
-
- 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 a8e4e41..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.core/src/org/eclipse/jst/ws/internal/jaxws/core/annotations/validation/SOAPBindingRules.java
+++ /dev/null
@@ -1,139 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Shane Clarke.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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.NAME;
-import static org.eclipse.jst.ws.internal.jaxws.core.utils.JAXWSUtils.PARAMETER_STYLE;
-import static org.eclipse.jst.ws.internal.jaxws.core.utils.JAXWSUtils.PART_NAME;
-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.WebParam;
-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.AnnotationValue;
-import com.sun.mirror.declaration.Declaration;
-import com.sun.mirror.declaration.MethodDeclaration;
-import com.sun.mirror.declaration.ParameterDeclaration;
-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) {
- TypeDeclaration typeDeclaration = (TypeDeclaration) declaration;
- checkForRPCBareOnTypeDeclaration(typeDeclaration);
- checkRedundantWebParamNameAttribute(typeDeclaration);
- }
-
- 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);
- }
- }
-
- private void checkRedundantWebParamNameAttribute(TypeDeclaration typeDeclaration) {
- AnnotationMirror soapBinding = AnnotationUtils.getAnnotation(typeDeclaration, SOAPBinding.class);
- String style = AnnotationUtils.getStringValue(soapBinding, STYLE);
- if (style != null && style.equals(Style.RPC.toString())) {
- Collection<? extends MethodDeclaration> methods = typeDeclaration.getMethods();
- for (MethodDeclaration methodDeclaration : methods) {
- Collection<ParameterDeclaration> parameters = methodDeclaration.getParameters();
- for (ParameterDeclaration parameterDeclaration : parameters) {
- AnnotationMirror webParam = AnnotationUtils.getAnnotation(parameterDeclaration, WebParam.class);
- if (webParam != null && !isHeader(webParam)) {
- AnnotationValue partName = AnnotationUtils.getAnnotationValue(webParam, PART_NAME);
- if (partName != null) {
- AnnotationValue name = AnnotationUtils.getAnnotationValue(webParam, NAME);
- if (name != null) {
- printWarning(name.getPosition(), JAXWSCoreMessages.WEBPARAM_NAME_REDUNDANT);
- }
- }
- }
- }
- }
- }
- }
-
- private boolean isHeader(AnnotationMirror annotationMirror) {
- Boolean header = AnnotationUtils.getBooleanValue(annotationMirror, HEADER);
- if (header != null) {
- return header.booleanValue();
- }
- return false;
- }
-
-}
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 aab3e67..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.core/src/org/eclipse/jst/ws/internal/jaxws/core/annotations/validation/UniqueNamesRule.java
+++ /dev/null
@@ -1,497 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Shane Clarke.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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.PART_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.RESPONSE_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.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;
- validateNameAttributes(typeDeclaration);
- checkOperationNames(typeDeclaration.getMethods());
- checkWrapperAndFaultBeanNames(typeDeclaration.getMethods());
- checkDocumentBareMethods(typeDeclaration.getMethods());
- checkMethodParameters(typeDeclaration.getMethods());
- }
- }
- }
-
- private void validateNameAttributes(TypeDeclaration typeDeclaration) {
- AnnotationMirror webService = AnnotationUtils.getAnnotation(typeDeclaration, WebService.class);
- checkAttributeValue(webService, WebService.class.getSimpleName(), NAME);
- checkAttributeValue(webService, WebService.class.getSimpleName(), PORT_NAME);
- checkAttributeValue(webService, WebService.class.getSimpleName(), SERVICE_NAME);
-
- Collection<? extends MethodDeclaration> methods = typeDeclaration.getMethods();
- for (MethodDeclaration methodDeclaration : methods) {
- AnnotationMirror webMethod = AnnotationUtils.getAnnotation(methodDeclaration, WebMethod.class);
- checkAttributeValue(webMethod, WebMethod.class.getSimpleName(), OPERATION_NAME);
-
- Collection<ParameterDeclaration> parameters = methodDeclaration.getParameters();
- for (ParameterDeclaration parameterDeclaration : parameters) {
- AnnotationMirror webParam = AnnotationUtils.getAnnotation(parameterDeclaration, WebParam.class);
- checkAttributeValue(webParam, WebParam.class.getSimpleName(), NAME);
- checkAttributeValue(webParam, WebParam.class.getSimpleName(), PART_NAME);
- }
- }
- }
-
- private void checkAttributeValue(AnnotationMirror annotationMirror, String annotationName, String attributeName) {
- if (annotationMirror != null) {
- AnnotationValue annotationValue = AnnotationUtils.getAnnotationValue(annotationMirror, attributeName);
- if (annotationValue != null) {
- if (annotationValue.toString().trim().length() == 0) {
- printError(annotationValue.getPosition(), JAXWSCoreMessages.bind(
- JAXWSCoreMessages.EMPTY_ATTRIBUTE_VALUE, new Object[] { annotationName, attributeName }));
- } else if (!XMLChar.isValidName(annotationValue.toString())) {
- printError(annotationValue.getPosition(), JAXWSCoreMessages.bind(
- JAXWSCoreMessages.INVALID_NCNAME_ATTRIBUTE, new Object[] { annotationName,
- attributeName, annotationValue.toString() }));
- }
- }
- }
- }
-
- 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];
- 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) {
- if (declaration instanceof MethodDeclaration) {
- AnnotationMirror requestWrapper = AnnotationUtils.getAnnotation(declaration, RequestWrapper.class);
- if (requestWrapper != null) {
- addClassName(requestWrapper, CLASS_NAME, classNames);
- addLocalName(requestWrapper, LOCAL_NAME, (MethodDeclaration) declaration, qNames);
- }
-
- AnnotationMirror responseWrapper = AnnotationUtils.getAnnotation(declaration, ResponseWrapper.class);
- if (responseWrapper != null) {
- addClassName(responseWrapper, CLASS_NAME, classNames);
- addLocalName(responseWrapper, LOCAL_NAME, (MethodDeclaration) 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];
- 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,
- MethodDeclaration methodDeclaration, Map<Object, QName> qNames) {
- AnnotationValue localNameValue = AnnotationUtils.getAnnotationValue(annotationMirror, attributeKey);
- if (localNameValue != null) {
- qNames.put(localNameValue, new QName(getTargetNamespace(annotationMirror, methodDeclaration),
- 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 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);
- 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 34d5f2f..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.core/src/org/eclipse/jst/ws/internal/jaxws/core/annotations/validation/WebMethodCheckForWebServiceRule.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Shane Clarke.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Shane Clarke - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.jaxws.core.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) {
- if (declaration instanceof MethodDeclaration) {
- 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 3d6d346..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.core/src/org/eclipse/jst/ws/internal/jaxws/core/annotations/validation/WebMethodExcludeRules.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.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) {
- if (declaration instanceof MethodDeclaration) {
- 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 0f66a80..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.core/src/org/eclipse/jst/ws/internal/jaxws/core/annotations/validation/WebServiceDefaultPublicConstructorRule.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Shane Clarke.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Shane Clarke - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.jaxws.core.annotations.validation;
-
-import java.util.Collection;
-
-import 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.EnumDeclaration;
-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 && !(declaration instanceof EnumDeclaration)) {
- 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/WebServiceEJBModuleRule.java b/bundles/org.eclipse.jst.ws.jaxws.core/src/org/eclipse/jst/ws/internal/jaxws/core/annotations/validation/WebServiceEJBModuleRule.java
deleted file mode 100644
index f1507d4..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.core/src/org/eclipse/jst/ws/internal/jaxws/core/annotations/validation/WebServiceEJBModuleRule.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.core.annotations.validation;
-
-import java.util.Collection;
-import java.util.Set;
-
-import javax.jws.WebService;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jdt.apt.core.env.EclipseAnnotationProcessorEnvironment;
-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.JAXWSCorePlugin;
-import org.eclipse.wst.common.project.facet.core.IFacetedProject;
-import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion;
-import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager;
-
-import com.sun.mirror.declaration.AnnotationMirror;
-import com.sun.mirror.declaration.AnnotationTypeDeclaration;
-import com.sun.mirror.declaration.Declaration;
-
-public class WebServiceEJBModuleRule extends AbstractAnnotationProcessor {
-
- private static final String STATELESS = "javax.ejb.Stateless"; //$NON-NLS-1$
- private static final String EJB_FACET = "jst.ejb"; //$NON-NLS-1$
- private static final String EJB_FACET_VERSION = "3.0"; //$NON-NLS-1$
-
- @Override
- public void process() {
- if (environment instanceof EclipseAnnotationProcessorEnvironment) {
- EclipseAnnotationProcessorEnvironment eclipseEnvironment = (EclipseAnnotationProcessorEnvironment) environment;
-
- IProject project = eclipseEnvironment.getJavaProject().getProject();
- try {
- if (isFacetedProject(project)) {
- IFacetedProject facetedProject = ProjectFacetsManager.create(project);
- if (facetedProject.hasProjectFacet(ProjectFacetsManager.getProjectFacet(EJB_FACET))) {
- IProjectFacetVersion facetVersion = facetedProject.getProjectFacetVersion(ProjectFacetsManager.getProjectFacet(EJB_FACET));
- if (facetVersion.getVersionString().equals(EJB_FACET_VERSION)) {
- AnnotationTypeDeclaration webServiceDeclaration = (AnnotationTypeDeclaration) eclipseEnvironment.getTypeDeclaration(WebService.class.getName());
- Collection<Declaration> annotatedTypes = eclipseEnvironment.getDeclarationsAnnotatedWith(webServiceDeclaration);
- for (Declaration declaration : annotatedTypes) {
- if (getStatelessAnnotation(declaration) == null) {
- AnnotationMirror webService = AnnotationUtils.getAnnotation(declaration, WebService.class);
- printError(webService.getPosition(), JAXWSCoreMessages.WEBSERVICE_ONLY_ON_STATELESS_SESSION_BEANS);
- }
- }
- }
- }
- }
- } catch (CoreException ce) {
- JAXWSCorePlugin.log(ce.getStatus());
- }
- }
- }
-
- private AnnotationMirror getStatelessAnnotation(Declaration declaration) {
- Collection<AnnotationMirror> aannotationMirrors = declaration.getAnnotationMirrors();
-
- for (AnnotationMirror annotationMirror : aannotationMirrors) {
- AnnotationTypeDeclaration annotationTypeDeclaration = annotationMirror.getAnnotationType().getDeclaration();
- if (annotationTypeDeclaration != null
- && annotationTypeDeclaration.getQualifiedName().equals(STATELESS)) {
- return annotationMirror;
- }
- }
- return null;
- }
-
- private boolean isFacetedProject(IProject project) throws CoreException {
- Set<IFacetedProject> facetedProjects = ProjectFacetsManager.getFacetedProjects();
- for (IFacetedProject facetedProject : facetedProjects) {
- if (facetedProject.getProject().equals(project)) {
- return true;
- }
- }
- return false;
- }
-
-}
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/WebServiceParametersReturnTypesRule.java b/bundles/org.eclipse.jst.ws.jaxws.core/src/org/eclipse/jst/ws/internal/jaxws/core/annotations/validation/WebServiceParametersReturnTypesRule.java
deleted file mode 100644
index 72bea3b..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.core/src/org/eclipse/jst/ws/internal/jaxws/core/annotations/validation/WebServiceParametersReturnTypesRule.java
+++ /dev/null
@@ -1,352 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 Shane Clarke.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Shane Clarke - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.jaxws.core.annotations.validation;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-import javax.jws.WebService;
-import javax.xml.bind.annotation.XmlType;
-
-import org.eclipse.jdt.apt.core.env.EclipseAnnotationProcessorEnvironment;
-import org.eclipse.jdt.core.Flags;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.ITypeHierarchy;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.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.JAXWSCorePlugin;
-
-import com.sun.mirror.declaration.AnnotationTypeDeclaration;
-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;
-import com.sun.mirror.type.ArrayType;
-import com.sun.mirror.type.ClassType;
-import com.sun.mirror.type.InterfaceType;
-import com.sun.mirror.type.TypeMirror;
-
-public class WebServiceParametersReturnTypesRule extends AbstractAnnotationProcessor {
-
- private static final Set<String> JAVA_TYPES = new HashSet<String>();
-
- private static final Set<String> ALLOWED_IN_MULTIPLE_INHERITANCE = new HashSet<String>();
-
- static {
- 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$
-
- 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$
-
- 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_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$
-
- JAVA_TYPES.add("java.lang.Exception"); //$NON-NLS-1$
- JAVA_TYPES.add("java.lang.Throwable"); //$NON-NLS-1$
- JAVA_TYPES.add("java.lang.StackTraceElement"); //$NON-NLS-1$
-
- ALLOWED_IN_MULTIPLE_INHERITANCE.add("java.lang.Cloneable"); // $NON-NLS$
- ALLOWED_IN_MULTIPLE_INHERITANCE.add("java.lang.Comparable"); // $NON-NLS$
- ALLOWED_IN_MULTIPLE_INHERITANCE.add("java.io.Serializable"); // $NON-NLS$
- }
-
- private static final String REMOTE_OBJECT = "java.rmi.Remote";
-
- @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 InterfaceDeclaration) {
- validateMethodParametersAndReturnTypes((InterfaceDeclaration) declaration);
- }
- }
- }
-
- private void validateMethodParametersAndReturnTypes(InterfaceDeclaration interfaceDeclaration) {
- Collection<? extends MethodDeclaration> methods = interfaceDeclaration.getMethods();
- for (MethodDeclaration methodDeclaration : methods) {
- TypeMirror returnType = methodDeclaration.getReturnType();
- validateTypeMirror(returnType, methodDeclaration);
- Collection<ParameterDeclaration> parameters = methodDeclaration.getParameters();
- for (ParameterDeclaration parameterDeclaration : parameters) {
- validateTypeMirror(parameterDeclaration.getType(), methodDeclaration);
- }
- }
- }
-
- private void validateTypeMirror(TypeMirror returnType, MethodDeclaration methodDeclaration) {
- if (returnType instanceof ArrayType) {
- ArrayType arrayType = (ArrayType) returnType;
-
- TypeMirror componentType = arrayType.getComponentType();
- if (componentType instanceof ClassDeclaration) {
- ClassDeclaration classDeclaration = (ClassDeclaration) componentType;
- checkClassRestriction(classDeclaration, methodDeclaration);
- }
- }
-
- if (returnType instanceof InterfaceType) {
- InterfaceType interfaceType = (InterfaceType) returnType;
- Collection<TypeMirror> typeArguments = interfaceType.getActualTypeArguments();
- if (typeArguments.size() > 0) {
- for (TypeMirror typeMirror : typeArguments) {
- if (typeMirror instanceof ClassDeclaration) {
- ClassDeclaration classDeclaration = (ClassDeclaration) typeMirror;
- checkClassRestriction(classDeclaration, methodDeclaration);
- }
- if (typeMirror instanceof InterfaceDeclaration) {
- checkInterface((InterfaceDeclaration) typeMirror, methodDeclaration);
- }
- }
- }
- checkInterface(interfaceType.getDeclaration(), methodDeclaration);
-
- }
-
- if (returnType instanceof ClassType) {
- ClassType classType = (ClassType) returnType;
- Collection<TypeMirror> typeArguments = classType.getActualTypeArguments();
- if (typeArguments.size() > 0) {
- for (TypeMirror typeMirror : typeArguments) {
- if (typeMirror instanceof ClassDeclaration) {
- ClassDeclaration classDeclaration = (ClassDeclaration) typeMirror;
- checkClassRestriction(classDeclaration, methodDeclaration);
- }
- }
- } else {
- if (classType.getDeclaration() != null) {
- checkClassRestriction(classType.getDeclaration(), methodDeclaration);
- }
- }
- }
-
- }
-
- private void checkClassRestriction(ClassDeclaration classDeclaration, MethodDeclaration methodDeclaration) {
- checkInnerPublicStaticTypes(classDeclaration, methodDeclaration);
- checkIfRemoteObject(classDeclaration, methodDeclaration);
- checkAbstactType(classDeclaration, methodDeclaration);
- checkMultipleInheritance(classDeclaration, methodDeclaration);
- }
-
- private void checkInnerPublicStaticTypes(ClassDeclaration classDeclaration, MethodDeclaration methodDeclaration) {
- if (hasInnerNonPublicStaticTypes(classDeclaration)) {
- printError(methodDeclaration.getPosition(), JAXWSCoreMessages.bind(
- JAXWSCoreMessages.HAS_INADMISSIBLE_INNER_TYPES, classDeclaration.getQualifiedName()));
- }
- }
-
- private boolean hasInnerNonPublicStaticTypes(ClassDeclaration classDeclaration) {
- if (isJavaType(classDeclaration.getQualifiedName()) && JAVA_TYPES.contains(classDeclaration.getQualifiedName())) {
- return false;
- }
- Collection<TypeDeclaration> nestedTypes = classDeclaration.getNestedTypes();
- for (TypeDeclaration typeDeclaration : nestedTypes) {
- if (!typeDeclaration.getModifiers().contains(Modifier.PUBLIC)
- || !typeDeclaration.getModifiers().contains(Modifier.STATIC)) {
- return true;
- }
- }
- return false;
- }
-
- private void checkInterface(InterfaceDeclaration interfaceDeclaration, MethodDeclaration methodDeclaration) {
- if (!isSuitableInterface(interfaceDeclaration)) {
- printError(methodDeclaration.getPosition(), JAXWSCoreMessages.bind(
- JAXWSCoreMessages.INTERFACES_NOT_SUPPORTED, interfaceDeclaration.getQualifiedName()));
- }
- }
-
- private boolean isSuitableInterface(InterfaceDeclaration interfaceDeclaration) {
- return isJavaType(interfaceDeclaration.getQualifiedName()) && JAVA_TYPES.contains(interfaceDeclaration.getQualifiedName())
- || isXMLType(interfaceDeclaration);
- }
-
- private boolean isXMLType(InterfaceDeclaration interfaceDeclaration) {
- return AnnotationUtils.getAnnotation(interfaceDeclaration, XmlType.class) != null;
- }
-
- private void checkIfRemoteObject(ClassDeclaration classDeclaration, MethodDeclaration methodDeclaration) {
- if (isRemoteObject(classDeclaration)) {
- printError(methodDeclaration.getPosition(), JAXWSCoreMessages.bind(
- JAXWSCoreMessages.IS_REMOTE_OBJECT, classDeclaration.getQualifiedName()));
- }
- }
-
- private boolean isRemoteObject(ClassDeclaration classDeclaration) {
- Collection<InterfaceType> superInterfaces = classDeclaration.getSuperinterfaces();
- for (InterfaceType interfaceType : superInterfaces) {
-
- if (interfaceType.getDeclaration() != null && interfaceType.getDeclaration().getQualifiedName().equals(REMOTE_OBJECT)) {
- return true;
- }
- }
- return false;
- }
-
- private void checkAbstactType(ClassDeclaration classDeclaration, MethodDeclaration methodDeclaration) {
- if (classDeclaration.getModifiers().contains(Modifier.ABSTRACT)) {
- if (environment instanceof EclipseAnnotationProcessorEnvironment) {
- EclipseAnnotationProcessorEnvironment eclipseEnvironment = (EclipseAnnotationProcessorEnvironment) environment;
- IJavaProject javaProject = eclipseEnvironment.getJavaProject();
- try {
- IType type = javaProject.findType(classDeclaration.getQualifiedName());
- ITypeHierarchy hierarchy = type.newTypeHierarchy(null);
- IType[] subTypes = hierarchy.getAllSubtypes(type);
- if (subTypes.length > 0) {
- for (IType subType : subTypes) {
- if (!Flags.isAbstract(subType.getFlags())) {
- TypeDeclaration typeDeclaration = environment.getTypeDeclaration(subType.getFullyQualifiedName());
- if (typeDeclaration instanceof ClassDeclaration) {
- ClassDeclaration subTypeDeclaration = (ClassDeclaration) typeDeclaration;
- if (isRemoteObject(subTypeDeclaration) || hasInnerNonPublicStaticTypes(subTypeDeclaration)
- || implementsMultipleInterfaces(subTypeDeclaration)
- || implementsClassAndInterface(subTypeDeclaration)) {
- printError(methodDeclaration.getPosition(), JAXWSCoreMessages.bind(
- JAXWSCoreMessages.ABSTRACT_CLASS_NOT_IMPLEMENTED,
- classDeclaration.getQualifiedName()));
- }
- }
- }
- }
- } else {
- printError(methodDeclaration.getPosition(), JAXWSCoreMessages.bind(
- JAXWSCoreMessages.ABSTRACT_CLASS_NOT_IMPLEMENTED,
- classDeclaration.getQualifiedName()));
- }
- } catch (JavaModelException jme) {
- JAXWSCorePlugin.log(jme.getStatus());
- }
- }
- }
- }
-
- private boolean implementsMultipleInterfaces(ClassDeclaration classDeclaration) {
- if (hasSuperClass(classDeclaration)) {
- return countAllowedInterfaces(classDeclaration.getSuperinterfaces()) > 1;
- }
- return false;
- }
-
- private boolean implementsClassAndInterface(ClassDeclaration classDeclaration) {
- if (!hasSuperClass(classDeclaration)) {
- return countAllowedInterfaces(classDeclaration.getSuperinterfaces()) > 0;
- }
- return false;
- }
-
- private boolean hasSuperClass(ClassDeclaration classDeclaration) {
- ClassType superClass = classDeclaration.getSuperclass();
- if (superClass.getDeclaration() != null) {
- String qualifiedName = superClass.getDeclaration().getQualifiedName();
- return qualifiedName.equals(Object.class.getName()) || qualifiedName.equals(Exception.class.getName());
- }
- return false;
- }
-
- private void checkMultipleInheritance(ClassDeclaration classDeclaration, MethodDeclaration methodDeclaration) {
- if (implementsMultipleInterfaces(classDeclaration)) {
- List<String> interfaceNames = getAllowedInterfaceNames(classDeclaration.getSuperinterfaces());
- printError(methodDeclaration.getPosition(), JAXWSCoreMessages.bind(
- JAXWSCoreMessages.IMPLEMENTS_MULTIPLE_INTERFACES,
- new Object [] { classDeclaration.getQualifiedName(), interfaceNames.get(0), interfaceNames.get(1) }));
- }
- if (implementsClassAndInterface(classDeclaration)) {
- List<String> interfaceNames = getAllowedInterfaceNames(classDeclaration.getSuperinterfaces());
- printError(methodDeclaration.getPosition(), JAXWSCoreMessages.bind(
- JAXWSCoreMessages.INHERITANCE_AND_IMPLEMENTATION,
- new Object[] {classDeclaration.getQualifiedName(),
- classDeclaration.getSuperclass().getDeclaration().getQualifiedName(),
- interfaceNames.get(0)} ));
- }
- }
-
- private List<String> getAllowedInterfaceNames(Collection<InterfaceType> superInterfaces) {
- List<String> interfaceNames = new ArrayList<String>();
- for (InterfaceType interfaceType : superInterfaces) {
- if (interfaceType.getDeclaration() != null) {
- InterfaceDeclaration superInterface = interfaceType.getDeclaration();
- if (!ALLOWED_IN_MULTIPLE_INHERITANCE.contains(superInterface.getQualifiedName())) {
- interfaceNames.add(superInterface.getQualifiedName());
- }
- }
- }
- return interfaceNames;
- }
-
- private int countAllowedInterfaces(Collection<InterfaceType> superInterfaces) {
- int count = 0;
- for (InterfaceType interfaceType : superInterfaces) {
- if (interfaceType.getDeclaration() != null) {
- InterfaceDeclaration superInterface = interfaceType.getDeclaration();
- if (!ALLOWED_IN_MULTIPLE_INHERITANCE.contains(superInterface.getQualifiedName())) {
- count++;
- }
- }
- }
- return count;
- }
-
- private boolean isJavaType(String typeName) {
- return typeName.startsWith("java.") || typeName.startsWith("javax."); //$NON-NLS-1$ //$NON-NLS-2$
- }
-
-} \ No newline at end of file
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 f95e381..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.core/src/org/eclipse/jst/ws/internal/jaxws/core/annotations/validation/WebServicePublicAbstractFinalRule.java
+++ /dev/null
@@ -1,87 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Shane Clarke.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Shane Clarke - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.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.Declaration;
-import com.sun.mirror.declaration.EnumDeclaration;
-import com.sun.mirror.declaration.InterfaceDeclaration;
-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 ClassDeclaration) {
- if (declaration instanceof EnumDeclaration) {
- printError(declaration.getPosition(), JAXWSCoreMessages.WEBSERVICE_CLASS_OR_INTERFACE_ONLY);
- } else {
- testDeclaration(declaration, annotationDeclaration);
- }
- }
-
- if (declaration instanceof InterfaceDeclaration) {
- if (declaration instanceof AnnotationTypeDeclaration) {
- printError(declaration.getPosition(), JAXWSCoreMessages.WEBSERVICE_CLASS_OR_INTERFACE_ONLY);
- } else {
- testDeclaration(declaration, annotationDeclaration);
- }
- }
- }
- }
-
- private void testDeclaration(Declaration declaration, AnnotationTypeDeclaration annotationDeclaration) {
- 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 67ba4aa..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.core/src/org/eclipse/jst/ws/internal/jaxws/core/annotations/validation/WebServiceSEIRestrictionsRule.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.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) || typeDeclaration instanceof AnnotationTypeDeclaration) {
- printError(endpointInterface.getPosition(), JAXWSCoreMessages.bind(
- JAXWSCoreMessages.WEBSERVICE_ENPOINTINTERFACE_NOT_INTERFACE, sei));
- return;
- }
- 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);
- }
- if (implMethod.getThrownTypes().size() != seiMethod.getThrownTypes().size() ||
- !implMethod.getThrownTypes().containsAll(seiMethod.getThrownTypes())) {
- printError(implMethod.getPosition(), JAXWSCoreMessages.bind(
- JAXWSCoreMessages.WEBSERVICE_ENPOINTINTERFACE_INCOMPATIBLE_EXCEPTIONS,
- implMethod.getSimpleName(), sei));
- }
- 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 e5154ef..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.core/src/org/eclipse/jst/ws/internal/jaxws/core/annotations/validation/WebServiceTargetNamespaceRule.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.internal.jaxws.core.annotations.validation;
-
-import static org.eclipse.jst.ws.internal.jaxws.core.utils.JAXWSUtils.TARGET_NAMESPACE;
-
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.util.Collection;
-
-import javax.jws.WebParam;
-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.MethodDeclaration;
-import com.sun.mirror.declaration.PackageDeclaration;
-import com.sun.mirror.declaration.ParameterDeclaration;
-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) {
- if (targetNamespace == null || targetNamespace.getValue().toString().trim().length() == 0) {
- printError(webService.getPosition(), JAXWSCoreMessages.WEBSERVICE_DEFAULT_PACKAGE_TARGET_NAMESPACE);
- }
- }
-
- validateURISyntax(targetNamespace);
-
- Collection<? extends MethodDeclaration> methods = ((TypeDeclaration) declaration).getMethods();
- for (MethodDeclaration methodDeclaration : methods) {
- Collection<ParameterDeclaration> parameters = methodDeclaration.getParameters();
- for (ParameterDeclaration parameterDeclaration : parameters) {
- AnnotationMirror webParam = AnnotationUtils.getAnnotation(parameterDeclaration, WebParam.class);
- if (webParam != null) {
- validateURISyntax(AnnotationUtils.getAnnotationValue(webParam, TARGET_NAMESPACE));
- }
- }
- }
- }
- }
- }
-
-
- private void validateURISyntax(AnnotationValue targetNamespace) {
- if (targetNamespace != null) {
- try {
- new URI(targetNamespace.getValue().toString());
- } catch (URISyntaxException urise) {
- printError(targetNamespace.getPosition(), JAXWSCoreMessages.bind(
- JAXWSCoreMessages.TARGET_NAMESPACE_URI_SYNTAX_ERROR, new Object[] {
- urise.getIndex(), urise.getInput(), urise.getReason() }));
- }
- }
- }
-
-}
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 78a33a7..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.core/src/org/eclipse/jst/ws/internal/jaxws/core/annotations/validation/WebServiceWSDLLocationRule.java
+++ /dev/null
@@ -1,316 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Shane Clarke.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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.core.resources.IFolder;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.jdt.apt.core.env.EclipseAnnotationProcessorEnvironment;
-import org.eclipse.jdt.core.IJavaProject;
-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.JAXWSCorePlugin;
-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
- 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;
- checkWSDLocation(classDeclaration);
- }
- }
- }
-
- private void checkWSDLocation(ClassDeclaration classDeclaration) {
- AnnotationMirror webService = AnnotationUtils.getAnnotation(classDeclaration, WebService.class);
- AnnotationValue wsdlLocationValue = AnnotationUtils.getAnnotationValue(webService, WSDL_LOCATION);
- if (wsdlLocationValue != null) {
- String wsdlLocation = wsdlLocationValue.getValue().toString().trim();
- if (wsdlLocation.length() > 0) {
- if (wsdlLocation.endsWith(".wsdl")) { //$NON-NLS-1$
- URL relativeURL = getRelativeURL(classDeclaration, wsdlLocation);
- if (relativeURL != null) {
- validateWSDL(relativeURL.toString(), webService, classDeclaration, wsdlLocationValue);
- } else {
- printWarning(wsdlLocationValue.getPosition(), JAXWSCoreMessages.bind(
- JAXWSCoreMessages.WEBSERVICE_WSDL_LOCATION_UNABLE_TO_LOCATE, wsdlLocation));
- }
- } else {
- validateWSDL(wsdlLocation, webService, classDeclaration, wsdlLocationValue);
- }
-
- } else {
- printError(wsdlLocationValue.getPosition(), JAXWSCoreMessages.bind(
- JAXWSCoreMessages.EMPTY_ATTRIBUTE_VALUE, new Object[] {WebService.class.getSimpleName(),
- WSDL_LOCATION}));
- }
- }
- }
-
- private URL getRelativeURL(ClassDeclaration classDeclaration, String wsdlLocation) {
- if (environment instanceof EclipseAnnotationProcessorEnvironment) {
- EclipseAnnotationProcessorEnvironment eclipseEnvironment = (EclipseAnnotationProcessorEnvironment) environment;
- IJavaProject javaProject = eclipseEnvironment.getJavaProject();
- IFolder webContentFolder = WSDLUtils.getWebContentFolder(javaProject.getProject());
- if (webContentFolder != null) {
- IResource wsdlResource = webContentFolder.findMember(wsdlLocation);
- if (wsdlResource != null) {
- try {
- return wsdlResource.getLocationURI().toURL();
- } catch (MalformedURLException murle) {
- JAXWSCorePlugin.log(murle);
- }
- }
- }
- }
- return null;
- }
-
- private void validateWSDL(String wsdlLocation, AnnotationMirror webService, ClassDeclaration classDeclaration, AnnotationValue wsdlLocationValue) {
- try {
- URL wsdlURL = new URL(wsdlLocation);
- Definition definition = WSDLUtils.readWSDL(wsdlURL);
- if (definition != null) {
- QName serviceQName = getServiceQName(webService, classDeclaration);
- 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);
- @SuppressWarnings("unchecked")
- 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) {
- printWarning(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/JAXWSHandlerUtils.java b/bundles/org.eclipse.jst.ws.jaxws.core/src/org/eclipse/jst/ws/internal/jaxws/core/utils/JAXWSHandlerUtils.java
deleted file mode 100644
index 39a576e..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.core/src/org/eclipse/jst/ws/internal/jaxws/core/utils/JAXWSHandlerUtils.java
+++ /dev/null
@@ -1,264 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 Shane Clarke.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Shane Clarke - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.jaxws.core.utils;
-
-import java.io.ByteArrayInputStream;
-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.util.List;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.content.IContentDescription;
-import org.eclipse.core.runtime.content.IContentType;
-import org.eclipse.jst.ws.internal.jaxws.core.JAXWSCorePlugin;
-import org.eclipse.wst.sse.core.internal.format.IStructuredFormatProcessor;
-import org.eclipse.wst.sse.ui.internal.FormatProcessorsExtensionReader;
-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;
-
-public final class JAXWSHandlerUtils {
- public static final String HANDLER_CHAINS = "handler-chains"; //$NON-NLS-1$
- public static final String HANDLER_CHAIN = "handler-chain"; //$NON-NLS-1$
- public static final String HANDLER = "handler"; //$NON-NLS-1$
- public static final String HANDLER_NAME = "handler-name"; //$NON-NLS-1$
- public static final String HANDLER_CLASS = "handler-class"; //$NON-NLS-1$
-
- public static final Namespace JAVAEE_NS = Namespace.getNamespace("http://java.sun.com/xml/ns/javaee"); //$NON-NLS-1$
-
- private JAXWSHandlerUtils() {
- }
-
- public static void createHandlerChainFile(IPath path, String handlerName, String handlerClass) {
- IFile handlerChainFile = ResourcesPlugin.getWorkspace().getRoot().getFile(path);
- if (!handlerChainFile.exists()) {
- try {
- IProgressMonitor progressMonitor = new NullProgressMonitor();
- handlerChainFile.create(new ByteArrayInputStream(new byte[] {}), true, progressMonitor);
-
- Element handlerChainsElement = new Element(HANDLER_CHAINS);
- handlerChainsElement.setNamespace(JAVAEE_NS);
-
- Element handlerChainElement = new Element(HANDLER_CHAIN, JAVAEE_NS);
- Element handlerElement = new Element(HANDLER, JAVAEE_NS);
-
- Element handlerNameElement = new Element(HANDLER_NAME, JAVAEE_NS);
- handlerNameElement.setText(handlerName);
-
- Element handlerClassElement = new Element(HANDLER_CLASS, JAVAEE_NS);
- handlerClassElement.setText(handlerClass);
-
- handlerElement.addContent(handlerNameElement);
- handlerElement.addContent(handlerClassElement);
-
- handlerChainElement.addContent(handlerElement);
-
- handlerChainsElement.addContent(handlerChainElement);
-
- Document document = new Document(handlerChainsElement);
- OutputStream outputStream = new FileOutputStream(handlerChainFile.getLocation().toFile());
- XMLOutputter outputter = new XMLOutputter();
- outputter.output(document, outputStream);
- handlerChainFile.refreshLocal(IResource.DEPTH_ONE, new NullProgressMonitor());
- formatXMLFile(handlerChainFile);
- } catch (CoreException ce) {
- JAXWSCorePlugin.log(ce);
- } catch (FileNotFoundException fnfe) {
- JAXWSCorePlugin.log(fnfe);
- } catch (IOException ioe) {
- JAXWSCorePlugin.log(ioe);
- }
- }
- }
-
- public static void createHandlerChainFile(IPath path) {
- IFile handlerChainFile = ResourcesPlugin.getWorkspace().getRoot().getFile(path);
- if (!handlerChainFile.exists()) {
- try {
- IProgressMonitor progressMonitor = new NullProgressMonitor();
- handlerChainFile.create(new ByteArrayInputStream(new byte[] {}), true, progressMonitor);
-
- Element handlerChainsElement = new Element(HANDLER_CHAINS);
- handlerChainsElement.setNamespace(JAVAEE_NS);
-
- Document document = new Document(handlerChainsElement);
- OutputStream outputStream = new FileOutputStream(handlerChainFile.getLocation().toFile());
- XMLOutputter outputter = new XMLOutputter();
- outputter.output(document, outputStream);
- handlerChainFile.refreshLocal(IResource.DEPTH_ONE, new NullProgressMonitor());
- formatXMLFile(handlerChainFile);
- } catch (CoreException ce) {
- JAXWSCorePlugin.log(ce);
- } catch (FileNotFoundException fnfe) {
- JAXWSCorePlugin.log(fnfe);
- } catch (IOException ioe) {
- JAXWSCorePlugin.log(ioe);
- }
- }
- }
-
- public static void addHandlerToHandlerChain(IPath path, String handlerName, String handlerClass) throws CoreException {
- IFile handlerChainFile = ResourcesPlugin.getWorkspace().getRoot().getFile(path);
- if (handlerChainFile.exists() && handlerChainFile.isAccessible()) {
- try {
- InputStream handlerInputStream = new FileInputStream(handlerChainFile.getLocation().toFile());
- SAXBuilder builder = new SAXBuilder();
- Document document = builder.build(handlerInputStream);
- Element root = document.getRootElement();
-
- Element handlerChainElement = root.getChild(HANDLER_CHAIN, JAVAEE_NS);
-
- if (handlerChainElement == null) {
- handlerChainElement = new Element(HANDLER_CHAIN, JAVAEE_NS);
- root.addContent(handlerChainElement);
- }
-
- Element handlerElement = new Element(HANDLER, JAVAEE_NS);
-
- Element handlerNameElement = new Element(HANDLER_NAME, JAVAEE_NS);
- handlerNameElement.setText(handlerName);
-
- Element handlerClassElement = new Element(HANDLER_CLASS, JAVAEE_NS);
- handlerClassElement.setText(handlerClass);
-
- handlerElement.addContent(handlerNameElement);
- handlerElement.addContent(handlerClassElement);
-
- handlerChainElement.addContent(handlerElement);
-
- OutputStream outputStream = new FileOutputStream(handlerChainFile.getLocation().toFile());
- XMLOutputter outputter = new XMLOutputter();
- outputter.output(document, outputStream);
- } catch (FileNotFoundException fnfe) {
- JAXWSCorePlugin.log(fnfe);
- } catch (IOException ioe) {
- JAXWSCorePlugin.log(ioe);
- } catch (JDOMException jdome) {
- JAXWSCorePlugin.log(jdome);
- } finally {
- //TODO Close streams
- handlerChainFile.refreshLocal(IResource.DEPTH_ONE, new NullProgressMonitor());
- formatXMLFile(handlerChainFile);
- }
- }
- }
-
- public static void writeDocumentToFile(IPath filePath, Document document) throws CoreException {
- IFile handlerChainFile = ResourcesPlugin.getWorkspace().getRoot().getFile(filePath);
- if (handlerChainFile.exists()) {
- try {
- if (isHandlerChainFile(handlerChainFile)) {
- OutputStream outputStream = null;
- try {
- outputStream = new FileOutputStream(handlerChainFile.getLocation().toFile());
- XMLOutputter outputter = new XMLOutputter();
- outputter.output(document, outputStream);
- } finally {
- handlerChainFile.refreshLocal(IResource.DEPTH_ONE, new NullProgressMonitor());
- formatXMLFile(handlerChainFile);
- if (outputStream != null) {
- outputStream.close();
- }
- }
- }
- } catch (IOException ioe) {
- JAXWSCorePlugin.log(ioe);
- }
- }
- }
-
- @SuppressWarnings("unchecked")
- public static boolean isHandlerDefined(IFile handlerChainFile, String handlerName, String handlerClass) throws IOException {
- if (isHandlerChainFile(handlerChainFile)) {
- SAXBuilder builder = new SAXBuilder();
- FileInputStream handlerChainInputSteam = new FileInputStream(handlerChainFile.getLocation()
- .toFile());
- try {
- Document doc = builder.build(handlerChainInputSteam);
- Element root = doc.getRootElement();
- List<Element> handlerChains = root.getChildren(HANDLER_CHAIN, JAVAEE_NS);
- for (Element handlerChain : handlerChains) {
- Element handler = handlerChain.getChild(HANDLER, JAVAEE_NS);
- if (handler != null) {
- Element handlerNameElement = handler.getChild(HANDLER_NAME, JAVAEE_NS);
- Element handlerClassElement = handler.getChild(HANDLER_CLASS, JAVAEE_NS);
-
- if (handlerNameElement != null && handlerNameElement.getText().equals(handlerName)
- && handlerClassElement != null && handlerClassElement.getText().equals(handlerClass)) {
- return true;
- }
- }
- }
- } catch (JDOMException jdome) {
- JAXWSCorePlugin.log(jdome);
- } finally {
- handlerChainInputSteam.close();
- }
- }
- return false;
- }
-
- public static boolean isHandlerChainFile(IFile handlerChainFile) throws IOException {
- if (handlerChainFile.exists()) {
- FileInputStream handlerChainInputStream = new FileInputStream(handlerChainFile.getLocation().toFile());
- if (handlerChainInputStream.available() > 0) {
- SAXBuilder builder = new SAXBuilder();
- try {
- Document doc = builder.build(handlerChainInputStream);
- Element root = doc.getRootElement();
- if (root.getName().equals(HANDLER_CHAINS) && root.getNamespace().equals(JAVAEE_NS)) {
- return true;
- }
- } catch (JDOMException jdome) {
- JAXWSCorePlugin.log(jdome);
- } finally {
- handlerChainInputStream.close();
- }
- }
- }
- 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) {
- JAXWSCorePlugin.log(ce.getStatus());
- } catch (IOException ioe) {
- JAXWSCorePlugin.log(ioe);
- }
- }
- }
-
-}
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 91e0dea..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.core/src/org/eclipse/jst/ws/internal/jaxws/core/utils/JAXWSUtils.java
+++ /dev/null
@@ -1,168 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Shane Clarke.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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 java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-import javax.jws.soap.SOAPBinding.ParameterStyle;
-import javax.jws.soap.SOAPBinding.Style;
-import javax.jws.soap.SOAPBinding.Use;
-
-import org.eclipse.jdt.core.IAnnotation;
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jst.ws.annotations.core.utils.AnnotationUtils;
-import org.eclipse.jst.ws.internal.jaxws.core.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()));
- }
-
- /**
- * Tests the given {@link IMethod} to see if it is an overloaded method. If it is it will return
- * a string representing the position of this method in it's parents {@link IType}.
- * <p>
- * E.g. Given three methods:
- * <pre>
- * public void myMethod(...);
- * public void myMethod(...);
- * public void myMethod(...);
- * </pre>
- * The first method would return a blank string, the second would return the string "1" and the third
- * would return the string "2".
- * </p>
- * @param method the method to test
- * @return a string value
- * @exception JavaModelException thrown if an exception occurs while accessing the underlying resource
- */
- public static String accountForOverloadedMethods(IMethod method) throws JavaModelException {
- IType type = method.getDeclaringType();
- if (type == null) {
- return "";
- }
- List<IMethod> methods = Arrays.asList(type.getMethods());
- List<IMethod> similarMethods = new ArrayList<IMethod>();
- for (IMethod methodToTest : methods) {
- if (!method.equals(methodToTest) && method.getElementName().equalsIgnoreCase(
- methodToTest.getElementName()) && methodToTest.getSourceRange().getOffset() <
- method.getSourceRange().getOffset()) {
- similarMethods.add(methodToTest);
- }
- }
- return similarMethods.size() > 0 ? Integer.toString(similarMethods.size()) : ""; //$NON-NLS-1$
- }
-}
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 0dd29d9..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 findType(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 findType(String projectName, String fullyQualifiedClassName) {
- return JDTUtils.findType(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 7a2d38f..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.core/src/org/eclipse/jst/ws/jaxws/core/utils/WSDLUtils.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
- * Bug #274293 - sudhan@progress.com
- *******************************************************************************/
-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.jaxws.core.JAXWSCorePlugin;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-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 project 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) {
- IVirtualComponent virtualComponent = ComponentCore.createComponent(project);
- return virtualComponent.getRootFolder().getWorkspaceRelativePath();
- }
-
- /**
- * 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 b44f235..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.200.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.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,
- org.eclipse.jdt.apt.core
-Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Export-Package: org.eclipse.jst.ws.jaxws.dom.integration.internal.util;x-friends:="org.eclipse.jst.ws.jaxws.dom.integration.tests",
- org.eclipse.jst.ws.jaxws.dom.integration.navigator;x-friends:="org.eclipse.jst.ws.jaxws.dom.integration.tests",
- org.eclipse.jst.ws.jaxws.dom.integration.navigator.actions;x-friends:="org.eclipse.jst.ws.jaxws.dom.integration.tests"
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 (&quot;Content&quot;). Unless otherwise
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;). 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, &quot;Program&quot; 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 (&quot;Redistributor&quot;) 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 011d98d..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.integration/build.properties
+++ /dev/null
@@ -1,18 +0,0 @@
-###############################################################################
-# Copyright (c) 2009 by SAP AG, Walldorf.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# SAP AG - initial API and implementation
-###############################################################################
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
- .,\
- plugin.xml,\
- plugin.properties,\
- about.html,\
- icons/
diff --git a/bundles/org.eclipse.jst.ws.jaxws.dom.integration/icons/jaxws_navcontent.gif b/bundles/org.eclipse.jst.ws.jaxws.dom.integration/icons/jaxws_navcontent.gif
deleted file mode 100644
index 8fb844f..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.integration/icons/jaxws_navcontent.gif
+++ /dev/null
Binary files differ
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 41653e5..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=JAX-WS DOM Integration
-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 58a0a55..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.integration/plugin.xml
+++ /dev/null
@@ -1,134 +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
- activeByDefault="true"
- contentProvider="org.eclipse.jst.ws.jaxws.dom.integration.navigator.DOMAdapterFactoryContentProvider"
- icon="icons/jaxws_navcontent.gif"
- id="org.eclipse.jst.navigator.j2ee.ui.jaxws"
- labelProvider="org.eclipse.jst.ws.jaxws.dom.integration.navigator.DOMAdapterFactoryLabelProvider"
- 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>
-<!-- }}} -->
-</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 48c6fdc..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,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.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_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;
-
- 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 ede3019..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,19 +0,0 @@
-###############################################################################
-# Copyright (c) 2009 by SAP AG, Walldorf.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.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_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
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/LoadingWsProjectNodesCollector.java b/bundles/org.eclipse.jst.ws.jaxws.dom.integration/src/org/eclipse/jst/ws/jaxws/dom/integration/internal/util/LoadingWsProjectNodesCollector.java
deleted file mode 100644
index dcf81f5..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.integration/src/org/eclipse/jst/ws/jaxws/dom/integration/internal/util/LoadingWsProjectNodesCollector.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2011 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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 java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-
-import org.eclipse.jst.ws.jaxws.dom.integration.navigator.ILoadingWsProject;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.IWebServiceProject;
-import org.eclipse.swt.widgets.TreeItem;
-
-/**
- * Utility which collects all tree items whose data is associated with {@link ILoadingWsProject} instance
- * @see TreeItem#getData()
- * @author Georgi Vachkov, Danail Branekov
- */
-public class LoadingWsProjectNodesCollector
-{
- public Collection<TreeItem> getLoadingWsProjects(final TreeItem[] treeItems)
- {
- final Collection<TreeItem> result = new ArrayList<TreeItem>();
- for (TreeItem item : treeItems) {
- result.addAll(getLoadingWsProjects(item));
- }
-
- return result;
- }
-
- private Collection<TreeItem> getLoadingWsProjects(final TreeItem treeItem)
- {
- if (treeItem.getData() instanceof IWebServiceProject) {
- return Collections.emptyList();
- }
-
- final Collection<TreeItem> result = new ArrayList<TreeItem>();
- if (treeItem.getData() instanceof ILoadingWsProject) {
- result.add(treeItem);
- }
- else {
- for (TreeItem child : treeItem.getItems()) {
- result.addAll(getLoadingWsProjects(child));
- }
- }
-
- return result;
- }
-}
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 b482f67..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.integration/src/org/eclipse/jst/ws/jaxws/dom/integration/navigator/DOMAdapterFactoryContentProvider.java
+++ /dev/null
@@ -1,342 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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.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.LoadingWsProjectNodesCollector;
-import org.eclipse.jst.ws.jaxws.dom.integration.internal.util.ProjectExplorerUtil;
-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.WsDOMLoadCanceledException;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.WsDOMRuntimeManager;
-import org.eclipse.jst.ws.jaxws.dom.runtime.persistence.load.IWsDomCallback;
-import org.eclipse.jst.ws.jaxws.dom.runtime.persistence.load.WsDomObtainerFactory;
-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
-{
- /**
- * 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)
- {
- new WsDomObtainerFactory().createAsynchronousObtainer(getSupportingRuntime(((ILoadingWsProject)context).getProject())).getDom(new LoadListener());
- return new Object[] { 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 };
- }
-
- return new Object[] { new LoadingWsProject(project) };
- }
- catch (WsDOMLoadCanceledException e) { // $JL-EXC$
- return new Object[]{ new LoadingWsProject(project) };
- }
- }
-
- 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 IWsDomCallback
- {
- public void dom(final IDOM dom)
- {
- final Runnable exchangeWithDomRunnable = new ExchangeLoadingWsProjectRunnable()
- {
- @Override
- protected void updateTreeItemData(final TreeItem treeItem, final CommonViewer commonViewer, final IProject relevantProject)
- {
- final IWebServiceProject wsProject = getWsProject(dom, relevantProject);
- adapterFactory.adapt(wsProject, ITreeItemContentProvider.class);
- treeItem.setData(wsProject);
- }
- };
- Display.getDefault().asyncExec(exchangeWithDomRunnable);
- }
-
- public void domLoadStarting() {
- // nothing to do here
- }
-
- public void domLoadCancelled() {
- final Runnable exchangeWithDomRunnable = new ExchangeLoadingWsProjectRunnable()
- {
- @Override
- protected void updateTreeItemData(final TreeItem treeItem, final CommonViewer commonViewer, final IProject relevantProject)
- {
- // DOM Load has been cancelled and therefore there is nothing to update. The next time the user expands the JSX-WS node the content provider schedules another DOM load routine
- }
- };
- Display.getDefault().asyncExec(exchangeWithDomRunnable);
- }
-
- public void domLoadFailed() {
- // TODO: Maybe add a "DOM Load Failed node"
- }
- }
-
- private class LoadingWsProject implements ILoadingWsProject
- {
- final IProject project;
-
- public LoadingWsProject(final IProject project) {
- ContractChecker.nullCheckParam(project, "project"); //$NON-NLS-1$
- this.project = project;
- }
-
- public IProject getProject() {
- return project;
- }
- }
-
- private abstract class ExchangeLoadingWsProjectRunnable implements Runnable
- {
- public void run()
- {
- final IViewPart viewPart = ProjectExplorerUtil.INSTANCE.findProjectExplorer();
- if (viewPart instanceof CommonNavigator)
- {
- final CommonViewer commonViewer = ((CommonNavigator)viewPart).getCommonViewer();
- for(TreeItem treeItem : new LoadingWsProjectNodesCollector().getLoadingWsProjects(commonViewer.getTree().getItems()))
- {
- final IProject relevantProject = ((ILoadingWsProject)treeItem.getData()).getProject();
- updateTreeItemData(treeItem, commonViewer, relevantProject);
- commonViewer.refresh(relevantProject);
- }
- }
- }
-
- protected abstract void updateTreeItemData(TreeItem treeItem, CommonViewer commonViewer, final IProject relevantProject);
- }
-}
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 fec941d..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.integration/src/org/eclipse/jst/ws/jaxws/dom/integration/navigator/DOMAdapterFactoryLabelProvider.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.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.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)
- {
- 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;
- }
- 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 default 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 d3c8573..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.integration/src/org/eclipse/jst/ws/jaxws/dom/integration/navigator/ILoadingWsProject.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.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();
-
- /**
- * 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 {};
-}
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 69a77f6..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.integration/src/org/eclipse/jst/ws/jaxws/dom/integration/navigator/WebServiceProblemsDecorator.java
+++ /dev/null
@@ -1,324 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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.ArrayList;
-import java.util.Collection;
-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.apt.core.internal.AptPlugin;
-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.ui.JavaElementImageDescriptor;
-import org.eclipse.jdt.ui.ProblemsLabelDecorator;
-import org.eclipse.jface.viewers.ILabelProviderListener;
-import org.eclipse.jface.viewers.LabelProviderChangedEvent;
-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.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.logging.Logger;
-import org.eclipse.ui.PlatformUI;
-
-@SuppressWarnings("restriction")
-public class WebServiceProblemsDecorator extends ProblemsLabelDecorator
-{
- private static final String THIS_DECORATOR_ID = "org.eclipse.jst.ws.jaxws.dom.integration.navigator.WebServiceDecorator";
-
- /**
- * The APT marker IDs
- */
- private static final String APT_MARKER_ID = AptPlugin.APT_COMPILATION_PROBLEM_MARKER;
- private static final String APT_NONRECONCILE_MARKER_ID = AptPlugin.APT_NONRECONCILE_COMPILATION_PROBLEM_MARKER;
-
- /** Enum to represent different marker types */
- public enum Severity {OK, ERROR, WARNING};
-
- private DomUtil domUtil = DomUtil.INSTANCE;
- private final Dom2ResourceMapper dom2ResourceMapper = Dom2ResourceMapper.INSTANCE;
-
- public WebServiceProblemsDecorator()
- {
- addListener(new ILabelProviderListener()
- {
- public void labelProviderChanged(LabelProviderChangedEvent event)
- {
- PlatformUI.getWorkbench().getDisplay().asyncExec(new Runnable()
- {
- public void run()
- {
- PlatformUI.getWorkbench().getDecoratorManager().update(THIS_DECORATOR_ID);
- }
- });
- }
- });
- }
-
- @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 Collection<IMarker> markers = findAptMarkers(resource, 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 isRelevantForParameter((IWebParam)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
- {
- final IType type = dom2ResourceMapper.findType(webMethod);
- final IMethod javaMethod = domUtil.findMethod(type, webMethod);
- final IAnnotationInspector annotationInspector = AnnotationFactory.createAnnotationInspector(type);
- boolean relevant = isMarkerRelevantFor(javaMethod, marker, annotationInspector);
- if (!relevant)
- {
- for (String methodParameterName : javaMethod.getParameterNames())
- {
- final ITypeParameter param = javaMethod.getTypeParameter(methodParameterName);
- relevant = relevant || isMarkerRelevantFor(param, marker, annotationInspector);
- }
- }
-
- return relevant;
- }
-
- protected boolean isRelevantForParameter(final IWebParam webParam, final IMarker marker) throws CoreException
- {
- final IType type = dom2ResourceMapper.findType(webParam);
- final ITypeParameter javaParameter = findJavaParameter(type, webParam);
- return isMarkerRelevantFor(javaParameter, marker, AnnotationFactory.createAnnotationInspector(type));
- }
-
- /**
- * Finds the {@link ITypeParameter} instance which corresponds to the web parameter specified
- */
- private ITypeParameter findJavaParameter(final IType type, final IWebParam webParam) throws JavaModelException
- {
- final IMethod javaMethod = domUtil.findMethod(type, (IWebMethod) webParam.eContainer());
- for (String paramName : javaMethod.getParameterNames())
- {
- final ITypeParameter javaParam = javaMethod.getTypeParameter(paramName);
- if (webParam.getImplementation().equals(javaParam.getElementName()))
- {
- return javaParam;
- }
- }
-
- throw new IllegalStateException("Parameter " + webParam.getImplementation() + " not found");
- }
-
- private boolean isMarkerRelevantFor(final IMethod javaMethod, final IMarker marker, final IAnnotationInspector inspector) throws CoreException
- {
- for (IAnnotation<IMethod> ann : inspector.inspectMethod(javaMethod))
- {
- if (isMarkerRelevantToAnnotation(marker, ann))
- {
- return true;
- }
- }
-
- return false;
- }
-
- private boolean isMarkerRelevantFor(final ITypeParameter parameter, final IMarker marker, final IAnnotationInspector inspector) throws CoreException
- {
- for (IAnnotation<ITypeParameter> ann : inspector.inspectParam(parameter))
- {
- if (isMarkerRelevantToAnnotation(marker, ann))
- {
- return true;
- }
- }
-
- return false;
- }
-
- /**
- * Check whether the marker is relevant for the annotation specified<br>
- * The implementation would read all the annotations relevant for the java element and check whether the marker start/end position is between annotation start/end
- */
- private boolean isMarkerRelevantToAnnotation(final IMarker marker, final IAnnotation<? extends IJavaElement> ann) throws CoreException
- {
- final int annStartPos = ann.getLocator().getStartPosition();
- final int annEndPos = annStartPos + ann.getLocator().getLength() - 1;
- return (annStartPos <= (Integer) marker.getAttribute(IMarker.CHAR_START)) && (annEndPos >= (Integer) marker.getAttribute(IMarker.CHAR_END));
- }
-
- /**
- * Finds all APT nonreconcile markers associated with the resource specified
- */
- private Collection<IMarker> findAptMarkers(final IResource resource, final int depth) throws CoreException
- {
- final Collection<IMarker> result = new ArrayList<IMarker>();
- // Search for both APT marker types. One of each IDs is used on Linux and Windows
- for(final IMarker m : resource.findMarkers(APT_MARKER_ID, false, depth))
- {
- result.add(m);
- }
-
- for(final IMarker m : resource.findMarkers(APT_NONRECONCILE_MARKER_ID, false, depth))
- {
- result.add(m);
- }
-
- return result;
- }
-}
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 9f581c0..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, Object> map = new HashMap<String, Object>();
-
- 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.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 0b0f8d9..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,34 +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.200.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.core.resources,
- org.eclipse.emf.ecore
-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.persistence;x-friends:="org.eclipse.jst.ws.jaxws.dom.integration,org.eclipse.jst.ws.jaxws.dom.integration.tests,org.eclipse.jst.ws.jaxws.dom.runtime.tests",
- org.eclipse.jst.ws.jaxws.dom.runtime.persistence.annotation;x-friends:="org.eclipse.jst.ws.jaxws.dom.runtime.tests",
- org.eclipse.jst.ws.jaxws.dom.runtime.persistence.annotation.impl;x-friends:="org.eclipse.jst.ws.jaxws.dom.runtime.tests",
- org.eclipse.jst.ws.jaxws.dom.runtime.persistence.defaults;x-friends:="org.eclipse.jst.ws.jaxws.dom.runtime.tests,org.eclipse.jst.ws.jaxws.dom.ui",
- org.eclipse.jst.ws.jaxws.dom.runtime.persistence.load;x-friends:="org.eclipse.jst.ws.jaxws.dom.runtime.tests,org.eclipse.jst.ws.jaxws.dom.integration",
- org.eclipse.jst.ws.jaxws.dom.runtime.persistence.serializer;x-friends:="org.eclipse.jst.ws.jaxws.dom.runtime.tests",
- org.eclipse.jst.ws.jaxws.dom.runtime.persistence.state;x-friends:="org.eclipse.jst.ws.jaxws.dom.runtime.tests,org.eclipse.jst.ws.jaxws.dom.ui",
- org.eclipse.jst.ws.jaxws.dom.runtime.persistence.sync;x-friends:="org.eclipse.jst.ws.jaxws.dom.runtime.tests",
- org.eclipse.jst.ws.jaxws.dom.runtime.registry;x-friends:="org.eclipse.jst.ws.jaxws.dom.integration,org.eclipse.jst.ws.jaxws.dom.runtime.tests",
- org.eclipse.jst.ws.jaxws.dom.runtime.util;
- x-friends:="org.eclipse.jst.ws.jaxws.dom.integration,
- org.eclipse.jst.ws.jaxws.dom.runtime.tests,
- org.eclipse.jst.ws.jaxws.dom.ui,
- org.eclipse.jst.ws.jaxws.ui"
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 (&quot;Content&quot;). Unless otherwise
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;). 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, &quot;Program&quot; 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 (&quot;Redistributor&quot;) 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 925b739..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/plugin.properties
+++ /dev/null
@@ -1,20 +0,0 @@
-###############################################################################
-# Copyright (c) 2009 by SAP AG, Walldorf.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# SAP AG - initial API and implementation
-###############################################################################
-###############################################################################
-# Language File for this Plugin
-###############################################################################
-
-# Generic Label and Description
-Bundle-Name.0=JAX-WS DOM Runtime
-Bundle-Vendor.0=Eclipse Web Tools Platform
-
-DomRuntimesExtension_Name = DOM Runtimes
-ExtensionPoint-Name.3 = JEE5 DOM contribution
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 4a34439..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/plugin.xml
+++ /dev/null
@@ -1,34 +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="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>
-
-</plugin>
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 f9a0dea..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/schema/runtimes.exsd
+++ /dev/null
@@ -1,156 +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>
- This extension point allows contributing web service runtime extensions (implementations of the org.eclipse.jst.ws.jaxws.dom.runtime.api.IWsDOMRuntimeExtension inteface) per a given project facet version.
-Runtime extensions are responsible for providing artifacts for web services implemented via a given web service technology (JAX-WS, JAX-RPC, etc.)
- </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">
- <annotation>
- <documentation>
- This element specifies the contributed runtime extension class
- </documentation>
- </annotation>
- <complexType>
- <attribute name="class" type="string" use="required">
- <annotation>
- <documentation>
- The fully qualified name of the class which implements the runtime extension
- </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">
- <annotation>
- <documentation>
- This element specifies the project facet version this runtime extension is applicable for. A runtime extension may be applicable for one or more project facet versions
- </documentation>
- </annotation>
- <complexType>
- <attribute name="id" type="string" use="required">
- <annotation>
- <documentation>
- The ID of the project facet
- </documentation>
- </annotation>
- </attribute>
- <attribute name="version" type="string">
- <annotation>
- <documentation>
- The version of the project facet
- </documentation>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <annotation>
- <appInfo>
- <meta.section type="since"/>
- </appInfo>
- <documentation>
- 1.0
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="examples"/>
- </appInfo>
- <documentation>
- &lt;p&gt;
-&lt;pre&gt;
- &lt;extension
- id=&quot;org.eclipse.jst.ws.jaxws.dom.jee5&quot;
- name=&quot;JEE5 DOM contribution&quot;
- point=&quot;org.eclipse.jst.ws.jaxws.dom.runtime.domruntimes&quot;&gt;
- &lt;implementation class=&quot;org.eclipse.jst.ws.jaxws.dom.runtime.persistence.Jee5WsDomRuntimeExtension&quot;/&gt;
- &lt;project_facet id=&quot;jst.ejb&quot; version=&quot;3.0&quot;/&gt;
- &lt;project_facet id=&quot;jst.web&quot; version=&quot;2.5&quot;/&gt;
- &lt;/extension&gt;&lt;/pre&gt;
-&lt;/p&gt;
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="apiInfo"/>
- </appInfo>
- <documentation>
- The interfaces of the web service model are located in the &quot;org.eclipse.jst.ws.jaxws.dom.runtime.api&quot; package.
-In order to access the contributed runtime extensions use org.eclipse.jst.ws.jaxws.dom.runtime.api.WsDOMRuntimeManager
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="implementation"/>
- </appInfo>
- <documentation>
- [Enter information about supplied implementation of this extension point.]
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="copyright"/>
- </appInfo>
- <documentation>
- Copyright (c) 2009 SAP AG, Walldorf.&lt;br&gt;
-All rights reserved. This program and the accompanying materials are made
-available under the terms of the Eclipse Public License v1.0 which accompanies
-this distribution, and is available at &lt;a
-href=&quot;http://www.eclipse.org/legal/epl-v10.html&quot;&gt;http://www.eclipse.org/legal/epl-v10.html&lt;/a&gt;
- </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 6373b86..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/DomUtil.java
+++ /dev/null
@@ -1,241 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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;
-
-/**
- *
- * @noextend This class is not intended to be extended by clients.
- *
- */
-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/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/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 840342b..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,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.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 WsDomStartupParticipant_Startup_Job_Message;
- public static String WorkspaceCUFinder_LOADING_CANCELED;
- public static String JAXWS_DOM_LOADING;
-
- 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 f69de43..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,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
-###############################################################################
-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
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/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/load/IWsDomCallback.java b/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/persistence/load/IWsDomCallback.java
deleted file mode 100644
index e1cd485..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/persistence/load/IWsDomCallback.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2011 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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.load;
-
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.IDOM;
-
-/**
- * Interface for a callback which is notified upon a DOM instance being available
- *
- * @author Danail Branekov
- *
- */
-public interface IWsDomCallback
-{
- /**
- * Notifies that the {@link IDOM} instance specified is now available
- *
- * @param dom
- * the {@link IDOM} instance; never <code>null</code>
- */
- public void dom(final IDOM dom);
-
- /**
- * Notifies that the {@link IDOM} load routine is starting since {@link IDOM} is not available
- */
- public void domLoadStarting();
-
- /**
- * Notifies the the {@link IDOM} load process has been cancelled and therefore the {@link IDOM} instance is not available
- */
- public void domLoadCancelled();
-
- /**
- * Notifies that DOM load has failed
- */
- public void domLoadFailed();
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/persistence/load/IWsDomObtainer.java b/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/persistence/load/IWsDomObtainer.java
deleted file mode 100644
index fbbbe2d..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/persistence/load/IWsDomObtainer.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2011 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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.load;
-
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.IDOM;
-
-public interface IWsDomObtainer
-{
- /**
- * Obtains a {@link IDOM} instance. The implementation may perform a lazy {@link IDOM} load and returns the {@link IDOM} instance via the
- * {@link IWsDomCallback} specified
- *
- * @param loadCallback
- * the callback which is notified on {@link IDOM} instance availability
- * @see IWsDomCallback#dom(IDOM)
- */
- public void getDom(final IWsDomCallback loadCallback);
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/persistence/load/WsDomObtainer.java b/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/persistence/load/WsDomObtainer.java
deleted file mode 100644
index 5618f3f..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/persistence/load/WsDomObtainer.java
+++ /dev/null
@@ -1,137 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2011 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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.load;
-
-import java.io.IOException;
-import java.lang.reflect.InvocationTargetException;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.jface.operation.IRunnableWithProgress;
-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.WsDOMLoadCanceledException;
-import org.eclipse.jst.ws.jaxws.utils.operation.IOperationRunner;
-
-/**
- * Implementation of the {@link IWsDomObtainer} interface which performs {@link IDOM} load if necessary. The implementation performs the load
- * operation via the {@link IOperationRunner} supplied in the contructor
- *
- * @author Danail Branekov
- */
-public class WsDomObtainer implements IWsDomObtainer
-{
- private final IWsDOMRuntimeExtension domRuntime;
- private final IOperationRunner opRunner;
-
- public WsDomObtainer(final IWsDOMRuntimeExtension domRuntime, final IOperationRunner opRunner)
- {
- this.domRuntime = domRuntime;
- this.opRunner = opRunner;
- }
-
- public void getDom(final IWsDomCallback loadCallback)
- {
- if (isDomAlreadyLoaded())
- {
- loadCallback.dom(getDomAlreadyLoaded());
- return;
- }
-
- opRunner.run(loadRunnable(loadCallback));
- }
-
- private IRunnableWithProgress loadRunnable(final IWsDomCallback loadCallback)
- {
- return new LoadDomRunnable(loadCallback);
- }
-
- private IDOM getDomAlreadyLoaded()
- {
- try
- {
- return domRuntime.getDOM();
- }
- catch (WsDOMLoadCanceledException e)
- {
- throw new IllegalStateException(e);
- }
- }
-
- private boolean isDomAlreadyLoaded()
- {
- try
- {
- return domRuntime.getDOM() != null;
- }
- catch (WsDOMLoadCanceledException e)
- {
- return false;
- }
- }
-
- private final class LoadDomRunnable implements IRunnableWithProgress
- {
- private final IWsDomCallback loadCallback;
-
- private LoadDomRunnable(IWsDomCallback loadCallback)
- {
- this.loadCallback = loadCallback;
- }
-
- public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException
- {
- if (isDomAlreadyLoaded())
- {
- loadCallback.dom(getDomAlreadyLoaded());
- return;
- }
-
- try
- {
- loadCallback.domLoadStarting();
- loadCallback.dom(performLoad(monitor));
- }
- catch (WsDOMLoadCanceledException e)
- {
- cancelled(e);
- }
- catch (IOException e)
- {
- failed(e);
- }
- }
-
- private IDOM performLoad(final IProgressMonitor monitor) throws IOException, WsDOMLoadCanceledException
- {
- try
- {
- domRuntime.createDOM(monitor);
- }
- catch (WsDOMLoadCanceledException e)
- {
- throw e;
- }
- return domRuntime.getDOM();
- }
-
- private void failed(IOException e) throws InvocationTargetException
- {
- loadCallback.domLoadFailed();
- throw new InvocationTargetException(e);
- }
-
- private void cancelled(WsDOMLoadCanceledException e) throws InterruptedException
- {
- loadCallback.domLoadCancelled();
- throw new InterruptedException(e.getMessage());
- }
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/persistence/load/WsDomObtainerFactory.java b/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/persistence/load/WsDomObtainerFactory.java
deleted file mode 100644
index 659d0b1..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.runtime/src/org/eclipse/jst/ws/jaxws/dom/runtime/persistence/load/WsDomObtainerFactory.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2011 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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.load;
-
-import org.eclipse.core.resources.ResourcesPlugin;
-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.internal.plugin.JaxWsDomRuntimeMessages;
-import org.eclipse.jst.ws.jaxws.utils.operation.OperationInJobRunner;
-
-/**
- * Factory for creating {@link IWsDomObtainer} instances
- *
- * @author Danail Branekov
- */
-public class WsDomObtainerFactory
-{
- /**
- * Creates a {@link IWsDomObtainer} instance which loads web service DOM asynchronously if necessary. The load routine is performed within a job
- * which has the workspace root as a scheduling rule
- *
- * @param domRuntime
- * the runtime for which the {@link IDOM} is to be loaded
- */
- public IWsDomObtainer createAsynchronousObtainer(final IWsDOMRuntimeExtension domRuntime)
- {
- return new WsDomObtainer(domRuntime, new OperationInJobRunner(JaxWsDomRuntimeMessages.JAXWS_DOM_LOADING, ResourcesPlugin.getWorkspace().getRoot()));
- }
-}
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 8d360b9..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,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.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;
-
- public SeiSynchronizer(IModelElementSynchronizer parent)
- {
- super(parent);
- seiMerger = new SeiMerger(this, new SeiMethodSynchronizer(this));
- }
-
- /* IServiceEndpointInterface */
- public void synchronizeInterface(IWebServiceProject wsProject, IAnnotation<IType> wsAnnotation, IAnnotationInspector inspector) throws JavaModelException
- {
- if(wsAnnotation.getAppliedElement().getFullyQualifiedName()==null) {
- return;
- }
-
- 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 fb2b7d3..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,176 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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()!= null && 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
- {
- if(wsAnnotation.getAppliedElement().getFullyQualifiedName()==null) {
- return null;
- }
-
- 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/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/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.ui/.classpath b/bundles/org.eclipse.jst.ws.jaxws.dom.ui/.classpath
deleted file mode 100755
index 2d1a430..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.ui/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/bundles/org.eclipse.jst.ws.jaxws.dom.ui/.project b/bundles/org.eclipse.jst.ws.jaxws.dom.ui/.project
deleted file mode 100755
index 9784ac9..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.ui/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.jst.ws.jaxws.dom.ui</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
diff --git a/bundles/org.eclipse.jst.ws.jaxws.dom.ui/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.jst.ws.jaxws.dom.ui/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100755
index c0bb2b4..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.ui/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,8 +0,0 @@
-#Tue Jun 23 10:38:22 EEST 2009
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.5
diff --git a/bundles/org.eclipse.jst.ws.jaxws.dom.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.jst.ws.jaxws.dom.ui/META-INF/MANIFEST.MF
deleted file mode 100755
index a2f9bba..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.ui/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,19 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %Bundle-Name.0
-Bundle-Vendor: %Bundle-Vendor.0
-Bundle-SymbolicName: org.eclipse.jst.ws.jaxws.dom.ui;singleton:=true
-Bundle-Localization: plugin
-Bundle-Version: 1.0.0.qualifier
-Bundle-ClassPath: .
-Bundle-Activator: org.eclipse.jst.ws.jaxws.dom.ui.internal.plugin.DomUi$Implementation
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Export-Package: org.eclipse.jst.ws.jaxws.dom.ui;x-friends:="org.eclipse.jst.ws.jaxws.dom.integration,org.eclipse.jst.ws.jaxws.dom.integration.tests,org.eclipse.jst.ws.jaxws.dom.ui.tests",
- org.eclipse.jst.ws.jaxws.dom.ui.internal.impl;x-friends:="org.eclipse.jst.ws.jaxws.dom.ui.tests"
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.jst.ws.jaxws.dom.runtime;visibility:=reexport,
- org.eclipse.emf.edit;visibility:=reexport,
- org.eclipse.jdt.core,
- org.eclipse.jst.ws.jaxws.utils,
- org.eclipse.jface
-Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.jst.ws.jaxws.dom.ui/about.html b/bundles/org.eclipse.jst.ws.jaxws.dom.ui/about.html
deleted file mode 100644
index 8410afb..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.ui/about.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
-<title>About</title>
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
-
-<p>August 15, 2009</p>
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;). Unless otherwise
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;). 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, &quot;Program&quot; 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 (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content. Check the Redistributor's license that was
-provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
-
-</body>
-</html>
diff --git a/bundles/org.eclipse.jst.ws.jaxws.dom.ui/build.properties b/bundles/org.eclipse.jst.ws.jaxws.dom.ui/build.properties
deleted file mode 100755
index 2d184ee..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.ui/build.properties
+++ /dev/null
@@ -1,20 +0,0 @@
-###############################################################################
-# Copyright (c) 2009 by SAP AG, Walldorf.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# SAP AG - initial API and implementation
-###############################################################################
-
-bin.includes = .,\
- icons/,\
- META-INF/,\
- plugin.xml,\
- plugin.properties,\
- about.html
-jars.compile.order = .
-source.. = src/
-output.. = bin/
diff --git a/bundles/org.eclipse.jst.ws.jaxws.dom.ui/icons/SEI.gif b/bundles/org.eclipse.jst.ws.jaxws.dom.ui/icons/SEI.gif
deleted file mode 100755
index 21325ca..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.ui/icons/SEI.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.jst.ws.jaxws.dom.ui/icons/SEI_Group.gif b/bundles/org.eclipse.jst.ws.jaxws.dom.ui/icons/SEI_Group.gif
deleted file mode 100755
index 9afcc01..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.ui/icons/SEI_Group.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.jst.ws.jaxws.dom.ui/icons/Web_Method.gif b/bundles/org.eclipse.jst.ws.jaxws.dom.ui/icons/Web_Method.gif
deleted file mode 100755
index 5818a30..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.ui/icons/Web_Method.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.jst.ws.jaxws.dom.ui/icons/Web_Param_In.gif b/bundles/org.eclipse.jst.ws.jaxws.dom.ui/icons/Web_Param_In.gif
deleted file mode 100755
index fe6b349..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.ui/icons/Web_Param_In.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.jst.ws.jaxws.dom.ui/icons/Web_Param_Out.gif b/bundles/org.eclipse.jst.ws.jaxws.dom.ui/icons/Web_Param_Out.gif
deleted file mode 100755
index bd0918c..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.ui/icons/Web_Param_Out.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.jst.ws.jaxws.dom.ui/icons/Web_Service.gif b/bundles/org.eclipse.jst.ws.jaxws.dom.ui/icons/Web_Service.gif
deleted file mode 100755
index 5216b3f..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.ui/icons/Web_Service.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.jst.ws.jaxws.dom.ui/icons/Web_Service_Group.gif b/bundles/org.eclipse.jst.ws.jaxws.dom.ui/icons/Web_Service_Group.gif
deleted file mode 100755
index 8b4814c..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.ui/icons/Web_Service_Group.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.jst.ws.jaxws.dom.ui/icons/Web_Service_Item_Provider.gif b/bundles/org.eclipse.jst.ws.jaxws.dom.ui/icons/Web_Service_Item_Provider.gif
deleted file mode 100755
index 8fb844f..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.ui/icons/Web_Service_Item_Provider.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.jst.ws.jaxws.dom.ui/icons/error_obj.gif b/bundles/org.eclipse.jst.ws.jaxws.dom.ui/icons/error_obj.gif
deleted file mode 100755
index 0bc6068..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.ui/icons/error_obj.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.jst.ws.jaxws.dom.ui/icons/full/ctool16/CreateIDOM_webServiceProjects_IWebServiceProject.gif b/bundles/org.eclipse.jst.ws.jaxws.dom.ui/icons/full/ctool16/CreateIDOM_webServiceProjects_IWebServiceProject.gif
deleted file mode 100755
index 4c76674..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.ui/icons/full/ctool16/CreateIDOM_webServiceProjects_IWebServiceProject.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.jst.ws.jaxws.dom.ui/icons/full/ctool16/CreateIServiceEndpointInterface_webMethods_IWebMethod.gif b/bundles/org.eclipse.jst.ws.jaxws.dom.ui/icons/full/ctool16/CreateIServiceEndpointInterface_webMethods_IWebMethod.gif
deleted file mode 100755
index 95f5a8c..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.ui/icons/full/ctool16/CreateIServiceEndpointInterface_webMethods_IWebMethod.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.jst.ws.jaxws.dom.ui/icons/full/ctool16/CreateIWebMethod_parameters_IWebParam.gif b/bundles/org.eclipse.jst.ws.jaxws.dom.ui/icons/full/ctool16/CreateIWebMethod_parameters_IWebParam.gif
deleted file mode 100755
index 03d63cb..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.ui/icons/full/ctool16/CreateIWebMethod_parameters_IWebParam.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.jst.ws.jaxws.dom.ui/icons/full/ctool16/CreateIWebServiceProject_serviceEndpointInterfaces_IServiceEndpointInterface.gif b/bundles/org.eclipse.jst.ws.jaxws.dom.ui/icons/full/ctool16/CreateIWebServiceProject_serviceEndpointInterfaces_IServiceEndpointInterface.gif
deleted file mode 100755
index 361b182..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.ui/icons/full/ctool16/CreateIWebServiceProject_serviceEndpointInterfaces_IServiceEndpointInterface.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.jst.ws.jaxws.dom.ui/icons/full/ctool16/CreateIWebServiceProject_webServices_IWebService.gif b/bundles/org.eclipse.jst.ws.jaxws.dom.ui/icons/full/ctool16/CreateIWebServiceProject_webServices_IWebService.gif
deleted file mode 100755
index 9120d10..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.ui/icons/full/ctool16/CreateIWebServiceProject_webServices_IWebService.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.jst.ws.jaxws.dom.ui/icons/full/obj16/IDOM.gif b/bundles/org.eclipse.jst.ws.jaxws.dom.ui/icons/full/obj16/IDOM.gif
deleted file mode 100755
index 420eee1..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.ui/icons/full/obj16/IDOM.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.jst.ws.jaxws.dom.ui/icons/full/obj16/IJavaWebServiceElement.gif b/bundles/org.eclipse.jst.ws.jaxws.dom.ui/icons/full/obj16/IJavaWebServiceElement.gif
deleted file mode 100755
index ea58a65..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.ui/icons/full/obj16/IJavaWebServiceElement.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.jst.ws.jaxws.dom.ui/icons/full/obj16/IServiceEndpointInterface.gif b/bundles/org.eclipse.jst.ws.jaxws.dom.ui/icons/full/obj16/IServiceEndpointInterface.gif
deleted file mode 100755
index 33a997a..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.ui/icons/full/obj16/IServiceEndpointInterface.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.jst.ws.jaxws.dom.ui/icons/full/obj16/IWebMethod.gif b/bundles/org.eclipse.jst.ws.jaxws.dom.ui/icons/full/obj16/IWebMethod.gif
deleted file mode 100755
index a17dc7d..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.ui/icons/full/obj16/IWebMethod.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.jst.ws.jaxws.dom.ui/icons/full/obj16/IWebParam.gif b/bundles/org.eclipse.jst.ws.jaxws.dom.ui/icons/full/obj16/IWebParam.gif
deleted file mode 100755
index 8a5c70c..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.ui/icons/full/obj16/IWebParam.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.jst.ws.jaxws.dom.ui/icons/full/obj16/IWebService.gif b/bundles/org.eclipse.jst.ws.jaxws.dom.ui/icons/full/obj16/IWebService.gif
deleted file mode 100755
index 53500da..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.ui/icons/full/obj16/IWebService.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.jst.ws.jaxws.dom.ui/icons/full/obj16/IWebServiceProject.gif b/bundles/org.eclipse.jst.ws.jaxws.dom.ui/icons/full/obj16/IWebServiceProject.gif
deleted file mode 100755
index 498364f..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.ui/icons/full/obj16/IWebServiceProject.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.jst.ws.jaxws.dom.ui/icons/full/obj16/IWebType.gif b/bundles/org.eclipse.jst.ws.jaxws.dom.ui/icons/full/obj16/IWebType.gif
deleted file mode 100755
index c00aedf..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.ui/icons/full/obj16/IWebType.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.jst.ws.jaxws.dom.ui/icons/warning_obj.gif b/bundles/org.eclipse.jst.ws.jaxws.dom.ui/icons/warning_obj.gif
deleted file mode 100755
index 2b2e50f..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.ui/icons/warning_obj.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.jst.ws.jaxws.dom.ui/plugin.properties b/bundles/org.eclipse.jst.ws.jaxws.dom.ui/plugin.properties
deleted file mode 100755
index b8b8e77..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.ui/plugin.properties
+++ /dev/null
@@ -1,83 +0,0 @@
-###############################################################################
-# Copyright (c) 2009 by SAP AG, Walldorf.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# SAP AG - initial API and implementation
-###############################################################################
-
-# ====================================================================
-# To code developer:
-# Do NOT change the properties between this line and the
-# "%%% END OF TRANSLATED PROPERTIES %%%" line.
-# Make a new property name, append to the end of the file and change
-# the code to use the new property.
-# ====================================================================
-
-# ====================================================================
-# %%% END OF TRANSLATED PROPERTIES %%%
-# ====================================================================
-Bundle-Name.0=JAX-WS DOM UI
-Bundle-Vendor.0=Eclipse Web Tools Platform
-
-_UI_CreateChild_text = {0}
-_UI_CreateChild_text2 = {1} {0}
-_UI_CreateChild_text3 = {1}
-_UI_CreateChild_tooltip = Create New {0} Under {1} Feature
-_UI_CreateChild_description = Create a new child of type {0} for the {1} feature of the selected {2}.
-_UI_CreateSibling_description = Create a new sibling of type {0} for the selected {2}, under the {1} feature of their parent.
-
-_UI_PropertyDescriptor_description = The {0} of the {1}
-
-_UI_IDOM_type = IDOM
-_UI_IJavaWebServiceElement_type = Java Web Service Element
-_UI_IServiceEndpointInterface_type = Service Endpoint Interface
-_UI_IWebService_type = Web Service
-_UI_IWebServiceProject_type = Web Service Project
-_UI_Unknown_type = Object
-
-_UI_Unknown_datatype= Value
-
-_UI_IDOM_webServiceProjects_feature = Web Service Projects
-_UI_IJavaWebServiceElement_javaImplementation_feature = Java Implementation
-_UI_IServiceEndpointInterface_name_feature = Name
-_UI_IServiceEndpointInterface_implicit_feature = Implicit
-_UI_IServiceEndpointInterface_implementingWebServices_feature = Implementing Web Services
-_UI_IServiceEndpointInterface_targetNamespace_feature = Target Namespace
-_UI_IServiceEndpointInterface_soapBinding = SOAP Binding
-_UI_IWebService_name_feature = Name
-_UI_IWebService_serviceEndpoint_feature = Service Endpoint
-_UI_IWebService_targetNamespace_feature = Target Namespace
-_UI_IWebService_portName_feature = Port Name
-_UI_IWebService_wsdlLocation_feature = WSDL Location
-_UI_IWebServiceProject_webServices_feature = Web Services
-_UI_IWebServiceProject_serviceEndpointInterfaces_feature = Service Endpoint Interfaces
-_UI_IWebServiceProject_name_feature = Name
-_UI_Unknown_feature = Unspecified
-
-_UI_WebServiceAnnotationCategory = General (WebService annotation)
-_UI_WebMethodAnnotationCategory = General (WebMethod annotation)
-_UI_WebParamAnnotationCategory = General (WebParam annotation)
-
-_UI_IJavaWebServiceElement_implementation_feature = Java representation
-_UI_IWebMethod_type = Web Method
-_UI_IWebParam_type = Web Param
-_UI_IWebType_type = Web Type
-_UI_IJavaWebServiceElement_name_feature = Name
-_UI_IWebMethod_excluded_feature = Excluded
-_UI_IWebParam_kind_feature = Mode
-_UI_IServiceEndpointInterface_webMethods_feature = Web Methods
-_UI_IWebMethod_parameters_feature = Parameters
-_UI_IWebParam_typeName_feature = Type Name
-_UI_IWebParam_partName_feature = Part Name
-_UI_IWebParam_targetNamespace_feature = Target Namespace
-_UI_IWebParam_header_feature = Header
-_UI_IServiceEndpointInterface_soapBindingStyle_feature = Style
-_UI_IServiceEndpointInterface_soapBindingUse_feature = Use
-_UI_IServiceEndpointInterface_soapBindingParameterStyle_feature = Parameter Style
-_UI_IWebMethod_soapBindingStyle_feature = Style
-_UI_IWebMethod_soapBindingUse_feature = Use
-_UI_IWebMethod_soapBindingParameterStyle_feature = Parameter Style
diff --git a/bundles/org.eclipse.jst.ws.jaxws.dom.ui/plugin.xml b/bundles/org.eclipse.jst.ws.jaxws.dom.ui/plugin.xml
deleted file mode 100755
index f94d68f..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.ui/plugin.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-
-<!--
- Copyright (c) 2009 by SAP AG, Walldorf.
- All rights reserved. This program and the accompanying materials
- are made available under the terms of the Eclipse Public License v1.0
- which accompanies this distribution, and is available at
- http://www.eclipse.org/legal/epl-v10.html
-
- Contributors:
- SAP AG - initial API and implementation
- -->
-
-<plugin>
-
- <extension point="org.eclipse.emf.edit.itemProviderAdapterFactories">
- <factory
- uri="http:///org/eclipse/jst/ws/jaxws/dom/runtime/dom.ecore"
- class="org.eclipse.jst.ws.jaxws.dom.ui.DomItemProviderAdapterFactory"
- supportedTypes=
- "org.eclipse.emf.edit.provider.IEditingDomainItemProvider
- org.eclipse.emf.edit.provider.IStructuredItemContentProvider
- org.eclipse.emf.edit.provider.ITreeItemContentProvider
- org.eclipse.emf.edit.provider.IItemLabelProvider
- org.eclipse.emf.edit.provider.IItemPropertySource"/>
- </extension>
-
-</plugin>
diff --git a/bundles/org.eclipse.jst.ws.jaxws.dom.ui/src/org/eclipse/jst/ws/jaxws/dom/ui/DomItemProviderAdapterFactory.java b/bundles/org.eclipse.jst.ws.jaxws.dom.ui/src/org/eclipse/jst/ws/jaxws/dom/ui/DomItemProviderAdapterFactory.java
deleted file mode 100755
index b923563..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.ui/src/org/eclipse/jst/ws/jaxws/dom/ui/DomItemProviderAdapterFactory.java
+++ /dev/null
@@ -1,375 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.dom.ui;
-
-import java.util.ArrayList;
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.Notifier;
-
-import org.eclipse.emf.edit.provider.ChangeNotifier;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.ComposedAdapterFactory;
-import org.eclipse.emf.edit.provider.IChangeNotifier;
-import org.eclipse.emf.edit.provider.IDisposable;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.INotifyChangedListener;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-
-import org.eclipse.jst.ws.jaxws.dom.runtime.util.DomAdapterFactory;
-
-/**
- * This is the factory that is used to provide the interfaces needed to support Viewers.
- * The adapters generated by this factory convert EMF adapter notifications into calls to {@link #fireNotifyChanged fireNotifyChanged}.
- * The adapters also support Eclipse property sheets.
- * Note that most of the adapters are shared among multiple instances.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class DomItemProviderAdapterFactory extends DomAdapterFactory implements ComposeableAdapterFactory, IChangeNotifier, IDisposable {
- /**
- * This keeps track of the root adapter factory that delegates to this adapter factory.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected ComposedAdapterFactory parentAdapterFactory;
-
- /**
- * This is used to implement {@link org.eclipse.emf.edit.provider.IChangeNotifier}.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected IChangeNotifier changeNotifier = new ChangeNotifier();
-
- /**
- * This keeps track of all the supported types checked by {@link #isFactoryForType isFactoryForType}.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected Collection<Object> supportedTypes = new ArrayList<Object>();
-
- /**
- * This constructs an instance.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public DomItemProviderAdapterFactory() {
- supportedTypes.add(IEditingDomainItemProvider.class);
- supportedTypes.add(IStructuredItemContentProvider.class);
- supportedTypes.add(ITreeItemContentProvider.class);
- supportedTypes.add(IItemLabelProvider.class);
- supportedTypes.add(IItemPropertySource.class);
- }
-
- /**
- * This keeps track of the one adapter used for all {@link org.eclipse.jst.ws.jaxws.dom.runtime.api.IDOM} instances.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected IDOMItemProvider idomItemProvider;
-
- /**
- * This creates an adapter for a {@link org.eclipse.jst.ws.jaxws.dom.runtime.api.IDOM}.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public Adapter createIDOMAdapter() {
- if (idomItemProvider == null) {
- idomItemProvider = new IDOMItemProvider(this);
- }
-
- return idomItemProvider;
- }
-
- /**
- * This keeps track of the one adapter used for all {@link org.eclipse.jst.ws.jaxws.dom.runtime.api.IJavaWebServiceElement} instances.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected IJavaWebServiceElementItemProvider iJavaWebServiceElementItemProvider;
-
- /**
- * This creates an adapter for a {@link org.eclipse.jst.ws.jaxws.dom.runtime.api.IJavaWebServiceElement}.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public Adapter createIJavaWebServiceElementAdapter() {
- if (iJavaWebServiceElementItemProvider == null) {
- iJavaWebServiceElementItemProvider = new IJavaWebServiceElementItemProvider(this);
- }
-
- return iJavaWebServiceElementItemProvider;
- }
-
- /**
- * This keeps track of the one adapter used for all {@link org.eclipse.jst.ws.jaxws.dom.runtime.api.IServiceEndpointInterface} instances.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected IServiceEndpointInterfaceItemProvider iServiceEndpointInterfaceItemProvider;
-
- /**
- * This creates an adapter for a {@link org.eclipse.jst.ws.jaxws.dom.runtime.api.IServiceEndpointInterface}.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public Adapter createIServiceEndpointInterfaceAdapter() {
- if (iServiceEndpointInterfaceItemProvider == null) {
- iServiceEndpointInterfaceItemProvider = new IServiceEndpointInterfaceItemProvider(this);
- }
-
- return iServiceEndpointInterfaceItemProvider;
- }
-
- /**
- * This keeps track of the one adapter used for all {@link org.eclipse.jst.ws.jaxws.dom.runtime.api.IWebMethod} instances.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected IWebMethodItemProvider iWebMethodItemProvider;
-
- /**
- * This creates an adapter for a {@link org.eclipse.jst.ws.jaxws.dom.runtime.api.IWebMethod}.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public Adapter createIWebMethodAdapter() {
- if (iWebMethodItemProvider == null) {
- iWebMethodItemProvider = new IWebMethodItemProvider(this);
- }
-
- return iWebMethodItemProvider;
- }
-
- /**
- * This keeps track of the one adapter used for all {@link org.eclipse.jst.ws.jaxws.dom.runtime.api.IWebParam} instances.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected IWebParamItemProvider iWebParamItemProvider;
-
- /**
- * This creates an adapter for a {@link org.eclipse.jst.ws.jaxws.dom.runtime.api.IWebParam}.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public Adapter createIWebParamAdapter() {
- if (iWebParamItemProvider == null) {
- iWebParamItemProvider = new IWebParamItemProvider(this);
- }
-
- return iWebParamItemProvider;
- }
-
- /**
- * This keeps track of the one adapter used for all {@link org.eclipse.jst.ws.jaxws.dom.runtime.api.IWebService} instances.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected IWebServiceItemProvider iWebServiceItemProvider;
-
- /**
- * This creates an adapter for a {@link org.eclipse.jst.ws.jaxws.dom.runtime.api.IWebService}.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public Adapter createIWebServiceAdapter() {
- if (iWebServiceItemProvider == null) {
- iWebServiceItemProvider = new IWebServiceItemProvider(this);
- }
-
- return iWebServiceItemProvider;
- }
-
- /**
- * This keeps track of the one adapter used for all {@link org.eclipse.jst.ws.jaxws.dom.runtime.api.IWebServiceProject} instances.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected IWebServiceProjectItemProvider iWebServiceProjectItemProvider;
-
- /**
- * This creates an adapter for a {@link org.eclipse.jst.ws.jaxws.dom.runtime.api.IWebServiceProject}.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public Adapter createIWebServiceProjectAdapter() {
- if (iWebServiceProjectItemProvider == null) {
- iWebServiceProjectItemProvider = new IWebServiceProjectItemProvider(this);
- }
-
- return iWebServiceProjectItemProvider;
- }
-
- /**
- * This keeps track of the one adapter used for all {@link org.eclipse.jst.ws.jaxws.dom.runtime.api.IWebType} instances.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected IWebTypeItemProvider iWebTypeItemProvider;
-
- /**
- * This creates an adapter for a {@link org.eclipse.jst.ws.jaxws.dom.runtime.api.IWebType}.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public Adapter createIWebTypeAdapter() {
- if (iWebTypeItemProvider == null) {
- iWebTypeItemProvider = new IWebTypeItemProvider(this);
- }
-
- return iWebTypeItemProvider;
- }
-
- /**
- * This returns the root adapter factory that contains this factory.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public ComposeableAdapterFactory getRootAdapterFactory() {
- return parentAdapterFactory == null ? this : parentAdapterFactory.getRootAdapterFactory();
- }
-
- /**
- * This sets the composed adapter factory that contains this factory.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setParentAdapterFactory(ComposedAdapterFactory parentAdapterFactory) {
- this.parentAdapterFactory = parentAdapterFactory;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public boolean isFactoryForType(Object type) {
- return supportedTypes.contains(type) || super.isFactoryForType(type);
- }
-
- /**
- * This implementation substitutes the factory itself as the key for the adapter.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public Adapter adapt(Notifier notifier, Object type) {
- return super.adapt(notifier, this);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public Object adapt(Object object, Object type) {
- if (isFactoryForType(type)) {
- Object adapter = super.adapt(object, type);
- if (!(type instanceof Class) || (((Class<?>)type).isInstance(adapter))) {
- return adapter;
- }
- }
-
- return null;
- }
-
- /**
- * This adds a listener.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void addListener(INotifyChangedListener notifyChangedListener) {
- changeNotifier.addListener(notifyChangedListener);
- }
-
- /**
- * This removes a listener.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void removeListener(INotifyChangedListener notifyChangedListener) {
- changeNotifier.removeListener(notifyChangedListener);
- }
-
- /**
- * This delegates to {@link #changeNotifier} and to {@link #parentAdapterFactory}.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void fireNotifyChanged(Notification notification) {
- changeNotifier.fireNotifyChanged(notification);
-
- if (parentAdapterFactory != null) {
- parentAdapterFactory.fireNotifyChanged(notification);
- }
- }
-
- /**
- * This disposes all of the item providers created by this factory.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void dispose() {
- if (idomItemProvider != null) idomItemProvider.dispose();
- if (iJavaWebServiceElementItemProvider != null) iJavaWebServiceElementItemProvider.dispose();
- if (iServiceEndpointInterfaceItemProvider != null) iServiceEndpointInterfaceItemProvider.dispose();
- if (iWebMethodItemProvider != null) iWebMethodItemProvider.dispose();
- if (iWebParamItemProvider != null) iWebParamItemProvider.dispose();
- if (iWebServiceItemProvider != null) iWebServiceItemProvider.dispose();
- if (iWebServiceProjectItemProvider != null) iWebServiceProjectItemProvider.dispose();
- if (iWebTypeItemProvider != null) iWebTypeItemProvider.dispose();
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.dom.ui/src/org/eclipse/jst/ws/jaxws/dom/ui/IDOMItemProvider.java b/bundles/org.eclipse.jst.ws.jaxws.dom.ui/src/org/eclipse/jst/ws/jaxws/dom/ui/IDOMItemProvider.java
deleted file mode 100755
index 00e1cd4..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.ui/src/org/eclipse/jst/ws/jaxws/dom/ui/IDOMItemProvider.java
+++ /dev/null
@@ -1,172 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.dom.ui;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.DomFactory;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.DomPackage;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.IDOM;
-import org.eclipse.jst.ws.jaxws.dom.ui.internal.plugin.DomUi;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.jst.ws.jaxws.dom.runtime.api.IDOM} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class IDOMItemProvider
- extends ItemProviderAdapter
- implements
- IEditingDomainItemProvider,
- IStructuredItemContentProvider,
- ITreeItemContentProvider,
- IItemLabelProvider,
- IItemPropertySource {
- /**
- * This constructs an instance from a factory and a notifier.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public IDOMItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- /**
- * This returns the property descriptors for the adapted class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
-
- }
- return itemPropertyDescriptors;
- }
-
- /**
- * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
- * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
- * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
- if (childrenFeatures == null) {
- super.getChildrenFeatures(object);
- childrenFeatures.add(DomPackage.Literals.IDOM__WEB_SERVICE_PROJECTS);
- }
- return childrenFeatures;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- protected EStructuralFeature getChildFeature(Object object, Object child) {
- // Check the type of the specified child object and return the proper feature to use for
- // adding (see {@link AddCommand}) it as a child.
-
- return super.getChildFeature(object, child);
- }
-
- /**
- * This returns IDOM.gif.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public Object getImage(Object object) {
- return overlayImage(object, getResourceLocator().getImage("full/obj16/IDOM")); //$NON-NLS-1$
- }
-
- /**
- * This returns the label text for the adapted class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public String getText(Object object) {
- return getString("_UI_IDOM_type"); //$NON-NLS-1$
- }
-
- /**
- * This handles model notifications by calling {@link #updateChildren} to update any cached
- * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public void notifyChanged(Notification notification) {
- updateChildren(notification);
-
- switch (notification.getFeatureID(IDOM.class)) {
- case DomPackage.IDOM__WEB_SERVICE_PROJECTS:
- fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
- return;
- }
- super.notifyChanged(notification);
- }
-
- /**
- * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
- * that can be created under this object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
- super.collectNewChildDescriptors(newChildDescriptors, object);
-
- newChildDescriptors.add
- (createChildParameter
- (DomPackage.Literals.IDOM__WEB_SERVICE_PROJECTS,
- DomFactory.eINSTANCE.createIWebServiceProject()));
- }
-
- /**
- * Return the resource locator for this item provider's resources.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public ResourceLocator getResourceLocator() {
- return DomUi.INSTANCE;
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.dom.ui/src/org/eclipse/jst/ws/jaxws/dom/ui/IDOMPropertyValue.java b/bundles/org.eclipse.jst.ws.jaxws.dom.ui/src/org/eclipse/jst/ws/jaxws/dom/ui/IDOMPropertyValue.java
deleted file mode 100755
index 7862b01..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.ui/src/org/eclipse/jst/ws/jaxws/dom/ui/IDOMPropertyValue.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.dom.ui;
-
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-
-/**
- * Interface representing property value. This interface is used to identify property values for WS DOM objects.
- *
- * @author Georgi Vachkov
- */
-public interface IDOMPropertyValue extends IItemPropertySource
-{
- public Object getEditableValue();
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.dom.ui/src/org/eclipse/jst/ws/jaxws/dom/ui/IJavaWebServiceElementItemProvider.java b/bundles/org.eclipse.jst.ws.jaxws.dom.ui/src/org/eclipse/jst/ws/jaxws/dom/ui/IJavaWebServiceElementItemProvider.java
deleted file mode 100755
index 84dbb8f..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.ui/src/org/eclipse/jst/ws/jaxws/dom/ui/IJavaWebServiceElementItemProvider.java
+++ /dev/null
@@ -1,197 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.dom.ui;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.DomPackage;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.IJavaWebServiceElement;
-import org.eclipse.jst.ws.jaxws.dom.ui.internal.impl.DOMItemPropertyProvider;
-import org.eclipse.jst.ws.jaxws.dom.ui.internal.plugin.DomUi;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.jst.ws.jaxws.dom.runtime.api.IJavaWebServiceElement} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class IJavaWebServiceElementItemProvider
- extends ItemProviderAdapter
- implements
- IEditingDomainItemProvider,
- IStructuredItemContentProvider,
- ITreeItemContentProvider,
- IItemLabelProvider,
- IItemPropertySource {
- /**
- * This constructs an instance from a factory and a notifier.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public IJavaWebServiceElementItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- /**
- * This returns the property descriptors for the adapted class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
-
- addImplementationPropertyDescriptor(object);
- addNamePropertyDescriptor(object);
- }
- return itemPropertyDescriptors;
- }
-
- /**
- * This adds a property descriptor for the Implementation feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- */
- protected void addImplementationPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_IJavaWebServiceElement_implementation_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_IJavaWebServiceElement_implementation_feature", "_UI_IJavaWebServiceElement_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- DomPackage.Literals.IJAVA_WEB_SERVICE_ELEMENT__IMPLEMENTATION,
- false,
- false,
- false,
- ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
- null,
- null));
- }
-
- /**
- * This adds a property descriptor for the Name feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- */
- protected void addNamePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add
- (new DOMItemPropertyProvider
- (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_IJavaWebServiceElement_name_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_IJavaWebServiceElement_name_feature", "_UI_IJavaWebServiceElement_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- DomPackage.Literals.IJAVA_WEB_SERVICE_ELEMENT__NAME,
- false,
- false,
- false,
- ItemPropertyDescriptor.TEXT_VALUE_IMAGE,
- getNameCategory(),
- null));
- }
-
- /**
- * This method defines at which category the name should go to. Extender of
- * this class should override it if wants the name to be separated in different
- * than default category.
- *
- * @return the default implementation returns <code>null</code>
- */
- public String getNameCategory() {
- return null;
- }
-
- /**
- * This returns IJavaWebServiceElement.gif.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public Object getImage(Object object) {
- return overlayImage(object, getResourceLocator().getImage("full/obj16/IJavaWebServiceElement")); //$NON-NLS-1$
- }
-
- /**
- * This returns the label text for the adapted class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public String getText(Object object) {
- String label = ((IJavaWebServiceElement)object).getName();
- return label == null || label.length() == 0 ?
- getString("_UI_IJavaWebServiceElement_type") : //$NON-NLS-1$
- getString("_UI_IJavaWebServiceElement_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
- }
-
- /**
- * This handles model notifications by calling {@link #updateChildren} to update any cached
- * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public void notifyChanged(Notification notification) {
- updateChildren(notification);
-
- switch (notification.getFeatureID(IJavaWebServiceElement.class)) {
- case DomPackage.IJAVA_WEB_SERVICE_ELEMENT__IMPLEMENTATION:
- case DomPackage.IJAVA_WEB_SERVICE_ELEMENT__NAME:
- fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
- return;
- }
- super.notifyChanged(notification);
- }
-
- /**
- * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
- * that can be created under this object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
- super.collectNewChildDescriptors(newChildDescriptors, object);
- }
-
- /**
- * Return the resource locator for this item provider's resources.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public ResourceLocator getResourceLocator() {
- return DomUi.INSTANCE;
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.dom.ui/src/org/eclipse/jst/ws/jaxws/dom/ui/IServiceEndpointInterfaceItemProvider.java b/bundles/org.eclipse.jst.ws.jaxws.dom.ui/src/org/eclipse/jst/ws/jaxws/dom/ui/IServiceEndpointInterfaceItemProvider.java
deleted file mode 100755
index f88bc41..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.ui/src/org/eclipse/jst/ws/jaxws/dom/ui/IServiceEndpointInterfaceItemProvider.java
+++ /dev/null
@@ -1,320 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.dom.ui;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.DomFactory;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.DomPackage;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.IServiceEndpointInterface;
-import org.eclipse.jst.ws.jaxws.dom.ui.internal.impl.DOMItemPropertyProvider;
-import org.eclipse.jst.ws.jaxws.dom.ui.internal.plugin.DomUi;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.jst.ws.jaxws.dom.runtime.api.IServiceEndpointInterface} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class IServiceEndpointInterfaceItemProvider
- extends IJavaWebServiceElementItemProvider
- implements
- IEditingDomainItemProvider,
- IStructuredItemContentProvider,
- ITreeItemContentProvider,
- IItemLabelProvider,
- IItemPropertySource {
- /**
- * This constructs an instance from a factory and a notifier.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public IServiceEndpointInterfaceItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- /**
- * This returns the property descriptors for the adapted class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- */
- @Override
- public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object)
- {
- itemPropertyDescriptors = null;
-
- super.getPropertyDescriptors(object);
-
- addImplicitPropertyDescriptor(object);
- addImplementingWebServicesPropertyDescriptor(object);
- addTargetNamespacePropertyDescriptor(object);
- addSoapBindingStylePropertyDescriptor(object);
- addSoapBindingUsePropertyDescriptor(object);
- addSoapBindingParameterStylePropertyDescriptor(object);
-
- return itemPropertyDescriptors;
- }
-
- /**
- * This adds a property descriptor for the Implicit feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- */
- protected void addImplicitPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_IServiceEndpointInterface_implicit_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_IServiceEndpointInterface_implicit_feature", "_UI_IServiceEndpointInterface_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- DomPackage.Literals.ISERVICE_ENDPOINT_INTERFACE__IMPLICIT,
- false,
- false,
- false,
- ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,
- null,
- null));
- }
-
- /**
- * This adds a property descriptor for the Implementing Web Services feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- */
- protected void addImplementingWebServicesPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_IServiceEndpointInterface_implementingWebServices_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_IServiceEndpointInterface_implementingWebServices_feature", "_UI_IServiceEndpointInterface_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- DomPackage.Literals.ISERVICE_ENDPOINT_INTERFACE__IMPLEMENTING_WEB_SERVICES,
- false,
- false,
- true,
- null,
- null,
- null));
- }
-
- /**
- * This adds a property descriptor for the Target Namespace feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- */
- protected void addTargetNamespacePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add
- (new DOMItemPropertyProvider
- (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_IServiceEndpointInterface_targetNamespace_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_IServiceEndpointInterface_targetNamespace_feature", "_UI_IServiceEndpointInterface_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- DomPackage.Literals.ISERVICE_ENDPOINT_INTERFACE__TARGET_NAMESPACE,
- false,
- false,
- false,
- ItemPropertyDescriptor.TEXT_VALUE_IMAGE,
- getNameCategory(),
- null));
- }
-
- /**
- * This adds a property descriptor for the Soap Binding Style feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- */
- protected void addSoapBindingStylePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_IServiceEndpointInterface_soapBindingStyle_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_IServiceEndpointInterface_soapBindingStyle_feature", "_UI_IServiceEndpointInterface_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- DomPackage.Literals.ISERVICE_ENDPOINT_INTERFACE__SOAP_BINDING_STYLE,
- false,
- false,
- false,
- ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
- getString("_UI_IServiceEndpointInterface_soapBinding"), //$NON-NLS-1$
- null));
- }
-
- /**
- * This adds a property descriptor for the Soap Binding Use feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- */
- protected void addSoapBindingUsePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_IServiceEndpointInterface_soapBindingUse_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_IServiceEndpointInterface_soapBindingUse_feature", "_UI_IServiceEndpointInterface_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- DomPackage.Literals.ISERVICE_ENDPOINT_INTERFACE__SOAP_BINDING_USE,
- false,
- false,
- false,
- ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
- getString("_UI_IServiceEndpointInterface_soapBinding"), //$NON-NLS-1$
- null));
- }
-
- /**
- * This adds a property descriptor for the Soap Binding Parameter Style feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- */
- protected void addSoapBindingParameterStylePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_IServiceEndpointInterface_soapBindingParameterStyle_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_IServiceEndpointInterface_soapBindingParameterStyle_feature", "_UI_IServiceEndpointInterface_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- DomPackage.Literals.ISERVICE_ENDPOINT_INTERFACE__SOAP_BINDING_PARAMETER_STYLE,
- false,
- false,
- false,
- ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
- getString("_UI_IServiceEndpointInterface_soapBinding"), //$NON-NLS-1$
- null));
- }
-
- /**
- * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
- * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
- * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
- if (childrenFeatures == null) {
- super.getChildrenFeatures(object);
- childrenFeatures.add(DomPackage.Literals.ISERVICE_ENDPOINT_INTERFACE__WEB_METHODS);
- }
- return childrenFeatures;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- protected EStructuralFeature getChildFeature(Object object, Object child) {
- // Check the type of the specified child object and return the proper feature to use for
- // adding (see {@link AddCommand}) it as a child.
-
- return super.getChildFeature(object, child);
- }
-
- /**
- * This returns IServiceEndpointInterface.gif.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- */
- @Override
- public Object getImage(Object object) {
- return overlayImage(object, Images.INSTANCE.getImage(Images.IMG_SEI));
- }
-
- /**
- * This returns the label text for the adapted class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- */
- @Override
- public String getText(Object object) {
- String label = ((IServiceEndpointInterface)object).getName();
- return label == null || label.length() == 0 ?
- getString("_UI_IServiceEndpointInterface_type") : //$NON-NLS-1$
- label;
- }
-
- /**
- * This handles model notifications by calling {@link #updateChildren} to update any cached
- * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public void notifyChanged(Notification notification) {
- updateChildren(notification);
-
- switch (notification.getFeatureID(IServiceEndpointInterface.class)) {
- case DomPackage.ISERVICE_ENDPOINT_INTERFACE__IMPLICIT:
- case DomPackage.ISERVICE_ENDPOINT_INTERFACE__TARGET_NAMESPACE:
- case DomPackage.ISERVICE_ENDPOINT_INTERFACE__SOAP_BINDING_STYLE:
- case DomPackage.ISERVICE_ENDPOINT_INTERFACE__SOAP_BINDING_USE:
- case DomPackage.ISERVICE_ENDPOINT_INTERFACE__SOAP_BINDING_PARAMETER_STYLE:
- fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
- return;
- case DomPackage.ISERVICE_ENDPOINT_INTERFACE__WEB_METHODS:
- fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
- return;
- }
- super.notifyChanged(notification);
- }
-
- /**
- * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
- * that can be created under this object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
- super.collectNewChildDescriptors(newChildDescriptors, object);
-
- newChildDescriptors.add
- (createChildParameter
- (DomPackage.Literals.ISERVICE_ENDPOINT_INTERFACE__WEB_METHODS,
- DomFactory.eINSTANCE.createIWebMethod()));
- }
-
- /**
- * Return the resource locator for this item provider's resources.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public ResourceLocator getResourceLocator() {
- return DomUi.INSTANCE;
- }
-
- @Override
- public String getNameCategory()
- {
- return getString("_UI_WebServiceAnnotationCategory"); //$NON-NLS-1$
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.dom.ui/src/org/eclipse/jst/ws/jaxws/dom/ui/IWebMethodItemProvider.java b/bundles/org.eclipse.jst.ws.jaxws.dom.ui/src/org/eclipse/jst/ws/jaxws/dom/ui/IWebMethodItemProvider.java
deleted file mode 100755
index 7800540..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.ui/src/org/eclipse/jst/ws/jaxws/dom/ui/IWebMethodItemProvider.java
+++ /dev/null
@@ -1,330 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.dom.ui;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.DomFactory;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.DomPackage;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.IWebMethod;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.IWebParam;
-import org.eclipse.jst.ws.jaxws.dom.ui.internal.plugin.DomUi;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.jst.ws.jaxws.dom.runtime.api.IWebMethod} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class IWebMethodItemProvider extends IJavaWebServiceElementItemProvider
- implements
- IEditingDomainItemProvider,
- IStructuredItemContentProvider,
- ITreeItemContentProvider,
- IItemLabelProvider,
- IItemPropertySource {
- /**
- * This constructs an instance from a factory and a notifier.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public IWebMethodItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- /**
- * This returns the property descriptors for the adapted class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- */
- @Override
- public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object)
- {
- if (itemPropertyDescriptors != null) {
- return itemPropertyDescriptors;
- }
-
- super.getPropertyDescriptors(object);
-
- addExcludedPropertyDescriptor(object);
- addSoapBindingStylePropertyDescriptor(object);
- addSoapBindingUsePropertyDescriptor(object);
- addSoapBindingParameterStylePropertyDescriptor(object);
-
- return itemPropertyDescriptors;
- }
-
- @Override
- protected void addImplementationPropertyDescriptor(Object object)
- {
- itemPropertyDescriptors.add(
- new ItemPropertyDescriptor(
- ((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_IJavaWebServiceElement_implementation_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_IJavaWebServiceElement_implementation_feature", "_UI_IJavaWebServiceElement_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- DomPackage.Literals.IJAVA_WEB_SERVICE_ELEMENT__IMPLEMENTATION,
- false,
- false,
- false,
- ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
- null,
- null)
- {
-
- @Override
- protected Object getValue(EObject object, EStructuralFeature feature)
- {
- String returnString = ""; //$NON-NLS-1$
- String parameters = ""; //$NON-NLS-1$
- IWebMethod webMethod = (IWebMethod)getTarget();
-
- for(IWebParam webParam : webMethod.getParameters())
- {
- if(webParam.getName().equals("return")) //$NON-NLS-1$
- {
- returnString = getTypeName(webParam.getTypeName()) + " "; //$NON-NLS-1$
- }
- else
- {
- parameters = parameters + getTypeName(webParam.getTypeName()) + ", "; //$NON-NLS-1$
- }
- }
-
- if (parameters.length() > 0) {
- parameters = parameters.substring(0, parameters.lastIndexOf(','));
- }
-
- String methodName = webMethod.getImplementation();
- int pos = methodName.indexOf('(');
- if (pos > -1) {
- methodName = methodName.substring(0, pos);
- }
-
- return returnString + methodName + '(' + parameters + ')';
- }
-
- protected String getTypeName(String typeName)
- {
- return typeName.substring(typeName.lastIndexOf('.') + 1);
- }
- });
- }
-
- /**
- * This adds a property descriptor for the Excluded feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- */
- protected void addExcludedPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_IWebMethod_excluded_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_IWebMethod_excluded_feature", "_UI_IWebMethod_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- DomPackage.Literals.IWEB_METHOD__EXCLUDED,
- false,
- false,
- false,
- ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,
- getNameCategory(),
- null));
- }
-
- /**
- * This adds a property descriptor for the Soap Binding Style feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- */
- protected void addSoapBindingStylePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_IWebMethod_soapBindingStyle_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_IWebMethod_soapBindingStyle_feature", "_UI_IWebMethod_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- DomPackage.Literals.IWEB_METHOD__SOAP_BINDING_STYLE,
- false,
- false,
- false,
- ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
- getString("_UI_IServiceEndpointInterface_soapBinding"), //$NON-NLS-1$
- null));
- }
-
- /**
- * This adds a property descriptor for the Soap Binding Use feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- */
- protected void addSoapBindingUsePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_IWebMethod_soapBindingUse_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_IWebMethod_soapBindingUse_feature", "_UI_IWebMethod_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- DomPackage.Literals.IWEB_METHOD__SOAP_BINDING_USE,
- false,
- false,
- false,
- ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
- getString("_UI_IServiceEndpointInterface_soapBinding"), //$NON-NLS-1$
- null));
- }
-
- /**
- * This adds a property descriptor for the Soap Binding Parameter Style feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- */
- protected void addSoapBindingParameterStylePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_IWebMethod_soapBindingParameterStyle_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_IWebMethod_soapBindingParameterStyle_feature", "_UI_IWebMethod_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- DomPackage.Literals.IWEB_METHOD__SOAP_BINDING_PARAMETER_STYLE,
- false,
- false,
- false,
- ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
- getString("_UI_IServiceEndpointInterface_soapBinding"), //$NON-NLS-1$
- null));
- }
-
- /**
- * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
- * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
- * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
- if (childrenFeatures == null) {
- super.getChildrenFeatures(object);
- childrenFeatures.add(DomPackage.Literals.IWEB_METHOD__PARAMETERS);
- }
- return childrenFeatures;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- protected EStructuralFeature getChildFeature(Object object, Object child) {
- // Check the type of the specified child object and return the proper feature to use for
- // adding (see {@link AddCommand}) it as a child.
-
- return super.getChildFeature(object, child);
- }
-
- /**
- * This returns Web_Method.gif.
- */
- @Override
- public Object getImage(Object object) {
- return overlayImage(object, Images.INSTANCE.getImage(Images.IMG_WEB_METHOD));
- }
-
- /**
- * This returns the label text for the adapted class.
- */
- @Override
- public String getText(Object object) {
- String label = ((IWebMethod)object).getName();
- return label == null || label.length() == 0 ?
- getString("_UI_IWebMethod_type") : //$NON-NLS-1$
- label;
- }
-
- /**
- * This handles model notifications by calling {@link #updateChildren} to update any cached
- * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public void notifyChanged(Notification notification) {
- updateChildren(notification);
-
- switch (notification.getFeatureID(IWebMethod.class)) {
- case DomPackage.IWEB_METHOD__EXCLUDED:
- case DomPackage.IWEB_METHOD__SOAP_BINDING_STYLE:
- case DomPackage.IWEB_METHOD__SOAP_BINDING_USE:
- case DomPackage.IWEB_METHOD__SOAP_BINDING_PARAMETER_STYLE:
- fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
- return;
- case DomPackage.IWEB_METHOD__PARAMETERS:
- fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
- return;
- }
- super.notifyChanged(notification);
- }
-
- /**
- * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
- * that can be created under this object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
- super.collectNewChildDescriptors(newChildDescriptors, object);
-
- newChildDescriptors.add
- (createChildParameter
- (DomPackage.Literals.IWEB_METHOD__PARAMETERS,
- DomFactory.eINSTANCE.createIWebParam()));
- }
-
- /**
- * Return the resource locator for this item provider's resources.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public ResourceLocator getResourceLocator() {
- return DomUi.INSTANCE;
- }
-
- @Override
- public String getNameCategory()
- {
- return getString("_UI_WebMethodAnnotationCategory"); //$NON-NLS-1$
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.dom.ui/src/org/eclipse/jst/ws/jaxws/dom/ui/IWebParamItemProvider.java b/bundles/org.eclipse.jst.ws.jaxws.dom.ui/src/org/eclipse/jst/ws/jaxws/dom/ui/IWebParamItemProvider.java
deleted file mode 100755
index b075bad..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.ui/src/org/eclipse/jst/ws/jaxws/dom/ui/IWebParamItemProvider.java
+++ /dev/null
@@ -1,299 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.dom.ui;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-import org.eclipse.jdt.core.Signature;
-import org.eclipse.jst.ws.jaxws.dom.runtime.IPropertyState;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.DomPackage;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.IWebParam;
-import org.eclipse.jst.ws.jaxws.dom.runtime.persistence.state.PropertyStateAdapterFactory;
-import org.eclipse.jst.ws.jaxws.dom.ui.internal.impl.DOMItemPropertyProvider;
-import org.eclipse.jst.ws.jaxws.dom.ui.internal.plugin.DomUi;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.jst.ws.jaxws.dom.runtime.api.IWebParam} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class IWebParamItemProvider
- extends IJavaWebServiceElementItemProvider
- implements
- IEditingDomainItemProvider,
- IStructuredItemContentProvider,
- ITreeItemContentProvider,
- IItemLabelProvider,
- IItemPropertySource {
-
- /**
- * This constructs an instance from a factory and a notifier.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public IWebParamItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- /**
- * This returns the property descriptors for the adapted class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- */
- @Override
- public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors != null) {
- return itemPropertyDescriptors;
- }
-
- super.getPropertyDescriptors(object);
-
- addKindPropertyDescriptor(object);
- addTypeNamePropertyDescriptor(object);
- addPartNamePropertyDescriptor(object);
- addTargetNamespacePropertyDescriptor(object);
- addHeaderPropertyDescriptor(object);
-
- return itemPropertyDescriptors;
- }
-
- /**
- * This adds a property descriptor for the Kind feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- */
- protected void addKindPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_IWebParam_kind_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_IWebParam_kind_feature", "_UI_IWebParam_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- DomPackage.Literals.IWEB_PARAM__KIND,
- false,
- false,
- false,
- ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
- getNameCategory(),
- null));
- }
-
- /**
- * This adds a property descriptor for the Type Name feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- */
- protected void addTypeNamePropertyDescriptorOld(Object object) {
- itemPropertyDescriptors.add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_IWebParam_typeName_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_IWebParam_typeName_feature", "_UI_IWebParam_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- DomPackage.Literals.IWEB_PARAM__TYPE_NAME,
- false,
- false,
- false,
- ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
- null,
- null));
- }
-
- protected void addTypeNamePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add
- (new ItemPropertyDescriptor(
- ((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_IWebParam_typeName_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_IWebParam_typeName_feature", "_UI_IWebParam_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- DomPackage.Literals.IWEB_PARAM__TYPE_NAME,
- false,
- false,
- false,
- ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
- null,
- null)
- {
- @Override
- protected Object getValue(EObject object, EStructuralFeature feature)
- {
- String typeName = null;
-
- final Object typeSignature = super.getValue(object, feature);
- if (typeSignature != null)
- {
- typeName = Signature.toString(typeSignature.toString());
- }
-
- return typeName;
- }
- });
- }
-
- /**
- * This adds a property descriptor for the Part Name feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- */
- protected void addPartNamePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add
- (new DOMItemPropertyProvider
- (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_IWebParam_partName_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_IWebParam_partName_feature", "_UI_IWebParam_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- DomPackage.Literals.IWEB_PARAM__PART_NAME,
- false,
- false,
- false,
- ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
- getNameCategory(),
- null));
- }
-
- /**
- * This adds a property descriptor for the Target Namespace feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- */
- protected void addTargetNamespacePropertyDescriptor(Object object) {
- final IPropertyState state = (IPropertyState)PropertyStateAdapterFactory.INSTANCE.adapt(object, IPropertyState.class);
- itemPropertyDescriptors.add
- (new DOMItemPropertyProvider
- (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_IWebParam_targetNamespace_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_IWebParam_targetNamespace_feature", "_UI_IWebParam_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- DomPackage.Literals.IWEB_PARAM__TARGET_NAMESPACE,
- (state==null) ? false : state.isChangeable(DomPackage.Literals.IWEB_PARAM__TARGET_NAMESPACE),
- false,
- false,
- ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
- getNameCategory(),
- null));
- }
-
- /**
- * This adds a property descriptor for the Header feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- */
- protected void addHeaderPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_IWebParam_header_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_IWebParam_header_feature", "_UI_IWebParam_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- DomPackage.Literals.IWEB_PARAM__HEADER,
- false,
- false,
- false,
- ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,
- getNameCategory(),
- null));
- }
-
- /**
- * This returns Web_Param.gif.
- */
- @Override
- public Object getImage(Object object)
- {
- String imageName = Images.IMG_WEB_PARAM_IN;
-
- if ((object instanceof IWebParam) && ((IWebParam) object).getImplementation().equals("return")) //$NON-NLS-1$
- {
- imageName = Images.IMG_WEB_PARAM_OUT;
- }
-
- return overlayImage(object, Images.INSTANCE.getImage(imageName));
- }
-
- /**
- * This returns the label text for the adapted class.
- */
- @Override
- public String getText(Object object)
- {
- return ((IWebParam)object).getName();
- }
-
- /**
- * This handles model notifications by calling {@link #updateChildren} to update any cached
- * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public void notifyChanged(Notification notification) {
- updateChildren(notification);
-
- switch (notification.getFeatureID(IWebParam.class)) {
- case DomPackage.IWEB_PARAM__KIND:
- case DomPackage.IWEB_PARAM__TYPE_NAME:
- case DomPackage.IWEB_PARAM__PART_NAME:
- case DomPackage.IWEB_PARAM__TARGET_NAMESPACE:
- case DomPackage.IWEB_PARAM__HEADER:
- fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
- return;
- }
- super.notifyChanged(notification);
- }
-
- /**
- * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
- * that can be created under this object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
- super.collectNewChildDescriptors(newChildDescriptors, object);
- }
-
- /**
- * Return the resource locator for this item provider's resources.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public ResourceLocator getResourceLocator() {
- return DomUi.INSTANCE;
- }
-
- @Override
- public String getNameCategory()
- {
- return getString("_UI_WebParamAnnotationCategory"); //$NON-NLS-1$
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.dom.ui/src/org/eclipse/jst/ws/jaxws/dom/ui/IWebServiceItemProvider.java b/bundles/org.eclipse.jst.ws.jaxws.dom.ui/src/org/eclipse/jst/ws/jaxws/dom/ui/IWebServiceItemProvider.java
deleted file mode 100755
index c894082..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.ui/src/org/eclipse/jst/ws/jaxws/dom/ui/IWebServiceItemProvider.java
+++ /dev/null
@@ -1,234 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.dom.ui;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.DomPackage;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.IWebService;
-import org.eclipse.jst.ws.jaxws.dom.ui.internal.impl.DOMItemPropertyProvider;
-import org.eclipse.jst.ws.jaxws.dom.ui.internal.plugin.DomUi;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.jst.ws.jaxws.dom.runtime.api.IWebService} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class IWebServiceItemProvider
- extends IJavaWebServiceElementItemProvider
- implements
- IEditingDomainItemProvider,
- IStructuredItemContentProvider,
- ITreeItemContentProvider,
- IItemLabelProvider,
- IItemPropertySource {
- /**
- * This constructs an instance from a factory and a notifier.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public IWebServiceItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- /**
- * This returns the property descriptors for the adapted class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- */
- @Override
- public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-
- if (itemPropertyDescriptors != null) {
- return itemPropertyDescriptors;
- }
-
- super.getPropertyDescriptors(object);
-
- addServiceEndpointPropertyDescriptor(object);
- addTargetNamespacePropertyDescriptor(object);
- addPortNamePropertyDescriptor(object);
- addWsdlLocationPropertyDescriptor(object);
-
- return itemPropertyDescriptors;
- }
-
- /**
- * This adds a property descriptor for the Service Endpoint feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- */
- protected void addServiceEndpointPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_IWebService_serviceEndpoint_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_IWebService_serviceEndpoint_feature", "_UI_IWebService_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- DomPackage.Literals.IWEB_SERVICE__SERVICE_ENDPOINT,
- false,
- false,
- true,
- null,
- getNameCategory(),
- null));
- }
-
- /**
- * This adds a property descriptor for the Target Namespace feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- */
- protected void addTargetNamespacePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add
- (new DOMItemPropertyProvider
- (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_IWebService_targetNamespace_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_IWebService_targetNamespace_feature", "_UI_IWebService_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- DomPackage.Literals.IWEB_SERVICE__TARGET_NAMESPACE,
- false,
- false,
- false,
- ItemPropertyDescriptor.TEXT_VALUE_IMAGE,
- getNameCategory(),
- null));
- }
-
- /**
- * This adds a property descriptor for the Port Name feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- */
- protected void addPortNamePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add
- (new DOMItemPropertyProvider
- (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_IWebService_portName_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_IWebService_portName_feature", "_UI_IWebService_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- DomPackage.Literals.IWEB_SERVICE__PORT_NAME,
- false,
- false,
- false,
- ItemPropertyDescriptor.TEXT_VALUE_IMAGE,
- getNameCategory(),
- null));
- }
-
- /**
- * This adds a property descriptor for the Wsdl Location feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- */
- protected void addWsdlLocationPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_IWebService_wsdlLocation_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_IWebService_wsdlLocation_feature", "_UI_IWebService_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- DomPackage.Literals.IWEB_SERVICE__WSDL_LOCATION,
- false,
- false,
- false,
- ItemPropertyDescriptor.TEXT_VALUE_IMAGE,
- getNameCategory(),
- null));
- }
-
- /**
- * This returns IWebService.gif.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- */
- @Override
- public Object getImage(Object object) {
- return overlayImage(object, Images.INSTANCE.getImage(Images.IMG_WEB_SERVICE));
- }
-
- /**
- * This returns the label text for the adapted class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- */
- @Override
- public String getText(Object object) {
- String label = ((IWebService)object).getName();
- return label == null || label.length() == 0 ?
- getString("_UI_IWebService_type") : //$NON-NLS-1$
- label;
- }
-
- /**
- * This handles model notifications by calling {@link #updateChildren} to update any cached
- * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- */
- @Override
- public void notifyChanged(Notification notification) {
- updateChildren(notification);
-
- switch (notification.getFeatureID(IWebService.class)) {
- case DomPackage.IWEB_SERVICE__SERVICE_ENDPOINT:
- fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, true));
- return;
- }
-
- super.notifyChanged(notification);
- }
-
- /**
- * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
- * that can be created under this object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
- super.collectNewChildDescriptors(newChildDescriptors, object);
- }
-
- /**
- * Return the resource locator for this item provider's resources.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public ResourceLocator getResourceLocator() {
- return DomUi.INSTANCE;
- }
-
- @Override
- public String getNameCategory()
- {
- return getString("_UI_WebServiceAnnotationCategory"); //$NON-NLS-1$
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.dom.ui/src/org/eclipse/jst/ws/jaxws/dom/ui/IWebServiceProjectItemProvider.java b/bundles/org.eclipse.jst.ws.jaxws.dom.ui/src/org/eclipse/jst/ws/jaxws/dom/ui/IWebServiceProjectItemProvider.java
deleted file mode 100755
index 5681e7a..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.ui/src/org/eclipse/jst/ws/jaxws/dom/ui/IWebServiceProjectItemProvider.java
+++ /dev/null
@@ -1,208 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.dom.ui;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.DomFactory;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.DomPackage;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.IWebServiceProject;
-import org.eclipse.jst.ws.jaxws.dom.ui.internal.plugin.DomUi;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.jst.ws.jaxws.dom.runtime.api.IWebServiceProject} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class IWebServiceProjectItemProvider
- extends ItemProviderAdapter
- implements
- IEditingDomainItemProvider,
- IStructuredItemContentProvider,
- ITreeItemContentProvider,
- IItemLabelProvider,
- IItemPropertySource {
- /**
- * This constructs an instance from a factory and a notifier.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public IWebServiceProjectItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- /**
- * This returns the property descriptors for the adapted class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
-
- addNamePropertyDescriptor(object);
- }
- return itemPropertyDescriptors;
- }
-
- /**
- * This adds a property descriptor for the Name feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- */
- protected void addNamePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_IWebServiceProject_name_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_IWebServiceProject_name_feature", "_UI_IWebServiceProject_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- DomPackage.Literals.IWEB_SERVICE_PROJECT__NAME,
- false,
- false,
- false,
- ItemPropertyDescriptor.TEXT_VALUE_IMAGE,
- null,
- null));
- }
-
- /**
- * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
- * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
- * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
- if (childrenFeatures == null) {
- super.getChildrenFeatures(object);
- childrenFeatures.add(DomPackage.Literals.IWEB_SERVICE_PROJECT__WEB_SERVICES);
- childrenFeatures.add(DomPackage.Literals.IWEB_SERVICE_PROJECT__SERVICE_ENDPOINT_INTERFACES);
- }
- return childrenFeatures;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- protected EStructuralFeature getChildFeature(Object object, Object child) {
- // Check the type of the specified child object and return the proper feature to use for
- // adding (see {@link AddCommand}) it as a child.
-
- return super.getChildFeature(object, child);
- }
-
- /**
- * This returns IWebServiceProject.gif.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- */
- @Override
- public Object getImage(Object object) {
- return overlayImage(object, Images.INSTANCE.getImage(Images.IMG_DOM_WS_PROVIDER));
- }
-
- /**
- * This returns the label text for the adapted class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public String getText(Object object) {
- String label = ((IWebServiceProject)object).getName();
- return label == null || label.length() == 0 ?
- getString("_UI_IWebServiceProject_type") : //$NON-NLS-1$
- getString("_UI_IWebServiceProject_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
- }
-
- /**
- * This handles model notifications by calling {@link #updateChildren} to update any cached
- * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public void notifyChanged(Notification notification) {
- updateChildren(notification);
-
- switch (notification.getFeatureID(IWebServiceProject.class)) {
- case DomPackage.IWEB_SERVICE_PROJECT__NAME:
- fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
- return;
- case DomPackage.IWEB_SERVICE_PROJECT__WEB_SERVICES:
- case DomPackage.IWEB_SERVICE_PROJECT__SERVICE_ENDPOINT_INTERFACES:
- fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
- return;
- }
- super.notifyChanged(notification);
- }
-
- /**
- * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
- * that can be created under this object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
- super.collectNewChildDescriptors(newChildDescriptors, object);
-
- newChildDescriptors.add
- (createChildParameter
- (DomPackage.Literals.IWEB_SERVICE_PROJECT__WEB_SERVICES,
- DomFactory.eINSTANCE.createIWebService()));
-
- newChildDescriptors.add
- (createChildParameter
- (DomPackage.Literals.IWEB_SERVICE_PROJECT__SERVICE_ENDPOINT_INTERFACES,
- DomFactory.eINSTANCE.createIServiceEndpointInterface()));
- }
-
- /**
- * Return the resource locator for this item provider's resources.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public ResourceLocator getResourceLocator() {
- return DomUi.INSTANCE;
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.dom.ui/src/org/eclipse/jst/ws/jaxws/dom/ui/IWebTypeItemProvider.java b/bundles/org.eclipse.jst.ws.jaxws.dom.ui/src/org/eclipse/jst/ws/jaxws/dom/ui/IWebTypeItemProvider.java
deleted file mode 100755
index bab35b8..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.ui/src/org/eclipse/jst/ws/jaxws/dom/ui/IWebTypeItemProvider.java
+++ /dev/null
@@ -1,129 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.dom.ui;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.IWebType;
-import org.eclipse.jst.ws.jaxws.dom.ui.internal.plugin.DomUi;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.jst.ws.jaxws.dom.runtime.api.IWebType} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class IWebTypeItemProvider
- extends IJavaWebServiceElementItemProvider
- implements
- IEditingDomainItemProvider,
- IStructuredItemContentProvider,
- ITreeItemContentProvider,
- IItemLabelProvider,
- IItemPropertySource {
- /**
- * This constructs an instance from a factory and a notifier.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public IWebTypeItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- /**
- * This returns the property descriptors for the adapted class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
-
- }
- return itemPropertyDescriptors;
- }
-
- /**
- * This returns IWebType.gif.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public Object getImage(Object object) {
- return overlayImage(object, getResourceLocator().getImage("full/obj16/IWebType")); //$NON-NLS-1$
- }
-
- /**
- * This returns the label text for the adapted class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public String getText(Object object) {
- String label = ((IWebType)object).getName();
- return label == null || label.length() == 0 ?
- getString("_UI_IWebType_type") : //$NON-NLS-1$
- getString("_UI_IWebType_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
- }
-
- /**
- * This handles model notifications by calling {@link #updateChildren} to update any cached
- * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public void notifyChanged(Notification notification) {
- updateChildren(notification);
- super.notifyChanged(notification);
- }
-
- /**
- * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
- * that can be created under this object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
- super.collectNewChildDescriptors(newChildDescriptors, object);
- }
-
- /**
- * Return the resource locator for this item provider's resources.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public ResourceLocator getResourceLocator() {
- return DomUi.INSTANCE;
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.dom.ui/src/org/eclipse/jst/ws/jaxws/dom/ui/Images.java b/bundles/org.eclipse.jst.ws.jaxws.dom.ui/src/org/eclipse/jst/ws/jaxws/dom/ui/Images.java
deleted file mode 100755
index c75a909..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.ui/src/org/eclipse/jst/ws/jaxws/dom/ui/Images.java
+++ /dev/null
@@ -1,122 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.dom.ui;
-
-import java.net.URL;
-import java.text.MessageFormat;
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.resource.ImageRegistry;
-import org.eclipse.jst.ws.jaxws.dom.ui.internal.plugin.DomUi;
-import org.eclipse.jst.ws.jaxws.utils.logging.Logger;
-import org.eclipse.swt.graphics.Image;
-
-/**
- * Images bundle. Use this class when you need to load some image.
- *
- * @author Georgi Vachkov
- */
-public class Images
-{
- public static final Images INSTANCE = new Images();
-
- public static final String IMG_WEB_METHOD = "WebMethod"; //$NON-NLS-1$
- public static final String IMG_WEB_PARAM_IN = "WebParamIn"; //$NON-NLS-1$
- public static final String IMG_WEB_PARAM_OUT = "WebParamOut"; //$NON-NLS-1$
- public static final String IMG_WEB_SERVICE = "WebService"; //$NON-NLS-1$
- public static final String IMG_WEB_SERVICE_GROUP = "WebServiceGroup"; //$NON-NLS-1$
- public static final String IMG_SEI = "SEI"; //$NON-NLS-1$
- public static final String IMG_SEI_GROUP = "SEIGroup"; //$NON-NLS-1$
- public static final String IMG_DOM_WS_PROVIDER = "DOMWSProvider"; //$NON-NLS-1$
- public static final String IMG_ERROR_MARKER = "error_obj"; //$NON-NLS-1$
- public static final String IMG_WARNING_MARKER = "warning_obj"; //$NON-NLS-1$
-
- private static ResourceBundle iconsBundle;
- private static ImageRegistry mImageRegistry;
-
- /**
- * Constructor
- */
- public Images()
- {
- try {
- iconsBundle = ResourceBundle.getBundle("org.eclipse.jst.ws.jaxws.dom.ui.internal.plugin.WSImageBundle"); //$NON-NLS-1$
- }
- catch (MissingResourceException x) {
- (new Logger()).logError("Unable to load image bundle for this plugin!", x); //$NON-NLS-1$
- iconsBundle = null;
- }
- }
-
-
- protected void initializeImageRegistry()
- {
- try {
- mImageRegistry = new ImageRegistry();
-
- mImageRegistry.put(IMG_WEB_SERVICE, getImageResource(iconsBundle
- .getString("IMG_WEB_SERVICE"))); //$NON-NLS-1$
- mImageRegistry.put(IMG_WEB_SERVICE_GROUP, getImageResource(iconsBundle
- .getString("IMG_WEB_SERVICE_GROUP"))); //$NON-NLS-1$
- mImageRegistry.put(IMG_SEI, getImageResource(iconsBundle
- .getString("IMG_SEI"))); //$NON-NLS-1$
- mImageRegistry.put(IMG_SEI_GROUP, getImageResource(iconsBundle
- .getString("IMG_SEI_GROUP"))); //$NON-NLS-1$
- mImageRegistry.put(IMG_DOM_WS_PROVIDER, getImageResource(iconsBundle
- .getString("IMG_DOM_WS_PROVIDER"))); //$NON-NLS-1$
- mImageRegistry.put(IMG_WEB_METHOD, getImageResource(iconsBundle
- .getString("IMG_WEB_METHOD"))); //$NON-NLS-1$
- mImageRegistry.put(IMG_WEB_PARAM_IN, getImageResource(iconsBundle
- .getString("IMG_WEB_PARAM_IN"))); //$NON-NLS-1$
- mImageRegistry.put(IMG_WEB_PARAM_OUT, getImageResource(iconsBundle
- .getString("IMG_WEB_PARAM_OUT"))); //$NON-NLS-1$
- mImageRegistry.put(IMG_ERROR_MARKER, getImageResource(iconsBundle
- .getString("IMG_ERROR_MARKER"))); //$NON-NLS-1$
- mImageRegistry.put(IMG_WARNING_MARKER, getImageResource(iconsBundle
- .getString("IMG_WARNING_MARKER"))); //$NON-NLS-1$
-
- } catch (RuntimeException e) {
- (new Logger()).logError("Unable to initialize image registry !", e); //$NON-NLS-1$
- }
- }
-
- public ImageRegistry getImageRegistry()
- {
- if (mImageRegistry == null) {
- initializeImageRegistry();
- }
-
- return mImageRegistry;
- }
-
- public Image getImage(String imageName)
- {
- return INSTANCE.getImageRegistry().get(imageName);
- }
-
- public static ImageDescriptor getImageResourceByKey(String resourceName) {
- return getImageResource(iconsBundle.getString(resourceName));
- }
-
- public static ImageDescriptor getImageResource(String resourceName)
- {
- try {
- URL url = DomUi.getDefault().getBundle().getResource(resourceName);
- return ImageDescriptor.createFromURL(url);
- }
- catch (NullPointerException npe) {
- (new Logger()).logError(MessageFormat.format("Unable to locate resource {0}!",resourceName), npe); //$NON-NLS-1$
- return ImageDescriptor.getMissingImageDescriptor();
- }
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.dom.ui/src/org/eclipse/jst/ws/jaxws/dom/ui/internal/impl/DOMItemPropertyProvider.java b/bundles/org.eclipse.jst.ws.jaxws.dom.ui/src/org/eclipse/jst/ws/jaxws/dom/ui/internal/impl/DOMItemPropertyProvider.java
deleted file mode 100755
index 66b3210..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.ui/src/org/eclipse/jst/ws/jaxws/dom/ui/internal/impl/DOMItemPropertyProvider.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.dom.ui.internal.impl;
-
-import java.beans.PropertyDescriptor;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.jst.ws.jaxws.dom.runtime.IPropertyDefaults;
-import org.eclipse.jst.ws.jaxws.dom.runtime.IPropertyState;
-import org.eclipse.jst.ws.jaxws.dom.runtime.persistence.defaults.PropertyDefaultsAdapterFactory;
-import org.eclipse.jst.ws.jaxws.dom.runtime.persistence.state.PropertyStateAdapterFactory;
-
-/**
- * Extends {@link PropertyDescriptor} to represent property descriptor for DOM objects.
- * This class overrides createPropertyValueWrapper form {@link PropertyDescriptor} to provide
- * custom property wrapper class.
- *
- * @author Georgi Vachkov
- */
-public class DOMItemPropertyProvider extends ItemPropertyDescriptor
-{
- public DOMItemPropertyProvider(AdapterFactory adapterFactory,
- ResourceLocator resourceLocator,
- String displayName,
- String description,
- EStructuralFeature feature,
- boolean isSettable,
- boolean multiLine,
- boolean sortChoices,
- Object staticImage,
- String category,
- String[] filterFlags)
- {
- super(adapterFactory, resourceLocator, displayName, description, feature,
- isSettable, multiLine, sortChoices, staticImage, category, filterFlags);
- }
-
- @Override
- protected Object createPropertyValueWrapper(Object object, Object propertyValue)
- {
- return new DOMPropertyValue(adapterFactory, object, propertyValue, null);
- }
-
- @Override
- public boolean canSetProperty(Object object)
- {
- final IPropertyState state = (IPropertyState)PropertyStateAdapterFactory.INSTANCE.adapt(object, IPropertyState.class);
- if (state != null) {
- super.isSettable = state.isChangeable(feature);
- }
-
- return super.canSetProperty(object);
- }
-
- @Override
- public void resetPropertyValue(Object object)
- {
- final IPropertyDefaults defaults = (IPropertyDefaults)PropertyDefaultsAdapterFactory.INSTANCE.adapt(object, IPropertyDefaults.class);
- if (defaults != null) {
- final Object defaultValue = defaults.getDefault(feature);
- ((EObject)object).eSet(feature, defaultValue);
- }
- else {
- super.resetPropertyValue(object);
- }
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.dom.ui/src/org/eclipse/jst/ws/jaxws/dom/ui/internal/impl/DOMPropertyValue.java b/bundles/org.eclipse.jst.ws.jaxws.dom.ui/src/org/eclipse/jst/ws/jaxws/dom/ui/internal/impl/DOMPropertyValue.java
deleted file mode 100755
index e4c521c..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.ui/src/org/eclipse/jst/ws/jaxws/dom/ui/internal/impl/DOMPropertyValue.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.dom.ui.internal.impl;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.jst.ws.jaxws.dom.ui.IDOMPropertyValue;
-
-/**
- * Implementor of {@link IDOMPropertyValue}.
- *
- * @author Georgi Vachkov
- */
-public class DOMPropertyValue extends ItemPropertyDescriptor.PropertyValueWrapper implements IDOMPropertyValue
-{
- public DOMPropertyValue(AdapterFactory adapterFactory, Object object, Object propertyValue, Object nestedPropertySourc)
- {
- super(adapterFactory, object, propertyValue, nestedPropertySourc);
- }
-
- public Object getEditableValue() {
- return getEditableValue(null);
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.dom.ui/src/org/eclipse/jst/ws/jaxws/dom/ui/internal/plugin/DomUi.java b/bundles/org.eclipse.jst.ws.jaxws.dom.ui/src/org/eclipse/jst/ws/jaxws/dom/ui/internal/plugin/DomUi.java
deleted file mode 100755
index 29a5752..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.ui/src/org/eclipse/jst/ws/jaxws/dom/ui/internal/plugin/DomUi.java
+++ /dev/null
@@ -1,113 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.dom.ui.internal.plugin;
-
-import org.eclipse.core.runtime.Plugin;
-import org.eclipse.emf.common.EMFPlugin;
-import org.eclipse.emf.common.util.ResourceLocator;
-
-/**
- * This is the central singleton for the Dom edit plugin.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public final class DomUi extends EMFPlugin
-{
- /**
- * Keep track of the singleton.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public static final DomUi INSTANCE = new DomUi();
-
- /**
- * Keep track of the singleton.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private static Implementation plugin;
-
- /**
- * Create the instance.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public DomUi()
- {
- super
- (new ResourceLocator []
- {
- });
- }
-
- /**
- * Returns the singleton instance of the Eclipse plugin.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the singleton instance.
- * @generated
- */
- @Override
- public ResourceLocator getPluginResourceLocator()
- {
- return plugin;
- }
-
- /**
- * Returns the singleton instance of the Eclipse plugin.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the singleton instance.
- * @generated
- */
- public static Implementation getPlugin()
- {
- return plugin;
- }
-
- /**
- * The actual implementation of the Eclipse <b>Plugin</b>.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public static class Implementation extends EclipsePlugin
- {
- /**
- * Creates an instance.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public Implementation()
- {
- super();
-
- // Remember the static instance.
- //
- plugin = this;
- }
- }
-
- /**
- * Returns the shared instance
- *
- * @return the shared instance
- */
- public static Plugin getDefault()
- {
- return plugin;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.dom.ui/src/org/eclipse/jst/ws/jaxws/dom/ui/internal/plugin/WSImageBundle.properties b/bundles/org.eclipse.jst.ws.jaxws.dom.ui/src/org/eclipse/jst/ws/jaxws/dom/ui/internal/plugin/WSImageBundle.properties
deleted file mode 100755
index b4aaf02..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.dom.ui/src/org/eclipse/jst/ws/jaxws/dom/ui/internal/plugin/WSImageBundle.properties
+++ /dev/null
@@ -1,20 +0,0 @@
-###############################################################################
-# Copyright (c) 2009 by SAP AG, Walldorf.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# SAP AG - initial API and implementation
-###############################################################################
-IMG_WEB_SERVICE=icons/Web_Service.gif
-IMG_WEB_SERVICE_GROUP=icons/Web_Service_Group.gif
-IMG_SEI=icons/SEI.gif
-IMG_SEI_GROUP=icons/SEI_Group.gif
-IMG_DOM_WS_PROVIDER=icons/Web_Service_Item_Provider.gif
-IMG_WEB_METHOD=icons/Web_Method.gif
-IMG_WEB_PARAM_IN=icons/Web_Param_In.gif
-IMG_WEB_PARAM_OUT=icons/Web_Param_Out.gif
-IMG_ERROR_MARKER=icons/error_obj.gif
-IMG_WARNING_MARKER=icons/warning_obj.gif \ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.jaxws.ui/.classpath b/bundles/org.eclipse.jst.ws.jaxws.ui/.classpath
deleted file mode 100755
index f930cb7..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.ui/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/bundles/org.eclipse.jst.ws.jaxws.ui/.project b/bundles/org.eclipse.jst.ws.jaxws.ui/.project
deleted file mode 100755
index e5a0fde..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.ui/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.jst.ws.jaxws.ui</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
diff --git a/bundles/org.eclipse.jst.ws.jaxws.ui/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.jst.ws.jaxws.ui/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100755
index f6eebfa..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.ui/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,7 +0,0 @@
-#Thu Dec 18 11:00:26 GMT 2008
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.5
diff --git a/bundles/org.eclipse.jst.ws.jaxws.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.jst.ws.jaxws.ui/META-INF/MANIFEST.MF
deleted file mode 100755
index bc81bb3..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.ui/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,33 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.jst.ws.jaxws.ui;singleton:=true
-Bundle-Version: 1.0.200.qualifier
-Bundle-Localization: plugin
-Bundle-Activator: org.eclipse.jst.ws.internal.jaxws.ui.JAXWSUIPlugin
-Bundle-Vendor: %pluginProvider
-Require-Bundle: org.eclipse.ui;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.jdt.ui;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.jface.text;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.ui.ide;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.core.resources;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.jdt.core;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.jst.ws.jaxws.core;bundle-version="[1.0.0,1.1.0)",
- org.eclipse.ltk.core.refactoring;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.ui.editors;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.jdt.launching;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.jst.ws.annotations.core;bundle-version="[1.0.0,1.2.0)",
- org.eclipse.jdt.apt.core;bundle-version="[3.3.100,4.0.0)",
- org.eclipse.jst.ws.jaxws.dom.runtime;bundle-version="[1.0.0,1.1.0)",
- org.eclipse.emf.ecore;bundle-version="[2.4.0,3.0.0)"
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Bundle-ActivationPolicy: lazy
-Import-Package: javax.jws,
- javax.jws.soap,
- javax.xml.ws;version="2.1.0",
- javax.xml.ws.http;version="2.1.0",
- javax.xml.ws.soap;version="2.1.0",
- org.jdom;version="1.1.1",
- org.jdom.input;version="1.1.1"
-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 (&quot;Content&quot;). Unless otherwise
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;). 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, &quot;Program&quot; 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 (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content. Check the Redistributor's license that was
-provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
-
-</body>
-</html>
diff --git a/bundles/org.eclipse.jst.ws.jaxws.ui/build.properties b/bundles/org.eclipse.jst.ws.jaxws.ui/build.properties
deleted file mode 100755
index d4e6333..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.ui/build.properties
+++ /dev/null
@@ -1,8 +0,0 @@
-source.. = src/
-output.. = bin/
-bin.includes = plugin.xml,\
- META-INF/,\
- .,\
- icons/,\
- about.html,\
- plugin.properties
diff --git a/bundles/org.eclipse.jst.ws.jaxws.ui/icons/elcl16/filter_ps.gif b/bundles/org.eclipse.jst.ws.jaxws.ui/icons/elcl16/filter_ps.gif
deleted file mode 100644
index a4c9e60..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.ui/icons/elcl16/filter_ps.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.jst.ws.jaxws.ui/icons/etool16/newhandler_wiz.gif b/bundles/org.eclipse.jst.ws.jaxws.ui/icons/etool16/newhandler_wiz.gif
deleted file mode 100644
index 5ac5678..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.ui/icons/etool16/newhandler_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.jst.ws.jaxws.ui/icons/eview16/annotation_obj.gif b/bundles/org.eclipse.jst.ws.jaxws.ui/icons/eview16/annotation_obj.gif
deleted file mode 100755
index 435d62e..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.ui/icons/eview16/annotation_obj.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.jst.ws.jaxws.ui/icons/eview16/prop_ps.gif b/bundles/org.eclipse.jst.ws.jaxws.ui/icons/eview16/prop_ps.gif
deleted file mode 100644
index d11c996..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.ui/icons/eview16/prop_ps.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.jst.ws.jaxws.ui/icons/obj16/binding_obj.gif b/bundles/org.eclipse.jst.ws.jaxws.ui/icons/obj16/binding_obj.gif
deleted file mode 100644
index 896e2f0..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.ui/icons/obj16/binding_obj.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.jst.ws.jaxws.ui/icons/obj16/false.gif b/bundles/org.eclipse.jst.ws.jaxws.ui/icons/obj16/false.gif
deleted file mode 100644
index 9bd9b0c..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.ui/icons/obj16/false.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.jst.ws.jaxws.ui/icons/obj16/httpbinding_obj.gif b/bundles/org.eclipse.jst.ws.jaxws.ui/icons/obj16/httpbinding_obj.gif
deleted file mode 100644
index 4428ef3..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.ui/icons/obj16/httpbinding_obj.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.jst.ws.jaxws.ui/icons/obj16/soapbinding_obj.gif b/bundles/org.eclipse.jst.ws.jaxws.ui/icons/obj16/soapbinding_obj.gif
deleted file mode 100644
index 115f6bf..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.ui/icons/obj16/soapbinding_obj.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.jst.ws.jaxws.ui/icons/obj16/true.gif b/bundles/org.eclipse.jst.ws.jaxws.ui/icons/obj16/true.gif
deleted file mode 100644
index 9cacb96..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.ui/icons/obj16/true.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.jst.ws.jaxws.ui/icons/wizban/new_wiz.png b/bundles/org.eclipse.jst.ws.jaxws.ui/icons/wizban/new_wiz.png
deleted file mode 100644
index 6b410e2..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.ui/icons/wizban/new_wiz.png
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.jst.ws.jaxws.ui/plugin.properties b/bundles/org.eclipse.jst.ws.jaxws.ui/plugin.properties
deleted file mode 100644
index 446ad6b..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.ui/plugin.properties
+++ /dev/null
@@ -1,24 +0,0 @@
-###############################################################################
-# Copyright (c) 2009 Shane Clarke.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# Shane Clarke - initial API and implementation
-###############################################################################
-
-#properties file for JAXWS UI
-pluginName=JAX-WS Tools UI
-pluginProvider=Eclipse Web Tools Platform
-
-ANNOTATIONS_VIEW_CATEGORY_NAME=JAX-WS
-ANNOTATIONS_VIEW_NAME=Annotation Properties
-
-#JAX-WS Handler Wizard
-JAXWS_WIZARD_CATEGORY_NAME=JAX-WS
-NEW_JAXWS_HANDLER_LABEL=JAX-WS Handler
-NEW_JAXWS_HANDLER__DESCRIPTION=Create a JAX-WS Handler
-
-CONFIGURE_HANDLERS_LABEL=Configure Handlers
diff --git a/bundles/org.eclipse.jst.ws.jaxws.ui/plugin.xml b/bundles/org.eclipse.jst.ws.jaxws.ui/plugin.xml
deleted file mode 100755
index d3fe28e..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.ui/plugin.xml
+++ /dev/null
@@ -1,174 +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="__java_string">
- </partition>
- </javaCompletionProposalComputer>
- </extension>
-
- <extension point="org.eclipse.jdt.ui.quickFixProcessors">
- <quickFixProcessor
- class="org.eclipse.jst.ws.internal.jaxws.ui.annotations.correction.JAXWSQuickFixProcessor"
- id="org.eclipse.jst.ws.jaxws.ui.annotations.correction.JAXWSQuickFixProcessor">
- <handledMarkerTypes>
- <markerType id="org.eclipse.jdt.apt.core.compile.problem"/>
- <markerType id="org.eclipse.jdt.apt.core.nonreconcile.compile.problem"/>
- </handledMarkerTypes>
- </quickFixProcessor>
- </extension>
-
- <extension point="org.eclipse.ui.ide.markerResolution">
- <markerResolutionGenerator
- markerType="org.eclipse.jdt.apt.core.compile.problem"
- class="org.eclipse.jst.ws.internal.jaxws.ui.annotations.correction.APTCompileProblemMarkerResolutionGenerator">
- </markerResolutionGenerator>
- <markerResolutionGenerator
- markerType="org.eclipse.jdt.apt.core.nonreconcile.compile.problem"
- class="org.eclipse.jst.ws.internal.jaxws.ui.annotations.correction.APTCompileProblemMarkerResolutionGenerator">
- </markerResolutionGenerator>
- </extension>
-
- <extension point="org.eclipse.ui.newWizards">
- <wizard
- category="org.eclipse.jst.ws.ui.new/org.eclipse.jst.ws.jaxws.ui.wizards.category"
- icon="$nl$/icons/etool16/newhandler_wiz.gif"
- id="org.eclipse.jst.ws.internal.jaxws.ui.wizards.NewJAXWSHandlerWizard"
- name="%NEW_JAXWS_HANDLER_LABEL">
- <class class="org.eclipse.jst.ws.internal.jaxws.ui.wizards.NewJAXWSHandlerWizard">
- <parameter name="javatype" value="true"/>
- </class>
- <description>
- %NEW_JAXWS_HANDLER__DESCRIPTION
- </description>
- </wizard>
- <category
- id="org.eclipse.jst.ws.jaxws.ui.wizards.category"
- name="%JAXWS_WIZARD_CATEGORY_NAME"
- parentCategory="org.eclipse.jst.ws.ui.new">
- </category>
- </extension>
-
- <extension point="org.eclipse.ui.menus">
- <menuContribution locationURI="popup:org.eclipse.ui.navigator.ProjectExplorer#PopupMenu?after=additions">
- <command
- commandId="org.eclipse.jst.ws.jaxws.ui.configure.handlers"
- id="jaxws.configure.handlers"
- label="%CONFIGURE_HANDLERS_LABEL"
- style="push">
- <visibleWhen checkEnabled="true"/>
- </command>
- </menuContribution>
- </extension>
-
- <extension point="org.eclipse.ui.commands">
- <command
- id="org.eclipse.jst.ws.jaxws.ui.configure.handlers"
- name="%CONFIGURE_HANDLERS_LABEL">
- </command>
- </extension>
-
- <extension point="org.eclipse.ui.handlers">
- <handler
- class="org.eclipse.jst.ws.internal.jaxws.ui.handlers.ConfigureHandlerChainHandler"
- commandId="org.eclipse.jst.ws.jaxws.ui.configure.handlers">
- <activeWhen>
- <reference definitionId="org.eclipse.jst.ws.jaxws.webservice.selected"/>
- </activeWhen>
- <enabledWhen>
- <reference definitionId="org.eclipse.jst.ws.jaxws.webservice.selected"/>
- </enabledWhen>
- </handler>
- </extension>
-
- <extension point="org.eclipse.core.expressions.definitions">
- <definition id="org.eclipse.jst.ws.jaxws.webservice.selected">
- <with variable="selection">
- <and>
- <count value="1"/>
- <iterate operator="or">
- <or>
- <instanceof value="org.eclipse.jst.ws.jaxws.dom.runtime.api.IWebService"/>
- <instanceof value="org.eclipse.jst.ws.jaxws.dom.runtime.api.IServiceEndpointInterface"/>
- </or>
- </iterate>
- </and>
- </with>
- </definition>
- </extension>
-
-</plugin>
diff --git a/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/JAXWSUIMessages.java b/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/JAXWSUIMessages.java
deleted file mode 100755
index 5067626..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/JAXWSUIMessages.java
+++ /dev/null
@@ -1,141 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Shane Clarke.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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_LABEL0;
- public static String ANNOTATION_ARRAY_CELL_EDITOR_BROWSE_LABEL1;
- public static String ANNOTATION_ARRAY_CELL_EDITOR_BROWSE_LABEL2;
- public static String ANNOTATION_ARRAY_CELL_EDITOR_BROWSE_LABEL3;
- public static String ANNOTATION_ARRAY_CELL_EDITOR_BROWSE_LABEL4;
- public static String ANNOTATION_ARRAY_CELL_EDITOR_BROWSE_LABEL5;
- public static String ANNOTATION_ARRAY_CELL_EDITOR_DOWN_LABEL;
- public static String ANNOTATION_ARRAY_CELL_EDITOR_EDIT_ARRAY_VALUES_TITLE;
- public static String ANNOTATION_ARRAY_CELL_EDITOR_REMOVE_LABEL;
- public static String ANNOTATION_ARRAY_CELL_EDITOR_SELECT_CLASS_TITLE;
- public static String ANNOTATION_ARRAY_CELL_EDITOR_UP_LABEL;
- public static String ANNOTATION_ARRAY_CELL_EDITOR_NESTED_ARRAYS_NOT_SUPPORTED;
-
- public static String ANNOTATION_EDITING_SUPPORT_NOT_VALID_MESSAGE_PREFIX;
-
- public static String ANNOTATIONS_VIEW_ANNOTATIONS_COLUMN_NAME;
- public static String ANNOTATIONS_VIEW_ANNOTATIONS_NOT_AVAILABLE_ON_SELECTION;
- public static String ANNOTATIONS_VIEW_ANNOTATIONS_VALUES_COLUMN_NAME;
-
- public static String ANNOTATIONS_VIEW_FILTER_ACTION_NAME;
- public static String ANNOTATIONS_VIEW_FILTER_ACTION_SELECT_CATEGORIES_MESSAGE;
-
- public static String ANNOTATIONS_VIEW_NO_SUITABLE_LIBRARY_FOUND;
- public static String ANNOTATIONS_VIEW_OTHER_ANNOTATION_LIBRARIES_USE;
-
- public static String CONFIGURE_JAVA_1_6_LIBRARY;
-
- public static String ADD_ANNOTATION;
- public static String ADD_MISSING_METHOD;
- public static String ADD_UNIMPLEMENTED_METHODS;
- public static String CHANGE_METHOD_VISIBILITY;
- public static String CHANGE_METHOD_RETURN_TYPE;
- public static String CREATE_CONSTRUCTOR;
- public static String REMOVE_ANNOTATION;
- public static String REMOVE_METHOD;
- public static String REMOVE_FINAL_MODIFIER;
- public static String REMOVE_ILLEGAL_MODIFIER;
- public static String REMOVE_STATIC_MODIFIER;
- public static String REMOVE_MEMBERVALUEPAIR;
- public static String REMOVE_ALL_OTHER_MEMBERVALUEPAIRS;
-
- public static String JAXWS_HANDLER_WIZARD_TITLE;
- public static String JAXWS_HANDLER_WIZARD_PAGE_TITLE;
- public static String JAXWS_HANDLER_WIZARD_PAGE_DESCRIPTION;
-
- public static String JAXWS_ADD_HANDLER_WIZARD_PAGE_TITLE;
- public static String JAXWS_ADD_HANDLER_WIZARD_PAGE_DESCRIPTION;
-
- public static String JAXWS_ORDER_HANDLER_WIZARD_PAGE_TITLE;
- public static String JAXWS_ORDER_HANDLER_WIZARD_PAGE_DESCRIPTION;
-
- public static String JAXWS_CONFIGURE_HANDLER_WIZARD_TITLE;
-
- public static String JAXWS_HANDLER_ADD;
- public static String JAXWS_HANDLER_REMOVE;
-
- public static String JAXWS_HANDLER_MOVE_UP;
- public static String JAXWS_HANDLER_MOVE_DOWN;
-
- public static String JAXWS_HANDLER_NAME_COLUMN;
- public static String JAXWS_HANDLER_CLASS_COLUMN;
- public static String JAXWS_HANDLER_TYPE_COLUMN;
-
- public static String JAXWS_LOGICAL;
- public static String JAXWS_PROTOCOL;
-
- public static String JAXWS_HANDLER_TYPE;
- public static String JAXWS_LOGICAL_HANDLER;
- public static String JAXWS_SOAP_HANDLER;
- public static String JAXWS_HANDLER_CONFIGURATION;
- public static String JAXWS_HANDLER_CONFIGURATION_ADD;
- public static String JAXWS_HANDLER_CONFIGURATION_CREATE;
- public static String JAXWS_HANDLER_CONFIGURATION_EDIT;
- public static String JAXWS_HANDLER_CONFIGURATION_CHOOSE;
- public static String JAXWS_HANDLER_CONFIGURATION_ASSOCIATE;
- public static String JAXWS_HANDLER_CONFIGURATION_WEB_SERVICE;
- public static String JAXWS_HANDLER_CONFIGURATION_FILE_PATH1;
- public static String JAXWS_HANDLER_CONFIGURATION_FILE_PATH2;
- public static String JAXWS_HANDLER_CONFIGURATION_FILE_PATH3;
- public static String JAXWS_HANDLER_CONFIGURATION_BROWSE1;
- public static String JAXWS_HANDLER_CONFIGURATION_BROWSE2;
- public static String JAXWS_HANDLER_CONFIGURATION_BROWSE3;
-
- public static String JAXWS_HANDLER_CONFIGURATION_CREATE_DIALOG_TITLE;
- public static String JAXWS_HANDLER_CONFIGURATION_CREATE_DIALOG_DESCRIPTION;
- public static String JAXWS_HANDLER_CONFIGURATION_CREATE_DIALOG_FILE_NAME;
- public static String JAXWS_HANDLER_CONFIGURATION_CREATE_DIALOG_ENTER_NAME;
- public static String JAXWS_HANDLER_CONFIGURATION_CREATE_DIALOG_CHOOSE_FOLDER;
- public static String JAXWS_HANDLER_CONFIGURATION_CREATE_DIALOG_INVALID_NAME;
- public static String JAXWS_HANDLER_CONFIGURATION_CREATE_DIALOG_FILE_EXISTS;
- public static String JAXWS_HANDLER_CONFIGURATION_CREATE_DIALOG_FILE_PROJECT;
- public static String JAXWS_HANDLER_CONFIGURATION_CREATE_DIALOG_EMPTY_FILE_NAME;
-
- public static String JAXWS_HANDLER_CONFIGURATION_EDIT_DIALOG_TITLE;
- public static String JAXWS_HANDLER_CONFIGURATION_EDIT_DIALOG_DESCRIPTION;
- public static String JAXWS_HANDLER_CONFIGURATION_EDIT_DIALOG_INVALID;
- public static String JAXWS_HANDLER_CONFIGURATION_EDIT_FILE_NOT_FOUND;
- public static String JAXWS_HANDLER_CONFIGURATION_EDIT_FILE_NOT_FOUND_IN_PROJECT;
-
- public static String JAXWS_HANDLER_CONFIGURATION_WS_DIALOG_TITLE;
- public static String JAXWS_HANDLER_CONFIGURATION_WS_DIALOG_DESCRIPTION;
- public static String JAXWS_HANDLER_CONFIGURATION_WS_DIALOG_INVALID;
- public static String JAXWS_HANDLER_CONFIGURATION_WS_NOT_FOUND;
-
- public static String JAXWS_HANDLER_CONFIGURATION_HANDLER_DIALOG_TITLE;
- public static String JAXWS_HANDLER_CONFIGURATION_HANDLER_DIALOG_DESCRIPTION;
- public static String JAXWS_HANDLER_CONFIGURATION_HANDLER_DIALOG_INVALID;
-
- public static String JAXWS_HANDLER_CONFIGURATION_NEW_HANDLER_PATH_EMTPY;
- public static String JAXWS_HANDLER_CONFIGURATION_EXISTING_HANDLER_PATH_EMTPY;
- public static String JAXWS_HANDLER_CONFIGURATION_WS_PATH_EMTPY;
-
- public static String JAXWS_HANDLER_EXTEND_IMPLEMENT_HANDLER;
- public static String JAXWS_HANDLER_LIBRARY_CLASSPATH;
-
- static {
- // initialize resource bundle
- NLS.initializeMessages(BUNDLE_NAME, JAXWSUIMessages.class);
- }
-
- private JAXWSUIMessages() {
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/JAXWSUIMessages.properties b/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/JAXWSUIMessages.properties
deleted file mode 100644
index 453f8c7..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/JAXWSUIMessages.properties
+++ /dev/null
@@ -1,124 +0,0 @@
-###############################################################################
-# Copyright (c) 2009 Shane Clarke
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.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_LABEL0=&Browse...
-ANNOTATION_ARRAY_CELL_EDITOR_BROWSE_LABEL1=B&rowse...
-ANNOTATION_ARRAY_CELL_EDITOR_BROWSE_LABEL2=Br&owse...
-ANNOTATION_ARRAY_CELL_EDITOR_BROWSE_LABEL3=Bro&wse...
-ANNOTATION_ARRAY_CELL_EDITOR_BROWSE_LABEL4=Brow&se...
-ANNOTATION_ARRAY_CELL_EDITOR_BROWSE_LABEL5=Brows&e...
-ANNOTATION_ARRAY_CELL_EDITOR_DOWN_LABEL=&Down
-ANNOTATION_ARRAY_CELL_EDITOR_EDIT_ARRAY_VALUES_TITLE=Edit Array Values
-ANNOTATION_ARRAY_CELL_EDITOR_REMOVE_LABEL=Re&move
-ANNOTATION_ARRAY_CELL_EDITOR_SELECT_CLASS_TITLE=Select Class
-ANNOTATION_ARRAY_CELL_EDITOR_UP_LABEL=&Up
-ANNOTATION_ARRAY_CELL_EDITOR_NESTED_ARRAYS_NOT_SUPPORTED=Nested Arrays within Arrays not yet supported
-ANNOTATION_EDITING_SUPPORT_NOT_VALID_MESSAGE_PREFIX=Not a valid
-
-ANNOTATIONS_VIEW_ANNOTATIONS_NOT_AVAILABLE_ON_SELECTION=Annotations not available for current selection
-ANNOTATIONS_VIEW_ANNOTATIONS_VALUES_COLUMN_NAME=Values
-ANNOTATIONS_VIEW_ANNOTATIONS_COLUMN_NAME=Annotations
-
-ANNOTATIONS_VIEW_FILTER_ACTION_NAME=Filters...
-ANNOTATIONS_VIEW_FILTER_ACTION_SELECT_CATEGORIES_MESSAGE=Select Annotation Categories to Filter
-
-ANNOTATIONS_VIEW_NO_SUITABLE_LIBRARY_FOUND=No suitable {0} library can be found on the projects classpath.\n\n
-
-ANNOTATIONS_VIEW_OTHER_ANNOTATION_LIBRARIES_USE=\n(For use with non JAX-WS libraries please setup the project with the required libraries.)\n\n
-
-JAXWS_HANDLER_WIZARD_TITLE=New JAX-WS Handler
-JAXWS_HANDLER_WIZARD_PAGE_TITLE=JAX-WS Handler
-JAXWS_HANDLER_WIZARD_PAGE_DESCRIPTION=Create a new JAX-WS Handler.
-
-JAXWS_ADD_HANDLER_WIZARD_PAGE_TITLE=Configure Handler Chain
-JAXWS_ADD_HANDLER_WIZARD_PAGE_DESCRIPTION=Create or select a handler chain file to associate with the web service.
-
-JAXWS_ORDER_HANDLER_WIZARD_PAGE_TITLE=Configure Handler Chain
-JAXWS_ORDER_HANDLER_WIZARD_PAGE_DESCRIPTION=Configure the position of the handlers in the handler chain file.
-
-JAXWS_CONFIGURE_HANDLER_WIZARD_TITLE=Configure JAX-WS Handler Chain
-
-JAXWS_HANDLER_ADD=&Add...
-JAXWS_HANDLER_REMOVE=&Remove...
-JAXWS_HANDLER_MOVE_UP=Move &Up
-JAXWS_HANDLER_MOVE_DOWN=Move &Down
-
-JAXWS_HANDLER_NAME_COLUMN=Name
-JAXWS_HANDLER_CLASS_COLUMN=Class
-JAXWS_HANDLER_TYPE_COLUMN=Type
-
-JAXWS_LOGICAL=Logical
-JAXWS_PROTOCOL=Protocol
-
-JAXWS_HANDLER_TYPE=&Handler type:
-JAXWS_LOGICAL_HANDLER=Logical Handler
-JAXWS_SOAP_HANDLER=Protocol Handler (SOAP)
-JAXWS_HANDLER_CONFIGURATION=Configuration
-JAXWS_HANDLER_CONFIGURATION_ADD=&Add this handler to a handler chain
-JAXWS_HANDLER_CONFIGURATION_CREATE=Create a new handler chain &file
-JAXWS_HANDLER_CONFIGURATION_EDIT=Add this handler to an e&xisting handler chain file
-JAXWS_HANDLER_CONFIGURATION_CHOOSE=Choose an e&xisting handler chain file
-JAXWS_HANDLER_CONFIGURATION_ASSOCIATE=Associate this ha&ndler chain with a web service
-JAXWS_HANDLER_CONFIGURATION_WEB_SERVICE=Web Service:
-JAXWS_HANDLER_CONFIGURATION_FILE_PATH1=F&ile path:
-JAXWS_HANDLER_CONFIGURATION_FILE_PATH2=File& path:
-JAXWS_HANDLER_CONFIGURATION_FILE_PATH3=File &path:
-JAXWS_HANDLER_CONFIGURATION_BROWSE1=&Browse...
-JAXWS_HANDLER_CONFIGURATION_BROWSE2=B&rowse...
-JAXWS_HANDLER_CONFIGURATION_BROWSE3=Browse&...
-
-JAXWS_HANDLER_CONFIGURATION_CREATE_DIALOG_TITLE=Handler Chain Creation
-JAXWS_HANDLER_CONFIGURATION_CREATE_DIALOG_DESCRIPTION=Select the parent folder:
-JAXWS_HANDLER_CONFIGURATION_CREATE_DIALOG_FILE_NAME=File name:
-JAXWS_HANDLER_CONFIGURATION_CREATE_DIALOG_ENTER_NAME=Handler chain file name cannot be empty.
-JAXWS_HANDLER_CONFIGURATION_CREATE_DIALOG_CHOOSE_FOLDER=Choose parent folder.
-JAXWS_HANDLER_CONFIGURATION_CREATE_DIALOG_INVALID_NAME=Invalid handler chain file name.
-JAXWS_HANDLER_CONFIGURATION_CREATE_DIALOG_FILE_EXISTS=The {0} file already exists.
-JAXWS_HANDLER_CONFIGURATION_CREATE_DIALOG_FILE_PROJECT=The handler chain file must reside within a source folder in the {0} project.
-JAXWS_HANDLER_CONFIGURATION_CREATE_DIALOG_EMPTY_FILE_NAME=Handler chain file name cannot be empty
-
-JAXWS_HANDLER_CONFIGURATION_EDIT_DIALOG_TITLE=Handler Chain Selection
-JAXWS_HANDLER_CONFIGURATION_EDIT_DIALOG_DESCRIPTION=Choose a handler chain:
-JAXWS_HANDLER_CONFIGURATION_EDIT_DIALOG_INVALID=Not a valid handler chain file.
-JAXWS_HANDLER_CONFIGURATION_EDIT_FILE_NOT_FOUND=Cannot find the {0} handler chain file.
-JAXWS_HANDLER_CONFIGURATION_EDIT_FILE_NOT_FOUND_IN_PROJECT=Cannot find the {0} handler chain file in the {1} project.
-
-JAXWS_HANDLER_CONFIGURATION_WS_DIALOG_TITLE=Web Service Selection
-JAXWS_HANDLER_CONFIGURATION_WS_DIALOG_DESCRIPTION=Choose a web service:
-JAXWS_HANDLER_CONFIGURATION_WS_DIALOG_INVALID=Not a Web Service.
-
-JAXWS_HANDLER_CONFIGURATION_HANDLER_DIALOG_TITLE=Handler Selection
-JAXWS_HANDLER_CONFIGURATION_HANDLER_DIALOG_DESCRIPTION=Choose a logical or soap handler:
-JAXWS_HANDLER_CONFIGURATION_HANDLER_DIALOG_INVALID=Not a logical or soap handler.
-
-JAXWS_HANDLER_CONFIGURATION_NEW_HANDLER_PATH_EMTPY=New handler chain path is empty.
-JAXWS_HANDLER_CONFIGURATION_EXISTING_HANDLER_PATH_EMTPY=Exisitng handler chain path is empty.
-JAXWS_HANDLER_CONFIGURATION_WS_PATH_EMTPY=Web service path is empty.
-JAXWS_HANDLER_CONFIGURATION_WS_NOT_FOUND=Web service cannot be found.
-
-JAXWS_HANDLER_EXTEND_IMPLEMENT_HANDLER=The handler class must implement or extend from a class that implements LogicalHandler or SOAPHandler.
-JAXWS_HANDLER_LIBRARY_CLASSPATH=A JAX-WS library cannot be found on the projects classpath.
-
-CONFIGURE_JAVA_1_6_LIBRARY=To select a 1.6 or above compliant JRE configure the <a href="1" >Installed JREs</a> or change the JRE on the <a href="2" >Java build path</a>.
-
-ADD_ANNOTATION=Add annotation ''@{0}''
-ADD_MISSING_METHOD=Add missing method
-ADD_UNIMPLEMENTED_METHODS=Add unimplemented methods
-CHANGE_METHOD_VISIBILITY=Change method visibility to ''{0}''
-CHANGE_METHOD_RETURN_TYPE=Change method return type to match SEI method return type
-CREATE_CONSTRUCTOR=Create constructor ''{0}()''
-REMOVE_ANNOTATION=Remove annotation ''@{0}''
-REMOVE_METHOD=Remove method ''{0}''
-REMOVE_FINAL_MODIFIER=Remove ''final'' modifier of ''{0}''(..)
-REMOVE_ILLEGAL_MODIFIER=Remove Illegal modifier
-REMOVE_STATIC_MODIFIER=Remove ''static'' modifier of ''{0}''(..)
-REMOVE_MEMBERVALUEPAIR=Remove member value pair ''{0}''
-REMOVE_ALL_OTHER_MEMBERVALUEPAIRS=Remove all other member value pairs
diff --git a/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/JAXWSUIPlugin.java b/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/JAXWSUIPlugin.java
deleted file mode 100755
index cc61dc9..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/JAXWSUIPlugin.java
+++ /dev/null
@@ -1,86 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Shane Clarke.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Shane Clarke - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.jaxws.ui;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.osgi.framework.BundleContext;
-
-/**
- * The activator class controls the plug-in life cycle
- */
-public class JAXWSUIPlugin extends AbstractUIPlugin {
-
- // The plug-in ID
- public static final String PLUGIN_ID = "org.eclipse.jst.ws.jaxws.ui"; //$NON-NLS-1$
-
- // The shared instance
- private static JAXWSUIPlugin plugin;
-
- /**
- * The constructor
- */
- public JAXWSUIPlugin() {
- }
-
- /*
- * (non-Javadoc)
- * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
- */
- public void start(BundleContext context) throws Exception {
- super.start(context);
- plugin = this;
- }
-
- /*
- * (non-Javadoc)
- * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
- */
- public void stop(BundleContext context) throws Exception {
- plugin = null;
- super.stop(context);
- }
-
- /**
- * Returns the shared instance
- *
- * @return the shared instance
- */
- public static JAXWSUIPlugin getDefault() {
- return plugin;
- }
-
- /**
- * Returns an image descriptor for the image file at the given
- * plug-in relative path
- *
- * @param path the path
- * @return the image descriptor
- */
- public static ImageDescriptor getImageDescriptor(String path) {
- return imageDescriptorFromPlugin(PLUGIN_ID, path);
- }
-
- public static void logMessage(int severity, String message) {
- JAXWSUIPlugin.log(new Status(severity, JAXWSUIPlugin.PLUGIN_ID, message));
- }
-
- public static void log(IStatus status) {
- JAXWSUIPlugin.getDefault().getLog().log(status);
- }
-
- public static void log(Throwable exception) {
- JAXWSUIPlugin.log(new Status(IStatus.ERROR, JAXWSUIPlugin.PLUGIN_ID,
- exception.toString(), exception));
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/actions/AnnotationsViewFilterAction.java b/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/actions/AnnotationsViewFilterAction.java
deleted file mode 100644
index e8b95e6..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/actions/AnnotationsViewFilterAction.java
+++ /dev/null
@@ -1,93 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Shane Clarke.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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.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() {
- categoryFilter.init();
- }
-
- public void saveState() {
- categoryFilter.saveState();
- }
-
- private static class AnnotationsCategoryDialogContentProvider implements IStructuredContentProvider {
-
- public Object[] getElements(Object inputElement) {
- if (inputElement instanceof List) {
- return ((List<?>)inputElement).toArray();
- }
- return new Object[] {};
- }
-
- public void dispose() {
- }
-
- public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
- }
-
- }
-
- private static class AnnotationsCategoryDialogLabelProvider extends LabelProvider {
- @Override
- public String getText(Object element) {
- return element.toString();
- }
-
- @Override
- public Image getImage(Object element) {
- return null;
- }
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/annotations/contentassist/AnnotationCompletionProposalComputer.java b/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/annotations/contentassist/AnnotationCompletionProposalComputer.java
deleted file mode 100644
index f63f52c..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/annotations/contentassist/AnnotationCompletionProposalComputer.java
+++ /dev/null
@@ -1,166 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Shane Clarke.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Shane Clarke - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.jaxws.ui.annotations.contentassist;
-
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.jdt.core.CompletionContext;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.ILocalVariable;
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jdt.core.dom.Annotation;
-import org.eclipse.jdt.core.dom.Expression;
-import org.eclipse.jdt.core.dom.MemberValuePair;
-import org.eclipse.jdt.core.dom.NormalAnnotation;
-import org.eclipse.jdt.core.dom.SingleMemberAnnotation;
-import org.eclipse.jdt.ui.text.java.ContentAssistInvocationContext;
-import org.eclipse.jdt.ui.text.java.IJavaCompletionProposalComputer;
-import org.eclipse.jdt.ui.text.java.JavaContentAssistInvocationContext;
-import org.eclipse.jface.text.contentassist.ICompletionProposal;
-import org.eclipse.jst.ws.annotations.core.AnnotationsManager;
-import org.eclipse.jst.ws.annotations.core.initialization.IAnnotationAttributeInitializer;
-import org.eclipse.jst.ws.annotations.core.utils.AnnotationUtils;
-import org.eclipse.jst.ws.internal.jaxws.ui.JAXWSUIPlugin;
-
-public class AnnotationCompletionProposalComputer implements IJavaCompletionProposalComputer {
-
- public AnnotationCompletionProposalComputer() {
- super();
- }
-
- @SuppressWarnings("unchecked")
- public List computeCompletionProposals(ContentAssistInvocationContext context, IProgressMonitor monitor) {
- if (context instanceof JavaContentAssistInvocationContext) {
- return computeCompletionProposals((JavaContentAssistInvocationContext) context);
- }
- return Collections.emptyList();
- }
-
- private List<ICompletionProposal> computeCompletionProposals(JavaContentAssistInvocationContext context) {
- CompletionContext completionContext = context.getCoreContext();
- int tokenStart = completionContext.getOffset();
-
- ICompilationUnit source = context.getCompilationUnit();
- try {
- IJavaElement javaElement = source.getElementAt(tokenStart);
- if (javaElement != null) {
- switch(javaElement.getElementType()) {
- case IJavaElement.PACKAGE_DECLARATION:
- case IJavaElement.TYPE:
- case IJavaElement.FIELD:
- return getCompletionProposalsForJavaElement(AnnotationUtils.getAnnotations(
- javaElement), javaElement, tokenStart);
- case IJavaElement.METHOD:
- ILocalVariable localVariable = AnnotationUtils.getLocalVariable((IMethod) javaElement, tokenStart);
- if (localVariable != null) {
- return getCompletionProposalsForJavaElement(AnnotationUtils.getAnnotations(
- localVariable), localVariable, tokenStart);
- } else {
- return getCompletionProposalsForJavaElement(AnnotationUtils.getAnnotations(
- javaElement), javaElement, tokenStart);
- }
- }
- }
- } catch (JavaModelException jme) {
- JAXWSUIPlugin.log(jme.getStatus());
- }
- return Collections.emptyList();
- }
-
- private List<ICompletionProposal> getCompletionProposalsForJavaElement(List<Annotation> annotations,
- IJavaElement javaElement, int offset) {
- for (Annotation annotation : annotations) {
- if (annotation instanceof NormalAnnotation) {
- NormalAnnotation normalAnnotation = (NormalAnnotation) annotation;
- MemberValuePair memberValuePair = getMemberValuePairForPosition(normalAnnotation, offset);
- if (memberValuePair != null) {
- return getCompletionProposalsForJavaElement(normalAnnotation, memberValuePair,
- javaElement);
- }
- }
-
- if (annotation instanceof SingleMemberAnnotation) {
- SingleMemberAnnotation singleMemberAnnotation = (SingleMemberAnnotation) annotation;
- if (isWithinSingleMemberAnnotationValue(singleMemberAnnotation, offset)) {
- return getCompletionProposalsForJavaElement(singleMemberAnnotation, javaElement);
- }
- }
- }
- return Collections.emptyList();
- }
-
- private List<ICompletionProposal> getCompletionProposalsForJavaElement(NormalAnnotation annotation,
- MemberValuePair memberValuePair, IJavaElement javaElement) {
- IAnnotationAttributeInitializer annotationAttributeInitializer = AnnotationsManager
- .getAnnotationAttributeInitializerForName(annotation.getTypeName());
- if (annotationAttributeInitializer != null) {
- return annotationAttributeInitializer.getCompletionProposalsForMemberValuePair(javaElement,
- memberValuePair);
- }
- return Collections.emptyList();
- }
-
- private List<ICompletionProposal> getCompletionProposalsForJavaElement(SingleMemberAnnotation annotation,
- IJavaElement javaElement) {
- IAnnotationAttributeInitializer annotationAttributeInitializer = AnnotationsManager
- .getAnnotationAttributeInitializerForName(annotation.getTypeName());
- if (annotationAttributeInitializer != null) {
- return annotationAttributeInitializer.getCompletionProposalsForSingleMemberAnnotation(javaElement,
- annotation);
- }
- return Collections.emptyList();
- }
-
-
- @SuppressWarnings("unchecked")
- private MemberValuePair getMemberValuePairForPosition(NormalAnnotation normalAnnotation, int offset) {
- List<MemberValuePair> memberValuePairs = normalAnnotation.values();
- for (MemberValuePair memberValuePair : memberValuePairs) {
- Expression value = memberValuePair.getValue();
- int valueStartPosition = value.getStartPosition();
- int valueLength = value.getLength();
- if (offset >= valueStartPosition
- && offset <= valueStartPosition + valueLength) {
- return memberValuePair;
- }
- }
- return null;
- }
-
- private boolean isWithinSingleMemberAnnotationValue(SingleMemberAnnotation singleMemberAnnotation, int offset) {
- Expression value = singleMemberAnnotation.getValue();
- if (value != null) {
- int valueStartPosition = value.getStartPosition();
- int valueLength = value.getLength();
- return (offset >= valueStartPosition && offset <= valueStartPosition + valueLength);
- }
- return false;
- }
-
- @SuppressWarnings("unchecked")
- public List computeContextInformation(ContentAssistInvocationContext context, IProgressMonitor monitor) {
- return Collections.emptyList();
- }
-
- public String getErrorMessage() {
- return null;
- }
-
- public void sessionEnded() {
- }
-
- public void sessionStarted() {
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/annotations/correction/APTCompileProblemMarkerResolutionGenerator.java b/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/annotations/correction/APTCompileProblemMarkerResolutionGenerator.java
deleted file mode 100644
index 9dc9d6a..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/annotations/correction/APTCompileProblemMarkerResolutionGenerator.java
+++ /dev/null
@@ -1,122 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Shane Clarke.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Shane Clarke - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.jaxws.ui.annotations.correction;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IMarker;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.jdt.apt.core.util.EclipseMessager;
-import org.eclipse.jdt.core.CorrectionEngine;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.IJavaModelMarker;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.internal.ui.text.correction.AssistContext;
-import org.eclipse.jdt.internal.ui.text.correction.JavaCorrectionProcessor;
-import org.eclipse.jdt.internal.ui.text.correction.ProblemLocation;
-import org.eclipse.jdt.internal.ui.text.correction.CorrectionMarkerResolutionGenerator.CorrectionMarkerResolution;
-import org.eclipse.jdt.ui.text.java.CompletionProposalComparator;
-import org.eclipse.jdt.ui.text.java.IInvocationContext;
-import org.eclipse.jdt.ui.text.java.IJavaCompletionProposal;
-import org.eclipse.jdt.ui.text.java.IProblemLocation;
-import org.eclipse.jst.ws.internal.jaxws.ui.JAXWSUIPlugin;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.IMarkerResolution;
-import org.eclipse.ui.IMarkerResolutionGenerator2;
-import org.eclipse.ui.part.FileEditorInput;
-
-@SuppressWarnings("restriction")
-public class APTCompileProblemMarkerResolutionGenerator implements IMarkerResolutionGenerator2 {
-
- private final static IMarkerResolution[] NO_RESOLUTIONS = new IMarkerResolution[0];
-
- public boolean hasResolutions(IMarker marker) {
- int id = marker.getAttribute(IJavaModelMarker.ID, -1);
- if (id == EclipseMessager.APT_QUICK_FIX_PROBLEM_ID) {
- return true;
- }
- return false;
- }
-
- @SuppressWarnings("unchecked")
- public IMarkerResolution[] getResolutions(IMarker marker) {
- if (!hasResolutions(marker)) {
- return NO_RESOLUTIONS;
- }
-
- ICompilationUnit compilationUnit = getCompilationUnit(marker);
-
- if (compilationUnit != null) {
- IEditorInput editorInput = new FileEditorInput((IFile) compilationUnit.getResource());
- if (editorInput != null) {
- IProblemLocation problemLocation = createProblemLocation(marker);
- if (problemLocation != null) {
- IInvocationContext invocationContext = new AssistContext(compilationUnit,
- problemLocation.getOffset(), problemLocation.getLength());
-
- List<IJavaCompletionProposal> completionProposals = new ArrayList<IJavaCompletionProposal>();
-
- IStatus status = JavaCorrectionProcessor.collectCorrections(invocationContext,
- new IProblemLocation[] { problemLocation }, completionProposals);
-
- if (status.isOK()) {
- Collections.sort(completionProposals, new CompletionProposalComparator());
-
- IMarkerResolution[] markerResolutions = new IMarkerResolution[completionProposals.size()];
- for (int i= 0; i < completionProposals.size(); i++) {
- markerResolutions[i] = new CorrectionMarkerResolution(compilationUnit,
- problemLocation.getOffset(), problemLocation.getLength(),
- completionProposals.get(i), marker);
- }
- return markerResolutions;
- }
- }
- }
- }
- return NO_RESOLUTIONS;
- }
-
- private IProblemLocation createProblemLocation(IMarker marker) {
- try {
- int id = marker.getAttribute(IJavaModelMarker.ID, -1);
- int offset = marker.getAttribute(IMarker.CHAR_START, -1);
- int end = marker.getAttribute(IMarker.CHAR_END, -1);
- int severity = marker.getAttribute(IMarker.SEVERITY, IMarker.SEVERITY_INFO);
- String[] arguments = CorrectionEngine.getProblemArguments(marker);
- String markerType = marker.getType();
- if (id != -1 && offset != -1 && end != -1 && arguments != null) {
- int length = end - offset;
- boolean isError = (severity == IMarker.SEVERITY_ERROR);
- return new ProblemLocation(offset, length, id, arguments, isError, markerType);
- }
- } catch (CoreException ce) {
- JAXWSUIPlugin.log(ce.getStatus());
- }
- return null;
- }
-
- private ICompilationUnit getCompilationUnit(IMarker marker) {
- IResource resource = marker.getResource();
- if (resource instanceof IFile && resource.isAccessible()) {
- IJavaElement javaElement = JavaCore.create((IFile) resource);
- if (javaElement != null && javaElement instanceof ICompilationUnit) {
- return (ICompilationUnit) javaElement;
- }
- }
- return null;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/annotations/correction/AbstractJavaCorrectionPropsoal.java b/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/annotations/correction/AbstractJavaCorrectionPropsoal.java
deleted file mode 100644
index 816238a..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/annotations/correction/AbstractJavaCorrectionPropsoal.java
+++ /dev/null
@@ -1,113 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Shane Clarke.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Shane Clarke - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.jaxws.ui.annotations.correction;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.ui.text.java.IInvocationContext;
-import org.eclipse.jdt.ui.text.java.IJavaCompletionProposal;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.contentassist.IContextInformation;
-import org.eclipse.jst.ws.internal.jaxws.ui.JAXWSUIPlugin;
-import org.eclipse.ltk.core.refactoring.Change;
-import org.eclipse.ltk.core.refactoring.IUndoManager;
-import org.eclipse.ltk.core.refactoring.RefactoringCore;
-import org.eclipse.ltk.core.refactoring.RefactoringStatus;
-import org.eclipse.ltk.core.refactoring.TextFileChange;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.text.edits.MultiTextEdit;
-
-public abstract class AbstractJavaCorrectionPropsoal implements IJavaCompletionProposal {
-
- private int relevance;
- private String displayString;
- private Image image;
- private TextFileChange textChange;
-
- protected IInvocationContext invocationContext;
-
- public AbstractJavaCorrectionPropsoal(IInvocationContext invocationContext, String displayString, int relevance, Image image) {
- this.invocationContext = invocationContext;
- this.displayString = displayString;
- this.relevance = relevance;
- this.image = image;
- }
-
- public int getRelevance() {
- return relevance;
- }
-
- public abstract void addEdits(TextFileChange textChange) throws CoreException;
-
- private TextFileChange getTextChange() throws CoreException {
- if (textChange == null) {
- ICompilationUnit compilationUnit = invocationContext.getCompilationUnit();
- textChange = new TextFileChange(getDisplayString(), (IFile) compilationUnit.getResource()); //$NON-NLS-1$
- MultiTextEdit multiTextEdit = new MultiTextEdit();
- textChange.setEdit(multiTextEdit);
- textChange.setKeepPreviewEdits(true);
- textChange.setSaveMode(TextFileChange.LEAVE_DIRTY);
- addEdits(textChange);
- }
- return textChange;
- }
-
- public void apply(IDocument document) {
- IProgressMonitor monitor = new NullProgressMonitor();
- IUndoManager manager= RefactoringCore.getUndoManager();
- boolean successful = false;
- Change undoChange = null;
- try {
- textChange = getTextChange();
- textChange.initializeValidationData(monitor);
- RefactoringStatus valid = textChange.isValid(monitor);
- if (valid.isOK()) {
- manager.aboutToPerformChange(textChange);
- undoChange = textChange.perform(monitor);
- successful = true;
- }
- } catch (CoreException ce) {
- JAXWSUIPlugin.log(ce.getStatus());
- } finally {
- manager.changePerformed(textChange, successful);
- }
- if (undoChange != null) {
- undoChange.initializeValidationData(monitor);
- manager.addUndo(undoChange.getName(), undoChange);
- }
- }
-
- public String getAdditionalProposalInfo() {
- return null;
- }
-
-
- public IContextInformation getContextInformation() {
- return null;
- }
-
- public String getDisplayString() {
- return displayString;
- }
-
- public Image getImage() {
- return image;
- }
-
- public Point getSelection(IDocument document) {
- return null;
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/annotations/correction/AddAnnotationToTypeCorrectionProposal.java b/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/annotations/correction/AddAnnotationToTypeCorrectionProposal.java
deleted file mode 100644
index d17f3ed..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/annotations/correction/AddAnnotationToTypeCorrectionProposal.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.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.IType;
-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.jst.ws.jaxws.core.utils.JDTUtils;
-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.getCanonicalName()).getAnnotationAttributeInitializer();
-
- List<MemberValuePair> memberValuePairs = null;
- IType annotationType = JDTUtils.findType(compilationUnit.getJavaProject(), annotationClass.getCanonicalName());
- if (annotationType != null) {
- memberValuePairs = annotationAttributeInitializer.getMemberValuePairs(compilationUnit.findPrimaryType(),
- ast, annotationType);
- }
-
- 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 3199c7c..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/annotations/initialization/BindingTypeAttributeInitializer.java
+++ /dev/null
@@ -1,162 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Shane Clarke.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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.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, IType annotationType) {
- 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 0e66985..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/annotations/initialization/RequestWrapperAttributeInitializer.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.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.util.ArrayList;
-import java.util.List;
-
-import javax.jws.WebMethod;
-import javax.jws.WebService;
-
-import org.eclipse.jdt.core.IAnnotation;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jdt.core.dom.AST;
-import org.eclipse.jdt.core.dom.MemberValuePair;
-import org.eclipse.jface.text.contentassist.ICompletionProposal;
-import org.eclipse.jst.ws.annotations.core.AnnotationsCore;
-import org.eclipse.jst.ws.annotations.core.initialization.AnnotationAttributeInitializer;
-import org.eclipse.jst.ws.annotations.core.utils.AnnotationUtils;
-import org.eclipse.jst.ws.internal.jaxws.core.utils.JAXWSUtils;
-import org.eclipse.jst.ws.internal.jaxws.ui.JAXWSUIPlugin;
-import org.eclipse.jst.ws.jaxws.core.utils.JDTUtils;
-
-public class RequestWrapperAttributeInitializer extends AnnotationAttributeInitializer {
-
- @Override
- public List<MemberValuePair> getMemberValuePairs(IJavaElement javaElement, AST ast, IType annotationType) {
- List<MemberValuePair> memberValuePairs = new ArrayList<MemberValuePair>();
- if (javaElement.getElementType() == IJavaElement.METHOD) {
- IMethod method = (IMethod) javaElement;
- IType type = method.getCompilationUnit().findPrimaryType();
-
- MemberValuePair classNameValuePair = AnnotationsCore.createStringMemberValuePair(ast, CLASS_NAME,
- getClassName(type, method));
-
- MemberValuePair localNameValuePair = AnnotationsCore.createStringMemberValuePair(ast, LOCAL_NAME,
- getLocalName(type, method));
-
- MemberValuePair targetNamespaceValuePair = AnnotationsCore.createStringMemberValuePair(ast,
- TARGET_NAMESPACE, getTargetNamespace(type));
-
- memberValuePairs.add(classNameValuePair);
- memberValuePairs.add(localNameValuePair);
- memberValuePairs.add(targetNamespaceValuePair);
- }
- return memberValuePairs;
- }
-
- public List<ICompletionProposal> getCompletionProposalsForMemberValuePair(IJavaElement javaElement,
- MemberValuePair memberValuePair) {
-
- List<ICompletionProposal> completionProposals = new ArrayList<ICompletionProposal>(1);
- if (javaElement.getElementType() == IJavaElement.METHOD) {
- IMethod method = (IMethod) javaElement;
- IType type = method.getCompilationUnit().findPrimaryType();
-
- String memberValuePairName = memberValuePair.getName().getIdentifier();
-
- if (memberValuePairName.equals(CLASS_NAME)) {
- completionProposals.add(createCompletionProposal(getClassName(type, method),
- memberValuePair.getValue()));
- }
- if (memberValuePairName.equals(LOCAL_NAME)) {
- completionProposals.add(createCompletionProposal(getLocalName(type, method),
- memberValuePair.getValue()));
- }
- if (memberValuePairName.equals(TARGET_NAMESPACE)) {
- completionProposals.add(createCompletionProposal(getTargetNamespace(type),
- memberValuePair.getValue()));
- }
- }
- return completionProposals;
- }
-
- protected String getPackageName(IType type) {
- StringBuilder packageName = new StringBuilder(type.getPackageFragment().getElementName());
- if (packageName.length() > 0) {
- packageName.append(DOT_CHARACTER);
- }
- packageName.append(JAXWS_SUBPACKAGE);
- packageName.append(DOT_CHARACTER);
- return packageName.toString();
- }
-
- protected String getClassName(IType type, IMethod method) {
- try {
- String methodName = method.getElementName();
- return getPackageName(type) + methodName.substring(0, 1).toUpperCase()
- + methodName.substring(1) + JAXWSUtils.accountForOverloadedMethods(method);
- } catch (JavaModelException jme) {
- JAXWSUIPlugin.log(jme.getStatus());
- }
- return ""; //$NON-NLS-1$
- }
-
- protected String getLocalName(IType type, IMethod method) {
- try {
- IAnnotation annotation = AnnotationUtils.getAnnotation(WebMethod.class, method);
- if (annotation != null) {
- String operationName = AnnotationUtils.getStringValue(annotation, OPERATION_NAME);
- if (operationName != null) {
- return operationName;
- }
- }
- return method.getElementName() + JAXWSUtils.accountForOverloadedMethods(method);
- } catch (JavaModelException jme) {
- JAXWSUIPlugin.log(jme.getStatus());
- }
- return ""; //$NON-NLS-1$
- }
-
- protected String getTargetNamespace(IType type) {
- try {
- IAnnotation annotation = AnnotationUtils.getAnnotation(WebService.class, type);
- if (annotation != null) {
- String targetNamespace = AnnotationUtils.getStringValue(annotation, TARGET_NAMESPACE);
- if (targetNamespace != null && targetNamespace.length() > 0) {
- return targetNamespace;
- }
- }
- return JDTUtils.getTargetNamespaceFromPackageName(type.getPackageFragment().getElementName());
- } catch (JavaModelException jme) {
- JAXWSUIPlugin.log(jme.getStatus());
- }
- return ""; //$NON-NLS-1$
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/annotations/initialization/ResponseWrapperAttributeInitializer.java b/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/annotations/initialization/ResponseWrapperAttributeInitializer.java
deleted file mode 100644
index b700378..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/annotations/initialization/ResponseWrapperAttributeInitializer.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Shane Clarke.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Shane Clarke - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.jaxws.ui.annotations.initialization;
-
-import static org.eclipse.jst.ws.internal.jaxws.core.utils.JAXWSUtils.OPERATION_NAME;
-import static org.eclipse.jst.ws.internal.jaxws.core.utils.JAXWSUtils.RESPONSE_SUFFIX;
-
-import javax.jws.WebMethod;
-
-import org.eclipse.jdt.core.IAnnotation;
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jst.ws.annotations.core.utils.AnnotationUtils;
-import org.eclipse.jst.ws.internal.jaxws.core.utils.JAXWSUtils;
-import org.eclipse.jst.ws.internal.jaxws.ui.JAXWSUIPlugin;
-
-public class ResponseWrapperAttributeInitializer extends RequestWrapperAttributeInitializer {
-
- @Override
- protected String getClassName(IType type, IMethod method) {
- try {
- String methodName = method.getElementName() + RESPONSE_SUFFIX;
- return getPackageName(type) + methodName.substring(0, 1).toUpperCase()
- + methodName.substring(1) + JAXWSUtils.accountForOverloadedMethods(method);
- } catch (JavaModelException jme) {
- JAXWSUIPlugin.log(jme.getStatus());
- }
- return ""; //$NON-NLS-1$
- }
-
- @Override
- protected String getLocalName(IType type, IMethod method) {
- try {
- IAnnotation annotation = AnnotationUtils.getAnnotation(WebMethod.class, method);
- if (annotation != null) {
- String operationName = AnnotationUtils.getStringValue(annotation, OPERATION_NAME);
- if (operationName != null) {
- return operationName + RESPONSE_SUFFIX;
- }
- }
- return method.getElementName() + RESPONSE_SUFFIX
- + JAXWSUtils.accountForOverloadedMethods(method);
- } catch (JavaModelException jme) {
- JAXWSUIPlugin.log(jme.getStatus());
- }
- return ""; //$NON-NLS-1$
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/annotations/initialization/SOAPBindingAttributeInitializer.java b/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/annotations/initialization/SOAPBindingAttributeInitializer.java
deleted file mode 100644
index 5e9b337..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/annotations/initialization/SOAPBindingAttributeInitializer.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.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.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.IType;
-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, IType annotationType) {
- 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 1297bb2..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/annotations/initialization/WebMethodAttributeInitializer.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.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.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jdt.core.dom.AST;
-import org.eclipse.jdt.core.dom.MemberValuePair;
-import org.eclipse.jface.text.contentassist.ICompletionProposal;
-import org.eclipse.jst.ws.annotations.core.AnnotationsCore;
-import org.eclipse.jst.ws.annotations.core.initialization.AnnotationAttributeInitializer;
-import org.eclipse.jst.ws.internal.jaxws.core.utils.JAXWSUtils;
-import org.eclipse.jst.ws.internal.jaxws.ui.JAXWSUIPlugin;
-
-public class WebMethodAttributeInitializer extends AnnotationAttributeInitializer {
-
- @Override
- public List<MemberValuePair> getMemberValuePairs(IJavaElement javaElement, AST ast, IType annotationType) {
-
- List<MemberValuePair> memberValuePairs = new ArrayList<MemberValuePair>();
-
- if (javaElement.getElementType() == IJavaElement.METHOD) {
- IMethod method = (IMethod) javaElement;
-
- MemberValuePair operationValuePair = AnnotationsCore.createStringMemberValuePair(ast,
- OPERATION_NAME, getOperationNameValue(method));
-
- MemberValuePair actionValuePair = AnnotationsCore.createStringMemberValuePair(ast,
- ACTION, getActionValue(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;
-
- String memberValuePairName = memberValuePair.getName().getIdentifier();
-
- if (memberValuePairName.equals(OPERATION_NAME)) {
- completionProposals.add(createCompletionProposal(getOperationNameValue(method),
- memberValuePair.getValue()));
- }
-
- if (memberValuePairName.equals(ACTION)) {
- completionProposals.add(createCompletionProposal(getActionValue(method),
- memberValuePair.getValue()));
- }
-
- }
- return completionProposals;
- }
-
- private String getOperationNameValue(IMethod method) {
- try {
- return method.getElementName() + JAXWSUtils.accountForOverloadedMethods(method);
- } catch (JavaModelException jme) {
- JAXWSUIPlugin.log(jme.getStatus());
- }
- return ""; //$NON-NLS-1$
- }
-
- private String getActionValue(IMethod method) {
- try {
- String methodName = method.getElementName();
- return "urn:" + methodName.substring(0, 1).toUpperCase() //$NON-NLS-1$
- + methodName.substring(1) + JAXWSUtils.accountForOverloadedMethods(method);
- } catch (JavaModelException jme) {
- JAXWSUIPlugin.log(jme.getStatus());
- }
- return ""; //$NON-NLS-1$
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/annotations/initialization/WebParamAttributeInitializer.java b/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/annotations/initialization/WebParamAttributeInitializer.java
deleted file mode 100644
index f2a301e..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/annotations/initialization/WebParamAttributeInitializer.java
+++ /dev/null
@@ -1,189 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Shane Clarke.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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.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, IType annotationType) {
-
- 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 e697ba3..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/annotations/initialization/WebResultAttributeInitializer.java
+++ /dev/null
@@ -1,204 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Shane Clarke.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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.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, IType annotationType) {
- 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 1560b25..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/annotations/initialization/WebServiceAttributeInitializer.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.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.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, IType annotationType) {
-
- List<MemberValuePair> memberValuePairs = new ArrayList<MemberValuePair>();
- if (javaElement.getElementType() == IJavaElement.TYPE) {
- try {
- IType type = (IType)javaElement;
-
- MemberValuePair nameValuePair = AnnotationsCore.createStringMemberValuePair(ast, NAME, getName(type));
-
- MemberValuePair portNameValuePair = AnnotationsCore.createStringMemberValuePair(ast, PORT_NAME,
- getPortName(type));
-
- MemberValuePair serviceNameValuePair = AnnotationsCore.createStringMemberValuePair(ast, SERVICE_NAME,
- getServiceName(type));
-
- MemberValuePair targetNamespaceValuePair = AnnotationsCore.createStringMemberValuePair(ast,
- TARGET_NAMESPACE, getTargetNamespace(type));
-
- if (type.isInterface()) {
- memberValuePairs.add(nameValuePair);
- }
-
- memberValuePairs.add(targetNamespaceValuePair);
-
- if (type.isClass()) {
- memberValuePairs.add(portNameValuePair);
- memberValuePairs.add(serviceNameValuePair);
- }
- } catch (JavaModelException jme) {
- JAXWSUIPlugin.log(jme.getStatus());
- }
- }
- return memberValuePairs;
- }
-
- public List<ICompletionProposal> getCompletionProposalsForMemberValuePair(IJavaElement javaElement,
- MemberValuePair memberValuePair) {
-
- List<ICompletionProposal> completionProposals = new ArrayList<ICompletionProposal>();
- if (javaElement.getElementType() == IJavaElement.TYPE) {
- IType type = (IType) javaElement;
-
- String memberValuePairName = memberValuePair.getName().getIdentifier();
-
- if (memberValuePairName.equals(ENDPOINT_INTERFACE)) {
- List<String> interfaces = getInterfaces(type);
- for (String anInterface : interfaces) {
- completionProposals.add(createCompletionProposal(anInterface,
- memberValuePair.getValue(), JavaUI.getSharedImages().getImage(
- ISharedImages.IMG_OBJS_INTERFACE), anInterface));
- }
- }
- if (memberValuePairName.equals(NAME)) {
- completionProposals.add(createCompletionProposal(getName(type),
- memberValuePair.getValue()));
- }
- if (memberValuePairName.equals(PORT_NAME)) {
- completionProposals.add(createCompletionProposal(getPortName(type),
- memberValuePair.getValue()));
- }
- if (memberValuePairName.equals(SERVICE_NAME)) {
- completionProposals.add(createCompletionProposal(getServiceName(type),
- memberValuePair.getValue()));
- }
- if (memberValuePairName.equals(TARGET_NAMESPACE)) {
- completionProposals.add(createCompletionProposal(getTargetNamespace(type),
- memberValuePair.getValue()));
- }
- }
- return completionProposals;
- }
-
- public String getName(IType type) {
- return type.getElementName();
- }
-
- public String getPortName(IType type) {
- return type.getElementName() + PORT_SUFFIX;
- }
-
- public String getServiceName(IType type) {
- return type.getElementName() + SERVICE_SUFFIX;
- }
-
- public String getTargetNamespace(IType type) {
- return JDTUtils.getTargetNamespaceFromPackageName(type.getPackageFragment().getElementName());
- }
-
- private List<String> getInterfaces(IType type) {
- try {
- List<String> interfaces = new ArrayList<String>();
- ITypeHierarchy typeHierarchy = type.newTypeHierarchy(type.getJavaProject(), null);
- IType[] allInterfaces = typeHierarchy.getAllInterfaces();
- for (IType aInterface : allInterfaces) {
- if (!aInterface.isBinary() && aInterface.getResource().getProject().equals(
- type.getResource().getProject())) {
- String packageName = aInterface.getPackageFragment().getElementName();
- if (packageName.trim().length() > 0) {
- packageName += "."; //$NON-NLS-1$
- }
- String qualifiedName = packageName + aInterface.getPrimaryElement().getElementName();
- interfaces.add(qualifiedName);
- }
- }
- return interfaces;
- } catch (JavaModelException jme) {
- JAXWSUIPlugin.log(jme.getStatus());
- }
- return Collections.emptyList();
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/dialogs/HandlerChainSelectionDialog.java b/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/dialogs/HandlerChainSelectionDialog.java
deleted file mode 100644
index 61922cb..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/dialogs/HandlerChainSelectionDialog.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 Shane Clarke.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Shane Clarke - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.jaxws.ui.dialogs;
-
-import java.io.IOException;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jface.viewers.ILabelProvider;
-import org.eclipse.jface.viewers.ITreeContentProvider;
-import org.eclipse.jst.ws.internal.jaxws.core.utils.JAXWSHandlerUtils;
-import org.eclipse.jst.ws.internal.jaxws.ui.JAXWSUIMessages;
-import org.eclipse.jst.ws.internal.jaxws.ui.JAXWSUIPlugin;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.dialogs.ElementTreeSelectionDialog;
-import org.eclipse.ui.dialogs.ISelectionStatusValidator;
-
-public class HandlerChainSelectionDialog extends ElementTreeSelectionDialog {
- private static final String XML_FILE_EXTENSION = "xml"; //$NON-NLS-1$
-
- private IStatus ok_status = new Status(IStatus.OK, JAXWSUIPlugin.PLUGIN_ID, ""); //$NON-NLS-1$
-
- public HandlerChainSelectionDialog(Shell parent, ILabelProvider labelProvider, ITreeContentProvider contentProvider) {
- super(parent, labelProvider, contentProvider);
- setTitle(JAXWSUIMessages.JAXWS_HANDLER_CONFIGURATION_EDIT_DIALOG_TITLE);
- setMessage(JAXWSUIMessages.JAXWS_HANDLER_CONFIGURATION_EDIT_DIALOG_DESCRIPTION);
- setAllowMultiple(false);
- setValidator(new ISelectionStatusValidator() {
-
- public IStatus validate(Object[] selection) {
- if (selection.length > 0) {
- Object selected = selection[0];
- if (selected instanceof IFile) {
- IFile file = (IFile) selected;
- try {
- if (file.getFileExtension().equals(XML_FILE_EXTENSION) &&
- JAXWSHandlerUtils.isHandlerChainFile(file)) {
- return ok_status;
- }
- } catch (IOException ioe) {
- JAXWSUIPlugin.log(ioe);
- }
- }
- }
- return new Status(IStatus.ERROR, JAXWSUIPlugin.PLUGIN_ID,
- JAXWSUIMessages.JAXWS_HANDLER_CONFIGURATION_EDIT_DIALOG_INVALID);
- }
- });
-
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/dialogs/NewHandlerChainDialog.java b/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/dialogs/NewHandlerChainDialog.java
deleted file mode 100644
index bcc0590..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/dialogs/NewHandlerChainDialog.java
+++ /dev/null
@@ -1,142 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 Shane Clarke.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Shane Clarke - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.jaxws.ui.dialogs;
-
-import java.io.File;
-
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jface.viewers.ILabelProvider;
-import org.eclipse.jface.viewers.ITreeContentProvider;
-import org.eclipse.jst.ws.internal.jaxws.ui.JAXWSUIMessages;
-import org.eclipse.jst.ws.internal.jaxws.ui.JAXWSUIPlugin;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.KeyAdapter;
-import org.eclipse.swt.events.KeyEvent;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.dialogs.ElementTreeSelectionDialog;
-import org.eclipse.ui.dialogs.ISelectionStatusValidator;
-
-public class NewHandlerChainDialog extends ElementTreeSelectionDialog implements ISelectionStatusValidator {
-
- private IStatus ok_status = new Status(IStatus.OK, JAXWSUIPlugin.PLUGIN_ID, ""); //$NON-NLS-1$
-
- private String handlerChainFileName = "handler-chain.xml"; //$NON-NLS-1$
-
- public NewHandlerChainDialog(Shell parent, ILabelProvider labelProvider,
- ITreeContentProvider contentProvider) {
- super(parent, labelProvider, contentProvider);
- setTitle(JAXWSUIMessages.JAXWS_HANDLER_CONFIGURATION_CREATE_DIALOG_TITLE);
- setMessage(JAXWSUIMessages.JAXWS_HANDLER_CONFIGURATION_CREATE_DIALOG_DESCRIPTION);
- setAllowMultiple(false);
- setValidator(this);
- }
-
- @Override
- protected Control createDialogArea(Composite parent) {
- Composite composite = (Composite) super.createDialogArea(parent);
- Composite fileComposite = new Composite(composite, SWT.NONE);
- GridLayout gridLayout = new GridLayout();
- gridLayout.numColumns = 2;
- fileComposite.setLayout(gridLayout);
- GridData gridData = new GridData(SWT.FILL, SWT.FILL, true, false);
- fileComposite.setLayoutData(gridData);
- Label handleChainLabel = new Label(fileComposite, SWT.NONE);
- handleChainLabel.setText(JAXWSUIMessages.JAXWS_HANDLER_CONFIGURATION_CREATE_DIALOG_FILE_NAME);
- Text newHandlerChainText = new Text(fileComposite, SWT.BORDER);
- gridData = new GridData(SWT.FILL, SWT.FILL, true, false);
- newHandlerChainText.setLayoutData(gridData);
- newHandlerChainText.setText(handlerChainFileName);
- newHandlerChainText.addKeyListener(new KeyAdapter() {
- @Override
- public void keyReleased(KeyEvent e) {
- super.keyReleased(e);
- handlerChainFileName = ((Text) e.widget).getText();
- updateOKStatus();
- }
-
- });
- updateOKStatus();
- return composite;
- }
-
- public IStatus validate(Object[] selection) {
- if (handlerChainFileName.trim().length() == 0) {
- return new Status(IStatus.ERROR, JAXWSUIPlugin.PLUGIN_ID,
- JAXWSUIMessages.JAXWS_HANDLER_CONFIGURATION_CREATE_DIALOG_ENTER_NAME);
- }
-
- IWorkspace workspace = ResourcesPlugin.getWorkspace();
- IStatus result = workspace.validateName(handlerChainFileName, IResource.FILE);
- if (!result.isOK()) {
- return result;
- }
-
- if (selection == null || selection.length == 0 || selection[0] instanceof IJavaProject) {
- return new Status(IStatus.ERROR, JAXWSUIPlugin.PLUGIN_ID,
- JAXWSUIMessages.JAXWS_HANDLER_CONFIGURATION_CREATE_DIALOG_CHOOSE_FOLDER);
- }
-
- if (!handlerChainFileName.endsWith(".xml")) { //$NON-NLS-1$
- return new Status(IStatus.ERROR, JAXWSUIPlugin.PLUGIN_ID,
- JAXWSUIMessages.JAXWS_HANDLER_CONFIGURATION_CREATE_DIALOG_INVALID_NAME);
- }
-
- IPath path = new Path(getFilePath());
- if (path.segmentCount() > 1) {
- if (path.lastSegment() != null && path.lastSegment().equals(".xml")) { //$NON-NLS-1$
- return new Status(IStatus.ERROR, JAXWSUIPlugin.PLUGIN_ID,
- JAXWSUIMessages.JAXWS_HANDLER_CONFIGURATION_CREATE_DIALOG_EMPTY_FILE_NAME);
- }
- }
- if (workspace.getRoot().getFile(path).exists()) {
- return new Status(IStatus.ERROR, JAXWSUIPlugin.PLUGIN_ID,
- JAXWSUIMessages.bind(JAXWSUIMessages.JAXWS_HANDLER_CONFIGURATION_CREATE_DIALOG_FILE_EXISTS,
- handlerChainFileName));
- }
-
- return ok_status;
- }
-
- public String getFileName() {
- return handlerChainFileName;
- }
-
- public String getFilePath() {
- Object element = getFirstResult();
- if (element instanceof IJavaProject) {
- return ((IJavaProject) element).getProject().getFullPath().toOSString() + File.separatorChar
- + handlerChainFileName;
- }
-
- if (element instanceof IJavaElement) {
- return ((IJavaElement) element).getResource().getFullPath().toOSString() + File.separatorChar
- + handlerChainFileName;
- }
- if (element instanceof IResource) {
- return ((IResource) element).getFullPath().toOSString() + File.separatorChar + handlerChainFileName;
- }
- return handlerChainFileName;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/filters/NewHandlerChainViewerFilter.java b/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/filters/NewHandlerChainViewerFilter.java
deleted file mode 100644
index f582f88..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/filters/NewHandlerChainViewerFilter.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 Shane Clarke.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Shane Clarke - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.jaxws.ui.filters;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IPackageFragment;
-import org.eclipse.jdt.core.IPackageFragmentRoot;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.viewers.ViewerFilter;
-import org.eclipse.jst.ws.internal.jaxws.ui.JAXWSUIPlugin;
-
-public class NewHandlerChainViewerFilter extends ViewerFilter {
- private static final String XML_FILE_EXTENSION = "xml"; //$NON-NLS-1$
-
- private IJavaProject javaProject;
- private boolean filterFiles;
- private boolean filterCompilationUnits;
-
- public NewHandlerChainViewerFilter(IJavaProject javaProject, boolean filterFiles, boolean filterCompilationUnits) {
- this.javaProject = javaProject;
- this.filterFiles = filterFiles;
- this.filterCompilationUnits = filterCompilationUnits;
- }
-
- @Override
- public boolean select(Viewer viewer, Object parentElement, Object element) {
- try {
- if (element instanceof IJavaProject) {
- if (javaProject != null) {
- return javaProject.equals(element);
- }
- return false;
-
- }
- if (element instanceof IPackageFragmentRoot) {
- IPackageFragmentRoot packageFragmentRoot = (IPackageFragmentRoot) element;
- return packageFragmentRoot.getKind() == IPackageFragmentRoot.K_SOURCE;
- }
- if (element instanceof IPackageFragment) {
- return true;
- }
-
- if (!filterFiles && element instanceof IFile) {
- IFile file = (IFile) element;
- return file.isAccessible() && file.getFileExtension().equals(XML_FILE_EXTENSION);
- }
-
- if (!filterCompilationUnits && element instanceof ICompilationUnit) {
- ICompilationUnit compilationUnit = (ICompilationUnit) element;
- IType type = compilationUnit.findPrimaryType();
- if (type != null) {
- return type.isClass() || type.isInterface() && !type.isAnnotation();
- }
- }
- } catch (JavaModelException jme) {
- JAXWSUIPlugin.log(jme);
- }
- return false;
- }
-} \ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/handlers/ConfigureHandlerChainHandler.java b/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/handlers/ConfigureHandlerChainHandler.java
deleted file mode 100644
index 990692f..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/handlers/ConfigureHandlerChainHandler.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 Shane Clarke.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Shane Clarke - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.jaxws.ui.handlers;
-
-import org.eclipse.core.commands.AbstractHandler;
-import org.eclipse.core.commands.ExecutionEvent;
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.wizard.WizardDialog;
-import org.eclipse.jst.ws.internal.jaxws.ui.JAXWSUIPlugin;
-import org.eclipse.jst.ws.internal.jaxws.ui.wizards.ConfigureHandlerWizard;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.IServiceEndpointInterface;
-import org.eclipse.jst.ws.jaxws.dom.runtime.api.IWebService;
-import org.eclipse.jst.ws.jaxws.dom.runtime.util.Dom2ResourceMapper;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.handlers.HandlerUtil;
-
-public class ConfigureHandlerChainHandler extends AbstractHandler {
-
- public Object execute(ExecutionEvent event) throws ExecutionException {
- ISelection selection = HandlerUtil.getCurrentSelection(event);
- if (selection != null && selection instanceof IStructuredSelection) {
- IStructuredSelection structuredSelection = (IStructuredSelection) selection;
- if (structuredSelection.getFirstElement() != null) {
- Object element = structuredSelection.getFirstElement();
- try {
- IType type = null;
- if (element instanceof IWebService) {
- IWebService webService = (IWebService) element;
- type = Dom2ResourceMapper.INSTANCE.findType(webService);
- }
- if (element instanceof IServiceEndpointInterface) {
- IServiceEndpointInterface serviceEndpointInterface = (IServiceEndpointInterface) element;
- type = Dom2ResourceMapper.INSTANCE.findType(serviceEndpointInterface);
- }
- if (type != null) {
- ConfigureHandlerWizard configureHandlerWizard = new ConfigureHandlerWizard(type);
- Shell shell = HandlerUtil.getActiveShell(event);
- WizardDialog dialog = new WizardDialog(shell, configureHandlerWizard);
- dialog.create();
- dialog.open();
- }
-
- } catch (JavaModelException jme) {
- JAXWSUIPlugin.log(jme.getStatus());
- }
- }
- }
- return null;
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/views/AnnotationArrayCellEditor.java b/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/views/AnnotationArrayCellEditor.java
deleted file mode 100644
index e15a819..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/views/AnnotationArrayCellEditor.java
+++ /dev/null
@@ -1,607 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Shane Clarke.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Shane Clarke - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.jaxws.ui.views;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Set;
-
-import org.eclipse.jdt.core.IAnnotation;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IMemberValuePair;
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jdt.core.Signature;
-import org.eclipse.jdt.core.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.annotations.core.utils.SignatureUtils;
-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 IMethod method;
- private Object[] values;
-
- private List<Object> originalValues;
- private List<Object> updatedValues;
-
- private AnnotationArrayDialog annotationArrayDialog;
- private int browse_button_count = 0;
-
- 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(IMethod method) {
- this.method = method;
- if (updatedValues != null) {
- updatedValues.clear();
- }
- }
-
- @Override
- protected void updateContents(Object value) {
- if (value instanceof Object[]) {
- Object[] values = (Object[])value;
- if (values.length > 0) {
- getDefaultLabel().setText("[]{...}"); //$NON-NLS-1$
- } else {
- getDefaultLabel().setText("[]{}"); //$NON-NLS-1$
- }
- }
- }
-
- @Override
- protected Object doGetValue() {
- if (cancelled || updatedValues == null) {
- return originalValues != null ? originalValues.toArray() : new Object[0];
- }
- return updatedValues.toArray();
- }
-
- @Override
- protected void doSetValue(Object value) {
- super.doSetValue(value);
- this.values = (Object[])value;
- }
-
- private class AnnotationArrayDialog extends SelectionStatusDialog {
- private Button addButton;
- private Button removeButton;
- private Button upButton;
- private Button downButton;
- private Table arrayValuesTable;
- private TableViewer arrayValuesTableViewer;
-
- private Map<String, Control> controls = new HashMap<String, Control>();
-
- public AnnotationArrayDialog(Shell parent, Object[] values) {
- super(parent);
- setValues(values);
- setTitle(JAXWSUIMessages.ANNOTATION_ARRAY_CELL_EDITOR_EDIT_ARRAY_VALUES_TITLE);
- }
-
- private void setValues(Object[] values) {
- try {
- originalValues = new ArrayList<Object>();
- updatedValues = new ArrayList<Object>();
- for (Object value : values) {
- if (value instanceof IAnnotation) {
- IAnnotation annotation = (IAnnotation) value;
- IMemberValuePair[] memberValuePairs = annotation.getMemberValuePairs();
- if (memberValuePairs.length > 0) {
- List<Map<String, Object>> aList = new ArrayList<Map<String,Object>>();
- for (IMemberValuePair memberValuePair : memberValuePairs) {
- String memberName = memberValuePair.getMemberName();
- Object memberValue = memberValuePair.getValue();
- Map<String, Object> mvps = new HashMap<String, Object>();
- if (memberValuePair.getValueKind() == IMemberValuePair.K_STRING) {
- mvps.put(memberName, memberValue);
- }
-
- if (memberValuePair.getValueKind() == IMemberValuePair.K_CLASS) {
- mvps.put(memberName, memberValuePair.getValue() + ".class"); //$NON-NLS-1$
- }
- aList.add(mvps);
- }
- originalValues.add(aList);
- updatedValues.add(aList);
- }
- }
- if (value.equals(Class.class)) {
- originalValues.add(value);
- updatedValues.add(value);
- }
- if (value instanceof String) {
- String string = (String)value;
- originalValues.add(string);
- updatedValues.add(string);
- }
- }
- } catch (JavaModelException jme) {
- JAXWSUIPlugin.log(jme.getStatus());
- }
- }
-
- @Override
- protected Control createDialogArea(Composite parent) {
- Composite mainComposite = (Composite) super.createDialogArea(parent);
-
- try {
- 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 IType componentType = getComponentType(method);
- if (componentType != null) {
- if (componentType.isAnnotation()) {
- Label compontTypeLabel = new Label(typeComposite, SWT.NONE);
- compontTypeLabel.setText("@" + componentType.getFullyQualifiedName()); //$NON-NLS-1$
- gridData = new GridData(SWT.FILL, SWT.FILL, true, true);
- gridData.horizontalSpan = 3;
- compontTypeLabel.setLayoutData(gridData);
-
- IMethod[] methods = componentType.getMethods();
- for (IMethod method : methods) {
- Label label = new Label(typeComposite, SWT.NONE);
- label.setText(method.getElementName() + ":"); //$NON-NLS-1$
- createEntryFields(method, typeComposite);
- }
- } else {
- Label label = new Label(typeComposite, SWT.NONE);
- label.setText(Signature.getSimpleName(Signature.toString(method.getReturnType())));
- 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) {
- try {
- 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();
- IMethod methodAA = (IMethod) textField.getData();
- if (textField.getText().trim().length() > 0) {
- if (componentType != null && componentType.isAnnotation()) {
- Map<String, Object> memberValuePairs = new HashMap<String, Object>();
- memberValuePairs.put(methodAA.getElementName(), textField.getText());
- aList.add(memberValuePairs);
- } else {
- updatedValues.add(textField.getText());
- }
- }
- }
- if (entry.getValue() instanceof Button) {
- Button button = (Button) entry.getValue();
- IMethod methodVV = (IMethod) button.getData();
- if (componentType != null && componentType.isAnnotation()) {
- Map<String, Object> memberValuePairs = new HashMap<String, Object>();
- memberValuePairs.put(methodVV.getElementName(), button.getSelection());
- aList.add(memberValuePairs);
- } else {
- updatedValues.add(button.getSelection());
- }
- }
- }
- if (aList.size() > 0) {
- updatedValues.add(aList);
- }
- arrayValuesTableViewer.refresh();
- } catch (JavaModelException jme) {
- JAXWSUIPlugin.log(jme.getStatus());
- }
- }
- });
- 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.getElementName() + ":"); //$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 = componentType.getElementName();
- annotationName += "("; //$NON-NLS-1$
- @SuppressWarnings("unchecked")
- List<Map<String, Object>> valuesList = (List<Map<String, Object>>) element;
- Iterator<Map<String, Object>> valuesIterator = valuesList.iterator();
- while (valuesIterator.hasNext()) {
- Map<String, Object> valuesMap = valuesIterator.next();
- Set<Entry<String, Object>> entrySet = valuesMap.entrySet();
- Iterator<Map.Entry<String, Object>> iterator = entrySet.iterator();
- while (iterator.hasNext()) {
- Map.Entry<String, Object> entry = iterator.next();
- Object value = entry.getValue();
- boolean isString = value instanceof String && !value.toString().endsWith(".class"); //$NON-NLS-1$
- if (isString) {
- annotationName += entry.getKey() + "=\"" + value + "\""; //$NON-NLS-1$ //$NON-NLS-2$
- } else {
- annotationName += entry.getKey() + "=" + value; //$NON-NLS-1$
- }
- }
- if (valuesIterator.hasNext()) {
- annotationName += ", "; //$NON-NLS-1$
- }
- }
- return annotationName += ")"; //$NON-NLS-1$
- }
- return element.toString();
- }
-
- @Override
- public Image getImage(Object element) {
- try {
- if (componentType != null && componentType.isAnnotation()) {
- return JavaUI.getSharedImages().getImage(ISharedImages.IMG_OBJS_ANNOTATION);
- } else if (SignatureUtils.isClass(method.getReturnType())) {
- return JavaUI.getSharedImages().getImage(ISharedImages.IMG_OBJS_CLASS);
- } else {
- return PlatformUI.getWorkbench().getSharedImages().getImage(
- org.eclipse.ui.ISharedImages.IMG_OBJ_FILE);
- }
- } catch (JavaModelException jme) {
- JAXWSUIPlugin.log(jme.getStatus());
- }
- return null;
- }
- });
-
- 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);
- } catch (JavaModelException jme) {
- JAXWSUIPlugin.log(jme.getStatus());
- }
-
- return mainComposite;
- }
-
- private IType getComponentType(IMethod method) throws JavaModelException {
- String returnType = method.getReturnType();
- if (SignatureUtils.isArray(returnType)) {
- String elementType = Signature.getElementType(returnType);
- IType declaringType = method.getDeclaringType();
- IJavaProject javaProject = declaringType.getJavaProject();
- if (javaProject != null) {
- return javaProject.findType(Signature.toString(elementType));
- }
- }
- return null;
- }
-
- private void createEntryFields(IMethod method, Composite typeComposite) throws JavaModelException {
- //TODO Handle ENUMS
- String returnType = method.getReturnType();
- IMemberValuePair defaultValue = method.getDefaultValue();
- GridData gridData = new GridData(SWT.FILL, SWT.BEGINNING, true, false);
- //String or String[]
- if (SignatureUtils.isString(returnType) || SignatureUtils.isArray(returnType) && SignatureUtils.isString(Signature.getElementType(returnType))) {
- Text text = new Text(typeComposite, SWT.BORDER);
- text.setData(method);
- gridData.horizontalSpan = 2;
- text.setLayoutData(gridData);
- if (defaultValue != null) {
- Object value = defaultValue.getValue();
- if (value instanceof Object[]) {
- Object[] values = (Object[]) value;
- if (values.length == 1) {
- text.setText(values[0].toString());
- }
- } else if (value instanceof String[]) {
- String[] values = (String[]) value;
- if (values.length == 1) {
- text.setText(values[0]);
- }
- } else {
- text.setText(value.toString().trim());
- }
- }
- controls.put(method.getElementName(), text);
- }
- //Class or Class[]
- if (SignatureUtils.isClass(returnType) || SignatureUtils.isArray(returnType) && SignatureUtils.isClass(Signature.getElementType(returnType))) {
- final Text text = new Text(typeComposite, SWT.BORDER);
- text.setData(method);
- gridData = new GridData(SWT.FILL, SWT.BEGINNING, true, false);
- text.setLayoutData(gridData);
- if (defaultValue != null && defaultValue.getValueKind() == IMemberValuePair.K_CLASS) {
- Object value = defaultValue.getValue();
- text.setText(value + ".class"); //$NON-NLS-1$
- }
- Button browseClassButton = new Button(typeComposite, SWT.PUSH);
- browseClassButton.setText(getBrowseButtonLabel());
- 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());
- }
- }
- }
- }
- });
- browse_button_count++;
- controls.put(method.getElementName(), text);
- }
-
- //Boolean
- if (SignatureUtils.isBoolean(returnType)) {
- Button checkbox = new Button(typeComposite, SWT.CHECK);
- checkbox.setData(method);
- gridData.horizontalSpan = 2;
- checkbox.setLayoutData(gridData);
- if (defaultValue != null) {
- checkbox.setSelection((Boolean) defaultValue.getValue());
- }
- controls.put(method.getElementName(), checkbox);
- }
- }
-
- private String getBrowseButtonLabel() {
- switch (browse_button_count) {
- case 0:
- return JAXWSUIMessages.ANNOTATION_ARRAY_CELL_EDITOR_BROWSE_LABEL0;
- case 1:
- return JAXWSUIMessages.ANNOTATION_ARRAY_CELL_EDITOR_BROWSE_LABEL1;
- case 2:
- return JAXWSUIMessages.ANNOTATION_ARRAY_CELL_EDITOR_BROWSE_LABEL2;
- case 3:
- return JAXWSUIMessages.ANNOTATION_ARRAY_CELL_EDITOR_BROWSE_LABEL3;
- case 4:
- return JAXWSUIMessages.ANNOTATION_ARRAY_CELL_EDITOR_BROWSE_LABEL4;
- case 5:
- return JAXWSUIMessages.ANNOTATION_ARRAY_CELL_EDITOR_BROWSE_LABEL5;
- default:
- return JAXWSUIMessages.ANNOTATION_ARRAY_CELL_EDITOR_BROWSE_LABEL0;
- }
- }
-
- private Object getSelectedElement() {
- IStructuredSelection selection= (IStructuredSelection) arrayValuesTableViewer.getSelection();
- return selection.getFirstElement();
- }
-
- private TableViewer getTableViewer() {
- return arrayValuesTableViewer;
- }
-
- private 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));
- }
- }
-
- private 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) {
- }
- }
-
- private SelectionDialog getClassSelectionDialog() {
- try {
- return JavaUI.createTypeDialog(getShell(), PlatformUI.getWorkbench().getProgressService(),
- SearchEngine.createWorkspaceScope(), IJavaElementSearchConstants.CONSIDER_CLASSES,
- false, "* "); //$NON-NLS-1$
- } catch (JavaModelException jme) {
- JAXWSUIPlugin.log(jme.getStatus());
- }
- return null;
- }
-
-
- @Override
- public Object[] getResult() {
- return updatedValues.toArray();
- }
-
- @Override
- protected void computeResult() {
- }
- }
-} \ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/views/AnnotationsColumnLabelProvider.java b/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/views/AnnotationsColumnLabelProvider.java
deleted file mode 100755
index 9b9019f..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 org.eclipse.jdt.core.IMethod;
-import org.eclipse.jdt.core.IType;
-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 IType) {
- return ((IType) element).getFullyQualifiedName();
- }
-
- if (element instanceof IMethod) {
- return ((IMethod) element).getElementName();
- }
- return ""; //$NON-NLS-1$
- }
-
- @Override
- public Image getImage(Object element) {
- if (element instanceof IType) {
- return JavaUI.getSharedImages().getImage(ISharedImages.IMG_OBJS_ANNOTATION);
- }
- if (element instanceof IMethod) {
- 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 437f270..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/views/AnnotationsValuesColumnLabelProvider.java
+++ /dev/null
@@ -1,209 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Shane Clarke.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Shane Clarke - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.jaxws.ui.views;
-
-import java.util.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.Signature;
-import org.eclipse.jdt.core.dom.Annotation;
-import org.eclipse.jdt.core.dom.ArrayInitializer;
-import org.eclipse.jdt.core.dom.BooleanLiteral;
-import org.eclipse.jdt.core.dom.Expression;
-import org.eclipse.jdt.core.dom.MemberValuePair;
-import org.eclipse.jdt.core.dom.NormalAnnotation;
-import org.eclipse.jdt.core.dom.SingleMemberAnnotation;
-import org.eclipse.jface.viewers.ColumnLabelProvider;
-import org.eclipse.jface.viewers.TreeViewer;
-import org.eclipse.jst.ws.annotations.core.utils.AnnotationUtils;
-import org.eclipse.jst.ws.internal.annotations.core.utils.SignatureUtils;
-import org.eclipse.jst.ws.internal.jaxws.ui.JAXWSUIPlugin;
-import org.eclipse.swt.graphics.Image;
-
-public class AnnotationsValuesColumnLabelProvider extends ColumnLabelProvider {
- private TreeViewer annotationTreeViewer;
- private Image true_image;
- private Image false_image;
-
- public AnnotationsValuesColumnLabelProvider(TreeViewer annotationTreeViewer) {
- this.annotationTreeViewer = annotationTreeViewer;
- true_image = JAXWSUIPlugin.imageDescriptorFromPlugin(JAXWSUIPlugin.PLUGIN_ID, "icons/obj16/true.gif") //$NON-NLS-1$
- .createImage();
- false_image = JAXWSUIPlugin.imageDescriptorFromPlugin(JAXWSUIPlugin.PLUGIN_ID, "icons/obj16/false.gif") //$NON-NLS-1$
- .createImage();
- }
-
- @Override
- public String getText(Object element) {
- if (element instanceof IMethod) {
- try {
- return getTextForMethod((IMethod) element);
- } catch (JavaModelException jme) {
- JAXWSUIPlugin.log(jme.getStatus());
- }
- }
- return ""; //$NON-NLS-1$
- }
-
- private String getTextForMethod(IMethod method) throws JavaModelException {
- if (annotationTreeViewer.getInput() instanceof IJavaElement) {
- IJavaElement javaElement = (IJavaElement) annotationTreeViewer.getInput();
- if (javaElement.exists()) {
- return getTextForMethod(method, javaElement);
- }
- }
- return ""; //$NON-NLS-1$
- }
-
- private String getTextForMethod(IMethod method, IJavaElement annotatedElement) throws JavaModelException {
- List<Annotation> annotations = AnnotationUtils.getAnnotations(annotatedElement);
- for (Annotation annotation : annotations) {
- String annotationName = AnnotationUtils.getAnnotationName(annotation);
- IType type = method.getDeclaringType();
- if (type != null && annotationName.equals(type.getElementName())
- || annotationName.equals(type.getFullyQualifiedName())) {
- if (annotation.isNormalAnnotation()) {
- NormalAnnotation normalAnnotation = (NormalAnnotation) annotation;
- @SuppressWarnings("unchecked")
- List<MemberValuePair> memberValuePairs = normalAnnotation.values();
- for (MemberValuePair memberValuePair : memberValuePairs) {
- if (memberValuePair.getName().getIdentifier().equals(method.getElementName())) {
- return getTextForMethod(method, memberValuePair.getValue());
- }
- }
- } else if (annotation.isSingleMemberAnnotation()) {
- SingleMemberAnnotation singleMemberAnnotation = (SingleMemberAnnotation) annotation;
- return getTextForMethod(method, singleMemberAnnotation.getValue());
- }
- }
- }
- return ""; //$NON-NLS-1$
- }
-
- private String getTextForMethod(IMethod method, Expression expression) throws JavaModelException {
- String returnType = method.getReturnType();
-
- if (SignatureUtils.isString(returnType) || SignatureUtils.isClass(returnType)) {
- return expression.toString();
- }
-
- if (SignatureUtils.isEnum(method)) {
- String enumValue = expression.toString();
- return enumValue.substring(enumValue.lastIndexOf(".") + 1); //$NON-NLS-1$
- }
-
- if (SignatureUtils.isPrimitive(returnType) && (returnType.charAt(0) == Signature.C_BYTE
- || returnType.charAt(0) == Signature.C_SHORT || returnType.charAt(0) == Signature.C_INT
- || returnType.charAt(0) == Signature.C_LONG || returnType.charAt(0) == Signature.C_FLOAT
- || returnType.charAt(0) == Signature.C_DOUBLE)) {
- return expression.toString();
- }
-
- if (SignatureUtils.isArray(returnType) && expression instanceof ArrayInitializer) {
- ArrayInitializer arrayInitializer = (ArrayInitializer) expression;
- if (arrayInitializer.expressions().size() > 0) {
- return "[]{...}"; //$NON-NLS-1$
- } else {
- return "[]{}"; //$NON-NLS-1$
- }
- }
- return ""; //$NON-NLS-1$
- }
-
- @Override
- public Image getImage(Object element) {
- try {
- if (element instanceof IType) {
- return getImageForClass((IType) element);
- }
- if (element instanceof IMethod) {
- return getImageForMethod((IMethod) element);
- }
- } catch (JavaModelException jme) {
- JAXWSUIPlugin.log(jme.getStatus());
- }
- return null;
- }
-
- private Image getImageForClass(IType type) throws JavaModelException {
- if (annotationTreeViewer.getInput() instanceof IJavaElement) {
- IJavaElement javaElement = (IJavaElement) annotationTreeViewer.getInput();
- if (javaElement.exists()) {
- return getImageForClass(type, javaElement);
- }
- }
- return null;
- }
-
- private Image getImageForClass(IType type, IJavaElement javaElement) throws JavaModelException {
- List<Annotation> annotations = AnnotationUtils.getAnnotations(javaElement);
- for (Annotation annotation : annotations) {
- String annotationName = AnnotationUtils.getAnnotationName(annotation);
- if (annotationName.equals(type.getElementName()) ||
- annotationName.equals(type.getFullyQualifiedName())) {
- return true_image;
- }
- }
- return false_image;
- }
-
- private Image getImageForMethod(IMethod method) throws JavaModelException {
- if (SignatureUtils.isBoolean(method.getReturnType()) && annotationTreeViewer.getInput() instanceof IJavaElement) {
- IJavaElement javaElement = (IJavaElement) annotationTreeViewer.getInput();
- if (javaElement.exists()) {
- return getImageForMethod(method, javaElement);
- }
- }
- return null;
- }
-
- private Image getImageForMethod(IMethod method, IJavaElement javaElement) throws JavaModelException {
- List<Annotation> annotations = AnnotationUtils.getAnnotations(javaElement);
- for (Annotation annotation : annotations) {
- String annotationName = AnnotationUtils.getAnnotationName(annotation);
- IType declaringType = method.getDeclaringType();
- if (declaringType != null && annotationName.equals(declaringType.getElementName())
- || annotationName.equals(declaringType.getFullyQualifiedName())) {
- if (annotation.isNormalAnnotation()) {
- NormalAnnotation normalAnnotation = (NormalAnnotation) annotation;
- @SuppressWarnings("unchecked")
- List<MemberValuePair> memberValuePairs = normalAnnotation.values();
- for (MemberValuePair memberValuePair : memberValuePairs) {
- if (memberValuePair.getName().getIdentifier().equals(method.getElementName())
- && memberValuePair.getValue() instanceof BooleanLiteral) {
- if (((BooleanLiteral) memberValuePair.getValue()).booleanValue()) {
- return true_image;
- }
- }
- }
- } else if (annotation.isSingleMemberAnnotation()) {
- SingleMemberAnnotation singleMemberAnnotation = (SingleMemberAnnotation) annotation;
- if (singleMemberAnnotation.getValue() instanceof BooleanLiteral) {
- if (((BooleanLiteral) singleMemberAnnotation.getValue()).booleanValue()) {
- return true_image;
- }
- }
- }
- }
- }
- return false_image;
- }
-
- @Override
- public void dispose() {
- super.dispose();
- true_image.dispose();
- false_image.dispose();
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/views/AnnotationsValuesEditingSupport.java b/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/views/AnnotationsValuesEditingSupport.java
deleted file mode 100644
index 21e27c4..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/views/AnnotationsValuesEditingSupport.java
+++ /dev/null
@@ -1,706 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Shane Clarke.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Shane Clarke - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.jaxws.ui.views;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Set;
-
-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.IJavaProject;
-import org.eclipse.jdt.core.ILocalVariable;
-import org.eclipse.jdt.core.IMemberValuePair;
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jdt.core.Signature;
-import org.eclipse.jdt.core.dom.AST;
-import org.eclipse.jdt.core.dom.ASTNode;
-import org.eclipse.jdt.core.dom.Annotation;
-import org.eclipse.jdt.core.dom.ArrayInitializer;
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jdt.core.dom.Expression;
-import org.eclipse.jdt.core.dom.MemberValuePair;
-import org.eclipse.jdt.core.dom.NormalAnnotation;
-import org.eclipse.jdt.core.dom.SingleMemberAnnotation;
-import org.eclipse.jdt.ui.SharedASTProvider;
-import org.eclipse.jface.viewers.CellEditor;
-import org.eclipse.jface.viewers.CheckboxCellEditor;
-import org.eclipse.jface.viewers.ComboBoxCellEditor;
-import org.eclipse.jface.viewers.EditingSupport;
-import org.eclipse.jface.viewers.ICellEditorValidator;
-import org.eclipse.jface.viewers.TextCellEditor;
-import org.eclipse.jface.viewers.TreeViewer;
-import org.eclipse.jst.ws.annotations.core.AnnotationsCore;
-import org.eclipse.jst.ws.annotations.core.AnnotationsCorePlugin;
-import org.eclipse.jst.ws.annotations.core.AnnotationsManager;
-import org.eclipse.jst.ws.annotations.core.initialization.IAnnotationAttributeInitializer;
-import org.eclipse.jst.ws.annotations.core.utils.AnnotationUtils;
-import org.eclipse.jst.ws.internal.annotations.core.utils.SignatureUtils;
-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 IMethod) {
- IMethod method = (IMethod) element;
- return (Boolean) getValue(method.getDeclaringType());
- }
- return true;
- }
-
- @Override
- protected CellEditor getCellEditor(Object element) {
- if (element instanceof IType) {
- return checkboxCellEditor;
- }
- if (element instanceof IMethod) {
- try {
- IMethod method = (IMethod) element;
-
- IType enumType = SignatureUtils.getEnumReturnType(method);
- if (enumType != null) {
- comboBoxCellEditor.setItems(SignatureUtils.getEnumConstantsNames(enumType));
- return comboBoxCellEditor;
- }
-
- final String returnType = method.getReturnType();
-
- if (SignatureUtils.isBoolean(returnType)) {
- return checkboxCellEditor;
- }
-
- if (SignatureUtils.isClass(returnType)) {
- return classDialogCellEditor;
- }
-
- if (SignatureUtils.isArray(returnType)) {
- annotationArrayCellEditor.setMethod(method);
- return annotationArrayCellEditor;
- }
- if (SignatureUtils.isPrimitive(returnType)) {
- textCellEditor.setValidator(new ICellEditorValidator() {
- public String isValid(Object value) {
- try {
- if (returnType.charAt(0) == Signature.C_BYTE) {
- Byte.parseByte((String) value);
- }
- if (returnType.charAt(0) == Signature.C_SHORT) {
- Short.parseShort((String) value);
- }
- if (returnType.charAt(0) == Signature.C_INT) {
- Integer.parseInt((String) value);
- }
- if (returnType.charAt(0) == Signature.C_LONG) {
- Long.parseLong((String) value);
- }
- if (returnType.charAt(0) == Signature.C_FLOAT) {
- Float.parseFloat((String) value);
- }
- if (returnType.charAt(0) == Signature.C_DOUBLE) {
- Double.parseDouble((String) value);
- }
- } catch (NumberFormatException nfe) {
- return JAXWSUIMessages.ANNOTATION_EDITING_SUPPORT_NOT_VALID_MESSAGE_PREFIX + value;
- }
- return null;
- }
- });
- return textCellEditor;
- }
- return textCellEditor;
- } catch (JavaModelException jme) {
- JAXWSUIPlugin.log(jme.getStatus());
- }
- }
- return checkboxCellEditor;
- }
-
- @Override
- protected Object getValue(Object element) {
- if (element instanceof IType) {
- return getValueForClass((IType) element);
- }
- if (element instanceof IMethod) {
- return getValueForMethod((IMethod) element);
- }
- return null;
- }
-
- private Object getValueForClass(IType type) {
- if (treeViewer.getInput() instanceof IAnnotatable) {
- return getValueForClass(type, (IAnnotatable) treeViewer.getInput());
- }
- return Boolean.FALSE;
- }
-
- private Object getValueForClass(IType type, IAnnotatable annotatedElement) {
- if (annotatedElement instanceof ILocalVariable) {
- ILocalVariable localVariable = getLocalVariable(annotatedElement);
- if (localVariable != null) {
- annotatedElement = localVariable;
- }
- }
- try {
- IAnnotation[] annotations = annotatedElement.getAnnotations();
- for (IAnnotation annotation : annotations) {
- String annotationName = annotation.getElementName();
- if (AnnotationUtils.isAnnotationPresent((IJavaElement)annotatedElement, annotationName)
- && (annotationName.equals(type.getElementName())
- || annotationName.equals(type.getFullyQualifiedName()))) {
- return Boolean.TRUE;
- }
- }
- } catch (JavaModelException jme) {
- JAXWSUIPlugin.log(jme.getStatus());
- }
- return Boolean.FALSE;
- }
-
- private Object getValueForMethod(IMethod 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(IMethod method, IAnnotatable annotatedElement) throws JavaModelException {
- if (annotatedElement instanceof ILocalVariable) {
- ILocalVariable localVariable = getLocalVariable(annotatedElement);
- if (localVariable != null) {
- annotatedElement = localVariable;
- }
- }
- String returnType = method.getReturnType();
- IAnnotation[] annotations = annotatedElement.getAnnotations();
- for (IAnnotation annotation : annotations) {
- IType declaringType = method.getDeclaringType();
-
- String annotationName = annotation.getElementName();
- if (annotationName.equals(declaringType.getElementName())
- || annotationName.equals(declaringType.getFullyQualifiedName())) {
- IMemberValuePair[] memberValuePairs = annotation.getMemberValuePairs();
- for (IMemberValuePair memberValuePair : memberValuePairs) {
- if (memberValuePair.getMemberName().equals(method.getElementName())) {
- if (SignatureUtils.isString(returnType)) {
- return memberValuePair.getValue();
- }
-
- IType enumType = SignatureUtils.getEnumReturnType(method);
- if (enumType != null) {
- String enumValue = memberValuePair.getValue().toString();
- String literal = enumValue.substring(enumValue.lastIndexOf(".") + 1); //$NON-NLS-1$
- String[] enumConstants = SignatureUtils.getEnumConstantsNames(enumType);
- for (int i = 0; i < enumConstants.length; i++) {
- if (enumConstants[i].equals(literal)) {
- return i;
- }
- }
- }
- if (SignatureUtils.isClass(returnType)) {
- return memberValuePair.getValue();
- }
-
- if (SignatureUtils.isBoolean(returnType)) {
- return memberValuePair.getValue();
- }
-
- if (SignatureUtils.isPrimitive(returnType)) {
- return ""; //$NON-NLS-1$
- }
- if (SignatureUtils.isArray(returnType)) {
- 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(method);
- }
- }
- return null;
- }
-
- private Object getDefaultValueForMethod(IMethod method) throws JavaModelException {
- String returnType = method.getReturnType();
-
- if (SignatureUtils.isString(returnType)) {
- return ""; //$NON-NLS-1$
- }
-
- if (SignatureUtils.isBoolean(returnType)) {
- return Boolean.FALSE;
- }
-
- if (SignatureUtils.isEnum(method)) {
- return -1;
- }
-
- if (SignatureUtils.isPrimitive(returnType)) {
- return ""; //$NON-NLS-1$
- }
-
- if (SignatureUtils.isArray(returnType)) {
- return new Object[] {};
- }
-
- return null;
- }
-
- private ILocalVariable getLocalVariable(IAnnotatable annotatedElement) {
- ILocalVariable localVariable = (ILocalVariable) annotatedElement;
- if (localVariable.getParent() instanceof IMethod) {
- IMethod parent = (IMethod) localVariable.getParent();
- localVariable = AnnotationUtils.getLocalVariable(parent, localVariable.getElementName());
- if (localVariable != null) {
- return localVariable;
- }
- }
- return null;
- }
-
- @Override
- protected void setValue(Object element, Object value) {
- if (value == null) {
- return;
- }
-
- try {
- if (element instanceof IType && ((IType) element).isAnnotation()) {
- setValueForClass((IType) element, (Boolean) value);
- }
-
- if (element instanceof IMethod) {
- setValueForMethod((IMethod) element, value);
- }
- } catch (CoreException ce) {
- JAXWSUIPlugin.log(ce.getStatus());
- }
- }
-
- private void setValueForClass(IType type, Boolean annotate) throws CoreException {
- Object viewerInput = treeViewer.getInput();
-
- IAnnotationAttributeInitializer annotationAttributeInitializer =
- AnnotationsManager.getAnnotationDefinitionForClass(type.getFullyQualifiedName()).getAnnotationAttributeInitializer();
-
- if (viewerInput instanceof IJavaElement) {
- setValueForClass(type, annotate, (IJavaElement) viewerInput, annotationAttributeInitializer);
- }
- }
-
- private Annotation getAnnotation(AST ast, IType type, List<MemberValuePair> memberValuePairs) throws JavaModelException {
- Annotation annotation = null;
- int numberOfDeclaredMethods = type.getMethods().length;
- if (numberOfDeclaredMethods == 0) {
- annotation = AnnotationsCore.createMarkerAnnotation(ast, type.getElementName());
- } 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, type.getElementName(), value);
- } else {
- annotation = AnnotationsCore.createNormalAnnotation(ast, type.getElementName(), memberValuePairs);
- }
- } else if (numberOfDeclaredMethods > 1) {
- annotation = AnnotationsCore.createNormalAnnotation(ast, type.getElementName(), memberValuePairs);
- }
-
- return annotation;
- }
-
- private void setValueForClass(IType type, 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, type);
-
- Annotation annotation = getAnnotation(ast, type, 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.createAddImportTextEdit(javaElement, type.getFullyQualifiedName()));
- change.addEdit(AnnotationUtils.createAddAnnotationTextEdit(javaElement, annotation));
- }
- } 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.createRemoveImportTextEdit(javaElement, type.getFullyQualifiedName()));
- change.addEdit(AnnotationUtils.createRemoveAnnotationTextEdit(javaElement, annotation));
- }
- }
- executeChange(new NullProgressMonitor(), change);
- }
-
- private List<MemberValuePair> getMemberValuePairs(IAnnotationAttributeInitializer annotationAttributeInitializer,
- IJavaElement javaElement, AST ast, IType type) {
- if (annotationAttributeInitializer != null) {
- List<MemberValuePair> memberValuePairs = annotationAttributeInitializer.getMemberValuePairs(javaElement, ast, type);
- if (memberValuePairs.size() > 0) {
- return memberValuePairs;
- } else {
- return annotationAttributeInitializer.getMemberValuePairs(javaElement, ast,
- AnnotationsManager.getAnnotationDefinitionForType(type).getAnnotationClass());
- }
- }
- return Collections.emptyList();
- }
-
- private void setValueForMethod(IMethod method, Object value) throws CoreException {
- if (value instanceof String) {
- Object currentValue = getValue(method);
- if (currentValue != null && currentValue instanceof String) {
- if (((String) value).equals(currentValue)) {
- return;
- }
- }
- }
- if (((Boolean) getValue(method.getDeclaringType())).booleanValue()) {
- Object viewerInput = treeViewer.getInput();
- if (viewerInput instanceof IAnnotatable) {
- setValueForMethod(method, value, (IJavaElement) viewerInput);
- }
- }
- }
-
- private void setValueForMethod(IMethod 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;
- IType declaringType = method.getDeclaringType();
- String annotationName = normalAnnotation.getTypeName().getFullyQualifiedName();
- if (annotationName.equals(declaringType.getElementName()) || annotationName.equals(declaringType.getFullyQualifiedName())) {
- @SuppressWarnings("unchecked")
- List<MemberValuePair> memberValuePairs = normalAnnotation.values();
- boolean hasMemberValuePair = false;
- for (MemberValuePair memberValuePair : memberValuePairs) {
- if (memberValuePair.getName().getIdentifier().equals(method.getElementName())) {
- 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;
- IType declaringType = method.getDeclaringType();
- String annotationName = singleMemberAnnotation.getTypeName().getFullyQualifiedName();
- if (annotationName.equals(declaringType.getElementName()) || annotationName.equals(declaringType.getFullyQualifiedName())) {
- MemberValuePair memberValuePair = getMemberValuePair(ast, method, value);
- if (memberValuePair != null) {
- change.addEdit(AnnotationUtils.createUpdateSingleMemberAnnotationTextEdit(singleMemberAnnotation, memberValuePair.getValue()));
- break;
- }
- }
-
- }
- }
-
- executeChange(new NullProgressMonitor(), change);
- }
-
- private MemberValuePair getMemberValuePair(AST ast, IMethod method, Object value) throws JavaModelException {
- String returnType = method.getReturnType();
- if (SignatureUtils.isString(returnType)) {
- return AnnotationsCore.createStringMemberValuePair(ast, method.getElementName(), (String) value);
- }
- if (SignatureUtils.isBoolean(returnType)) {
- return AnnotationsCore.createBooleanMemberValuePair(ast, method.getElementName(), (Boolean) value);
- }
-
- if (SignatureUtils.isPrimitive(returnType)) {
- if (returnType.charAt(0) == Signature.C_BYTE
- || returnType.charAt(0) == Signature.C_SHORT
- || returnType.charAt(0) == Signature.C_INT
- || returnType.charAt(0) == Signature.C_LONG
- || returnType.charAt(0) == Signature.C_FLOAT
- || returnType.charAt(0) == Signature.C_DOUBLE) {
- return AnnotationsCore.createNumberMemberValuePair(ast, method.getElementName(), value.toString());
- }
- }
-
- if (SignatureUtils.isArray(returnType)) {
- IType componentType = getComponentType(method);
- if (componentType != null) {
- if (componentType.isAnnotation()) {
- return createArrayMemberValuePair(ast, method, (Object[]) value);
- } else {
- return AnnotationsCore.createArrayMemberValuePair(ast, method.getElementName(), (Object[]) value);
- }
- }
- }
-
- if (SignatureUtils.isClass(returnType)) {
- return AnnotationsCore.createTypeMemberValuePair(ast, method.getElementName(), value.toString());
- }
-
- IType enumType = SignatureUtils.getEnumReturnType(method);
- if (enumType != null) {
- int selected = ((Integer) value).intValue();
- if (selected != -1) {
- if (enumType.isMember()) {
- return AnnotationsCore.createEnumMemberValuePair(ast, enumType.getDeclaringType().getFullyQualifiedName(),
- method.getElementName(), SignatureUtils.getEnumConstants(enumType)[selected]);
- } else {
- return AnnotationsCore.createEnumMemberValuePair(ast, enumType.getFullyQualifiedName(),
- method.getElementName(), SignatureUtils.getEnumConstants(enumType)[selected]);
- }
- }
- }
- return null;
- }
-
- private ASTNode getMemberValuePairValue(AST ast, IMethod method, Object value) throws JavaModelException {
- String returnType = method.getReturnType();
- if (SignatureUtils.isString(returnType)) {
- return AnnotationsCore.createStringLiteral(ast, value.toString());
- }
-
- if (SignatureUtils.isBoolean(returnType)) {
- return AnnotationsCore.createBooleanLiteral(ast, ((Boolean) value).booleanValue());
- }
-
- if (SignatureUtils.isPrimitive(returnType)) {
- if (returnType.charAt(0) == Signature.C_BYTE
- || returnType.charAt(0) == Signature.C_SHORT
- || returnType.charAt(0) == Signature.C_INT
- || returnType.charAt(0) == Signature.C_LONG
- || returnType.charAt(0) == Signature.C_FLOAT
- || returnType.charAt(0) == Signature.C_DOUBLE) {
- return AnnotationsCore.createNumberLiteral(ast, value.toString());
- }
- }
-
- if (SignatureUtils.isArray(returnType)) {
- IType componentType = getComponentType(method);
- if (componentType != null) {
- if (componentType.isAnnotation()) {
- return createArrayValueLiteral(ast, method, (Object[]) value);
- } else {
- return AnnotationsCore.createArrayValueLiteral(ast, (Object[]) value);
- }
- }
- }
-
- if (SignatureUtils.isClass(returnType)) {
- return AnnotationsCore.createTypeLiteral(ast, value.toString());
- }
-
-
- IType enumType = SignatureUtils.getEnumReturnType(method);
- if (enumType != null) {
- int selected = ((Integer) value).intValue();
- if (selected != -1) {
- if (enumType.isMember()) {
- return AnnotationsCore.createEnumLiteral(ast, enumType.getDeclaringType().getFullyQualifiedName(),
- SignatureUtils.getEnumConstants(enumType)[selected]);
- } else {
- return AnnotationsCore.createEnumLiteral(ast, enumType.getFullyQualifiedName(),
- SignatureUtils.getEnumConstants(enumType)[selected]);
- }
- }
- }
-
- return null;
- }
-
- private void executeChange(IProgressMonitor monitor, Change change) {
- if (change == null) {
- return;
- }
-
- IUndoManager manager = RefactoringCore.getUndoManager();
- boolean successful = false;
- Change undoChange = null;
- try {
- change.initializeValidationData(monitor);
- RefactoringStatus valid = change.isValid(monitor);
- if (valid.isOK()) {
- manager.aboutToPerformChange(change);
- undoChange = change.perform(monitor);
- successful = true;
- }
- } catch (CoreException ce) {
- JAXWSUIPlugin.log(ce.getStatus());
- } finally {
- manager.changePerformed(change, successful);
- }
- if (undoChange != null) {
- undoChange.initializeValidationData(monitor);
- manager.addUndo(undoChange.getName(), undoChange);
- }
- annotationsView.refreshLabels();
- }
-
- private MemberValuePair createArrayMemberValuePair(AST ast, IMethod method, Object[] values) throws JavaModelException {
- return AnnotationsCore.createMemberValuePair(ast, method.getElementName(), createArrayValueLiteral(ast,
- method, values));
- }
-
- private IType getComponentType(IMethod method) throws JavaModelException {
- String returnType = method.getReturnType();
- if (SignatureUtils.isArray(returnType)) {
- String elementType = Signature.getElementType(returnType);
- IType declaringType = method.getDeclaringType();
- IJavaProject javaProject = declaringType.getJavaProject();
- if (javaProject != null) {
- return javaProject.findType(Signature.toString(elementType));
- }
- }
- return null;
- }
-
- private ArrayInitializer createArrayValueLiteral(AST ast, IMethod method, Object[] values) throws JavaModelException {
- ArrayInitializer arrayInitializer = ast.newArrayInitializer();
- for (Object value : values) {
- if (value instanceof List<?>) {
- IType componentType = getComponentType(method);
- if (componentType != null) {
-
- List<MemberValuePair> memberValuePairs = new ArrayList<MemberValuePair>();
- @SuppressWarnings("unchecked")
- List<Map<String, Object>> valuesList = (List<Map<String, Object>>) value;
- Iterator<Map<String, Object>> valuesIterator = valuesList.iterator();
- while (valuesIterator.hasNext()) {
- Map<String, Object> annotationMap = valuesIterator.next();
- Set<Entry<String, Object>> entrySet = annotationMap.entrySet();
- Iterator<Map.Entry<String, Object>> iterator = entrySet.iterator();
- while (iterator.hasNext()) {
- Map.Entry<java.lang.String, Object> entry = iterator.next();
- String memberName = entry.getKey();
- try {
- IMethod annotationMethod = componentType.getMethod(memberName, new String[] {});
- if (annotationMethod != null) {
- Object memberValue = entry.getValue();
- String returnType = annotationMethod.getReturnType();
- if (SignatureUtils.isString(returnType)) {
- memberValuePairs.add(AnnotationsCore.createStringMemberValuePair(ast, memberName,
- memberValue.toString()));
- }
- if (SignatureUtils.isBoolean(returnType)) {
- memberValuePairs.add(AnnotationsCore.createBooleanMemberValuePair(ast, memberName,
- (Boolean) memberValue));
- }
- if (SignatureUtils.isClass(returnType)) {
- String className = memberValue.toString();
- if (className.endsWith(".class")) {
- className = className.substring(0, className.lastIndexOf("."));
- }
- memberValuePairs.add(AnnotationsCore.createMemberValuePair(ast, memberName,
- AnnotationsCore.createTypeLiteral(ast, className)));
- }
- // if (returnType.isPrimitive()) {
- // memberValuePairs.add(getNumberMemberValuePair(ast, memberName, memberValue));
- // }
- }
-
- } catch (SecurityException se) {
- AnnotationsCorePlugin.log(se);
- }
- }
- }
- arrayInitializer.expressions().add(AnnotationsCore.createNormalAnnotation(ast, componentType.getFullyQualifiedName(),
- memberValuePairs));
- }
- }
- }
- return arrayInitializer;
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/views/AnnotationsView.java b/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/views/AnnotationsView.java
deleted file mode 100755
index 520deee..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/views/AnnotationsView.java
+++ /dev/null
@@ -1,474 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Shane Clarke.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Shane Clarke - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.jaxws.ui.views;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.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.graphics.Color;
-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.INullSelectionListener;
-import org.eclipse.ui.IPartListener2;
-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 static final String VIEW_ID = "org.eclipse.jst.ws.jaxws.ui.views.AnnotationsView";
-
- private PageBook pageBook;
- private Tree annotationTree;
-
- private Composite notAvaiableComposite;
- private ClasspathComposite setupClasspathComposite;
-
- private TreeViewer annotationTreeViewer;
-
- 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(getBackgroundColor(parent));
- Label label = new Label(notAvaiableComposite, SWT.NONE);
- label.setBackground(getBackgroundColor(parent));
- 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 IType && obj2 instanceof IType) {
- return ((IType) obj1).getFullyQualifiedName().compareTo(
- ((IType) obj2).getFullyQualifiedName());
- }
- if (obj1 instanceof IMethod && obj2 instanceof IMethod) {
- return ((IMethod) obj1).getElementName().compareTo(((IMethod) obj2).getElementName());
- }
- return super.compare(viewer, obj1, obj2);
- }
- });
-
- //TODO Add a Faceted Project composite
- setupClasspathComposite = new ClasspathComposite(pageBook, SWT.NONE);
-
- pageBook.showPage(notAvaiableComposite);
- }
-
- private Color getBackgroundColor(Composite parent) {
- if (Display.getDefault().getHighContrast()) {
- return parent.getDisplay().getSystemColor(SWT.COLOR_WIDGET_BACKGROUND);
- } else {
- return parent.getDisplay().getSystemColor(SWT.COLOR_WHITE);
- }
- }
-
- private void startListeningForSelectionChanges() {
- getViewSite().getWorkbenchWindow().getSelectionService().addPostSelectionListener(this);
- }
-
- private void stopListeningForSelectionChanges() {
- getViewSite().getWorkbenchWindow().getSelectionService().removePostSelectionListener(this);
- }
-
- public void selectionChanged(IWorkbenchPart part, ISelection selection) {
- IWorkbenchPage workbenchPage = getViewSite().getWorkbenchWindow().getActivePage();
-
- if (workbenchPage == null) {
- return;
- }
-
- IWorkbenchPartReference workbenchPartReference = workbenchPage.getActivePartReference();
-
- if (workbenchPartReference == null || workbenchPartReference.getId().equals(getViewSite().getId())
- || !workbenchPartReference.getId().equals(JavaUI.ID_CU_EDITOR)) {
- return;
- }
-
- IEditorPart editorPart = workbenchPage.getActiveEditor();
-
- IFileEditorInput fileEditorInput = (IFileEditorInput) editorPart.getEditorInput();
-
- if (selection instanceof TextSelection) {
- ITextSelection txtSelection = (TextSelection) selection;
- ICompilationUnit compilationUnit = JavaCore.createCompilationUnitFrom(fileEditorInput.getFile());
- if (compilationUnit != null) {
- updateView(compilationUnit, txtSelection);
- }
- }
- }
-
- public void updateView(IJavaElement javaElement, ITextSelection textSelection) {
- TreePath[] expandedTreePaths = annotationTreeViewer.getExpandedTreePaths();
-
- IJavaProject javaProject = javaElement.getJavaProject();
-
- if (!checkClasspath(javaProject)) {
- annotationTreeViewer.setInput(null);
- pageBook.showPage(setupClasspathComposite);
- return;
- }
-
- pageBook.showPage(annotationTree);
-
- int offset = textSelection.getOffset();
- try {
- ICompilationUnit compilationUnit = null;
- if (javaElement instanceof ICompilationUnit) {
- compilationUnit = (ICompilationUnit)javaElement;
- javaElement = compilationUnit.getElementAt(offset);
- }
-
- if (javaElement == null) {
- return;
- }
-
- if (javaElement.getElementType() == IJavaElement.PACKAGE_DECLARATION) {
- if (javaElement.getResource().getName().equals("package-info.java")) { //$NON-NLS-1$
- setInput(javaElement);
- } else {
- annotationTreeViewer.setInput(null);
- }
- }
-
- if (javaElement.getElementType() == IJavaElement.IMPORT_DECLARATION) {
- annotationTreeViewer.setInput(null);
- }
-
- if (javaElement.getElementType() == IJavaElement.TYPE) {
- IType type = (IType)javaElement;
- if (!type.isMember()) {
- setInput(type);
- } else {
- annotationTreeViewer.setInput(null);
- }
- }
-
- if (javaElement.getElementType() == IJavaElement.FIELD) {
- IField field = (IField)javaElement;
- if (!field.getDeclaringType().isMember()) {
- setInput(field);
- } else {
- annotationTreeViewer.setInput(null);
- }
- }
-
- if (javaElement.getElementType() == IJavaElement.METHOD) {
- IMethod method = (IMethod) javaElement;
- if (!method.getDeclaringType().isMember()) {
- ILocalVariable localVariable = AnnotationUtils.getLocalVariable(method, offset);
- if (localVariable != null) {
- setInput(localVariable);
- } else {
- setInput(method);
- }
- } else {
- annotationTreeViewer.setInput(null);
- }
- }
- annotationTreeViewer.refresh();
- } catch (JavaModelException jme) {
- JAXWSUIPlugin.log(jme.getStatus());
- }
-
- annotationTreeViewer.setExpandedTreePaths(expandedTreePaths);
- }
-
- private void setInput(IJavaElement javaElement) {
- if (annotationTreeViewer.getInput() == null) {
- annotationTreeViewer.setInput(javaElement);
- } else if (!annotationTreeViewer.getInput().equals(javaElement)) {
- annotationTreeViewer.setInput(javaElement);
- }
- }
-
- private boolean checkClasspath(IJavaProject javaProject) {
- List<String> categories = new ArrayList<String>();
- categories.addAll(AnnotationsManager.getAnnotationCategories());
- ViewerFilter[] viewerFilters = annotationTreeViewer.getFilters();
- for (ViewerFilter viewerFilter : viewerFilters) {
- if (viewerFilter instanceof AnnotationsViewCategoryFilter) {
- categories.removeAll(((AnnotationsViewCategoryFilter)viewerFilter).getCategories());
- }
- }
-
- boolean jwsReady = true;
- try {
- for (String category : categories) {
- List<AnnotationDefinition> annotationDefinitions = AnnotationsManager
- .getAnnotationsByCategory(category);
- String className = annotationDefinitions.get(0).getAnnotationClassName();
- if (javaProject.findType(className) == null) {
- jwsReady = false;
- setupClasspathComposite.updateLibraryLabel(category);
- break;
- } else {
- continue;
- }
- }
- } catch (JavaModelException jme) {
- JAXWSUIPlugin.log(jme.getStatus());
- }
- return jwsReady;
- }
-
- public void partActivated(IWorkbenchPartReference partRef) {
- IWorkbenchPart workbenchPart = partRef.getPart(false);
- if (partRef.getId().equals(JavaUI.ID_CU_EDITOR)) {
- javaEditorActivated((IEditorPart) workbenchPart);
- } else if (partRef.getId().equals(getViewSite().getId())) {
- annotationsViewActivated();
- } else {
- clearAnnotationsView();
- }
- }
-
- public void partDeactivated(IWorkbenchPartReference partRef) {
- }
-
- public void partVisible(IWorkbenchPartReference partRef) {
- if (partRef.getId().equals(getViewSite().getId())) {
- startListeningForSelectionChanges();
- }
- }
-
- public void partHidden(IWorkbenchPartReference partRef) {
- if (partRef.getId().equals(getViewSite().getId())) {
- stopListeningForSelectionChanges();
- }
- }
-
- public void partOpened(IWorkbenchPartReference partRef) {
- if (partRef.getId().equals(VIEW_ID)) {
- annotationsViewFilterAction.init();
- }
- }
-
- 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());
- }
- }
- }
- }
- } else if (partRef.getId().equals(VIEW_ID)) {
- annotationsViewFilterAction.saveState();
- }
- }
-
- 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);
- }
-
- 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);
- manager.add(annotationsViewFilterAction);
- }
-
- /**
- * Passing the focus request to the viewer's control.
- */
- @Override
- public void setFocus() {
- annotationTreeViewer.getControl().setFocus();
- }
-
- public void refreshLabels() {
- annotationTreeViewer.refresh();
- }
-
- public void refresh() {
- Display display = annotationTreeViewer.getControl().getDisplay();
- if (!display.isDisposed()) {
- display.asyncExec(new Runnable() {
- public void run() {
- IWorkbenchWindow workbenchWindow = PlatformUI.getWorkbench().getActiveWorkbenchWindow();
- IWorkbenchPage workbenchPage = workbenchWindow.getActivePage();
- IEditorPart editorPart = workbenchPage.getActiveEditor();
- try {
- if (editorPart != null
- && editorPart.getEditorInput() instanceof IFileEditorInput
- && IDE.getEditorDescriptor(
- ((IFileEditorInput) editorPart.getEditorInput()).getFile()).getId()
- .equals(JavaUI.ID_CU_EDITOR)) {
- ITextEditor txtEditor = (ITextEditor) workbenchPage.getActiveEditor();
- IFileEditorInput fileEditorInput = (IFileEditorInput) txtEditor.getEditorInput();
- ICompilationUnit compilationUnit = JavaCore.createCompilationUnitFrom(fileEditorInput.getFile());
- if (compilationUnit != null) {
- if (!compilationUnit.isConsistent()) {
- compilationUnit.makeConsistent(new NullProgressMonitor());
- }
- updateView(compilationUnit, (ITextSelection) txtEditor.getSelectionProvider()
- .getSelection());
- }
- }
- } catch (JavaModelException jme) {
- JAXWSUIPlugin.log(jme.getStatus());
- } catch (PartInitException pie) {
- JAXWSUIPlugin.log(pie.getStatus());
- }
- }
- });
- }
- }
-} \ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/views/AnnotationsViewCategoryFilter.java b/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/views/AnnotationsViewCategoryFilter.java
deleted file mode 100644
index 2ce5ca4..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/views/AnnotationsViewCategoryFilter.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.internal.jaxws.ui.views;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jface.dialogs.IDialogSettings;
-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.jst.ws.internal.jaxws.ui.JAXWSUIPlugin;
-
-public class AnnotationsViewCategoryFilter extends ViewerFilter {
- 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 IType) {
- AnnotationDefinition annotationDefinition = AnnotationsManager.getAnnotationDefinitionForType((IType) 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() {
- IDialogSettings settings = JAXWSUIPlugin.getDefault().getDialogSettings();
- String[] cat = settings.getArray(TAG_CATEGORY_NAME);
- if (cat != null) {
- for (String category : cat) {
- categories.add(category);
- }
- }
- filterAnnotations(categories);
- }
-
- public void saveState() {
- IDialogSettings settings = JAXWSUIPlugin.getDefault().getDialogSettings();
- settings.put(TAG_CATEGORY_NAME, categories.toArray(new String[categories.size()]));
- }
-}
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 39f4867..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/views/AnnotationsViewContentProvider.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Shane Clarke.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Shane Clarke - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.jaxws.ui.views;
-
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jface.viewers.ITreeContentProvider;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jst.ws.annotations.core.AnnotationsManager;
-import org.eclipse.jst.ws.internal.jaxws.ui.JAXWSUIPlugin;
-
-public class AnnotationsViewContentProvider implements ITreeContentProvider {
-
- public Object[] getChildren(Object parentElement) {
- if (parentElement instanceof IType) {
- try {
- return ((IType) parentElement).getMethods();
- } catch (JavaModelException jme) {
- JAXWSUIPlugin.log(jme.getStatus());
- }
- }
- return new Object[] {};
- }
-
- public Object getParent(Object element) {
- return null;
- }
-
- public boolean hasChildren(Object element) {
- if (element instanceof IType) {
- try {
- return ((IType) element).getMethods().length > 0;
- } catch (JavaModelException jme) {
- JAXWSUIPlugin.log(jme.getStatus());
- }
- }
- return false;
- }
-
- public Object[] getElements(Object inputElement) {
- if (inputElement != null && inputElement instanceof IJavaElement && ((IJavaElement) inputElement).exists()) {
- IJavaElement javaElement = (IJavaElement) inputElement;
- return AnnotationsManager.getAnnotationTypes(javaElement).toArray();
- }
- return new Object[] {};
- }
-
- public void dispose() {
-
- }
-
- public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/views/ClassDialogCellEditor.java b/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/views/ClassDialogCellEditor.java
deleted file mode 100644
index f1d0942..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 && value.toString().trim().length() > 0) {
- 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 afe746f..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/widgets/ClasspathComposite.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.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.graphics.Color;
-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.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(getBackgroundColor());
- informationLabel = new Label(this, SWT.NONE);
- informationLabel.setBackground(getBackgroundColor());
- 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(getBackgroundColor());
- link.setText(JAXWSUIMessages.CONFIGURE_JAVA_1_6_LIBRARY);
- link.addSelectionListener(new SelectionAdapter() {
- @Override
- 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 Color getBackgroundColor() {
- if (Display.getDefault().getHighContrast()) {
- return getParent().getDisplay().getSystemColor(SWT.COLOR_WIDGET_BACKGROUND);
- } else {
- return getParent().getDisplay().getSystemColor(SWT.COLOR_WHITE);
- }
- }
-
- private IProject getProject() {
- return ((FileEditorInput) PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage()
- .getActiveEditor().getEditorInput()).getFile().getProject();
- }
-
-
- public void updateLibraryLabel(String libraryName) {
- informationLabel.setText(JAXWSUIMessages.bind(
- JAXWSUIMessages.ANNOTATIONS_VIEW_NO_SUITABLE_LIBRARY_FOUND, libraryName));
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/wizards/AddHandlerChainPage.java b/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/wizards/AddHandlerChainPage.java
deleted file mode 100644
index 6b3317d..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/wizards/AddHandlerChainPage.java
+++ /dev/null
@@ -1,376 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 Shane Clarke.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Shane Clarke - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.jaxws.ui.wizards;
-
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jdt.core.IPackageFragmentRoot;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jdt.ui.JavaElementLabelProvider;
-import org.eclipse.jdt.ui.StandardJavaElementContentProvider;
-import org.eclipse.jface.window.Window;
-import org.eclipse.jface.wizard.WizardPage;
-import org.eclipse.jst.ws.internal.jaxws.ui.JAXWSUIMessages;
-import org.eclipse.jst.ws.internal.jaxws.ui.JAXWSUIPlugin;
-import org.eclipse.jst.ws.internal.jaxws.ui.dialogs.HandlerChainSelectionDialog;
-import org.eclipse.jst.ws.internal.jaxws.ui.dialogs.NewHandlerChainDialog;
-import org.eclipse.jst.ws.internal.jaxws.ui.filters.NewHandlerChainViewerFilter;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.KeyAdapter;
-import org.eclipse.swt.events.KeyEvent;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Text;
-
-public class AddHandlerChainPage extends WizardPage {
-
- private IStatus ok_status = new Status(IStatus.OK, JAXWSUIPlugin.PLUGIN_ID, ""); //$NON-NLS-1$
- private IStatus addNewHandlerChainStatus = Status.OK_STATUS;
- private IStatus editHandlerChainStatus = Status.OK_STATUS;
-
- private IType type;
-
- private Button createHandlerChainButton;
- private Text newHandlerChainText;
- private Button browseNewHandlerChainButton;
-
- private Button editHandlerChainButton;
- private Text exisitingHandlerChainText;
- private Button browseExistingHandlerChainButton;
-
- private boolean fileCreated;
-
- protected AddHandlerChainPage(IType type) {
- super("add.handlerchain.wizard.page"); //$NON-NLS-1$
- this.type = type;
- setTitle(JAXWSUIMessages.JAXWS_ADD_HANDLER_WIZARD_PAGE_TITLE);
- setDescription(JAXWSUIMessages.JAXWS_ADD_HANDLER_WIZARD_PAGE_DESCRIPTION);
- }
-
- public void createControl(Composite parent) {
- initializeDialogUnits(parent);
-
- Composite composite = new Composite(parent, SWT.NONE);
- composite.setFont(parent.getFont());
-
- int nColumns = 4;
-
- GridLayout gridLayout = new GridLayout();
- gridLayout.numColumns= nColumns;
- composite.setLayout(gridLayout);
-
- createHandlerChainButton = new Button(composite, SWT.RADIO);
- createHandlerChainButton.setText(JAXWSUIMessages.JAXWS_HANDLER_CONFIGURATION_CREATE);
- GridData gridData = new GridData(SWT.FILL, SWT.FILL, true, false);
- gridData.horizontalSpan = 4;
- createHandlerChainButton.setLayoutData(gridData);
- createHandlerChainButton.addSelectionListener(new SelectionAdapter() {
-
- @Override
- public void widgetSelected(SelectionEvent e) {
- Button button = (Button) e.widget;
- enableNewHandlerChainFileWidgets(button.getSelection());
- enableEditHandlerChainFileWidgets(!button.getSelection());
- updateConfigureHandlerStatus();
- }
- });
-
- Label createNewHandlerLabel = new Label(composite, SWT.NONE);
- createNewHandlerLabel.setText(JAXWSUIMessages.JAXWS_HANDLER_CONFIGURATION_FILE_PATH1);
-
- newHandlerChainText = new Text(composite, SWT.SINGLE | SWT.BORDER);
- newHandlerChainText.setFont(composite.getFont());
- gridData = new GridData(SWT.FILL, SWT.CENTER, true, false);
- gridData.horizontalSpan = 2;
- newHandlerChainText.setLayoutData(gridData);
-
- newHandlerChainText.addKeyListener(new KeyAdapter() {
-
- @Override
- public void keyReleased(KeyEvent e) {
- updateConfigureHandlerStatus();
- }
- });
-
- browseNewHandlerChainButton = new Button(composite, SWT.PUSH);
- browseNewHandlerChainButton.setText(JAXWSUIMessages.JAXWS_HANDLER_CONFIGURATION_BROWSE1);
- gridData = new GridData(SWT.END, SWT.FILL, false, false);
- browseNewHandlerChainButton.setLayoutData(gridData);
- browseNewHandlerChainButton.addSelectionListener(new SelectionAdapter() {
-
- @Override
- public void widgetSelected(SelectionEvent e) {
- NewHandlerChainDialog dialog = new NewHandlerChainDialog(getShell(),
- new JavaElementLabelProvider(), new StandardJavaElementContentProvider());
- dialog.setInput(JavaCore.create(ResourcesPlugin.getWorkspace().getRoot()));
- dialog.addFilter(new NewHandlerChainViewerFilter(type.getJavaProject(), true, true));
- if (dialog.open() == Window.OK) {
- newHandlerChainText.setText(dialog.getFilePath());
- updateConfigureHandlerStatus();
- }
- }
- });
-
- editHandlerChainButton = new Button(composite, SWT.RADIO);
- editHandlerChainButton.setText(JAXWSUIMessages.JAXWS_HANDLER_CONFIGURATION_CHOOSE);
- gridData = new GridData(SWT.FILL, SWT.FILL, true, false);
- gridData.horizontalSpan = 4;
- editHandlerChainButton.setLayoutData(gridData);
-
- Label addToHandlerLabel = new Label(composite, SWT.NONE);
- addToHandlerLabel.setText(JAXWSUIMessages.JAXWS_HANDLER_CONFIGURATION_FILE_PATH3);
-
- editHandlerChainButton.addSelectionListener(new SelectionAdapter() {
-
- @Override
- public void widgetSelected(SelectionEvent e) {
- updateConfigureHandlerStatus();
- }
-
- });
-
- exisitingHandlerChainText = new Text(composite, SWT.SINGLE | SWT.BORDER);
- exisitingHandlerChainText.setFont(composite.getFont());
- gridData = new GridData(SWT.FILL, SWT.CENTER, true, false);
- gridData.horizontalSpan = 2;
- exisitingHandlerChainText.setLayoutData(gridData);
- exisitingHandlerChainText.addKeyListener(new KeyAdapter() {
-
- @Override
- public void keyReleased(KeyEvent e) {
- updateConfigureHandlerStatus();
- }
-
- });
-
- browseExistingHandlerChainButton = new Button(composite, SWT.PUSH);
- browseExistingHandlerChainButton.setText(JAXWSUIMessages.JAXWS_HANDLER_CONFIGURATION_BROWSE2);
- gridData = new GridData(SWT.FILL, SWT.FILL, false, false);
- browseExistingHandlerChainButton.setLayoutData(gridData);
-
- browseExistingHandlerChainButton.addSelectionListener(new SelectionAdapter() {
-
- @Override
- public void widgetSelected(SelectionEvent e) {
- HandlerChainSelectionDialog dialog = new HandlerChainSelectionDialog(getShell(),
- new JavaElementLabelProvider(), new StandardJavaElementContentProvider());
-
- dialog.setInput(JavaCore.create(ResourcesPlugin.getWorkspace().getRoot()));
- dialog.addFilter(new NewHandlerChainViewerFilter(type.getJavaProject(), false, true));
-
- if (dialog.open() == Window.OK) {
- Object[] result = dialog.getResult();
- IResource resource = (IResource) result[0];
- exisitingHandlerChainText.setText(resource.getFullPath().toOSString());
- updateConfigureHandlerStatus();
- }
- }
- });
-
-
- setInitialSelection();
- setControl(composite);
- }
-
- private void setInitialSelection() {
- IPath handlerChainPath = new Path(type.getResource().getParent().getFullPath().addTrailingSeparator()
- + "handler-chain.xml");
- IResource handlerChain = ResourcesPlugin.getWorkspace().getRoot().getFile(handlerChainPath);
- if (handlerChain.exists()) {
- editHandlerChainButton.setSelection(true);
- exisitingHandlerChainText.setText(handlerChainPath.toString());
- enableNewHandlerChainFileWidgets(false);
- enableEditHandlerChainFileWidgets(true);
- } else {
- createHandlerChainButton.setSelection(true);
- newHandlerChainText.setText(handlerChainPath.toString());
- enableNewHandlerChainFileWidgets(true);
- enableEditHandlerChainFileWidgets(false);
- }
- updateConfigureHandlerStatus();
- }
-
- public void setFileCreated(boolean fileCreated) {
- this.fileCreated = fileCreated;
- }
-
- @Override
- public void setVisible(boolean visible) {
- super.setVisible(visible);
- if (visible && fileCreated) {
- ((ConfigureHandlerWizard) getWizard()).deleteFile(new Path(getNewHandlerChainPath()));
- }
- }
-
- private void enableEditHandlerChainFileWidgets(boolean enable) {
- exisitingHandlerChainText.setEnabled(enable);
- browseExistingHandlerChainButton.setEnabled(enable);
- }
-
- private void enableNewHandlerChainFileWidgets(boolean enable) {
- newHandlerChainText.setEnabled(enable);
- browseNewHandlerChainButton.setEnabled(enable);
- }
-
- public boolean isCreateHandlerChain() {
- return createHandlerChainButton.getSelection();
- }
-
- public boolean isEditHandlerChain() {
- return editHandlerChainButton.getSelection();
- }
-
- public String getNewHandlerChainPath() {
- return newHandlerChainText.getText();
- }
-
- public String getExistingHandlerChainPath() {
- return exisitingHandlerChainText.getText();
- }
-
- private void updateConfigureHandlerStatus() {
- try {
- validateNewHandlerChainField();
- validateExistingHandlerChainField();
- if (addNewHandlerChainStatus.getSeverity() != IStatus.OK || editHandlerChainStatus.getSeverity() != IStatus.OK) {
- setErrorMessage(findMostSevere().getMessage());
- setPageComplete(false);
- } else {
- setErrorMessage(null);
- setPageComplete(true);
- }
- } catch (JavaModelException jme) {
- JAXWSUIPlugin.log(jme.getStatus());
- }
- }
-
- private IStatus findMostSevere() {
- if (addNewHandlerChainStatus.getSeverity() > editHandlerChainStatus.getSeverity()) {
- return addNewHandlerChainStatus;
- }
- if (editHandlerChainStatus.getSeverity() > addNewHandlerChainStatus.getSeverity()) {
- return editHandlerChainStatus;
- }
- if (addNewHandlerChainStatus.getSeverity() == editHandlerChainStatus.getSeverity()) {
- return addNewHandlerChainStatus;
- }
-
- return addNewHandlerChainStatus;
- }
-
- private IStatus validateNewHandlerChainField() throws JavaModelException {
- if (isCreateHandlerChain()) {
- editHandlerChainStatus = ok_status;
- String newHandlerChainPath = getNewHandlerChainPath().trim();
- if (newHandlerChainPath.length() == 0) {
- return addNewHandlerChainStatus = new Status(IStatus.ERROR, JAXWSUIPlugin.PLUGIN_ID,
- JAXWSUIMessages.JAXWS_HANDLER_CONFIGURATION_NEW_HANDLER_PATH_EMTPY);
- }
-
- if (!newHandlerChainPath.endsWith(".xml")) { //$NON-NLS-1$
- return addNewHandlerChainStatus = new Status(IStatus.ERROR, JAXWSUIPlugin.PLUGIN_ID,
- JAXWSUIMessages.JAXWS_HANDLER_CONFIGURATION_CREATE_DIALOG_INVALID_NAME);
- }
-
- IPath path = new Path(newHandlerChainPath);
- if (path.segmentCount() >= 2) {
- String[] segmenets = path.segments();
- if (!segmenets[0].equals(type.getJavaProject().getElementName())) {
- return addNewHandlerChainStatus = new Status(IStatus.ERROR, JAXWSUIPlugin.PLUGIN_ID,
- JAXWSUIMessages.bind(JAXWSUIMessages.JAXWS_HANDLER_CONFIGURATION_CREATE_DIALOG_FILE_PROJECT,
- type.getJavaProject().getElementName()));
- }
- boolean inSourceFolder = false;
- IPackageFragmentRoot[] packageFragmentRoots = type.getJavaProject().getPackageFragmentRoots();
- for (IPackageFragmentRoot packageFragmentRoot : packageFragmentRoots) {
- if (segmenets[1].equals(packageFragmentRoot.getElementName())) {
- inSourceFolder = true;
- break;
- }
- }
- if (!inSourceFolder) {
- return addNewHandlerChainStatus = new Status(IStatus.ERROR, JAXWSUIPlugin.PLUGIN_ID,
- JAXWSUIMessages.bind(JAXWSUIMessages.JAXWS_HANDLER_CONFIGURATION_CREATE_DIALOG_FILE_PROJECT,
- type.getJavaProject().getElementName()));
- }
- if (path.lastSegment() != null && path.lastSegment().equals(".xml")) { //$NON-NLS-1$
- return addNewHandlerChainStatus = new Status(IStatus.ERROR, JAXWSUIPlugin.PLUGIN_ID,
- JAXWSUIMessages.JAXWS_HANDLER_CONFIGURATION_CREATE_DIALOG_EMPTY_FILE_NAME);
- }
- } else {
- return addNewHandlerChainStatus = new Status(IStatus.ERROR, JAXWSUIPlugin.PLUGIN_ID,
- JAXWSUIMessages.bind(JAXWSUIMessages.JAXWS_HANDLER_CONFIGURATION_CREATE_DIALOG_FILE_PROJECT,
- type.getJavaProject().getElementName()));
- }
-
- IResource res = ResourcesPlugin.getWorkspace().getRoot().findMember(path);
- if (res != null && res.exists()) {
- return addNewHandlerChainStatus = new Status(IStatus.ERROR, JAXWSUIPlugin.PLUGIN_ID,
- JAXWSUIMessages.bind(JAXWSUIMessages.JAXWS_HANDLER_CONFIGURATION_CREATE_DIALOG_FILE_EXISTS,
- res.getName()));
- }
-
- return addNewHandlerChainStatus = ok_status;
- } else {
- return addNewHandlerChainStatus = ok_status;
- }
- }
-
- private IStatus validateExistingHandlerChainField() {
- if (isEditHandlerChain()) {
- addNewHandlerChainStatus = ok_status;
- String existingHandlerChainPath = getExistingHandlerChainPath().trim();
- if (existingHandlerChainPath.length() == 0) {
- return editHandlerChainStatus = new Status(IStatus.ERROR, JAXWSUIPlugin.PLUGIN_ID,
- JAXWSUIMessages.JAXWS_HANDLER_CONFIGURATION_EXISTING_HANDLER_PATH_EMTPY);
- }
-
- if (!existingHandlerChainPath.endsWith(".xml")) { //$NON-NLS-1$
- return editHandlerChainStatus = new Status(IStatus.ERROR, JAXWSUIPlugin.PLUGIN_ID,
- JAXWSUIMessages.JAXWS_HANDLER_CONFIGURATION_CREATE_DIALOG_INVALID_NAME);
- }
-
- IWorkspace workspace = ResourcesPlugin.getWorkspace();
- IPath path = new Path(existingHandlerChainPath);
-
- if (path.segmentCount() >= 2) {
- if (path.lastSegment() != null && path.lastSegment().equals(".xml")) { //$NON-NLS-1$
- return addNewHandlerChainStatus = new Status(IStatus.ERROR, JAXWSUIPlugin.PLUGIN_ID,
- JAXWSUIMessages.JAXWS_HANDLER_CONFIGURATION_CREATE_DIALOG_EMPTY_FILE_NAME);
- }
- }
-
- if (path.segmentCount() >= 2 && path.segment(0).equals(type.getJavaProject().getElementName())
- && workspace.getRoot().getFile(path).exists()) {
- return editHandlerChainStatus = ok_status;
- } else {
- return editHandlerChainStatus = new Status(IStatus.ERROR, JAXWSUIPlugin.PLUGIN_ID,
- JAXWSUIMessages.bind(JAXWSUIMessages.JAXWS_HANDLER_CONFIGURATION_EDIT_FILE_NOT_FOUND,
- existingHandlerChainPath));
- }
- } else {
- return editHandlerChainStatus = ok_status;
- }
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/wizards/ConfigureHandlerWizard.java b/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/wizards/ConfigureHandlerWizard.java
deleted file mode 100644
index 3cf7e82..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/wizards/ConfigureHandlerWizard.java
+++ /dev/null
@@ -1,206 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 Shane Clarke.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Shane Clarke - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.jaxws.ui.wizards;
-
-import java.lang.reflect.InvocationTargetException;
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.jws.HandlerChain;
-
-import org.eclipse.core.resources.IContainer;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.jobs.ISchedulingRule;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.dom.AST;
-import org.eclipse.jdt.core.dom.ASTParser;
-import org.eclipse.jdt.core.dom.Annotation;
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jdt.core.dom.MemberValuePair;
-import org.eclipse.jface.wizard.IWizardPage;
-import org.eclipse.jface.wizard.Wizard;
-import org.eclipse.jst.ws.annotations.core.AnnotationsCore;
-import org.eclipse.jst.ws.annotations.core.utils.AnnotationUtils;
-import org.eclipse.jst.ws.internal.jaxws.core.utils.JAXWSHandlerUtils;
-import org.eclipse.jst.ws.internal.jaxws.ui.JAXWSUIMessages;
-import org.eclipse.jst.ws.internal.jaxws.ui.JAXWSUIPlugin;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.actions.WorkspaceModifyOperation;
-
-public class ConfigureHandlerWizard extends Wizard {
- private AddHandlerChainPage addHandlerChainPage;
- private OrderHandlerChainPage orderHandlerChainPage;
-
- private boolean fileCreated;
- private boolean addAnnotation;
-
- private IPath handlerChainPath;
- private IType type;
-
- public ConfigureHandlerWizard(IType type) {
- this.type = type;
- setWindowTitle(JAXWSUIMessages.JAXWS_CONFIGURE_HANDLER_WIZARD_TITLE);
- //TODO replace with dedicated handler wizban
- setDefaultPageImageDescriptor(JAXWSUIPlugin.getImageDescriptor("$nl$/icons/wizban/new_wiz.png")); //$NON-NLS-1$
- handlerChainPath = getHandlerChainPath(type);
- }
-
- @Override
- public void addPages() {
- if (addHandlerChainPage == null) {
- addHandlerChainPage = new AddHandlerChainPage(type);
- }
- if (orderHandlerChainPage == null) {
- orderHandlerChainPage = new OrderHandlerChainPage(handlerChainPath, type.getJavaProject());
- }
- if (handlerChainPath != null && handlerChainPath.isEmpty()) {
- addPage(addHandlerChainPage);
- }
- addPage(orderHandlerChainPage);
- }
-
- @Override
- public IWizardPage getNextPage(IWizardPage page) {
- if (page == addHandlerChainPage && addHandlerChainPage.isPageComplete()) {
- if (addHandlerChainPage.isCreateHandlerChain()) {
- handlerChainPath = new Path(addHandlerChainPage.getNewHandlerChainPath());
- orderHandlerChainPage.setHandlerChainPath(handlerChainPath);
- addAnnotation = true;
- fileCreated = true;
- addHandlerChainPage.setFileCreated(fileCreated);
- }
- if (addHandlerChainPage.isEditHandlerChain()) {
- handlerChainPath = new Path(addHandlerChainPage.getExistingHandlerChainPath());
- orderHandlerChainPage.setHandlerChainPath(handlerChainPath);
- addAnnotation = true;
- fileCreated = false;
- addHandlerChainPage.setFileCreated(fileCreated);
- }
- }
- return super.getNextPage(page);
- }
-
- private IPath getHandlerChainPath(IType type) {
- if (type != null) {
- Annotation handlerChain = AnnotationUtils.getAnnotation(type, HandlerChain.class);
- if (handlerChain != null) {
- String file = AnnotationUtils.getStringValue(handlerChain, "file"); //$NON-NLS-1$
- if (file != null) {
- if (!file.startsWith("../")) { //$NON-NLS-1$
- return type.getPackageFragment().getPath().append(new Path(file));
- } else {
- return findHandlerChainPath(file);
- }
- }
- }
- }
- return Path.EMPTY;
- }
-
- private IPath findHandlerChainPath(String file) {
- IContainer container = type.getResource().getParent();
- if (container != null) {
- while(file.startsWith("../")) { //$NON-NLS-1$
- file = file.substring(3);
- if (container != null) {
- container = container.getParent();
- }
- }
- if (container != null) {
- IResource handlerChainFile = container.findMember(file);
- if (handlerChainFile != null) {
- return handlerChainFile.getFullPath();
- }
- }
- }
- return Path.EMPTY;
- }
-
- @Override
- public boolean performFinish() {
- try {
-
- ISchedulingRule rule = null;
- Job job = Job.getJobManager().currentJob();
- if (job != null) {
- rule = job.getRule();
- } else {
- rule = ResourcesPlugin.getWorkspace().getRoot();
- }
- WorkspaceModifyOperation workspaceModifyOperation = new WorkspaceModifyOperation(rule) {
-
- @Override
- protected void execute(IProgressMonitor monitor) throws CoreException, InvocationTargetException, InterruptedException {
- if (addAnnotation) {
- IFile handlerChainFile = ResourcesPlugin.getWorkspace().getRoot().getFile(handlerChainPath);
-
- URI relativeURI = URI.createPlatformResourceURI(handlerChainFile.getLocation().toOSString(),
- false).deresolve(
- URI.createPlatformResourceURI(type.getResource().getLocation().toOSString(),
- false));
-
- ICompilationUnit compilationUnit = type.getCompilationUnit();
- ASTParser parser = ASTParser.newParser(AST.JLS3);
- parser.setSource(compilationUnit);
- CompilationUnit cu = (CompilationUnit)parser.createAST(null);
- List<MemberValuePair> memberValuePairs = new ArrayList<MemberValuePair>();
- MemberValuePair filePair = AnnotationsCore.createStringMemberValuePair(cu.getAST(),
- "file", relativeURI.toFileString()); //$NON-NLS-1$
- memberValuePairs.add(filePair);
- Annotation handlerChainAnnotation = AnnotationsCore.createNormalAnnotation(cu.getAST(),
- HandlerChain.class.getSimpleName(), memberValuePairs);
- AnnotationUtils.addAnnotation(type, handlerChainAnnotation);
- AnnotationUtils.addImport(type, HandlerChain.class.getCanonicalName());
- }
- JAXWSHandlerUtils.writeDocumentToFile(handlerChainPath, orderHandlerChainPage.getDocument());
- }
- };
- PlatformUI.getWorkbench().getProgressService().runInUI(getContainer(), workspaceModifyOperation, rule);
- } catch (InvocationTargetException ite) {
- JAXWSUIPlugin.log(ite);
- return false;
- } catch (InterruptedException ie) {
- JAXWSUIPlugin.log(ie);
- return false;
- }
- return true;
- }
-
- public void deleteFile(IPath filePath) {
- IFile handlerFile = ResourcesPlugin.getWorkspace().getRoot().getFile(filePath);
- if (handlerFile.exists()) {
- try {
- handlerFile.delete(true, null);
- } catch (CoreException ce) {
- JAXWSUIPlugin.log(ce.getStatus());
- }
- }
- }
-
- @Override
- public boolean performCancel() {
- if (fileCreated) {
- IPath filePath = type.getPackageFragment().getPath().append(new Path("handler-chain.xml")); //$NON-NLS-1$
- deleteFile(filePath);
- }
- return super.performCancel();
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/wizards/NewJAXWSHandlerWizard.java b/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/wizards/NewJAXWSHandlerWizard.java
deleted file mode 100644
index 8d5921e..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/wizards/NewJAXWSHandlerWizard.java
+++ /dev/null
@@ -1,208 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Shane Clarke.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Shane Clarke - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.jaxws.ui.wizards;
-
-import java.lang.reflect.InvocationTargetException;
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.jws.HandlerChain;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.jobs.ISchedulingRule;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.dom.AST;
-import org.eclipse.jdt.core.dom.ASTParser;
-import org.eclipse.jdt.core.dom.Annotation;
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jdt.core.dom.MemberValuePair;
-import org.eclipse.jdt.core.dom.NormalAnnotation;
-import org.eclipse.jdt.core.dom.StringLiteral;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.wizard.IWizardPage;
-import org.eclipse.jface.wizard.Wizard;
-import org.eclipse.jst.ws.annotations.core.AnnotationsCore;
-import org.eclipse.jst.ws.annotations.core.utils.AnnotationUtils;
-import org.eclipse.jst.ws.internal.jaxws.core.utils.JAXWSHandlerUtils;
-import org.eclipse.jst.ws.internal.jaxws.ui.JAXWSUIMessages;
-import org.eclipse.jst.ws.internal.jaxws.ui.JAXWSUIPlugin;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.INewWizard;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.actions.WorkspaceModifyOperation;
-import org.eclipse.ui.ide.IDE;
-import org.eclipse.ui.wizards.newresource.BasicNewResourceWizard;
-
-public class NewJAXWSHandlerWizard extends Wizard implements INewWizard {
- private IWorkbench workbench;
- private IStructuredSelection selection;
-
- private NewJAXWSHandlerWizardPage handlerWizardPage;
- private OrderHandlerChainPage handlerOrderPage;
-
- @Override
- public void addPages() {
- if (handlerWizardPage == null) {
- handlerWizardPage= new NewJAXWSHandlerWizardPage();
- handlerWizardPage.init(getSelection());
- }
-
- if (handlerOrderPage == null) {
- handlerOrderPage = new OrderHandlerChainPage();
- }
- addPage(handlerWizardPage);
- addPage(handlerOrderPage);
- }
-
- public NewJAXWSHandlerWizard() {
- setWindowTitle(JAXWSUIMessages.JAXWS_HANDLER_WIZARD_TITLE);
- //TODO replace with dedicated handler wizban
- setDefaultPageImageDescriptor(JAXWSUIPlugin.getImageDescriptor("$nl$/icons/wizban/new_wiz.png")); //$NON-NLS-1$
- }
-
- @Override
- public IWizardPage getNextPage(IWizardPage page) {
- if (page == handlerWizardPage && handlerWizardPage.isConfigureHandlerChain() && handlerWizardPage.isEditHandlerChain()) {
- handlerOrderPage.setJavaProject(handlerWizardPage.getJavaProject());
- IPath handlerChainPath = new Path(handlerWizardPage.getExistingHandlerChainPath());
- handlerOrderPage.setInput(handlerChainPath);
- handlerOrderPage.addHandler(handlerWizardPage.getTypeName(), handlerWizardPage.getPackageText(), handlerWizardPage.getSelectedHandlerType());
- return handlerOrderPage;
- }
- return null;
- }
-
- @Override
- public boolean performFinish() {
- try {
-
- ISchedulingRule rule = null;
- Job job = Job.getJobManager().currentJob();
- if (job != null) {
- rule = job.getRule();
- } else {
- rule = ResourcesPlugin.getWorkspace().getRoot();
- }
- WorkspaceModifyOperation workspaceModifyOperation = new WorkspaceModifyOperation(rule) {
-
- @Override
- protected void execute(IProgressMonitor monitor) throws CoreException,
- InvocationTargetException, InterruptedException {
- handlerWizardPage.createType(monitor);
- IType type = handlerWizardPage.getCreatedType();
- if (handlerWizardPage.isConfigureHandlerChain()) {
- if (handlerWizardPage.isCreateHandlerChain()) {
- IPath handlerChainPath = new Path(handlerWizardPage.getNewHandlerChainPath());
- JAXWSHandlerUtils.createHandlerChainFile(handlerChainPath);
- JAXWSHandlerUtils.addHandlerToHandlerChain(handlerChainPath, type.getElementName(), type.getFullyQualifiedName());
- } else if (handlerWizardPage.isEditHandlerChain()) {
- IPath handlerChainPath = new Path(handlerWizardPage.getExistingHandlerChainPath());
- JAXWSHandlerUtils.writeDocumentToFile(handlerChainPath, handlerOrderPage.getDocument());
- }
- if (handlerWizardPage.isAssociateHandlerChain()) {
- String fullyQualifiedName = handlerWizardPage.getSelectedWebServicePath();
- IType webServiceType = handlerWizardPage.getJavaProject().findType(fullyQualifiedName);
- IPath handlerChainPath = new Path(handlerWizardPage.getHandlerChainPath());
- IFile handlerChainFile = ResourcesPlugin.getWorkspace().getRoot().getFile(handlerChainPath);
-
- URI relativeURI = URI.createPlatformResourceURI(handlerChainFile.getLocation().toOSString(),
- false).deresolve(
- URI.createPlatformResourceURI(webServiceType.getResource().getLocation().toOSString(),
- false));
-
- ICompilationUnit compilationUnit = webServiceType.getCompilationUnit();
- ASTParser parser = ASTParser.newParser(AST.JLS3);
- parser.setSource(compilationUnit);
- CompilationUnit cu = (CompilationUnit)parser.createAST(null);
-
- Annotation annotation = AnnotationUtils.getAnnotation(webServiceType, HandlerChain.class);
- if (annotation != null && annotation instanceof NormalAnnotation) {
- NormalAnnotation handlerChainAnnotation = (NormalAnnotation) annotation;
- MemberValuePair filePair = AnnotationUtils.getMemberValuePair(handlerChainAnnotation,
- "file"); //$NON-NLS-1$
- if (filePair != null) {
- StringLiteral file = AnnotationsCore.createStringLiteral(cu.getAST(),
- relativeURI.toFileString());
- AnnotationUtils.updateMemberValuePair(filePair, file);
- }
- } else {
- List<MemberValuePair> memberValuePairs = new ArrayList<MemberValuePair>();
- MemberValuePair filePair = AnnotationsCore.createStringMemberValuePair(cu.getAST(),
- "file", relativeURI.toFileString()); //$NON-NLS-1$
- memberValuePairs.add(filePair);
- Annotation handlerChainAnnotation = AnnotationsCore.createNormalAnnotation(cu.getAST(),
- HandlerChain.class.getSimpleName(), memberValuePairs);
- AnnotationUtils.addAnnotation(webServiceType, handlerChainAnnotation);
- AnnotationUtils.addImport(webServiceType, HandlerChain.class.getCanonicalName());
- }
- }
- }
- }
-
- };
- PlatformUI.getWorkbench().getProgressService().runInUI(getContainer(), workspaceModifyOperation, rule);
- } catch (InvocationTargetException ite) {
- JAXWSUIPlugin.log(ite);
- return false;
- } catch (InterruptedException ie) {
- JAXWSUIPlugin.log(ie);
- return false;
- }
-
- IResource resource= handlerWizardPage.getModifiedResource();
- if (resource != null) {
- BasicNewResourceWizard.selectAndReveal(resource, workbench.getActiveWorkbenchWindow());
- openResource((IFile) resource);
- }
-
- return true;
- }
-
-
- protected void openResource(final IFile resource) {
- final IWorkbenchPage activePage= PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage();
- if (activePage != null) {
- final Display display= getShell().getDisplay();
- if (display != null) {
- display.asyncExec(new Runnable() {
- public void run() {
- try {
- IDE.openEditor(activePage, resource, true);
- } catch (PartInitException e) {
- JAXWSUIPlugin.log(e);
- }
- }
- });
- }
- }
- }
-
- public void init(IWorkbench workbench, IStructuredSelection selection) {
- this.workbench = workbench;
- this.selection = selection;
- }
-
- private IStructuredSelection getSelection() {
- return selection;
- }
-} \ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/wizards/NewJAXWSHandlerWizardPage.java b/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/wizards/NewJAXWSHandlerWizardPage.java
deleted file mode 100644
index 26d9e43..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/wizards/NewJAXWSHandlerWizardPage.java
+++ /dev/null
@@ -1,652 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Shane Clarke.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Shane Clarke - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.jaxws.ui.wizards;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-import javax.jws.WebService;
-
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.core.runtime.SubProgressMonitor;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.IPackageFragmentRoot;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jdt.core.Signature;
-import org.eclipse.jdt.ui.JavaElementLabelProvider;
-import org.eclipse.jdt.ui.StandardJavaElementContentProvider;
-import org.eclipse.jdt.ui.wizards.NewTypeWizardPage;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.window.Window;
-import org.eclipse.jst.ws.annotations.core.utils.AnnotationUtils;
-import org.eclipse.jst.ws.internal.jaxws.ui.JAXWSUIMessages;
-import org.eclipse.jst.ws.internal.jaxws.ui.JAXWSUIPlugin;
-import org.eclipse.jst.ws.internal.jaxws.ui.dialogs.HandlerChainSelectionDialog;
-import org.eclipse.jst.ws.internal.jaxws.ui.dialogs.NewHandlerChainDialog;
-import org.eclipse.jst.ws.internal.jaxws.ui.filters.NewHandlerChainViewerFilter;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.KeyAdapter;
-import org.eclipse.swt.events.KeyEvent;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Group;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.dialogs.ElementTreeSelectionDialog;
-import org.eclipse.ui.dialogs.ISelectionStatusValidator;
-
-public class NewJAXWSHandlerWizardPage extends NewTypeWizardPage {
- private List<String> logicalHandlerList = new ArrayList<String>();
- private List<String> soapHandlerList = new ArrayList<String>();
-
- private IStatus ok_status = new Status(IStatus.OK, JAXWSUIPlugin.PLUGIN_ID, ""); //$NON-NLS-1$
-
- private IStatus superClassImplementsStatus = Status.OK_STATUS;
- private IStatus addNewHandlerChainStatus = Status.OK_STATUS;
- private IStatus editHandlerChainStatus = Status.OK_STATUS;
- private IStatus associateWebServiceStatus = Status.OK_STATUS;
-
- private Combo handlerTypeCombo;
- private Button configureHandlerChainButton;
- private Button createHandlerChainButton;
- private Text newHandlerChainText;
- private Button browseNewHandlerChainButton;
-
- private Button editHandlerChainButton;
- private Text exisitingHandlerChainText;
- private Button browseExistingHandlerChainButton;
-
- private Button associateHandlerChainButton;
- private Text webServiceText;
- private Button browseWebServiceButton;
-
- public NewJAXWSHandlerWizardPage() {
- super(true, "create.new.handler.chain.page"); //$NON-NLS-1$
- setTitle(JAXWSUIMessages.JAXWS_HANDLER_WIZARD_PAGE_TITLE);
- setDescription(JAXWSUIMessages.JAXWS_HANDLER_WIZARD_PAGE_DESCRIPTION);
- logicalHandlerList.add("javax.xml.ws.handler.LogicalHandler<javax.xml.ws.handler.LogicalMessageContext>"); //$NON-NLS-1$
- soapHandlerList.add("javax.xml.ws.handler.soap.SOAPHandler<javax.xml.ws.handler.soap.SOAPMessageContext>"); //$NON-NLS-1$
- }
-
- public void init(IStructuredSelection selection) {
- IJavaElement javaElement = getInitialJavaElement(selection);
- initContainerPage(javaElement);
- initTypePage(javaElement);
- doStatusUpdate();
- }
-
- public void createControl(Composite parent) {
- initializeDialogUnits(parent);
-
- Composite composite = new Composite(parent, SWT.NONE);
- composite.setFont(parent.getFont());
-
- int nColumns = 4;
-
- GridLayout gridLayout = new GridLayout();
- gridLayout.numColumns= nColumns;
- composite.setLayout(gridLayout);
-
- createContainerControls(composite, nColumns);
- createPackageControls(composite, nColumns);
-
- createSeparator(composite, nColumns);
-
- createTypeNameControls(composite, nColumns);
- createModifierControls(composite, nColumns);
-
- createSuperClassControls(composite, nColumns);
-
- Label handlerTypeLabel = new Label(composite, SWT.NONE);
- handlerTypeLabel.setText(JAXWSUIMessages.JAXWS_HANDLER_TYPE);
-
- handlerTypeCombo = new Combo(composite, SWT.READ_ONLY | SWT.BORDER);
-
- GridData gridData = new GridData(SWT.FILL, SWT.BEGINNING, true, false);
- gridData.horizontalSpan = 2;
- handlerTypeCombo.setLayoutData(gridData);
- handlerTypeCombo.add(JAXWSUIMessages.JAXWS_LOGICAL_HANDLER);
- handlerTypeCombo.add(JAXWSUIMessages.JAXWS_SOAP_HANDLER);
- handlerTypeCombo.addSelectionListener(new SelectionAdapter() {
-
- @Override
- public void widgetSelected(SelectionEvent e) {
- Combo combo = (Combo) e.widget;
- if (combo.getSelectionIndex() == 0) {
- setSuperInterfaces(logicalHandlerList, true);
- } else if (combo.getSelectionIndex() == 1) {
- setSuperInterfaces(soapHandlerList, true);
- }
- }
- });
-
- Group configurationGroup = new Group(composite, SWT.SHADOW_NONE);
- configurationGroup.setText(JAXWSUIMessages.JAXWS_HANDLER_CONFIGURATION);
- gridLayout = new GridLayout();
- gridLayout.numColumns = 1;
- configurationGroup.setLayout(gridLayout);
-
- gridData = new GridData(SWT.FILL, SWT.FILL, false, false);
- gridData.horizontalSpan = 4;
- configurationGroup.setLayoutData(gridData);
-
- configureHandlerChainButton = new Button(configurationGroup, SWT.CHECK);
- configureHandlerChainButton.setText(JAXWSUIMessages.JAXWS_HANDLER_CONFIGURATION_ADD);
- configureHandlerChainButton.addSelectionListener(new SelectionAdapter() {
-
- @Override
- public void widgetSelected(SelectionEvent e) {
- Button button = (Button) e.widget;
- if (button.getSelection()) {
- createHandlerChainButton.setEnabled(true);
- editHandlerChainButton.setEnabled(true);
- associateHandlerChainButton.setEnabled(true);
- enableNewHandlerChainFileWidgets(createHandlerChainButton.getSelection());
- enableEditHandlerChainFileWidgets(editHandlerChainButton.getSelection());
- enableWebServiceWidgets(associateHandlerChainButton.getSelection());
- } else {
- createHandlerChainButton.setEnabled(false);
- editHandlerChainButton.setEnabled(false);
- associateHandlerChainButton.setEnabled(false);
- enableNewHandlerChainFileWidgets(false);
- enableEditHandlerChainFileWidgets(false);
- enableWebServiceWidgets(false);
- }
- updateConfigureHandlerStatus();
- }
- });
-
- gridData = new GridData(SWT.FILL, SWT.FILL, false, false);
- gridData.horizontalSpan = 4;
- configureHandlerChainButton.setLayoutData(gridData);
-
- Group innerGroup = new Group(configurationGroup, SWT.SHADOW_NONE);
- gridLayout = new GridLayout();
- gridLayout.numColumns = 4;
- innerGroup.setLayout(gridLayout);
-
- gridData = new GridData(SWT.FILL, SWT.FILL, true, true);
- gridData.horizontalSpan = 4;
- innerGroup.setLayoutData(gridData);
-
- createHandlerChainButton = new Button(innerGroup, SWT.RADIO);
- createHandlerChainButton.setText(JAXWSUIMessages.JAXWS_HANDLER_CONFIGURATION_CREATE);
- gridData = new GridData(SWT.FILL, SWT.FILL, true, false);
- gridData.horizontalSpan = 4;
- createHandlerChainButton.setLayoutData(gridData);
- createHandlerChainButton.addSelectionListener(new SelectionAdapter() {
-
- @Override
- public void widgetSelected(SelectionEvent e) {
- Button button = (Button) e.widget;
- enableNewHandlerChainFileWidgets(button.getSelection());
- enableEditHandlerChainFileWidgets(!button.getSelection());
- updateConfigureHandlerStatus();
- }
-
- });
-
- Label createNewHandlerLabel = new Label(innerGroup, SWT.NONE);
- createNewHandlerLabel.setText(JAXWSUIMessages.JAXWS_HANDLER_CONFIGURATION_FILE_PATH1);
-
- newHandlerChainText = new Text(innerGroup, SWT.SINGLE | SWT.BORDER);
- newHandlerChainText.setFont(innerGroup.getFont());
- gridData = new GridData(SWT.FILL, SWT.CENTER, true, false);
- gridData.horizontalSpan = 2;
- newHandlerChainText.setLayoutData(gridData);
-
- newHandlerChainText.addKeyListener(new KeyAdapter() {
-
- @Override
- public void keyReleased(KeyEvent e) {
- updateConfigureHandlerStatus();
- }
-
- });
-
- browseNewHandlerChainButton = new Button(innerGroup, SWT.PUSH);
- browseNewHandlerChainButton.setText(JAXWSUIMessages.JAXWS_HANDLER_CONFIGURATION_BROWSE1);
- gridData = new GridData(SWT.END, SWT.FILL, false, false);
- browseNewHandlerChainButton.setLayoutData(gridData);
- browseNewHandlerChainButton.addSelectionListener(new SelectionAdapter() {
-
- @Override
- public void widgetSelected(SelectionEvent e) {
- NewHandlerChainDialog dialog = new NewHandlerChainDialog(getShell(),
- new JavaElementLabelProvider(), new StandardJavaElementContentProvider());
- dialog.setInput(JavaCore.create(ResourcesPlugin.getWorkspace().getRoot()));
- dialog.addFilter(new NewHandlerChainViewerFilter(getJavaProject(), true, true));
- if (dialog.open() == Window.OK) {
- newHandlerChainText.setText(dialog.getFilePath());
- updateConfigureHandlerStatus();
- }
- }
- });
-
- editHandlerChainButton = new Button(innerGroup, SWT.RADIO);
- editHandlerChainButton.setText(JAXWSUIMessages.JAXWS_HANDLER_CONFIGURATION_EDIT);
- gridData = new GridData(SWT.FILL, SWT.FILL, true, false);
- gridData.horizontalSpan = 4;
- editHandlerChainButton.setLayoutData(gridData);
-
- Label addToHandlerLabel = new Label(innerGroup, SWT.NONE);
- addToHandlerLabel.setText(JAXWSUIMessages.JAXWS_HANDLER_CONFIGURATION_FILE_PATH2);
-
- editHandlerChainButton.addSelectionListener(new SelectionAdapter() {
-
- @Override
- public void widgetSelected(SelectionEvent e) {
- updateConfigureHandlerStatus();
- }
-
- });
-
- exisitingHandlerChainText = new Text(innerGroup, SWT.SINGLE | SWT.BORDER);
- exisitingHandlerChainText.setFont(composite.getFont());
- gridData = new GridData(SWT.FILL, SWT.CENTER, true, false);
- gridData.horizontalSpan = 2;
- exisitingHandlerChainText.setLayoutData(gridData);
- exisitingHandlerChainText.addKeyListener(new KeyAdapter() {
-
- @Override
- public void keyReleased(KeyEvent e) {
- updateConfigureHandlerStatus();
- }
-
- });
-
- browseExistingHandlerChainButton = new Button(innerGroup, SWT.PUSH);
- browseExistingHandlerChainButton.setText(JAXWSUIMessages.JAXWS_HANDLER_CONFIGURATION_BROWSE2);
- gridData = new GridData(SWT.FILL, SWT.FILL, false, false);
- browseExistingHandlerChainButton.setLayoutData(gridData);
-
- browseExistingHandlerChainButton.addSelectionListener(new SelectionAdapter() {
-
- @Override
- public void widgetSelected(SelectionEvent e) {
- HandlerChainSelectionDialog dialog = new HandlerChainSelectionDialog(getShell(),
- new JavaElementLabelProvider(), new StandardJavaElementContentProvider());
-
- dialog.setInput(JavaCore.create(ResourcesPlugin.getWorkspace().getRoot()));
- dialog.addFilter(new NewHandlerChainViewerFilter(getJavaProject(), false, true));
-
- if (dialog.open() == Window.OK) {
- Object[] result = dialog.getResult();
- IResource resource = (IResource) result[0];
- exisitingHandlerChainText.setText(resource.getFullPath().toOSString());
- updateConfigureHandlerStatus();
- }
- }
- });
-
- createSeparator(innerGroup, nColumns);
-
- associateHandlerChainButton = new Button(innerGroup, SWT.CHECK);
- gridData = new GridData(SWT.FILL, SWT.FILL, true, false);
- gridData.horizontalSpan = 4;
- associateHandlerChainButton.setLayoutData(gridData);
- associateHandlerChainButton.setText(JAXWSUIMessages.JAXWS_HANDLER_CONFIGURATION_ASSOCIATE);
- associateHandlerChainButton.addSelectionListener(new SelectionAdapter() {
-
- @Override
- public void widgetSelected(SelectionEvent e) {
- Button button = (Button) e.widget;
- enableWebServiceWidgets(button.getSelection());
- updateConfigureHandlerStatus();
- }
-
- });
-
- Label webServiceLabel = new Label(innerGroup, SWT.NONE);
- webServiceLabel.setText(JAXWSUIMessages.JAXWS_HANDLER_CONFIGURATION_WEB_SERVICE);
-
- webServiceText = new Text(innerGroup, SWT.SINGLE | SWT.BORDER);
- webServiceText.setFont(composite.getFont());
- gridData = new GridData(SWT.FILL, SWT.CENTER, false, false);
- gridData.horizontalSpan = 2;
- webServiceText.setLayoutData(gridData);
- webServiceText.addKeyListener(new KeyAdapter() {
-
- @Override
- public void keyReleased(KeyEvent e) {
- updateConfigureHandlerStatus();
- }
-
- });
-
- browseWebServiceButton = new Button(innerGroup, SWT.PUSH);
- browseWebServiceButton.setText(JAXWSUIMessages.JAXWS_HANDLER_CONFIGURATION_BROWSE3);
- gridData = new GridData(SWT.FILL, SWT.FILL, false, false);
- browseWebServiceButton.setLayoutData(gridData);
-
- browseWebServiceButton.addSelectionListener(new SelectionAdapter() {
-
- @Override
- public void widgetSelected(SelectionEvent e) {
- ElementTreeSelectionDialog dialog = new ElementTreeSelectionDialog(getShell(),
- new JavaElementLabelProvider(), new StandardJavaElementContentProvider());
- dialog.setTitle(JAXWSUIMessages.JAXWS_HANDLER_CONFIGURATION_WS_DIALOG_TITLE);
- dialog.setMessage(JAXWSUIMessages.JAXWS_HANDLER_CONFIGURATION_WS_DIALOG_DESCRIPTION);
- dialog.setAllowMultiple(false);
- dialog.setInput(JavaCore.create(ResourcesPlugin.getWorkspace().getRoot()));
-
- dialog.addFilter(new NewHandlerChainViewerFilter(getJavaProject(), true, false));
- dialog.setValidator(new ISelectionStatusValidator() {
-
- public IStatus validate(Object[] selection) {
- if (selection.length == 1) {
- if (selection[0] instanceof ICompilationUnit) {
- ICompilationUnit compilationUnit = (ICompilationUnit) selection[0];
- if (AnnotationUtils.getAnnotation(compilationUnit.findPrimaryType(), WebService.class)
- != null) {
- return ok_status;
- } else {
- return new Status(IStatus.ERROR, JAXWSUIPlugin.PLUGIN_ID,
- JAXWSUIMessages.JAXWS_HANDLER_CONFIGURATION_WS_DIALOG_INVALID);
- }
- }
- }
- return new Status(IStatus.ERROR, JAXWSUIPlugin.PLUGIN_ID, ""); //$NON-NLS-1$
- }
- });
-
- if (dialog.open() == Window.OK) {
- ICompilationUnit selectedCompilationUnit = (ICompilationUnit) dialog.getFirstResult();
- webServiceText.setText(selectedCompilationUnit.findPrimaryType().getFullyQualifiedName());
- updateConfigureHandlerStatus();
- }
-
- }
- });
-
- composite.pack();
- setControl(composite);
- Dialog.applyDialogFont(composite);
-
- createHandlerChainButton.setSelection(true);
- createHandlerChainButton.setEnabled(false);
- editHandlerChainButton.setEnabled(false);
- associateHandlerChainButton.setEnabled(false);
- enableNewHandlerChainFileWidgets(false);
- enableEditHandlerChainFileWidgets(false);
- enableWebServiceWidgets(false);
- }
-
- public boolean isConfigureHandlerChain() {
- return configureHandlerChainButton.getSelection();
- }
-
- public boolean isCreateHandlerChain() {
- return createHandlerChainButton.getSelection();
- }
-
- public boolean isEditHandlerChain() {
- return editHandlerChainButton.getSelection();
- }
-
- public String getSelectedHandlerType() {
- return handlerTypeCombo.getText();
- }
-
- public String getNewHandlerChainPath() {
- return newHandlerChainText.getText();
- }
-
- public String getExistingHandlerChainPath() {
- return exisitingHandlerChainText.getText();
- }
-
- public String getHandlerChainPath() {
- if (isCreateHandlerChain()) {
- return getNewHandlerChainPath();
- } else if (isEditHandlerChain()) {
- return getExistingHandlerChainPath();
- }
- return "";
- }
-
- public boolean isAssociateHandlerChain() {
- return associateHandlerChainButton.getSelection();
- }
-
- public String getSelectedWebServicePath() {
- return webServiceText.getText();
- }
-
- private void enableEditHandlerChainFileWidgets(boolean enable) {
- exisitingHandlerChainText.setEnabled(enable);
- browseExistingHandlerChainButton.setEnabled(enable);
- }
-
- private void enableNewHandlerChainFileWidgets(boolean enable) {
- newHandlerChainText.setEnabled(enable);
- browseNewHandlerChainButton.setEnabled(enable);
- }
-
- private void enableWebServiceWidgets(boolean enable) {
- webServiceText.setEnabled(enable);
- browseWebServiceButton.setEnabled(enable);
- }
-
- private void doStatusUpdate() {
- IStatus[] status = new IStatus[] {
- fContainerStatus,
- fPackageStatus,
- fTypeNameStatus,
- fSuperClassStatus,
- fSuperInterfacesStatus,
- superClassImplementsStatus,
- addNewHandlerChainStatus,
- editHandlerChainStatus,
- associateWebServiceStatus
- };
-
- updateStatus(status);
- }
-
- private void updateConfigureHandlerStatus() {
- try {
- validateNewHandlerChainField();
- validateExistingHandlerChainField();
- validateWebServiceField();
- doStatusUpdate();
- } catch (JavaModelException jme) {
- JAXWSUIPlugin.log(jme.getStatus());
- }
- }
-
- private IStatus validateNewHandlerChainField() throws JavaModelException {
- if (isConfigureHandlerChain() && isCreateHandlerChain()) {
- editHandlerChainStatus = ok_status;
- String newHandlerChainPath = getNewHandlerChainPath().trim();
- if (newHandlerChainPath.length() == 0) {
- return addNewHandlerChainStatus = new Status(IStatus.ERROR, JAXWSUIPlugin.PLUGIN_ID,
- JAXWSUIMessages.JAXWS_HANDLER_CONFIGURATION_NEW_HANDLER_PATH_EMTPY);
- }
-
- if (!newHandlerChainPath.endsWith(".xml")) { //$NON-NLS-1$
- return addNewHandlerChainStatus = new Status(IStatus.ERROR, JAXWSUIPlugin.PLUGIN_ID,
- JAXWSUIMessages.JAXWS_HANDLER_CONFIGURATION_CREATE_DIALOG_INVALID_NAME);
- }
-
- IPath path = new Path(newHandlerChainPath);
- if (path.segmentCount() >= 2) {
- String[] segmenets = path.segments();
- if (!segmenets[0].equals(getJavaProject().getElementName())) {
- return addNewHandlerChainStatus = new Status(IStatus.ERROR, JAXWSUIPlugin.PLUGIN_ID,
- JAXWSUIMessages.bind(JAXWSUIMessages.JAXWS_HANDLER_CONFIGURATION_CREATE_DIALOG_FILE_PROJECT,
- getJavaProject().getElementName()));
- }
- boolean inSourceFolder = false;
- IPackageFragmentRoot[] packageFragmentRoots = getJavaProject().getPackageFragmentRoots();
- for (IPackageFragmentRoot packageFragmentRoot : packageFragmentRoots) {
- if (segmenets[1].equals(packageFragmentRoot.getElementName())) {
- inSourceFolder = true;
- break;
- }
- }
- if (!inSourceFolder) {
- return addNewHandlerChainStatus = new Status(IStatus.ERROR, JAXWSUIPlugin.PLUGIN_ID,
- JAXWSUIMessages.bind(JAXWSUIMessages.JAXWS_HANDLER_CONFIGURATION_CREATE_DIALOG_FILE_PROJECT,
- getJavaProject().getElementName()));
- }
- if (path.lastSegment() != null && path.lastSegment().equals(".xml")) { //$NON-NLS-1$
- return addNewHandlerChainStatus = new Status(IStatus.ERROR, JAXWSUIPlugin.PLUGIN_ID,
- JAXWSUIMessages.JAXWS_HANDLER_CONFIGURATION_CREATE_DIALOG_EMPTY_FILE_NAME);
- }
- } else {
- return addNewHandlerChainStatus = new Status(IStatus.ERROR, JAXWSUIPlugin.PLUGIN_ID,
- JAXWSUIMessages.bind(JAXWSUIMessages.JAXWS_HANDLER_CONFIGURATION_CREATE_DIALOG_FILE_PROJECT,
- getJavaProject().getElementName()));
- }
-
- IResource res = ResourcesPlugin.getWorkspace().getRoot().findMember(path);
- if (res != null) {
- return addNewHandlerChainStatus = new Status(IStatus.ERROR, JAXWSUIPlugin.PLUGIN_ID,
- JAXWSUIMessages.bind(JAXWSUIMessages.JAXWS_HANDLER_CONFIGURATION_CREATE_DIALOG_FILE_EXISTS,
- res.getName()));
- }
-
- return addNewHandlerChainStatus = ok_status;
- } else {
- return addNewHandlerChainStatus = ok_status;
- }
- }
-
- private IStatus validateExistingHandlerChainField() {
- if (isConfigureHandlerChain() && isEditHandlerChain()) {
- addNewHandlerChainStatus = ok_status;
- String existingHandlerChainPath = getExistingHandlerChainPath().trim();
- if (existingHandlerChainPath.length() == 0) {
- return editHandlerChainStatus = new Status(IStatus.ERROR, JAXWSUIPlugin.PLUGIN_ID,
- JAXWSUIMessages.JAXWS_HANDLER_CONFIGURATION_EXISTING_HANDLER_PATH_EMTPY);
- }
-
- if (!existingHandlerChainPath.endsWith(".xml")) { //$NON-NLS-1$
- return editHandlerChainStatus = new Status(IStatus.ERROR, JAXWSUIPlugin.PLUGIN_ID,
- JAXWSUIMessages.JAXWS_HANDLER_CONFIGURATION_CREATE_DIALOG_INVALID_NAME);
- }
-
- IWorkspace workspace = ResourcesPlugin.getWorkspace();
- IPath path = new Path(existingHandlerChainPath);
- if (path.segmentCount() > 1 && path.segment(0).equals(getJavaProject().getElementName())
- && workspace.getRoot().getFile(path).exists()) {
- return editHandlerChainStatus = ok_status;
- } else {
- return editHandlerChainStatus = new Status(IStatus.ERROR, JAXWSUIPlugin.PLUGIN_ID,
- JAXWSUIMessages.bind(JAXWSUIMessages.JAXWS_HANDLER_CONFIGURATION_EDIT_FILE_NOT_FOUND,
- existingHandlerChainPath));
- }
- } else {
- return editHandlerChainStatus = ok_status;
- }
- }
-
- private IStatus validateWebServiceField() throws JavaModelException {
- if (isConfigureHandlerChain() && isAssociateHandlerChain()) {
- String webServicePath = getSelectedWebServicePath().trim();
- if (webServicePath.length() == 0) {
- return associateWebServiceStatus = new Status(IStatus.ERROR, JAXWSUIPlugin.PLUGIN_ID,
- JAXWSUIMessages.JAXWS_HANDLER_CONFIGURATION_WS_PATH_EMTPY);
- } else if (getJavaProject().findType(webServicePath) == null){
- return associateWebServiceStatus = new Status(IStatus.ERROR, JAXWSUIPlugin.PLUGIN_ID,
- JAXWSUIMessages.JAXWS_HANDLER_CONFIGURATION_WS_NOT_FOUND);
- } else {
- return associateWebServiceStatus = ok_status;
- }
- } else {
- return associateWebServiceStatus = ok_status;
- }
- }
-
- @Override
- protected void handleFieldChanged(String fieldName) {
- super.handleFieldChanged(fieldName);
- if (fieldName.equals(SUPER) || fieldName.equals(INTERFACES)) {
- try {
- if (getSuperInterfaces().size() == 0 && fSuperClassStatus.isOK()) {
- IType type = getJavaProject().findType(getSuperClass());
- if (type != null) {
- List<String> interfaceNames = new ArrayList<String>();
- List<String> superInterfaceNames = Arrays.asList(type.getSuperInterfaceNames());
- for (String interfaceName : superInterfaceNames) {
- interfaceNames.add(Signature.getTypeErasure(interfaceName));
- }
-
- if (interfaceNames.contains("javax.xml.ws.handler.soap.SOAPHandler") || //$NON-NLS-1$
- interfaceNames.contains("javax.xml.ws.handler.LogicalHandler")) { //$NON-NLS-1$
- superClassImplementsStatus = ok_status;
- } else {
- superClassImplementsStatus = new Status(IStatus.ERROR, JAXWSUIPlugin.PLUGIN_ID,
- JAXWSUIMessages.JAXWS_HANDLER_EXTEND_IMPLEMENT_HANDLER);
- }
- }
- } else {
- superClassImplementsStatus = Status.OK_STATUS;
- }
- } catch (JavaModelException jme) {
- JAXWSUIPlugin.log(jme);
- }
- }
-
- doStatusUpdate();
- }
-
- @Override
- protected IStatus superInterfacesChanged() {
- IStatus status = Status.OK_STATUS;
-
- IPackageFragmentRoot root = getPackageFragmentRoot();
-
- if (root != null) {
- String interfaceName = "javax.xml.ws.handler.LogicalHandler"; //$NON-NLS-1$
- try {
- IType type = root.getJavaProject().findType(interfaceName);
- if (type == null) {
- status = new Status(IStatus.ERROR, JAXWSUIPlugin.PLUGIN_ID,
- JAXWSUIMessages.JAXWS_HANDLER_LIBRARY_CLASSPATH);
- return status;
- }
- } catch (JavaModelException jme) {
- JAXWSUIPlugin.log(jme.getStatus());
- }
- }
- return status;
- }
-
- @Override
- protected void createTypeMembers(IType newType, final ImportsManager imports, IProgressMonitor monitor)
- throws CoreException {
- createInheritedMethods(newType, false, true, imports, new SubProgressMonitor(monitor, 1));
- if (monitor != null) {
- monitor.done();
- }
- }
-
-} \ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/wizards/OrderHandlerChainPage.java b/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/wizards/OrderHandlerChainPage.java
deleted file mode 100644
index bcaaaa6..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/wizards/OrderHandlerChainPage.java
+++ /dev/null
@@ -1,528 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 Shane Clarke.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Shane Clarke - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.jaxws.ui.wizards;
-
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.ITypeHierarchy;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jdt.core.dom.AST;
-import org.eclipse.jdt.core.dom.ASTParser;
-import org.eclipse.jdt.core.dom.ASTVisitor;
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jdt.core.dom.ITypeBinding;
-import org.eclipse.jdt.core.dom.ParameterizedType;
-import org.eclipse.jdt.core.dom.TypeDeclaration;
-import org.eclipse.jdt.ui.JavaElementLabelProvider;
-import org.eclipse.jdt.ui.StandardJavaElementContentProvider;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.viewers.ColumnLabelProvider;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.ITreeContentProvider;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.viewers.TreeViewer;
-import org.eclipse.jface.viewers.TreeViewerColumn;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.window.Window;
-import org.eclipse.jface.wizard.WizardPage;
-import org.eclipse.jst.ws.internal.jaxws.core.utils.JAXWSHandlerUtils;
-import org.eclipse.jst.ws.internal.jaxws.ui.JAXWSUIMessages;
-import org.eclipse.jst.ws.internal.jaxws.ui.JAXWSUIPlugin;
-import org.eclipse.jst.ws.internal.jaxws.ui.filters.NewHandlerChainViewerFilter;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.TreeColumn;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.dialogs.ElementTreeSelectionDialog;
-import org.eclipse.ui.dialogs.ISelectionStatusValidator;
-import org.jdom.Document;
-import org.jdom.Element;
-import org.jdom.JDOMException;
-import org.jdom.input.SAXBuilder;
-
-public class OrderHandlerChainPage extends WizardPage {
- private static final String LOGICAL_HANDLER = "javax.xml.ws.handler.LogicalHandler"; //$NON-NLS-1$
- private static final String SOAP_HANDLER = "javax.xml.ws.handler.soap.SOAPHandler"; //$NON-NLS-1$
-
- private IStatus ok_status = new Status(IStatus.OK, JAXWSUIPlugin.PLUGIN_ID, ""); //$NON-NLS-1$
-
- private TreeViewer treeViewer;
-
- private Document doc;
- private Element root;
-
- private IPath handlerChainPath;
- private IJavaProject javaProject;
-
- private boolean configure;
-
- private String newHandlerClassName;
- private String newHandlerType;
-
- public OrderHandlerChainPage() {
- super("order.handlerchain.wizard.page"); //$NON-NLS-1$
- setTitle(JAXWSUIMessages.JAXWS_ORDER_HANDLER_WIZARD_PAGE_TITLE);
- setDescription(JAXWSUIMessages.JAXWS_ORDER_HANDLER_WIZARD_PAGE_DESCRIPTION);
- }
-
- public OrderHandlerChainPage(IPath handlerChainPath, IJavaProject javaProject) {
- this();
- this.handlerChainPath = handlerChainPath;
- this.javaProject = javaProject;
- this.configure = true;
- }
-
- public Document getDocument() {
- return doc;
- }
-
- public void refreshViewer() {
- treeViewer.refresh();
- }
-
- public void setSelection(ISelection selection) {
- treeViewer.setSelection(selection, true);
- }
-
- public void createControl(Composite parent) {
- final Composite composite = new Composite(parent, SWT.NONE);
- GridLayout gridLayout = new GridLayout(2, false);
- composite.setLayout(gridLayout);
-
- treeViewer = new TreeViewer(composite, SWT.SINGLE | SWT.FULL_SELECTION | SWT.BORDER);
- treeViewer.getTree().setHeaderVisible(true);
- treeViewer.getTree().setLinesVisible(true);
- treeViewer.setContentProvider(new HandlerChainContentProvider());
-
- TreeViewerColumn nameViewerColumn = new TreeViewerColumn(treeViewer, SWT.LEFT);
- TreeColumn nameColumn = nameViewerColumn.getColumn();
- nameColumn.setWidth(200);
- nameColumn.setMoveable(false);
- nameColumn.setText(JAXWSUIMessages.JAXWS_HANDLER_NAME_COLUMN);
-
- nameViewerColumn.setLabelProvider(new ColumnLabelProvider() {
-
- @Override
- public String getText(Object element) {
- if (element instanceof Element) {
- Element node = (Element) element;
- if (node.getName().equals(JAXWSHandlerUtils.HANDLER)) {
- Element handlerNameElement = node.getChild(JAXWSHandlerUtils.HANDLER_NAME, JAXWSHandlerUtils.JAVAEE_NS);
- if (handlerNameElement != null) {
- return handlerNameElement.getText().trim();
- }
- }
- if (node.getName().equals(JAXWSHandlerUtils.HANDLER_CHAIN)) {
- return node.getName();
- }
- }
- return null;
- }
-
- @Override
- public Image getImage(Object element) {
- if (element instanceof Element) {
- return PlatformUI.getWorkbench().getSharedImages().getImage(
- org.eclipse.ui.ISharedImages.IMG_OBJ_FILE);
- }
- return null;
- }
- });
-
- TreeViewerColumn classViewerColumn = new TreeViewerColumn(treeViewer, SWT.LEFT);
- TreeColumn classColumn = classViewerColumn.getColumn();
- classColumn.setWidth(200);
- classColumn.setMoveable(false);
- classColumn.setText(JAXWSUIMessages.JAXWS_HANDLER_CLASS_COLUMN);
-
- classViewerColumn.setLabelProvider(new ColumnLabelProvider() {
-
- @Override
- public String getText(Object element) {
- if (element instanceof Element) {
- Element node = (Element) element;
- if (node.getName().equals(JAXWSHandlerUtils.HANDLER)) {
- Element handlerNameElement = node.getChild(JAXWSHandlerUtils.HANDLER_CLASS, JAXWSHandlerUtils.JAVAEE_NS);
- if (handlerNameElement != null) {
- return handlerNameElement.getText().trim();
- }
- }
- }
- return null;
- }
- });
-
- TreeViewerColumn typeViewerColumn = new TreeViewerColumn(treeViewer, SWT.LEFT);
- TreeColumn typeColumn = typeViewerColumn.getColumn();
- typeColumn.setWidth(100);
- typeColumn.setMoveable(false);
- typeColumn.setText(JAXWSUIMessages.JAXWS_HANDLER_TYPE_COLUMN);
-
- typeViewerColumn.setLabelProvider(new ColumnLabelProvider() {
-
- @Override
- public String getText(Object element) {
- if (element instanceof Element) {
- Element node = (Element) element;
- if (node.getName().equals(JAXWSHandlerUtils.HANDLER)) {
- Element handlerClassElement = node.getChild(JAXWSHandlerUtils.HANDLER_CLASS, JAXWSHandlerUtils.JAVAEE_NS);
- if (handlerClassElement != null) {
- if (newHandlerClassName != null && newHandlerClassName.equals(handlerClassElement.getValue().trim())) {
- return newHandlerType;
- }
- try {
- IType handler = javaProject.findType(handlerClassElement.getText().trim());
- if (handler != null) {
- ITypeHierarchy typeHierarchy = handler.newTypeHierarchy(javaProject, null);
- IType[] allInterfaces = typeHierarchy.getAllInterfaces();
- for (IType aInterface : allInterfaces) {
- if (aInterface.getFullyQualifiedName().equals(LOGICAL_HANDLER)) {
- return JAXWSUIMessages.JAXWS_LOGICAL;
- }
- if (aInterface.getFullyQualifiedName().equals(SOAP_HANDLER)) {
- return JAXWSUIMessages.JAXWS_PROTOCOL;
- }
- }
- }
- } catch (JavaModelException jme) {
- JAXWSUIPlugin.log(jme.getStatus());
- }
- }
- }
- }
- return null;
- }
- });
-
- GridData gridData = new GridData(SWT.FILL, SWT.FILL, true, true);
- gridData.verticalSpan = 6;
- treeViewer.getTree().setLayoutData(gridData);
-
- if (configure) {
- Button addButton = new Button(composite, SWT.PUSH);
- addButton.setText(JAXWSUIMessages.JAXWS_HANDLER_ADD);
- gridData = new GridData(SWT.FILL, SWT.CENTER, true, false);
- addButton.setLayoutData(gridData);
- addButton.addSelectionListener(new SelectionAdapter() {
-
- @Override
- public void widgetSelected(SelectionEvent e) {
- ElementTreeSelectionDialog dialog = new ElementTreeSelectionDialog(getShell(),
- new JavaElementLabelProvider(), new StandardJavaElementContentProvider());
- dialog.setTitle(JAXWSUIMessages.JAXWS_HANDLER_CONFIGURATION_HANDLER_DIALOG_TITLE);
- dialog.setMessage(JAXWSUIMessages.JAXWS_HANDLER_CONFIGURATION_HANDLER_DIALOG_DESCRIPTION);
- dialog.setAllowMultiple(false);
- dialog.setInput(JavaCore.create(ResourcesPlugin.getWorkspace().getRoot()));
-
- dialog.addFilter(new NewHandlerChainViewerFilter(javaProject, true, false));
- dialog.setValidator(new ISelectionStatusValidator() {
-
- public IStatus validate(Object[] selection) {
- if (selection.length == 1) {
- if (selection[0] instanceof ICompilationUnit) {
- ICompilationUnit compilationUnit = (ICompilationUnit) selection[0];
- if (isHandler(compilationUnit)) {
- return ok_status;
- } else {
- return new Status(IStatus.ERROR, JAXWSUIPlugin.PLUGIN_ID,
- JAXWSUIMessages.JAXWS_HANDLER_CONFIGURATION_HANDLER_DIALOG_INVALID);
- }
- }
- }
- return new Status(IStatus.ERROR, JAXWSUIPlugin.PLUGIN_ID, ""); //$NON-NLS-1$
- }
- });
-
- if (dialog.open() == Window.OK) {
- ICompilationUnit selectedHandler = (ICompilationUnit) dialog.getFirstResult();
- addHandler(selectedHandler.findPrimaryType().getElementName(),
- selectedHandler.findPrimaryType().getPackageFragment().getElementName());
- }
-
- }
- });
-
- Button removeButton = new Button(composite, SWT.PUSH);
- removeButton.setText(JAXWSUIMessages.JAXWS_HANDLER_REMOVE);
- gridData = new GridData(SWT.FILL, SWT.CENTER, true, false);
- removeButton.setLayoutData(gridData);
- removeButton.addSelectionListener(new SelectionAdapter() {
-
- @Override
- public void widgetSelected(SelectionEvent e) {
- IStructuredSelection selection = (IStructuredSelection) treeViewer.getSelection();
- if (!selection.isEmpty()) {
- Element selected = (Element) selection.getFirstElement();
- if (selected.getName().equals(JAXWSHandlerUtils.HANDLER)) {
- Element handlerChain = (Element) selected.getParent();
- if (handlerChain != null) {
- handlerChain.removeContent(selected);
- treeViewer.refresh();
- }
- }
- }
- }
- });
- }
-
- Button moveUpButton = new Button(composite, SWT.PUSH);
- moveUpButton.setText(JAXWSUIMessages.JAXWS_HANDLER_MOVE_UP);
- gridData = new GridData(SWT.FILL, SWT.CENTER, true, false);
- moveUpButton.setLayoutData(gridData);
- moveUpButton.addSelectionListener(new SelectionAdapter() {
-
- @Override
- @SuppressWarnings("unchecked")
- public void widgetSelected(SelectionEvent e) {
- IStructuredSelection selection = (IStructuredSelection) treeViewer.getSelection();
- if (!selection.isEmpty()) {
- Element selected = (Element) selection.getFirstElement();
- Element parent = (Element) selected.getParent();
- List children = parent.getChildren();
- int index = children.indexOf(selected);
- if (index > 0) {
- children.remove(selected);
- children.add(index - 1, selected);
- } else if (index == 0) {
- Element root = (Element) parent.getParent();
- List handlerChains = root.getChildren();
- int topIndex = handlerChains.indexOf(parent);
- if (topIndex > 0 && handlerChains.get(topIndex - 1) != null) {
- children.remove(selected);
- Element topChild = (Element) handlerChains.get(topIndex - 1);
- topChild.getChildren().add(topChild.getChildren().size(), selected);
- }
- }
- treeViewer.refresh();
- }
- }
- });
-
- Button moveDownButton = new Button(composite, SWT.PUSH);
- moveDownButton.setText(JAXWSUIMessages.JAXWS_HANDLER_MOVE_DOWN);
- gridData = new GridData(SWT.FILL, SWT.CENTER, true, false);
- moveDownButton.setLayoutData(gridData);
- moveDownButton.addSelectionListener(new SelectionAdapter() {
-
- @Override
- @SuppressWarnings("unchecked")
- public void widgetSelected(SelectionEvent e) {
- IStructuredSelection selection = (IStructuredSelection) treeViewer.getSelection();
- if (!selection.isEmpty()) {
- Element selected = (Element) selection.getFirstElement();
- Element parent = (Element) selected.getParent();
- List children = parent.getChildren();
- int index = children.indexOf(selected);
- if (index >= 0 && index < children.size() - 1) {
- children.remove(selected);
- children.add(index + 1, selected);
- } else if (index == children.size() - 1) {
- Element root = (Element) parent.getParent();
- List handlerChains = root.getChildren();
- int hIndex = handlerChains.indexOf(parent);
- if (hIndex >= 0 && hIndex < handlerChains.size() - 1 && handlerChains.get(hIndex + 1) != null) {
- children.remove(selected);
- Element topChild = (Element) handlerChains.get(hIndex + 1);
- topChild.getChildren().add(0, selected);
- }
- }
- treeViewer.refresh();
- }
- }
- });
-
- if (handlerChainPath != null) {
- setInput(handlerChainPath);
- }
-
- treeViewer.expandAll();
-
- composite.pack();
- setControl(composite);
- Dialog.applyDialogFont(composite);
- }
-
-
- @Override
- public void setVisible(boolean visible) {
- super.setVisible(visible);
- if (visible) {
- setInput(handlerChainPath);
- }
- }
-
- public void setHandlerChainPath(IPath handlerChainPath) {
- this.handlerChainPath = handlerChainPath;
- }
-
- private boolean isHandler(ICompilationUnit source) {
- final List<String> interfaces = new ArrayList<String>();
- ASTParser parser = ASTParser.newParser(AST.JLS3);
- parser.setSource(source);
- parser.setResolveBindings(true);
- CompilationUnit compilationUnit = (CompilationUnit) parser.createAST(null);
- compilationUnit.accept(new ASTVisitor() {
- @Override
- public boolean visit(TypeDeclaration typeDeclaration) {
- @SuppressWarnings("unchecked")
- List superInterfaces = typeDeclaration.superInterfaceTypes();
- for (Object object : superInterfaces) {
- if (object instanceof ParameterizedType) {
- ParameterizedType parameterizedType = (ParameterizedType) object;
- ITypeBinding binding = parameterizedType.resolveBinding();
- if (binding != null) {
- String qualifiedName = binding.getErasure().getQualifiedName();
- if (qualifiedName.equals(LOGICAL_HANDLER) || qualifiedName.equals(SOAP_HANDLER)) {
- interfaces.add(qualifiedName);
- break;
- }
- }
- }
- }
- return false;
- }
- });
- return interfaces.size() > 0;
- }
-
- public void setInput(IPath handlerChainPath) {
- if (handlerChainPath == null) {
- return;
- }
- if (!handlerChainPath.isEmpty()) {
- try {
- IFile handlerChainFile = ResourcesPlugin.getWorkspace().getRoot().getFile(handlerChainPath);
- if (handlerChainFile.getFileExtension().equals("xml")) { //$NON-NLS-1$
- if (handlerChainFile.exists() && JAXWSHandlerUtils.isHandlerChainFile(handlerChainFile)) {
- FileInputStream handlerInputStream = new FileInputStream(handlerChainFile.getLocation().toFile());
- SAXBuilder builder = new SAXBuilder();
- doc = builder.build(handlerInputStream);
- root = doc.getRootElement();
- treeViewer.setInput(root);
- treeViewer.expandAll();
- } else {
- JAXWSHandlerUtils.createHandlerChainFile(handlerChainPath);
- setInput(handlerChainPath);
- }
- }
- } catch (IOException ioe) {
- JAXWSUIPlugin.log(ioe);
- } catch (JDOMException jdome) {
- JAXWSUIPlugin.log(jdome);
- }
- }
- }
-
- public void setJavaProject(IJavaProject javaProject) {
- this.javaProject = javaProject;
- }
-
- public void addHandler(String newHandlerName, String packageName) {
- if (root != null) {
- Element handlerChainElement = root.getChild(JAXWSHandlerUtils.HANDLER_CHAIN, JAXWSHandlerUtils.JAVAEE_NS);
- if (handlerChainElement == null) {
- handlerChainElement = new Element(JAXWSHandlerUtils.HANDLER_CHAIN, JAXWSHandlerUtils.JAVAEE_NS);
- root.addContent(handlerChainElement);
- }
- Element handlerElement = new Element(JAXWSHandlerUtils.HANDLER, JAXWSHandlerUtils.JAVAEE_NS);
-
- Element handlerNameElement = new Element(JAXWSHandlerUtils.HANDLER_NAME, JAXWSHandlerUtils.JAVAEE_NS);
- handlerNameElement.setText(newHandlerName);
-
- Element handlerClassElement = new Element(JAXWSHandlerUtils.HANDLER_CLASS, JAXWSHandlerUtils.JAVAEE_NS);
- if (packageName.trim().length() > 0) {
- handlerClassElement.setText(packageName + "." + newHandlerName);
- } else {
- handlerClassElement.setText(newHandlerName);
- }
-
- handlerElement.addContent(handlerNameElement);
- handlerElement.addContent(handlerClassElement);
- handlerChainElement.addContent(handlerElement);
- treeViewer.refresh();
- treeViewer.setSelection(new StructuredSelection(handlerElement));
- }
- }
-
- public void addHandler(String newHandlerName, String packageName, String newHandlerType) {
- addHandler(newHandlerName, packageName);
- this.newHandlerClassName = packageName + "." + newHandlerName;
- this.newHandlerType = newHandlerType;
- if (newHandlerType.equals(JAXWSUIMessages.JAXWS_LOGICAL_HANDLER)) {
- this.newHandlerType = JAXWSUIMessages.JAXWS_LOGICAL;
- } else if (newHandlerType.equals(JAXWSUIMessages.JAXWS_SOAP_HANDLER)) {
- this.newHandlerType = JAXWSUIMessages.JAXWS_PROTOCOL;
- }
- }
-
- private class HandlerChainContentProvider implements ITreeContentProvider {
-
- public Object[] getChildren(Object parentElement) {
- if (parentElement instanceof Element) {
- Element element = (Element) parentElement;
- return element.getChildren().toArray();
- }
- return new Object[] {};
- }
-
- public Object getParent(Object element) {
- if (element instanceof Element) {
- Element node = (Element) element;
- return node.getParent();
- }
- return null;
- }
-
- public boolean hasChildren(Object element) {
- if (element instanceof Element) {
- Element node = (Element) element;
- if (node.getName().equals(JAXWSHandlerUtils.HANDLER_CHAIN)) {
- return node.getChildren().size() > 0;
- }
- }
- return false;
- }
-
- public Object[] getElements(Object inputElement) {
- if (inputElement instanceof Element) {
- Element element = (Element) inputElement;
- return element.getChildren().toArray();
- }
- return new Object[] {};
- }
-
- public void dispose() {
- }
-
- public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
- }
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.utils/.classpath b/bundles/org.eclipse.jst.ws.jaxws.utils/.classpath
deleted file mode 100755
index 2d1a430..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.utils/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/bundles/org.eclipse.jst.ws.jaxws.utils/.project b/bundles/org.eclipse.jst.ws.jaxws.utils/.project
deleted file mode 100755
index ca99091..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.utils/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.jst.ws.jaxws.utils</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
diff --git a/bundles/org.eclipse.jst.ws.jaxws.utils/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.jst.ws.jaxws.utils/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100755
index ae0484e..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.utils/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,8 +0,0 @@
-#Mon Jul 20 15:25:31 EEST 2009
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.5
diff --git a/bundles/org.eclipse.jst.ws.jaxws.utils/META-INF/MANIFEST.MF b/bundles/org.eclipse.jst.ws.jaxws.utils/META-INF/MANIFEST.MF
deleted file mode 100755
index a2447f6..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.utils/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,40 +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.200.qualifier
-Bundle-Localization: plugin
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.jdt.core,
- org.eclipse.core.resources,
- org.eclipse.text,
- org.eclipse.ui,
- org.eclipse.ui.ide,
- org.eclipse.wst.common.project.facet.core
-Export-Package: org.eclipse.jst.ws.jaxws.utils;
- x-friends:="org.eclipse.jst.ws.jaxws.dom.integration,
- org.eclipse.jst.ws.jaxws.dom.runtime,
- org.eclipse.jst.ws.jaxws.dom.runtime.tests,
- org.eclipse.jst.ws.jaxws.testutils,
- org.eclipse.jst.ws.jaxws.utils.tests",
- org.eclipse.jst.ws.jaxws.utils.annotations;
- x-friends:="org.eclipse.jst.ws.jaxws.dom.integration,
- org.eclipse.jst.ws.jaxws.dom.integration.tests,
- org.eclipse.jst.ws.jaxws.dom.runtime,
- org.eclipse.jst.ws.jaxws.dom.runtime.tests,
- org.eclipse.jst.ws.jaxws.utils.tests",
- org.eclipse.jst.ws.jaxws.utils.clazz;x-friends:="org.eclipse.jst.ws.jaxws.utils.tests",
- org.eclipse.jst.ws.jaxws.utils.exception;x-friends:="org.eclipse.jst.ws.jaxws.testutils",
- org.eclipse.jst.ws.jaxws.utils.facets;x-friends:="org.eclipse.jst.ws.jaxws.dom.integration,org.eclipse.jst.ws.jaxws.dom.runtime",
- org.eclipse.jst.ws.jaxws.utils.internal.annotations.impl;x-friends:="org.eclipse.jst.ws.jaxws.dom.runtime.tests,org.eclipse.jst.ws.jaxws.utils.tests",
- org.eclipse.jst.ws.jaxws.utils.logging;
- x-friends:="org.eclipse.jst.ws.jaxws.dom.integration,
- org.eclipse.jst.ws.jaxws.dom.runtime,
- org.eclipse.jst.ws.jaxws.dom.runtime.tests,
- org.eclipse.jst.ws.jaxws.dom.ui,
- org.eclipse.jst.ws.jaxws.testutils",
- org.eclipse.jst.ws.jaxws.utils.operation;x-friends:="org.eclipse.jst.ws.jaxws.dom.runtime,org.eclipse.jst.ws.jaxws.dom.runtime.tests,org.eclipse.jst.ws.jaxws.utils.tests",
- org.eclipse.jst.ws.jaxws.utils.resources;x-friends:="org.eclipse.jst.ws.jaxws.dom.integration,org.eclipse.jst.ws.jaxws.dom.runtime.tests,org.eclipse.jst.ws.jaxws.utils.tests"
-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 (&quot;Content&quot;). Unless otherwise
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;). 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, &quot;Program&quot; 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 (&quot;Redistributor&quot;) 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 26e32f8..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=JAX-WS Utils
-Bundle-Vendor.0=Eclipse Web Tools Platform
diff --git a/bundles/org.eclipse.jst.ws.jaxws.utils/plugin.xml b/bundles/org.eclipse.jst.ws.jaxws.utils/plugin.xml
deleted file mode 100755
index 0029309..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.utils/plugin.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.4"?>
-<!--
- Copyright (c) 2009 by SAP AG, Walldorf.
- All rights reserved. This program and the accompanying materials
- are made available under the terms of the Eclipse Public License v1.0
- which accompanies this distribution, and is available at
- http://www.eclipse.org/legal/epl-v10.html
-
- Contributors:
- SAP AG - initial API and implementation
- -->
-
-<plugin>
- <extension
- point="org.eclipse.ui.startup">
- <startup></startup>
- </extension>
-
-</plugin>
diff --git a/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/ContractChecker.java b/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/ContractChecker.java
deleted file mode 100755
index 7f13b8e..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/ContractChecker.java
+++ /dev/null
@@ -1,132 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.utils;
-
-import java.text.MessageFormat;
-
-/**
- * Contains checks frequently applied on parameters.
- *
- * @author Joerg Dehmel
- */
-public final class ContractChecker
-{
- private ContractChecker()
- {
- // prevent instantiation from outside
- }
-
- /** Checks if the given parameter value is null and reports an <code>NullPointerException</code>
- * in this case.
- * @param paramValue the value to be checked
- * @param paramName name of the parameter, used to report the problem to the user
- * @throws NullPointerException thrown either the paramValue or paramName is null */
- public static void nullCheckParam(final Object paramValue, final String paramName)
- {
- if (paramName == null)
- {
- throw new NullPointerException("paramName must not be null"); //$NON-NLS-1$
- }
- if (paramValue == null)
- {
- throw new NullPointerException(paramName + " must not be null"); //$NON-NLS-1$
- }
- }
-
- /** Checks whether the given parameter value is null and reports an <code>NullPointerException</code>
- * in this case.
- * @param paramValue the value to be checked
- * @throws NullPointerException thrown if the paramValue is null */
- public static void nullCheckParam(final Object paramValue)
- {
- if (paramValue == null)
- {
- throw new NullPointerException("paramValue must not be null"); //$NON-NLS-1$
- }
- }
-
- /** Checks if the given field value is null and reports an <code>IllegalStateException</code>
- * in this case.
- * @param fieldValue the value to be checked
- * @param fieldName name of the field, used to report the problem to the user
- * @throws NullPointerException thrown if the fieldName is null
- * @throws IllegalStateException thrown if the fieldValue is null */
- public static void nullCheckField(final Object fieldValue, final String fieldName)
- {
- if (fieldName == null)
- {
- throw new NullPointerException("fieldName must not be null"); //$NON-NLS-1$
- }
- if (fieldValue == null)
- {
- throw new IllegalStateException(fieldName + " must not be null"); //$NON-NLS-1$
- }
- }
-
- /** Checks whether the given field value is null and reports an <code>IllegalStateException</code>
- * in this case.
- * @param fieldValue the value to be checked
- * @throws IllegalStateException thrown if the fieldValue is null */
- public static void nullCheckField(final Object fieldValue)
- {
- if (fieldValue == null)
- {
- throw new IllegalStateException("fieldValue must not be null"); //$NON-NLS-1$
- }
- }
-
- /** Checks whether the given value of a local variable is null and reports an <code>IllegalStateException</code>
- * in this case.
- * @param varValue the value to be checked
- * @param varName name of the local variable, used to report the problem to the user
- * @throws NullPointerException thrown if the varName is null
- * @throws IllegalStateException thrown if the varValue is null */
- public static void nullCheckVariable(final Object varValue, final String varName)
- {
- if (varName == null)
- {
- throw new NullPointerException("varName must not be null"); //$NON-NLS-1$
- }
- if (varValue == null)
- {
- throw new IllegalStateException(varName + " must not be null"); //$NON-NLS-1$
- }
- }
-
- /** Checks whether the given value of a local variable is null and reports an <code>IllegalStateException</code>
- * in this case.
- * @param varValue the value to be checked
- * @throws IllegalStateException thrown if the varValue is null */
- public static void nullCheckVariable(final Object varValue)
- {
- if (varValue == null)
- {
- throw new IllegalStateException("varValue must not be null"); //$NON-NLS-1$
- }
- }
-
- /**
- * This method checks if <code>param</code> is <code>null</code> or empty string.
- * @param param
- * @param varName
- * @throws NullPointerException in case <code>param</code> is <code>null</code>
- * @throws IllegalArgumentException in case <code>param</code> is empty string or contains only
- * white space characters
- */
- public static void emptyStringCheckParam(final String param, final String varName)
- {
- nullCheckParam(param, varName);
-
- if (param.trim().length() == 0) {
- throw new IllegalArgumentException(MessageFormat.format("Parameter {0} is empty string or contains only white spaces", varName)); //$NON-NLS-1$
- }
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/JaxWsUtils.java b/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/JaxWsUtils.java
deleted file mode 100755
index 5edde7e..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/JaxWsUtils.java
+++ /dev/null
@@ -1,220 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.utils;
-
-import org.eclipse.jdt.core.IType;
-
-/**
- * Utility that contains JAX-WS releated functionality
- *
- * @author Danail Branekov
- *
- */
-public class JaxWsUtils
-{
- private static final String BEAN_SUFFIX = "Bean"; //$NON-NLS-1$
- private static final String PORT_SUFFIX = "Port"; //$NON-NLS-1$
- private static final String SERVICE_SUFFIX = "Service"; //$NON-NLS-1$
-
- private JaxWsUtils()
- {
- // hide default constructor
- }
-
- /**
- * An utility method for composing a default target namespace for JaxWs customization
- * out of a package name.
- * Algorithm:
- * <li>In case the package has 0 fragment (default package) the result would be http:///</li>
- * <li>In case the package has 1 fragment the result would be http://fragment1/</li>
- * <li>In case the package has 2 fragments the result would be http://fragment2.fragment1/</li>
- * <li>In case the package has more than 2 fragments the result would be http://fragment2.fragment1/fragment3/fragment4/.../fragmentn/</li>
- * @param packageName Name of the package
- * @return the composed namespace
- * @thorws NullPointerException when package name specified is null
- */
- public static String composeJaxWsTargetNamespaceByPackage(String packageName)
- {
- if(packageName == null)
- {
- throw new NullPointerException("Package name cannot be null"); //$NON-NLS-1$
- }
-
- String[] pkgFragments = packageName.split("\\."); //$NON-NLS-1$
-
- if(pkgFragments.length > 1)
- {
- // reverse the first two fragments in case there are at least two fragments available
- String frag0 = pkgFragments[0];
- pkgFragments[0] = pkgFragments[1];
- pkgFragments[1] = frag0;
- }
-
- StringBuilder result = new StringBuilder("http://"); //$NON-NLS-1$
- for (int i = 0; i < pkgFragments.length; i++)
- {
- result.append(pkgFragments[i]);
- result.append(i==0 && pkgFragments.length>1 ? "." : "/"); //$NON-NLS-1$ //$NON-NLS-2$
- }
-
- return result.toString();
- }
-
- /**
- * Same as composeJaxWsTargetNamespaceByPackage() but first extracts the package out of class
- * fully qualified name
- * @param fqName the class fully qualified name
- * @return calculated target namespace
- */
- public static String composeJaxWsTargetNamespaceByFQName(String fqName)
- {
- ContractChecker.nullCheckParam(fqName, "fqName"); //$NON-NLS-1$
- return composeJaxWsTargetNamespaceByPackage(extractPackage(fqName));
- }
-
- /**
- * Returns the PortType name from the <code>endpointType</code> and <code>seiName</code>.
- * @param endpoint class.
- * @param seiName
- * @return PortType name for the @WebService annotation, the name of the <code>endpointType</code> with the "Port" suffix.
- * @throws NullPointerException when <code>endpointType</code> specified is null.
- */
- public static String getPorttypeName(IType endpointType, String seiName)
- {
- if(endpointType == null)
- {
- throw new NullPointerException("endpointType could not be null!"); //$NON-NLS-1$
- }
-
- if(seiName != null && seiName.length() > 0)
- {
- return seiName;
- }
-
- return removeBeanSuffixIfRequired(endpointType.getElementName());
- }
-
- /**
- * Removes the "Bean" suffix from the <code>endpointType</code> in case it is present and generates Service name for the specified IType.
- * @param endpoint class.
- * @return Service name for the @WebService annotation, the name of the <code>endpointType</code> without the "Bean" suffix and <code>"Service"</code> at the end.
- * In case the name of the <code>endpointType</code> equals "Bean" then the original name is returned with <code>"Service"</code> ate the end.
- * @throws NullPointerException when <code>endpointType</code> specified is null
- */
- public static String getServiceName(final IType endpointType)
- {
- if(endpointType == null)
- {
- throw new NullPointerException("endpointType could not be null!"); //$NON-NLS-1$
- }
-
- return removeBeanSuffixIfRequired(endpointType.getElementName()) + SERVICE_SUFFIX;
- }
-
- /**
- * Removes the "Bean" suffix from the endpoint name in case it is present.
- * @param endpointName the name of the endpoint
- * @return the name of the endpoint without the "Bean" suffix. In case the name of the endpoint equals "Bean" then the original name is returned
- */
- private static String removeBeanSuffixIfRequired(final String endpointName)
- {
- assert endpointName != null && endpointName.length() > 0;
-
- if(endpointName.equals(BEAN_SUFFIX))
- {
- return endpointName;
- }
-
- if(endpointName.endsWith(BEAN_SUFFIX))
- {
- return endpointName.substring(0, endpointName.lastIndexOf(BEAN_SUFFIX));
- }
-
- return endpointName;
- }
-
- /**
- * Returns the Port name from the <code>endpointType</code>.
- * @param endpoint class.
- * @return Port name for the @WebService annotation, the name of the <code>endpointType</code> with the "Port" suffix.
- * @throws NullPointerException when <code>endpointType</code> specified is null.
- */
- public static String getPortName(final IType endpointType)
- {
- return getDefaultPortName(endpointType.getElementName());
- }
-
- /**
- * Returns the default service name calculated as the specification states.
- * @param fqName
- * @return the default service name
- * @throws NullPointerException in case <code>endpointType</code> is <code>null</code>
- */
- public static String getDefaultServiceName(final String fqName)
- {
- if(fqName == null)
- {
- throw new NullPointerException("endpointType could not be null!"); //$NON-NLS-1$
- }
-
- return extractShortName(fqName) + SERVICE_SUFFIX;
- }
-
- /**
- * Returns the default wsdl:portType name defined as JAX-WS specification states.
- * @param fqName
- * @return
- */
- public static String getDefaultPorttypeName(final String fqName)
- {
- if(fqName == null)
- {
- throw new NullPointerException("fqName could not be null!"); //$NON-NLS-1$
- }
-
- return extractShortName(fqName);
- }
-
- /**
- * Return the default name for a wsdl:port defined as JAX-WS specification states
- * @param fqName
- * @return the calculated name
- */
- public static String getDefaultPortName(final String fqName)
- {
- if(fqName == null)
- {
- throw new NullPointerException("fqName could not be null!"); //$NON-NLS-1$
- }
-
- return extractShortName(fqName) + PORT_SUFFIX;
- }
-
- private static String extractShortName(String fqName)
- {
- int pos = fqName.lastIndexOf('.');
- if (pos ==-1 ) {
- return fqName;
- }
-
- return fqName.substring(pos+1);
- }
-
- private static String extractPackage(final String fqName)
- {
- int pos = fqName.lastIndexOf('.');
- if (pos ==-1 ) {
- return fqName;
- }
-
- return fqName.substring(0, pos);
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/StatusUtils.java b/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/StatusUtils.java
deleted file mode 100755
index 53779a6..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/StatusUtils.java
+++ /dev/null
@@ -1,170 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.utils;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.MultiStatus;
-import org.eclipse.core.runtime.Status;
-
-
-/**
- * Convenience methods to manage status objects.
- *
- * @author Joerg Dehmel
- */
-public final class StatusUtils
-{
- private StatusUtils()
- {
- // no instantiation
- }
-
- /**
- * Finds the most severe status from a array of stati.
- * An error is more severe than a warning, and a warning is more severe
- * than ok.
- */
- public static IStatus getMostSevere(IStatus[] status) {
- IStatus max= null;
- for (int i= 0; i < status.length; i++) {
- IStatus curr= status[i];
- if (curr.matches(IStatus.ERROR)) {
- return curr;
- }
- if (max == null || curr.getSeverity() > max.getSeverity()) {
- max= curr;
- }
- }
- return max;
- }
-
- /**
- * Provides a new status object with severity IStatus.CANCEL.
- *
- * @param message
- * status message
- * @return the cancel status
- */
- public static IStatus statusCancel(final String message)
- {
- return createStatus(IStatus.CANCEL, message);
- }
-
- /**
- * Provides a new status object with severity IStatus.ERROR.
- *
- * @param message
- * status message
- * @return the error status
- */
- public static IStatus statusError(final String message)
- {
- return createStatus(IStatus.ERROR, message);
- }
-
- /**
- * Provides a new status object with severity IStatus.ERROR.
- *
- * @param message
- * status message
- * @param ex
- * exception that corresponds to the status
- * @return the error status
- */
- public static IStatus statusError(final String message, final Throwable ex)
- {
- return createStatus(IStatus.ERROR, message, ex);
- }
-
- /**
- * Provides a new status object with severity IStatus.WARNING.
- *
- * @param message
- * status message
- * @return the warning status
- */
- public static IStatus statusWarning(final String message)
- {
- return createStatus(IStatus.WARNING, message);
- }
-
- /**
- * Provides a new status object with severity IStatus.WARNING.
- *
- * @param message
- * status message
- * @param ex
- * exception that corresponds to the status
- * @return the warning status
- */
- public static IStatus statusWarning(final String message, final Throwable ex)
- {
- return createStatus(IStatus.WARNING, message, ex);
- }
-
- /**
- * Provides a new status object with severity IStatus.INFO.
- *
- * @param message
- * status message
- * @return the info status
- */
- public static IStatus statusInfo(final String message)
- {
- return createStatus(IStatus.INFO, message);
- }
-
- /**
- * Provides a new status object with severity IStatus.INFO.
- *
- * @param message
- * status message
- * @return the info status
- */
- public static IStatus statusInfo(final String message, final Throwable cause)
- {
- return createStatus(IStatus.INFO, message, cause);
- }
-
- /**
- * Provides a new status object with severity IStatus.OK.
- *
- * @param message
- * status message
- * @return the ok status
- */
- public static IStatus statusOk(final String message)
- {
- return createStatus(IStatus.OK, message);
- }
-
- private static IStatus createStatus(final int severity, final String message)
- {
- return new Status(severity, "id", 0, message, null); //$NON-NLS-1$
- }
-
- private static IStatus createStatus(final int severity, final String message, final Throwable ex)
- {
- return new Status(severity, "id", 0, message, ex); //$NON-NLS-1$
- }
-
- /**
- * Provides a new multistatus object
- *
- * @param message
- * status message
- * @return multistatus
- */
- public static MultiStatus createMultiStatus(String message)
- {
- return new MultiStatus("id", 0, message, null); //$NON-NLS-1$
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/annotations/AnnotationFactory.java b/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/annotations/AnnotationFactory.java
deleted file mode 100755
index af2fd38..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/annotations/AnnotationFactory.java
+++ /dev/null
@@ -1,352 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.utils.annotations;
-
-import static org.eclipse.jst.ws.jaxws.utils.ContractChecker.nullCheckParam;
-
-import java.io.FileNotFoundException;
-import java.util.Set;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jdt.core.IField;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.ITypeParameter;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jface.text.BadLocationException;
-import org.eclipse.jst.ws.jaxws.utils.internal.annotations.impl.AnnotationImpl;
-import org.eclipse.jst.ws.jaxws.utils.internal.annotations.impl.AnnotationInspectorImpl;
-import org.eclipse.jst.ws.jaxws.utils.internal.annotations.impl.AnnotationUtils;
-import org.eclipse.jst.ws.jaxws.utils.internal.annotations.impl.ArrayValueImpl;
-import org.eclipse.jst.ws.jaxws.utils.internal.annotations.impl.BooleanValueImpl;
-import org.eclipse.jst.ws.jaxws.utils.internal.annotations.impl.ClassValueImpl;
-import org.eclipse.jst.ws.jaxws.utils.internal.annotations.impl.IntegerValueImpl;
-import org.eclipse.jst.ws.jaxws.utils.internal.annotations.impl.ParamValuePairImpl;
-import org.eclipse.jst.ws.jaxws.utils.internal.annotations.impl.QualifiedNameValueImpl;
-import org.eclipse.jst.ws.jaxws.utils.internal.annotations.impl.StringValueImpl;
-import org.eclipse.jst.ws.jaxws.utils.internal.text.JaxWsUtilMessages;
-import org.eclipse.text.edits.MalformedTreeException;
-
-
-/**
- * Factory class containing common factory and utility methods Annotation processing.
- *
- * @author Plamen Pavlov
- */
-public class AnnotationFactory
-{
- /**
- * Creates complex Annotation, e.g. Annotation of kind \@WebService(param1="value1", param2="value2").
- *
- * @param annotationQName
- * @param paramValuePairs
- *
- * @return Instantiated Annotation of type IComplexAnnotation.
- *
- * @throws NullPointerException in case <tt>annotationQName</tt> or <tt>paramValuePairs</tt> are null.
- * @throws IllegalArgumentException in case <tt>annotationQName</tt> is empty String.
- */
- public static <T extends IJavaElement> IAnnotation<T> createAnnotation(String annotationQName, Set<IParamValuePair> paramValuePairs, final T appliedElement)
- {
- if (annotationQName == null)
- {
- throw new NullPointerException("annotationQName should not be null!"); //$NON-NLS-1$
- }
- if (annotationQName.trim().length() == 0)
- {
- throw new IllegalArgumentException("annotationQName should not be empty String!"); //$NON-NLS-1$
- }
-
- if (paramValuePairs == null)
- {
- throw new NullPointerException("paramValuePairs should not be null!"); //$NON-NLS-1$
- }
-
- final AnnotationImpl<T> impl = new AnnotationImpl<T>(annotationQName, paramValuePairs);
- impl.setJavaElement(appliedElement);
-
- return impl;
- }
-
-
- /**
- * Creates {@link IAnnotation} instance that references <code>appliedElement</code> java element
- * @param annotationQName the annotation name
- * @param appliedElement the java element that this annotation is applied on
- * @param paramValuePairs the annotation attributes
- * @return {@link IAnnotation} instance
- * @throws NullPointerException in case some of params is <code>null</code>
- * @throws IllegalArgumentException in case <code>annotationQName</code> is empty string
- */
- public static IAnnotation<? extends IJavaElement> createAnnotation(String annotationQName, IJavaElement appliedElement, Set<IParamValuePair> paramValuePairs)
- {
- nullCheckParam(annotationQName, "annotationQName"); //$NON-NLS-1$
- if (annotationQName.trim().length() == 0) {
- throw new IllegalArgumentException("annotationQName should not be empty String!"); //$NON-NLS-1$
- }
-
- nullCheckParam(paramValuePairs, "paramValuePairs"); //$NON-NLS-1$
- nullCheckParam(appliedElement, "appliedElement"); //$NON-NLS-1$
-
- final AnnotationImpl<IJavaElement> annotation = new AnnotationImpl<IJavaElement>(annotationQName, paramValuePairs);
- annotation.setAppliedElementWithoutSave(appliedElement);
-
- return annotation;
- }
-
- /**
- * Creates param-value pair needed in complex Annotations.
- *
- * @param param
- * @param value
- *
- * @return instance of IParamValuePair
- *
- * @throws NullPointerException in case <code>param</code> or <code>value</code> is <code>null</code>.
- * @throws IllegalArgumentException in case <code>param</code> parameter is empty String.
- */
- public static IParamValuePair createParamValuePairValue(String param, IValue value)
- {
- if (param == null)
- {
- throw new NullPointerException("param should not be null!"); //$NON-NLS-1$
- }
- if (param.trim().length() == 0)
- {
- throw new IllegalArgumentException("param should not be empty String!"); //$NON-NLS-1$
- }
-
- if (value == null)
- {
- throw new NullPointerException("value should not be null!"); //$NON-NLS-1$
- }
-
- return new ParamValuePairImpl(param, value);
- }
-
- /**
- * Creates {@link IValue} instance using provided <code>values</code>.
- *
- * @param values
- *
- * @return instance of {@link IValue}
- *
- * @throws NullPointerException in case <code>values</code> is null.
- * @throws IllegalArgumentException in case <code>values</code> is empty Set.
- */
- public static IValue createArrayValue(Set<IValue> values)
- {
- if (values == null)
- {
- throw new NullPointerException("values should not be null!"); //$NON-NLS-1$
- }
- if (values.size() < 1)
- {
- throw new IllegalArgumentException("values should not be empty Set!"); //$NON-NLS-1$
- }
-
- return new ArrayValueImpl(values);
- }
-
- /**
- * Creates {@link IValue} instance out of <code>value</code>.
- *
- * @param value
- *
- * @return instance of {@link IValue}
- */
- public static IValue createBooleanValue(boolean value)
- {
- return new BooleanValueImpl(value);
- }
-
- /**
- * Creates {@link IValue} instance out of <code>value</code>.
- *
- * @param value
- *
- * @return instance of {@link String}
- */
- public static IValue createClassValue(String value)
- {
- if (value == null)
- {
- throw new NullPointerException("value should not be null!"); //$NON-NLS-1$
- }
- if(value.equals("")) //$NON-NLS-1$
- {
- throw new IllegalArgumentException("value should not be empty String"); //$NON-NLS-1$
- }
-
- return new ClassValueImpl(value);
- }
-
- /**
- * Creates {@link IValue} instance out of <code>value</code>.
- *
- * @param value
- *
- * @return instance of {@link IValue}
- */
- public static IValue createIntegerValue(String value)
- {
- return new IntegerValueImpl(value);
- }
-
- /**
- * Creates {@link IValue} instance using provided <code>qualifiedName</code> fully qualified name.
- *
- * @param qualifiedName
- *
- * @return instance of {@link IValue}
- *
- * @throws NullPointerException in case <tt>qualifiedName</tt> is null.
- * @throws IllegalArgumentException in case <code>qualifiedName</code> is not in correct form e.g. could not be empty String, shold be qualified.
- */
- public static IValue createQualifiedNameValue(String qualifiedName)
- {
- if (qualifiedName == null)
- {
- throw new NullPointerException("qualifiedName should not be null!"); //$NON-NLS-1$
- }
-
- if (qualifiedName.trim().length() == 0 || qualifiedName.indexOf('.') == -1)
- {
- throw new IllegalArgumentException("qualifiedName is not in correct form!"); //$NON-NLS-1$
- }
-
- return new QualifiedNameValueImpl(qualifiedName);
- }
-
- /**
- * Creates {@link IValue} instance out of <code>value</code> content.
- *
- * @param value
- *
- * @return instance of {@link IValue}
- * @throws NullPointerException in case <tt>value</tt> is null.
- */
- public static IValue createStringValue(String value)
- {
- if (value == null)
- {
- throw new NullPointerException("value should not be null!"); //$NON-NLS-1$
- }
-
- return new StringValueImpl(value);
- }
-
-
-// /**
-// * Retrieves all Annotations from class.
-// *
-// * @param javaElement
-// *
-// * @return contained annotations in <code>javaElement</code>
-// *
-// * @throws JavaModelException if exception occurs
-// * @throws NullPointerException if <tt>javaElement</tt> is null.
-// * @throws IllegalArgumentException in case <code>javaElement</code> is not of the correct type. Supported types are: Itype, IMethod, IField, ITypeParameter
-// */
-// public static Set<IAnnotation> getAnnotationsFromJavaElement(IJavaElement javaElement) throws JavaModelException
-// {
-// if (javaElement == null)
-// {
-// throw new NullPointerException("javaElement should not be null!");
-// }
-// if(!(javaElement instanceof IType) || !(javaElement instanceof IMethod) || !(javaElement instanceof IField) || !(javaElement instanceof ITypeParameter))
-// {
-// throw new IllegalArgumentException("javaElement is not of correct type!");
-// }
-// pppppp
-// }
-
- /**
- * Removes all Annotations from <code>javaElement</code>.
- *
- * @param javaElement
- *
- * @throws NullPointerException if <tt>javaElement</tt> is null.
- * @throws IllegalArgumentException in case <code>javaElement</code> is not of the correct type. Supported types are: Itype, IMethod, IField, ITypeParameter
- * @throws AnnotationGeneratorException
- */
- public static void removeAnnotationsFromJavaElement(IJavaElement javaElement) throws AnnotationGeneratorException
- {
- if (javaElement == null)
- {
- throw new NullPointerException("javaElement should not be null!"); //$NON-NLS-1$
- }
- if(!(javaElement instanceof IType) && !(javaElement instanceof org.eclipse.jdt.core.IMethod) && !(javaElement instanceof IField) && !(javaElement instanceof ITypeParameter))
- {
- throw new IllegalArgumentException("javaElement is not of correct type!"); //$NON-NLS-1$
- }
- removeAnnotations(javaElement, null);
- }
-
- /**
- * Removes Annotations with names contained in <code>annotations</code> from <code>javaElement</code> and its children, if such exist.
- *
- * @param javaElement
- * @param annotations
- *
- * @throws NullPointerException if <tt>javaElement</tt> or <tt>annotations</tt> is null.
- * @throws IllegalArgumentException in case <code>javaElement</code> is not of the correct type. Supported types are: Itype, IMethod, IField, ITypeParameter
- * @throws AnnotationGeneratorException
- */
- public static void removeAnnotations(IJavaElement javaElement, Set<String> annotations) throws AnnotationGeneratorException
- {
- if (javaElement == null)
- {
- throw new NullPointerException("javaElement should not be null!"); //$NON-NLS-1$
- }
- if(!(javaElement instanceof IType) && !(javaElement instanceof org.eclipse.jdt.core.IMethod) && !(javaElement instanceof IField) && !(javaElement instanceof ITypeParameter))
- {
- throw new IllegalArgumentException("javaElement is not of correct type!"); //$NON-NLS-1$
- }
-
- try
- {
- AnnotationUtils.getInstance().removeAnnotations(javaElement, annotations, true);
- }
- catch (JavaModelException e)
- {
- throw new AnnotationGeneratorException(e.getMessage(), e.getStatus().getMessage(), e);
- }
- catch (MalformedTreeException e)
- {
- throw new AnnotationGeneratorException(e.getMessage(), JaxWsUtilMessages.InvalidTreeStateMsg, e);
- }
- catch (FileNotFoundException e)
- {
- throw new AnnotationGeneratorException(e.getMessage(), JaxWsUtilMessages.CompUnitMissingMsg, e);
- }
- catch (CoreException e)
- {
- throw new AnnotationGeneratorException(e.getMessage(), e.getStatus().getMessage(), e);
- }
- catch (BadLocationException e)
- {
- throw new AnnotationGeneratorException(e.getMessage(), JaxWsUtilMessages.CannotPerformEditMsg, e);
- }
- }
-
- /**
- * Create instance of IAnnotationInspector for a specific IType.
- *
- * @param type - IType, which will be inspected.
- *
- * @return IAnnotationInspector
- */
- public static IAnnotationInspector createAnnotationInspector(IType type)
- {
- return new AnnotationInspectorImpl(type);
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/annotations/AnnotationGeneratorException.java b/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/annotations/AnnotationGeneratorException.java
deleted file mode 100755
index 8558a94..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/annotations/AnnotationGeneratorException.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.utils.annotations;
-
-import org.eclipse.jst.ws.jaxws.utils.exception.LocalizedException;
-
-/**
- * Exception thrown by annotation generator in case when unexpected condition is met
- *
- * @author Plamen Pavlov
- */
-
-public class AnnotationGeneratorException extends LocalizedException
-{
- private static final long serialVersionUID = 1L;
-
- /**
- * Constructor getting error message, localized message and {@link Throwable} to be wrapped
- *
- * @param message
- * @param localizedMessage
- * @param t
- */
- public AnnotationGeneratorException(final String message, final String localizedMessage, final Throwable t)
- {
- super(message, localizedMessage, t);
- }
-
- /**
- * Constructor with error message and a localized message.
- *
- * @param message
- * @param localizedMessage
- */
- public AnnotationGeneratorException(final String message, final String localizedMessage)
- {
- super(message, localizedMessage);
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/annotations/AnnotationWriter.java b/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/annotations/AnnotationWriter.java
deleted file mode 100755
index 3f0732b..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/annotations/AnnotationWriter.java
+++ /dev/null
@@ -1,600 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.utils.annotations;
-
-import java.io.FileNotFoundException;
-import java.util.List;
-import java.util.Set;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IField;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.IMember;
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.ITypeParameter;
-import org.eclipse.jdt.core.dom.AST;
-import org.eclipse.jdt.core.dom.ASTNode;
-import org.eclipse.jdt.core.dom.Annotation;
-import org.eclipse.jdt.core.dom.BodyDeclaration;
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jdt.core.dom.Expression;
-import org.eclipse.jdt.core.dom.FieldDeclaration;
-import org.eclipse.jdt.core.dom.IExtendedModifier;
-import org.eclipse.jdt.core.dom.MethodDeclaration;
-import org.eclipse.jdt.core.dom.SingleVariableDeclaration;
-import org.eclipse.jdt.core.dom.TypeDeclaration;
-import org.eclipse.jface.text.BadLocationException;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jst.ws.jaxws.utils.clazz.ASTUtils;
-import org.eclipse.jst.ws.jaxws.utils.internal.annotations.impl.AnnotationImpl;
-import org.eclipse.jst.ws.jaxws.utils.internal.annotations.impl.AnnotationUtils;
-import org.eclipse.jst.ws.jaxws.utils.internal.text.JaxWsUtilMessages;
-import org.eclipse.jst.ws.jaxws.utils.resources.EditResourcesManager;
-import org.eclipse.jst.ws.jaxws.utils.resources.FileUtils;
-import org.eclipse.jst.ws.jaxws.utils.resources.IFileUtils;
-import org.eclipse.text.edits.MalformedTreeException;
-import org.eclipse.text.edits.TextEdit;
-
-/**
- * Class, which is used to save the annotations.
- *
- * @author Plamen Pavlov
- *
- */
-public class AnnotationWriter
-{
- private static AnnotationWriter writer = null;
- private final IFileUtils fileUtils = FileUtils.getInstance();
-
- /**
- * The factory method.
- *
- * @return a AnnotationWriter instance.
- */
- public static<T extends IJavaElement> AnnotationWriter getInstance()
- {
- if (writer == null)
- {
- writer = new AnnotationWriter();
- }
- return writer;
- }
-
- /**
- * Adds Annotation to specific IJavaElement.
- *
- * @param javaElement
- *
- * @throws NullPointerException if <tt>javaElement</tt> is null.
- * @throws IllegalArgumentException in case <code>javaElement</code> is not of the correct type. Supported types are: IType, IMethod, IField, ITypeParameter.
- * @throws AnnotationGeneratorException.
- */
- public <T extends IJavaElement> void setAppliedElement(final IAnnotation<T> annotation, final T javaElement) throws AnnotationGeneratorException
- {
- AnnotationImpl<T> annotationImpl = (AnnotationImpl<T>)annotation;
- annotationImpl.setJavaElement(javaElement);
-
- setAnnotatationStringVallue(annotationImpl, true, javaElement);
- }
-
- private <T extends IJavaElement> void setAnnotatationStringVallue(AnnotationImpl<T> annotationImpl, boolean needSave, final T javaElement) throws AnnotationGeneratorException
- {
- if (!needSave) {
- return;
- }
-
- if(javaElement instanceof IType)
- {
- addToClass(annotationImpl, (IType)javaElement);
- }
- if(javaElement instanceof IField)
- {
- addToField(annotationImpl, (IField)javaElement);
- }
- if(javaElement instanceof IMethod)
- {
- addToMethod(annotationImpl, (IMethod)javaElement);
- }
- if(javaElement instanceof ITypeParameter)
- {
- addToParam(annotationImpl, (ITypeParameter)javaElement);
- }
- }
-
- private <T extends IJavaElement> void addToClass(AnnotationImpl<T> annotationImpl, IType classType) throws AnnotationGeneratorException
- {
- String className = classType.getElementName();
-
- addToMember(annotationImpl, classType.getCompilationUnit(), classType, className);
- }
-
- private <T extends IJavaElement> void addToField(AnnotationImpl<T> annotationImpl, IField fieldType) throws AnnotationGeneratorException
- {
- String className = fieldType.getParent().getElementName();
-
- addToMember(annotationImpl, fieldType.getCompilationUnit(), fieldType, className);
- }
-
- private <T extends IJavaElement> void addToMethod(AnnotationImpl<T> annotationImpl, IMethod methodType) throws AnnotationGeneratorException
- {
- String className = methodType.getParent().getElementName();
-
- addToMember(annotationImpl, methodType.getCompilationUnit(), methodType, className);
- }
-
- private <T extends IJavaElement> void addToParam(AnnotationImpl<T> annotationImpl, ITypeParameter typeParam) throws AnnotationGeneratorException
- {
- IMember member = typeParam.getDeclaringMember();
- String className = null;
- if (member.getElementType() == IJavaElement.METHOD)
- {
- className = member.getDeclaringType().getElementName();
- } else
- {
- className = member.getElementName();
- }
-
- addToMember(annotationImpl, member.getCompilationUnit(), typeParam, className);
- }
-
- private <T extends IJavaElement> void addToMember(AnnotationImpl<T> annotationImpl, ICompilationUnit cUnit, IJavaElement type, String className) throws AnnotationGeneratorException
- {
- try
- {
- if (cUnit == null)
- {
- return;
- }
-
- CompilationUnit unit = ASTUtils.getInstance().createCompilationUnit(cUnit, null);
- AST ast = unit.getAST();
-
- TypeDeclaration typeDeclaration = (TypeDeclaration)ASTUtils.getInstance().getTypeDeclaration(className, unit);
- if (typeDeclaration != null)
- {
- switch (type.getElementType())
- {
- case IJavaElement.TYPE:
- addAnnotation(annotationImpl, cUnit, unit, ast, typeDeclaration);
- break;
- case IJavaElement.METHOD:
- MethodDeclaration methodDeclaration = ASTUtils.getInstance().getMethodDeclaration((IMethod) type, typeDeclaration);
- addAnnotation(annotationImpl, cUnit, unit, ast, methodDeclaration);
- break;
- case IJavaElement.FIELD:
- FieldDeclaration fieldDeclaration = ASTUtils.getInstance().getFieldDeclaration((IField) type, typeDeclaration);
- addAnnotation(annotationImpl, cUnit, unit, ast, fieldDeclaration);
- break;
- case IJavaElement.TYPE_PARAMETER:
- ITypeParameter typeParameter = (ITypeParameter) type;
- if (typeParameter.getDeclaringMember().getElementType() == IJavaElement.METHOD)
- {
- methodDeclaration = ASTUtils.getInstance().getMethodDeclaration((IMethod) typeParameter.getDeclaringMember(), typeDeclaration);
- SingleVariableDeclaration paramDeclaration = getParamDeclaration(typeParameter, methodDeclaration);
- addAnnotation(annotationImpl, cUnit, unit, ast, paramDeclaration);
- }
- break;
- default:
- throw new IllegalArgumentException("unsupported type for annotation"); //$NON-NLS-1$
- }
- }
- }
- catch (MalformedTreeException e)
- {
- throw new AnnotationGeneratorException(e.getMessage(), JaxWsUtilMessages.InvalidTreeStateMsg, e);
- }
- catch (CoreException e)
- {
- throw new AnnotationGeneratorException(e.getMessage(), e.getStatus().getMessage(), e);
- }
- catch (BadLocationException e)
- {
- throw new AnnotationGeneratorException(e.getMessage(), JaxWsUtilMessages.CannotPerformEditMsg, e);
- }
- catch (FileNotFoundException e)
- {
- throw new AnnotationGeneratorException(e.getMessage(), JaxWsUtilMessages.CompUnitMissingMsg, e);
- }
- }
-
- @SuppressWarnings("unchecked")
- private <T extends IJavaElement> void addAnnotation(AnnotationImpl<T> annotationImpl, ICompilationUnit cUnit, CompilationUnit unit, AST ast, ASTNode declaration)
- throws CoreException, MalformedTreeException, BadLocationException, FileNotFoundException, AnnotationGeneratorException
- {
- editResManager().setFileEditable((IFile) cUnit.getResource());
-
- unit.recordModifications();
- Expression annot = annotationImpl.getExpression(unit, ast);
-
- List modifiers = null;
-
- switch (declaration.getNodeType())
- {
- case ASTNode.METHOD_DECLARATION:
- case ASTNode.FIELD_DECLARATION:
- case ASTNode.TYPE_DECLARATION:
- modifiers = ((BodyDeclaration) declaration).modifiers();
- break;
- case ASTNode.SINGLE_VARIABLE_DECLARATION:
- modifiers = ((SingleVariableDeclaration) declaration).modifiers();
- break;
- default:
- throw new IllegalArgumentException("addAnnotation() illegal declataion type"); //$NON-NLS-1$
- }
-
- modifiers.add(0, annot);
-
- IDocument doc = AnnotationUtils.getInstance().getDocument(cUnit);
-
- TextEdit edit = unit.rewrite(doc, null);
- edit.apply(doc);
-
- IStatus status = editResManager().setFileEditable((IFile) cUnit.getResource());
- if(status.getSeverity() == IStatus.OK)
- {
- fileUtils.setCompilationUnitContentAndSaveDirtyEditors(cUnit, doc.get(), true, null);
- }
- else
- {
- throw new AnnotationGeneratorException("Annotattion could not be stored, the file is not writable", //$NON-NLS-1$
- JaxWsUtilMessages.AnnotationCannotBeStoredMsg);
- }
- }
-
- private static SingleVariableDeclaration getParamDeclaration(ITypeParameter typeParameter, MethodDeclaration methodDeclaration)
- {
- //TODO check this method
- final String paramName = typeParameter.getElementName();
-
- for (Object decl : methodDeclaration.parameters())
- {
- if (!(decl instanceof SingleVariableDeclaration))
- {
- continue;
- }
-
- if (paramName.equals(((SingleVariableDeclaration) decl).getName().toString()))
- {
- return (SingleVariableDeclaration) decl;
- }
- }
-
- return null;
- }
-
- /**
- * Updates the Parameter-Value Pairs of specific Annotation.
- *
- * @param annotation - Annotation, which will be updated.
- * @throws AnnotationGeneratorException
- * @throws CoreException
- */
- public <T extends IJavaElement> void update(final IAnnotation<T> annotation) throws AnnotationGeneratorException, CoreException
- {
- AnnotationImpl<T> annotattionImpl = new AnnotationImpl<T>(annotation.getAnnotationName(), annotation.getParamValuePairs());
- try
- {
- updateTheAnnotation(annotation.getAppliedElement(), annotattionImpl);
- }
- catch(MalformedTreeException e) {
- throw new AnnotationGeneratorException(e.getMessage(), JaxWsUtilMessages.InvalidTreeStateMsg, e);
- }
- catch (BadLocationException e) {
- throw new AnnotationGeneratorException(e.getMessage(), JaxWsUtilMessages.CannotPerformEditMsg, e);
- }
- catch (FileNotFoundException e) {
- throw new AnnotationGeneratorException(e.getMessage(), JaxWsUtilMessages.CompUnitMissingMsg, e);
- }
- }
-
- /**
- * Updates the Param-Value Pairs of specific Annotation.
- *
- * @param annotation - Annotation, which will be updated.
- * @param paramValuePairs which will be updated. Old pairs will be replaced with the new once.
- * @param replacePreviousPairs boolean value which specifies the way, how new IParamValuePairs will be updated. If the value is <tt>true</tt>,
- * the Set with the old IParamValuePairs will be cleared and the new values will be applied. If the value is <tt>false</tt> the old pairs will be kept
- * and will be updated with the values from the new Set, if there are params which do not exist in the old one, they will be added.
- *
- * @throws CoreException
- * @throws AnnotationGeneratorException
- *
- * @deprecated - use public <T extends IJavaElement> void update(final IAnnotation<T> annotation) instead.
- */
- @Deprecated
- public <T extends IJavaElement> void update(final IAnnotation<T> annotation, Set<IParamValuePair> paramValuePairs, boolean replacePreviousPairs) throws AnnotationGeneratorException, CoreException
- {
- updateAnnotation(annotation, annotation.getAppliedElement(), paramValuePairs, replacePreviousPairs);
- }
-
- /**
- *
- * @param <T>
- * @param annotation
- * @param javaElement
- * @param paramValuePairs
- * @param replacePreviousPairs
- * @throws AnnotationGeneratorException
- * @throws CoreException
- *
- */
- private <T extends IJavaElement> void updateAnnotation(final IAnnotation<T> annotation, final T javaElement, Set<IParamValuePair> paramValuePairs, boolean replacePreviousPairs) throws AnnotationGeneratorException, CoreException
- {
- AnnotationImpl<T> annotationImpl = (AnnotationImpl<T>)annotation;
- try
- {
- if(replacePreviousPairs)
- {
- annotationImpl.setParamValuePairs(paramValuePairs);
- }
- else
- {
- for (IParamValuePair pair : paramValuePairs)
- {
- boolean isUpdated = false;
- Set<IParamValuePair> tmpParamValuePairs = annotationImpl.getParamValuePairs();
- for (IParamValuePair thisPair : tmpParamValuePairs)
- {
- if(thisPair.getParam().equals(pair.getParam()))
- {
- tmpParamValuePairs.remove(thisPair);
- tmpParamValuePairs.add(pair);
- isUpdated = true;
- break;
- }
- }
- if(!isUpdated)
- {
- tmpParamValuePairs.add(pair);
- }
- annotationImpl.setParamValuePairs(tmpParamValuePairs);
- }
- }
- updateTheAnnotation(javaElement, annotationImpl);
-
- //remove(annotation);
- //setAppliedElement(annotation, javaElement);
- }
- catch(MalformedTreeException e) {
- throw new AnnotationGeneratorException(e.getMessage(), JaxWsUtilMessages.InvalidTreeStateMsg, e);
- }
- catch (BadLocationException e) {
- throw new AnnotationGeneratorException(e.getMessage(), JaxWsUtilMessages.CannotPerformEditMsg, e);
- }
- catch (FileNotFoundException e) {
- throw new AnnotationGeneratorException(e.getMessage(), JaxWsUtilMessages.CompUnitMissingMsg, e);
- }
- }
-
-
- /**
- * Removes Annotation.
- *
- * @param annotation - Annotation, which will be removed.
- *
- * @throws BadLocationException
- * @throws CoreException
- * @throws AnnotationGeneratorException
- * @throws FileNotFoundException
- */
- public <T extends IJavaElement> void remove(final IAnnotation<T> annotation) throws AnnotationGeneratorException, CoreException
- {
- removeAnnotation(annotation, annotation.getAppliedElement());
- }
-
- private <T extends IJavaElement> void removeAnnotation(final IAnnotation<T> annotation, final T javaElement) throws AnnotationGeneratorException, CoreException
- {
- AnnotationImpl<T> annotationImpl = (AnnotationImpl<T>)annotation;
- try
- {
-// if(annotationImpl.getAnnotationStringValue() == null || annotationImpl.getAnnotationStringValue().trim().equals(""))
-// {
-// annotationImpl.setAnnotationStringValue(createAnnotatationStringVallue(annotationImpl, javaElement));
-// AnnotationUtils.getInstance().removeAnnotation(javaElement, annotationImpl.getAnnotationStringValue());
-// }
-// else
-// {
- AnnotationUtils.getInstance().removeAnnotation(javaElement, annotationImpl.getSimpleAnnotationName());
-// }
- } catch (BadLocationException ble)
- {
- throw new AnnotationGeneratorException(ble.getMessage(), JaxWsUtilMessages.CannotPerformEditMsg, ble);
- } catch (FileNotFoundException fnfe)
- {
- throw new AnnotationGeneratorException(fnfe.getMessage(), JaxWsUtilMessages.CompUnitMissingMsg, fnfe);
- }
- }
-
- // i036509 added
- @SuppressWarnings("unchecked")
- private <T extends IJavaElement> void updateTheAnnotation(final T javaElement, final AnnotationImpl<T> annotationImpl) throws BadLocationException, CoreException, AnnotationGeneratorException, FileNotFoundException
- {
- final ICompilationUnit iCu = getCu(javaElement);
- final CompilationUnit unit = ASTUtils.getInstance().createCompilationUnit(iCu, null);
-
- BodyDeclaration bd = null;
- Annotation found = null;
- if(javaElement instanceof IType)
- {
- bd = ASTUtils.getInstance().getTypeDeclaration(javaElement.getElementName(), unit);
- found = findAnnotation(bd, annotationImpl);
-
- unit.recordModifications();
- if (found!=null) {
- bd.modifiers().remove(found);
- }
-
- final Expression annot = annotationImpl.getExpression(unit, unit.getAST());
- bd.modifiers().add(0, annot);
- }
- if(javaElement instanceof IMethod)
- {
- TypeDeclaration td = (TypeDeclaration)ASTUtils.getInstance().getTypeDeclaration(((IMethod)javaElement).getDeclaringType().getElementName(), unit);
- bd = ASTUtils.getInstance().getMethodDeclaration(((IMethod)javaElement), td);
- found = findAnnotation(bd, annotationImpl);
-
- unit.recordModifications();
- if (found!=null) {
- bd.modifiers().remove(found);
- }
-
- final Expression annot = annotationImpl.getExpression(unit, unit.getAST());
- bd.modifiers().add(0, annot);
- }
- if(javaElement instanceof IField)
- {
- TypeDeclaration td = (TypeDeclaration)ASTUtils.getInstance().getTypeDeclaration(((IField)javaElement).getDeclaringType().getElementName(), unit);
- bd = ASTUtils.getInstance().getFieldDeclaration(((IField)javaElement), td);
- found = findAnnotation(bd, annotationImpl);
-
- unit.recordModifications();
- if (found!=null) {
- bd.modifiers().remove(found);
- }
-
- final Expression annot = annotationImpl.getExpression(unit, unit.getAST());
- bd.modifiers().add(0, annot);
- }
- if(javaElement instanceof ITypeParameter)
- {
- if(((ITypeParameter)javaElement).getDeclaringMember() instanceof IType)
- {
- bd = ASTUtils.getInstance().getTypeDeclaration(((ITypeParameter)javaElement).getDeclaringMember().getElementName(), unit);
- SingleVariableDeclaration param = findParameter(bd, javaElement);
- if(param != null)
- {
- found = findParamAnnotation(param, annotationImpl, javaElement);
- }
-
- unit.recordModifications();
- if (found!=null) {
- param.modifiers().remove(found);
- }
-
- final Expression annot = annotationImpl.getExpression(unit, unit.getAST());
- param.modifiers().add(0, annot);
- }
- else
- {
- TypeDeclaration td = (TypeDeclaration)ASTUtils.getInstance().getTypeDeclaration(((IMethod)((ITypeParameter)javaElement).getParent()).getDeclaringType(). getElementName(), unit);
- bd = ASTUtils.getInstance().getMethodDeclaration(((IMethod)((ITypeParameter)javaElement).getParent()), td);
- SingleVariableDeclaration param = findParameter(bd, javaElement);
- if(param != null)
- {
- found = findParamAnnotation(param, annotationImpl, javaElement);
- }
-
- unit.recordModifications();
- if (found!=null) {
- param.modifiers().remove(found);
- }
-
- final Expression annot = annotationImpl.getExpression(unit, unit.getAST());
- param.modifiers().add(0, annot);
- }
- }
-
- setAnnotatationStringVallue(annotationImpl, false, javaElement);
- final IDocument doc = AnnotationUtils.getInstance().getDocument(iCu);
- final TextEdit edit = unit.rewrite(doc, javaElement.getJavaProject().getOptions(true));
- edit.apply(doc);
-
- IStatus status = editResManager().setFileEditable((IFile) iCu.getResource());
- if(status.getSeverity() == IStatus.OK)
- {
- fileUtils.setCompilationUnitContentAndSaveDirtyEditors(iCu, doc.get(), true, null);
- }
- else
- {
- throw new AnnotationGeneratorException("Annotattion could not be stored, the file is not writable", //$NON-NLS-1$
- JaxWsUtilMessages.AnnotationCannotBeStoredMsg);
- }
- }
-
- @SuppressWarnings("unchecked")
- private Annotation findAnnotation(final BodyDeclaration td, final IAnnotation<? extends IJavaElement> annotation)
- {
- Annotation ann;
- for (IExtendedModifier modifier : (List<IExtendedModifier>)td.modifiers())
- {
- if(!modifier.isAnnotation()) {
- continue;
- }
-
- ann = (Annotation)modifier;
- if (annotation.getAnnotationName().endsWith(ann.getTypeName().getFullyQualifiedName())) {
- return ann;
- }
- }
-
- return null;
- }
-
- private <T extends IJavaElement> SingleVariableDeclaration findParameter(final BodyDeclaration td, T javaElement)
- {
- if (td != null)
- {
- for (Object param : ((MethodDeclaration)td).parameters())
- {
- if (param instanceof SingleVariableDeclaration &&
- ((ITypeParameter)javaElement).getElementName().toString().equals(((SingleVariableDeclaration)param).getName().toString()))
- {
- return (SingleVariableDeclaration)param;
- }
- }
- }
- return null;
- }
-
- @SuppressWarnings("unchecked")
- private <T extends IJavaElement> Annotation findParamAnnotation(final SingleVariableDeclaration param, final IAnnotation<? extends IJavaElement> annotation, T javaElement)
- {
- Annotation ann;
- for (IExtendedModifier modifier : (List<IExtendedModifier>)(param.modifiers()))
- {
- if(!modifier.isAnnotation()) {
- continue;
- }
-
- ann = (Annotation)modifier;
- if (annotation.getAnnotationName().endsWith(ann.getTypeName().getFullyQualifiedName())) {
- return ann;
- }
- }
- return null;
- }
-
- private ICompilationUnit getCu(final IJavaElement javaElement)
- {
- switch (javaElement.getElementType())
- {
- case IJavaElement.TYPE:
- return ((IType) javaElement).getCompilationUnit();
- case IJavaElement.FIELD:
- return ((IField) javaElement).getCompilationUnit();
- case IJavaElement.METHOD:
- return ((IMethod) javaElement).getCompilationUnit();
- case IJavaElement.TYPE_PARAMETER:
- return ((ITypeParameter) javaElement).getDeclaringMember().getCompilationUnit();
- }
-
- return null;
- }
-
- private EditResourcesManager editResManager()
- {
- return new EditResourcesManager();
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/annotations/IAnnotation.java b/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/annotations/IAnnotation.java
deleted file mode 100755
index 0d8d839..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/annotations/IAnnotation.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.utils.annotations;
-
-import java.util.Set;
-
-import org.eclipse.jdt.core.IJavaElement;
-
-/**
- * Interface representing Complex Annotation consisting of param-value pairs.
- *
- * @author Plamen Pavlov
- */
-public interface IAnnotation<T extends IJavaElement>
-{
- /**
- * Return the param-value pairs which this Annotation has.
- *
- * @return Set of param-values pairs.
- */
- public Set<IParamValuePair> getParamValuePairs();
-
- /**
- * Returns the value of the parameter with name param.
- * @param param - the name of the parameter who's value is requested
- * @return - the value represented as a string. Null if such parameter cannot be found or has a value of null.
- * @throws - NullPointerException if param is null
- */
- public String getPropertyValue(String param);
-
- /**
- * Returns the T, to which this annotattion is associated.
- */
- public T getAppliedElement();
-
-
-//From IAnnotattionBase
- /**
- * @return - annotation name
- */
- public String getAnnotationName();
-
- /**
- * Gets the information about location in the source code.
- *
- * @return ILocator
- */
- public ILocator getLocator();
-
-
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/annotations/IAnnotationBase.java b/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/annotations/IAnnotationBase.java
deleted file mode 100755
index 2f900d6..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/annotations/IAnnotationBase.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.utils.annotations;
-
-import java.io.FileNotFoundException;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jface.text.BadLocationException;
-import org.eclipse.text.edits.MalformedTreeException;
-
-/**
- * Base interface representing Annotation and the functionality, required by it.
- *
- * @author Plamen Pavlov
- */
-public interface IAnnotationBase<T extends IJavaElement>
-{
- /** simple annotation type ID */
- public final int SIMPLE_ANNOTATION = 1;
-
- /** single element annotation type ID */
- public final int SINGLE_ELEMENT_ANNOTATION = 2;
-
- /** complex annotation type ID */
- public final int COMPLEX_ANNOTATION = 4;
-
- /**
- * @return - annotation name
- */
- public String getAnnotationName();
-
- /**
- * Getting the TypeID of current Annotation
- *
- * @return Integer value, which represents the Annotation TypeID
- */
- public int getType();
-
- /**
- * Adds current Annotation to specific IJavaElement. It is not possible to have IMember as parameter because there is ITypeParameter as parameter when add to TypParameter is executed.
- *
- * @param javaElement
- *
- * @throws NullPointerException if <tt>javaElement</tt> is null.
- * @throws IllegalArgumentException in case <code>javaElement</code> is not of the correct type. Supported types are: IType, IMethod, IField, ITypeParameter.
- * @throws AnnotationGeneratorException.
- */
- public void setAppliedElement(T javaElement) throws AnnotationGeneratorException;
-
- /**
- * Remove the current Annotation from the associated JavaElement.
- *
- * @throws BadLocationException
- * @throws CoreException
- * @throws AnnotationGeneratorException
- * @throws FileNotFoundException
- * @throws MalformedTreeException
- */
- public void remove() throws MalformedTreeException, FileNotFoundException, AnnotationGeneratorException, CoreException, BadLocationException;
-
- /**
- * Gets the information about location in the source code.
- *
- * @return ILocator
- */
- public ILocator getLocator();
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/annotations/IAnnotationInspector.java b/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/annotations/IAnnotationInspector.java
deleted file mode 100755
index c3f05f5..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/annotations/IAnnotationInspector.java
+++ /dev/null
@@ -1,138 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.utils.annotations;
-
-import java.util.Collection;
-
-import org.eclipse.jdt.core.IField;
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.ITypeParameter;
-import org.eclipse.jdt.core.JavaModelException;
-
-public interface IAnnotationInspector
-{
- /**
- * Retrieves all Type level Annotations from <code>type</code>, which is used to instantiate the IAnnotationInspector.
- *
- * @return contained Type level Annotations in <code>type</code> or empty Collection if not present.
- *
- * @throws JavaModelException
- */
- Collection<IAnnotation<IType>> inspectType() throws JavaModelException;
-
- /**
- * Retrieves a Type level Annotation with specific QName from <code>type</code>, which is used to instantiate the IAnnotationInspector.
- *
- * @param annotationQName - specified QName for the Annotation.
- *
- * @return Type level Annotation in <code>type</code> or <code>null</code>, if such Annotation do not present.
- *
- * @throws NullPointerException if <code>annotationQName</code> is <code>null</code>.
- * @throws IllegalArgumentException if <code>annotationQName</code> is empty String.
- * @throws JavaModelException
- */
- IAnnotation<IType> inspectType(final String annotationQName) throws JavaModelException;
-
- /**
- * Retrieves all Method level Annotations from <code>method</code>.
- *
- * @param method
- *
- * @return contained Method level Annotations in <code>method</code> or empty Collection if not present.
- *
- * @throws NullPointerException if <tt>method</tt> is null.
- * @throws JavaModelException
- */
- Collection<IAnnotation<IMethod>> inspectMethod(IMethod method) throws JavaModelException;
-
- /**
- * Retrieves a Method level Annotation with specific QName from <code>method</code>.
- *
- * @param method
- * @param annotationQName - specified QName for the Annotation.
- *
- * @return contained Method level Annotation in <code>method</code> or <code>null</code>.
- *
- * @throws NullPointerException if <tt>method</tt> or <code>annotationQName</code> are <code>null</code>.
- * @throws IllegalArgumentException if <code>annotationQName</code> is empty String.
- * @throws JavaModelException
- */
- IAnnotation<IMethod> inspectMethod(IMethod method, final String annotationQName) throws JavaModelException;
-
- /**
- * Retrieves all Field level Annotations from <code>field</code>.
- *
- * @param field
- *
- * @return contained Filed level Annotations in <code>field</code> or empty Collection if not present.
- *
- * @throws NullPointerException if <code>field</code> is <code>null</code>.
- * @throws JavaModelException
- */
- Collection<IAnnotation<IField>> inspectField(IField field) throws JavaModelException;
-
- /**
- * Retrieves a Field level Annotation with specific QName from <code>field</code>.
- *
- * @param field
- * @param annotationQName - specified QName for the Annotation.
- *
- * @return contained Filed level Annotations in <code>field</code> or <code>null</code>.
- *
- * @throws NullPointerException if <code>field</code> or <code>annotationQName</code> are <code>null</code>.
- * @throws IllegalArgumentException if <code>annotationQName</code> is empty String.
- * @throws JavaModelException
- */
- IAnnotation<IField> inspectField(IField field, final String annotationQName) throws JavaModelException;
-
- /**
- * Retrieves all TypeParameter level Annotations from <code>param</code>.
- *
- * @param param
- *
- * @return contained TypeParameter level Annotations in <code>param</code> or empty Collection if not present.
- *
- * @throws NullPointerException if <code>param</code> is <code>null</code>.
- * @throws JavaModelException
- */
- Collection<IAnnotation<ITypeParameter>> inspectParam(ITypeParameter param) throws JavaModelException;
-
- /**
- * Retrieves a TypeParameter level Annotation with specific QName from <code>param</code>.
- *
- * @param param
- * @param annotationQName - specified QName for the Annotation.
- *
- * @return contained TypeParameter level Annotations in <code>param</code> or <code>null</code>.
- *
- * @throws NullPointerException if <code>param</code> or <code>annotationQName</code> are <code>null</code>.
- * @throws IllegalArgumentException if <code>annotationQName</code> is empty String.
- * @throws JavaModelException
- */
- IAnnotation<ITypeParameter> inspectParam(ITypeParameter param, final String annotationQName) throws JavaModelException;
-
-
-
-
-// /**
-// * Retrieves all annotations from <code>javaElement</code>.
-// *
-// * @param javaElement
-// *
-// * @return contained annotations in <code>javaElement</code> or empty Colleaction if not present.
-// *
-// * @throws NullPointerException if <tt>javaElement</tt> is null.
-// * @throws IllegalArgumentException in case <code>javaElement</code> is not of the correct type. Supported types are: Itype, IMethod, IField.
-// * @throws JavaModelException
-// */
-// public Collection<IAnnotation> inspect(IJavaElement javaElement) throws JavaModelException;
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/annotations/IAnnotationProperty.java b/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/annotations/IAnnotationProperty.java
deleted file mode 100755
index db90bcb..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/annotations/IAnnotationProperty.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.utils.annotations;
-
-import org.eclipse.jst.ws.jaxws.utils.internal.annotations.impl.AttributeTypeEnum;
-
-public interface IAnnotationProperty
-{
- public String getAnnotationName();
-
- public String getAttributeName();
-
- public String getValue();
-
- public AttributeTypeEnum getAttributeType();
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/annotations/IAnnotationPropertyContainer.java b/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/annotations/IAnnotationPropertyContainer.java
deleted file mode 100755
index 3cc7694..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/annotations/IAnnotationPropertyContainer.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.utils.annotations;
-
-import java.lang.annotation.ElementType;
-import java.util.Set;
-
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.ITypeParameter;
-import org.eclipse.jst.ws.jaxws.utils.internal.annotations.impl.AnnotationProperty;
-
-/**
- * Interface for annotations container.
- *
- * @author Plamen Pavlov
- *
- */
-public interface IAnnotationPropertyContainer
-{
- public void addAnnotationProperty(final AnnotationProperty annotationProperty, final ElementType target);
-
- public Set<IAnnotation<ITypeParameter>> getParameterAnnotations(ITypeParameter tParam);
-
- public Set<IAnnotation<IType>> getTypeAnnotations(IType type);
-
- public Set<IAnnotation<IMethod>> getMethodAnnotations(IMethod method);
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/annotations/ILocator.java b/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/annotations/ILocator.java
deleted file mode 100755
index c47636f..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/annotations/ILocator.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.utils.annotations;
-
-/**
- * Class that holds information to locate specific region in the source code
- *
- */
-public interface ILocator
-{
- /**
- * @return the line number in the source where the region pointed by this locator starts
- */
- public int getLineNumber();
-
-
- /**
- * @return the index of the first character of this region in source code
- */
- public int getStartPosition();
-
- /**
- * @return the length of the region
- */
- public int getLength();
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/annotations/IParamValuePair.java b/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/annotations/IParamValuePair.java
deleted file mode 100755
index ffe6e5c..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/annotations/IParamValuePair.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.utils.annotations;
-
-/**
- * Interface representing param value pair in annotation. Param value pair has the following form: param=value
- *
- * @author Plamen Pavlov
- */
-public interface IParamValuePair
-{
- /**
- * @return param name
- */
- public String getParam();
-
- /**
- * @return the value
- */
- public IValue getValue();
-
- /**
- * Gets the information about location in the source code.
- *
- * @return ILocator
- */
- public ILocator getLocator();
-
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/annotations/IValue.java b/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/annotations/IValue.java
deleted file mode 100755
index 32c4a4c..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/annotations/IValue.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.utils.annotations;
-
-/**
- * Interface representing artifact value in annotation.
- *
- * @author Plamen Pavlov
- */
-public interface IValue
-{
- /**
- * Obtains the string representation of this value. The obtained string representation can later on be used to instantiate
- * an instance of the type of the value that will be considedered equal to the returned value.
- * <p>
- * <c>@AnnotationExample(1)</c> //annoation with one attribute/parameter called "value" with value of "1".
- * </p>
- * The toString method will return the string "1", which can later on be used by Integer.parse(String) to create an instance of Integer
- * equal to the value represented by the integer literal 1
- * @return the string representation of this value
- */
- public String toString();
-
- /**
- * Gets the information about location in the source code.
- *
- * @return ILocator
- */
- public ILocator getLocator();
-
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/clazz/ASTUtils.java b/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/clazz/ASTUtils.java
deleted file mode 100755
index 11997ed..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/clazz/ASTUtils.java
+++ /dev/null
@@ -1,253 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.utils.clazz;
-
-import static org.eclipse.jst.ws.jaxws.utils.ContractChecker.nullCheckParam;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.Arrays;
-import java.util.List;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IField;
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.Signature;
-import org.eclipse.jdt.core.dom.AST;
-import org.eclipse.jdt.core.dom.ASTNode;
-import org.eclipse.jdt.core.dom.ASTParser;
-import org.eclipse.jdt.core.dom.AbstractTypeDeclaration;
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jdt.core.dom.FieldDeclaration;
-import org.eclipse.jdt.core.dom.MethodDeclaration;
-import org.eclipse.jdt.core.dom.SingleVariableDeclaration;
-import org.eclipse.jdt.core.dom.TypeDeclaration;
-import org.eclipse.jdt.core.dom.VariableDeclarationFragment;
-import org.eclipse.jst.ws.jaxws.utils.resources.FileUtils;
-
-/**
- * Utility class that provides helper methods for {@link AST} processing.
- *
- * @author Georgi Vachkov
- */
-public class ASTUtils
-{
- private static ASTUtils instance;
-
- private ASTUtils() {
- // disable construction
- }
-
- /**
- * @return create new instance for this utility
- */
- public static ASTUtils getInstance() {
- if(instance==null) {
- instance = new ASTUtils();
- }
- return instance;
- }
-
- /**
- * Creates AST tree out of {@link File} instance.
- * @param sourceFile java class file
- * @param monitor progress monitor
- * @return created {@link ASTNode}
- * @throws IOException
- */
- public ASTNode createAST(final File sourceFile, final IProgressMonitor monitor) throws IOException
- {
- nullCheckParam(sourceFile, "sourceFile"); //$NON-NLS-1$
-
- final ASTParser parser = ASTParser.newParser(AST.JLS3);
- parser.setSource(FileUtils.getInstance().getFileContent(sourceFile).toCharArray());
- return parser.createAST(monitor);
- }
-
- /**
- * Creates {@link AST} tree out of {@link IType} instance.
- * @param sourceType java class
- * @param monitor progress monitor
- * @return created {@link ASTNode} instance
- */
- public CompilationUnit createCompilationUnit(final ICompilationUnit sourceCu, final IProgressMonitor monitor)
- {
- nullCheckParam(sourceCu, "sourceCu"); //$NON-NLS-1$
- final ASTParser parser = ASTParser.newParser(AST.JLS3);
- parser.setSource(sourceCu);
- parser.setBindingsRecovery(false);
- return (CompilationUnit)parser.createAST(monitor);
- }
-
- /**
- * Finds {@link FieldDeclaration} in {@link TypeDeclaration} with name <code>fieldType.getElementName()</code>.
- *
- * @param fieldType
- * @param typeDeclaration
- * @return found object or <code>null</code>
- */
- public FieldDeclaration getFieldDeclaration(final IField fieldType, final TypeDeclaration typeDeclaration)
- {
- for (FieldDeclaration fd : typeDeclaration.getFields())
- {
- for (Object fr : fd.fragments())
- {
- VariableDeclarationFragment vdf = (VariableDeclarationFragment) fr;
- if (vdf.getName().getFullyQualifiedName().equals(fieldType.getElementName()))
- {
- return fd;
- }
- }
- }
- return null;
- }
-
- @SuppressWarnings("unchecked")
- private boolean compareMethodParams(final IMethod methodType, final MethodDeclaration md)
- {
- List<SingleVariableDeclaration> list = md.parameters();
- if (list.size() == methodType.getNumberOfParameters())
- {
- String[] parameterTypes = methodType.getParameterTypes();
- for (int i = 0; i < list.size(); i++)
- {
- if (!isSameParam(parameterTypes[i], (SingleVariableDeclaration) list.get(i)))
- {
- return false;
- }
- }
- return true;
- }
- return false;
- }
-
- private boolean isSameParam(final String type, final SingleVariableDeclaration svDecl)
- {
- return type.equals(getTypeSignature(svDecl));
- }
-
- /**
- * Retrieves type signature from {@link SingleVariableDeclaration}. As {@link SingleVariableDeclaration} returns only the clean type in case
- * declaration of type <tt>int paraArr[][]</tt> is in code the method adds array identifiers for type declaration int this case.
- *
- * @param svDecl
- * @return the signatyre for the type
- */
- public String getTypeSignature(final SingleVariableDeclaration svDecl)
- {
- String typeName = createDimensionedTypeName(Signature.createTypeSignature(svDecl.getType().toString(), false), svDecl.getExtraDimensions());
-
- // Varargs append another dimension
- if (svDecl.isVarargs())
- {
- typeName = Signature.C_ARRAY + typeName;
- }
-
- return typeName;
- }
-
- private String createDimensionedTypeName(final String typeName, final int dimensions)
- {
- final StringBuilder result = new StringBuilder(typeName);
- final String dimensionString = createDimensionString(dimensions);
- while(!result.toString().startsWith(dimensionString))
- {
- result.insert(0, Signature.C_ARRAY);
- }
-
- return result.toString();
- }
-
- private String createDimensionString(final int dimensions)
- {
- final char[] dimensionChars = new char[dimensions];
- Arrays.fill(dimensionChars, Signature.C_ARRAY);
- return new String(dimensionChars);
- }
-
- /**
- * Finds {@link MethodDeclaration} in {@link TypeDeclaration} having name <code>methodType.getElementName()</code>.
- *
- * @param methodType
- * @param typeDeclaration
- * @return found object or <code>null</code>
- */
- public MethodDeclaration getMethodDeclaration(final IMethod methodType, final TypeDeclaration typeDeclaration)
- {
- for (MethodDeclaration md : typeDeclaration.getMethods())
- {
- if (md.getName().getFullyQualifiedName().equals(methodType.getElementName()))
- {
- if (compareMethodParams(methodType, md))
- {
- return md;
- }
- }
- }
-
- return null;
- }
-
- /**
- * Retrieves {@link TypeDeclaration} from {@link CompilationUnit} with name <tt>className</tt>
- *
- * @param className
- * @param unit
- * @return found {@link TypeDeclaration} or <code>null</code>
- */
- @SuppressWarnings("unchecked")
- public AbstractTypeDeclaration getTypeDeclaration(final String className, final CompilationUnit unit)
- {
- AbstractTypeDeclaration typeDeclaration = null;
- // looking up the selected type
- for (Object typeObject : unit.types())
- {
- AbstractTypeDeclaration tmpTypeDeclaration = (AbstractTypeDeclaration) typeObject;
- if (tmpTypeDeclaration.getName().getFullyQualifiedName().equals(className))
- {
- typeDeclaration = tmpTypeDeclaration;
- break;
- }
- }
-
- if (typeDeclaration == null)
- {
- List<AbstractTypeDeclaration> list = unit.types();
- typeDeclaration = getInnerClass(list.toArray(new AbstractTypeDeclaration[list.size()]), className);
- }
-
- return typeDeclaration;
- }
-
- private AbstractTypeDeclaration getInnerClass(final AbstractTypeDeclaration[] types, final String className)
- {
- AbstractTypeDeclaration result = null;
- for (AbstractTypeDeclaration abstractType : types)
- {
- if (abstractType.getName().getFullyQualifiedName().equals(className)) {
- return abstractType;
- }
-
- if (!(abstractType instanceof TypeDeclaration)) {
- continue;
- }
-
- result = getInnerClass((AbstractTypeDeclaration[]) ((TypeDeclaration) abstractType).getTypes(), className);
- if (result != null) {
- return result;
- }
- }
-
- return null;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/exception/LocalizedException.java b/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/exception/LocalizedException.java
deleted file mode 100755
index 1ce0843..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/exception/LocalizedException.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.utils.exception;
-
-import org.eclipse.jst.ws.jaxws.utils.ContractChecker;
-
-
-
-/**
- * This is base class for all CHECKED exceptions for the WS Tools
- * toolset. This exception correctly overrides getLocalizedMessage()
- * of Exception class and provide proper localized message.
- * To achieve that there is a limitation - it will be impossible to return localized
- * message if it haven't been passed to the constructor of exception, so there is no
- * constructor without localized message.
- *
- * @author Mladen Tomov
- **/
-
-public class LocalizedException extends Exception {
-
- private static final long serialVersionUID = 1L;
-
- private final String localizedMessage;
-
- /**
- * Constructs exception with ability to provide localized message
- * @param message - the detail message (which is saved for later retrieval
- * by the {@link #getMessage()} method)
- * @param localizedMessage - the localized message (which is saved for later retrieval
- * by the {@link #getLocalizedMessage()} method)
- *
- * @throws NullPointerException - in case localized message is null
- * */
- public LocalizedException(String message, String localizedMessage) {
- super(message);
- ContractChecker.nullCheckParam(localizedMessage, "localizedMessage"); //$NON-NLS-1$
- this.localizedMessage = localizedMessage;
- }
-
- /**
- * Constructs exception with ability to provide localized message
- * @param message - the detail message (which is saved for later retrieval
- * by the {@link #getMessage()} method)
- * @param localizedMessage - the localized message (which is saved for later retrieval
- * by the {@link #getLocalizedMessage()} method)
- * @param cause - cause the cause (which is saved for later retrieval by the
- * {@link #getCause()} method).
- *
- * @throws NullPointerException - in case localized message is null
- * */
-
- public LocalizedException(String message, String localizedMessage, Throwable cause) {
- super(message, cause);
- ContractChecker.nullCheckParam(localizedMessage, "localizedMessage"); //$NON-NLS-1$
- this.localizedMessage = localizedMessage;
- }
-
- /**
- * Returns localized message with which the exception was constructed.*/
- @Override
- public String getLocalizedMessage() {
- return localizedMessage;
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/exception/MissingResourceException.java b/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/exception/MissingResourceException.java
deleted file mode 100755
index da21294..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/exception/MissingResourceException.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.utils.exception;
-
-
-/**
- * Indicates that a resource of any kind couldn't be found but this was expected.
- *
- * @author Joerg Dehmel
- */
-public class MissingResourceException extends LocalizedException
-{
-
- /**
- *
- */
- private static final long serialVersionUID = 1L;
-
- /**
- * Creates an instance with a message and a localized message.
- *
- * @param message
- * error message
- * @param localizedMessage
- * localized message
- */
- public MissingResourceException(final String message, final String localizedMessage)
- {
- super(message, localizedMessage);
- }
-
- /**
- * Creates an instance with message, localized message and causing exception.
- *
- * @param message
- * error message
- * @param localizedMessage
- * localized message
- * @param cause
- * causing exception
- */
- public MissingResourceException(final String message, final String localizedMessage, final Throwable cause)
- {
- super(message, localizedMessage, cause);
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/facets/FacetUtils.java b/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/facets/FacetUtils.java
deleted file mode 100755
index e88da7f..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/facets/FacetUtils.java
+++ /dev/null
@@ -1,130 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.utils.facets;
-
-import java.util.Comparator;
-import java.util.Iterator;
-import java.util.Set;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jst.ws.jaxws.utils.ContractChecker;
-import org.eclipse.wst.common.project.facet.core.IFacetedProject;
-import org.eclipse.wst.common.project.facet.core.IProjectFacet;
-import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion;
-import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager;
-
-
-public class FacetUtils implements IFacetUtils
-{
- /**
- * @throws NullPointerException
- * if <c>project</c> or <c>facetIds</c> is null
- */
- public boolean hasAnyFacet(IProject project, String... facetIds) throws CoreException
- {
- ContractChecker.nullCheckParam(project);
- ContractChecker.nullCheckParam(facetIds);
-
- if (!isFacetedProject(project))
- {
- return false;
- }
-
- final IFacetedProject facetedProject = getFacetedProject(project);
- for (String facetId : facetIds)
- {
- final IProjectFacet facet = ProjectFacetsManager.getProjectFacet(facetId);
- if (facetedProject.hasProjectFacet(facet))
- {
- return true;
- }
- }
- return false;
- }
-
- public boolean hasFacetWithVersion(IProject project, String facetVersion, String facetId) throws CoreException
- {
- return hasFacetWithVersion(project, facetVersion, facetId, true);
- }
-
- public boolean isFacetedProject(IProject project) throws CoreException
- {
- Set<IFacetedProject> facetedProjects = getAllWorkspaceFacetedProjects();
- final Iterator<IFacetedProject> i = facetedProjects.iterator();
- while (i.hasNext())
- {
- final IFacetedProject fp = (IFacetedProject) i.next();
- if (project.equals(fp.getProject()))
- {
- return true;
- }
- }
- return false;
- }
-
- public boolean hasFacetWithVersion(IProject project, String facetVersion, String facetId, boolean acceptHigherFacetVersion) throws CoreException
- {
- ContractChecker.nullCheckParam(project);
- ContractChecker.nullCheckParam(facetVersion);
- ContractChecker.nullCheckParam(facetId);
-
- if (!isFacetedProject(project))
- {
- return false;
- }
-
- Set<IProjectFacetVersion> allFacetsVersions = getProjectFacets(project);
- for (IProjectFacetVersion ver : allFacetsVersions)
- {
- if (ver.getProjectFacet().getId().equals(facetId))
- {
- return isFacetAcceptable(ver, facetVersion, acceptHigherFacetVersion);
- }
- }
-
- return false;
- }
-
- private boolean isFacetAcceptable(IProjectFacetVersion facetVersion, String facetVersionId, boolean acceptHigherFacetVersion)
- throws CoreException
- {
- assert facetVersion != null;
-
- // Check for exact version
- if (!acceptHigherFacetVersion)
- {
- return facetVersion.getVersionString().equals(facetVersionId);
- }
-
- Comparator<String> comparator = facetVersion.getProjectFacet().getVersionComparator();
- String currentFacetVersion = facetVersion.getVersionString();
- return comparator.compare(currentFacetVersion, facetVersionId) >= 0;
- }
-
- private IFacetedProject getFacetedProject(IProject project) throws CoreException
- {
- return ProjectFacetsManager.create(project);
- }
-
- private Set<IProjectFacetVersion> getProjectFacets(IProject project) throws CoreException
- {
- assert isFacetedProject(project);
-
- return getFacetedProject(project).getProjectFacets();
- }
-
- private Set<IFacetedProject> getAllWorkspaceFacetedProjects() throws CoreException
- {
- return ProjectFacetsManager.getFacetedProjects();
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/facets/IFacetUtils.java b/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/facets/IFacetUtils.java
deleted file mode 100755
index 8727750..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/facets/IFacetUtils.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.utils.facets;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-
-public interface IFacetUtils
-{
- /**
- * Constant for EJB30 facet ID
- */
- public static final String EJB_30_FACET_ID = "jst.ejb"; //$NON-NLS-1$
-
- /**
- * Constant for EJB30 facet version 3.0
- */
- public static final String EJB_30_FACET_VERSION = "3.0"; //$NON-NLS-1$
-
- /**
- * Constant for Web 2.5 facet ID
- */
- public static final String WEB_25_FACET_ID = "jst.web"; //$NON-NLS-1$
-
- /**
- * Constant for Web facet version 2.5
- */
- public static final String WEB_25_FACET_VERSION = "2.5"; //$NON-NLS-1$
-
- /**
- * Constant for Application client facet ID
- */
- public static final String APPCLIENT_25_FACET_ID = "jst.appclient"; //$NON-NLS-1$
-
- /**
- * Constant for Application client facet version 2.5
- */
- public static final String APPCLIENT_25_FACET_VERSION = "5.0"; //$NON-NLS-1$
-
- /**
- * Checks whether <code>project</code> has a facet with id <code>facetId</code> with version <code>facetVersion</code>
- * In case the project specified is not a faceted project, false is returned
- * This is a convenience method that is equivalent to invoking hasFacetWithVersion(project, facetVersion, facetId, false)
- * @param project the project
- * @param facetVersion the facet version
- * @param facetId the facet id
- * @return true in case the project specified is a faceted project and has the facet with the version specified; false otherwise
- * @throws CoreException
- * @throws NullPointerException when any of the input parameters is null
- * @see IFacetUtils#hasFacetWithVersion(IProject, String, String, boolean)
- */
- public boolean hasFacetWithVersion(IProject project, String facetVersion, String facetId) throws CoreException;
-
- /**
- * Checks whether <code>project</code> has a facet with id <code>facetId</code> with version <code>facetVersion</code>
- * In case the project specified is not a faceted project, false is returned
- * @param project the project
- * @param facetVersion the facet version
- * @param facetId the facet id
- * @param acceptHigherFacetVersion a flag indicating whether higher facet versions are acceptable
- * @return true in case the project specified is a faceted project and has the facet with the version specified; false otherwise
- * @throws CoreException
- * @throws NullPointerException when any of the input parameters is null
- */
- public boolean hasFacetWithVersion(IProject project, String facetVersion, String facetId, boolean acceptHigherFacetVersion) throws CoreException;
-
- /**
- * Checks whether the project specified is a faceted project
- * @param project the project
- * @return
- * @throws CoreException
- * @throws NullPointerException if <code>project</code> is null
- */
- public boolean isFacetedProject(IProject project) throws CoreException;
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/internal/annotations/impl/AnnotationBaseImpl.java b/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/internal/annotations/impl/AnnotationBaseImpl.java
deleted file mode 100755
index 32eda2b..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/internal/annotations/impl/AnnotationBaseImpl.java
+++ /dev/null
@@ -1,120 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.utils.internal.annotations.impl;
-
-import org.eclipse.jdt.core.IField;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.ITypeParameter;
-import org.eclipse.jst.ws.jaxws.utils.annotations.IAnnotationBase;
-
-/**
- * Base {@link IAnnotationBase} implementation
- *
- * @author Plamen Pavlov
- */
-public abstract class AnnotationBaseImpl<T extends IJavaElement> extends ValueImpl
-{
- private String annotationName;// Container for Annotation Name;
- protected T javaElement; // Conatiner for the parent IJavaElement;
- //private String annotationStringValue;//Conatiner to current String representation of this annotation
-
- private static final String DOT = "."; //$NON-NLS-1$
-
- /**
- * Constructor.
- *
- * @param annotationName
- *
- * @throws NullPointerException in case <code>annotationName</code> is null.
- * @throws IllegalArgumentException in case <code>annotationName</code> is empty String.
- */
- public AnnotationBaseImpl(String annotationName)
- {
- this.annotationName = annotationName;
- }
-
- /**
- * Extracts only the Annotation name in case it is in fully qualified form.
- *
- * @return the simple Annotation name.
- */
- public String getSimpleAnnotationName()
- {
- int lastDotIndex = annotationName.lastIndexOf(DOT);
-
- if (lastDotIndex == -1)
- {
- return annotationName;
- }
-
- return annotationName.substring(lastDotIndex + 1);
- }
-
- public String getAnnotationName()
- {
- return annotationName;
- }
-
- /**
- * Adds Annotation to specific IJavaElement.
- *
- * @param javaElement
- *
- * @throws NullPointerException if <tt>javaElement</tt> is null.
- * @throws IllegalArgumentException in case <code>javaElement</code> is not of the correct type. Supported types are: IType, IMethod, IField, ITypeParameter.
- */
- public void setAppliedElementWithoutSave(T javaElement)
- {
- setJavaElement(javaElement);
- }
-
- public void setJavaElement(T javaElement)
- {
- if (javaElement == null)
- {
- throw new NullPointerException("javaElement should not be null!"); //$NON-NLS-1$
- }
- if(!(javaElement instanceof IType) && !(javaElement instanceof IMethod) && !(javaElement instanceof IField) && !(javaElement instanceof ITypeParameter))
- {
- throw new IllegalArgumentException("javaElement is not of correct type!"); //$NON-NLS-1$
- }
-
- this.javaElement = javaElement;
- }
-
- @Override
- public int hashCode()
- {
- return annotationName.hashCode();
- }
-
- @SuppressWarnings("unchecked")
- @Override
- public boolean equals(Object obj)
- {
- if (this == obj)
- {
- return true;
- }
- if (obj == null)
- {
- return false;
- }
- if (getClass() != obj.getClass())
- {
- return false;
- }
- final AnnotationBaseImpl<T> other = (AnnotationBaseImpl<T>)obj;
- return annotationName.equals(other.annotationName);
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/internal/annotations/impl/AnnotationImpl.java b/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/internal/annotations/impl/AnnotationImpl.java
deleted file mode 100755
index 5d3b5a3..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/internal/annotations/impl/AnnotationImpl.java
+++ /dev/null
@@ -1,125 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.utils.internal.annotations.impl;
-
-import java.util.Arrays;
-import java.util.Set;
-
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.dom.AST;
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jdt.core.dom.Expression;
-import org.eclipse.jdt.core.dom.MemberValuePair;
-import org.eclipse.jdt.core.dom.Name;
-import org.eclipse.jdt.core.dom.NormalAnnotation;
-import org.eclipse.jdt.core.dom.SimpleName;
-import org.eclipse.jst.ws.jaxws.utils.annotations.IAnnotation;
-import org.eclipse.jst.ws.jaxws.utils.annotations.IParamValuePair;
-
-/**
- * An implementation of {@link IAnnotation}
- *
- * @author Plamen Pavlov
- */
-public class AnnotationImpl<T extends IJavaElement> extends AnnotationBaseImpl<T> implements IAnnotation<T>
-{
-
- /**
- * @see org.eclipse.jst.ws.jaxws.utils.annotations.IAnnotation#getPropertyValue(java.lang.String)
- */
- public String getPropertyValue(String param)
- {
- for (IParamValuePair pair : getParamValuePairs())
- {
- if (param.equals(pair.getParam()))
- {
- return pair.getValue()!=null ? pair.getValue().toString() : null;
- }
- }
- return null;
- }
-
- private Set<IParamValuePair> paramValuePairs;
-
- /**
- * Constructor
- *
- * @param annotationName -
- * the name of annotation
- * @param paramValuePairs -
- * the param=value paris
- */
- public AnnotationImpl(String annotationName, Set<IParamValuePair> paramValuePairs)
- {
- super(annotationName);
- this.paramValuePairs = paramValuePairs;
- }
-
- public Set<IParamValuePair> getParamValuePairs()
- {
- return paramValuePairs;
- }
-
- public void setParamValuePairs(Set<IParamValuePair> paramValuePairs)
- {
- this.paramValuePairs = paramValuePairs;
- }
-
- @SuppressWarnings("unchecked")
- @Override
- public Expression getExpression(CompilationUnit unit, AST ast)
- {
- NormalAnnotation annot = ast.newNormalAnnotation();
- boolean wasAdded = addImports(ast, unit, getAnnotationName());
- if (wasAdded)
- {
- ((SimpleName) annot.getTypeName()).setIdentifier(getSimpleAnnotationName());
- } else
- {
- Name name = ast.newName(getAnnotationName());
- annot.setTypeName(name);
- }
- for (IParamValuePair paramValuePair : paramValuePairs)
- {
- MemberValuePair pair = ast.newMemberValuePair();
- pair.getName().setIdentifier(paramValuePair.getParam());
- pair.setValue(((ValueImpl) paramValuePair.getValue()).getExpression(unit, ast));
- annot.values().add(pair);
- }
- return annot;
- }
-
- @Override
- public int hashCode()
- {
- if(paramValuePairs == null || paramValuePairs.size() < 1)
- {
- return 31 * super.hashCode();
- }
- return 31 * super.hashCode() + Arrays.hashCode(paramValuePairs.toArray(new IParamValuePair[paramValuePairs.size()]));
- }
-
- @Override
- public boolean equals(Object obj)
- {
- if (!super.equals(obj))
- {
- return false;
- }
- final AnnotationImpl<?> other = (AnnotationImpl<?>) obj;
- return (Arrays.equals(paramValuePairs.toArray(new IParamValuePair[paramValuePairs.size()]), other.paramValuePairs.toArray(new IParamValuePair[paramValuePairs.size()])));
- }
-
- public T getAppliedElement()
- {
- return this.javaElement;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/internal/annotations/impl/AnnotationInspectorImpl.java b/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/internal/annotations/impl/AnnotationInspectorImpl.java
deleted file mode 100755
index 2c867e1..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/internal/annotations/impl/AnnotationInspectorImpl.java
+++ /dev/null
@@ -1,670 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.utils.internal.annotations.impl;
-
-import static org.eclipse.jst.ws.jaxws.utils.ContractChecker.nullCheckParam;
-
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Set;
-
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IField;
-import org.eclipse.jdt.core.IImportDeclaration;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.IMember;
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.ITypeParameter;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jdt.core.dom.ASTNode;
-import org.eclipse.jdt.core.dom.AbstractTypeDeclaration;
-import org.eclipse.jdt.core.dom.Annotation;
-import org.eclipse.jdt.core.dom.ArrayInitializer;
-import org.eclipse.jdt.core.dom.BodyDeclaration;
-import org.eclipse.jdt.core.dom.BooleanLiteral;
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jdt.core.dom.Expression;
-import org.eclipse.jdt.core.dom.FieldDeclaration;
-import org.eclipse.jdt.core.dom.IExtendedModifier;
-import org.eclipse.jdt.core.dom.MarkerAnnotation;
-import org.eclipse.jdt.core.dom.MemberValuePair;
-import org.eclipse.jdt.core.dom.MethodDeclaration;
-import org.eclipse.jdt.core.dom.Name;
-import org.eclipse.jdt.core.dom.NormalAnnotation;
-import org.eclipse.jdt.core.dom.NumberLiteral;
-import org.eclipse.jdt.core.dom.QualifiedName;
-import org.eclipse.jdt.core.dom.QualifiedType;
-import org.eclipse.jdt.core.dom.SimpleType;
-import org.eclipse.jdt.core.dom.SingleMemberAnnotation;
-import org.eclipse.jdt.core.dom.SingleVariableDeclaration;
-import org.eclipse.jdt.core.dom.StringLiteral;
-import org.eclipse.jdt.core.dom.Type;
-import org.eclipse.jdt.core.dom.TypeDeclaration;
-import org.eclipse.jdt.core.dom.TypeLiteral;
-import org.eclipse.jst.ws.jaxws.utils.ContractChecker;
-import org.eclipse.jst.ws.jaxws.utils.annotations.AnnotationFactory;
-import org.eclipse.jst.ws.jaxws.utils.annotations.IAnnotation;
-import org.eclipse.jst.ws.jaxws.utils.annotations.IAnnotationInspector;
-import org.eclipse.jst.ws.jaxws.utils.annotations.ILocator;
-import org.eclipse.jst.ws.jaxws.utils.annotations.IParamValuePair;
-import org.eclipse.jst.ws.jaxws.utils.annotations.IValue;
-import org.eclipse.jst.ws.jaxws.utils.clazz.ASTUtils;
-
-/**
- * Class, which is made to load and return annotations from a given IJavaElemet.
- *
- * @author Plamen Pavlov
- */
-public class AnnotationInspectorImpl implements IAnnotationInspector
-{
- private IType iType;
- private CompilationUnit cUnit;
-
- public AnnotationInspectorImpl(final IType type)
- {
- ContractChecker.nullCheckParam(type, "type"); //$NON-NLS-1$
-
- this.iType = type;
- }
-
- public IAnnotation<IMethod> inspectMethod(final IMethod method, final String annotationQName) throws JavaModelException
- {
- ContractChecker.nullCheckParam(method, "method"); //$NON-NLS-1$
- ContractChecker.nullCheckParam(annotationQName, "annotationQName"); //$NON-NLS-1$
- if(!(method instanceof IMethod))
- {
- throw new IllegalArgumentException("method argument is not of correct Type!"); //$NON-NLS-1$
- }
- if(annotationQName.trim().equals("")) //$NON-NLS-1$
- {
- throw new IllegalArgumentException("annotationQName argument is not with propper value!"); //$NON-NLS-1$
- }
-
- return getSpecificAnnotationFromMember(method, method.getParent().getElementName(), annotationQName);
- }
-
- public Collection<IAnnotation<IMethod>> inspectMethod(IMethod method) throws JavaModelException
- {
- ContractChecker.nullCheckParam(method, "method"); //$NON-NLS-1$
-
- if(!(method instanceof IMethod))
- {
- throw new IllegalArgumentException("method argument is not of correct Type!"); //$NON-NLS-1$
- }
-
- return getFromMember(method, method.getParent().getElementName());
- }
-
- public IAnnotation<IField> inspectField(final IField field, final String annotationQName) throws JavaModelException
- {
- nullCheckParam(field, "field"); //$NON-NLS-1$
- nullCheckParam(annotationQName, "annotationQName"); //$NON-NLS-1$
-
- if(!(field instanceof IField))
- {
- throw new IllegalArgumentException("field argument is not of correct Type!"); //$NON-NLS-1$
- }
- if(annotationQName.trim().equals("")) //$NON-NLS-1$
- {
- throw new IllegalArgumentException("annotationQName argument is not with propper value!"); //$NON-NLS-1$
- }
-
- final String className = field.getParent().getElementName();
- return getSpecificAnnotationFromMember(field, className, annotationQName);
- }
-
- public Collection<IAnnotation<IField>> inspectField(IField field) throws JavaModelException
- {
- if (field == null)
- {
- throw new NullPointerException("field should not be null!"); //$NON-NLS-1$
- }
- if(!(field instanceof IField))
- {
- throw new IllegalArgumentException("field argument is not of correct Type!"); //$NON-NLS-1$
- }
-
- final String className = field.getParent().getElementName();
- return getFromMember(field, className);
- }
-
- public IAnnotation<ITypeParameter> inspectParam(final ITypeParameter param, final String annotationQName) throws JavaModelException
- {
- nullCheckParam(param, "param"); //$NON-NLS-1$
- nullCheckParam(annotationQName, "annotationQName"); //$NON-NLS-1$
-
- if(!(param instanceof ITypeParameter))
- {
- throw new IllegalArgumentException("param argument is not of correct Type!"); //$NON-NLS-1$
- }
- if(annotationQName.trim().equals("")) //$NON-NLS-1$
- {
- throw new IllegalArgumentException("annotationQName argument is not with propper value!"); //$NON-NLS-1$
- }
-
- final String className = getClassNameFromParam(param);
- return getSpecificAnnotationFromMember(param, className, annotationQName);
- }
-
- public Collection<IAnnotation<ITypeParameter>> inspectParam(ITypeParameter param) throws JavaModelException
- {
- if (param == null)
- {
- throw new NullPointerException("param should not be null!"); //$NON-NLS-1$
- }
- if(!(param instanceof ITypeParameter))
- {
- throw new IllegalArgumentException("param argument is not of correct Type!"); //$NON-NLS-1$
- }
-
- return getFromMember(param, getClassNameFromParam(param));
- }
-
- public IAnnotation<IType> inspectType(final String annotationQName) throws JavaModelException
- {
- nullCheckParam(annotationQName, "annotationQName"); //$NON-NLS-1$
-
- if (annotationQName.trim().equals("")) //$NON-NLS-1$
- {
- throw new IllegalArgumentException("annotationQName argument is not with propper value!"); //$NON-NLS-1$
- }
-
- return getSpecificAnnotationFromMember(iType, iType.getElementName(), annotationQName);
- }
-
- public Collection<IAnnotation<IType>> inspectType() throws JavaModelException
- {
- return getFromMember(iType, iType.getElementName());
- }
-
- // # implementation
-
- private String getClassNameFromParam(final ITypeParameter param) throws JavaModelException
- {
- if(param.getDeclaringMember() instanceof IMethod)
- {
- return param.getDeclaringMember().getParent().getElementName();
- }
-
- return param.getDeclaringMember().getElementName();
- }
-
- protected <T extends IJavaElement> Set<IAnnotation<T>> getFromMember(T type, String className) throws JavaModelException
- {
- if (!isSupportedJavaElement(type)) {
- throw new IllegalArgumentException("passed argument is not of correct type."); //$NON-NLS-1$
- }
-
- ICompilationUnit cUnit = null;
- if(type instanceof IMember) {
- cUnit = ((IMember)type).getCompilationUnit();
- }
- else {
- cUnit = ((ITypeParameter)type).getDeclaringMember().getCompilationUnit();
- }
-
- if (cUnit == null) {
- return new HashSet<IAnnotation<T>>();
- }
-
- final CompilationUnit unit = getCompilationUnit();
- final AbstractTypeDeclaration typeDeclaration = ASTUtils.getInstance().getTypeDeclaration(className, unit);
-
- switch(type.getElementType())
- {
- case IJavaElement.TYPE:
- return getAnnotations(type, typeDeclaration);
-
- case IJavaElement.FIELD:
- FieldDeclaration fieldDeclaration = ASTUtils.getInstance().getFieldDeclaration((IField) type, (TypeDeclaration)typeDeclaration);
- return getAnnotations(type, fieldDeclaration);
-
- case IJavaElement.METHOD:
- MethodDeclaration methodDeclaration = ASTUtils.getInstance().getMethodDeclaration((IMethod) type, (TypeDeclaration)typeDeclaration);
- return getAnnotations(type, methodDeclaration);
-
- case IJavaElement.TYPE_PARAMETER:
- methodDeclaration = ASTUtils.getInstance().getMethodDeclaration((IMethod)((ITypeParameter) type).getParent(), (TypeDeclaration)typeDeclaration);
- return getParamAnnotations(type, methodDeclaration);
- }
-
- return new HashSet<IAnnotation<T>>();
- }
-
- @SuppressWarnings("unchecked")
- private <T extends IJavaElement> Set<IAnnotation<T>> getAnnotations(T iMember, BodyDeclaration bodyDeclaration) throws JavaModelException
- {
- if (bodyDeclaration != null)
- {
- List list = bodyDeclaration.modifiers();
- return extractAnnotations(iMember, list);
- }
- return new HashSet<IAnnotation<T>>();
- }
-
- @SuppressWarnings("unchecked")
- private <T extends IJavaElement> Set<IAnnotation<T>> getParamAnnotations(T iMember, MethodDeclaration methodDeclaration) throws JavaModelException
- {
- if (methodDeclaration != null)
- {
- for (Object param : methodDeclaration.parameters())
- {
- if (param instanceof SingleVariableDeclaration &&
- ((ITypeParameter)iMember).getElementName().toString().equals(((SingleVariableDeclaration)param).getName().toString()))
- {
- List list = ((SingleVariableDeclaration) param).modifiers();
-
- return extractAnnotations(iMember, list);
- }
- }
- }
- return new HashSet<IAnnotation<T>>();
- }
-
-
- @SuppressWarnings("unchecked")
- private <T extends IJavaElement> Set<IAnnotation<T>> extractAnnotations(T iMember, List list) throws JavaModelException
- {
- Iterator iter = list.iterator();
- Set<IValue> values = new HashSet<IValue>();
- while (iter.hasNext())
- {
- IExtendedModifier element = (IExtendedModifier) iter.next();
- if (element.isAnnotation())
- {
- values.add(convertExpression((Expression) element));
- }
- }
-
- Set<IAnnotation<T>> expressions = new HashSet<IAnnotation<T>>();
- for (IValue value : values)
- {
- AnnotationImpl<T> ann = (AnnotationImpl<T>)value;
- ann.setAppliedElementWithoutSave(iMember);
- expressions.add(ann);
- }
- return expressions;
- }
-
- @SuppressWarnings("unchecked")
- private <T extends IJavaElement> IAnnotation<T> extractSpecificAnnotation(T iMember, List list, IType type, String annotationQName) throws JavaModelException
- {
- Iterator iter = list.iterator();
- Set<IValue> values = new HashSet<IValue>();
- while (iter.hasNext())
- {
- IExtendedModifier element = (IExtendedModifier) iter.next();
- if (element.isAnnotation())
- {
- final Name typeName = ((Annotation)element).getTypeName();
- if (annotationQName.endsWith(typeName.getFullyQualifiedName())) {
- values.add(convertExpression((Expression) element));
- }
- }
- }
-
- for (IValue value : values)
- {
- AnnotationImpl<T> tmpAnnotation = (AnnotationImpl<T>)value;
- if(checkSpecificAnnotattion(tmpAnnotation, type, annotationQName))
- {
- AnnotationImpl<T> result = new AnnotationImpl<T>(annotationQName, tmpAnnotation.getParamValuePairs());
- result.setAppliedElementWithoutSave(iMember);
- result.setLocator(tmpAnnotation.getLocator());
- return result;
- }
- }
- return null;
- }
-
- private <T extends IJavaElement> boolean checkSpecificAnnotattion(final AnnotationImpl<T> annotation, final IType type, final String annotationQName) throws JavaModelException
- {
- if(annotation.getAnnotationName().equals(annotationQName) ||
- (type.getPackageFragment().getElementName() + "." + annotation.getAnnotationName()).equals(annotationQName)) //$NON-NLS-1$
- {
- return true;
- }
-
- ICompilationUnit cUnit = type.getCompilationUnit();
- IImportDeclaration[] imports = cUnit.getImports();
- for (IImportDeclaration importDeclaration : imports)
- {
- if(annotationQName.endsWith(annotation.getAnnotationName()) && importDeclaration.getElementName().equals(annotationQName))
- {
- return true;
- }
- }
-
- for (IImportDeclaration importDeclaration : imports)
- {
- if(importDeclaration.getElementName().endsWith("*")) //$NON-NLS-1$
- {
- String importStr = importDeclaration.getElementName().substring(0, importDeclaration.getElementName().length() - 1);
- if(annotationQName.endsWith(annotation.getAnnotationName()) && annotationQName.indexOf(importStr) == 0)
- {
- return true;
- }
- }
- }
-
- return false;
- }
-
- @SuppressWarnings("unchecked")
- private IValue convertExpression(Expression element) throws JavaModelException
- {
- switch (element.getNodeType())
- {
- case ASTNode.MARKER_ANNOTATION:
- {
- MarkerAnnotation ma = (MarkerAnnotation) element;
- AnnotationImpl annotation = new AnnotationImpl(getFullyQualifiedAnnotationName(ma), new HashSet<IParamValuePair>());
- annotation.setLocator(createLocator(ma));
- return annotation;
- }
- case ASTNode.SINGLE_MEMBER_ANNOTATION:
- {
- final SingleMemberAnnotation sma = (SingleMemberAnnotation) element;
- final Set<IParamValuePair> values = new HashSet<IParamValuePair>();
-
- final IValue value = convertExpression(sma.getValue());
- if (value!=null) {
- values.add(AnnotationFactory.createParamValuePairValue("value", value)); //$NON-NLS-1$
- }
-
- AnnotationImpl annotation = new AnnotationImpl(getFullyQualifiedAnnotationName(sma), values);
- annotation.setLocator(createLocator(sma));
- return annotation;
- }
- case ASTNode.NORMAL_ANNOTATION:
- {
- return getNormalAnnotationValue((NormalAnnotation) element);
- }
- case ASTNode.ARRAY_INITIALIZER:
- {
- ArrayInitializer arr = (ArrayInitializer) element;
- List<Expression> list = arr.expressions();
- Iterator<Expression> iter = list.iterator();
- Set<IValue> result = new HashSet<IValue>();
- while (iter.hasNext())
- {
- Expression expr = (Expression) iter.next();
- result.add(convertExpression(expr));
- }
- return new ArrayValueImpl(result);
- }
- case ASTNode.NULL_LITERAL:
- {
- // return AnnotationFactory.createNullValue();
- break;
- }
- case ASTNode.SIMPLE_NAME:
- {
- break;//return new StringValueImpl(((SimpleName)element).getIdentifier());
- }
- case ASTNode.TYPE_LITERAL:
- {
- return getTypeLiteralValue((TypeLiteral) element);
- }
- case ASTNode.QUALIFIED_NAME:
- {
- QualifiedName qn = (QualifiedName) element;
- QualifiedNameValueImpl qnValue = new QualifiedNameValueImpl(qn.getFullyQualifiedName());
- qnValue.setLocator(createLocator(qn));
- return qnValue;
- }
- case ASTNode.BOOLEAN_LITERAL:
- {
- BooleanLiteral bl = (BooleanLiteral) element;
- BooleanValueImpl bValue = new BooleanValueImpl(bl.booleanValue());
- bValue.setLocator(createLocator(bl));
- return bValue;
- }
- case ASTNode.CHARACTER_LITERAL:
- {
- // CharacterLiteral cl = (CharacterLiteral) element;
- // TODO Finish with this return new CharacterValue(cl.charValue());
- break;
- }
- case ASTNode.NUMBER_LITERAL:
- {
- NumberLiteral nl = (NumberLiteral) element;
- IntegerValueImpl intValue = new IntegerValueImpl(nl.getToken());
- intValue.setLocator(createLocator(nl));
- return intValue;
- }
- case ASTNode.STRING_LITERAL:
- {
- StringLiteral sl = (StringLiteral) element;
- StringValueImpl strValue = new StringValueImpl(sl.getLiteralValue());
- strValue.setLocator(createLocator(sl));
- return strValue;
- }
- }
- return null;
- }
-
- private IValue getTypeLiteralValue(TypeLiteral tl) throws JavaModelException
- {
- Type type = tl.getType();
- Name name = null;
- if (type.isQualifiedType())
- {
- name = ((QualifiedType) type).getName();
- } else
- {
- if (type.isSimpleType())
- {
- name = ((SimpleType) type).getName();
- }
- }
- if (name != null)
- {
- CompilationUnit cu = getCompilationUnit(tl);
- if (cu != null)
- {
- String fullyQualifiedName = name.getFullyQualifiedName();
- if (type.isSimpleType())
- {
- fullyQualifiedName = resolveType((ICompilationUnit) cu.getJavaElement(), fullyQualifiedName);
- }
-
- ClassValueImpl cValue = new ClassValueImpl(fullyQualifiedName);
- cValue.setLocator(createLocator(tl));
- return cValue;
- }
- }
-
- return null;
- }
-
- @SuppressWarnings("unchecked")
- private IValue getNormalAnnotationValue(NormalAnnotation na) throws JavaModelException
- {
- List<MemberValuePair> l = na.values();
- Iterator<MemberValuePair> iter = l.iterator();
- Set<IParamValuePair> result = new HashSet<IParamValuePair>();
- while (iter.hasNext())
- {
- MemberValuePair mvp = (MemberValuePair) iter.next();
- IValue mvpval = convertExpression(mvp.getValue());
- ParamValuePairImpl pair = new ParamValuePairImpl(mvp.getName().getIdentifier(), mvpval);
- pair.setLocator(createLocator(mvp));
- result.add(pair);
- }
-
- AnnotationImpl annotation = new AnnotationImpl(getFullyQualifiedAnnotationName(na), result);
- annotation.setLocator(createLocator(na));
- return annotation;
- }
-
- private String getFullyQualifiedAnnotationName(Annotation anno) throws JavaModelException
- {
- Name typeName = anno.getTypeName();
- String fullyQualifiedName = typeName.getFullyQualifiedName();
- if (typeName.isSimpleName())
- {
- CompilationUnit cu = getCompilationUnit(anno);
- fullyQualifiedName = resolveType((ICompilationUnit) cu.getJavaElement(), fullyQualifiedName);
- }
- return fullyQualifiedName;
- }
-
- private CompilationUnit getCompilationUnit(Expression element)
- {
- ASTNode cu = element;
- while (cu != null && !(cu instanceof CompilationUnit))
- {
- cu = cu.getParent();
- }
- return (CompilationUnit) cu;
- }
-
- private String resolveType(ICompilationUnit icu, String fullyQualifiedName) throws JavaModelException
- {
- String localFullyQualifiedName = fullyQualifiedName;
- IType[] allTypes = icu.getAllTypes();
- if (allTypes == null)
- {
- return localFullyQualifiedName;
- }
-
- for (int i = 0; i < allTypes.length; i++)
- {
- String[][] resolvedType = allTypes[i].resolveType(localFullyQualifiedName);
- if (resolvedType != null && resolvedType.length > 0)
- {
- StringBuffer buf = new StringBuffer();
- for (int j = 0; j < resolvedType[0].length; j++)
- {
- buf = appendDot(j, buf);
- buf.append(resolvedType[0][j]);
- }
- localFullyQualifiedName = buf.toString();
- break;
- }
- }
-
- return localFullyQualifiedName;
- }
-
- private StringBuffer appendDot(int index, StringBuffer buff)
- {
- StringBuffer result = buff;
- if (index != 0)
- {
- result.append('.');
- }
- return result;
- }
-
- protected <T extends IJavaElement> IAnnotation<T> getSpecificAnnotationFromMember(final T type, final String className, final String annotationQName) throws JavaModelException
- {
- if (!isSupportedJavaElement(type))
- {
- throw new IllegalArgumentException("passed argument is not of correct type."); //$NON-NLS-1$
- }
-
- ICompilationUnit cUnit = null;
- if (type instanceof IMember) {
- cUnit = ((IMember)type).getCompilationUnit();
- }
- else {
- cUnit = ((ITypeParameter)type).getDeclaringMember().getCompilationUnit();
- }
-
- if (cUnit == null) {
- return null;
- }
-
- final CompilationUnit unit = getCompilationUnit();
- final AbstractTypeDeclaration typeDeclaration = ASTUtils.getInstance().getTypeDeclaration(className, unit);
-
- switch(type.getElementType())
- {
- case IJavaElement.TYPE:
- return getSpecificAnnotation(type, typeDeclaration, (IType)type, annotationQName);
-
- case IJavaElement.FIELD:
- IField field = (IField) type;
- FieldDeclaration fieldDeclaration = ASTUtils.getInstance().getFieldDeclaration(field, (TypeDeclaration)typeDeclaration);
- return getSpecificAnnotation(type, fieldDeclaration, field.getDeclaringType(), annotationQName);
-
- case IJavaElement.METHOD:
- IMethod method = (IMethod) type;
- MethodDeclaration methodDeclaration = ASTUtils.getInstance().getMethodDeclaration(method, (TypeDeclaration)typeDeclaration);
- return getSpecificAnnotation(type, methodDeclaration, method.getDeclaringType(), annotationQName);
-
- case IJavaElement.TYPE_PARAMETER:
- method = (IMethod)((ITypeParameter) type).getParent();
- methodDeclaration = ASTUtils.getInstance().getMethodDeclaration(method, (TypeDeclaration)typeDeclaration);
- return getSpecificParamAnnotation(type, methodDeclaration, method.getDeclaringType(), annotationQName);
- }
-
- return null;
- }
-
- private <T extends IJavaElement> IAnnotation<T> getSpecificAnnotation(final T iMember, final BodyDeclaration bodyDeclaration, final IType type, final String annotationQName) throws JavaModelException
- {
- if (bodyDeclaration != null)
- {
- @SuppressWarnings("unchecked")
- final List list = bodyDeclaration.modifiers();
- return extractSpecificAnnotation(iMember, list, type, annotationQName);
- }
- return null;
- }
-
- private <T extends IJavaElement> IAnnotation<T> getSpecificParamAnnotation(T iMember, MethodDeclaration methodDeclaration, final IType type, final String annotationQName) throws JavaModelException
- {
- if (methodDeclaration != null)
- {
- for (Object param : methodDeclaration.parameters())
- {
- if (param instanceof SingleVariableDeclaration &&
- ((ITypeParameter)iMember).getElementName().toString().equals(((SingleVariableDeclaration)param).getName().toString()))
- {
- @SuppressWarnings("unchecked")
- final List list = ((SingleVariableDeclaration) param).modifiers();
-
- return extractSpecificAnnotation(iMember, list, type, annotationQName);
- }
- }
- }
- return null;
- }
-
- private boolean isSupportedJavaElement(final IJavaElement javaElement)
- {
- return javaElement.getElementType()==IJavaElement.METHOD ||
- javaElement.getElementType()==IJavaElement.TYPE ||
- javaElement.getElementType()==IJavaElement.FIELD ||
- javaElement.getElementType()==IJavaElement.TYPE_PARAMETER;
- }
-
- private CompilationUnit getCompilationUnit()
- {
- if (cUnit==null) {
- cUnit = ASTUtils.getInstance().createCompilationUnit(iType.getCompilationUnit(), null);
- }
-
- return cUnit;
- }
-
- private ILocator createLocator(final ASTNode node)
- {
- final int lineNumber = getCompilationUnit().getLineNumber(node.getStartPosition());
- return new LocatorImpl(lineNumber, node.getStartPosition(), node.getLength());
- }
-} \ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/internal/annotations/impl/AnnotationProperty.java b/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/internal/annotations/impl/AnnotationProperty.java
deleted file mode 100755
index 3c17bfc..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/internal/annotations/impl/AnnotationProperty.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.utils.internal.annotations.impl;
-
-import org.eclipse.jst.ws.jaxws.utils.annotations.IAnnotationProperty;
-
-
-public class AnnotationProperty implements IAnnotationProperty
-{
- private String annotationName;
- private String attributeName;
- private String value;
- private AttributeTypeEnum attributeType;
-
- /**
- * Public constructor for AnnotationProperty objects
- *
- * @param annotationName - String representation of the Name for the Annotation.
- * @param attributeName - String representation of the Name for the Attribute.
- * @param value - String representation of the Value for the Attribute.
- */
- public AnnotationProperty(final String annotationName, final String attributeName, final String value, final AttributeTypeEnum attributeType)
- {
- this.annotationName = annotationName;
- this.attributeName = attributeName;
- this.value = value;
- this.attributeType = attributeType;
- }
-
- public String getAnnotationName()
- {
- return this.annotationName;
- }
-
- public String getAttributeName()
- {
- return this.attributeName;
- }
-
- public String getValue()
- {
- return this.value;
- }
-
- public AttributeTypeEnum getAttributeType()
- {
- return this.attributeType;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/internal/annotations/impl/AnnotationPropertyContainer.java b/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/internal/annotations/impl/AnnotationPropertyContainer.java
deleted file mode 100755
index 5b018cd..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/internal/annotations/impl/AnnotationPropertyContainer.java
+++ /dev/null
@@ -1,169 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.utils.internal.annotations.impl;
-
-import java.lang.annotation.ElementType;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
-
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.ITypeParameter;
-import org.eclipse.jst.ws.jaxws.utils.annotations.AnnotationFactory;
-import org.eclipse.jst.ws.jaxws.utils.annotations.IAnnotation;
-import org.eclipse.jst.ws.jaxws.utils.annotations.IAnnotationPropertyContainer;
-import org.eclipse.jst.ws.jaxws.utils.annotations.IParamValuePair;
-import org.eclipse.jst.ws.jaxws.utils.annotations.IValue;
-
-public class AnnotationPropertyContainer implements IAnnotationPropertyContainer
-{
- private Map<String, Set<IParamValuePair>> typeAnnotationName2ParamValuesMap =
- new HashMap<String, Set<IParamValuePair>>();
- private Map<String, Set<IParamValuePair>> methodAnnotationName2ParamValuesMap =
- new HashMap<String, Set<IParamValuePair>>();
- private Map<String, Set<IParamValuePair>> parameterAnnotationName2ParamValuesMap =
- new HashMap<String, Set<IParamValuePair>>();
-
- /**
- * Add Annotation Property to the container.
- *
- * @throws NullPointerException if the <code>target</code> or <code>annotationProperty</code> is <code>null</code>.
- */
- public void addAnnotationProperty(final AnnotationProperty annotationProperty, final ElementType target)
- {
- if(annotationProperty == null)
- {
- throw new NullPointerException("annotationProperty could not be null!"); //$NON-NLS-1$
- }
- if(target == null)
- {
- throw new NullPointerException("target could not be null!"); //$NON-NLS-1$
- }
-
- if(!(target.equals(ElementType.TYPE)) && !(target.equals(ElementType.METHOD)) && !(target.equals(ElementType.PARAMETER)))
- {
- throw new IllegalArgumentException("target parameter is not of correct type"); //$NON-NLS-1$
- }
- Map<String, Set<IParamValuePair>> annotationName2ParamValuesMap = null;
-
- if(target.equals(ElementType.TYPE))
- {
- annotationName2ParamValuesMap = typeAnnotationName2ParamValuesMap;
- }
- if(target.equals(ElementType.METHOD))
- {
- annotationName2ParamValuesMap = methodAnnotationName2ParamValuesMap;
- }
- if(target.equals(ElementType.PARAMETER))
- {
- annotationName2ParamValuesMap = parameterAnnotationName2ParamValuesMap;
- }
-
-
- Set<IParamValuePair> paramValuesSet = annotationName2ParamValuesMap.get(annotationProperty.getAnnotationName());
- if(paramValuesSet == null)
- {
- paramValuesSet = new HashSet<IParamValuePair>();
- annotationName2ParamValuesMap.put(annotationProperty.getAnnotationName(), paramValuesSet);
- }
-
- IValue value = null;
- if(annotationProperty.getAttributeType() == null)
- {
- return;
- }
-
- if(annotationProperty.getAttributeType().equals(AttributeTypeEnum.BOOLEAN))
- {
- value = AnnotationFactory.createBooleanValue(new Boolean(annotationProperty.getValue()));
- }
- if(annotationProperty.getAttributeType().equals(AttributeTypeEnum.CLASS))
- {
- //TODO change this!!!!!!
- //value = AnnotationFactory.createClassValue(annotationProperty.getValue());
- }
- if(annotationProperty.getAttributeType().equals(AttributeTypeEnum.INTEGER))
- {
- value = AnnotationFactory.createIntegerValue(annotationProperty.getValue());
- }
- if(annotationProperty.getAttributeType().equals(AttributeTypeEnum.QUALIFIED_NAME))
- {
- value = AnnotationFactory.createQualifiedNameValue(annotationProperty.getValue());
- }
- if(value == null)
- {
- value = AnnotationFactory.createStringValue(annotationProperty.getValue());
- }
-
- IParamValuePair paramValuePair = AnnotationFactory.createParamValuePairValue(annotationProperty.getAttributeName(), value);
-
- paramValuesSet.add(paramValuePair);
- }
- /**
- * @param ITypeParameter
- * @return Set with all Annotation from the container, which are ITypeParameter relevant.
- */
- public Set<IAnnotation<ITypeParameter>> getParameterAnnotations(ITypeParameter tParam)
- {
- return getAnnotations(ElementType.PARAMETER, tParam);
- }
-
- /**
- * @return Set with all Annotation from the container, which are IType relevant.
- */
- public Set<IAnnotation<IType>> getTypeAnnotations(IType type)
- {
- return getAnnotations(ElementType.TYPE, type);
- }
-
- /**
- * @return Set with all Annotation from the container, which are IMethod relevant.
- */
- public Set<IAnnotation<IMethod>> getMethodAnnotations(IMethod method)
- {
- return getAnnotations(ElementType.METHOD , method);
- }
-
- private <T extends IJavaElement> Set<IAnnotation<T>> getAnnotations(final ElementType target, final T iTarget)
- {
- if(!(target.equals(ElementType.TYPE)) && !(target.equals(ElementType.METHOD)) && !(target.equals(ElementType.PARAMETER)))
- {
- throw new IllegalArgumentException("target parameter is not of correct type"); //$NON-NLS-1$
- }
-
- Map<String, Set<IParamValuePair>> annotationName2ParamValuesMap = null;
- if(target.equals(ElementType.TYPE))
- {
- annotationName2ParamValuesMap = typeAnnotationName2ParamValuesMap;
- }
- if(target.equals(ElementType.METHOD))
- {
- annotationName2ParamValuesMap = methodAnnotationName2ParamValuesMap;
- }
- if(target.equals(ElementType.PARAMETER))
- {
- annotationName2ParamValuesMap = parameterAnnotationName2ParamValuesMap;
- }
- Set<IAnnotation<T>> result = new HashSet<IAnnotation<T>>();
- Set<String> keys = annotationName2ParamValuesMap.keySet();
- for (String key : keys)
- {
- Set<IParamValuePair> paramValuePairsSet = annotationName2ParamValuesMap.get(key);
- IAnnotation<T> annotation = AnnotationFactory.createAnnotation(key, paramValuePairsSet, iTarget);
- result.add(annotation);
- }
-
- return result;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/internal/annotations/impl/AnnotationUtils.java b/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/internal/annotations/impl/AnnotationUtils.java
deleted file mode 100755
index c855a1b..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/internal/annotations/impl/AnnotationUtils.java
+++ /dev/null
@@ -1,528 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.utils.internal.annotations.impl;
-
-import java.io.FileNotFoundException;
-import java.text.MessageFormat;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Set;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IField;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.ITypeParameter;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jdt.core.dom.AbstractTypeDeclaration;
-import org.eclipse.jdt.core.dom.Annotation;
-import org.eclipse.jdt.core.dom.BodyDeclaration;
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jdt.core.dom.IExtendedModifier;
-import org.eclipse.jdt.core.dom.MethodDeclaration;
-import org.eclipse.jdt.core.dom.SingleVariableDeclaration;
-import org.eclipse.jdt.core.dom.TypeDeclaration;
-import org.eclipse.jface.text.BadLocationException;
-import org.eclipse.jface.text.Document;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jst.ws.jaxws.utils.annotations.AnnotationGeneratorException;
-import org.eclipse.jst.ws.jaxws.utils.clazz.ASTUtils;
-import org.eclipse.jst.ws.jaxws.utils.internal.text.JaxWsUtilMessages;
-import org.eclipse.jst.ws.jaxws.utils.resources.EditResourcesManager;
-import org.eclipse.jst.ws.jaxws.utils.resources.FileUtils;
-import org.eclipse.jst.ws.jaxws.utils.resources.IFileUtils;
-import org.eclipse.text.edits.MalformedTreeException;
-import org.eclipse.text.edits.TextEdit;
-
-/**
- * Contains utilities for getting AST objects needed in annotation processing
- *
- * @author Plamen Pavlov
- */
-public class AnnotationUtils
-{
- private static AnnotationUtils utils = null;
- private final IFileUtils fileUtils = FileUtils.getInstance();
-
- /**
- * The factory method.
- *
- * @return a AnnotationUtils instance.
- */
- public static AnnotationUtils getInstance()
- {
- if (utils == null)
- {
- utils = new AnnotationUtils();
- }
- return utils;
- }
-
- /**
- * Gets IDocument, which coresponds to one CompilationUnit.
- *
- * @param unit -
- * Compilation Unit, which will be used as starting point to get the IDocument.
- *
- * @return IDocument which is found.
- *
- * @throws CoreException
- */
- public IDocument getDocument(ICompilationUnit unit) throws CoreException
- {
- String source = unit.getBuffer().getContents();
- return new Document(source);
- }
-
- /**
- * Removes Annotations of specified IJavaElement.
- *
- * @param javaElement - IJavaElement which will be used as starting poin for removing the annotations.
- * @param annotations - Set which contains String values for the annotations which will be removed. If this Set is empty all Annotations will be removed.
- * @param deepRemove - Boolean value, representing whether Annotations from javaElemet childs will be removed.
- * @throws AnnotationGeneratorException
- *
- * @throws AnnotationGeneratorException
- * thown if AST TypeDeclaration cannot be found for <code>type</code> and also is used as wrapper in case {@link CoreException} or
- * {@link BadLocationException} is thrown while processing.
- * @throws BadLocationException
- * @throws CoreException
- * @throws FileNotFoundException
- * @throws MalformedTreeException
- */
- public void removeAnnotations(IJavaElement javaElement, Set<String> annotations, boolean deepRemove) throws AnnotationGeneratorException, MalformedTreeException, FileNotFoundException, CoreException, BadLocationException
- {
- if(javaElement instanceof IType)
- {
- IType type = (IType)javaElement;
- ICompilationUnit cUnit = type.getCompilationUnit();
- String className = type.getElementName();
- CompilationUnit unit = ASTUtils.getInstance().createCompilationUnit(cUnit, null);
-
- AbstractTypeDeclaration typeDeclaration = ASTUtils.getInstance().getTypeDeclaration(className, unit);
- if (typeDeclaration == null)
- {
- throw new AnnotationGeneratorException("typeDeclaration should not be null",//$NON-NLS-1$
- MessageFormat.format(JaxWsUtilMessages.AnnotationUtils_ParamShouldNotBeNullMsg, "typeDeclaration")); //$NON-NLS-1$
- }
-
- removeTypeAnnotations(type, typeDeclaration, unit, cUnit, annotations);
-
- if(!deepRemove)
- {
- return;
- }
-
- IField[] tmpFields = type.getFields();
- if (tmpFields != null && tmpFields.length > 0)
- {
- for (IField tmpField : tmpFields)
- {
- removeFieldAnnotations(tmpField, type, cUnit, annotations);
- }
- }
-
- IMethod[] tmpMethods = type.getMethods();
- if (tmpMethods != null && tmpMethods.length > 0)
- {
- for (IMethod tmpMethod : tmpMethods)
- {
- removeMethodAnnotations(tmpMethod, type, cUnit, annotations);
-
- //Remove params annotations
- for (String paramName : tmpMethod.getParameterNames())
- {
- ITypeParameter typeParameter = tmpMethod.getTypeParameter(paramName);
- removeParamAnnotations(typeParameter, type, cUnit, annotations, paramName);
- }
- }
- }
- }
-
- if(javaElement instanceof IField)
- {
- IField field = (IField)javaElement;
- IType declaringType = field.getDeclaringType();
- ICompilationUnit declaringTypeCompUnit = declaringType.getCompilationUnit();
-
- removeFieldAnnotations(field, declaringType, declaringTypeCompUnit, annotations);
- }
-
- if(javaElement instanceof IMethod)
- {
- IMethod method = (IMethod)javaElement;
- IType declaringType = method.getDeclaringType();
- ICompilationUnit declaringTypeCompUnit = declaringType.getCompilationUnit();
-
- removeMethodAnnotations(method, declaringType, declaringTypeCompUnit, annotations);
- if(!deepRemove)
- {
- return;
- }
-
- //Remove params annotations
- for (String paramName: method.getParameterNames())
- {
- ITypeParameter param = method.getTypeParameter(paramName);
- removeParamAnnotations(param, declaringType, declaringTypeCompUnit, annotations, paramName);
- }
- }
-
- if(javaElement instanceof ITypeParameter)
- {
- ITypeParameter typeParameter = (ITypeParameter)javaElement;
- IMethod tmpMethod = (IMethod) typeParameter.getDeclaringMember();
- //TODO check this
- //param.getParent();
- IType declaringType = tmpMethod.getDeclaringType();
- ICompilationUnit declaringTypeCompUnit = declaringType.getCompilationUnit();
- //TODO FIX THIS
- removeParamAnnotations(typeParameter, declaringType, declaringTypeCompUnit, annotations, null);
- }
- }
-
- private void removeTypeAnnotations(IType type, AbstractTypeDeclaration typeDeclaration, CompilationUnit unit, ICompilationUnit cUnit, Set<String> annotationsSet) throws CoreException, MalformedTreeException, BadLocationException, FileNotFoundException, AnnotationGeneratorException
- {
- unit.recordModifications();
- if (removeAnnotations(typeDeclaration.modifiers(), annotationsSet))
- {
- IDocument doc = AnnotationUtils.getInstance().getDocument(cUnit);
- TextEdit edit = unit.rewrite(doc, null);
- edit.apply(doc);
-
- saveContent(cUnit, doc);
- }
- }
-
- private void removeFieldAnnotations(IField field, IType declaringType, ICompilationUnit declaringTypeCompUnit, Set<String> annotationsSet) throws CoreException, MalformedTreeException, BadLocationException, FileNotFoundException, AnnotationGeneratorException
- {
- ICompilationUnit fcUnit = field.getCompilationUnit();
- String className = declaringType.getElementName();
- CompilationUnit fUnit = ASTUtils.getInstance().createCompilationUnit(fcUnit, null);
-
- BodyDeclaration fBodyDeclaration = ASTUtils.getInstance().getTypeDeclaration(className, fUnit);
- fBodyDeclaration = ASTUtils.getInstance().getFieldDeclaration(field, (TypeDeclaration) fBodyDeclaration);
-
- fUnit.recordModifications();
- if (removeAnnotations(fBodyDeclaration.modifiers(), annotationsSet))
- {
- IDocument doc = getDocument(declaringTypeCompUnit);
- TextEdit edit = fUnit.rewrite(doc, null);
- edit.apply(doc);
-
- saveContent(declaringTypeCompUnit, doc);
- }
- }
-
- private void removeMethodAnnotations(IMethod method, IType declaringType, ICompilationUnit declaringTypeCompUnit, Set<String> annotationsSet) throws CoreException, MalformedTreeException, BadLocationException, FileNotFoundException, AnnotationGeneratorException
- {
- ICompilationUnit mcUnit = method.getCompilationUnit();
- String className = declaringType.getElementName();
- CompilationUnit mUnit = ASTUtils.getInstance().createCompilationUnit(mcUnit, null);
-
- BodyDeclaration mBodyDeclaration = ASTUtils.getInstance().getTypeDeclaration(className, mUnit);
- mBodyDeclaration = ASTUtils.getInstance().getMethodDeclaration(method, (TypeDeclaration) mBodyDeclaration);
- mUnit.recordModifications();
- if (removeAnnotations(mBodyDeclaration.modifiers(), annotationsSet))
- {
- IDocument doc = getDocument(declaringTypeCompUnit);
- TextEdit edit = mUnit.rewrite(doc, null);
- edit.apply(doc);
-
- saveContent(declaringTypeCompUnit, doc);
- }
- }
-
- private void removeParamAnnotations(ITypeParameter param, IType declaringType, ICompilationUnit declaringTypeCompUnit, Set<String> annotationsSet, String paramName) throws CoreException, MalformedTreeException, BadLocationException, FileNotFoundException, AnnotationGeneratorException
- {
- IMethod tmpMethod = (IMethod)param.getDeclaringMember();
- //TODO check this
- //param.getParent();
- String className = declaringType.getElementName();
- ICompilationUnit mcUnit = tmpMethod.getCompilationUnit();
- CompilationUnit mUnit = ASTUtils.getInstance().createCompilationUnit(mcUnit, null);
-
- BodyDeclaration mBodyDeclaration = ASTUtils.getInstance().getTypeDeclaration(className, mUnit);
- mBodyDeclaration = ASTUtils.getInstance().getMethodDeclaration(tmpMethod, (TypeDeclaration) mBodyDeclaration);
- mUnit.recordModifications();
-
- for (Object object : ((MethodDeclaration) mBodyDeclaration).parameters())
- {
- if (object instanceof SingleVariableDeclaration)
- {
- SingleVariableDeclaration svd = (SingleVariableDeclaration) object;
- if ((paramName == null || svd.getName().toString().equals(paramName)) &&
- removeAnnotations(svd.modifiers(), annotationsSet))
- {
- IDocument doc = getDocument(declaringTypeCompUnit);
- TextEdit edit = mUnit.rewrite(doc, null);
- edit.apply(doc);
-
- saveContent(declaringTypeCompUnit, doc);
- }
- }
- }
- }
-
- private void saveContent(ICompilationUnit cUnit, IDocument doc) throws FileNotFoundException, JavaModelException, AnnotationGeneratorException
- {
- IStatus status = (new EditResourcesManager()).setFileEditable((IFile) cUnit.getResource());
- if(status.getSeverity() == IStatus.OK )
- {
- fileUtils.setCompilationUnitContentAndSaveDirtyEditors(cUnit, doc.get(), true, null);
- }
- else
- {
- throw new AnnotationGeneratorException("Annotattion could not be stored, the file is not writable", //$NON-NLS-1$
- JaxWsUtilMessages.AnnotationCannotBeStoredMsg);
- }
- }
-
- /**
- * Removes specific Annotation of specified IJavaElement.
- *
- * @param javaElement - IJavaElement which will be used as starting poin for removing the Annotation.
- * @param annotationName - String which is the representation Name of the Annotation, which will be removed.
- *
- * @throws AnnotationGeneratorException
- * @throws AnnotationGeneratorException
- * thown if AST TypeDeclaration cannot be found for <code>type</code> and also is used as wrapper in case {@link CoreException} or
- * {@link BadLocationException} is thrown while processing.
- * @throws BadLocationException
- * @throws CoreException
- * @throws FileNotFoundException
- * @throws MalformedTreeException
- */
- public void removeAnnotation(IJavaElement javaElement, String annotationName) throws AnnotationGeneratorException, FileNotFoundException, CoreException, BadLocationException
- {
- if(javaElement instanceof IType)
- {
- IType type = (IType)javaElement;
- ICompilationUnit cUnit = type.getCompilationUnit();
- String className = type.getElementName();
- CompilationUnit unit = ASTUtils.getInstance().createCompilationUnit(cUnit, null);
-
- AbstractTypeDeclaration typeDeclaration = ASTUtils.getInstance().getTypeDeclaration(className, unit);
- if (typeDeclaration == null)
- {
- throw new AnnotationGeneratorException("typeDeclaration should not be null", //$NON-NLS-1$
- MessageFormat.format(JaxWsUtilMessages.AnnotationUtils_ParamShouldNotBeNullMsg, "typeDeclaration")); //$NON-NLS-1$
- }
-
- removeTypeAnnotation(type, typeDeclaration, unit, cUnit, annotationName);
-
- }
-
- if(javaElement instanceof IField)
- {
- IField field = (IField)javaElement;
- IType declaringType = field.getDeclaringType();
- ICompilationUnit declaringTypeCompUnit = declaringType.getCompilationUnit();
-
- removeFieldAnnotation(field, declaringType, declaringTypeCompUnit, annotationName);
- }
-
- if(javaElement instanceof IMethod)
- {
- IMethod method = (IMethod)javaElement;
- IType declaringType = method.getDeclaringType();
- ICompilationUnit declaringTypeCompUnit = declaringType.getCompilationUnit();
-
- removeMethodAnnotation(method, declaringType, declaringTypeCompUnit, annotationName);
- }
-
- if(javaElement instanceof ITypeParameter)
- {
- ITypeParameter typeParameter = (ITypeParameter)javaElement;
- IMethod tmpMethod = (IMethod) typeParameter.getDeclaringMember();
- //TODO check this
- //param.getParent();
- IType declaringType = tmpMethod.getDeclaringType();
- ICompilationUnit declaringTypeCompUnit = declaringType.getCompilationUnit();
-
- removeParamAnnotation(typeParameter, declaringType, declaringTypeCompUnit, annotationName);
- }
- }
-
- private void removeTypeAnnotation(IType type, AbstractTypeDeclaration typeDeclaration, CompilationUnit unit, ICompilationUnit cUnit, String annotationName) throws CoreException, MalformedTreeException, BadLocationException, FileNotFoundException, AnnotationGeneratorException
- {
- unit.recordModifications();
- if (removeAnnotation(typeDeclaration.modifiers(), annotationName))
- {
- IDocument doc = AnnotationUtils.getInstance().getDocument(cUnit);
- TextEdit edit = unit.rewrite(doc, null);
- edit.apply(doc);
-
- saveContent(cUnit, doc);
- }
- }
-
- private void removeFieldAnnotation(IField field, IType declaringType, ICompilationUnit declaringTypeCompUnit, String annotationName) throws CoreException, MalformedTreeException, BadLocationException, FileNotFoundException, AnnotationGeneratorException
- {
- ICompilationUnit fcUnit = field.getCompilationUnit();
- String className = declaringType.getElementName();
- CompilationUnit fUnit = ASTUtils.getInstance().createCompilationUnit(fcUnit, null);
-
- BodyDeclaration fBodyDeclaration = ASTUtils.getInstance().getTypeDeclaration(className, fUnit);
- fBodyDeclaration = ASTUtils.getInstance().getFieldDeclaration(field, (TypeDeclaration) fBodyDeclaration);
-
- fUnit.recordModifications();
- if (removeAnnotation(fBodyDeclaration.modifiers(), annotationName))
- {
- IDocument doc = getDocument(declaringTypeCompUnit);
- TextEdit edit = fUnit.rewrite(doc, null);
- edit.apply(doc);
-
- saveContent(declaringTypeCompUnit, doc);
- }
- }
-
- private void removeMethodAnnotation(IMethod method, IType declaringType, ICompilationUnit declaringTypeCompUnit, String annotationName) throws CoreException, MalformedTreeException, BadLocationException, FileNotFoundException, AnnotationGeneratorException
- {
- ICompilationUnit mcUnit = method.getCompilationUnit();
- String className = declaringType.getElementName();
- CompilationUnit mUnit = ASTUtils.getInstance().createCompilationUnit(mcUnit, null);
-
- BodyDeclaration mBodyDeclaration = ASTUtils.getInstance().getTypeDeclaration(className, mUnit);
- mBodyDeclaration = ASTUtils.getInstance().getMethodDeclaration(method, (TypeDeclaration) mBodyDeclaration);
- mUnit.recordModifications();
- if(removeAnnotation(mBodyDeclaration.modifiers(), annotationName))
- {
- IDocument doc = getDocument(declaringTypeCompUnit);
- TextEdit edit = mUnit.rewrite(doc, null);
- edit.apply(doc);
-
- saveContent(declaringTypeCompUnit, doc);
- }
- }
-
- private void removeParamAnnotation(ITypeParameter param, IType declaringType, ICompilationUnit declaringTypeCompUnit, String annotationName) throws CoreException, MalformedTreeException, BadLocationException, FileNotFoundException, AnnotationGeneratorException
- {
- IMethod tmpMethod = (IMethod)param.getDeclaringMember();
- //TODO check this
- //param.getParent();
- String className = declaringType.getElementName();
- ICompilationUnit mcUnit = tmpMethod.getCompilationUnit();
- className = tmpMethod.getParent().getElementName();
- CompilationUnit mUnit = ASTUtils.getInstance().createCompilationUnit(mcUnit, null);
-
- BodyDeclaration mBodyDeclaration = ASTUtils.getInstance().getTypeDeclaration(className, mUnit);
- mBodyDeclaration = ASTUtils.getInstance().getMethodDeclaration(tmpMethod, (TypeDeclaration) mBodyDeclaration);
-
- mUnit.recordModifications();
- for (Object object : ((MethodDeclaration) mBodyDeclaration).parameters())
- {
- if (object instanceof SingleVariableDeclaration)
- {
- if (removeAnnotation(((SingleVariableDeclaration) object).modifiers(), annotationName))
- {
- IDocument doc = getDocument(declaringTypeCompUnit);
- TextEdit edit = mUnit.rewrite(doc, null);
- edit.apply(doc);
-
- saveContent(declaringTypeCompUnit, doc);
- }
- }
- }
- }
-
- /**
- * Removes specific annotation from the list of modifiers.
- *
- * @param modifiers
- * @param annotationName
- *
- * @return boolean value, which represents wheter the annotation is removed or not.
- */
- @SuppressWarnings("unchecked")
- private boolean removeAnnotation(List modifiers, String annotationName)
- {
- Annotation[] mAnnotations = extractAnnotations(modifiers);
- for (Annotation mAnnotation : mAnnotations)
- {
- if(validateAnnotatation(mAnnotation, annotationName))
- {
- modifiers.remove(mAnnotation);
- return true;
- }
- }
-
- return false;
- }
-
- @SuppressWarnings("unchecked")
- private boolean removeAnnotations(List modifiers, Set<String> annotationsSet)
- {
- boolean changed = false;
- Annotation[] mAnnotations = extractAnnotations(modifiers);
- for (int mai = 0; mai < mAnnotations.length; mai++)
- {
- if (annotationsSet != null)
- {
- if (annotationsSet.contains(mAnnotations[mai].getTypeName().getFullyQualifiedName()))
- {
- modifiers.remove(mAnnotations[mai]);
- changed = true;
- }
- } else
- {
- modifiers.remove(mAnnotations[mai]);
- changed = true;
- }
- }
-
- return changed;
- }
-
- @SuppressWarnings("unchecked")
- private Annotation[] extractAnnotations(List modifiers)
- {
- Iterator iterator = modifiers.iterator();
- Set<Annotation> annotationsSet = new HashSet<Annotation>();
-
- while (iterator.hasNext())
- {
- IExtendedModifier modif = (IExtendedModifier) iterator.next();
- if (modif.isAnnotation())
- {
- annotationsSet.add((Annotation) modif);
- }
- }
-
- return annotationsSet.toArray(new Annotation[annotationsSet.size()]);
- }
-
- private boolean validateAnnotatation(Annotation mAnnotation, String annotationName)
- {
- String mAnnotationString = mAnnotation.toString();
- int index = mAnnotationString.indexOf("("); //$NON-NLS-1$
- if(index == -1)
- {
- mAnnotationString = mAnnotationString.trim();
- }
- else
- {
- mAnnotationString = mAnnotationString.substring(0, index).trim();
- }
-
- if(mAnnotationString.endsWith(annotationName))
- {
- return true;
- }
-
- return false;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/internal/annotations/impl/ArrayValueImpl.java b/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/internal/annotations/impl/ArrayValueImpl.java
deleted file mode 100755
index 331862b..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/internal/annotations/impl/ArrayValueImpl.java
+++ /dev/null
@@ -1,108 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.utils.internal.annotations.impl;
-
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.Set;
-
-import org.eclipse.jdt.core.dom.AST;
-import org.eclipse.jdt.core.dom.ArrayInitializer;
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jdt.core.dom.Expression;
-import org.eclipse.jst.ws.jaxws.utils.annotations.IValue;
-
-/**
- * Implementation for {@link IArrayValue}
- *
- * @author Plamen Pavlov
- */
-public class ArrayValueImpl extends ValueImpl
-{
- private Set<IValue> values = new HashSet<IValue>();
-
- /**
- * Construction
- *
- * @param values
- * @throws NullPointerException
- * in case <code>values</code> is <code>null</code>.
- */
- public ArrayValueImpl(Set<IValue> values)
- {
- if (values == null)
- {
- throw new NullPointerException("values should not be null"); //$NON-NLS-1$
- }
-
- this.values = values;
- }
-
- @Override
- public String toString()
- {
- String result = "["; //$NON-NLS-1$
- boolean first = true;
- for (IValue value : values)
- {
- if(first)
- {
- result = result + value.toString();
- first = false;
- }
- else
- {
- result = result + ", " + value.toString(); //$NON-NLS-1$
- }
- }
- result = result + "]"; //$NON-NLS-1$
- return result;
- }
-
- @SuppressWarnings("unchecked")
- @Override
- protected Expression getExpression(CompilationUnit unit, AST ast)
- {
- //TODO check this method
- ArrayInitializer arr = ast.newArrayInitializer();
- for (IValue value : values)
- {
- arr.expressions().add(((ValueImpl) value).getExpression(unit, ast));
- }
-
- return arr;
- }
-
- @Override
- public int hashCode()
- {
- return Arrays.hashCode(values.toArray(new IValue[values.size()]));
- }
-
- @Override
- public boolean equals(Object obj)
- {
- if (this == obj)
- {
- return true;
- }
- if (obj == null)
- {
- return false;
- }
- if (getClass() != obj.getClass())
- {
- return false;
- }
- final ArrayValueImpl other = (ArrayValueImpl) obj;
- return Arrays.equals(values.toArray(new IValue[values.size()]), other.values.toArray(new IValue[values.size()]));
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/internal/annotations/impl/AttributeTypeEnum.java b/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/internal/annotations/impl/AttributeTypeEnum.java
deleted file mode 100755
index a0ba607..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/internal/annotations/impl/AttributeTypeEnum.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.utils.internal.annotations.impl;
-
-public enum AttributeTypeEnum
-{
- BOOLEAN("Boolean"), //$NON-NLS-1$
- CLASS("Class"), //$NON-NLS-1$
- INTEGER("Integer"), //$NON-NLS-1$
- QUALIFIED_NAME("Qualified Name"), //$NON-NLS-1$
- STRING("String"); //$NON-NLS-1$
-
- private final String value;
-
- AttributeTypeEnum(final String value)
- {
- this.value = value;
- }
-
- final String getValue()
- {
- return this.value;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/internal/annotations/impl/BooleanValueImpl.java b/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/internal/annotations/impl/BooleanValueImpl.java
deleted file mode 100755
index 45fe1f9..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/internal/annotations/impl/BooleanValueImpl.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.utils.internal.annotations.impl;
-
-import org.eclipse.jdt.core.dom.AST;
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jdt.core.dom.Expression;
-
-/**
- * Implementation for {@link IBooleanValue}
- *
- * @author Plamen Pavlov
- */
-public class BooleanValueImpl extends ValueImpl
-{ //$JL-EQUALS$
- private boolean value;
-
- /**
- * Constructor
- *
- * @param value
- */
- public BooleanValueImpl(boolean value)
- {
- this.value = value;
- }
-
- @Override
- protected Expression getExpression(CompilationUnit unit, AST ast)
- {
- return ast.newBooleanLiteral(value);
- }
-
- @Override
- public String toString()
- {
- return Boolean.toString(value);
- }
-
- @Override
- public boolean equals(Object obj)
- {
- if (this == obj)
- {
- return true;
- }
- if (obj == null)
- {
- return false;
- }
- if (getClass() != obj.getClass())
- {
- return false;
- }
- final BooleanValueImpl other = (BooleanValueImpl) obj;
- return value == other.value;
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/internal/annotations/impl/ClassValueImpl.java b/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/internal/annotations/impl/ClassValueImpl.java
deleted file mode 100755
index bdcea51..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/internal/annotations/impl/ClassValueImpl.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.utils.internal.annotations.impl;
-
-import org.eclipse.jdt.core.dom.AST;
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jdt.core.dom.Expression;
-import org.eclipse.jdt.core.dom.Name;
-import org.eclipse.jdt.core.dom.SimpleType;
-import org.eclipse.jdt.core.dom.TypeLiteral;
-
-public class ClassValueImpl extends ValueImpl
-{
- private String classQName;
-
- public ClassValueImpl(String classQName)
- {
- this.classQName = classQName;
- }
-
- protected Expression getExpression(CompilationUnit unit, AST ast)
- {
- String clsName = this.classQName;
- if (addImports(ast, unit, clsName))
- {
- clsName = getSimpleName(clsName);
- }
- Name name = ast.newName(clsName);
- SimpleType simpleType = ast.newSimpleType(name);
- TypeLiteral literal = ast.newTypeLiteral();
- literal.setType(simpleType);
- return literal;
- }
-
- @Override
- public String toString()
- {
- return this.classQName;
- }
-
- @Override
- public int hashCode()
- {
- return this.classQName.hashCode();
- }
-
- @Override
- public boolean equals(Object obj)
- {
- if (this == obj)
- {
- return true;
- }
- if (obj == null)
- {
- return false;
- }
- if (getClass() != obj.getClass())
- {
- return false;
- }
- final ClassValueImpl other = (ClassValueImpl) obj;
- return this.classQName.equals(other.classQName);
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/internal/annotations/impl/IntegerValueImpl.java b/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/internal/annotations/impl/IntegerValueImpl.java
deleted file mode 100755
index faffe0f..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/internal/annotations/impl/IntegerValueImpl.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.utils.internal.annotations.impl;
-
-import org.eclipse.jdt.core.dom.AST;
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jdt.core.dom.Expression;
-import org.eclipse.jdt.core.dom.NumberLiteral;
-
-/**
- * Implementor for IIntegerValue
- *
- * @author Plamen Pavlov
- */
-public class IntegerValueImpl extends ValueImpl
-{
- private String value;
-
- /**
- * Constructor
- *
- * @param value
- */
- public IntegerValueImpl(String value)
- {
- this.value = value;
- }
-
- @Override
- protected Expression getExpression(CompilationUnit unit, AST ast)
- {
- NumberLiteral literal = ast.newNumberLiteral();
- literal.setToken(new Integer(value).toString());
- return literal;
- }
-
- @Override
- public int hashCode()
- {
- return new Integer(value);
- }
-
- @Override
- public boolean equals(Object obj)
- {
- if (this == obj)
- {
- return true;
- }
- if (obj == null)
- {
- return false;
- }
- if (getClass() != obj.getClass())
- {
- return false;
- }
- final IntegerValueImpl other = (IntegerValueImpl) obj;
- return value == other.value;
- }
-
- @Override
- public String toString()
- {
- return value;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/internal/annotations/impl/LocatorImpl.java b/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/internal/annotations/impl/LocatorImpl.java
deleted file mode 100755
index 89e859a..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/internal/annotations/impl/LocatorImpl.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.utils.internal.annotations.impl;
-
-import org.eclipse.jst.ws.jaxws.utils.annotations.ILocator;
-
-/**
- * Implementor of {@link ILocator} interface
- */
-public class LocatorImpl implements ILocator
-{
- private int lineNumber;
- private int startPosition;
- private int length;
-
- public LocatorImpl(final int lineNumber, final int startPosition, final int length)
- {
- this.length = length;
- this.startPosition = startPosition;
- this.lineNumber = lineNumber;
- }
-
- public int getLength()
- {
- return this.length;
- }
-
- public int getStartPosition()
- {
- return this.startPosition;
- }
-
- public int getLineNumber()
- {
- return lineNumber;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/internal/annotations/impl/ParamValuePairImpl.java b/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/internal/annotations/impl/ParamValuePairImpl.java
deleted file mode 100755
index 9ce31d7..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/internal/annotations/impl/ParamValuePairImpl.java
+++ /dev/null
@@ -1,98 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.utils.internal.annotations.impl;
-
-import org.eclipse.jst.ws.jaxws.utils.annotations.ILocator;
-import org.eclipse.jst.ws.jaxws.utils.annotations.IParamValuePair;
-import org.eclipse.jst.ws.jaxws.utils.annotations.IValue;
-
-/**
- * @author Plamen Pavlov
- */
-
-public class ParamValuePairImpl implements IParamValuePair
-{
-
- private ILocator locator = null;
-
-
- private String param;
-
- private IValue value;
-
- /**
- * Constructor
- *
- * @param param
- * @param value
- */
- public ParamValuePairImpl(String param, IValue value)
- {
- this.param = param;
- this.value = value;
- }
-
- public String getParam()
- {
- return param;
- }
-
- public IValue getValue()
- {
- return value;
- }
-
- @Override
- public int hashCode()
- {
- if(value != null)
- {
- return 31 * param.hashCode() + value.hashCode();
- }
- else
- {
- return 31 * param.hashCode();
- }
- }
-
- @Override
- public boolean equals(Object obj)
- {
- if (this == obj)
- {
- return true;
- }
- if (obj == null)
- {
- return false;
- }
- if (getClass() != obj.getClass())
- {
- return false;
- }
- final ParamValuePairImpl other = (ParamValuePairImpl) obj;
- if (!param.equals(other.param))
- {
- return false;
- }
- return value.equals(other.value);
- }
-
- public ILocator getLocator()
- {
- return this.locator;
- }
-
- public void setLocator(final ILocator locator)
- {
- this.locator = locator;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/internal/annotations/impl/QualifiedNameValueImpl.java b/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/internal/annotations/impl/QualifiedNameValueImpl.java
deleted file mode 100755
index 5bb66cf..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/internal/annotations/impl/QualifiedNameValueImpl.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.utils.internal.annotations.impl;
-
-import org.eclipse.jdt.core.dom.AST;
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jdt.core.dom.Expression;
-
-/**
- * Implementor for {@link IQualifiedNameValue}
- *
- * @author Plamen Pavlov
- */
-public class QualifiedNameValueImpl extends ValueImpl
-{
- private String value;
-
- /**
- * Constructor
- *
- * @param value
- */
- public QualifiedNameValueImpl(String value)
- {
- this.value = value;
- }
-
- @Override
- protected Expression getExpression(CompilationUnit unit, AST ast)
- {
- // "javax.ejb.TransactionAttributeType.REQUIRED"
- int i = value.lastIndexOf('.');
- if (i != -1)
- {
- String clsName = value.substring(0, i);
- if (addImports(ast, unit, clsName))
- {
- return ast.newName(getSimpleName(clsName) + value.substring(i));
- }
- }
- return ast.newName(value);
- }
-
- @Override
- public int hashCode()
- {
- return value.hashCode();
- }
-
- @Override
- public boolean equals(Object obj)
- {
- if (this == obj)
- {
- return true;
- }
- if (obj == null)
- {
- return false;
- }
- if (getClass() != obj.getClass())
- {
- return false;
- }
- final QualifiedNameValueImpl other = (QualifiedNameValueImpl) obj;
- return value.equals(other.value);
- }
-
- @Override
- public String toString()
- {
- return value;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/internal/annotations/impl/StringValueImpl.java b/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/internal/annotations/impl/StringValueImpl.java
deleted file mode 100755
index 58bd1b7..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/internal/annotations/impl/StringValueImpl.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.utils.internal.annotations.impl;
-
-import org.eclipse.jdt.core.dom.AST;
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jdt.core.dom.Expression;
-import org.eclipse.jdt.core.dom.StringLiteral;
-
-/**
- * Implementor for IStringValue
- *
- * @author Plamen Pavlov
- */
-public class StringValueImpl extends ValueImpl
-{
- private String value;
-
- /**
- * Constructor
- *
- * @param value
- */
- public StringValueImpl(String value)
- {
- this.value = value;
- }
-
- @Override
- protected Expression getExpression(CompilationUnit unit, AST ast)
- {
- StringLiteral literal = ast.newStringLiteral();
- literal.setLiteralValue(value);
- return literal;
- }
-
- @Override
- public int hashCode()
- {
- return value.hashCode();
- }
-
- @Override
- public boolean equals(Object obj)
- {
- if (this == obj)
- {
- return true;
- }
- if (obj == null)
- {
- return false;
- }
- if (getClass() != obj.getClass())
- {
- return false;
- }
- final StringValueImpl other = (StringValueImpl) obj;
- return value.equals(other.value);
- }
-
- @Override
- public String toString()
- {
- return value;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/internal/annotations/impl/ValueImpl.java b/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/internal/annotations/impl/ValueImpl.java
deleted file mode 100755
index 88c5715..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/internal/annotations/impl/ValueImpl.java
+++ /dev/null
@@ -1,144 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.utils.internal.annotations.impl;
-
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.jdt.core.dom.AST;
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jdt.core.dom.Expression;
-import org.eclipse.jdt.core.dom.ImportDeclaration;
-import org.eclipse.jdt.core.dom.Name;
-import org.eclipse.jdt.core.dom.QualifiedName;
-import org.eclipse.jdt.core.dom.SimpleName;
-import org.eclipse.jst.ws.jaxws.utils.annotations.ILocator;
-import org.eclipse.jst.ws.jaxws.utils.annotations.IValue;
-
-/**
- * @author Plamen Pavlov
- */
-
-public abstract class ValueImpl implements IValue
-{
- private ILocator locator = null;
-
- protected abstract Expression getExpression(CompilationUnit unit, AST ast);
-
-
- @SuppressWarnings("unchecked")
- protected boolean addImports(AST ast, CompilationUnit unit, String annotationName)
- {
- String packageAnnotationName = getPackageName(annotationName);
- if (packageAnnotationName == null)
- {
- return false;
- }
-
- if (packageAnnotationName.equals("java.lang")) //$NON-NLS-1$
- {
- return true;
- }
- if (unit != null)
- {
- ImportDeclaration imp = ast.newImportDeclaration();
- imp.setName(ast.newName(annotationName));
- List<ImportDeclaration> imports = unit.imports();
- String imp1 = getImport(imports, getSimpleName(annotationName));
- if (imp1 == null)
- {
- if (getOnDemandImport(imports, packageAnnotationName) == null)
- {
- imports.add(imp);
- }
- } else
- {
- if (!imp1.equals(annotationName))
- {
- return false;
- }
- }
- return true;
- }
-
- return false;
- }
-
- protected static String getImport(List<ImportDeclaration> imports, String imp)
- {
- Iterator<ImportDeclaration> iter = imports.iterator();
- while (iter.hasNext())
- {
- ImportDeclaration next = iter.next();
- Name fqName = next.getName();
- SimpleName name;
- if (fqName.isQualifiedName())
- {
- name = ((QualifiedName) fqName).getName();
- } else
- {
- name = (SimpleName) fqName;
- }
- String simpleName = name.getIdentifier();
- if (imp.equals(simpleName))
- {
- return fqName.getFullyQualifiedName();
- }
- }
- return null;
- }
-
- protected static String getOnDemandImport(List<ImportDeclaration> imports, String imp)
- {
- Iterator<ImportDeclaration> iter = imports.iterator();
- while (iter.hasNext())
- {
- ImportDeclaration next = iter.next();
- if (!next.isOnDemand())
- {
- continue;
- }
- Name fqName = next.getName();
- String name = fqName.getFullyQualifiedName();
- if (imp.equals(name))
- {
- return name;
- }
- }
- return null;
- }
-
- protected static String getPackageName(String name)
- {
- int i = name.lastIndexOf('.');
- if (i == -1)
- return null;
- return name.substring(0, i);
- }
-
- protected static String getSimpleName(String name)
- {
- int i = name.lastIndexOf('.');
- if (i == -1)
- return name;
- return name.substring(i + 1);
- }
-
- public ILocator getLocator()
- {
- return this.locator;
- }
-
- public void setLocator(final ILocator locator)
- {
- this.locator = locator;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/internal/plugin/JaxwsUtilsPlugin.java b/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/internal/plugin/JaxwsUtilsPlugin.java
deleted file mode 100755
index 44d3fa5..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/internal/plugin/JaxwsUtilsPlugin.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.utils.internal.plugin;
-
-import org.eclipse.core.runtime.Plugin;
-import org.eclipse.ui.IStartup;
-import org.osgi.framework.BundleContext;
-
-public class JaxwsUtilsPlugin extends Plugin implements IStartup
-{
- // The plug-in ID
- public static final String PLUGIN_ID = "org.eclipse.jst.ws.jaxws.utils";
-
- // The shared instance
- private static JaxwsUtilsPlugin plugin;
-
- /**
- * The constructor
- */
- public JaxwsUtilsPlugin() {
- }
-
- /*
- * (non-Javadoc)
- * @see org.eclipse.core.runtime.Plugins#start(org.osgi.framework.BundleContext)
- */
- public void start(BundleContext context) throws Exception {
- super.start(context);
- plugin = this;
-
- }
-
- /*
- * (non-Javadoc)
- * @see org.eclipse.core.runtime.Plugin#stop(org.osgi.framework.BundleContext)
- */
- public void stop(BundleContext context) throws Exception {
- plugin = null;
- super.stop(context);
- }
-
- /**
- * Returns the shared instance
- *
- * @return the shared instance
- */
- public static JaxwsUtilsPlugin getDefault() {
- return plugin;
- }
-
- public void earlyStartup()
- {
- // Nothing to do. However, this pugin has to start as early as possible since its services will be used for common logging
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/internal/text/JaxWsUtilMessages.java b/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/internal/text/JaxWsUtilMessages.java
deleted file mode 100755
index bd4d368..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/internal/text/JaxWsUtilMessages.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.utils.internal.text;
-
-import org.eclipse.osgi.util.NLS;
-
-public class JaxWsUtilMessages extends NLS
-{
- private static final String BUNDLE_NAME = "org.eclipse.jst.ws.jaxws.utils.internal.text.JaxWsUtilMessages"; //$NON-NLS-1$
-
-
- public static String CannotPerformEditMsg;
-
-
- public static String CompUnitMissingMsg;
-
-
- public static String InvalidTreeStateMsg;
-
-
- public static String AnnotationCannotBeStoredMsg;
-
-
- public static String AnnotationUtils_ParamShouldNotBeNullMsg;
-
- public static String EditResourcesManager_FILE_CONTENTS_CHANGE_FAILED_MSG;
-
- public static String ProjectManagementUtils_ProjectHasNoMetaInfFolderMsg;
-
- static
- {
- NLS.initializeMessages(BUNDLE_NAME, JaxWsUtilMessages.class);
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/internal/text/JaxWsUtilMessages.properties b/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/internal/text/JaxWsUtilMessages.properties
deleted file mode 100755
index 2dcfecd..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/internal/text/JaxWsUtilMessages.properties
+++ /dev/null
@@ -1,18 +0,0 @@
-###############################################################################
-# Copyright (c) 2009 by SAP AG, Walldorf.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# SAP AG - initial API and implementation
-###############################################################################
-CannotPerformEditMsg = Edit cannot be performed
-CompUnitMissingMsg = Compilation unit file missing
-InvalidTreeStateMsg = Invalid project tree state
-AnnotationCannotBeStoredMsg = Annotation could not be stored, the file is not writable
-AnnotationUtils_ParamShouldNotBeNullMsg = {0} should not be null
-
-EditResourcesManager_FILE_CONTENTS_CHANGE_FAILED_MSG = File contents could not be set
-ProjectManagementUtils_ProjectHasNoMetaInfFolderMsg = project {0} does not have a META-INF folder
diff --git a/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/logging/ILogger.java b/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/logging/ILogger.java
deleted file mode 100755
index e7f92fb..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/logging/ILogger.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.utils.logging;
-
-public interface ILogger
-{
- /**
- * Logs a message with severity error.
- *
- * @param message
- * message to be logged
- */
- public void logError(final String message);
-
- /**
- * Logs a message with severity error.
- *
- * @param message
- * message to be logged
- * @param cause
- * causing exception
- */
- public void logError(final String message, final Throwable cause);
-
- /**
- * Logs a message with severity warning.
- *
- * @param message
- * message to be logged
- */
- public void logWarn(final String message);
-
- /**
- * Logs a message with severity warning.
- *
- * @param message
- * message to be logged
- * @param cause
- * causing exception
- */
- public void logWarn(final String message, final Throwable cause);
-
- /**
- * Logs a message with severity debug.
- *
- * @param message
- * message to be logged
- */
- public void logDebug(final String message);
-
- /**
- * Logs a message with severity debug.
- *
- * @param message
- * message to be logged
- * @param cause
- * causing exception
- */
- public void logDebug(final String message, final Throwable cause);
-
-
- public boolean isDebug();
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/logging/Logger.java b/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/logging/Logger.java
deleted file mode 100755
index efad315..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/logging/Logger.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.utils.logging;
-
-import org.eclipse.core.runtime.ILog;
-import org.eclipse.jst.ws.jaxws.utils.StatusUtils;
-import org.eclipse.jst.ws.jaxws.utils.internal.plugin.JaxwsUtilsPlugin;
-
-public class Logger implements ILogger
-{
- public void logDebug(String message)
- {
-// log().log(StatusUtils.statusInfo(message));
- }
-
- public void logDebug(String message, Throwable cause)
- {
-// log().log(StatusUtils.statusInfo(message, cause));
- }
-
- public void logError(String message)
- {
- log().log(StatusUtils.statusError(message));
- }
-
- public void logError(String message, Throwable cause)
- {
- log().log(StatusUtils.statusError(message, cause));
- }
-
- public void logWarn(String message)
- {
- log().log(StatusUtils.statusWarning(message));
- }
-
- public void logWarn(String message, Throwable cause)
- {
- log().log(StatusUtils.statusWarning(message, cause));
- }
-
- private ILog log()
- {
- return JaxwsUtilsPlugin.getDefault().getLog();
- }
-
- public boolean isDebug()
- {
- // TODO Auto-generated method stub
- return false;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/operation/IOperationRunner.java b/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/operation/IOperationRunner.java
deleted file mode 100644
index 7f9f150..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/operation/IOperationRunner.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2011 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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.operation;
-
-import org.eclipse.jface.operation.IRunnableWithProgress;
-
-/**
- * Utility interface for running operations
- *
- * @author Danail Branekov
- */
-public interface IOperationRunner
-{
- /**
- * Runs the operation specified
- *
- * @param runnable
- * the operation to run
- */
- public void run(final IRunnableWithProgress runnable);
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/operation/OperationInJobRunner.java b/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/operation/OperationInJobRunner.java
deleted file mode 100644
index b7cbc4b..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/operation/OperationInJobRunner.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2011 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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.operation;
-
-import java.lang.reflect.InvocationTargetException;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.core.runtime.jobs.ISchedulingRule;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.jface.operation.IRunnableWithProgress;
-import org.eclipse.jst.ws.jaxws.utils.StatusUtils;
-import org.eclipse.jst.ws.jaxws.utils.logging.ILogger;
-import org.eclipse.jst.ws.jaxws.utils.logging.Logger;
-
-/**
- * Implementation of the {@link IOperationRunner} interface which runs the operation in a job which the supplied scheduling rule
- *
- * @author Danail Branekov
- */
-public class OperationInJobRunner implements IOperationRunner
-{
- private final String jobName;
- private final ISchedulingRule jobRule;
- private final ILogger logger;
-
- /**
- * Constructor
- *
- * @param jobName
- * the name of the job which performs the operation
- * @param jobRule
- * the scheduling rule of the job
- */
- public OperationInJobRunner(final String jobName, final ISchedulingRule jobRule)
- {
- this.jobName = jobName;
- this.jobRule = jobRule;
- this.logger = new Logger();
- }
-
- public void run(final IRunnableWithProgress runnable)
- {
- final Job job = new Job(jobName)
- {
- @Override
- protected IStatus run(IProgressMonitor monitor)
- {
- try
- {
- runnable.run(monitor);
- }
- catch (InvocationTargetException e)
- {
- logger.logError(e.getMessage(), e);
- return StatusUtils.statusError(e.getMessage(), e);
- }
- catch (InterruptedException e)
- {
- return Status.CANCEL_STATUS;
- }
- return Status.OK_STATUS;
- }
- };
- job.setRule(this.jobRule);
- job.schedule();
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/resources/EditResourcesManager.java b/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/resources/EditResourcesManager.java
deleted file mode 100755
index 26398a9..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/resources/EditResourcesManager.java
+++ /dev/null
@@ -1,207 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.utils.resources;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.ws.jaxws.utils.StatusUtils;
-import org.eclipse.jst.ws.jaxws.utils.internal.text.JaxWsUtilMessages;
-import org.eclipse.jst.ws.jaxws.utils.logging.ILogger;
-import org.eclipse.jst.ws.jaxws.utils.logging.Logger;
-
-/**
- * This is an utility class which is meant to provide common functionality to save and modify resources. It is a wrapper of the eclipse API and
- * workarounds some DTR issues. Until DTR colleagues fix their coding, this manager must be used on each file modification occasion
- *
- * @author Danail Branekov
- */
-public class EditResourcesManager
-{
- private static final ILogger logger = new Logger();
-
- /**
- * Sets editability of a file. In case the file specified is already writable, <code>Status.OK_STATUS</code> is returned
- *
- * @param file
- * The file to be set editable
- * @param context
- * either {@link IWorkspace#VALIDATE_PROMPT}, or the <code>org.eclipse.swt.widgets.Shell</code> that is to be used to parent any
- * dialogs with the user, or <code>null</code> if there is no UI context (declared as an <code>Object</code> to avoid any direct
- * references on the SWT component)
- * @return the status of the operation
- * @throws NullPointerException
- * when the file specified is null
- * @see IWorkspace#VALIDATE_PROMPT
- */
- public IStatus setFileEditable(IFile file, Object context)
- {
- if (file == null)
- {
- throw new NullPointerException("file"); //$NON-NLS-1$
- }
- if(!file.isReadOnly())
- {
- return Status.OK_STATUS;
- }
-
- IWorkspace workspace = file.getWorkspace();
- return workspace.validateEdit(new IFile[] { file }, context);
- }
-
- /**
- * Sets editablility of a file. This is a convenience method equivalent to invoking
- * <code>setFileEditable(file, IWorkspace.VALIDATE_PROMPT)</code>
- *
- * @param file
- * The file to be set editable
- * @return the status of the operation
- * @throws NullPointerException
- * when the file specified is null
- * @see EditResourcesManager#setFileEditable(IFile, Object)
- * @see IWorkspace#VALIDATE_PROMPT
- *
- */
- public IStatus setFileEditable(IFile file)
- {
- return setFileEditable(file, IWorkspace.VALIDATE_PROMPT);
- }
-
- /**
- * Sets editablility of an array of files. In case all files specified are already writable, <code>Status.OK_STATUS</code> is returned
- *
- * @param files
- * The array of files to be set editable
- * @param context
- * either {@link IWorkspace#VALIDATE_PROMPT}, or the <code>org.eclipse.swt.widgets.Shell</code> that is to be used to parent any
- * dialogs with the user, or <code>null</code> if there is no UI context (declared as an <code>Object</code> to avoid any direct
- * references on the SWT component)
- * @return the status of the operation
- * @throws IllegalArgumentException
- * when the array is empty or null
- */
- public IStatus setFilesEditable(IFile[] files, Object context)
- {
- if (files == null || files.length == 0)
- {
- throw new IllegalArgumentException("Array must not be empty nor null"); //$NON-NLS-1$
- }
- List<IFile> roFiles = new ArrayList<IFile>();
- for(IFile f : files)
- {
- if(f.isReadOnly())
- {
- roFiles.add(f);
- }
- }
-
- if(roFiles.size() == 0)
- {
- return Status.OK_STATUS;
- }
-
- IWorkspace workspace = roFiles.get(0).getWorkspace();
- return workspace.validateEdit(roFiles.toArray(new IFile[roFiles.size()]), context);
- }
-
- /**
- * Sets editablility of an array of files. This is a convenience method equivalent to invoking
- * <code>setFilesEditable(files, IWorkspace.VALIDATE_PROMPT)</code>
- *
- * @param files
- * The array of files to be set editable
- * @return the status of the operation
- * @throws IllegalArgumentException
- * when the array is empty or null
- * @see EditResourcesManager#setFilesEditable(IFile[], Object)
- */
- public IStatus setFilesEditable(IFile[] files)
- {
- return setFilesEditable(files, IWorkspace.VALIDATE_PROMPT);
- }
-
- /**
- * Sets the content of a file
- *
- * @param file
- * the file to be set
- * @param content
- * the content to be set
- * @param updateFlags
- * update flags.
- * @see IFile#setContents(java.io.InputStream, int, IProgressMonitor)
- * @param progressMonitor
- * a progress monitor, or <code>null</code> if progress reporting is not desired
- * @return status of the operation
- * @throws NullPointerException
- * when <code>file</code> or <code>content</code> is null
- */
- public IStatus setFileContents(IFile file, String content, int updateFlags, IProgressMonitor progressMonitor)
- {
- if (file == null)
- {
- throw new NullPointerException("file"); //$NON-NLS-1$
- }
-
- if (content == null)
- {
- throw new NullPointerException("content"); //$NON-NLS-1$
- }
-
- IStatus editStatus = setFileEditable(file);
- if (editStatus.getSeverity() != IStatus.OK)
- {
- // something went wrong with the validateEdit operation
- return editStatus;
- }
-
- try
- {
- file.setContents(new StringInputStreamAdapter(content), updateFlags, progressMonitor);
- return Status.OK_STATUS;
- } catch (CoreException e)
- {
- logger.logError(e.getMessage(), e);
- return StatusUtils.statusError(JaxWsUtilMessages.EditResourcesManager_FILE_CONTENTS_CHANGE_FAILED_MSG, e);
- }
- }
-
- /**
- * Sets the content of a file. This method is equivalent of invoking
- * <code>setFileContens(IFile file, String content, (keepHistory ? IFile.KEEP_HISTORY : IResource.NONE) | (force ? IFile.FORCE : IResource.NONE), IProgressMonitor monitor)</code>
- *
- * @param file
- * the file to be set
- * @param content
- * the content to be set
- * @param force
- * a flag controlling how to deal with resources that are not in sync with the local file system
- * @param keepHistory
- * a flag indicating whether or not store the current contents in the local history
- * @param monitor
- * a progress monitor, or <code>null</code> if progress reporting is not desired
- * @return status of the operation
- * @throws NullPointerException
- * when <code>file</code> or <code>content</code> is null
- * @see EditResourcesManager#setFileContents(IFile, String, int, IProgressMonitor)
- */
- public IStatus setFileContents(IFile file, String content, boolean force, boolean keepHistory, IProgressMonitor monitor)
- {
- return setFileContents(file, content, ((keepHistory ? IFile.KEEP_HISTORY : IResource.NONE) | (force ? IFile.FORCE : IResource.NONE)), monitor);
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/resources/FileUtils.java b/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/resources/FileUtils.java
deleted file mode 100755
index dddb3a1..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/resources/FileUtils.java
+++ /dev/null
@@ -1,438 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.utils.resources;
-
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.FileReader;
-import java.io.IOException;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jst.ws.jaxws.utils.ContractChecker;
-import org.eclipse.ui.IEditorDescriptor;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IEditorReference;
-import org.eclipse.ui.IEditorRegistry;
-import org.eclipse.ui.IFileEditorInput;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.PlatformUI;
-
-/**
- * Implementation for file utilities interface
- *
- * @author Danail Branekov
- *
- */
-public class FileUtils implements IFileUtils {
- private static IFileUtils utils = null;
- private static int index = 0;
-
- public FileUtils() {
- }
-
- /**
- * The factory method
- *
- * @return a FileUtils instance
- */
- public static IFileUtils getInstance() {
- if (utils == null) {
- utils = new FileUtils();
- }
-
- return utils;
- }
-
- public final List<IEditorPart> getEditorsByFileLocation(
- final String fileLocation) throws FileNotFoundException {
- List<ICompilationUnit> units = getCompilationUnits(fileLocation);
- Set<IEditorPart> editors = new HashSet<IEditorPart>();
- for (ICompilationUnit cu : units) {
- final IEditorDescriptor editorDescr = getEditorDescriptor(cu
- .getElementName());
- editors.addAll(getEditorsByCompilationUnit(editorDescr,
- getActiveWorkbenchPage(), cu));
-
- }
-
- return Arrays.asList(editors.toArray(new IEditorPart[editors.size()]));
- }
-
- public final List<ICompilationUnit> getCompilationUnits(
- final String fileLocation) throws FileNotFoundException {
- if (fileLocation == null) {
- throw new NullPointerException("fileLocation"); //$NON-NLS-1$
- }
-
- IFile[] filesFound = ResourcesPlugin.getWorkspace().getRoot()
- .findFilesForLocationURI(new File(fileLocation).toURI());
- if (filesFound == null || filesFound.length == 0) {
- throw new FileNotFoundException("File: " + fileLocation + " does not exist"); //$NON-NLS-1$ //$NON-NLS-2$
- }
-
- List<ICompilationUnit> units = new ArrayList<ICompilationUnit>();
-
- for (IFile file : filesFound) {
- IJavaElement javaElement = JavaCore.create(file);
- if (!(javaElement instanceof ICompilationUnit)) {
- throw new IllegalStateException("File: " + fileLocation + " is not a compilation unit"); //$NON-NLS-1$ //$NON-NLS-2$
- }
-
- units.add((ICompilationUnit) javaElement);
- }
-
- return units;
- }
-
- public IProject getProjectUnit(String fileLocation)
- throws FileNotFoundException {
-
- if (fileLocation == null)
- {
- throw new NullPointerException("fileLocation"); //$NON-NLS-1$
- }
-
- IFile file = getFileForLocation(new Path(fileLocation));
- if (file == null)
- {
- throw new FileNotFoundException("File: " + fileLocation + " does not exist"); //$NON-NLS-1$ //$NON-NLS-2$
- }
-
- return file.getProject();
- }
-
- public final boolean isFileDisplayedInDirtyEditor(final String fileLocation)
- throws FileNotFoundException {
- return isFileDisplayedInDirtyEditor(getEditorsByFileLocation(fileLocation));
- }
-
- public boolean isCompilationUnitDisplayedInDirtyEditor(
- final ICompilationUnit unit) {
- return isFileDisplayedInDirtyEditor(getEditorsByCompilationUnit(unit));
- }
-
- public final void saveEditor(String fileLocation)
- throws FileNotFoundException {
- saveEditor(fileLocation, new NullProgressMonitor());
- }
-
- public void saveEditor(final String fileLocation,
- final IProgressMonitor monitor) throws FileNotFoundException {
- List<IEditorPart> editors = getEditorsByFileLocation(fileLocation);
- if (editors.size() == 0) {
- throw new IllegalStateException("The file is not displayed by an editor"); //$NON-NLS-1$
- }
-
- saveEditors(editors, monitor);
- }
-
- public void saveEditor(final ICompilationUnit cu,
- final IProgressMonitor monitor) {
- List<IEditorPart> editors = getEditorsByCompilationUnit(cu);
- if (editors.size() == 0) {
- throw new IllegalStateException("The file is not displayed by an editor"); //$NON-NLS-1$
- }
-
- saveEditors(editors, monitor);
- }
-
- public void saveEditor(final ICompilationUnit cu) {
- List<IEditorPart> editors = getEditorsByCompilationUnit(cu);
- if (editors.size() == 0) {
- throw new IllegalStateException("The file is not displayed by an editor"); //$NON-NLS-1$
- }
-
- saveEditors(editors, new NullProgressMonitor());
- }
-
- private void saveEditors(final List<IEditorPart> editors,
- final IProgressMonitor monitor) {
- for (IEditorPart e : editors) {
- if (e.isDirty()) {
- e.doSave(monitor);
- }
- }
- }
-
- public Collection<IEditorPart> getDirtyEditors() {
- final Set<IEditorInput> inputs = new HashSet<IEditorInput>();
- final Collection<IEditorPart> result = new ArrayList<IEditorPart>();
- final IWorkbench workbench = PlatformUI.getWorkbench();
- final IWorkbenchWindow[] windows = workbench.getWorkbenchWindows();
- for (int i = 0; i < windows.length; i++) {
- final IWorkbenchPage[] pages = windows[i].getPages();
- for (int x = 0; x < pages.length; x++) {
- final IEditorPart[] editors = pages[x].getDirtyEditors();
- for (int z = 0; z < editors.length; z++) {
- final IEditorPart ep = editors[z];
- final IEditorInput input = ep.getEditorInput();
- if (!inputs.contains(input)) {
- inputs.add(input);
- result.add(ep);
- }
- }
- }
- }
- return result;
- }
-
- private IEditorDescriptor getEditorDescriptor(String fileName) {
- IEditorRegistry editorRegistry = PlatformUI.getWorkbench()
- .getEditorRegistry();
- return editorRegistry.getDefaultEditor(fileName);
- }
-
- /**
- * Converts a String to a URL, assuming 'file:' as a default scheme.
- *
- * @param base
- * @param path
- *
- * @return
- *
- * @throws NullPointerException,
- * if the String is neither a valid URL, nor a valid filename.
- *
- */
- public final URL fileOrURLToURL(final URL base, final String path)
- throws IOException {
- if (path == null) {
- throw new NullPointerException("path"); //$NON-NLS-1$
- }
-
- String localPath = path;
- URL localBase = base;
-
- if (localBase == null) {
- localBase = new URL("file:");//$NON-NLS-1$
- }
-
- localPath = localPath.replace('\\', '/');
- try {
- String protocol = localBase.getProtocol();
- if (!"http".equals(protocol) //$NON-NLS-1$
- && !"https".equals(protocol) //$NON-NLS-1$
- && (localPath.charAt(1) == ':'
- || localPath.charAt(0) == '/' || localPath
- .charAt(0) == '\\')) {
- localPath = (new File(localPath)).toURI().toURL().toExternalForm();
- }
- } catch (IndexOutOfBoundsException e) {
- // $JL-EXC$
- }
-
- if (localPath.startsWith("file:") && localPath.length() > 5 //$NON-NLS-1$
- && localPath.charAt(5) != '/') {
- localPath = "file:/".concat(localPath.substring(5)); //$NON-NLS-1$
- } else {
- if (localPath.startsWith("file://") //$NON-NLS-1$
- && !localPath.startsWith("file:////") //$NON-NLS-1$
- && !localPath.startsWith("file://localhost/")) { //$NON-NLS-1$
- localPath = "file:////".concat(localPath.substring("file://" //$NON-NLS-1$ //$NON-NLS-2$
- .length()));
- }
- }
- URL url = new URL(localBase, localPath);
- return url;
- }
-
- public File createTempDirectory() {
- String tempDir = System.getProperty("java.io.tmpdir"); //$NON-NLS-1$
- index++;
- File temp1 = new File(tempDir, Integer.toString(this.hashCode()) + "_" //$NON-NLS-1$
- + index);
- temp1.mkdir();
- return temp1;
- }
-
- public void deleteDirectory(final File directory) {
- if (directory == null) {
- return;
- }
- if (!directory.exists()) {
- return;
- }
- for (File f : directory.listFiles()) {
- f.delete();
- }
- directory.delete();
- }
-
- public IFile[] getFilesByExtension(IProject project, String extension)
- throws CoreException {
- ContractChecker.nullCheckParam(extension, "extension"); //$NON-NLS-1$
- ArrayList<IFile> foundFiles = new ArrayList<IFile>();
-
- getFilesByExtension(foundFiles, project.members(), extension);
-
- return foundFiles.toArray(new IFile[foundFiles.size()]);
- }
-
- private void getFilesByExtension(ArrayList<IFile> foundFiles,
- IResource[] currentResources, String extension)
- throws CoreException {
- for (int ii = 0; ii < currentResources.length; ii++) {
- if (currentResources[ii].getType() == IResource.FOLDER) {
- getFilesByExtension(foundFiles,
- ((IFolder) currentResources[ii]).members(), extension);
- } else if (currentResources[ii].getType() == IResource.FILE
- && extension
- .equals(currentResources[ii].getFileExtension())) {
- foundFiles.add((IFile) currentResources[ii]);
- }
- }
- }
-
- public IFile getFileForLocation(IPath location) {
- return ResourcesPlugin.getWorkspace().getRoot().getFileForLocation(
- location);
- }
-
- private IWorkbenchPage getActiveWorkbenchPage() {
- if (PlatformUI.getWorkbench().getActiveWorkbenchWindow() == null) {
- return null;
- }
-
- return PlatformUI.getWorkbench().getActiveWorkbenchWindow()
- .getActivePage();
- }
-
- public List<IEditorPart> getEditorsByCompilationUnit(
- final ICompilationUnit cu) {
- ContractChecker.nullCheckParam(cu, "cu"); //$NON-NLS-1$
- final IEditorDescriptor editorDescr = getEditorDescriptor(cu
- .getElementName());
- final IWorkbenchPage wbPage = getActiveWorkbenchPage();
- if (wbPage == null) {
- return new ArrayList<IEditorPart>(0);
- }
-
- return getEditorsByCompilationUnit(editorDescr, wbPage, cu);
- }
-
- private List<IEditorPart> getEditorsByCompilationUnit(
- final IEditorDescriptor editorDescriptor,
- final IWorkbenchPage page, final ICompilationUnit cu) {
- List<IEditorPart> editorPartReturned = new ArrayList<IEditorPart>();
-
- if (editorDescriptor != null && page != null) {
- for (IEditorReference editorReferece : page.getEditorReferences()) {
- IEditorPart editorPart = editorReferece.getEditor(true);
- if (isEditorApplicableForCu(editorPart, cu)) {
- editorPartReturned.add(editorPart);
- }
- }
- }
-
- return editorPartReturned;
- }
-
- private boolean isEditorApplicableForCu(final IEditorPart editor,
- final ICompilationUnit cu) {
- if (editor == null) {
- return false;
- }
-
- if (!(editor.getEditorInput() instanceof IFileEditorInput)
- || !(cu.getResource() instanceof IFile)) {
- return false;
- }
-
- final IFile cuFile = (IFile) cu.getResource();
- final IFileEditorInput editorInput = (IFileEditorInput) editor
- .getEditorInput();
-
- return cuFile.equals(editorInput.getFile());
- }
-
- public final boolean isFileDisplayedInDirtyEditor(
- final List<IEditorPart> displayingEditors) {
- ContractChecker.nullCheckParam(displayingEditors, "displayingEditors"); //$NON-NLS-1$
- for (IEditorPart editor : displayingEditors) {
- if (editor.isDirty()) {
- return true;
- }
- }
-
- return false;
- }
-
- /**
- * Reads file content as text and returns {@link String}
- *
- * @param sourceFile
- * @return the content of file
- * @throws IOException
- */
- public String getFileContent(final File sourceFile) throws IOException {
- final FileReader fr = new FileReader(sourceFile);
- final StringBuilder builder = new StringBuilder();
-
- try {
- final char[] buff = new char[1024];
- for (int cnt = 0; (cnt = fr.read(buff)) > -1;) {
- builder.append(buff, 0, cnt);
- }
- } finally {
- fr.close();
- }
-
- return builder.toString();
- }
-
- public void setCompilationUnitContent(final ICompilationUnit unit,
- final String content, final boolean force,
- final IProgressMonitor monitor) throws JavaModelException {
- ContractChecker.nullCheckParam(unit, "unit"); //$NON-NLS-1$
- ContractChecker.nullCheckParam(content, "content"); //$NON-NLS-1$
-
- unit.becomeWorkingCopy(monitor);
- try {
- unit.getBuffer().setContents(content);
- unit.commitWorkingCopy(force, monitor);
- } finally {
- unit.discardWorkingCopy();
- }
- }
-
- public void setCompilationUnitContentAndSaveDirtyEditors(
- final ICompilationUnit unit, final String content,
- final boolean force, final IProgressMonitor monitor)
- throws JavaModelException {
- setCompilationUnitContent(unit, content, force, monitor);
- if (isCompilationUnitDisplayedInDirtyEditor(unit)) {
- saveEditor(unit);
- }
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/resources/IFileUtils.java b/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/resources/IFileUtils.java
deleted file mode 100755
index 0fdfa06..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/resources/IFileUtils.java
+++ /dev/null
@@ -1,310 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.utils.resources;
-
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.net.URL;
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.ui.IEditorPart;
-
-/**
- * Interface that defines common utilies for file manipulation
- *
- * @author Danail Branekov
- */
-public interface IFileUtils {
-
- /**
- * Retrieves the editors that are currently displaying the file specfied.
- *
- * @param fileLocation
- * Absolute path to the file
- * @see IResource#getLocation().toOSString()
- * @return Current opened editors of the file specified or an empty list if such are not opened
- * @throws FileNotFoundException
- * when the file does not exist
- */
- public abstract List<IEditorPart> getEditorsByFileLocation(
- final String fileLocation) throws FileNotFoundException;
-
- /**
- * Determines whether the file specified is displayed within an editor which
- * has a dirty state.
- *
- * @param fileLocation
- * Absolute path to the file
- * @see IResource#getLocation().toOSString()
- * @return whether the file is dirty
- * @throws FileNotFoundException
- * when the location specified does not exist
- */
- public abstract boolean isFileDisplayedInDirtyEditor(
- final String fileLocation) throws FileNotFoundException;
-
- /**
- * Saves the dirty state editor
- *
- * @param fileLocation
- * Absolute path to the file
- * @see IResource#getLocation()#toOSString()
- * @throws FileNotFoundException
- * when the location specified does not exis
- * @throws IllegalStateException
- * when the file is not displayed by an editor
- */
- public abstract void saveEditor(String fileLocation)
- throws FileNotFoundException;
-
- /**
- * Saves the dirty state editor
- *
- * @param fileLocation
- * Absolute path to the file
- * @see IResource#getLocation()#toOSString()
- * @param monitor
- * Progress monitor
- * @throws FileNotFoundException
- * when the location specified does not exis
- * @throws IllegalStateException
- * when the file is not displayed by an editor
- */
- public abstract void saveEditor(String fileLocation,
- IProgressMonitor monitor) throws FileNotFoundException;
-
- /**
- * Retrieves a list of dirty editors
- *
- * @return collection containing dirty editors
- */
- public abstract Collection<IEditorPart> getDirtyEditors();
-
- /**
- * Retrieve compilation units for the location specified
- *
- * @param fileLocation
- * The absolute path to the file, e.g.
- * <code>C:\\dir1\\dir2\\file.name</code>
- * @see IResource#getLocation()#toOSString()
- *
- * @throws FileNotFoundException
- * when the file specified cannot be found in the workspace
- * @throws IllegalStateException
- * when the file specified is not a compilation unit
- * @throws NullPointerException
- * when fileLocation is null
- * @return The compilation units; cannot be null
- */
- public abstract List<ICompilationUnit> getCompilationUnits(
- final String fileLocation) throws FileNotFoundException;
-
- /**
- * Retrieve project unit for the location specified
- *
- * @param fileLocation
- * The absolute path to the file, e.g.
- * <code>C:\\dir1\\dir2\\file.name</code>
- * @see IResource#getLocation()#toOSString()
- *
- * @throws FileNotFoundException
- * when the file specified cannot be found in the workspace
- * @throws NullPointerException
- * when fileLocation is null
- * @return The compilation units; cannot be null
- */
- public abstract IProject getProjectUnit(
- final String fileLocation) throws FileNotFoundException;
-
- /**
- * Converts a String to a URL, assuming 'file:' as a default scheme.
- *
- * @param base
- * @param path
- *
- * @return
- *
- * @throws NullPointerException,
- * if the String is neither a valid URL, nor a valid filename.
- *
- */
- public abstract URL fileOrURLToURL(final URL base, final String path)
- throws IOException;
-
- /**
- * Creates a new directory in the OS temp folder
- *
- * @return the directory
- */
- public File createTempDirectory();
-
- /**
- * Deletes the specified directory and all its content
- *
- * param directory
- */
- public void deleteDirectory(final File directory);
-
- /**
- * Gets all the files with the provided extension within a project.
- *
- * @param project -
- * to be searched
- * @param extension -
- * types of files of interest
- */
- public IFile[] getFilesByExtension(IProject project, String extension)
- throws CoreException;
-
- /**
- * Retrieves a list of editors that are currently displaying the compilation
- * unit specified.
- *
- * @param cu
- * the compilation unit; must not be null
- * @return Current editors list or an empty list in case there are not
- * editors displaying the file specified
- *
- * @throws NullPointerException
- * when the <code>cu</code> parameter is null
- */
- public abstract List<IEditorPart> getEditorsByCompilationUnit(
- final ICompilationUnit cu);
-
- /**
- * Determines whether the compilation unit specified is displayed within an
- * editor which has a dirty state.
- *
- * @param unit
- * The compilation unit
- *
- * @return whether the compilation unit is dirty
- */
- public abstract boolean isCompilationUnitDisplayedInDirtyEditor(
- final ICompilationUnit unit);
-
- /**
- * Saves all the dirty state editors that are currently displaying the
- * compilation unit specified
- *
- * @param cu
- * the compilation unit
- * @param monitor
- * Progress monitor
- * @throws FileNotFoundException
- * when the location specified does not exist
- * @throws IllegalStateException
- * when the file is not displayed by an editor
- */
- public abstract void saveEditor(ICompilationUnit cu,
- IProgressMonitor monitor);
-
- /**
- * Saves all the dirty state editors that are currently displaying the
- * compilation unit specified
- *
- * @param cu
- * the compilation unit
- * @throws FileNotFoundException
- * when the location specified does not exist
- * @throws IllegalStateException
- * when the file is not displayed by an editor
- */
- public abstract void saveEditor(ICompilationUnit cu);
-
- /**
- * Retrieve a file instance for the location specified. This method is a
- * convenience method equivalent to invoking
- * <code>ResourcesPlugin.getWorkspace().getRoot().getFileForLocation(location)</code>
- *
- * @param location
- * the file location; must be absolute
- * @return the corresponding file in the workspace, or null if none
- * @see IWorkspaceRoot#getFileForLocation(IPath)
- */
- public IFile getFileForLocation(IPath location);
-
- /**
- * Reads file content as text and returns {@link String}
- *
- * @param sourceFile
- * @return the content of file
- * @throws IOException
- */
- public String getFileContent(final File sourceFile) throws IOException;
-
- /**
- * Sets the content of the compilation unit specified with the
- * <code>content</code> provided. There is no validation of the content
- *
- * @param cUnit
- * the compilation unit. Must not be null. If the compilation
- * unit does not exist, it will be created
- * @param content
- * the content to be set. Must not be null
- * @param force
- * a flag to handle the cases when the contents of the original
- * resource have changed since this working copy was created
- * @param monitor
- * the monitor to report progress to or null if no progress
- * monitoring is required
- *
- * @throws JavaModelException
- * when there is a problem with setting compilation unit content
- * @see ICompilationUnit#becomeWorkingCopy(IProgressMonitor)
- * @see ICompilationUnit#commitWorkingCopy(boolean, IProgressMonitor)
- * @see ICompilationUnit#discardWorkingCopy()
- */
- public void setCompilationUnitContent(ICompilationUnit cUnit,
- String content, boolean force, IProgressMonitor monitor)
- throws JavaModelException;
-
- /**
- * Sets the content of the compilation unit specified with the
- * <code>content</code> provided and saves the dirty editors if any which
- * display the compilation unit. There is no validation of the content
- *
- * @param cUnit
- * the compilation unit. Must not be null. If the compilation
- * unit does not exist, it will be created
- * @param content
- * the content to be set. Must not be null
- * @param force
- * a flag to handle the cases when the contents of the original
- * resource have changed since this working copy was created
- * @param monitor
- * the monitor to report progress to or null if no progress
- * monitoring is required
- *
- * @throws JavaModelException
- * when there is a problem with setting compilation unit content
- * @see ICompilationUnit#becomeWorkingCopy(IProgressMonitor)
- * @see ICompilationUnit#commitWorkingCopy(boolean, IProgressMonitor)
- * @see ICompilationUnit#discardWorkingCopy()
- * @see IFileUtils#setCompilationUnitContent(ICompilationUnit, String,
- * boolean, IProgressMonitor)
- * @see IFileUtils#isFileDisplayedInDirtyEditor(String)
- * @see IFileUtils#saveEditor(ICompilationUnit, IProgressMonitor)
- */
- public void setCompilationUnitContentAndSaveDirtyEditors(
- ICompilationUnit cUnit, String content, boolean force,
- IProgressMonitor monitor) throws JavaModelException;
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/resources/ProjectManagementUtils.java b/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/resources/ProjectManagementUtils.java
deleted file mode 100755
index 8f880a3..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/resources/ProjectManagementUtils.java
+++ /dev/null
@@ -1,257 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.utils.resources;
-
-import java.text.MessageFormat;
-
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IPackageFragment;
-import org.eclipse.jdt.core.IPackageFragmentRoot;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jst.ws.jaxws.utils.exception.MissingResourceException;
-import org.eclipse.jst.ws.jaxws.utils.facets.FacetUtils;
-import org.eclipse.jst.ws.jaxws.utils.facets.IFacetUtils;
-import org.eclipse.jst.ws.jaxws.utils.internal.text.JaxWsUtilMessages;
-import org.eclipse.jst.ws.jaxws.utils.logging.ILogger;
-import org.eclipse.jst.ws.jaxws.utils.logging.Logger;
-
-
-/**
- * Utility that provides useful project management services
- *
- * @author Joerg Dehmel
- * @author Danail Branekov
- */
-public final class ProjectManagementUtils
-{
- private static final ILogger logger = new Logger();
-
- /**
- * Provides the meta-inf folder of a EJB project.
- *
- * @param pProjectName
- * project name
- * @return the resource of the meta-inf folder
- * @throws IllegalArgumentException
- * when project name specified is <code>null</code>, empty string, the project does not exist or is not accessible, or the project
- * is not an ejb project
- * @throws MissingResourceException
- * either the project doesn't exist in the workspace or it doesn't contain a meta-inf folder
- * @throws RuntimeException
- * when error occured while accessing java model
- */
- public static IFolder findMetaInfFolder(final String pProjectName) throws MissingResourceException
- {
- final String metaInfName = "META-INF"; //$NON-NLS-1$
- final String ejbModuleName = "ejbModule"; //$NON-NLS-1$
-
- if (!isEjb3Project(pProjectName))
- {
- throw new IllegalArgumentException("Project " + pProjectName + " is not an EJB project"); //$NON-NLS-1$ //$NON-NLS-2$
- }
-
- IProject project = getProjectByName(pProjectName);
- IJavaProject javaProject = getJavaProject(project);
- IPackageFragment ejbModulePkgFragment = null;
-
- try
- {
- for (IPackageFragmentRoot fragmentRoot : javaProject.getPackageFragmentRoots())
- {
- if (fragmentRoot.getKind() == IPackageFragmentRoot.K_SOURCE && fragmentRoot.getElementName().equals(ejbModuleName))
- {
- ejbModulePkgFragment = fragmentRoot.getPackageFragment(metaInfName);
- }
- }
-
- verifyMetaInfFolder(ejbModulePkgFragment, pProjectName);
- return (IFolder) ejbModulePkgFragment.getCorrespondingResource();
- } catch (JavaModelException e)
- {
- logger.logError(e.getMessage(), e);
- throw new RuntimeException(e.getMessage(), e);
- }
- }
-
- private static void verifyMetaInfFolder(IPackageFragment fragment, String projectName) throws MissingResourceException
- {
- if (fragment == null)
- {
- final String msg = MessageFormat.format("project {0} does not have a META-INF folder", new Object[] { projectName }); //$NON-NLS-1$
- final String localizedMsg = MessageFormat.format(JaxWsUtilMessages.ProjectManagementUtils_ProjectHasNoMetaInfFolderMsg, new Object[] { projectName });
- throw new MissingResourceException(msg, localizedMsg);
- }
-
- try
- {
- IResource resource = fragment.getCorrespondingResource();
- // should not happen!
- if (!(resource instanceof IFolder))
- {
- throw new RuntimeException("Resource " + resource.getName() + " is not a folder"); //$NON-NLS-1$ //$NON-NLS-2$
- }
- } catch (JavaModelException e)
- {
- logger.logError(e.getMessage(), e);
- throw new RuntimeException(e.getMessage(), e);
- }
- }
-
- /**
- * Check whether a project is an ejb 3 project
- *
- * @param projectName
- * the name of the project; cannot be <code>null</code> or empty string
- * @return true in case the project specified is a ejb 3 project; false otherwise
- * @throws IllegalArgumentException
- * when the project name specified is <code>null</code>, empty string
- * @throws IllegalStateException
- * when the project does not exist or is not accessible
- * @throws RuntimeException
- * when an error occurred while accessing the project metadata
- */
- public static boolean isEjb3Project(final String projectName)
- {
- IProject project = getProjectByName(projectName);
-
- try
- {
- return facetUtils().hasFacetWithVersion(project, IFacetUtils.EJB_30_FACET_VERSION, IFacetUtils.EJB_30_FACET_ID, true);
- } catch (CoreException e)
- {
- logger.logError(e.getMessage(), e);
- throw new RuntimeException(e.getMessage(), e);
- }
- }
-
- /**
- * Check whether a project is an web 2.5 project
- *
- * @param projectName
- * the name of the project; cannot be <code>null</code> or empty string
- * @return true in case the project specified is a web 2.5 project; false otherwise
- * @throws IllegalArgumentException
- * when the project name specified is <code>null</code>, empty string
- * @throws IllegalStateException
- * when the project does not exist or is not accessible
- * @throws RuntimeException
- * when an error occurred while accessing the project metadata
- */
- public static boolean isWeb25Project(final String projectName)
- {
- IProject project = getProjectByName(projectName);
-
- try
- {
- return facetUtils().hasFacetWithVersion(project, IFacetUtils.WEB_25_FACET_VERSION, IFacetUtils.WEB_25_FACET_ID, true);
- } catch (CoreException e)
- {
- logger.logError(e.getMessage(), e);
- throw new RuntimeException(e.getMessage(), e);
- }
- }
-
- /**
- * Retrieve the project instance by project name
- *
- * @param projectName
- * the project name
- * @return the project instance
- * @throws IllegalArgumentException
- * when the project name specified is null or empty string
- * @throws IllegalStateException
- * when the project does not exist or is not accessible
- *
- */
- public static IProject getProjectByName(String projectName)
- {
- if (projectName == null || projectName.length() == 0)
- {
- throw new IllegalArgumentException("Illegal project name: " + projectName); //$NON-NLS-1$
- }
-
- IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(projectName);
- if (project == null || !project.isAccessible())
- {
- throw new IllegalStateException("Project is not accessible"); //$NON-NLS-1$
- }
-
- return project;
- }
-
- /**
- * Get the java project instance
- *
- * @param project
- * the project as eclipse resource
- * @return the java project instance
- * @throws IllegalArgumentException
- * when <code>project</code> null or the project is not accessible
- */
- public static IJavaProject getJavaProject(IProject project)
- {
- if (project == null || !project.isAccessible())
- {
- throw new IllegalArgumentException("Project is not accessible"); //$NON-NLS-1$
- }
- return JavaCore.create(project);
- }
-
- /**
- * Refresh the resource specified. Refresh depth used is zero
- * @param resource the resource to be refreshed
- * @throws CoreException
- * @see IResource#DEPTH_ZERO
- */
- public static void refreshResource(IResource resource) throws CoreException
- {
- if(resource == null)
- {
- throw new NullPointerException("resource"); //$NON-NLS-1$
- }
-
- resource.refreshLocal(IResource.DEPTH_ZERO, null);
- }
-
- /**
- * Refreshes the project the resource specified belongs to. Refresh depth used is infinite.
- * @param the resource which project is to be refreshed
- * @throws CoreException
- * @throws IllegalArgumentException when the resource specified is a workspace root
- * @see IResource#DEPTH_INFINITE
- */
- public static void refreshProjectByResource(IResource resource) throws CoreException
- {
- if(resource == null)
- {
- throw new NullPointerException("resource"); //$NON-NLS-1$
- }
-
- if(resource instanceof IWorkspaceRoot)
- {
- throw new IllegalArgumentException("Operation is not defined for workspace roots"); //$NON-NLS-1$
- }
-
- resource.getProject().refreshLocal(IResource.DEPTH_INFINITE, null);
- }
-
- private static IFacetUtils facetUtils()
- {
- return new FacetUtils();
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/resources/StringInputStreamAdapter.java b/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/resources/StringInputStreamAdapter.java
deleted file mode 100755
index c0c9629..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.utils/src/org/eclipse/jst/ws/jaxws/utils/resources/StringInputStreamAdapter.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.jaxws.utils.resources;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.StringReader;
-
-/**
- * Adapter class that uses a StringReader to organize an InputStream
- *
- * @author Danail Branekov
- *
- */
-public class StringInputStreamAdapter extends InputStream
-{
- private StringReader reader;
-
- /**
- * Constructor
- *
- * @param string
- * @throws NullPointerException
- * when <code>string</code> is null
- */
- public StringInputStreamAdapter(String string)
- {
- if (string == null)
- {
- throw new NullPointerException("string"); //$NON-NLS-1$
- }
-
- reader = new StringReader(string);
- }
-
- @Override
- public int read() throws IOException
- {
- return reader.read();
- }
-
-}
diff --git a/docs/org.eclipse.jst.ws.cxf.doc.user/.project b/docs/org.eclipse.jst.ws.cxf.doc.user/.project
deleted file mode 100755
index 9c59a3c..0000000
--- a/docs/org.eclipse.jst.ws.cxf.doc.user/.project
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.jst.ws.cxf.doc.user</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.PluginNature</nature>
- </natures>
-</projectDescription>
diff --git a/docs/org.eclipse.jst.ws.cxf.doc.user/META-INF/MANIFEST.MF b/docs/org.eclipse.jst.ws.cxf.doc.user/META-INF/MANIFEST.MF
deleted file mode 100755
index 603287d..0000000
--- a/docs/org.eclipse.jst.ws.cxf.doc.user/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,9 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Localization: plugin
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.jst.ws.cxf.doc.user;singleton:=true
-Bundle-Version: 1.0.100.qualifier
-Bundle-Vendor: %pluginProvider
-Require-Bundle: org.eclipse.ui;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.ui.cheatsheets;bundle-version="[3.3.100,4.0.0)"
diff --git a/docs/org.eclipse.jst.ws.cxf.doc.user/about.html b/docs/org.eclipse.jst.ws.cxf.doc.user/about.html
deleted file mode 100755
index 4d690f1..0000000
--- a/docs/org.eclipse.jst.ws.cxf.doc.user/about.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
-<title>About</title>
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
-
-<p>September 06, 2009</p>
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;). Unless otherwise
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;). 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, &quot;Program&quot; 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 (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content. Check the Redistributor's license that was
-provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
-
-</body>
-</html>
diff --git a/docs/org.eclipse.jst.ws.cxf.doc.user/book.css b/docs/org.eclipse.jst.ws.cxf.doc.user/book.css
deleted file mode 100755
index d7e2b57..0000000
--- a/docs/org.eclipse.jst.ws.cxf.doc.user/book.css
+++ /dev/null
@@ -1,22 +0,0 @@
-@import "../PRODUCT_PLUGIN/book.css";
-
-span.control {
- font-weight: bold;
-}
-
-span.name {
- font-style: italic;
-}
-
-span.code {
- font-family: monospace;
-}
-
-p.nav_footer {
- font-weight: bold;
-}
-
-p.nav_footer a {
- font-weight: bold;
- font-style: italic;
-}
diff --git a/docs/org.eclipse.jst.ws.cxf.doc.user/build.properties b/docs/org.eclipse.jst.ws.cxf.doc.user/build.properties
deleted file mode 100755
index aca4ea6..0000000
--- a/docs/org.eclipse.jst.ws.cxf.doc.user/build.properties
+++ /dev/null
@@ -1,15 +0,0 @@
-bin.includes = META-INF/,\
- plugin.xml,\
- about.html,\
- book.css,\
- cheatsheets/,\
- gettingstarted/,\
- images/,\
- plugin.properties,\
- tasks/,\
- tocgettingstarted.xml,\
- toctasks.xml,\
- build.properties,\
- reference/,\
- legal.html,\
- tocreference.xml
diff --git a/docs/org.eclipse.jst.ws.cxf.doc.user/cheatsheets/bottomUp-cxf-composite.xml b/docs/org.eclipse.jst.ws.cxf.doc.user/cheatsheets/bottomUp-cxf-composite.xml
deleted file mode 100755
index babe139..0000000
--- a/docs/org.eclipse.jst.ws.cxf.doc.user/cheatsheets/bottomUp-cxf-composite.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<compositeCheatsheet name="Creating a Web service from a Java implementation bean using Apache CXF">
- <taskGroup kind="set" name="Creating a Web service from a Java implementation bean using Apache CXF" skip="false">
- <intro>
- This cheat sheet will guide you through the individual steps to setup the Apache CXF runtime, create an Apache Tomcat server, a Dynamic Web Project enabled for Apache CXF Web services development and create a JAX-WS Web service from a Java implementation bean, deploy it to Apache Tomcat and test it using the Web Services Explorer.
- <br/>
- <br/>
-To assist you along the way, wizards and commands will be available for you to launch automatically.
- </intro>
- <onCompletion>
- Congratulations! You just configured the Apache CXF runtime, created an Apache Tomcat server, a Dynamic Web Project enabled for Apache CXF Web services developemnt and a JAX-WS Web service from a Java implementation bean and then deployed that service to Apache Tomcat and tested it with the Web Services Explorer.
- </onCompletion>
- <task kind="cheatsheet" name="Install and configure the Apache CXF Runtime" skip="true">
- <intro>
- This cheat sheet will demonstrate how to install and configure the Apache CXF runtime in the workbench.
-<br/>
-<br/>
-If you have already installed and configured the Apache CXF runtime in the workbench you may skip this task by clicking the &quot;Skip this task&quot; button.
- </intro>
- <onCompletion>
- Congratulations! You just installed and configured the Apache CXF runtime!
- </onCompletion>
- <param name="path" value="configure-cxf-runtime.xml">
- </param>
- </task>
- <task kind="cheatsheet" name="Install and create an Apache Tomcat server" skip="true">
- <intro>
- This cheat sheet will demonstrate how to install and create an Apache Tomcat server.
-<br/>
-<br/>
-If you have already installed and created an Apache Tomcat server you may skip this task by clicking the &quot;Skip this task&quot; button.
- </intro>
- <onCompletion>
- Congratulations! You just installed and created an Apache Tomcat server!
- </onCompletion>
- <param name="path" value="create-tomcat-server.xml">
- </param>
- </task>
- <task kind="cheatsheet" name="Create a project for CXF Web services" skip="true">
- <intro>
- This cheat sheet will demonstrate how to create a Dynamic Web Project and enable it for Apache CXF Web services developemnt.
-<br/>
-<br/>
-If you already have a Dynamic Web Project enabled for Apache CXF Web services development you may skip this task by clicking the &quot;Skip this task&quot; button.
- </intro>
- <onCompletion>
- Congratulations! You just created a Dynamic Web Project and enabled it for Apache CXF Web services development!
- </onCompletion>
- <param name="path" value="create-cxf-project.xml">
- </param>
- </task>
- <task kind="cheatsheet" name="Create a Web service from a Java implementation bean using Apache CXF" skip="false">
- <intro>
- This cheat sheet will demonstrate how to create a JAX-WS Web service from a Java implementation bean using the Apache CXF runtime.
- </intro>
- <onCompletion>
- Congratulations! You just icreated a JAX-WS Web service from a Java bean using the Apache CXF runtime!
- </onCompletion>
- <param name="path" value="create-bottomUp-cxf.xml">
- </param>
- </task>
- </taskGroup>
-</compositeCheatsheet>
diff --git a/docs/org.eclipse.jst.ws.cxf.doc.user/cheatsheets/configure-cxf-runtime.xml b/docs/org.eclipse.jst.ws.cxf.doc.user/cheatsheets/configure-cxf-runtime.xml
deleted file mode 100755
index 330085a..0000000
--- a/docs/org.eclipse.jst.ws.cxf.doc.user/cheatsheets/configure-cxf-runtime.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<cheatsheet title="Configure the Apache CXF Runtime">
- <intro
- href="/org.eclipse.platform.doc.user/reference/ref-cheatsheets.htm">
- <description>
- This cheat sheet will demonstrate how to install and configure the Apache CXF runtime in the workbench.
- <br/>
- <br/>
-If you need help at any step, click the help button in the top right corner (?).
- </description>
- </intro>
- <item
- href="/org.eclipse.jst.ws.jaxws.doc.user/gettingstarted/requirements.html"
- skip="true"
- title="Download and install the Apache CXF runtime">
- <description>
- Download and install the Apache CXF runtime version 2.1.x or 2.2.x from the following site: http://cxf.apache.org/. Selecting the &quot;Click to perform&quot; button below will open a web browser at that location.
- </description>
- <command
- required="false"
- serialization="org.eclipse.ui.browser.openBrowser(url=http://cxf.apache.org/)"/>
- </item>
- <item
- href="/org.eclipse.jst.ws.cxf.doc.user/reference/preferences.html"
- skip="true"
- title="Configure Apache CXF in the workbench"
- dialog="true">
- <description>
- Apache CXF must be configured in the workbench before using it to create JAX-WS Web services.
-<br/>
-<br/>
-Select <b>Window-&gt;Preferences</b> from the main menu, expand the <b>Web Services</b> outline tree node within the resulting dialog, and choose <b>CXF 2.x Preferences</b>. Select the &quot;Click to perform&quot; button to do this automatically.
-<br/>
-<br/>
-Browse to the location where you installed Apache CXF and then click <b>OK</b> in the Preferences dialog.
- </description>
- <command
- required="false"
- serialization="org.eclipse.ui.window.preferences(preferencePageId=org.eclipse.jst.ws.cxf.ui.CXFRuntimePreferencesPage)"/>
- </item>
- <item
- href="/org.eclipse.jst.ws.cxf.doc.user/reference/server_runtime.html"
- skip="true"
- title="Set Apache CXF as the default runtime"
- dialog="true">
- <description>
- To set Apache CXF as the default Web service runtime in the workbench select <b>Window-&gt;Preferences</b> from the main menu, expand the <b>Web Services</b> outline tree node within the resulting dialog, and choose <b>Server and Runtime</b>. Selecting the &quot;Click to perform&quot; button will open this preference page.
-<br/>
-<br/>
-In the <b>Web service runtime</b> drop down list select &quot;Apache CXF 2.x&quot; and click <b>OK</b>.
- </description>
- <command
- required="false"
- serialization="org.eclipse.ui.window.preferences(preferencePageId=org.eclipse.jst.ws.internal.consumption.ui.preferences.ServerRuntimePreferencePage)"/>
- </item>
-</cheatsheet>
diff --git a/docs/org.eclipse.jst.ws.cxf.doc.user/cheatsheets/create-bottomUp-cxf.xml b/docs/org.eclipse.jst.ws.cxf.doc.user/cheatsheets/create-bottomUp-cxf.xml
deleted file mode 100755
index 8aaca57..0000000
--- a/docs/org.eclipse.jst.ws.cxf.doc.user/cheatsheets/create-bottomUp-cxf.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<cheatsheet title="Create a Web Service from a Java implementation bean using Apache CXF">
- <intro href="/org.eclipse.platform.doc.user/reference/ref-cheatsheets.htm">
- <description>
- This cheat sheet will demonstrate how to use the Web Services wizard to create a Web service from a Java implementation bean using the Apache CXF runtime and to deploy that service to an Apache Tomcat server and test it using the Web Services Explorer.
- <br/>
- <br/>
-If you need help at any step, click the help button in the top right corner (?).
- </description>
- </intro>
- <item
- href="/org.eclipse.jdt.doc.user/gettingStarted/qs-9.htm"
- title="Create or Import a Java implementation bean">
- <description>
- Create or import a Java bean that will be used as the Web service implementation into the source folder of a Dynamic Web Project that has been enabled for Apache CXF Web services development.
- </description>
- </item>
- <item
- dialog="true"
- href="/org.eclipse.jst.ws.cxf.doc.user/tasks/create_bottomup.html"
- title="Create a Web service from a Java implementation bean">
- <description>
- To create a Web service from a Java implementation bean perform the following steps:
- </description>
- <subitem
- label="Select &quot;File -&gt; New -&gt; Other...&quot; from the main menu, expand the &quot;Web Services&quot; category and select &quot;Web Service&quot;. Click &quot;OK&quot; to launch the Web Services wizard or select the &quot;Click to perform&quot; button to do this automatically.">
- <command
- required="false"
- serialization="org.eclipse.ui.newWizard(newWizardId=org.eclipse.jst.ws.creation.ui.wizard.serverwizard)"/>
- </subitem>
- <subitem
- label="Select &quot;Bottom up Java bean Web Service&quot; as the &quot;Web service type&quot;.">
- </subitem>
- <subitem
- label="Browse to select the Service Implementation.">
- </subitem>
- <subitem
- label="Verify that &quot;Apache CXF 2.x&quot; is selected as the Web service runtime.">
- </subitem>
- <subitem
- label="Move the service slider to the &quot;Test service&quot; stage.">
- </subitem>
- <subitem
- label="Accept all other default values on this page and click &quot;Next &gt;&quot;.">
- </subitem>
- <subitem
- label="On the Service Endpoint Interface configuration page select the &quot;Use a Service Endpoint Interface&quot; check box followed by the &quot;Create an SEI&quot; button. Enter a name for the SEI, &quot;Select All&quot; the methods and click &quot;Finish&quot;.">
- </subitem>
- </item>
- <item
- href="/org.eclipse.jst.ws.consumption.ui.doc.user/tasks/ttestwsdl.html"
- skip="true"
- title="Test the Web service with the Web Services Explorer">
- <description>
- The Web Services Wizard will launch the <b>Web Services Explorer</b> after successfully creating and deploying your Web service to Apache Tomcat.
-<br/>
-<br/>
-To test the Web service select an opertaion in the <b>Web Services Explorer</b>, fill in the required information and click <b>Go</b>.
-<br/>
-<br/>
-The result will be displayed in the <b>Status</b> pane.
- </description>
- </item>
- <onCompletion>
- Congratulations! You just created a JAX-WS Web service!
- </onCompletion>
-</cheatsheet>
diff --git a/docs/org.eclipse.jst.ws.cxf.doc.user/cheatsheets/create-client-cxf.xml b/docs/org.eclipse.jst.ws.cxf.doc.user/cheatsheets/create-client-cxf.xml
deleted file mode 100755
index b968c16..0000000
--- a/docs/org.eclipse.jst.ws.cxf.doc.user/cheatsheets/create-client-cxf.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<cheatsheet
- title="Generate a JAX-WS Client from a WSDL document using Apache CXF">
- <intro
- href="/org.eclipse.platform.doc.user/reference/ref-cheatsheets.htm">
- <description>
- This cheat sheet will guide you through the individual steps to generate a JAX-WS client from a WSDL document using Apache CXF.
- </description>
- </intro>
- <item
- dialog="true"
- href="/org.eclipse.jst.ws.cxf.doc.user/tasks/create_client.html"
- title="Generate a JAX-WS client from a WSDL document">
- <description>
- To generate a JAX-WS client from a WSDL document perform the following steps.
-
- </description>
- <subitem label="Select &quot;File -&gt; New -&gt; Other...&quot; from the main menu, expand the &quot;Web Services&quot; category and choose &quot;Web Service Client&quot;. Click &quot;OK&quot;. Select the &quot;Click to perform&quot; button below to do this automatically.">
- <command
- required="false"
- serialization="org.eclipse.ui.newWizard(newWizardId=org.eclipse.jst.ws.internal.consumption.ui.wizard.client.clientwizard)"/>
- </subitem>
- <subitem
- label="Enter the URI to the remote WSDL file that will be used to generate the client.">
- </subitem>
- <subitem
- label="Select &quot;Java Proxy&quot; as the &quot;Client type&quot;.">
- </subitem>
- <subitem
- label="Verify that &quot;Apache CXF 2.x&quot; is selected as the &quot;Web service runtime&quot;.">
- </subitem>
- <subitem
- label="Select the &quot;Client project&quot; link to choose the project in to which the JAX-WS client will be generated.">
- </subitem>
- <subitem
- label="Move the client slider position to &quot;Develop Client&quot; and click &quot;Finish&quot;.">
- </subitem>
- </item>
- <item
- href="/org.eclipse.jdt.doc.user/gettingStarted/qs-12.htm"
- title="Run the JAX-WS client">
- <description>
- Before running the client check the operation parameters that CXF generated for you and edit if necessary.
-<br/>
-<br/>
-To <b>run</b> your client, right-click on the client in the Project Explorer and select <b>Run As &gt; Java Application</b>. A new console view will open and display the responses of the operation invocations.
- </description>
- </item>
-</cheatsheet>
diff --git a/docs/org.eclipse.jst.ws.cxf.doc.user/cheatsheets/create-cxf-project.xml b/docs/org.eclipse.jst.ws.cxf.doc.user/cheatsheets/create-cxf-project.xml
deleted file mode 100755
index f2305f9..0000000
--- a/docs/org.eclipse.jst.ws.cxf.doc.user/cheatsheets/create-cxf-project.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<cheatsheet title="Create a project for CXF Web services">
- <intro
- href="/org.eclipse.platform.doc.user/reference/ref-cheatsheets.htm">
- <description>
- This cheat sheet will demonstrate how to create a Dynamic Web Project and enable it for CXF JAX-WS Web service development.
- <br/>
- <br/>
-If you need help at any step, click the help button in the top right corner (?).
- </description>
- </intro>
- <item
- href="/org.eclipse.jst.j2ee.doc.user/topics/cjpers.html"
- skip="true"
- title="Open the Java EE perspective">
- <description>
- When working with JAX-WS Web services, you should use the Java EE perspective. If you already have the Java EE perspective active, you may skip this step by clicking the <b>Click to Skip</b> button. If not, select <b>Window -&gt; Open Perspective -&gt; Other...</b> from the main menu and choose <b>Java EE</b> in the resulting <b>Open Perspective</b> dialog box.
- </description>
- <command
- required="false"
- serialization="org.eclipse.ui.perspectives.showPerspective(org.eclipse.ui.perspectives.showPerspective.perspectiveId=org.eclipse.jst.j2ee.J2EEPerspective)"/>
- </item>
- <item
- dialog="true"
- href="/org.eclipse.jst.ws.cxf.doc.user/tasks/create_cxf_project.html"
- skip="true"
- title="Create a Dynamic Web Project">
- <description>
- Before creating a JAX-WS Web Service, we need a project to put it in. Perform the following steps to create an Dynamic Web Project.
-<br/>
-<br/>
-Select <b>File -&gt; New -&gt; Project...</b> from the main menu, expand the <b>Web</b> category within the resulting <b>New Project</b> dialog box and choose <b>Dynamic Web Project</b>.
-<br/>
-<br/>
-On the first page of the wizard enter a <b>Project name:</b>, select Apache Tomcat as the <b>Target runtime</b> and click <b>Finish</b>.
- </description>
- <command
- required="false"
- serialization="org.eclipse.ui.newWizard(newWizardId=org.eclipse.jst.servlet.ui.project.facet.WebProjectWizard)"/>
- </item>
- <item
- href="/org.eclipse.jst.ws.cxf.doc.user/tasks/install_cxf_facet.html"
- skip="true"
- title="Enable JAX-WS Web service developement">
- <description>
- Enable a Dynamic Web Project for Apache CXF Web services development by right-clicking on the project and selecting <b>Properties</b>.
-<br/>
-<br/>
-In the <b>Project Facets</b> page enable the <b>CXF 2.x Web Services</b> facet by selecting the check box and click <b>OK</b>.
- </description>
- </item>
-</cheatsheet>
diff --git a/docs/org.eclipse.jst.ws.cxf.doc.user/cheatsheets/create-tomcat-server.xml b/docs/org.eclipse.jst.ws.cxf.doc.user/cheatsheets/create-tomcat-server.xml
deleted file mode 100755
index d3f2dd1..0000000
--- a/docs/org.eclipse.jst.ws.cxf.doc.user/cheatsheets/create-tomcat-server.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<cheatsheet title="Create an Apache Tomcat server">
- <intro
- href="/org.eclipse.platform.doc.user/reference/ref-cheatsheets.htm">
- <description>
- This cheat sheet will demonstrate how to install and create an instance of the Apache Tomcat server in order to deploy and test your JAX-WS Web service.
- <br/>
- <br/>
-If you need help at any step, click the help button in the top right corner (?).
- </description>
- </intro>
- <item
- href="/org.eclipse.jst.server.ui.doc.user/topics/tomcat.html"
- skip="true"
- title="Download and install Apache Tomcat">
- <description>
- Download and install Apache Tomcat version 5.5.x or 6.0.x from the following site: http://tomcat.apache.org/. Selecting the &quot;Click to perform&quot; button below will open a web browser at that location.
- </description>
- <command
- required="false"
- serialization="org.eclipse.ui.browser.openBrowser(url=http://tomcat.apache.org/)"/>
- </item>
- <item
- dialog="true"
- href="/org.eclipse.jst.server.ui.doc.user/topics/tomcat.html"
- skip="false"
- title="Create an Apache Tomcat server">
- <description>
- Perform the following the steps to create a Tomcat server in the workbench.
- </description>
- <subitem
- label="Select &quot;File -&gt; New -&gt; Other...&quot; from the main menu, expand the &quot;Server&quot; category within the resulting &quot;New Wizard&quot; dialog box and choose &quot;Server&quot;. Click &quot;Next &gt;&quot;."
- skip="true">
- <command
- required="false"
- serialization="org.eclipse.ui.newWizard(newWizardId=org.eclipse.wst.server.ui.new.server)"/>
- </subitem>
- <subitem
- label="Select the version of Tomcat that you have installed on the first page. Click &quot;Next &gt;&quot;."
- skip="true">
- </subitem>
- <subitem
- label="Specify the Tomcat Installation directory and click &quot;Finish&quot;."
- skip="true">
- </subitem>
- <subitem
- label="Open the Servers view by selecting &quot;Window -&gt; Show View -&gt; Other..&quot; from the main menu, expand the &quot;Server&quot; category within the resulting &quot;Show View&quot; dialog box and choose &quot;Servers&quot;. Click &quot;OK&quot;."
- skip="true">
- <command
- required="false"
- serialization="org.eclipse.ui.views.showView(org.eclipse.ui.views.showView.viewId=org.eclipse.wst.server.ui.ServersView)"/>
- </subitem>
- <subitem
- label="Start the Tomcat server by selecting the server in the Servers view and clicking the &quot;Start the server&quot; button in the Servers view toolbar.">
- </subitem>
- </item>
-</cheatsheet>
diff --git a/docs/org.eclipse.jst.ws.cxf.doc.user/cheatsheets/create-topDown-cxf.xml b/docs/org.eclipse.jst.ws.cxf.doc.user/cheatsheets/create-topDown-cxf.xml
deleted file mode 100755
index 595f82d..0000000
--- a/docs/org.eclipse.jst.ws.cxf.doc.user/cheatsheets/create-topDown-cxf.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<cheatsheet
- title="Generate a JAX-WS SEI and a skeleton implementation bean from a WSDL document using Apache CXF">
- <intro
- href="/org.eclipse.platform.doc.user/reference/ref-cheatsheets.htm">
- <description>
- This cheat sheet will demonstrate how to use the Web Services wizard to generate a JAX-WS Service Endpoint Interface and a skeleton implementation bean from a WSDL document using the Apache CXF runtime.
- <br/>
- <br/>
-If you need help at any step, click the help button in the top right corner (?).
- </description>
- </intro>
- <item
- href="/org.eclipse.wst.wsdl.ui.doc.user/tasks/tcrtwsdl.html"
- title="Create or import a WSDL document">
- <description>
- Create or import a WSDL file into the Web Content folder of the Web project. The WSDL document must have a valid service element.
- </description>
- </item>
- <item
- dialog="true"
- href="/org.eclipse.jst.ws.cxf.doc.user/tasks/create_topdown.html"
- title="Generate a JAX-WS SEI and a skeleton implementation bean from the WSDL document">
- <description>
- To generate a JAX-WS SEI and a skeleton implementation bean from a WSDL document perform the following steps:
- </description>
- <subitem
- label="Select &quot;File -&gt; New -&gt; Other...&quot; from the main menu, expand the &quot;Web Services&quot; category and select &quot;Web Service&quot;. Click &quot;OK&quot; to launch the Web Services wizard or select the &quot;Click to perform&quot; button to do this automatically.">
- <command
- required="false"
- serialization="org.eclipse.ui.newWizard(newWizardId=org.eclipse.jst.ws.creation.ui.wizard.serverwizard)"/>
- </subitem>
- <subitem
- label="Select &quot;Top down Java bean Web Service&quot; as the &quot;Web service type&quot;.">
- </subitem>
- <subitem
- label="Browse to select the Service definition.">
- </subitem>
- <subitem
- label="Verify that &quot;Apache CXF 2.x&quot; is selected as the Web service runtime.">
- </subitem>
- <subitem
- label="Move the service slider to the &quot;Develop service&quot; stage.">
- </subitem>
- <subitem
- label="Accept all other default values on this page and click &quot;Next &gt;&quot;.">
- </subitem>
- <subitem
- label="On the Apache CXF WSDL to Java page accept the defaults and click &quot;Next &gt;&quot;.">
- </subitem>
- <subitem
- label="Select &quot;Generate Implementation&quot; on the WSDL to Java preference override page and click &quot;Finish&quot;.">
- </subitem>
- </item>
-</cheatsheet>
diff --git a/docs/org.eclipse.jst.ws.cxf.doc.user/cheatsheets/generate-cxf-wsdl-client-composite.xml b/docs/org.eclipse.jst.ws.cxf.doc.user/cheatsheets/generate-cxf-wsdl-client-composite.xml
deleted file mode 100755
index a6abeb4..0000000
--- a/docs/org.eclipse.jst.ws.cxf.doc.user/cheatsheets/generate-cxf-wsdl-client-composite.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<compositeCheatsheet name="Generating a JAX-WS client from a WSDL document using Apache CXF">
- <taskGroup kind="set" name="Generating a JAX-WS client from a WSDL document using Apache CXF" skip="false">
- <intro>
- This cheat sheet will guide you through the individual steps to generate a JAX-WS client from a WSDL document using Apache CXF.
- <br/>
- <br/>
-The generated client will include a main() that when run will connect to the remote service and invoke every operation on that remote service.
- <br/>
- <br/>
-To assist you along the way, wizards and commands will be available for you to launch automatically.
- </intro>
- <onCompletion>
- Congratulations! You just just generated a JAX-WS client from a WSDL document!
- </onCompletion>
- <task kind="cheatsheet" name="Install and configure the Apache CXF Runtime" skip="true">
- <intro>
- This cheat sheet will demonstrate how to install and configure the Apache CXF runtime in the workbench.
-<br/>
-<br/>
-If you have already installed and configured the Apache CXF runtime in the workbench you may skip this task by clicking the &quot;Skip this task&quot; button.
- </intro>
- <onCompletion>
- Congratulations! You just installed and configured the Apache CXF runtime!
- </onCompletion>
- <param name="path" value="configure-cxf-runtime.xml">
- </param>
- </task>
- <task kind="cheatsheet" name="Create a project for CXF Web services" skip="true">
- <intro>
- This cheat sheet will demonstrate how to create a Dynamic Web Project and enable it for Apache CXF Web services developemnt.
-<br/>
-<br/>
-If you already have a Dynamic Web Project enabled for Apache CXF Web services development you may skip this task by clicking the &quot;Skip this task&quot; button.
- </intro>
- <onCompletion>
- Congratulations! You just created a Dynamic Web Project and enabled it for Apache CXF Web services development!
- </onCompletion>
- <param name="path" value="create-cxf-project.xml">
- </param>
- </task>
- <task kind="cheatsheet" name="Generate a JAX-WS client from a WSDL document using Apache CXF" skip="false">
- <intro>
- <b>Introduction</b>
- </intro>
- <onCompletion>
- <b>Conclusion</b>
- </onCompletion>
- <param name="path" value="create-client-cxf.xml">
- </param>
- </task>
- </taskGroup>
-</compositeCheatsheet>
diff --git a/docs/org.eclipse.jst.ws.cxf.doc.user/cheatsheets/topdown-cxf-composite.xml b/docs/org.eclipse.jst.ws.cxf.doc.user/cheatsheets/topdown-cxf-composite.xml
deleted file mode 100755
index 3f4988d..0000000
--- a/docs/org.eclipse.jst.ws.cxf.doc.user/cheatsheets/topdown-cxf-composite.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<compositeCheatsheet name="Generating a JAX-WS SEI and a skeleton implementation bean from a WSDL document using Apache CXF">
- <taskGroup kind="set" name="Generating a JAX-WS SEI and a skeleton implementation bean from a WSDL document using Apache CXF" skip="false">
- <intro>
- This cheat sheet will guide you through the individual steps to setup the Apache CXF runtime, create an Apache Tomcat server, a Dynamic Web Project enabled for Apache CXF Web services development and generate a a fully annotated JAX-WS Service Endpoint Interface and a skeleton implementation bean from a WSDL document.
- <br/>
- <br/>
-To assist you along the way, wizards and commands will be available for you to launch automatically.
- </intro>
- <onCompletion>
- Congratulations! You just configured the Apache CXF runtime, created an Apache Tomcat server, a Dynamic Web Project enabled for Apache CXF Web services developemnt and generated a JAX-WS Service Endpoint Interface and a skeleton implementation bean from a WSDL document.
- </onCompletion>
- <task kind="cheatsheet" name="Install and configure the Apache CXF Runtime" skip="true">
- <intro>
- This cheat sheet will demonstrate how to install and configure the Apache CXF runtime in the workbench.
-<br/>
-<br/>
-If you have already installed and configured the Apache CXF runtime in the workbench you may skip this task by clicking the &quot;Skip this task&quot; button.
- </intro>
- <onCompletion>
- Congratulations! You just installed and configured the Apache CXF runtime!
- </onCompletion>
- <param name="path" value="configure-cxf-runtime.xml">
- </param>
- </task>
- <task kind="cheatsheet" name="Install and create an Apache Tomcat server" skip="true">
- <intro>
- This cheat sheet will demonstrate how to install and create an Apache Tomcat server.
-<br/>
-<br/>
-If you have already installed and created an Apache Tomcat server you may skip this task by clicking the &quot;Skip this task&quot; button.
- </intro>
- <onCompletion>
- Congratulations! You just installed and created an Apache Tomcat server!
- </onCompletion>
- <param name="path" value="create-tomcat-server.xml">
- </param>
- </task>
- <task kind="cheatsheet" name="Create a project for CXF Web services" skip="true">
- <intro>
- This cheat sheet will demonstrate how to create a Dynamic Web Project and enable it for Apache CXF Web services developemnt.
-<br/>
-<br/>
-If you already have a Dynamic Web Project enabled for Apache CXF Web services development you may skip this task by clicking the &quot;Skip this task&quot; button.
- </intro>
- <onCompletion>
- Congratulations! You just created a Dynamic Web Project and enabled it for Apache CXF Web services development!
- </onCompletion>
- <param name="path" value="create-cxf-project.xml">
- </param>
- </task>
- <task kind="cheatsheet" name="Generate a JAX-WS SEI and a skeleton implementation bean from a WSDL document using Apache CXF" skip="false">
- <intro>
- This cheat sheet will demonstrate how to generate a Service Endpoint Interface and a skeleton implementation bean from a WSDL document.
- </intro>
- <onCompletion>
- Congratulations! You just generated a JAX-WS Service Endpoint Interface and a skeleton implementation bean from a WSDL document.
- </onCompletion>
- <param name="path" value="create-topDown-cxf.xml">
- </param>
- </task>
- </taskGroup>
-</compositeCheatsheet>
diff --git a/docs/org.eclipse.jst.ws.cxf.doc.user/gettingstarted/quickstart.html b/docs/org.eclipse.jst.ws.cxf.doc.user/gettingstarted/quickstart.html
deleted file mode 100755
index a9e0a3a..0000000
--- a/docs/org.eclipse.jst.ws.cxf.doc.user/gettingstarted/quickstart.html
+++ /dev/null
@@ -1,27 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-
-<html>
-<head>
- <meta name="copyright" content="Copyright (c) 2009 Shane Clarke. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Shane Clarke - initial API and implementation">
- <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
- <title>Quick Start</title>
- <link href="../book.css" rel="stylesheet" charset="ISO-8859-1" type="text/css">
-</head>
-
-<body lang="EN-US">
-<h2>Apache CXF Quick Start</h2>
-<p>Try out the following cheat sheets to help you quickly start using JAX-WS Tools and the Apache CXF runtime to create Web service applications.</p>
-<br>
-<a class="command-link" href='javascript:executeCommand("org.eclipse.ui.cheatsheets.openCheatSheet(cheatSheetId=org.eclipse.jst.ws.jaxws.cxf.bottomup)")'>
- <img src="PLUGINS_ROOT/org.eclipse.help/command_link.png" alt="Open bottomup cheat sheet"><strong>Creating a Web service from a Java implementation bean using Apache CXF</strong></a>
-<br>
-<br>
-<a class="command-link" href='javascript:executeCommand("org.eclipse.ui.cheatsheets.openCheatSheet(cheatSheetId=org.eclipse.jst.ws.jaxws.cxf.topdown)")'>
- <img src="PLUGINS_ROOT/org.eclipse.help/command_link.png" alt="Open topdown cheat sheet"><strong>Generating a JAX-WS SEI and a skeleton implementation bean from a WSDL document using Apache CXF</strong></a>
-<br>
-<br>
-<a class="command-link" href='javascript:executeCommand("org.eclipse.ui.cheatsheets.openCheatSheet(cheatSheetId=org.eclipse.jst.ws.jaxws.cxf.topdown.client)")'>
- <img src="PLUGINS_ROOT/org.eclipse.help/command_link.png" alt="Open client cheat sheet"><strong>Generating a JAX-WS client from a WSDL document using Apache CXF</strong></a>
-<br>
-</body>
-</html> \ No newline at end of file
diff --git a/docs/org.eclipse.jst.ws.cxf.doc.user/images/ngrelc.png b/docs/org.eclipse.jst.ws.cxf.doc.user/images/ngrelc.png
deleted file mode 100755
index 161e3aa..0000000
--- a/docs/org.eclipse.jst.ws.cxf.doc.user/images/ngrelc.png
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.jst.ws.cxf.doc.user/images/ngrelr.png b/docs/org.eclipse.jst.ws.cxf.doc.user/images/ngrelr.png
deleted file mode 100755
index 4726f8c..0000000
--- a/docs/org.eclipse.jst.ws.cxf.doc.user/images/ngrelr.png
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.jst.ws.cxf.doc.user/images/ngrelt.png b/docs/org.eclipse.jst.ws.cxf.doc.user/images/ngrelt.png
deleted file mode 100755
index 74bee2b..0000000
--- a/docs/org.eclipse.jst.ws.cxf.doc.user/images/ngrelt.png
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.jst.ws.cxf.doc.user/legal.html b/docs/org.eclipse.jst.ws.cxf.doc.user/legal.html
deleted file mode 100755
index a051798..0000000
--- a/docs/org.eclipse.jst.ws.cxf.doc.user/legal.html
+++ /dev/null
@@ -1,18 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-
-<html>
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
- <title>Legal</title>
- <link href="book.css" rel="stylesheet" charset="ISO-8859-1" type="text/css">
- <script type="text/javascript" language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js"></script>
-</head>
-
-<body lang="EN-US">
-<h2>Legal</h2>
-<p>Copyright &copy; 2009, Shane Clarke. All rights reserved.</p>
-<p>This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at:</p>
-<p><code><a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></code></p>
-<p><a href="about.html">Terms and conditions regarding the use of this guide.</a></p>
-</body>
-</html> \ No newline at end of file
diff --git a/docs/org.eclipse.jst.ws.cxf.doc.user/plugin.properties b/docs/org.eclipse.jst.ws.cxf.doc.user/plugin.properties
deleted file mode 100755
index 0dd06e8..0000000
--- a/docs/org.eclipse.jst.ws.cxf.doc.user/plugin.properties
+++ /dev/null
@@ -1,16 +0,0 @@
-###############################################################################
-# Copyright (c) 2009 Shane Clarke.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# Shane Clarke - initial API and implementation
-###############################################################################
-pluginName=CXF Web services User Guide
-pluginProvider=Eclipse Web Tools Platform
-
-cheatsheet.cxf.bottomup.composite=Creating a Web service from a Java bean using Apache CXF
-cheatsheet.cxf.topdown.composite=Generating an SEI and a skeleton implementation bean from a WSDL document using Apache CXF
-cheatsheet.cxf.topdown.client.composite=Generating a JAX-WS Web Service Client from a WSDL document using Apache CXF
diff --git a/docs/org.eclipse.jst.ws.cxf.doc.user/plugin.xml b/docs/org.eclipse.jst.ws.cxf.doc.user/plugin.xml
deleted file mode 100755
index 0f495f2..0000000
--- a/docs/org.eclipse.jst.ws.cxf.doc.user/plugin.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.4"?>
-<plugin>
-
- <extension point="org.eclipse.help.toc">
- <toc file="tocgettingstarted.xml"/>
- <toc file="toctasks.xml"/>
- <toc file="tocreference.xml"/>
- </extension>
-
- <extension point="org.eclipse.ui.cheatsheets.cheatSheetContent">
- <cheatsheet
- category="org.eclipse.jst.ws.jaxws"
- composite="true"
- contentFile="$nl$/cheatsheets/bottomUp-cxf-composite.xml"
- id="org.eclipse.jst.ws.jaxws.cxf.bottomup"
- name="%cheatsheet.cxf.bottomup.composite">
- </cheatsheet>
- <cheatsheet
- category="org.eclipse.jst.ws.jaxws"
- composite="true"
- contentFile="$nl$/cheatsheets/topdown-cxf-composite.xml"
- id="org.eclipse.jst.ws.jaxws.cxf.topdown"
- name="%cheatsheet.cxf.topdown.composite">
- </cheatsheet>
- <cheatsheet
- category="org.eclipse.jst.ws.jaxws"
- composite="true"
- contentFile="$nl$/cheatsheets/generate-cxf-wsdl-client-composite.xml"
- id="org.eclipse.jst.ws.jaxws.cxf.topdown.client"
- name="%cheatsheet.cxf.topdown.client.composite">
- </cheatsheet>
- </extension>
-
-</plugin>
diff --git a/docs/org.eclipse.jst.ws.cxf.doc.user/reference/cxf_facet.html b/docs/org.eclipse.jst.ws.cxf.doc.user/reference/cxf_facet.html
deleted file mode 100755
index 6014769..0000000
--- a/docs/org.eclipse.jst.ws.cxf.doc.user/reference/cxf_facet.html
+++ /dev/null
@@ -1,32 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-
-<html>
-<head>
- <meta name="copyright" content="Copyright (c) 2009 Shane Clarke. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Shane Clarke - initial API and implementation">
- <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
- <title>CXF Project Facet</title>
- <link href="../book.css" rel="stylesheet" charset="ISO-8859-1" type="text/css">
-</head>
-
-<body lang="EN-US">
-<h2>CXF Project Facet</h2>
-<p>Facets can be thought of as units of functionality that can be added and removed from facet based projects in the workspace.</p>
-<p>For more information on facets see the <a href="PLUGINS_ROOT/org.eclipse.jst.j2ee.doc.user/topics/cfacets.html">WTP Project Facets documentation</a>.</p>
-<p>JAX-WS Tools provides the CXF Facet that performs the following when installed on a Dynamic Web Project:</p>
-<ul>
- <li>Configures the project with the CXF Classpath Container.</li>
- <li>Configures the project with the CXF JAX-WS endpoint configuration option that is selected in the <a href="PLUGINS_ROOT/org.eclipse.jst.ws.cxf.doc.user/reference/endpoint_config_tab.html">Endpoint Config</a> preferences.</li>
- <li>Enables JAX-WS Annotation processing if the option is selected in the <a href="PLUGINS_ROOT/org.eclipse.jst.ws.cxf.doc.user/reference/jaxws_tab.html">JAX-WS</a> preferences.</li>
-</ul>
-<p>The CXF Facet has the following facet prerequisites:</p>
-<ul>
- <li>Dynamic Web Module version 2.5</li>
- <li>Java version 5.0 or greater</li>
-</ul>
-<p>The CXF Facet and it's prerequisites are grouped into a project configuration that can be selected when creating a Dynamic Web Project.</p>
-
-<p><img src="../images/ngrelt.png" alt="Related tasks" border="0" ></p>
-<a href="../tasks/create_cxf_project.html">Creating a project for CXF Web services</a><br>
-<a href="../tasks/install_cxf_facet.html">Install the CXF Project Facet</a><br>
-</body>
-</html> \ No newline at end of file
diff --git a/docs/org.eclipse.jst.ws.cxf.doc.user/reference/endpoint_config_tab.html b/docs/org.eclipse.jst.ws.cxf.doc.user/reference/endpoint_config_tab.html
deleted file mode 100755
index 1ee9e60..0000000
--- a/docs/org.eclipse.jst.ws.cxf.doc.user/reference/endpoint_config_tab.html
+++ /dev/null
@@ -1,73 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-
-<html>
-<head>
- <meta name="copyright" content="Copyright (c) 2009 Shane Clarke. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Shane Clarke - initial API and implementation">
- <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
- <title>JAX-WS Endpoint Configuration Preferences</title>
- <link href="../book.css" rel="stylesheet" charset="ISO-8859-1" type="text/css">
-</head>
-
-<body lang="EN-US">
-<h2>Endpoint Config Preferences</h2>
-<p>The <strong>Endpoint Config</strong> tab provides setting that control the type of endpoint configuration that web projects are configured with when the CXF Facet is installed.</p>
-<p><img src="./images/spring_config.png" alt="Spring Config tab" > </p>
-<p></p>
- <table border="1" cellspacing="0" cellpadding="5" summary="Java search actions">
- <thead>
- <tr>
- <td>
- <p><span class="control">Option</span></p>
- </td>
-
- <td>
- <p><span class="control">Description</span></p>
- </td>
-
- <td>
- <p><span class="control">Default</span></p>
- </td>
- </tr>
- </thead>
-
- <tbody>
- <tr>
- <td valign="top">
- <p>Use CXF Servlet</p>
- </td>
-
- <td valign="top">
- <p>Creates a cxf-servlet.xml file in the Web Projects WEB-INF directory. This is the slower option of the two as it loads all possible CXF modules for an endpoint</p>
- </td>
-
- <td valign="top">
- <p>false</p>
- </td>
- </tr>
-
- <tr>
- <td valign="top">
- <p>Use Spring Application Context</p>
- </td>
-
- <td valign="top">
- <p>Creates a beans.xml file in the Web Projects WEB-INF directory. This is the fastest option as it allows the specification of which CXF modules to load for an endpoint</p>
- </td>
-
- <td valign="top">
- <p>true</p>
- </td>
- </tr>
- </tbody>
- </table>
-
-<p>During bottom-up and top-down web services development the endpoint configuration file in the web project is updated with a jaxws:endpoint element for the generated web service.</p>
-
-<p><img src="../images/ngrelr.png" alt="Related reference" border="0" ></p>
-<a href="../reference/cxf_facet.html">CXF Project Facet</a><br>
-<p><img src="../images/ngrelt.png" alt="Related tasks" border="0" ></p>
-<a href="../tasks/create_cxf_project.html">Create a project for CXF Web services</a><br>
-<a href="../tasks/create_bottomup.html">Create a Web Service from a Java implementation bean using Apache CXF</a><br>
-<a href="../tasks/create_topdown.html">Generate an SEI and a skeleton implementation bean from a WSDL document using Apache CXF</a><br>
-</body>
-</html> \ No newline at end of file
diff --git a/docs/org.eclipse.jst.ws.cxf.doc.user/reference/images/apt_processing.png b/docs/org.eclipse.jst.ws.cxf.doc.user/reference/images/apt_processing.png
deleted file mode 100755
index 612bec6..0000000
--- a/docs/org.eclipse.jst.ws.cxf.doc.user/reference/images/apt_processing.png
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.jst.ws.cxf.doc.user/reference/images/cxf2x_preferences.png b/docs/org.eclipse.jst.ws.cxf.doc.user/reference/images/cxf2x_preferences.png
deleted file mode 100755
index 2ff37b8..0000000
--- a/docs/org.eclipse.jst.ws.cxf.doc.user/reference/images/cxf2x_preferences.png
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.jst.ws.cxf.doc.user/reference/images/cxf_runtime_tab.png b/docs/org.eclipse.jst.ws.cxf.doc.user/reference/images/cxf_runtime_tab.png
deleted file mode 100755
index 01dcd9d..0000000
--- a/docs/org.eclipse.jst.ws.cxf.doc.user/reference/images/cxf_runtime_tab.png
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.jst.ws.cxf.doc.user/reference/images/cxf_runtime_tab_export.png b/docs/org.eclipse.jst.ws.cxf.doc.user/reference/images/cxf_runtime_tab_export.png
deleted file mode 100644
index ded0107..0000000
--- a/docs/org.eclipse.jst.ws.cxf.doc.user/reference/images/cxf_runtime_tab_export.png
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.jst.ws.cxf.doc.user/reference/images/java2ws_tab.png b/docs/org.eclipse.jst.ws.cxf.doc.user/reference/images/java2ws_tab.png
deleted file mode 100755
index 289068a..0000000
--- a/docs/org.eclipse.jst.ws.cxf.doc.user/reference/images/java2ws_tab.png
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.jst.ws.cxf.doc.user/reference/images/jaxws_annotations.png b/docs/org.eclipse.jst.ws.cxf.doc.user/reference/images/jaxws_annotations.png
deleted file mode 100755
index 421690c..0000000
--- a/docs/org.eclipse.jst.ws.cxf.doc.user/reference/images/jaxws_annotations.png
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.jst.ws.cxf.doc.user/reference/images/server_runtime.png b/docs/org.eclipse.jst.ws.cxf.doc.user/reference/images/server_runtime.png
deleted file mode 100755
index 4f030f0..0000000
--- a/docs/org.eclipse.jst.ws.cxf.doc.user/reference/images/server_runtime.png
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.jst.ws.cxf.doc.user/reference/images/spring_config.png b/docs/org.eclipse.jst.ws.cxf.doc.user/reference/images/spring_config.png
deleted file mode 100755
index e566417..0000000
--- a/docs/org.eclipse.jst.ws.cxf.doc.user/reference/images/spring_config.png
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.jst.ws.cxf.doc.user/reference/images/wsdl2java.png b/docs/org.eclipse.jst.ws.cxf.doc.user/reference/images/wsdl2java.png
deleted file mode 100755
index 702d64c..0000000
--- a/docs/org.eclipse.jst.ws.cxf.doc.user/reference/images/wsdl2java.png
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.jst.ws.cxf.doc.user/reference/images/xjc.png b/docs/org.eclipse.jst.ws.cxf.doc.user/reference/images/xjc.png
deleted file mode 100755
index fa77021..0000000
--- a/docs/org.eclipse.jst.ws.cxf.doc.user/reference/images/xjc.png
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.jst.ws.cxf.doc.user/reference/java2ws_tab.html b/docs/org.eclipse.jst.ws.cxf.doc.user/reference/java2ws_tab.html
deleted file mode 100755
index 20a833c..0000000
--- a/docs/org.eclipse.jst.ws.cxf.doc.user/reference/java2ws_tab.html
+++ /dev/null
@@ -1,153 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-
-<html>
-<head>
- <meta name="copyright" content="Copyright (c) 2009 Shane Clarke. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Shane Clarke - initial API and implementation">
- <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
- <title>Java2WS Preferences</title>
- <link href="../book.css" rel="stylesheet" charset="ISO-8859-1" type="text/css">
-</head>
-
-<body lang="EN-US">
-<h2>Java2WS Preferences</h2>
-<p>The <strong>Java2WS</strong> tab provides settings that control the CXF java2ws tool (for CXF 2.1.x runtimes and above). When a CXF 2.0.x runtime is selected this page displays a subset of the available setting that provides control of the CXF java2wsdl tool.</p>
-<p><img src="./images/java2ws_tab.png" alt="Java2WS tab" > </p>
-<p></p>
- <table border="1" cellspacing="0" cellpadding="5" summary="Java search actions">
- <thead>
- <tr>
- <td>
- <p><span class="control">Option</span></p>
- </td>
-
- <td>
- <p><span class="control">Description</span></p>
- </td>
-
- <td>
- <p><span class="control">Default</span></p>
- </td>
- </tr>
- </thead>
-
- <tbody>
- <tr>
- <td valign="top">
- <p>Default Frontend</p>
- </td>
-
- <td valign="top">
- <p>Specifies the front end to use. Currently only the jaxws front end is supported</p>
- </td>
-
- <td valign="top">
- <p>jaxws</p>
- </td>
- </tr>
-
- <tr>
- <td valign="top">
- <p>Default Databinding</p>
- </td>
-
- <td valign="top">
- <p>Specifies the data binding to use. Currently only the jaxb data binding is supported</p>
- </td>
-
- <td valign="top">
- <p>jaxb</p>
- </td>
- </tr>
-
- <tr>
- <td valign="top">
- <p>Generate Client</p>
- </td>
-
- <td valign="top">
- <p>Select to generate a client mainline using JAX-WS APIs</p>
- </td>
-
- <td valign="top">
- <p>false</p>
- </td>
- </tr>
-
- <tr>
- <td valign="top">
- <p>Generate Server</p>
- </td>
-
- <td valign="top">
- <p>Select to generate a server mainline using JAX-WS APIs</p>
- </td>
-
- <td valign="top">
- <p>false</p>
- </td>
- </tr>
-
- <tr>
- <td valign="top">
- <p>Generate Wrapper and Fault Beans</p>
- </td>
-
- <td valign="top">
- <p>Select to generate wrapper and fault beans</p>
- </td>
-
- <td valign="top">
- <p>true</p>
- </td>
- </tr>
-
- <tr>
- <td valign="top">
- <p>Generate WSDL</p>
- </td>
-
- <td valign="top">
- <p>Select to generate a WSDL document</p>
- </td>
-
- <td valign="top">
- <p>true</p>
- </td>
- </tr>
-
- <tr>
- <td valign="top">
- <p>Default SOAP Binding</p>
- </td>
-
- <td valign="top">
- <p>Specify the SOAP binding to include in the generated WSDL document. SOAP 1.1 and SOAP 1.2 supported</p>
- </td>
-
- <td valign="top">
- <p>SOAP 1.1</p>
- </td>
- </tr>
-
- <tr>
- <td valign="top">
- <p>Generate separate XSD for the types</p>
- </td>
-
- <td valign="top">
- <p>Select to output schemas to separate files when generating a WSDL document</p>
- </td>
-
- <td valign="top">
- <p>true</p>
- </td>
- </tr>
-
- </tbody>
- </table>
-<p>The options on this tab are presented in the web services wizard when creating a bottom-up web service with the Apache CXF runtime.</p>
-<p>The options there can be changed from their default values for the web service being created.</p>
-<p><img src="../images/ngrelt.png" alt="Related tasks" border="0" ></p>
-<a href="../tasks/create_bottomup.html">Create a Web Service from a Java implementation bean using Apache CXF</a><br>
-</body>
-</html> \ No newline at end of file
diff --git a/docs/org.eclipse.jst.ws.cxf.doc.user/reference/jaxws_tab.html b/docs/org.eclipse.jst.ws.cxf.doc.user/reference/jaxws_tab.html
deleted file mode 100755
index 3f13c8b..0000000
--- a/docs/org.eclipse.jst.ws.cxf.doc.user/reference/jaxws_tab.html
+++ /dev/null
@@ -1,23 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-
-<html>
-<head>
- <meta name="copyright" content="Copyright (c) 2009 Shane Clarke. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Shane Clarke - initial API and implementation">
- <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
- <title>JAX-WS Preferences</title>
- <link href="../book.css" rel="stylesheet" charset="ISO-8859-1" type="text/css">
-</head>
-
-<body lang="EN-US">
-<h2>JAX-WS Preferences</h2>
-<p>The <strong>JAX-WS</strong> tab provides settings that control the automatic generation of JAX-WS annotations and the enablement of JAX-WS annotation validation processing.</p>
-<p><img src="./images/jaxws_annotations.png" alt="JAXWS Annotations" > </p>
-<p>Select the JAX-WS annotations that are added by default to the implementation bean or SEI before input to the CXF java2ws tool.</p>
-<p><img src="./images/apt_processing.png" alt="APT Processing"> </p>
-<p>Select this option to enable annotation validation processing in web projects when configured with the CXF Facet.</p>
-<p>The JDT APT processors report errors, warnings and information messages in the Java Editor and Problems View when JAX-WS rules are broken.</p>
-<p>Annotation processing can be enabled and disabled on any Java based project using the Annotation Processing properties page on the projects context menu.</p>
-<p><img src="../images/ngrelt.png" alt="Related tasks" border="0" ></p>
-<a href="../tasks/configuring_jaxws_annotation_processing.html">Enable JAX-WS Annotation Processing</a><br>
-</body>
-</html> \ No newline at end of file
diff --git a/docs/org.eclipse.jst.ws.cxf.doc.user/reference/preferences.html b/docs/org.eclipse.jst.ws.cxf.doc.user/reference/preferences.html
deleted file mode 100755
index eaa719d..0000000
--- a/docs/org.eclipse.jst.ws.cxf.doc.user/reference/preferences.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-
-<html>
-<head>
- <meta name="copyright" content="Copyright (c) 2009 Shane Clarke. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Shane Clarke - initial API and implementation">
- <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
- <title>Apache CXF 2.x Preferences</title>
- <link href="../book.css" rel="stylesheet" charset="ISO-8859-1" type="text/css">
- <script type="text/javascript" language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js"></script>
-</head>
-
-<body lang="EN-US">
-<h2>Apache CXF 2.x Preferences</h2>
-<p>JAX-WS Tools provides a preference page for setting up and configuring the Apache CXF runtime.</p>
-<p>The CXF 2.x preferences can be accessed via
-<a class="command-link" href='javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=org.eclipse.jst.ws.cxf.ui.CXFRuntimePreferencesPage)")'>
-<img src="PLUGINS_ROOT/org.eclipse.help/command_link.png" alt="Open the CXF 2.x preference page">
-<strong>Window &gt; Preferences... &gt; Web Services &gt; CXF 2.x Preferences</strong></a> from the top level menu. </p>
-<p><img src="./images/cxf2x_preferences.png" alt="CXF 2.x Preferences" > </p>
-<p>The CXF Runtime tab is used to point to the install location of a CXF 2.x runtime.</p>
-<p><img src="./images/cxf_runtime_tab.png" alt="CXF 2.x Preferences"></p>
-<p>The <strong>Export runtime libraries...</strong> option is enabled by default and controls whether the CXF library jar files are resolved into the WEB-INF/lib folder of the web module at deployment time.</p>
-<p>This option can be enabled or disabled on existing projects that are configured with the CXF Facet using the Java EE Module Dependencies properties page.</p>
-<p><img src="./images/cxf_runtime_tab_export.png" alt="CXF 2.x Preferences Export Runtime Libraries"></p>
-<p>For details on the other CXF 2.x preferences tabs, refer to the following documents:</p>
-<ul>
- <li><a href="java2ws_tab.html">Java2WS</a></li>
- <li><a href="wsdl2java_tab.html">WSDL2Java</a></li>
- <li><a href="jaxws_tab.html">JAX-WS</a></li>
- <li><a href="endpoint_config_tab.html">Endpoint Config</a></li>
-</ul>
-For information on setting Apache CXF as the default Web services runtime, refer to this document.
-<ul>
- <li><a href="server_runtime.html">Server and Runtime</a></li>
-</ul>
-<p><img src="../images/ngrelr.png" alt="Related reference" border="0" ></p>
-<a href="../reference/cxf_facet.html">CXF Project Facet</a><br>
-<p><img src="../images/ngrelt.png" alt="Related tasks" border="0" ></p>
-<a href="../tasks/manage_cxf_lib_export.html">Manage the exporting of CXF libraries at deployment time</a><br>
-</body>
-</html> \ No newline at end of file
diff --git a/docs/org.eclipse.jst.ws.cxf.doc.user/reference/server_runtime.html b/docs/org.eclipse.jst.ws.cxf.doc.user/reference/server_runtime.html
deleted file mode 100755
index 4e1769e..0000000
--- a/docs/org.eclipse.jst.ws.cxf.doc.user/reference/server_runtime.html
+++ /dev/null
@@ -1,21 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-
-<html>
-<head>
- <meta name="copyright" content="Copyright (c) 2009 Shane Clarke. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Shane Clarke - initial API and implementation">
- <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
- <title>Server and Runtime</title>
- <link href="../book.css" rel="stylesheet" charset="ISO-8859-1" type="text/css">
-</head>
-
-<body lang="EN-US">
-<h2>Server and Runtime</h2>
-Apache CXF can be set as the default Web services runtime selection in the Web services wizards using the Server and Runtime preference page.
-<p>The Server and Runtime preference page can be accessed via
-<a class="command-link" href='javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=org.eclipse.jst.ws.internal.consumption.ui.preferences.ServerRuntimePreferencePage)")'>
-<img src="PLUGINS_ROOT/org.eclipse.help/command_link.png" alt="Open the CXF 2.x preference page">
-<strong>Window &gt; Preferences... &gt; Web Services &gt; Server and Runtime</strong></a> from the top level menu. </p>
-<p><img src="./images/server_runtime.png" alt="Server and Runtime" > </p>
-<p>Select <b>Apache CXF 2.x</b> in the <b>Web service runtime</b> drop down list and click <b>OK</b>.
-</body>
-</html> \ No newline at end of file
diff --git a/docs/org.eclipse.jst.ws.cxf.doc.user/reference/wsdl2java_tab.html b/docs/org.eclipse.jst.ws.cxf.doc.user/reference/wsdl2java_tab.html
deleted file mode 100755
index ad23cea..0000000
--- a/docs/org.eclipse.jst.ws.cxf.doc.user/reference/wsdl2java_tab.html
+++ /dev/null
@@ -1,275 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-
-<html>
-<head>
- <meta name="copyright" content="Copyright (c) 2009 Shane Clarke. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Shane Clarke - initial API and implementation">
- <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
- <title>WSDL2Java Preferences</title>
- <link href="../book.css" rel="stylesheet" charset="ISO-8859-1" type="text/css">
-</head>
-
-<body lang="EN-US">
-<h2>WSDL2Java Preferences</h2>
-<p>The <strong>WSDL2Java</strong> tab provides settings that can be used to customize the code generated by the CXF wsdl2java tool.
-<p><img src="./images/wsdl2java.png" alt="Java2WS tab" > </p>
-<p></p>
- <table border="1" cellspacing="0" cellpadding="5" summary="Java search actions">
- <thead>
- <tr>
- <td>
- <p><span class="control">Option</span></p>
- </td>
-
- <td>
- <p><span class="control">Description</span></p>
- </td>
-
- <td>
- <p><span class="control">Default</span></p>
- </td>
- </tr>
- </thead>
-
- <tbody>
- <tr>
- <td valign="top">
- <p>Generate Server</p>
- </td>
-
- <td valign="top">
- <p>Select to generate starting point code for a server mainline</p>
- </td>
-
- <td valign="top">
- <p>false</p>
- </td>
- </tr>
-
- <tr>
- <td valign="top">
- <p>Generate Implementation</p>
- </td>
-
- <td valign="top">
- <p>Select to generate starting point code for an implementation bean</p>
- </td>
-
- <td valign="top">
- <p>true</p>
- </td>
- </tr>
-
- <tr>
- <td valign="top">
- <p>Generate default values for the generated artifacts</p>
- </td>
-
- <td valign="top">
- <p>Select to generate default values for a generated client and implementation</p>
- </td>
-
- <td valign="top">
- <p>true</p>
- </td>
- </tr>
-
- <tr>
- <td valign="top">
- <p>Enable processing of implicit SOAP headers</p>
- </td>
-
- <td valign="top">
- <p>Select to enable the processing of of SOAP headers defined in the wsdl:binding</p>
- </td>
-
- <td valign="top">
- <p>false</p>
- </td>
- </tr>
-
- <tr>
- <td valign="top">
- <p>Enable loading of the default namespace package name mapping</p>
- </td>
-
- <td valign="top">
- <p>Select to enable the loading of the default namepsace package name mapping</p>
- </td>
-
- <td valign="top">
- <p>true</p>
- </td>
- </tr>
-
- <tr>
- <td valign="top">
- <p>Enable the use of the default excludes namespace mapping</p>
- </td>
-
- <td valign="top">
- <p>Select to enable the loading of the default excludes namespace mapping</p>
- </td>
-
- <td valign="top">
- <p>true</p>
- </td>
- </tr>
-
- <tr>
- <td valign="top">
- <p>Enable Auto Name Resolution</p>
- </td>
-
- <td valign="top">
- <p>Select to automatically resolve naming conflicts without requiring the use of binding customizations</p>
- </td>
-
- <td valign="top">
- <p>false</p>
- </td>
- </tr>
-
- <tr>
- <td valign="top">
- <p>Use the Apache CXF proprietary WS-Addressing type</p>
- </td>
-
- <td valign="top">
- <p>Select to generate the older CXF proprietary WS-Addressing types instead of the JAX-WS 2.1 compliant WS-Addressing types. Used for compatibility with CXF 2.0</p>
- </td>
-
- <td valign="top">
- <p>false</p>
- </td>
- </tr>
- </tbody>
- </table>
-
-<p>The following options are passed to the XJC processor.</p>
-<p><img src="./images/xjc.png" alt="Java2WS tab" > </p>
-<p></p>
- <table border="1" cellspacing="0" cellpadding="5" summary="Java search actions">
- <thead>
- <tr>
- <td>
- <p><span class="control">Option</span></p>
- </td>
-
- <td>
- <p><span class="control">Description</span></p>
- </td>
-
- <td>
- <p><span class="control">Default</span></p>
- </td>
- </tr>
- </thead>
-
- <tbody>
- <tr>
- <td valign="top">
- <p>-Xdv</p>
- </td>
-
- <td valign="top">
- <p>Select to initialize fields mapped from elements with their default values</p>
- </td>
-
- <td valign="top">
- <p>false</p>
- </td>
- </tr>
-
- <tr>
- <td valign="top">
- <p>-Xts</p>
- </td>
-
- <td valign="top">
- <p>Select to activate plugin to add a toString() method to generated classes</p>
- </td>
-
- <td valign="top">
- <p>false</p>
- </td>
- </tr>
-
- <tr>
- <td valign="top">
- <p>-Xts:style:multiline</p>
- </td>
-
- <td valign="top">
- <p>Select to have toString produce multi line output</p>
- </td>
-
- <td valign="top">
- <p>false</p>
- </td>
- </tr>
-
- <tr>
- <td valign="top">
- <p>-Xts:style:simple</p>
- </td>
-
- <td valign="top">
- <p>Select to have toString produce single line terse output</p>
- </td>
-
- <td valign="top">
- <p>false</p>
- </td>
- </tr>
-
- <tr>
- <td valign="top">
- <p>-Xlocator</p>
- </td>
-
- <td valign="top">
- <p>Select to enable source location support for generated code</p>
- </td>
-
- <td valign="top">
- <p>false</p>
- </td>
- </tr>
-
- <tr>
- <td valign="top">
- <p>-Xsync-methods</p>
- </td>
-
- <td valign="top">
- <p>Select to generate accessor methods with the 'synchronized' keyword</p>
- </td>
-
- <td valign="top">
- <p>false</p>
- </td>
- </tr>
-
- <tr>
- <td valign="top">
- <p>-mark-generated</p>
- </td>
-
- <td valign="top">
- <p>Select to add @Generated annotations to the generated code</p>
- </td>
-
- <td valign="top">
- <p>false</p>
- </td>
- </tr>
-
- </tbody>
- </table>
-
-<p>The options on this tab are presented in the web services wizard when creating a top-down web service with the Apache CXF runtime.</p>
-<p>The options there can be changed from their default values for the web service being created.</p>
-<p><img src="../images/ngrelt.png" alt="Related tasks" border="0" ></p>
-<a href="../tasks/create_topdown.html">Generate an SEI and a skeleton implementation bean from a WSDL document using Apache CXF</a><br>
-</body>
-</html> \ No newline at end of file
diff --git a/docs/org.eclipse.jst.ws.cxf.doc.user/tasks/ant_tasks.html b/docs/org.eclipse.jst.ws.cxf.doc.user/tasks/ant_tasks.html
deleted file mode 100644
index 6bf98a4..0000000
--- a/docs/org.eclipse.jst.ws.cxf.doc.user/tasks/ant_tasks.html
+++ /dev/null
@@ -1,53 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<meta name="copyright"
- content="Copyright (c) 2010 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">
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<title>Creating Web services and clients using Apache CXF and Ant tasks</title>
-<link href="../book.css" rel="stylesheet" charset="ISO-8859-1"
- type="text/css">
-<script type="text/javascript" language="JavaScript"
- src="PLUGINS_ROOT/org.eclipse.help/livehelp.js"></script>
-</head>
-
-<body lang="EN-US">
-<h2>Creating Web services and clients using Apache CXF and Ant
-tasks</h2>
-<p>In addition to using the Web services wizards it is also possible to generate Ant files which you can use to create Web services and
-clients using the Apache CXF runtime environment. The Ant tasks can be run in the Eclipse workspace using Run As > Ant Build... or they can be
-run headless through the command line.</p>
-<h3>Prerequisites:</h3>
-<ol>
- <li>Install and configure the Apache CXF runtime environment. See
- the <a
- href="PLUGINS_ROOT/org.eclipse.jst.ws.jaxws.doc.user/gettingstarted/requirements.html">Requirements
- and Installation</a> page for more details.</li>
- <li>Create a Dynamic Web Project for the Web Service or client and enable it for Apache CXF Web services development as described here: <a
- href="../tasks/create_cxf_project.html">Create a project for CXF Web services</a>.</li>
- <li>Import the required Ant files into your workspace:
- <ol>
- <li>Use the existing Dynamic Web Project created above or create a new project.</li>
- <li>Import the Ant files by selecting <a class="command-link" href='javascript:executeCommand("org.eclipse.ui.newWizard(newWizardId=org.eclipse.wst.command.env.ui.AntFileImportWizard)")'>
- <img src="PLUGINS_ROOT/org.eclipse.help/command_link.png" alt="Open the ant files wizard"><strong>File &gt; New &gt; Other... &gt; Web Services &gt; Ant Files</strong></a> from the top level menu.</li>
- <li>Select the following:</li>
- <ul>
- <li>Apache CXF as the Web service runtime.</li>
- <li>The Web service or client type.</li>
- <li>The folder into which the Ant files will be generated.</li>
- </ul>
- Click <b>Finish</b>. The wizard will generate two files into the selected folder.
- <ol>
- <li>An Ant file: One of <samp class="codeph">cxf_bujava.xml</samp> (bottom-up), <samp class="codeph">cxf_tdjava.xml</samp> (top-down) or <samp class="codeph">cxf_client.xml</samp> (client).</li>
- <li>An Ant properties file which is referenced by the Ant file: One of <samp class="codeph">cxf_bujava.properties</samp> (bottom-up), <samp class="codeph">cxf_tdjava.properties</samp> (top-down) or <samp class="codeph">cxf_client.properties</samp> (client)</li>
- </ol>
-</ol>
- <p><img src="../images/ngrelt.png" alt="Related tasks" border="0"></p>
- <a href="../tasks/cxf_ant_ws.html">Creating a Web service using Ant tasks in the Workbench</a>
- <br>
- <a href="../tasks/cxf_ant_ws_client.html">Creating a Web service client using Ant tasks in the Workbench</a>
- <br>
- <a href="../tasks/cxf_ant_cmd.html">Using the Ant Tasks at the Command Line</a>
- <br>
-</body>
-</html> \ No newline at end of file
diff --git a/docs/org.eclipse.jst.ws.cxf.doc.user/tasks/configuring_jaxws_annotation_processing.html b/docs/org.eclipse.jst.ws.cxf.doc.user/tasks/configuring_jaxws_annotation_processing.html
deleted file mode 100755
index d9ea63d..0000000
--- a/docs/org.eclipse.jst.ws.cxf.doc.user/tasks/configuring_jaxws_annotation_processing.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-
-<html>
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
- <title>Configuring JAX-WS Annotation Processing</title>
- <link href="../book.css" rel="stylesheet" charset="ISO-8859-1" type="text/css">
-</head>
-
-<body lang="EN-US">
-<h2>Enable JAX-WS Annotation Processing</h2>
-<p>If the <strong>Enable annotation validation processing</strong> setting on the <a href="PLUGINS_ROOT/org.eclipse.jst.ws.cxf.doc.user/reference/jaxws_tab.html">JAX-WS</a> tab in
-the Apache CXF 2.x preferences is selected, annotation processing will be enabled on projects on as part of the CXF Facet install.</p>
-
-<h3>Enabling Existing Projects</h3>
-To turn annotation processing on or off on an existing project right-click on the project and choose <b>Properties</b> from the context menu.
- On the <strong>Java Compiler > Annotation Processing</strong> properties page select or deselect the <strong>Enable Annotation Processing</strong> check box and then click <b>OK</b>.
-<p><img src="./images/annotation_processing.png" alt="Annotation Processing" > </p>
-<p><img src="../images/ngrelr.png" alt="Related reference" border="0" ></p>
-<a href="PLUGINS_ROOT/org.eclipse.jst.ws.cxf.doc.user/reference/cxf_facet.html">CXF Project Facet</a><br>
-</body>
-</html> \ No newline at end of file
diff --git a/docs/org.eclipse.jst.ws.cxf.doc.user/tasks/create_bottomup.html b/docs/org.eclipse.jst.ws.cxf.doc.user/tasks/create_bottomup.html
deleted file mode 100755
index 03e5d34..0000000
--- a/docs/org.eclipse.jst.ws.cxf.doc.user/tasks/create_bottomup.html
+++ /dev/null
@@ -1,76 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
- <meta name="copyright" content="Copyright (c) 2009 Shane Clarke. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Shane Clarke - initial API and implementation">
- <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
- <title>Create a Web Service from a Java implementation bean using Apache CXF</title>
- <link href="../book.css" rel="stylesheet" charset="ISO-8859-1" type="text/css">
- <script type="text/javascript" language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js"></script>
-</head>
-
-<body lang="EN-US">
-<h2>Create a Web Service from a Java implementation bean using Apache CXF</h2>
-<h3>Prerequisites:</h3>
-<ol>
-<li>Install and configure the Apache CXF runtime environment. See the <a href="PLUGINS_ROOT/org.eclipse.jst.ws.jaxws.doc.user/gettingstarted/requirements.html">Requirements and Installation</a> page for more details.</li>
-<li>Create a Dynamic Web Project and enable it for Apache CXF Web services development as described here: <a href="../tasks/create_cxf_project.html">Create a project for CXF Web services</a>.</li>
-<li>Create or import a Java implementation bean into the source folder of the Dynamic Web Project.</li>
-</ol>
-To create a Web service from a Java bean using the Apache CXF runtime environment:
-<ol>
-<li>Select <a class="command-link" href='javascript:executeCommand("org.eclipse.ui.perspectives.showPerspective(org.eclipse.ui.perspectives.showPerspective.perspectiveId=org.eclipse.jst.j2ee.J2EEPerspective)")'>
- <img src="PLUGINS_ROOT/org.eclipse.help/command_link.png" alt="Open the Java EE perspective"><strong>Window &gt; Open Perspective &gt; Java EE</strong></a> from the top level menu to switch to the Java EE perspective.</li>
-<li>In the Project Explorer view select the Java implementation bean that you created or imported into the Dynamic Web Projects source folder.</li>
-<li>Open the Web Service wizard by selecting <a class="command-link" href='javascript:executeCommand("org.eclipse.ui.newWizard(newWizardId=org.eclipse.jst.ws.creation.ui.wizard.serverwizard)")'>
-<img src="PLUGINS_ROOT/org.eclipse.help/command_link.png" alt="Open the new web service wizard"><strong>File &gt; New &gt; Other... &gt; Web Services &gt; Web Service</strong></a> from the top level menu.</li>
-<li>Web Services page: select <b>Bottom up Java bean Web Service</b> as the Web service type and browse to select the Java implementation bean from which to create the Web service:<p><img src="./images/bottom_up_wizard.png" alt="Bottom Up Web Services Wizard" ></p>
-<ol type="a">
-<li>Move the service slider to the stage of Web services development that you wish to complete.</li>
-<ul>
-<li>Develop: Invokes the Apache CXF java2ws tool using the preference defaults and the information gathered in the wizard to create a service. The wizard also generates a JAX-WS endpoint configuration file.</li>
-<li>Assemble: If required by the target server this phase assembles and configures the project that hosts the Web service into an EAR.</li>
-<li>Deploy: Generates the deployment artifacts for the Web service.</li>
-<li>Install: Installs and configures the Web Module and EARs on the target server.</li>
-<li>Start: Starts the target server once the Web service has been installed on it.</li>
-<li>Test: Use the Web Service Explorer to test the generated Web service.</li>
-</ul>
-<li>Server: Select a server to deploy your Web service to.</li>
-<li>Web service runtime: Select Apache CXF 2.x</li>
-<li>Service project: Select the project in your workspace into which Apache CXF will generate the code.</li>
-<li>If you wish to generate a client for your Web service, select <b>Java Proxy</b> as the Client type:
-<ul>
-<li>Move the client slider to the <b>Develop client</b> stage.</li>
-<li>Client project: Select a different project into which to generate the client code. The wizard will create the project for you if it doesn't exist and configure it with the CXF Facet.</li>
-</ul></li>
-<li>Publish the Web service: Launch the Web Services Explorer to publish your Web service to a UDDI registry.</li>
-<li>Monitor the Web service: Monitor the Web service's SOAP traffic using the TCP/IP Monitor.</li>
-</ol></li>
-<li>Click <b>Next &gt;</b> to move to the Service Endpoint Interface configuration page:
-<ol>
-<li>Use a Service Endpoint Interface: Select or create a Service Endpoint Interface (SEI) that defines the methods you wish to expose in the service. This is the recommended approach.
-<ul>
-<li>Select an SEI: Browse to select an existing SEI.</li>
-<li>Create an SEI: Create an Interface from the Implementation by providing a name and the methods to declare in the extracted interface.</li>
-</ul>
-Both options create or update the <i>@WebService.endpointInterface</i> element on the implementation bean.
-</ol>
-</li>
-<li>Click <b>Next &gt;</b> to move to the JAX-WS annotations configuration page:
-<p>This page allows you add to JAX-WS annotations to the SEI or Implementation (if not using an explicit SEI).</p>
-<p>The JAX-WS annotations element values default to those outlined in the JAX-WS specifications.</p>
-<p>If the Implementation bean / SEI contains overloaded methods the JAX-WS annotations added on this page adjust to resolve those conflicts.</p></li>
-<li>Click <b>Next &gt;</b> to move to the Apache CXF java2ws configuration page which allows you to override the default <a href="../reference/java2ws_tab.html">java2ws</a> preferences:
-</li>
- <li>Test Web Service page. This page will be displayed if the service slider on the first page was set to Test service.
- <p>Select the launch button to test the Web Service with the <a href="PLUGINS_ROOT/org.eclipse.jst.ws.consumption.ui.doc.user/tasks/ttestwsdl.html">Web Services Explorer</a>.</p>
- </li>
- <li>Apache CXF JAX-WS client configuration page: This page will be displayed if the client slider on the Web services page was set to <b>Develop client</b>.
- <p>Refer to the <a href="./create_client.html">Generate a JAX-WS Web Service Client</a> page for information on the options displayed on this page.</p>
- </li>
- <li>Web Service Publication Page: Select whether or not you want to publish this Web service to a UDDI registry. Click <b>Finish</b></li>
-</ol>
-<p><img src="../images/ngrelt.png" alt="Related tasks" border="0" ></p>
-<a href="../tasks/create_topdown.html">Generate an SEI and a skeleton implementation bean from a WSDL document using Apache CXF</a><br>
-<a href="../tasks/create_client.html">Generate a JAX-WS Web Service Client from a WSDL document using Apache CXF</a><br>
-</body>
-</html> \ No newline at end of file
diff --git a/docs/org.eclipse.jst.ws.cxf.doc.user/tasks/create_client.html b/docs/org.eclipse.jst.ws.cxf.doc.user/tasks/create_client.html
deleted file mode 100755
index 12e1740..0000000
--- a/docs/org.eclipse.jst.ws.cxf.doc.user/tasks/create_client.html
+++ /dev/null
@@ -1,56 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
- <meta name="copyright" content="Copyright (c) 2009 Shane Clarke. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Shane Clarke - initial API and implementation">
- <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
- <title>Generate a JAX-WS Web Service Client from a WSDL document using Apache CXF</title>
- <link href="../book.css" rel="stylesheet" charset="ISO-8859-1" type="text/css">
- <script type="text/javascript" language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js"></script>
-</head>
-
-<body lang="EN-US">
-<h2>Generate a JAX-WS Web Service Client from a WSDL document using Apache CXF</h2>
-<h3>Prerequisites:</h3>
-<ol>
- <li>Install and configure the Apache CXF runtime environment. See the <a href="PLUGINS_ROOT/org.eclipse.jst.ws.jaxws.doc.user/gettingstarted/requirements.html">Requirements and Installation</a> page for more details.</li>
- <li>Create a Dynamic Web Project and enable it for Apache CXF Web services development as described here: <a href="../tasks/create_cxf_project.html">Create a project for CXF Web services</a>.</li>
-</ol>
-To generate a JAX-WS client from a WSDL document:
-<ol>
- <li>Select <a class="command-link"
- href='javascript:executeCommand("org.eclipse.ui.perspectives.showPerspective(org.eclipse.ui.perspectives.showPerspective.perspectiveId=org.eclipse.jst.j2ee.J2EEPerspective)")'>
- <img src="PLUGINS_ROOT/org.eclipse.help/command_link.png" alt="Open the Java EE perspective"><strong>Window &gt; Open Perspective &gt; Java EE</strong></a> from the top level menu to switch to the Java EE perspective.</li>
- <li>Open the Web Service Client by selecting <a class="command-link" href='javascript:executeCommand("org.eclipse.ui.newWizard(newWizardId=org.eclipse.jst.ws.internal.consumption.ui.wizard.client.clientwizard)")'>
- <img src="PLUGINS_ROOT/org.eclipse.help/command_link.png" alt="Open the new web service client wizard"><strong>File
- &gt; New &gt; Other... &gt; Web Services &gt; Web Service Client</strong></a> from the top level menu.</li>
- <li>Web Services page:
- <p><img src="./images/ws_client_wizard.png" alt="Web Services Client Wizard"></p>
- <ol type="a">
- <Li>Enter the URI to the remote WSDL file that will be used to generate the client.</Li>
- <li>Select <b>Java Proxy</b> as the Client type.</li>
- <li>Move the client slider to the <b>Develop client</b> stage.</li>
- <li>Web service runtime: Select Apache CXF 2.x</li>
- <li>Service project: Select the project in your workspace into which Apache CXF will generate the code.</li>
- </ol>
- </li>
- <li>Click <b>Next &gt;</b> to move to the first Apache CXF wsdl2java Configuration page:
- <ol>
- <li>Output Directory: Specify the source folder in the service project into which the code is generated.</li>
- <li>Package Name: Type the Java package name to use for the generated code.</li>
- <li>Specify WSDL Namespace to Package Name Mappings: Optionally specify WSDL namespace mappings to Java package names.</li>
- <li>Service Name: Specify the name of the WSDL service from which to generate code. The default is to generate code for every service in the WSDL document.</li>
- <li>Binding Files: Specify one or more JAX-WS or JAXB binding files.</li>
- </ol>
- </li>
- <li>Click <b>Next &gt;</b> to move to the second Apache CXF wsdl2java configuration page which allows you to override the <a href="../reference/wsdl2java_tab.html">wsdl2java</a> default preferences:
- </li>
- <li>Click <b>Finish</b> to generate the client.</li>
-</ol>
-<p>The generated client will include a main() that when run will connect to the remote service and invoke every operation on that remote service.</p>
-<p>Before running the client open the client in the Java Editor and edit the generated arguments used to invoke the operations on the service.</p>
-<p>To <b>run</b> the client right-click on the client in the Project Explorer and select <b>Run As > Java Application</b>.
-<p><img src="../images/ngrelt.png" alt="Related tasks" border="0" ></p>
-<a href="../tasks/create_bottomup.html">Create a Web Service from a Java implementation bean using Apache CXF</a><br>
-<a href="../tasks/create_topdown.html">Generate an SEI and a skeleton implementation bean from a WSDL document using Apache CXF</a><br>
-</body>
-</html> \ No newline at end of file
diff --git a/docs/org.eclipse.jst.ws.cxf.doc.user/tasks/create_cxf_project.html b/docs/org.eclipse.jst.ws.cxf.doc.user/tasks/create_cxf_project.html
deleted file mode 100755
index 5c0cd86..0000000
--- a/docs/org.eclipse.jst.ws.cxf.doc.user/tasks/create_cxf_project.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-
-<html>
-<head>
- <meta name="copyright" content="Copyright (c) 2009 Shane Clarke. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Shane Clarke - initial API and implementation">
- <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
- <title>Create a project for CXF Web services</title>
- <link href="../book.css" rel="stylesheet" charset="ISO-8859-1" type="text/css">
- <script type="text/javascript" language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js"></script>
-</head>
-
-<body lang="EN-US">
-<h2>Create a project for CXF Web services</h2>
-<p>To create a Dynamic Web Project and enable it for Apache CXF Web services development perform the following steps:<br/>
-<ol>
-<li>
-Select <a class="command-link" href='javascript:executeCommand("org.eclipse.ui.newWizard(newWizardId=org.eclipse.jst.servlet.ui.project.facet.WebProjectWizard)")'>
-<img src="PLUGINS_ROOT/org.eclipse.help/command_link.png" alt="Open the new dynamic web project wizard"><strong>File &gt; New &gt; Project... &gt; Web &gt; Dynamic Web Project</strong></a> from the top level menu
-enter the following information:
-<ol type="a">
-<li>Project name: Enter a name of the project.</li>
-<li>Target Runtime: Select the server you wish to deploy your Web service to. If it's not listed
-click <b>New</b> and browse to the location where it is installed.</li>
-<li>Dynamic Web Module version: Select version 2.5</li>
-<li>Default Configuration: Select the default configuration for your server type.</li>
-<li>EAR Membership: If deploying to Apache Tomcat ensure that the <b>Add project to an EAR</b> check box is not selected.</li>
-<li>Click Finish</li>
-</ol>
-</li>
-<li><a href="../tasks/install_cxf_facet.html">Install the CXF Project Facet</a></li>
-<li><a href="../tasks/manage_cxf_lib_export.html">Manage the exporting of CXF libraries at deployment time</a></li>
-</ol>
-<p><img src="../images/ngrelr.png" alt="Related reference" border="0" ></p>
-<a href="PLUGINS_ROOT/org.eclipse.jst.ws.cxf.doc.user/reference/cxf_facet.html">CXF Project Facet</a><br>
-<p><img src="../images/ngrelt.png" alt="Related tasks" border="0" ></p>
-<a href="../tasks/create_bottomup.html">Create a Web Service from a Java bean using Apache CXF</a><br>
-<a href="../tasks/create_topdown.html">Generate an SEI and a skeleton implementation bean from a WSDL document using Apache CXF</a><br>
-<a href="../tasks/create_client.html">Generate a JAX-WS Web Service Client from a WSDL document using Apache CXF</a><br>
-</body>
-</html> \ No newline at end of file
diff --git a/docs/org.eclipse.jst.ws.cxf.doc.user/tasks/create_jaxws_handler.html b/docs/org.eclipse.jst.ws.cxf.doc.user/tasks/create_jaxws_handler.html
deleted file mode 100644
index a1a398d..0000000
--- a/docs/org.eclipse.jst.ws.cxf.doc.user/tasks/create_jaxws_handler.html
+++ /dev/null
@@ -1,51 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
- <meta name="copyright" content="Copyright (c) 2010 Shane Clarke. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Shane Clarke - initial API and implementation">
- <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
- <title>Create a JAX-WS Handler</title>
- <link href="../book.css" rel="stylesheet" charset="ISO-8859-1" type="text/css">
- <script type="text/javascript" language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js"></script>
-</head>
-
-<body lang="EN-US">
-<h2>Create a JAX-WS Handler</h2>
-<p>JAX-WS handlers are message interceptors that may be used to carry out additional processing on inbound and outbound messages.</p>
-<p>Protocol handlers are specific to a protocol (e.g. SOAP) and they may access or change protocol specific aspects of a message while logical handlers are protocol agnostic and may only act on the message payload.</p>
-<h3>Prerequisites:</h3>
-<ul>
-<p>Complete one of the following tasks to generate a Web service:<p/>
-<li><a href="../tasks/create_topdown.html">Generate an SEI and a skeleton implementation bean from a WSDL document using Apache CXF</a><br></li>
-<li><a href="../tasks/create_client.html">Generate a JAX-WS Web Service Client from a WSDL document using Apache CXF</a><br></li>
-</ul>
-To create a JAX-WS Handler:
-<ol>
- <li>Select <a class="command-link" href='javascript:executeCommand("org.eclipse.ui.perspectives.showPerspective(org.eclipse.ui.perspectives.showPerspective.perspectiveId=org.eclipse.jst.j2ee.J2EEPerspective)")'>
- <img src="PLUGINS_ROOT/org.eclipse.help/command_link.png" alt="Open the Java EE perspective"><strong>Window &gt; Open Perspective &gt; Java EE</strong></a> from the top level menu to switch to the Java EE perspective.</li>
- <li>Open the JAX-WS Handler wizard by selecting <a class="command-link" href='javascript:executeCommand("org.eclipse.ui.newWizard(newWizardId=org.eclipse.jst.ws.internal.jaxws.ui.wizards.NewJAXWSHandlerWizard)")'>
- <img src="PLUGINS_ROOT/org.eclipse.help/command_link.png" alt="Open the new JAX-WS Handler wizard"><strong>File &gt; New &gt; Other... &gt; Web Services &gt; JAX-WS &gt; JAX-WS Handler</strong></a> from the top level menu.</li>
- <li>JAX-WS Handler page:<p><img src="./images/jaxws_handler_wizard.png" alt="JAX-WS Handler Wizard" ></p>
- <ol type="a">
- <li>Browse to select the <b>Source folder.</b></li>
- <li>Browse to select an existing <b>Package</b> or enter a new package name.</li>
- <li>Enter a <b>Name</b> for the JAX-WS Handler.</li>
- <li>Select the <b>Handler type</b>:</li>
- <ul>
- <li><b>Logical Handler</b></li>
- <li><b>Protocol Handler (SOAP)</b></li>
- </ul>
- In the <b>Configuration</b> section:
- <li>Select the <b>Add this handler to a handler chain</b> checkbox.</li>
- <li><p>Select <b>Create a new handler chain file</b> and browse to select a location in the project where the handler chain file will be generated.<p/>
- <p><b><i>Note</i></b>: To add this JAX-WS handler to an existing handler-chain in the project select <b>Add this handler to an existing handler chain file</b> and browse to select the file location.</p>
- <p>Selecting <b>Next</b> will then display a wizard page which will allow you to select the position of the new JAX-WS handler in the handler chain file.</p></li>
- <li>Select <b>Associate this handler chain with a Web service</b> and browse to select the Web service implementation or service endpoint interface that was created in the prerequisites.</li>
- Click <b>Finish</b>.
- The wizard will generate a skeleton JAX-WS Handler, handler-chain file and annotate the Web service with the <samp class="codeph">@javax.jws.HandlerChain</samp> annotation.
- </ol>
-</ol>
-<p><img src="../images/ngrelt.png" alt="Related tasks" border="0" ></p>
-<a href="../tasks/create_topdown.html">Generate an SEI and a skeleton implementation bean from a WSDL document using Apache CXF</a><br>
-<a href="../tasks/create_client.html">Generate a JAX-WS Web Service Client from a WSDL document using Apache CXF</a><br>
-</body>
-</html> \ No newline at end of file
diff --git a/docs/org.eclipse.jst.ws.cxf.doc.user/tasks/create_topdown.html b/docs/org.eclipse.jst.ws.cxf.doc.user/tasks/create_topdown.html
deleted file mode 100755
index d6a645b..0000000
--- a/docs/org.eclipse.jst.ws.cxf.doc.user/tasks/create_topdown.html
+++ /dev/null
@@ -1,77 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
- <meta name="copyright" content="Copyright (c) 2009 Shane Clarke. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Shane Clarke - initial API and implementation">
- <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
- <title>Generate an SEI and a skeleton implementation bean from a WSDL document using Apache CXF</title>
- <link href="../book.css" rel="stylesheet" charset="ISO-8859-1" type="text/css">
- <script type="text/javascript" language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js"></script>
-</head>
-<body lang="EN-US">
-<h2>Generate an SEI and a skeleton implementation bean from a WSDL document using Apache CXF</h2>
-<h3>Prerequisites:</h3>
-<ol>
- <li>Install and configure the Apache CXF runtime environment. See the <a href="PLUGINS_ROOT/org.eclipse.jst.ws.jaxws.doc.user/gettingstarted/requirements.html">Requirements and Installation</a> page for more details.</li>
- <li>Create a Dynamic Web Project and enable it for Apache CXF Web services development as described here: <a href="../tasks/create_cxf_project.html">Create a project for CXF Web services</a>.</li>
- <li>Create or import a WSDL document into the Web Content folder of the Dynamic Web Project.</li>
-</ol>
-<br/>
-To create an SEI and a skeleton implementation bean from a WSDL document using the Apache CXF runtime environment:
-<ol>
- <li>Select <a class="command-link"
- href='javascript:executeCommand("org.eclipse.ui.perspectives.showPerspective(org.eclipse.ui.perspectives.showPerspective.perspectiveId=org.eclipse.jst.j2ee.J2EEPerspective)")'>
- <img src="PLUGINS_ROOT/org.eclipse.help/command_link.png" alt="Open the Java EE perspective"><strong>Window &gt; Open Perspective &gt; Java EE</strong></a> from the top level menu to switch to the Java EE perspective.</li>
- <li>In the Project Explorer view select the WSDL document that you created or imported into the Dynamic Web Projects Web Content folder.</li>
- <li>Open the Web Service wizard by selecting <a class="command-link" href='javascript:executeCommand("org.eclipse.ui.newWizard(newWizardId=org.eclipse.jst.ws.creation.ui.wizard.serverwizard)")'>
- <img src="PLUGINS_ROOT/org.eclipse.help/command_link.png" alt="Open the new web service wizard"><strong>File &gt; New &gt; Other... &gt; Web Services &gt; Web Service</strong></a> from the top level menu.</li>
- <li>Web Services page: select <b>Top down Java bean Web Service</b> as the Web service type and browse to select the WSDL document from which to generate the SEI and implementation bean:
- <p><img src="./images/top_down_wizard.png" alt="Top down Web Services Wizard"></p>
- <ol type="a">
- <li>Move the service slider to the stage of Web services development that you wish to complete.</li>
- <ul>
- <li>Develop: Invokes the Apache CXF wsdl2java tool using the preference defaults and the information gathered in the wizard to generate an annotated Service Endpoint Interface and supporting classes. The wizard also generates a JAX-WS endpoint configuration file.</li>
- <li>Assemble: If required by the target server this phase
- assembles and configures the project that hosts the Web service into an EAR.</li>
- <li>Deploy: Generates the deployment artifacts for the Web service.</li>
- <li>Install: Installs and configures the Web Module and EARs on the target server.</li>
- <li>Start: Starts the target server once the Web service has been installed on it.</li>
- <li>Test: Use the Web Service Explorer to test the generated Web service.</li>
- </ul>
- <li>Server: Select a server to deploy your Web service to.</li>
- <li>Web service runtime: Select Apache CXF 2.x</li>
- <li>Service project: Select the project in your workspace into which Apache CXF will generate the code.</li>
- <li>If you wish to generate a client for your Web service, select <b>Java Proxy</b> as the Client type:
- <ul>
- <li>Move the client slider to the <b>Develop client</b> stage.</li>
- <li>Client project: Select a different project into which to generate the client code. The wizard will create the project for you if it doesn't exist and configure it with the CXF Facet.</li>
- </ul>
- </li>
- <li>Publish the Web service: Launch the Web Services Explorer to publish your Web service to a UDDI registry.</li>
- <li>Monitor the Web service: Monitor the Web service's SOAP traffic using the TCP/IP Monitor.</li>
- </ol>
- </li>
- <li>Click <b>Next &gt;</b> to move to the first Apache CXF wsdl2java Configuration page:
- <ol>
- <li>Output Directory: Specify the source folder in the service project into which the code is generated.</li>
- <li>Package Name: Type the Java package name to use for the generated code.</li>
- <li>Specify WSDL Namespace to Package Name Mappings: Optionally specify WSDL namespace mappings to Java package names.</li>
- <li>Service Name: Specify the name of the WSDL service from which to generate code. The default is to generate code for every service in the WSDL document.</li>
- <li>Binding Files: Specify one or more JAX-WS or JAXB binding files.</li>
- </ol>
- </li>
- <li>Click <b>Next &gt;</b> to move to the second Apache CXF wsdl2java configuration page which allows you to override the <a href="../reference/wsdl2java_tab.html">wsdl2java</a> default preferences:
- <p>Ensure that the <b>Generate Implementation</b> check box is selected and click <b>Next &gt;</b>
- </li>
- <li>Test Web Service page. This page will be displayed if the service slider on the first page was set to Test service.
- <p>Select the launch button to test the Web Service with the <a href="PLUGINS_ROOT/org.eclipse.jst.ws.consumption.ui.doc.user/tasks/ttestwsdl.html">Web Services Explorer</a>.</p>
- </li>
- <li>Apache CXF JAX-WS client configuration page: This page will be displayed if the client slider on the Web services page was set to <b>Develop client</b>.
- <p>Refer to the <a href="./create_client.html">Create a JAX-WS Web Service Client</a> page for information on the options displayed on this page.</p>
- </li>
- <li>Web Service Publication Page: Select whether or not you want to publish this Web service to a UDDI registry. Click <b>Finish</b></li>
-</ol>
-<p><img src="../images/ngrelt.png" alt="Related tasks" border="0" ></p>
-<a href="../tasks/create_bottomup.html">Create a Web Service from a Java implementation bean using Apache CXF</a><br>
-<a href="../tasks/create_client.html">Generate a JAX-WS Web Service Client from a WSDL document using Apache CXF</a><br>
-</body>
-</html> \ No newline at end of file
diff --git a/docs/org.eclipse.jst.ws.cxf.doc.user/tasks/cxf_ant_bu_prop_ref.html b/docs/org.eclipse.jst.ws.cxf.doc.user/tasks/cxf_ant_bu_prop_ref.html
deleted file mode 100644
index a429ca1..0000000
--- a/docs/org.eclipse.jst.ws.cxf.doc.user/tasks/cxf_ant_bu_prop_ref.html
+++ /dev/null
@@ -1,135 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-
-<html>
-<head>
- <meta name="copyright" content="Copyright (c) 2010 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">
- <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
- <title>Bottom-up CXF Web service Ant task properties file reference</title>
- <link href="../book.css" rel="stylesheet" charset="ISO-8859-1" type="text/css">
-</head>
-
-<body lang="EN-US">
-<h2>Bottom-up CXF Web service Ant task properties file reference</h2>
-
-<div>
-<p>The <kbd class="userinput">cxf_bujava.properties</kbd> file is
-used to pass data to the Web services Ant tasks when creating a CXF
-Web service . This file shows the available options.</p>
-
-<div class="section">
-<h4 class="sectiontitle">Parameters</h4>
-<dl>
- <dt class="dlterm">ScenarioType</dt>
- <dd><span class="synph"> Options: <samp class="codeph">service</samp>
- </span></dd>
-
- <dd class="ddexpand">This is a required element that tells the Ant
- task if it is creating a Web service or a Web service client.</dd>
-
-
- <dt class="dlterm">InitialSelection</dt>
-
- <dd>Enter the workspace relative URI to the Java bean within your workspace.
- For example <kbd class="userinput">/dynamicWebProjectName/src/myBean.java</kbd></dd>
-
- <dt class="dlterm">ListRuntimes</dt>
-
- <dd><span class="synph"> Options: <samp class="codeph">true</samp>
- <samp class="codeph">false</samp></span></dd>
-
- <dd class="ddexpand">If <samp class="codeph">true</samp> is
- selected, the list of valid runtime options will be provided when the
- Ant task is run.</dd>
-
- <dt class="dlterm">ListServers</dt>
-
- <dd><span class="synph"> Options: <samp class="codeph">true</samp>
- <samp class="codeph">false</samp></span></dd>
-
- <dd class="ddexpand">If <samp class="codeph">true</samp> is
- selected, the list of valid server options will be provided when the
- Ant task is run.</dd>
-
- <dt class="dlterm">Service.RuntimeId</dt>
-
- <dd>This is the ID of the CXF Web service runtime. This parameter should not modified.</dd>
-
- <dt class="dlterm">Service.ServerId</dt>
-
- <dd>Options:<ul class="simple">
- <li><samp class="codeph">org.eclipse.jst.server.tomcat.x</samp> (where <samp class="codeph">x</samp> is <samp class="codeph">60</samp> or <samp class="codeph">70</samp>)</li>
-
- <li><samp class="codeph">org.eclipse.jst.server.generic.jbossx</samp> (where <samp class="codeph">x</samp> is <samp class="codeph">42</samp> or <samp class="codeph">5</samp>)</li>
- </ul>
- </dd>
-
- <dd class="ddexpand">This is the ID of the target server. Delete
- or comment out this parameter to have the Ant task select the correct
- value based on the server settings of the Dynamic Web project.</dd>
-
- <dt class="dlterm">ServiceProjectName</dt>
-
- <dd>By default the service project is given the name of the Java bean from which it is created.
- Use this parameter to create the service project with a different name.</dd>
-
- <dt class="dlterm">ServiceEarProjectName</dt>
-
- <dd>By default the service EAR project is given the name of the Java bean from which it is created.
- Use this parameter to create the service EAR project with a different name.</dd>
-
- <dt class="dlterm">GenClient</dt>
-
- <dd><span class="synph"> Options: <samp class="codeph">true</samp>
- <samp class="codeph">false</samp></span></dd>
-
- <dd class="ddexpand">If <samp class="codeph">true</samp> a
- client mainline that uses JAX-WS APIs will be generated.</dd>
-
- <dt class="dlterm">GenServer</dt>
-
- <dd><span class="synph"> Options: <samp class="codeph">true</samp>
- <samp class="codeph">false</samp></span></dd>
-
- <dd class="ddexpand">If <samp class="codeph">true</samp> a
- server mainline that uses JAX-WS APIs will be generated.</dd>
-
- <dt class="dlterm">GenWrapperFaultBeans</dt>
-
- <dd><span class="synph"> Options: <samp class="codeph">true</samp>
- <samp class="codeph">false</samp></span></dd>
-
- <dd class="ddexpand">If <samp class="codeph">true</samp> the
- wrapper and fault beans will be generated.</dd>
-
- <dt class="dlterm">GenWSDL</dt>
-
- <dd><span class="synph"> Options: <samp class="codeph">true</samp>
- <samp class="codeph">false</samp></span></dd>
-
- <dd class="ddexpand">If <samp class="codeph">true</samp> a
- WSDL file will be generated.</dd>
-
- <dt class="dlterm">GenXSDImports</dt>
-
- <dd><span class="synph"> Options: <samp class="codeph">true</samp>
- <samp class="codeph">false</samp></span></dd>
-
- <dd class="ddexpand">If <samp class="codeph">true</samp> schemas
- will be output to separate files and imports will be used to load them
- into the wsdl instead of inlining them.</dd>
-
- <dt class="dlterm">UseSOAP12Binding</dt>
-
- <dd><span class="synph"> Options: <samp class="codeph">true</samp>
- <samp class="codeph">false</samp></span></dd>
-
- <dd class="ddexpand">If <samp class="codeph">true</samp> the
- generated WSDL file will include a SOAP 1.2 binding.</dd>
-
- <dt class="dlterm">WsdlFileName</dt>
-
- <dd>Set the name of the generated WSDL file.</dd>
-
-</dl>
-</body>
-</html> \ No newline at end of file
diff --git a/docs/org.eclipse.jst.ws.cxf.doc.user/tasks/cxf_ant_client_prop_ref.html b/docs/org.eclipse.jst.ws.cxf.doc.user/tasks/cxf_ant_client_prop_ref.html
deleted file mode 100644
index 6e3f717..0000000
--- a/docs/org.eclipse.jst.ws.cxf.doc.user/tasks/cxf_ant_client_prop_ref.html
+++ /dev/null
@@ -1,155 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-
-<html>
-<head>
- <meta name="copyright" content="Copyright (c) 2010 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">
- <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
- <title>CXF Web service client Ant task properties file reference</title>
- <link href="../book.css" rel="stylesheet" charset="ISO-8859-1" type="text/css">
-</head>
-
-<body lang="EN-US">
-<h2>CXF Web service client Ant task properties file reference</h2>
-
-<div><p>The <kbd class="userinput">cxf_client.properties</kbd> file is used
-to pass data to the Web services Ant tasks when creating a CXF Web service
-client. This file shows the available options.</p>
-
-<div class="section"><h4 class="sectiontitle">Parameters</h4><dl>
-<dt class="dlterm">ScenarioType</dt>
-
-<dd><span class="synph"> Options: <samp class="codeph">client</samp></span></dd>
-
-<dd class="ddexpand">This is a required element that tells the Ant task if it is creating a
-Web service or a Web service client.</dd>
-
- <dt class="dlterm">InitialSelection</dt>
-
- <dd>Enter URI to the WSDL file. This URI may be a workspace relative URI or point to a remote URI.
- For example <kbd class="userinput">/dynamicWebProjectName/WebContent/myService.wsdl</dd> or <kbd class="userinput">http://localhost:8080/dynamicWebProjectName/services/MyServicePort?wsdl</dd>
-
- <dt class="dlterm">ListRuntimes</dt>
-
- <dd><span class="synph"> Options: <samp class="codeph">true</samp> <samp class="codeph">false</samp></span></dd>
-
- <dd class="ddexpand">If <samp class="codeph">true</samp> is selected, the list of valid runtime options
- will be provided when the Ant task is run.</dd>
-
-
- <dt class="dlterm">ListServers</dt>
-
- <dd><span class="synph"> Options: <samp class="codeph">true</samp> <samp class="codeph">false</samp></span></dd>
-
- <dd class="ddexpand">If <samp class="codeph">true</samp> is selected, the list of valid server options
- will be provided when the Ant task is run.</dd>
-
- <dt class="dlterm">Client.RuntimeId</dt>
-
- <dd>This is the ID of the CXF Web service runtime. This parameter should not modified.</dd>
-
- <dt class="dlterm">Client.ServerId</dt>
-
- <dd>Options:<ul class="simple">
- <li><samp class="codeph">org.eclipse.jst.server.tomcat.x</samp> (where <samp class="codeph">x</samp> is <samp class="codeph">60</samp> or <samp class="codeph">70</samp>)</li>
-
- <li><samp class="codeph">org.eclipse.jst.server.generic.jbossx</samp> (where <samp class="codeph">x</samp> is <samp class="codeph">42</samp> or <samp class="codeph">5</samp>)</li>
- </ul>
- </dd>
-
- <dd class="ddexpand">This is the ID of the target server. Delete or comment out this parameter
- to have the Ant task select the correct value based on the server settings of the Dynamic Web project.</dd>
-
-
- <dt class="dlterm">ClientProjectName</dt>
-
- <dd>By default the client project is given the name of the WSDL file from which it is created.
- Use this parameter to create the service project with a different name.</dd>
-
- <dt class="dlterm">ClientEarProjectName</dt>
-
- <dd>By default the client EAR project is given the name of the WSDL file from which it is created.
- Use this parameter to create the service EAR project with a different name.</dd>
-
-
-< dt class="dlterm">ClientComponentType</dt>
-
- <dd><p>Options: <kbd class="userinput">template.jst.web</kbd> <kbd class="userinput">template.cxf.core</kbd></p>
- <p>Use this parameter to select the type of client project.</p>
- </dd>
-
- <dt class="dlterm">Mappings</dt>
-
- <dd>Enter the workspace relative URI to a property file containing mappings.</dd>
-
- <dd class="ddexpand">Mappings are used to override the WSDL namespace to package name mapping of the generated Java classes.
- The content of the properties file must be of the format wsdl-namespace=package. You will need to escape some special characters in the
- properties files. For example <samp class="codeph">http://someNamespace=somePackage</samp> should
- be <samp class="codeph">http\://someNamespace=somePackage</samp>. Otherwise, the colon
- (:) would be treated as delimiter resulting in trying to map <samp class="codeph">http</samp> to <samp class="codeph">//someNamespace=somePackage</samp>.</dd>
-
- <h3>XJC Args: Specify the arguments to be passed directly to the XJC</h3>
-
- <dt class="dlterm">xjc_dv</dt>
-
- <dd><span class="synph"> Options: <samp class="codeph">true</samp>
- <samp class="codeph">false</samp></span></dd>
-
- <dd class="ddexpand">If <samp class="codeph">true</samp>
- fields will be initialised with their default values.</dd>
-
- <dt class="dlterm">xjc_ts</dt>
-
- <dd><span class="synph"> Options: <samp class="codeph">true</samp>
- <samp class="codeph">false</samp></span></dd>
-
- <dd class="ddexpand">If <samp class="codeph">true</samp>
- a toString() method will be added to generated classes.</dd>
-
- <dt class="dlterm">xjc_ts_multi</dt>
-
- <dd><span class="synph"> Options: <samp class="codeph">true</samp>
- <samp class="codeph">false</samp></span></dd>
-
- <dd class="ddexpand">If <samp class="codeph">true</samp> the
- toString() method will produce multi line output.</dd>
-
- <dt class="dlterm">xjc_ts_simple</dt>
-
- <dd><span class="synph"> Options: <samp class="codeph">true</samp>
- <samp class="codeph">false</samp></span></dd>
-
- <dd class="ddexpand">If <samp class="codeph">true</samp> the
- toString() method will produce single line terse output.</dd>
-
- <dt class="dlterm">xjc_locator</dt>
-
- <dd><span class="synph"> Options: <samp class="codeph">true</samp>
- <samp class="codeph">false</samp></span></dd>
-
- <dd class="ddexpand">If <samp class="codeph">true</samp> the
- source location support for generated code will be enabled.</dd>
-
- <dt class="dlterm">xjc_sync_methods</dt>
-
- <dd><span class="synph"> Options: <samp class="codeph">true</samp>
- <samp class="codeph">false</samp></span></dd>
-
- <dd class="ddexpand">If <samp class="codeph">true</samp>
- accessor methods will be generated with the 'synchronized' keyword.</dd>
-
- <dt class="dlterm">xjc_mark_generated</dt>
-
- <dd><span class="synph"> Options: <samp class="codeph">true</samp>
- <samp class="codeph">false</samp></span></dd>
-
- <dd class="ddexpand">If <samp class="codeph">true</samp>
- @Generated annotations will be added to the generated code.</dd>
-
- <dt class="dlterm">Bindings</dt>
-
- <dd>Binding Files. Comma delimited string of absolute paths in the
- local file system of JAXWS or JAXB binding files.</dd>
-
-</dl>
-</body>
-</html> \ No newline at end of file
diff --git a/docs/org.eclipse.jst.ws.cxf.doc.user/tasks/cxf_ant_cmd.html b/docs/org.eclipse.jst.ws.cxf.doc.user/tasks/cxf_ant_cmd.html
deleted file mode 100644
index 516325b..0000000
--- a/docs/org.eclipse.jst.ws.cxf.doc.user/tasks/cxf_ant_cmd.html
+++ /dev/null
@@ -1,57 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
- <meta name="copyright" content="Copyright (c) 2010 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">
- <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
- <title>Using the Ant Tasks at the Command Line</title>
- <link href="../book.css" rel="stylesheet" charset="ISO-8859-1" type="text/css">
- <script type="text/javascript" language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js"></script>
-</head>
-
-<body lang="EN-US">
-<h2>Using the Ant Tasks at the Command Line</h2>
-<h3>Prerequisites:</h3>
-<ol>
- <li>Import the CXF Ant property file for the scenario being run into an Eclipse workspace before running the task from the command line
- by selecting <a class="command-link" href='javascript:executeCommand("org.eclipse.ui.newWizard(newWizardId=org.eclipse.wst.command.env.ui.AntFileImportWizard)")'>
- <img src="PLUGINS_ROOT/org.eclipse.help/command_link.png" alt="Open the ant files wizard"><strong>File &gt; New &gt; Other... &gt; Web Services &gt; Ant Files</strong></a> from the top level menu.
- </li>
- <li>Edit the CXF Ant property file and set the <samp class="codeph">scenarioType</samp> and
- <samp class="codeph">initialSelection</samp> parameters:
- <ul>
- <li><samp class="codeph">cxf_tdjava.properties</samp>. Ensure the scenarioType parameter is set to service and the initialSelection points to the location of your WSDL file.
- See <a href="../tasks/cxf_ant_td_prop_ref.html">Top-down CXF Web service Ant task properties file reference</a> for additional information on setting these parameters.</li>
- <li><samp class="codeph">cxf_bujava.properties</samp>. Ensure the scenarioType parameter is set to service and the initialSelection points to the location of your Java bean.
- See <a href="../tasks/cxf_ant_bu_prop_ref.html">Bottom-up CXF Web service Ant task properties file reference</a> for additional information on setting these parameters.</li>
- <li><samp class="codeph">cxf_client.properties</samp>. Ensure the scenarioType parameter is set to client and the initialSelection points to the location of your WSDL file.
- See <a href="../tasks/cxf_ant_client_prop_ref.html">CXF Web service client Ant task properties file reference</a> for additional information on setting these parameters.</li>
- </ul>
- </li>
-</ol>
-To invoke the Ant tasks from the command line complete the following steps:
-<ol>
- <li>Navigate to the plugins directory of your WTP installation and extract the contents of the
- <b>org.eclipse.wst.command.env</b> plug-in.</li>
- <li>In the extracted plug-in go to the <b>ant</b> folder. The following files should exist there:
- <ul>
- <li><b>wsant.bat</b></li>
- <li><b>wsgen.xml</b></li>
- </ul>
- </li>
- <li>Copy the required CXF Ant property file that was imported in the prerequisites into the <b>ant</b> folder.</li>
- <li>Edit the <b>wsgen.xml</b> file to point to the CXF Ant property file.</li>
- <li>Edit the <b>wsant.bat</b> file and set the following local environment variables to reflect your system configuration:
- <ul>
- <li><samp class="codeph">JAVAEXE</samp> the location of a 1.5 or higher JDK.</li>
- <li><samp class="codeph">INSTALL_DIRECTORY</samp> the Eclipse install directory.</li>
- <li><samp class="codeph">LAUNCHER_JAR</samp> the location of the Eclipse Equinox Launcher jar.</li>
- <li><samp class="codeph">WORKSPACE</samp> the location of the workspace that contains the Dynamic Web projects being used.</li>
- </ul>
- </li>
- <li>To run the Ant task open a command line, navigate to the <b>ant</b> folder and type <i>wsant</i></li>
- <li>Check the <b>wsgen.txt</b> file for output after the generation has completed.</li>
- <li>Navigate to the Dynamic Web project in the file system or refresh the project in Eclipse to find the generated artifacts.</li>
-</ol>
-
-</body>
-</html> \ No newline at end of file
diff --git a/docs/org.eclipse.jst.ws.cxf.doc.user/tasks/cxf_ant_td_prop_ref.html b/docs/org.eclipse.jst.ws.cxf.doc.user/tasks/cxf_ant_td_prop_ref.html
deleted file mode 100644
index c021cf8..0000000
--- a/docs/org.eclipse.jst.ws.cxf.doc.user/tasks/cxf_ant_td_prop_ref.html
+++ /dev/null
@@ -1,214 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-
-<html>
-<head>
- <meta name="copyright" content="Copyright (c) 2010 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">
- <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
- <title>Top-down CXF Web service Ant task properties file reference</title>
- <link href="../book.css" rel="stylesheet" charset="ISO-8859-1" type="text/css">
-</head>
-
-<body lang="EN-US">
-<h2>Top-down CXF Web service Ant task properties file reference</h2>
-
-<div><p>The <kbd class="userinput">cxf_tdjava.properties</kbd> file is used
-to pass data to the Web services Ant tasks when creating a CXF Web service.
-This file shows the available options.</p>
-
- <div class="section"><h4 class="sectiontitle">Parameters</h4><dl>
- <dt class="dlterm">ScenarioType</dt>
-
- <dd><span class="synph"> Options: <samp class="codeph">service</samp> </span></dd>
-
- <dd class="ddexpand">This is a required element that tells the Ant task if it is creating a
- Web service or a Web service client.</dd>
-
- <dt class="dlterm">InitialSelection</dt>
-
- <dd>Enter URI to the WSDL file. This URI may be a workspace relative URI or point to a remote URI.
- For example <kbd class="userinput">/dynamicWebProjectName/WebContent/myService.wsdl</dd> or <kbd class="userinput">http://localhost:8080/dynamicWebProjectName/services/MyServicePort?wsdl</dd>
-
- <dt class="dlterm">ListRuntimes</dt>
-
- <dd><span class="synph"> Options: <samp class="codeph">true</samp> <samp class="codeph">false</samp></span></dd>
-
- <dd class="ddexpand">If <samp class="codeph">true</samp> is selected, the list of valid runtime options
- will be provided when the Ant task is run.</dd>
-
- <dt class="dlterm">ListServers</dt>
-
- <dd><span class="synph"> Options: <samp class="codeph">true</samp> <samp class="codeph">false</samp></span></dd>
-
- <dd class="ddexpand">If <samp class="codeph">true</samp> is selected, the list of valid server options
- will be provided when the Ant task is run.</dd>
-
- <dt class="dlterm">Service.RuntimeId</dt>
-
- <dd>This is the ID of the CXF Web service runtime. This parameter should not modified.</dd>
-
- <dt class="dlterm">Service.ServerId</dt>
-
- <dd>Options:<ul class="simple">
- <li><samp class="codeph">org.eclipse.jst.server.tomcat.x</samp> (where <samp class="codeph">x</samp> is <samp class="codeph">60</samp> or <samp class="codeph">70</samp>)</li>
-
- <li><samp class="codeph">org.eclipse.jst.server.generic.jbossx</samp> (where <samp class="codeph">x</samp> is <samp class="codeph">42</samp> or <samp class="codeph">5</samp>)</li>
- </ul>
- </dd>
-
- <dd class="ddexpand">This is the ID of the target server. Delete or comment out this parameter
- to have the Ant task select the correct value based on the server settings
- of the Dynamic Web project.</dd>
-
- <dt class="dlterm">ServiceProjectName</dt>
-
- <dd>By default the service project is given the name of the WSDL file from which it is created.
- Use this parameter to create the service project with a different name.</dd>
-
- <dt class="dlterm">ServiceEarProjectName</dt>
-
- <dd>By default the service EAR project is given the name of the WSDL file from which it is created.
- Use this parameter to create the service EAR project with a different name.</dd>
-
- <dt class="dlterm">Mappings</dt>
-
- <dd>Enter the workspace relative URI to a property file containing mappings.</dd>
-
- <dd class="ddexpand">Mappings are used to override the WSDL namespace to package name mapping of the generated Java classes.
- The content of the properties file must be of the format wsdl-namespace=package. You will need to escape some special characters in the
- properties files. For example <samp class="codeph">http://someNamespace=somePackage</samp> should
- be <samp class="codeph">http\://someNamespace=somePackage</samp>. Otherwise, the colon
- (:) would be treated as delimiter resulting in trying to map <samp class="codeph">http</samp> to <samp class="codeph">//someNamespace=somePackage</samp>.</dd>
-
- <dt class="dlterm">JavaOutput</dt>
-
- <dd>Enter the workspace relative URI to an existing Java source folder for
- the generated Java code.</dd>
-
- <dt class="dlterm">ServiceName</dt>
-
- <dd class="ddexpand">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</dd>
-
- <dt class="dlterm">GenServer</dt>
-
- <dd><span class="synph"> Options: <samp class="codeph">true</samp>
- <samp class="codeph">false</samp></span></dd>
-
- <dd class="ddexpand">If <samp class="codeph">true</samp>
- a server mainline that uses JAX-WS APIs will be generated.</dd>
-
- <dt class="dlterm">GenImpl</dt>
-
- <dd><span class="synph"> Options: <samp class="codeph">true</samp>
- <samp class="codeph">false</samp></span></dd>
-
- <dd class="ddexpand">If <samp class="codeph">true</samp> the
- starting point code for an implementation object will be generated.</dd>
-
- <dt class="dlterm">DefaultValues</dt>
-
- <dd><span class="synph"> Options: <samp class="codeph">true</samp>
- <samp class="codeph">false</samp></span></dd>
-
- <dd class="ddexpand">If <samp class="codeph">true</samp> the
- default values will be generated in the implementation and client.
- Ignored if implementation or client is not being generated</dd>
-
- <dt class="dlterm">ExtSOAPHeaders</dt>
-
- <dd><span class="synph"> Options: <samp class="codeph">true</samp>
- <samp class="codeph">false</samp></span></dd>
-
- <dd class="ddexpand">If <samp class="codeph">true</samp>
- processing of extended soap header message binding will be enabled.</dd>
-
- <dt class="dlterm">DefaultNamespace</dt>
-
- <dd><span class="synph"> Options: <samp class="codeph">true</samp>
- <samp class="codeph">false</samp></span></dd>
-
- <dd class="ddexpand">If <samp class="codeph">true</samp>
- loading of the default namespace package name mapping will be enabled.</dd>
-
- <dt class="dlterm">DefaultExcludesNamespace</dt>
-
- <dd><span class="synph"> Options: <samp class="codeph">true</samp>
- <samp class="codeph">false</samp></span></dd>
-
- <dd class="ddexpand">If <samp class="codeph">true</samp> the
- loading of the default excludes namespace mapping will be enabled.</dd>
-
- <dt class="dlterm">AutoNameResolution</dt>
-
- <dd><span class="synph"> Options: <samp class="codeph">true</samp>
- <samp class="codeph">false</samp></span></dd>
-
- <dd class="ddexpand">If <samp class="codeph">true</samp>
- Auto Name Resolution will be enabled.</dd>
-
- <h3>XJC Args: Specify the arguments to be passed directly to the XJC</h3>
-
- <dt class="dlterm">xjc_dv</dt>
-
- <dd><span class="synph"> Options: <samp class="codeph">true</samp>
- <samp class="codeph">false</samp></span></dd>
-
- <dd class="ddexpand">If <samp class="codeph">true</samp>
- fields will be initialised with their default values.</dd>
-
- <dt class="dlterm">xjc_ts</dt>
-
- <dd><span class="synph"> Options: <samp class="codeph">true</samp>
- <samp class="codeph">false</samp></span></dd>
-
- <dd class="ddexpand">If <samp class="codeph">true</samp>
- a toString() method will be added to generated classes.</dd>
-
- <dt class="dlterm">xjc_ts_multi</dt>
-
- <dd><span class="synph"> Options: <samp class="codeph">true</samp>
- <samp class="codeph">false</samp></span></dd>
-
- <dd class="ddexpand">If <samp class="codeph">true</samp> the
- toString() method will produce multi line output.</dd>
-
- <dt class="dlterm">xjc_ts_simple</dt>
-
- <dd><span class="synph"> Options: <samp class="codeph">true</samp>
- <samp class="codeph">false</samp></span></dd>
-
- <dd class="ddexpand">If <samp class="codeph">true</samp> the
- toString() method will produce single line terse output.</dd>
-
- <dt class="dlterm">xjc_locator</dt>
-
- <dd><span class="synph"> Options: <samp class="codeph">true</samp>
- <samp class="codeph">false</samp></span></dd>
-
- <dd class="ddexpand">If <samp class="codeph">true</samp> the
- source location support for generated code will be enabled.</dd>
-
- <dt class="dlterm">xjc_sync_methods</dt>
-
- <dd><span class="synph"> Options: <samp class="codeph">true</samp>
- <samp class="codeph">false</samp></span></dd>
-
- <dd class="ddexpand">If <samp class="codeph">true</samp>
- accessor methods will be generated with the 'synchronized' keyword.</dd>
-
- <dt class="dlterm">xjc_mark_generated</dt>
-
- <dd><span class="synph"> Options: <samp class="codeph">true</samp>
- <samp class="codeph">false</samp></span></dd>
-
- <dd class="ddexpand">If <samp class="codeph">true</samp>
- @Generated annotations will be added to the generated code.</dd>
-
- <dt class="dlterm">Bindings</dt>
-
- <dd>Binding Files. Comma delimited string of absolute paths in the
- local file system of JAXWS or JAXB binding files.</dd>
-
-</dl>
-</body>
-</html> \ No newline at end of file
diff --git a/docs/org.eclipse.jst.ws.cxf.doc.user/tasks/cxf_ant_ws.html b/docs/org.eclipse.jst.ws.cxf.doc.user/tasks/cxf_ant_ws.html
deleted file mode 100644
index bf6cd56..0000000
--- a/docs/org.eclipse.jst.ws.cxf.doc.user/tasks/cxf_ant_ws.html
+++ /dev/null
@@ -1,53 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<meta name="copyright"
- content="Copyright (c) 2010 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">
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<title>Creating a Web service using Ant tasks in the Workbench</title>
-<link href="../book.css" rel="stylesheet" charset="ISO-8859-1"
- type="text/css">
-<script type="text/javascript" language="JavaScript"
- src="PLUGINS_ROOT/org.eclipse.help/livehelp.js"></script>
-</head>
-
-<body lang="EN-US">
-<h2>Creating a Web service using Ant tasks in the Workbench</h2>
-<p>You can use Ant through the Eclipse workspace to generate a Web service using the CXF run-time environment.
-Both top-down and bottom-up Web services development is supported with the Ant tasks.</p>
-<p>Before creating the Web service you must:</p>
-<ul>
- <li>Complete the prerequisites in: <a href="../tasks/ant_tasks.html">Creating Web services and clients using Apache CXF and Ant tasks</a></li>
- <li>If you are creating a top-down Web service, create or import a WSDL file into the WebContent folder of the Dynamic Web project.</li>
- <li>If you are creating a bottom-up Web service, create or import a Java bean into the source folder of the Dynamic Web project.</li>
- <p><b><i>Note</i></b>: There are certain limitations when developing a bottom-up Web service using the Ant tasks as opposed to the Web services wizards.
- If an explicit service endpoint interface (SEI) is required one must be extracted beforehand and both the implementation class and SEI must be annotated with
- @javax.jws.WebService before running the Ant build file.</p>
-</ul>
-<p>To begin you need to modify the Ant properties file than was imported using the Ant Files wizard in the prerequisites.</p>
-<ol>
- <li>Edit the <samp class="codeph">cxf_tdjava.properties</samp> if doing top-down development or the <samp class="codeph">cxf_bujava.properties</samp> file for bottom-up development.</li>
- <ol type="a">
- <li>Ensure the scenarioType parameter is set to service.</li>
- <li>Set the initialSelection parameter to the location of your WSDL file (top-down) or Java bean (bottom-up).</li>
- <li>All other parameters are optional and should be deleted if not explicitly set. The default values
- for the remaining properties will be retrieved from the Dynamic Web project settings and preferences.
- For additional information on how to set these parameters refer to:
- <ul>
- <li><a href="../tasks/cxf_ant_td_prop_ref.html">Top-down CXF Web service Ant task properties file reference</a></li>
- <li><a href="../tasks/cxf_ant_bu_prop_ref.html">Bottom-up CXF Web service Ant task properties file reference</a></li>
- </ul>
- </li>
- Save the properties file.
- </ol>
- <li>Select the <samp class="codeph">cxf_tdjava.xml</samp> (top-down) or <samp class="codeph">cxf_bujava.xml</samp> (bottom-up) and from the top level menu
- and select <b>Run > External Tools > External Tools Configurations.</b></li>
- <li>In the dialog that opens select <b>Ant Build</b> and then select the <b>'New launch configuration'</b> button in the toolbar.
- Select the <b>JRE</b> tab and select <b>Run in the same JRE as the workspace</b>.
- Click <b>Apply</b> and then <b>Run</b>.</li>
- <li>A <samp class="codeph">Build Successful</samp> message will be output to the console once the Web service has been generated.</li>
-</ol>
- <p><img src="../images/ngrelt.png" alt="Related tasks" border="0"></p>
- <a href="../tasks/cxf_ant_ws_client.html">Creating a Web service client using Ant tasks in the Workbench</a>
- </body>
-</html> \ No newline at end of file
diff --git a/docs/org.eclipse.jst.ws.cxf.doc.user/tasks/cxf_ant_ws_client.html b/docs/org.eclipse.jst.ws.cxf.doc.user/tasks/cxf_ant_ws_client.html
deleted file mode 100644
index 8399482..0000000
--- a/docs/org.eclipse.jst.ws.cxf.doc.user/tasks/cxf_ant_ws_client.html
+++ /dev/null
@@ -1,47 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<meta name="copyright"
- content="Copyright (c) 2010 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">
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<title>Creating a Web service client using Ant tasks in the Workbench</title>
-<link href="../book.css" rel="stylesheet" charset="ISO-8859-1"
- type="text/css">
-<script type="text/javascript" language="JavaScript"
- src="PLUGINS_ROOT/org.eclipse.help/livehelp.js"></script>
-</head>
-
-<body lang="EN-US">
-<h2>Creating a Web service client using Ant tasks in the Workbench</h2>
-<p>You can use Ant through the Eclipse workspace to generate a Web service client using the CXF run-time environment.</p>
-<p>Before creating the Web service you must:</p>
-<ul>
- <li>Complete the prerequisites in:<a href="../tasks/ant_tasks.html">Creating Web services and clients using Apache CXF and Ant tasks</a></li>
- <!-- <li>Create or import a WSDL file into the WebContent folder of the dynamic Web project.</li> -->
-</ul>
-<p>To begin you need to modify the Ant properties file than was imported using the Ant Files wizard in the prerequisites.</p>
-<ol>
- <li>Edit the <samp class="codeph">cxf_client.properties</samp> file that you imported in the prerequisites step.</li>
- <ol type="a">
- <li>Ensure the scenarioType parameter is set to client.</li>
- <li>Set the initialSelection parameter to the location of your WSDL file.</li>
- <li>All other parameters are optional and should be deleted if not explicitly set. The default values
- for the remaining properties will be retrieved from the Dynamic Web project settings and preferences.
- For additional information on how to set these parameters refer to:
- <ul>
- <li><a href="../tasks/cxf_ant_client_prop_ref.html">CXF Web service client Ant task properties file reference</a></li>
- </ul>
- </li>
- Save the properties file.
- </ol>
- <li>Select the <samp class="codeph">cxf_client.xml</samp> file and from the top level menu and
- select <b>Run > External Tools > External Tools Configurations</b>.</li>
- <li>In the dialog that opens select <b>Ant Build</b> and then select the <b>New launch configuration</b> button in the toolbar.
- Select the <b>JRE</b> tab and select <b>Run in the same JRE as the workspace</b>.
- Click <b>Apply</b> and then <b>Run</b>.</li>
- <li>A <samp class="codeph">Build Successful</samp> message will be output to the console once the Web service has been generated.</li>
-</ol>
- <p><img src="../images/ngrelt.png" alt="Related tasks" border="0"></p>
- <a href="../tasks/cxf_ant_ws.html">Creating a Web service using Ant tasks in the Workbench</a>
- </body>
-</html> \ No newline at end of file
diff --git a/docs/org.eclipse.jst.ws.cxf.doc.user/tasks/images/annotation_processing.png b/docs/org.eclipse.jst.ws.cxf.doc.user/tasks/images/annotation_processing.png
deleted file mode 100755
index 4b954d7..0000000
--- a/docs/org.eclipse.jst.ws.cxf.doc.user/tasks/images/annotation_processing.png
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.jst.ws.cxf.doc.user/tasks/images/bottom_up_wizard.png b/docs/org.eclipse.jst.ws.cxf.doc.user/tasks/images/bottom_up_wizard.png
deleted file mode 100755
index 27dc3b4..0000000
--- a/docs/org.eclipse.jst.ws.cxf.doc.user/tasks/images/bottom_up_wizard.png
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.jst.ws.cxf.doc.user/tasks/images/facet_configuration.png b/docs/org.eclipse.jst.ws.cxf.doc.user/tasks/images/facet_configuration.png
deleted file mode 100755
index d37c91a..0000000
--- a/docs/org.eclipse.jst.ws.cxf.doc.user/tasks/images/facet_configuration.png
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.jst.ws.cxf.doc.user/tasks/images/jaxws_handler_wizard.png b/docs/org.eclipse.jst.ws.cxf.doc.user/tasks/images/jaxws_handler_wizard.png
deleted file mode 100644
index 17213b3..0000000
--- a/docs/org.eclipse.jst.ws.cxf.doc.user/tasks/images/jaxws_handler_wizard.png
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.jst.ws.cxf.doc.user/tasks/images/module_dependencies.png b/docs/org.eclipse.jst.ws.cxf.doc.user/tasks/images/module_dependencies.png
deleted file mode 100755
index 524ad9c..0000000
--- a/docs/org.eclipse.jst.ws.cxf.doc.user/tasks/images/module_dependencies.png
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.jst.ws.cxf.doc.user/tasks/images/project_facets.png b/docs/org.eclipse.jst.ws.cxf.doc.user/tasks/images/project_facets.png
deleted file mode 100755
index 0917995..0000000
--- a/docs/org.eclipse.jst.ws.cxf.doc.user/tasks/images/project_facets.png
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.jst.ws.cxf.doc.user/tasks/images/top_down_wizard.png b/docs/org.eclipse.jst.ws.cxf.doc.user/tasks/images/top_down_wizard.png
deleted file mode 100755
index 8a7191c..0000000
--- a/docs/org.eclipse.jst.ws.cxf.doc.user/tasks/images/top_down_wizard.png
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.jst.ws.cxf.doc.user/tasks/images/ws_client_wizard.png b/docs/org.eclipse.jst.ws.cxf.doc.user/tasks/images/ws_client_wizard.png
deleted file mode 100755
index 66cc22c..0000000
--- a/docs/org.eclipse.jst.ws.cxf.doc.user/tasks/images/ws_client_wizard.png
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.jst.ws.cxf.doc.user/tasks/install_cxf_facet.html b/docs/org.eclipse.jst.ws.cxf.doc.user/tasks/install_cxf_facet.html
deleted file mode 100755
index d6376e3..0000000
--- a/docs/org.eclipse.jst.ws.cxf.doc.user/tasks/install_cxf_facet.html
+++ /dev/null
@@ -1,25 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-
-<html>
-<head>
- <meta name="copyright" content="Copyright (c) 2009 Shane Clarke. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Shane Clarke - initial API and implementation">
- <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
- <title>Install the CXF Project Facet</title>
- <link href="../book.css" rel="stylesheet" charset="ISO-8859-1" type="text/css">
-</head>
-
-<body lang="EN-US">
-<h2>Install the CXF Project Facet</h2>
-<p>There are three ways to enable a Dynamic Web Project for CXF Web services development.<p>
-<ol>
-<li>Let the Web Services wizards do it for you automatically when creating a Web service with Apache CXF.</li>
-<li>Select a CXF project configuration or modify another configuration when creating a new Dynamic Web Project
-<p><img src="./images/facet_configuration.png" alt="Project Configuration" > </p></li>
-<li>Right-click on a Dynamic Web Project and choose <b>Properties</b> from the context menu.<br/> On the the <b>Project Facets</b>
- properties page select the <b>CXF 2.x Web Services</b> facet in the list and click <b>OK</b>.
- <p><img src="./images/project_facets.png" alt="Project Facets" > </p></li>
-</ol>
-<p><img src="../images/ngrelr.png" alt="Related reference" border="0" ></p>
-<a href="PLUGINS_ROOT/org.eclipse.jst.ws.cxf.doc.user/reference/cxf_facet.html">CXF Project Facet</a><br>
-</body>
-</html> \ No newline at end of file
diff --git a/docs/org.eclipse.jst.ws.cxf.doc.user/tasks/manage_cxf_lib_export.html b/docs/org.eclipse.jst.ws.cxf.doc.user/tasks/manage_cxf_lib_export.html
deleted file mode 100755
index 72aebd3..0000000
--- a/docs/org.eclipse.jst.ws.cxf.doc.user/tasks/manage_cxf_lib_export.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-
-<html>
-<head>
- <meta name="copyright" content="Copyright (c) 2009 Shane Clarke. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Shane Clarke - initial API and implementation">
- <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
- <title>Manage the exporting of CXF libraries at deployment time</title>
- <link href="../book.css" rel="stylesheet" charset="ISO-8859-1" type="text/css">
-</head>
-
-<body lang="EN-US">
-<h2>Manage the exporting of CXF libraries at deployment time</h2>
-<p>By default projects configured with the CXF facet are setup to resolve the CXF libraries to the WEB-INF/lib folder at deployment time.</p>
-<p>This however greatly increases the size of the deployed web module. If the web or application server you are deploying to is already configured with the Apache CXF libraries you
-can disable this option in the Apache CXF preferences.</p>
-<p>To enable or disable this functionality in a existing <b>Dynamic Web Project</b> already configured with the CXF Facet right-click on the project and choose <b>Properties</b>.<br/></p>
-<p><img src="./images/module_dependencies.png" alt="Module Dependencies"></p>
-Select the <b>Java EE Module Dependencies</b> properties page and select or deselect the version of the <b>Apache CXF Library</b> that is configured in the project and click <b>OK</b>.
-<p><img src="../images/ngrelr.png" alt="Related reference" border="0" ></p>
-<a href="PLUGINS_ROOT/org.eclipse.jst.ws.cxf.doc.user/reference/cxf_facet.html">CXF Project Facet</a><br>
-</body>
-</html> \ No newline at end of file
diff --git a/docs/org.eclipse.jst.ws.cxf.doc.user/tocgettingstarted.xml b/docs/org.eclipse.jst.ws.cxf.doc.user/tocgettingstarted.xml
deleted file mode 100755
index dc6b674..0000000
--- a/docs/org.eclipse.jst.ws.cxf.doc.user/tocgettingstarted.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?NLS TYPE="org.eclipse.help.toc"?>
-
-<toc label="Getting Started" link_to="toc.xml#gettingstarted">
- <topic label="Quick Start" href="gettingstarted/quickstart.html"/>
-</toc>
diff --git a/docs/org.eclipse.jst.ws.cxf.doc.user/tocreference.xml b/docs/org.eclipse.jst.ws.cxf.doc.user/tocreference.xml
deleted file mode 100755
index aca2472..0000000
--- a/docs/org.eclipse.jst.ws.cxf.doc.user/tocreference.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?NLS TYPE="org.eclipse.help.toc"?>
-
-<toc label="Reference" link_to="toc.xml#reference">
- <topic label="Preferences" href="reference/preferences.html">
- <topic label="Java2WS" href="reference/java2ws_tab.html"/>
- <topic label="WSDL2Java" href="reference/wsdl2java_tab.html"/>
- <topic label="JAX-WS" href="reference/jaxws_tab.html"/>
- <topic label="Endpoint Config" href="reference/endpoint_config_tab.html"/>
- <topic label="Server and runtime" href="reference/server_runtime.html"/>
- </topic>
- <topic href="reference/cxf_facet.html" label="CXF Project Facet">
- </topic>
-</toc>
diff --git a/docs/org.eclipse.jst.ws.cxf.doc.user/toctasks.xml b/docs/org.eclipse.jst.ws.cxf.doc.user/toctasks.xml
deleted file mode 100755
index 4092096..0000000
--- a/docs/org.eclipse.jst.ws.cxf.doc.user/toctasks.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?NLS TYPE="org.eclipse.help.toc"?>
-
-<toc label="Tasks" link_to="toc.xml#tasks">
- <topic href="tasks/create_cxf_project.html" label="Create a project for CXF Web services">
- <topic href="tasks/install_cxf_facet.html" label="Install the CXF Project Facet">
- </topic>
- <topic href="tasks/manage_cxf_lib_export.html" label="Manage the exporting of CXF libraries during deployment">
- </topic>
- <topic href="tasks/configuring_jaxws_annotation_processing.html" label="Enable JAX-WS Annotation Processing">
- </topic>
- </topic>
- <topic label="Create a Web Service from a Java implementation bean using Apache CXF" href="tasks/create_bottomup.html"/>
- <topic label="Generate an SEI and a skeleton implementation bean from a WSDL document using Apache CXF" href="tasks/create_topdown.html"/>
- <topic label="Generate a JAX-WS Web Service Client from a WSDL document using Apache CXF" href="tasks/create_client.html"/>
- <topic href="tasks/ant_tasks.html" label="Creating Web services and clients using Apache CXF and Ant tasks">
- <topic href="tasks/cxf_ant_ws.html" label="Creating a Web service using Ant tasks">
- <topic href="tasks/cxf_ant_td_prop_ref.html" label="Top-down CXF Web service Ant task properties file reference">
- </topic>
- <topic href="tasks/cxf_ant_bu_prop_ref.html" label="Bottom-up CXF Web service Ant task properties file reference">
- </topic>
- </topic>
- <topic href="tasks/cxf_ant_ws_client.html" label="Creating a Web service client using Ant tasks">
- <topic href="tasks/cxf_ant_client_prop_ref.html" label="CXF Web service client Ant task properties file reference">
- </topic>
- </topic>
- <topic href="tasks/cxf_ant_cmd.html" label="Using the Ant Tasks at the Command Line">
- </topic>
- </topic>
- <topic href="tasks/create_jaxws_handler.html" label="Create a JAX-WS Handler">
- </topic>
-</toc>
diff --git a/docs/org.eclipse.jst.ws.jaxws.doc.isv/.project b/docs/org.eclipse.jst.ws.jaxws.doc.isv/.project
deleted file mode 100644
index f728c88..0000000
--- a/docs/org.eclipse.jst.ws.jaxws.doc.isv/.project
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.jst.ws.jaxws.doc.isv</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.PluginNature</nature>
- </natures>
-</projectDescription>
diff --git a/docs/org.eclipse.jst.ws.jaxws.doc.isv/META-INF/MANIFEST.MF b/docs/org.eclipse.jst.ws.jaxws.doc.isv/META-INF/MANIFEST.MF
deleted file mode 100644
index cbaf7a4..0000000
--- a/docs/org.eclipse.jst.ws.jaxws.doc.isv/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,7 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Localization: plugin
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.jst.ws.jaxws.doc.isv;singleton:=true
-Bundle-Version: 1.1.0.qualifier
-Bundle-Vendor: %pluginProvider
diff --git a/docs/org.eclipse.jst.ws.jaxws.doc.isv/about.html b/docs/org.eclipse.jst.ws.jaxws.doc.isv/about.html
deleted file mode 100644
index 49483e5..0000000
--- a/docs/org.eclipse.jst.ws.jaxws.doc.isv/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>April 9, 2010</p>
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;). Unless otherwise
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;). 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, &quot;Program&quot; 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 (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content. Check the Redistributor's license that was
-provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
-
-</body>
-</html>
diff --git a/docs/org.eclipse.jst.ws.jaxws.doc.isv/book.css b/docs/org.eclipse.jst.ws.jaxws.doc.isv/book.css
deleted file mode 100644
index 84d8880..0000000
--- a/docs/org.eclipse.jst.ws.jaxws.doc.isv/book.css
+++ /dev/null
@@ -1 +0,0 @@
-@import "../PRODUCT_PLUGIN/book.css";
diff --git a/docs/org.eclipse.jst.ws.jaxws.doc.isv/build.properties b/docs/org.eclipse.jst.ws.jaxws.doc.isv/build.properties
deleted file mode 100644
index ae3055c..0000000
--- a/docs/org.eclipse.jst.ws.jaxws.doc.isv/build.properties
+++ /dev/null
@@ -1,9 +0,0 @@
-bin.includes = META-INF/,\
- plugin.xml,\
- reference/,\
- topics_api_reference.xml,\
- plugin.properties,\
- book.css,\
- topics_extension_points_reference.xml,\
- about.html,\
- schema.css
diff --git a/docs/org.eclipse.jst.ws.jaxws.doc.isv/plugin.properties b/docs/org.eclipse.jst.ws.jaxws.doc.isv/plugin.properties
deleted file mode 100644
index 8cd758b..0000000
--- a/docs/org.eclipse.jst.ws.jaxws.doc.isv/plugin.properties
+++ /dev/null
@@ -1,12 +0,0 @@
-###############################################################################
-# Copyright (c) 2010 Shane Clarke.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# Shane Clarke - initial API and implementation
-###############################################################################
-pluginName=JAX-WS Tools Developer Guide
-pluginProvider=Eclipse Web Tools Platform
diff --git a/docs/org.eclipse.jst.ws.jaxws.doc.isv/plugin.xml b/docs/org.eclipse.jst.ws.jaxws.doc.isv/plugin.xml
deleted file mode 100644
index 65d736b..0000000
--- a/docs/org.eclipse.jst.ws.jaxws.doc.isv/plugin.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.4"?>
-<plugin>
-
- <extension point="org.eclipse.help.toc">
- <toc file="topics_api_reference.xml"/>
- <toc file="topics_extension_points_reference.xml"/>
- </extension>
-
- <extension point="org.eclipse.pde.core.javadoc">
- <javadoc path="reference/api">
- <plugin id="org.eclipse.jst.ws.annotations.core"/>
- <plugin id="org.eclipse.jst.ws.jaxws.core"/>
- </javadoc>
- </extension>
-</plugin>
diff --git a/docs/org.eclipse.jst.ws.jaxws.doc.isv/reference/api/allclasses-frame.html b/docs/org.eclipse.jst.ws.jaxws.doc.isv/reference/api/allclasses-frame.html
deleted file mode 100644
index 2a9131b..0000000
--- a/docs/org.eclipse.jst.ws.jaxws.doc.isv/reference/api/allclasses-frame.html
+++ /dev/null
@@ -1,49 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.6.0_24) on Sun Apr 03 11:19:14 IST 2011 -->
-<TITLE>
-All Classes
-</TITLE>
-
-<META NAME="date" CONTENT="2011-04-03">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="stylesheet.css" TITLE="Style">
-
-
-</HEAD>
-
-<BODY BGCOLOR="white">
-<FONT size="+1" CLASS="FrameHeadingFont">
-<B>All Classes</B></FONT>
-<BR>
-
-<TABLE BORDER="0" WIDTH="100%" SUMMARY="">
-<TR>
-<TD NOWRAP><FONT CLASS="FrameItemFont"><A HREF="org/eclipse/jst/ws/annotations/core/processor/AbstractAnnotationProcessor.html" title="class in org.eclipse.jst.ws.annotations.core.processor" target="classFrame">AbstractAnnotationProcessor</A>
-<BR>
-<A HREF="org/eclipse/jst/ws/annotations/core/initialization/AnnotationAttributeInitializer.html" title="class in org.eclipse.jst.ws.annotations.core.initialization" target="classFrame">AnnotationAttributeInitializer</A>
-<BR>
-<A HREF="org/eclipse/jst/ws/annotations/core/AnnotationDefinition.html" title="class in org.eclipse.jst.ws.annotations.core" target="classFrame">AnnotationDefinition</A>
-<BR>
-<A HREF="org/eclipse/jst/ws/annotations/core/AnnotationsCore.html" title="class in org.eclipse.jst.ws.annotations.core" target="classFrame">AnnotationsCore</A>
-<BR>
-<A HREF="org/eclipse/jst/ws/annotations/core/AnnotationsManager.html" title="class in org.eclipse.jst.ws.annotations.core" target="classFrame">AnnotationsManager</A>
-<BR>
-<A HREF="org/eclipse/jst/ws/annotations/core/utils/AnnotationUtils.html" title="class in org.eclipse.jst.ws.annotations.core.utils" target="classFrame">AnnotationUtils</A>
-<BR>
-<A HREF="org/eclipse/jst/ws/annotations/core/initialization/DefaultsAnnotationAttributeInitializer.html" title="class in org.eclipse.jst.ws.annotations.core.initialization" target="classFrame">DefaultsAnnotationAttributeInitializer</A>
-<BR>
-<A HREF="org/eclipse/jst/ws/annotations/core/initialization/IAnnotationAttributeInitializer.html" title="interface in org.eclipse.jst.ws.annotations.core.initialization" target="classFrame"><I>IAnnotationAttributeInitializer</I></A>
-<BR>
-<A HREF="org/eclipse/jst/ws/jaxws/core/utils/JDTUtils.html" title="class in org.eclipse.jst.ws.jaxws.core.utils" target="classFrame">JDTUtils</A>
-<BR>
-<A HREF="org/eclipse/jst/ws/jaxws/core/utils/WSDLUtils.html" title="class in org.eclipse.jst.ws.jaxws.core.utils" target="classFrame">WSDLUtils</A>
-<BR>
-</FONT></TD>
-</TR>
-</TABLE>
-
-</BODY>
-</HTML>
diff --git a/docs/org.eclipse.jst.ws.jaxws.doc.isv/reference/api/allclasses-noframe.html b/docs/org.eclipse.jst.ws.jaxws.doc.isv/reference/api/allclasses-noframe.html
deleted file mode 100644
index 9f52034..0000000
--- a/docs/org.eclipse.jst.ws.jaxws.doc.isv/reference/api/allclasses-noframe.html
+++ /dev/null
@@ -1,49 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.6.0_24) on Sun Apr 03 11:19:14 IST 2011 -->
-<TITLE>
-All Classes
-</TITLE>
-
-<META NAME="date" CONTENT="2011-04-03">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="stylesheet.css" TITLE="Style">
-
-
-</HEAD>
-
-<BODY BGCOLOR="white">
-<FONT size="+1" CLASS="FrameHeadingFont">
-<B>All Classes</B></FONT>
-<BR>
-
-<TABLE BORDER="0" WIDTH="100%" SUMMARY="">
-<TR>
-<TD NOWRAP><FONT CLASS="FrameItemFont"><A HREF="org/eclipse/jst/ws/annotations/core/processor/AbstractAnnotationProcessor.html" title="class in org.eclipse.jst.ws.annotations.core.processor">AbstractAnnotationProcessor</A>
-<BR>
-<A HREF="org/eclipse/jst/ws/annotations/core/initialization/AnnotationAttributeInitializer.html" title="class in org.eclipse.jst.ws.annotations.core.initialization">AnnotationAttributeInitializer</A>
-<BR>
-<A HREF="org/eclipse/jst/ws/annotations/core/AnnotationDefinition.html" title="class in org.eclipse.jst.ws.annotations.core">AnnotationDefinition</A>
-<BR>
-<A HREF="org/eclipse/jst/ws/annotations/core/AnnotationsCore.html" title="class in org.eclipse.jst.ws.annotations.core">AnnotationsCore</A>
-<BR>
-<A HREF="org/eclipse/jst/ws/annotations/core/AnnotationsManager.html" title="class in org.eclipse.jst.ws.annotations.core">AnnotationsManager</A>
-<BR>
-<A HREF="org/eclipse/jst/ws/annotations/core/utils/AnnotationUtils.html" title="class in org.eclipse.jst.ws.annotations.core.utils">AnnotationUtils</A>
-<BR>
-<A HREF="org/eclipse/jst/ws/annotations/core/initialization/DefaultsAnnotationAttributeInitializer.html" title="class in org.eclipse.jst.ws.annotations.core.initialization">DefaultsAnnotationAttributeInitializer</A>
-<BR>
-<A HREF="org/eclipse/jst/ws/annotations/core/initialization/IAnnotationAttributeInitializer.html" title="interface in org.eclipse.jst.ws.annotations.core.initialization"><I>IAnnotationAttributeInitializer</I></A>
-<BR>
-<A HREF="org/eclipse/jst/ws/jaxws/core/utils/JDTUtils.html" title="class in org.eclipse.jst.ws.jaxws.core.utils">JDTUtils</A>
-<BR>
-<A HREF="org/eclipse/jst/ws/jaxws/core/utils/WSDLUtils.html" title="class in org.eclipse.jst.ws.jaxws.core.utils">WSDLUtils</A>
-<BR>
-</FONT></TD>
-</TR>
-</TABLE>
-
-</BODY>
-</HTML>
diff --git a/docs/org.eclipse.jst.ws.jaxws.doc.isv/reference/api/constant-values.html b/docs/org.eclipse.jst.ws.jaxws.doc.isv/reference/api/constant-values.html
deleted file mode 100644
index 7d653c2..0000000
--- a/docs/org.eclipse.jst.ws.jaxws.doc.isv/reference/api/constant-values.html
+++ /dev/null
@@ -1,174 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.6.0_24) on Sun Apr 03 11:19:14 IST 2011 -->
-<TITLE>
-Constant Field Values
-</TITLE>
-
-<META NAME="date" CONTENT="2011-04-03">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
- if (location.href.indexOf('is-external=true') == -1) {
- parent.document.title="Constant Field Values";
- }
-}
-</SCRIPT>
-<NOSCRIPT>
-</NOSCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-<HR>
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
- <TR ALIGN="center" VALIGN="top">
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <FONT CLASS="NavBarFont1">Package</FONT>&nbsp;</TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <FONT CLASS="NavBarFont1">Class</FONT>&nbsp;</TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <FONT CLASS="NavBarFont1">Use</FONT>&nbsp;</TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="overview-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
- </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;PREV&nbsp;
-&nbsp;NEXT</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- <A HREF="index.html?constant-values.html" target="_top"><B>FRAMES</B></A> &nbsp;
-&nbsp;<A HREF="constant-values.html" target="_top"><B>NO FRAMES</B></A> &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
- <!--
- if(window==top) {
- document.writeln('<A HREF="allclasses-noframe.html"><B>All Classes</B></A>');
- }
- //-->
-</SCRIPT>
-<NOSCRIPT>
- <A HREF="allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<CENTER>
-<H1>
-Constant Field Values</H1>
-</CENTER>
-<HR SIZE="4" NOSHADE>
-<B>Contents</B><UL>
-<LI><A HREF="#org.eclipse">org.eclipse.*</A>
-</UL>
-
-<A NAME="org.eclipse"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left"><FONT SIZE="+2">
-org.eclipse.*</FONT></TH>
-</TR>
-</TABLE>
-
-<P>
-
-<TABLE BORDER="1" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor">
-<TH ALIGN="left" COLSPAN="3">org.eclipse.jst.ws.jaxws.core.utils.<A HREF="org/eclipse/jst/ws/jaxws/core/utils/WSDLUtils.html" title="class in org.eclipse.jst.ws.jaxws.core.utils">WSDLUtils</A></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<A NAME="org.eclipse.jst.ws.jaxws.core.utils.WSDLUtils.WSDL_FILE_EXTENSION"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1">
-<CODE>public&nbsp;static&nbsp;final&nbsp;java.lang.String</CODE></FONT></TD>
-<TD ALIGN="left"><CODE><A HREF="org/eclipse/jst/ws/jaxws/core/utils/WSDLUtils.html#WSDL_FILE_EXTENSION">WSDL_FILE_EXTENSION</A></CODE></TD>
-<TD ALIGN="right"><CODE>".wsdl"</CODE></TD>
-</TR>
-</FONT></TD>
-</TR>
-</TABLE>
-
-<P>
-
-<P>
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
- <TR ALIGN="center" VALIGN="top">
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <FONT CLASS="NavBarFont1">Package</FONT>&nbsp;</TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <FONT CLASS="NavBarFont1">Class</FONT>&nbsp;</TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <FONT CLASS="NavBarFont1">Use</FONT>&nbsp;</TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="overview-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
- </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;PREV&nbsp;
-&nbsp;NEXT</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- <A HREF="index.html?constant-values.html" target="_top"><B>FRAMES</B></A> &nbsp;
-&nbsp;<A HREF="constant-values.html" target="_top"><B>NO FRAMES</B></A> &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
- <!--
- if(window==top) {
- document.writeln('<A HREF="allclasses-noframe.html"><B>All Classes</B></A>');
- }
- //-->
-</SCRIPT>
-<NOSCRIPT>
- <A HREF="allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/docs/org.eclipse.jst.ws.jaxws.doc.isv/reference/api/deprecated-list.html b/docs/org.eclipse.jst.ws.jaxws.doc.isv/reference/api/deprecated-list.html
deleted file mode 100644
index 37e1702..0000000
--- a/docs/org.eclipse.jst.ws.jaxws.doc.isv/reference/api/deprecated-list.html
+++ /dev/null
@@ -1,186 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.6.0_24) on Sun Apr 03 11:19:14 IST 2011 -->
-<TITLE>
-Deprecated List
-</TITLE>
-
-<META NAME="date" CONTENT="2011-04-03">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
- if (location.href.indexOf('is-external=true') == -1) {
- parent.document.title="Deprecated List";
- }
-}
-</SCRIPT>
-<NOSCRIPT>
-</NOSCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-<HR>
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
- <TR ALIGN="center" VALIGN="top">
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <FONT CLASS="NavBarFont1">Package</FONT>&nbsp;</TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <FONT CLASS="NavBarFont1">Class</FONT>&nbsp;</TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <FONT CLASS="NavBarFont1">Use</FONT>&nbsp;</TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="overview-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
- <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Deprecated</B></FONT>&nbsp;</TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
- </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;PREV&nbsp;
-&nbsp;NEXT</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- <A HREF="index.html?deprecated-list.html" target="_top"><B>FRAMES</B></A> &nbsp;
-&nbsp;<A HREF="deprecated-list.html" target="_top"><B>NO FRAMES</B></A> &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
- <!--
- if(window==top) {
- document.writeln('<A HREF="allclasses-noframe.html"><B>All Classes</B></A>');
- }
- //-->
-</SCRIPT>
-<NOSCRIPT>
- <A HREF="allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<CENTER>
-<H2>
-<B>Deprecated API</B></H2>
-</CENTER>
-<HR SIZE="4" NOSHADE>
-<B>Contents</B><UL>
-<LI><A HREF="#method">Deprecated Methods</A>
-</UL>
-
-<A NAME="method"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Deprecated Methods</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><A HREF="org/eclipse/jst/ws/annotations/core/AnnotationDefinition.html#getAnnotationClass()">org.eclipse.jst.ws.annotations.core.AnnotationDefinition.getAnnotationClass()</A>
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<I>As of 1.1 replaced by <A HREF="org/eclipse/jst/ws/annotations/core/AnnotationDefinition.html#getAnnotationType()"><CODE>AnnotationDefinition.getAnnotationType()</CODE></A></I>&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><A HREF="org/eclipse/jst/ws/annotations/core/AnnotationsManager.html#getAnnotations(org.eclipse.jdt.core.IJavaElement)">org.eclipse.jst.ws.annotations.core.AnnotationsManager.getAnnotations(IJavaElement)</A>
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<I>As of 1.1 replaced by <A HREF="org/eclipse/jst/ws/annotations/core/AnnotationsManager.html#getAnnotationTypes(org.eclipse.jdt.core.IJavaElement)"><CODE>AnnotationsManager.getAnnotationTypes(IJavaElement)</CODE></A></I>&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><A HREF="org/eclipse/jst/ws/annotations/core/initialization/IAnnotationAttributeInitializer.html#getMemberValuePairs(org.eclipse.jdt.core.IJavaElement, org.eclipse.jdt.core.dom.AST, java.lang.Class)">org.eclipse.jst.ws.annotations.core.initialization.IAnnotationAttributeInitializer.getMemberValuePairs(IJavaElement, AST, Class<? extends Annotation>)</A>
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<I>as of 1.1 replaced by <A HREF="org/eclipse/jst/ws/annotations/core/initialization/IAnnotationAttributeInitializer.html#getMemberValuePairs(org.eclipse.jdt.core.IJavaElement, org.eclipse.jdt.core.dom.AST, org.eclipse.jdt.core.IType)"><CODE>IAnnotationAttributeInitializer.getMemberValuePairs(IJavaElement, AST, IType)</CODE></A></I>&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><A HREF="org/eclipse/jst/ws/annotations/core/initialization/DefaultsAnnotationAttributeInitializer.html#getMemberValuePairs(org.eclipse.jdt.core.IJavaElement, org.eclipse.jdt.core.dom.AST, java.lang.Class)">org.eclipse.jst.ws.annotations.core.initialization.DefaultsAnnotationAttributeInitializer.getMemberValuePairs(IJavaElement, AST, Class<? extends Annotation>)</A>
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<I>as of 1.1 replaced by <A HREF="org/eclipse/jst/ws/annotations/core/initialization/DefaultsAnnotationAttributeInitializer.html#getMemberValuePairs(org.eclipse.jdt.core.IJavaElement, org.eclipse.jdt.core.dom.AST, org.eclipse.jdt.core.IType)"><CODE>DefaultsAnnotationAttributeInitializer.getMemberValuePairs(IJavaElement, AST, IType)</CODE></A></I>&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><A HREF="org/eclipse/jst/ws/annotations/core/initialization/AnnotationAttributeInitializer.html#getMemberValuePairs(org.eclipse.jdt.core.IJavaElement, org.eclipse.jdt.core.dom.AST, java.lang.Class)">org.eclipse.jst.ws.annotations.core.initialization.AnnotationAttributeInitializer.getMemberValuePairs(IJavaElement, AST, Class<? extends Annotation>)</A>
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<I>as of 1.1 replaced by <A HREF="org/eclipse/jst/ws/annotations/core/initialization/AnnotationAttributeInitializer.html#getMemberValuePairs(org.eclipse.jdt.core.IJavaElement, org.eclipse.jdt.core.dom.AST, org.eclipse.jdt.core.IType)"><CODE>AnnotationAttributeInitializer.getMemberValuePairs(IJavaElement, AST, IType)</CODE></A></I>&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><A HREF="org/eclipse/jst/ws/annotations/core/AnnotationDefinition.html#getTargets()">org.eclipse.jst.ws.annotations.core.AnnotationDefinition.getTargets()</A>
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<I>as of 1.1 replaced by <A HREF="org/eclipse/jst/ws/annotations/core/AnnotationDefinition.html#getAnnotationTypeTargets()"><CODE>AnnotationDefinition.getAnnotationTypeTargets()</CODE></A></I>&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;
-<P>
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
- <TR ALIGN="center" VALIGN="top">
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <FONT CLASS="NavBarFont1">Package</FONT>&nbsp;</TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <FONT CLASS="NavBarFont1">Class</FONT>&nbsp;</TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <FONT CLASS="NavBarFont1">Use</FONT>&nbsp;</TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="overview-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
- <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Deprecated</B></FONT>&nbsp;</TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
- </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;PREV&nbsp;
-&nbsp;NEXT</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- <A HREF="index.html?deprecated-list.html" target="_top"><B>FRAMES</B></A> &nbsp;
-&nbsp;<A HREF="deprecated-list.html" target="_top"><B>NO FRAMES</B></A> &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
- <!--
- if(window==top) {
- document.writeln('<A HREF="allclasses-noframe.html"><B>All Classes</B></A>');
- }
- //-->
-</SCRIPT>
-<NOSCRIPT>
- <A HREF="allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/docs/org.eclipse.jst.ws.jaxws.doc.isv/reference/api/help-doc.html b/docs/org.eclipse.jst.ws.jaxws.doc.isv/reference/api/help-doc.html
deleted file mode 100644
index 9749939..0000000
--- a/docs/org.eclipse.jst.ws.jaxws.doc.isv/reference/api/help-doc.html
+++ /dev/null
@@ -1,223 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.6.0_24) on Sun Apr 03 11:19:14 IST 2011 -->
-<TITLE>
-API Help
-</TITLE>
-
-<META NAME="date" CONTENT="2011-04-03">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
- if (location.href.indexOf('is-external=true') == -1) {
- parent.document.title="API Help";
- }
-}
-</SCRIPT>
-<NOSCRIPT>
-</NOSCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-<HR>
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
- <TR ALIGN="center" VALIGN="top">
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <FONT CLASS="NavBarFont1">Package</FONT>&nbsp;</TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <FONT CLASS="NavBarFont1">Class</FONT>&nbsp;</TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <FONT CLASS="NavBarFont1">Use</FONT>&nbsp;</TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="overview-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
- <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Help</B></FONT>&nbsp;</TD>
- </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;PREV&nbsp;
-&nbsp;NEXT</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- <A HREF="index.html?help-doc.html" target="_top"><B>FRAMES</B></A> &nbsp;
-&nbsp;<A HREF="help-doc.html" target="_top"><B>NO FRAMES</B></A> &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
- <!--
- if(window==top) {
- document.writeln('<A HREF="allclasses-noframe.html"><B>All Classes</B></A>');
- }
- //-->
-</SCRIPT>
-<NOSCRIPT>
- <A HREF="allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<CENTER>
-<H1>
-How This API Document Is Organized</H1>
-</CENTER>
-This API (Application Programming Interface) document has pages corresponding to the items in the navigation bar, described as follows.<H3>
-Overview</H3>
-<BLOCKQUOTE>
-
-<P>
-The <A HREF="overview-summary.html">Overview</A> page is the front page of this API document and provides a list of all packages with a summary for each. This page can also contain an overall description of the set of packages.</BLOCKQUOTE>
-<H3>
-Package</H3>
-<BLOCKQUOTE>
-
-<P>
-Each package has a page that contains a list of its classes and interfaces, with a summary for each. This page can contain four categories:<UL>
-<LI>Interfaces (italic)<LI>Classes<LI>Enums<LI>Exceptions<LI>Errors<LI>Annotation Types</UL>
-</BLOCKQUOTE>
-<H3>
-Class/Interface</H3>
-<BLOCKQUOTE>
-
-<P>
-Each class, interface, nested class and nested interface has its own separate page. Each of these pages has three sections consisting of a class/interface description, summary tables, and detailed member descriptions:<UL>
-<LI>Class inheritance diagram<LI>Direct Subclasses<LI>All Known Subinterfaces<LI>All Known Implementing Classes<LI>Class/interface declaration<LI>Class/interface description
-<P>
-<LI>Nested Class Summary<LI>Field Summary<LI>Constructor Summary<LI>Method Summary
-<P>
-<LI>Field Detail<LI>Constructor Detail<LI>Method Detail</UL>
-Each summary entry contains the first sentence from the detailed description for that item. The summary entries are alphabetical, while the detailed descriptions are in the order they appear in the source code. This preserves the logical groupings established by the programmer.</BLOCKQUOTE>
-</BLOCKQUOTE>
-<H3>
-Annotation Type</H3>
-<BLOCKQUOTE>
-
-<P>
-Each annotation type has its own separate page with the following sections:<UL>
-<LI>Annotation Type declaration<LI>Annotation Type description<LI>Required Element Summary<LI>Optional Element Summary<LI>Element Detail</UL>
-</BLOCKQUOTE>
-</BLOCKQUOTE>
-<H3>
-Enum</H3>
-<BLOCKQUOTE>
-
-<P>
-Each enum has its own separate page with the following sections:<UL>
-<LI>Enum declaration<LI>Enum description<LI>Enum Constant Summary<LI>Enum Constant Detail</UL>
-</BLOCKQUOTE>
-<H3>
-Use</H3>
-<BLOCKQUOTE>
-Each documented package, class and interface has its own Use page. This page describes what packages, classes, methods, constructors and fields use any part of the given class or package. Given a class or interface A, its Use page includes subclasses of A, fields declared as A, methods that return A, and methods and constructors with parameters of type A. You can access this page by first going to the package, class or interface, then clicking on the "Use" link in the navigation bar.</BLOCKQUOTE>
-<H3>
-Tree (Class Hierarchy)</H3>
-<BLOCKQUOTE>
-There is a <A HREF="overview-tree.html">Class Hierarchy</A> page for all packages, plus a hierarchy for each package. Each hierarchy page contains a list of classes and a list of interfaces. The classes are organized by inheritance structure starting with <code>java.lang.Object</code>. The interfaces do not inherit from <code>java.lang.Object</code>.<UL>
-<LI>When viewing the Overview page, clicking on "Tree" displays the hierarchy for all packages.<LI>When viewing a particular package, class or interface page, clicking "Tree" displays the hierarchy for only that package.</UL>
-</BLOCKQUOTE>
-<H3>
-Deprecated API</H3>
-<BLOCKQUOTE>
-The <A HREF="deprecated-list.html">Deprecated API</A> page lists all of the API that have been deprecated. A deprecated API is not recommended for use, generally due to improvements, and a replacement API is usually given. Deprecated APIs may be removed in future implementations.</BLOCKQUOTE>
-<H3>
-Index</H3>
-<BLOCKQUOTE>
-The <A HREF="index-files/index-1.html">Index</A> contains an alphabetic list of all classes, interfaces, constructors, methods, and fields.</BLOCKQUOTE>
-<H3>
-Prev/Next</H3>
-These links take you to the next or previous class, interface, package, or related page.<H3>
-Frames/No Frames</H3>
-These links show and hide the HTML frames. All pages are available with or without frames.
-<P>
-<H3>
-Serialized Form</H3>
-Each serializable or externalizable class has a description of its serialization fields and methods. This information is of interest to re-implementors, not to developers using the API. While there is no link in the navigation bar, you can get to this information by going to any serialized class and clicking "Serialized Form" in the "See also" section of the class description.
-<P>
-<H3>
-Constant Field Values</H3>
-The <a href="constant-values.html">Constant Field Values</a> page lists the static final fields and their values.
-<P>
-<FONT SIZE="-1">
-<EM>
-This help file applies to API documentation generated using the standard doclet.</EM>
-</FONT>
-<BR>
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
- <TR ALIGN="center" VALIGN="top">
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <FONT CLASS="NavBarFont1">Package</FONT>&nbsp;</TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <FONT CLASS="NavBarFont1">Class</FONT>&nbsp;</TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <FONT CLASS="NavBarFont1">Use</FONT>&nbsp;</TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="overview-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
- <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Help</B></FONT>&nbsp;</TD>
- </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;PREV&nbsp;
-&nbsp;NEXT</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- <A HREF="index.html?help-doc.html" target="_top"><B>FRAMES</B></A> &nbsp;
-&nbsp;<A HREF="help-doc.html" target="_top"><B>NO FRAMES</B></A> &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
- <!--
- if(window==top) {
- document.writeln('<A HREF="allclasses-noframe.html"><B>All Classes</B></A>');
- }
- //-->
-</SCRIPT>
-<NOSCRIPT>
- <A HREF="allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/docs/org.eclipse.jst.ws.jaxws.doc.isv/reference/api/index-files/index-1.html b/docs/org.eclipse.jst.ws.jaxws.doc.isv/reference/api/index-files/index-1.html
deleted file mode 100644
index 9fd3c74..0000000
--- a/docs/org.eclipse.jst.ws.jaxws.doc.isv/reference/api/index-files/index-1.html
+++ /dev/null
@@ -1,167 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.6.0_24) on Sun Apr 03 11:19:14 IST 2011 -->
-<TITLE>
-A-Index
-</TITLE>
-
-<META NAME="date" CONTENT="2011-04-03">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
- if (location.href.indexOf('is-external=true') == -1) {
- parent.document.title="A-Index";
- }
-}
-</SCRIPT>
-<NOSCRIPT>
-</NOSCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-<HR>
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
- <TR ALIGN="center" VALIGN="top">
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <FONT CLASS="NavBarFont1">Package</FONT>&nbsp;</TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <FONT CLASS="NavBarFont1">Class</FONT>&nbsp;</TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <FONT CLASS="NavBarFont1">Use</FONT>&nbsp;</TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../overview-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
- <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Index</B></FONT>&nbsp;</TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
- </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;PREV LETTER&nbsp;
-&nbsp;<A HREF="index-2.html"><B>NEXT LETTER</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- <A HREF="../index.html?index-filesindex-1.html" target="_top"><B>FRAMES</B></A> &nbsp;
-&nbsp;<A HREF="index-1.html" target="_top"><B>NO FRAMES</B></A> &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
- <!--
- if(window==top) {
- document.writeln('<A HREF="../allclasses-noframe.html"><B>All Classes</B></A>');
- }
- //-->
-</SCRIPT>
-<NOSCRIPT>
- <A HREF="../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<A HREF="index-1.html">A</A> <A HREF="index-2.html">C</A> <A HREF="index-3.html">D</A> <A HREF="index-4.html">F</A> <A HREF="index-5.html">G</A> <A HREF="index-6.html">I</A> <A HREF="index-7.html">J</A> <A HREF="index-8.html">O</A> <A HREF="index-9.html">P</A> <A HREF="index-10.html">R</A> <A HREF="index-11.html">S</A> <A HREF="index-12.html">U</A> <A HREF="index-13.html">V</A> <A HREF="index-14.html">W</A> <HR>
-<A NAME="_A_"><!-- --></A><H2>
-<B>A</B></H2>
-<DL>
-<DT><A HREF="../org/eclipse/jst/ws/annotations/core/processor/AbstractAnnotationProcessor.html" title="class in org.eclipse.jst.ws.annotations.core.processor"><B>AbstractAnnotationProcessor</B></A> - Class in <A HREF="../org/eclipse/jst/ws/annotations/core/processor/package-summary.html">org.eclipse.jst.ws.annotations.core.processor</A><DD>Abstract base class for processors contributed to the
- <code>org.eclipse.jst.ws.annotations.core.annotationProcessor</code> extension point.<DT><A HREF="../org/eclipse/jst/ws/annotations/core/utils/AnnotationUtils.html#addAnnotation(org.eclipse.jdt.core.IJavaElement, org.eclipse.jdt.core.dom.Annotation)"><B>addAnnotation(IJavaElement, Annotation)</B></A> -
-Static method in class org.eclipse.jst.ws.annotations.core.utils.<A HREF="../org/eclipse/jst/ws/annotations/core/utils/AnnotationUtils.html" title="class in org.eclipse.jst.ws.annotations.core.utils">AnnotationUtils</A>
-<DD>Adds the given <CODE>Annotation</CODE> to the <CODE>IJavaElement</CODE>.
-<DT><A HREF="../org/eclipse/jst/ws/annotations/core/utils/AnnotationUtils.html#addImport(org.eclipse.jdt.core.IJavaElement, java.lang.String)"><B>addImport(IJavaElement, String)</B></A> -
-Static method in class org.eclipse.jst.ws.annotations.core.utils.<A HREF="../org/eclipse/jst/ws/annotations/core/utils/AnnotationUtils.html" title="class in org.eclipse.jst.ws.annotations.core.utils">AnnotationUtils</A>
-<DD>Adds an import to the compilation unit of the given <CODE>IJavaElement</CODE>.
-<DT><A HREF="../org/eclipse/jst/ws/annotations/core/utils/AnnotationUtils.html#addMemberValuePair(org.eclipse.jdt.core.dom.NormalAnnotation, org.eclipse.jdt.core.dom.MemberValuePair)"><B>addMemberValuePair(NormalAnnotation, MemberValuePair)</B></A> -
-Static method in class org.eclipse.jst.ws.annotations.core.utils.<A HREF="../org/eclipse/jst/ws/annotations/core/utils/AnnotationUtils.html" title="class in org.eclipse.jst.ws.annotations.core.utils">AnnotationUtils</A>
-<DD>Adds the <CODE>MemberValuePair</CODE> to the <CODE>NormalAnnotation</CODE>.
-<DT><A HREF="../org/eclipse/jst/ws/jaxws/core/utils/JDTUtils.html#addToClasspath(org.eclipse.jdt.core.IJavaProject, org.eclipse.jdt.core.IClasspathEntry)"><B>addToClasspath(IJavaProject, IClasspathEntry)</B></A> -
-Static method in class org.eclipse.jst.ws.jaxws.core.utils.<A HREF="../org/eclipse/jst/ws/jaxws/core/utils/JDTUtils.html" title="class in org.eclipse.jst.ws.jaxws.core.utils">JDTUtils</A>
-<DD>Add a <code>IClasspathEntry</code> to a <code>IJavaProject</code>
-<DT><A HREF="../org/eclipse/jst/ws/annotations/core/initialization/AnnotationAttributeInitializer.html" title="class in org.eclipse.jst.ws.annotations.core.initialization"><B>AnnotationAttributeInitializer</B></A> - Class in <A HREF="../org/eclipse/jst/ws/annotations/core/initialization/package-summary.html">org.eclipse.jst.ws.annotations.core.initialization</A><DD>Abstract base class for initializers contributed to the
- <code>org.eclipse.jst.ws.annotations.core.annotationInitializer</code> extension point.<DT><A HREF="../org/eclipse/jst/ws/annotations/core/AnnotationDefinition.html" title="class in org.eclipse.jst.ws.annotations.core"><B>AnnotationDefinition</B></A> - Class in <A HREF="../org/eclipse/jst/ws/annotations/core/package-summary.html">org.eclipse.jst.ws.annotations.core</A><DD>An <code>AnnotationDefinition</code> is a representation of the information contributed through the
- <code>org.eclipse.jst.ws.annotations.core.annotationDefinition</code>,
- <code>org.eclipse.jst.ws.annotations.core.annotationCategory</code> and
- <code>org.eclipse.jst.ws.annotations.core.annotationInitializer</code> extension points.<DT><A HREF="../org/eclipse/jst/ws/annotations/core/AnnotationDefinition.html#AnnotationDefinition(org.eclipse.core.runtime.IConfigurationElement, java.lang.String)"><B>AnnotationDefinition(IConfigurationElement, String)</B></A> -
-Constructor for class org.eclipse.jst.ws.annotations.core.<A HREF="../org/eclipse/jst/ws/annotations/core/AnnotationDefinition.html" title="class in org.eclipse.jst.ws.annotations.core">AnnotationDefinition</A>
-<DD>Constructs an <code>AnnotationDefinition</code> using information from the
- <code>org.eclipse.jst.ws.annotations.core.annotationDefinition</code> extension point and category name.
-<DT><A HREF="../org/eclipse/jst/ws/annotations/core/AnnotationsCore.html" title="class in org.eclipse.jst.ws.annotations.core"><B>AnnotationsCore</B></A> - Class in <A HREF="../org/eclipse/jst/ws/annotations/core/package-summary.html">org.eclipse.jst.ws.annotations.core</A><DD>Utility class for creating annotations and member value pairs.<DT><A HREF="../org/eclipse/jst/ws/annotations/core/AnnotationsManager.html" title="class in org.eclipse.jst.ws.annotations.core"><B>AnnotationsManager</B></A> - Class in <A HREF="../org/eclipse/jst/ws/annotations/core/package-summary.html">org.eclipse.jst.ws.annotations.core</A><DD>Manages the annotation categories, definitions, processors and initializers contributed through the
- <code>org.eclipse.jst.ws.annotations.core.annotationDefinition</code>,
- <code>org.eclipse.jst.ws.annotations.core.annotationCategory</code>,
- <code>org.eclipse.jst.ws.annotations.core.annotationInitializer</code> and
- <code>org.eclipse.jst.ws.annotations.core.annotationProcessor</code> extension points.<DT><A HREF="../org/eclipse/jst/ws/annotations/core/utils/AnnotationUtils.html" title="class in org.eclipse.jst.ws.annotations.core.utils"><B>AnnotationUtils</B></A> - Class in <A HREF="../org/eclipse/jst/ws/annotations/core/utils/package-summary.html">org.eclipse.jst.ws.annotations.core.utils</A><DD>Utility class for adding, removing and updating annotations and member value pairs.</DL>
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
- <TR ALIGN="center" VALIGN="top">
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <FONT CLASS="NavBarFont1">Package</FONT>&nbsp;</TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <FONT CLASS="NavBarFont1">Class</FONT>&nbsp;</TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <FONT CLASS="NavBarFont1">Use</FONT>&nbsp;</TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../overview-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
- <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Index</B></FONT>&nbsp;</TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
- </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;PREV LETTER&nbsp;
-&nbsp;<A HREF="index-2.html"><B>NEXT LETTER</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- <A HREF="../index.html?index-filesindex-1.html" target="_top"><B>FRAMES</B></A> &nbsp;
-&nbsp;<A HREF="index-1.html" target="_top"><B>NO FRAMES</B></A> &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
- <!--
- if(window==top) {
- document.writeln('<A HREF="../allclasses-noframe.html"><B>All Classes</B></A>');
- }
- //-->
-</SCRIPT>
-<NOSCRIPT>
- <A HREF="../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<A HREF="index-1.html">A</A> <A HREF="index-2.html">C</A> <A HREF="index-3.html">D</A> <A HREF="index-4.html">F</A> <A HREF="index-5.html">G</A> <A HREF="index-6.html">I</A> <A HREF="index-7.html">J</A> <A HREF="index-8.html">O</A> <A HREF="index-9.html">P</A> <A HREF="index-10.html">R</A> <A HREF="index-11.html">S</A> <A HREF="index-12.html">U</A> <A HREF="index-13.html">V</A> <A HREF="index-14.html">W</A> <HR>
-
-</BODY>
-</HTML>
diff --git a/docs/org.eclipse.jst.ws.jaxws.doc.isv/reference/api/index-files/index-10.html b/docs/org.eclipse.jst.ws.jaxws.doc.isv/reference/api/index-files/index-10.html
deleted file mode 100644
index 929e611..0000000
--- a/docs/org.eclipse.jst.ws.jaxws.doc.isv/reference/api/index-files/index-10.html
+++ /dev/null
@@ -1,158 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.6.0_24) on Sun Apr 03 11:19:14 IST 2011 -->
-<TITLE>
-R-Index
-</TITLE>
-
-<META NAME="date" CONTENT="2011-04-03">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
- if (location.href.indexOf('is-external=true') == -1) {
- parent.document.title="R-Index";
- }
-}
-</SCRIPT>
-<NOSCRIPT>
-</NOSCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-<HR>
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
- <TR ALIGN="center" VALIGN="top">
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <FONT CLASS="NavBarFont1">Package</FONT>&nbsp;</TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <FONT CLASS="NavBarFont1">Class</FONT>&nbsp;</TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <FONT CLASS="NavBarFont1">Use</FONT>&nbsp;</TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../overview-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
- <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Index</B></FONT>&nbsp;</TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
- </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="index-9.html"><B>PREV LETTER</B></A>&nbsp;
-&nbsp;<A HREF="index-11.html"><B>NEXT LETTER</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- <A HREF="../index.html?index-filesindex-10.html" target="_top"><B>FRAMES</B></A> &nbsp;
-&nbsp;<A HREF="index-10.html" target="_top"><B>NO FRAMES</B></A> &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
- <!--
- if(window==top) {
- document.writeln('<A HREF="../allclasses-noframe.html"><B>All Classes</B></A>');
- }
- //-->
-</SCRIPT>
-<NOSCRIPT>
- <A HREF="../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<A HREF="index-1.html">A</A> <A HREF="index-2.html">C</A> <A HREF="index-3.html">D</A> <A HREF="index-4.html">F</A> <A HREF="index-5.html">G</A> <A HREF="index-6.html">I</A> <A HREF="index-7.html">J</A> <A HREF="index-8.html">O</A> <A HREF="index-9.html">P</A> <A HREF="index-10.html">R</A> <A HREF="index-11.html">S</A> <A HREF="index-12.html">U</A> <A HREF="index-13.html">V</A> <A HREF="index-14.html">W</A> <HR>
-<A NAME="_R_"><!-- --></A><H2>
-<B>R</B></H2>
-<DL>
-<DT><A HREF="../org/eclipse/jst/ws/jaxws/core/utils/WSDLUtils.html#readWSDL(java.net.URL)"><B>readWSDL(URL)</B></A> -
-Static method in class org.eclipse.jst.ws.jaxws.core.utils.<A HREF="../org/eclipse/jst/ws/jaxws/core/utils/WSDLUtils.html" title="class in org.eclipse.jst.ws.jaxws.core.utils">WSDLUtils</A>
-<DD>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.
-<DT><A HREF="../org/eclipse/jst/ws/annotations/core/utils/AnnotationUtils.html#removeAnnotation(org.eclipse.jdt.core.IJavaElement, org.eclipse.jdt.core.dom.Annotation)"><B>removeAnnotation(IJavaElement, Annotation)</B></A> -
-Static method in class org.eclipse.jst.ws.annotations.core.utils.<A HREF="../org/eclipse/jst/ws/annotations/core/utils/AnnotationUtils.html" title="class in org.eclipse.jst.ws.annotations.core.utils">AnnotationUtils</A>
-<DD>Removes the given <CODE>Annotation</CODE> from the <CODE>IJavaElement</CODE>.
-<DT><A HREF="../org/eclipse/jst/ws/jaxws/core/utils/JDTUtils.html#removeFromClasspath(org.eclipse.jdt.core.IJavaProject, org.eclipse.jdt.core.IClasspathEntry)"><B>removeFromClasspath(IJavaProject, IClasspathEntry)</B></A> -
-Static method in class org.eclipse.jst.ws.jaxws.core.utils.<A HREF="../org/eclipse/jst/ws/jaxws/core/utils/JDTUtils.html" title="class in org.eclipse.jst.ws.jaxws.core.utils">JDTUtils</A>
-<DD>Remove a <code>IClasspathEntry</code> from a <code>IJavaProject</code>
-<DT><A HREF="../org/eclipse/jst/ws/annotations/core/utils/AnnotationUtils.html#removeImport(org.eclipse.jdt.core.IJavaElement, java.lang.String)"><B>removeImport(IJavaElement, String)</B></A> -
-Static method in class org.eclipse.jst.ws.annotations.core.utils.<A HREF="../org/eclipse/jst/ws/annotations/core/utils/AnnotationUtils.html" title="class in org.eclipse.jst.ws.annotations.core.utils">AnnotationUtils</A>
-<DD>Removes an import from the compilation unit of the given <CODE>IJavaElement</CODE>.
-<DT><A HREF="../org/eclipse/jst/ws/annotations/core/utils/AnnotationUtils.html#removeMemberValuePair(org.eclipse.jdt.core.dom.NormalAnnotation, org.eclipse.jdt.core.dom.MemberValuePair)"><B>removeMemberValuePair(NormalAnnotation, MemberValuePair)</B></A> -
-Static method in class org.eclipse.jst.ws.annotations.core.utils.<A HREF="../org/eclipse/jst/ws/annotations/core/utils/AnnotationUtils.html" title="class in org.eclipse.jst.ws.annotations.core.utils">AnnotationUtils</A>
-<DD>Removes the <CODE>MemberValuePair</CODE> from the <CODE>NormalAnnotation</CODE>.
-</DL>
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
- <TR ALIGN="center" VALIGN="top">
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <FONT CLASS="NavBarFont1">Package</FONT>&nbsp;</TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <FONT CLASS="NavBarFont1">Class</FONT>&nbsp;</TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <FONT CLASS="NavBarFont1">Use</FONT>&nbsp;</TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../overview-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
- <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Index</B></FONT>&nbsp;</TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
- </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="index-9.html"><B>PREV LETTER</B></A>&nbsp;
-&nbsp;<A HREF="index-11.html"><B>NEXT LETTER</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- <A HREF="../index.html?index-filesindex-10.html" target="_top"><B>FRAMES</B></A> &nbsp;
-&nbsp;<A HREF="index-10.html" target="_top"><B>NO FRAMES</B></A> &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
- <!--
- if(window==top) {
- document.writeln('<A HREF="../allclasses-noframe.html"><B>All Classes</B></A>');
- }
- //-->
-</SCRIPT>
-<NOSCRIPT>
- <A HREF="../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<A HREF="index-1.html">A</A> <A HREF="index-2.html">C</A> <A HREF="index-3.html">D</A> <A HREF="index-4.html">F</A> <A HREF="index-5.html">G</A> <A HREF="index-6.html">I</A> <A HREF="index-7.html">J</A> <A HREF="index-8.html">O</A> <A HREF="index-9.html">P</A> <A HREF="index-10.html">R</A> <A HREF="index-11.html">S</A> <A HREF="index-12.html">U</A> <A HREF="index-13.html">V</A> <A HREF="index-14.html">W</A> <HR>
-
-</BODY>
-</HTML>
diff --git a/docs/org.eclipse.jst.ws.jaxws.doc.isv/reference/api/index-files/index-11.html b/docs/org.eclipse.jst.ws.jaxws.doc.isv/reference/api/index-files/index-11.html
deleted file mode 100644
index ddc3611..0000000
--- a/docs/org.eclipse.jst.ws.jaxws.doc.isv/reference/api/index-files/index-11.html
+++ /dev/null
@@ -1,148 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.6.0_24) on Sun Apr 03 11:19:14 IST 2011 -->
-<TITLE>
-S-Index
-</TITLE>
-
-<META NAME="date" CONTENT="2011-04-03">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
- if (location.href.indexOf('is-external=true') == -1) {
- parent.document.title="S-Index";
- }
-}
-</SCRIPT>
-<NOSCRIPT>
-</NOSCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-<HR>
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
- <TR ALIGN="center" VALIGN="top">
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <FONT CLASS="NavBarFont1">Package</FONT>&nbsp;</TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <FONT CLASS="NavBarFont1">Class</FONT>&nbsp;</TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <FONT CLASS="NavBarFont1">Use</FONT>&nbsp;</TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../overview-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
- <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Index</B></FONT>&nbsp;</TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
- </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="index-10.html"><B>PREV LETTER</B></A>&nbsp;
-&nbsp;<A HREF="index-12.html"><B>NEXT LETTER</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- <A HREF="../index.html?index-filesindex-11.html" target="_top"><B>FRAMES</B></A> &nbsp;
-&nbsp;<A HREF="index-11.html" target="_top"><B>NO FRAMES</B></A> &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
- <!--
- if(window==top) {
- document.writeln('<A HREF="../allclasses-noframe.html"><B>All Classes</B></A>');
- }
- //-->
-</SCRIPT>
-<NOSCRIPT>
- <A HREF="../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<A HREF="index-1.html">A</A> <A HREF="index-2.html">C</A> <A HREF="index-3.html">D</A> <A HREF="index-4.html">F</A> <A HREF="index-5.html">G</A> <A HREF="index-6.html">I</A> <A HREF="index-7.html">J</A> <A HREF="index-8.html">O</A> <A HREF="index-9.html">P</A> <A HREF="index-10.html">R</A> <A HREF="index-11.html">S</A> <A HREF="index-12.html">U</A> <A HREF="index-13.html">V</A> <A HREF="index-14.html">W</A> <HR>
-<A NAME="_S_"><!-- --></A><H2>
-<B>S</B></H2>
-<DL>
-<DT><A HREF="../org/eclipse/jst/ws/annotations/core/processor/AbstractAnnotationProcessor.html#setAnnotationProcessorEnvironment(com.sun.mirror.apt.AnnotationProcessorEnvironment)"><B>setAnnotationProcessorEnvironment(AnnotationProcessorEnvironment)</B></A> -
-Method in class org.eclipse.jst.ws.annotations.core.processor.<A HREF="../org/eclipse/jst/ws/annotations/core/processor/AbstractAnnotationProcessor.html" title="class in org.eclipse.jst.ws.annotations.core.processor">AbstractAnnotationProcessor</A>
-<DD>Set the <CODE>AnnotationProcessorEnvironment</CODE> environment to use during processing.
-<DT><A HREF="../org/eclipse/jst/ws/annotations/core/AnnotationDefinition.html#setJavaProject(org.eclipse.jdt.core.IJavaProject)"><B>setJavaProject(IJavaProject)</B></A> -
-Method in class org.eclipse.jst.ws.annotations.core.<A HREF="../org/eclipse/jst/ws/annotations/core/AnnotationDefinition.html" title="class in org.eclipse.jst.ws.annotations.core">AnnotationDefinition</A>
-<DD>Sets the <code>org.eclipse.jdt.core.IJavaProject</code> which is used to find the annotation type.
-</DL>
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
- <TR ALIGN="center" VALIGN="top">
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <FONT CLASS="NavBarFont1">Package</FONT>&nbsp;</TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <FONT CLASS="NavBarFont1">Class</FONT>&nbsp;</TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <FONT CLASS="NavBarFont1">Use</FONT>&nbsp;</TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../overview-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
- <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Index</B></FONT>&nbsp;</TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
- </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="index-10.html"><B>PREV LETTER</B></A>&nbsp;
-&nbsp;<A HREF="index-12.html"><B>NEXT LETTER</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- <A HREF="../index.html?index-filesindex-11.html" target="_top"><B>FRAMES</B></A> &nbsp;
-&nbsp;<A HREF="index-11.html" target="_top"><B>NO FRAMES</B></A> &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
- <!--
- if(window==top) {
- document.writeln('<A HREF="../allclasses-noframe.html"><B>All Classes</B></A>');
- }
- //-->
-</SCRIPT>
-<NOSCRIPT>
- <A HREF="../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<A HREF="index-1.html">A</A> <A HREF="index-2.html">C</A> <A HREF="index-3.html">D</A> <A HREF="index-4.html">F</A> <A HREF="index-5.html">G</A> <A HREF="index-6.html">I</A> <A HREF="index-7.html">J</A> <A HREF="index-8.html">O</A> <A HREF="index-9.html">P</A> <A HREF="index-10.html">R</A> <A HREF="index-11.html">S</A> <A HREF="index-12.html">U</A> <A HREF="index-13.html">V</A> <A HREF="index-14.html">W</A> <HR>
-
-</BODY>
-</HTML>
diff --git a/docs/org.eclipse.jst.ws.jaxws.doc.isv/reference/api/index-files/index-12.html b/docs/org.eclipse.jst.ws.jaxws.doc.isv/reference/api/index-files/index-12.html
deleted file mode 100644
index 3abb8ac..0000000
--- a/docs/org.eclipse.jst.ws.jaxws.doc.isv/reference/api/index-files/index-12.html
+++ /dev/null
@@ -1,148 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.6.0_24) on Sun Apr 03 11:19:14 IST 2011 -->
-<TITLE>
-U-Index
-</TITLE>
-
-<META NAME="date" CONTENT="2011-04-03">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
- if (location.href.indexOf('is-external=true') == -1) {
- parent.document.title="U-Index";
- }
-}
-</SCRIPT>
-<NOSCRIPT>
-</NOSCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-<HR>
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
- <TR ALIGN="center" VALIGN="top">
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <FONT CLASS="NavBarFont1">Package</FONT>&nbsp;</TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <FONT CLASS="NavBarFont1">Class</FONT>&nbsp;</TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <FONT CLASS="NavBarFont1">Use</FONT>&nbsp;</TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../overview-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
- <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Index</B></FONT>&nbsp;</TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
- </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="index-11.html"><B>PREV LETTER</B></A>&nbsp;
-&nbsp;<A HREF="index-13.html"><B>NEXT LETTER</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- <A HREF="../index.html?index-filesindex-12.html" target="_top"><B>FRAMES</B></A> &nbsp;
-&nbsp;<A HREF="index-12.html" target="_top"><B>NO FRAMES</B></A> &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
- <!--
- if(window==top) {
- document.writeln('<A HREF="../allclasses-noframe.html"><B>All Classes</B></A>');
- }
- //-->
-</SCRIPT>
-<NOSCRIPT>
- <A HREF="../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<A HREF="index-1.html">A</A> <A HREF="index-2.html">C</A> <A HREF="index-3.html">D</A> <A HREF="index-4.html">F</A> <A HREF="index-5.html">G</A> <A HREF="index-6.html">I</A> <A HREF="index-7.html">J</A> <A HREF="index-8.html">O</A> <A HREF="index-9.html">P</A> <A HREF="index-10.html">R</A> <A HREF="index-11.html">S</A> <A HREF="index-12.html">U</A> <A HREF="index-13.html">V</A> <A HREF="index-14.html">W</A> <HR>
-<A NAME="_U_"><!-- --></A><H2>
-<B>U</B></H2>
-<DL>
-<DT><A HREF="../org/eclipse/jst/ws/annotations/core/utils/AnnotationUtils.html#updateMemberValuePair(org.eclipse.jdt.core.dom.MemberValuePair, org.eclipse.jdt.core.dom.ASTNode)"><B>updateMemberValuePair(MemberValuePair, ASTNode)</B></A> -
-Static method in class org.eclipse.jst.ws.annotations.core.utils.<A HREF="../org/eclipse/jst/ws/annotations/core/utils/AnnotationUtils.html" title="class in org.eclipse.jst.ws.annotations.core.utils">AnnotationUtils</A>
-<DD>Updates the <CODE>MemberValuePair</CODE> value with the given <CODE>ASTNode</CODE>.
-<DT><A HREF="../org/eclipse/jst/ws/annotations/core/utils/AnnotationUtils.html#updateSingleMemberAnnotation(org.eclipse.jdt.core.dom.SingleMemberAnnotation, org.eclipse.jdt.core.dom.ASTNode)"><B>updateSingleMemberAnnotation(SingleMemberAnnotation, ASTNode)</B></A> -
-Static method in class org.eclipse.jst.ws.annotations.core.utils.<A HREF="../org/eclipse/jst/ws/annotations/core/utils/AnnotationUtils.html" title="class in org.eclipse.jst.ws.annotations.core.utils">AnnotationUtils</A>
-<DD>Updates the value of the <CODE>SingleMemberAnnotation</CODE> with the given <CODE>ASTNode</CODE>.
-</DL>
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
- <TR ALIGN="center" VALIGN="top">
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <FONT CLASS="NavBarFont1">Package</FONT>&nbsp;</TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <FONT CLASS="NavBarFont1">Class</FONT>&nbsp;</TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <FONT CLASS="NavBarFont1">Use</FONT>&nbsp;</TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../overview-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
- <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Index</B></FONT>&nbsp;</TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
- </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="index-11.html"><B>PREV LETTER</B></A>&nbsp;
-&nbsp;<A HREF="index-13.html"><B>NEXT LETTER</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- <A HREF="../index.html?index-filesindex-12.html" target="_top"><B>FRAMES</B></A> &nbsp;
-&nbsp;<A HREF="index-12.html" target="_top"><B>NO FRAMES</B></A> &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
- <!--
- if(window==top) {
- document.writeln('<A HREF="../allclasses-noframe.html"><B>All Classes</B></A>');
- }
- //-->
-</SCRIPT>
-<NOSCRIPT>
- <A HREF="../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<A HREF="index-1.html">A</A> <A HREF="index-2.html">C</A> <A HREF="index-3.html">D</A> <A HREF="index-4.html">F</A> <A HREF="index-5.html">G</A> <A HREF="index-6.html">I</A> <A HREF="index-7.html">J</A> <A HREF="index-8.html">O</A> <A HREF="index-9.html">P</A> <A HREF="index-10.html">R</A> <A HREF="index-11.html">S</A> <A HREF="index-12.html">U</A> <A HREF="index-13.html">V</A> <A HREF="index-14.html">W</A> <HR>
-
-</BODY>
-</HTML>
diff --git a/docs/org.eclipse.jst.ws.jaxws.doc.isv/reference/api/index-files/index-13.html b/docs/org.eclipse.jst.ws.jaxws.doc.isv/reference/api/index-files/index-13.html
deleted file mode 100644
index 9719cee..0000000
--- a/docs/org.eclipse.jst.ws.jaxws.doc.isv/reference/api/index-files/index-13.html
+++ /dev/null
@@ -1,154 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.6.0_24) on Sun Apr 03 11:19:14 IST 2011 -->
-<TITLE>
-V-Index
-</TITLE>
-
-<META NAME="date" CONTENT="2011-04-03">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
- if (location.href.indexOf('is-external=true') == -1) {
- parent.document.title="V-Index";
- }
-}
-</SCRIPT>
-<NOSCRIPT>
-</NOSCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-<HR>
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
- <TR ALIGN="center" VALIGN="top">
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <FONT CLASS="NavBarFont1">Package</FONT>&nbsp;</TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <FONT CLASS="NavBarFont1">Class</FONT>&nbsp;</TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <FONT CLASS="NavBarFont1">Use</FONT>&nbsp;</TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../overview-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
- <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Index</B></FONT>&nbsp;</TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
- </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="index-12.html"><B>PREV LETTER</B></A>&nbsp;
-&nbsp;<A HREF="index-14.html"><B>NEXT LETTER</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- <A HREF="../index.html?index-filesindex-13.html" target="_top"><B>FRAMES</B></A> &nbsp;
-&nbsp;<A HREF="index-13.html" target="_top"><B>NO FRAMES</B></A> &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
- <!--
- if(window==top) {
- document.writeln('<A HREF="../allclasses-noframe.html"><B>All Classes</B></A>');
- }
- //-->
-</SCRIPT>
-<NOSCRIPT>
- <A HREF="../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<A HREF="index-1.html">A</A> <A HREF="index-2.html">C</A> <A HREF="index-3.html">D</A> <A HREF="index-4.html">F</A> <A HREF="index-5.html">G</A> <A HREF="index-6.html">I</A> <A HREF="index-7.html">J</A> <A HREF="index-8.html">O</A> <A HREF="index-9.html">P</A> <A HREF="index-10.html">R</A> <A HREF="index-11.html">S</A> <A HREF="index-12.html">U</A> <A HREF="index-13.html">V</A> <A HREF="index-14.html">W</A> <HR>
-<A NAME="_V_"><!-- --></A><H2>
-<B>V</B></H2>
-<DL>
-<DT><A HREF="../org/eclipse/jst/ws/jaxws/core/utils/JDTUtils.html#validateIdentifier(java.lang.String)"><B>validateIdentifier(String)</B></A> -
-Static method in class org.eclipse.jst.ws.jaxws.core.utils.<A HREF="../org/eclipse/jst/ws/jaxws/core/utils/JDTUtils.html" title="class in org.eclipse.jst.ws.jaxws.core.utils">JDTUtils</A>
-<DD>Validates the given Java identifier with the workspace source and compliance levels.
-<DT><A HREF="../org/eclipse/jst/ws/jaxws/core/utils/JDTUtils.html#validateJavaTypeName(java.lang.String)"><B>validateJavaTypeName(String)</B></A> -
-Static method in class org.eclipse.jst.ws.jaxws.core.utils.<A HREF="../org/eclipse/jst/ws/jaxws/core/utils/JDTUtils.html" title="class in org.eclipse.jst.ws.jaxws.core.utils">JDTUtils</A>
-<DD>Validates the given Java type name, either simple or qualified, using the workspace source and compliance levels.
-<DT><A HREF="../org/eclipse/jst/ws/jaxws/core/utils/JDTUtils.html#validateJavaTypeName(java.lang.String, java.lang.String)"><B>validateJavaTypeName(String, String)</B></A> -
-Static method in class org.eclipse.jst.ws.jaxws.core.utils.<A HREF="../org/eclipse/jst/ws/jaxws/core/utils/JDTUtils.html" title="class in org.eclipse.jst.ws.jaxws.core.utils">JDTUtils</A>
-<DD>Validates the given Java type name, either simple or qualified, using the given projects source and compliance levels.
-<DT><A HREF="../org/eclipse/jst/ws/jaxws/core/utils/JDTUtils.html#validatePackageName(java.lang.String, java.lang.String)"><B>validatePackageName(String, String)</B></A> -
-Static method in class org.eclipse.jst.ws.jaxws.core.utils.<A HREF="../org/eclipse/jst/ws/jaxws/core/utils/JDTUtils.html" title="class in org.eclipse.jst.ws.jaxws.core.utils">JDTUtils</A>
-<DD>Validate the given package name using the given projects source and compliance levels.
-</DL>
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
- <TR ALIGN="center" VALIGN="top">
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <FONT CLASS="NavBarFont1">Package</FONT>&nbsp;</TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <FONT CLASS="NavBarFont1">Class</FONT>&nbsp;</TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <FONT CLASS="NavBarFont1">Use</FONT>&nbsp;</TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../overview-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
- <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Index</B></FONT>&nbsp;</TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
- </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="index-12.html"><B>PREV LETTER</B></A>&nbsp;
-&nbsp;<A HREF="index-14.html"><B>NEXT LETTER</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- <A HREF="../index.html?index-filesindex-13.html" target="_top"><B>FRAMES</B></A> &nbsp;
-&nbsp;<A HREF="index-13.html" target="_top"><B>NO FRAMES</B></A> &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
- <!--
- if(window==top) {
- document.writeln('<A HREF="../allclasses-noframe.html"><B>All Classes</B></A>');
- }
- //-->
-</SCRIPT>
-<NOSCRIPT>
- <A HREF="../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<A HREF="index-1.html">A</A> <A HREF="index-2.html">C</A> <A HREF="index-3.html">D</A> <A HREF="index-4.html">F</A> <A HREF="index-5.html">G</A> <A HREF="index-6.html">I</A> <A HREF="index-7.html">J</A> <A HREF="index-8.html">O</A> <A HREF="index-9.html">P</A> <A HREF="index-10.html">R</A> <A HREF="index-11.html">S</A> <A HREF="index-12.html">U</A> <A HREF="index-13.html">V</A> <A HREF="index-14.html">W</A> <HR>
-
-</BODY>
-</HTML>
diff --git a/docs/org.eclipse.jst.ws.jaxws.doc.isv/reference/api/index-files/index-14.html b/docs/org.eclipse.jst.ws.jaxws.doc.isv/reference/api/index-files/index-14.html
deleted file mode 100644
index 5a063db..0000000
--- a/docs/org.eclipse.jst.ws.jaxws.doc.isv/reference/api/index-files/index-14.html
+++ /dev/null
@@ -1,148 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.6.0_24) on Sun Apr 03 11:19:14 IST 2011 -->
-<TITLE>
-W-Index
-</TITLE>
-
-<META NAME="date" CONTENT="2011-04-03">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
- if (location.href.indexOf('is-external=true') == -1) {
- parent.document.title="W-Index";
- }
-}
-</SCRIPT>
-<NOSCRIPT>
-</NOSCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-<HR>
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
- <TR ALIGN="center" VALIGN="top">
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <FONT CLASS="NavBarFont1">Package</FONT>&nbsp;</TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <FONT CLASS="NavBarFont1">Class</FONT>&nbsp;</TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <FONT CLASS="NavBarFont1">Use</FONT>&nbsp;</TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../overview-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
- <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Index</B></FONT>&nbsp;</TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
- </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="index-13.html"><B>PREV LETTER</B></A>&nbsp;
-&nbsp;NEXT LETTER</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- <A HREF="../index.html?index-filesindex-14.html" target="_top"><B>FRAMES</B></A> &nbsp;
-&nbsp;<A HREF="index-14.html" target="_top"><B>NO FRAMES</B></A> &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
- <!--
- if(window==top) {
- document.writeln('<A HREF="../allclasses-noframe.html"><B>All Classes</B></A>');
- }
- //-->
-</SCRIPT>
-<NOSCRIPT>
- <A HREF="../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<A HREF="index-1.html">A</A> <A HREF="index-2.html">C</A> <A HREF="index-3.html">D</A> <A HREF="index-4.html">F</A> <A HREF="index-5.html">G</A> <A HREF="index-6.html">I</A> <A HREF="index-7.html">J</A> <A HREF="index-8.html">O</A> <A HREF="index-9.html">P</A> <A HREF="index-10.html">R</A> <A HREF="index-11.html">S</A> <A HREF="index-12.html">U</A> <A HREF="index-13.html">