[jbossws-commits] JBossWS SVN: r2174 - in trunk: jbossws-core/src/main/java/org/jboss/ws/tools and 4 other directories.

Author: heiko.braun(a)jboss.com Date: 2007-01-29 07:14:45 -0500 (Mon, 29 Jan 2007) New Revision: 2174 Added: trunk/jbossws-core/src/main/resources/schema/eventing.xsd Removed: trunk/jbossws-core/src/main/resources/schema/ws-eventing.xsd Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/eventing/mgmt/Subscription.java trunk/jbossws-core/src/main/java/org/jboss/ws/tools/JavaToXSD.java trunk/jbossws-docs/user-guide/project/en/master.template trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/wseventing/EventingSupport.java trunk/jbossws-tests/src/main/resources/jaxws/samples/wseventing/WEB-INF/wsdl/ws-eventing.wsdl Log: Resolve eventing.xsd name correctly. Schemaloading uses the EntityResolver now. Subscription.end() message log a warning instead of displaying the stacktrace Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/eventing/mgmt/Subscription.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/eventing/mgmt/Subscription.java 2007-01-29 10:40:51 UTC (rev 2173) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/eventing/mgmt/Subscription.java 2007-01-29 12:14:45 UTC (rev 2174) @@ -177,7 +177,7 @@ } catch (Exception e) { - log.warn("Failed to send subscription end message to: " + this.endTo, e); + log.warn("Failed to send subscription end message to: " + this.endTo + "("+e.getMessage()+")"); } } Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/tools/JavaToXSD.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/tools/JavaToXSD.java 2007-01-29 10:40:51 UTC (rev 2173) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/tools/JavaToXSD.java 2007-01-29 12:14:45 UTC (rev 2174) @@ -23,14 +23,6 @@ // $Id$ -import java.io.IOException; -import java.net.URL; -import java.util.HashMap; -import java.util.Iterator; -import java.util.Map; - -import javax.xml.namespace.QName; - import org.apache.xerces.impl.xs.SchemaGrammar; import org.apache.xerces.impl.xs.XMLSchemaLoader; import org.apache.xerces.impl.xs.XSModelImpl; @@ -38,7 +30,6 @@ import org.apache.xerces.xs.XSModel; import org.jboss.logging.Logger; import org.jboss.ws.WSException; -import org.jboss.ws.core.utils.DOMUtils; import org.jboss.ws.core.utils.JBossWSEntityResolver; import org.jboss.ws.core.utils.ResourceURL; import org.jboss.ws.metadata.wsdl.WSDLUtils; @@ -54,7 +45,16 @@ import org.jboss.xb.binding.sunday.unmarshalling.SchemaBinding; import org.jboss.xb.binding.sunday.unmarshalling.SchemaBindingResolver; import org.w3c.dom.ls.LSInput; +import org.xml.sax.InputSource; +import javax.xml.namespace.QName; +import java.io.IOException; +import java.io.InputStream; +import java.net.URL; +import java.util.HashMap; +import java.util.Iterator; +import java.util.Map; + /** * <P> * Handles the conversion of Java classes to XML Schema @@ -172,7 +172,11 @@ URL url = resURL != null ? resURL : orgURL; log.debug("Load schema: " + nsURI + "=" + url); XMLInputSource inputSource = new XMLInputSource(null, url.toExternalForm(), null); - inputSource.setByteStream(new ResourceURL(url).openStream()); + + InputSource tmpSrc = resolver.resolveEntity(null, url.toExternalForm()); + InputStream in = tmpSrc.getByteStream() != null ? tmpSrc.getByteStream() : new ResourceURL(url).openStream(); + inputSource.setByteStream(in); + SchemaGrammar grammar = (SchemaGrammar)loader.loadGrammar(inputSource); gs[index++] = grammar; } Copied: trunk/jbossws-core/src/main/resources/schema/eventing.xsd (from rev 2172, trunk/jbossws-core/src/main/resources/schema/ws-eventing.xsd) =================================================================== --- trunk/jbossws-core/src/main/resources/schema/eventing.xsd (rev 0) +++ trunk/jbossws-core/src/main/resources/schema/eventing.xsd 2007-01-29 12:14:45 UTC (rev 2174) @@ -0,0 +1,186 @@ +<?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 Property changes on: trunk/jbossws-core/src/main/resources/schema/eventing.xsd ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Deleted: trunk/jbossws-core/src/main/resources/schema/ws-eventing.xsd =================================================================== --- trunk/jbossws-core/src/main/resources/schema/ws-eventing.xsd 2007-01-29 10:40:51 UTC (rev 2173) +++ trunk/jbossws-core/src/main/resources/schema/ws-eventing.xsd 2007-01-29 12:14:45 UTC (rev 2174) @@ -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: trunk/jbossws-docs/user-guide/project/en/master.template =================================================================== --- trunk/jbossws-docs/user-guide/project/en/master.template 2007-01-29 10:40:51 UTC (rev 2173) +++ trunk/jbossws-docs/user-guide/project/en/master.template 2007-01-29 12:14:45 UTC (rev 2174) @@ -1,9 +1,9 @@ -<?xml version='1.0' encoding="iso-8859-1"?> +<?xml version='1.0' encoding="iso-8859-1"?> <!-- $Id: master.xml 118 2006-04-06 14:44:24Z thomas.diesler(a)jboss.com $ --> <!DOCTYPE book PUBLIC - "-//OASIS//DTD DocBook XML V4.3CR3//EN" + "-//OASIS//DTD DocBook XML V4.1.2//EN" "../../../docbook-support/support/docbook-dtd/docbookx.dtd" [ <!ENTITY ch-introduction SYSTEM "modules/introduction.xml"> @@ -101,4 +101,4 @@ &ch-xmlregistry; &appendix-a; -</book> +</book> \ No newline at end of file Modified: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/wseventing/EventingSupport.java =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/wseventing/EventingSupport.java 2007-01-29 10:40:51 UTC (rev 2173) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/wseventing/EventingSupport.java 2007-01-29 12:14:45 UTC (rev 2174) @@ -156,7 +156,7 @@ EndpointReferenceType notifyEPR = new EndpointReferenceType(); AttributedURIType attURI = new AttributedURIType(); attURI.setValue("http://" + getServerHost() + ":8080/jaxws-wseventing/eventSink"); - notifyEPR.setAddress(attURI); + notifyEPR.setAddress(attURI); delivery.setNotifyTo(notifyEPR); return delivery; } Modified: trunk/jbossws-tests/src/main/resources/jaxws/samples/wseventing/WEB-INF/wsdl/ws-eventing.wsdl =================================================================== --- trunk/jbossws-tests/src/main/resources/jaxws/samples/wseventing/WEB-INF/wsdl/ws-eventing.wsdl 2007-01-29 10:40:51 UTC (rev 2173) +++ trunk/jbossws-tests/src/main/resources/jaxws/samples/wseventing/WEB-INF/wsdl/ws-eventing.wsdl 2007-01-29 12:14:45 UTC (rev 2174) @@ -9,7 +9,8 @@ xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"> <wsdl:types> - <xs:import namespace="http://schemas.xmlsoap.org/ws/2004/08/eventing" schemaLocation="http://schemas.xmlsoap.org/ws/2004/08/eventing/event... + <xs:import namespace="http://schemas.xmlsoap.org/ws/2004/08/eventing" + schemaLocation="http://schemas.xmlsoap.org/ws/2004/08/eventing/event... </wsdl:types> <wsdl:message name='SubscribeMsg'>