### 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 'Respect Binding Type'. + * + * This implementation returns null; + * returning a non-null result will terminate the switch. + * + * @param object the target of the switch. + * @return the result of interpreting the object as an instance of 'Respect Binding Type'. + * @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 'Addressing Type'. + * + * This implementation returns null; + * returning a non-null result will terminate the switch. + * + * @param object the target of the switch. + * @return the result of interpreting the object as an instance of 'Addressing Type'. + * @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 'J2EEE Object'. * * 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 createXXX methods. + * The switch that delegates to the createXXX methods. * * * @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 Respect Binding Type}'. + * + * 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. + * + * @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 Addressing Type}'. + * + * 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. + * + * @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 J2EEE Object}'. * * 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 @@ /** * + * + * @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$ + } + } + + /** + * + * + * @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$ + } + } + + /** + * * * @generated */ @@ -213,6 +246,46 @@ /** * + * + * @generated + */ + public RespectBindingType createRespectBindingType() { + RespectBindingTypeImpl respectBindingType = new RespectBindingTypeImpl(); + return respectBindingType; + } + + /** + * + * + * @generated + */ + public AddressingType createAddressingType() { + AddressingTypeImpl addressingType = new AddressingTypeImpl(); + return addressingType; + } + + /** + * + * + * @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; + } + + /** + * + * + * @generated + */ + public String convertAddressingResponsesTypeToString(EDataType eDataType, Object instanceValue) { + return instanceValue == null ? null : instanceValue.toString(); + } + + /** + * * * @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; /** + * + * + * @generated + */ + private EClass respectBindingTypeEClass = null; + + /** + * + * + * @generated + */ + private EClass addressingTypeEClass = null; + + /** + * + * + * @generated + */ + private EEnum addressingResponsesTypeEEnum = null; + + /** * Creates an instance of the model Package, 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 Package 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. - *

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. - *

