Author: alessio.soldano(a)jboss.com Date: 2009-06-16 05:33:10 -0400 (Tue, 16 Jun 2009) New Revision: 10194 Removed: stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/extensions/eventing/ stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/wsf/stack/jbws/EventingDeploymentAspect.java stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/resources/schema/eventing_200408.xsd stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wseventing/ stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/wseventing/ stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/resources/jaxws/samples/wseventing/ stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/resources/jaxws/wseventing/ Modified: stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/metadata/builder/MetaDataBuilder.java stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/tools/wsdl/WSDL11Reader.java stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/resources/META-INF/jbossws-entities.properties stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/resources/jbossws-native-config.xml stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/scripts/build-jars-jaxws.xml stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/scripts/build-samples-jaxws.xml stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/common/wsdl11/WSDL11TestCase.java Log: [JBPAPP-1888] Removing unsupported WS-Eventing implementation Modified: stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/metadata/builder/MetaDataBuilder.java =================================================================== --- stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/metadata/builder/MetaDataBuilder.java 2009-06-11 12:01:02 UTC (rev 10193) +++ stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/metadata/builder/MetaDataBuilder.java 2009-06-16 09:33:10 UTC (rev 10194) @@ -46,9 +46,6 @@ import org.jboss.ws.core.soap.Use; import org.jboss.ws.extensions.addressing.AddressingPropertiesImpl; import org.jboss.ws.extensions.addressing.metadata.AddressingOpMetaExt; -import org.jboss.ws.extensions.eventing.EventingConstants; -import org.jboss.ws.extensions.eventing.EventingUtils; -import org.jboss.ws.extensions.eventing.metadata.EventingEpMetaExt; import org.jboss.ws.metadata.umdm.EndpointMetaData; import org.jboss.ws.metadata.umdm.OperationMetaData; import org.jboss.ws.metadata.umdm.ServerEndpointMetaData; @@ -58,11 +55,8 @@ import org.jboss.ws.metadata.wsdl.WSDLEndpoint; import org.jboss.ws.metadata.wsdl.WSDLInterface; import org.jboss.ws.metadata.wsdl.WSDLInterfaceOperation; -import org.jboss.ws.metadata.wsdl.WSDLInterfaceOperationOutput; import org.jboss.ws.metadata.wsdl.WSDLProperty; import org.jboss.ws.metadata.wsdl.WSDLService; -import org.jboss.ws.metadata.wsdl.WSDLUtils; -import org.jboss.ws.metadata.wsdl.xmlschema.JBossXSModel; import org.jboss.wsf.common.ObjectNameFactory; import org.jboss.wsf.spi.SPIProvider; import org.jboss.wsf.spi.SPIProviderResolver; @@ -73,9 +67,9 @@ import org.jboss.wsf.spi.management.ServerConfigFactory; import org.jboss.wsf.spi.metadata.j2ee.EJBArchiveMetaData; import org.jboss.wsf.spi.metadata.j2ee.EJBMetaData; -import org.jboss.wsf.spi.metadata.j2ee.MDBMetaData; import org.jboss.wsf.spi.metadata.j2ee.JSEArchiveMetaData; import org.jboss.wsf.spi.metadata.j2ee.JSESecurityMetaData; +import org.jboss.wsf.spi.metadata.j2ee.MDBMetaData; import org.jboss.wsf.spi.metadata.j2ee.JSESecurityMetaData.JSEResourceCollection; /** An abstract meta data builder. @@ -443,40 +437,7 @@ protected void processEndpointMetaDataExtensions(EndpointMetaData epMetaData, WSDLDefinitions wsdlDefinitions) { - for (WSDLInterface wsdlInterface : wsdlDefinitions.getInterfaces()) - { - WSDLProperty eventSourceProp = wsdlInterface.getProperty(Constants.WSDL_PROPERTY_EVENTSOURCE); - if (eventSourceProp != null && epMetaData instanceof ServerEndpointMetaData) - { - ServerEndpointMetaData sepMetaData = (ServerEndpointMetaData)epMetaData; - String eventSourceNS = wsdlInterface.getName().getNamespaceURI() + "/" + wsdlInterface.getName().getLocalPart(); - - // extract the schema model - JBossXSModel schemaModel = WSDLUtils.getSchemaModel(wsdlDefinitions.getWsdlTypes()); - String[] notificationSchema = EventingUtils.extractNotificationSchema(schemaModel); - - // extract the root element NS - String notificationRootElementNS = null; - WSDLInterfaceOperation wsdlInterfaceOperation = wsdlInterface.getOperations()[0]; - if (wsdlInterfaceOperation.getOutputs().length > 0) - { - WSDLInterfaceOperationOutput wsdlInterfaceOperationOutput = wsdlInterfaceOperation.getOutputs()[0]; - notificationRootElementNS = wsdlInterfaceOperationOutput.getElement().getNamespaceURI(); - } - else - { - // WSDL operation of an WSDL interface that is marked as an event source - // requires to carry an output message. - throw new WSException("Unable to resolve eventing root element NS. No operation output found at " + wsdlInterfaceOperation.getName()); - } - - EventingEpMetaExt ext = new EventingEpMetaExt(EventingConstants.NS_EVENTING); - ext.setEventSourceNS(eventSourceNS); - ext.setNotificationSchema(notificationSchema); - ext.setNotificationRootElementNS(notificationRootElementNS); - sepMetaData.addExtension(ext); - } - } + //nothing to do; WS-Eventing processing removed as it's not supported (JBPAPP-1888) } /** Process operation meta data extensions. */ Modified: stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/tools/wsdl/WSDL11Reader.java =================================================================== --- stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/tools/wsdl/WSDL11Reader.java 2009-06-11 12:01:02 UTC (rev 10193) +++ stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/tools/wsdl/WSDL11Reader.java 2009-06-16 09:33:10 UTC (rev 10194) @@ -720,13 +720,6 @@ destInterface.addProperty(new WSDLProperty(Constants.WSDL_PROPERTY_POLICYURIS, policyURIsProp.getLocalPart())); } - // eventing extensions - QName eventSourceProp = (QName)srcPortType.getExtensionAttribute(Constants.WSDL_ATTRIBUTE_WSE_EVENTSOURCE); - if (eventSourceProp != null && eventSourceProp.getLocalPart().equals(Boolean.TRUE.toString())) - { - destInterface.addProperty(new WSDLProperty(Constants.WSDL_PROPERTY_EVENTSOURCE, eventSourceProp.getLocalPart())); - } - // documentation Element documentationElement = srcPortType.getDocumentationElement(); if (documentationElement != null && documentationElement.getTextContent() != null) Deleted: stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/wsf/stack/jbws/EventingDeploymentAspect.java =================================================================== --- stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/wsf/stack/jbws/EventingDeploymentAspect.java 2009-06-11 12:01:02 UTC (rev 10193) +++ stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/wsf/stack/jbws/EventingDeploymentAspect.java 2009-06-16 09:33:10 UTC (rev 10194) @@ -1,90 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * Copyright 2006, Red Hat Middleware LLC, and individual contributors - * as indicated by the @author tags. See the copyright.txt file in the - * distribution for a full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.wsf.stack.jbws; - -import org.jboss.ws.extensions.eventing.EventingConstants; -import org.jboss.ws.extensions.eventing.deployment.EventingEndpointDeployment; -import org.jboss.ws.extensions.eventing.metadata.EventingEpMetaExt; -import org.jboss.ws.extensions.eventing.mgmt.SubscriptionManagerFactory; -import org.jboss.ws.extensions.eventing.mgmt.SubscriptionManagerMBean; -import org.jboss.ws.metadata.umdm.ServerEndpointMetaData; -import org.jboss.wsf.spi.deployment.DeploymentAspect; -import org.jboss.wsf.spi.deployment.Deployment; -import org.jboss.wsf.spi.deployment.Endpoint; - -/** - * A deployer that creates event sources and register them with the - * subscripion manager when a service endpoint is created. - * - * @author Thomas.Diesler(a)jboss.org - * @since 25-Apr-2007 - */ -public class EventingDeploymentAspect extends DeploymentAspect -{ - @Override - public void start(Deployment dep) - { - for (Endpoint ep : dep.getService().getEndpoints()) - { - ServerEndpointMetaData sepMetaData = ep.getAttachment(ServerEndpointMetaData.class); - if (sepMetaData == null) - throw new IllegalStateException("Cannot obtain endpoint meta data"); - - EventingEpMetaExt ext = (EventingEpMetaExt)sepMetaData.getExtension(EventingConstants.NS_EVENTING); - if (ext != null) - { - // Currently several endpoints may belong to an event source deployment. - // Therefore we have to avoid duplicate registrations - // Actually there should be a 1:n mapping of event source NS to endpoints. - // See also http://jira.jboss.org/jira/browse/JBWS-770 - - // create pending incomplete event source - EventingEndpointDeployment desc = new EventingEndpointDeployment(ext.getEventSourceNS(), ext.getNotificationSchema(), ext.getNotificationRootElementNS()); - desc.setEndpointAddress(sepMetaData.getEndpointAddress()); - desc.setPortName(sepMetaData.getPortName()); - - SubscriptionManagerFactory factory = SubscriptionManagerFactory.getInstance(); - SubscriptionManagerMBean manager = factory.getSubscriptionManager(); - manager.registerEventSource(desc); - } - } - } - - @Override - public void destroy(Deployment dep) - { - for (Endpoint ep : dep.getService().getEndpoints()) - { - ServerEndpointMetaData sepMetaData = ep.getAttachment(ServerEndpointMetaData.class); - if (sepMetaData == null) - throw new IllegalStateException("Cannot obtain endpoint meta data"); - - EventingEpMetaExt ext = (EventingEpMetaExt)sepMetaData.getExtension(EventingConstants.NS_EVENTING); - if (ext != null) - { - SubscriptionManagerFactory factory = SubscriptionManagerFactory.getInstance(); - SubscriptionManagerMBean manager = factory.getSubscriptionManager(); - manager.removeEventSource(ext.getEventSourceURI()); - } - } - } -} Modified: stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/resources/META-INF/jbossws-entities.properties =================================================================== --- stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/resources/META-INF/jbossws-entities.properties 2009-06-11 12:01:02 UTC (rev 10193) +++ stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/resources/META-INF/jbossws-entities.properties 2009-06-16 09:33:10 UTC (rev 10194) @@ -4,7 +4,6 @@ http\://www.jboss.org/jbossws-tools=schema/jbossws-tool_1_0.xsd http\://java.sun.com/xml/ns/javaee=schema/javaee_web_services_1_2.xsd http\://www.w3.org/2005/08/addressing=schema/ws-addr.xsd -http\://schemas.xmlsoap.org/ws/2004/08/eventing=schema/eventing_200408.xsd http\://www.w3.org/2002/06/soap-encoding=schema/soap-encoding_200206.xsd http\://schemas.xmlsoap.org/soap/encoding/=schema/soap-encoding_1_1.xsd http\://www.ibm.com/webservices/xsd/j2ee_web_services_client_1_1.xsd=schema/j2ee_web_services_client_1_1.xsd Modified: stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/resources/jbossws-native-config.xml =================================================================== --- stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/resources/jbossws-native-config.xml 2009-06-11 12:01:02 UTC (rev 10193) +++ stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/resources/jbossws-native-config.xml 2009-06-16 09:33:10 UTC (rev 10194) @@ -28,11 +28,6 @@ <property name="mbeanServer"><inject bean="WSMBeanServerLocator" property="mbeanServer"/></property> </bean> - <!-- A subscription manager for WS-Eventing --> - <bean name="WSSubscriptionManager" class="org.jboss.ws.extensions.eventing.mgmt.SubscriptionManager"> - <property name="bindAddress">${jboss.bind.address}</property> - </bean> - <!-- Installed Record Processors--> <bean name="WSMemoryBufferRecorder" class="org.jboss.wsf.framework.management.recording.MemoryBufferRecorder"> <property name="recording">false</property> @@ -75,10 +70,6 @@ </property> </bean> - <bean name="WSNativeEventingDeploymentAspect" class="org.jboss.wsf.stack.jbws.EventingDeploymentAspect"> - <property name="requires">UnifiedMetaDataModel</property> - </bean> - <bean name="WSNativePublishContractDeploymentAspect" class="org.jboss.wsf.stack.jbws.PublishContractDeploymentAspect"> <property name="requires">UnifiedMetaDataModel, JAXBIntros</property> <property name="provides">PublishedContract</property> @@ -121,7 +112,6 @@ <set class="java.util.HashSet" elementClass="org.jboss.wsf.spi.deployment.DeploymentAspect"> <inject bean="WSNativeEndpointHandlerDeploymentAspect"/> <inject bean="WSNativeEndpointRecordProcessorDeploymentAspect"/> - <inject bean="WSNativeEventingDeploymentAspect"/> <inject bean="WSNativePublishContractDeploymentAspect"/> <inject bean="WSNativeServiceEndpointInvokerDeploymentAspect"/> <inject bean="WSNativeRMDeploymentAspect"/> @@ -142,7 +132,6 @@ <inject bean="WSNativeEagerInitializeDeploymentAspect"/> <inject bean="WSNativeEndpointHandlerDeploymentAspect"/> <inject bean="WSNativeEndpointRecordProcessorDeploymentAspect"/> - <inject bean="WSNativeEventingDeploymentAspect"/> <inject bean="WSNativePublishContractDeploymentAspect"/> <inject bean="WSNativeServiceEndpointInvokerDeploymentAspect"/> <inject bean="WSNativeRMDeploymentAspect"/> @@ -162,7 +151,6 @@ <inject bean="WSNativeEagerInitializeDeploymentAspect"/> <inject bean="WSNativeEndpointHandlerDeploymentAspect"/> <inject bean="WSNativeEndpointRecordProcessorDeploymentAspect"/> - <inject bean="WSNativeEventingDeploymentAspect"/> <inject bean="WSNativePublishContractDeploymentAspect"/> <inject bean="WSNativeServiceEndpointInvokerDeploymentAspect"/> <inject bean="WSNativeRMDeploymentAspect"/> Deleted: stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/resources/schema/eventing_200408.xsd =================================================================== --- stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/resources/schema/eventing_200408.xsd 2009-06-11 12:01:02 UTC (rev 10193) +++ stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/resources/schema/eventing_200408.xsd 2009-06-16 09:33:10 UTC (rev 10194) @@ -1,186 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- -(c) 2004 BEA Systems Inc., Computer Associates International, Inc., International Business Machines Corporation, Microsoft Corporation, Inc, Sun Microsystems, Inc., and TIBCO Software Inc. All rights reserved. - -BEA Systems Inc., Computer Associates International, Inc., International Business Machines Corporation, Microsoft Corporation, Inc, Sun Microsystems, Inc, and TIBCO Software Inc (collectively, the "Authors") hereby grant you permission to copy and display the WS-Eventing Specification (the "Specification", which includes WSDL and schema documents), in any medium without fee or royalty, provided that you include the following on ALL copies of the Specification, that you make: - -1. A link or URL to the WS-Eventing Specification at one of the Authors' websites -2. The copyright notice as shown in the WS-Eventing Specification. - -BEA, CA, IBM, Microsoft, Sun and TIBCO (collectively, the "Authors") each agree to grant you a license, under royalty-free and otherwise reasonable, non-discriminatory terms and conditions, to their respective essential patent claims that they deem necessary to implement the Specification. - -THE SPECIFICATION IS PROVIDED "AS IS," AND THE AUTHORS MAKE NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, NON-INFRINGEMENT, OR TITLE; THAT THE CONTENTS OF THE SPECIFICATION ARE SUITABLE FOR ANY PURPOSE; NOR THAT THE IMPLEMENTATION OF SUCH CONTENTS WILL NOT INFRINGE ANY THIRD PARTY PATENTS, COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS. - -THE AUTHORS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF OR RELATING TO ANY USE OR DISTRIBUTION OF THE SPECIFICATION. - -The name and trademarks of the Authors may NOT be used in any manner, including advertising or publicity pertaining to the Specification or its contents without specific, written prior permission. Title to copyright in the Specification will at all times remain with the Authors. - -No other rights are granted by implication, estoppel or otherwise. ---> -<xs:schema targetNamespace="http://schemas.xmlsoap.org/ws/2004/08/eventing" - xmlns:tns="http://schemas.xmlsoap.org/ws/2004/08/eventing" - xmlns:wsa="http://www.w3.org/2005/08/addressing" - xmlns:xs="http://www.w3.org/2001/XMLSchema" - elementFormDefault="qualified" - blockDefault="#all"> - - <xs:import namespace="http://www.w3.org/XML/1998/namespace" schemaLocation="http://www.w3.org/2001/xml.xsd"/> - - <!--xs:import namespace="http://www.w3.org/2005/08/addressing" schemaLocation="wsaddr.xsd"/--> - <xs:import namespace="http://www.w3.org/2005/08/addressing"/> - - <!-- Types and global elements --> - <xs:complexType name="DeliveryType" mixed="true"> - <xs:sequence> - <xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/> - </xs:sequence> - <xs:attribute name="Mode" type="xs:anyURI" use="optional"/> - <xs:anyAttribute namespace="##other" processContents="lax"/> - </xs:complexType> - - <xs:element name="NotifyTo" type="wsa:EndpointReferenceType"/> - - <xs:simpleType name="NonNegativeDurationType"> - <xs:restriction base="xs:duration"> - <xs:minInclusive value="P0Y0M0DT0H0M0S"/> - </xs:restriction> - </xs:simpleType> - - <xs:simpleType name="ExpirationType"> - <xs:union memberTypes="xs:dateTime tns:NonNegativeDurationType"/> - </xs:simpleType> - - <xs:complexType name="FilterType" mixed="true"> - <xs:sequence> - <xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/> - </xs:sequence> - <xs:attribute name="Dialect" type="xs:anyURI" use="optional"/> - <xs:anyAttribute namespace="##other" processContents="lax"/> - </xs:complexType> - - <xs:complexType name="LanguageSpecificStringType"> - <xs:simpleContent> - <xs:extension base="xs:string"> - <xs:attribute ref="xml:lang"/> - <xs:anyAttribute namespace="##other" processContents="lax"/> - </xs:extension> - </xs:simpleContent> - </xs:complexType> - - <!-- Subscribe request --> - <xs:element name="Subscribe"> - <xs:complexType> - <xs:sequence> - <xs:element name="EndTo" type="wsa:EndpointReferenceType" minOccurs="0"/> - <xs:element name="Delivery" type="tns:DeliveryType"/> - <xs:element name="Expires" type="tns:ExpirationType" minOccurs="0"/> - <xs:element name="Filter" type="tns:FilterType" minOccurs="0"/> - <xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/> - </xs:sequence> - <xs:anyAttribute namespace="##other" processContents="lax"/> - </xs:complexType> - </xs:element> - - <xs:element name="Identifier" type="xs:anyURI"/> - - <!-- Subscribe response --> - <xs:element name="SubscribeResponse"> - <xs:complexType> - <xs:sequence> - <xs:element name="SubscriptionManager" type="wsa:EndpointReferenceType"/> - <xs:element name="Expires" type="tns:ExpirationType"/> - <xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/> - </xs:sequence> - <xs:anyAttribute namespace="##other" processContents="lax"/> - </xs:complexType> - </xs:element> - - <!-- Used in a fault if there's an unsupported dialect --> - <xs:element name="SupportedDialect" type="xs:anyURI"/> - - <!-- Used in a fault if there's an unsupported delivery mode --> - <xs:element name="SupportedDeliveryMode" type="xs:anyURI"/> - - <!-- Renew request --> - <xs:element name="Renew"> - <xs:complexType> - <xs:sequence> - <xs:element name="Expires" type="tns:ExpirationType" minOccurs="0"/> - <xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/> - </xs:sequence> - <xs:anyAttribute namespace="##other" processContents="lax"/> - </xs:complexType> - </xs:element> - - <!-- Renew response --> - <xs:element name="RenewResponse"> - <xs:complexType> - <xs:sequence> - <xs:element name="Expires" type="tns:ExpirationType" minOccurs="0"/> - <xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/> - </xs:sequence> - <xs:anyAttribute namespace="##other" processContents="lax"/> - </xs:complexType> - </xs:element> - - <!-- GetStatus request --> - <xs:element name="GetStatus"> - <xs:complexType> - <xs:sequence> - <xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/> - </xs:sequence> - <xs:anyAttribute namespace="##other" processContents="lax"/> - </xs:complexType> - </xs:element> - - <!-- GetStatus response --> - <xs:element name="GetStatusResponse"> - <xs:complexType> - <xs:sequence> - <xs:element name="Expires" type="tns:ExpirationType" minOccurs="0"/> - <xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/> - </xs:sequence> - <xs:anyAttribute namespace="##other" processContents="lax"/> - </xs:complexType> - </xs:element> - - <!-- Unsubscribe request --> - <xs:element name="Unsubscribe"> - <xs:complexType> - <xs:sequence> - <xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/> - </xs:sequence> - <xs:anyAttribute namespace="##other" processContents="lax"/> - </xs:complexType> - </xs:element> - - <!-- count(/s:Envelope/s:Body/*) = 0 for Unsubscribe response --> - - <!-- SubscriptionEnd message --> - <xs:element name="SubscriptionEnd"> - <xs:complexType> - <xs:sequence> - <xs:element name="SubscriptionManager" type="wsa:EndpointReferenceType"/> - <xs:element name="Code" type="tns:OpenSubscriptionEndCodeType"/> - <xs:element name="Reason" type="tns:LanguageSpecificStringType" minOccurs="0" maxOccurs="unbounded"/> - <xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/> - </xs:sequence> - <xs:anyAttribute namespace="##other" processContents="lax"/> - </xs:complexType> - </xs:element> - - <xs:simpleType name="SubscriptionEndCodeType"> - <xs:restriction base="xs:QName"> - <xs:enumeration value="tns:DeliveryFailure"/> - <xs:enumeration value="tns:SourceShuttingDown"/> - <xs:enumeration value="tns:SourceCancelling"/> - </xs:restriction> - </xs:simpleType> - - <xs:simpleType name="OpenSubscriptionEndCodeType"> - <xs:union memberTypes="tns:SubscriptionEndCodeType xs:QName"/> - </xs:simpleType> - - <xs:attribute name="EventSource" type="xs:boolean"/> - -</xs:schema> \ No newline at end of file Modified: stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/scripts/build-jars-jaxws.xml =================================================================== --- stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/scripts/build-jars-jaxws.xml 2009-06-11 12:01:02 UTC (rev 10193) +++ stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/scripts/build-jars-jaxws.xml 2009-06-16 09:33:10 UTC (rev 10194) @@ -750,17 +750,6 @@ </classes> </war> - <!-- jaxws-wseventing --> - <war warfile="${tests.output.dir}/test-libs/jaxws-wseventing.war" webxml="${tests.output.dir}/test-resources/jaxws/wseventing/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/ws/eventing/*.class"/> - <include name="org/jboss/test/ws/jaxws/wseventing/*.class"/> - </classes> - <webinf dir="${tests.output.dir}/test-resources/jaxws/wseventing/WEB-INF"> - <include name="wsdl/**"/> - </webinf> - </war> - <!-- jaxws-wsrm --> <war warfile="${tests.output.dir}/test-libs/jaxws-wsrm.war" webxml="${tests.output.dir}/test-resources/jaxws/wsrm/WEB-INF/unsecure/web.xml"> <classes dir="${tests.output.dir}/test-classes"> Modified: stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/scripts/build-samples-jaxws.xml =================================================================== --- stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/scripts/build-samples-jaxws.xml 2009-06-11 12:01:02 UTC (rev 10193) +++ stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/scripts/build-samples-jaxws.xml 2009-06-16 09:33:10 UTC (rev 10194) @@ -222,26 +222,6 @@ </classes> </war> - <!-- jaxws-samples-wseventing --> - <war warfile="${tests.output.dir}/test-libs/jaxws-samples-wseventing.war" webxml="${tests.output.dir}/test-resources/jaxws/samples/wseventing/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/samples/wseventing/Sysmon**.class"/> - </classes> - <webinf dir="${tests.output.dir}/test-resources/jaxws/samples/wseventing/WEB-INF"> - <include name="wsdl/jboss-web.xml"/> - <include name="wsdl/sysmon.wsdl"/> - <include name="wsdl/ws-eventing.wsdl"/> - <include name="wsdl/ws-eventing.xsd"/> - <include name="wsdl/ws-addr.xsd"/> - </webinf> - </war> - <jar destfile="${tests.output.dir}/test-libs/jaxws-samples-wseventing-sink.jar"> - <fileset dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/samples/wseventing/EventSink*.class"/> - <include name="org/jboss/test/ws/jaxws/samples/wseventing/SystemStatus.class"/> - </fileset> - </jar> - <!-- jaxws-samples-wsrm --> <war warfile="${tests.output.dir}/test-libs/jaxws-samples-wsrm.war" webxml="${tests.output.dir}/test-resources/jaxws/samples/wsrm/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/test-classes"> Modified: stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/common/wsdl11/WSDL11TestCase.java =================================================================== --- stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/common/wsdl11/WSDL11TestCase.java 2009-06-11 12:01:02 UTC (rev 10193) +++ stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/common/wsdl11/WSDL11TestCase.java 2009-06-16 09:33:10 UTC (rev 10194) @@ -29,7 +29,6 @@ import org.jboss.test.ws.tools.validation.WSDLValidator; import org.jboss.ws.Constants; -import org.jboss.ws.extensions.eventing.EventingConstants; import org.jboss.ws.metadata.wsdl.WSDLBinding; import org.jboss.ws.metadata.wsdl.WSDLDefinitions; import org.jboss.ws.metadata.wsdl.WSDLEndpoint; @@ -156,32 +155,6 @@ } - public void testEventSourceBinding() throws Exception - { - File wsdlFile = getResourceFile("common/wsdl11/inherit/wind_inherit.wsdl"); - assertTrue(wsdlFile.exists()); - - WSDLDefinitionsFactory factory = WSDLDefinitionsFactory.newInstance(); - WSDLDefinitions wsdlDefinitions = factory.parse(wsdlFile.toURL()); - - WSDLService service = wsdlDefinitions.getService(new QName("http://schemas.xmlsoap.org/ws/2004/08/eventing";, "EventingService")); - assertNotNull(service); - WSDLEndpoint[] endpoints = service.getEndpoints(); - for (int i = 0; i < endpoints.length; i++) - { - WSDLEndpoint ep = endpoints[i]; - assertEquals(EventingConstants.NS_EVENTING, ep.getName().getNamespaceURI()); - } - - WSDLInterface warningsInterface = wsdlDefinitions.getInterface(new QName(wsdlDefinitions.getTargetNamespace(), "Warnings")); - assertNotNull("Event source port type not parsed", warningsInterface); - assertEquals(warningsInterface.getName().getNamespaceURI(), "http://www.example.org/oceanwatch"); - - WSDLInterface eventSourceInterface = wsdlDefinitions.getInterface(new QName("http://schemas.xmlsoap.org/ws/2004/08/eventing";, "EventSource")); - assertNotNull(eventSourceInterface); - assertEquals(eventSourceInterface.getName().getNamespaceURI(), EventingConstants.NS_EVENTING); - } - public void testSwaMessages() throws Exception { File wsdlFile = getResourceFile("common/wsdl11/SwaTestService.wsdl");