jaliya 2005/02/21 04:08:22
Modified: sandesha/src/org/apache/sandesha Constants.java
EnvelopeCreator.java
sandesha/src/org/apache/sandesha/client
ClientPropertyValidator.java
ClientStorageManager.java RMSender.java
sandesha/src/org/apache/sandesha/server
MessageValidator.java RMInvoker.java
sandesha/src/org/apache/sandesha/server/msgprocessors
CompositeProcessor.java FaultProcessor.java
sandesha/src/org/apache/sandesha/ws/rm/providers
RMProvider.java
Log:
Revision Changes Path
1.29 +2 -0 ws-fx/sandesha/src/org/apache/sandesha/Constants.java
Index: Constants.java
===================================================================
RCS file: /home/cvs/ws-fx/sandesha/src/org/apache/sandesha/Constants.java,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- Constants.java 20 Feb 2005 17:42:38 -0000 1.28
+++ Constants.java 21 Feb 2005 12:08:21 -0000 1.29
@@ -267,6 +267,8 @@
public static final int CLIENT_RESPONSE_CHECKING_INTERVAL = 500;
public interface FaultMessages {
+ public static final String SERVER_INTERNAL_ERROR="Server Interanal
Error";
+
public static final String NO_ADDRESSING_HEADERS = "No Addressing
Headers Available in this Message";
public static final String NO_MESSAGE_ID = "MessageID should be
present in the message";
1.17 +1 -5
ws-fx/sandesha/src/org/apache/sandesha/EnvelopeCreator.java
Index: EnvelopeCreator.java
===================================================================
RCS file:
/home/cvs/ws-fx/sandesha/src/org/apache/sandesha/EnvelopeCreator.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- EnvelopeCreator.java 20 Feb 2005 08:49:45 -0000 1.16
+++ EnvelopeCreator.java 21 Feb 2005 12:08:21 -0000 1.17
@@ -97,9 +97,6 @@
} catch (Exception e) {
e.printStackTrace();
}
-
- //System.out.println(envelope.toString());
-
return envelope;
}
@@ -407,8 +404,7 @@
//Set the addressing headers to the SOAPEnvelope.
outGoingAddressingHaders.toEnvelope(requestEnvelope, null);
- //System.out.println(requestEnvelope.toString());
-
+
} catch (SOAPException e) {
// TODO Auto-generated catch block
e.printStackTrace();
1.8 +1 -2
ws-fx/sandesha/src/org/apache/sandesha/client/ClientPropertyValidator.java
Index: ClientPropertyValidator.java
===================================================================
RCS file:
/home/cvs/ws-fx/sandesha/src/org/apache/sandesha/client/ClientPropertyValidator.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ClientPropertyValidator.java 16 Feb 2005 04:21:21 -0000 1.7
+++ ClientPropertyValidator.java 21 Feb 2005 12:08:21 -0000 1.8
@@ -46,8 +46,7 @@
try {
sourceURL = getSourceURL(call);
- System.out.println("Souce URI " + sourceURL);
- } catch (UnknownHostException e) {
+ } catch (UnknownHostException e) {
// TODO Auto-generated catch block
throw new AxisFault(e.getMessage());
}
1.21 +2 -4
ws-fx/sandesha/src/org/apache/sandesha/client/ClientStorageManager.java
Index: ClientStorageManager.java
===================================================================
RCS file:
/home/cvs/ws-fx/sandesha/src/org/apache/sandesha/client/ClientStorageManager.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- ClientStorageManager.java 20 Feb 2005 17:42:38 -0000 1.20
+++ ClientStorageManager.java 21 Feb 2005 12:08:21 -0000 1.21
@@ -163,8 +163,7 @@
public boolean setApprovedOutSequence(String oldOutsequenceId, String
newOutSequenceId) {
boolean done = false;
- System.out.println(oldOutsequenceId+" "+newOutSequenceId);
- String sequenceID =
accessor.getSequenceOfOutSequence(oldOutsequenceId);
+ String sequenceID =
accessor.getSequenceOfOutSequence(oldOutsequenceId);
if (sequenceID == null) {
log.error("ERROR: setApprovedOutSequence()");
@@ -308,8 +307,7 @@
* @see
org.apache.sandesha.IStorageManager#addSendMsgNo(java.lang.String, long)
*/
public void addSendMsgNo(String seqId, long msgNo) {
- System.out.println( accessor.getSequenceOfOutSequence(seqId));
-
accessor.addSendMsgNo(accessor.getSequenceOfOutSequence(seqId),msgNo);
+
accessor.addSendMsgNo(accessor.getSequenceOfOutSequence(seqId),msgNo);
}
public void addOutgoingSequence(String sequenceId) {
1.25 +2 -5
ws-fx/sandesha/src/org/apache/sandesha/client/RMSender.java
Index: RMSender.java
===================================================================
RCS file:
/home/cvs/ws-fx/sandesha/src/org/apache/sandesha/client/RMSender.java,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- RMSender.java 20 Feb 2005 08:49:45 -0000 1.24
+++ RMSender.java 21 Feb 2005 12:08:21 -0000 1.25
@@ -88,7 +88,6 @@
Iterator ite = headers.iterator();
while (ite.hasNext()) {
- System.out.println("HHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHH");
SOAPHeaderElement headerElement = (SOAPHeaderElement)
ite.next();
headerElement.setMustUnderstand(false);
headerElement.setProcessed(true);
@@ -99,8 +98,7 @@
} else {
boolean gotAck = false;
while (!gotAck) {
- System.out.println("");
- gotAck =
checkTheQueueForAck(requestMesssageContext.getSequenceID(),
+ gotAck =
checkTheQueueForAck(requestMesssageContext.getSequenceID(),
requestMesssageContext.getMessageID());
Thread.sleep(Constants.CLIENT_RESPONSE_CHECKING_INTERVAL);
}
@@ -221,8 +219,7 @@
private RMMessageContext processFirstMessage(RMMessageContext
reqRMMsgContext,
AddressingHeaders
addrHeaders, boolean sync) throws Exception {
long nextMsgNumber = reqRMMsgContext.getMsgNumber();
- System.out.println(nextMsgNumber);
- UUIDGen uuidGen = UUIDGenFactory.getUUIDGen();
+ UUIDGen uuidGen = UUIDGenFactory.getUUIDGen();
//Set the tempUUID
String tempUUID = uuidGen.nextUUID();
RMMessageContext createSeqRMMsgContext =
getCreateSeqRMContext(reqRMMsgContext, addrHeaders, tempUUID);
1.8 +1 -2
ws-fx/sandesha/src/org/apache/sandesha/server/MessageValidator.java
Index: MessageValidator.java
===================================================================
RCS file:
/home/cvs/ws-fx/sandesha/src/org/apache/sandesha/server/MessageValidator.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- MessageValidator.java 20 Feb 2005 17:42:38 -0000 1.7
+++ MessageValidator.java 21 Feb 2005 12:08:21 -0000 1.8
@@ -68,8 +68,7 @@
if (sequence != null) {
String seqId = sequence.getIdentifier().getIdentifier();
if (!storageMgr.isRequestedSeqPresent(seqId)){
- System.out.println("I am Here
lllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllll");
- throw new AxisFault(new
QName(Constants.FaultCodes.WSRM_FAULT_UNKNOWN_SEQUENCE),
Constants.FaultMessages.UNKNOWN_SEQUENCE, null, null);
+ throw new AxisFault(new
QName(Constants.FaultCodes.WSRM_FAULT_UNKNOWN_SEQUENCE),
Constants.FaultMessages.UNKNOWN_SEQUENCE, null, null);
}
if (sequence.getMessageNumber() != null) {
long msgNo = sequence.getMessageNumber().getMessageNumber();
1.12 +1 -2
ws-fx/sandesha/src/org/apache/sandesha/server/RMInvoker.java
Index: RMInvoker.java
===================================================================
RCS file:
/home/cvs/ws-fx/sandesha/src/org/apache/sandesha/server/RMInvoker.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- RMInvoker.java 20 Feb 2005 08:49:45 -0000 1.11
+++ RMInvoker.java 21 Feb 2005 12:08:21 -0000 1.12
@@ -73,8 +73,7 @@
if (rmMessageContext.isLastMessage()) {
//Insert Terminate Sequnce.
- System.out.println("LAST MESSAGE IS THERE");
-
storageManager.insertTerminateSeqMessage(getTerminateSeqMessage(rmMessageContext));
+
storageManager.insertTerminateSeqMessage(getTerminateSeqMessage(rmMessageContext));
}
rpcProvider.invoke(rmMessageContext.getMsgContext());
1.5 +11 -31
ws-fx/sandesha/src/org/apache/sandesha/server/msgprocessors/CompositeProcessor.java
Index: CompositeProcessor.java
===================================================================
RCS file:
/home/cvs/ws-fx/sandesha/src/org/apache/sandesha/server/msgprocessors/CompositeProcessor.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- CompositeProcessor.java 20 Feb 2005 08:49:45 -0000 1.4
+++ CompositeProcessor.java 21 Feb 2005 12:08:21 -0000 1.5
@@ -16,17 +16,18 @@
*/
package org.apache.sandesha.server.msgprocessors;
+import org.apache.axis.AxisFault;
import org.apache.axis.Message;
import org.apache.axis.MessageContext;
-import org.apache.axis.AxisFault;
import org.apache.axis.message.addressing.AddressingHeaders;
import org.apache.axis.message.addressing.RelatesTo;
import org.apache.sandesha.Constants;
import org.apache.sandesha.IStorageManager;
-import org.apache.sandesha.RMException;
import org.apache.sandesha.RMMessageContext;
import org.apache.sandesha.ws.rm.RMHeaders;
+import javax.xml.namespace.QName;
+
/**
* @author
*/
@@ -40,49 +41,36 @@
public boolean processMessage(RMMessageContext rmMessageContext) throws
AxisFault {
- //if the message is and Ack then process the ack
- //if the message has a body then insert it to the queue
-
RMHeaders rmHeaders = rmMessageContext.getRMHeaders();
- AddressingHeaders addrHeaders
=rmMessageContext.getAddressingHeaders();
+ AddressingHeaders addrHeaders =
rmMessageContext.getAddressingHeaders();
AcknowledgementProcessor ackProcessor = new
AcknowledgementProcessor(this.storageManager);
if (rmHeaders.getSequenceAcknowledgement() != null) {
ackProcessor.processMessage(rmMessageContext);
}
if (rmHeaders.getSequence() != null) {
- System.out.println("EEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEE 1");
if (rmHeaders.getSequence().getMessageNumber() != null) {
- System.out.println("EEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEE
2");
String sequenceUUID =
rmHeaders.getSequence().getIdentifier().getIdentifier();
long messageNumber =
rmHeaders.getSequence().getMessageNumber().getMessageNumber();
- // System.out.println("EEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEE
"+storageManger.isMessageExist(sequenceID, messageNumber));
-
String seqId =
storageManager.getOutgoingSeqenceIdOfIncomingMsg(rmMessageContext);
boolean hasSequence = storageManager.isSequenceExist(seqId);
-
-
- if(addrHeaders.getRelatesTo()!=null &&
!addrHeaders.getRelatesTo().isEmpty()){
- RelatesTo relatesTo = (RelatesTo)
addrHeaders.getRelatesTo().get(0);
- String messageId = relatesTo.getURI().toString();
- seqId=storageManager.getOutgoingSeqOfMsg(messageId);
-
System.out.println("(((((((99999999999999999999999999999999999999 "+seqId);
+ if (addrHeaders.getRelatesTo() != null &&
!addrHeaders.getRelatesTo().isEmpty()) {
+ RelatesTo relatesTo = (RelatesTo)
addrHeaders.getRelatesTo().get(0);
+ String messageId = relatesTo.getURI().toString();
+ seqId = storageManager.getOutgoingSeqOfMsg(messageId);
}
- if(!hasSequence){
+ if (!hasSequence) {
storageManager.addIncomingSequence(seqId);
}
-
-
if (storageManager.isMessageExist(seqId, messageNumber) !=
true) {
//Create a copy of the RMMessageContext.
RMMessageContext rmMsgContext = new RMMessageContext();
//Copy the RMMEssageContext
rmMessageContext.copyContents(rmMsgContext);
- System.out.println("SETTING THE RESPONSE " +
sequenceUUID + " " + messageNumber);
rmMsgContext.setSequenceID(sequenceUUID);
rmMsgContext.setMsgNumber(messageNumber);
try {
@@ -93,22 +81,14 @@
//Copy the request and response messages.
String soapMsg =
rmMessageContext.getMsgContext().getRequestMessage().getSOAPPartAsString();
Message reqMsg = new Message(soapMsg);
- //Message resMsg = new Message(rmMessageContext
- // .getMsgContext().getResponseMessage()
- // .getSOAPPartAsString());
- //Set the request and response messages of the
message
- // context.
- msgContext.setRequestMessage(reqMsg);
- //msgContext.setResponseMessage(resMsg);
-
- //rmMsgContext.setReqEnv(reqMsg.getSOAPEnvelope());
- //rmMsgContext.setResEnv(resMsg.getSOAPEnvelope());
+ msgContext.setRequestMessage(reqMsg);
rmMsgContext.setMsgContext(msgContext);
//Set the message type for this message.
rmMsgContext.setMessageType(Constants.MSG_TYPE_SERVICE_REQUEST);
} catch (Exception e) {
e.printStackTrace();
+ throw new AxisFault(new
QName(Constants.FaultCodes.WSRM_SERVER_INTERNAL_ERROR),
Constants.FaultMessages.SERVER_INTERNAL_ERROR, null, null);
//TODO: Add to log.
}
1.5 +1 -1
ws-fx/sandesha/src/org/apache/sandesha/server/msgprocessors/FaultProcessor.java
Index: FaultProcessor.java
===================================================================
RCS file:
/home/cvs/ws-fx/sandesha/src/org/apache/sandesha/server/msgprocessors/FaultProcessor.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- FaultProcessor.java 20 Feb 2005 08:49:45 -0000 1.4
+++ FaultProcessor.java 21 Feb 2005 12:08:21 -0000 1.5
@@ -78,7 +78,7 @@
}
*/
- soapFault = new SOAPFault(this.axisFault);
+ soapFault = new SOAPFault(this.axisFault);
return sendFault(rmMessageContext, soapFault);
1.34 +1 -3
ws-fx/sandesha/src/org/apache/sandesha/ws/rm/providers/RMProvider.java
Index: RMProvider.java
===================================================================
RCS file:
/home/cvs/ws-fx/sandesha/src/org/apache/sandesha/ws/rm/providers/RMProvider.java,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- RMProvider.java 20 Feb 2005 08:49:45 -0000 1.33
+++ RMProvider.java 21 Feb 2005 12:08:21 -0000 1.34
@@ -54,7 +54,6 @@
public void processMessage(MessageContext msgContext, SOAPEnvelope
reqEnv, SOAPEnvelope resEnv, Object obj)
throws Exception {
- System.out.println("RMProvider Received a SOAP REQUEST.....\n");
RMProvider.log.info("RMProvider Received a SOAP REQUEST");
@@ -95,8 +94,7 @@
msgContext.setResponseMessage(null);
}
} catch (AxisFault af) {
-
System.out.println("GGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGG");
- RMProvider.log.error(af);
+ RMProvider.log.error(af);
FaultProcessor faultProcessor = new
FaultProcessor(storageManager, af);
