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 di...@apache.org on 2004/05/03 14:52:37 UTC
cvs commit: ws-fx/sandesha/src/org/apache/sandesha/ws/rm/handlers RMServerRequestHandler.java
dims 2004/05/03 05:52:37
Modified: sandesha/src/org/apache/sandesha/ws/rm
AcknowledgementRange.java LastMessage.java
MessageNumber.java Nack.java
sandesha/src/org/apache/sandesha/client
ClientMessageController.java RMClientService.java
sandesha/src/org/apache/sandesha Constants.java
RMMessage.java RMSequence.java
sandesha/src/org/apache/sandesha/ws/utility Identifier.java
sandesha/src/org/apache/sandesha/server MessageInserter.java
ServerMessageController.java
sandesha/src/org/apache/sandesha/ws/rm/providers
RMProvider.java
sandesha/src/org/apache/sandesha/ws/rm/handlers
RMServerRequestHandler.java
Log:
- Add logging of exceptions
- javadoc changes
- fix typos in names.
Revision Changes Path
1.6 +2 -1 ws-fx/sandesha/src/org/apache/sandesha/ws/rm/AcknowledgementRange.java
Index: AcknowledgementRange.java
===================================================================
RCS file: /home/cvs/ws-fx/sandesha/src/org/apache/sandesha/ws/rm/AcknowledgementRange.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- AcknowledgementRange.java 2 May 2004 16:52:59 -0000 1.5
+++ AcknowledgementRange.java 3 May 2004 12:52:36 -0000 1.6
@@ -18,6 +18,7 @@
package org.apache.sandesha.ws.rm;
import org.apache.axis.message.MessageElement;
+import org.apache.sandesha.Constants;
import javax.xml.soap.SOAPElement;
import javax.xml.soap.SOAPException;
@@ -103,7 +104,7 @@
throws SOAPException {
SOAPElement ackRange =
- msgElement.addChildElement("AcknowledgementRange", "wsrm");
+ msgElement.addChildElement("AcknowledgementRange", Constants.NS_PREFIX_RM);
ackRange.setAttribute("Upper", new Long(maxValue).toString());
ackRange.setAttribute("Lower", new Long(minValue).toString());
1.5 +2 -1 ws-fx/sandesha/src/org/apache/sandesha/ws/rm/LastMessage.java
Index: LastMessage.java
===================================================================
RCS file: /home/cvs/ws-fx/sandesha/src/org/apache/sandesha/ws/rm/LastMessage.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- LastMessage.java 2 May 2004 16:52:59 -0000 1.4
+++ LastMessage.java 3 May 2004 12:52:36 -0000 1.5
@@ -18,6 +18,7 @@
package org.apache.sandesha.ws.rm;
import org.apache.axis.message.MessageElement;
+import org.apache.sandesha.Constants;
import javax.xml.soap.SOAPException;
@@ -88,7 +89,7 @@
public MessageElement toSOAPEnvelope(MessageElement msgElement)
throws SOAPException {
- msgElement.addChildElement("LastMessage", "wsrm");
+ msgElement.addChildElement("LastMessage", Constants.NS_PREFIX_RM);
return msgElement;
}
1.6 +2 -1 ws-fx/sandesha/src/org/apache/sandesha/ws/rm/MessageNumber.java
Index: MessageNumber.java
===================================================================
RCS file: /home/cvs/ws-fx/sandesha/src/org/apache/sandesha/ws/rm/MessageNumber.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- MessageNumber.java 2 May 2004 16:52:59 -0000 1.5
+++ MessageNumber.java 3 May 2004 12:52:36 -0000 1.6
@@ -18,6 +18,7 @@
package org.apache.sandesha.ws.rm;
import org.apache.axis.message.MessageElement;
+import org.apache.sandesha.Constants;
import javax.xml.soap.SOAPException;
@@ -101,7 +102,7 @@
public MessageElement toSOAPEnvelope(MessageElement msgElement)
throws SOAPException {
- msgElement.addChildElement("MessageNumber", "wsrm").addTextNode((new Long(messageNumber)).toString());
+ msgElement.addChildElement("MessageNumber", Constants.NS_PREFIX_RM).addTextNode((new Long(messageNumber)).toString());
return msgElement;
}
1.6 +2 -2 ws-fx/sandesha/src/org/apache/sandesha/ws/rm/Nack.java
Index: Nack.java
===================================================================
RCS file: /home/cvs/ws-fx/sandesha/src/org/apache/sandesha/ws/rm/Nack.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Nack.java 2 May 2004 16:52:59 -0000 1.5
+++ Nack.java 3 May 2004 12:52:36 -0000 1.6
@@ -18,6 +18,7 @@
package org.apache.sandesha.ws.rm;
import org.apache.axis.message.MessageElement;
+import org.apache.sandesha.Constants;
import javax.xml.soap.SOAPException;
@@ -91,8 +92,7 @@
public MessageElement toSOAPEnvelope(MessageElement msgElement)
throws SOAPException {
- msgElement.addChildElement("Nack", "wsrm").addTextNode((new Long(notAckNum)).toString());
- ;
+ msgElement.addChildElement("Nack", Constants.NS_PREFIX_RM).addTextNode((new Long(notAckNum)).toString());
return msgElement;
}
1.6 +1 -1 ws-fx/sandesha/src/org/apache/sandesha/client/ClientMessageController.java
Index: ClientMessageController.java
===================================================================
RCS file: /home/cvs/ws-fx/sandesha/src/org/apache/sandesha/client/ClientMessageController.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ClientMessageController.java 2 May 2004 16:53:00 -0000 1.5
+++ ClientMessageController.java 3 May 2004 12:52:36 -0000 1.6
@@ -82,7 +82,7 @@
public void storeSequence(RMSequence sequence) {
// System.out.println("----------------storeSequence::"+sequence.getSequenceIdetifer());
- sequenceMap.put(sequence.getSequenceIdetifer().toString(), sequence);
+ sequenceMap.put(sequence.getSequenceIdentifier().toString(), sequence);
}
/**
1.6 +14 -15 ws-fx/sandesha/src/org/apache/sandesha/client/RMClientService.java
Index: RMClientService.java
===================================================================
RCS file: /home/cvs/ws-fx/sandesha/src/org/apache/sandesha/client/RMClientService.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- RMClientService.java 3 May 2004 12:06:13 -0000 1.5
+++ RMClientService.java 3 May 2004 12:52:36 -0000 1.6
@@ -22,6 +22,7 @@
import org.apache.axis.client.Service;
import org.apache.axis.components.uuid.UUIDGen;
import org.apache.axis.components.uuid.UUIDGenFactory;
+import org.apache.axis.components.logger.LogFactory;
import org.apache.axis.message.MessageElement;
import org.apache.axis.message.SOAPEnvelope;
import org.apache.axis.message.addressing.Action;
@@ -40,6 +41,7 @@
import org.apache.sandesha.ws.rm.Sequence;
import org.apache.sandesha.ws.rm.SequenceAcknowledgement;
import org.apache.sandesha.ws.utility.Identifier;
+import org.apache.commons.logging.Log;
import javax.xml.rpc.ServiceException;
import javax.xml.soap.SOAPException;
@@ -57,11 +59,15 @@
* @author Sudar Nimalan
*/
public class RMClientService {
+ /**
+ * Field log
+ */
+ protected static Log log = LogFactory.getLog(RMClientService.class.getName());
/**
* Field retransmissinInterval
*/
- private long retransmissinInterval;
+ private long retransmissionInterval;
/**
* Field retransmissionCount
@@ -72,7 +78,7 @@
* Constructor RMClientService
*/
public RMClientService() {
- retransmissinInterval = Constants.RETRANSMISSION_INTERVAL;
+ retransmissionInterval = Constants.RETRANSMISSION_INTERVAL;
}
/**
@@ -321,9 +327,7 @@
stringReturn =
rmMessage.getResponseMessage().getSOAPPartAsString();
} catch (AxisFault e2) {
-
- // TODO Auto-generated catch block
- e2.printStackTrace();
+ log.error(e2);
}
break;
@@ -342,25 +346,20 @@
System.out.println("GGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGG");
System.out.println(stringReturn);
} catch (Exception e1) {
-
- // TODO Auto-generated catch block
- e1.printStackTrace();
+ log.error(e1);
}
}
// /System.out.println(stringReturn);
// Not handle let finlly to handle it.
} catch (ServiceException e) {
-
- // TODO Auto-generated catch block
+ log.error(e);
} catch (SOAPException e) {
-
- // TODO Auto-generated catch block
+ log.error(e);
} catch (Exception e) {
-
- // TODO Auto-generated catch block
// If it is comming to this location then there will be an severe error than the
// HTTP termination.
+ log.error(e);
}
}
}
@@ -406,7 +405,7 @@
* put them back in the data structure
*
* @param identifier
- * @param message
+ * @param message
* @throws AxisFault
*/
private void setAckedMessages(Identifier identifier, Message message)
1.5 +2 -2 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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Constants.java 3 May 2004 12:06:13 -0000 1.4
+++ Constants.java 3 May 2004 12:52:36 -0000 1.5
@@ -85,12 +85,12 @@
* Field NS_URI_RM
*/
public static final String NS_URI_RM = "http://schemas.xmlsoap.org/ws/2004/03/rm";
-
+
/**
* Field WSU_PREFIX
*/
public static final String WSU_PREFIX = "wsu";
-
+
/**
* Field WSU_NS
*/
1.4 +127 -25 ws-fx/sandesha/src/org/apache/sandesha/RMMessage.java
Index: RMMessage.java
===================================================================
RCS file: /home/cvs/ws-fx/sandesha/src/org/apache/sandesha/RMMessage.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- RMMessage.java 2 May 2004 16:53:00 -0000 1.3
+++ RMMessage.java 3 May 2004 12:52:36 -0000 1.4
@@ -25,102 +25,104 @@
import org.apache.sandesha.ws.utility.Identifier;
/**
- * class RMMessage
+ * class RMMessage.
+ * <p/>
*
- * @author Amila Navarathna
- * @author Jaliya Ekanayaka
- * @author Sudar Nimalan
+ * @author Amila Navarathna.
+ * @author Jaliya Ekanayaka.
+ * @author Sudar Nimalan.
*/
public class RMMessage {
/**
- * Field requestMessage
+ * Field requestMessage.
*/
Message requestMessage;
/**
- * Field responseMessage
+ * Field responseMessage.
*/
Message responseMessage;
/**
- * Field messageNumber
+ * Field messageNumber.
*/
long messageNumber;
/**
- * Field rmHeaders
+ * Field rmHeaders.
*/
RMHeaders rmHeaders;
/**
- * Field addressingHeaders
+ * Field addressingHeaders.
*/
AddressingHeaders addressingHeaders;
/**
- * Field acknowledged
+ * Field acknowledged.
*/
boolean acknowledged;
/**
- * Field identifier
+ * Field identifier.
*/
Identifier identifier;
/**
- * Field operation
+ * Field operation.
*/
OperationDesc operation;
/**
- * Field serviceDesc
+ * Field serviceDesc.
*/
ServiceDesc serviceDesc;
/**
- * Field serviceObject
+ * Field serviceObject.
*/
Object serviceObject;
/**
- * Field EncodingStyle
+ * Field EncodingStyle.
*/
String EncodingStyle;
/**
- * Field destinationURL
+ * Field destinationURL.
*/
private String destinationURL;
/**
- * Field toClientServiceURL
+ * Field toClientServiceURL.
*/
private String toClientServiceURL;
/**
- * Field isOneWay
+ * Field isOneWay.
*/
private String isOneWay;
/**
- * Field isCreateSequence
+ * Field isCreateSequence.
*/
private String isCreateSequence;
/**
- * Field isResponseExpected
+ * Field isResponseExpected.
*/
private String isResponseExpected;
/**
- * Constructor RMMessage
+ * Constructor RMMessage.
*/
public RMMessage() {
}
/**
- * Constructor RMMessage
+ * Constructor RMMessage.
+ * <p/>
*
* @param message
*/
@@ -129,6 +131,9 @@
}
/**
+ * method getAddressingHeaders.
+ * <p/>
+ *
* @return
*/
public AddressingHeaders getAddressingHeaders() {
@@ -136,6 +141,9 @@
}
/**
+ * method getMessageNumber
+ * <p/>
+ *
* @return
*/
public long getMessageNumber() {
@@ -143,6 +151,9 @@
}
/**
+ * method getRequestMessage
+ * <p/>
+ *
* @return
*/
public Message getRequestMessage() {
@@ -150,6 +161,9 @@
}
/**
+ * method getResponseMessage
+ * <p/>
+ *
* @return
*/
public Message getResponseMessage() {
@@ -157,6 +171,9 @@
}
/**
+ * method getRMHeaders
+ * <p/>
+ *
* @return
*/
public RMHeaders getRMHeaders() {
@@ -164,6 +181,9 @@
}
/**
+ * method setAddressingHeaders
+ * <p/>
+ *
* @param headers
*/
public void setAddressingHeaders(AddressingHeaders headers) {
@@ -171,6 +191,9 @@
}
/**
+ * method setMessageNumber
+ * <p/>
+ *
* @param l
*/
public void setMessageNumber(long l) {
@@ -178,6 +201,9 @@
}
/**
+ * method setRequestMessage
+ * <p/>
+ *
* @param message
*/
public void setRequestMessage(Message message) {
@@ -185,6 +211,9 @@
}
/**
+ * method setResponseMessage
+ * <p/>
+ *
* @param message
*/
public void setResponseMessage(Message message) {
@@ -192,6 +221,9 @@
}
/**
+ * method setRMHeaders.
+ * <p/>
+ *
* @param headers
*/
public void setRMHeaders(RMHeaders headers) {
@@ -199,6 +231,9 @@
}
/**
+ * method isAcknowledged.
+ * <p/>
+ *
* @return
*/
public boolean isAcknowledged() {
@@ -206,6 +241,9 @@
}
/**
+ * method setAcknowledged.
+ * <p/>
+ *
* @param b
*/
public void setAcknowledged(boolean b) {
@@ -213,6 +251,9 @@
}
/**
+ * method getIdentifier.
+ * <p/>
+ *
* @return
*/
public Identifier getIdentifier() {
@@ -220,15 +261,19 @@
}
/**
- * method setIdentifier
+ * method setIdentifier.
+ * <p/>
*
- * @param id
+ * @param id
*/
public void setIdentifier(Identifier id) {
identifier = id;
}
/**
+ * method getOperation.
+ * <p/>
+ *
* @return
*/
public OperationDesc getOperation() {
@@ -236,6 +281,9 @@
}
/**
+ * method setOperation.
+ * <p/>
+ *
* @param desc
*/
public void setOperation(OperationDesc desc) {
@@ -243,6 +291,9 @@
}
/**
+ * method getServiceDesc
+ * <p/>
+ *
* @return
*/
public ServiceDesc getServiceDesc() {
@@ -250,6 +301,9 @@
}
/**
+ * method setServiceDesc.
+ * <p/>
+ *
* @param desc
*/
public void setServiceDesc(ServiceDesc desc) {
@@ -257,6 +311,9 @@
}
/**
+ * method getServiceObject.
+ * <p/>
+ *
* @return
*/
public Object getServiceObject() {
@@ -264,6 +321,9 @@
}
/**
+ * method setServiceObject.
+ * <p/>
+ *
* @param object
*/
public void setServiceObject(Object object) {
@@ -271,6 +331,9 @@
}
/**
+ * method getEncodingStyle.
+ * <p/>
+ *
* @return
*/
public String getEncodingStyle() {
@@ -278,6 +341,9 @@
}
/**
+ * method setEncodingStyle.
+ * <p/>
+ *
* @param string
*/
public void setEncodingStyle(String string) {
@@ -285,6 +351,9 @@
}
/**
+ * method getIsCreateSequence.
+ * <p/>
+ *
* @return
*/
public String getIsCreateSequence() {
@@ -292,6 +361,9 @@
}
/**
+ * method getIsOneWay.
+ * <p/>
+ *
* @return
*/
public String getIsOneWay() {
@@ -299,6 +371,9 @@
}
/**
+ * method getIsResponseExpected.
+ * <p/>
+ *
* @return
*/
public String getIsResponseExpected() {
@@ -306,6 +381,9 @@
}
/**
+ * method getRmHeaders.
+ * <p/>
+ *
* @return
*/
public RMHeaders getRmHeaders() {
@@ -313,6 +391,9 @@
}
/**
+ * method getToClientServiceURL
+ * <p/>
+ *
* @return
*/
public String getToClientServiceURL() {
@@ -320,6 +401,9 @@
}
/**
+ * method setIsCreateSequence.
+ * <p/>
+ *
* @param string
*/
public void setIsCreateSequence(String string) {
@@ -327,6 +411,9 @@
}
/**
+ * method setIsOneWay.
+ * <p/>
+ *
* @param string
*/
public void setIsOneWay(String string) {
@@ -334,6 +421,9 @@
}
/**
+ * method setIsResponseExpected.
+ * <p/>
+ *
* @param string
*/
public void setIsResponseExpected(String string) {
@@ -341,6 +431,9 @@
}
/**
+ * method setRmHeaders.
+ * <p/>
+ *
* @param headers
*/
public void setRmHeaders(RMHeaders headers) {
@@ -348,6 +441,9 @@
}
/**
+ * method setToClientServiceURL.
+ * <p/>
+ *
* @param string
*/
public void setToClientServiceURL(String string) {
@@ -355,6 +451,9 @@
}
/**
+ * method getDestinationURL.
+ * <p/>
+ *
* @return
*/
public String getDestinationURL() {
@@ -362,9 +461,12 @@
}
/**
+ * method setDestinationURL.
+ * <p/>
+ *
* @param string
*/
public void setDestinationURL(String string) {
destinationURL = string;
}
-}
+}
\ No newline at end of file
1.6 +49 -46 ws-fx/sandesha/src/org/apache/sandesha/RMSequence.java
Index: RMSequence.java
===================================================================
RCS file: /home/cvs/ws-fx/sandesha/src/org/apache/sandesha/RMSequence.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- RMSequence.java 2 May 2004 16:53:00 -0000 1.5
+++ RMSequence.java 3 May 2004 12:52:36 -0000 1.6
@@ -16,12 +16,11 @@
*/
package org.apache.sandesha;
-import org.apache.axis.AxisFault;
import org.apache.axis.Message;
import org.apache.axis.client.Call;
+import org.apache.axis.components.logger.LogFactory;
import org.apache.axis.description.OperationDesc;
import org.apache.axis.description.ParameterDesc;
-import org.apache.axis.description.ServiceDesc;
import org.apache.axis.message.RPCElement;
import org.apache.axis.message.RPCParam;
import org.apache.axis.message.SOAPBodyElement;
@@ -32,6 +31,7 @@
import org.apache.axis.message.addressing.ReplyTo;
import org.apache.axis.message.addressing.To;
import org.apache.axis.utils.JavaUtils;
+import org.apache.commons.logging.Log;
import org.apache.sandesha.ws.rm.AcknowledgementRange;
import org.apache.sandesha.ws.rm.RMHeaders;
import org.apache.sandesha.ws.rm.SequenceAcknowledgement;
@@ -55,6 +55,10 @@
* @author Sudar Nimalan
*/
public class RMSequence {
+ /**
+ * Field log
+ */
+ protected static Log log = LogFactory.getLog(RMSequence.class.getName());
/**
* Field messageList
@@ -64,7 +68,7 @@
/**
* Field sequenceIdetifer
*/
- private Identifier sequenceIdetifer;
+ private Identifier sequenceIdentifier;
/**
* Field nextMessageNo
@@ -82,24 +86,23 @@
private long maxMessageNumber;
/**
+ * Field lastProcessedMessageNumber
+ */
+ private long lastProcessedMessageNumber;
+
+ /**
* Constructor RMSequence
*
* @param identifier
*/
public RMSequence(Identifier identifier) {
-
- this.sequenceIdetifer = identifier;
+ this.sequenceIdentifier = identifier;
messageList = new HashMap();
nextMessageNo = 1;
maxMessageNumber = 0;
}
/**
- * Field lastProcessedMessageNumber
- */
- private long lastProcessedMessageNumber;
-
- /**
* Constructor RMSequence
*/
public RMSequence() {
@@ -110,10 +113,10 @@
/**
* Method getSequenceIdetifer
*
- * @return
+ * @return Identifier
*/
- public Identifier getSequenceIdetifer() {
- return sequenceIdetifer;
+ public Identifier getSequenceIdentifier() {
+ return sequenceIdentifier;
}
/**
@@ -126,14 +129,12 @@
// System.out.println("RMSequence::processMessage");
if (messageList.get(new Long(lastProcessedMessageNumber + 1)) != null) {
- // //////////////
// System.out.println("processMessage processing.............");
rmMessge =
(RMMessage) messageList.get(new Long(lastProcessedMessageNumber
+ 1));
// System.out.println( "RMMessage ................................********"+ rmMessge);
- ServiceDesc serviceDesc = rmMessge.getServiceDesc();
OperationDesc operation = rmMessge.getOperation();
try {
@@ -357,9 +358,7 @@
addAddressingHeader(responseEnv, resFrom,
resTo, null);
} catch (Exception e) {
-
- // TODO Auto-generated catch block
- e.printStackTrace();
+ log.error(e);
}
}
@@ -416,9 +415,7 @@
addAddressingHeader(responseEnv, resFrom,
resTo, null);
} catch (Exception e) {
-
- // TODO Auto-generated catch block
- e.printStackTrace();
+ log.error(e);
}
}
@@ -463,9 +460,7 @@
addAddressingHeader(ackEnv, resFrom, resTo,
null);
} catch (Exception e) {
-
- // TODO Auto-generated catch block
- e.printStackTrace();
+ log.error(e);
}
}
@@ -485,7 +480,7 @@
// System.out.println("Res=null");
SOAPEnvelope responseEnv = new SOAPEnvelope();
- SOAPBodyElement reponceBody =
+ SOAPBodyElement responseBody =
new SOAPBodyElement(responseEnv.createName(""));
RMHeaders resHeaders = new RMHeaders();
@@ -533,9 +528,7 @@
addAddressingHeader(responseEnv, resFrom, resTo,
null);
} catch (Exception e) {
-
- // TODO Auto-generated catch block
- e.printStackTrace();
+ log.error(e);
}
}
@@ -553,14 +546,8 @@
}
// System.out.println("00-----0000----at the end of processing message.");
- } catch (AxisFault e) {
-
- // TODO Auto-generated catch block
- e.printStackTrace();
} catch (Exception e) {
-
- // TODO Auto-generated catch block
- e.printStackTrace();
+ log.error(e);
}
// ////////
@@ -703,8 +690,8 @@
/**
* @param identifier
*/
- public void setSequenceIdetifer(Identifier identifier) {
- sequenceIdetifer = identifier;
+ public void setSequenceIdentifier(Identifier identifier) {
+ sequenceIdentifier = identifier;
}
/**
@@ -715,6 +702,8 @@
}
/**
+ * method setNextMessageNo
+ *
* @param l
*/
public void setNextMessageNo(long l) {
@@ -722,7 +711,9 @@
}
/**
- * @return TODO:
+ * method getSeqAck
+ *
+ * @return SequenceAcknowledgement
*/
public SequenceAcknowledgement getSeqAck() {
return seqAck;
@@ -731,7 +722,7 @@
/**
* Method getSequenceAcknowledgement
*
- * @return
+ * @return SequenceAcknowledgement
*/
public SequenceAcknowledgement getSequenceAcknowledgement() {
@@ -770,7 +761,7 @@
ackRange.setMinValue(min);
ackRange.setMaxValue(max);
seqAck.addAckRanges(ackRange);
- seqAck.setIdentifier(this.getSequenceIdetifer());
+ seqAck.setIdentifier(this.getSequenceIdentifier());
}
}
}
@@ -807,18 +798,20 @@
}
/**
- * @param acknowledgement TODO:
+ * method setSeqAck
+ *
+ * @param acknowledgement
*/
public void setSeqAck(SequenceAcknowledgement acknowledgement) {
seqAck = acknowledgement;
}
/**
- * Method setResponceMessage
+ * Method setResponseMessage
*
* @param resMsg
*/
- public void setResponceMessage(RMMessage resMsg) {
+ public void setResponseMessage(RMMessage resMsg) {
RMMessage rmMsg =
(RMMessage) messageList.get((new Long(resMsg.getMessageNumber())));
@@ -858,27 +851,35 @@
}
/**
- * @return
+ * method getLastProcessedMessageNumber
+ *
+ * @return long
*/
public long getLastProcessedMessageNumber() {
return lastProcessedMessageNumber;
}
/**
- * @return
+ * method getMaxMessageNumber
+ *
+ * @return long
*/
public long getMaxMessageNumber() {
return maxMessageNumber;
}
/**
- * @return
+ * method getMessageList
+ *
+ * @return long
*/
public Map getMessageList() {
return messageList;
}
/**
+ * method setLastProcessedMessageNumber
+ *
* @param l
*/
public void setLastProcessedMessageNumber(long l) {
@@ -886,6 +887,8 @@
}
/**
+ * method setMaxMessageNumber
+ *
* @param l
*/
public void setMaxMessageNumber(long l) {
1.6 +0 -16 ws-fx/sandesha/src/org/apache/sandesha/ws/utility/Identifier.java
Index: Identifier.java
===================================================================
RCS file: /home/cvs/ws-fx/sandesha/src/org/apache/sandesha/ws/utility/Identifier.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Identifier.java 2 May 2004 16:53:00 -0000 1.5
+++ Identifier.java 3 May 2004 12:52:36 -0000 1.6
@@ -120,22 +120,6 @@
identifier = string;
}
- /*
- * (non-Javadoc)
- * @see org.apache.sandesha.ws.rm.IRmElement#addChildElement(org.apache.axis.message.MessageElement)
- */
-
- /**
- * Method addChildElement
- *
- * @param element
- * @throws SOAPException
- */
- public void addChildElement(MessageElement element) throws SOAPException {
-
- // TODO Auto-generated method stub
- }
-
/**
* Method equals
*
1.5 +13 -24 ws-fx/sandesha/src/org/apache/sandesha/server/MessageInserter.java
Index: MessageInserter.java
===================================================================
RCS file: /home/cvs/ws-fx/sandesha/src/org/apache/sandesha/server/MessageInserter.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- MessageInserter.java 3 May 2004 12:06:13 -0000 1.4
+++ MessageInserter.java 3 May 2004 12:52:36 -0000 1.5
@@ -18,6 +18,7 @@
import org.apache.axis.Message;
import org.apache.axis.MessageContext;
+import org.apache.axis.components.logger.LogFactory;
import org.apache.axis.client.Call;
import org.apache.axis.message.SOAPEnvelope;
import org.apache.axis.message.addressing.Address;
@@ -32,6 +33,7 @@
import org.apache.sandesha.ws.rm.RMHeaders;
import org.apache.sandesha.ws.rm.SequenceAcknowledgement;
import org.apache.sandesha.ws.utility.Identifier;
+import org.apache.commons.logging.Log;
import java.net.MalformedURLException;
@@ -43,6 +45,10 @@
* @author Sudar Nimalan
*/
public class MessageInserter implements Runnable {
+ /**
+ * Field log
+ */
+ protected static Log log = LogFactory.getLog(MessageInserter.class.getName());
/**
* Field msgContext
@@ -79,9 +85,7 @@
try {
Thread.sleep(2000);
} catch (InterruptedException e3) {
-
- // TODO Auto-generated catch block
- e3.printStackTrace();
+ log.error(e3);
}
// ///////////
@@ -131,9 +135,7 @@
try {
ackResRMHeaders.toSoapEnvelop(ackResEnv);
} catch (Exception e1) {
-
- // TODO Auto-generated catch block
- e1.printStackTrace();
+ log.error(e1);
}
Address from;
@@ -161,14 +163,8 @@
+ to.getPath()));
addAddressingHeader(ackResEnv, resFrom, resTo, null);
- } catch (MalformedURIException e) {
-
- // TODO Auto-generated catch block
- e.printStackTrace();
} catch (Exception e) {
-
- // TODO Auto-generated catch block
- e.printStackTrace();
+ log.error(e);
}
}
@@ -177,17 +173,10 @@
try {
call = new Call(addressingHeaders.getFrom().getAddress().toString());
-
call.setRequestMessage(ackResMsg);
-
- try {
- call.invoke();
- } catch (Exception e) {
- }
- } catch (MalformedURLException e2) {
-
- // TODO Auto-generated catch block
- e2.printStackTrace();
+ call.invoke();
+ } catch (Exception e2) {
+ log.error(e2);
}
}
@@ -237,7 +226,7 @@
resMsg.setResponseMessage(message.getRequestMessage());
}
- responsedSeq.setResponceMessage(message);
+ responsedSeq.setResponseMessage(message);
}
}
}
1.5 +1 -1 ws-fx/sandesha/src/org/apache/sandesha/server/ServerMessageController.java
Index: ServerMessageController.java
===================================================================
RCS file: /home/cvs/ws-fx/sandesha/src/org/apache/sandesha/server/ServerMessageController.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ServerMessageController.java 2 May 2004 16:53:00 -0000 1.4
+++ ServerMessageController.java 3 May 2004 12:52:36 -0000 1.5
@@ -89,7 +89,7 @@
} else {
rmSeq = new RMSequence();
- rmSeq.setSequenceIdetifer(message.getIdentifier());
+ rmSeq.setSequenceIdentifier(message.getIdentifier());
sequences.put(message.getIdentifier().toString(), rmSeq);
rmSeq.insertServerMessage(message);
}
1.7 +3 -4 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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- RMProvider.java 3 May 2004 12:06:13 -0000 1.6
+++ RMProvider.java 3 May 2004 12:52:37 -0000 1.7
@@ -17,6 +17,7 @@
package org.apache.sandesha.ws.rm.providers;
import org.apache.axis.MessageContext;
+import org.apache.axis.AxisFault;
import org.apache.axis.message.SOAPEnvelope;
import org.apache.axis.message.addressing.AddressingHeaders;
import org.apache.axis.providers.java.RPCProvider;
@@ -200,7 +201,7 @@
resMsg.setResponseMessage(message.getRequestMessage());
}
- responsedSeq.setResponceMessage(message);
+ responsedSeq.setResponseMessage(message);
}
}
@@ -218,9 +219,7 @@
try {
ackResRMHeaders.toSoapEnvelop(msgContext.getResponseMessage().getSOAPEnvelope());
} catch (Exception e1) {
-
- // TODO Auto-generated catch block
- e1.printStackTrace();
+ throw AxisFault.makeFault(e1);
}
}
}
1.7 +2 -8 ws-fx/sandesha/src/org/apache/sandesha/ws/rm/handlers/RMServerRequestHandler.java
Index: RMServerRequestHandler.java
===================================================================
RCS file: /home/cvs/ws-fx/sandesha/src/org/apache/sandesha/ws/rm/handlers/RMServerRequestHandler.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- RMServerRequestHandler.java 3 May 2004 12:06:13 -0000 1.6
+++ RMServerRequestHandler.java 3 May 2004 12:52:37 -0000 1.7
@@ -48,14 +48,8 @@
try {
setPropertyToMessageContext(msgContext,
Constants.ENV_RM_REQUEST_HEADERS);
- } catch (AxisFault e) {
-
- // TODO Auto-generated catch block
- e.printStackTrace();
- } catch (SOAPException e) {
-
- // TODO Auto-generated catch block
- e.printStackTrace();
+ } catch (Exception e) {
+ throw AxisFault.makeFault(e);
}
}
}