[jboss-svn-commits] JBL Code SVN: r23582 - in labs/jbosstm/workspace/interop/WSTFSC02-interop: dd/sc003 and 6 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Fri Oct 24 12:13:09 EDT 2008
Author: adinn
Date: 2008-10-24 12:13:09 -0400 (Fri, 24 Oct 2008)
New Revision: 23582
Added:
labs/jbosstm/workspace/interop/WSTFSC02-interop/src/com/jboss/transaction/wstf/webservices/sc003/server/Sc003ResponseServerHandler.java
Modified:
labs/jbosstm/workspace/interop/WSTFSC02-interop/dd/sc002/wsdl/sc002.wsdl
labs/jbosstm/workspace/interop/WSTFSC02-interop/dd/sc003/sc003responsehandlers.xml
labs/jbosstm/workspace/interop/WSTFSC02-interop/dd/sc003/wsdl/sc002.xsd
labs/jbosstm/workspace/interop/WSTFSC02-interop/dd/sc003/wsdl/sc003.wsdl
labs/jbosstm/workspace/interop/WSTFSC02-interop/src/com/jboss/transaction/wstf/interop/Sc002TestCase.java
labs/jbosstm/workspace/interop/WSTFSC02-interop/src/com/jboss/transaction/wstf/interop/Sc003AsyncTestCase.java
labs/jbosstm/workspace/interop/WSTFSC02-interop/src/com/jboss/transaction/wstf/interop/Sc003TestCase.java
labs/jbosstm/workspace/interop/WSTFSC02-interop/src/com/jboss/transaction/wstf/webservices/sc003/sei/Sc003PortImpl.java
labs/jbosstm/workspace/interop/WSTFSC02-interop/web/sc002/details.jsp
labs/jbosstm/workspace/interop/WSTFSC02-interop/web/sc002/index.jsp
labs/jbosstm/workspace/interop/WSTFSC02-interop/web/sc002/results.jsp
labs/jbosstm/workspace/interop/WSTFSC02-interop/web/sc003/details.jsp
labs/jbosstm/workspace/interop/WSTFSC02-interop/web/sc003/index.jsp
labs/jbosstm/workspace/interop/WSTFSC02-interop/web/sc003/results.jsp
Log:
fixed up to work with AS5.0.0.CR2 and WS 3.0.4 -- also uses new wsdl which has no SOAPAction
Modified: labs/jbosstm/workspace/interop/WSTFSC02-interop/dd/sc002/wsdl/sc002.wsdl
===================================================================
--- labs/jbosstm/workspace/interop/WSTFSC02-interop/dd/sc002/wsdl/sc002.wsdl 2008-10-24 15:02:35 UTC (rev 23581)
+++ labs/jbosstm/workspace/interop/WSTFSC02-interop/dd/sc002/wsdl/sc002.wsdl 2008-10-24 16:13:09 UTC (rev 23582)
@@ -1,196 +1,196 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<wsdl:definitions targetNamespace="http://www.wstf.org/docs/scenarios/sc002"
- xmlns:xs="http://www.w3.org/2001/XMLSchema"
- xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
- xmlns:soap12="http://schemas.xmlsoap.org/wsdl/soap12/"
- xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
- xmlns:tns="http://www.wstf.org/docs/scenarios/sc002">
-
- <wsdl:types>
- <xs:schema targetNamespace="http://www.wstf.org/docs/scenarios/sc002">
- <xs:include schemaLocation="sc002.xsd"/>
- <xs:element name="Begin" type="tns:BeginType"/>
- <xs:element name="BeginResponse" type="tns:BeginResponseType"/>
- <xs:element name="Notify" type="tns:NotifyType"/>
- <xs:element name="Echo" type="tns:EchoType"/>
- <xs:element name="EchoResponse" type="tns:EchoResponseType"/>
- <xs:element name="End" type="tns:EndType"/>
- <xs:element name="EndResponse" type="tns:EndResponseType"/>
- <xs:element name="SendMessages" type="tns:SendMessagesType"/>
- <xs:element name="SendMessagesResponse" type="tns:SendMessagesResponseType"/>
- <xs:element name="SessionData" type="tns:SessionDataType"/>
- </xs:schema>
- </wsdl:types>
-
- <wsdl:message name="Begin">
- <wsdl:part name="Begin" element="tns:Begin"/>
- <wsdl:part name="SessionData" element="tns:SessionData"/>
- </wsdl:message>
-
- <wsdl:message name="BeginResponse">
- <wsdl:part name="BeginResponse" element="tns:BeginResponse"/>
- </wsdl:message>
-
- <wsdl:message name="Notify">
- <wsdl:part name="Notify" element="tns:Notify"/>
- <wsdl:part name="SessionData" element="tns:SessionData"/>
- </wsdl:message>
-
- <wsdl:message name="Echo">
- <wsdl:part name="Echo" element="tns:Echo"/>
- <wsdl:part name="SessionData" element="tns:SessionData"/>
- </wsdl:message>
-
- <wsdl:message name="EchoResponse">
- <wsdl:part name="EchoResponse" element="tns:EchoResponse"/>
- </wsdl:message>
-
- <wsdl:message name="End">
- <wsdl:part name="End" element="tns:End"/>
- <wsdl:part name="SessionData" element="tns:SessionData"/>
- </wsdl:message>
-
- <wsdl:message name="EndResponse">
- <wsdl:part name="EndResponse" element="tns:EndResponse"/>
- </wsdl:message>
-
- <wsdl:message name="SendMessages">
- <wsdl:part name="SendMessages" element="tns:SendMessages"/>
- </wsdl:message>
-
- <wsdl:message name="SendMessagesResponse">
- <wsdl:part name="SendMessagesResponse" element="tns:SendMessagesResponse"/>
- </wsdl:message>
-
- <wsdl:portType name="sc002Port">
- <wsdl:operation name="Begin">
- <wsdl:input message="tns:Begin"/>
- <wsdl:output message="tns:BeginResponse"/>
- </wsdl:operation>
- <wsdl:operation name="Notify">
- <wsdl:input message="tns:Notify"/>
- </wsdl:operation>
- <wsdl:operation name="Echo">
- <wsdl:input message="tns:Echo"/>
- <wsdl:output message="tns:EchoResponse"/>
- </wsdl:operation>
- <wsdl:operation name="End">
- <wsdl:input message="tns:End"/>
- <wsdl:output message="tns:EndResponse"/>
- </wsdl:operation>
- <wsdl:operation name="SendMessages">
- <wsdl:input message="tns:SendMessages"/>
- <wsdl:output message="tns:SendMessagesResponse"/>
- </wsdl:operation>
- </wsdl:portType>
-
- <wsdl:binding name="sc002SOAP11Binding" type="tns:sc002Port">
- <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
- <wsdl:operation name="Begin">
- <soap:operation soapAction="http://www.wstf.org/docs/scenarios/sc002/Begin"/>
- <wsdl:input>
- <soap:header use="literal" part="SessionData" message="tns:Begin"/>
- <soap:body use="literal" parts="Begin"/>
- </wsdl:input>
- <wsdl:output>
- <soap:body use="literal"/>
- </wsdl:output>
- </wsdl:operation>
- <wsdl:operation name="Notify">
- <soap:operation soapAction="http://www.wstf.org/docs/scenarios/sc002/Notify"/>
- <wsdl:input>
- <soap:header use="literal" part="SessionData" message="tns:Notify"/>
- <soap:body use="literal" parts="Notify"/>
- </wsdl:input>
- </wsdl:operation>
- <wsdl:operation name="Echo">
- <soap:operation soapAction="http://www.wstf.org/docs/scenarios/sc002/Echo"/>
- <wsdl:input>
- <soap:header use="literal" part="SessionData" message="tns:Echo"/>
- <soap:body use="literal" parts="Echo"/>
- </wsdl:input>
- <wsdl:output>
- <soap:body use="literal"/>
- </wsdl:output>
- </wsdl:operation>
- <wsdl:operation name="End">
- <soap:operation soapAction="http://www.wstf.org/docs/scenarios/sc002/End"/>
- <wsdl:input>
- <soap:header use="literal" part="SessionData" message="tns:End"/>
- <soap:body use="literal" parts="End"/>
- </wsdl:input>
- <wsdl:output>
- <soap:body use="literal"/>
- </wsdl:output>
- </wsdl:operation>
- <wsdl:operation name="SendMessages">
- <soap:operation soapAction="http://www.wstf.org/docs/scenarios/sc002/SendMessages"/>
- <wsdl:input>
- <soap:body use="literal"/>
- </wsdl:input>
- <wsdl:output>
- <soap:body use="literal"/>
- </wsdl:output>
- </wsdl:operation>
- </wsdl:binding>
-
- <wsdl:binding name="sc002SOAP12Binding" type="tns:sc002Port">
- <soap12:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
- <wsdl:operation name="Begin">
- <soap12:operation soapAction="http://www.wstf.org/docs/scenarios/sc002/Begin"/>
- <wsdl:input>
- <soap12:header use="literal" part="SessionData" message="tns:Begin"/>
- <soap12:body use="literal" parts="Begin"/>
- </wsdl:input>
- <wsdl:output>
- <soap12:body use="literal"/>
- </wsdl:output>
- </wsdl:operation>
- <wsdl:operation name="Notify">
- <soap12:operation soapAction="http://www.wstf.org/docs/scenarios/sc002/Notify"/>
- <wsdl:input>
- <soap12:header use="literal" part="SessionData" message="tns:Notify"/>
- <soap12:body use="literal" parts="Notify"/>
- </wsdl:input>
- </wsdl:operation>
- <wsdl:operation name="Echo">
- <soap12:operation soapAction="http://www.wstf.org/docs/scenarios/sc002/Echo"/>
- <wsdl:input>
- <soap12:header use="literal" part="SessionData" message="tns:Echo"/>
- <soap12:body use="literal" parts="Echo"/>
- </wsdl:input>
- <wsdl:output>
- <soap12:body use="literal"/>
- </wsdl:output>
- </wsdl:operation>
- <wsdl:operation name="End">
- <soap12:operation soapAction="http://www.wstf.org/docs/scenarios/sc002/End"/>
- <wsdl:input>
- <soap12:header use="literal" part="SessionData" message="tns:End"/>
- <soap12:body use="literal" parts="End"/>
- </wsdl:input>
- <wsdl:output>
- <soap12:body use="literal"/>
- </wsdl:output>
- </wsdl:operation>
- <wsdl:operation name="SendMessages">
- <soap12:operation soapAction="http://www.wstf.org/docs/scenarios/sc002/SendMessages"/>
- <wsdl:input>
- <soap12:body use="literal"/>
- </wsdl:input>
- <wsdl:output>
- <soap12:body use="literal"/>
- </wsdl:output>
- </wsdl:operation>
- </wsdl:binding>
-
- <wsdl:service name="sc002Service">
- <wsdl:port name="soap11port" binding="tns:sc002SOAP11Binding">
- <soap:address location="http://www.wstf.org/sc002/sc002SOAP11"/>
- </wsdl:port>
- <wsdl:port name="soap12port" binding="tns:sc002SOAP12Binding">
- <soap12:address location="http://www.wstf.org/sc002/sc002SOAP12"/>
- </wsdl:port>
- </wsdl:service>
-
-</wsdl:definitions>
+<?xml version="1.0" encoding="UTF-8"?>
+<wsdl:definitions targetNamespace="http://www.wstf.org/docs/scenarios/sc002"
+ xmlns:xs="http://www.w3.org/2001/XMLSchema"
+ xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
+ xmlns:soap12="http://schemas.xmlsoap.org/wsdl/soap12/"
+ xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
+ xmlns:tns="http://www.wstf.org/docs/scenarios/sc002">
+
+ <wsdl:types>
+ <xs:schema targetNamespace="http://www.wstf.org/docs/scenarios/sc002">
+ <xs:include schemaLocation="sc002.xsd"/>
+ <xs:element name="Begin" type="tns:BeginType"/>
+ <xs:element name="BeginResponse" type="tns:BeginResponseType"/>
+ <xs:element name="Notify" type="tns:NotifyType"/>
+ <xs:element name="Echo" type="tns:EchoType"/>
+ <xs:element name="EchoResponse" type="tns:EchoResponseType"/>
+ <xs:element name="End" type="tns:EndType"/>
+ <xs:element name="EndResponse" type="tns:EndResponseType"/>
+ <xs:element name="SendMessages" type="tns:SendMessagesType"/>
+ <xs:element name="SendMessagesResponse" type="tns:SendMessagesResponseType"/>
+ <xs:element name="SessionData" type="tns:SessionDataType"/>
+ </xs:schema>
+ </wsdl:types>
+
+ <wsdl:message name="Begin">
+ <wsdl:part name="Begin" element="tns:Begin"/>
+ <wsdl:part name="SessionData" element="tns:SessionData"/>
+ </wsdl:message>
+
+ <wsdl:message name="BeginResponse">
+ <wsdl:part name="BeginResponse" element="tns:BeginResponse"/>
+ </wsdl:message>
+
+ <wsdl:message name="Notify">
+ <wsdl:part name="Notify" element="tns:Notify"/>
+ <wsdl:part name="SessionData" element="tns:SessionData"/>
+ </wsdl:message>
+
+ <wsdl:message name="Echo">
+ <wsdl:part name="Echo" element="tns:Echo"/>
+ <wsdl:part name="SessionData" element="tns:SessionData"/>
+ </wsdl:message>
+
+ <wsdl:message name="EchoResponse">
+ <wsdl:part name="EchoResponse" element="tns:EchoResponse"/>
+ </wsdl:message>
+
+ <wsdl:message name="End">
+ <wsdl:part name="End" element="tns:End"/>
+ <wsdl:part name="SessionData" element="tns:SessionData"/>
+ </wsdl:message>
+
+ <wsdl:message name="EndResponse">
+ <wsdl:part name="EndResponse" element="tns:EndResponse"/>
+ </wsdl:message>
+
+ <wsdl:message name="SendMessages">
+ <wsdl:part name="SendMessages" element="tns:SendMessages"/>
+ </wsdl:message>
+
+ <wsdl:message name="SendMessagesResponse">
+ <wsdl:part name="SendMessagesResponse" element="tns:SendMessagesResponse"/>
+ </wsdl:message>
+
+ <wsdl:portType name="sc002Port">
+ <wsdl:operation name="Begin">
+ <wsdl:input message="tns:Begin"/>
+ <wsdl:output message="tns:BeginResponse"/>
+ </wsdl:operation>
+ <wsdl:operation name="Notify">
+ <wsdl:input message="tns:Notify"/>
+ </wsdl:operation>
+ <wsdl:operation name="Echo">
+ <wsdl:input message="tns:Echo"/>
+ <wsdl:output message="tns:EchoResponse"/>
+ </wsdl:operation>
+ <wsdl:operation name="End">
+ <wsdl:input message="tns:End"/>
+ <wsdl:output message="tns:EndResponse"/>
+ </wsdl:operation>
+ <wsdl:operation name="SendMessages">
+ <wsdl:input message="tns:SendMessages"/>
+ <wsdl:output message="tns:SendMessagesResponse"/>
+ </wsdl:operation>
+ </wsdl:portType>
+
+ <wsdl:binding name="sc002SOAP11Binding" type="tns:sc002Port">
+ <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
+ <wsdl:operation name="Begin">
+ <soap:operation soapAction=""/>
+ <wsdl:input>
+ <soap:header use="literal" part="SessionData" message="tns:Begin"/>
+ <soap:body use="literal" parts="Begin"/>
+ </wsdl:input>
+ <wsdl:output>
+ <soap:body use="literal"/>
+ </wsdl:output>
+ </wsdl:operation>
+ <wsdl:operation name="Notify">
+ <soap:operation soapAction=""/>
+ <wsdl:input>
+ <soap:header use="literal" part="SessionData" message="tns:Notify"/>
+ <soap:body use="literal" parts="Notify"/>
+ </wsdl:input>
+ </wsdl:operation>
+ <wsdl:operation name="Echo">
+ <soap:operation soapAction=""/>
+ <wsdl:input>
+ <soap:header use="literal" part="SessionData" message="tns:Echo"/>
+ <soap:body use="literal" parts="Echo"/>
+ </wsdl:input>
+ <wsdl:output>
+ <soap:body use="literal"/>
+ </wsdl:output>
+ </wsdl:operation>
+ <wsdl:operation name="End">
+ <soap:operation soapAction=""/>
+ <wsdl:input>
+ <soap:header use="literal" part="SessionData" message="tns:End"/>
+ <soap:body use="literal" parts="End"/>
+ </wsdl:input>
+ <wsdl:output>
+ <soap:body use="literal"/>
+ </wsdl:output>
+ </wsdl:operation>
+ <wsdl:operation name="SendMessages">
+ <soap:operation soapAction=""/>
+ <wsdl:input>
+ <soap:body use="literal"/>
+ </wsdl:input>
+ <wsdl:output>
+ <soap:body use="literal"/>
+ </wsdl:output>
+ </wsdl:operation>
+ </wsdl:binding>
+
+ <wsdl:binding name="sc002SOAP12Binding" type="tns:sc002Port">
+ <soap12:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
+ <wsdl:operation name="Begin">
+ <soap12:operation/>
+ <wsdl:input>
+ <soap12:header use="literal" part="SessionData" message="tns:Begin"/>
+ <soap12:body use="literal" parts="Begin"/>
+ </wsdl:input>
+ <wsdl:output>
+ <soap12:body use="literal"/>
+ </wsdl:output>
+ </wsdl:operation>
+ <wsdl:operation name="Notify">
+ <soap12:operation/>
+ <wsdl:input>
+ <soap12:header use="literal" part="SessionData" message="tns:Notify"/>
+ <soap12:body use="literal" parts="Notify"/>
+ </wsdl:input>
+ </wsdl:operation>
+ <wsdl:operation name="Echo">
+ <soap12:operation/>
+ <wsdl:input>
+ <soap12:header use="literal" part="SessionData" message="tns:Echo"/>
+ <soap12:body use="literal" parts="Echo"/>
+ </wsdl:input>
+ <wsdl:output>
+ <soap12:body use="literal"/>
+ </wsdl:output>
+ </wsdl:operation>
+ <wsdl:operation name="End">
+ <soap12:operation/>
+ <wsdl:input>
+ <soap12:header use="literal" part="SessionData" message="tns:End"/>
+ <soap12:body use="literal" parts="End"/>
+ </wsdl:input>
+ <wsdl:output>
+ <soap12:body use="literal"/>
+ </wsdl:output>
+ </wsdl:operation>
+ <wsdl:operation name="SendMessages">
+ <soap12:operation/>
+ <wsdl:input>
+ <soap12:body use="literal"/>
+ </wsdl:input>
+ <wsdl:output>
+ <soap12:body use="literal"/>
+ </wsdl:output>
+ </wsdl:operation>
+ </wsdl:binding>
+
+ <wsdl:service name="sc002Service">
+ <wsdl:port name="soap11port" binding="tns:sc002SOAP11Binding">
+ <soap:address location="http://www.wstf.org/sc002/sc002SOAP11"/>
+ </wsdl:port>
+ <wsdl:port name="soap12port" binding="tns:sc002SOAP12Binding">
+ <soap12:address location="http://www.wstf.org/sc002/sc002SOAP12"/>
+ </wsdl:port>
+ </wsdl:service>
+
+</wsdl:definitions>
Modified: labs/jbosstm/workspace/interop/WSTFSC02-interop/dd/sc003/sc003responsehandlers.xml
===================================================================
--- labs/jbosstm/workspace/interop/WSTFSC02-interop/dd/sc003/sc003responsehandlers.xml 2008-10-24 15:02:35 UTC (rev 23581)
+++ labs/jbosstm/workspace/interop/WSTFSC02-interop/dd/sc003/sc003responsehandlers.xml 2008-10-24 16:13:09 UTC (rev 23582)
@@ -25,12 +25,8 @@
xsi:schemaLocation="http://java.sun.com/xml/ns/javaee">
<handler-chain>
<handler>
- <handler-name>WS Addressing Server Handler</handler-name>
- <handler-class>org.jboss.ws.extensions.addressing.jaxws.WSAddressingServerHandler</handler-class>
- </handler>
- <handler>
<handler-name>WSTF Sc003 Server Handler</handler-name>
- <handler-class>com.jboss.transaction.wstf.webservices.sc003.client.Sc003ClientHandler</handler-class>
+ <handler-class>com.jboss.transaction.wstf.webservices.sc003.server.Sc003ResponseServerHandler</handler-class>
</handler>
</handler-chain>
</handler-chains>
Modified: labs/jbosstm/workspace/interop/WSTFSC02-interop/dd/sc003/wsdl/sc002.xsd
===================================================================
--- labs/jbosstm/workspace/interop/WSTFSC02-interop/dd/sc003/wsdl/sc002.xsd 2008-10-24 15:02:35 UTC (rev 23581)
+++ labs/jbosstm/workspace/interop/WSTFSC02-interop/dd/sc003/wsdl/sc002.xsd 2008-10-24 16:13:09 UTC (rev 23582)
@@ -1,104 +1,104 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
- targetNamespace="http://www.wstf.org/docs/scenarios/sc002"
- xmlns:tns="http://www.wstf.org/docs/scenarios/sc002"
- xmlns:wsa="http://www.w3.org/2005/08/addressing"
- elementFormDefault="qualified">
-
- <xs:import namespace="http://www.w3.org/2005/08/addressing"
- schemaLocation="http://www.w3.org/2006/03/addressing/ws-addr.xsd"/>
-
- <xs:complexType name="BeginType">
- <xs:sequence>
- <xs:any namespace="##other" processContents="lax" minOccurs="0"
- maxOccurs="unbounded" />
- </xs:sequence>
- </xs:complexType>
-
- <xs:complexType name="BeginResponseType">
- <xs:sequence>
- <xs:any namespace="##other" processContents="lax" minOccurs="0"
- maxOccurs="unbounded" />
- </xs:sequence>
- </xs:complexType>
-
- <xs:complexType name="NotifyType">
- <xs:sequence>
- <xs:element name="text" type="xs:string" />
- <xs:any namespace="##other" processContents="lax" minOccurs="0"
- maxOccurs="unbounded" />
- </xs:sequence>
- </xs:complexType>
-
- <xs:complexType name="EchoType">
- <xs:sequence>
- <xs:element name="text" type="xs:string" />
- <xs:any namespace="##other" processContents="lax" minOccurs="0"
- maxOccurs="unbounded" />
- </xs:sequence>
- </xs:complexType>
-
- <xs:complexType name="EchoResponseType">
- <xs:sequence>
- <xs:element name="text" type="xs:string" />
- <xs:any namespace="##other" processContents="lax" minOccurs="0"
- maxOccurs="unbounded" />
- </xs:sequence>
- </xs:complexType>
-
- <xs:complexType name="EndType">
- <xs:sequence>
- <xs:any namespace="##other" processContents="lax" minOccurs="0"
- maxOccurs="unbounded" />
- </xs:sequence>
- </xs:complexType>
-
- <xs:complexType name="EndResponseType">
- <xs:sequence>
- <xs:any namespace="##other" processContents="lax" minOccurs="0"
- maxOccurs="unbounded" />
- </xs:sequence>
- </xs:complexType>
-
- <xs:complexType name="MessageType">
- <xs:sequence>
- <xs:element name="service" type="xs:QName"/>
- <xs:element name="port" type="xs:NCName"/>
- <xs:element name="operation" type="xs:string"/>
- <xs:any namespace="##other" processContents="lax" minOccurs="1"
- maxOccurs="unbounded"/>
- </xs:sequence>
- </xs:complexType>
-
- <xs:complexType name="SendMessagesType">
- <xs:sequence>
- <xs:element name="epr" type="wsa:EndpointReferenceType"/>
- <xs:element name="messages">
- <xs:complexType>
- <xs:sequence>
- <xs:element name="message" type="tns:MessageType" minOccurs="1"
- maxOccurs="unbounded"/>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:any namespace="##other" processContents="lax" minOccurs="0"
- maxOccurs="unbounded" />
- </xs:sequence>
- </xs:complexType>
-
- <xs:complexType name="SendMessagesResponseType">
- <xs:sequence>
- <xs:any namespace="##other" processContents="lax" minOccurs="0"
- maxOccurs="unbounded" />
- </xs:sequence>
- </xs:complexType>
-
- <xs:complexType name="SessionDataType">
- <xs:sequence>
- <xs:element name="ID" type="xs:string" />
- <xs:any namespace="##other" processContents="lax" minOccurs="0"
- maxOccurs="unbounded" />
- </xs:sequence>
- </xs:complexType>
-
-</xs:schema>
+<?xml version="1.0" encoding="UTF-8"?>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
+ targetNamespace="http://www.wstf.org/docs/scenarios/sc002"
+ xmlns:tns="http://www.wstf.org/docs/scenarios/sc002"
+ xmlns:wsa="http://www.w3.org/2005/08/addressing"
+ elementFormDefault="qualified">
+
+ <xs:import namespace="http://www.w3.org/2005/08/addressing"
+ schemaLocation="http://www.w3.org/2006/03/addressing/ws-addr.xsd"/>
+
+ <xs:complexType name="BeginType">
+ <xs:sequence>
+ <xs:any namespace="##other" processContents="lax" minOccurs="0"
+ maxOccurs="unbounded" />
+ </xs:sequence>
+ </xs:complexType>
+
+ <xs:complexType name="BeginResponseType">
+ <xs:sequence>
+ <xs:any namespace="##other" processContents="lax" minOccurs="0"
+ maxOccurs="unbounded" />
+ </xs:sequence>
+ </xs:complexType>
+
+ <xs:complexType name="NotifyType">
+ <xs:sequence>
+ <xs:element name="text" type="xs:string" />
+ <xs:any namespace="##other" processContents="lax" minOccurs="0"
+ maxOccurs="unbounded" />
+ </xs:sequence>
+ </xs:complexType>
+
+ <xs:complexType name="EchoType">
+ <xs:sequence>
+ <xs:element name="text" type="xs:string" />
+ <xs:any namespace="##other" processContents="lax" minOccurs="0"
+ maxOccurs="unbounded" />
+ </xs:sequence>
+ </xs:complexType>
+
+ <xs:complexType name="EchoResponseType">
+ <xs:sequence>
+ <xs:element name="text" type="xs:string" />
+ <xs:any namespace="##other" processContents="lax" minOccurs="0"
+ maxOccurs="unbounded" />
+ </xs:sequence>
+ </xs:complexType>
+
+ <xs:complexType name="EndType">
+ <xs:sequence>
+ <xs:any namespace="##other" processContents="lax" minOccurs="0"
+ maxOccurs="unbounded" />
+ </xs:sequence>
+ </xs:complexType>
+
+ <xs:complexType name="EndResponseType">
+ <xs:sequence>
+ <xs:any namespace="##other" processContents="lax" minOccurs="0"
+ maxOccurs="unbounded" />
+ </xs:sequence>
+ </xs:complexType>
+
+ <xs:complexType name="MessageType">
+ <xs:sequence>
+ <xs:element name="service" type="xs:QName"/>
+ <xs:element name="port" type="xs:NCName"/>
+ <xs:element name="operation" type="xs:string"/>
+ <xs:any namespace="##other" processContents="lax" minOccurs="1"
+ maxOccurs="unbounded"/>
+ </xs:sequence>
+ </xs:complexType>
+
+ <xs:complexType name="SendMessagesType">
+ <xs:sequence>
+ <xs:element name="epr" type="wsa:EndpointReferenceType"/>
+ <xs:element name="messages">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="message" type="tns:MessageType" minOccurs="1"
+ maxOccurs="unbounded"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:any namespace="##other" processContents="lax" minOccurs="0"
+ maxOccurs="unbounded" />
+ </xs:sequence>
+ </xs:complexType>
+
+ <xs:complexType name="SendMessagesResponseType">
+ <xs:sequence>
+ <xs:any namespace="##other" processContents="lax" minOccurs="0"
+ maxOccurs="unbounded" />
+ </xs:sequence>
+ </xs:complexType>
+
+ <xs:complexType name="SessionDataType">
+ <xs:sequence>
+ <xs:element name="ID" type="xs:string" />
+ <xs:any namespace="##other" processContents="lax" minOccurs="0"
+ maxOccurs="unbounded" />
+ </xs:sequence>
+ </xs:complexType>
+
+</xs:schema>
Modified: labs/jbosstm/workspace/interop/WSTFSC02-interop/dd/sc003/wsdl/sc003.wsdl
===================================================================
--- labs/jbosstm/workspace/interop/WSTFSC02-interop/dd/sc003/wsdl/sc003.wsdl 2008-10-24 15:02:35 UTC (rev 23581)
+++ labs/jbosstm/workspace/interop/WSTFSC02-interop/dd/sc003/wsdl/sc003.wsdl 2008-10-24 16:13:09 UTC (rev 23582)
@@ -15,7 +15,6 @@
<xs:element name="Notify" type="sc002:NotifyType"/>
<xs:element name="Echo" type="sc002:EchoType"/>
<xs:element name="EchoResponse" type="sc002:EchoResponseType"/>
- <xs:element name="SessionData" type="sc002:SessionDataType"/>
</xs:schema>
</wsdl:types>
@@ -51,14 +50,14 @@
<wsdl:binding name="sc003SOAP11Binding" type="tns:sc003Port">
<soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
<wsdl:operation name="Notify">
- <soap:operation soapAction="http://www.wstf.org/docs/scenarios/sc002/Notify"/>
+ <soap:operation soapAction=""/>
<wsdl:input>
<soap:header use="literal" part="SessionData" message="tns:Notify"/>
<soap:body use="literal" parts="Notify"/>
</wsdl:input>
</wsdl:operation>
<wsdl:operation name="Echo">
- <soap:operation soapAction="http://www.wstf.org/docs/scenarios/sc002/Echo"/>
+ <soap:operation soapAction=""/>
<wsdl:input>
<soap:header use="literal" part="SessionData" message="tns:Echo"/>
<soap:body use="literal" parts="Echo"/>
@@ -72,14 +71,14 @@
<wsdl:binding name="sc003SOAP12Binding" type="tns:sc003Port">
<soap12:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
<wsdl:operation name="Notify">
- <soap12:operation soapAction="http://www.wstf.org/docs/scenarios/sc002/Notify"/>
+ <soap12:operation/>
<wsdl:input>
<soap12:header use="literal" part="SessionData" message="tns:Notify"/>
<soap12:body use="literal" parts="Notify"/>
</wsdl:input>
</wsdl:operation>
<wsdl:operation name="Echo">
- <soap12:operation soapAction="http://www.wstf.org/docs/scenarios/sc002/Echo"/>
+ <soap12:operation/>
<wsdl:input>
<soap12:header use="literal" part="SessionData" message="tns:Echo"/>
<soap12:body use="literal" parts="Echo"/>
Modified: labs/jbosstm/workspace/interop/WSTFSC02-interop/src/com/jboss/transaction/wstf/interop/Sc002TestCase.java
===================================================================
--- labs/jbosstm/workspace/interop/WSTFSC02-interop/src/com/jboss/transaction/wstf/interop/Sc002TestCase.java 2008-10-24 15:02:35 UTC (rev 23581)
+++ labs/jbosstm/workspace/interop/WSTFSC02-interop/src/com/jboss/transaction/wstf/interop/Sc002TestCase.java 2008-10-24 16:13:09 UTC (rev 23582)
@@ -132,7 +132,7 @@
fail("invalid null echo response");
} else {
int length = reply.length();
- int idx = reply.indexOf("World");
+ int idx = reply.lastIndexOf("World");
if ((idx < 0) || ((idx + 5) != length)) {
fail ("invalid echo response " + reply);
}
Modified: labs/jbosstm/workspace/interop/WSTFSC02-interop/src/com/jboss/transaction/wstf/interop/Sc003AsyncTestCase.java
===================================================================
--- labs/jbosstm/workspace/interop/WSTFSC02-interop/src/com/jboss/transaction/wstf/interop/Sc003AsyncTestCase.java 2008-10-24 15:02:35 UTC (rev 23581)
+++ labs/jbosstm/workspace/interop/WSTFSC02-interop/src/com/jboss/transaction/wstf/interop/Sc003AsyncTestCase.java 2008-10-24 16:13:09 UTC (rev 23582)
@@ -203,7 +203,7 @@
fail("invalid null echo response");
} else {
int length = reply.length();
- int idx = reply.indexOf("World");
+ int idx = reply.lastIndexOf("World");
if ((idx < 0) || ((idx + 5) != length)) {
fail ("invalid echo response " + reply);
}
Modified: labs/jbosstm/workspace/interop/WSTFSC02-interop/src/com/jboss/transaction/wstf/interop/Sc003TestCase.java
===================================================================
--- labs/jbosstm/workspace/interop/WSTFSC02-interop/src/com/jboss/transaction/wstf/interop/Sc003TestCase.java 2008-10-24 15:02:35 UTC (rev 23581)
+++ labs/jbosstm/workspace/interop/WSTFSC02-interop/src/com/jboss/transaction/wstf/interop/Sc003TestCase.java 2008-10-24 16:13:09 UTC (rev 23582)
@@ -147,7 +147,7 @@
fail("invalid null echo response");
} else {
int length = reply.length();
- int idx = reply.indexOf("World");
+ int idx = reply.lastIndexOf("World");
if ((idx < 0) || ((idx + 5) != length)) {
fail ("invalid echo response " + reply);
}
Modified: labs/jbosstm/workspace/interop/WSTFSC02-interop/src/com/jboss/transaction/wstf/webservices/sc003/sei/Sc003PortImpl.java
===================================================================
--- labs/jbosstm/workspace/interop/WSTFSC02-interop/src/com/jboss/transaction/wstf/webservices/sc003/sei/Sc003PortImpl.java 2008-10-24 15:02:35 UTC (rev 23581)
+++ labs/jbosstm/workspace/interop/WSTFSC02-interop/src/com/jboss/transaction/wstf/webservices/sc003/sei/Sc003PortImpl.java 2008-10-24 16:13:09 UTC (rev 23582)
@@ -23,7 +23,7 @@
portName = "soap11port",
serviceName="sc003Service")
@SOAPBinding(parameterStyle = SOAPBinding.ParameterStyle.BARE)
-//@HandlerChain(file="sc003handlers.xml")
+ at HandlerChain(file="sc003responsehandlers.xml")
@EndpointConfig(configName="Standard WSAddressing Endpoint")
public class Sc003PortImpl implements Sc003Port
{
Copied: labs/jbosstm/workspace/interop/WSTFSC02-interop/src/com/jboss/transaction/wstf/webservices/sc003/server/Sc003ResponseServerHandler.java (from rev 21599, labs/jbosstm/workspace/interop/WSTFSC02-interop/src/com/jboss/transaction/wstf/webservices/sc003/client/Sc003ClientHandler.java)
===================================================================
--- labs/jbosstm/workspace/interop/WSTFSC02-interop/src/com/jboss/transaction/wstf/webservices/sc003/server/Sc003ResponseServerHandler.java (rev 0)
+++ labs/jbosstm/workspace/interop/WSTFSC02-interop/src/com/jboss/transaction/wstf/webservices/sc003/server/Sc003ResponseServerHandler.java 2008-10-24 16:13:09 UTC (rev 23582)
@@ -0,0 +1,146 @@
+package com.jboss.transaction.wstf.webservices.sc003.server;
+
+import com.jboss.transaction.wstf.webservices.sc003.Sc003Constants;
+import com.jboss.transaction.wstf.proxy.ProxyConversation;
+
+import javax.xml.ws.handler.soap.SOAPHandler;
+import javax.xml.ws.handler.soap.SOAPMessageContext;
+import javax.xml.ws.handler.MessageContext;
+import javax.xml.namespace.QName;
+import javax.xml.soap.*;
+import java.util.Set;
+import java.util.Collections;
+import java.util.Iterator;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+
+/**
+ */
+public class Sc003ResponseServerHandler implements SOAPHandler<SOAPMessageContext>
+{
+ /**
+ * Gets the header blocks that can be processed by this Handler
+ * instance.
+ *
+ * @return Set of QNames of header blocks processed by this
+ * handler instance. <code>QName</code> is the qualified
+ * name of the outermost element of the Header block.
+ */
+ public Set<QName> getHeaders() {
+ return Collections.singleton(Sc003Constants.SC003_ELEMENT_CONVERSATIONID_QNAME);
+ }
+
+ /**
+ * The <code>handleMessage</code> method is invoked for normal processing
+ * of inbound and outbound messages. Refer to the description of the handler
+ * framework in the JAX-WS specification for full details.
+ *
+ * @param context the message context.
+ * @return An indication of whether handler processing should continue for
+ * the current message
+ * <ul>
+ * <li>Return <code>true</code> to continue
+ * processing.</li>
+ * <li>Return <code>false</code> to block
+ * processing.</li>
+ * </ul>
+ * @throws RuntimeException Causes the JAX-WS runtime to cease
+ * handler processing and generate a fault.
+ * @throws javax.xml.ws.ProtocolException Causes the JAX-WS runtime to switch to
+ * fault message processing.
+ */
+ public boolean handleMessage(SOAPMessageContext context)
+ {
+ SOAPMessage message = context.getMessage();
+
+ handleConversation(context, message);
+
+ return true;
+ }
+
+ /**
+ * The <code>handleFault</code> method is invoked for fault message
+ * processing. Refer to the description of the handler
+ * framework in the JAX-WS specification for full details.
+ *
+ * @param context the message context
+ * @return An indication of whether handler fault processing should continue
+ * for the current message
+ * <ul>
+ * <li>Return <code>true</code> to continue
+ * processing.</li>
+ * <li>Return <code>false</code> to block
+ * processing.</li>
+ * </ul>
+ * @throws RuntimeException Causes the JAX-WS runtime to cease
+ * handler fault processing and dispatch the fault.
+ * @throws javax.xml.ws.ProtocolException Causes the JAX-WS runtime to cease
+ * handler fault processing and dispatch the fault.
+ */
+ public boolean handleFault(SOAPMessageContext context)
+ {
+ SOAPMessage message = context.getMessage();
+
+ handleConversation(context, message);
+
+ return true;
+ }
+
+ /**
+ * Called at the conclusion of a message exchange pattern just prior to
+ * the JAX-WS runtime disptaching a message, fault or exception. Refer to
+ * the description of the handler
+ * framework in the JAX-WS specification for full details.
+ *
+ * @param context the message context
+ */
+ public void close(MessageContext context)
+ {
+ // do nothing
+ }
+
+ private void handleConversation(SOAPMessageContext context, SOAPMessage message)
+ {
+ // update the conversation id if attached to the context or use the last one provided
+
+ try {
+ SOAPHeader header = message.getSOAPHeader();
+ if (header != null) {
+ Iterator<SOAPHeaderElement> iterator = header.examineAllHeaderElements();
+ SOAPHeaderElement element = null;
+ while (iterator.hasNext()) {
+ element = iterator.next();
+ if (element.getElementQName().equals(Sc003Constants.SC003_ELEMENT_CONVERSATIONID_QNAME)) {
+ conversationId = element.getValue();
+ break;
+ }
+ }
+ }
+ } catch (SOAPException e) {
+ return;
+ }
+
+ if (conversationId != null) {
+ // add the message to the conversation log
+
+ // we need to add the message to the conversation as a string
+
+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
+ try {
+ message.writeTo(baos);
+ String messageString = baos.toString();
+ ProxyConversation.appendConversation(conversationId, messageString);
+ } catch (SOAPException e) {
+ // print error and continue
+ ProxyConversation.appendConversation(conversationId, "<error> could not log message : " + e + "</error>");
+ } catch (IOException e) {
+ ProxyConversation.appendConversation(conversationId, "<error> could not log message : " + e + "</error>");
+ }
+ }
+ }
+
+ // the outgoing and incoming handlers have to share the converstion id so we make this
+ // a static
+
+ private static String conversationId = null;
+}
\ No newline at end of file
Modified: labs/jbosstm/workspace/interop/WSTFSC02-interop/web/sc002/details.jsp
===================================================================
--- labs/jbosstm/workspace/interop/WSTFSC02-interop/web/sc002/details.jsp 2008-10-24 15:02:35 UTC (rev 23581)
+++ labs/jbosstm/workspace/interop/WSTFSC02-interop/web/sc002/details.jsp 2008-10-24 16:13:09 UTC (rev 23582)
@@ -9,7 +9,7 @@
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>JBoss Transactions WS-TX Interop detail page</title>
+<title>JBoss WSTF Sc002 Interop detail page</title>
</head>
<body>
<h1>Results</h1>
Modified: labs/jbosstm/workspace/interop/WSTFSC02-interop/web/sc002/index.jsp
===================================================================
--- labs/jbosstm/workspace/interop/WSTFSC02-interop/web/sc002/index.jsp 2008-10-24 15:02:35 UTC (rev 23581)
+++ labs/jbosstm/workspace/interop/WSTFSC02-interop/web/sc002/index.jsp 2008-10-24 16:13:09 UTC (rev 23582)
@@ -12,7 +12,7 @@
<title>JBoss Transactions WSTF Sc002 Interop</title>
</head>
<body>
-<h1>JBoss Transactions WSTF Sc002 Interop</h1>
+<h1>JBoss WSTF Sc002 Interop</h1>
<h2>Introduction</h2>
<p>This web application implements the <a href="http://www.wstf.org/docs/scenarios/sc002/sc002.xml">scenario sc002</a> interoperability tests specified by the <a href="http://www.wstf.org/">Web Services Test Forum</a> Group.</p>
<p>Please send any queries to the <a href="mailto:adinn at redhat.com?subject=WSTF%20interop%20query">Red Hat Test Forum contact</a></p>
Modified: labs/jbosstm/workspace/interop/WSTFSC02-interop/web/sc002/results.jsp
===================================================================
--- labs/jbosstm/workspace/interop/WSTFSC02-interop/web/sc002/results.jsp 2008-10-24 15:02:35 UTC (rev 23581)
+++ labs/jbosstm/workspace/interop/WSTFSC02-interop/web/sc002/results.jsp 2008-10-24 16:13:09 UTC (rev 23582)
@@ -9,7 +9,7 @@
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>JBoss Transactions WS-TX Interop results page</title>
+<title>JBoss WSTF Sc002 Interop results page</title>
</head>
<body>
<h1>Results</h1>
Modified: labs/jbosstm/workspace/interop/WSTFSC02-interop/web/sc003/details.jsp
===================================================================
--- labs/jbosstm/workspace/interop/WSTFSC02-interop/web/sc003/details.jsp 2008-10-24 15:02:35 UTC (rev 23581)
+++ labs/jbosstm/workspace/interop/WSTFSC02-interop/web/sc003/details.jsp 2008-10-24 16:13:09 UTC (rev 23582)
@@ -9,7 +9,7 @@
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>JBoss Transactions WS-TX Interop detail page</title>
+<title>JBoss WSTF Sc003 Interop detail page</title>
</head>
<body>
<h1>Results</h1>
Modified: labs/jbosstm/workspace/interop/WSTFSC02-interop/web/sc003/index.jsp
===================================================================
--- labs/jbosstm/workspace/interop/WSTFSC02-interop/web/sc003/index.jsp 2008-10-24 15:02:35 UTC (rev 23581)
+++ labs/jbosstm/workspace/interop/WSTFSC02-interop/web/sc003/index.jsp 2008-10-24 16:13:09 UTC (rev 23582)
@@ -9,18 +9,18 @@
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>JBoss Transactions WSTF Sc002 Interop</title>
+<title>JBoss Transactions WSTF Sc003 Interop</title>
</head>
<body>
-<h1>JBoss Transactions WSTF Sc002 Interop</h1>
+<h1>JBoss WSTF Sc003 Interop</h1>
<h2>Introduction</h2>
<p>This web application implements the <a href="http://www.wstf.org/docs/scenarios/sc003/sc003.xml">scenario sc003</a> interoperability tests specified by the <a href="http://www.wstf.org/">Web Services Test Forum</a> Group.</p>
<p>Please send any queries to the <a href="mailto:adinn at redhat.com?subject=WSTF%20interop%20query">Red Hat Test Forum contact</a></p>
-<h2>Sc002 tests</h2>
+<h2>Sc003 tests</h2>
<p>Enter the URL of the sc003 participant service to be used to run these tests and a timeout for each individual test<br>
n.b. the JBoss participant has URL http://localhost:8080/wstf/sc003/Sc003Service</p>
<form action="../test" method="post">
-<p>Sc002 Participant Service URI: <input name="<%= TestConstants.PARAM_SERVICE_URI %>" maxlength="2000" size="100" value="http://localhost:8080/wstf/sc003/Sc003Service"/></p>
+<p>Sc003 Participant Service URI: <input name="<%= TestConstants.PARAM_SERVICE_URI %>" maxlength="2000" size="100" value="http://localhost:8080/wstf/sc003/Sc003Service"/></p>
<p>Test timeout: <input name="<%= TestConstants.PARAM_TEST_TIMEOUT %>" maxlength="10" size="10" value="20000"/></p>
<!-- the current JaxWS based interop11 tests only runs synchronous tests for now
<p>Asynchronous Test application: <input name="<%= TestConstants.PARAM_ASYNC_TEST %>" type="checkbox" checked="checked"/></p>
@@ -28,7 +28,7 @@
<select name="<%= TestConstants.PARAM_TEST %>">
<option value="<%= TestConstants.NAME_ALL_TESTS_SC003 %>">All Sc003 tests</option>
<option value="<%= TestConstants.NAME_ALL_TESTS_SC003_SYNC %>">All Sc003 synchronous tests</option>
- <option value="<%= TestConstants.NAME_ALL_TESTS_SC003 %>">All Sc002 asynchronous tests</option>
+ <option value="<%= TestConstants.NAME_ALL_TESTS_SC003 %>">All Sc003 asynchronous tests</option>
<%
final Map descriptions = TestConstants.DESCRIPTIONS_SC003 ;
Modified: labs/jbosstm/workspace/interop/WSTFSC02-interop/web/sc003/results.jsp
===================================================================
--- labs/jbosstm/workspace/interop/WSTFSC02-interop/web/sc003/results.jsp 2008-10-24 15:02:35 UTC (rev 23581)
+++ labs/jbosstm/workspace/interop/WSTFSC02-interop/web/sc003/results.jsp 2008-10-24 16:13:09 UTC (rev 23582)
@@ -9,7 +9,7 @@
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>JBoss Transactions WS-TX Interop results page</title>
+<title>JBoss WSTF Sc003 Interop results page</title>
</head>
<body>
<h1>Results</h1>
More information about the jboss-svn-commits
mailing list