[jboss-svn-commits] JBL Code SVN: r12172 - in labs/jbossesb/trunk/product: core/listeners/tests and 9 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Mon May 28 10:13:41 EDT 2007
Author: tfennelly
Date: 2007-05-28 10:13:40 -0400 (Mon, 28 May 2007)
New Revision: 12172
Added:
labs/jbossesb/trunk/product/lib/ext/jboss-remoting.jar
Modified:
labs/jbossesb/trunk/product/build-distr.xml
labs/jbossesb/trunk/product/build.xml
labs/jbossesb/trunk/product/core/listeners/tests/build.xml
labs/jbossesb/trunk/product/core/listeners/tests/resources/etc/log4j.xml
labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/actions/soap/SOAPClientUnitTest.java
labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/actions/soap/beans/Order.java
labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/actions/soap/soapclient-config-01.xml
labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/listeners/ListenerManagerFileUnitTest.java
labs/jbossesb/trunk/product/core/rosetta/tests/build.xml
labs/jbossesb/trunk/product/core/services/src/org/jboss/internal/soa/esb/services/registry/JAXRRegistryImpl.java
labs/jbossesb/trunk/product/core/services/tests/build.xml
labs/jbossesb/trunk/product/samples/quickstarts/webservice_bpel/jboss-esb.xml
Log:
Fixing the woodstox test classpath issue
Modified: labs/jbossesb/trunk/product/build-distr.xml
===================================================================
--- labs/jbossesb/trunk/product/build-distr.xml 2007-05-28 11:31:35 UTC (rev 12171)
+++ labs/jbossesb/trunk/product/build-distr.xml 2007-05-28 14:13:40 UTC (rev 12172)
@@ -1,153 +1,156 @@
<project name="JBESB Distribution Build" default="dist" basedir=".">
- <property name="build.dir" value="build"/>
- <property name="lib.ext.dir" value="lib/ext"/>
- <property name="services.dir" value="services"/>
- <property name="build.lib.dir" value="${build.dir}/jbossesb/lib"/>
- <property name="version" value="4.2.MR1"/>
- <property name="esbserver.dist.dir" value="${build.dir}/jbossesb-server-${version}"/>
- <property name="installation.files.dir" value="install"/>
+ <property name="build.dir" value="build"/>
+ <property name="lib.ext.dir" value="lib/ext"/>
+ <property name="services.dir" value="services"/>
+ <property name="build.lib.dir" value="${build.dir}/jbossesb/lib"/>
+ <property name="version" value="4.2.MR1"/>
+ <property name="esbserver.dist.dir" value="${build.dir}/jbossesb-server-${version}"/>
+ <property name="installation.files.dir" value="install"/>
- <target name="dist" depends="server.dist">
- <copy todir="${esbserver.dist.dir}/docs">
- <fileset dir="${build.dir}/jbossesb/docs">
- <include name="**/*"/>
- </fileset>
- </copy>
- <copy todir="${esbserver.dist.dir}">
- <fileset dir="${build.dir}/jbossesb">
- <include name="javadocs/**/*"/>
- </fileset>
- </copy>
- <copy todir="${esbserver.dist.dir}">
- <fileset dir="${build.dir}/jbossesb">
- <include name="samples/**/*"/>
- </fileset>
- </copy>
- <copy todir="${esbserver.dist.dir}">
- <fileset dir="${build.dir}/jbossesb">
- <include name="tools/**/*"/>
- </fileset>
- </copy>
- <copy todir="${esbserver.dist.dir}/docs/schema">
- <fileset dir="${build.dir}/jbossesb/xml">
- <include name="**/*"/>
- </fileset>
- </copy>
- <copy todir="${esbserver.dist.dir}">
- <fileset dir="${build.dir}/jbossesb">
- <include name="*.txt"/>
- </fileset>
- </copy>
- </target>
+ <target name="dist" depends="server.dist">
+ <copy todir="${esbserver.dist.dir}/docs">
+ <fileset dir="${build.dir}/jbossesb/docs">
+ <include name="**/*"/>
+ </fileset>
+ </copy>
+ <copy todir="${esbserver.dist.dir}">
+ <fileset dir="${build.dir}/jbossesb">
+ <include name="javadocs/**/*"/>
+ </fileset>
+ </copy>
+ <copy todir="${esbserver.dist.dir}">
+ <fileset dir="${build.dir}/jbossesb">
+ <include name="samples/**/*"/>
+ </fileset>
+ </copy>
+ <copy todir="${esbserver.dist.dir}">
+ <fileset dir="${build.dir}/jbossesb">
+ <include name="tools/**/*"/>
+ </fileset>
+ </copy>
+ <copy todir="${esbserver.dist.dir}/docs/schema">
+ <fileset dir="${build.dir}/jbossesb/xml">
+ <include name="**/*"/>
+ </fileset>
+ </copy>
+ <copy todir="${esbserver.dist.dir}">
+ <fileset dir="${build.dir}/jbossesb">
+ <include name="*.txt"/>
+ </fileset>
+ </copy>
+ </target>
- <target name="ftp-server">
- <ant antfile="build.xml" dir="ftp"/>
- </target>
+ <target name="ftp-server">
+ <ant antfile="build.xml" dir="ftp"/>
+ </target>
- <target name="server.dist" depends="build.sar, unpack.server.zip, ftp-server, services">
- <copy todir="${esbserver.dist.dir}/server/default/deploy/jbossesb.sar">
- <fileset dir="${build.dir}/jbossesb.sar">
- <include name="**/*"/>
- </fileset>
- </copy>
- <copy todir="${esbserver.dist.dir}/server/default/deploy">
- <fileset dir="ftp/build">
- <include name="ftp-server.sar/**/*"/>
- </fileset>
- </copy>
- <copy todir="${esbserver.dist.dir}/server/default/deploy">
- <fileset dir="tools/configeditor/editor/dist">
- <include name="jbossesb-config-editor.war"/>
- </fileset>
- </copy>
- <copy todir="${esbserver.dist.dir}/server/default/conf">
- <fileset dir="tools/configeditor/editor/resources">
- <include name="action-templates.xml"/>
- </fileset>
- </copy>
- <!-- copy services -->
- <copy todir="${esbserver.dist.dir}/server/default/deploy">
- <fileset dir="${build.dir}/services">
- <include name="**/*"/>
- </fileset>
- </copy>
- </target>
+ <target name="server.dist" depends="build.sar, unpack.server.zip, ftp-server, services">
+ <copy todir="${esbserver.dist.dir}/server/default/deploy/jbossesb.sar">
+ <fileset dir="${build.dir}/jbossesb.sar">
+ <include name="**/*"/>
+ </fileset>
+ </copy>
+ <copy todir="${esbserver.dist.dir}/server/default/deploy">
+ <fileset dir="ftp/build">
+ <include name="ftp-server.sar/**/*"/>
+ </fileset>
+ </copy>
+ <copy todir="${esbserver.dist.dir}/server/default/deploy">
+ <fileset dir="tools/configeditor/editor/dist">
+ <include name="jbossesb-config-editor.war"/>
+ </fileset>
+ </copy>
+ <copy todir="${esbserver.dist.dir}/server/default/conf">
+ <fileset dir="tools/configeditor/editor/resources">
+ <include name="action-templates.xml"/>
+ </fileset>
+ </copy>
+ <!-- copy services -->
+ <copy todir="${esbserver.dist.dir}/server/default/deploy">
+ <fileset dir="${build.dir}/services">
+ <include name="**/*"/>
+ </fileset>
+ </copy>
+ </target>
- <target name="unpack.server.zip">
- <delete dir="${esbserver.dist.dir}"/>
- <unzip src="${installation.files.dir}/standalone/jbossesb-server-base.zip" dest="${build.dir}"/>
- <move file="${build.dir}/jbossesb-server" tofile="${esbserver.dist.dir}"/>
- </target>
+ <target name="unpack.server.zip">
+ <delete dir="${esbserver.dist.dir}"/>
+ <unzip src="${installation.files.dir}/standalone/jbossesb-server-base.zip" dest="${build.dir}"/>
+ <move file="${build.dir}/jbossesb-server" tofile="${esbserver.dist.dir}"/>
+ </target>
- <target name="build.sar">
- <echo message="Building JBoss ESB sar files"/>
- <delete dir="${build.dir}/jbossesb.sar" />
- <mkdir dir="${build.dir}/jbossesb.sar" />
- <mkdir dir="${build.dir}/jbossesb.sar/META-INF" />
- <copy file="${installation.files.dir}/jboss-service.xml"
- todir="${build.dir}/jbossesb.sar/META-INF"/>
- <copy todir="${build.dir}/jbossesb.sar">
- <fileset dir="${installation.files.dir}/conf">
- <include name="jbossesb-properties.xml"/>
- <include name="esb.juddi.properties"/>
- <include name="smooks-cdr.lst"/>
- <include name="repository.xml"/>
- </fileset>
- <fileset dir="${installation.files.dir}/jUDDI-registry">
- <include name="juddi-ds.xml"/>
- </fileset>
- <fileset dir="${installation.files.dir}/message-store">
- <include name="message-store-ds.xml"/>
- </fileset>
- </copy>
+ <target name="build.sar">
+ <echo message="Building JBoss ESB sar files"/>
+ <delete dir="${build.dir}/jbossesb.sar"/>
+ <mkdir dir="${build.dir}/jbossesb.sar"/>
+ <mkdir dir="${build.dir}/jbossesb.sar/META-INF"/>
+ <copy file="${installation.files.dir}/jboss-service.xml"
+ todir="${build.dir}/jbossesb.sar/META-INF"/>
+ <copy todir="${build.dir}/jbossesb.sar">
+ <fileset dir="${installation.files.dir}/conf">
+ <include name="jbossesb-properties.xml"/>
+ <include name="esb.juddi.properties"/>
+ <include name="smooks-cdr.lst"/>
+ <include name="repository.xml"/>
+ </fileset>
+ <fileset dir="${installation.files.dir}/jUDDI-registry">
+ <include name="juddi-ds.xml"/>
+ </fileset>
+ <fileset dir="${installation.files.dir}/message-store">
+ <include name="message-store-ds.xml"/>
+ </fileset>
+ </copy>
- <mkdir dir="${build.dir}/jbossesb.sar/juddi-sql"/>
- <copy todir="${build.dir}/jbossesb.sar/juddi-sql">
- <fileset dir="${installation.files.dir}/jUDDI-registry/sql">
- <include name="**/*.sql"/>
- </fileset>
- </copy>
+ <mkdir dir="${build.dir}/jbossesb.sar/juddi-sql"/>
+ <copy todir="${build.dir}/jbossesb.sar/juddi-sql">
+ <fileset dir="${installation.files.dir}/jUDDI-registry/sql">
+ <include name="**/*.sql"/>
+ </fileset>
+ </copy>
- <mkdir dir="${build.dir}/jbossesb.sar/message-store-sql"/>
- <copy todir="${build.dir}/jbossesb.sar/message-store-sql">
- <fileset dir="${installation.files.dir}/message-store/sql">
- <include name="**/*.sql"/>
- </fileset>
- </copy>
+ <mkdir dir="${build.dir}/jbossesb.sar/message-store-sql"/>
+ <copy todir="${build.dir}/jbossesb.sar/message-store-sql">
+ <fileset dir="${installation.files.dir}/message-store/sql">
+ <include name="**/*.sql"/>
+ </fileset>
+ </copy>
- <mkdir dir="${build.dir}/jbossesb.sar/lib" />
- <copy todir="${build.dir}/jbossesb.sar/lib">
- <fileset dir="${lib.ext.dir}" includes="jbossts-common.jar"/>
- <fileset dir="${build.lib.dir}" includes="jbossesb*.jar" />
- <!-- scout -->
- <fileset dir="${lib.ext.dir}" includes="scout-1.0-SNAPSHOT.jar"/>
- <!-- xbean for reading/marchalling xml for configuration, and scout -->
- <fileset dir="${lib.ext.dir}" includes="xbean.jar,stax-api-1.0.1.jar,xmlpublic.jar"/>
- <!-- jUDDI Registry -->
- <fileset dir="${lib.ext.dir}" includes="juddi-1.0-SNAPSHOT.jar,juddi-client-1.0-SNAPSHOT.jar"/>
- <!-- jboss rules for CBR -->
- <fileset dir="${lib.ext.dir}" includes="antlr-3.0ea8.jar,antlr-2.7.6.jar,
+ <mkdir dir="${build.dir}/jbossesb.sar/lib"/>
+ <copy todir="${build.dir}/jbossesb.sar/lib">
+ <fileset dir="${lib.ext.dir}" includes="jbossts-common.jar"/>
+ <fileset dir="${build.lib.dir}" includes="jbossesb*.jar"/>
+ <!-- scout -->
+ <fileset dir="${lib.ext.dir}" includes="scout-1.0-SNAPSHOT.jar"/>
+ <!-- xbean for reading/marchalling xml for configuration, and scout -->
+ <fileset dir="${lib.ext.dir}" includes="xbean.jar,stax-api-1.0.1.jar,xmlpublic.jar"/>
+ <!-- jUDDI Registry -->
+ <fileset dir="${lib.ext.dir}" includes="juddi-1.0-SNAPSHOT.jar,juddi-client-1.0-SNAPSHOT.jar"/>
+ <!-- jboss rules for CBR -->
+ <fileset dir="${lib.ext.dir}" includes="antlr-3.0ea8.jar,antlr-2.7.6.jar,
drools-compiler-3.0.4.jar,drools-core-3.0.4.jar,stringtemplate-2.3b6.jar,
commons-jci-core-1.0-406301.jar, commons-jci-janino-2.4.3.jar, janino-2.4.3.jar"/>
- <!-- smooks for transformation -->
- <fileset dir="${lib.ext.dir}" includes="milyn-*.jar,opencsv-*.jar,ognl-*.jar,groovy-*.jar,commons-lang-2.1.jar"/>
- <!-- ftp -->
- <fileset dir="${lib.ext.dir}" includes="edtftpj-*.jar"/>
- <!-- connection pooling -->
- <fileset dir="${lib.ext.dir}" includes="c3p0-*.jar"/>
- <!-- JCR repository -->
- <fileset dir="${lib.ext.dir}" includes="jcr-*.jar,jackrabbit-*.jar,commons-io-*.jar,lucene-*.jar"/>
- </copy>
+ <!-- smooks for transformation -->
+ <fileset dir="${lib.ext.dir}"
+ includes="milyn-*.jar,opencsv-*.jar,ognl-*.jar,groovy-*.jar,commons-lang-2.1.jar"/>
+ <!-- ftp -->
+ <fileset dir="${lib.ext.dir}" includes="edtftpj-*.jar"/>
+ <!-- connection pooling -->
+ <fileset dir="${lib.ext.dir}" includes="c3p0-*.jar"/>
+ <!-- JCR repository -->
+ <fileset dir="${lib.ext.dir}" includes="jcr-*.jar,jackrabbit-*.jar,commons-io-*.jar,lucene-*.jar"/>
+ <!-- XStream jars - including woodstox for the StaxDriver -->
+ <fileset dir="${lib.ext.dir}" includes="xstream-*.jar,wstx-lgpl-*.jar"/>
+ </copy>
- </target>
-
- <target name="services">
- <mkdir dir="${build.dir}/services" />
- <copy todir="${build.dir}/services">
- <fileset dir="${services.dir}/jbpm/build" includes="jbpm.esb/**/*"/>
- <fileset dir="${services.dir}/jbossesb/build" includes="jbossesb.esb/**/*"/>
- </copy>
- </target>
+ </target>
+ <target name="services">
+ <mkdir dir="${build.dir}/services"/>
+ <copy todir="${build.dir}/services">
+ <fileset dir="${services.dir}/jbpm/build" includes="jbpm.esb/**/*"/>
+ <fileset dir="${services.dir}/jbossesb/build" includes="jbossesb.esb/**/*"/>
+ </copy>
+ </target>
+
</project>
Modified: labs/jbossesb/trunk/product/build.xml
===================================================================
--- labs/jbossesb/trunk/product/build.xml 2007-05-28 11:31:35 UTC (rev 12171)
+++ labs/jbossesb/trunk/product/build.xml 2007-05-28 14:13:40 UTC (rev 12172)
@@ -125,18 +125,41 @@
</target>
<!-- Test targets -->
- <target name="org.jboss.esb.test" depends="org.jboss.esb.compile, org.jboss.esb.jar">
+
+ <target name="esb.test">
+ <property name="tests.to.run" value="*" />
+ <antcall target="org.jboss.esb.test" />
+ </target>
+
+ <target name="esb.testx">
+ <input addproperty="tests.to.run" message="Enter the name of the class(es) to be tested. Wildcards Supported. No need to specify the 'UnitTest' suffix:" />
+ <antcall target="org.jboss.esb.test" />
+ </target>
+
+ <target name="org.jboss.esb.test">
+ <available file="build" type="dir" property="build-available" />
+ <antcall target="assert-build-available" />
+
<echo message="Testing of modules, using unit and functional tests"/>
<ant dir="core" target="org.jboss.esb.core.test"/>
<ant dir="services" target="test"/>
</target>
- <!-- Integration test targets -->
- <target name="org.jboss.esb.integration.test" depends="org.jboss.esb.compile">
- <echo message="Testing of modules, using unit, functional and integration tests"/>
- <ant dir="core" target="org.jboss.esb.core.integration.test"/>
- </target>
+ <target name="assert-build-available" unless="build-available">
+ <echo message="" />
+ <echo message="***" />
+ <echo message="*** Sorry, you must run the 'dist' target before runing the 'test' target." />
+ <echo message="***" />
+ <echo message="" />
+ <fail message="Sorry, you must run the 'dist' target before runing the 'test' target." />
+ </target>
+ <!-- Integration test targets -->
+ <target name="org.jboss.esb.integration.test" depends="org.jboss.esb.compile">
+ <echo message="Testing of modules, using unit, functional and integration tests"/>
+ <ant dir="core" target="org.jboss.esb.core.integration.test"/>
+ </target>
+
<!-- javadocs paths -->
<path id="org.jboss.esb.javadocs.path">
<pathelement path="build/schema-model/src"/>
@@ -398,9 +421,13 @@
</target>
<target name="test" description="will run all tests">
- <runant target="org.jboss.esb.test"/>
+ <runant target="esb.test"/>
</target>
-
+
+ <target name="testx" description="will run specified tests">
+ <runant target="esb.testx"/>
+ </target>
+
<target name="integration" description="run integration tests">
<runant target="org.jboss.esb.integration.test"/>
</target>
Modified: labs/jbossesb/trunk/product/core/listeners/tests/build.xml
===================================================================
--- labs/jbossesb/trunk/product/core/listeners/tests/build.xml 2007-05-28 11:31:35 UTC (rev 12171)
+++ labs/jbossesb/trunk/product/core/listeners/tests/build.xml 2007-05-28 14:13:40 UTC (rev 12172)
@@ -7,7 +7,9 @@
<property name="org.jboss.esb.module.tests.src.dir" location="src"/>
<property name="org.jboss.esb.tests.classes.dir" location="${org.jboss.esb.internal.dest}/tests"/>
<property name="org.jboss.esb.tests.report.dir" location="${org.jboss.esb.internal.dest}/tests/junit"/>
- <property name="org.jboss.esb.root.dir" location="../.."/>
+ <property name="org.jboss.esb.root.dir" location="../../.."/>
+ <property name="lib.ext.dir" location="${org.jboss.esb.root.dir}/lib/ext"/>
+ <property name="build.dir" location="${org.jboss.esb.root.dir}/build"/>
<property name="gendir" location="${org.jboss.esb.internal.dest}/schema-model" />
<property name="org.jboss.esb.module.tests.conf.dir" location="${org.jboss.esb.root.dir}/listeners/tests/resources/conf"/>
@@ -27,10 +29,10 @@
</condition>
<path id="org.jboss.esb.tests.base.classpath">
- <fileset dir="${org.jboss.esb.ext.lib.dir}"
- excludes="*.jar" includes="jaxr-api*.jar,scout*.jar,juddi*.jar"/>
- <fileset dir="${org.jboss.esb.ext.lib.dir}" includes="*.jar"/>
+ <fileset dir="${org.jboss.esb.ext.lib.dir}" includes="jaxr-api*.jar,scout*.jar,juddi*.jar"/>
+ <fileset dir="${org.jboss.esb.ext.lib.dir}" includes="*.jar" excludes="jboss-messaging-client.jar,jboss-remoting.jar"/>
<fileset dir="${org.jboss.esb.ftp.lib.dir}" includes="*.jar"/>
+ <fileset dir="/jboss-4.0.5.GA/client" includes="*.jar"/>
<pathelement location="${org.jboss.esb.module.classes.root.dir}/rosetta"/>
<pathelement location="${org.jboss.esb.module.classes.root.dir}/services"/>
<pathelement location="${gendir}/classes"/>
@@ -84,10 +86,23 @@
<instr instrpath="${org.jboss.esb.module.classes.dir}"
destdir="${org.jboss.esb.module.classes.instr.dir}"
metadatafile="${org.jboss.esb.module.tests.coverage.dir}/coverage.emma" />
- </emma>
- <!-- Run the tests -->
- <antcall target="org.jboss.esb.services.internal.test.exec"/>
+ </emma>
+ <!--
+ Run the tests.
+ What's going on here? Good question :-) See http://jira.jboss.com/jira/browse/JBESB-583
+ -->
+ <antcall target="org.jboss.esb.services.internal.test.exec">
+ <param name="param.test.classpath" value="test.classpath.with.jboss-messaging-client" />
+ <param name="param.test.include" value="${tests.to.run}" />
+ <param name="param.test.exclude" value="SOAPClient" />
+ </antcall>
+ <antcall target="org.jboss.esb.services.internal.test.exec">
+ <param name="param.test.classpath" value="test.classpath.with.jboss-remoting" />
+ <param name="param.test.include" value="SOAPClient" />
+ <param name="param.test.exclude" value="XXX" />
+ </antcall>
+
<!-- Generate the coverage report -->
<emma>
<report sourcepath="${org.jboss.esb.module.src.dir}" sort="+block,+name,+method,+class" metrics="method:70,block:80,line:80,class:100">
@@ -99,32 +114,46 @@
</emma>
</target>
+ <path id="test.classpath.with.jboss-messaging-client">
+ <path refid="test.classpath"/>
+ <fileset dir="${org.jboss.esb.ext.lib.dir}" includes="jboss-messaging-client.jar"/>
+ </path>
+ <path id="test.classpath.with.jboss-remoting">
+ <path refid="test.classpath"/>
+ <fileset dir="${org.jboss.esb.ext.lib.dir}" includes="jboss-remoting.jar"/>
+ </path>
+ <path id="test.classpath">
+ <!-- log4j location -->
+ <pathelement location="${basedir}/resources/etc"/>
+ <!-- using instrumented code for code coverage -->
+ <pathelement location="${org.jboss.esb.module.classes.instr.dir}"/>
+ <pathelement location="${org.jboss.esb.tests.classes.dir}"/>
+ <!-- Need the module and test src folders because there may be non-compiled test resources -->
+ <pathelement location="${org.jboss.esb.module.tests.src.dir}"/>
+ <pathelement location="${org.jboss.esb.module.src.dir}"/>
+ <path refid="org.jboss.esb.tests.base.classpath"/>
+ </path>
+
<!-- ====================================================================== -->
<!-- U N I T A N D F U N C T I O N A L T E S T S -->
<!-- ====================================================================== -->
<target name="org.jboss.esb.services.internal.test.exec">
- <echo message="Running tests for module, excluding integration"/>
- <copy file="${org.jboss.esb.root.dir}/etc/schemas/xml/jbossesb-1.0.1.xsd" todir="${org.jboss.esb.tests.classes.dir}"/>
+ <echo message="Running tests '**/${tests.to.run}Test' for Listeners module, excluding integration and '**/${param.test.exclude}*Test' tests."/>
+
+ <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="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}">
- <include name="**/**UnitTest.java"/>
- <include name="**/**FuncTest.java"/>
+ <include name="**/${param.test.include}UnitTest.java"/>
+ <include name="**/${param.test.include}FuncTest.java"/>
+ <exclude name="**/${param.test.exclude}*Test.java"/>
</fileset>
</batchtest>
- <classpath>
- <!-- log4j location -->
- <pathelement location="${basedir}/resources/etc"/>
- <!-- using instrumented code for code coverage -->
- <pathelement location="${org.jboss.esb.module.classes.instr.dir}"/>
- <pathelement location="${org.jboss.esb.tests.classes.dir}"/>
- <!-- Need the module and test src folders because there may be non-compiled test resources -->
- <pathelement location="${org.jboss.esb.module.tests.src.dir}"/>
- <pathelement location="${org.jboss.esb.module.src.dir}"/>
- <path refid="org.jboss.esb.tests.base.classpath"/>
- </classpath>
+
+ <classpath refid="${param.test.classpath}" />
+
<sysproperty key="org.jboss.esb.test.ftp.hostname" value="${org.jboss.esb.test.ftp.hostname}"/>
<sysproperty key="org.jboss.esb.test.ftp.user" value="${org.jboss.esb.test.ftp.user}"/>
<sysproperty key="org.jboss.esb.test.ftp.pwd" value="${org.jboss.esb.test.ftp.pwd}"/>
@@ -141,8 +170,8 @@
<report format="noframes" todir="${org.jboss.esb.tests.report.dir}"/>
</junitreport>
</target>
-
- <!-- ====================================================================== -->
+
+ <!-- ====================================================================== -->
<!-- INTEGRATION T E S TS -->
<!-- ====================================================================== -->
<target name="org.jboss.esb.listeners.internal.integration.test">
Modified: labs/jbossesb/trunk/product/core/listeners/tests/resources/etc/log4j.xml
===================================================================
--- labs/jbossesb/trunk/product/core/listeners/tests/resources/etc/log4j.xml 2007-05-28 11:31:35 UTC (rev 12171)
+++ labs/jbossesb/trunk/product/core/listeners/tests/resources/etc/log4j.xml 2007-05-28 14:13:40 UTC (rev 12172)
@@ -21,7 +21,7 @@
<!-- ============================== -->
<appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender">
- <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
+ <!-- errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/ -->
<param name="Threshold" value="FATAL"/>
<param name="Target" value="System.out"/>
Modified: labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/actions/soap/SOAPClientUnitTest.java
===================================================================
--- labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/actions/soap/SOAPClientUnitTest.java 2007-05-28 11:31:35 UTC (rev 12171)
+++ labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/actions/soap/SOAPClientUnitTest.java 2007-05-28 14:13:40 UTC (rev 12172)
@@ -19,7 +19,7 @@
private ESBConfigUtil configUtil = new ESBConfigUtil(getClass().getResourceAsStream("soapclient-config-01.xml"));
- public void xtest_XStream_ResponseProcessing() throws ConfigurationException, ActionProcessingException {
+ public void test_XStream_ResponseProcessing() throws ConfigurationException, ActionProcessingException {
ConfigTree actionConfig = configUtil.getActionConfig("OrderNotificationService", "soapui-client-action-01");
SOAPClient soapClient = new SOAPClient(actionConfig);
Message message = MessageFactory.getInstance().getMessage();
@@ -45,7 +45,7 @@
assertEquals("false", response.get("customerOrderAck"));
}
- public void xtest_OgnlMap_ResponseProcessing_2() throws ConfigurationException, ActionProcessingException {
+ public void test_OgnlMap_ResponseProcessing_2() throws ConfigurationException, ActionProcessingException {
ConfigTree actionConfig = configUtil.getActionConfig("OrderNotificationService", "soapui-client-action-05");
SOAPClient soapClient = new SOAPClient(actionConfig);
String responseString = new String(StreamUtils.readStream(getClass().getResourceAsStream("soap-message-01.xml")));
Modified: labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/actions/soap/beans/Order.java
===================================================================
--- labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/actions/soap/beans/Order.java 2007-05-28 11:31:35 UTC (rev 12171)
+++ labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/actions/soap/beans/Order.java 2007-05-28 14:13:40 UTC (rev 12172)
@@ -20,7 +20,6 @@
package org.jboss.soa.esb.actions.soap.beans;
import java.util.List;
-import java.util.ArrayList;
/**
* @author <a href="mailto:tom.fennelly at jboss.com">tom.fennelly at jboss.com</a>
Modified: labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/actions/soap/soapclient-config-01.xml
===================================================================
--- labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/actions/soap/soapclient-config-01.xml 2007-05-28 11:31:35 UTC (rev 12171)
+++ labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/actions/soap/soapclient-config-01.xml 2007-05-28 14:13:40 UTC (rev 12172)
@@ -48,6 +48,7 @@
<property name="operation" value="ZZZ"/>
<property name="responseXStreamConfig">
<alias name="customerOrder" class="org.jboss.soa.esb.actions.soap.beans.Order" namespace="http://schemas.active-endpoints.com/sample/customerorder/2006/04/CustomerOrder.xsd" />
+ <alias name="customerName" class="java.lang.String" namespace="http://schemas.active-endpoints.com/sample/customerorder/2006/04/CustomerOrder.xsd" />
<alias name="orderheader" class="org.jboss.soa.esb.actions.soap.beans.Header" namespace="http://schemas.active-endpoints.com/sample/customerorder/2006/04/CustomerOrder.xsd" />
<alias name="item" class="org.jboss.soa.esb.actions.soap.beans.OrderItem" namespace="http://schemas.active-endpoints.com/sample/customerorder/2006/04/CustomerOrder.xsd" />
</property>
Modified: labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/listeners/ListenerManagerFileUnitTest.java
===================================================================
--- labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/listeners/ListenerManagerFileUnitTest.java 2007-05-28 11:31:35 UTC (rev 12171)
+++ labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/listeners/ListenerManagerFileUnitTest.java 2007-05-28 14:13:40 UTC (rev 12172)
@@ -58,7 +58,8 @@
catch (Exception ex)
{
_logger.error(ex.toString(), ex);
- fail();
+ ex.printStackTrace();
+ fail();
}
_logger.info("___Test for FILENAME: " + _file
@@ -92,8 +93,8 @@
configFile));
final File tmpDir = new File(System.getProperty("java.io.tmpdir")) ;
final String tmpDirForm = tmpDir.toURL().toExternalForm() ;
-
- ConfigTree eprElement = tree.getAllChildren()[0].getFirstChild("EPR");
+
+ ConfigTree eprElement = tree.getAllChildren()[0].getFirstChild("EPR");
eprElement.setAttribute(ListenerTagNames.URL_TAG, tmpDirForm) ;
EPR toEPR = ListenerUtil.assembleEpr(eprElement);
Modified: labs/jbossesb/trunk/product/core/rosetta/tests/build.xml
===================================================================
--- labs/jbossesb/trunk/product/core/rosetta/tests/build.xml 2007-05-28 11:31:35 UTC (rev 12171)
+++ labs/jbossesb/trunk/product/core/rosetta/tests/build.xml 2007-05-28 14:13:40 UTC (rev 12172)
@@ -93,7 +93,8 @@
<!-- U N I T A N D F U N C T I O N A L T E S T S -->
<!-- ====================================================================== -->
<target name="org.jboss.esb.services.internal.test.exec">
- <echo message="Running tests for module, excluding integration"/>
+ <echo message="Running tests '${tests.to.run}' for Rosetta module, excluding integration"/>
+
<delete dir="${org.jboss.esb.test.persistdb.dir}" failonerror="false"/>
<mkdir dir="${org.jboss.esb.test.persistdb.dir}"/>
<copy todir="${org.jboss.esb.test.persistdb.dir}">
@@ -105,8 +106,8 @@
<formatter type="xml"/>
<batchtest todir="${org.jboss.esb.tests.report.dir}">
<fileset dir="${org.jboss.esb.module.tests.src.dir}">
- <include name="**/**UnitTest.java"/>
- <include name="**/**FuncTest.java"/>
+ <include name="**/${tests.to.run}UnitTest.java"/>
+ <include name="**/${tests.to.run}FuncTest.java"/>
</fileset>
</batchtest>
<classpath>
Modified: labs/jbossesb/trunk/product/core/services/src/org/jboss/internal/soa/esb/services/registry/JAXRRegistryImpl.java
===================================================================
--- labs/jbossesb/trunk/product/core/services/src/org/jboss/internal/soa/esb/services/registry/JAXRRegistryImpl.java 2007-05-28 11:31:35 UTC (rev 12171)
+++ labs/jbossesb/trunk/product/core/services/src/org/jboss/internal/soa/esb/services/registry/JAXRRegistryImpl.java 2007-05-28 14:13:40 UTC (rev 12172)
@@ -102,7 +102,7 @@
factory.setProperties(props);
connection = factory.createConnection();
} catch (JAXRException e) {
- logger.log(Priority.ERROR, "Could not set up a connection to the Registry. " + e.getMessage(), e);
+ logger.log(Priority.ERROR, "Could not set up a connection to the Registry. " + e.getMessage(), e);
}
return connection;
}
Modified: labs/jbossesb/trunk/product/core/services/tests/build.xml
===================================================================
--- labs/jbossesb/trunk/product/core/services/tests/build.xml 2007-05-28 11:31:35 UTC (rev 12171)
+++ labs/jbossesb/trunk/product/core/services/tests/build.xml 2007-05-28 14:13:40 UTC (rev 12172)
@@ -90,14 +90,15 @@
<!-- U N I T A N D F U N C T I O N A L T E S T S -->
<!-- ====================================================================== -->
<target name="org.jboss.esb.services.internal.test.exec">
- <echo message="Running tests for module, excluding integration"/>
+ <echo message="Running tests '${tests.to.run}' for Services module, excluding integration"/>
+
<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}">
- <include name="**/**UnitTest.java"/>
- <include name="**/**FuncTest.java"/>
+ <include name="**/${tests.to.run}UnitTest.java"/>
+ <include name="**/${tests.to.run}FuncTest.java"/>
</fileset>
</batchtest>
<classpath>
Added: labs/jbossesb/trunk/product/lib/ext/jboss-remoting.jar
===================================================================
(Binary files differ)
Property changes on: labs/jbossesb/trunk/product/lib/ext/jboss-remoting.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: labs/jbossesb/trunk/product/samples/quickstarts/webservice_bpel/jboss-esb.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/webservice_bpel/jboss-esb.xml 2007-05-28 11:31:35 UTC (rev 12171)
+++ labs/jbossesb/trunk/product/samples/quickstarts/webservice_bpel/jboss-esb.xml 2007-05-28 14:13:40 UTC (rev 12172)
@@ -130,7 +130,13 @@
<property name="wsdl" value="http://localhost:18080/active-bpel/services/RetailerCallback?wsdl"/>
<property name="operation" value="SendSalesOrderNotification"/>
<property name="paramsLocation" value="EXTRACTED_BEANS_HASH"/>
+ <property name="responseXStreamConfig">
+ <alias name="salesOrderNotificationAck" class="java.lang.Boolean" namespace="http://org.jboss.esb/quickstarts/bpel/ABI_OrderManager" />
+ </property>
</action>
+ <action name="print-after-soap-invoke" class="org.jboss.soa.esb.actions.SystemPrintln">
+ <property name="message" value="[Quickstart_webservice_bpel] Message after SOAPClient invocation"/>
+ </action>
</actions>
</service>
More information about the jboss-svn-commits
mailing list