Download
Getting Started
Members
Projects
Community
Marketplace
Events
Planet Eclipse
Newsletter
Videos
Participate
Report a Bug
Forums
Mailing Lists
Wiki
IRC
How to Contribute
Working Groups
Automotive
Internet of Things
LocationTech
Long-Term Support
PolarSys
Science
OpenMDM
More
Community
Marketplace
Events
Planet Eclipse
Newsletter
Videos
Participate
Report a Bug
Forums
Mailing Lists
Wiki
IRC
How to Contribute
Working Groups
Automotive
Internet of Things
LocationTech
Long-Term Support
PolarSys
Science
OpenMDM
Toggle navigation
Bugzilla – Attachment 150741 Details for
Bug 293585
Update Web Services model for JSR-109 1.3
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Requests
|
Help
|
Log In
[x]
|
Terms of Use
|
Copyright Agent
Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read
this important communication.
[patch]
Add support for Web Services 1.3
bug293585.patch (text/plain), 99.77 KB, created by
Carl Anderson
on 2009-10-28 11:52:36 EDT
(
hide
)
Description:
Add support for Web Services 1.3
Filename:
MIME Type:
Creator:
Carl Anderson
Created:
2009-10-28 11:52:36 EDT
Size:
99.77 KB
patch
obsolete
>### Eclipse Workspace Patch 1.0 >#P org.eclipse.jst.j2ee.core >Index: mofj2ee/org/eclipse/jst/j2ee/internal/model/translator/webservices/WsddTranslator.java >=================================================================== >RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/model/translator/webservices/WsddTranslator.java,v >retrieving revision 1.9 >diff -u -r1.9 WsddTranslator.java >--- mofj2ee/org/eclipse/jst/j2ee/internal/model/translator/webservices/WsddTranslator.java 9 Jun 2009 19:34:38 -0000 1.9 >+++ mofj2ee/org/eclipse/jst/j2ee/internal/model/translator/webservices/WsddTranslator.java 28 Oct 2009 15:53:54 -0000 >@@ -101,7 +101,7 @@ > }; > } > >-protected Translator[] create12Children() { >+ protected Translator[] create12Children() { > > return new Translator[] { > IDTranslator.INSTANCE, >@@ -116,6 +116,21 @@ > }; > } > >+ protected Translator[] create13Children() { >+ >+ return new Translator[] { >+ IDTranslator.INSTANCE, >+ new ConstantAttributeTranslator(XML_NS, JAVAEE_NS_URL), >+ new ConstantAttributeTranslator(XML_NS_XSI, XSI_NS_URL), >+ new ConstantAttributeTranslator(XSI_SCHEMA_LOCATION, JAVAEE_NS_URL+' '+WebServiceConstants.WEBSERVICE_SCHEMA_LOC_1_3), >+ new ConstantAttributeTranslator(VERSION, WebServiceConstants.WEBSERVICE_SCHEMA_VERSION_1_3), >+ CommonTranslators.DESCRIPTIONS_TRANSLATOR, >+ CommonTranslators.DISPLAYNAMES_TRANSLATOR, >+ CommonTranslators.ICONS_TRANSLATOR, >+ create13WebServiceDescTranslator() >+ }; >+ } >+ > public Translator create10WebServiceDescTranslator() { > GenericTranslator result = new GenericTranslator(WEBSERVICE_DESCRIPTION, WSDD_PKG.getWebServices_WebServiceDescriptions()); > result.setChildren(new Translator[] { >@@ -148,7 +163,7 @@ > return result; > } > >-public Translator create12WebServiceDescTranslator() { >+ public Translator create12WebServiceDescTranslator() { > > GenericTranslator result = new GenericTranslator(WEBSERVICE_DESCRIPTION, WSDD_PKG.getWebServices_WebServiceDescriptions()); > result.setChildren(new Translator[] { >@@ -164,7 +179,21 @@ > return result; > } > >- >+ public Translator create13WebServiceDescTranslator() { >+ >+ GenericTranslator result = new GenericTranslator(WEBSERVICE_DESCRIPTION, WSDD_PKG.getWebServices_WebServiceDescriptions()); >+ result.setChildren(new Translator[] { >+ IDTranslator.INSTANCE, >+ create11DescriptionTranslator(WSDD_PKG.getWebServiceDescription_DescriptionType()), >+ create11DisplayNameTranslator(WSDD_PKG.getWebServiceDescription_DisplayNameType()), >+ create11IconTranslator(WSDD_PKG.getWebServiceDescription_IconType()), >+ new Translator(WEBSERVICE_DESCRIPTION_NAME, WSDD_PKG.getWebServiceDescription_WebServiceDescriptionName()), >+ new Translator(WSDL_FILE, WSDD_PKG.getWebServiceDescription_WsdlFile()), >+ new Translator(JAXRPC_MAPPING_FILE, WSDD_PKG.getWebServiceDescription_JaxrpcMappingFile()), >+ create13PortComponentTranslator() >+ }); >+ return result; >+ } > > public Translator create10PortComponentTranslator() { > GenericTranslator result = new GenericTranslator(PORT_COMPONENT, WSDD_PKG.getWebServiceDescription_PortComponents()); >@@ -199,6 +228,7 @@ > }); > return result; > } >+ > public Translator create12PortComponentTranslator() { > GenericTranslator result = new GenericTranslator(PORT_COMPONENT, WSDD_PKG.getWebServiceDescription_PortComponents()); > result.setChildren(new Translator[] { >@@ -220,6 +250,27 @@ > return result; > } > >+ public Translator create13PortComponentTranslator() { >+ GenericTranslator result = new GenericTranslator(PORT_COMPONENT, WSDD_PKG.getWebServiceDescription_PortComponents()); >+ result.setChildren(new Translator[] { >+ IDTranslator.INSTANCE, >+ new Translator(DESCRIPTION, WSDD_PKG.getPortComponent_Description()), >+ new Translator(DISPLAY_NAME, WSDD_PKG.getPortComponent_DisplayName()), >+ new Translator(SMALL_ICON, WSDD_PKG.getPortComponent_SmallIcon()), >+ new Translator(LARGE_ICON, WSDD_PKG.getPortComponent_LargeIcon()), >+ new Translator(PORT_COMPONENT_NAME, WSDD_PKG.getPortComponent_PortComponentName()), >+ CommonTranslators.createQNameTranslator(WSDL_SERVICE, WSDD_PKG.getPortComponent_WsdlService()), >+ CommonTranslators.createQNameTranslator(WSDL_PORT, WSDD_PKG.getPortComponent_WsdlPort()), >+ new BooleanTranslator(ENABLE_MTOM, WSDD_PKG.getPortComponent_EnableMtom()), >+ new Translator(PROTOCOL_BINDING, WSDD_PKG.getPortComponent_ProtocolBinding()), >+ new Translator(SERVICE_ENPOINT_INTERFACE, WSDD_PKG.getPortComponent_ServiceEndpointInterface()), >+ createServiceImplBeanTranslator(), >+ createHandler11Translator(WSDD_PKG.getPortComponent_Handlers()), >+ createHandlerChains12Translator() >+ }); >+ return result; >+ } >+ > public Translator create10WsdlPortTranslator() { > GenericTranslator result = new GenericTranslator(WSDL_PORT, WSDD_PKG.getPortComponent_WsdlPort()); > result.setChildren(new Translator[] { >Index: mofj2ee/org/eclipse/jst/j2ee/webservice/internal/WebServiceConstants.java >=================================================================== >RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/internal/WebServiceConstants.java,v >retrieving revision 1.3 >diff -u -r1.3 WebServiceConstants.java >--- mofj2ee/org/eclipse/jst/j2ee/webservice/internal/WebServiceConstants.java 12 Dec 2007 22:57:13 -0000 1.3 >+++ mofj2ee/org/eclipse/jst/j2ee/webservice/internal/WebServiceConstants.java 28 Oct 2009 15:53:54 -0000 >@@ -22,6 +22,8 @@ > public static final String WEBSERVICE_SCHEMA_LOC_SUN_1_1 = "http://java.sun.com/xml/ns/j2ee/j2ee_web_services_1_1.xsd";//$NON-NLS-1$ > public static final String WEBSERVICE_SCHEMA_LOC_1_2 = "http://java.sun.com/xml/ns/javaee/javaee_web_services_1_2.xsd";//$NON-NLS-1$ > public static final String WEBSERVICE_SCHEMA_LOC_SUN_1_2 = "http://java.sun.com/xml/ns/javaee/javaee_web_services_1_2.xsd";//$NON-NLS-1$ >+ public static final String WEBSERVICE_SCHEMA_LOC_1_3 = "http://java.sun.com/xml/ns/javaee/javaee_web_services_1_3.xsd";//$NON-NLS-1$ >+ public static final String WEBSERVICE_SCHEMA_LOC_SUN_1_3 = "http://java.sun.com/xml/ns/javaee/javaee_web_services_1_3.xsd";//$NON-NLS-1$ > > public static final String WEBSERVICECLIENT_DD_SHORT_NAME = "webservicesclient.xml"; //$NON-NLS-1$ > public static final String WEBSERVICECLIENT_SYSTEMID = "http://www.ibm.com/webservices/dtd/j2ee_web_services_client_1_0.dtd"; //$NON-NLS-1$ >@@ -42,8 +44,10 @@ > public static final int WEBSERVICE_1_0_ID = 10; > public static final int WEBSERVICE_1_1_ID = 11; > public static final int WEBSERVICE_1_2_ID = 12; >+ public static final int WEBSERVICE_1_3_ID = 13; > public static final String WEBSERVICE_SCHEMA_VERSION_1_1 = "1.1";//$NON-NLS-1$ > public static final String WEBSERVICE_SCHEMA_VERSION_1_2 = "1.2";//$NON-NLS-1$ >+ public static final String WEBSERVICE_SCHEMA_VERSION_1_3 = "1.3";//$NON-NLS-1$ > > } > >Index: mofj2ee/org/eclipse/jst/j2ee/webservice/wsdd/internal/util/WsddSwitch.java >=================================================================== >RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wsdd/internal/util/WsddSwitch.java,v >retrieving revision 1.5 >diff -u -r1.5 WsddSwitch.java >--- mofj2ee/org/eclipse/jst/j2ee/webservice/wsdd/internal/util/WsddSwitch.java 12 Dec 2007 22:57:15 -0000 1.5 >+++ mofj2ee/org/eclipse/jst/j2ee/webservice/wsdd/internal/util/WsddSwitch.java 28 Oct 2009 15:54:02 -0000 >@@ -198,6 +198,20 @@ > if (result == null) result = defaultCase(theEObject); > return result; > } >+ case WsddPackage.RESPECT_BINDING_TYPE: { >+ RespectBindingType respectBindingType = (RespectBindingType)theEObject; >+ Object result = caseRespectBindingType(respectBindingType); >+ if (result == null) result = caseJ2EEEObject(respectBindingType); >+ if (result == null) result = defaultCase(theEObject); >+ return result; >+ } >+ case WsddPackage.ADDRESSING_TYPE: { >+ AddressingType addressingType = (AddressingType)theEObject; >+ Object result = caseAddressingType(addressingType); >+ if (result == null) result = caseJ2EEEObject(addressingType); >+ if (result == null) result = defaultCase(theEObject); >+ return result; >+ } > default: return defaultCase(theEObject); > } > } >@@ -383,6 +397,36 @@ > } > > /** >+ * Returns the result of interpreting the object as an instance of '<em>Respect Binding 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>Respect Binding Type</em>'. >+ * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) >+ * @generated >+ */ >+ public Object caseRespectBindingType(RespectBindingType object) { >+ return null; >+ } >+ >+ /** >+ * Returns the result of interpreting the object as an instance of '<em>Addressing 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>Addressing Type</em>'. >+ * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) >+ * @generated >+ */ >+ public Object caseAddressingType(AddressingType object) { >+ return null; >+ } >+ >+ /** > * Returns the result of interpreting the object as an instance of '<em>J2EEE Object</em>'. > * <!-- begin-user-doc --> > * This implementation returns null; >Index: mofj2ee/org/eclipse/jst/j2ee/webservice/wsdd/internal/util/WsddAdapterFactory.java >=================================================================== >RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wsdd/internal/util/WsddAdapterFactory.java,v >retrieving revision 1.6 >diff -u -r1.6 WsddAdapterFactory.java >--- mofj2ee/org/eclipse/jst/j2ee/webservice/wsdd/internal/util/WsddAdapterFactory.java 9 Jun 2009 19:35:56 -0000 1.6 >+++ mofj2ee/org/eclipse/jst/j2ee/webservice/wsdd/internal/util/WsddAdapterFactory.java 28 Oct 2009 15:54:02 -0000 >@@ -82,7 +82,7 @@ > } > > /** >- * The switch the delegates to the <code>createXXX</code> methods. >+ * The switch that delegates to the <code>createXXX</code> methods. > * <!-- begin-user-doc --> > * <!-- end-user-doc --> > * @generated >@@ -138,6 +138,14 @@ > return createHandlersChainsAdapter(); > } > @Override >+ public Object caseRespectBindingType(RespectBindingType object) { >+ return createRespectBindingTypeAdapter(); >+ } >+ @Override >+ public Object caseAddressingType(AddressingType object) { >+ return createAddressingTypeAdapter(); >+ } >+ @Override > public Object caseJ2EEEObject(J2EEEObject object) { > return createJ2EEEObjectAdapter(); > } >@@ -342,6 +350,34 @@ > } > > /** >+ * Creates a new adapter for an object of class '{@link org.eclipse.jst.j2ee.webservice.wsdd.RespectBindingType <em>Respect Binding 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.j2ee.webservice.wsdd.RespectBindingType >+ * @generated >+ */ >+ public Adapter createRespectBindingTypeAdapter() { >+ return null; >+ } >+ >+ /** >+ * Creates a new adapter for an object of class '{@link org.eclipse.jst.j2ee.webservice.wsdd.AddressingType <em>Addressing 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.j2ee.webservice.wsdd.AddressingType >+ * @generated >+ */ >+ public Adapter createAddressingTypeAdapter() { >+ return null; >+ } >+ >+ /** > * Creates a new adapter for an object of class '{@link org.eclipse.jst.j2ee.common.J2EEEObject <em>J2EEE Object</em>}'. > * <!-- begin-user-doc --> > * This default implementation returns null so that we can easily ignore cases; >Index: mofj2ee/org/eclipse/jst/j2ee/webservice/wsdd/internal/impl/WsddFactoryImpl.java >=================================================================== >RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wsdd/internal/impl/WsddFactoryImpl.java,v >retrieving revision 1.7 >diff -u -r1.7 WsddFactoryImpl.java >--- mofj2ee/org/eclipse/jst/j2ee/webservice/wsdd/internal/impl/WsddFactoryImpl.java 9 Jun 2009 22:38:39 -0000 1.7 >+++ mofj2ee/org/eclipse/jst/j2ee/webservice/wsdd/internal/impl/WsddFactoryImpl.java 28 Oct 2009 15:54:00 -0000 >@@ -11,6 +11,7 @@ > package org.eclipse.jst.j2ee.webservice.wsdd.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; >@@ -45,7 +46,7 @@ > */ > public static WsddFactory init() { > try { >- WsddFactory theWsddFactory = (WsddFactory)EPackage.Registry.INSTANCE.getEFactory("wsdd.xmi"); //$NON-NLS-1$ >+ WsddFactory theWsddFactory = (WsddFactory)EPackage.Registry.INSTANCE.getEFactory("wsdd.xmi"); //$NON-NLS-1$ > if (theWsddFactory != null) { > return theWsddFactory; > } >@@ -86,6 +87,8 @@ > case WsddPackage.WSDL_SERVICE: return createWSDLService(); > case WsddPackage.HANDLER_CHAIN: return createHandlerChain(); > case WsddPackage.HANDLERS_CHAINS: return createHandlersChains(); >+ case WsddPackage.RESPECT_BINDING_TYPE: return createRespectBindingType(); >+ case WsddPackage.ADDRESSING_TYPE: return createAddressingType(); > default: > throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$ > } >@@ -93,6 +96,36 @@ > > /** > * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> >+ * @generated >+ */ >+ @Override >+ public Object createFromString(EDataType eDataType, String initialValue) { >+ switch (eDataType.getClassifierID()) { >+ case WsddPackage.ADDRESSING_RESPONSES_TYPE: >+ return createAddressingResponsesTypeFromString(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 WsddPackage.ADDRESSING_RESPONSES_TYPE: >+ return convertAddressingResponsesTypeToString(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 > */ >@@ -213,6 +246,46 @@ > > /** > * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> >+ * @generated >+ */ >+ public RespectBindingType createRespectBindingType() { >+ RespectBindingTypeImpl respectBindingType = new RespectBindingTypeImpl(); >+ return respectBindingType; >+ } >+ >+ /** >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> >+ * @generated >+ */ >+ public AddressingType createAddressingType() { >+ AddressingTypeImpl addressingType = new AddressingTypeImpl(); >+ return addressingType; >+ } >+ >+ /** >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> >+ * @generated >+ */ >+ public AddressingResponsesType createAddressingResponsesTypeFromString(EDataType eDataType, String initialValue) { >+ AddressingResponsesType result = AddressingResponsesType.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 convertAddressingResponsesTypeToString(EDataType eDataType, Object instanceValue) { >+ return instanceValue == null ? null : instanceValue.toString(); >+ } >+ >+ /** >+ * <!-- begin-user-doc --> > * <!-- end-user-doc --> > * @generated > */ >Index: mofj2ee/org/eclipse/jst/j2ee/webservice/wsdd/internal/impl/WsddPackageImpl.java >=================================================================== >RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wsdd/internal/impl/WsddPackageImpl.java,v >retrieving revision 1.7 >diff -u -r1.7 WsddPackageImpl.java >--- mofj2ee/org/eclipse/jst/j2ee/webservice/wsdd/internal/impl/WsddPackageImpl.java 9 Jun 2009 22:38:39 -0000 1.7 >+++ mofj2ee/org/eclipse/jst/j2ee/webservice/wsdd/internal/impl/WsddPackageImpl.java 28 Oct 2009 15:54:02 -0000 >@@ -12,6 +12,7 @@ > > 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.EcorePackage; >@@ -37,12 +38,15 @@ > import org.eclipse.jst.j2ee.webservice.wsclient.internal.impl.Webservice_clientPackageImpl; > import org.eclipse.jst.j2ee.webservice.wscommon.WscommonPackage; > import org.eclipse.jst.j2ee.webservice.wscommon.internal.impl.WscommonPackageImpl; >+import org.eclipse.jst.j2ee.webservice.wsdd.AddressingResponsesType; >+import org.eclipse.jst.j2ee.webservice.wsdd.AddressingType; > import org.eclipse.jst.j2ee.webservice.wsdd.BeanLink; > import org.eclipse.jst.j2ee.webservice.wsdd.EJBLink; > import org.eclipse.jst.j2ee.webservice.wsdd.Handler; > import org.eclipse.jst.j2ee.webservice.wsdd.HandlerChain; > import org.eclipse.jst.j2ee.webservice.wsdd.HandlersChains; > import org.eclipse.jst.j2ee.webservice.wsdd.PortComponent; >+import org.eclipse.jst.j2ee.webservice.wsdd.RespectBindingType; > import org.eclipse.jst.j2ee.webservice.wsdd.ServiceImplBean; > import org.eclipse.jst.j2ee.webservice.wsdd.ServletLink; > import org.eclipse.jst.j2ee.webservice.wsdd.WSDLPort; >@@ -146,6 +150,27 @@ > private EClass handlersChainsEClass = null; > > /** >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> >+ * @generated >+ */ >+ private EClass respectBindingTypeEClass = null; >+ >+ /** >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> >+ * @generated >+ */ >+ private EClass addressingTypeEClass = null; >+ >+ /** >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> >+ * @generated >+ */ >+ private EEnum addressingResponsesTypeEEnum = 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. >@@ -172,20 +197,10 @@ > 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. >+ * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends. >+ * >+ * <p>This method is used to initialize {@link WsddPackage#eINSTANCE} when that field is accessed. >+ * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package. > * <!-- begin-user-doc --> > * <!-- end-user-doc --> > * @see #eNS_URI >@@ -197,12 +212,11 @@ > if (isInited) return (WsddPackage)EPackage.Registry.INSTANCE.getEPackage(WsddPackage.eNS_URI); > > // Obtain or create and register package >- WsddPackageImpl theWsddPackage = (WsddPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(eNS_URI) instanceof WsddPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(eNS_URI) : new WsddPackageImpl()); >+ WsddPackageImpl theWsddPackage = (WsddPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof WsddPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new WsddPackageImpl()); > > isInited = true; > > // Initialize simple dependencies >- EcorePackage.eINSTANCE.eClass(); > JavaRefPackage.eINSTANCE.eClass(); > > // Obtain or create and register interdependencies >@@ -249,6 +263,9 @@ > // Mark meta-data to indicate it can't be changed > theWsddPackage.freeze(); > >+ >+ // Update the registry and return the package >+ EPackage.Registry.INSTANCE.put(WsddPackage.eNS_URI, theWsddPackage); > return theWsddPackage; > } > >@@ -533,6 +550,33 @@ > > /** > * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> >+ * @generated >+ */ >+ public EAttribute getPortComponent_MtomThreshold() { >+ return (EAttribute)portComponentEClass.getEStructuralFeatures().get(16); >+ } >+ >+ /** >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> >+ * @generated >+ */ >+ public EReference getPortComponent_RespectBinding() { >+ return (EReference)portComponentEClass.getEStructuralFeatures().get(17); >+ } >+ >+ /** >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> >+ * @generated >+ */ >+ public EReference getPortComponent_Addressing() { >+ return (EReference)portComponentEClass.getEStructuralFeatures().get(18); >+ } >+ >+ /** >+ * <!-- begin-user-doc --> > * <!-- end-user-doc --> > * @generated > */ >@@ -749,6 +793,69 @@ > > /** > * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> >+ * @generated >+ */ >+ public EClass getRespectBindingType() { >+ return respectBindingTypeEClass; >+ } >+ >+ /** >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> >+ * @generated >+ */ >+ public EAttribute getRespectBindingType_Enabled() { >+ return (EAttribute)respectBindingTypeEClass.getEStructuralFeatures().get(0); >+ } >+ >+ /** >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> >+ * @generated >+ */ >+ public EClass getAddressingType() { >+ return addressingTypeEClass; >+ } >+ >+ /** >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> >+ * @generated >+ */ >+ public EAttribute getAddressingType_Enabled() { >+ return (EAttribute)addressingTypeEClass.getEStructuralFeatures().get(0); >+ } >+ >+ /** >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> >+ * @generated >+ */ >+ public EAttribute getAddressingType_Required() { >+ return (EAttribute)addressingTypeEClass.getEStructuralFeatures().get(1); >+ } >+ >+ /** >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> >+ * @generated >+ */ >+ public EAttribute getAddressingType_Responses() { >+ return (EAttribute)addressingTypeEClass.getEStructuralFeatures().get(2); >+ } >+ >+ /** >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> >+ * @generated >+ */ >+ public EEnum getAddressingResponsesType() { >+ return addressingResponsesTypeEEnum; >+ } >+ >+ /** >+ * <!-- begin-user-doc --> > * <!-- end-user-doc --> > * @generated > */ >@@ -808,6 +915,9 @@ > createEAttribute(portComponentEClass, PORT_COMPONENT__ENABLE_MTOM); > createEAttribute(portComponentEClass, PORT_COMPONENT__PROTOCOL_BINDING); > createEReference(portComponentEClass, PORT_COMPONENT__HANDLER_CHAINS); >+ createEAttribute(portComponentEClass, PORT_COMPONENT__MTOM_THRESHOLD); >+ createEReference(portComponentEClass, PORT_COMPONENT__RESPECT_BINDING); >+ createEReference(portComponentEClass, PORT_COMPONENT__ADDRESSING); > > wsdlPortEClass = createEClass(WSDL_PORT); > >@@ -841,6 +951,17 @@ > > handlersChainsEClass = createEClass(HANDLERS_CHAINS); > createEReference(handlersChainsEClass, HANDLERS_CHAINS__HANDLER_CHAIN); >+ >+ respectBindingTypeEClass = createEClass(RESPECT_BINDING_TYPE); >+ createEAttribute(respectBindingTypeEClass, RESPECT_BINDING_TYPE__ENABLED); >+ >+ addressingTypeEClass = createEClass(ADDRESSING_TYPE); >+ createEAttribute(addressingTypeEClass, ADDRESSING_TYPE__ENABLED); >+ createEAttribute(addressingTypeEClass, ADDRESSING_TYPE__REQUIRED); >+ createEAttribute(addressingTypeEClass, ADDRESSING_TYPE__RESPONSES); >+ >+ // Create enums >+ addressingResponsesTypeEEnum = createEEnum(ADDRESSING_RESPONSES_TYPE); > } > > /** >@@ -884,6 +1005,8 @@ > wsdlServiceEClass.getESuperTypes().add(theCommonPackage.getQName()); > handlerChainEClass.getESuperTypes().add(theCommonPackage.getJ2EEEObject()); > handlersChainsEClass.getESuperTypes().add(theCommonPackage.getJ2EEEObject()); >+ respectBindingTypeEClass.getESuperTypes().add(theCommonPackage.getJ2EEEObject()); >+ addressingTypeEClass.getESuperTypes().add(theCommonPackage.getJ2EEEObject()); > > // Initialize classes and features; add operations and parameters > initEClass(webServicesEClass, WebServices.class, "WebServices", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$ >@@ -919,6 +1042,9 @@ > initEAttribute(getPortComponent_EnableMtom(), theEcorePackage.getEBoolean(), "enableMtom", "", 0, 1, PortComponent.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$ > initEAttribute(getPortComponent_ProtocolBinding(), ecorePackage.getEString(), "protocolBinding", null, 0, 1, PortComponent.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ > initEReference(getPortComponent_HandlerChains(), this.getHandlersChains(), null, "handlerChains", null, 0, 1, PortComponent.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ >+ initEAttribute(getPortComponent_MtomThreshold(), theEcorePackage.getEBigInteger(), "mtomThreshold", null, 0, 1, PortComponent.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ >+ initEReference(getPortComponent_RespectBinding(), this.getRespectBindingType(), null, "respectBinding", null, 0, 1, PortComponent.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ >+ initEReference(getPortComponent_Addressing(), this.getAddressingType(), null, "addressing", null, 0, 1, PortComponent.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ > > initEClass(wsdlPortEClass, WSDLPort.class, "WSDLPort", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$ > >@@ -953,6 +1079,20 @@ > initEClass(handlersChainsEClass, HandlersChains.class, "HandlersChains", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$ > initEReference(getHandlersChains_HandlerChain(), this.getHandlerChain(), null, "handlerChain", null, 0, -1, HandlersChains.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ > >+ initEClass(respectBindingTypeEClass, RespectBindingType.class, "RespectBindingType", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$ >+ initEAttribute(getRespectBindingType_Enabled(), theEcorePackage.getEBoolean(), "enabled", null, 0, 1, RespectBindingType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ >+ >+ initEClass(addressingTypeEClass, AddressingType.class, "AddressingType", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$ >+ initEAttribute(getAddressingType_Enabled(), theEcorePackage.getEBoolean(), "enabled", null, 0, 1, AddressingType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ >+ initEAttribute(getAddressingType_Required(), theEcorePackage.getEBoolean(), "required", null, 0, 1, AddressingType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ >+ initEAttribute(getAddressingType_Responses(), this.getAddressingResponsesType(), "responses", null, 0, 1, AddressingType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ >+ >+ // Initialize enums and add enum literals >+ initEEnum(addressingResponsesTypeEEnum, AddressingResponsesType.class, "AddressingResponsesType"); //$NON-NLS-1$ >+ addEEnumLiteral(addressingResponsesTypeEEnum, AddressingResponsesType.ANONYMOUS_LITERAL); >+ addEEnumLiteral(addressingResponsesTypeEEnum, AddressingResponsesType.NONANONYMOUS_LITERAL); >+ addEEnumLiteral(addressingResponsesTypeEEnum, AddressingResponsesType.ALL_LITERAL); >+ > // Create resource > createResource(eNS_URI); > } >Index: mofj2ee/org/eclipse/jst/j2ee/webservice/wsdd/internal/impl/WsddResourceImpl.java >=================================================================== >RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wsdd/internal/impl/WsddResourceImpl.java,v >retrieving revision 1.12 >diff -u -r1.12 WsddResourceImpl.java >--- mofj2ee/org/eclipse/jst/j2ee/webservice/wsdd/internal/impl/WsddResourceImpl.java 10 Jun 2009 18:09:45 -0000 1.12 >+++ mofj2ee/org/eclipse/jst/j2ee/webservice/wsdd/internal/impl/WsddResourceImpl.java 28 Oct 2009 15:54:02 -0000 >@@ -99,6 +99,10 @@ > { > return (getModuleVersionID()==WebServiceConstants.WEBSERVICE_1_2_ID); > } >+ public boolean isWebService1_3() >+ { >+ return (getModuleVersionID()==WebServiceConstants.WEBSERVICE_1_3_ID); >+ } > > /* > * This directly sets the module version id >@@ -107,6 +111,10 @@ > public void setModuleVersionID(int id) { > //super.setVersionID(id); > switch (id) { >+ case (WebServiceConstants.WEBSERVICE_1_3_ID) : >+ super.setDoctypeValues(null, null); >+ primSetVersionID(WebServiceConstants.WEBSERVICE_1_3_ID); >+ break; > case (WebServiceConstants.WEBSERVICE_1_2_ID) : > super.setDoctypeValues(null, null); > primSetVersionID(WebServiceConstants.WEBSERVICE_1_2_ID); >Index: mofj2ee/org/eclipse/jst/j2ee/webservice/wsdd/internal/impl/PortComponentImpl.java >=================================================================== >RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wsdd/internal/impl/PortComponentImpl.java,v >retrieving revision 1.7 >diff -u -r1.7 PortComponentImpl.java >--- mofj2ee/org/eclipse/jst/j2ee/webservice/wsdd/internal/impl/PortComponentImpl.java 9 Jun 2009 22:38:39 -0000 1.7 >+++ mofj2ee/org/eclipse/jst/j2ee/webservice/wsdd/internal/impl/PortComponentImpl.java 28 Oct 2009 15:54:00 -0000 >@@ -10,6 +10,7 @@ > *******************************************************************************/ > package org.eclipse.jst.j2ee.webservice.wsdd.internal.impl; > >+import java.math.BigInteger; > import java.util.Collection; > > import org.eclipse.emf.common.notify.Notification; >@@ -24,9 +25,11 @@ > import org.eclipse.jst.j2ee.common.internal.impl.J2EEEObjectImpl; > import org.eclipse.jst.j2ee.webservice.wscommon.DescriptionType; > import org.eclipse.jst.j2ee.webservice.wscommon.DisplayNameType; >+import org.eclipse.jst.j2ee.webservice.wsdd.AddressingType; > import org.eclipse.jst.j2ee.webservice.wsdd.Handler; > import org.eclipse.jst.j2ee.webservice.wsdd.HandlersChains; > import org.eclipse.jst.j2ee.webservice.wsdd.PortComponent; >+import org.eclipse.jst.j2ee.webservice.wsdd.RespectBindingType; > import org.eclipse.jst.j2ee.webservice.wsdd.ServiceImplBean; > import org.eclipse.jst.j2ee.webservice.wsdd.WSDLPort; > import org.eclipse.jst.j2ee.webservice.wsdd.WSDLService; >@@ -56,6 +59,9 @@ > * <li>{@link org.eclipse.jst.j2ee.webservice.wsdd.internal.impl.PortComponentImpl#isEnableMtom <em>Enable Mtom</em>}</li> > * <li>{@link org.eclipse.jst.j2ee.webservice.wsdd.internal.impl.PortComponentImpl#getProtocolBinding <em>Protocol Binding</em>}</li> > * <li>{@link org.eclipse.jst.j2ee.webservice.wsdd.internal.impl.PortComponentImpl#getHandlerChains <em>Handler Chains</em>}</li> >+ * <li>{@link org.eclipse.jst.j2ee.webservice.wsdd.internal.impl.PortComponentImpl#getMtomThreshold <em>Mtom Threshold</em>}</li> >+ * <li>{@link org.eclipse.jst.j2ee.webservice.wsdd.internal.impl.PortComponentImpl#getRespectBinding <em>Respect Binding</em>}</li> >+ * <li>{@link org.eclipse.jst.j2ee.webservice.wsdd.internal.impl.PortComponentImpl#getAddressing <em>Addressing</em>}</li> > * </ul> > * </p> > * >@@ -304,6 +310,46 @@ > protected HandlersChains handlerChains; > > /** >+ * The default value of the '{@link #getMtomThreshold() <em>Mtom Threshold</em>}' attribute. >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> >+ * @see #getMtomThreshold() >+ * @generated >+ * @ordered >+ */ >+ protected static final BigInteger MTOM_THRESHOLD_EDEFAULT = null; >+ >+ /** >+ * The cached value of the '{@link #getMtomThreshold() <em>Mtom Threshold</em>}' attribute. >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> >+ * @see #getMtomThreshold() >+ * @generated >+ * @ordered >+ */ >+ protected BigInteger mtomThreshold = MTOM_THRESHOLD_EDEFAULT; >+ >+ /** >+ * The cached value of the '{@link #getRespectBinding() <em>Respect Binding</em>}' containment reference. >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> >+ * @see #getRespectBinding() >+ * @generated >+ * @ordered >+ */ >+ protected RespectBindingType respectBinding; >+ >+ /** >+ * The cached value of the '{@link #getAddressing() <em>Addressing</em>}' containment reference. >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> >+ * @see #getAddressing() >+ * @generated >+ * @ordered >+ */ >+ protected AddressingType addressing; >+ >+ /** > * <!-- begin-user-doc --> > * <!-- end-user-doc --> > * @generated >@@ -808,6 +854,113 @@ > * <!-- end-user-doc --> > * @generated > */ >+ public BigInteger getMtomThreshold() { >+ return mtomThreshold; >+ } >+ >+ /** >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> >+ * @generated >+ */ >+ public void setMtomThreshold(BigInteger newMtomThreshold) { >+ BigInteger oldMtomThreshold = mtomThreshold; >+ mtomThreshold = newMtomThreshold; >+ if (eNotificationRequired()) >+ eNotify(new ENotificationImpl(this, Notification.SET, WsddPackage.PORT_COMPONENT__MTOM_THRESHOLD, oldMtomThreshold, mtomThreshold)); >+ } >+ >+ /** >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> >+ * @generated >+ */ >+ public RespectBindingType getRespectBinding() { >+ return respectBinding; >+ } >+ >+ /** >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> >+ * @generated >+ */ >+ public NotificationChain basicSetRespectBinding(RespectBindingType newRespectBinding, NotificationChain msgs) { >+ RespectBindingType oldRespectBinding = respectBinding; >+ respectBinding = newRespectBinding; >+ if (eNotificationRequired()) { >+ ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, WsddPackage.PORT_COMPONENT__RESPECT_BINDING, oldRespectBinding, newRespectBinding); >+ if (msgs == null) msgs = notification; else msgs.add(notification); >+ } >+ return msgs; >+ } >+ >+ /** >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> >+ * @generated >+ */ >+ public void setRespectBinding(RespectBindingType newRespectBinding) { >+ if (newRespectBinding != respectBinding) { >+ NotificationChain msgs = null; >+ if (respectBinding != null) >+ msgs = ((InternalEObject)respectBinding).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - WsddPackage.PORT_COMPONENT__RESPECT_BINDING, null, msgs); >+ if (newRespectBinding != null) >+ msgs = ((InternalEObject)newRespectBinding).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - WsddPackage.PORT_COMPONENT__RESPECT_BINDING, null, msgs); >+ msgs = basicSetRespectBinding(newRespectBinding, msgs); >+ if (msgs != null) msgs.dispatch(); >+ } >+ else if (eNotificationRequired()) >+ eNotify(new ENotificationImpl(this, Notification.SET, WsddPackage.PORT_COMPONENT__RESPECT_BINDING, newRespectBinding, newRespectBinding)); >+ } >+ >+ /** >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> >+ * @generated >+ */ >+ public AddressingType getAddressing() { >+ return addressing; >+ } >+ >+ /** >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> >+ * @generated >+ */ >+ public NotificationChain basicSetAddressing(AddressingType newAddressing, NotificationChain msgs) { >+ AddressingType oldAddressing = addressing; >+ addressing = newAddressing; >+ if (eNotificationRequired()) { >+ ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, WsddPackage.PORT_COMPONENT__ADDRESSING, oldAddressing, newAddressing); >+ if (msgs == null) msgs = notification; else msgs.add(notification); >+ } >+ return msgs; >+ } >+ >+ /** >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> >+ * @generated >+ */ >+ public void setAddressing(AddressingType newAddressing) { >+ if (newAddressing != addressing) { >+ NotificationChain msgs = null; >+ if (addressing != null) >+ msgs = ((InternalEObject)addressing).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - WsddPackage.PORT_COMPONENT__ADDRESSING, null, msgs); >+ if (newAddressing != null) >+ msgs = ((InternalEObject)newAddressing).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - WsddPackage.PORT_COMPONENT__ADDRESSING, null, msgs); >+ msgs = basicSetAddressing(newAddressing, msgs); >+ if (msgs != null) msgs.dispatch(); >+ } >+ else if (eNotificationRequired()) >+ eNotify(new ENotificationImpl(this, Notification.SET, WsddPackage.PORT_COMPONENT__ADDRESSING, newAddressing, newAddressing)); >+ } >+ >+ /** >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> >+ * @generated >+ */ > @Override > public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) { > switch (featureID) { >@@ -827,6 +980,10 @@ > return basicSetWsdlService(null, msgs); > case WsddPackage.PORT_COMPONENT__HANDLER_CHAINS: > return basicSetHandlerChains(null, msgs); >+ case WsddPackage.PORT_COMPONENT__RESPECT_BINDING: >+ return basicSetRespectBinding(null, msgs); >+ case WsddPackage.PORT_COMPONENT__ADDRESSING: >+ return basicSetAddressing(null, msgs); > } > return super.eInverseRemove(otherEnd, featureID, msgs); > } >@@ -871,6 +1028,12 @@ > return getProtocolBinding(); > case WsddPackage.PORT_COMPONENT__HANDLER_CHAINS: > return getHandlerChains(); >+ case WsddPackage.PORT_COMPONENT__MTOM_THRESHOLD: >+ return getMtomThreshold(); >+ case WsddPackage.PORT_COMPONENT__RESPECT_BINDING: >+ return getRespectBinding(); >+ case WsddPackage.PORT_COMPONENT__ADDRESSING: >+ return getAddressing(); > } > return super.eGet(featureID, resolve, coreType); > } >@@ -932,6 +1095,15 @@ > case WsddPackage.PORT_COMPONENT__HANDLER_CHAINS: > setHandlerChains((HandlersChains)newValue); > return; >+ case WsddPackage.PORT_COMPONENT__MTOM_THRESHOLD: >+ setMtomThreshold((BigInteger)newValue); >+ return; >+ case WsddPackage.PORT_COMPONENT__RESPECT_BINDING: >+ setRespectBinding((RespectBindingType)newValue); >+ return; >+ case WsddPackage.PORT_COMPONENT__ADDRESSING: >+ setAddressing((AddressingType)newValue); >+ return; > } > super.eSet(featureID, newValue); > } >@@ -992,6 +1164,15 @@ > case WsddPackage.PORT_COMPONENT__HANDLER_CHAINS: > setHandlerChains((HandlersChains)null); > return; >+ case WsddPackage.PORT_COMPONENT__MTOM_THRESHOLD: >+ setMtomThreshold(MTOM_THRESHOLD_EDEFAULT); >+ return; >+ case WsddPackage.PORT_COMPONENT__RESPECT_BINDING: >+ setRespectBinding((RespectBindingType)null); >+ return; >+ case WsddPackage.PORT_COMPONENT__ADDRESSING: >+ setAddressing((AddressingType)null); >+ return; > } > super.eUnset(featureID); > } >@@ -1036,6 +1217,12 @@ > return PROTOCOL_BINDING_EDEFAULT == null ? protocolBinding != null : !PROTOCOL_BINDING_EDEFAULT.equals(protocolBinding); > case WsddPackage.PORT_COMPONENT__HANDLER_CHAINS: > return handlerChains != null; >+ case WsddPackage.PORT_COMPONENT__MTOM_THRESHOLD: >+ return MTOM_THRESHOLD_EDEFAULT == null ? mtomThreshold != null : !MTOM_THRESHOLD_EDEFAULT.equals(mtomThreshold); >+ case WsddPackage.PORT_COMPONENT__RESPECT_BINDING: >+ return respectBinding != null; >+ case WsddPackage.PORT_COMPONENT__ADDRESSING: >+ return addressing != null; > } > return super.eIsSet(featureID); > } >@@ -1066,6 +1253,8 @@ > result.append(enableMtom); > result.append(", protocolBinding: "); //$NON-NLS-1$ > result.append(protocolBinding); >+ result.append(", mtomThreshold: "); //$NON-NLS-1$ >+ result.append(mtomThreshold); > result.append(')'); > return result.toString(); > } >Index: mofj2ee/org/eclipse/jst/j2ee/webservice/wsdd/PortComponent.java >=================================================================== >RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wsdd/PortComponent.java,v >retrieving revision 1.10 >diff -u -r1.10 PortComponent.java >--- mofj2ee/org/eclipse/jst/j2ee/webservice/wsdd/PortComponent.java 12 Dec 2007 22:57:13 -0000 1.10 >+++ mofj2ee/org/eclipse/jst/j2ee/webservice/wsdd/PortComponent.java 28 Oct 2009 15:53:55 -0000 >@@ -10,6 +10,7 @@ > *******************************************************************************/ > package org.eclipse.jst.j2ee.webservice.wsdd; > >+import java.math.BigInteger; > import org.eclipse.emf.common.util.EList; > import org.eclipse.jst.j2ee.common.IconType; > import org.eclipse.jst.j2ee.common.J2EEEObject; >@@ -46,6 +47,9 @@ > * <li>{@link org.eclipse.jst.j2ee.webservice.wsdd.PortComponent#isEnableMtom <em>Enable Mtom</em>}</li> > * <li>{@link org.eclipse.jst.j2ee.webservice.wsdd.PortComponent#getProtocolBinding <em>Protocol Binding</em>}</li> > * <li>{@link org.eclipse.jst.j2ee.webservice.wsdd.PortComponent#getHandlerChains <em>Handler Chains</em>}</li> >+ * <li>{@link org.eclipse.jst.j2ee.webservice.wsdd.PortComponent#getMtomThreshold <em>Mtom Threshold</em>}</li> >+ * <li>{@link org.eclipse.jst.j2ee.webservice.wsdd.PortComponent#getRespectBinding <em>Respect Binding</em>}</li> >+ * <li>{@link org.eclipse.jst.j2ee.webservice.wsdd.PortComponent#getAddressing <em>Addressing</em>}</li> > * </ul> > * </p> > * >@@ -470,4 +474,82 @@ > */ > void setHandlerChains(HandlersChains value); > >+ /** >+ * Returns the value of the '<em><b>Mtom Threshold</b></em>' attribute. >+ * <!-- begin-user-doc --> >+ * <p> >+ * If the meaning of the '<em>Mtom Threshold</em>' attribute isn't clear, >+ * there really should be more of a description here... >+ * </p> >+ * <!-- end-user-doc --> >+ * @return the value of the '<em>Mtom Threshold</em>' attribute. >+ * @see #setMtomThreshold(BigInteger) >+ * @see org.eclipse.jst.j2ee.webservice.wsdd.WsddPackage#getPortComponent_MtomThreshold() >+ * @model >+ * @generated >+ */ >+ BigInteger getMtomThreshold(); >+ >+ /** >+ * Sets the value of the '{@link org.eclipse.jst.j2ee.webservice.wsdd.PortComponent#getMtomThreshold <em>Mtom Threshold</em>}' attribute. >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> >+ * @param value the new value of the '<em>Mtom Threshold</em>' attribute. >+ * @see #getMtomThreshold() >+ * @generated >+ */ >+ void setMtomThreshold(BigInteger value); >+ >+ /** >+ * Returns the value of the '<em><b>Respect Binding</b></em>' containment reference. >+ * <!-- begin-user-doc --> >+ * <p> >+ * If the meaning of the '<em>Respect Binding</em>' containment reference isn't clear, >+ * there really should be more of a description here... >+ * </p> >+ * <!-- end-user-doc --> >+ * @return the value of the '<em>Respect Binding</em>' containment reference. >+ * @see #setRespectBinding(RespectBindingType) >+ * @see org.eclipse.jst.j2ee.webservice.wsdd.WsddPackage#getPortComponent_RespectBinding() >+ * @model containment="true" >+ * @generated >+ */ >+ RespectBindingType getRespectBinding(); >+ >+ /** >+ * Sets the value of the '{@link org.eclipse.jst.j2ee.webservice.wsdd.PortComponent#getRespectBinding <em>Respect Binding</em>}' containment reference. >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> >+ * @param value the new value of the '<em>Respect Binding</em>' containment reference. >+ * @see #getRespectBinding() >+ * @generated >+ */ >+ void setRespectBinding(RespectBindingType value); >+ >+ /** >+ * Returns the value of the '<em><b>Addressing</b></em>' containment reference. >+ * <!-- begin-user-doc --> >+ * <p> >+ * If the meaning of the '<em>Addressing</em>' containment reference isn't clear, >+ * there really should be more of a description here... >+ * </p> >+ * <!-- end-user-doc --> >+ * @return the value of the '<em>Addressing</em>' containment reference. >+ * @see #setAddressing(AddressingType) >+ * @see org.eclipse.jst.j2ee.webservice.wsdd.WsddPackage#getPortComponent_Addressing() >+ * @model containment="true" >+ * @generated >+ */ >+ AddressingType getAddressing(); >+ >+ /** >+ * Sets the value of the '{@link org.eclipse.jst.j2ee.webservice.wsdd.PortComponent#getAddressing <em>Addressing</em>}' containment reference. >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> >+ * @param value the new value of the '<em>Addressing</em>' containment reference. >+ * @see #getAddressing() >+ * @generated >+ */ >+ void setAddressing(AddressingType value); >+ > } // PortComponent >Index: mofj2ee/org/eclipse/jst/j2ee/webservice/wsdd/WsddFactory.java >=================================================================== >RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wsdd/WsddFactory.java,v >retrieving revision 1.12 >diff -u -r1.12 WsddFactory.java >--- mofj2ee/org/eclipse/jst/j2ee/webservice/wsdd/WsddFactory.java 12 Dec 2007 22:57:13 -0000 1.12 >+++ mofj2ee/org/eclipse/jst/j2ee/webservice/wsdd/WsddFactory.java 28 Oct 2009 15:53:55 -0000 >@@ -138,6 +138,24 @@ > HandlersChains createHandlersChains(); > > /** >+ * Returns a new object of class '<em>Respect Binding Type</em>'. >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> >+ * @return a new object of class '<em>Respect Binding Type</em>'. >+ * @generated >+ */ >+ RespectBindingType createRespectBindingType(); >+ >+ /** >+ * Returns a new object of class '<em>Addressing Type</em>'. >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> >+ * @return a new object of class '<em>Addressing Type</em>'. >+ * @generated >+ */ >+ AddressingType createAddressingType(); >+ >+ /** > * Returns the package supported by this factory. > * <!-- begin-user-doc --> > * This method is NOT api, and may change in future releases. >Index: mofj2ee/org/eclipse/jst/j2ee/webservice/wsdd/WsddPackage.java >=================================================================== >RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wsdd/WsddPackage.java,v >retrieving revision 1.11 >diff -u -r1.11 WsddPackage.java >--- mofj2ee/org/eclipse/jst/j2ee/webservice/wsdd/WsddPackage.java 12 Dec 2007 22:57:13 -0000 1.11 >+++ mofj2ee/org/eclipse/jst/j2ee/webservice/wsdd/WsddPackage.java 28 Oct 2009 15:54:00 -0000 >@@ -12,6 +12,7 @@ > > 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.jst.j2ee.common.CommonPackage; >@@ -438,13 +439,40 @@ > int PORT_COMPONENT__HANDLER_CHAINS = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 15; > > /** >+ * The feature id for the '<em><b>Mtom Threshold</b></em>' attribute. >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> >+ * @generated >+ * @ordered >+ */ >+ int PORT_COMPONENT__MTOM_THRESHOLD = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 16; >+ >+ /** >+ * The feature id for the '<em><b>Respect Binding</b></em>' containment reference. >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> >+ * @generated >+ * @ordered >+ */ >+ int PORT_COMPONENT__RESPECT_BINDING = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 17; >+ >+ /** >+ * The feature id for the '<em><b>Addressing</b></em>' containment reference. >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> >+ * @generated >+ * @ordered >+ */ >+ int PORT_COMPONENT__ADDRESSING = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 18; >+ >+ /** > * The number of structural features of the '<em>Port Component</em>' class. > * <!-- begin-user-doc --> > * <!-- end-user-doc --> > * @generated > * @ordered > */ >- int PORT_COMPONENT_FEATURE_COUNT = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 16; >+ int PORT_COMPONENT_FEATURE_COUNT = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 19; > > /** > * The meta object id for the '{@link org.eclipse.jst.j2ee.webservice.wsdd.internal.impl.WSDLPortImpl <em>WSDL Port</em>}' class. >@@ -890,6 +918,91 @@ > > > /** >+ * The meta object id for the '{@link org.eclipse.jst.j2ee.webservice.wsdd.internal.impl.RespectBindingTypeImpl <em>Respect Binding Type</em>}' class. >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> >+ * @see org.eclipse.jst.j2ee.webservice.wsdd.internal.impl.RespectBindingTypeImpl >+ * @see org.eclipse.jst.j2ee.webservice.wsdd.internal.impl.WsddPackageImpl#getRespectBindingType() >+ * @generated >+ */ >+ int RESPECT_BINDING_TYPE = 12; >+ >+ /** >+ * The feature id for the '<em><b>Enabled</b></em>' attribute. >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> >+ * @generated >+ * @ordered >+ */ >+ int RESPECT_BINDING_TYPE__ENABLED = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 0; >+ >+ /** >+ * The number of structural features of the '<em>Respect Binding Type</em>' class. >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> >+ * @generated >+ * @ordered >+ */ >+ int RESPECT_BINDING_TYPE_FEATURE_COUNT = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 1; >+ >+ /** >+ * The meta object id for the '{@link org.eclipse.jst.j2ee.webservice.wsdd.internal.impl.AddressingTypeImpl <em>Addressing Type</em>}' class. >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> >+ * @see org.eclipse.jst.j2ee.webservice.wsdd.internal.impl.AddressingTypeImpl >+ * @see org.eclipse.jst.j2ee.webservice.wsdd.internal.impl.WsddPackageImpl#getAddressingType() >+ * @generated >+ */ >+ int ADDRESSING_TYPE = 13; >+ >+ /** >+ * The feature id for the '<em><b>Enabled</b></em>' attribute. >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> >+ * @generated >+ * @ordered >+ */ >+ int ADDRESSING_TYPE__ENABLED = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 0; >+ >+ /** >+ * The feature id for the '<em><b>Required</b></em>' attribute. >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> >+ * @generated >+ * @ordered >+ */ >+ int ADDRESSING_TYPE__REQUIRED = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 1; >+ >+ /** >+ * The feature id for the '<em><b>Responses</b></em>' attribute. >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> >+ * @generated >+ * @ordered >+ */ >+ int ADDRESSING_TYPE__RESPONSES = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 2; >+ >+ /** >+ * The number of structural features of the '<em>Addressing Type</em>' class. >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> >+ * @generated >+ * @ordered >+ */ >+ int ADDRESSING_TYPE_FEATURE_COUNT = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 3; >+ >+ /** >+ * The meta object id for the '{@link org.eclipse.jst.j2ee.webservice.wsdd.AddressingResponsesType <em>Addressing Responses Type</em>}' enum. >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> >+ * @see org.eclipse.jst.j2ee.webservice.wsdd.AddressingResponsesType >+ * @see org.eclipse.jst.j2ee.webservice.wsdd.internal.impl.WsddPackageImpl#getAddressingResponsesType() >+ * @generated >+ */ >+ int ADDRESSING_RESPONSES_TYPE = 14; >+ >+ >+ /** > * Returns the meta object for class '{@link org.eclipse.jst.j2ee.webservice.wsdd.WebServices <em>Web Services</em>}'. > * <!-- begin-user-doc --> > * <!-- end-user-doc --> >@@ -1228,6 +1341,39 @@ > EReference getPortComponent_HandlerChains(); > > /** >+ * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.webservice.wsdd.PortComponent#getMtomThreshold <em>Mtom Threshold</em>}'. >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> >+ * @return the meta object for the attribute '<em>Mtom Threshold</em>'. >+ * @see org.eclipse.jst.j2ee.webservice.wsdd.PortComponent#getMtomThreshold() >+ * @see #getPortComponent() >+ * @generated >+ */ >+ EAttribute getPortComponent_MtomThreshold(); >+ >+ /** >+ * Returns the meta object for the containment reference '{@link org.eclipse.jst.j2ee.webservice.wsdd.PortComponent#getRespectBinding <em>Respect Binding</em>}'. >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> >+ * @return the meta object for the containment reference '<em>Respect Binding</em>'. >+ * @see org.eclipse.jst.j2ee.webservice.wsdd.PortComponent#getRespectBinding() >+ * @see #getPortComponent() >+ * @generated >+ */ >+ EReference getPortComponent_RespectBinding(); >+ >+ /** >+ * Returns the meta object for the containment reference '{@link org.eclipse.jst.j2ee.webservice.wsdd.PortComponent#getAddressing <em>Addressing</em>}'. >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> >+ * @return the meta object for the containment reference '<em>Addressing</em>'. >+ * @see org.eclipse.jst.j2ee.webservice.wsdd.PortComponent#getAddressing() >+ * @see #getPortComponent() >+ * @generated >+ */ >+ EReference getPortComponent_Addressing(); >+ >+ /** > * Returns the meta object for class '{@link org.eclipse.jst.j2ee.webservice.wsdd.WSDLPort <em>WSDL Port</em>}'. > * <!-- begin-user-doc --> > * <!-- end-user-doc --> >@@ -1483,6 +1629,80 @@ > EReference getHandlersChains_HandlerChain(); > > /** >+ * Returns the meta object for class '{@link org.eclipse.jst.j2ee.webservice.wsdd.RespectBindingType <em>Respect Binding Type</em>}'. >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> >+ * @return the meta object for class '<em>Respect Binding Type</em>'. >+ * @see org.eclipse.jst.j2ee.webservice.wsdd.RespectBindingType >+ * @generated >+ */ >+ EClass getRespectBindingType(); >+ >+ /** >+ * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.webservice.wsdd.RespectBindingType#isEnabled <em>Enabled</em>}'. >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> >+ * @return the meta object for the attribute '<em>Enabled</em>'. >+ * @see org.eclipse.jst.j2ee.webservice.wsdd.RespectBindingType#isEnabled() >+ * @see #getRespectBindingType() >+ * @generated >+ */ >+ EAttribute getRespectBindingType_Enabled(); >+ >+ /** >+ * Returns the meta object for class '{@link org.eclipse.jst.j2ee.webservice.wsdd.AddressingType <em>Addressing Type</em>}'. >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> >+ * @return the meta object for class '<em>Addressing Type</em>'. >+ * @see org.eclipse.jst.j2ee.webservice.wsdd.AddressingType >+ * @generated >+ */ >+ EClass getAddressingType(); >+ >+ /** >+ * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.webservice.wsdd.AddressingType#isEnabled <em>Enabled</em>}'. >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> >+ * @return the meta object for the attribute '<em>Enabled</em>'. >+ * @see org.eclipse.jst.j2ee.webservice.wsdd.AddressingType#isEnabled() >+ * @see #getAddressingType() >+ * @generated >+ */ >+ EAttribute getAddressingType_Enabled(); >+ >+ /** >+ * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.webservice.wsdd.AddressingType#isRequired <em>Required</em>}'. >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> >+ * @return the meta object for the attribute '<em>Required</em>'. >+ * @see org.eclipse.jst.j2ee.webservice.wsdd.AddressingType#isRequired() >+ * @see #getAddressingType() >+ * @generated >+ */ >+ EAttribute getAddressingType_Required(); >+ >+ /** >+ * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.webservice.wsdd.AddressingType#getResponses <em>Responses</em>}'. >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> >+ * @return the meta object for the attribute '<em>Responses</em>'. >+ * @see org.eclipse.jst.j2ee.webservice.wsdd.AddressingType#getResponses() >+ * @see #getAddressingType() >+ * @generated >+ */ >+ EAttribute getAddressingType_Responses(); >+ >+ /** >+ * Returns the meta object for enum '{@link org.eclipse.jst.j2ee.webservice.wsdd.AddressingResponsesType <em>Addressing Responses Type</em>}'. >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> >+ * @return the meta object for enum '<em>Addressing Responses Type</em>'. >+ * @see org.eclipse.jst.j2ee.webservice.wsdd.AddressingResponsesType >+ * @generated >+ */ >+ EEnum getAddressingResponsesType(); >+ >+ /** > * Returns the factory that creates the instances of the model. > * <!-- begin-user-doc --> > * <!-- end-user-doc --> >@@ -1759,6 +1979,30 @@ > EReference PORT_COMPONENT__HANDLER_CHAINS = eINSTANCE.getPortComponent_HandlerChains(); > > /** >+ * The meta object literal for the '<em><b>Mtom Threshold</b></em>' attribute feature. >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> >+ * @generated >+ */ >+ EAttribute PORT_COMPONENT__MTOM_THRESHOLD = eINSTANCE.getPortComponent_MtomThreshold(); >+ >+ /** >+ * The meta object literal for the '<em><b>Respect Binding</b></em>' containment reference feature. >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> >+ * @generated >+ */ >+ EReference PORT_COMPONENT__RESPECT_BINDING = eINSTANCE.getPortComponent_RespectBinding(); >+ >+ /** >+ * The meta object literal for the '<em><b>Addressing</b></em>' containment reference feature. >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> >+ * @generated >+ */ >+ EReference PORT_COMPONENT__ADDRESSING = eINSTANCE.getPortComponent_Addressing(); >+ >+ /** > * The meta object literal for the '{@link org.eclipse.jst.j2ee.webservice.wsdd.internal.impl.WSDLPortImpl <em>WSDL Port</em>}' class. > * <!-- begin-user-doc --> > * <!-- end-user-doc --> >@@ -1968,6 +2212,68 @@ > */ > EReference HANDLERS_CHAINS__HANDLER_CHAIN = eINSTANCE.getHandlersChains_HandlerChain(); > >+ /** >+ * The meta object literal for the '{@link org.eclipse.jst.j2ee.webservice.wsdd.internal.impl.RespectBindingTypeImpl <em>Respect Binding Type</em>}' class. >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> >+ * @see org.eclipse.jst.j2ee.webservice.wsdd.internal.impl.RespectBindingTypeImpl >+ * @see org.eclipse.jst.j2ee.webservice.wsdd.internal.impl.WsddPackageImpl#getRespectBindingType() >+ * @generated >+ */ >+ EClass RESPECT_BINDING_TYPE = eINSTANCE.getRespectBindingType(); >+ >+ /** >+ * The meta object literal for the '<em><b>Enabled</b></em>' attribute feature. >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> >+ * @generated >+ */ >+ EAttribute RESPECT_BINDING_TYPE__ENABLED = eINSTANCE.getRespectBindingType_Enabled(); >+ >+ /** >+ * The meta object literal for the '{@link org.eclipse.jst.j2ee.webservice.wsdd.internal.impl.AddressingTypeImpl <em>Addressing Type</em>}' class. >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> >+ * @see org.eclipse.jst.j2ee.webservice.wsdd.internal.impl.AddressingTypeImpl >+ * @see org.eclipse.jst.j2ee.webservice.wsdd.internal.impl.WsddPackageImpl#getAddressingType() >+ * @generated >+ */ >+ EClass ADDRESSING_TYPE = eINSTANCE.getAddressingType(); >+ >+ /** >+ * The meta object literal for the '<em><b>Enabled</b></em>' attribute feature. >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> >+ * @generated >+ */ >+ EAttribute ADDRESSING_TYPE__ENABLED = eINSTANCE.getAddressingType_Enabled(); >+ >+ /** >+ * The meta object literal for the '<em><b>Required</b></em>' attribute feature. >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> >+ * @generated >+ */ >+ EAttribute ADDRESSING_TYPE__REQUIRED = eINSTANCE.getAddressingType_Required(); >+ >+ /** >+ * The meta object literal for the '<em><b>Responses</b></em>' attribute feature. >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> >+ * @generated >+ */ >+ EAttribute ADDRESSING_TYPE__RESPONSES = eINSTANCE.getAddressingType_Responses(); >+ >+ /** >+ * The meta object literal for the '{@link org.eclipse.jst.j2ee.webservice.wsdd.AddressingResponsesType <em>Addressing Responses Type</em>}' enum. >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> >+ * @see org.eclipse.jst.j2ee.webservice.wsdd.AddressingResponsesType >+ * @see org.eclipse.jst.j2ee.webservice.wsdd.internal.impl.WsddPackageImpl#getAddressingResponsesType() >+ * @generated >+ */ >+ EEnum ADDRESSING_RESPONSES_TYPE = eINSTANCE.getAddressingResponsesType(); >+ > } > > } //WsddPackage >Index: mofj2ee/org/eclipse/jst/j2ee/webservice/wsdd/WsddResource.java >=================================================================== >RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wsdd/WsddResource.java,v >retrieving revision 1.5 >diff -u -r1.5 WsddResource.java >--- mofj2ee/org/eclipse/jst/j2ee/webservice/wsdd/WsddResource.java 12 Dec 2007 22:57:13 -0000 1.5 >+++ mofj2ee/org/eclipse/jst/j2ee/webservice/wsdd/WsddResource.java 28 Oct 2009 15:54:00 -0000 >@@ -46,5 +46,10 @@ > * @return boolean value > */ > public boolean isWebService1_2(); >+ /** >+ * Returns true if the WebService is of version 1.2 >+ * @return boolean value >+ */ >+ public boolean isWebService1_3(); > > } >Index: model/wsdd.ecore >=================================================================== >RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee.core/model/wsdd.ecore,v >retrieving revision 1.3 >diff -u -r1.3 wsdd.ecore >--- model/wsdd.ecore 12 Dec 2007 22:57:14 -0000 1.3 >+++ model/wsdd.ecore 28 Oct 2009 15:53:54 -0000 >@@ -81,6 +81,11 @@ > <eStructuralFeatures xsi:type="ecore:EAttribute" name="protocolBinding" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/> > <eStructuralFeatures xsi:type="ecore:EReference" name="handlerChains" eType="#//HandlersChains" > containment="true"/> >+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="mtomThreshold" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EBigInteger"/> >+ <eStructuralFeatures xsi:type="ecore:EReference" name="respectBinding" eType="#//RespectBindingType" >+ containment="true"/> >+ <eStructuralFeatures xsi:type="ecore:EReference" name="addressing" eType="#//AddressingType" >+ containment="true"/> > </eClassifiers> > <eClassifiers xsi:type="ecore:EClass" name="WSDLPort" eSuperTypes="common.ecore#//QName"> > <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> >@@ -147,4 +152,17 @@ > <eStructuralFeatures xsi:type="ecore:EReference" name="handlerChain" upperBound="-1" > eType="#//HandlerChain" containment="true"/> > </eClassifiers> >+ <eClassifiers xsi:type="ecore:EClass" name="RespectBindingType" eSuperTypes="common.ecore#//J2EEEObject"> >+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="enabled" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EBoolean"/> >+ </eClassifiers> >+ <eClassifiers xsi:type="ecore:EClass" name="AddressingType" eSuperTypes="common.ecore#//J2EEEObject"> >+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="enabled" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EBoolean"/> >+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="required" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EBoolean"/> >+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="responses" eType="#//AddressingResponsesType"/> >+ </eClassifiers> >+ <eClassifiers xsi:type="ecore:EEnum" name="AddressingResponsesType"> >+ <eLiterals name="ANONYMOUS"/> >+ <eLiterals name="NONANONYMOUS" value="1"/> >+ <eLiterals name="ALL" value="2"/> >+ </eClassifiers> > </ecore:EPackage> >Index: model/j2ee.genmodel >=================================================================== >RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee.core/model/j2ee.genmodel,v >retrieving revision 1.2 >diff -u -r1.2 j2ee.genmodel >--- model/j2ee.genmodel 22 Aug 2006 16:06:46 -0000 1.2 >+++ model/j2ee.genmodel 28 Oct 2009 15:53:53 -0000 >@@ -2,8 +2,9 @@ > <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.j2ee.core/mofj2ee" >- modelPluginID="org.eclipse.jst.j2ee.core" modelName="J2ee" testsDirectory="/org.eclipse.jst.j2ee.core.tests/mofj2eeTests" >- importerID="org.eclipse.emf.importer.rose" usedGenPackages="../../../plugin/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore ../../org.eclipse.jem/model/javaModel.genmodel#//java"> >+ modelPluginID="org.eclipse.jst.j2ee.core" modelName="J2ee" nonNLSMarkers="true" >+ testsDirectory="/org.eclipse.jst.j2ee.core.tests/mofj2eeTests" importerID="org.eclipse.emf.importer.rose" >+ runtimeVersion="2.5" usedGenPackages="platform:/plugin/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore ../../org.eclipse.jem/model/javaModel.genmodel#//java"> > <foreignModel>..\rose\j2ee.mdl</foreignModel> > <foreignModel>WORKSPACE_ROOT</foreignModel> > <foreignModel>D:\work\M5</foreignModel> >@@ -846,6 +847,11 @@ > </genPackages> > <genPackages prefix="Wsdd" basePackage="org.eclipse.jst.j2ee.webservice" disposableProviderFactory="true" > classPackageSuffix="internal.impl" utilityPackageSuffix="internal.util" ecorePackage="wsdd.ecore#/"> >+ <genEnums typeSafeEnumCompatible="false" ecoreEnum="wsdd.ecore#//AddressingResponsesType"> >+ <genEnumLiterals ecoreEnumLiteral="wsdd.ecore#//AddressingResponsesType/ANONYMOUS"/> >+ <genEnumLiterals ecoreEnumLiteral="wsdd.ecore#//AddressingResponsesType/NONANONYMOUS"/> >+ <genEnumLiterals ecoreEnumLiteral="wsdd.ecore#//AddressingResponsesType/ALL"/> >+ </genEnums> > <genClasses ecoreClass="wsdd.ecore#//WebServices"> > <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference wsdd.ecore#//WebServices/webServiceDescriptions"/> > </genClasses> >@@ -875,6 +881,12 @@ > <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference wsdd.ecore#//PortComponent/descriptionType"/> > <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference wsdd.ecore#//PortComponent/displayNameType"/> > <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference wsdd.ecore#//PortComponent/iconType"/> >+ <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference wsdd.ecore#//PortComponent/wsdlService"/> >+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdd.ecore#//PortComponent/enableMtom"/> >+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdd.ecore#//PortComponent/protocolBinding"/> >+ <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference wsdd.ecore#//PortComponent/handlerChains"/> >+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdd.ecore#//PortComponent/mtomThreshold"/> >+ <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference wsdd.ecore#//PortComponent/respectBinding"/> > </genClasses> > <genClasses ecoreClass="wsdd.ecore#//WSDLPort"/> > <genClasses ecoreClass="wsdd.ecore#//ServiceImplBean"> >@@ -896,5 +908,23 @@ > <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference wsdd.ecore#//Handler/soapRoles"/> > </genClasses> > <genClasses ecoreClass="wsdd.ecore#//BeanLink"/> >+ <genClasses ecoreClass="wsdd.ecore#//WSDLService"/> >+ <genClasses ecoreClass="wsdd.ecore#//HandlerChain"> >+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdd.ecore#//HandlerChain/serviceNamePattern"/> >+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdd.ecore#//HandlerChain/portNamePattern"/> >+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdd.ecore#//HandlerChain/protocolBindings"/> >+ <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference wsdd.ecore#//HandlerChain/handlers"/> >+ </genClasses> >+ <genClasses ecoreClass="wsdd.ecore#//HandlersChains"> >+ <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference wsdd.ecore#//HandlersChains/handlerChain"/> >+ </genClasses> >+ <genClasses ecoreClass="wsdd.ecore#//RespectBindingType"> >+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdd.ecore#//RespectBindingType/enabled"/> >+ </genClasses> >+ <genClasses ecoreClass="wsdd.ecore#//AddressingType"> >+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdd.ecore#//AddressingType/enabled"/> >+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdd.ecore#//AddressingType/required"/> >+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdd.ecore#//AddressingType/responses"/> >+ </genClasses> > </genPackages> > </genmodel:GenModel> >Index: mofj2ee/org/eclipse/jst/j2ee/webservice/internal/wsdd/WsddResourceFactory.java >=================================================================== >RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/internal/wsdd/WsddResourceFactory.java,v >retrieving revision 1.9 >diff -u -r1.9 WsddResourceFactory.java >--- mofj2ee/org/eclipse/jst/j2ee/webservice/internal/wsdd/WsddResourceFactory.java 9 Jun 2009 19:35:56 -0000 1.9 >+++ mofj2ee/org/eclipse/jst/j2ee/webservice/internal/wsdd/WsddResourceFactory.java 28 Oct 2009 15:53:54 -0000 >@@ -77,8 +77,10 @@ > //http://www.ibm.com/webservices/dtd/j2ee_web_services_1_0.dtd > J2EEXmlDtDEntityResolver.registerDtD(WebServiceConstants.WEBSERVICE_SYSTEMID, "j2ee_web_services_1_0.dtd");//$NON-NLS-1$ > J2EEXmlDtDEntityResolver.registerDtD(WebServiceConstants.WEBSERVICE_SCHEMA_LOC_1_1, "j2ee_web_services_1_1.xsd"); //$NON-NLS-1$ >- J2EEXmlDtDEntityResolver.registerDtD(WebServiceConstants.WEBSERVICE_SCHEMA_LOC_SUN_1_1, "j2ee_web_services_1_1.xsd"); //$NON-NLS-1$ >+ J2EEXmlDtDEntityResolver.registerDtD(WebServiceConstants.WEBSERVICE_SCHEMA_LOC_SUN_1_1, "j2ee_web_services_1_1.xsd"); //$NON-NLS-1$ > J2EEXmlDtDEntityResolver.registerDtD(WebServiceConstants.WEBSERVICE_SCHEMA_LOC_1_2, "javaee_web_services_1_2.xsd"); //$NON-NLS-1$ >- J2EEXmlDtDEntityResolver.registerDtD(WebServiceConstants.WEBSERVICE_SCHEMA_LOC_SUN_1_2, "javaee_web_services_1_2.xsd"); //$NON-NLS-1$ >+ J2EEXmlDtDEntityResolver.registerDtD(WebServiceConstants.WEBSERVICE_SCHEMA_LOC_SUN_1_2, "javaee_web_services_1_2.xsd"); //$NON-NLS-1$ >+ J2EEXmlDtDEntityResolver.registerDtD(WebServiceConstants.WEBSERVICE_SCHEMA_LOC_1_3, "javaee_web_services_1_3.xsd"); //$NON-NLS-1$ >+ J2EEXmlDtDEntityResolver.registerDtD(WebServiceConstants.WEBSERVICE_SCHEMA_LOC_SUN_1_3, "javaee_web_services_1_3.xsd"); //$NON-NLS-1$ > } > } >Index: mofj2ee/org/eclipse/jst/j2ee/webservice/wsdd/RespectBindingType.java >=================================================================== >RCS file: mofj2ee/org/eclipse/jst/j2ee/webservice/wsdd/RespectBindingType.java >diff -N mofj2ee/org/eclipse/jst/j2ee/webservice/wsdd/RespectBindingType.java >--- /dev/null 1 Jan 1970 00:00:00 -0000 >+++ mofj2ee/org/eclipse/jst/j2ee/webservice/wsdd/RespectBindingType.java 1 Jan 1970 00:00:00 -0000 >@@ -0,0 +1,58 @@ >+/******************************************************************************* >+ * Copyright (c) 2007 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.j2ee.webservice.wsdd; >+ >+import org.eclipse.jst.j2ee.common.J2EEEObject; >+ >+/** >+ * <!-- begin-user-doc --> >+ * A representation of the model object '<em><b>Respect Binding Type</b></em>'. >+ * <!-- end-user-doc --> >+ * >+ * <p> >+ * The following features are supported: >+ * <ul> >+ * <li>{@link org.eclipse.jst.j2ee.webservice.wsdd.RespectBindingType#isEnabled <em>Enabled</em>}</li> >+ * </ul> >+ * </p> >+ * >+ * @see org.eclipse.jst.j2ee.webservice.wsdd.WsddPackage#getRespectBindingType() >+ * @model >+ * @generated >+ */ >+public interface RespectBindingType extends J2EEEObject { >+ /** >+ * Returns the value of the '<em><b>Enabled</b></em>' attribute. >+ * <!-- begin-user-doc --> >+ * <p> >+ * If the meaning of the '<em>Enabled</em>' attribute isn't clear, >+ * there really should be more of a description here... >+ * </p> >+ * <!-- end-user-doc --> >+ * @return the value of the '<em>Enabled</em>' attribute. >+ * @see #setEnabled(boolean) >+ * @see org.eclipse.jst.j2ee.webservice.wsdd.WsddPackage#getRespectBindingType_Enabled() >+ * @model >+ * @generated >+ */ >+ boolean isEnabled(); >+ >+ /** >+ * Sets the value of the '{@link org.eclipse.jst.j2ee.webservice.wsdd.RespectBindingType#isEnabled <em>Enabled</em>}' attribute. >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> >+ * @param value the new value of the '<em>Enabled</em>' attribute. >+ * @see #isEnabled() >+ * @generated >+ */ >+ void setEnabled(boolean value); >+ >+} // RespectBindingType >Index: mofj2ee/org/eclipse/jst/j2ee/webservice/wsdd/AddressingType.java >=================================================================== >RCS file: mofj2ee/org/eclipse/jst/j2ee/webservice/wsdd/AddressingType.java >diff -N mofj2ee/org/eclipse/jst/j2ee/webservice/wsdd/AddressingType.java >--- /dev/null 1 Jan 1970 00:00:00 -0000 >+++ mofj2ee/org/eclipse/jst/j2ee/webservice/wsdd/AddressingType.java 1 Jan 1970 00:00:00 -0000 >@@ -0,0 +1,115 @@ >+/******************************************************************************* >+ * Copyright (c) 2007 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.j2ee.webservice.wsdd; >+ >+import org.eclipse.jst.j2ee.common.J2EEEObject; >+ >+/** >+ * <!-- begin-user-doc --> >+ * A representation of the model object '<em><b>Addressing Type</b></em>'. >+ * <!-- end-user-doc --> >+ * >+ * <p> >+ * The following features are supported: >+ * <ul> >+ * <li>{@link org.eclipse.jst.j2ee.webservice.wsdd.AddressingType#isEnabled <em>Enabled</em>}</li> >+ * <li>{@link org.eclipse.jst.j2ee.webservice.wsdd.AddressingType#isRequired <em>Required</em>}</li> >+ * <li>{@link org.eclipse.jst.j2ee.webservice.wsdd.AddressingType#getResponses <em>Responses</em>}</li> >+ * </ul> >+ * </p> >+ * >+ * @see org.eclipse.jst.j2ee.webservice.wsdd.WsddPackage#getAddressingType() >+ * @model >+ * @generated >+ */ >+public interface AddressingType extends J2EEEObject { >+ /** >+ * Returns the value of the '<em><b>Enabled</b></em>' attribute. >+ * <!-- begin-user-doc --> >+ * <p> >+ * If the meaning of the '<em>Enabled</em>' attribute isn't clear, >+ * there really should be more of a description here... >+ * </p> >+ * <!-- end-user-doc --> >+ * @return the value of the '<em>Enabled</em>' attribute. >+ * @see #setEnabled(boolean) >+ * @see org.eclipse.jst.j2ee.webservice.wsdd.WsddPackage#getAddressingType_Enabled() >+ * @model >+ * @generated >+ */ >+ boolean isEnabled(); >+ >+ /** >+ * Sets the value of the '{@link org.eclipse.jst.j2ee.webservice.wsdd.AddressingType#isEnabled <em>Enabled</em>}' attribute. >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> >+ * @param value the new value of the '<em>Enabled</em>' attribute. >+ * @see #isEnabled() >+ * @generated >+ */ >+ void setEnabled(boolean value); >+ >+ /** >+ * Returns the value of the '<em><b>Required</b></em>' attribute. >+ * <!-- begin-user-doc --> >+ * <p> >+ * If the meaning of the '<em>Required</em>' attribute isn't clear, >+ * there really should be more of a description here... >+ * </p> >+ * <!-- end-user-doc --> >+ * @return the value of the '<em>Required</em>' attribute. >+ * @see #setRequired(boolean) >+ * @see org.eclipse.jst.j2ee.webservice.wsdd.WsddPackage#getAddressingType_Required() >+ * @model >+ * @generated >+ */ >+ boolean isRequired(); >+ >+ /** >+ * Sets the value of the '{@link org.eclipse.jst.j2ee.webservice.wsdd.AddressingType#isRequired <em>Required</em>}' attribute. >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> >+ * @param value the new value of the '<em>Required</em>' attribute. >+ * @see #isRequired() >+ * @generated >+ */ >+ void setRequired(boolean value); >+ >+ /** >+ * Returns the value of the '<em><b>Responses</b></em>' attribute. >+ * The literals are from the enumeration {@link org.eclipse.jst.j2ee.webservice.wsdd.AddressingResponsesType}. >+ * <!-- begin-user-doc --> >+ * <p> >+ * If the meaning of the '<em>Responses</em>' attribute isn't clear, >+ * there really should be more of a description here... >+ * </p> >+ * <!-- end-user-doc --> >+ * @return the value of the '<em>Responses</em>' attribute. >+ * @see org.eclipse.jst.j2ee.webservice.wsdd.AddressingResponsesType >+ * @see #setResponses(AddressingResponsesType) >+ * @see org.eclipse.jst.j2ee.webservice.wsdd.WsddPackage#getAddressingType_Responses() >+ * @model >+ * @generated >+ */ >+ AddressingResponsesType getResponses(); >+ >+ /** >+ * Sets the value of the '{@link org.eclipse.jst.j2ee.webservice.wsdd.AddressingType#getResponses <em>Responses</em>}' attribute. >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> >+ * @param value the new value of the '<em>Responses</em>' attribute. >+ * @see org.eclipse.jst.j2ee.webservice.wsdd.AddressingResponsesType >+ * @see #getResponses() >+ * @generated >+ */ >+ void setResponses(AddressingResponsesType value); >+ >+} // AddressingType >Index: mofj2ee/org/eclipse/jst/j2ee/webservice/wsdd/internal/impl/RespectBindingTypeImpl.java >=================================================================== >RCS file: mofj2ee/org/eclipse/jst/j2ee/webservice/wsdd/internal/impl/RespectBindingTypeImpl.java >diff -N mofj2ee/org/eclipse/jst/j2ee/webservice/wsdd/internal/impl/RespectBindingTypeImpl.java >--- /dev/null 1 Jan 1970 00:00:00 -0000 >+++ mofj2ee/org/eclipse/jst/j2ee/webservice/wsdd/internal/impl/RespectBindingTypeImpl.java 1 Jan 1970 00:00:00 -0000 >@@ -0,0 +1,172 @@ >+/******************************************************************************* >+ * Copyright (c) 2007 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.j2ee.webservice.wsdd.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.j2ee.common.internal.impl.J2EEEObjectImpl; >+ >+import org.eclipse.jst.j2ee.webservice.wsdd.RespectBindingType; >+import org.eclipse.jst.j2ee.webservice.wsdd.WsddPackage; >+ >+/** >+ * <!-- begin-user-doc --> >+ * An implementation of the model object '<em><b>Respect Binding Type</b></em>'. >+ * <!-- end-user-doc --> >+ * <p> >+ * The following features are implemented: >+ * <ul> >+ * <li>{@link org.eclipse.jst.j2ee.webservice.wsdd.internal.impl.RespectBindingTypeImpl#isEnabled <em>Enabled</em>}</li> >+ * </ul> >+ * </p> >+ * >+ * @generated >+ */ >+public class RespectBindingTypeImpl extends J2EEEObjectImpl implements RespectBindingType { >+ /** >+ * The default value of the '{@link #isEnabled() <em>Enabled</em>}' attribute. >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> >+ * @see #isEnabled() >+ * @generated >+ * @ordered >+ */ >+ protected static final boolean ENABLED_EDEFAULT = false; >+ >+ /** >+ * The cached value of the '{@link #isEnabled() <em>Enabled</em>}' attribute. >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> >+ * @see #isEnabled() >+ * @generated >+ * @ordered >+ */ >+ protected boolean enabled = ENABLED_EDEFAULT; >+ >+ /** >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> >+ * @generated >+ */ >+ protected RespectBindingTypeImpl() { >+ super(); >+ } >+ >+ /** >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> >+ * @generated >+ */ >+ @Override >+ protected EClass eStaticClass() { >+ return WsddPackage.Literals.RESPECT_BINDING_TYPE; >+ } >+ >+ /** >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> >+ * @generated >+ */ >+ public boolean isEnabled() { >+ return enabled; >+ } >+ >+ /** >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> >+ * @generated >+ */ >+ public void setEnabled(boolean newEnabled) { >+ boolean oldEnabled = enabled; >+ enabled = newEnabled; >+ if (eNotificationRequired()) >+ eNotify(new ENotificationImpl(this, Notification.SET, WsddPackage.RESPECT_BINDING_TYPE__ENABLED, oldEnabled, enabled)); >+ } >+ >+ /** >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> >+ * @generated >+ */ >+ @Override >+ public Object eGet(int featureID, boolean resolve, boolean coreType) { >+ switch (featureID) { >+ case WsddPackage.RESPECT_BINDING_TYPE__ENABLED: >+ return isEnabled() ? Boolean.TRUE : Boolean.FALSE; >+ } >+ return super.eGet(featureID, resolve, coreType); >+ } >+ >+ /** >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> >+ * @generated >+ */ >+ @Override >+ public void eSet(int featureID, Object newValue) { >+ switch (featureID) { >+ case WsddPackage.RESPECT_BINDING_TYPE__ENABLED: >+ setEnabled(((Boolean)newValue).booleanValue()); >+ return; >+ } >+ super.eSet(featureID, newValue); >+ } >+ >+ /** >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> >+ * @generated >+ */ >+ @Override >+ public void eUnset(int featureID) { >+ switch (featureID) { >+ case WsddPackage.RESPECT_BINDING_TYPE__ENABLED: >+ setEnabled(ENABLED_EDEFAULT); >+ return; >+ } >+ super.eUnset(featureID); >+ } >+ >+ /** >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> >+ * @generated >+ */ >+ @Override >+ public boolean eIsSet(int featureID) { >+ switch (featureID) { >+ case WsddPackage.RESPECT_BINDING_TYPE__ENABLED: >+ return enabled != ENABLED_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(" (enabled: "); //$NON-NLS-1$ >+ result.append(enabled); >+ result.append(')'); >+ return result.toString(); >+ } >+ >+} //RespectBindingTypeImpl >Index: mofj2ee/org/eclipse/jst/j2ee/webservice/wsdd/internal/impl/AddressingTypeImpl.java >=================================================================== >RCS file: mofj2ee/org/eclipse/jst/j2ee/webservice/wsdd/internal/impl/AddressingTypeImpl.java >diff -N mofj2ee/org/eclipse/jst/j2ee/webservice/wsdd/internal/impl/AddressingTypeImpl.java >--- /dev/null 1 Jan 1970 00:00:00 -0000 >+++ mofj2ee/org/eclipse/jst/j2ee/webservice/wsdd/internal/impl/AddressingTypeImpl.java 1 Jan 1970 00:00:00 -0000 >@@ -0,0 +1,281 @@ >+/******************************************************************************* >+ * Copyright (c) 2007 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.j2ee.webservice.wsdd.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.j2ee.common.internal.impl.J2EEEObjectImpl; >+ >+import org.eclipse.jst.j2ee.webservice.wsdd.AddressingResponsesType; >+import org.eclipse.jst.j2ee.webservice.wsdd.AddressingType; >+import org.eclipse.jst.j2ee.webservice.wsdd.WsddPackage; >+ >+/** >+ * <!-- begin-user-doc --> >+ * An implementation of the model object '<em><b>Addressing Type</b></em>'. >+ * <!-- end-user-doc --> >+ * <p> >+ * The following features are implemented: >+ * <ul> >+ * <li>{@link org.eclipse.jst.j2ee.webservice.wsdd.internal.impl.AddressingTypeImpl#isEnabled <em>Enabled</em>}</li> >+ * <li>{@link org.eclipse.jst.j2ee.webservice.wsdd.internal.impl.AddressingTypeImpl#isRequired <em>Required</em>}</li> >+ * <li>{@link org.eclipse.jst.j2ee.webservice.wsdd.internal.impl.AddressingTypeImpl#getResponses <em>Responses</em>}</li> >+ * </ul> >+ * </p> >+ * >+ * @generated >+ */ >+public class AddressingTypeImpl extends J2EEEObjectImpl implements AddressingType { >+ /** >+ * The default value of the '{@link #isEnabled() <em>Enabled</em>}' attribute. >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> >+ * @see #isEnabled() >+ * @generated >+ * @ordered >+ */ >+ protected static final boolean ENABLED_EDEFAULT = false; >+ >+ /** >+ * The cached value of the '{@link #isEnabled() <em>Enabled</em>}' attribute. >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> >+ * @see #isEnabled() >+ * @generated >+ * @ordered >+ */ >+ protected boolean enabled = ENABLED_EDEFAULT; >+ >+ /** >+ * The default value of the '{@link #isRequired() <em>Required</em>}' attribute. >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> >+ * @see #isRequired() >+ * @generated >+ * @ordered >+ */ >+ protected static final boolean REQUIRED_EDEFAULT = false; >+ >+ /** >+ * The cached value of the '{@link #isRequired() <em>Required</em>}' attribute. >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> >+ * @see #isRequired() >+ * @generated >+ * @ordered >+ */ >+ protected boolean required = REQUIRED_EDEFAULT; >+ >+ /** >+ * The default value of the '{@link #getResponses() <em>Responses</em>}' attribute. >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> >+ * @see #getResponses() >+ * @generated >+ * @ordered >+ */ >+ protected static final AddressingResponsesType RESPONSES_EDEFAULT = AddressingResponsesType.ANONYMOUS_LITERAL; >+ >+ /** >+ * The cached value of the '{@link #getResponses() <em>Responses</em>}' attribute. >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> >+ * @see #getResponses() >+ * @generated >+ * @ordered >+ */ >+ protected AddressingResponsesType responses = RESPONSES_EDEFAULT; >+ >+ /** >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> >+ * @generated >+ */ >+ protected AddressingTypeImpl() { >+ super(); >+ } >+ >+ /** >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> >+ * @generated >+ */ >+ @Override >+ protected EClass eStaticClass() { >+ return WsddPackage.Literals.ADDRESSING_TYPE; >+ } >+ >+ /** >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> >+ * @generated >+ */ >+ public boolean isEnabled() { >+ return enabled; >+ } >+ >+ /** >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> >+ * @generated >+ */ >+ public void setEnabled(boolean newEnabled) { >+ boolean oldEnabled = enabled; >+ enabled = newEnabled; >+ if (eNotificationRequired()) >+ eNotify(new ENotificationImpl(this, Notification.SET, WsddPackage.ADDRESSING_TYPE__ENABLED, oldEnabled, enabled)); >+ } >+ >+ /** >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> >+ * @generated >+ */ >+ public boolean isRequired() { >+ return required; >+ } >+ >+ /** >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> >+ * @generated >+ */ >+ public void setRequired(boolean newRequired) { >+ boolean oldRequired = required; >+ required = newRequired; >+ if (eNotificationRequired()) >+ eNotify(new ENotificationImpl(this, Notification.SET, WsddPackage.ADDRESSING_TYPE__REQUIRED, oldRequired, required)); >+ } >+ >+ /** >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> >+ * @generated >+ */ >+ public AddressingResponsesType getResponses() { >+ return responses; >+ } >+ >+ /** >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> >+ * @generated >+ */ >+ public void setResponses(AddressingResponsesType newResponses) { >+ AddressingResponsesType oldResponses = responses; >+ responses = newResponses == null ? RESPONSES_EDEFAULT : newResponses; >+ if (eNotificationRequired()) >+ eNotify(new ENotificationImpl(this, Notification.SET, WsddPackage.ADDRESSING_TYPE__RESPONSES, oldResponses, responses)); >+ } >+ >+ /** >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> >+ * @generated >+ */ >+ @Override >+ public Object eGet(int featureID, boolean resolve, boolean coreType) { >+ switch (featureID) { >+ case WsddPackage.ADDRESSING_TYPE__ENABLED: >+ return isEnabled() ? Boolean.TRUE : Boolean.FALSE; >+ case WsddPackage.ADDRESSING_TYPE__REQUIRED: >+ return isRequired() ? Boolean.TRUE : Boolean.FALSE; >+ case WsddPackage.ADDRESSING_TYPE__RESPONSES: >+ return getResponses(); >+ } >+ return super.eGet(featureID, resolve, coreType); >+ } >+ >+ /** >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> >+ * @generated >+ */ >+ @Override >+ public void eSet(int featureID, Object newValue) { >+ switch (featureID) { >+ case WsddPackage.ADDRESSING_TYPE__ENABLED: >+ setEnabled(((Boolean)newValue).booleanValue()); >+ return; >+ case WsddPackage.ADDRESSING_TYPE__REQUIRED: >+ setRequired(((Boolean)newValue).booleanValue()); >+ return; >+ case WsddPackage.ADDRESSING_TYPE__RESPONSES: >+ setResponses((AddressingResponsesType)newValue); >+ return; >+ } >+ super.eSet(featureID, newValue); >+ } >+ >+ /** >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> >+ * @generated >+ */ >+ @Override >+ public void eUnset(int featureID) { >+ switch (featureID) { >+ case WsddPackage.ADDRESSING_TYPE__ENABLED: >+ setEnabled(ENABLED_EDEFAULT); >+ return; >+ case WsddPackage.ADDRESSING_TYPE__REQUIRED: >+ setRequired(REQUIRED_EDEFAULT); >+ return; >+ case WsddPackage.ADDRESSING_TYPE__RESPONSES: >+ setResponses(RESPONSES_EDEFAULT); >+ return; >+ } >+ super.eUnset(featureID); >+ } >+ >+ /** >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> >+ * @generated >+ */ >+ @Override >+ public boolean eIsSet(int featureID) { >+ switch (featureID) { >+ case WsddPackage.ADDRESSING_TYPE__ENABLED: >+ return enabled != ENABLED_EDEFAULT; >+ case WsddPackage.ADDRESSING_TYPE__REQUIRED: >+ return required != REQUIRED_EDEFAULT; >+ case WsddPackage.ADDRESSING_TYPE__RESPONSES: >+ return responses != RESPONSES_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(" (enabled: "); //$NON-NLS-1$ >+ result.append(enabled); >+ result.append(", required: "); //$NON-NLS-1$ >+ result.append(required); >+ result.append(", responses: "); //$NON-NLS-1$ >+ result.append(responses); >+ result.append(')'); >+ return result.toString(); >+ } >+ >+} //AddressingTypeImpl >Index: mofj2ee/org/eclipse/jst/j2ee/webservice/wsdd/AddressingResponsesType.java >=================================================================== >RCS file: mofj2ee/org/eclipse/jst/j2ee/webservice/wsdd/AddressingResponsesType.java >diff -N mofj2ee/org/eclipse/jst/j2ee/webservice/wsdd/AddressingResponsesType.java >--- /dev/null 1 Jan 1970 00:00:00 -0000 >+++ mofj2ee/org/eclipse/jst/j2ee/webservice/wsdd/AddressingResponsesType.java 1 Jan 1970 00:00:00 -0000 >@@ -0,0 +1,182 @@ >+/******************************************************************************* >+ * Copyright (c) 2009 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.j2ee.webservice.wsdd; >+ >+import java.util.Arrays; >+import java.util.Collections; >+import java.util.List; >+ >+import org.eclipse.emf.common.util.AbstractEnumerator; >+ >+/** >+ * <!-- begin-user-doc --> >+ * A representation of the literals of the enumeration '<em><b>Addressing Responses Type</b></em>', >+ * and utility methods for working with them. >+ * <!-- end-user-doc --> >+ * @see org.eclipse.jst.j2ee.webservice.wsdd.WsddPackage#getAddressingResponsesType() >+ * @model >+ * @generated >+ */ >+public final class AddressingResponsesType extends AbstractEnumerator { >+ /** >+ * The '<em><b>ANONYMOUS</b></em>' literal value. >+ * <!-- begin-user-doc --> >+ * <p> >+ * If the meaning of '<em><b>ANONYMOUS</b></em>' literal object isn't clear, >+ * there really should be more of a description here... >+ * </p> >+ * <!-- end-user-doc --> >+ * @see #ANONYMOUS_LITERAL >+ * @model >+ * @generated >+ * @ordered >+ */ >+ public static final int ANONYMOUS = 0; >+ >+ /** >+ * The '<em><b>NONANONYMOUS</b></em>' literal value. >+ * <!-- begin-user-doc --> >+ * <p> >+ * If the meaning of '<em><b>NONANONYMOUS</b></em>' literal object isn't clear, >+ * there really should be more of a description here... >+ * </p> >+ * <!-- end-user-doc --> >+ * @see #NONANONYMOUS_LITERAL >+ * @model >+ * @generated >+ * @ordered >+ */ >+ public static final int NONANONYMOUS = 1; >+ >+ /** >+ * The '<em><b>ALL</b></em>' literal value. >+ * <!-- begin-user-doc --> >+ * <p> >+ * If the meaning of '<em><b>ALL</b></em>' literal object isn't clear, >+ * there really should be more of a description here... >+ * </p> >+ * <!-- end-user-doc --> >+ * @see #ALL_LITERAL >+ * @model >+ * @generated >+ * @ordered >+ */ >+ public static final int ALL = 2; >+ >+ /** >+ * The '<em><b>ANONYMOUS</b></em>' literal object. >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> >+ * @see #ANONYMOUS >+ * @generated >+ * @ordered >+ */ >+ public static final AddressingResponsesType ANONYMOUS_LITERAL = new AddressingResponsesType(ANONYMOUS, "ANONYMOUS", "ANONYMOUS"); //$NON-NLS-1$ //$NON-NLS-2$ >+ >+ /** >+ * The '<em><b>NONANONYMOUS</b></em>' literal object. >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> >+ * @see #NONANONYMOUS >+ * @generated >+ * @ordered >+ */ >+ public static final AddressingResponsesType NONANONYMOUS_LITERAL = new AddressingResponsesType(NONANONYMOUS, "NONANONYMOUS", "NONANONYMOUS"); //$NON-NLS-1$ //$NON-NLS-2$ >+ >+ /** >+ * The '<em><b>ALL</b></em>' literal object. >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> >+ * @see #ALL >+ * @generated >+ * @ordered >+ */ >+ public static final AddressingResponsesType ALL_LITERAL = new AddressingResponsesType(ALL, "ALL", "ALL"); //$NON-NLS-1$ //$NON-NLS-2$ >+ >+ /** >+ * An array of all the '<em><b>Addressing Responses Type</b></em>' enumerators. >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> >+ * @generated >+ */ >+ private static final AddressingResponsesType[] VALUES_ARRAY = >+ new AddressingResponsesType[] { >+ ANONYMOUS_LITERAL, >+ NONANONYMOUS_LITERAL, >+ ALL_LITERAL, >+ }; >+ >+ /** >+ * A public read-only list of all the '<em><b>Addressing Responses Type</b></em>' enumerators. >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> >+ * @generated >+ */ >+ public static final List VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY)); >+ >+ /** >+ * Returns the '<em><b>Addressing Responses Type</b></em>' literal with the specified literal value. >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> >+ * @generated >+ */ >+ public static AddressingResponsesType get(String literal) { >+ for (int i = 0; i < VALUES_ARRAY.length; ++i) { >+ AddressingResponsesType result = VALUES_ARRAY[i]; >+ if (result.toString().equals(literal)) { >+ return result; >+ } >+ } >+ return null; >+ } >+ >+ /** >+ * Returns the '<em><b>Addressing Responses Type</b></em>' literal with the specified name. >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> >+ * @generated >+ */ >+ public static AddressingResponsesType getByName(String name) { >+ for (int i = 0; i < VALUES_ARRAY.length; ++i) { >+ AddressingResponsesType result = VALUES_ARRAY[i]; >+ if (result.getName().equals(name)) { >+ return result; >+ } >+ } >+ return null; >+ } >+ >+ /** >+ * Returns the '<em><b>Addressing Responses Type</b></em>' literal with the specified integer value. >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> >+ * @generated >+ */ >+ public static AddressingResponsesType get(int value) { >+ switch (value) { >+ case ANONYMOUS: return ANONYMOUS_LITERAL; >+ case NONANONYMOUS: return NONANONYMOUS_LITERAL; >+ case ALL: return ALL_LITERAL; >+ } >+ return null; >+ } >+ >+ /** >+ * Only this class can construct instances. >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> >+ * @generated >+ */ >+ private AddressingResponsesType(int value, String name, String literal) { >+ super(value, name, literal); >+ } >+ >+} //AddressingResponsesType >#P org.eclipse.jst.j2ee.core.tests >Index: commonArchiveTests/org/eclipse/jst/j2ee/archive/emftests/WebServicesEMFTest.java >=================================================================== >RCS file: /cvsroot/webtools/jeetools/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveTests/org/eclipse/jst/j2ee/archive/emftests/WebServicesEMFTest.java,v >retrieving revision 1.18 >diff -u -r1.18 WebServicesEMFTest.java >--- commonArchiveTests/org/eclipse/jst/j2ee/archive/emftests/WebServicesEMFTest.java 22 Jan 2008 18:24:58 -0000 1.18 >+++ commonArchiveTests/org/eclipse/jst/j2ee/archive/emftests/WebServicesEMFTest.java 28 Oct 2009 15:54:05 -0000 >@@ -179,6 +179,25 @@ > earFile.close(); > > } >+ >+ public void test60WebServicesDDPopulation() throws Exception { >+ EMFAttributeFeatureGenerator.reset(); >+ currentVersion = J2EEVersionConstants.JEE_6_0_ID; >+ createEAR(); >+ createEJB(); >+ >+ WsddResource webserDD = (WsddResource)ejbFile.getResourceSet().createResource(URI.createURI("META-INF/webservices.xml")); >+ webserDD.getContents().add(WsddFactory.eINSTANCE.createWebServices()); >+ //TODO: individual test for each version >+ webserDD.setVersionID(currentVersion); >+ setVersion(VERSION_6_0); >+ populateRoot(webserDD.getRootObject()); >+ >+ String out = AutomatedBVT.baseDirectory +getProjectLocation(); >+ earFile.extractTo(out, Archive.EXPAND_ALL); >+ earFile.close(); >+ >+ } > > public EObject createInstance(EReference ref,EObject eObject) { >
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 293585
: 150741