[jboss-svn-commits] JBL Code SVN: r37305 - in labs/jbossesb/branches/JBESB_4_10_CP: qa and 1 other directory.

[jboss-svn-commits at lists.jboss.org]

Author: tcunning
Date: 2011-07-26 15:57:37 -0400 (Tue, 26 Jul 2011)
New Revision: 37305

Modified:
   labs/jbossesb/branches/JBESB_4_10_CP/product/samples/quickstarts/conf/base-build.xml
   labs/jbossesb/branches/JBESB_4_10_CP/qa/base-cp.xml
Log:
JBESB-3632
Fix the integration tests, which were broken on the last ivy commit.


Modified: labs/jbossesb/branches/JBESB_4_10_CP/product/samples/quickstarts/conf/base-build.xml
===================================================================
--- labs/jbossesb/branches/JBESB_4_10_CP/product/samples/quickstarts/conf/base-build.xml	2011-07-25 16:11:46 UTC (rev 37304)
+++ labs/jbossesb/branches/JBESB_4_10_CP/product/samples/quickstarts/conf/base-build.xml	2011-07-26 19:57:37 UTC (rev 37305)
@@ -22,10 +22,15 @@
 	<condition property="hierarchy.source">
 		<available file="${product.dir}/build-distr.xml"/>
 	</condition>
+
 	<!-- Are we embedded in a jbossesb distribution hierarchy? -->
 	<condition property="hierarchy.jbossesb">
 		<and>
-			<available file="${product.dir}/copyright.txt"/>
+			<or>
+				<available file="${product.dir}/Contributors.txt"/>
+				<available file="${product.dir}/Copyright.txt"/>
+				<available file="${product.dir}/copyright.txt"/>
+			</or>
 			<not>
 				<available file="${product.dir}/server/default"/>
 			</not>
@@ -144,7 +149,8 @@
 
 	<target name="check-as-version">
 		<property name="org.jboss.esb.server.server" location="${org.jboss.esb.server.home}/server/${org.jboss.esb.server.config}"/>
-		<echo message="${org.jboss.esb.server.server}"/>
+		<echo message="product.dir=${product.dir}"/>
+		<echo message="server.server=${org.jboss.esb.server.server}"/>
 		<!-- Check for JBossAS5 -->
 		<condition property="jbossas5">
 			<available file="${org.jboss.esb.server.server}/deployers"/>

Modified: labs/jbossesb/branches/JBESB_4_10_CP/qa/base-cp.xml
===================================================================
--- labs/jbossesb/branches/JBESB_4_10_CP/qa/base-cp.xml	2011-07-25 16:11:46 UTC (rev 37304)
+++ labs/jbossesb/branches/JBESB_4_10_CP/qa/base-cp.xml	2011-07-26 19:57:37 UTC (rev 37305)
@@ -54,7 +54,7 @@
 				includes="*.jar" />
 			<!-- jbpm config -->
 			<fileset dir="${org.jboss.esb.server.server}/deploy/jbpm.esb"
-				includes="jbossesb-jbpm.jar jbpm-ant.jar jbpm-jpdl.jar" />
+				includes="jbossesb-jbpm.jar jbpm-ant.jar jbpm-jpdl*.jar" />
 			<pathelement location="${org.jboss.esb.server.server}/lib/cglib.jar" />
 			<fileset dir="${org.jboss.esb.server.server}/lib" includes="activation.jar, mail.jar, jboss-ejb3x.jar" />
 			<!-- general libs -->
@@ -93,7 +93,7 @@
             <pathelement location="${org.jboss.esb.server.deploy.dir}/jbossesb.esb"/>
             
             <!-- jbpm.esb jars -->
-            <fileset dir="${org.jboss.esb.server.deploy.dir}/jbpm.esb" includes="jbossesb-jbpm.jar jbpm-ant.jar jbpm-jpdl.jar"/>
+            <fileset dir="${org.jboss.esb.server.deploy.dir}/jbpm.esb" includes="jbossesb-jbpm.jar jbpm-ant.jar jbpm-jpdl*.jar"/>
             <pathelement location="${org.jboss.esb.server.deploy.dir}/jbpm.esb"/>
 
             <pathelement location="${org.jboss.esb.server.home}/lib/dom4j.jar"/>
@@ -146,4 +146,4 @@
 
         </path>
 	</target>
-</project>
\ No newline at end of file
+</project>