Move performance-relative classes in perf package

HTML_PERFORMANCE_TOOLS.md

@@ -32,7 +32,7 @@ to the root folder of the binary distribution and run the following
 command to start the benchmark:
 
 ```bash
-bin/runjava com.rabbitmq.examples.PerfTestMulti
+bin/runjava com.rabbitmq.perf.PerfTestMulti
 publish-consume-spec.js publish-consume-result.js
 ```
 
@@ -345,23 +345,23 @@ As an alternative, from the root directory of the binary distribution,
 you can launch a Java-based web server:
 
 ```
-bin/runjava com.rabbitmq.examples.WebServer
+bin/runjava com.rabbitmq.perf.WebServer
 ```
 
 The latter command starts a web server listening on port 8080, with the
 `html` directory as its base directory. You can then see the included
 sample at http://localhost:8080/examples/sample.html. To change these defaults:
 
 ```
-bin/runjava com.rabbitmq.examples.WebServer ./other-base-dir 9090
+bin/runjava com.rabbitmq.perf.WebServer ./other-base-dir 9090
 ```
 
 At last, if you want a quick preview of your results (same layout
 as the first 'consume' scenario above), ensure the scenario name is
 'benchmark' in the result file and launch the following command:
 
 ```
-$ bin/runjava com.rabbitmq.examples.BenchmarkResults my-result-file.js
+$ bin/runjava com.rabbitmq.perf.BenchmarkResults my-result-file.js
 ```
 
 The latter command will start a web server on port 8080 and open

README.md

@@ -11,7 +11,7 @@ Assuming the current directory is the root directory of the binary distribution,
 to launch a performance test with 1 producer and 1 consumer:
 
 ```
-bin/runjava com.rabbitmq.examples.PerfTest
+bin/runjava com.rabbitmq.perf.PerfTest
 ```
 
 ### Using the HTML performance tools

scripts/PerfTest

@@ -9,5 +9,5 @@ SRCDIR=$(cd "$SCRIPTDIR"/.. && pwd)
 	cd "$SRCDIR"
 	mvn -q test-compile -P '!setup-test-cluster'
 	mvn -q exec:java \
-		-Dexec.mainClass="com.rabbitmq.examples.PerfTest" "$@"
+		-Dexec.mainClass="com.rabbitmq.perf.PerfTest" "$@"
 )

scripts/runperftest

@@ -2,7 +2,7 @@
 
 run() {
     echo "=== running with '$2'"
-    sh `dirname $0`/runjava com.rabbitmq.examples.PerfTest -h $1 -z 10 -i 20 $2
+    sh `dirname $0`/runjava com.rabbitmq.perf.PerfTest -h $1 -z 10 -i 20 $2
     sleep 2
 }
 

scripts/runperftestMaven

@@ -3,7 +3,7 @@
 cd `dirname $0`/..
 run() {
     echo "=== running with '$2'"
-    mvn -q exec:java -Dexec.mainClass="com.rabbitmq.examples.PerfTest" -Dexec.args=" -h $1 -z 10 -i 20 $2"
+    mvn -q exec:java -Dexec.mainClass="com.rabbitmq.perf.PerfTest" -Dexec.args=" -h $1 -z 10 -i 20 $2"
     sleep 2
 }
 

src/main/java/com/rabbitmq/examples/BenchmarkResults.java → src/main/java/com/rabbitmq/perf/BenchmarkResults.java

@@ -13,7 +13,7 @@
 // If you have any questions regarding licensing, please contact us at
 // info@rabbitmq.com.
 
-package com.rabbitmq.examples;
+package com.rabbitmq.perf;
 
 import org.eclipse.jetty.server.Server;
 import org.eclipse.jetty.servlet.DefaultServlet;

src/main/java/com/rabbitmq/examples/perf/Broker.java → src/main/java/com/rabbitmq/perf/Broker.java

@@ -13,7 +13,7 @@
 // If you have any questions regarding licensing, please contact us at
 // info@rabbitmq.com.
 
-package com.rabbitmq.examples.perf;
+package com.rabbitmq.perf;
 
 import com.rabbitmq.tools.Host;
 

src/main/java/com/rabbitmq/examples/perf/BrokerValue.java → src/main/java/com/rabbitmq/perf/BrokerValue.java

@@ -13,7 +13,7 @@
 // If you have any questions regarding licensing, please contact us at
 // info@rabbitmq.com.
 
-package com.rabbitmq.examples.perf;
+package com.rabbitmq.perf;
 
 import java.io.IOException;
 

src/main/java/com/rabbitmq/examples/perf/BrokerVariable.java → src/main/java/com/rabbitmq/perf/BrokerVariable.java

@@ -13,7 +13,7 @@
 // If you have any questions regarding licensing, please contact us at
 // info@rabbitmq.com.
 
-package com.rabbitmq.examples.perf;
+package com.rabbitmq.perf;
 
 import java.util.ArrayList;
 import java.util.List;

src/main/java/com/rabbitmq/examples/perf/Consumer.java → src/main/java/com/rabbitmq/perf/Consumer.java

