changed prefix consumer and producer to "client". Also, the broker can be started in activemq-perftest instead in the assembly.

git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@412301 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Frederick G. Oconer 2006-06-07 06:17:14 +00:00
parent 4fb36fe50c
commit edfe3df36b
4 changed files with 21 additions and 31 deletions

View File

@ -296,17 +296,7 @@
</execution> </execution>
</executions> </executions>
</plugin> </plugin>
<!--
<plugin>
<groupId>incubator-activemq</groupId>
<artifactId>maven-activemq-perf-plugin</artifactId>
<version>4.0-SNAPSHOT</version>
<configuration>
<configFile>src/release/conf/activemq.xml</configFile>
</configuration>
</plugin>
-->
</plugins> </plugins>
</build> </build>
</project> </project>

View File

@ -93,32 +93,32 @@ public class ConsumerMojo
private String destComposite; private String destComposite;
/** /**
* @parameter expression="${consumer.durable}" default-value="false" * @parameter expression="${client.durable}" default-value="false"
* @required * @required
*/ */
private String durable; private String durable;
/** /**
* @parameter expression="${consumer.asyncRecv}" default-value="true" * @parameter expression="${client.asyncRecv}" default-value="true"
* @required * @required
*/ */
private String asyncRecv; private String asyncRecv;
/** /**
* @parameter expression="${consumer.recvCount}" default-value="1000" * @parameter expression="${client.recvCount}" default-value="1000"
* @required * @required
*/ */
private String recvCount; private String recvCount;
/* /*
* @parameter expression="${consumer.recvDuration}" default-value="60000" * @parameter expression="${client.recvDuration}" default-value="60000"
* @required * @required
private String recvDuration; private String recvDuration;
*/ */
/** /**
* @parameter expression="${consumer.recvType}" default-value="time" * @parameter expression="${client.recvType}" default-value="time"
* @required * @required
*/ */
private String recvType; private String recvType;
@ -209,11 +209,11 @@ public class ConsumerMojo
options[8] = "client.destCount=" + destCount; options[8] = "client.destCount=" + destCount;
options[9] = "client.destComposite=" + destComposite; options[9] = "client.destComposite=" + destComposite;
options[10] = "consumer.durable=" + durable; options[10] = "client.durable=" + durable;
options[11] = "consumer.asyncRecv=" + asyncRecv; options[11] = "client.asyncRecv=" + asyncRecv;
options[12] = "consumer.recvCount=" + recvCount; // 1000 messages options[12] = "client.recvCount=" + recvCount; // 1000 messages
options[13] = "consumer.recvDuration=" + duration; // use sampler.duration. options[13] = "client.recvDuration=" + duration; // use sampler.duration.
options[14] = "consumer.recvType=" + recvType; options[14] = "client.recvType=" + recvType;
options[15] = "factory.brokerUrl=" + brokerUrl; options[15] = "factory.brokerUrl=" + brokerUrl;
options[16] = "factory.optimAck=" + optimAck; options[16] = "factory.optimAck=" + optimAck;

View File

@ -91,26 +91,26 @@ public class ProducerMojo
private String destComposite; private String destComposite;
/** /**
* @parameter expression="${producer.messageSize}" default-value="1024" * @parameter expression="${client.messageSize}" default-value="1024"
* @required * @required
*/ */
private String messageSize; private String messageSize;
/** /**
* @parameter expression="${producer.sendCount}" default-value="1000" * @parameter expression="${client.sendCount}" default-value="1000"
* @required * @required
*/ */
private String sendCount; private String sendCount;
/* /*
* @parameter expression="${producer.sendDuration}" default-value="60000" * @parameter expression="${client.sendDuration}" default-value="60000"
* @required * @required
private String sendDuration; private String sendDuration;
*/ */
/** /**
* @parameter expression="${producer.sendType}" default-value="time" * @parameter expression="${client.sendType}" default-value="time"
* @required * @required
*/ */
private String sendType; private String sendType;
@ -173,10 +173,10 @@ public class ProducerMojo
options[8] = "client.destCount=" + destCount; options[8] = "client.destCount=" + destCount;
options[9] = "client.destComposite=" + destComposite; options[9] = "client.destComposite=" + destComposite;
options[10] = "producer.messageSize="+messageSize; options[10] = "client.messageSize="+messageSize;
options[11] = "producer.sendCount="+sendCount; // 1000 messages options[11] = "client.sendCount="+sendCount; // 1000 messages
options[12] = "producer.sendDuration="+duration; // use sampler.duration. options[12] = "client.sendDuration="+duration; // use sampler.duration.
options[13] = "producer.sendType="+sendType; options[13] = "client.sendType="+sendType;
options[14] = "factory.brokerUrl="+brokerUrl; options[14] = "factory.brokerUrl="+brokerUrl;
options[15] = "factory.asyncSend="+asyncSend; options[15] = "factory.asyncSend="+asyncSend;

View File

@ -119,8 +119,8 @@ public class PerfReportGenerator {
public String createReportName(Properties testSettings) { public String createReportName(Properties testSettings) {
if (testSettings != null) { if (testSettings != null) {
String[] keys = {"client.destCount", "consumer.asyncRecv", "consumer.durable", String[] keys = {"client.destCount", "client.asyncRecv", "client.durable",
"producer.messageSize", "sysTest.numClients", "sysTest.totalDests"}; "client.messageSize", "sysTest.numClients", "sysTest.totalDests"};
StringBuffer buffer = new StringBuffer(); StringBuffer buffer = new StringBuffer();
String key; String key;