You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by gd...@apache.org on 2007/04/30 17:54:35 UTC
svn commit: r533780 [1/2] - in
/webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2: engine/
phaserule/
Author: gdaniels
Date: Mon Apr 30 08:54:33 2007
New Revision: 533780
URL: http://svn.apache.org/viewvc?view=rev&rev=533780
Log:
Quell ridiculous amounts of stdout output from tests, convert to log.debug().
Modified:
webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/engine/EnginePausingTest.java
webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/engine/MessageContextChangeTest.java
webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/engine/MessageContextSaveATest.java
webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/engine/MessageContextSaveBTest.java
webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/engine/MessageContextSaveCTest.java
webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/engine/MessageContextSelfManagedDataTest.java
webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/engine/ObjectSaveTest.java
webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/engine/OperationContextSaveTest.java
webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/engine/OptionsSaveTest.java
webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/phaserule/PhaseRuleTests.java
Modified: webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/engine/EnginePausingTest.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/engine/EnginePausingTest.java?view=diff&rev=533780&r1=533779&r2=533780
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/engine/EnginePausingTest.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/engine/EnginePausingTest.java Mon Apr 30 08:54:33 2007
@@ -128,7 +128,7 @@
mc.setTransportOut(transportOut);
mc.setServerSide(true);
- mc.setProperty(MessageContext.TRANSPORT_OUT, System.out);
+// mc.setProperty(MessageContext.TRANSPORT_OUT, System.out);
SOAPFactory omFac = OMAbstractFactory.getSOAP11Factory();
mc.setEnvelope(omFac.getDefaultEnvelope());
@@ -172,7 +172,7 @@
mc.setWSAAction(operationName.getLocalPart());
mc.setSoapAction(operationName.getLocalPart());
- System.out.flush();
+// System.out.flush();
}
Modified: webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/engine/MessageContextChangeTest.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/engine/MessageContextChangeTest.java?view=diff&rev=533780&r1=533779&r2=533780
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/engine/MessageContextChangeTest.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/engine/MessageContextChangeTest.java Mon Apr 30 08:54:33 2007
@@ -18,11 +18,14 @@
import junit.framework.TestCase;
import org.apache.axis2.context.MessageContext;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import java.lang.reflect.Field;
public class MessageContextChangeTest extends TestCase {
-
+ protected static final Log log = LogFactory.getLog(MessageContextChangeTest.class);
+
private FieldDescription[] knownList = {
new FieldDescription("org.apache.commons.logging.Log", "log"),
new FieldDescription("java.lang.String", "logCorrelationID"),
@@ -130,7 +133,7 @@
int numberKnownFields = knownList.length;
if (numberKnownFields != numberFields) {
- System.out.println("ERROR: number of actual fields [" + numberFields +
+ log.debug("ERROR: number of actual fields [" + numberFields +
"] in MessageContext does not match the expected number [" + numberKnownFields +
"]");
noChange = false;
@@ -145,14 +148,14 @@
Field actualField = findField(fields, name);
if (actualField == null) {
- System.out.println("ERROR: MessageContext is missing field [" + name + "]");
+ log.debug("ERROR: MessageContext is missing field [" + name + "]");
noChange = false;
} else {
String knownType = knownList[i].getType();
String actualType = actualField.getType().getName();
if (!knownType.equals(actualType)) {
- System.out.println("ERROR: MessageContext field [" + name +
+ log.debug("ERROR: MessageContext field [" + name +
"] expected type [" + knownType + "] does not match actual type [" +
actualType + "]");
noChange = false;
@@ -171,7 +174,7 @@
FieldDescription fd = findFieldDescription(name);
if (fd == null) {
- System.out.println("ERROR: MessageContext has new field [" + description +
+ log.debug("ERROR: MessageContext has new field [" + description +
"] that needs to be assessed for message context save/restore functions");
noChange = false;
} else {
@@ -179,7 +182,7 @@
String actualType = fields[j].getType().getName();
if (!knownType.equals(actualType)) {
- System.out.println("ERROR: MessageContext field [" + name +
+ log.debug("ERROR: MessageContext field [" + name +
"] expected type [" + knownType + "] does not match actual type [" +
actualType + "]");
noChange = false;
Modified: webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/engine/MessageContextSaveATest.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/engine/MessageContextSaveATest.java?view=diff&rev=533780&r1=533779&r2=533780
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/engine/MessageContextSaveATest.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/engine/MessageContextSaveATest.java Mon Apr 30 08:54:33 2007
@@ -43,6 +43,8 @@
import org.apache.axis2.transport.http.SimpleHTTPServer;
import org.apache.axis2.util.ObjectStateUtils;
import org.apache.axis2.wsdl.WSDLConstants;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import javax.xml.namespace.QName;
import java.io.File;
@@ -55,28 +57,20 @@
import java.util.Iterator;
public class MessageContextSaveATest extends TestCase {
+ protected static final Log log = LogFactory.getLog(MessageContextSaveATest.class);
private QName serviceName = new QName("TestService");
private QName operationName = new QName("Operation_1");
private ConfigurationContext configurationContext = null;
private ServiceGroupContext serviceGroupContext = null;
- private ServiceContext serviceContext = null;
private OperationContext operationContext = null;
- private AxisConfiguration axisConfiguration = null;
private AxisServiceGroup axisServiceGroup = null;
private AxisService axisService = null;
private AxisOperation axisOperation = null;
private AxisMessage axisMessage = null;
- private TransportOutDescription transportOut = null;
- private TransportOutDescription transportOut2 = null;
- private TransportOutDescription transportOut3 = null;
- private TransportInDescription transportIn = null;
- private TransportInDescription transportIn2 = null;
- private TransportInDescription transportIn3 = null;
-
private Phase phase1 = null;
private Phase phase2 = null;
private Phase phase3 = null;
@@ -90,20 +84,15 @@
private ArrayList executedHandlers = null;
- private String testArg = null;
-
-
public MessageContextSaveATest(String arg0) {
super(arg0);
- testArg = new String(arg0);
try {
prepare();
}
catch (Exception e) {
- System.out.println(
- "MessageContextSaveATest:constructor: error in setting up object graph [" +
- e.getClass().getName() + " : " + e.getMessage() + "]");
+ log.debug("MessageContextSaveATest:constructor: error in setting up object graph [" +
+ e.getClass().getName() + " : " + e.getMessage() + "]");
}
}
@@ -114,7 +103,7 @@
private void prepare() throws Exception {
//-----------------------------------------------------------------
- axisConfiguration = new AxisConfiguration();
+ AxisConfiguration axisConfiguration = new AxisConfiguration();
configurationContext = new ConfigurationContext(axisConfiguration);
@@ -175,15 +164,16 @@
.getParent());
serviceGroupContext.setId("ServiceGroupContextTest");
- serviceContext = ContextFactory.createServiceContext(serviceGroupContext, axisService);
+ ServiceContext serviceContext =
+ ContextFactory.createServiceContext(serviceGroupContext, axisService);
operationContext = serviceContext.createOperationContext(operationName);
//-----------------------------------------------------------------
- transportOut = new TransportOutDescription("null");
- transportOut2 = new TransportOutDescription("happy");
- transportOut3 = new TransportOutDescription("golucky");
+ TransportOutDescription transportOut = new TransportOutDescription("null");
+ TransportOutDescription transportOut2 = new TransportOutDescription("happy");
+ TransportOutDescription transportOut3 = new TransportOutDescription("golucky");
transportOut.setSender(new CommonsHTTPTransportSender());
transportOut2.setSender(new CommonsHTTPTransportSender());
transportOut3.setSender(new CommonsHTTPTransportSender());
@@ -191,9 +181,9 @@
axisConfiguration.addTransportOut(transportOut2);
axisConfiguration.addTransportOut(transportOut);
- transportIn = new TransportInDescription("null");
- transportIn2 = new TransportInDescription("always");
- transportIn3 = new TransportInDescription("thebest");
+ TransportInDescription transportIn = new TransportInDescription("null");
+ TransportInDescription transportIn2 = new TransportInDescription("always");
+ TransportInDescription transportIn3 = new TransportInDescription("thebest");
transportIn.setReceiver(new SimpleHTTPServer());
transportIn2.setReceiver(new SimpleHTTPServer());
transportIn3.setReceiver(new SimpleHTTPServer());
@@ -208,7 +198,7 @@
mc.setTransportOut(transportOut);
mc.setServerSide(true);
- mc.setProperty(MessageContext.TRANSPORT_OUT, System.out);
+// mc.setProperty(MessageContext.TRANSPORT_OUT, System.out);
SOAPFactory omFac = OMAbstractFactory.getSOAP11Factory();
mc.setEnvelope(omFac.getDefaultEnvelope());
@@ -282,7 +272,7 @@
mc.setWSAAction(operationName.getLocalPart());
mc.setSoapAction(operationName.getLocalPart());
- System.out.flush();
+// System.out.flush();
mc.setMessageID(UUIDGenerator.getUUID());
@@ -311,11 +301,11 @@
public void testReceive() throws Exception {
AxisEngine engine = new AxisEngine(configurationContext);
- System.out.println(
+ log.debug(
"MessageContextSaveATest:testReceive(): start - - engine.receive(mc) - - - - - - - - - - - - - - - -");
engine.receive(mc);
- System.out.println(
+ log.debug(
"MessageContextSaveATest:testReceive(): resume - - engine.resume(mc) - - - - - - - - - - - - - - - -");
engine.resume(mc);
@@ -364,7 +354,7 @@
// -------------------------------------------------------------------
// second resume to start the second pause
// -------------------------------------------------------------------
- System.out.println(
+ log.debug(
"MessageContextSaveATest:testReceive(): resume - - engine.resume(mc) - - - - - - - - - - - - - - - -");
engine.resume(mc);
@@ -448,23 +438,21 @@
String c2 = o2.getClass().getName();
if (c1.equals(c2)) {
- System.out.println(
- "MessageContextSaveATest::compareHandlers: class [" + c1 + "] match ");
+ log.debug("MessageContextSaveATest::compareHandlers: class [" + c1 + "] match ");
int id1 = getHandlerID(o1);
int id2 = getHandlerID(o2);
if (id1 == id2) {
- System.out.println(
- "MessageContextSaveATest::compareHandlers: id [" + id1 + "] match");
+ log.debug("MessageContextSaveATest::compareHandlers: id [" + id1 + "] match");
return true;
} else {
- System.out.println("MessageContextSaveATest::compareHandlers: id1 [" + id1 +
+ log.debug("MessageContextSaveATest::compareHandlers: id1 [" + id1 +
"] != id2 [" + id2 + "] ");
return false;
}
} else {
- System.out.println("MessageContextSaveATest::compareHandlers: class1 [" + c1 +
+ log.debug("MessageContextSaveATest::compareHandlers: class1 [" + c1 +
"] != class2 [" + c2 + "] ");
return false;
}
@@ -484,7 +472,7 @@
*/
private boolean comparePhases(Object o1, Object o2) {
if ((o1 == null) && (o2 == null)) {
- System.out.println(
+ log.debug(
"MessageContextSaveATest: comparePhases: Phase1[] == Phase2[] - both null objects");
return true;
}
@@ -504,7 +492,7 @@
ArrayList list2 = p2.getHandlers();
if ((list1 == null) && (list2 == null)) {
- System.out.println("MessageContextSaveATest: comparePhases: Phase1[" + name1 +
+ log.debug("MessageContextSaveATest: comparePhases: Phase1[" + name1 +
"] == Phase2[" + name2 + "]");
return true;
}
@@ -514,7 +502,7 @@
int size2 = list2.size();
if (size1 != size2) {
- System.out.println("MessageContextSaveATest: comparePhases: Phase1[" +
+ log.debug("MessageContextSaveATest: comparePhases: Phase1[" +
name1 + "] != Phase2[" + name2 +
"] - mismatched size of handler lists");
return false;
@@ -527,7 +515,7 @@
if ((obj1 == null) && (obj2 == null)) {
// ok
} else if ((obj1 != null) && (obj2 != null)) {
- boolean check = false;
+ boolean check;
if (obj1 instanceof Phase) {
check = comparePhases(obj1, obj2);
@@ -536,8 +524,8 @@
check = compareHandlers(obj1, obj2);
}
- if (check == false) {
- System.out.println(
+ if (!check) {
+ log.debug(
"MessageContextSaveATest: comparePhases: Phase1[" + name1 +
"] != Phase2[" + name2 +
"] - mismatched handler lists");
@@ -545,7 +533,7 @@
}
} else {
// mismatch
- System.out.println("MessageContextSaveATest: comparePhases: Phase1[" +
+ log.debug("MessageContextSaveATest: comparePhases: Phase1[" +
name1 + "] != Phase2[" + name2 +
"] - mismatched handler lists");
return false;
@@ -555,7 +543,7 @@
// if we got here, the comparison completed ok
// with a match
- System.out.println("MessageContextSaveATest: comparePhases: Phase1[" + name1 +
+ log.debug("MessageContextSaveATest: comparePhases: Phase1[" + name1 +
"] == Phase2[" + name2 + "] - matched handler lists");
return true;
}
@@ -567,12 +555,12 @@
}
}
- System.out.println("MessageContextSaveATest: comparePhases: Phase1[] != Phase2[]");
+ log.debug("MessageContextSaveATest: comparePhases: Phase1[] != Phase2[]");
return false;
}
private void showMcMap(HashMap map) {
- if ((map != null) && (map.isEmpty() == false)) {
+ if ((map != null) && (!map.isEmpty())) {
Iterator itList = map.keySet().iterator();
while (itList.hasNext()) {
@@ -584,14 +572,14 @@
if (value != null) {
valueID = value.getMessageID();
- System.out.println(
+ log.debug(
"MessageContextSaveATest: showMcMap: Message context ID[" + valueID +
"] Key Label [" + key + "]");
}
}
} else {
- System.out.println(
+ log.debug(
"MessageContextSaveATest: showMcMap: No entries to display for message contexts table.");
}
}
@@ -603,7 +591,7 @@
// simple message
public void testSimpleMC() throws Exception {
String title = "MessageContextSaveATest:testSimpleMC(): ";
- System.out.println(title + "start - - - - - - - - - - - - - - - -");
+ log.debug(title + "start - - - - - - - - - - - - - - - -");
MessageContext simpleMsg = new MessageContext();
MessageContext restoredSimpleMsg = null;
@@ -611,7 +599,6 @@
File theFile = null;
String theFilename = null;
- boolean pause = false;
boolean savedMessageContext = false;
boolean restoredMessageContext = false;
boolean comparesOk = false;
@@ -619,10 +606,10 @@
try {
theFile = File.createTempFile("Simple", null);
theFilename = theFile.getName();
- System.out.println(title + "temp file = [" + theFilename + "]");
+ log.debug(title + "temp file = [" + theFilename + "]");
}
catch (Exception ex) {
- System.out.println(title + "error creating temp file = [" + ex.getMessage() + "]");
+ log.debug(title + "error creating temp file = [" + ex.getMessage() + "]");
theFile = null;
}
@@ -639,7 +626,7 @@
ObjectOutputStream outObjStream = new ObjectOutputStream(outStream);
// try to save the message context
- System.out.println(title + "saving message context.....");
+ log.debug(title + "saving message context.....");
savedMessageContext = false;
outObjStream.writeObject(simpleMsg);
@@ -650,15 +637,15 @@
outStream.close();
savedMessageContext = true;
- System.out.println(title + "....saved message context.....");
+ log.debug(title + "....saved message context.....");
long filesize = theFile.length();
- System.out.println(title + "file size after save [" + filesize +
+ log.debug(title + "file size after save [" + filesize +
"] temp file = [" + theFilename + "]");
}
catch (Exception ex2) {
- System.out.println(title + "error with saving message context = [" +
+ log.debug(title + "error with saving message context = [" +
ex2.getClass().getName() + " : " + ex2.getMessage() + "]");
ex2.printStackTrace();
}
@@ -677,7 +664,7 @@
ObjectInputStream inObjStream = new ObjectInputStream(inStream);
// try to restore the message context
- System.out.println(title + "restoring a message context.....");
+ log.debug(title + "restoring a message context.....");
restoredMessageContext = false;
restoredSimpleMsg = (MessageContext) inObjStream.readObject();
@@ -687,7 +674,7 @@
restoredSimpleMsg.activate(configurationContext);
restoredMessageContext = true;
- System.out.println(title + "....restored message context.....");
+ log.debug(title + "....restored message context.....");
// compare to original execution chain
ArrayList restored_execChain = restoredSimpleMsg.getExecutionChain();
@@ -695,7 +682,7 @@
comparesOk =
ObjectStateUtils.isEquivalent(restored_execChain, orig_execChain, false);
- System.out.println(title + "execution chain equivalency [" + comparesOk + "]");
+ log.debug(title + "execution chain equivalency [" + comparesOk + "]");
assertTrue(comparesOk);
// check executed list
@@ -707,7 +694,7 @@
Object p2 = orig_executed_it.next();
comparesOk = comparePhases(p1, p2);
- System.out.println(title + "executed phase list: compare phases [" +
+ log.debug(title + "executed phase list: compare phases [" +
comparesOk + "]");
assertTrue(comparesOk);
}
@@ -718,7 +705,7 @@
}
catch (Exception ex2) {
- System.out.println(title + "error with saving message context = [" +
+ log.debug(title + "error with saving message context = [" +
ex2.getClass().getName() + " : " + ex2.getMessage() + "]");
ex2.printStackTrace();
}
@@ -738,7 +725,7 @@
}
}
- System.out.println(title + "end - - - - - - - - - - - - - - - -");
+ log.debug(title + "end - - - - - - - - - - - - - - - -");
}
@@ -746,7 +733,7 @@
// some properties set
public void testMcProperties() throws Exception {
String title = "MessageContextSaveATest:testMcProperties(): ";
- System.out.println(title + "start - - - - - - - - - - - - - - - -");
+ log.debug(title + "start - - - - - - - - - - - - - - - -");
MessageContext simpleMsg = new MessageContext();
MessageContext restoredSimpleMsg = null;
@@ -768,10 +755,10 @@
try {
theFile = File.createTempFile("McProps", null);
theFilename = theFile.getName();
- System.out.println(title + "temp file = [" + theFilename + "]");
+ log.debug(title + "temp file = [" + theFilename + "]");
}
catch (Exception ex) {
- System.out.println(title + "error creating temp file = [" + ex.getMessage() + "]");
+ log.debug(title + "error creating temp file = [" + ex.getMessage() + "]");
theFile = null;
}
@@ -788,7 +775,7 @@
ObjectOutputStream outObjStream = new ObjectOutputStream(outStream);
// try to save the message context
- System.out.println(title + "saving message context.....");
+ log.debug(title + "saving message context.....");
savedMessageContext = false;
outObjStream.writeObject(simpleMsg);
@@ -799,15 +786,15 @@
outStream.close();
savedMessageContext = true;
- System.out.println(title + "....saved message context.....");
+ log.debug(title + "....saved message context.....");
long filesize = theFile.length();
- System.out.println(title + "file size after save [" + filesize +
+ log.debug(title + "file size after save [" + filesize +
"] temp file = [" + theFilename + "]");
}
catch (Exception ex2) {
- System.out.println(title + "error with saving message context = [" +
+ log.debug(title + "error with saving message context = [" +
ex2.getClass().getName() + " : " + ex2.getMessage() + "]");
ex2.printStackTrace();
}
@@ -826,7 +813,7 @@
ObjectInputStream inObjStream = new ObjectInputStream(inStream);
// try to restore the message context
- System.out.println(title + "restoring a message context.....");
+ log.debug(title + "restoring a message context.....");
restoredMessageContext = false;
restoredSimpleMsg = (MessageContext) inObjStream.readObject();
@@ -836,7 +823,7 @@
restoredSimpleMsg.activate(configurationContext);
restoredMessageContext = true;
- System.out.println(title + "....restored message context.....");
+ log.debug(title + "....restored message context.....");
// compare to original execution chain
ArrayList restored_execChain = restoredSimpleMsg.getExecutionChain();
@@ -844,7 +831,7 @@
comparesOk =
ObjectStateUtils.isEquivalent(restored_execChain, orig_execChain, false);
- System.out.println(title + "execution chain equivalency [" + comparesOk + "]");
+ log.debug(title + "execution chain equivalency [" + comparesOk + "]");
assertTrue(comparesOk);
// check executed list
@@ -856,7 +843,7 @@
Object p2 = orig_executed_it.next();
comparesOk = comparePhases(p1, p2);
- System.out.println(title + "executed phase list: compare phases [" +
+ log.debug(title + "executed phase list: compare phases [" +
comparesOk + "]");
assertTrue(comparesOk);
}
@@ -887,7 +874,7 @@
}
catch (Exception ex2) {
- System.out.println(title + "error with restoring message context = [" +
+ log.debug(title + "error with restoring message context = [" +
ex2.getClass().getName() + " : " + ex2.getMessage() + "]");
ex2.printStackTrace();
}
@@ -907,14 +894,14 @@
}
}
- System.out.println(title + "end - - - - - - - - - - - - - - - -");
+ log.debug(title + "end - - - - - - - - - - - - - - - -");
}
public void testMapping() throws Exception {
String title = "MessageContextSaveATest:testMapping(): ";
- System.out.println(title + "start - - - - - - - - - - - - - - - -");
+ log.debug(title + "start - - - - - - - - - - - - - - - -");
MessageContext restoredMC = null;
@@ -931,15 +918,14 @@
// update the table
mcMap1 = mc.getOperationContext().getMessageContexts();
- System.out
- .println(title + "- - - - - original message contexts table- - - - - - - - - - -");
+ log.debug(title + "- - - - - original message contexts table- - - - - - - - - - -");
showMcMap(mcMap1);
//---------------------------------------------------------------------
// save and restore the message context
//---------------------------------------------------------------------
- File theFile = null;
+ File theFile;
String theFilename = null;
boolean pause = false;
@@ -950,10 +936,10 @@
try {
theFile = File.createTempFile("McMappings", null);
theFilename = theFile.getName();
- System.out.println(title + "temp file = [" + theFilename + "]");
+ log.debug(title + "temp file = [" + theFilename + "]");
}
catch (Exception ex) {
- System.out.println(title + "error creating temp file = [" + ex.getMessage() + "]");
+ log.debug(title + "error creating temp file = [" + ex.getMessage() + "]");
theFile = null;
}
@@ -970,7 +956,7 @@
ObjectOutputStream outObjStream = new ObjectOutputStream(outStream);
// try to save the message context
- System.out.println(title + "saving message context.....");
+ log.debug(title + "saving message context.....");
savedMessageContext = false;
outObjStream.writeObject(mc);
@@ -981,15 +967,15 @@
outStream.close();
savedMessageContext = true;
- System.out.println(title + "....saved message context.....");
+ log.debug(title + "....saved message context.....");
long filesize = theFile.length();
- System.out.println(title + "file size after save [" + filesize +
+ log.debug(title + "file size after save [" + filesize +
"] temp file = [" + theFilename + "]");
}
catch (Exception ex2) {
- System.out.println(title + "error with saving message context = [" +
+ log.debug(title + "error with saving message context = [" +
ex2.getClass().getName() + " : " + ex2.getMessage() + "]");
ex2.printStackTrace();
}
@@ -1008,7 +994,7 @@
ObjectInputStream inObjStream = new ObjectInputStream(inStream);
// try to restore the message context
- System.out.println(title + "restoring a message context.....");
+ log.debug(title + "restoring a message context.....");
restoredMessageContext = false;
restoredMC = (MessageContext) inObjStream.readObject();
@@ -1018,12 +1004,12 @@
restoredMC.activate(configurationContext);
restoredMessageContext = true;
- System.out.println(title + "....restored message context.....");
+ log.debug(title + "....restored message context.....");
// get the table after the restore
HashMap mcMap2 = restoredMC.getOperationContext().getMessageContexts();
- System.out.println(
+ log.debug(
"MessageContextSaveATest:testMapping(): - - - - - restored message contexts table- - - - - - - - - - -");
showMcMap(mcMap2);
@@ -1032,7 +1018,7 @@
}
catch (Exception ex2) {
- System.out.println(title + "error with restoring message context = [" +
+ log.debug(title + "error with restoring message context = [" +
ex2.getClass().getName() + " : " + ex2.getMessage() + "]");
ex2.printStackTrace();
}
@@ -1052,7 +1038,7 @@
}
}
- System.out.println(title + "end - - - - - - - - - - - - - - - -");
+ log.debug(title + "end - - - - - - - - - - - - - - - -");
}
@@ -1065,7 +1051,7 @@
int size2 = m2.size();
if (size1 != size2) {
- System.out.println(title + "MISMATCH: map1 size [" + size1 +
+ log.debug(title + "MISMATCH: map1 size [" + size1 +
"] != map2 size [" + size2 + "]");
return false;
}
@@ -1089,22 +1075,22 @@
id2 = value2.getMessageID();
} else {
// mismatch
- System.out.println(title +
+ log.debug(title +
"MISMATCH: no message context in one of the tables for key [" +
key1 + "]");
return false;
}
if ((id1 != null) && (id2 != null)) {
- if ((id1.equals(id2)) == false) {
+ if (!id1.equals(id2)) {
// mismatch
- System.out.println(title + "MISMATCH: messageID_1 [" + id1 +
+ log.debug(title + "MISMATCH: messageID_1 [" + id1 +
"] != messageID_2 [" + id2 + "]");
return false;
}
} else {
// null values, can't tell
- System.out.println(title + "MISMATCH: one or more null message IDs");
+ log.debug(title + "MISMATCH: one or more null message IDs");
return false;
}
}
@@ -1114,7 +1100,7 @@
return true;
} else {
// mismatch
- System.out.println(title + "MISMATCH: one of the tables is null");
+ log.debug(title + "MISMATCH: one of the tables is null");
return false;
}
}
@@ -1142,12 +1128,12 @@
public TempHandler(int index, boolean pause) {
this.handlerID = new Integer(index);
this.pause = pause;
- init(new HandlerDescription(new String("handler" + index)));
+ init(new HandlerDescription("handler" + index));
}
public TempHandler(int index) {
this.handlerID = new Integer(index);
- init(new HandlerDescription(new String("handler" + index)));
+ init(new HandlerDescription("handler" + index));
}
//-----------------------------------------------------------------
@@ -1165,23 +1151,22 @@
public InvocationResponse invoke(MessageContext msgContext) throws AxisFault {
String title = "TempHandler[" + getHandlerID() + "]:invoke(): ";
- System.out.println(title + "pause = [" + pause + "]");
+ log.debug(title + "pause = [" + pause + "]");
savedMessageContext = false;
restoredMessageContext = false;
if (pause) {
- System.out.println(title + "msgContext.pause()");
+ log.debug(title + "msgContext.pause()");
msgContext.pause();
pause = false;
try {
theFile = File.createTempFile("mcSave", null);
theFilename = theFile.getName();
- System.out.println(title + "temp file = [" + theFilename + "]");
+ log.debug(title + "temp file = [" + theFilename + "]");
}
catch (Exception ex) {
- System.out.println(
- title + "error creating temp file = [" + ex.getMessage() + "]");
+ log.debug(title + "error creating temp file = [" + ex.getMessage() + "]");
theFile = null;
}
@@ -1198,7 +1183,7 @@
ObjectOutputStream outObjStream = new ObjectOutputStream(outStream);
// try to save the message context
- System.out.println(title + "saving message context.....");
+ log.debug(title + "saving message context.....");
savedMessageContext = false;
outObjStream.writeObject(msgContext);
@@ -1209,15 +1194,15 @@
outStream.close();
savedMessageContext = true;
- System.out.println(title + "....saved message context.....");
+ log.debug(title + "....saved message context.....");
long filesize = theFile.length();
- System.out.println(title + "file size after save [" + filesize +
+ log.debug(title + "file size after save [" + filesize +
"] temp file = [" + theFilename + "]");
}
catch (Exception ex2) {
- System.out.println(title + "error with saving message context = [" +
+ log.debug(title + "error with saving message context = [" +
ex2.getClass().getName() + " : " + ex2.getMessage() + "]");
ex2.printStackTrace();
}
@@ -1236,7 +1221,7 @@
ObjectInputStream inObjStream = new ObjectInputStream(inStream);
// try to restore the message context
- System.out.println(title + "restoring a message context.....");
+ log.debug(title + "restoring a message context.....");
restoredMessageContext = false;
MessageContext msgContext2 = (MessageContext) inObjStream.readObject();
@@ -1246,7 +1231,7 @@
msgContext2.activate(configurationContext);
restoredMessageContext = true;
- System.out.println(title + "....restored message context.....");
+ log.debug(title + "....restored message context.....");
// compare to original execution chain
ArrayList restored_execChain = msgContext2.getExecutionChain();
@@ -1254,8 +1239,7 @@
comparesOk = ObjectStateUtils
.isEquivalent(restored_execChain, orig_execChain, false);
- System.out.println(
- title + "execution chain equivalency [" + comparesOk + "]");
+ log.debug(title + "execution chain equivalency [" + comparesOk + "]");
assertTrue(comparesOk);
// check executed list
@@ -1267,7 +1251,7 @@
Object p2 = orig_executed_it.next();
comparesOk = comparePhases(p1, p2);
- System.out.println(title +
+ log.debug(title +
"executed phase list: compare phases [" + comparesOk +
"]");
assertTrue(comparesOk);
@@ -1282,7 +1266,7 @@
mc2 = msgContext2;
}
catch (Exception ex2) {
- System.out.println(title + "error with saving message context = [" +
+ log.debug(title + "error with saving message context = [" +
ex2.getClass().getName() + " : " + ex2.getMessage() + "]");
ex2.printStackTrace();
}
@@ -1306,7 +1290,7 @@
return InvocationResponse.SUSPEND;
} else {
- System.out.println(title + "executedHandlers.add(" + handlerID + ")");
+ log.debug(title + "executedHandlers.add(" + handlerID + ")");
executedHandlers.add(handlerID);
}
Modified: webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/engine/MessageContextSaveBTest.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/engine/MessageContextSaveBTest.java?view=diff&rev=533780&r1=533779&r2=533780
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/engine/MessageContextSaveBTest.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/engine/MessageContextSaveBTest.java Mon Apr 30 08:54:33 2007
@@ -43,6 +43,8 @@
import org.apache.axis2.transport.http.SimpleHTTPServer;
import org.apache.axis2.util.ObjectStateUtils;
import org.apache.axis2.wsdl.WSDLConstants;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import javax.xml.namespace.QName;
import java.io.File;
@@ -56,7 +58,7 @@
import java.util.Map;
public class MessageContextSaveBTest extends TestCase {
- private String testArg = null;
+ protected static final Log log = LogFactory.getLog(MessageContextSaveBTest.class);
//-------------------------------------------------------------------------
// test key-value pairs
@@ -230,15 +232,13 @@
public MessageContextSaveBTest(String arg0) {
super(arg0);
- testArg = new String(arg0);
try {
prepare();
}
catch (Exception e) {
- System.out.println(
- "MessageContextSaveBTest:constructor: error in setting up object graph [" +
- e.getClass().getName() + " : " + e.getMessage() + "]");
+ log.debug("MessageContextSaveBTest:constructor: error in setting up object graph [" +
+ e.getClass().getName() + " : " + e.getMessage() + "]");
}
}
@@ -516,7 +516,7 @@
mc.setTransportOut(transportOut);
mc.setServerSide(true);
- mc.setProperty(MessageContext.TRANSPORT_OUT, System.out);
+// mc.setProperty(MessageContext.TRANSPORT_OUT, System.out);
SOAPFactory omFac = OMAbstractFactory.getSOAP11Factory();
mc.setEnvelope(omFac.getDefaultEnvelope());
@@ -524,7 +524,7 @@
AxisOperation axisOperation = oc.getAxisOperation();
String action = axisOperation.getName().getLocalPart();
mc.setSoapAction(action);
- System.out.flush();
+// System.out.flush();
mc.setMessageID(UUIDGenerator.getUUID());
@@ -562,7 +562,7 @@
Map properties_original = new HashMap(getServiceProperties(mc));
showProperties(properties_original, "original properties");
- System.out.println(title + "start - - engine.receive(mc) - - - - - - - - - - - - - - - -");
+ log.debug(title + "start - - engine.receive(mc) - - - - - - - - - - - - - - - -");
engine.receive(mc);
// get the service level properties into a separate table
@@ -574,7 +574,7 @@
addServiceProperties(restoredMessageContext, suffix);
// resume the paused message context
- System.out.println(title + "resume - - engine.resume(mc) - - - - - - - - - - - - - - - -");
+ log.debug(title + "resume - - engine.resume(mc) - - - - - - - - - - - - - - - -");
engine.resume(restoredMessageContext);
// get the service level properties into a separate table
@@ -634,10 +634,10 @@
private void showProperties(Map map, String description) {
- System.out.println(description + " ======================================");
+ log.debug(description + " ======================================");
if ((map == null) || (map.isEmpty())) {
- System.out.println(description + ": No properties");
- System.out.println(description + " ======================================");
+ log.debug(description + ": No properties");
+ log.debug(description + " ======================================");
return;
}
@@ -648,9 +648,9 @@
String value = (String) map.get(key);
- System.out.println(description + ": key-value pair [" + key + "][" + value + "]");
+ log.debug(description + ": key-value pair [" + key + "][" + value + "]");
}
- System.out.println(description + " ======================================");
+ log.debug(description + " ======================================");
}
@@ -723,23 +723,22 @@
public InvocationResponse invoke(MessageContext msgContext) throws AxisFault {
String title = "HandlerMCS[" + getHandlerID() + "]:invoke(): ";
- System.out.println(title + "pause = [" + pause + "]");
+ log.debug(title + "pause = [" + pause + "]");
savedOk = false;
restoredOk = false;
if (pause) {
- System.out.println(title + "msgContext.pause()");
+ log.debug(title + "msgContext.pause()");
msgContext.pause();
pause = false;
try {
theFile = File.createTempFile("mcSave", null);
theFilename = theFile.getName();
- System.out.println(title + "temp file = [" + theFilename + "]");
+ log.debug(title + "temp file = [" + theFilename + "]");
}
catch (Exception ex) {
- System.out.println(
- title + "error creating temp file = [" + ex.getMessage() + "]");
+ log.debug(title + "error creating temp file = [" + ex.getMessage() + "]");
theFile = null;
}
@@ -756,7 +755,7 @@
ObjectOutputStream outObjStream = new ObjectOutputStream(outStream);
// try to save the message context
- System.out.println(title + "saving message context.....");
+ log.debug(title + "saving message context.....");
savedOk = false;
outObjStream.writeObject(msgContext);
@@ -767,15 +766,15 @@
outStream.close();
savedOk = true;
- System.out.println(title + "....saved message context.....");
+ log.debug(title + "....saved message context.....");
long filesize = theFile.length();
- System.out.println(title + "file size after save [" + filesize +
+ log.debug(title + "file size after save [" + filesize +
"] temp file = [" + theFilename + "]");
}
catch (Exception ex2) {
- System.out.println(title + "error with saving message context = [" +
+ log.debug(title + "error with saving message context = [" +
ex2.getClass().getName() + " : " + ex2.getMessage() + "]");
ex2.printStackTrace();
}
@@ -794,7 +793,7 @@
ObjectInputStream inObjStream = new ObjectInputStream(inStream);
// try to restore the message context
- System.out.println(title + "restoring a message context.....");
+ log.debug(title + "restoring a message context.....");
restoredOk = false;
MessageContext msgContext2 = (MessageContext) inObjStream.readObject();
@@ -804,14 +803,14 @@
msgContext2.activate(configurationContext);
restoredOk = true;
- System.out.println(title + "....restored message context.....");
+ log.debug(title + "....restored message context.....");
// now put the restored message context in the global
// variable for the test
restoredMessageContext = msgContext2;
}
catch (Exception ex2) {
- System.out.println(title + "error with restoring message context = [" +
+ log.debug(title + "error with restoring message context = [" +
ex2.getClass().getName() + " : " + ex2.getMessage() + "]");
ex2.printStackTrace();
restoredMessageContext = null;
@@ -835,7 +834,7 @@
return InvocationResponse.SUSPEND;
} else {
- System.out.println(title + "executedHandlers.add(" + handlerID + ")");
+ log.debug(title + "executedHandlers.add(" + handlerID + ")");
executedHandlers.add(handlerID);
}
@@ -904,7 +903,7 @@
}
}
- System.out.println(title + "executedHandlers.add(" + handlerID + ")");
+ log.debug(title + "executedHandlers.add(" + handlerID + ")");
executedHandlers.add(handlerID);
return InvocationResponse.CONTINUE;
Modified: webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/engine/MessageContextSaveCTest.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/engine/MessageContextSaveCTest.java?view=diff&rev=533780&r1=533779&r2=533780
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/engine/MessageContextSaveCTest.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/engine/MessageContextSaveCTest.java Mon Apr 30 08:54:33 2007
@@ -43,6 +43,8 @@
import org.apache.axis2.transport.http.SimpleHTTPServer;
import org.apache.axis2.util.MetaDataEntry;
import org.apache.axis2.wsdl.WSDLConstants;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import javax.xml.namespace.QName;
import java.io.File;
@@ -59,7 +61,7 @@
* Provides tests that focus on the message context object graph
*/
public class MessageContextSaveCTest extends TestCase {
- private String testArg = null;
+ protected static final Log log = LogFactory.getLog(MessageContextSaveCTest.class);
private File persistentStore = null;
@@ -183,15 +185,13 @@
public MessageContextSaveCTest(String arg0) {
super(arg0);
- testArg = new String(arg0);
try {
prepare();
}
catch (Exception e) {
- System.out.println(
- "MessageContextSaveCTest:constructor: error in setting up object graph [" +
- e.getClass().getName() + " : " + e.getMessage() + "]");
+ log.debug("MessageContextSaveCTest:constructor: error in setting up object graph [" +
+ e.getClass().getName() + " : " + e.getMessage() + "]");
}
}
@@ -508,7 +508,7 @@
mc.setTransportOut(transportOut);
mc.setServerSide(true);
- mc.setProperty(MessageContext.TRANSPORT_OUT, System.out);
+// mc.setProperty(MessageContext.TRANSPORT_OUT, System.out);
SOAPFactory omFac = OMAbstractFactory.getSOAP11Factory();
mc.setEnvelope(omFac.getDefaultEnvelope());
@@ -516,7 +516,7 @@
AxisOperation axisOperation = oc.getAxisOperation();
String action = axisOperation.getName().getLocalPart();
mc.setSoapAction(action);
- System.out.flush();
+// System.out.flush();
mc.setMessageID(UUIDGenerator.getUUID());
@@ -546,29 +546,29 @@
MessageContext mc = msgCtx_A1_2_save;
OperationContext oc = mc.getOperationContext();
- System.out.println(title + "*** Original OperationContext message context table ****");
+ log.debug(title + "*** Original OperationContext message context table ****");
showMCTable(oc);
// run the message through the message processing
// this causes the message context to get saved
- System.out.println(title + "- - - Save the message context from the engine - - - -");
+ log.debug(title + "- - - Save the message context from the engine - - - -");
engineSave.receive(mc);
LinkedHashMap original_object_graph = getObjectGraphInfo(mc);
- System.out.println(title + "*** Originial object graph ****");
+ log.debug(title + "*** Originial object graph ****");
showObjectGraphInfo(original_object_graph);
- System.out.println(title +
+ log.debug(title +
"- - - Restore the message context on a separate engine - - - - - - - - - - - - - - - -");
AxisEngine engineRestore = new AxisEngine(restoreConfigurationContext);
MessageContext mc2 = restoreMessageContext(persistentStore, restoreConfigurationContext);
LinkedHashMap restored_object_graph = getObjectGraphInfo(mc2);
- System.out.println(title + "*** Restored object graph ****");
+ log.debug(title + "*** Restored object graph ****");
showObjectGraphInfo(restored_object_graph);
OperationContext oc2 = mc2.getOperationContext();
- System.out.println(title + "*** Restored OperationContext message context table ****");
+ log.debug(title + "*** Restored OperationContext message context table ****");
showMCTable(oc2);
boolean mcTableMatch = compareMCTable(oc, oc2);
@@ -577,12 +577,12 @@
// resume the restored paused message context on an engine that has the
// same setup as the engine where the save occurred
// but doesn't have the Context objects
- System.out.println(title +
+ log.debug(title +
"- - - Resume the restored message context - - - - - - - - - - - - - - - -");
engineRestore.resume(mc2);
LinkedHashMap resumed_object_graph = getObjectGraphInfo(mc2);
- System.out.println(title + "*** Post Resumed object graph ****");
+ log.debug(title + "*** Post Resumed object graph ****");
showObjectGraphInfo(resumed_object_graph);
// compare object hashcodes - expect differences
@@ -608,20 +608,20 @@
// run the message through the message processing
// this causes the message context to get saved
- System.out.println(title + "- - - Save the message context from the engine - - - -");
+ log.debug(title + "- - - Save the message context from the engine - - - -");
engineSave.receive(mc);
LinkedHashMap original_object_graph = getObjectGraphInfo(mc);
- System.out.println(title + "*** Originial object graph ****");
+ log.debug(title + "*** Originial object graph ****");
showObjectGraphInfo(original_object_graph);
- System.out.println(title +
+ log.debug(title +
"- - - Restore the message context on a separate engine - - - - - - - - - - - - - - - -");
AxisEngine engineEquiv = new AxisEngine(equivConfigurationContext);
MessageContext mc2 = restoreMessageContext(persistentStore, equivConfigurationContext);
LinkedHashMap restored_object_graph = getObjectGraphInfo(mc2);
- System.out.println(title + "*** Restored object graph ****");
+ log.debug(title + "*** Restored object graph ****");
showObjectGraphInfo(restored_object_graph);
// we don't use strict checking here since the engine where the
@@ -644,12 +644,12 @@
// resume the restored paused message context on an engine that has the
// same setup as the engine where the save occurred
// and save has the Service-level Context objects
- System.out.println(title +
+ log.debug(title +
"- - - Resume the restored message context - - - - - - - - - - - - - - - -");
engineEquiv.resume(mc2);
LinkedHashMap resumed_object_graph = getObjectGraphInfo(mc2);
- System.out.println(title + "*** Post Resumed object graph ****");
+ log.debug(title + "*** Post Resumed object graph ****");
showObjectGraphInfo(resumed_object_graph);
// there should be no changes in the object graph in our case after the resume
@@ -677,7 +677,7 @@
if ((theFile != null) && (theFile.exists())) {
theFilename = theFile.getName();
- System.out.println(title + "temp file = [" + theFilename + "]");
+ log.debug(title + "temp file = [" + theFilename + "]");
// ---------------------------------------------------------
// restore from the temporary file
@@ -691,7 +691,7 @@
ObjectInputStream inObjStream = new ObjectInputStream(inStream);
// try to restore the message context
- System.out.println(title + "restoring a message context.....");
+ log.debug(title + "restoring a message context.....");
restoredOk = false;
MessageContext msgContext2 = (MessageContext) inObjStream.readObject();
@@ -701,14 +701,14 @@
msgContext2.activate(cfgCtx);
restoredOk = true;
- System.out.println(title + "....restored message context.....");
+ log.debug(title + "....restored message context.....");
// now put the restored message context in the global
// variable for the test
restoredMC = msgContext2;
}
catch (Exception ex2) {
- System.out.println(title + "error with restoring message context = [" +
+ log.debug(title + "error with restoring message context = [" +
ex2.getClass().getName() + " : " + ex2.getMessage() + "]");
ex2.printStackTrace();
restoredMessageContext = null;
@@ -840,7 +840,7 @@
if ((map1 != null) && (map2 != null)) {
if (map1.size() != map2.size()) {
- System.out.println(title + "Object graph info mappings are different sizes.");
+ log.debug(title + "Object graph info mappings are different sizes.");
return false;
}
@@ -868,7 +868,7 @@
if ((name1 != null) && (name2 != null)) {
if (name1.equals(name2) == false) {
- System.out.println(title + "name1 [" + name1 + "] != name2 [" +
+ log.debug(title + "name1 [" + name1 + "] != name2 [" +
name2 + "]");
return false;
}
@@ -876,8 +876,7 @@
// ok
} else {
// mismatch
- System.out.println(
- title + "name1 [" + name1 + "] != name2 [" + name2 + "]");
+ log.debug(title + "name1 [" + name1 + "] != name2 [" + name2 + "]");
return false;
}
@@ -890,7 +889,7 @@
if ((code1 != null) && (code2 != null)) {
if (code1.equals(code2) == false) {
- System.out.println(title + "name [" + name1 + "] code1 [" +
+ log.debug(title + "name [" + name1 + "] code1 [" +
code1 + "] != code2 [" + code2 + "]");
return false;
}
@@ -898,7 +897,7 @@
// ok
} else {
// mismatch
- System.out.println(title + "name [" + name1 + "]code1 [" + code1 +
+ log.debug(title + "name [" + name1 + "]code1 [" + code1 +
"] != code2 [" + code2 + "]");
return false;
}
@@ -907,8 +906,7 @@
// ok
} else {
// mismatch
- System.out.println(
- title + "value1 [" + value1 + "] != value2 [" + value2 + "]");
+ log.debug(title + "value1 [" + value1 + "] != value2 [" + value2 + "]");
return false;
}
}
@@ -919,7 +917,7 @@
} else if ((map1 == null) && (map2 == null)) {
return true;
} else {
- System.out.println(title + "mismatch: one or more of the maps are null. ");
+ log.debug(title + "mismatch: one or more of the maps are null. ");
return false;
}
@@ -942,8 +940,7 @@
String name = meta.getName();
String hashcode = meta.getExtraName();
- System.out.println(
- "class[" + classname + "] id[" + name + "] hashcode" + hashcode + " ");
+ log.debug("class[" + classname + "] id[" + name + "] hashcode" + hashcode + " ");
}
}
@@ -964,7 +961,7 @@
int size2 = mcTable2.size();
if (size1 != size2) {
- System.out.println(title +
+ log.debug(title +
" Return FALSE: table sizes don't match size1[" + size1 +
"] != size2 [" + size2 + "] ");
return false;
@@ -984,7 +981,7 @@
if ((id1 != null) && (id2 != null)) {
if (!id1.equals(id2)) {
- System.out.println(title +
+ log.debug(title +
" Return FALSE: message IDs don't match id1[" + id1 +
"] != id2 [" + id2 + "] ");
return false;
@@ -993,7 +990,7 @@
// can't tell, keep going
} else {
// mismatch
- System.out.println(title +
+ log.debug(title +
" Return FALSE: message IDs don't match id1[" + id1 +
"] != id2 [" + id2 + "] ");
return false;
@@ -1003,35 +1000,34 @@
// entries match
} else {
// mismatch
- System.out.println(
+ log.debug(
title + " Return FALSE: message context objects don't match ");
return false;
}
}
- System.out.println(title + " Return TRUE: message context tables match");
+ log.debug(title + " Return TRUE: message context tables match");
return true;
} else if (mcTable1.isEmpty() && mcTable2.isEmpty()) {
- System.out.println(
- title + " Return TRUE: message context tables are both empty ");
+ log.debug(title + " Return TRUE: message context tables are both empty ");
return true;
} else {
- System.out.println(title + " Return FALSE: message context tables mismatch");
+ log.debug(title + " Return FALSE: message context tables mismatch");
return false;
}
} else if ((mcTable1 == null) && (mcTable2 == null)) {
- System.out.println(title + " Return TRUE: message context tables are null");
+ log.debug(title + " Return TRUE: message context tables are null");
return true;
} else {
- System.out.println(title + " Return FALSE: message context tables don't match");
+ log.debug(title + " Return FALSE: message context tables don't match");
return false;
}
} else if ((oc1 == null) && (oc2 == null)) {
- System.out.println(title + " Return TRUE: operation context objects are null ");
+ log.debug(title + " Return TRUE: operation context objects are null ");
return true;
} else {
- System.out.println(title + " Return FALSE: operation context objects don't match ");
+ log.debug(title + " Return FALSE: operation context objects don't match ");
return false;
}
@@ -1058,7 +1054,7 @@
if (mc != null) {
String id = mc.getMessageID();
- System.out.println("message context table entry: label [" + key +
+ log.debug("message context table entry: label [" + key +
"] message ID [" + id + "] ");
}
}
@@ -1132,25 +1128,24 @@
savedOk = false;
if (performSave == false) {
- System.out.println(title + "Configured for no action to be performed.");
+ log.debug(title + "Configured for no action to be performed.");
return InvocationResponse.CONTINUE;
}
- System.out.println(title + "msgContext.pause()");
+ log.debug(title + "msgContext.pause()");
msgContext.pause();
if (theFile != null) {
try {
- System.out.println(title + "Resetting the file to use.");
+ log.debug(title + "Resetting the file to use.");
theFile.delete();
theFile.createNewFile();
theFilename = theFile.getName();
- System.out.println(title + "temp file = [" + theFilename + "]");
+ log.debug(title + "temp file = [" + theFilename + "]");
}
catch (Exception ex) {
- System.out
- .println(title + "error creating new file = [" + ex.getMessage() + "]");
+ log.debug(title + "error creating new file = [" + ex.getMessage() + "]");
}
if (theFile.exists() == true) {
@@ -1166,7 +1161,7 @@
ObjectOutputStream outObjStream = new ObjectOutputStream(outStream);
// try to save the message context
- System.out.println(title + "saving message context.....");
+ log.debug(title + "saving message context.....");
savedOk = false;
outObjStream.writeObject(msgContext);
@@ -1177,15 +1172,15 @@
outStream.close();
savedOk = true;
- System.out.println(title + "....saved message context.....");
+ log.debug(title + "....saved message context.....");
long filesize = theFile.length();
- System.out.println(title + "file size after save [" + filesize +
+ log.debug(title + "file size after save [" + filesize +
"] temp file = [" + theFilename + "]");
}
catch (Exception ex2) {
- System.out.println(title + "error with saving message context = [" +
+ log.debug(title + "error with saving message context = [" +
ex2.getClass().getName() + " : " + ex2.getMessage() + "]");
ex2.printStackTrace();
}
@@ -1195,7 +1190,7 @@
}
}
- System.out.println(title + "executedHandlers.add(" + handlerID + ")");
+ log.debug(title + "executedHandlers.add(" + handlerID + ")");
executedHandlers.add(handlerID);
return InvocationResponse.SUSPEND;
@@ -1265,7 +1260,7 @@
}
}
- System.out.println(title + "executedHandlers.add(" + handlerID + ")");
+ log.debug(title + "executedHandlers.add(" + handlerID + ")");
executedHandlers.add(handlerID);
return InvocationResponse.CONTINUE;
Modified: webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/engine/MessageContextSelfManagedDataTest.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/engine/MessageContextSelfManagedDataTest.java?view=diff&rev=533780&r1=533779&r2=533780
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/engine/MessageContextSelfManagedDataTest.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/engine/MessageContextSelfManagedDataTest.java Mon Apr 30 08:54:33 2007
@@ -41,6 +41,8 @@
import org.apache.axis2.receivers.RawXMLINOutMessageReceiver;
import org.apache.axis2.transport.http.CommonsHTTPTransportSender;
import org.apache.axis2.transport.http.SimpleHTTPServer;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import javax.xml.namespace.QName;
import java.io.ByteArrayInputStream;
@@ -55,7 +57,8 @@
import java.util.Iterator;
public class MessageContextSelfManagedDataTest extends TestCase {
-
+ protected static final Log log = LogFactory.getLog(MessageContextSelfManagedDataTest.class);
+
private File theFile = null;
boolean savedMessageContext = false;
boolean restoredMessageContext = false;
@@ -126,7 +129,7 @@
prepare();
}
catch (Exception e) {
- System.out.println(
+ log.debug(
"MessageContextSelfManagedDataTest:initAll: error in setting up object graph [" +
e.getClass().getName() + " : " + e.getMessage() + "]");
}
@@ -329,7 +332,7 @@
* Test case for setting and removing data from a message context
*/
public void testSelfManagedData01() {
- System.out.println(
+ log.debug(
"MessageContextSelfManagedDataTest::testSelfManagedData01()=======================================");
try {
ArrayList handlers = new ArrayList();
@@ -364,7 +367,7 @@
* Test for setting, saving, restoring self managed data with no exceptions
*/
public void testPause01_noExceptions() {
- System.out.println(
+ log.debug(
"MessageContextSelfManagedDataTest::testPause01_noExceptions()=======================================");
try {
@@ -393,7 +396,7 @@
* Test for verifying the self managed data used during the save and restore
*/
public void testPause02_saveRestoreSelfManagedData() {
- System.out.println(
+ log.debug(
"MessageContextSelfManagedDataTest::testPause02_saveRestoreSelfManagedData()=======================================");
try {
@@ -420,7 +423,7 @@
* Test for save and restore of self managed data and the AxisOperation
*/
public void testPause03_saveRestoreOperation() {
- System.out.println(
+ log.debug(
"MessageContextSelfManagedDataTest::testPause03_saveRestoreOperation()=======================================");
try {
@@ -449,7 +452,7 @@
* Test for save and restore of self managed data and the AxisService
*/
public void testPause04_saveRestoreAxisService() {
- System.out.println(
+ log.debug(
"MessageContextSelfManagedDataTest::testPause04_saveRestoreAxisService()=======================================");
try {
@@ -477,7 +480,7 @@
* Test for save and restore of self managed data and the AxisServiceGroup
*/
public void testPause05_saveRestoreAxisServiceGroup() {
- System.out.println(
+ log.debug(
"MessageContextSelfManagedDataTest::testPause05_saveRestoreAxisServiceGroup()=======================================");
try {
@@ -506,7 +509,7 @@
* Test for phases
*/
public void testPause06_saveRestorePhases() {
- System.out.println(
+ log.debug(
"MessageContextSelfManagedDataTest::testPause06_saveRestorePhases()=======================================");
TempHandler02 handlerA = new TempHandler02(666);
@@ -592,7 +595,7 @@
// Notice we do currently have a subhandler in the subPhase object.
// When axis2 decides to support nested handlers, the
// first three assertEquals below will fail.
- System.out.println(
+ log.debug(
"MessageContextSelfManagedDataTest::testPause06_saveRestorePhases():: invokecallcount [" +
invokecallcount + "]");
assertEquals(11, invokecallcount);
@@ -601,7 +604,7 @@
// handlerA in the executionChain, its serialize and deserialize
// should only be called once per unique instance in the list
int count_s = handlerA.getSerializecallcount();
- System.out.println(
+ log.debug(
"MessageContextSelfManagedDataTest::testPause06_saveRestorePhases():: handlerA serialize call count [" +
count_s + "]");
assertEquals(11, count_s);
@@ -615,7 +618,7 @@
// invoke is called in the executionChain. Observing our phases,
// we see it is in slot #3. 11 - 3 = 8
int count_d = handlerA.getDeserializecallcount();
- System.out.println(
+ log.debug(
"MessageContextSelfManagedDataTest::testPause06_saveRestorePhases():: handlerA deserialize call count [" +
count_d + "]");
assertEquals(8, count_d);
@@ -628,7 +631,7 @@
* Test for save and restore of binary self managed data
*/
public void testSelfManagedData07() {
- System.out.println(
+ log.debug(
"MessageContextSelfManagedDataTest::testSelfManagedData07()=======================================");
try {
ArrayList handlers = new ArrayList();
@@ -656,7 +659,7 @@
* Test for handler04
*/
public void testSelfManagedData08() {
- System.out.println(
+ log.debug(
"MessageContextSelfManagedDataTest::testSelfManagedData08()=======================================");
try {
@@ -686,7 +689,7 @@
* Test for handler03 and handler04
*/
public void testSelfManagedData09() {
- System.out.println(
+ log.debug(
"MessageContextSelfManagedDataTest::testSelfManagedData09()=======================================");
try {
@@ -731,14 +734,14 @@
private MessageContext saveAndRestore(MessageContext mc1, String fnprefix, String desc) {
MessageContext msgContext2 = null;
String title = "MessageContextSelfManagedDataTest::saveAndRestore::[" + desc + "] ";
- System.out.println(title);
+ log.debug(title);
try {
theFile = File.createTempFile(fnprefix, null);
- System.out.println(title + "temp file = [" + theFile.getName() + "]");
+ log.debug(title + "temp file = [" + theFile.getName() + "]");
}
catch (Exception ex) {
- System.out.println(title + "error creating temp file = [" + ex.getMessage() + "]");
+ log.debug(title + "error creating temp file = [" + ex.getMessage() + "]");
theFile = null;
}
@@ -752,7 +755,7 @@
ObjectOutputStream outObjStream = new ObjectOutputStream(outStream);
// try to save the message context
- System.out.println(title + "saving message context ....");
+ log.debug(title + "saving message context ....");
savedMessageContext = false;
outObjStream.writeObject(mc1);
@@ -762,7 +765,7 @@
// no exceptions, set savedMessageContext to true
savedMessageContext = true;
- System.out.println(title + "....saved message context .....");
+ log.debug(title + "....saved message context .....");
// setup an input stream to the file
FileInputStream inStream = new FileInputStream(theFile);
@@ -772,7 +775,7 @@
ObjectInputStream inObjStream = new ObjectInputStream(inStream);
// try to restore the message context
- System.out.println(title + "restoring message context .....");
+ log.debug(title + "restoring message context .....");
restoredMessageContext = false;
msgContext2 = (MessageContext) inObjStream.readObject();
inObjStream.close();
@@ -785,16 +788,16 @@
// VERY IMPORTANT: replace testcase's messagecontext object with the new restored one
mc = msgContext2;
- System.out.println(title + "....restored message context .....");
+ log.debug(title + "....restored message context .....");
}
catch (Exception ex2) {
if (savedMessageContext != true) {
- System.out.println(title + "Error with saving message context = [" +
+ log.debug(title + "Error with saving message context = [" +
ex2.getClass().getName() + " : " + ex2.getMessage() + "]");
ex2.printStackTrace();
} else {
- System.out.println(title + "Error with restoring message context = [" +
+ log.debug(title + "Error with restoring message context = [" +
ex2.getClass().getName() + " : " + ex2.getMessage() + "]");
ex2.printStackTrace();
}
@@ -859,24 +862,23 @@
String c2 = o2.getClass().getName();
if (c1.equals(c2)) {
- System.out.println("MessagecontextSelfManagedDataTest::compareHandlers: class [" +
+ log.debug("MessagecontextSelfManagedDataTest::compareHandlers: class [" +
c1 + "] match ");
int id1 = getHandlerID(o1);
int id2 = getHandlerID(o2);
if (id1 == id2) {
- System.out.println("MessagecontextSelfManagedDataTest::compareHandlers: id [" +
+ log.debug("MessagecontextSelfManagedDataTest::compareHandlers: id [" +
id1 + "] match");
return true;
} else {
- System.out.println(
- "MessagecontextSelfManagedDataTest::compareHandlers: id1 [" + id1 +
- "] != id2 [" + id2 + "] ");
+ log.debug("MessagecontextSelfManagedDataTest::compareHandlers: id1 [" + id1 +
+ "] != id2 [" + id2 + "] ");
return false;
}
} else {
- System.out.println("MessagecontextSelfManagedDataTest::compareHandlers: class1 [" +
+ log.debug("MessagecontextSelfManagedDataTest::compareHandlers: class1 [" +
c1 + "] != class2 [" + c2 + "] ");
return false;
}
@@ -1039,7 +1041,7 @@
String desc = "TempHandler01[id=" + id + "].invoke()";
String title = "MessageContextSelfManagedDataTest::" + desc;
- System.out.println(title);
+ log.debug(title);
String tmp = "whaaa?";
_mc.setSelfManagedData(this.getClass(), key02, tmp);
@@ -1069,7 +1071,7 @@
invokecallcount++;
- System.out.println(title + ": Completed");
+ log.debug(title + ": Completed");
return InvocationResponse.CONTINUE;
}
@@ -1129,14 +1131,14 @@
public InvocationResponse invoke(MessageContext _mc) throws AxisFault {
String desc = "TempHandler02[id=" + id + "].invoke()";
String title = "MessageContextSelfManagedDataTest::" + desc;
- System.out.println(title);
+ log.debug(title);
MessageContext msgContext2 = null; // this will be the restored one
_mc.setSelfManagedData(this.getClass(), Integer.toString(id),
testData + Integer.toString(id));
- System.out.println(title + ": Setting self managed data using key [" +
+ log.debug(title + ": Setting self managed data using key [" +
Integer.toString(id) + "]");
msgContext2 = saveAndRestore(_mc, "TempHandler02_", desc);
@@ -1146,7 +1148,7 @@
invokecallcount++;
- System.out.println(title + ": Completed");
+ log.debug(title + ": Completed");
return InvocationResponse.CONTINUE;
}
@@ -1158,7 +1160,7 @@
String desc = "TempHandler02[id=" + id + "].deserializeSelfManagedData() count [" +
deserializecallcount + "]";
String title = "MessageContextSelfManagedDataTest::" + desc;
- System.out.println(title);
+ log.debug(title);
ObjectInputStream ois = new ObjectInputStream(data);
testData = ois.readUTF().concat(" with extra text " + Integer.toString(id));
@@ -1178,12 +1180,12 @@
String desc = "TempHandler02[id=" + id + "].serializeSelfManagedData() count [" +
serializecallcount + "]";
String title = "MessageContextSelfManagedDataTest::" + desc;
- System.out.println(title);
+ log.debug(title);
String storedTestData =
(String) _mc.getSelfManagedData(this.getClass(), Integer.toString(id));
if (storedTestData == null) {
- System.out.println(title + ": No self managed data to serialize");
+ log.debug(title + ": No self managed data to serialize");
return null;
}
@@ -1194,9 +1196,9 @@
int baos_size = baos.size();
baos.close();
- System.out.println(title + ": saved self managed data string length [" +
+ log.debug(title + ": saved self managed data string length [" +
storedTestData.length() + "]");
- System.out.println(title +
+ log.debug(title +
": saved self managed data byte array output stream (UTF) length [" +
baos_size + "]");
return baos;
@@ -1255,14 +1257,14 @@
String desc = "TempHandler03[id=" + id + "].invoke()";
String title = "MessageContextSelfManagedDataTest::" + desc;
- System.out.println(title);
+ log.debug(title);
MessageContext msgContext2 = null; // this will be the restored one
// add the byte [] of data
_mc.setSelfManagedData(this.getClass(), Integer.toString(id), testData03);
- System.out.println(title + ": Setting self managed data using key [" +
+ log.debug(title + ": Setting self managed data using key [" +
Integer.toString(id) + "]");
msgContext2 = saveAndRestore(_mc, "TempHandler03_", desc);
@@ -1272,7 +1274,7 @@
invokecallcount++;
- System.out.println(title + ": Completed");
+ log.debug(title + ": Completed");
return InvocationResponse.CONTINUE;
}
@@ -1285,7 +1287,7 @@
String desc = "TempHandler03[id=" + id + "].deserializeSelfManagedData() count [" +
deserializecallcount + "]";
String title = "MessageContextSelfManagedDataTest::" + desc;
- System.out.println(title);
+ log.debug(title);
int expected = testData03.length;
@@ -1329,12 +1331,12 @@
String desc = "TempHandler03[id=" + id + "].serializeSelfManagedData() count [" +
serializecallcount + "]";
String title = "MessageContextSelfManagedDataTest::" + desc;
- System.out.println(title);
+ log.debug(title);
byte [] tmp = (byte []) _mc.getSelfManagedData(this.getClass(), Integer.toString(id));
if (tmp == null) {
- System.out.println(title + ": No self managed data to serialize");
+ log.debug(title + ": No self managed data to serialize");
return null;
}
@@ -1343,9 +1345,8 @@
int baos_size = baos.size();
baos.close();
- System.out.println(
- title + ": saved self managed data byte [] length [" + tmp.length + "]");
- System.out.println(title +
+ log.debug(title + ": saved self managed data byte [] length [" + tmp.length + "]");
+ log.debug(title +
": saved self managed data byte array output stream length [" + baos_size +
"]");
return baos;
@@ -1406,14 +1407,14 @@
String desc = "TempHandler04[id=" + id + "].invoke()";
String title = "MessageContextSelfManagedDataTest::" + desc;
- System.out.println(title);
+ log.debug(title);
MessageContext msgContext2 = null; // this will be the restored one
// add the byte [] of data
_mc.setSelfManagedData(this.getClass(), Integer.toString(id), testData04);
- System.out.println(title + ": Setting self managed data using key [" +
+ log.debug(title + ": Setting self managed data using key [" +
Integer.toString(id) + "]");
msgContext2 = saveAndRestore(_mc, "TempHandler04_", desc);
@@ -1423,7 +1424,7 @@
invokecallcount++;
- System.out.println(title + ": Completed");
+ log.debug(title + ": Completed");
return InvocationResponse.CONTINUE;
}
@@ -1436,7 +1437,7 @@
String desc = "TempHandler04[id=" + id + "].deserializeSelfManagedData() count [" +
deserializecallcount + "]";
String title = "MessageContextSelfManagedDataTest::" + desc;
- System.out.println(title);
+ log.debug(title);
int expected = testData04.length;
@@ -1487,12 +1488,12 @@
String desc = "TempHandler04[id=" + id + "].serializeSelfManagedData() count [" +
serializecallcount + "]";
String title = "MessageContextSelfManagedDataTest::" + desc;
- System.out.println(title);
+ log.debug(title);
long [] tmp = (long []) _mc.getSelfManagedData(this.getClass(), Integer.toString(id));
if (tmp == null) {
- System.out.println(title + ": No self managed data to serialize");
+ log.debug(title + ": No self managed data to serialize");
return null;
}
@@ -1511,9 +1512,8 @@
int baos_size = baos.size();
baos.close();
- System.out.println(
- title + ": saved self managed data byte [] length [" + tmp.length + "]");
- System.out.println(title +
+ log.debug(title + ": saved self managed data byte [] length [" + tmp.length + "]");
+ log.debug(title +
": saved self managed data byte array output stream length [" + baos_size +
"]");
return baos;
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org