[jboss-svn-commits] JBL Code SVN: r19619 - in labs/jbossesb/trunk/product: rosetta/tests and 2 other directories.

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

Author: kevin.conner at jboss.com
Date: 2008-04-18 06:03:11 -0400 (Fri, 18 Apr 2008)
New Revision: 19619

Modified:
   labs/jbossesb/trunk/product/build.xml
   labs/jbossesb/trunk/product/product.properties
   labs/jbossesb/trunk/product/rosetta/tests/build.xml
   labs/jbossesb/trunk/product/services/build.xml
   labs/jbossesb/trunk/product/services/soapui-client/build.xml
Log:
Rollback JBESB-1480

Modified: labs/jbossesb/trunk/product/build.xml
===================================================================
--- labs/jbossesb/trunk/product/build.xml	2008-04-18 09:55:17 UTC (rev 19618)
+++ labs/jbossesb/trunk/product/build.xml	2008-04-18 10:03:11 UTC (rev 19619)
@@ -65,18 +65,6 @@
 	</condition>
 	<property name="org.jboss.esb.optimize" value="on"/>
 	
-	<!-- Halt on error? -->
-		<condition property="org.jboss.esb.build.haltonerror" value="no">
-			<equals arg1="${org.jboss.esb.junit.haltonerror}" arg2="no"/>
-		</condition>
-		<property name="org.jboss.esb.build.haltonerror" value="yes"/>
-	
-	<!-- Halt on failure? -->
-		<condition property="org.jboss.esb.build.haltonfailure" value="no">
-			<equals arg1="${org.jboss.esb.junit.haltonfailure}" arg2="no"/>
-		</condition>
-		<property name="org.jboss.esb.build.haltonfailure" value="yes"/>
-	
 	<!-- Path names -->
 	<property name="org.jboss.esb.internal.rosetta" value="esb"/>
 	<property name="org.jboss.esb.internal.dest" location="build"/>

Modified: labs/jbossesb/trunk/product/product.properties
===================================================================
--- labs/jbossesb/trunk/product/product.properties	2008-04-18 09:55:17 UTC (rev 19618)
+++ labs/jbossesb/trunk/product/product.properties	2008-04-18 10:03:11 UTC (rev 19619)
@@ -5,7 +5,7 @@
 org.jboss.esb.build.optimize=off
 org.jboss.esb.build.debug=yes
 
-# Uncomment the following if you wish to use an app server installation
+# uncomment the following if you wish to use an app server installation
 # for tests instead of the included jbossesb-server
 #org.jboss.esb.server.home=<app server home>
 
@@ -14,7 +14,3 @@
 #org.jboss.esb.test.ftp.user=<username>
 #org.jboss.esb.test.ftp.pwd=<password>
 #org.jboss.esb.test.ftp.dir=<base directory>
-
-# Uncomment the following if you want more control over junit
-#org.jboss.esb.junit.haltonerror=yes
-#org.jboss.esb.junit.haltonfailure=yes

Modified: labs/jbossesb/trunk/product/rosetta/tests/build.xml
===================================================================
--- labs/jbossesb/trunk/product/rosetta/tests/build.xml	2008-04-18 09:55:17 UTC (rev 19618)
+++ labs/jbossesb/trunk/product/rosetta/tests/build.xml	2008-04-18 10:03:11 UTC (rev 19619)
@@ -101,8 +101,9 @@
         </copy>
 		<copy file="${org.jboss.esb.root.dir}/etc/schemas/xml/jbossesb-1.0.1.xsd" todir="${org.jboss.esb.tests.classes.dir}"/>
 
-        <junit printsummary="yes" haltonerror="${org.jboss.esb.build.haltonerror}" haltonfailure="${org.jboss.esb.build.haltonfailure}" showoutput="no" fork="true">
-        	<formatter type="plain" usefile="false"/>
+
+        <junit printsummary="yes" haltonerror="yes" haltonfailure="yes" showoutput="no" fork="true">
+            <formatter type="plain" usefile="false"/>
             <formatter type="xml"/>
             <batchtest todir="${org.jboss.esb.tests.report.dir}">
                 <fileset dir="${org.jboss.esb.module.tests.src.dir}">
@@ -186,7 +187,7 @@
                     <fileset dir="resources/etc/" includes="persistUnitTestDB*"/>
                 </copy>
 
-	        <junit printsummary="yes" haltonerror="${org.jboss.esb.build.haltonerror}" haltonfailure="${org.jboss.esb.build.haltonfailure}" showoutput="no" fork="true">
+	        <junit printsummary="yes" haltonerror="yes" haltonfailure="yes" showoutput="no" fork="true">
 	            <formatter type="plain" usefile="false"/>
 	            <formatter type="xml"/>
 	            <batchtest todir="${org.jboss.esb.tests.report.dir}">

Modified: labs/jbossesb/trunk/product/services/build.xml
===================================================================
--- labs/jbossesb/trunk/product/services/build.xml	2008-04-18 09:55:17 UTC (rev 19618)
+++ labs/jbossesb/trunk/product/services/build.xml	2008-04-18 10:03:11 UTC (rev 19619)
@@ -10,7 +10,6 @@
         <ant dir="soapui-client" target="sar"/>
         <ant dir="soap" target="dist"/>
         <ant dir="spring" target="dist"/>
-        <ant dir="slsb" target="dist"/>
     </target>
 
     <target name="clean">
@@ -21,7 +20,6 @@
         <ant dir="soapui-client" target="clean"/>
 		<ant dir="soap" target="clean"/>
         <ant dir="spring" target="clean"/>
-        <ant dir="slsb" target="clean"/>
     </target>
 
     <target name="test">
@@ -32,7 +30,6 @@
         <ant dir="soapui-client" target="test"/>
 		<ant dir="soap" target="test"/>
 		<ant dir="spring" target="test"/>
-	    <ant dir="slsb" target="test"/>
     </target>
 	
 </project>

Modified: labs/jbossesb/trunk/product/services/soapui-client/build.xml
===================================================================
--- labs/jbossesb/trunk/product/services/soapui-client/build.xml	2008-04-18 09:55:17 UTC (rev 19618)
+++ labs/jbossesb/trunk/product/services/soapui-client/build.xml	2008-04-18 10:03:11 UTC (rev 19619)
@@ -88,7 +88,7 @@
     </target>
     <target name="test" depends="junit-present, compile-tests" if="junit.present" description="Run the test cases">
         <mkdir dir="${maven.test.reports}"/>
-        <junit printSummary="yes" haltonerror="${org.jboss.esb.build.haltonerror}" haltonfailure="${org.jboss.esb.build.haltonfailure}" showoutput="true" fork="true" dir=".">
+        <junit printSummary="yes" haltonerror="true" showoutput="true" haltonfailure="true" fork="true" dir=".">
             <sysproperty key="basedir" value="."/>
 			<sysproperty key="java.awt.headless" value="true"/>
         	<sysproperty key="log4j.configuration" value="log4j.xml"/>