[jboss-svn-commits] JBL Code SVN: r18569 - in labs/jbossesb/branches/JBESB_4_2_1_GA_CP/qa: junit and 2 other directories.

jboss-svn-commits at lists.jboss.org jboss-svn-commits at lists.jboss.org
Sat Feb 23 19:05:16 EST 2008


Author: tcunning
Date: 2008-02-23 19:05:16 -0500 (Sat, 23 Feb 2008)
New Revision: 18569

Added:
   labs/jbossesb/branches/JBESB_4_2_1_GA_CP/qa/junit/src/org/jboss/soa/esb/epr/jbm-service.xml
   labs/jbossesb/branches/JBESB_4_2_1_GA_CP/qa/junit/src/org/jboss/soa/esb/epr/jbmq-service.xml
Removed:
   labs/jbossesb/branches/JBESB_4_2_1_GA_CP/qa/junit/src/org/jboss/soa/esb/epr/jms-service.xml
Modified:
   labs/jbossesb/branches/JBESB_4_2_1_GA_CP/qa/build.xml
   labs/jbossesb/branches/JBESB_4_2_1_GA_CP/qa/junit/build.xml
   labs/jbossesb/branches/JBESB_4_2_1_GA_CP/qa/junit/src/org/jboss/soa/esb/epr/LogicalEPRUnitTest.java
   labs/jbossesb/branches/JBESB_4_2_1_GA_CP/qa/quickstarts/build.xml
   labs/jbossesb/branches/JBESB_4_2_1_GA_CP/qa/test.properties
Log:
bug:JBESB-1513
Changes to classpath so that tests run against the classpath of the container.


Modified: labs/jbossesb/branches/JBESB_4_2_1_GA_CP/qa/build.xml
===================================================================
--- labs/jbossesb/branches/JBESB_4_2_1_GA_CP/qa/build.xml	2008-02-23 17:28:12 UTC (rev 18568)
+++ labs/jbossesb/branches/JBESB_4_2_1_GA_CP/qa/build.xml	2008-02-24 00:05:16 UTC (rev 18569)
@@ -23,6 +23,10 @@
                 <propertyref  regex="soa.test.*"/>
         </propertyset>
 
+	<propertyset id="org.jboss.esb.server">
+		<propertyref regex="org.jboss.esb.server.*"/>	
+	</propertyset>
+
 	<property name="junit.jar" location="lib/ext/junit-4.1.jar"/>
 	<macrodef name="runant">
 		<attribute name="target"/>
@@ -34,6 +38,7 @@
 			    fork="true" failonerror="@{failonerror}"
 				resultproperty="@{resultproperty}">
 				<syspropertyset refid="soa.props"/>
+				<syspropertyset refid="org.jboss.esb.server"/>
 				<sysproperty key="ant.home" value="${ant.home}"/>
 				<sysproperty key="ant.library.dir" value="${ant.library.dir}"/>
 	            		<sysproperty key="org.jboss.esb.properties" value="${org.jboss.esb.properties}"/>

Modified: labs/jbossesb/branches/JBESB_4_2_1_GA_CP/qa/junit/build.xml
===================================================================
--- labs/jbossesb/branches/JBESB_4_2_1_GA_CP/qa/junit/build.xml	2008-02-23 17:28:12 UTC (rev 18568)
+++ labs/jbossesb/branches/JBESB_4_2_1_GA_CP/qa/junit/build.xml	2008-02-24 00:05:16 UTC (rev 18569)
@@ -1,8 +1,7 @@
 <?xml version="1.0"?>
 <project name="JUnit" default="test" basedir=".">
-
+   <property name="product.dir" location="../../product"/>
    <property name="product.build" location="../../product/build"/>
-   <property name="product.lib" location="${product.build}/jbossesb/lib"/>
    <property name="coverage" location="${product.build}/tests/coverage"/>
    <property name="qa.build" location="../build"/>
    <property name="qa.build.lib" location="../build/lib"/>