@@ -13,7 +13,7 @@
 // If you have any questions regarding licensing, please contact us at
 // info@rabbitmq.com.
 
-package com.rabbitmq.examples.perf;
+package com.rabbitmq.perf;
 
 import com.rabbitmq.client.AMQP.BasicProperties;
 import com.rabbitmq.client.Channel;

src/main/java/com/rabbitmq/examples/perf/MulticastParams.java → src/main/java/com/rabbitmq/perf/MulticastParams.java

@@ -13,7 +13,7 @@
 // If you have any questions regarding licensing, please contact us at
 // info@rabbitmq.com.
 
-package com.rabbitmq.examples.perf;
+package com.rabbitmq.perf;
 
 import com.rabbitmq.client.AMQP;
 import com.rabbitmq.client.Channel;

src/main/java/com/rabbitmq/examples/perf/MulticastSet.java → src/main/java/com/rabbitmq/perf/MulticastSet.java

@@ -13,7 +13,7 @@
 // If you have any questions regarding licensing, please contact us at
 // info@rabbitmq.com.
 
-package com.rabbitmq.examples.perf;
+package com.rabbitmq.perf;
 
 import com.rabbitmq.client.Connection;
 import com.rabbitmq.client.ConnectionFactory;

src/main/java/com/rabbitmq/examples/perf/MulticastValue.java → src/main/java/com/rabbitmq/perf/MulticastValue.java

@@ -13,7 +13,7 @@
 // If you have any questions regarding licensing, please contact us at
 // info@rabbitmq.com.
 
