Rolled back revision 561365 and commented out some broken code in ClientSession.java. The trunk should now build.

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

4 files changed, 43 insertions, 46 deletions

diff --git a/qpid/java/perftests/src/main/java/org/apache/qpid/client/message/TestMessageFactory.java b/qpid/java/perftests/src/main/java/org/apache/qpid/client/message/TestMessageFactory.java
index 64ccb719b6..eeb4021f34 100644
--- a/qpid/java/perftests/src/main/java/org/apache/qpid/client/message/TestMessageFactory.java
+++ b/qpid/java/perftests/src/main/java/org/apache/qpid/client/message/TestMessageFactory.java
@@ -1,21 +1,18 @@
 /*
  *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
+ * Copyright (c) 2006 The Apache Software Foundation
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  *
  */
 package org.apache.qpid.client.message;
diff --git a/qpid/java/perftests/src/main/java/org/apache/qpid/ping/PingDurableClient.java b/qpid/java/perftests/src/main/java/org/apache/qpid/ping/PingDurableClient.java
index c5f71b4774..2765986868 100644
--- a/qpid/java/perftests/src/main/java/org/apache/qpid/ping/PingDurableClient.java
+++ b/qpid/java/perftests/src/main/java/org/apache/qpid/ping/PingDurableClient.java
@@ -20,6 +20,18 @@
  */

 package org.apache.qpid.ping;

 

+import java.io.BufferedReader;

+import java.io.IOException;

+import java.io.InputStreamReader;

+import java.util.List;

+import java.util.Properties;

+import java.util.concurrent.atomic.AtomicInteger;

+

+import javax.jms.Destination;

+import javax.jms.ExceptionListener;

+import javax.jms.JMSException;

+import javax.jms.Message;

+

 import org.apache.log4j.Logger;

 

 import org.apache.qpid.requestreply.PingPongProducer;

@@ -28,18 +40,6 @@ import org.apache.qpid.util.CommandLineParser;
 import uk.co.thebadgerset.junit.extensions.util.MathUtils;

 import uk.co.thebadgerset.junit.extensions.util.ParsedProperties;

 

-import javax.jms.Destination;

-import javax.jms.ExceptionListener;

-import javax.jms.JMSException;

-import javax.jms.Message;

-

-import java.io.BufferedReader;

-import java.io.IOException;

-import java.io.InputStreamReader;

-import java.util.List;

-import java.util.Properties;

-import java.util.concurrent.atomic.AtomicInteger;

-

 /**

  * PingDurableClient is a variation of the {@link PingPongProducer} ping tool. Instead of sending its pings and

  * receiving replies to them at the same time, this tool sends pings until it is signalled by some 'event' to stop

@@ -167,8 +167,7 @@ public class PingDurableClient extends PingPongProducer implements ExceptionList
         try

         {

             // Create a ping producer overriding its defaults with all options passed on the command line.

-            Properties options =

-                CommandLineParser.processCommandLine(args, new CommandLineParser(new String[][] {}), System.getProperties());

+            Properties options = CommandLineParser.processCommandLine(args, new CommandLineParser(new String[][] {}));

             PingDurableClient pingProducer = new PingDurableClient(options);

 

             // Create a shutdown hook to terminate the ping-pong producer.

diff --git a/qpid/java/perftests/src/main/java/org/apache/qpid/ping/PingSendOnlyClient.java b/qpid/java/perftests/src/main/java/org/apache/qpid/ping/PingSendOnlyClient.java
index 2879f0c322..bbe337ca0a 100644
--- a/qpid/java/perftests/src/main/java/org/apache/qpid/ping/PingSendOnlyClient.java
+++ b/qpid/java/perftests/src/main/java/org/apache/qpid/ping/PingSendOnlyClient.java
@@ -57,7 +57,7 @@ public class PingSendOnlyClient extends PingDurableClient
         try

         {

             // Create a ping producer overriding its defaults with all options passed on the command line.

-            Properties options = CommandLineParser.processCommandLine(args, new CommandLineParser(new String[][] {}), System.getProperties());

+            Properties options = CommandLineParser.processCommandLine(args, new CommandLineParser(new String[][] {}));

             PingSendOnlyClient pingProducer = new PingSendOnlyClient(options);

 

             // Create a shutdown hook to terminate the ping-pong producer.

diff --git a/qpid/java/perftests/src/main/java/org/apache/qpid/requestreply/PingPongProducer.java b/qpid/java/perftests/src/main/java/org/apache/qpid/requestreply/PingPongProducer.java
index 03f5f0549d..d5d1c304e9 100644
--- a/qpid/java/perftests/src/main/java/org/apache/qpid/requestreply/PingPongProducer.java
+++ b/qpid/java/perftests/src/main/java/org/apache/qpid/requestreply/PingPongProducer.java
@@ -20,6 +20,20 @@
  */

 package org.apache.qpid.requestreply;

 