@@ -23,17 +22,44 @@
    <property file="${org.jboss.esb.properties}"/>
 
    <path id="base.cp">
-      <fileset dir="${product.lib}/ext"
-               excludes="*.jar" includes="jaxr-api*.jar,scout*.jar,juddi*.jar"/>
-      <fileset dir="${qa.lib}/ext" includes="*.jar"/>
-      <fileset dir="${product.lib}/ext" includes="*.jar"/>
-      <fileset dir="${product.lib}/jbpm.esb" includes="*.jar"/>
-      <pathelement location="../"/>
+       <fileset dir="${product.dir}/lib/ext" includes="jaxr-api*.jar"/>
+	   <fileset dir="${org.jboss.esb.server.home}">
+		   <include name="lib/*.jar"/>
+		   <include name="client/*.jar"/>
+	   </fileset>
+       <fileset dir="${org.jboss.esb.server.home}/server/${org.jboss.esb.test.server.config}">
+           <include name="jbossesb.sar/*.jar"/>
+           <include name="jbpm.esb/*.jar"/>
+       </fileset>
+       <fileset dir="${qa.lib}/ext" includes="*.jar"/>
+       <pathelement location="../"/>
    </path>
 
    <path id="qa.junit.cp">
-      <path refid="base.cp"/>
-      <fileset dir="${product.lib}" includes="*.jar"/>
+        <path refid="base.cp"/>
+        <fileset dir="${org.jboss.esb.server.home}/client" includes="*.jar"/>
+        <fileset dir="${org.jboss.esb.server.home}/lib">
+                <include name="*.jar"/>
+                <include name="endorsed/*.jar"/>
+        </fileset>
+        <fileset dir="${org.jboss.esb.server.home}/server/${org.jboss.esb.test.server.config}/lib" includes="*.jar"/>
+        <fileset dir="${org.jboss.esb.server.home}/server/${org.jboss.esb.test.server.config}/deploy">
+                <include name="jbossesb.sar/lib/*.jar"/>
+                <include name="soap.esb/*.jar"/>
+                <include name="jbpm.esb/*.jar"/>
+                <include name="jbrules.esb/*.jar"/>
+                <include name="jboss-aop-jdk50.deployer/*.jar"/>
+                <include name="jbossws.sar/*.jar"/>
+                <include name="jboss-web.deployer/*.jar"/>
+        </fileset>
+        <fileset dir="${product.dir}/lib/ext">
+                <include name="emma*.jar"/>
+                <include name="edtftpj-1.5.4.jar"/>
+                <include name="jaxr-api-1.0rc1.jar"/>
+                <include name="jakarta-oro-2.0.8.jar"/>
+        </fileset>
+        <fileset dir="${qa.lib}/ext" includes="*.jar"/>
+        <pathelement location="../"/>
    </path>
 
    <path id="qa.junit.emma.cp">
@@ -46,7 +72,7 @@
 
    <target name="compile">
       <echo message="Running JUnit based QA tests..."/>
-
+	<echo>${org.jboss.soa.esb.qa.jmsprovider}</echo>
       <!-- Build the tests... -->
       <mkdir dir="${qa.junit.classes}"/>
       <javac srcdir="${qa.junit.src}" destdir="${qa.junit.classes}" classpathref="qa.junit.cp" debug="on"/>
@@ -57,7 +83,7 @@
 
       <path id="qa.junit.versioned.cp">
          <path refid="base.cp"/>
-         <fileset dir="${product.lib}" includes="*.jar"/>
+		 <path refid="qa.junit.cp"/>
          <pathelement location="${qa.junit.classes}"/>
       </path>
 
@@ -162,6 +188,7 @@
              haltonfailure="false"
              fork="true">
 
