Author: ritchiem
Date: Fri May 18 07:12:28 2007
New Revision: 539476

URL: http://svn.apache.org/viewvc?view=rev&rev=539476
Log:
QPID-401 Update to pom to correctly set the broker.dir

Modified:
    incubator/qpid/branches/M2/java/broker/pom.xml

Modified: incubator/qpid/branches/M2/java/broker/pom.xml
URL: 
http://svn.apache.org/viewvc/incubator/qpid/branches/M2/java/broker/pom.xml?view=diff&rev=539476&r1=539475&r2=539476
==============================================================================
--- incubator/qpid/branches/M2/java/broker/pom.xml (original)
+++ incubator/qpid/branches/M2/java/broker/pom.xml Fri May 18 07:12:28 2007
@@ -168,13 +168,14 @@
                                 <tasks>
 
                                     <condition property="broker.dir" 
-                                             
value="${user.dir}${file.separator}..${file.separator}broker"
-                                             else="${user.dir}">
-                                        <equals arg1="${topDirectoryLocation}" 
arg2="." />
+                                             
else="${user.dir}${file.separator}broker"
+                                             value="${user.dir}">
+                                        <contains string="${user.dir}" 
substring="broker" />
                                     </condition>
 
                                     <property name="command" 
-                                              value="bash -c 'python run-tests 
-v -I java_failing.txt'"/>
+                                              value="python run-tests -v -I 
java_failing.txt"/>
+                                              <!--value="bash -c 'python 
run-tests -v -I java_failing.txt'"/>-->
 
                                     <ant antfile="python-test.xml" 
inheritRefs="true">
                                         <target name="run-tests" />


Reply via email to