You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ru...@apache.org on 2007/11/09 16:31:04 UTC
svn commit: r593566 [1/4] - in /incubator/qpid/trunk/qpid/java/perftests: ./
etc/jndi/ etc/scripts/ src/main/java/org/apache/qpid/ping/
src/main/java/org/apache/qpid/requestreply/
Author: rupertlssmith
Date: Fri Nov 9 07:31:03 2007
New Revision: 593566
URL: http://svn.apache.org/viewvc?rev=593566&view=rev
Log:
Merged perf test latest from M2.1 onto trunk. Many fixes and now tests through pure JMS.
Added:
incubator/qpid/trunk/qpid/java/perftests/etc/jndi/
incubator/qpid/trunk/qpid/java/perftests/etc/jndi/activemq.properties
incubator/qpid/trunk/qpid/java/perftests/etc/jndi/perftests.properties
incubator/qpid/trunk/qpid/java/perftests/etc/jndi/swiftmq.properties
incubator/qpid/trunk/qpid/java/perftests/etc/scripts/Test-ActiveMQ.sh
incubator/qpid/trunk/qpid/java/perftests/etc/scripts/Test-SwiftMQ.sh
Modified:
incubator/qpid/trunk/qpid/java/perftests/jar-with-dependencies.xml
incubator/qpid/trunk/qpid/java/perftests/pom.xml
incubator/qpid/trunk/qpid/java/perftests/src/main/java/org/apache/qpid/ping/PingClient.java
incubator/qpid/trunk/qpid/java/perftests/src/main/java/org/apache/qpid/ping/PingLatencyTestPerf.java
incubator/qpid/trunk/qpid/java/perftests/src/main/java/org/apache/qpid/requestreply/PingPongProducer.java
Added: incubator/qpid/trunk/qpid/java/perftests/etc/jndi/activemq.properties
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/perftests/etc/jndi/activemq.properties?rev=593566&view=auto
==============================================================================
--- incubator/qpid/trunk/qpid/java/perftests/etc/jndi/activemq.properties (added)
+++ incubator/qpid/trunk/qpid/java/perftests/etc/jndi/activemq.properties Fri Nov 9 07:31:03 2007
@@ -0,0 +1,3 @@
+java.naming.factory.initial = org.apache.activemq.jndi.ActiveMQInitialContextFactory
+java.naming.provider.url= tcp://localhost:61616
+
Added: incubator/qpid/trunk/qpid/java/perftests/etc/jndi/perftests.properties
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/perftests/etc/jndi/perftests.properties?rev=593566&view=auto
==============================================================================
--- incubator/qpid/trunk/qpid/java/perftests/etc/jndi/perftests.properties (added)
+++ incubator/qpid/trunk/qpid/java/perftests/etc/jndi/perftests.properties Fri Nov 9 07:31:03 2007
@@ -0,0 +1,2 @@
+java.naming.factory.initial = org.apache.qpid.jndi.PropertiesFileInitialContextFactory
+connectionfactory.local = amqp://guest:guest@clientid/test?brokerlist='tcp://localhost:5672'
Added: incubator/qpid/trunk/qpid/java/perftests/etc/jndi/swiftmq.properties
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/perftests/etc/jndi/swiftmq.properties?rev=593566&view=auto
==============================================================================
--- incubator/qpid/trunk/qpid/java/perftests/etc/jndi/swiftmq.properties (added)
+++ incubator/qpid/trunk/qpid/java/perftests/etc/jndi/swiftmq.properties Fri Nov 9 07:31:03 2007
@@ -0,0 +1,3 @@
+java.naming.factory.initial = com.swiftmq.jndi.InitialContextFactoryImpl
+java.naming.provider.url=smqp://localhost:4001/timeout=10000
+#connectionfactory.local = amqp://guest:guest@clientid/test?brokerlist='tcp://localhost:5672'
Added: incubator/qpid/trunk/qpid/java/perftests/etc/scripts/Test-ActiveMQ.sh
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/perftests/etc/scripts/Test-ActiveMQ.sh?rev=593566&view=auto
==============================================================================
--- incubator/qpid/trunk/qpid/java/perftests/etc/scripts/Test-ActiveMQ.sh (added)
+++ incubator/qpid/trunk/qpid/java/perftests/etc/scripts/Test-ActiveMQ.sh Fri Nov 9 07:31:03 2007
@@ -0,0 +1,14 @@
+#!/bin/bash
+
+# Parse arguements taking all - prefixed args as JAVA_OPTS
+for arg in "$@"; do
+ if [[ $arg == -java:* ]]; then
+ JAVA_OPTS="${JAVA_OPTS}-`echo $arg|cut -d ':' -f 2` "
+ else
+ ARGS="${ARGS}$arg "
+ fi
+done
+
+java -Xms256m -Dlog4j.configuration=perftests.log4j -Xmx1024m -Dbadger.level=warn -Damqj.test.logging.level=info -Damqj.logging.level=warn ${JAVA_OPTS} -cp "qpid-perftests-1.0-incubating-M2.1-SNAPSHOT.jar;activemq-jars/apache-activemq-4.1.1.jar" uk.co.thebadgerset.junit.extensions.TKTestRunner -n Test-ActiveMQ -s[1] -r 1 -t testAsyncPingOk -o . org.apache.qpid.ping.PingAsyncTestPerf properties=activemq.properties factoryName=ConnectionFactory ${ARGS}
+
+# queueNamePostfix=@router1 overrideClientId=true
\ No newline at end of file
Added: incubator/qpid/trunk/qpid/java/perftests/etc/scripts/Test-SwiftMQ.sh
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/perftests/etc/scripts/Test-SwiftMQ.sh?rev=593566&view=auto
==============================================================================
--- incubator/qpid/trunk/qpid/java/perftests/etc/scripts/Test-SwiftMQ.sh (added)
+++ incubator/qpid/trunk/qpid/java/perftests/etc/scripts/Test-SwiftMQ.sh Fri Nov 9 07:31:03 2007
@@ -0,0 +1,12 @@
+#!/bin/bash
+
+# Parse arguements taking all - prefixed args as JAVA_OPTS
+for arg in "$@"; do
+ if [[ $arg == -java:* ]]; then
+ JAVA_OPTS="${JAVA_OPTS}-`echo $arg|cut -d ':' -f 2` "
+ else
+ ARGS="${ARGS}$arg "
+ fi
+done
+
+java -Xms256m -Dlog4j.configuration=perftests.log4j -Xmx1024m -Dbadger.level=warn -Damqj.test.logging.level=info -Damqj.logging.level=warn ${JAVA_OPTS} -cp "qpid-perftests-1.0-incubating-M2.1-SNAPSHOT.jar;swiftmqjars/swiftmq.jar" uk.co.thebadgerset.junit.extensions.TKTestRunner -n Test-SwiftMQ -s[1] -r 1 -t testAsyncPingOk -o . org.apache.qpid.ping.PingAsyncTestPerf properties=swiftmq.properties factoryName=ConnectionFactory queueNamePostfix=@router1 overrideClientId=true ${ARGS}
\ No newline at end of file
Modified: incubator/qpid/trunk/qpid/java/perftests/jar-with-dependencies.xml
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/perftests/jar-with-dependencies.xml?rev=593566&r1=593565&r2=593566&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/perftests/jar-with-dependencies.xml (original)
+++ incubator/qpid/trunk/qpid/java/perftests/jar-with-dependencies.xml Fri Nov 9 07:31:03 2007
@@ -6,9 +6,9 @@
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
-
+ -
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
@@ -44,21 +44,30 @@
<outputDirectory></outputDirectory>
</fileSet>
- <!-- Include all the test scripts, both generated and hand-written. -->
- <fileSet>
- <directory>target</directory>
- <outputDirectory></outputDirectory>
- <includes>
- <include>*.sh</include>
- </includes>
- </fileSet>
- <fileSet>
- <directory>etc/scripts</directory>
- <outputDirectory></outputDirectory>
- <includes>
- <include>*.sh</include>
- </includes>
- </fileSet>
+ <!-- Include all the test scripts, both generated and hand-written. -->
+ <fileSet>
+ <directory>target</directory>
+ <outputDirectory></outputDirectory>
+ <includes>
+ <include>*.sh</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>etc/scripts</directory>
+ <outputDirectory></outputDirectory>
+ <includes>
+ <include>*.sh</include>
+ </includes>
+ </fileSet>
+
+ <!-- Include all jndi configurations needed to run the tests. -->
+ <fileSet>
+ <directory>etc/jndi</directory>
+ <outputDirectory></outputDirectory>
+ <includes>
+ <include>*.properties</include>
+ </includes>
+ </fileSet>
<!-- Include the build artifact. -->
<fileSet>