[jboss-svn-commits] JBL Code SVN: r18827 - 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
Tue Mar 11 09:48:50 EDT 2008
Author: kevin.conner at jboss.com
Date: 2008-03-11 09:48:50 -0400 (Tue, 11 Mar 2008)
New Revision: 18827
Added:
labs/jbossesb/branches/JBESB_4_2_1_GA_CP/qa/base-cp.xml
Removed:
labs/jbossesb/branches/JBESB_4_2_1_GA_CP/qa/lib/ext/javassist.jar
labs/jbossesb/branches/JBESB_4_2_1_GA_CP/qa/lib/ext/jboss-aop-jdk50.jar
labs/jbossesb/branches/JBESB_4_2_1_GA_CP/qa/lib/ext/jboss-messaging-client.jar
labs/jbossesb/branches/JBESB_4_2_1_GA_CP/qa/lib/ext/trove.jar
Modified:
labs/jbossesb/branches/JBESB_4_2_1_GA_CP/qa/junit/build.xml
labs/jbossesb/branches/JBESB_4_2_1_GA_CP/qa/quickstarts/build.xml
Log:
Fixup classpaths: JBESB-1593
Added: labs/jbossesb/branches/JBESB_4_2_1_GA_CP/qa/base-cp.xml
===================================================================
--- labs/jbossesb/branches/JBESB_4_2_1_GA_CP/qa/base-cp.xml (rev 0)
+++ labs/jbossesb/branches/JBESB_4_2_1_GA_CP/qa/base-cp.xml 2008-03-11 13:48:50 UTC (rev 18827)
@@ -0,0 +1,65 @@
+<project name="base-cp">
+ <!--
+ This file extracts the common classpath configuration from the junit/quickstarts directories.
+ There are other sections of those build.xml files than can be consolidated in future.
+ -->
+
+ <!--
+ When updating this file please bear in mind the following
+ - make sure jbossall-client.jar is last.
+ - make sure jaxr-api-1.0rc1.jar precedes jboss-j2ee.jar.
+ - Restrict jar files to those known to be required.
+ -->
+ <property name="org.jboss.esb.server.server"
+ location="${org.jboss.esb.server.home}/server/${org.jboss.esb.server.config}" />
+ <dirname property="pwd" file="${ant.file.base-cp}" />
+ <path id="base.cp">
+ <pathelement location="${product.dir}/lib/ext/jaxr-api-1.0rc1.jar" />
+ <fileset dir="${org.jboss.esb.server.server}/lib" includes="jboss-remoting.jar jboss-j2ee.jar" /> <!-- Required for JMS Client Code. -->
+ <fileset dir="${org.jboss.esb.server.home}/client" includes="jboss-messaging-client.jar" /> <!-- Required for JMS Client Code. -->
+ <fileset dir="${org.jboss.esb.server.server}/lib"
+ includes="hibernate3.jar commons-collections.jar hsqldb.jar" /> <!-- Required for jbpm Client Code. -->
+ <fileset dir="${org.jboss.esb.server.server}/lib" includes="bsh.jar" /> <!-- Required for scripting Client Code. -->
+ <fileset dir="${org.jboss.esb.server.home}/lib/endorsed"
+ includes="*.jar" /> <!-- Required for JMS Client Code. -->
+ <fileset
+ dir="${org.jboss.esb.server.server}/deploy/jboss-aop-jdk50.deployer"
+ includes="jboss-aop-jdk50.jar" /> <!-- Required for JMS Client Code. -->
+ <fileset dir="${org.jboss.esb.server.home}/client" includes="javassist.jar trove.jar" /> <!-- Required for JMS Client Code. -->
+ <fileset dir="${org.jboss.esb.server.home}/client" includes="hibernate-client.jar" /> <!-- Required for jbpm Client Code. -->
+ <fileset dir="${org.jboss.esb.server.server}/deploy/jbossesb.sar/lib"
+ includes="*.jar" />
+ <!-- jbossesb config -->
+ <fileset dir="${org.jboss.esb.server.server}/deploy/jbossesb.esb"
+ includes="*.jar" />
+ <!-- jbpm config -->
+ <fileset dir="${org.jboss.esb.server.server}/deploy/jbpm.esb"
+ includes="*.jar" />
+ <pathelement location="${org.jboss.esb.server.server}/lib/cglib.jar" />
+ <!-- smooks config -->
+ <fileset dir="${org.jboss.esb.server.server}/deploy/smooks.esb"
+ includes="*.jar" />
+ <!-- jbrules config -->
+ <fileset dir="${org.jboss.esb.server.server}/deploy/jbrules.esb"
+ includes="*.jar" />
+ <!-- spring config -->
+ <fileset dir="${org.jboss.esb.server.server}/deploy/spring.esb"
+ includes="*.jar" />
+ <!-- soap config -->
+ <fileset dir="${org.jboss.esb.server.server}/deploy/soap.esb"
+ includes="*.jar" />
+ <fileset dir="${org.jboss.esb.server.server}/lib" includes="activation.jar, mail.jar, jboss-ejb3x.jar" />
+ <!-- general libs -->
+ <pathelement location="${org.jboss.esb.server.home}/lib/commons-logging.jar" />
+ <pathelement location="${org.jboss.esb.server.home}/lib/commons-codec.jar" />
+ <pathelement location="${org.jboss.esb.server.home}/lib/jboss-system.jar" />
+ <pathelement location="${org.jboss.esb.server.home}/lib/jboss-xml-binding.jar" />
+ <pathelement location="${org.jboss.esb.server.server}/lib/log4j.jar" />
+ <fileset dir="${product.dir}/lib/ext">
+ <include name="emma*.jar" />
+ </fileset>
+ <fileset dir="${qa.lib}/ext" includes="*.jar" />
+ <pathelement location="${org.jboss.esb.server.home}/client/jbossall-client.jar" />
+ <pathelement location="${pwd}" />
+ </path>
+</project>
\ No newline at end of file
Property changes on: labs/jbossesb/branches/JBESB_4_2_1_GA_CP/qa/base-cp.xml
___________________________________________________________________
Name: svn:mime-type
+ text/xml
Name: svn:keywords
+ Rev Date
Name: svn:eol-style
+ native
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-03-11 13:45:00 UTC (rev 18826)
+++ labs/jbossesb/branches/JBESB_4_2_1_GA_CP/qa/junit/build.xml 2008-03-11 13:48:50 UTC (rev 18827)
@@ -21,47 +21,8 @@
<property file="${org.jboss.esb.properties}"/>
- <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>
+ <import file="../base-cp.xml"/>
- <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>
-
<path id="qa.junit.emma.cp">
<fileset dir="${coverage}/all" includes="jbossesb-instr-all.jar"/>
<path refid="base.cp"/>
@@ -72,10 +33,9 @@
<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"/>
+ <javac srcdir="${qa.junit.src}" destdir="${qa.junit.classes}" classpathref="base.cp" debug="on"/>
</target>
<target name="compile-versioned">
@@ -83,7 +43,6 @@
<path id="qa.junit.versioned.cp">
<path refid="base.cp"/>
- <path refid="qa.junit.cp"/>
<pathelement location="${qa.junit.classes}"/>
</path>
@@ -201,7 +160,7 @@
<classpath>
<pathelement location="${qa.junit.classes}"/>
- <path refid="qa.junit.cp"/>
+ <path refid="base.cp"/>
<pathelement location="${qa.junit.src}"/>
<!-- jndi.properties and other client prop files -->
<pathelement location="${qa.junit.resources}/server"/>
@@ -261,12 +220,16 @@
<exclude name="${tests.exclude}"/>
</fileset>
</batchtest>
+
<classpath>
<pathelement location="${qa.junit.classes}"/>
- <path refid="qa.junit.cp"/>
+ <path refid="base.cp"/>
<pathelement location="${qa.junit.src}"/>
<pathelement location="${qa.junit.resources}/server"/>
</classpath>
+<!-- KEV
+<jvmarg value="-agentlib:jdwp=transport=dt_socket,address=8787,suspend=y,server=y"/>
+ -->
<jvmarg value="-Xmx${qa.junit.memory}"/>
<sysproperty key="org.jboss.esb.jmsimpl" value="${org.jboss.soa.esb.qa.jmsprovider}"/>
Deleted: labs/jbossesb/branches/JBESB_4_2_1_GA_CP/qa/lib/ext/javassist.jar
===================================================================
(Binary files differ)
Deleted: labs/jbossesb/branches/JBESB_4_2_1_GA_CP/qa/lib/ext/jboss-aop-jdk50.jar
===================================================================
(Binary files differ)
Deleted: labs/jbossesb/branches/JBESB_4_2_1_GA_CP/qa/lib/ext/jboss-messaging-client.jar
===================================================================
(Binary files differ)
Deleted: labs/jbossesb/branches/JBESB_4_2_1_GA_CP/qa/lib/ext/trove.jar
===================================================================
(Binary files differ)
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-03-11 13:45:00 UTC (rev 18826)
+++ labs/jbossesb/branches/JBESB_4_2_1_GA_CP/qa/quickstarts/build.xml 2008-03-11 13:48:50 UTC (rev 18827)
@@ -26,47 +26,7 @@
<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>
-
+ <import file="../base-cp.xml"/>
<macrodef name="runant">
<attribute name="target"/>
@@ -165,8 +125,7 @@
<include name="wiretap/build/classes"/>
</dirset>
<pathelement location="${qa.quickstarts.resources}"/>
- <path refid="qa.junit.cp"/>
- <path refid="base.cp"/>
+ <path refid="base.cp"/>
</path>
<path id="qa.quickstarts.emma.cp">
More information about the jboss-svn-commits
mailing list