You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ri...@apache.org on 2007/09/25 13:13:25 UTC
svn commit: r579198 - in /incubator/qpid/branches/M2.1/java/broker:
etc/log4j.xml pom.xml python-test.xml
src/test/java/org/apache/qpid/server/RunBrokerWithCommand.java
Author: ritchiem
Date: Tue Sep 25 04:13:23 2007
New Revision: 579198
URL: http://svn.apache.org/viewvc?rev=579198&view=rev
Log:
Update to start M2.1 python test broker on port 2100 (management 2101) and for the tests to use that broker.
Modified:
incubator/qpid/branches/M2.1/java/broker/etc/log4j.xml
incubator/qpid/branches/M2.1/java/broker/pom.xml
incubator/qpid/branches/M2.1/java/broker/python-test.xml
incubator/qpid/branches/M2.1/java/broker/src/test/java/org/apache/qpid/server/RunBrokerWithCommand.java
Modified: incubator/qpid/branches/M2.1/java/broker/etc/log4j.xml
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/M2.1/java/broker/etc/log4j.xml?rev=579198&r1=579197&r2=579198&view=diff
==============================================================================
--- incubator/qpid/branches/M2.1/java/broker/etc/log4j.xml (original)
+++ incubator/qpid/branches/M2.1/java/broker/etc/log4j.xml Tue Sep 25 04:13:23 2007
@@ -76,6 +76,7 @@
<category name="Qpid.Broker">
<priority value="debug"/>
<appender-ref ref="AlertFile"/>
+ <appender-ref ref="STDOUT"/>
</category>
<category name="org.apache.qpid.server.queue.AMQQueueMBean">
Modified: incubator/qpid/branches/M2.1/java/broker/pom.xml
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/M2.1/java/broker/pom.xml?rev=579198&r1=579197&r2=579198&view=diff
==============================================================================
--- incubator/qpid/branches/M2.1/java/broker/pom.xml (original)
+++ incubator/qpid/branches/M2.1/java/broker/pom.xml Tue Sep 25 04:13:23 2007
@@ -209,7 +209,7 @@
</condition>
<property name="command"
- value="python run-tests -v -I java_failing.txt"/>
+ value="python run-tests -v -I java_failing.txt -b localhost:2100"/>
<!--value="bash -c 'python run-tests -v -I java_failing.txt'"/>-->
<ant antfile="python-test.xml" inheritRefs="true">
Modified: incubator/qpid/branches/M2.1/java/broker/python-test.xml
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/M2.1/java/broker/python-test.xml?rev=579198&r1=579197&r2=579198&view=diff
==============================================================================
--- incubator/qpid/branches/M2.1/java/broker/python-test.xml (original)
+++ incubator/qpid/branches/M2.1/java/broker/python-test.xml Tue Sep 25 04:13:23 2007
@@ -42,8 +42,12 @@
failonerror="true"
>
<arg value="${command}"/>
-
- <classpath refid="maven.test.classpath"/>
+ <arg value="-p"/>
+ <arg value="2100"/>
+ <arg value="-m"/>
+ <arg value="2101"/>
+
+ <classpath refid="maven.test.classpath"/>
<sysproperty key="QPID_HOME" value="${broker.dir}"/>
<sysproperty key="QPID_WORK" value="${broker.dir}${file.separator}target"/>
</java>
Modified: incubator/qpid/branches/M2.1/java/broker/src/test/java/org/apache/qpid/server/RunBrokerWithCommand.java
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/M2.1/java/broker/src/test/java/org/apache/qpid/server/RunBrokerWithCommand.java?rev=579198&r1=579197&r2=579198&view=diff
==============================================================================
--- incubator/qpid/branches/M2.1/java/broker/src/test/java/org/apache/qpid/server/RunBrokerWithCommand.java (original)
+++ incubator/qpid/branches/M2.1/java/broker/src/test/java/org/apache/qpid/server/RunBrokerWithCommand.java Tue Sep 25 04:13:23 2007
@@ -33,11 +33,11 @@
public static void main(String[] args)
{
//Start broker
-
try
{
+ String[] fudge = args.clone();
- String[] fudge = new String[1];
+ // Override the first value which is the command we are going to run later.
fudge[0] = "-v";
new Main(fudge).startup();
}