Invocation of this method will not affect any packages that have - * already been initialized. + * Creates, registers, and initializes the Package for this model, and for any others upon which it depends. + * + *

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. * * * @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 @@ /** * + * + * @generated + */ + public EAttribute getPortComponent_MtomThreshold() { + return (EAttribute)portComponentEClass.getEStructuralFeatures().get(16); + } + + /** + * + * + * @generated + */ + public EReference getPortComponent_RespectBinding() { + return (EReference)portComponentEClass.getEStructuralFeatures().get(17); + } + + /** + * + * + * @generated + */ + public EReference getPortComponent_Addressing() { + return (EReference)portComponentEClass.getEStructuralFeatures().get(18); + } + + /** + * * * @generated */ @@ -749,6 +793,69 @@ /** * + * + * @generated + */ + public EClass getRespectBindingType() { + return respectBindingTypeEClass; + } + + /** + * + * + * @generated + */ + public EAttribute getRespectBindingType_Enabled() { + return (EAttribute)respectBindingTypeEClass.getEStructuralFeatures().get(0); + } + + /** + * + * + * @generated + */ + public EClass getAddressingType() { + return addressingTypeEClass; + } + + /** + * + * + * @generated + */ + public EAttribute getAddressingType_Enabled() { + return (EAttribute)addressingTypeEClass.getEStructuralFeatures().get(0); + } + + /** + * + * + * @generated + */ + public EAttribute getAddressingType_Required() { + return (EAttribute)addressingTypeEClass.getEStructuralFeatures().get(1); + } + + /** + * + * + * @generated + */ + public EAttribute getAddressingType_Responses() { + return (EAttribute)addressingTypeEClass.getEStructuralFeatures().get(2); + } + + /** + * + * + * @generated + */ + public EEnum getAddressingResponsesType() { + return addressingResponsesTypeEEnum; + } + + /** + * * * @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 @@ *

  • {@link org.eclipse.jst.j2ee.webservice.wsdd.internal.impl.PortComponentImpl#isEnableMtom Enable Mtom}
    • *
  • {@link org.eclipse.jst.j2ee.webservice.wsdd.internal.impl.PortComponentImpl#getProtocolBinding Protocol Binding}
    • *
  • {@link org.eclipse.jst.j2ee.webservice.wsdd.internal.impl.PortComponentImpl#getHandlerChains Handler Chains}
    • + *
  • {@link org.eclipse.jst.j2ee.webservice.wsdd.internal.impl.PortComponentImpl#getMtomThreshold Mtom Threshold}
    • + *
  • {@link org.eclipse.jst.j2ee.webservice.wsdd.internal.impl.PortComponentImpl#getRespectBinding Respect Binding}
    • + *
  • {@link org.eclipse.jst.j2ee.webservice.wsdd.internal.impl.PortComponentImpl#getAddressing Addressing}
    • * *

    * @@ -304,6 +310,46 @@ protected HandlersChains handlerChains; /** + * The default value of the '{@link #getMtomThreshold() Mtom Threshold}' attribute. + * + * + * @see #getMtomThreshold() + * @generated + * @ordered + */ + protected static final BigInteger MTOM_THRESHOLD_EDEFAULT = null; + + /** + * The cached value of the '{@link #getMtomThreshold() Mtom Threshold}' attribute. + * + * + * @see #getMtomThreshold() + * @generated + * @ordered + */ + protected BigInteger mtomThreshold = MTOM_THRESHOLD_EDEFAULT; + + /** + * The cached value of the '{@link #getRespectBinding() Respect Binding}' containment reference. + * + * + * @see #getRespectBinding() + * @generated + * @ordered + */ + protected RespectBindingType respectBinding; + + /** + * The cached value of the '{@link #getAddressing() Addressing}' containment reference. + * + * + * @see #getAddressing() + * @generated + * @ordered + */ + protected AddressingType addressing; + + /** * * * @generated @@ -808,6 +854,113 @@ * * @generated */ + public BigInteger getMtomThreshold() { + return mtomThreshold; + } + + /** + * + * + * @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)); + } + + /** + * + * + * @generated + */ + public RespectBindingType getRespectBinding() { + return respectBinding; + } + + /** + * + * + * @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; + } + + /** + * + * + * @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)); + } + + /** + * + * + * @generated + */ + public AddressingType getAddressing() { + return addressing; + } + + /** + * + * + * @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; + } + + /** + * + * + * @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)); + } + + /** + * + * + * @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 @@ *
  • {@link org.eclipse.jst.j2ee.webservice.wsdd.PortComponent#isEnableMtom Enable Mtom}
    • *
  • {@link org.eclipse.jst.j2ee.webservice.wsdd.PortComponent#getProtocolBinding Protocol Binding}
    • *
  • {@link org.eclipse.jst.j2ee.webservice.wsdd.PortComponent#getHandlerChains Handler Chains}
    • + *
  • {@link org.eclipse.jst.j2ee.webservice.wsdd.PortComponent#getMtomThreshold Mtom Threshold}
    • + *
  • {@link org.eclipse.jst.j2ee.webservice.wsdd.PortComponent#getRespectBinding Respect Binding}
    • + *
  • {@link org.eclipse.jst.j2ee.webservice.wsdd.PortComponent#getAddressing Addressing}
    • * *

    * @@ -470,4 +474,82 @@ */ void setHandlerChains(HandlersChains value); + /** + * Returns the value of the 'Mtom Threshold' attribute. + * + *

    + * If the meaning of the 'Mtom Threshold' attribute isn't clear, + * there really should be more of a description here... + *

    + * + * @return the value of the 'Mtom Threshold' 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 Mtom Threshold}' attribute. + * + * + * @param value the new value of the 'Mtom Threshold' attribute. + * @see #getMtomThreshold() + * @generated + */ + void setMtomThreshold(BigInteger value); + + /** + * Returns the value of the 'Respect Binding' containment reference. + * + *

    + * If the meaning of the 'Respect Binding' containment reference isn't clear, + * there really should be more of a description here... + *

    + * + * @return the value of the 'Respect Binding' 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 Respect Binding}' containment reference. + * + * + * @param value the new value of the 'Respect Binding' containment reference. + * @see #getRespectBinding() + * @generated + */ + void setRespectBinding(RespectBindingType value); + + /** + * Returns the value of the 'Addressing' containment reference. + * + *

    + * If the meaning of the 'Addressing' containment reference isn't clear, + * there really should be more of a description here... + *

    + * + * @return the value of the 'Addressing' 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 Addressing}' containment reference. + * + * + * @param value the new value of the 'Addressing' 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 'Respect Binding Type'. + * + * + * @return a new object of class 'Respect Binding Type'. + * @generated + */ + RespectBindingType createRespectBindingType(); + + /** + * Returns a new object of class 'Addressing Type'. + * + * + * @return a new object of class 'Addressing Type'. + * @generated + */ + AddressingType createAddressingType(); + + /** * Returns the package supported by this factory. * * 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 'Mtom Threshold' attribute. + * + * + * @generated + * @ordered + */ + int PORT_COMPONENT__MTOM_THRESHOLD = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 16; + + /** + * The feature id for the 'Respect Binding' containment reference. + * + * + * @generated + * @ordered + */ + int PORT_COMPONENT__RESPECT_BINDING = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 17; + + /** + * The feature id for the 'Addressing' containment reference. + * + * + * @generated + * @ordered + */ + int PORT_COMPONENT__ADDRESSING = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 18; + + /** * The number of structural features of the 'Port Component' class. * * * @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 WSDL Port}' class. @@ -890,6 +918,91 @@ /** + * The meta object id for the '{@link org.eclipse.jst.j2ee.webservice.wsdd.internal.impl.RespectBindingTypeImpl Respect Binding Type}' class. + * + * + * @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 'Enabled' attribute. + * + * + * @generated + * @ordered + */ + int RESPECT_BINDING_TYPE__ENABLED = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 0; + + /** + * The number of structural features of the 'Respect Binding Type' class. + * + * + * @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 Addressing Type}' class. + * + * + * @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 'Enabled' attribute. + * + * + * @generated + * @ordered + */ + int ADDRESSING_TYPE__ENABLED = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 0; + + /** + * The feature id for the 'Required' attribute. + * + * + * @generated + * @ordered + */ + int ADDRESSING_TYPE__REQUIRED = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 1; + + /** + * The feature id for the 'Responses' attribute. + * + * + * @generated + * @ordered + */ + int ADDRESSING_TYPE__RESPONSES = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 2; + + /** + * The number of structural features of the 'Addressing Type' class. + * + * + * @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 Addressing Responses Type}' enum. + * + * + * @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 Web Services}'. * * @@ -1228,6 +1341,39 @@ EReference getPortComponent_HandlerChains(); /** + * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.webservice.wsdd.PortComponent#getMtomThreshold Mtom Threshold}'. + * + * + * @return the meta object for the attribute 'Mtom Threshold'. + * @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 Respect Binding}'. + * + * + * @return the meta object for the containment reference 'Respect Binding'. + * @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 Addressing}'. + * + * + * @return the meta object for the containment reference 'Addressing'. + * @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 WSDL Port}'. * * @@ -1483,6 +1629,80 @@ EReference getHandlersChains_HandlerChain(); /** + * Returns the meta object for class '{@link org.eclipse.jst.j2ee.webservice.wsdd.RespectBindingType Respect Binding Type}'. + * + * + * @return the meta object for class 'Respect Binding Type'. + * @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 Enabled}'. + * + * + * @return the meta object for the attribute 'Enabled'. + * @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 Addressing Type}'. + * + * + * @return the meta object for class 'Addressing Type'. + * @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 Enabled}'. + * + * + * @return the meta object for the attribute 'Enabled'. + * @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 Required}'. + * + * + * @return the meta object for the attribute 'Required'. + * @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 Responses}'. + * + * + * @return the meta object for the attribute 'Responses'. + * @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 Addressing Responses Type}'. + * + * + * @return the meta object for enum 'Addressing Responses Type'. + * @see org.eclipse.jst.j2ee.webservice.wsdd.AddressingResponsesType + * @generated + */ + EEnum getAddressingResponsesType(); + + /** * Returns the factory that creates the instances of the model. * * @@ -1759,6 +1979,30 @@ EReference PORT_COMPONENT__HANDLER_CHAINS = eINSTANCE.getPortComponent_HandlerChains(); /** + * The meta object literal for the 'Mtom Threshold' attribute feature. + * + * + * @generated + */ + EAttribute PORT_COMPONENT__MTOM_THRESHOLD = eINSTANCE.getPortComponent_MtomThreshold(); + + /** + * The meta object literal for the 'Respect Binding' containment reference feature. + * + * + * @generated + */ + EReference PORT_COMPONENT__RESPECT_BINDING = eINSTANCE.getPortComponent_RespectBinding(); + + /** + * The meta object literal for the 'Addressing' containment reference feature. + * + * + * @generated + */ + EReference PORT_COMPONENT__ADDRESSING = eINSTANCE.getPortComponent_Addressing(); + + /** * The meta object literal for the '{@link org.eclipse.jst.j2ee.webservice.wsdd.internal.impl.WSDLPortImpl WSDL Port}' class. * * @@ -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 Respect Binding Type}' class. + * + * + * @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 'Enabled' attribute feature. + * + * + * @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 Addressing Type}' class. + * + * + * @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 'Enabled' attribute feature. + * + * + * @generated + */ + EAttribute ADDRESSING_TYPE__ENABLED = eINSTANCE.getAddressingType_Enabled(); + + /** + * The meta object literal for the 'Required' attribute feature. + * + * + * @generated + */ + EAttribute ADDRESSING_TYPE__REQUIRED = eINSTANCE.getAddressingType_Required(); + + /** + * The meta object literal for the 'Responses' attribute feature. + * + * + * @generated + */ + EAttribute ADDRESSING_TYPE__RESPONSES = eINSTANCE.getAddressingType_Responses(); + + /** + * The meta object literal for the '{@link org.eclipse.jst.j2ee.webservice.wsdd.AddressingResponsesType Addressing Responses Type}' enum. + * + * + * @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 @@ + + + @@ -147,4 +152,17 @@ + + + + + + + + + + + + + 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 @@ + 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"> ..\rose\j2ee.mdl WORKSPACE_ROOT D:\work\M5 @@ -846,6 +847,11 @@ + + + + + @@ -875,6 +881,12 @@ + + + + + + @@ -896,5 +908,23 @@ + + + + + + + + + + + + + + + + + + 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; + +/** + * + * A representation of the model object 'Respect Binding Type'. + * + * + *

    + * The following features are supported: + *

      + *
    • {@link org.eclipse.jst.j2ee.webservice.wsdd.RespectBindingType#isEnabled Enabled}
      • + *
    + *

    + * + * @see org.eclipse.jst.j2ee.webservice.wsdd.WsddPackage#getRespectBindingType() + * @model + * @generated + */ +public interface RespectBindingType extends J2EEEObject { + /** + * Returns the value of the 'Enabled' attribute. + * + *

    + * If the meaning of the 'Enabled' attribute isn't clear, + * there really should be more of a description here... + *

    + * + * @return the value of the 'Enabled' 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 Enabled}' attribute. + * + * + * @param value the new value of the 'Enabled' 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; + +/** + * + * A representation of the model object 'Addressing Type'. + * + * + *

    + * The following features are supported: + *

      + *
    • {@link org.eclipse.jst.j2ee.webservice.wsdd.AddressingType#isEnabled Enabled}
      • + *
    • {@link org.eclipse.jst.j2ee.webservice.wsdd.AddressingType#isRequired Required}
      • + *
    • {@link org.eclipse.jst.j2ee.webservice.wsdd.AddressingType#getResponses Responses}
      • + *
    + *

    + * + * @see org.eclipse.jst.j2ee.webservice.wsdd.WsddPackage#getAddressingType() + * @model + * @generated + */ +public interface AddressingType extends J2EEEObject { + /** + * Returns the value of the 'Enabled' attribute. + * + *

    + * If the meaning of the 'Enabled' attribute isn't clear, + * there really should be more of a description here... + *

    + * + * @return the value of the 'Enabled' 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 Enabled}' attribute. + * + * + * @param value the new value of the 'Enabled' attribute. + * @see #isEnabled() + * @generated + */ + void setEnabled(boolean value); + + /** + * Returns the value of the 'Required' attribute. + * + *

    + * If the meaning of the 'Required' attribute isn't clear, + * there really should be more of a description here... + *

    + * + * @return the value of the 'Required' 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 Required}' attribute. + * + * + * @param value the new value of the 'Required' attribute. + * @see #isRequired() + * @generated + */ + void setRequired(boolean value); + + /** + * Returns the value of the 'Responses' attribute. + * The literals are from the enumeration {@link org.eclipse.jst.j2ee.webservice.wsdd.AddressingResponsesType}. + * + *

    + * If the meaning of the 'Responses' attribute isn't clear, + * there really should be more of a description here... + *

    + * + * @return the value of the 'Responses' 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 Responses}' attribute. + * + * + * @param value the new value of the 'Responses' 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; + +/** + * + * An implementation of the model object 'Respect Binding Type'. + * + *

    + * The following features are implemented: + *

      + *
    • {@link org.eclipse.jst.j2ee.webservice.wsdd.internal.impl.RespectBindingTypeImpl#isEnabled Enabled}
      • + *
    + *

    + * + * @generated + */ +public class RespectBindingTypeImpl extends J2EEEObjectImpl implements RespectBindingType { + /** + * The default value of the '{@link #isEnabled() Enabled}' attribute. + * + * + * @see #isEnabled() + * @generated + * @ordered + */ + protected static final boolean ENABLED_EDEFAULT = false; + + /** + * The cached value of the '{@link #isEnabled() Enabled}' attribute. + * + * + * @see #isEnabled() + * @generated + * @ordered + */ + protected boolean enabled = ENABLED_EDEFAULT; + + /** + * + * + * @generated + */ + protected RespectBindingTypeImpl() { + super(); + } + + /** + * + * + * @generated + */ + @Override + protected EClass eStaticClass() { + return WsddPackage.Literals.RESPECT_BINDING_TYPE; + } + + /** + * + * + * @generated + */ + public boolean isEnabled() { + return enabled; + } + + /** + * + * + * @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)); + } + + /** + * + * + * @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); + } + + /** + * + * + * @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); + } + + /** + * + * + * @generated + */ + @Override + public void eUnset(int featureID) { + switch (featureID) { + case WsddPackage.RESPECT_BINDING_TYPE__ENABLED: + setEnabled(ENABLED_EDEFAULT); + return; + } + super.eUnset(featureID); + } + + /** + * + * + * @generated + */ + @Override + public boolean eIsSet(int featureID) { + switch (featureID) { + case WsddPackage.RESPECT_BINDING_TYPE__ENABLED: + return enabled != ENABLED_EDEFAULT; + } + return super.eIsSet(featureID); + } + + /** + * + * + * @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; + +/** + * + * An implementation of the model object 'Addressing Type'. + * + *

    + * The following features are implemented: + *

      + *
    • {@link org.eclipse.jst.j2ee.webservice.wsdd.internal.impl.AddressingTypeImpl#isEnabled Enabled}
      • + *
    • {@link org.eclipse.jst.j2ee.webservice.wsdd.internal.impl.AddressingTypeImpl#isRequired Required}
      • + *
    • {@link org.eclipse.jst.j2ee.webservice.wsdd.internal.impl.AddressingTypeImpl#getResponses Responses}
      • + *
    + *

    + * + * @generated + */ +public class AddressingTypeImpl extends J2EEEObjectImpl implements AddressingType { + /** + * The default value of the '{@link #isEnabled() Enabled}' attribute. + * + * + * @see #isEnabled() + * @generated + * @ordered + */ + protected static final boolean ENABLED_EDEFAULT = false; + + /** + * The cached value of the '{@link #isEnabled() Enabled}' attribute. + * + * + * @see #isEnabled() + * @generated + * @ordered + */ + protected boolean enabled = ENABLED_EDEFAULT; + + /** + * The default value of the '{@link #isRequired() Required}' attribute. + * + * + * @see #isRequired() + * @generated + * @ordered + */ + protected static final boolean REQUIRED_EDEFAULT = false; + + /** + * The cached value of the '{@link #isRequired() Required}' attribute. + * + * + * @see #isRequired() + * @generated + * @ordered + */ + protected boolean required = REQUIRED_EDEFAULT; + + /** + * The default value of the '{@link #getResponses() Responses}' attribute. + * + * + * @see #getResponses() + * @generated + * @ordered + */ + protected static final AddressingResponsesType RESPONSES_EDEFAULT = AddressingResponsesType.ANONYMOUS_LITERAL; + + /** + * The cached value of the '{@link #getResponses() Responses}' attribute. + * + * + * @see #getResponses() + * @generated + * @ordered + */ + protected AddressingResponsesType responses = RESPONSES_EDEFAULT; + + /** + * + * + * @generated + */ + protected AddressingTypeImpl() { + super(); + } + + /** + * + * + * @generated + */ + @Override + protected EClass eStaticClass() { + return WsddPackage.Literals.ADDRESSING_TYPE; + } + + /** + * + * + * @generated + */ + public boolean isEnabled() { + return enabled; + } + + /** + * + * + * @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)); + } + + /** + * + * + * @generated + */ + public boolean isRequired() { + return required; + } + + /** + * + * + * @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)); + } + + /** + * + * + * @generated + */ + public AddressingResponsesType getResponses() { + return responses; + } + + /** + * + * + * @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)); + } + + /** + * + * + * @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); + } + + /** + * + * + * @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); + } + + /** + * + * + * @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); + } + + /** + * + * + * @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); + } + + /** + * + * + * @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; + +/** + * + * A representation of the literals of the enumeration 'Addressing Responses Type', + * and utility methods for working with them. + * + * @see org.eclipse.jst.j2ee.webservice.wsdd.WsddPackage#getAddressingResponsesType() + * @model + * @generated + */ +public final class AddressingResponsesType extends AbstractEnumerator { + /** + * The 'ANONYMOUS' literal value. + * + *

    + * If the meaning of 'ANONYMOUS' literal object isn't clear, + * there really should be more of a description here... + *

    + * + * @see #ANONYMOUS_LITERAL + * @model + * @generated + * @ordered + */ + public static final int ANONYMOUS = 0; + + /** + * The 'NONANONYMOUS' literal value. + * + *

    + * If the meaning of 'NONANONYMOUS' literal object isn't clear, + * there really should be more of a description here... + *

    + * + * @see #NONANONYMOUS_LITERAL + * @model + * @generated + * @ordered + */ + public static final int NONANONYMOUS = 1; + + /** + * The 'ALL' literal value. + * + *

    + * If the meaning of 'ALL' literal object isn't clear, + * there really should be more of a description here... + *

    + * + * @see #ALL_LITERAL + * @model + * @generated + * @ordered + */ + public static final int ALL = 2; + + /** + * The 'ANONYMOUS' literal object. + * + * + * @see #ANONYMOUS + * @generated + * @ordered + */ + public static final AddressingResponsesType ANONYMOUS_LITERAL = new AddressingResponsesType(ANONYMOUS, "ANONYMOUS", "ANONYMOUS"); //$NON-NLS-1$ //$NON-NLS-2$ + + /** + * The 'NONANONYMOUS' literal object. + * + * + * @see #NONANONYMOUS + * @generated + * @ordered + */ + public static final AddressingResponsesType NONANONYMOUS_LITERAL = new AddressingResponsesType(NONANONYMOUS, "NONANONYMOUS", "NONANONYMOUS"); //$NON-NLS-1$ //$NON-NLS-2$ + + /** + * The 'ALL' literal object. + * + * + * @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 'Addressing Responses Type' enumerators. + * + * + * @generated + */ + private static final AddressingResponsesType[] VALUES_ARRAY = + new AddressingResponsesType[] { + ANONYMOUS_LITERAL, + NONANONYMOUS_LITERAL, + ALL_LITERAL, + }; + + /** + * A public read-only list of all the 'Addressing Responses Type' enumerators. + * + * + * @generated + */ + public static final List VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY)); + + /** + * Returns the 'Addressing Responses Type' literal with the specified literal value. + * + * + * @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 'Addressing Responses Type' literal with the specified name. + * + * + * @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 'Addressing Responses Type' literal with the specified integer value. + * + * + * @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. + * + * + * @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) {