From: <jbo...@li...> - 2006-07-05 12:18:14
|
Author: hei...@jb... Date: 2006-07-05 08:17:59 -0400 (Wed, 05 Jul 2006) New Revision: 565 Modified: branches/jbossws-1.0/src/main/java/org/jboss/ws/eventing/element/DeliveryType.java branches/jbossws-1.0/src/main/java/org/jboss/ws/eventing/element/FilterType.java branches/jbossws-1.0/src/main/java/org/jboss/ws/eventing/element/StatusRequest.java branches/jbossws-1.0/src/main/java/org/jboss/ws/eventing/element/UnsubscribeRequest.java branches/jbossws-1.0/src/test/resources/eventing/WEB-INF/jaxrpc-mapping.xml branches/jbossws-1.0/src/test/resources/eventing/WEB-INF/wsdl/eventing.xsd branches/jbossws-1.0/src/test/resources/samples/wseventing/WEB-INF/jaxrpc-mapping.xml branches/jbossws-1.0/src/test/resources/samples/wseventing/WEB-INF/wsdl/jbwse.xsd Log: Fix JBWS-991 Modified: branches/jbossws-1.0/src/main/java/org/jboss/ws/eventing/element/DeliveryType.java =================================================================== --- branches/jbossws-1.0/src/main/java/org/jboss/ws/eventing/element/DeliveryType.java 2006-07-05 12:17:07 UTC (rev 564) +++ branches/jbossws-1.0/src/main/java/org/jboss/ws/eventing/element/DeliveryType.java 2006-07-05 12:17:59 UTC (rev 565) @@ -56,6 +56,7 @@ { private URI mode; private SOAPElement[] _any; + public String _value; private EndpointReference notifyTo; public URI getMode() @@ -87,4 +88,14 @@ { this.notifyTo = notifyTo; } + + public String get_value() + { + return _value; + } + + public void set_value(String _value) + { + this._value = _value; + } } Modified: branches/jbossws-1.0/src/main/java/org/jboss/ws/eventing/element/FilterType.java =================================================================== --- branches/jbossws-1.0/src/main/java/org/jboss/ws/eventing/element/FilterType.java 2006-07-05 12:17:07 UTC (rev 564) +++ branches/jbossws-1.0/src/main/java/org/jboss/ws/eventing/element/FilterType.java 2006-07-05 12:17:59 UTC (rev 565) @@ -45,7 +45,7 @@ { private URI dialect; private SOAPElement[] _any; - private String _value; + public String _value; public URI getDialect() { Modified: branches/jbossws-1.0/src/main/java/org/jboss/ws/eventing/element/StatusRequest.java =================================================================== --- branches/jbossws-1.0/src/main/java/org/jboss/ws/eventing/element/StatusRequest.java 2006-07-05 12:17:07 UTC (rev 564) +++ branches/jbossws-1.0/src/main/java/org/jboss/ws/eventing/element/StatusRequest.java 2006-07-05 12:17:59 UTC (rev 565) @@ -21,6 +21,8 @@ */ package org.jboss.ws.eventing.element; +import javax.xml.soap.SOAPElement; + // $Id$ /** @@ -29,5 +31,13 @@ */ public class StatusRequest { + private SOAPElement _any; + public SOAPElement get_any() { + return _any; + } + + public void set_any(SOAPElement _any) { + this._any = _any; + } } Modified: branches/jbossws-1.0/src/main/java/org/jboss/ws/eventing/element/UnsubscribeRequest.java =================================================================== --- branches/jbossws-1.0/src/main/java/org/jboss/ws/eventing/element/UnsubscribeRequest.java 2006-07-05 12:17:07 UTC (rev 564) +++ branches/jbossws-1.0/src/main/java/org/jboss/ws/eventing/element/UnsubscribeRequest.java 2006-07-05 12:17:59 UTC (rev 565) @@ -23,6 +23,7 @@ // $Id$ +import javax.xml.soap.SOAPElement; import java.net.URI; /** @@ -33,6 +34,8 @@ { private URI identifier; + private SOAPElement _any; + public UnsubscribeRequest() { } @@ -48,4 +51,12 @@ { this.identifier = identifier; } + + public SOAPElement get_any() { + return _any; + } + + public void set_any(SOAPElement _any) { + this._any = _any; + } } Modified: branches/jbossws-1.0/src/test/resources/eventing/WEB-INF/jaxrpc-mapping.xml =================================================================== --- branches/jbossws-1.0/src/test/resources/eventing/WEB-INF/jaxrpc-mapping.xml 2006-07-05 12:17:07 UTC (rev 564) +++ branches/jbossws-1.0/src/test/resources/eventing/WEB-INF/jaxrpc-mapping.xml 2006-07-05 12:17:59 UTC (rev 565) @@ -2,367 +2,375 @@ <java-wsdl-mapping xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.1" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://www.ibm.com/webservices/xsd/j2ee_jaxrpc_mapping_1_1.xsd"> - <package-mapping> - <package-type>org.jboss.ws.eventing</package-type> - <namespaceURI>http://schemas.xmlsoap.org/ws/2004/08/eventing</namespaceURI> - </package-mapping> + <package-mapping> + <package-type>org.jboss.ws.eventing</package-type> + <namespaceURI>http://schemas.xmlsoap.org/ws/2004/08/eventing</namespaceURI> + </package-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.ws.eventing.element.SubscribeRequest</java-type> - <root-type-qname xmlns:typeNS="http://schemas.xmlsoap.org/ws/2004/08/eventing"> - typeNS:Subscribe</root-type-qname> - <qname-scope>element</qname-scope> - </java-xml-type-mapping> + <java-xml-type-mapping> + <java-type>org.jboss.ws.eventing.element.SubscribeRequest</java-type> + <root-type-qname xmlns:typeNS="http://schemas.xmlsoap.org/ws/2004/08/eventing"> + typeNS:Subscribe</root-type-qname> + <qname-scope>element</qname-scope> + </java-xml-type-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.ws.eventing.element.SubscribeRequest</java-type> - <anonymous-type-qname xmlns:typeNS="http://schemas.xmlsoap.org/ws/2004/08/eventing"> - typeNS:>Subscribe</anonymous-type-qname> - <qname-scope>complexType</qname-scope> - <variable-mapping> - <java-variable-name>delivery</java-variable-name> - <xml-element-name>Delivery</xml-element-name> - </variable-mapping> - <variable-mapping> - <java-variable-name>endTo</java-variable-name> - <xml-element-name>EndTo</xml-element-name> - </variable-mapping> - <variable-mapping> - <java-variable-name>expires</java-variable-name> - <xml-element-name>Expires</xml-element-name> - </variable-mapping> - <variable-mapping> - <java-variable-name>filter</java-variable-name> - <xml-element-name>Filter</xml-element-name> - </variable-mapping> - <!--variable-mapping> - <java-variable-name>_any</java-variable-name> - <xml-wildcard/> - </variable-mapping--> - </java-xml-type-mapping> + <java-xml-type-mapping> + <java-type>org.jboss.ws.eventing.element.SubscribeRequest</java-type> + <anonymous-type-qname xmlns:typeNS="http://schemas.xmlsoap.org/ws/2004/08/eventing"> + typeNS:>Subscribe</anonymous-type-qname> + <qname-scope>complexType</qname-scope> + <variable-mapping> + <java-variable-name>delivery</java-variable-name> + <xml-element-name>Delivery</xml-element-name> + </variable-mapping> + <variable-mapping> + <java-variable-name>endTo</java-variable-name> + <xml-element-name>EndTo</xml-element-name> + </variable-mapping> + <variable-mapping> + <java-variable-name>expires</java-variable-name> + <xml-element-name>Expires</xml-element-name> + </variable-mapping> + <variable-mapping> + <java-variable-name>filter</java-variable-name> + <xml-element-name>Filter</xml-element-name> + </variable-mapping> + <!--variable-mapping> + <java-variable-name>_any</java-variable-name> + <xml-wildcard/> + </variable-mapping--> + </java-xml-type-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.ws.eventing.element.FilterType</java-type> - <root-type-qname xmlns:typeNS="http://schemas.xmlsoap.org/ws/2004/08/eventing"> - typeNS:FilterType</root-type-qname> - <qname-scope>complexType</qname-scope> - <variable-mapping> - <java-variable-name>dialect</java-variable-name> - <xml-attribute-name>Dialect</xml-attribute-name> - </variable-mapping> - <!--variable-mapping> - <java-variable-name>_any</java-variable-name> - <xml-wildcard/> - </variable-mapping--> - </java-xml-type-mapping> + <java-xml-type-mapping> + <java-type>org.jboss.ws.eventing.element.FilterType</java-type> + <root-type-qname xmlns:typeNS="http://schemas.xmlsoap.org/ws/2004/08/eventing"> + typeNS:FilterType</root-type-qname> + <qname-scope>complexType</qname-scope> + <variable-mapping> + <java-variable-name>dialect</java-variable-name> + <xml-attribute-name>Dialect</xml-attribute-name> + </variable-mapping> + <!--variable-mapping> + <java-variable-name>_any</java-variable-name> + <xml-wildcard/> + </variable-mapping--> + </java-xml-type-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.ws.eventing.element.DeliveryType</java-type> - <root-type-qname xmlns:typeNS="http://schemas.xmlsoap.org/ws/2004/08/eventing"> - typeNS:DeliveryType</root-type-qname> - <qname-scope>complexType</qname-scope> - <variable-mapping> - <java-variable-name>mode</java-variable-name> - <xml-attribute-name>Mode</xml-attribute-name> - </variable-mapping> - <!--variable-mapping> - <java-variable-name>notifyTo</java-variable-name> - <xml-attribute-name>NotifyTo</xml-attribute-name> - </variable-mapping--> - <!--variable-mapping> - <java-variable-name>_any</java-variable-name> - <xml-wildcard/> - </variable-mapping--> - </java-xml-type-mapping> + <java-xml-type-mapping> + <java-type>org.jboss.ws.eventing.element.DeliveryType</java-type> + <root-type-qname xmlns:typeNS="http://schemas.xmlsoap.org/ws/2004/08/eventing"> + typeNS:DeliveryType</root-type-qname> + <qname-scope>complexType</qname-scope> + <variable-mapping> + <java-variable-name>mode</java-variable-name> + <xml-attribute-name>Mode</xml-attribute-name> + </variable-mapping> + <!--variable-mapping> + <java-variable-name>notifyTo</java-variable-name> + <xml-attribute-name>NotifyTo</xml-attribute-name> + </variable-mapping--> + <!--variable-mapping> + <java-variable-name>_any</java-variable-name> + <xml-wildcard/> + </variable-mapping--> + </java-xml-type-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.ws.eventing.element.SubscriptionEndRequest</java-type> - <root-type-qname xmlns:typeNS="http://schemas.xmlsoap.org/ws/2004/08/eventing"> - typeNS:SubscriptionEnd</root-type-qname> - <qname-scope>element</qname-scope> - </java-xml-type-mapping> + <java-xml-type-mapping> + <java-type>org.jboss.ws.eventing.element.SubscriptionEndRequest</java-type> + <root-type-qname xmlns:typeNS="http://schemas.xmlsoap.org/ws/2004/08/eventing"> + typeNS:SubscriptionEnd</root-type-qname> + <qname-scope>element</qname-scope> + </java-xml-type-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.ws.eventing.element.SubscriptionEndRequest</java-type> - <anonymous-type-qname xmlns:typeNS="http://schemas.xmlsoap.org/ws/2004/08/eventing"> - typeNS:>SubscriptionEnd</anonymous-type-qname> - <qname-scope>complexType</qname-scope> - <variable-mapping> - <java-variable-name>subscriptionManager</java-variable-name> - <xml-element-name>SubscriptionManager</xml-element-name> - </variable-mapping> - <variable-mapping> - <java-variable-name>code</java-variable-name> - <xml-element-name>Code</xml-element-name> - </variable-mapping> - <variable-mapping> - <java-variable-name>reason</java-variable-name> - <xml-element-name>Reason</xml-element-name> - </variable-mapping> - </java-xml-type-mapping> + <java-xml-type-mapping> + <java-type>org.jboss.ws.eventing.element.SubscriptionEndRequest</java-type> + <anonymous-type-qname xmlns:typeNS="http://schemas.xmlsoap.org/ws/2004/08/eventing"> + typeNS:>SubscriptionEnd</anonymous-type-qname> + <qname-scope>complexType</qname-scope> + <variable-mapping> + <java-variable-name>subscriptionManager</java-variable-name> + <xml-element-name>SubscriptionManager</xml-element-name> + </variable-mapping> + <variable-mapping> + <java-variable-name>code</java-variable-name> + <xml-element-name>Code</xml-element-name> + </variable-mapping> + <variable-mapping> + <java-variable-name>reason</java-variable-name> + <xml-element-name>Reason</xml-element-name> + </variable-mapping> + </java-xml-type-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.ws.eventing.element.SubscribeResponse</java-type> - <root-type-qname xmlns:typeNS="http://schemas.xmlsoap.org/ws/2004/08/eventing"> - typeNS:SubscribeResponse</root-type-qname> - <qname-scope>element</qname-scope> - </java-xml-type-mapping> + <java-xml-type-mapping> + <java-type>org.jboss.ws.eventing.element.SubscribeResponse</java-type> + <root-type-qname xmlns:typeNS="http://schemas.xmlsoap.org/ws/2004/08/eventing"> + typeNS:SubscribeResponse</root-type-qname> + <qname-scope>element</qname-scope> + </java-xml-type-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.ws.eventing.element.SubscribeResponse</java-type> - <anonymous-type-qname xmlns:typeNS="http://schemas.xmlsoap.org/ws/2004/08/eventing"> - typeNS:>SubscribeResponse</anonymous-type-qname> - <qname-scope>complexType</qname-scope> - <variable-mapping> - <java-variable-name>expires</java-variable-name> - <xml-element-name>Expires</xml-element-name> - </variable-mapping> - <variable-mapping> - <java-variable-name>subscriptionManager</java-variable-name> - <xml-element-name>SubscriptionManager</xml-element-name> - </variable-mapping> - </java-xml-type-mapping> + <java-xml-type-mapping> + <java-type>org.jboss.ws.eventing.element.SubscribeResponse</java-type> + <anonymous-type-qname xmlns:typeNS="http://schemas.xmlsoap.org/ws/2004/08/eventing"> + typeNS:>SubscribeResponse</anonymous-type-qname> + <qname-scope>complexType</qname-scope> + <variable-mapping> + <java-variable-name>expires</java-variable-name> + <xml-element-name>Expires</xml-element-name> + </variable-mapping> + <variable-mapping> + <java-variable-name>subscriptionManager</java-variable-name> + <xml-element-name>SubscriptionManager</xml-element-name> + </variable-mapping> + </java-xml-type-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.ws.eventing.element.EndpointReference</java-type> - <root-type-qname xmlns:typeNS="http://www.w3.org/2005/08/addressing">typeNS:EndpointReference</root-type-qname> - <qname-scope>element</qname-scope> - </java-xml-type-mapping> + <java-xml-type-mapping> + <java-type>org.jboss.ws.eventing.element.EndpointReference</java-type> + <root-type-qname xmlns:typeNS="http://www.w3.org/2005/08/addressing">typeNS:EndpointReference</root-type-qname> + <qname-scope>element</qname-scope> + </java-xml-type-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.ws.eventing.element.EndpointReference</java-type> - <root-type-qname xmlns:typeNS="http://www.w3.org/2005/08/addressing"> - typeNS:EndpointReferenceType</root-type-qname> - <qname-scope>complexType</qname-scope> - <variable-mapping> - <java-variable-name>address</java-variable-name> - <xml-element-name>Address</xml-element-name> - </variable-mapping> - <variable-mapping> - <java-variable-name>referenceParams</java-variable-name> - <xml-element-name>ReferenceParameters</xml-element-name> - </variable-mapping> - <variable-mapping> - <java-variable-name>metadata</java-variable-name> - <xml-element-name>Metadata</xml-element-name> - </variable-mapping> - </java-xml-type-mapping> + <java-xml-type-mapping> + <java-type>org.jboss.ws.eventing.element.EndpointReference</java-type> + <root-type-qname xmlns:typeNS="http://www.w3.org/2005/08/addressing"> + typeNS:EndpointReferenceType</root-type-qname> + <qname-scope>complexType</qname-scope> + <variable-mapping> + <java-variable-name>address</java-variable-name> + <xml-element-name>Address</xml-element-name> + </variable-mapping> + <variable-mapping> + <java-variable-name>referenceParams</java-variable-name> + <xml-element-name>ReferenceParameters</xml-element-name> + </variable-mapping> + <variable-mapping> + <java-variable-name>metadata</java-variable-name> + <xml-element-name>Metadata</xml-element-name> + </variable-mapping> + </java-xml-type-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.ws.eventing.element.MetaData</java-type> - <root-type-qname xmlns:typeNS="http://www.w3.org/2005/08/addressing">typeNS:Metadata</root-type-qname> - <qname-scope>element</qname-scope> - </java-xml-type-mapping> + <java-xml-type-mapping> + <java-type>org.jboss.ws.eventing.element.MetaData</java-type> + <root-type-qname xmlns:typeNS="http://www.w3.org/2005/08/addressing">typeNS:Metadata</root-type-qname> + <qname-scope>element</qname-scope> + </java-xml-type-mapping> - <!--java-xml-type-mapping> - <java-type>org.jboss.ws.eventing.element.MetaData</java-type> - <root-type-qname xmlns:typeNS="http://www.w3.org/2005/08/addressing">typeNS:MetadataType</root-type-qname> - <qname-scope>complexType</qname-scope> - <variable-mapping> - <java-variable-name>_any</java-variable-name> - <xml-wildcard/> - </variable-mapping> - </java-xml-type-mapping--> + <!--java-xml-type-mapping> + <java-type>org.jboss.ws.eventing.element.MetaData</java-type> + <root-type-qname xmlns:typeNS="http://www.w3.org/2005/08/addressing">typeNS:MetadataType</root-type-qname> + <qname-scope>complexType</qname-scope> + <variable-mapping> + <java-variable-name>_any</java-variable-name> + <xml-wildcard/> + </variable-mapping> + </java-xml-type-mapping--> - <java-xml-type-mapping> - <java-type>org.jboss.ws.eventing.element.RenewRequest</java-type> - <root-type-qname xmlns:typeNS="http://schemas.xmlsoap.org/ws/2004/08/eventing">typeNS:Renew</root-type-qname> - <qname-scope>element</qname-scope> - </java-xml-type-mapping> + <java-xml-type-mapping> + <java-type>org.jboss.ws.eventing.element.RenewRequest</java-type> + <root-type-qname xmlns:typeNS="http://schemas.xmlsoap.org/ws/2004/08/eventing">typeNS:Renew</root-type-qname> + <qname-scope>element</qname-scope> + </java-xml-type-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.ws.eventing.element.RenewRequest</java-type> - <anonymous-type-qname xmlns:typeNS="http://schemas.xmlsoap.org/ws/2004/08/eventing"> - typeNS:>Renew</anonymous-type-qname> - <qname-scope>complexType</qname-scope> - <variable-mapping> - <java-variable-name>expires</java-variable-name> - <xml-element-name>Expires</xml-element-name> - </variable-mapping> - </java-xml-type-mapping> + <java-xml-type-mapping> + <java-type>org.jboss.ws.eventing.element.RenewRequest</java-type> + <anonymous-type-qname xmlns:typeNS="http://schemas.xmlsoap.org/ws/2004/08/eventing"> + typeNS:>Renew</anonymous-type-qname> + <qname-scope>complexType</qname-scope> + <variable-mapping> + <java-variable-name>expires</java-variable-name> + <xml-element-name>Expires</xml-element-name> + </variable-mapping> + </java-xml-type-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.ws.eventing.element.RenewResponse</java-type> - <root-type-qname xmlns:typeNS="http://schemas.xmlsoap.org/ws/2004/08/eventing"> - typeNS:RenewResponse</root-type-qname> - <qname-scope>element</qname-scope> - </java-xml-type-mapping> + <java-xml-type-mapping> + <java-type>org.jboss.ws.eventing.element.RenewResponse</java-type> + <root-type-qname xmlns:typeNS="http://schemas.xmlsoap.org/ws/2004/08/eventing"> + typeNS:RenewResponse</root-type-qname> + <qname-scope>element</qname-scope> + </java-xml-type-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.ws.eventing.element.RenewResponse</java-type> - <anonymous-type-qname xmlns:typeNS="http://schemas.xmlsoap.org/ws/2004/08/eventing"> - typeNS:>RenewResponse</anonymous-type-qname> - <qname-scope>complexType</qname-scope> - <variable-mapping> - <java-variable-name>expires</java-variable-name> - <xml-element-name>Expires</xml-element-name> - </variable-mapping> - </java-xml-type-mapping> + <java-xml-type-mapping> + <java-type>org.jboss.ws.eventing.element.RenewResponse</java-type> + <anonymous-type-qname xmlns:typeNS="http://schemas.xmlsoap.org/ws/2004/08/eventing"> + typeNS:>RenewResponse</anonymous-type-qname> + <qname-scope>complexType</qname-scope> + <variable-mapping> + <java-variable-name>expires</java-variable-name> + <xml-element-name>Expires</xml-element-name> + </variable-mapping> + </java-xml-type-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.ws.eventing.element.StatusRequest</java-type> - <root-type-qname xmlns:typeNS="http://schemas.xmlsoap.org/ws/2004/08/eventing"> - typeNS:GetStatus</root-type-qname> - <qname-scope>element</qname-scope> - </java-xml-type-mapping> + <java-xml-type-mapping> + <java-type>org.jboss.ws.eventing.element.StatusRequest</java-type> + <root-type-qname xmlns:typeNS="http://schemas.xmlsoap.org/ws/2004/08/eventing"> + typeNS:GetStatus</root-type-qname> + <qname-scope>element</qname-scope> + <variable-mapping> + <java-variable-name>_any</java-variable-name> + <xml-wildcard/> + </variable-mapping> + </java-xml-type-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.ws.eventing.element.StatusRequest</java-type> - <anonymous-type-qname xmlns:typeNS="http://schemas.xmlsoap.org/ws/2004/08/eventing"> - typeNS:>GetStatus</anonymous-type-qname> - <qname-scope>complexType</qname-scope> - </java-xml-type-mapping> + <java-xml-type-mapping> + <java-type>org.jboss.ws.eventing.element.StatusRequest</java-type> + <anonymous-type-qname xmlns:typeNS="http://schemas.xmlsoap.org/ws/2004/08/eventing"> + typeNS:>GetStatus</anonymous-type-qname> + <qname-scope>complexType</qname-scope> + </java-xml-type-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.ws.eventing.element.StatusResponse</java-type> - <root-type-qname xmlns:typeNS="http://schemas.xmlsoap.org/ws/2004/08/eventing"> - typeNS:GetStatusResponse</root-type-qname> - <qname-scope>element</qname-scope> - </java-xml-type-mapping> + <java-xml-type-mapping> + <java-type>org.jboss.ws.eventing.element.StatusResponse</java-type> + <root-type-qname xmlns:typeNS="http://schemas.xmlsoap.org/ws/2004/08/eventing"> + typeNS:GetStatusResponse</root-type-qname> + <qname-scope>element</qname-scope> + </java-xml-type-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.ws.eventing.element.StatusResponse</java-type> - <anonymous-type-qname xmlns:typeNS="http://schemas.xmlsoap.org/ws/2004/08/eventing"> - typeNS:>GetStatusResponse</anonymous-type-qname> - <qname-scope>complexType</qname-scope> - <variable-mapping> - <java-variable-name>expires</java-variable-name> - <xml-element-name>Expires</xml-element-name> - </variable-mapping> - </java-xml-type-mapping> + <java-xml-type-mapping> + <java-type>org.jboss.ws.eventing.element.StatusResponse</java-type> + <anonymous-type-qname xmlns:typeNS="http://schemas.xmlsoap.org/ws/2004/08/eventing"> + typeNS:>GetStatusResponse</anonymous-type-qname> + <qname-scope>complexType</qname-scope> + <variable-mapping> + <java-variable-name>expires</java-variable-name> + <xml-element-name>Expires</xml-element-name> + </variable-mapping> + </java-xml-type-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.ws.eventing.element.UnsubscribeRequest</java-type> - <root-type-qname xmlns:typeNS="http://schemas.xmlsoap.org/ws/2004/08/eventing"> - typeNS:Unsubscribe</root-type-qname> - <qname-scope>element</qname-scope> - </java-xml-type-mapping> + <java-xml-type-mapping> + <java-type>org.jboss.ws.eventing.element.UnsubscribeRequest</java-type> + <root-type-qname xmlns:typeNS="http://schemas.xmlsoap.org/ws/2004/08/eventing"> + typeNS:Unsubscribe</root-type-qname> + <qname-scope>element</qname-scope> + <variable-mapping> + <java-variable-name>_any</java-variable-name> + <xml-wildcard/> + </variable-mapping> + </java-xml-type-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.ws.eventing.element.UnsubscribeRequest</java-type> - <anonymous-type-qname xmlns:typeNS="http://schemas.xmlsoap.org/ws/2004/08/eventing"> - typeNS:>Unsubscribe</anonymous-type-qname> - <qname-scope>complexType</qname-scope> - </java-xml-type-mapping> + <java-xml-type-mapping> + <java-type>org.jboss.ws.eventing.element.UnsubscribeRequest</java-type> + <anonymous-type-qname xmlns:typeNS="http://schemas.xmlsoap.org/ws/2004/08/eventing"> + typeNS:>Unsubscribe</anonymous-type-qname> + <qname-scope>complexType</qname-scope> + </java-xml-type-mapping> - <service-interface-mapping> - <service-interface>org.jboss.ws.eventing.EventingService</service-interface> - <wsdl-service-name xmlns:serviceNS="http://schemas.xmlsoap.org/ws/2004/08/eventing"> - serviceNS:EventingService</wsdl-service-name> - <port-mapping> - <port-name>EventSourcePortTypePort</port-name> - <java-port-name>EventSourcePortTypePort</java-port-name> - </port-mapping> - <port-mapping> - <port-name>SubscriptionManagerPortTypePort</port-name> - <java-port-name>SubscriptionManagerPortTypePort</java-port-name> - </port-mapping> - </service-interface-mapping> + <service-interface-mapping> + <service-interface>org.jboss.ws.eventing.EventingService</service-interface> + <wsdl-service-name xmlns:serviceNS="http://schemas.xmlsoap.org/ws/2004/08/eventing"> + serviceNS:EventingService</wsdl-service-name> + <port-mapping> + <port-name>EventSourcePortTypePort</port-name> + <java-port-name>EventSourcePortTypePort</java-port-name> + </port-mapping> + <port-mapping> + <port-name>SubscriptionManagerPortTypePort</port-name> + <java-port-name>SubscriptionManagerPortTypePort</java-port-name> + </port-mapping> + </service-interface-mapping> - <service-endpoint-interface-mapping> - <service-endpoint-interface>org.jboss.ws.eventing.EventSourceEndpoint</service-endpoint-interface> - <wsdl-port-type xmlns:portTypeNS="http://schemas.xmlsoap.org/ws/2004/08/eventing"> - portTypeNS:EventSource</wsdl-port-type> - <wsdl-binding xmlns:bindingNS="http://schemas.xmlsoap.org/ws/2004/08/eventing"> - bindingNS:EventSourcePortTypeBinding</wsdl-binding> - <service-endpoint-method-mapping> - <java-method-name>subscribe</java-method-name> - <wsdl-operation>SubscribeOp</wsdl-operation> - <method-param-parts-mapping> - <param-position>0</param-position> - <param-type>org.jboss.ws.eventing.element.SubscribeRequest</param-type> - <wsdl-message-mapping> - <wsdl-message xmlns:wsdlMsgNS="http://schemas.xmlsoap.org/ws/2004/08/eventing"> - wsdlMsgNS:SubscribeMsg</wsdl-message> - <wsdl-message-part-name>body</wsdl-message-part-name> - <parameter-mode>IN</parameter-mode> - </wsdl-message-mapping> - </method-param-parts-mapping> - <wsdl-return-value-mapping> - <method-return-value>org.jboss.ws.eventing.element.SubscribeResponse</method-return-value> - <wsdl-message xmlns:wsdlMsgNS="http://schemas.xmlsoap.org/ws/2004/08/eventing"> - wsdlMsgNS:SubscribeResponseMsg</wsdl-message> - <wsdl-message-part-name>body</wsdl-message-part-name> - </wsdl-return-value-mapping> - </service-endpoint-method-mapping> + <service-endpoint-interface-mapping> + <service-endpoint-interface>org.jboss.ws.eventing.EventSourceEndpoint</service-endpoint-interface> + <wsdl-port-type xmlns:portTypeNS="http://schemas.xmlsoap.org/ws/2004/08/eventing"> + portTypeNS:EventSource</wsdl-port-type> + <wsdl-binding xmlns:bindingNS="http://schemas.xmlsoap.org/ws/2004/08/eventing"> + bindingNS:EventSourcePortTypeBinding</wsdl-binding> + <service-endpoint-method-mapping> + <java-method-name>subscribe</java-method-name> + <wsdl-operation>SubscribeOp</wsdl-operation> + <method-param-parts-mapping> + <param-position>0</param-position> + <param-type>org.jboss.ws.eventing.element.SubscribeRequest</param-type> + <wsdl-message-mapping> + <wsdl-message xmlns:wsdlMsgNS="http://schemas.xmlsoap.org/ws/2004/08/eventing"> + wsdlMsgNS:SubscribeMsg</wsdl-message> + <wsdl-message-part-name>body</wsdl-message-part-name> + <parameter-mode>IN</parameter-mode> + </wsdl-message-mapping> + </method-param-parts-mapping> + <wsdl-return-value-mapping> + <method-return-value>org.jboss.ws.eventing.element.SubscribeResponse</method-return-value> + <wsdl-message xmlns:wsdlMsgNS="http://schemas.xmlsoap.org/ws/2004/08/eventing"> + wsdlMsgNS:SubscribeResponseMsg</wsdl-message> + <wsdl-message-part-name>body</wsdl-message-part-name> + </wsdl-return-value-mapping> + </service-endpoint-method-mapping> - <service-endpoint-method-mapping> - <java-method-name>subscriptionEnd</java-method-name> - <wsdl-operation>SubscriptionEnd</wsdl-operation> - <wsdl-return-value-mapping> - <method-return-value>org.jboss.ws.eventing.element.SubscriptionEndRequest</method-return-value> - <wsdl-message xmlns:wsdlMsgNS="http://schemas.xmlsoap.org/ws/2004/08/eventing"> - wsdlMsgNS:SubscriptionEnd</wsdl-message> - <wsdl-message-part-name>body</wsdl-message-part-name> - </wsdl-return-value-mapping> - </service-endpoint-method-mapping> + <service-endpoint-method-mapping> + <java-method-name>subscriptionEnd</java-method-name> + <wsdl-operation>SubscriptionEnd</wsdl-operation> + <wsdl-return-value-mapping> + <method-return-value>org.jboss.ws.eventing.element.SubscriptionEndRequest</method-return-value> + <wsdl-message xmlns:wsdlMsgNS="http://schemas.xmlsoap.org/ws/2004/08/eventing"> + wsdlMsgNS:SubscriptionEnd</wsdl-message> + <wsdl-message-part-name>body</wsdl-message-part-name> + </wsdl-return-value-mapping> + </service-endpoint-method-mapping> - </service-endpoint-interface-mapping> + </service-endpoint-interface-mapping> - <service-endpoint-interface-mapping> - <service-endpoint-interface>org.jboss.ws.eventing.SubscriptionManagerEndpoint</service-endpoint-interface> + <service-endpoint-interface-mapping> + <service-endpoint-interface>org.jboss.ws.eventing.SubscriptionManagerEndpoint</service-endpoint-interface> - <wsdl-port-type xmlns:portTypeNS="http://schemas.xmlsoap.org/ws/2004/08/eventing"> - portTypeNS:SubscriptionManager</wsdl-port-type> - <wsdl-binding xmlns:bindingNS="http://schemas.xmlsoap.org/ws/2004/08/eventing"> - bindingNS:SubscriptionManagerPortTypeBinding</wsdl-binding> + <wsdl-port-type xmlns:portTypeNS="http://schemas.xmlsoap.org/ws/2004/08/eventing"> + portTypeNS:SubscriptionManager</wsdl-port-type> + <wsdl-binding xmlns:bindingNS="http://schemas.xmlsoap.org/ws/2004/08/eventing"> + bindingNS:SubscriptionManagerPortTypeBinding</wsdl-binding> - <service-endpoint-method-mapping> - <java-method-name>getStatus</java-method-name> - <wsdl-operation>GetStatusOp</wsdl-operation> - <method-param-parts-mapping> - <param-position>0</param-position> - <param-type>org.jboss.ws.eventing.element.StatusRequest</param-type> - <wsdl-message-mapping> - <wsdl-message xmlns:wsdlMsgNS="http://schemas.xmlsoap.org/ws/2004/08/eventing"> - wsdlMsgNS:GetStatusMsg</wsdl-message> - <wsdl-message-part-name>body</wsdl-message-part-name> - <parameter-mode>IN</parameter-mode> - </wsdl-message-mapping> - </method-param-parts-mapping> - <wsdl-return-value-mapping> - <method-return-value>org.jboss.ws.eventing.element.StatusResponse</method-return-value> - <wsdl-message xmlns:wsdlMsgNS="http://schemas.xmlsoap.org/ws/2004/08/eventing"> - wsdlMsgNS:GetStatusResponseMsg</wsdl-message> - <wsdl-message-part-name>body</wsdl-message-part-name> - </wsdl-return-value-mapping> - </service-endpoint-method-mapping> + <service-endpoint-method-mapping> + <java-method-name>getStatus</java-method-name> + <wsdl-operation>GetStatusOp</wsdl-operation> + <method-param-parts-mapping> + <param-position>0</param-position> + <param-type>org.jboss.ws.eventing.element.StatusRequest</param-type> + <wsdl-message-mapping> + <wsdl-message xmlns:wsdlMsgNS="http://schemas.xmlsoap.org/ws/2004/08/eventing"> + wsdlMsgNS:GetStatusMsg</wsdl-message> + <wsdl-message-part-name>body</wsdl-message-part-name> + <parameter-mode>IN</parameter-mode> + </wsdl-message-mapping> + </method-param-parts-mapping> + <wsdl-return-value-mapping> + <method-return-value>org.jboss.ws.eventing.element.StatusResponse</method-return-value> + <wsdl-message xmlns:wsdlMsgNS="http://schemas.xmlsoap.org/ws/2004/08/eventing"> + wsdlMsgNS:GetStatusResponseMsg</wsdl-message> + <wsdl-message-part-name>body</wsdl-message-part-name> + </wsdl-return-value-mapping> + </service-endpoint-method-mapping> - <service-endpoint-method-mapping> - <java-method-name>renew</java-method-name> - <wsdl-operation>RenewOp</wsdl-operation> - <method-param-parts-mapping> - <param-position>0</param-position> - <param-type>org.jboss.ws.eventing.element.RenewRequest</param-type> - <wsdl-message-mapping> - <wsdl-message xmlns:wsdlMsgNS="http://schemas.xmlsoap.org/ws/2004/08/eventing"> - wsdlMsgNS:RenewMsg</wsdl-message> - <wsdl-message-part-name>body</wsdl-message-part-name> - <parameter-mode>IN</parameter-mode> - </wsdl-message-mapping> - </method-param-parts-mapping> - <wsdl-return-value-mapping> - <method-return-value>org.jboss.ws.eventing.element.RenewResponse</method-return-value> - <wsdl-message xmlns:wsdlMsgNS="http://schemas.xmlsoap.org/ws/2004/08/eventing"> - wsdlMsgNS:RenewResponseMsg</wsdl-message> - <wsdl-message-part-name>body</wsdl-message-part-name> - </wsdl-return-value-mapping> - </service-endpoint-method-mapping> + <service-endpoint-method-mapping> + <java-method-name>renew</java-method-name> + <wsdl-operation>RenewOp</wsdl-operation> + <method-param-parts-mapping> + <param-position>0</param-position> + <param-type>org.jboss.ws.eventing.element.RenewRequest</param-type> + <wsdl-message-mapping> + <wsdl-message xmlns:wsdlMsgNS="http://schemas.xmlsoap.org/ws/2004/08/eventing"> + wsdlMsgNS:RenewMsg</wsdl-message> + <wsdl-message-part-name>body</wsdl-message-part-name> + <parameter-mode>IN</parameter-mode> + </wsdl-message-mapping> + </method-param-parts-mapping> + <wsdl-return-value-mapping> + <method-return-value>org.jboss.ws.eventing.element.RenewResponse</method-return-value> + <wsdl-message xmlns:wsdlMsgNS="http://schemas.xmlsoap.org/ws/2004/08/eventing"> + wsdlMsgNS:RenewResponseMsg</wsdl-message> + <wsdl-message-part-name>body</wsdl-message-part-name> + </wsdl-return-value-mapping> + </service-endpoint-method-mapping> - <service-endpoint-method-mapping> - <java-method-name>unsubscribe</java-method-name> - <wsdl-operation>UnsubscribeOp</wsdl-operation> - <method-param-parts-mapping> - <param-position>0</param-position> - <param-type>org.jboss.ws.eventing.element.UnsubscribeRequest</param-type> - <wsdl-message-mapping> - <wsdl-message xmlns:wsdlMsgNS="http://schemas.xmlsoap.org/ws/2004/08/eventing"> - wsdlMsgNS:UnsubscribeMsg</wsdl-message> - <wsdl-message-part-name>body</wsdl-message-part-name> - <parameter-mode>IN</parameter-mode> - </wsdl-message-mapping> - </method-param-parts-mapping> - </service-endpoint-method-mapping> + <service-endpoint-method-mapping> + <java-method-name>unsubscribe</java-method-name> + <wsdl-operation>UnsubscribeOp</wsdl-operation> + <method-param-parts-mapping> + <param-position>0</param-position> + <param-type>org.jboss.ws.eventing.element.UnsubscribeRequest</param-type> + <wsdl-message-mapping> + <wsdl-message xmlns:wsdlMsgNS="http://schemas.xmlsoap.org/ws/2004/08/eventing"> + wsdlMsgNS:UnsubscribeMsg</wsdl-message> + <wsdl-message-part-name>body</wsdl-message-part-name> + <parameter-mode>IN</parameter-mode> + </wsdl-message-mapping> + </method-param-parts-mapping> + </service-endpoint-method-mapping> - </service-endpoint-interface-mapping> + </service-endpoint-interface-mapping> </java-wsdl-mapping> Modified: branches/jbossws-1.0/src/test/resources/eventing/WEB-INF/wsdl/eventing.xsd =================================================================== --- branches/jbossws-1.0/src/test/resources/eventing/WEB-INF/wsdl/eventing.xsd 2006-07-05 12:17:07 UTC (rev 564) +++ branches/jbossws-1.0/src/test/resources/eventing/WEB-INF/wsdl/eventing.xsd 2006-07-05 12:17:59 UTC (rev 565) @@ -128,8 +128,8 @@ <xs:element name="GetStatus"> <xs:complexType> <xs:sequence> - <!--xs:any namespace="##other" processContents="lax" - minOccurs="0" maxOccurs="unbounded" /--> + <xs:any namespace="##other" processContents="lax" + minOccurs="0" maxOccurs="unbounded" /> </xs:sequence> <!--xs:anyAttribute namespace="##other" processContents="lax" /--> </xs:complexType> @@ -151,8 +151,8 @@ <xs:element name="Unsubscribe"> <xs:complexType> <xs:sequence> - <!--xs:any namespace="##other" processContents="lax" - minOccurs="0" maxOccurs="unbounded" /--> + <xs:any namespace="##other" processContents="lax" + minOccurs="0" maxOccurs="unbounded" /> </xs:sequence> <!--xs:anyAttribute namespace="##other" processContents="lax" /--> </xs:complexType> Modified: branches/jbossws-1.0/src/test/resources/samples/wseventing/WEB-INF/jaxrpc-mapping.xml =================================================================== --- branches/jbossws-1.0/src/test/resources/samples/wseventing/WEB-INF/jaxrpc-mapping.xml 2006-07-05 12:17:07 UTC (rev 564) +++ branches/jbossws-1.0/src/test/resources/samples/wseventing/WEB-INF/jaxrpc-mapping.xml 2006-07-05 12:17:59 UTC (rev 565) @@ -204,6 +204,10 @@ <root-type-qname xmlns:typeNS="http://schemas.xmlsoap.org/ws/2004/08/eventing"> typeNS:GetStatus</root-type-qname> <qname-scope>element</qname-scope> + <variable-mapping> + <java-variable-name>_any</java-variable-name> + <xml-wildcard/> + </variable-mapping> </java-xml-type-mapping> <java-xml-type-mapping> @@ -236,6 +240,10 @@ <root-type-qname xmlns:typeNS="http://schemas.xmlsoap.org/ws/2004/08/eventing"> typeNS:Unsubscribe</root-type-qname> <qname-scope>element</qname-scope> + <variable-mapping> + <java-variable-name>_any</java-variable-name> + <xml-wildcard/> + </variable-mapping> </java-xml-type-mapping> <java-xml-type-mapping> Modified: branches/jbossws-1.0/src/test/resources/samples/wseventing/WEB-INF/wsdl/jbwse.xsd =================================================================== --- branches/jbossws-1.0/src/test/resources/samples/wseventing/WEB-INF/wsdl/jbwse.xsd 2006-07-05 12:17:07 UTC (rev 564) +++ branches/jbossws-1.0/src/test/resources/samples/wseventing/WEB-INF/wsdl/jbwse.xsd 2006-07-05 12:17:59 UTC (rev 565) @@ -128,8 +128,8 @@ <xs:element name="GetStatus"> <xs:complexType> <xs:sequence> - <!--xs:any namespace="##other" processContents="lax" - minOccurs="0" maxOccurs="unbounded" /--> + <xs:any namespace="##other" processContents="lax" + minOccurs="0" maxOccurs="unbounded" /> </xs:sequence> <!--xs:anyAttribute namespace="##other" processContents="lax" /--> </xs:complexType> @@ -151,8 +151,8 @@ <xs:element name="Unsubscribe"> <xs:complexType> <xs:sequence> - <!--xs:any namespace="##other" processContents="lax" - minOccurs="0" maxOccurs="unbounded" /--> + <xs:any namespace="##other" processContents="lax" + minOccurs="0" maxOccurs="unbounded" /> </xs:sequence> <!--xs:anyAttribute namespace="##other" processContents="lax" /--> </xs:complexType> |