Appologies for the sudden checkin without notice, close to the release cycle.

Reverting the changes back. Will attach a patch and commit after the release.


git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@719657 13f79535-47bb-0310-9956-ffa450edef68

8 files changed, 26 insertions, 153 deletions

diff --git a/java/testkit/src/main/java/org/apache/qpid/testkit/perf/LatencyTest.java b/java/testkit/src/main/java/org/apache/qpid/testkit/perf/LatencyTest.java
index 4a4f3d124b..35a2374fbc 100644
--- a/java/testkit/src/main/java/org/apache/qpid/testkit/perf/LatencyTest.java
+++ b/java/testkit/src/main/java/org/apache/qpid/testkit/perf/LatencyTest.java
@@ -37,7 +37,6 @@ import javax.jms.MessageProducer;
 import javax.jms.TextMessage;
 
 import org.apache.qpid.testkit.MessageFactory;
-import org.apache.qpid.thread.Threading;
 
 /**
  * Latency test sends an x number of messages in warmup mode and wait for a confirmation
@@ -315,36 +314,19 @@ public class LatencyTest extends PerfBase implements MessageListener
 
     public static void main(String[] args)
     {
-        final LatencyTest latencyTest = new LatencyTest();        
-        Runnable r = new Runnable()
+        LatencyTest latencyTest = new LatencyTest();
+        latencyTest.test();
+        latencyTest.printToConsole();
+        if (System.getProperty("file") != null)
         {
-            public void run()
+            try
             {
-                latencyTest.test();
-                latencyTest.printToConsole();
-                if (System.getProperty("file") != null)
-                {
-                    try
-                    {
-                        latencyTest.writeToFile();
-                    }
-                    catch(Exception e)
-                    {
-                        e.printStackTrace();
-                    }
-                }
+                latencyTest.writeToFile();
+            }
+            catch(Exception e)
+            {
+                e.printStackTrace();
             }
-        };
-        
-        Thread t;
-        try
-        {
-            t = Threading.getThreadFactory().createThread(r);                      
-        }
-        catch(Exception e)
-        {
-            throw new Error("Error creating latency test thread",e);
         }
-        t.start(); 
     }
 }
\ No newline at end of file
diff --git a/java/testkit/src/main/java/org/apache/qpid/testkit/perf/PerfConsumer.java b/java/testkit/src/main/java/org/apache/qpid/testkit/perf/PerfConsumer.java
index 9781a7e839..cd12c7010d 100644
--- a/java/testkit/src/main/java/org/apache/qpid/testkit/perf/PerfConsumer.java
+++ b/java/testkit/src/main/java/org/apache/qpid/testkit/perf/PerfConsumer.java
@@ -27,8 +27,6 @@ import javax.jms.MessageListener;
 import javax.jms.MessageProducer;
 import javax.jms.TextMessage;
 
-import org.apache.qpid.thread.Threading;
-
 /**
  * PerfConsumer will receive x no of messages in warmup mode.
  * Once it receives the Start message it will then signal the PerfProducer.
@@ -244,24 +242,7 @@ public class PerfConsumer extends PerfBase implements MessageListener
 
     public static void main(String[] args)
     {
-        final PerfConsumer cons = new PerfConsumer();
-        Runnable r = new Runnable()
-        {
-            public void run()
-            {
-                cons.test();
-            }
-        };
-        
-        Thread t;
-        try
-        {
-            t = Threading.getThreadFactory().createThread(r);                      
-        }
-        catch(Exception e)
-        {
-            throw new Error("Error creating consumer thread",e);
-        }
-        t.start(); 
+        PerfConsumer cons = new PerfConsumer();
+        cons.test();
     }
 }
\ No newline at end of file
diff --git a/java/testkit/src/main/java/org/apache/qpid/testkit/perf/PerfProducer.java b/java/testkit/src/main/java/org/apache/qpid/testkit/perf/PerfProducer.java
index e9421d7f22..757b1bfcda 100644
--- a/java/testkit/src/main/java/org/apache/qpid/testkit/perf/PerfProducer.java
+++ b/java/testkit/src/main/java/org/apache/qpid/testkit/perf/PerfProducer.java
@@ -27,7 +27,6 @@ import javax.jms.MessageConsumer;
 import javax.jms.MessageProducer;
 
 import org.apache.qpid.testkit.MessageFactory;
-import org.apache.qpid.thread.Threading;
 
 /**
  * PerfProducer sends an x no of messages in warmup mode and wait for a confirmation
@@ -202,24 +201,7 @@ public class PerfProducer extends PerfBase
 
     public static void main(String[] args)
     {
-        final PerfProducer prod = new PerfProducer();
-        Runnable r = new Runnable()
-        {
-            public void run()
-            {
-                prod.test();
-            }
-        };
-        
-        Thread t;
-        try
-        {
-            t = Threading.getThreadFactory().createThread(r);                      
-        }
-        catch(Exception e)
-        {
-            throw new Error("Error creating producer thread",e);
-        }
-        t.start();            
+        PerfProducer prod = new PerfProducer();
+        prod.test();
     }
 }
\ No newline at end of file
diff --git a/java/testkit/src/main/java/org/apache/qpid/testkit/soak/MultiThreadedConsumer.java b/java/testkit/src/main/java/org/apache/qpid/testkit/soak/MultiThreadedConsumer.java
index d5514873e6..a91d9e7e85 100644
--- a/java/testkit/src/main/java/org/apache/qpid/testkit/soak/MultiThreadedConsumer.java
+++ b/java/testkit/src/main/java/org/apache/qpid/testkit/soak/MultiThreadedConsumer.java
@@ -29,8 +29,6 @@ import javax.jms.MessageProducer;
 import javax.jms.Session;
 import javax.jms.TextMessage;
 
-import org.apache.qpid.thread.Threading;
-
 /**
  * Test Description
  * ================
@@ -69,7 +67,7 @@ public class MultiThreadedConsumer extends BaseTest
             {
 
                 final Session session = con.createSession(false, Session.AUTO_ACKNOWLEDGE);
-                Runnable r = new Runnable()
+                Thread t = new Thread(new Runnable()
                 {
                     public void run()
                     {
@@ -133,18 +131,7 @@ public class MultiThreadedConsumer extends BaseTest
 
                     }
 
-                };
-                
-                Thread t;
-                try
-                {
-                    t = Threading.getThreadFactory().createThread(r);                      
-                }
-                catch(Exception e)
-                {
-                    throw new Error("Error creating consumer thread",e);
-                }
-                
+                });
                 t.setName("session-" + i);
                 t.start();
             } // for loop
diff --git a/java/testkit/src/main/java/org/apache/qpid/testkit/soak/MultiThreadedProducer.java b/java/testkit/src/main/java/org/apache/qpid/testkit/soak/MultiThreadedProducer.java
index 1cf4ee28ca..279e5ea0bf 100644
--- a/java/testkit/src/main/java/org/apache/qpid/testkit/soak/MultiThreadedProducer.java
+++ b/java/testkit/src/main/java/org/apache/qpid/testkit/soak/MultiThreadedProducer.java
@@ -32,7 +32,6 @@ import javax.jms.TextMessage;
 
 import org.apache.qpid.client.AMQQueue;
 import org.apache.qpid.framing.AMQShortString;
-import org.apache.qpid.thread.Threading;
 
 /**
  * Test Description
@@ -80,7 +79,7 @@ public class MultiThreadedProducer extends SimpleProducer
             for (int i = 0; i < session_count; i++)
             {
                 final Session session = con.createSession(transacted, Session.AUTO_ACKNOWLEDGE);
-                Runnable r = new Runnable()
+                Thread t = new Thread(new Runnable()
                 {
                     private Random gen = new Random();
 
@@ -143,16 +142,7 @@ public class MultiThreadedProducer extends SimpleProducer
 
                     }
 
-                };
-                Thread t;
-                try
-                {
-                    t = Threading.getThreadFactory().createThread(r);                      
-                }
-                catch(Exception e)
-                {
-                    throw new Error("Error creating producer thread",e);
-                }
+                });
                 t.setName("session-" + i);
                 t.start();
 
diff --git a/java/testkit/src/main/java/org/apache/qpid/testkit/soak/ResourceLeakTest.java b/java/testkit/src/main/java/org/apache/qpid/testkit/soak/ResourceLeakTest.java
index 1ae2c35970..c33f9ffbf2 100644
--- a/java/testkit/src/main/java/org/apache/qpid/testkit/soak/ResourceLeakTest.java
+++ b/java/testkit/src/main/java/org/apache/qpid/testkit/soak/ResourceLeakTest.java
@@ -30,7 +30,6 @@ import javax.jms.Session;
 import org.apache.qpid.client.AMQConnection;
 import org.apache.qpid.client.AMQQueue;
 import org.apache.qpid.framing.AMQShortString;
-import org.apache.qpid.thread.Threading;
 
 /**
  * Test Description
@@ -132,23 +131,8 @@ public class ResourceLeakTest extends BaseTest
 
     public static void main(String[] args)
     {
-        final ResourceLeakTest test = new ResourceLeakTest();
-        Runnable r = new Runnable(){    
-            public void run()
-            {
-                test.test();
-            }
-        };    
-        
-        Thread t;
-        try
-        {
-            t = Threading.getThreadFactory().createThread(r);                      
-        }
-        catch(Exception e)
-        {
-            throw new Error("Error creating test thread",e);
-        }
+        ResourceLeakTest test = new ResourceLeakTest();
+        test.test();
     }
 
 }
diff --git a/java/testkit/src/main/java/org/apache/qpid/testkit/soak/SimpleConsumer.java b/java/testkit/src/main/java/org/apache/qpid/testkit/soak/SimpleConsumer.java
index cd6d9013f8..b3eb97dafe 100644
--- a/java/testkit/src/main/java/org/apache/qpid/testkit/soak/SimpleConsumer.java
+++ b/java/testkit/src/main/java/org/apache/qpid/testkit/soak/SimpleConsumer.java
@@ -29,8 +29,6 @@ import javax.jms.MessageProducer;
 import javax.jms.Session;
 import javax.jms.TextMessage;
 
-import org.apache.qpid.thread.Threading;
-
 /**
  * Test Description
  * ================
@@ -128,24 +126,9 @@ public class SimpleConsumer extends BaseTest
 
     public static void main(String[] args)
     {
-        final SimpleConsumer test = new SimpleConsumer();
-        Runnable r = new Runnable(){    
-            public void run()
-            {
-                test.setUp();
-                test.test();
-            }
-        };    
-        
-        Thread t;
-        try
-        {
-            t = Threading.getThreadFactory().createThread(r);                      
-        }
-        catch(Exception e)
-        {
-            throw new Error("Error creating consumer thread",e);
-        }
+        SimpleConsumer test = new SimpleConsumer();
+        test.setUp();
+        test.test();
     }
 
 }
diff --git a/java/testkit/src/main/java/org/apache/qpid/testkit/soak/SimpleProducer.java b/java/testkit/src/main/java/org/apache/qpid/testkit/soak/SimpleProducer.java
index 805ce7ac29..1080092536 100644
--- a/java/testkit/src/main/java/org/apache/qpid/testkit/soak/SimpleProducer.java
+++ b/java/testkit/src/main/java/org/apache/qpid/testkit/soak/SimpleProducer.java
@@ -33,7 +33,6 @@ import javax.jms.TextMessage;
 
 import org.apache.qpid.client.AMQQueue;
 import org.apache.qpid.framing.AMQShortString;
-import org.apache.qpid.thread.Threading;
 
 /**
  * Test Description
@@ -139,24 +138,9 @@ public class SimpleProducer extends BaseTest
 
     public static void main(String[] args)
     {
-        final SimpleProducer test = new SimpleProducer();
-        Runnable r = new Runnable(){    
-            public void run()
-            {
-                test.setUp();
-                test.test();
-            }
-        };    
-        
-        Thread t;
-        try
-        {
-            t = Threading.getThreadFactory().createThread(r);                      
-        }
-        catch(Exception e)
-        {
-            throw new Error("Error creating producer thread",e);
-        }
+        SimpleProducer test = new SimpleProducer();
+        test.setUp();
+        test.test();
     }
 
 }