ws-sandesha-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mckie...@apache.org
Subject svn commit: r603197 - in /webservices/sandesha/trunk/java/modules/core/src/main: java/org/apache/sandesha2/i18n/SandeshaMessageKeys.java java/org/apache/sandesha2/util/RMMsgCreator.java resources/org/apache/sandesha2/i18n/resource.properties
Date Tue, 11 Dec 2007 10:37:15 GMT
Author: mckierna
Date: Tue Dec 11 02:37:11 2007
New Revision: 603197

URL: http://svn.apache.org/viewvc?rev=603197&view=rev
Log:
Ensure terminateSequenceResponse msgs go to acksTo EPR

Modified:
    webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/i18n/SandeshaMessageKeys.java
    webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/util/RMMsgCreator.java
    webservices/sandesha/trunk/java/modules/core/src/main/resources/org/apache/sandesha2/i18n/resource.properties

Modified: webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/i18n/SandeshaMessageKeys.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/i18n/SandeshaMessageKeys.java?rev=603197&r1=603196&r2=603197&view=diff
==============================================================================
--- webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/i18n/SandeshaMessageKeys.java
(original)
+++ webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/i18n/SandeshaMessageKeys.java
Tue Dec 11 02:37:11 2007
@@ -36,6 +36,7 @@
 	public static final String contextManagerMustImplement="contextManagerMustImplement";
 	public static final String cannotFindModulePolicies="cannotFindModulePolicies";
 	public static final String cannotPauseThread = "cannotPauseThread";
+	public static final String internalError = "internalError";
 
 	public static final String commitError="commitError";
 	public static final String rollbackError="rollbackError";

Modified: webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/util/RMMsgCreator.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/util/RMMsgCreator.java?rev=603197&r1=603196&r2=603197&view=diff
==============================================================================
--- webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/util/RMMsgCreator.java
(original)
+++ webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/util/RMMsgCreator.java
Tue Dec 11 02:37:11 2007
@@ -414,6 +414,10 @@
 
 		MessageContext outMessage = MessageContextBuilder.createOutMessageContext (requestMsg.getMessageContext());
 		RMMsgContext responseRMMsg = new RMMsgContext(outMessage);
+		
+		if(rmSequenceBean.getAcksToEndpointReference()!=null){
+			responseRMMsg.setTo(rmSequenceBean.getAcksToEndpointReference());
+		}
 		SOAPFactory factory = SOAPAbstractFactory.getSOAPFactory(SandeshaUtil.getSOAPVersion(requestMsg.getSOAPEnvelope()));
 
 		String namespace = requestMsg.getRMNamespaceValue();
@@ -426,7 +430,7 @@
 			case Sandesha2Constants.MessageParts.CLOSE_SEQUENCE_RESPONSE: responseRMMsg.setCloseSequenceResponse((CloseSequenceResponse)
part);break;
 			case Sandesha2Constants.MessageParts.TERMINATE_SEQ_RESPONSE: responseRMMsg.setTerminateSequenceResponse((TerminateSequenceResponse)
part);break;
 			case Sandesha2Constants.MessageParts.CREATE_SEQ_RESPONSE: responseRMMsg.setCreateSequenceResponse((CreateSequenceResponse)
part);break;
-			default: throw new RuntimeException("Boom");
+			default: throw new RuntimeException(SandeshaMessageHelper.getMessage(SandeshaMessageKeys.internalError));
 		}
 
 		outMessage.setWSAAction(action);

Modified: webservices/sandesha/trunk/java/modules/core/src/main/resources/org/apache/sandesha2/i18n/resource.properties
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/modules/core/src/main/resources/org/apache/sandesha2/i18n/resource.properties?rev=603197&r1=603196&r2=603197&view=diff
==============================================================================
--- webservices/sandesha/trunk/java/modules/core/src/main/resources/org/apache/sandesha2/i18n/resource.properties
(original)
+++ webservices/sandesha/trunk/java/modules/core/src/main/resources/org/apache/sandesha2/i18n/resource.properties
Tue Dec 11 02:37:11 2007
@@ -34,6 +34,7 @@
 contextManagerMustImplement=ContextManager {0} must implement the org.apache.sandesha2.context.ContextManager
interface.
 cannotFindModulePolicies=No policies were found in the module.xml at the module initiation
time.
 cannotPauseThread=Cannot pause a non-running thread.
+internalError=An internal error was encountered due to an unexpcted condition.
 
 commitError=Exception thrown when trying to commit the transaction: {0}.
 rollbackError=Exception thrown when trying to rollback the transaction: {0}.
@@ -125,7 +126,7 @@
 ackInvalidNotSent=The SequenceAcknowledgement received is invalid as the acknowledgement
contains messages that have not been sent.
 cannotHaveFinalWithNack=The ''Final'' element cannot be present when there are Nack elements
under the SequenceAcknowledgement.
 accptButNoSequenceOffered=Error: An ''accept'' was received but there was no offered sequence
entry.
-relatesToNotAvailable: Invalid create sequence message: ''RelatesTo'' part is not available.
+relatesToNotAvailable=Invalid create sequence message: ''RelatesTo'' part is not available.
 cannotDerriveAckInterval=Cannot derive the ''Acknowledgement Interval'' from the passed string
{0}.
 cannotDerriveRetransInterval=Cannot derive the ''Retransmission Interval'' from the passed
string {0}.
 cannotDerriveInactivityTimeout=Cannot derive the ''Inactivity Timeout'' from the passed string
{0}.
@@ -249,4 +250,4 @@
 invalidAckFault=The SequenceAcknowledgement violates the cumulative Acknowledgement invariant.
 cannotAcceptMsgAsSequenceClosedFault=The Sequence is closed and can not accept new messages.

 unsuportedSelectionFault=The extension element used in the message is not supported by the
MakeConnection receiver.
-missingSelectionFault=The MakeConnection element did not contain any selection criteria.
\ No newline at end of file
+missingSelectionFault=The MakeConnection element did not contain any selection criteria.



---------------------------------------------------------------------
To unsubscribe, e-mail: sandesha-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: sandesha-dev-help@ws.apache.org


Mime
View raw message