+import java.io.IOException;

+import java.net.InetAddress;

+import java.text.DateFormat;

+import java.text.SimpleDateFormat;

+import java.util.*;

+import java.util.concurrent.BrokenBarrierException;

+import java.util.concurrent.CountDownLatch;

+import java.util.concurrent.CyclicBarrier;

+import java.util.concurrent.TimeUnit;

+import java.util.concurrent.atomic.AtomicInteger;

+import java.util.concurrent.atomic.AtomicLong;

+

+import javax.jms.*;

+

 import org.apache.log4j.Logger;

 

 import org.apache.qpid.AMQException;

@@ -37,18 +51,6 @@ import uk.co.thebadgerset.junit.extensions.BatchedThrottle;
 import uk.co.thebadgerset.junit.extensions.Throttle;

 import uk.co.thebadgerset.junit.extensions.util.ParsedProperties;

 

-import javax.jms.*;

-

-import java.io.IOException;

-import java.net.InetAddress;

-import java.text.DateFormat;

-import java.text.SimpleDateFormat;

-import java.util.*;

-import java.util.concurrent.CountDownLatch;

-import java.util.concurrent.TimeUnit;

-import java.util.concurrent.atomic.AtomicInteger;

-import java.util.concurrent.atomic.AtomicLong;

-

 /**

  * PingPongProducer is a client that sends test messages, and waits for replies to these messages. The replies may

  * either be generated by another client (see {@link PingPongBouncer}, or an extension of it may be used that listens

@@ -87,7 +89,7 @@ import java.util.concurrent.atomic.AtomicLong;
  * <tr><td> destinationCount <td> 1        <td> The number of receivers listening to the pings.

  * <tr><td> timeout          <td> 30000    <td> In milliseconds. The timeout to stop waiting for replies.

  * <tr><td> commitBatchSize  <td> 1        <td> The number of messages per transaction in transactional mode.

- * <tr><td> uniqueDests      <td> true     <td> Whether each receivers only listens to one ping destination or all.

+ * <tr><td> uniqueDests      <td> true     <td> Whether each receiver only listens to one ping destination or all.

  * <tr><td> durableDests     <td> false    <td> Whether or not durable destinations are used.

  * <tr><td> ackMode          <td> AUTO_ACK <td> The message acknowledgement mode. Possible values are:

  *                                               0 - SESSION_TRANSACTED

@@ -235,7 +237,7 @@ public class PingPongProducer implements Runnable, MessageListener, ExceptionLis
     /** Holds the default message selector. */

     public static final String SELECTOR_DEFAULT = "";

 

-    /** Holds the name of the property to get the destination count from. */

+    /** Holds the name of the proeprty to get the destination count from. */

     public static final String DESTINATION_COUNT_PROPNAME = "destinationCount";

 

     /** Defines the default number of destinations to ping. */

@@ -371,7 +373,7 @@ public class PingPongProducer implements Runnable, MessageListener, ExceptionLis
     protected int _maxPendingSize;

 

     /**

-     * Holds a monitor which is used to synchronize sender and receivers threads, where the sender has elected

+     * Holds a monitor which is used to synchronize sender and receiver threads, where the sender has elected

      * to wait until the number of unreceived message is reduced before continuing to send.

      */

     protected Object _sendPauseMonitor = new Object();

@@ -568,8 +570,7 @@ public class PingPongProducer implements Runnable, MessageListener, ExceptionLis
     {

         try

         {

-            Properties options =

-                CommandLineParser.processCommandLine(args, new CommandLineParser(new String[][] {}), System.getProperties());

+            Properties options = CommandLineParser.processCommandLine(args, new CommandLineParser(new String[][] {}));

 

             // Create a ping producer overriding its defaults with all options passed on the command line.

             PingPongProducer pingProducer = new PingPongProducer(options);