-package com.rabbitmq.examples.perf;
+package com.rabbitmq.perf;
 
 class MulticastValue implements VariableValue {
     private final String name;

src/main/java/com/rabbitmq/examples/perf/MulticastVariable.java → src/main/java/com/rabbitmq/perf/MulticastVariable.java

@@ -13,7 +13,7 @@
 // If you have any questions regarding licensing, please contact us at
 // info@rabbitmq.com.
 
-package com.rabbitmq.examples.perf;
+package com.rabbitmq.perf;
 
 import java.util.ArrayList;
 import java.util.List;

src/main/java/com/rabbitmq/examples/PerfTest.java → src/main/java/com/rabbitmq/perf/PerfTest.java

@@ -13,16 +13,16 @@
 // If you have any questions regarding licensing, please contact us at
 // info@rabbitmq.com.
 
-package com.rabbitmq.examples;
+package com.rabbitmq.perf;
 
 import java.text.SimpleDateFormat;
 import java.util.Arrays;
 import java.util.Calendar;
 import java.util.List;
 
-import com.rabbitmq.examples.perf.MulticastParams;
-import com.rabbitmq.examples.perf.MulticastSet;
-import com.rabbitmq.examples.perf.Stats;
+import com.rabbitmq.perf.MulticastParams;
+import com.rabbitmq.perf.MulticastSet;
+import com.rabbitmq.perf.Stats;
 import org.apache.commons.cli.CommandLine;
 import org.apache.commons.cli.CommandLineParser;
 import org.apache.commons.cli.GnuParser;

src/main/java/com/rabbitmq/examples/PerfTestMulti.java → src/main/java/com/rabbitmq/perf/PerfTestMulti.java

@@ -13,11 +13,11 @@
 // If you have any questions regarding licensing, please contact us at
 // info@rabbitmq.com.
 
-package com.rabbitmq.examples;
+package com.rabbitmq.perf;
 
 import com.rabbitmq.client.ConnectionFactory;
-import com.rabbitmq.examples.perf.Scenario;
-import com.rabbitmq.examples.perf.ScenarioFactory;
+import com.rabbitmq.perf.Scenario;
+import com.rabbitmq.perf.ScenarioFactory;
 import com.rabbitmq.tools.json.JSONReader;
 import com.rabbitmq.tools.json.JSONWriter;
 

src/main/java/com/rabbitmq/examples/perf/PerfUtil.java → src/main/java/com/rabbitmq/perf/PerfUtil.java

@@ -13,7 +13,7 @@
 // If you have any questions regarding licensing, please contact us at
 // info@rabbitmq.com.
 
-package com.rabbitmq.examples.perf;
+package com.rabbitmq.perf;
 
 import java.beans.IntrospectionException;
 import java.beans.Introspector;

src/main/java/com/rabbitmq/examples/perf/Producer.java → src/main/java/com/rabbitmq/perf/Producer.java

@@ -13,7 +13,7 @@
 // If you have any questions regarding licensing, please contact us at
 // info@rabbitmq.com.
 
-package com.rabbitmq.examples.perf;
+package com.rabbitmq.perf;
 
 import com.rabbitmq.client.AMQP;
 import com.rabbitmq.client.Channel;

src/main/java/com/rabbitmq/examples/perf/ProducerConsumerBase.java → src/main/java/com/rabbitmq/perf/ProducerConsumerBase.java

@@ -13,7 +13,7 @@
 // If you have any questions regarding licensing, please contact us at
 // info@rabbitmq.com.
 
-package com.rabbitmq.examples.perf;
+package com.rabbitmq.perf;
 
 /**
  *

src/main/java/com/rabbitmq/examples/perf/RateVsLatencyScenario.java → src/main/java/com/rabbitmq/perf/RateVsLatencyScenario.java

@@ -13,7 +13,7 @@
 // If you have any questions regarding licensing, please contact us at
 // info@rabbitmq.com.
 
-package com.rabbitmq.examples.perf;
+package com.rabbitmq.perf;
 
 import com.rabbitmq.client.ConnectionFactory;
 

src/main/java/com/rabbitmq/examples/perf/Scenario.java → src/main/java/com/rabbitmq/perf/Scenario.java

@@ -13,7 +13,7 @@
 // If you have any questions regarding licensing, please contact us at
 // info@rabbitmq.com.
 
-package com.rabbitmq.examples.perf;
+package com.rabbitmq.perf;
 
 public interface Scenario {
     public String getName();

src/main/java/com/rabbitmq/examples/perf/ScenarioFactory.java → src/main/java/com/rabbitmq/perf/ScenarioFactory.java

@@ -13,7 +13,7 @@
 // If you have any questions regarding licensing, please contact us at
 // info@rabbitmq.com.
 
-package com.rabbitmq.examples.perf;
+package com.rabbitmq.perf;
 
 import com.rabbitmq.client.ConnectionFactory;
 

src/main/java/com/rabbitmq/examples/perf/ScenarioStats.java → src/main/java/com/rabbitmq/perf/ScenarioStats.java

@@ -13,7 +13,7 @@
 // If you have any questions regarding licensing, please contact us at
 // info@rabbitmq.com.
 
-package com.rabbitmq.examples.perf;
+package com.rabbitmq.perf;
 
 import java.util.Map;
 

src/main/java/com/rabbitmq/examples/perf/SimpleScenario.java → src/main/java/com/rabbitmq/perf/SimpleScenario.java

@@ -13,7 +13,7 @@
 // If you have any questions regarding licensing, please contact us at
 // info@rabbitmq.com.
 
-package com.rabbitmq.examples.perf;
+package com.rabbitmq.perf;
 
 import com.rabbitmq.client.ConnectionFactory;
 

src/main/java/com/rabbitmq/examples/perf/SimpleScenarioStats.java → src/main/java/com/rabbitmq/perf/SimpleScenarioStats.java

@@ -13,7 +13,7 @@
 // If you have any questions regarding licensing, please contact us at
 // info@rabbitmq.com.
 
-package com.rabbitmq.examples.perf;
+package com.rabbitmq.perf;
 
 import java.util.ArrayList;
 import java.util.HashMap;

src/main/java/com/rabbitmq/examples/perf/Stats.java → src/main/java/com/rabbitmq/perf/Stats.java

@@ -13,7 +13,7 @@
 // If you have any questions regarding licensing, please contact us at
 // info@rabbitmq.com.
 
-package com.rabbitmq.examples.perf;
+package com.rabbitmq.perf;
 
 public abstract class Stats {
     protected final long    interval;

src/main/java/com/rabbitmq/examples/perf/Variable.java → src/main/java/com/rabbitmq/perf/Variable.java

@@ -13,7 +13,7 @@
 // If you have any questions regarding licensing, please contact us at
 // info@rabbitmq.com.
 
-package com.rabbitmq.examples.perf;
+package com.rabbitmq.perf;
 
 import java.util.List;
 

src/main/java/com/rabbitmq/examples/perf/VariableValue.java → src/main/java/com/rabbitmq/perf/VariableValue.java

@@ -13,7 +13,7 @@
 // If you have any questions regarding licensing, please contact us at
 // info@rabbitmq.com.
 
-package com.rabbitmq.examples.perf;
+package com.rabbitmq.perf;
 
 public interface VariableValue {
     public void setup(MulticastParams params) throws Exception;

src/main/java/com/rabbitmq/examples/perf/VaryingScenario.java → src/main/java/com/rabbitmq/perf/VaryingScenario.java

@@ -13,7 +13,7 @@
 // If you have any questions regarding licensing, please contact us at
 // info@rabbitmq.com.
 
-package com.rabbitmq.examples.perf;
+package com.rabbitmq.perf;
 
 import com.rabbitmq.client.ConnectionFactory;
 

src/main/java/com/rabbitmq/examples/perf/VaryingScenarioStats.java → src/main/java/com/rabbitmq/perf/VaryingScenarioStats.java

@@ -13,7 +13,7 @@
 // If you have any questions regarding licensing, please contact us at
 // info@rabbitmq.com.
 
-package com.rabbitmq.examples.perf;
+package com.rabbitmq.perf;
 
 import java.util.ArrayList;
 import java.util.HashMap;

src/main/java/com/rabbitmq/examples/WebServer.java → src/main/java/com/rabbitmq/perf/WebServer.java

@@ -13,7 +13,7 @@
 // If you have any questions regarding licensing, please contact us at
 // info@rabbitmq.com.
 
-package com.rabbitmq.examples;
+package com.rabbitmq.perf;
 
 import org.eclipse.jetty.server.Server;
 import org.eclipse.jetty.servlet.DefaultServlet;