+	 <sysproperty key="org.jboss.esb.jmsimpl" value="${org.jboss.soa.esb.qa.jmsprovider}"/>
          <sysproperty key="jbosstest.deploy.dir" value="${qa.build.lib}"/>
          <sysproperty key="jbosstest.threadcount" value="${jbosstest.threadcount}"/>
          <sysproperty key="jbosstest.iterationcount" value="${jbosstest.iterationcount}"/>
@@ -190,6 +217,7 @@
 
             <fileset dir="${qa.junit.classes}">
                <include name="org/jboss/soa/esb/${test}/unit/*TestCase.class"/>
+     	       <exclude name="**/LogicalEPRUnitTest.class"/> 
             </fileset>
          </batchtest>
       </junit>
@@ -242,6 +270,7 @@
          </classpath>
          <jvmarg value="-Xmx${qa.junit.memory}"/>
 
+         <sysproperty key="org.jboss.esb.jmsimpl" value="${org.jboss.soa.esb.qa.jmsprovider}"/>
       	 <sysproperty key="jbosstest.deploy.dir" value="${qa.build.lib}"/>
          <sysproperty key="jbosstest.threadcount" value="${jbosstest.threadcount}"/>
          <sysproperty key="jbosstest.iterationcount" value="${jbosstest.iterationcount}"/>

