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/03/02 16:15:29 UTC
cvs commit: ws-fx/sandesha/src/org/apache/sandesha/server/msgprocessors AcknowledgementProcessor.java CompositeProcessor.java
jaliya 2005/03/02 07:15:29
Modified: sandesha/src/org/apache/sandesha RMInitiator.java
RMMessageContext.java
sandesha/src/org/apache/sandesha/client RMSender.java
sandesha/src/org/apache/sandesha/server
MessageValidator.java RMInvoker.java Sender.java
sandesha/src/org/apache/sandesha/server/msgprocessors
AcknowledgementProcessor.java
CompositeProcessor.java
Log:
Added the loging
Revision Changes Path
1.8 +6 -2 ws-fx/sandesha/src/org/apache/sandesha/RMInitiator.java
Index: RMInitiator.java
===================================================================
RCS file: /home/cvs/ws-fx/sandesha/src/org/apache/sandesha/RMInitiator.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- RMInitiator.java 2 Mar 2005 03:16:31 -0000 1.7
+++ RMInitiator.java 2 Mar 2005 15:15:29 -0000 1.8
@@ -21,12 +21,15 @@
import org.apache.axis.handlers.soap.SOAPService;
import org.apache.axis.server.AxisServer;
import org.apache.axis.transport.http.SimpleAxisServer;
+import org.apache.axis.components.logger.LogFactory;
import org.apache.sandesha.client.ClientStorageManager;
import org.apache.sandesha.server.RMInvoker;
import org.apache.sandesha.server.Sender;
import org.apache.sandesha.server.ServerStorageManager;
import org.apache.sandesha.util.PropertyLoader;
import org.apache.sandesha.ws.rm.providers.RMProvider;
+import org.apache.sandesha.storage.dao.SandeshaQueueDAO;
+import org.apache.commons.logging.Log;
import org.w3c.dom.Document;
import javax.xml.namespace.QName;
@@ -52,6 +55,7 @@
private static Thread thSender;
private static Thread thInvoker;
private static Sender sender;
+ private static final Log log = LogFactory.getLog(SandeshaQueueDAO.class.getName());
public static IStorageManager init(boolean client) {
if (client) {
@@ -104,7 +108,7 @@
System.out.println("INFO : Waiting to Stop Client .....");
Thread.sleep(Constants.CLIENT_WAIT_PERIOD_FOR_COMPLETE);
} catch (InterruptedException e) {
- e.printStackTrace(); //To change body of catch statement use File | Settings | File Templates.
+ log.error(e);
}
}
@@ -143,7 +147,7 @@
Thread serverThread = new Thread(sas);
serverThread.start();
} catch (Exception e) {
- e.printStackTrace();
+ log.error(e);
}
1.22 +6 -1 ws-fx/sandesha/src/org/apache/sandesha/RMMessageContext.java
Index: RMMessageContext.java
===================================================================
RCS file: /home/cvs/ws-fx/sandesha/src/org/apache/sandesha/RMMessageContext.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- RMMessageContext.java 16 Feb 2005 04:21:20 -0000 1.21
+++ RMMessageContext.java 2 Mar 2005 15:15:29 -0000 1.22
@@ -18,8 +18,11 @@
import org.apache.axis.AxisFault;
import org.apache.axis.MessageContext;
+import org.apache.axis.components.logger.LogFactory;
import org.apache.axis.message.addressing.AddressingHeaders;
import org.apache.sandesha.ws.rm.RMHeaders;
+import org.apache.sandesha.storage.dao.SandeshaQueueDAO;
+import org.apache.commons.logging.Log;
import java.util.Iterator;
@@ -68,6 +71,8 @@
private boolean ackReceived = false;
+ private static final Log log = LogFactory.getLog(SandeshaQueueDAO.class.getName());
+
/**
* @return Returns the responseReceived.
*/
@@ -461,7 +466,7 @@
} catch (AxisFault e) {
// TODO Auto-generated catch block
- e.printStackTrace();
+ log.error(e);
}
}
1.30 +5 -1 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.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- RMSender.java 2 Mar 2005 03:16:31 -0000 1.29
+++ RMSender.java 2 Mar 2005 15:15:29 -0000 1.30
@@ -18,12 +18,15 @@
import org.apache.axis.AxisFault;
import org.apache.axis.MessageContext;
+import org.apache.axis.components.logger.LogFactory;
import org.apache.axis.message.SOAPHeaderElement;
import org.apache.axis.handlers.BasicHandler;
import org.apache.sandesha.Constants;
import org.apache.sandesha.IStorageManager;
import org.apache.sandesha.RMMessageContext;
+import org.apache.sandesha.storage.dao.SandeshaQueueDAO;
import org.apache.sandesha.util.RMMessageCreator;
+import org.apache.commons.logging.Log;
import java.util.Vector;
import java.util.Iterator;
@@ -31,6 +34,7 @@
public class RMSender extends BasicHandler {
private IStorageManager storageManager;
+ private static final Log log = LogFactory.getLog(SandeshaQueueDAO.class.getName());
public void invoke(MessageContext msgContext) throws AxisFault {
@@ -80,7 +84,7 @@
msgContext.setResponseMessage(null);
}
} catch (Exception ex) {
- ex.printStackTrace();
+ log.error(ex);
}
}
1.10 +5 -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.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- MessageValidator.java 28 Feb 2005 13:26:05 -0000 1.9
+++ MessageValidator.java 2 Mar 2005 15:15:29 -0000 1.10
@@ -2,13 +2,16 @@
import org.apache.axis.AxisFault;
import org.apache.axis.MessageContext;
+import org.apache.axis.components.logger.LogFactory;
import org.apache.axis.message.addressing.AddressingHeaders;
import org.apache.sandesha.Constants;
import org.apache.sandesha.IStorageManager;
import org.apache.sandesha.RMMessageContext;
+import org.apache.sandesha.storage.dao.SandeshaQueueDAO;
import org.apache.sandesha.client.ClientStorageManager;
import org.apache.sandesha.ws.rm.RMHeaders;
import org.apache.sandesha.ws.rm.Sequence;
+import org.apache.commons.logging.Log;
import javax.xml.namespace.QName;
import javax.xml.soap.SOAPException;
@@ -16,7 +19,7 @@
public final class MessageValidator {
private static IStorageManager storageMgr = null;
-
+ private static final Log log = LogFactory.getLog(SandeshaQueueDAO.class.getName());
public static void validate(final RMMessageContext rmMsgContext, boolean client) throws AxisFault {
@@ -38,7 +41,7 @@
validateForFaults(rmMsgContext);
} catch (SOAPException e) {
- e.printStackTrace();
+ log.error(e);
//TODO Do we need to throw a Sequence Fault at this level.
}
}
1.15 +0 -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.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- RMInvoker.java 27 Feb 2005 18:17:20 -0000 1.14
+++ RMInvoker.java 2 Mar 2005 15:15:29 -0000 1.15
@@ -116,10 +116,8 @@
}
}
} catch (InterruptedException error) {
- error.printStackTrace();
log.error(error);
} catch (Exception error) {
- error.printStackTrace();
log.error(error);
}
}
1.27 +4 -4 ws-fx/sandesha/src/org/apache/sandesha/server/Sender.java
Index: Sender.java
===================================================================
RCS file: /home/cvs/ws-fx/sandesha/src/org/apache/sandesha/server/Sender.java,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- Sender.java 28 Feb 2005 13:26:05 -0000 1.26
+++ Sender.java 2 Mar 2005 15:15:29 -0000 1.27
@@ -82,11 +82,11 @@
try {
sendMessage(rmMessageContext);
} catch (AxisFault e) {
- e.printStackTrace();
+ log.error(e);
} catch (SOAPException e) {
- e.printStackTrace();
+ log.error(e);
} catch (Exception e) {
- e.printStackTrace();
+ log.error(e);
}
} else {
//TODO REPORT ERROR
@@ -100,7 +100,7 @@
//System.out.print("|"); //Sender THREAD IS SLEEPING
Thread.sleep(Constants.SENDER_SLEEP_TIME - timeGap);
} catch (Exception ex) {
- ex.printStackTrace();
+ log.error(ex);
}
}
}
1.6 +0 -1 ws-fx/sandesha/src/org/apache/sandesha/server/msgprocessors/AcknowledgementProcessor.java
Index: AcknowledgementProcessor.java
===================================================================
RCS file: /home/cvs/ws-fx/sandesha/src/org/apache/sandesha/server/msgprocessors/AcknowledgementProcessor.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- AcknowledgementProcessor.java 27 Feb 2005 18:17:20 -0000 1.5
+++ AcknowledgementProcessor.java 2 Mar 2005 15:15:29 -0000 1.6
@@ -133,7 +133,6 @@
//Set the messsage type
rmMsgContext.setMessageType(Constants.MSG_TYPE_ACKNOWLEDGEMENT);
} catch (Exception e) {
- e.printStackTrace();
log.error(e);
}
return rmMsgContext;
1.8 +6 -2 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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- CompositeProcessor.java 2 Mar 2005 03:16:31 -0000 1.7
+++ CompositeProcessor.java 2 Mar 2005 15:15:29 -0000 1.8
@@ -19,11 +19,14 @@
import org.apache.axis.AxisFault;
import org.apache.axis.Message;
import org.apache.axis.MessageContext;
+import org.apache.axis.components.logger.LogFactory;
import org.apache.axis.message.addressing.AddressingHeaders;
import org.apache.axis.message.addressing.RelatesTo;
+import org.apache.commons.logging.Log;
import org.apache.sandesha.Constants;
import org.apache.sandesha.IStorageManager;
import org.apache.sandesha.RMMessageContext;
+import org.apache.sandesha.storage.dao.SandeshaQueueDAO;
import org.apache.sandesha.ws.rm.RMHeaders;
import javax.xml.namespace.QName;
@@ -34,6 +37,7 @@
public class CompositeProcessor implements IRMMessageProcessor {
private IStorageManager storageManager = null;
+ private static final Log log = LogFactory.getLog(SandeshaQueueDAO.class.getName());
public CompositeProcessor(IStorageManager storageManger) {
this.storageManager = storageManger;
@@ -61,7 +65,7 @@
String messageId = relatesTo.getURI().toString();
seqId = storageManager.getOutgoingSeqOfMsg(messageId);
}
- if (!hasSequence ) {
+ if (!hasSequence) {
storageManager.addIncomingSequence(seqId);
}
if (storageManager.isMessageExist(seqId, messageNumber) != true) {
@@ -81,7 +85,7 @@
rmMsgContext.setMsgContext(msgContext);
rmMsgContext.setMessageType(Constants.MSG_TYPE_SERVICE_REQUEST);
} catch (Exception e) {
- e.printStackTrace();
+ log.error(e);
throw new AxisFault(new QName(Constants.FaultCodes.WSRM_SERVER_INTERNAL_ERROR), Constants.FaultMessages.SERVER_INTERNAL_ERROR, null, null);
}
storageManager.insertIncomingMessage(rmMsgContext);