You are viewing a plain text version of this content. The canonical link for it is here.
Posted to fx-dev@ws.apache.org by ja...@apache.org on 2005/07/02 07:00:00 UTC
cvs commit: ws-sandesha/test/org/apache/sandesha/intergratedtest TCScenarioTest.java
jaliya 2005/07/01 22:00:00
Modified: samples/org/apache/sandesha/samples AsyncPingClient.java
EchoClientSyncAck.java
src/org/apache/sandesha Constants.java EnvelopeCreator.java
IStorageManager.java RMReport.java
src/org/apache/sandesha/client ClientPropertyValidator.java
ClientStorageManager.java RMSender.java
RMService.java
src/org/apache/sandesha/server MessageValidator.java
RMInvokerWorker.java
RMMessageProcessorIdentifier.java SenderWorker.java
src/org/apache/sandesha/server/msgprocessors
AcknowledgementProcessor.java
CompositeProcessor.java
CreateSequenceProcessor.java FaultProcessor.java
src/org/apache/sandesha/storage Callback.java
CallbackData.java
src/org/apache/sandesha/storage/dao ISandeshaDAO.java
src/org/apache/sandesha/storage/queue SandeshaQueue.java
src/org/apache/sandesha/util PolicyLoader.java
PropertyLoader.java
src/org/apache/sandesha/ws/rm Accept.java AckRequested.java
AcknowledgementRange.java AcksTo.java
CreateSequence.java CreateSequenceResponse.java
Identifier.java MessageNumber.java Nack.java
Sequence.java SequenceAcknowledgement.java
SequenceFault.java SequenceOffer.java
TerminateSequence.java
src/org/apache/sandesha/ws/rm/providers RMProvider.java
test/org/apache/sandesha/intergratedtest TCScenarioTest.java
Log:
Change the RM header elements to reflect the order as per the specification. Order of the headers are not specified precilsely in the specification, however to support pull based parses I changed this
Revision Changes Path
1.4 +3 -2 ws-sandesha/samples/org/apache/sandesha/samples/AsyncPingClient.java
Index: AsyncPingClient.java
===================================================================
RCS file: /home/cvs/ws-sandesha/samples/org/apache/sandesha/samples/AsyncPingClient.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- AsyncPingClient.java 30 Jun 2005 11:47:21 -0000 1.3
+++ AsyncPingClient.java 2 Jul 2005 04:59:53 -0000 1.4
@@ -47,6 +47,7 @@
SandeshaContext ctx = new SandeshaContext();
ctx.setAcksToURL("http://127.0.0.1:" + defaultClientPort + "/axis/services/RMService");
+ ctx.setReplyToURL("http://127.0.0.1:" + defaultClientPort + "/axis/services/RMService");
ctx.initCall(call, targetURL, "urn:wsrm:ping", Constants.ClientProperties.IN_ONLY);
call.setOperationName(new QName("http://tempuri.org", "Ping"));
@@ -57,11 +58,11 @@
ctx.setLastMessage(call);
call.invoke(new Object[]{"Ping Message Number Three"});
- ctx.endSequence();
+ RMReport report = ctx.endSequence();
System.out.println("\n***********Printing RM Report***********");
- // System.out.println("Were all messages acked - " + report.isAllAcked());
+ System.out.println("Were all messages acked - " + report.isAllAcked());
System.out.println("****************************************\n");
1.3 +2 -0 ws-sandesha/samples/org/apache/sandesha/samples/EchoClientSyncAck.java
Index: EchoClientSyncAck.java
===================================================================
RCS file: /home/cvs/ws-sandesha/samples/org/apache/sandesha/samples/EchoClientSyncAck.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- EchoClientSyncAck.java 22 Jun 2005 13:38:11 -0000 1.2
+++ EchoClientSyncAck.java 2 Jul 2005 04:59:53 -0000 1.3
@@ -39,6 +39,8 @@
private static String targetURL = "http://127.0.0.1:" + defaultServerPort +
"/axis/services/RMSampleService";
+
+
public static void main(String[] args) {
System.out.println("EchoClientSyncAck Started ........");
1.57 +3 -3 ws-sandesha/src/org/apache/sandesha/Constants.java
Index: Constants.java
===================================================================
RCS file: /home/cvs/ws-sandesha/src/org/apache/sandesha/Constants.java,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- Constants.java 22 Jun 2005 13:38:11 -0000 1.56
+++ Constants.java 2 Jul 2005 04:59:53 -0000 1.57
@@ -68,7 +68,7 @@
byte SERVER = (byte) 1;
byte CLIENT = (byte) 0;
- int SYNCHRONIZED=0;
+ int SYNCHRONIZED = 0;
public interface WSA {
String NS_ADDRESSING_ANONYMOUS = AddressingUtils.getAnonymousRoleURI();
@@ -148,8 +148,8 @@
String SEQ_IS_NOT_CREATED = "ERROR: Sequence was not created correcly in the in queue";
- String CANNOT_LOAD_PROPERTIES="Cannot Load Properties. Check Whether sandesha.properties file is " +
- "in your classpath. ";
+ String CANNOT_LOAD_PROPERTIES = "Cannot Load Properties. Check Whether sandesha.properties file is " +
+ "in your classpath. ";
}
public interface InfomationMessage {
1.46 +48 -51 ws-sandesha/src/org/apache/sandesha/EnvelopeCreator.java
Index: EnvelopeCreator.java
===================================================================
RCS file: /home/cvs/ws-sandesha/src/org/apache/sandesha/EnvelopeCreator.java,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- EnvelopeCreator.java 10 Jun 2005 11:46:37 -0000 1.45
+++ EnvelopeCreator.java 2 Jul 2005 04:59:53 -0000 1.46
@@ -68,8 +68,8 @@
//RelatesTo
MessageID incommingMessageId = addressingHeaders.getMessageID();
- outGoingAddressingHaders.addRelatesTo(incommingMessageId.toString(), new QName(
- org.apache.axis.message.addressing.Constants.NS_PREFIX_ADDRESSING,
+ outGoingAddressingHaders.addRelatesTo(incommingMessageId.toString(),
+ new QName(org.apache.axis.message.addressing.Constants.NS_PREFIX_ADDRESSING,
org.apache.axis.message.addressing.Constants.NS_URI_ADDRESSING_DEFAULT));
//SettingTo
@@ -125,8 +125,7 @@
public static void addNamespaceDeclarations(SOAPEnvelope soapEnv) throws Exception {
soapEnv.addNamespaceDeclaration(Constants.WSRM.NS_PREFIX_RM, Constants.WSRM.NS_URI_RM);
- soapEnv.addNamespaceDeclaration(
- org.apache.axis.message.addressing.Constants.NS_PREFIX_ADDRESSING,
+ soapEnv.addNamespaceDeclaration(org.apache.axis.message.addressing.Constants.NS_PREFIX_ADDRESSING,
org.apache.axis.message.addressing.Constants.NS_URI_ADDRESSING_DEFAULT);
soapEnv.addNamespaceDeclaration(Constants.WSRM.NS_PREFIX_RM, Constants.WSRM.NS_URI_RM);
}
@@ -185,29 +184,6 @@
AddressingHeaders outGoingAddressingHaders = new AddressingHeaders(responseEnvelope);
- Identifier seqId = new Identifier();
- seqId.setIdentifier(rmMessageContext.getSequenceID());
- Sequence seq = new Sequence();
- seq.setIdentifier(seqId);
-
- MessageNumber msgNumber = new MessageNumber();
- msgNumber.setMessageNumber(rmMessageContext.getMsgNumber());
-
- seq.setMessageNumber(msgNumber);
- if (rmMessageContext.isLastMessage()) {
- seq.setLastMessage(new LastMessage());
- }
-
-
- seq.toSoapEnvelop(responseEnvelope);
-
- if (rmMessageContext.getReTransmissionCount() > 0) {
- AckRequested ackReq = new AckRequested();
- ackReq.setIdentifier(seqId);
- ackReq.toSoapEnvelop(responseEnvelope);
- }
-
-
if (rmMessageContext.getOldSequenceID() != null)
outGoingAddressingHaders.addRelatesTo(rmMessageContext.getMessageID(), null);
@@ -236,42 +212,41 @@
outGoingAddressingHaders.toEnvelope(responseEnvelope, null);
- return responseEnvelope;
- }
+ Identifier seqId = new Identifier();
+ seqId.setIdentifier(rmMessageContext.getSequenceID());
+ Sequence seq = new Sequence();
+ seq.setIdentifier(seqId);
+ MessageNumber msgNumber = new MessageNumber();
+ msgNumber.setMessageNumber(rmMessageContext.getMsgNumber());
- public static SOAPEnvelope createServiceRequestEnvelope(RMMessageContext rmMessageContext)
- throws Exception {
- SOAPEnvelope requestEnvelope;
- AddressingHeaders addressingHeaders = rmMessageContext.getAddressingHeaders();
- RMHeaders rmHeaders = new RMHeaders();
+ seq.setMessageNumber(msgNumber);
+ if (rmMessageContext.isLastMessage()) {
+ seq.setLastMessage(new LastMessage());
+ }
- Sequence seq = new Sequence();
- Identifier id = new Identifier();
- id.setIdentifier(rmMessageContext.getSequenceID());
- seq.setIdentifier(id);
+ seq.toSoapEnvelop(responseEnvelope);
if (rmMessageContext.getReTransmissionCount() > 0) {
AckRequested ackReq = new AckRequested();
- ackReq.setIdentifier(id);
- rmHeaders.setAckRequest(ackReq);
+ ackReq.setIdentifier(seqId);
+ ackReq.toSoapEnvelop(responseEnvelope);
}
- if (rmMessageContext.isLastMessage()) {
- seq.setLastMessage(new LastMessage());
- }
+ return responseEnvelope;
+ }
- MessageNumber msgNumber = new MessageNumber();
- msgNumber.setMessageNumber(rmMessageContext.getMsgNumber());
- seq.setMessageNumber(msgNumber);
- rmHeaders.setSequence(seq);
- rmMessageContext.setRMHeaders(rmHeaders);
+ public static SOAPEnvelope createServiceRequestEnvelope(RMMessageContext rmMessageContext)
+ throws Exception {
+ SOAPEnvelope requestEnvelope;
String str = rmMessageContext.getMsgContext().getRequestMessage().getSOAPPartAsString();
requestEnvelope = new Message(str).getSOAPEnvelope();
- rmMessageContext.getRMHeaders().toSoapEnvelop(requestEnvelope);
+ AddressingHeaders addressingHeaders = rmMessageContext.getAddressingHeaders();
+ RMHeaders rmHeaders = new RMHeaders();
+
AddressingHeaders outGoingAddressingHaders = new AddressingHeaders(requestEnvelope);
MessageID messageId = new MessageID(new URI(rmMessageContext.getMessageID()));
@@ -293,11 +268,33 @@
}
if (rmMessageContext.getFaultTo() != null)
- outGoingAddressingHaders.setFaultTo(
- new FaultTo(new Address(rmMessageContext.getFaultTo())));
+ outGoingAddressingHaders.setFaultTo(new FaultTo(new Address(rmMessageContext.getFaultTo())));
outGoingAddressingHaders.toEnvelope(requestEnvelope, null);
+ Sequence seq = new Sequence();
+ Identifier id = new Identifier();
+ id.setIdentifier(rmMessageContext.getSequenceID());
+ seq.setIdentifier(id);
+
+ if (rmMessageContext.getReTransmissionCount() > 0) {
+ AckRequested ackReq = new AckRequested();
+ ackReq.setIdentifier(id);
+ rmHeaders.setAckRequest(ackReq);
+ }
+
+ if (rmMessageContext.isLastMessage()) {
+ seq.setLastMessage(new LastMessage());
+ }
+
+ MessageNumber msgNumber = new MessageNumber();
+ msgNumber.setMessageNumber(rmMessageContext.getMsgNumber());
+ seq.setMessageNumber(msgNumber);
+
+ rmHeaders.setSequence(seq);
+ rmMessageContext.setRMHeaders(rmHeaders);
+
+ rmMessageContext.getRMHeaders().toSoapEnvelop(requestEnvelope);
return requestEnvelope;
}
1.28 +1 -1 ws-sandesha/src/org/apache/sandesha/IStorageManager.java
Index: IStorageManager.java
===================================================================
RCS file: /home/cvs/ws-sandesha/src/org/apache/sandesha/IStorageManager.java,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- IStorageManager.java 8 Jun 2005 08:58:31 -0000 1.27
+++ IStorageManager.java 2 Jul 2005 04:59:53 -0000 1.28
@@ -110,6 +110,6 @@
void clearStorage();
boolean isSequenceComplete(String seqId);
-
+
void sendAck(String sequenceId);
}
\ No newline at end of file
1.8 +12 -11 ws-sandesha/src/org/apache/sandesha/RMReport.java
Index: RMReport.java
===================================================================
RCS file: /home/cvs/ws-sandesha/src/org/apache/sandesha/RMReport.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- RMReport.java 22 Jun 2005 13:38:11 -0000 1.7
+++ RMReport.java 2 Jul 2005 04:59:53 -0000 1.8
@@ -18,13 +18,14 @@
/**
* RMReport is generated at the end of the termination of each sequence.
+ *
* @auther Chamikara Jayalath
* @auther Jaliya Ekanyake
*/
public class RMReport {
-
- private boolean allAcked;
- private int returns;
+
+ private boolean allAcked;
+ private int returns;
private String error;
public String getError() {
@@ -50,17 +51,17 @@
public int getNumberOfReturnMessages() {
return this.returns;
}
-
- public void setAllAcked(boolean acked){
- this.allAcked = acked;
+
+ public void setAllAcked(boolean acked) {
+ this.allAcked = acked;
}
-
- public void setNoOfReturmMessages(int n){
- this.returns = n;
+
+ public void setNoOfReturmMessages(int n) {
+ this.returns = n;
}
- public void incrementReturnedMsgCount(){
- this.returns++;
+ public void incrementReturnedMsgCount() {
+ this.returns++;
}
}
1.31 +8 -8 ws-sandesha/src/org/apache/sandesha/client/ClientPropertyValidator.java
Index: ClientPropertyValidator.java
===================================================================
RCS file: /home/cvs/ws-sandesha/src/org/apache/sandesha/client/ClientPropertyValidator.java,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- ClientPropertyValidator.java 22 Jun 2005 13:38:11 -0000 1.30
+++ ClientPropertyValidator.java 2 Jul 2005 04:59:54 -0000 1.31
@@ -48,7 +48,7 @@
String faultTo = getFaultTo(call);
boolean sendOffer = getOffer(call);
String key = getKey(call);
- SandeshaContext ctx=getCtx(call);
+ SandeshaContext ctx = getCtx(call);
try {
sourceURL = getSourceURL(call);
@@ -81,8 +81,8 @@
}
- private static SandeshaContext getCtx(Call call){
- return (SandeshaContext) call.getProperty("context");
+ private static SandeshaContext getCtx(Call call) {
+ return (SandeshaContext) call.getProperty("context");
}
private static String getKey(Call call) {
@@ -173,13 +173,13 @@
* @return
*/
private static long getMessageNumber(Call call) {
- Object temp = call.getProperty(Constants.ClientProperties.MSG_NUMBER);
- SandeshaContext ctx=(SandeshaContext)call.getProperty("context");
- long msgNo=ctx.getMessageNumber();
+ Object temp = call.getProperty(Constants.ClientProperties.MSG_NUMBER);
+ SandeshaContext ctx = (SandeshaContext) call.getProperty("context");
+ long msgNo = ctx.getMessageNumber();
if (temp == null) {
- ctx.setMessageNumber(++msgNo);
+ ctx.setMessageNumber(++msgNo);
} else {
- msgNo = ((Long) call.getProperty(Constants.ClientProperties.MSG_NUMBER)).longValue();
+ msgNo = ((Long) call.getProperty(Constants.ClientProperties.MSG_NUMBER)).longValue();
}
1.45 +4 -4 ws-sandesha/src/org/apache/sandesha/client/ClientStorageManager.java
Index: ClientStorageManager.java
===================================================================
RCS file: /home/cvs/ws-sandesha/src/org/apache/sandesha/client/ClientStorageManager.java,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- ClientStorageManager.java 22 Jun 2005 13:38:11 -0000 1.44
+++ ClientStorageManager.java 2 Jul 2005 04:59:54 -0000 1.45
@@ -48,7 +48,7 @@
Constants.CLIENT);
}
- public boolean isSequenceExist(String sequenceID) {
+ public boolean isSequenceExist(String sequenceID) {
return accessor.isOutgoingSequenceExists(sequenceID);
}
@@ -226,9 +226,9 @@
* @see org.apache.sandesha.IStorageManager#insertOutgoingMessage
* (org.apache.sandesha.RMMessageContext)
*/
- public void insertOutgoingMessage(RMMessageContext msg) {
- String sequenceId = msg.getSequenceID();
- accessor.addMessageToOutgoingSequence(sequenceId, msg);
+ public void insertOutgoingMessage(RMMessageContext msg) {
+ String sequenceId = msg.getSequenceID();
+ accessor.addMessageToOutgoingSequence(sequenceId, msg);
}
/*
1.48 +11 -11 ws-sandesha/src/org/apache/sandesha/client/RMSender.java
Index: RMSender.java
===================================================================
RCS file: /home/cvs/ws-sandesha/src/org/apache/sandesha/client/RMSender.java,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- RMSender.java 22 Jun 2005 13:38:11 -0000 1.47
+++ RMSender.java 2 Jul 2005 04:59:54 -0000 1.48
@@ -83,13 +83,13 @@
long inactivityTimeOut = PolicyLoader.getInstance().getInactivityTimeout();
while (responseMessageContext == null) {
- synchronized(lock){
- responseMessageContext =
- checkTheQueueForResponse(tempSeqID, reqMsgCtx.getMessageID());
- if ((System.currentTimeMillis() - startingTime) >= inactivityTimeOut) {
- reqMsgCtx.getCtx().stopClientByForce();
- }
- Thread.sleep(Constants.CLIENT_RESPONSE_CHECKING_INTERVAL);
+ synchronized (lock) {
+ responseMessageContext =
+ checkTheQueueForResponse(tempSeqID, reqMsgCtx.getMessageID());
+ if ((System.currentTimeMillis() - startingTime) >= inactivityTimeOut) {
+ reqMsgCtx.getCtx().stopClientByForce();
+ }
+ Thread.sleep(Constants.CLIENT_RESPONSE_CHECKING_INTERVAL);
}
}
@@ -135,10 +135,10 @@
*/
private RMMessageContext processFirstRequestMessage(RMMessageContext reqRMMsgContext,
boolean sync) throws Exception {
- synchronized (lock) {
+ synchronized (lock) {
if (!storageManager.isSequenceExist(reqRMMsgContext.getSequenceID())) {
- String msgID = Constants.UUID + uuidGen.nextUUID();
+ String msgID = Constants.UUID + uuidGen.nextUUID();
String offerID = null;
if (reqRMMsgContext.isHasResponse() && reqRMMsgContext.isSendOffer()) {
offerID = Constants.UUID + uuidGen.nextUUID();
@@ -167,12 +167,12 @@
private RMMessageContext processRequestMessage(RMMessageContext reqRMMsgContext)
throws Exception {
- if (reqRMMsgContext.isLastMessage()) {
+ if (reqRMMsgContext.isLastMessage()) {
storageManager.insertTerminateSeqMessage(RMMessageCreator.createTerminateSeqMsg(reqRMMsgContext, Constants.CLIENT));
}
RMMessageContext serviceRequestMsg = RMMessageCreator.createServiceRequestMessage(reqRMMsgContext);
storageManager.insertOutgoingMessage(serviceRequestMsg);
- return reqRMMsgContext;
+ return reqRMMsgContext;
}
private RMMessageContext checkTheQueueForResponse(String sequenceId, String reqMessageID) {
1.6 +1 -0 ws-sandesha/src/org/apache/sandesha/client/RMService.java
Index: RMService.java
===================================================================
RCS file: /home/cvs/ws-sandesha/src/org/apache/sandesha/client/RMService.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- RMService.java 9 May 2005 03:45:26 -0000 1.5
+++ RMService.java 2 Jul 2005 04:59:54 -0000 1.6
@@ -16,6 +16,7 @@
*/
package org.apache.sandesha.client;
+
/**
* This class is used as a web service in the client side.
* This is the <b>addressible endpoint<b> for Sandesha client side. All the "reply"
1.21 +4 -8 ws-sandesha/src/org/apache/sandesha/server/MessageValidator.java
Index: MessageValidator.java
===================================================================
RCS file: /home/cvs/ws-sandesha/src/org/apache/sandesha/server/MessageValidator.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- MessageValidator.java 8 Jun 2005 08:58:32 -0000 1.20
+++ MessageValidator.java 2 Jul 2005 04:59:54 -0000 1.21
@@ -50,13 +50,11 @@
MessageContext msgContext = rmMsgContext.getMsgContext();
try {
AddressingHeaders aHeaders = (AddressingHeaders) rmMsgContext.getMsgContext()
- .getProperty(
- org.apache.axis.message.addressing.Constants.ENV_ADDRESSING_REQUEST_HEADERS);
+ .getProperty(org.apache.axis.message.addressing.Constants.ENV_ADDRESSING_REQUEST_HEADERS);
if (aHeaders == null)
throw new AxisFault(new QName(Constants.FaultCodes.IN_CORRECT_MESSAGE),
Constants.FaultMessages.NO_ADDRESSING_HEADERS, null, null);
- AddressingHeaders addrHeaders = new AddressingHeaders(
- msgContext.getRequestMessage().getSOAPEnvelope());
+ AddressingHeaders addrHeaders = new AddressingHeaders(msgContext.getRequestMessage().getSOAPEnvelope());
validateAddrHeaders(addrHeaders);
rmMsgContext.setAddressingHeaders(addrHeaders);
@@ -109,12 +107,10 @@
}
if (sequence.getMessageNumber() != null) {
long msgNo = sequence.getMessageNumber().getMessageNumber();
- if (storageMgr.hasLastIncomingMsgReceived(
- sequence.getIdentifier().getIdentifier())) {
+ if (storageMgr.hasLastIncomingMsgReceived(sequence.getIdentifier().getIdentifier())) {
long lastMsg = storageMgr.getLastIncomingMsgNo(seqId);
if (msgNo > lastMsg)
- throw new AxisFault(
- new QName(Constants.FaultCodes.WSRM_FAULR_LAST_MSG_NO_EXCEEDED),
+ throw new AxisFault(new QName(Constants.FaultCodes.WSRM_FAULR_LAST_MSG_NO_EXCEEDED),
Constants.FaultMessages.LAST_MSG_NO_EXCEEDED, null, null);
}
}
1.4 +6 -12 ws-sandesha/src/org/apache/sandesha/server/RMInvokerWorker.java
Index: RMInvokerWorker.java
===================================================================
RCS file: /home/cvs/ws-sandesha/src/org/apache/sandesha/server/RMInvokerWorker.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- RMInvokerWorker.java 8 Jun 2005 08:58:32 -0000 1.3
+++ RMInvokerWorker.java 2 Jul 2005 04:59:54 -0000 1.4
@@ -69,19 +69,16 @@
String oldAction = rmMessageContext.getAddressingHeaders().getAction()
.toString();
- rmMessageContext.getAddressingHeaders().setAction(
- oldAction + Constants.RESPONSE);
+ rmMessageContext.getAddressingHeaders().setAction(oldAction + Constants.RESPONSE);
if (rmMessageContext.isLastMessage()) {
//Insert Terminate Sequnce.
if (addrHeaders.getReplyTo() != null) {
String replyTo = addrHeaders.getReplyTo().getAddress().toString();
- RMMessageContext terminateMsg = RMMessageCreator.createTerminateSeqMsg(
- rmMessageContext, Constants.SERVER);
+ RMMessageContext terminateMsg = RMMessageCreator.createTerminateSeqMsg(rmMessageContext, Constants.SERVER);
terminateMsg.setOutGoingAddress(replyTo);
getStorageManager().insertTerminateSeqMessage(terminateMsg);
} else {
- RMInvokerWorker.log.error(
- Constants.ErrorMessages.CANNOT_SEND_THE_TERMINATE_SEQ);
+ RMInvokerWorker.log.error(Constants.ErrorMessages.CANNOT_SEND_THE_TERMINATE_SEQ);
}
}
//Store the message in the response queue. If there is an application
@@ -90,24 +87,21 @@
// RMSender.
rmMessageContext.setMessageType(Constants.MSG_TYPE_SERVICE_RESPONSE);
- boolean hasResponseSeq = getStorageManager().isResponseSequenceExist(
- rmMessageContext.getSequenceID());
+ boolean hasResponseSeq = getStorageManager().isResponseSequenceExist(rmMessageContext.getSequenceID());
boolean firstMsgOfResponseSeq = false;
if (!(hasResponseSeq && rmMessageContext.getRMHeaders().getSequence()
.getMessageNumber().getMessageNumber() == 1)) {
firstMsgOfResponseSeq = !hasResponseSeq;
}
- rmMessageContext.setMsgNumber(getStorageManager().getNextMessageNumber(
- rmMessageContext.getSequenceID()));
+ rmMessageContext.setMsgNumber(getStorageManager().getNextMessageNumber(rmMessageContext.getSequenceID()));
getStorageManager().insertOutgoingMessage(rmMessageContext);
if (firstMsgOfResponseSeq) {
String msgIdStr = Constants.UUID + RMInvokerWorker.uuidGen.nextUUID();
- RMMessageContext csRMMsgCtx = RMMessageCreator.createCreateSeqMsg(
- rmMessageContext, Constants.SERVER, msgIdStr, null);
+ RMMessageContext csRMMsgCtx = RMMessageCreator.createCreateSeqMsg(rmMessageContext, Constants.SERVER, msgIdStr, null);
csRMMsgCtx.setOutGoingAddress(rmMessageContext.getAddressingHeaders()
.getReplyTo().getAddress().toString());
1.17 +2 -4 ws-sandesha/src/org/apache/sandesha/server/RMMessageProcessorIdentifier.java
Index: RMMessageProcessorIdentifier.java
===================================================================
RCS file: /home/cvs/ws-sandesha/src/org/apache/sandesha/server/RMMessageProcessorIdentifier.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- RMMessageProcessorIdentifier.java 8 Jun 2005 08:58:32 -0000 1.16
+++ RMMessageProcessorIdentifier.java 2 Jul 2005 04:59:54 -0000 1.17
@@ -45,11 +45,9 @@
if (addrHeaders.getAction() != null) {
if (addrHeaders.getAction().toString().equals(Constants.WSRM.ACTION_CREATE_SEQUENCE)) {
return new CreateSequenceProcessor(storageManager);
- } else if (addrHeaders.getAction().toString().equals(
- Constants.WSRM.ACTION_CREATE_SEQUENCE_RESPONSE)) {
+ } else if (addrHeaders.getAction().toString().equals(Constants.WSRM.ACTION_CREATE_SEQUENCE_RESPONSE)) {
return new CreateSequenceResponseProcessor(storageManager);
- } else if (addrHeaders.getAction().toString().equals(
- Constants.WSRM.ACTION_TERMINATE_SEQUENCE)) {
+ } else if (addrHeaders.getAction().toString().equals(Constants.WSRM.ACTION_TERMINATE_SEQUENCE)) {
return new TerminateSequenceProcessor(storageManager);
} else if (rmHeaders.getSequenceAcknowledgement() != null ||
rmHeaders.getSequence().getMessageNumber() != null) {
1.6 +8 -16 ws-sandesha/src/org/apache/sandesha/server/SenderWorker.java
Index: SenderWorker.java
===================================================================
RCS file: /home/cvs/ws-sandesha/src/org/apache/sandesha/server/SenderWorker.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- SenderWorker.java 22 Jun 2005 13:38:12 -0000 1.5
+++ SenderWorker.java 2 Jul 2005 04:59:54 -0000 1.6
@@ -140,8 +140,7 @@
}
sendMessage(rmMessageContext);
- rmMessageContext.setReTransmissionCount(
- rmMessageContext.getReTransmissionCount() + 1);
+ rmMessageContext.setReTransmissionCount(rmMessageContext.getReTransmissionCount() + 1);
rmMessageContext.setLocked(false);
@@ -190,13 +189,12 @@
{
log.info(Constants.InfomationMessage.SENDING_TERMINATE_SEQ);
sendTerminateSequenceRequest(rmMessageContext);
- storageManager.setTerminateSend(storageManager.getKeyFromOutgoingSeqId(
- rmMessageContext.getSequenceID()));
+ storageManager.setTerminateSend(storageManager.getKeyFromOutgoingSeqId(rmMessageContext.getSequenceID()));
break;
}
case Constants.MSG_TYPE_ACKNOWLEDGEMENT:
{
- log.info(Constants.InfomationMessage.SENDING_ACK);
+ log.info(Constants.InfomationMessage.SENDING_ACK);
sendAcknowldgement(rmMessageContext);
break;
}
@@ -247,8 +245,7 @@
call.setSOAPActionURI(rmMessageContext.getAddressingHeaders().getAction().toString());
}
- call.setTargetEndpointAddress(
- rmMessageContext.getAddressingHeaders().getReplyTo().getAddress().toString());
+ call.setTargetEndpointAddress(rmMessageContext.getAddressingHeaders().getReplyTo().getAddress().toString());
//NOTE: WE USE THE REQUEST MESSAGE TO SEND THE RESPONSE.
String soapMsg = rmMessageContext.getMsgContext().getRequestMessage().getSOAPPartAsString();
@@ -257,9 +254,7 @@
if (soapMsg != null)
call.setRequestMessage(new Message(soapMsg));
else {
- call.setRequestMessage(
- new Message(
- rmMessageContext.getMsgContext().getRequestMessage().getSOAPEnvelope()));
+ call.setRequestMessage(new Message(rmMessageContext.getMsgContext().getRequestMessage().getSOAPEnvelope()));
}
// rmMessageContext.setLastPrecessedTime(System.currentTimeMillis());
@@ -321,8 +316,7 @@
.getSOAPPartAsString();
call.setRequestMessage(new Message(soapMsg));
if (rmMessageContext.getAddressingHeaders().getAction() != null) {
- call.setSOAPActionURI(
- rmMessageContext.getAddressingHeaders().getAction().toString());
+ call.setSOAPActionURI(rmMessageContext.getAddressingHeaders().getAction().toString());
}
}
return call;
@@ -361,12 +355,10 @@
RMHeaders rmHeaders = new RMHeaders();
rmHeaders.fromSOAPEnvelope(call.getResponseMessage().getSOAPEnvelope());
rmMessageContext.setRMHeaders(rmHeaders);
- AddressingHeaders addrHeaders = new AddressingHeaders(
- call.getResponseMessage().getSOAPEnvelope());
+ AddressingHeaders addrHeaders = new AddressingHeaders(call.getResponseMessage().getSOAPEnvelope());
rmMessageContext.setAddressingHeaders(addrHeaders);
rmMessageContext.getMsgContext().setResponseMessage(call.getResponseMessage());
- IRMMessageProcessor messagePrcessor = RMMessageProcessorIdentifier.getMessageProcessor(
- rmMessageContext, storageManager);
+ IRMMessageProcessor messagePrcessor = RMMessageProcessorIdentifier.getMessageProcessor(rmMessageContext, storageManager);
messagePrcessor.processMessage(rmMessageContext);
}
1.16 +5 -10 ws-sandesha/src/org/apache/sandesha/server/msgprocessors/AcknowledgementProcessor.java
Index: AcknowledgementProcessor.java
===================================================================
RCS file: /home/cvs/ws-sandesha/src/org/apache/sandesha/server/msgprocessors/AcknowledgementProcessor.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- AcknowledgementProcessor.java 8 Jun 2005 08:58:32 -0000 1.15
+++ AcknowledgementProcessor.java 2 Jul 2005 04:59:55 -0000 1.16
@@ -62,8 +62,7 @@
long msgNumber = ackRange.getMinValue();
while (ackRange.getMaxValue() >= msgNumber) {
if (!storageManager.isSentMsg(seqID, msgNumber)) {
- throw new AxisFault(new javax.xml.namespace.QName(
- Constants.FaultCodes.WSRM_FAULT_INVALID_ACKNOWLEDGEMENT),
+ throw new AxisFault(new javax.xml.namespace.QName(Constants.FaultCodes.WSRM_FAULT_INVALID_ACKNOWLEDGEMENT),
Constants.FaultMessages.INVALID_ACKNOWLEDGEMENT, null, null);
}
storageManager.setAckReceived(seqID, msgNumber);
@@ -118,15 +117,12 @@
RMMessageContext rmMsgContext = new RMMessageContext();
try {
- String to = storageManager.getAcksTo(
- rmMessageContext.getRMHeaders().getSequence().getIdentifier().getIdentifier());
+ String to = storageManager.getAcksTo(rmMessageContext.getRMHeaders().getSequence().getIdentifier().getIdentifier());
- SOAPEnvelope ackEnvelope = EnvelopeCreator.createAcknowledgementEnvelope(
- rmMessageContext, to, ackRangeVector);
+ SOAPEnvelope ackEnvelope = EnvelopeCreator.createAcknowledgementEnvelope(rmMessageContext, to, ackRangeVector);
Message resMsg = new Message(ackEnvelope);
- MessageContext msgContext = new MessageContext(
- rmMessageContext.getMsgContext().getAxisEngine());
+ MessageContext msgContext = new MessageContext(rmMessageContext.getMsgContext().getAxisEngine());
rmMessageContext.copyContents(rmMsgContext);
msgContext.setResponseMessage(resMsg);
rmMsgContext.setMsgContext(msgContext);
@@ -166,8 +162,7 @@
max = ((Long) listOfMsgNumbers.get(new Long(i))).longValue();
} else {
- if (1 == (((Long) listOfMsgNumbers.get(new Long(i + 1))).longValue() - ((Long) listOfMsgNumbers.get(
- new Long(i))).longValue())) {
+ if (1 == (((Long) listOfMsgNumbers.get(new Long(i + 1))).longValue() - ((Long) listOfMsgNumbers.get(new Long(i))).longValue())) {
max = ((Long) listOfMsgNumbers.get(new Long(i + 1))).longValue();
found = true;
} else {
1.15 +2 -4 ws-sandesha/src/org/apache/sandesha/server/msgprocessors/CompositeProcessor.java
Index: CompositeProcessor.java
===================================================================
RCS file: /home/cvs/ws-sandesha/src/org/apache/sandesha/server/msgprocessors/CompositeProcessor.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- CompositeProcessor.java 8 Jun 2005 08:58:32 -0000 1.14
+++ CompositeProcessor.java 2 Jul 2005 04:59:55 -0000 1.15
@@ -78,8 +78,7 @@
rmMsgContext.setSequenceID(sequenceUUID);
rmMsgContext.setMsgNumber(messageNumber);
try {
- MessageContext msgContext = new MessageContext(
- rmMessageContext.getMsgContext().getAxisEngine());
+ MessageContext msgContext = new MessageContext(rmMessageContext.getMsgContext().getAxisEngine());
RMMessageContext.copyMessageContext(rmMessageContext.getMsgContext(),
msgContext);
String soapMsg = rmMessageContext.getMsgContext().getRequestMessage()
@@ -92,8 +91,7 @@
rmMsgContext.setMessageType(Constants.MSG_TYPE_SERVICE_REQUEST);
} catch (Exception e) {
log.error(e);
- throw new AxisFault(
- new QName(Constants.FaultCodes.WSRM_SERVER_INTERNAL_ERROR),
+ throw new AxisFault(new QName(Constants.FaultCodes.WSRM_SERVER_INTERNAL_ERROR),
Constants.FaultMessages.SERVER_INTERNAL_ERROR, null, null);
}
storageManager.insertIncomingMessage(rmMsgContext);
1.20 +3 -6 ws-sandesha/src/org/apache/sandesha/server/msgprocessors/CreateSequenceProcessor.java
Index: CreateSequenceProcessor.java
===================================================================
RCS file: /home/cvs/ws-sandesha/src/org/apache/sandesha/server/msgprocessors/CreateSequenceProcessor.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- CreateSequenceProcessor.java 8 Jun 2005 08:58:32 -0000 1.19
+++ CreateSequenceProcessor.java 2 Jul 2005 04:59:55 -0000 1.20
@@ -100,19 +100,16 @@
resEnvelope = EnvelopeCreator.createCreateSequenceResponseEnvelope(seqId,
rmMessageContext, hasOffer, offerAccepted);
} catch (Exception e) {
- throw new AxisFault(
- org.apache.sandesha.Constants.FaultCodes.WSRM_SERVER_INTERNAL_ERROR);
+ throw new AxisFault(org.apache.sandesha.Constants.FaultCodes.WSRM_SERVER_INTERNAL_ERROR);
}
- rmMessageContext.setMessageType(
- org.apache.sandesha.Constants.MSG_TYPE_CREATE_SEQUENCE_RESPONSE);
+ rmMessageContext.setMessageType(org.apache.sandesha.Constants.MSG_TYPE_CREATE_SEQUENCE_RESPONSE);
if (rmMessageContext.getSync()) {
rmMessageContext.getMsgContext().setResponseMessage(new Message(resEnvelope));
return true;
} else {
- MessageContext msgContext = new MessageContext(
- rmMessageContext.getMsgContext().getAxisEngine());
+ MessageContext msgContext = new MessageContext(rmMessageContext.getMsgContext().getAxisEngine());
msgContext.setResponseMessage(new Message(resEnvelope));
rmMessageContext.setMsgContext(msgContext);
1.14 +2 -4 ws-sandesha/src/org/apache/sandesha/server/msgprocessors/FaultProcessor.java
Index: FaultProcessor.java
===================================================================
RCS file: /home/cvs/ws-sandesha/src/org/apache/sandesha/server/msgprocessors/FaultProcessor.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- FaultProcessor.java 8 Jun 2005 08:58:32 -0000 1.13
+++ FaultProcessor.java 2 Jul 2005 04:59:55 -0000 1.14
@@ -74,8 +74,7 @@
if (rmMessageContext.getAddressingHeaders() != null) {
addrHeaders = rmMessageContext.getAddressingHeaders();
if (addrHeaders.getFaultTo() != null) {
- if (addrHeaders.getFaultTo().getAddress().toString().equals(
- Constants.WSA.NS_ADDRESSING_ANONYMOUS)) {
+ if (addrHeaders.getFaultTo().getAddress().toString().equals(Constants.WSA.NS_ADDRESSING_ANONYMOUS)) {
return sendFaultSync(msgContext);
} else {
storageManager.insertFault(rmMessageContext);
@@ -99,8 +98,7 @@
private String getAcksTo(RMHeaders rmHeaders) {
if (rmHeaders.getSequence() != null)
- return storageManager.getAcksTo(
- rmHeaders.getSequence().getIdentifier().getIdentifier());
+ return storageManager.getAcksTo(rmHeaders.getSequence().getIdentifier().getIdentifier());
else if (rmHeaders.getCreateSequence() != null)
return rmHeaders.getCreateSequence().getAcksTo().getAddress().toString();
else
1.2 +12 -12 ws-sandesha/src/org/apache/sandesha/storage/Callback.java
Index: Callback.java
===================================================================
RCS file: /home/cvs/ws-sandesha/src/org/apache/sandesha/storage/Callback.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Callback.java 9 May 2005 04:18:33 -0000 1.1
+++ Callback.java 2 Jul 2005 04:59:55 -0000 1.2
@@ -8,18 +8,18 @@
/**
* @author root
- *
- * To change the template for this generated type comment go to
- * Window>Preferences>Java>Code Generation>Code and Comments
+ * <p/>
+ * To change the template for this generated type comment go to
+ * Window>Preferences>Java>Code Generation>Code and Comments
*/
public class Callback {
-
- public void onIncomingMessage(CallbackData result){
-
- }
-
- public void onOutgoingMessage(CallbackData result){
-
- }
-
+
+ public void onIncomingMessage(CallbackData result) {
+
+ }
+
+ public void onOutgoingMessage(CallbackData result) {
+
+ }
+
}
1.3 +109 -108 ws-sandesha/src/org/apache/sandesha/storage/CallbackData.java
Index: CallbackData.java
===================================================================
RCS file: /home/cvs/ws-sandesha/src/org/apache/sandesha/storage/CallbackData.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- CallbackData.java 17 May 2005 07:23:46 -0000 1.2
+++ CallbackData.java 2 Jul 2005 04:59:55 -0000 1.3
@@ -12,17 +12,17 @@
/**
* @author root
- *
- * To change the template for this generated type comment go to
- * Window>Preferences>Java>Code Generation>Code and Comments
+ * <p/>
+ * To change the template for this generated type comment go to
+ * Window>Preferences>Java>Code Generation>Code and Comments
*/
public class CallbackData {
-
- private int messageType;
- private String action;
- private long messageNumber;
- private String messageId;
- private String sequenceId;
+
+ private int messageType;
+ private String action;
+ private long messageNumber;
+ private String messageId;
+ private String sequenceId;
public AxisFault getFault() {
return fault;
@@ -32,119 +32,120 @@
this.fault = fault;
}
- private long ackStart;
- private long ackEnd;
- private ArrayList ackNack;
+ private long ackStart;
+ private long ackEnd;
+ private ArrayList ackNack;
private AxisFault fault;
-
/**
* @return Returns the action.
*/
public String getAction() {
return action;
}
+
/**
* @param action The action to set.
*/
public void setAction(String action) {
this.action = action;
}
- public CallbackData () {
- ackNack = new ArrayList ();
- }
-
- private void addToNacks(long nack){
- ackNack.add(new Long(nack));
- }
-
- private ArrayList getNacks(){
- return ackNack;
- }
-
- /**
- * @return
- */
- public long getAckEnd() {
- return ackEnd;
- }
-
- /**
- * @return
- */
- public long getAckStart() {
- return ackStart;
- }
-
- /**
- * @return
- */
- public String getMessageId() {
- return messageId;
- }
-
- /**
- * @return
- */
- public long getMessageNumber() {
- return messageNumber;
- }
-
- /**
- * @return
- */
- public int getMessageType() {
- return messageType;
- }
-
- /**
- * @return
- */
- public String getSequenceId() {
- return sequenceId;
- }
-
- /**
- * @param l
- */
- public void setAckEnd(long l) {
- ackEnd = l;
- }
-
- /**
- * @param l
- */
- public void setAckStart(long l) {
- ackStart = l;
- }
-
- /**
- * @param string
- */
- public void setMessageId(String string) {
- messageId = string;
- }
-
- /**
- * @param l
- */
- public void setMessageNumber(long l) {
- messageNumber = l;
- }
-
- /**
- * @param i
- */
- public void setMessageType(int i) {
- messageType = i;
- }
-
- /**
- * @param string
- */
- public void setSequenceId(String string) {
- sequenceId = string;
- }
+
+ public CallbackData() {
+ ackNack = new ArrayList();
+ }
+
+ private void addToNacks(long nack) {
+ ackNack.add(new Long(nack));
+ }
+
+ private ArrayList getNacks() {
+ return ackNack;
+ }
+
+ /**
+ * @return
+ */
+ public long getAckEnd() {
+ return ackEnd;
+ }
+
+ /**
+ * @return
+ */
+ public long getAckStart() {
+ return ackStart;
+ }
+
+ /**
+ * @return
+ */
+ public String getMessageId() {
+ return messageId;
+ }
+
+ /**
+ * @return
+ */
+ public long getMessageNumber() {
+ return messageNumber;
+ }
+
+ /**
+ * @return
+ */
+ public int getMessageType() {
+ return messageType;
+ }
+
+ /**
+ * @return
+ */
+ public String getSequenceId() {
+ return sequenceId;
+ }
+
+ /**
+ * @param l
+ */
+ public void setAckEnd(long l) {
+ ackEnd = l;
+ }
+
+ /**
+ * @param l
+ */
+ public void setAckStart(long l) {
+ ackStart = l;
+ }
+
+ /**
+ * @param string
+ */
+ public void setMessageId(String string) {
+ messageId = string;
+ }
+
+ /**
+ * @param l
+ */
+ public void setMessageNumber(long l) {
+ messageNumber = l;
+ }
+
+ /**
+ * @param i
+ */
+ public void setMessageType(int i) {
+ messageType = i;
+ }
+
+ /**
+ * @param string
+ */
+ public void setSequenceId(String string) {
+ sequenceId = string;
+ }
}
1.17 +46 -46 ws-sandesha/src/org/apache/sandesha/storage/dao/ISandeshaDAO.java
Index: ISandeshaDAO.java
===================================================================
RCS file: /home/cvs/ws-sandesha/src/org/apache/sandesha/storage/dao/ISandeshaDAO.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- ISandeshaDAO.java 8 Jun 2005 08:58:32 -0000 1.16
+++ ISandeshaDAO.java 2 Jul 2005 04:59:55 -0000 1.17
@@ -27,35 +27,35 @@
*/
public interface ISandeshaDAO {
-
+
/**
- * This adds a new entry in the storage to to hold messages of a perticular
+ * This adds a new entry in the storage to to hold messages of a perticular
* sequence that come in to the sandesha server/client
*/
boolean addIncomingSequence(String sequenceId);
-
+
/**
- * This adds a entry in the storage for holding the messages of the given outgoing
+ * This adds a entry in the storage for holding the messages of the given outgoing
* sequence.
*/
boolean addOutgoingSequence(String sequenceId);
-
+
/**
- * Adds a priority message (e.g. create seq) to the queue. These will be sent
- * before other messages like application requests.
+ * Adds a priority message (e.g. create seq) to the queue. These will be sent
+ * before other messages like application requests.
*/
boolean addPriorityMessage(RMMessageContext message);
-
+
/**
- * This checks the priority messages to see weather there is any one to
+ * This checks the priority messages to see weather there is any one to
* be sent (either for the first time or a retransmission)
*/
RMMessageContext getNextPriorityMessageContextToSend();
-
+
/**
* This adds a incoming message to a area belonging to the given sequence in the
* queue.
@@ -63,43 +63,42 @@
boolean addMessageToIncomingSequence(String sequenceId, Long msgNo,
RMMessageContext rmMessageContext);
-
+
/**
* This adds the given message to the given sequence.
*/
boolean addMessageToOutgoingSequence(String sequenceId,
RMMessageContext rmMessageContext);
-
+
/**
- * This checks weather there is a entry for the given incoming sequence in
+ * This checks weather there is a entry for the given incoming sequence in
* the queue.
*/
boolean isIncomingSequenceExists(String sequenceId);
-
+
/**
* Checks weather a entry for the given outgoing sequence exists in
* the queue.
*/
boolean isOutgoingSequenceExists(String sequenceId);
-
/**
- * This checks in the given incoming sequence to see weather a message of
+ * This checks in the given incoming sequence to see weather a message of
* the given message no exists
*/
boolean isIncomingMessageExists(String sequenceId, Long msgNo);
-
+
/**
* This tries to get the next message to be sent from the given outgoing sequence
* If these is no message to be sent in the given sequence, null will be returned.
*/
RMMessageContext getNextMsgContextToProcess(String sequenceId);
-
+
/**
* Gets the next possible message to be sent from the queue.
*/
@@ -112,9 +111,9 @@
*/
String getRandomSeqIdToProcess();
-
+
/**
- * This reutns a set of message numbers with all the message numbers of
+ * This reutns a set of message numbers with all the message numbers of
* incoming sequence.
*/
Set getAllReceivedMsgNumsOfIncomingSeq(String sequenceId);
@@ -122,33 +121,33 @@
/**
* This sets the outgoing sequence. Here seqId is the entry in the queue
- * that we hope to hold the messages of a perticular sequence. outseqid is the
+ * that we hope to hold the messages of a perticular sequence. outseqid is the
* actual sequence id (i.e. uuid). That will be set within the wsrm:sequence field of
* this message. (remember that we may not have received this actual outgoing sequence id
* by the time we start to store outgoing messages).
*/
void setOutSequence(String sequenceId, String outSequenceId);
-
+
/**
- * This sets a flag in the queue to indicate that the outSequence of the perticular message set
+ * This sets a flag in the queue to indicate that the outSequence of the perticular message set
* (stored with the id seqId) has been set correctly. The value in outSequence may be wrong
- * before the sender gets the create seq. response. After getting this and after setting the
+ * before the sender gets the create seq. response. After getting this and after setting the
* out sequence correctly using the previous method, this flag will be set to true. Only then these
* messages thould be send to the sender.
*/
void setOutSequenceApproved(String sequenceID, boolean approved);
-
+
/**
- * this gives the seqId which is used to hold the messages of which the
+ * this gives the seqId which is used to hold the messages of which the
* outsequence entry has been set to the value outsequenceId.
*/
String getSequenceOfOutSequence(String outsequenceId);
/**
- * This checks the priority queue for a message if given messageid and
+ * This checks the priority queue for a message if given messageid and
* moves it to the bin
*/
void removeCreateSequenceMsg(String messageId);
@@ -196,20 +195,20 @@
public RMMessageContext getNextLowPriorityMessageContextToSend();
/**
- * The message will be added to a sent list (the list holds the
+ * The message will be added to a sent list (the list holds the
* messages that were sent at least once)
*/
public void addSendMsgNo(String seqId, long msgNo);
/**
- * Asks from the storage weather the given message has been sent at
- * least once
+ * Asks from the storage weather the given message has been sent at
+ * least once
*/
public boolean isSentMsg(String seqId, long msgNo);
/**
- * Can be used to ckeck weather the last message has been received in the
+ * Can be used to ckeck weather the last message has been received in the
* incoming sequence.
*/
public boolean hasLastIncomingMsgReceived(String seqId);
@@ -230,14 +229,15 @@
*/
public boolean isRequestedSeqPresent(String seqId);
- /**The client side will not be able to have sequenceId as a key for storing request messages.
- *Since it may be not known when the user adds first message.
- *This asks for that key, giving sequence id of incoming messages.
+ /**
+ * The client side will not be able to have sequenceId as a key for storing request messages.
+ * Since it may be not known when the user adds first message.
+ * This asks for that key, giving sequence id of incoming messages.
*/
public String getKeyFromIncomingSequenceId(String incomingSeqID);
/**
- *This asks for the above key (the key used to hold messages) given the outgoing sequece id.
+ * This asks for the above key (the key used to hold messages) given the outgoing sequece id.
*/
public String getKeyFromOutgoingSequenceId(String outgoingSeqID);
@@ -257,7 +257,7 @@
public boolean isAllOutgoingTerminateSent();
/**
- * Use this to check weather the terminate message of all sequences (incoming) has
+ * Use this to check weather the terminate message of all sequences (incoming) has
* been received.
*/
public boolean isAllIncommingTerminateReceived();
@@ -265,8 +265,8 @@
/**
* Set the acks to of the given sequence.
*/
- public void setAcksTo(String seqId,String acksTo);
-
+ public void setAcksTo(String seqId, String acksTo);
+
/**
* gets the acksTo value
*/
@@ -281,7 +281,7 @@
* Gets the offered incoming sequence, of outgoing sequence.
*/
public String getOffer(String msgID);
-
+
/**
* clears the storage.
*/
@@ -289,11 +289,11 @@
public boolean isOutgoingTerminateSent(String seqId);
- public boolean isIncommingTerminateReceived(String seqId);
-
- public void updateFinalMessageArrivedTime(String sequenceID);
-
- public void sendAck(String sequenceId);
-
- public void removeAllAcks(String sequenceID);
+ public boolean isIncommingTerminateReceived(String seqId);
+
+ public void updateFinalMessageArrivedTime(String sequenceID);
+
+ public void sendAck(String sequenceId);
+
+ public void removeAllAcks(String sequenceID);
}
\ No newline at end of file
1.27 +1 -1 ws-sandesha/src/org/apache/sandesha/storage/queue/SandeshaQueue.java
Index: SandeshaQueue.java
===================================================================
RCS file: /home/cvs/ws-sandesha/src/org/apache/sandesha/storage/queue/SandeshaQueue.java,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- SandeshaQueue.java 22 Jun 2005 13:38:12 -0000 1.26
+++ SandeshaQueue.java 2 Jul 2005 04:59:56 -0000 1.27
@@ -225,7 +225,7 @@
synchronized (lowPriorityQueue) {
if (msg == null)
throw new QueueException(Constants.Queue.MESSAGE_ID_NULL);
- lowPriorityQueue.add(msg);
+ lowPriorityQueue.add(msg);
}
}
1.6 +3 -4 ws-sandesha/src/org/apache/sandesha/util/PolicyLoader.java
Index: PolicyLoader.java
===================================================================
RCS file: /home/cvs/ws-sandesha/src/org/apache/sandesha/util/PolicyLoader.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- PolicyLoader.java 26 May 2005 03:00:10 -0000 1.5
+++ PolicyLoader.java 2 Jul 2005 04:59:56 -0000 1.6
@@ -52,7 +52,7 @@
private Element rootNodeElement;
private PolicyLoader() {
- helper();
+ helper();
policyInstance = true;
}
@@ -132,7 +132,7 @@
}
private String getExpBackoffInterval(String namespaceURI, String elementName) {
- String name = null;
+ String name = null;
NodeList list = rootNodeElement.getElementsByTagNameNS(namespaceURI, elementName);
if (list != null) {
Node node = list.item(0);
@@ -147,8 +147,7 @@
factory = DocumentBuilderFactory.newInstance();
factory.setNamespaceAware(true);
builder = factory.newDocumentBuilder();
- InputStream in = Thread.currentThread().getContextClassLoader().getResourceAsStream(
- Constants.ClientProperties.WSRM_POLICY_FILE);
+ InputStream in = Thread.currentThread().getContextClassLoader().getResourceAsStream(Constants.ClientProperties.WSRM_POLICY_FILE);
if (in != null) {
document = builder.parse(in);
1.12 +16 -16 ws-sandesha/src/org/apache/sandesha/util/PropertyLoader.java
Index: PropertyLoader.java
===================================================================
RCS file: /home/cvs/ws-sandesha/src/org/apache/sandesha/util/PropertyLoader.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- PropertyLoader.java 22 Jun 2005 13:38:12 -0000 1.11
+++ PropertyLoader.java 2 Jul 2005 04:59:56 -0000 1.12
@@ -33,7 +33,7 @@
*/
public class PropertyLoader {
public static int getClientSideListenerPort() throws Exception {
- Properties prop = loadProperties();
+ Properties prop = loadProperties();
if (prop != null) {
return new Integer(prop.getProperty(Constants.ClientProperties.CLIENT_LISTENER_PORT)).intValue();
@@ -54,10 +54,10 @@
private static Properties loadProperties() throws Exception {
Properties properties = new Properties();
- try{
- InputStream in = Thread.currentThread().getContextClassLoader().getResourceAsStream(Constants.ClientProperties.PROPERTY_FILE);
- properties.load(in);
- }catch(IOException e){
+ try {
+ InputStream in = Thread.currentThread().getContextClassLoader().getResourceAsStream(Constants.ClientProperties.PROPERTY_FILE);
+ properties.load(in);
+ } catch (IOException e) {
throw new Exception(Constants.ErrorMessages.CANNOT_LOAD_PROPERTIES);
}
@@ -78,18 +78,18 @@
Properties properties = loadProperties();
ArrayList ret = new ArrayList();
- int temp = 0;
- String propVal;
- do {
- temp++;
- String tempStr = type + temp;
- propVal = properties.getProperty(tempStr);
- if (propVal != null) {
- ret.add(propVal);
- }
- } while (propVal != null);
+ int temp = 0;
+ String propVal;
+ do {
+ temp++;
+ String tempStr = type + temp;
+ propVal = properties.getProperty(tempStr);
+ if (propVal != null) {
+ ret.add(propVal);
+ }
+ } while (propVal != null);
- return ret;
+ return ret;
}
1.5 +8 -8 ws-sandesha/src/org/apache/sandesha/ws/rm/Accept.java
Index: Accept.java
===================================================================
RCS file: /home/cvs/ws-sandesha/src/org/apache/sandesha/ws/rm/Accept.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Accept.java 25 May 2005 10:09:00 -0000 1.4
+++ Accept.java 2 Jul 2005 04:59:56 -0000 1.5
@@ -64,7 +64,7 @@
return acceptElement;
}
- public Accept fromSOAPEnvelope(MessageElement bodyElement) throws SOAPException{
+ public Accept fromSOAPEnvelope(MessageElement bodyElement) throws SOAPException {
Iterator iterator = bodyElement.getChildElements();
MessageElement childElement;
@@ -72,14 +72,15 @@
while (iterator.hasNext()) {
childElement = (MessageElement) iterator.next();
- if (childElement.getName().equals(Constants.WSRM.NS_PREFIX_RM + Constants.COLON + Constants.WSRM.ACKS_TO)) {
+ if (childElement.getName().equals(Constants.WSRM.NS_PREFIX_RM + Constants.COLON + Constants.WSRM.ACKS_TO)) {
acksTo = new AcksTo();
acksTo.fromSOAPEnvelope(childElement);
}
- if (childElement.getName().equals(Constants.WSRM.ACKS_TO)) {
+ if (childElement.getName().equals(Constants.WSRM.ACKS_TO)) {
acksTo = new AcksTo();
- acksTo.fromSOAPEnvelope(childElement);}
+ acksTo.fromSOAPEnvelope(childElement);
+ }
}
@@ -102,7 +103,6 @@
}
-
public void addChildElement(MessageElement element) {
}
@@ -125,11 +125,11 @@
acceptElement = element;
}
- public void setAcksTo(AcksTo acksTo){
- this.acksTo=acksTo;
+ public void setAcksTo(AcksTo acksTo) {
+ this.acksTo = acksTo;
}
- public AcksTo getAcksTo(){
+ public AcksTo getAcksTo() {
return this.acksTo;
}
1.20 +4 -12 ws-sandesha/src/org/apache/sandesha/ws/rm/AckRequested.java
Index: AckRequested.java
===================================================================
RCS file: /home/cvs/ws-sandesha/src/org/apache/sandesha/ws/rm/AckRequested.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- AckRequested.java 25 May 2005 10:09:00 -0000 1.19
+++ AckRequested.java 2 Jul 2005 04:59:56 -0000 1.20
@@ -56,8 +56,7 @@
*/
public AckRequested() {
ackRequested = new MessageElement();
- ackRequested.setName(
- Constants.WSRM.NS_PREFIX_RM + Constants.COLON + Constants.WSRM.ACK_REQUESTED);
+ ackRequested.setName(Constants.WSRM.NS_PREFIX_RM + Constants.COLON + Constants.WSRM.ACK_REQUESTED);
}
@@ -92,8 +91,7 @@
}
Name name = env.createName("", Constants.WSRM.NS_PREFIX_RM, Constants.WSRM.NS_URI_RM);
- SOAPHeaderElement headerElement = (SOAPHeaderElement) env.getHeader().addHeaderElement(
- name);
+ SOAPHeaderElement headerElement = (SOAPHeaderElement) env.getHeader().addHeaderElement(name);
// .setActor(null);
headerElement.setActor(null);
@@ -125,29 +123,23 @@
while (iterator.hasNext()) {
childElement = (MessageElement) iterator.next();
- if (childElement.getName().equals(
- Constants.WSRM.NS_PREFIX_RM + Constants.COLON + Constants.WSRM.IDENTIFIER)) {
+ if (childElement.getName().equals(Constants.WSRM.NS_PREFIX_RM + Constants.COLON + Constants.WSRM.IDENTIFIER)) {
identifier = new Identifier();
-
identifier.fromSOAPEnvelope(childElement);
}
if (childElement.getName().equals(Constants.WSRM.IDENTIFIER)) {
identifier = new Identifier();
-
identifier.fromSOAPEnvelope(childElement);
}
- if (childElement.getName().equals(
- Constants.WSRM.NS_PREFIX_RM + Constants.COLON + Constants.WSRM.MSG_NUMBER)) {
+ if (childElement.getName().equals(Constants.WSRM.NS_PREFIX_RM + Constants.COLON + Constants.WSRM.MSG_NUMBER)) {
messageNumber = new MessageNumber();
-
messageNumber.fromSOAPEnvelope(childElement);
}
if (childElement.getName().equals(Constants.WSRM.MSG_NUMBER)) {
messageNumber = new MessageNumber();
-
messageNumber.fromSOAPEnvelope(childElement);
}
}
1.12 +1 -1 ws-sandesha/src/org/apache/sandesha/ws/rm/AcknowledgementRange.java
Index: AcknowledgementRange.java
===================================================================
RCS file: /home/cvs/ws-sandesha/src/org/apache/sandesha/ws/rm/AcknowledgementRange.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- AcknowledgementRange.java 25 May 2005 10:09:00 -0000 1.11
+++ AcknowledgementRange.java 2 Jul 2005 04:59:56 -0000 1.12
@@ -52,7 +52,7 @@
*/
public AcknowledgementRange() {
ackRangeElement = new MessageElement();
- ackRangeElement.setName(Constants.WSRM.NS_PREFIX_RM+Constants.COLON+Constants.WSRM.ACK_RANGE);
+ ackRangeElement.setName(Constants.WSRM.NS_PREFIX_RM + Constants.COLON + Constants.WSRM.ACK_RANGE);
}
/**
1.6 +3 -6 ws-sandesha/src/org/apache/sandesha/ws/rm/AcksTo.java
Index: AcksTo.java
===================================================================
RCS file: /home/cvs/ws-sandesha/src/org/apache/sandesha/ws/rm/AcksTo.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- AcksTo.java 25 May 2005 10:09:00 -0000 1.5
+++ AcksTo.java 2 Jul 2005 04:59:56 -0000 1.6
@@ -36,8 +36,7 @@
public AcksTo(Address address) {
acksToElement = new MessageElement();
- acksToElement.setName(
- Constants.WSRM.NS_PREFIX_RM + Constants.COLON + Constants.WSRM.ACKS_TO);
+ acksToElement.setName(Constants.WSRM.NS_PREFIX_RM + Constants.COLON + Constants.WSRM.ACKS_TO);
this.address = address;
}
@@ -54,15 +53,13 @@
try {
while (iterator.hasNext()) {
childElement = (MessageElement) iterator.next();
- if (childElement.getName().equals(
- org.apache.axis.message.addressing.Constants.NS_PREFIX_ADDRESSING +
+ if (childElement.getName().equals(org.apache.axis.message.addressing.Constants.NS_PREFIX_ADDRESSING +
Constants.COLON +
org.apache.axis.message.addressing.Constants.ADDRESS)) {
String uri = childElement.getFirstChild().getFirstChild().toString();
address = new Address(uri);
}
- if (childElement.getName().equals(
- org.apache.axis.message.addressing.Constants.ADDRESS)) {
+ if (childElement.getName().equals(org.apache.axis.message.addressing.Constants.ADDRESS)) {
String uri = childElement.getFirstChild().getNodeValue();
address = new Address(uri);
}
1.20 +12 -14 ws-sandesha/src/org/apache/sandesha/ws/rm/CreateSequence.java
Index: CreateSequence.java
===================================================================
RCS file: /home/cvs/ws-sandesha/src/org/apache/sandesha/ws/rm/CreateSequence.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- CreateSequence.java 25 May 2005 10:09:00 -0000 1.19
+++ CreateSequence.java 2 Jul 2005 04:59:56 -0000 1.20
@@ -49,8 +49,7 @@
*/
public CreateSequence() {
createSequence = new MessageElement();
- createSequence.setName(
- Constants.WSRM.NS_PREFIX_RM + Constants.COLON + Constants.WSRM.CREATE_SEQUENCE);
+ createSequence.setName(Constants.WSRM.NS_PREFIX_RM + Constants.COLON + Constants.WSRM.CREATE_SEQUENCE);
}
@@ -60,8 +59,8 @@
* @return MessageElement
*/
public MessageElement getSoapElement() throws SOAPException {
- createSequence.addChildElement(offer.getSoapElement());
createSequence.addChildElement(acksTo.getSoapElement());
+ createSequence.addChildElement(offer.getSoapElement());
return createSequence;
}
@@ -84,10 +83,10 @@
bodyElement.setName(Constants.WSRM.CREATE_SEQUENCE);
- if (offer != null)
- offer.toSOAPEnvelope(bodyElement);
if (acksTo != null)
acksTo.toSOAPEnvelope(bodyElement);
+ if (offer != null)
+ offer.toSOAPEnvelope(bodyElement);
return env;
}
@@ -107,20 +106,19 @@
//TODO add offer processing code here
//TEST OFFER
childElement = (MessageElement) iterator.next();
- if (childElement.getName().equals(
- Constants.WSRM.NS_PREFIX_RM + Constants.COLON + Constants.WSRM.SEQUENCE_OFFER)) {
- offer = new SequenceOffer();
- offer.fromSOAPEnvelope(childElement);
- } else if (childElement.getName().equals(Constants.WSRM.SEQUENCE_OFFER)) {
- offer = new SequenceOffer();
- offer.fromSOAPEnvelope(childElement);
- } else if (childElement.getName().equals(
- Constants.WSRM.NS_PREFIX_RM + Constants.COLON + Constants.WSRM.ACKS_TO)) {
+
+ if (childElement.getName().equals(Constants.WSRM.NS_PREFIX_RM + Constants.COLON + Constants.WSRM.ACKS_TO)) {
acksTo = new AcksTo();
acksTo.fromSOAPEnvelope(childElement);
} else if (childElement.getName().equals(Constants.WSRM.ACKS_TO)) {
acksTo = new AcksTo();
acksTo.fromSOAPEnvelope(childElement);
+ } else if (childElement.getName().equals(Constants.WSRM.NS_PREFIX_RM + Constants.COLON + Constants.WSRM.SEQUENCE_OFFER)) {
+ offer = new SequenceOffer();
+ offer.fromSOAPEnvelope(childElement);
+ } else if (childElement.getName().equals(Constants.WSRM.SEQUENCE_OFFER)) {
+ offer = new SequenceOffer();
+ offer.fromSOAPEnvelope(childElement);
}
}
1.20 +3 -3 ws-sandesha/src/org/apache/sandesha/ws/rm/CreateSequenceResponse.java
Index: CreateSequenceResponse.java
===================================================================
RCS file: /home/cvs/ws-sandesha/src/org/apache/sandesha/ws/rm/CreateSequenceResponse.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- CreateSequenceResponse.java 25 May 2005 10:09:00 -0000 1.19
+++ CreateSequenceResponse.java 2 Jul 2005 04:59:56 -0000 1.20
@@ -55,7 +55,7 @@
createSequenceResponse.setName(Constants.WSRM.NS_PREFIX_RM + Constants.COLON + Constants.WSRM.CREATE_SEQUENCE_RESPONSE);
}
- /**
+ /**
* Method getSoapElement
*
* @return MessageElement
@@ -104,7 +104,7 @@
while (iterator.hasNext()) {
childElement = (MessageElement) iterator.next();
- if (childElement.getName().equals(Constants.WSRM.NS_PREFIX_RM+ Constants.COLON + Constants.WSRM.IDENTIFIER)) {
+ if (childElement.getName().equals(Constants.WSRM.NS_PREFIX_RM + Constants.COLON + Constants.WSRM.IDENTIFIER)) {
identifier = new Identifier();
identifier.fromSOAPEnvelope(childElement);
}
@@ -128,7 +128,7 @@
return this;
}
- /**
+ /**
* Method addChildElement
*
* @param element
1.3 +1 -2 ws-sandesha/src/org/apache/sandesha/ws/rm/Identifier.java
Index: Identifier.java
===================================================================
RCS file: /home/cvs/ws-sandesha/src/org/apache/sandesha/ws/rm/Identifier.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Identifier.java 16 May 2005 06:08:17 -0000 1.2
+++ Identifier.java 2 Jul 2005 04:59:56 -0000 1.3
@@ -32,8 +32,7 @@
*/
public Identifier() {
identifierElement = new MessageElement();
- identifierElement.setName(
- Constants.WSRM.NS_PREFIX_RM + Constants.COLON + Constants.WSRM.IDENTIFIER);
+ identifierElement.setName(Constants.WSRM.NS_PREFIX_RM + Constants.COLON + Constants.WSRM.IDENTIFIER);
}
/**
1.14 +1 -2 ws-sandesha/src/org/apache/sandesha/ws/rm/MessageNumber.java
Index: MessageNumber.java
===================================================================
RCS file: /home/cvs/ws-sandesha/src/org/apache/sandesha/ws/rm/MessageNumber.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- MessageNumber.java 25 May 2005 10:09:00 -0000 1.13
+++ MessageNumber.java 2 Jul 2005 04:59:56 -0000 1.14
@@ -50,8 +50,7 @@
messageNoElement = new MessageElement();
- messageNoElement.setName(
- Constants.WSRM.NS_PREFIX_RM + Constants.COLON + Constants.WSRM.MSG_NUMBER);
+ messageNoElement.setName(Constants.WSRM.NS_PREFIX_RM + Constants.COLON + Constants.WSRM.MSG_NUMBER);
}
/**
1.13 +1 -2 ws-sandesha/src/org/apache/sandesha/ws/rm/Nack.java
Index: Nack.java
===================================================================
RCS file: /home/cvs/ws-sandesha/src/org/apache/sandesha/ws/rm/Nack.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- Nack.java 25 May 2005 10:09:00 -0000 1.12
+++ Nack.java 2 Jul 2005 04:59:56 -0000 1.13
@@ -85,8 +85,7 @@
*/
public MessageElement toSOAPEnvelope(MessageElement msgElement) throws SOAPException {
- msgElement.addChildElement(Constants.WSRM.NACK, Constants.WSRM.NS_PREFIX_RM).addTextNode(
- (new Long(notAckNum)).toString());
+ msgElement.addChildElement(Constants.WSRM.NACK, Constants.WSRM.NS_PREFIX_RM).addTextNode((new Long(notAckNum)).toString());
return msgElement;
}
1.19 +5 -9 ws-sandesha/src/org/apache/sandesha/ws/rm/Sequence.java
Index: Sequence.java
===================================================================
RCS file: /home/cvs/ws-sandesha/src/org/apache/sandesha/ws/rm/Sequence.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- Sequence.java 25 May 2005 10:09:00 -0000 1.18
+++ Sequence.java 2 Jul 2005 04:59:56 -0000 1.19
@@ -72,9 +72,9 @@
*/
public MessageElement getSoapElement() throws SOAPException {
- seqElement.addChildElement(lastMessage.getSoapElement());
seqElement.addChildElement(identifier.getSoapElement());
seqElement.addChildElement(messageNumber.getSoapElement());
+ seqElement.addChildElement(lastMessage.getSoapElement());
return seqElement;
}
@@ -96,8 +96,7 @@
removeHeaders(envelope);
Name name = env.createName("", Constants.WSRM.NS_PREFIX_RM, Constants.WSRM.NS_URI_RM);
- SOAPHeaderElement headerElement = (SOAPHeaderElement) env.getHeader().addHeaderElement(
- name);
+ SOAPHeaderElement headerElement = (SOAPHeaderElement) env.getHeader().addHeaderElement(name);
headerElement.setActor(null);
headerElement.setName(Constants.WSRM.SEQUENCE);
@@ -133,8 +132,7 @@
while (iterator.hasNext()) {
childElement = (MessageElement) iterator.next();
- if (childElement.getName().equals(
- Constants.WSRM.NS_PREFIX_RM + Constants.COLON + Constants.WSRM.IDENTIFIER)) {
+ if (childElement.getName().equals(Constants.WSRM.NS_PREFIX_RM + Constants.COLON + Constants.WSRM.IDENTIFIER)) {
identifier = new Identifier();
identifier.fromSOAPEnvelope(childElement);
}
@@ -144,8 +142,7 @@
identifier.fromSOAPEnvelope(childElement);
}
- if (childElement.getName().equals(
- Constants.WSRM.NS_PREFIX_RM + Constants.COLON + Constants.WSRM.MSG_NUMBER)) {
+ if (childElement.getName().equals(Constants.WSRM.NS_PREFIX_RM + Constants.COLON + Constants.WSRM.MSG_NUMBER)) {
messageNumber = new MessageNumber();
messageNumber.fromSOAPEnvelope(childElement);
}
@@ -155,8 +152,7 @@
messageNumber.fromSOAPEnvelope(childElement);
}
- if (childElement.getName().equals(
- Constants.WSRM.NS_PREFIX_RM + Constants.COLON + Constants.WSRM.LAST_MSG)) {
+ if (childElement.getName().equals(Constants.WSRM.NS_PREFIX_RM + Constants.COLON + Constants.WSRM.LAST_MSG)) {
lastMessage = new LastMessage();
lastMessage.fromSOAPEnvelope(childElement);
}
1.16 +4 -9 ws-sandesha/src/org/apache/sandesha/ws/rm/SequenceAcknowledgement.java
Index: SequenceAcknowledgement.java
===================================================================
RCS file: /home/cvs/ws-sandesha/src/org/apache/sandesha/ws/rm/SequenceAcknowledgement.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- SequenceAcknowledgement.java 25 May 2005 10:09:00 -0000 1.15
+++ SequenceAcknowledgement.java 2 Jul 2005 04:59:56 -0000 1.16
@@ -114,8 +114,7 @@
}
Name name = env.createName("", Constants.WSRM.NS_PREFIX_RM, Constants.WSRM.NS_URI_RM);
- SOAPHeaderElement headerElement = (SOAPHeaderElement) env.getHeader().addHeaderElement(
- name);
+ SOAPHeaderElement headerElement = (SOAPHeaderElement) env.getHeader().addHeaderElement(name);
headerElement.setActor(null);
headerElement.setName(Constants.WSRM.SEQUENCE_ACK);
@@ -159,10 +158,8 @@
childElement = (MessageElement) iterator.next();
- if (childElement.getName().equals(
- Constants.WSRM.NS_PREFIX_RM + Constants.COLON + Constants.WSRM.IDENTIFIER)) {
+ if (childElement.getName().equals(Constants.WSRM.NS_PREFIX_RM + Constants.COLON + Constants.WSRM.IDENTIFIER)) {
identifier = new Identifier();
-
identifier.fromSOAPEnvelope(childElement);
}
@@ -171,8 +168,7 @@
identifier.fromSOAPEnvelope(childElement);
}
- if (childElement.getName().equals(
- Constants.WSRM.NS_PREFIX_RM + Constants.COLON + Constants.WSRM.ACK_RANGE)) {
+ if (childElement.getName().equals(Constants.WSRM.NS_PREFIX_RM + Constants.COLON + Constants.WSRM.ACK_RANGE)) {
AcknowledgementRange ackRange = new AcknowledgementRange();
ackRange.fromSOAPEnvelope(childElement);
@@ -185,8 +181,7 @@
ackRanges.add(ackRange);
}
- if (childElement.getName().equals(
- Constants.WSRM.NS_PREFIX_RM + Constants.COLON + Constants.WSRM.NACK)) {
+ if (childElement.getName().equals(Constants.WSRM.NS_PREFIX_RM + Constants.COLON + Constants.WSRM.NACK)) {
Nack nack = new Nack();
nack.fromSOAPEnvelope(childElement);
}
1.5 +2 -2 ws-sandesha/src/org/apache/sandesha/ws/rm/SequenceFault.java
Index: SequenceFault.java
===================================================================
RCS file: /home/cvs/ws-sandesha/src/org/apache/sandesha/ws/rm/SequenceFault.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- SequenceFault.java 25 May 2005 10:09:00 -0000 1.4
+++ SequenceFault.java 2 Jul 2005 04:59:56 -0000 1.5
@@ -40,7 +40,7 @@
public SequenceFault() {
sequenceFault = new MessageElement();
- sequenceFault.setName(Constants.WSRM.NS_PREFIX_RM+Constants.COLON+Constants.WSRM.SEQUENCE_FAULT);
+ sequenceFault.setName(Constants.WSRM.NS_PREFIX_RM + Constants.COLON + Constants.WSRM.SEQUENCE_FAULT);
}
@@ -85,7 +85,7 @@
while (iterator.hasNext()) {
childElement = (MessageElement) iterator.next();
- if (childElement.getName().equals(Constants.WSRM.NS_PREFIX_RM+Constants.COLON+Constants.WSRM.FAULT_CODE)) {
+ if (childElement.getName().equals(Constants.WSRM.NS_PREFIX_RM + Constants.COLON + Constants.WSRM.FAULT_CODE)) {
faultCode = new FaultCode();
faultCode.fromSOAPEnvelope(childElement);
}
1.7 +15 -14 ws-sandesha/src/org/apache/sandesha/ws/rm/SequenceOffer.java
Index: SequenceOffer.java
===================================================================
RCS file: /home/cvs/ws-sandesha/src/org/apache/sandesha/ws/rm/SequenceOffer.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- SequenceOffer.java 17 May 2005 07:23:46 -0000 1.6
+++ SequenceOffer.java 2 Jul 2005 04:59:56 -0000 1.7
@@ -25,6 +25,7 @@
/**
* class SequenceOffer
+ *
* @author Jaliya Ekanayaka
* @author Chamikara Jayalath
*/
@@ -32,13 +33,13 @@
public class SequenceOffer extends MessageElement implements IRmElement {
private MessageElement offerElement;
-
+
private Identifier identifier;
-
- public SequenceOffer (){
- offerElement = new MessageElement(Constants.WSRM.SEQUENCE_OFFER,Constants.WSRM.NS_PREFIX_RM,Constants.WSRM.NS_URI_RM);
- }
-
+
+ public SequenceOffer() {
+ offerElement = new MessageElement(Constants.WSRM.SEQUENCE_OFFER, Constants.WSRM.NS_PREFIX_RM, Constants.WSRM.NS_URI_RM);
+ }
+
public void addChildElement(MessageElement element) throws SOAPException {
offerElement.addChildElement(element);
}
@@ -47,7 +48,7 @@
offerElement.addChildElement(identifier.getSoapElement());
return offerElement;
}
-
+
public SequenceOffer fromSOAPEnvelope(MessageElement element) {
Iterator iterator = element.getChildElements();
@@ -56,8 +57,8 @@
while (iterator.hasNext()) {
childElement = (MessageElement) iterator.next();
-
- if (childElement.getName().equals(Constants.WSRM.NS_PREFIX_RM+Constants.COLON+Constants.WSRM.IDENTIFIER)) {
+
+ if (childElement.getName().equals(Constants.WSRM.NS_PREFIX_RM + Constants.COLON + Constants.WSRM.IDENTIFIER)) {
identifier = new Identifier();
identifier.fromSOAPEnvelope(childElement);
}
@@ -69,17 +70,17 @@
}
return this;
}
-
+
public MessageElement toSOAPEnvelope(MessageElement element) throws SOAPException {
- if(identifier!=null)
- identifier.toSOAPEnvelope(offerElement);
+ if (identifier != null)
+ identifier.toSOAPEnvelope(offerElement);
element.addChildElement(offerElement);
return element;
}
-
-
+
+
public Identifier getIdentifier() {
return identifier;
}
1.15 +2 -4 ws-sandesha/src/org/apache/sandesha/ws/rm/TerminateSequence.java
Index: TerminateSequence.java
===================================================================
RCS file: /home/cvs/ws-sandesha/src/org/apache/sandesha/ws/rm/TerminateSequence.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- TerminateSequence.java 25 May 2005 10:09:00 -0000 1.14
+++ TerminateSequence.java 2 Jul 2005 04:59:56 -0000 1.15
@@ -50,8 +50,7 @@
*/
public TerminateSequence() {
terminateSequence = new MessageElement();
- terminateSequence.setName(
- Constants.WSRM.NS_PREFIX_RM + Constants.COLON + Constants.WSRM.TERMINATE_DEQUENCE);
+ terminateSequence.setName(Constants.WSRM.NS_PREFIX_RM + Constants.COLON + Constants.WSRM.TERMINATE_DEQUENCE);
}
/*
@@ -115,8 +114,7 @@
childElement = (MessageElement) iterator.next();
- if (childElement.getName().equals(
- Constants.WSRM.NS_PREFIX_RM + Constants.COLON + Constants.WSRM.IDENTIFIER)) {
+ if (childElement.getName().equals(Constants.WSRM.NS_PREFIX_RM + Constants.COLON + Constants.WSRM.IDENTIFIER)) {
identifier = new Identifier();
identifier.fromSOAPEnvelope(childElement);
1.49 +2 -4 ws-sandesha/src/org/apache/sandesha/ws/rm/providers/RMProvider.java
Index: RMProvider.java
===================================================================
RCS file: /home/cvs/ws-sandesha/src/org/apache/sandesha/ws/rm/providers/RMProvider.java,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- RMProvider.java 22 May 2005 04:54:20 -0000 1.48
+++ RMProvider.java 2 Jul 2005 04:59:59 -0000 1.49
@@ -106,8 +106,7 @@
rmMessageContext.setMessageID(addrHeaders.getMessageID().toString());
}
- IRMMessageProcessor rmMessageProcessor = RMMessageProcessorIdentifier.getMessageProcessor(
- rmMessageContext, storageManager);
+ IRMMessageProcessor rmMessageProcessor = RMMessageProcessorIdentifier.getMessageProcessor(rmMessageContext, storageManager);
if (callback != null) {
CallbackData cbData = getCallbackData(rmMessageContext);
@@ -142,8 +141,7 @@
private boolean isIgnorableMessage(MessageContext msgContext) throws Exception {
boolean result = false;
- AddressingHeaders addrH = new AddressingHeaders(
- msgContext.getRequestMessage().getSOAPEnvelope());
+ AddressingHeaders addrH = new AddressingHeaders(msgContext.getRequestMessage().getSOAPEnvelope());
List lst = getIgnorableActions(msgContext);
if (lst != null && addrH.getAction() != null) {
Iterator ite = lst.iterator();
1.7 +3 -0 ws-sandesha/test/org/apache/sandesha/intergratedtest/TCScenarioTest.java
Index: TCScenarioTest.java
===================================================================
RCS file: /home/cvs/ws-sandesha/test/org/apache/sandesha/intergratedtest/TCScenarioTest.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- TCScenarioTest.java 22 Jun 2005 13:38:12 -0000 1.6
+++ TCScenarioTest.java 2 Jul 2005 05:00:00 -0000 1.7
@@ -127,6 +127,7 @@
SandeshaContext ctx = new SandeshaContext();
ctx.setAcksToURL("http://127.0.0.1:" + defaultClientPort + "/axis/services/RMService");
+ ctx.setReplyToURL("http://127.0.0.1:" + defaultClientPort + "/axis/services/RMService");
ctx.initCall(call, targetURL, "urn:wsrm:ping", Constants.ClientProperties.IN_ONLY);
call.setOperationName(new QName("http://tempuri.org", "Ping"));
@@ -272,6 +273,8 @@
Service pingService = new Service();
Call pingCall = (Call) pingService.createCall();
SandeshaContext pingCtx = new SandeshaContext();
+ pingCtx.setAcksToURL("http://127.0.0.1:" + defaultClientPort + "/axis/services/RMService");
+ pingCtx.setReplyToURL("http://127.0.0.1:" + defaultClientPort + "/axis/services/RMService");
pingCtx.initCall(pingCall, targetURL, "urn:wsrm:Ping", Constants.ClientProperties.IN_ONLY);
---------------------------------------------------------------------
To unsubscribe, e-mail: sandesha-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: sandesha-dev-help@ws.apache.org