Modified: labs/jbossesb/branches/JBESB_4_2_1_GA_CP/qa/junit/src/org/jboss/soa/esb/epr/LogicalEPRUnitTest.java
===================================================================
--- labs/jbossesb/branches/JBESB_4_2_1_GA_CP/qa/junit/src/org/jboss/soa/esb/epr/LogicalEPRUnitTest.java	2008-02-23 17:28:12 UTC (rev 18568)
+++ labs/jbossesb/branches/JBESB_4_2_1_GA_CP/qa/junit/src/org/jboss/soa/esb/epr/LogicalEPRUnitTest.java	2008-02-24 00:05:16 UTC (rev 18569)
@@ -87,10 +87,10 @@
 
     public static Test suite() throws Exception {
         DeploymentArchive deployment = new DeploymentArchive("LogicalEPRUnitTest.esb");
-
+        String jmsImpl = System.getProperty("org.jboss.esb.jmsimpl");
         deployment.addEntry("META-INF/jboss-esb.xml", LogicalEPRUnitTest.class.getResourceAsStream("jboss-esb.xml"));
         deployment.addEntry("META-INF/deployment.xml", LogicalEPRUnitTest.class.getResourceAsStream("deployment.xml"));
-        deployment.addEntry("jms-service.xml", LogicalEPRUnitTest.class.getResourceAsStream("jms-service.xml"));
+        deployment.addEntry(jmsImpl + "-queue-service.xml", LogicalEPRUnitTest.class.getResourceAsStream(jmsImpl + "-service.xml"));
         deployment.addEntry(ServiceInvokerAction.class);
         deployment.addEntry(Service2Action.class);
         deployment.addEntry(Service3Action1.class);

Added: labs/jbossesb/branches/JBESB_4_2_1_GA_CP/qa/junit/src/org/jboss/soa/esb/epr/jbm-service.xml
===================================================================
--- labs/jbossesb/branches/JBESB_4_2_1_GA_CP/qa/junit/src/org/jboss/soa/esb/epr/jbm-service.xml	                        (rev 0)
+++ labs/jbossesb/branches/JBESB_4_2_1_GA_CP/qa/junit/src/org/jboss/soa/esb/epr/jbm-service.xml	2008-02-24 00:05:16 UTC (rev 18569)
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<server>
+
+    <mbean code="org.jboss.jms.server.destination.QueueService"
+           name="jboss.esb.qa.junit.destination:service=Queue,name=LogicalEPRUnitTest_service1_gtw"
+           xmbean-dd="xmdesc/Queue-xmbean.xml">
+        <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
+        <depends>jboss.messaging:service=PostOffice</depends>
+    </mbean>
+
+    <mbean code="org.jboss.jms.server.destination.QueueService"
+           name="jboss.esb.qa.junit.destination:service=Queue,name=LogicalEPRUnitTest_service1"
+           xmbean-dd="xmdesc/Queue-xmbean.xml">
+        <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
+        <depends>jboss.messaging:service=PostOffice</depends>
+    </mbean>
+
+    <mbean code="org.jboss.jms.server.destination.QueueService"
+           name="jboss.esb.qa.junit.destination:service=Queue,name=LogicalEPRUnitTest_service2"
+           xmbean-dd="xmdesc/Queue-xmbean.xml">
+        <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
+        <depends>jboss.messaging:service=PostOffice</depends>
+    </mbean>
+
+    <mbean code="org.jboss.jms.server.destination.QueueService"
+           name="jboss.esb.qa.junit.destination:service=Queue,name=LogicalEPRUnitTest_service3"
+           xmbean-dd="xmdesc/Queue-xmbean.xml">
+        <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
+        <depends>jboss.messaging:service=PostOffice</depends>
+    </mbean>
+
+    <mbean code="org.jboss.jms.server.destination.QueueService"
+           name="jboss.esb.qa.junit.destination:service=Queue,name=LogicalEPRUnitTest_service4"
+           xmbean-dd="xmdesc/Queue-xmbean.xml">
+        <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
+        <depends>jboss.messaging:service=PostOffice</depends>
+    </mbean>
+
+</server>
\ No newline at end of file

Added: labs/jbossesb/branches/JBESB_4_2_1_GA_CP/qa/junit/src/org/jboss/soa/esb/epr/jbmq-service.xml
===================================================================
--- labs/jbossesb/branches/JBESB_4_2_1_GA_CP/qa/junit/src/org/jboss/soa/esb/epr/jbmq-service.xml	                        (rev 0)
+++ labs/jbossesb/branches/JBESB_4_2_1_GA_CP/qa/junit/src/org/jboss/soa/esb/epr/jbmq-service.xml	2008-02-24 00:05:16 UTC (rev 18569)
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<server>
+    <mbean code="org.jboss.mq.server.jmx.Queue"
+           name="jboss.esb.qa.junit.destination:service=Queue,name=LogicalEPRUnitTest_service1_gtw">
+    <depends optional-attribute-name="DestinationManager">
+      jboss.mq:service=DestinationManager
+    </depends>
+    </mbean>
+    <mbean code="org.jboss.mq.server.jmx.Queue"
+           name="jboss.esb.qa.junit.destination:service=Queue,name=LogicalEPRUnitTest_service1">
+    <depends optional-attribute-name="DestinationManager">
+      jboss.mq:service=DestinationManager
+    </depends>
+    </mbean>
+    <mbean code="org.jboss.mq.server.jmx.Queue"
+           name="jboss.esb.qa.junit.destination:service=Queue,name=LogicalEPRUnitTest_service2">
+    <depends optional-attribute-name="DestinationManager">
+      jboss.mq:service=DestinationManager
+    </depends>
+    </mbean>
+    <mbean code="org.jboss.mq.server.jmx.Queue"
+           name="jboss.esb.qa.junit.destination:service=Queue,name=LogicalEPRUnitTest_service3">
+    <depends optional-attribute-name="DestinationManager">
+      jboss.mq:service=DestinationManager
+    </depends>
+    </mbean>
+    <mbean code="org.jboss.mq.server.jmx.Queue"
+           name="jboss.esb.qa.junit.destination:service=Queue,name=LogicalEPRUnitTest_service4">
+    <depends optional-attribute-name="DestinationManager">
+      jboss.mq:service=DestinationManager
+    </depends>
+    </mbean>
+</server>

Deleted: labs/jbossesb/branches/JBESB_4_2_1_GA_CP/qa/junit/src/org/jboss/soa/esb/epr/jms-service.xml
===================================================================
--- labs/jbossesb/branches/JBESB_4_2_1_GA_CP/qa/junit/src/org/jboss/soa/esb/epr/jms-service.xml	2008-02-23 17:28:12 UTC (rev 18568)
+++ labs/jbossesb/branches/JBESB_4_2_1_GA_CP/qa/junit/src/org/jboss/soa/esb/epr/jms-service.xml	2008-02-24 00:05:16 UTC (rev 18569)
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<server>
-
-    <mbean code="org.jboss.jms.server.destination.QueueService"
-           name="jboss.esb.qa.junit.destination:service=Queue,name=LogicalEPRUnitTest_service1_gtw"
-           xmbean-dd="xmdesc/Queue-xmbean.xml">
-        <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
-        <depends>jboss.messaging:service=PostOffice</depends>
-    </mbean>
-
-    <mbean code="org.jboss.jms.server.destination.QueueService"
-           name="jboss.esb.qa.junit.destination:service=Queue,name=LogicalEPRUnitTest_service1"
-           xmbean-dd="xmdesc/Queue-xmbean.xml">
-        <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
-        <depends>jboss.messaging:service=PostOffice</depends>
-    </mbean>
-
-    <mbean code="org.jboss.jms.server.destination.QueueService"
-           name="jboss.esb.qa.junit.destination:service=Queue,name=LogicalEPRUnitTest_service2"
-           xmbean-dd="xmdesc/Queue-xmbean.xml">
-        <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
-        <depends>jboss.messaging:service=PostOffice</depends>
-    </mbean>
-
-    <mbean code="org.jboss.jms.server.destination.QueueService"
-           name="jboss.esb.qa.junit.destination:service=Queue,name=LogicalEPRUnitTest_service3"
-           xmbean-dd="xmdesc/Queue-xmbean.xml">
-        <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
-        <depends>jboss.messaging:service=PostOffice</depends>
-    </mbean>
-
-    <mbean code="org.jboss.jms.server.destination.QueueService"
-           name="jboss.esb.qa.junit.destination:service=Queue,name=LogicalEPRUnitTest_service4"
-           xmbean-dd="xmdesc/Queue-xmbean.xml">
-        <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
-        <depends>jboss.messaging:service=PostOffice</depends>
-    </mbean>
-
-</server>
\ No newline at end of file

Modified: labs/jbossesb/branches/JBESB_4_2_1_GA_CP/qa/quickstarts/build.xml
===================================================================
--- labs/jbossesb/branches/JBESB_4_2_1_GA_CP/qa/quickstarts/build.xml	2008-02-23 17:28:12 UTC (rev 18568)
+++ labs/jbossesb/branches/JBESB_4_2_1_GA_CP/qa/quickstarts/build.xml	2008-02-24 00:05:16 UTC (rev 18569)
@@ -4,8 +4,6 @@
 
    <property name="product.dir" location="../../product"/>
    <property name="product.build" location="${product.dir}/build"/>
-   <property name="product.lib" location="${product.build}/jbossesb/lib"/>
-   <property name="product.lib.ext" location="${product.lib}/ext"/>
    <property name="org.jboss.esb.test.quickstarts.dir" location="${product.build}/jbossesb/samples/quickstarts"/>
    <property name="coverage" location="${product.build}/tests/coverage"/>
    <property name="qa.dir" location=".."/>
@@ -26,7 +24,50 @@
 
    <property name="org.jboss.soa.esb.paramsRepository.file.root" location="src"/>
 
-   <property name="junit.jar" location="${product.lib.ext}/junit-4.1.jar"/>
+   <property name="junit.jar" location="${product.dir}/lib/ext/junit-4.1.jar"/>
+   
+      <path id="base.cp">
+       <fileset dir="${product.dir}/lib/ext" includes="jaxr-api*.jar"/>
+	   <fileset dir="${org.jboss.esb.server.home}">
+		   <include name="lib/*.jar"/>
+		   <include name="client/*.jar"/>
+	   </fileset>
+       <fileset dir="${org.jboss.esb.server.home}/server/${org.jboss.esb.test.server.config}">
+           <include name="jbossesb.sar/*.jar"/>
+           <include name="jbpm.esb/*.jar"/>
+       </fileset>
+       <fileset dir="${qa.lib}/ext" includes="*.jar"/>
+       <pathelement location="../"/>
+   </path>
+
+   <path id="qa.junit.cp">
+        <path refid="base.cp"/>
+        <fileset dir="${org.jboss.esb.server.home}/client" includes="*.jar"/>
+        <fileset dir="${org.jboss.esb.server.home}/lib">
+                <include name="*.jar"/>
+                <include name="endorsed/*.jar"/>
+        </fileset>
+        <fileset dir="${org.jboss.esb.server.home}/server/${org.jboss.esb.test.server.config}/lib" includes="*.jar"/>
+        <fileset dir="${org.jboss.esb.server.home}/server/${org.jboss.esb.test.server.config}/deploy">
+                <include name="jbossesb.sar/lib/*.jar"/>
+                <include name="soap.esb/*.jar"/>
+                <include name="jbpm.esb/*.jar"/>
+                <include name="jbrules.esb/*.jar"/>
+                <include name="jboss-aop-jdk50.deployer/*.jar"/>
+                <include name="jbossws.sar/*.jar"/>
+                <include name="jboss-web.deployer/*.jar"/>
+        </fileset>
+        <fileset dir="${product.dir}/lib/ext">
+                <include name="emma*.jar"/>
+                <include name="edtftpj-1.5.4.jar"/>
+                <include name="jaxr-api-1.0rc1.jar"/>
+                <include name="jakarta-oro-2.0.8.jar"/>
+        </fileset>
+        <fileset dir="${qa.lib}/ext" includes="*.jar"/>
+        <pathelement location="../"/>
+   </path>
+
+   
    <macrodef name="runant">
       <attribute name="target"/>
       <attribute name="failonerror" default="true"/>
@@ -48,12 +89,6 @@
       </sequential>
    </macrodef>
 
-   <path id="base.cp">
-      <fileset dir="${qa.lib}/ext" includes="*.jar"/>
-      <fileset dir="${product.lib}/ext" includes="*.jar"/>
-      <pathelement location="${qa.dir}/"/>
-   </path>
-
    <path id="qa.quickstarts.cp">
       <fileset dir="${product.dir}/services/jbossesb/build">
     	 <include name="**/*.jar"/> 
@@ -94,16 +129,16 @@
 	 <include name="business_rules_service/build/classes"/>
 	 <include name="custom_action/build/classes"/>
 	 <include name="deadletter/build/classes"/>
-         <include name="dynamic_router/build/classes"/>
+	 <include name="dynamic_router/build/classes"/>
 	 <include name="exceptions_faults/build/classes"/>
   	 <include name="fun_cbr/build/classes"/>
 	 <include name="groovy_gateway/build/classes"/>
-         <include name="helloworld/build/classes"/>
-         <include name="helloworld_action/build/classes"/>
-         <include name="helloworld_db_registration/build/classes"/>
-         <include name="helloworld_file_action/build/classes"/>
+     <include name="helloworld/build/classes"/>
+     <include name="helloworld_action/build/classes"/>
+     <include name="helloworld_db_registration/build/classes"/>
+     <include name="helloworld_file_action/build/classes"/>
 	 <include name="helloworld_file_notifier/build/classes"/>
-         <include name="helloworld_sql_action/build/classes"/>
+     <include name="helloworld_sql_action/build/classes"/>
 	 <include name="jms_secured/build/classes"/>
 	 <include name="jms_topic/build/classes"/>
 	 <include name="load_generator/build/classes"/>
@@ -111,28 +146,26 @@
 	 <include name="messagefilter/build/classes"/>
 	 <include name="messagestore/build/classes"/>
 	 <include name="native_client/build/classes"/>
-         <include name="recipient_list/build/classes"/>
+     <include name="recipient_list/build/classes"/>
 	 <include name="scheduled_services/build/classes"/>
 	 <include name="scripting_groovy/build/classes"/>
-         <include name="simple_cbr/build/classes"/>
+     <include name="simple_cbr/build/classes"/>
 	 <include name="spring_aop/build/classes"/>
 	 <include name="spring_helloworld/build/classes"/>
 	 <include name="spring_jpetstore/build/classes"/>
-         <include name="static_router/build/classes"/>
-         <include name="transform_CSV2XML/build/classes"/>
-         <include name="transform_EDI2XML_Groovy_XSLT/build/classes"/>
-         <include name="transform_XML2POJO/build/classes"/>
-         <include name="transform_XML2XML_date_manipulation/build/classes"/>
-         <include name="transform_XML2XML_simple/build/classes"/>
+     <include name="static_router/build/classes"/>
+     <include name="transform_CSV2XML/build/classes"/>
+     <include name="transform_EDI2XML_Groovy_XSLT/build/classes"/>
+     <include name="transform_XML2POJO/build/classes"/>
+     <include name="transform_XML2XML_date_manipulation/build/classes"/>
+     <include name="transform_XML2XML_simple/build/classes"/>
 	 <include name="webservice_consumer1/build/classes"/>
 	 <include name="webservice_consumer2/build/classes"/>
 	 <include name="webservice_producer/build/classes"/>
 	 <include name="wiretap/build/classes"/>
       </dirset>
-   	
-      <fileset dir="${product.lib.ext}" includes="*.jar"/>
-      <fileset dir="${product.lib}" includes="*.jar"/>
       <pathelement location="${qa.quickstarts.resources}"/>
+	  <path refid="qa.junit.cp"/>
       <path refid="base.cp"/>
    </path>
 
@@ -257,9 +290,6 @@
       <exec-quickstart quickstart="helloworld_sql_action" target="prepare-deployment"/>
       <exec-quickstart quickstart="jms_secured" target="prepare-deployment"/>
       <exec-quickstart quickstart="jms_topic" target="prepare-deployment"/>
-	<!--
-      <exec-quickstart quickstart="load_generator" target="prepare-deployment"/>
-	-->
       <exec-quickstart quickstart="messagefilter" target="prepare-deployment"/>
       <exec-quickstart quickstart="messagestore" target="prepare-deployment"/>
       <exec-quickstart quickstart="native_client" target="prepare-deployment"/>
@@ -372,7 +402,7 @@
 	       <exclude name="**/SpringJPetStoreTest.java"/>
                <exclude name="**/HelloWorldSQLActionTest.java"/>
 	       <exclude name="**/BPMOrchestration1Test.java"/>
-	       <!-- The following quickstart is broken -->
+	       <!-- The following quickstart is broken -->
 	       <exclude name="**/BPMOrchestration3Test.java"/>
 	       <exclude name="**/HelloWorldFileNotifierTest.java"/>
                <exclude name="**/RecipientlistTest.java"/>

Modified: labs/jbossesb/branches/JBESB_4_2_1_GA_CP/qa/test.properties
===================================================================
--- labs/jbossesb/branches/JBESB_4_2_1_GA_CP/qa/test.properties	2008-02-23 17:28:12 UTC (rev 18568)
+++ labs/jbossesb/branches/JBESB_4_2_1_GA_CP/qa/test.properties	2008-02-24 00:05:16 UTC (rev 18569)
@@ -6,3 +6,11 @@
 
 org.jboss.soa.esb.jndi.server.type=jboss
 org.jboss.soa.esb.jndi.server.url=localhost
+
+#### 
+# Set these options to run the tests against a SOA/JBoss AS container
+####
+#soa.test.no-prepare=true
+#org.jboss.esb.server.home=/Users/tcunning/tools/jboss-4.2.2.GA
+#org.jboss.esb.test.server.config=default
+#org.jboss.esb.server.config=default




More information about the jboss-svn-commits mailing list