left overs

git-svn-id: https://svn.apache.org/repos/asf/tomcat/tc6.0.x/trunk@539066 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/test/org/apache/catalina/tribes/demos/ChannelCreator.java b/test/org/apache/catalina/tribes/demos/ChannelCreator.java
index 36de09d..06e3217 100644 (file)
--- a/test/org/apache/catalina/tribes/demos/ChannelCreator.java
+++ b/test/org/apache/catalina/tribes/demos/ChannelCreator.java
@@ -52,7 +52,7 @@ import org.apache.catalina.tribes.Member;
  */
 public class ChannelCreator {
     
-    org.apache.commons.logging.impl.LogFactoryImpl impl=null;
+    
     public static StringBuffer usage() {
         StringBuffer buf = new StringBuffer();
         buf.append("\n\t\t[-bind tcpbindaddress]")

diff --git a/test/org/apache/catalina/tribes/demos/IntrospectionUtils.java b/test/org/apache/catalina/tribes/demos/IntrospectionUtils.java
index 5e59662..db94ded 100644 (file)
--- a/test/org/apache/catalina/tribes/demos/IntrospectionUtils.java
+++ b/test/org/apache/catalina/tribes/demos/IntrospectionUtils.java
@@ -29,6 +29,8 @@ import java.net.UnknownHostException;
 import java.util.Hashtable;
 import java.util.StringTokenizer;
 import java.util.Vector;
+import org.apache.juli.logging.LogFactory;
+import org.apache.juli.logging.Log;
 
 // Depends: JDK1.1
 
@@ -38,8 +40,7 @@ import java.util.Vector;
 public final class IntrospectionUtils {
 
 
-    private static org.apache.commons.logging.Log log=
-        org.apache.commons.logging.LogFactory.getLog( IntrospectionUtils.class );
+    private static Log log= LogFactory.getLog( IntrospectionUtils.class );
 
     /**
      * Call execute() - any ant-like task should work

diff --git a/test/org/apache/catalina/tribes/demos/LoadTest.java b/test/org/apache/catalina/tribes/demos/LoadTest.java
index 1580665..cd5854a 100644 (file)
--- a/test/org/apache/catalina/tribes/demos/LoadTest.java
+++ b/test/org/apache/catalina/tribes/demos/LoadTest.java
@@ -28,6 +28,8 @@ import org.apache.catalina.tribes.MembershipListener;
 import org.apache.catalina.tribes.io.XByteBuffer;
 import org.apache.catalina.tribes.Channel;
 import java.io.Externalizable;
+import org.apache.juli.logging.Log;
+import org.apache.juli.logging.LogFactory;
 
 
 /**
@@ -41,7 +43,7 @@ import java.io.Externalizable;
  * @version 1.0
  */
 public class LoadTest implements MembershipListener,ChannelListener, Runnable {
-    protected static org.apache.commons.logging.Log log = org.apache.commons.logging.LogFactory.getLog(LoadTest.class);
+    protected static Log log = LogFactory.getLog(LoadTest.class);
     public static int size = 24000;
     public static Object mutex = new Object();
     public boolean doRun = true;
@@ -227,6 +229,7 @@ public class LoadTest implements MembershipListener,ChannelListener, Runnable {
             float seconds = ((float)(System.currentTimeMillis()-receiveStart)) / 1000f;
             log.info("****RECEIVE STATS-"+Thread.currentThread().getName()+"*****"+
                      "\n\tMessage count :"+(long)messagesReceived+
+                     "\n\tMessage/sec   :"+messagesReceived/seconds+
                      "\n\tTotal bytes   :"+(long)bytes+
                      "\n\tTotal mbytes  :"+(long)mBytesReceived+
                      "\n\tTime since 1st:"+seconds+" seconds"+