Author: chamikara
Date: Mon Mar 6 18:54:28 2006
New Revision: 383755
URL: http://svn.apache.org/viewcvs?rev=383755&view=rev
Log:
Updated module.xml and test resources.
Modified:
webservices/sandesha/trunk/config/module.xml
webservices/sandesha/trunk/src/org/apache/sandesha2/handlers/SandeshaInHandler.java
webservices/sandesha/trunk/test-resources/CreateSequence.xml
webservices/sandesha/trunk/test-resources/CreateSequenceResponse.xml
webservices/sandesha/trunk/test-resources/Sequence.xml
webservices/sandesha/trunk/test-resources/SequenceAcknowledgement.xml
webservices/sandesha/trunk/test-resources/TerminateSequence.xml
Modified: webservices/sandesha/trunk/config/module.xml
URL:
http://svn.apache.org/viewcvs/webservices/sandesha/trunk/config/module.xml?rev=383755&r1=383754&r2=383755&view=diff
==============================================================================
--- webservices/sandesha/trunk/config/module.xml (original)
+++ webservices/sandesha/trunk/config/module.xml Mon Mar 6 18:54:28 2006
@@ -2,7 +2,8 @@
<inflow>
<handler name="SandeshaGlobalInHandler"
class="org.apache.sandesha2.handlers.SandeshaGlobalInHandler">
- <order after="AddressingInHandler" phase="PreDispatch"/>
+ <order phase="PreDispatch" after="AddressingFinalInHandler" />
+ <!-- <order after="addressingSubmissionInHandler"
phase="PreDispatch"/> cant do this-->
</handler>
<handler name="SandeshaInHandler"
class="org.apache.sandesha2.handlers.SandeshaInHandler">
<order phase="RMPhase"/>
@@ -19,25 +20,30 @@
<messageReceiver
class="org.apache.sandesha2.msgreceivers.RMMessageReceiver"/>
<!-- namespaces for the 2005-02 spec -->
- <parameter name="wsamapping"
locked="xsd:false">http://schemas.xmlsoap.org/ws/2005/02/rm/TerminateSequence</parameter>
- <parameter name="wsamapping"
locked="xsd:false">http://schemas.xmlsoap.org/ws/2005/02/rm/SequenceAcknowledgement</parameter>
- <parameter name="wsamapping"
locked="xsd:false">http://schemas.xmlsoap.org/ws/2005/02/rm/CreateSequenceResponse</parameter>
+
<actionMapping>http://schemas.xmlsoap.org/ws/2005/02/rm/TerminateSequence</actionMapping>
+
<actionMapping>http://schemas.xmlsoap.org/ws/2005/02/rm/SequenceAcknowledgement</actionMapping>
+
<actionMapping>http://schemas.xmlsoap.org/ws/2005/02/rm/CreateSequenceResponse</actionMapping>
+
<!-- namespaces for the 2005-10 spec -->
- <parameter name="wsamapping"
locked="xsd:false">http://docs.oasis-open.org/ws-rx/wsrm/200510/TerminateSequence</parameter>
- <parameter name="wsamapping"
locked="xsd:false">http://docs.oasis-open.org/ws-rx/wsrm/200510/SequenceAcknowledgement</parameter>
- <parameter name="wsamapping"
locked="xsd:false">http://docs.oasis-open.org/ws-rx/wsrm/200510/CreateSequenceResponse</parameter>
- </operation>
+
+
<actionMapping>http://docs.oasis-open.org/ws-rx/wsrm/200510/SequenceAcknowledgement</actionMapping>
+
<actionMapping>http://docs.oasis-open.org/ws-rx/wsrm/200510/CreateSequenceResponse</actionMapping>
+
<actionMapping>http://docs.oasis-open.org/ws-rx/wsrm/200510/AckRequested</actionMapping>
+ </operation>
<operation name="RMInOutOperation"
mep="http://www.w3.org/2004/08/wsdl/in-out";>
<messageReceiver
class="org.apache.sandesha2.msgreceivers.RMMessageReceiver"/>
<!-- namespaces for the 2005-02 spec -->
- <parameter name="wsamapping"
locked="xsd:false">http://schemas.xmlsoap.org/ws/2005/02/rm/CreateSequence</parameter>
+
<actionMapping>http://schemas.xmlsoap.org/ws/2005/02/rm/CreateSequence</actionMapping>
<!-- namespaces for the 2005-10 spec -->
- <parameter name="wsamapping"
locked="xsd:false">http://docs.oasis-open.org/ws-rx/wsrm/200510/CreateSequence</parameter>
-
+
<actionMapping>http://docs.oasis-open.org/ws-rx/wsrm/200510/CreateSequence</actionMapping>
+
<actionMapping>http://docs.oasis-open.org/ws-rx/wsrm/200510/TerminateSequence</actionMapping>
+
<actionMapping>http://docs.oasis-open.org/ws-rx/wsrm/200510/CloseSequence</actionMapping>
+
<actionMapping>http://docs.oasis-open.org/ws-rx/wsrm/200510/TerminateSequenceResponse</actionMapping>
+
<actionMapping>http://docs.oasis-open.org/ws-rx/wsrm/200510/CloseSequenceResponse</actionMapping>
</operation>
Modified:
webservices/sandesha/trunk/src/org/apache/sandesha2/handlers/SandeshaInHandler.java
URL:
http://svn.apache.org/viewcvs/webservices/sandesha/trunk/src/org/apache/sandesha2/handlers/SandeshaInHandler.java?rev=383755&r1=383754&r2=383755&view=diff
==============================================================================
---
webservices/sandesha/trunk/src/org/apache/sandesha2/handlers/SandeshaInHandler.java
(original)
+++
webservices/sandesha/trunk/src/org/apache/sandesha2/handlers/SandeshaInHandler.java
Mon Mar 6 18:54:28 2006
@@ -81,9 +81,6 @@
throw new AxisFault(message);
}
- if
(rmMsgCtx.getMessageContext().getAxisOperation().getParent()==null) {
- System.out.println("Operation parent was null for
message:" + SandeshaUtil.getMessageTypeString(rmMsgCtx.getMessageType()));
- }
MsgProcessor msgProcessor = MsgProcessorFactory
.getMessageProcessor(rmMsgCtx.getMessageType());
Modified: webservices/sandesha/trunk/test-resources/CreateSequence.xml
URL:
http://svn.apache.org/viewcvs/webservices/sandesha/trunk/test-resources/CreateSequence.xml?rev=383755&r1=383754&r2=383755&view=diff
==============================================================================
--- webservices/sandesha/trunk/test-resources/CreateSequence.xml (original)
+++ webservices/sandesha/trunk/test-resources/CreateSequence.xml Mon Mar 6
18:54:28 2006
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
- <soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/";
xmlns:xsd="http://www.w3.org/2001/XMLSchema";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xmlns:wsrm="http://schemas.xmlsoap.org/ws/2005/02/rm";
xmlns:wsa="http://schemas.xmlsoap.org/ws/2004/08/addressing";>
+ <soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/";
xmlns:xsd="http://www.w3.org/2001/XMLSchema";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xmlns:wsrm="http://schemas.xmlsoap.org/ws/2005/02/rm";
xmlns:wsa="http://www.w3.org/2005/08/addressing";>
<soapenv:Header>
<wsa:MessageID
soapenv:mustUnderstand="0">uuid:c3671020-15e0-11da-9b3a-f0439d4867bd</wsa:MessageID>
<wsa:To
soapenv:mustUnderstand="0">http://localhost:8070/axis/services/TestService</wsa:To>
Modified: webservices/sandesha/trunk/test-resources/CreateSequenceResponse.xml
URL:
http://svn.apache.org/viewcvs/webservices/sandesha/trunk/test-resources/CreateSequenceResponse.xml?rev=383755&r1=383754&r2=383755&view=diff
==============================================================================
--- webservices/sandesha/trunk/test-resources/CreateSequenceResponse.xml
(original)
+++ webservices/sandesha/trunk/test-resources/CreateSequenceResponse.xml Mon
Mar 6 18:54:28 2006
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
- <soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/";
xmlns:xsd="http://www.w3.org/2001/XMLSchema";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xmlns:wsrm="http://schemas.xmlsoap.org/ws/2005/02/rm";
xmlns:wsa="http://schemas.xmlsoap.org/ws/2004/08/addressing";>
+ <soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/";
xmlns:xsd="http://www.w3.org/2001/XMLSchema";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xmlns:wsrm="http://schemas.xmlsoap.org/ws/2005/02/rm";
xmlns:wsa="http://www.w3.org/2005/08/addressing";>
<soapenv:Header>
<wsa:MessageID
soapenv:mustUnderstand="1">uuid:88754b00-161a-11da-b6d6-8198de3c47c5</wsa:MessageID>
<wsa:To
soapenv:mustUnderstand="1">http://127.0.0.1:9070/axis/services/RMService</wsa:To>
@@ -7,7 +7,7 @@
<wsa:From soapenv:mustUnderstand="1">
<wsa:Address>http://localhost:8070/axis/services/TestService</wsa:Address>
</wsa:From>
- <wsa:RelatesTo
RelationshipType="http://schemas.xmlsoap.org/ws/2004/08/addressing";
soapenv:mustUnderstand="1"
xmlns:http="wsa">uuid:872e4c10-161a-11da-9ef7-bd9ad94438a3</wsa:RelatesTo>
+ <wsa:RelatesTo
RelationshipType="http://schemas.xmlsoap.org/ws/2005/08/addressing";
soapenv:mustUnderstand="1"
xmlns:http="wsa">uuid:872e4c10-161a-11da-9ef7-bd9ad94438a3</wsa:RelatesTo>
</soapenv:Header>
<soapenv:Body>
<wsrm:CreateSequenceResponse>
Modified: webservices/sandesha/trunk/test-resources/Sequence.xml
URL:
http://svn.apache.org/viewcvs/webservices/sandesha/trunk/test-resources/Sequence.xml?rev=383755&r1=383754&r2=383755&view=diff
==============================================================================
--- webservices/sandesha/trunk/test-resources/Sequence.xml (original)
+++ webservices/sandesha/trunk/test-resources/Sequence.xml Mon Mar 6 18:54:28
2006
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/";
xmlns:xsd="http://www.w3.org/2001/XMLSchema";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xmlns:wsrm="http://schemas.xmlsoap.org/ws/2005/02/rm";
xmlns:wsa="http://schemas.xmlsoap.org/ws/2004/08/addressing";>
+<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/";
xmlns:xsd="http://www.w3.org/2001/XMLSchema";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xmlns:wsrm="http://schemas.xmlsoap.org/ws/2005/02/rm";
xmlns:wsa="http://www.w3.org/2005/08/addressing";>
<soapenv:Header>
<wsa:MessageID
soapenv:mustUnderstand="1">uuid:8c00b020-1624-11da-a28e-b3b9c4e71445</wsa:MessageID>
<wsa:To
soapenv:mustUnderstand="1">http://127.0.0.1:9070/axis/services/RMService</wsa:To>
Modified: webservices/sandesha/trunk/test-resources/SequenceAcknowledgement.xml
URL:
http://svn.apache.org/viewcvs/webservices/sandesha/trunk/test-resources/SequenceAcknowledgement.xml?rev=383755&r1=383754&r2=383755&view=diff
==============================================================================
--- webservices/sandesha/trunk/test-resources/SequenceAcknowledgement.xml
(original)
+++ webservices/sandesha/trunk/test-resources/SequenceAcknowledgement.xml Mon
Mar 6 18:54:28 2006
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
- <soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/";
xmlns:xsd="http://www.w3.org/2001/XMLSchema";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xmlns:wsrm="http://schemas.xmlsoap.org/ws/2005/02/rm";
xmlns:wsa="http://schemas.xmlsoap.org/ws/2004/08/addressing";>
+ <soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/";
xmlns:xsd="http://www.w3.org/2001/XMLSchema";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xmlns:wsrm="http://schemas.xmlsoap.org/ws/2005/02/rm";
xmlns:wsa="http://www.w3.org/2005/08/addressing";>
<soapenv:Header>
<wsa:MessageID
soapenv:mustUnderstand="1">uuid:8d8f8d80-1624-11da-a28e-b3b9c4e71445</wsa:MessageID>
<wsa:To
soapenv:mustUnderstand="1">http://127.0.0.1:9070/axis/services/RMService</wsa:To>
Modified: webservices/sandesha/trunk/test-resources/TerminateSequence.xml
URL:
http://svn.apache.org/viewcvs/webservices/sandesha/trunk/test-resources/TerminateSequence.xml?rev=383755&r1=383754&r2=383755&view=diff
==============================================================================
--- webservices/sandesha/trunk/test-resources/TerminateSequence.xml (original)
+++ webservices/sandesha/trunk/test-resources/TerminateSequence.xml Mon Mar 6
18:54:28 2006
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
- <soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/";
xmlns:xsd="http://www.w3.org/2001/XMLSchema";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xmlns:wsrm="http://schemas.xmlsoap.org/ws/2005/02/rm";
xmlns:wsa="http://schemas.xmlsoap.org/ws/2004/08/addressing";>
+ <soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/";
xmlns:xsd="http://www.w3.org/2001/XMLSchema";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xmlns:wsrm="http://schemas.xmlsoap.org/ws/2005/02/rm";
xmlns:wsa="http://www.w3.org/2005/08/addressing";>
<soapenv:Header>
<wsa:MessageID
soapenv:mustUnderstand="1">uuid:64f5c3c0-1625-11da-a28e-b3b9c4e71445</wsa:MessageID>
<wsa:To
soapenv:mustUnderstand="1">http://127.0.0.1:9070/axis/services/RMService</wsa:To>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
