Author: chamikara
Date: Thu Nov 3 00:37:57 2005
New Revision: 330511
URL: http://svn.apache.org/viewcvs?rev=330511&view=rev
Log:
Moved SOAPActions to the Constants file.
Modified:
webservices/sandesha/trunk/src/org/apache/sandesha2/Constants.java
webservices/sandesha/trunk/src/org/apache/sandesha2/msgprocessors/AcknowledgementProcessor.java
webservices/sandesha/trunk/src/org/apache/sandesha2/util/RMMsgCreator.java
Modified: webservices/sandesha/trunk/src/org/apache/sandesha2/Constants.java
URL:
http://svn.apache.org/viewcvs/webservices/sandesha/trunk/src/org/apache/sandesha2/Constants.java?rev=330511&r1=330510&r2=330511&view=diff
==============================================================================
--- webservices/sandesha/trunk/src/org/apache/sandesha2/Constants.java
(original)
+++ webservices/sandesha/trunk/src/org/apache/sandesha2/Constants.java Thu Nov
3 00:37:57 2005
@@ -32,12 +32,18 @@
String NS_URI_RM = "http://schemas.xmlsoap.org/ws/2005/02/rm";;
- String ACTION_SEQ_ACK =
"http://schemas.xmlsoap.org/ws/2005/02/rm/SequenceAcknowledgement";;
-
- String ACTION_CREATE_SEQ =
"http://schemas.xmlsoap.org/ws/2005/02/rm/CreateSequence";;
-
- String NS_URI_CREATE_SEQ_RESPONSE =
"http://schemas.xmlsoap.org/ws/2005/02/rm/CreateSequenceResponse";;
-
+// String ACTION_SEQ_ACK =
"http://schemas.xmlsoap.org/ws/2005/02/rm/SequenceAcknowledgement";;
+//
+// String SOAP_ACTION_SEQ_ACK =
"http://schemas.xmlsoap.org/ws/2005/02/rm/SequenceAcknowledgement";;
+//
+// String ACTION_CREATE_SEQ =
"http://schemas.xmlsoap.org/ws/2005/02/rm/CreateSequence";;
+//
+// String SOAP_ACTION_CREATE_SEQ =
"http://schemas.xmlsoap.org/ws/2005/02/rm/CreateSequence";;
+//
+// String ACTION_CREATE_SEQ_RESPONSE =
"http://schemas.xmlsoap.org/ws/2005/02/rm/CreateSequenceResponse";;
+//
+// String SOAP_ACTION_CREATE_SEQ_RESPONSE =
"http://schemas.xmlsoap.org/ws/2005/02/rm/CreateSequenceResponse";;
+
String MSG_NUMBER = "MessageNumber";
String LAST_MSG = "LastMessage";
@@ -78,13 +84,22 @@
public interface Actions {
- String CREATE_SEQUENCE =
"http://schemas.xmlsoap.org/ws/2005/02/rm/CreateSequence";;
+ String ACTION_CREATE_SEQUENCE =
"http://schemas.xmlsoap.org/ws/2005/02/rm/CreateSequence";;
+
+ String ACTION_CREATE_SEQUENCE_RESPONSE =
"http://schemas.xmlsoap.org/ws/2005/02/rm/CreateSequenceResponse";;
+
+ String ACTION_SEQUENCE_ACKNOWLEDGEMENT =
"http://schemas.xmlsoap.org/ws/2005/02/rm/SequenceAcknowledgement";;
+
+ String ACTION_TERMINATE_SEQUENCE =
"http://schemas.xmlsoap.org/ws/2005/02/rm/TerminateSequence";;
+
+ String SOAP_ACTION_CREATE_SEQUENCE =
"http://schemas.xmlsoap.org/ws/2005/02/rm/CreateSequence";;
+
+ String SOAP_ACTION_CREATE_SEQUENCE_RESPONSE =
"http://schemas.xmlsoap.org/ws/2005/02/rm/CreateSequenceResponse";;
- String CREATE_SEQUENCE_RESPONSE =
"http://schemas.xmlsoap.org/ws/2005/02/rm/CreateSequenceResponse";;
+ String SOAP_ACTION_SEQUENCE_ACKNOWLEDGEMENT =
"http://schemas.xmlsoap.org/ws/2005/02/rm/SequenceAcknowledgement";;
- String SEQUENCE_ACKNOWLEDGEMENT =
"http://schemas.xmlsoap.org/ws/2005/02/rm/SequenceAcknowledgement";;
+ String SOAP_ACTION_TERMINATE_SEQUENCE =
"http://schemas.xmlsoap.org/ws/2005/02/rm/TerminateSequence";;
- String TERMINATE_SEQUENCE =
"http://schemas.xmlsoap.org/ws/2005/02/rm/TerminateSequence";;
}
}
Modified:
webservices/sandesha/trunk/src/org/apache/sandesha2/msgprocessors/AcknowledgementProcessor.java
URL:
http://svn.apache.org/viewcvs/webservices/sandesha/trunk/src/org/apache/sandesha2/msgprocessors/AcknowledgementProcessor.java?rev=330511&r1=330510&r2=330511&view=diff
==============================================================================
---
webservices/sandesha/trunk/src/org/apache/sandesha2/msgprocessors/AcknowledgementProcessor.java
(original)
+++
webservices/sandesha/trunk/src/org/apache/sandesha2/msgprocessors/AcknowledgementProcessor.java
Thu Nov 3 00:37:57 2005
@@ -193,9 +193,8 @@
//terminateRMMessage.setFrom(new EndpointReference
// (replyToEPR.getAddress()));
terminateRMMessage
-
.setWSAAction(Constants.WSRM.Actions.TERMINATE_SEQUENCE);
- terminateRMMessage.setSOAPAction("\""
- + Constants.WSRM.Actions.TERMINATE_SEQUENCE +
"\"");
+
.setWSAAction(Constants.WSRM.Actions.ACTION_TERMINATE_SEQUENCE);
+
terminateRMMessage.setSOAPAction(Constants.WSRM.Actions.SOAP_ACTION_TERMINATE_SEQUENCE);
try {
terminateRMMessage.addSOAPEnvelope();
Modified:
webservices/sandesha/trunk/src/org/apache/sandesha2/util/RMMsgCreator.java
URL:
http://svn.apache.org/viewcvs/webservices/sandesha/trunk/src/org/apache/sandesha2/util/RMMsgCreator.java?rev=330511&r1=330510&r2=330511&view=diff
==============================================================================
--- webservices/sandesha/trunk/src/org/apache/sandesha2/util/RMMsgCreator.java
(original)
+++ webservices/sandesha/trunk/src/org/apache/sandesha2/util/RMMsgCreator.java
Thu Nov 3 00:37:57 2005
@@ -197,9 +197,8 @@
throw new SandeshaException(e1.getMessage());
}
- createSeqRMMsg.setAction(Constants.WSRM.ACTION_CREATE_SEQ);
- createSeqRMMsg.setSOAPAction("\"" +
Constants.WSRM.ACTION_CREATE_SEQ
- + "\"");
+
createSeqRMMsg.setAction(Constants.WSRM.Actions.ACTION_CREATE_SEQUENCE);
+
createSeqRMMsg.setSOAPAction(Constants.WSRM.Actions.SOAP_ACTION_CREATE_SEQUENCE);
createSeqRMMsg.setMessageId(createSeqMsgId);
MessageContext createSeqMsg =
createSeqRMMsg.getMessageContext();
@@ -328,8 +327,8 @@
SOAPEnvelope envelope = SOAPAbstractFactory.getSOAPFactory(
Constants.SOAPVersion.DEFAULT).getDefaultEnvelope();
response.toOMElement(envelope.getBody());
-
outMessage.setWSAAction(Constants.WSRM.NS_URI_CREATE_SEQ_RESPONSE);
-
outMessage.setSoapAction(Constants.WSRM.NS_URI_CREATE_SEQ_RESPONSE);
+
outMessage.setWSAAction(Constants.WSRM.Actions.ACTION_CREATE_SEQUENCE_RESPONSE);
+
outMessage.setSoapAction(Constants.WSRM.Actions.SOAP_ACTION_CREATE_SEQUENCE_RESPONSE);
String newMessageId = SandeshaUtil.getUUID();
outMessage.setMessageID(newMessageId);
@@ -382,8 +381,8 @@
sequenceAck.addAcknowledgementRanges(ackRangeArr[i]);
sequenceAck.toOMElement(envelope.getHeader());
- applicationMsg.setAction(Constants.WSRM.ACTION_SEQ_ACK);
- applicationMsg.setSOAPAction(Constants.WSRM.ACTION_SEQ_ACK);
+
applicationMsg.setAction(Constants.WSRM.Actions.ACTION_SEQUENCE_ACKNOWLEDGEMENT);
+
applicationMsg.setSOAPAction(Constants.WSRM.Actions.SOAP_ACTION_SEQUENCE_ACKNOWLEDGEMENT);
applicationMsg.setMessageId(SandeshaUtil.getUUID());
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
