User: starksm
Date: 01/07/08 18:06:02
Modified: src/build/subprojects Tag: Branch_2_4 build-bank.xml
build-bmp.xml build-cts.xml build-dbtest.xml
build-hello.xml build-jmsra.xml build-jrmp.xml
build-load.xml build-lock.xml build-mdb.xml
build-perf.xml build-testbean.xml build-web.xml
build-xa.xml
Added: src/build/subprojects Tag: Branch_2_4 build-jbossmq.xml
build-readahead.xml build-threading.xml
Log:
Merge latest changes from main to the 2.4 branch
Revision Changes Path
No revision
No revision
1.1.2.1 +1 -1 jbosstest/src/build/subprojects/build-bank.xml
Index: build-bank.xml
===================================================================
RCS file: /cvsroot/jboss/jbosstest/src/build/subprojects/build-bank.xml,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
--- build-bank.xml 2001/05/05 20:54:05 1.1
+++ build-bank.xml 2001/07/09 01:06:01 1.1.2.1
@@ -27,7 +27,7 @@
<jar jarfile="${build.lib.dir}/banktest.jar"
basedir="${build.classes.dir}"
manifest="${etc.dir}/manifest.mf"
-
includes="org/jboss/test/bank/interfaces/**,org/jboss/test/bank/test/**,*.*"
+
includes="org/jboss/test/util/**,org/jboss/test/bank/interfaces/**,org/jboss/test/bank/test/**,*.*"
/>
<jar jarfile="${build.deploy.dir}/bank.jar"
1.1.2.1 +1 -1 jbosstest/src/build/subprojects/build-bmp.xml
Index: build-bmp.xml
===================================================================
RCS file: /cvsroot/jboss/jbosstest/src/build/subprojects/build-bmp.xml,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
--- build-bmp.xml 2001/05/05 20:54:05 1.1
+++ build-bmp.xml 2001/07/09 01:06:01 1.1.2.1
@@ -28,7 +28,7 @@
<jar jarfile="${build.lib.dir}/bmptest.jar"
basedir="${build.classes.dir}"
manifest="${etc.dir}/manifest.mf"
-
includes="org/jboss/test/bmp/interfaces/**,org/jboss/test/bmp/test/**,*.*"
+
includes="org/jboss/test/util/**,org/jboss/test/bmp/interfaces/**,org/jboss/test/bmp/test/**,*.*"
/>
<jar jarfile="${build.deploy.dir}/bmp.jar"
1.1.2.1 +1 -1 jbosstest/src/build/subprojects/build-cts.xml
Index: build-cts.xml
===================================================================
RCS file: /cvsroot/jboss/jbosstest/src/build/subprojects/build-cts.xml,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
--- build-cts.xml 2001/05/05 20:54:05 1.1
+++ build-cts.xml 2001/07/09 01:06:01 1.1.2.1
@@ -27,7 +27,7 @@
<jar jarfile="${build.lib.dir}/ctstest.jar"
basedir="${build.classes.dir}"
manifest="${etc.dir}/manifest.mf"
-
includes="org/jboss/test/util/ejb/BeanContextInfo.class,org/jboss/test/cts/jms/**,org/jboss/test/cts/keys/**,org/jboss/test/cts/interfaces/**,org/jboss/test/cts/test/**,*.*"
+
includes="org/jboss/test/util/**,org/jboss/test/cts/jms/**,org/jboss/test/cts/keys/**,org/jboss/test/cts/interfaces/**,org/jboss/test/cts/test/**,*.*"
/>
<jar jarfile="${build.deploy.dir}/cts.jar"
1.2.2.1 +1 -1 jbosstest/src/build/subprojects/build-dbtest.xml
Index: build-dbtest.xml
===================================================================
RCS file: /cvsroot/jboss/jbosstest/src/build/subprojects/build-dbtest.xml,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -r1.2 -r1.2.2.1
--- build-dbtest.xml 2001/06/09 16:26:44 1.2
+++ build-dbtest.xml 2001/07/09 01:06:01 1.2.2.1
@@ -27,7 +27,7 @@
<jar jarfile="${build.lib.dir}/dbtestclient.jar"
basedir="${build.classes.dir}"
manifest="${etc.dir}/manifest.mf"
-
includes="org/jboss/test/dbtest/interfaces/**,org/jboss/test/dbtest/test/**,client.policy"
+
includes="org/jboss/test/util/**,org/jboss/test/dbtest/interfaces/**,org/jboss/test/dbtest/test/**,client.policy"
/>
<jar jarfile="${build.deploy.dir}/dbtest.jar"
1.1.2.1 +1 -1 jbosstest/src/build/subprojects/build-hello.xml
Index: build-hello.xml
===================================================================
RCS file: /cvsroot/jboss/jbosstest/src/build/subprojects/build-hello.xml,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
--- build-hello.xml 2001/05/05 20:54:05 1.1
+++ build-hello.xml 2001/07/09 01:06:01 1.1.2.1
@@ -27,7 +27,7 @@
<jar jarfile="${build.lib.dir}/hellotest.jar"
basedir="${build.classes.dir}"
manifest="${etc.dir}/manifest.mf"
-
includes="org/jboss/test/hello/interfaces/**,org/jboss/test/hello/test/**,*.*"
+
includes="org/jboss/test/util/**,org/jboss/test/hello/interfaces/**,org/jboss/test/hello/test/**,*.*"
/>
<jar jarfile="${build.deploy.dir}/hello.jar"
1.1.2.1 +1 -1 jbosstest/src/build/subprojects/build-jmsra.xml
Index: build-jmsra.xml
===================================================================
RCS file: /cvsroot/jboss/jbosstest/src/build/subprojects/build-jmsra.xml,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
--- build-jmsra.xml 2001/05/06 01:11:45 1.1
+++ build-jmsra.xml 2001/07/09 01:06:01 1.1.2.1
@@ -29,7 +29,7 @@
<jar jarfile="${build.lib.dir}/jmsratest.jar"
basedir="${build.classes.dir}"
manifest="${etc.dir}/manifest.mf"
- includes="org/jboss/test/jmsra/**,*.*"
+ includes="org/jboss/test/util/**,org/jboss/test/jmsra/**,*.*"
/>
<jar jarfile="${build.deploy.dir}/jmsra.jar"
1.2.2.1 +2 -1 jbosstest/src/build/subprojects/build-jrmp.xml
Index: build-jrmp.xml
===================================================================
RCS file: /cvsroot/jboss/jbosstest/src/build/subprojects/build-jrmp.xml,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -r1.2 -r1.2.2.1
--- build-jrmp.xml 2001/06/19 02:48:53 1.2
+++ build-jrmp.xml 2001/07/09 01:06:01 1.2.2.1
@@ -60,13 +60,14 @@
manifest="${etc.dir}/manifest.mf" >
<include name="org/jboss/test/jrmp/interfaces/**" />
<include name="org/jboss/test/jrmp/test/TestDynLoading*.class" />
- <include name="org/jboss/test/util/Deploy.class" />
+ <include name="org/jboss/test/util/Deploy*.class" />
</jar>
<jar jarfile="${build.deploy.dir}/jrmp-dl.jar"
basedir="${build.classes.dir}" >
<include name="org/jboss/test/jrmp/ejb/**" />
<include name="org/jboss/test/jrmp/interfaces/**" />
<include name="**/ejb-jar.xml" />
+ <include name="**/jboss.xml" />
<exclude name="org/jboss/test/jrmp/ejb/Compression*.class" />
</jar>
</target>
1.1.2.1 +1 -1 jbosstest/src/build/subprojects/build-load.xml
Index: build-load.xml
===================================================================
RCS file: /cvsroot/jboss/jbosstest/src/build/subprojects/build-load.xml,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
--- build-load.xml 2001/05/05 20:54:05 1.1
+++ build-load.xml 2001/07/09 01:06:01 1.1.2.1
@@ -27,7 +27,7 @@
<jar jarfile="${build.lib.dir}/load.jar"
basedir="${build.classes.dir}"
manifest="${etc.dir}/manifest.mf"
-
includes="org/jboss/test/load/test/**,org/jboss/test/testbean/interfaces/**,org/jboss/test/bmp/interfaces/**"
+
includes="org/jboss/test/util/**,org/jboss/test/load/test/**,org/jboss/test/testbean/interfaces/**,org/jboss/test/bmp/interfaces/**"
/>
</target>
1.2.2.1 +1 -1 jbosstest/src/build/subprojects/build-lock.xml
Index: build-lock.xml
===================================================================
RCS file: /cvsroot/jboss/jbosstest/src/build/subprojects/build-lock.xml,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -r1.2 -r1.2.2.1
--- build-lock.xml 2001/06/09 16:31:58 1.2
+++ build-lock.xml 2001/07/09 01:06:01 1.2.2.1
@@ -27,7 +27,7 @@
<jar jarfile="${build.lib.dir}/locktestclient.jar"
basedir="${build.classes.dir}"
manifest="${etc.dir}/manifest.mf"
-
includes="org/jboss/test/lock/interfaces/**,org/jboss/test/lock/test/**,client.policy"
+
includes="org/jboss/test/util/**,org/jboss/test/lock/interfaces/**,org/jboss/test/lock/test/**,client.policy"
/>
<jar jarfile="${build.deploy.dir}/locktest.jar"
1.2.2.1 +1 -1 jbosstest/src/build/subprojects/build-mdb.xml
Index: build-mdb.xml
===================================================================
RCS file: /cvsroot/jboss/jbosstest/src/build/subprojects/build-mdb.xml,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -r1.2 -r1.2.2.1
--- build-mdb.xml 2001/06/08 14:59:36 1.2
+++ build-mdb.xml 2001/07/09 01:06:01 1.2.2.1
@@ -28,7 +28,7 @@
<jar jarfile="${build.lib.dir}/mdbtest.jar"
basedir="${build.classes.dir}"
manifest="${etc.dir}/manifest.mf"
- includes="org/jboss/test/mdb/**,org/jboss/test/util/Deploy.class,*.*"
+ includes="org/jboss/test/mdb/**,org/jboss/test/util/Deploy*.class,*.*"
/>
<jar jarfile="${build.deploy.dir}/mdb.jar"
1.1.2.1 +32 -27 jbosstest/src/build/subprojects/build-perf.xml
Index: build-perf.xml
===================================================================
RCS file: /cvsroot/jboss/jbosstest/src/build/subprojects/build-perf.xml,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
--- build-perf.xml 2001/05/05 20:54:05 1.1
+++ build-perf.xml 2001/07/09 01:06:01 1.1.2.1
@@ -1,39 +1,44 @@
<?xml version="1.0"?>
<!-- The JBossTest performance testsuite build file -->
<project name="JBossTest-Performance" default="jar">
- <!-- =================================================================== -->
- <!-- Compiles the source code -->
- <!-- =================================================================== -->
- <target name="compile">
- <mkdir dir="${build.classes.dir}"/>
- <javac srcdir="${src.dir}"
+
+ <!-- =================================================================== -->
+ <!-- Compiles the source code -->
+ <!-- =================================================================== -->
+ <target name="compile">
+ <mkdir dir="${build.classes.dir}"/>
+ <javac srcdir="${src.dir}"
destdir="${build.classes.dir}"
classpath="${classpath}"
debug="on"
deprecation="on"
optimize="off"
- includes="org/jboss/test/perf/**"
- />
- </target>
+ >
+ <include name="org/jboss/test/perf/**" />
+ <include name="org/jboss/test/util/**" />
+ </javac>
+ </target>
- <!-- =================================================================== -->
- <!-- Creates the JBossTest perf ejb-jar file -->
- <!-- =================================================================== -->
- <target name="jar" depends="compile">
- <delete dir="${build.classes.dir}/META-INF"/>
- <copy todir="${build.classes.dir}">
- <fileset dir="${src.resources}/perf"/>
- </copy>
- <jar jarfile="${build.lib.dir}/perftest.jar"
- basedir="${build.classes.dir}"
- manifest="${etc.dir}/manifest.mf"
-
includes="org/jboss/test/perf/interfaces/**,org/jboss/test/perf/test/**,*.*"
- />
+ <!-- =================================================================== -->
+ <!-- Creates the JBossTest perf ejb-jar file -->
+ <!-- =================================================================== -->
+ <target name="jar" depends="compile">
+ <delete dir="${build.classes.dir}/META-INF"/>
+ <copy todir="${build.classes.dir}">
+ <fileset dir="${src.resources}/perf"/>
+ </copy>
+ <jar jarfile="${build.lib.dir}/perftest.jar"
+ basedir="${build.classes.dir}"
+ manifest="${etc.dir}/manifest.mf"
+
includes="org/jboss/test/perf/interfaces/**,org/jboss/test/perf/test/**,*.*"
+ />
- <jar jarfile="${build.deploy.dir}/perf.jar"
- basedir="${build.classes.dir}"
-
includes="org/jboss/test/perf/interfaces/**,org/jboss/test/perf/ejb/**,**/*.xml"
- />
- </target>
+ <jar jarfile="${build.deploy.dir}/perf.jar" basedir="${build.classes.dir}">
+ <include name="org/jboss/test/perf/ejb/**" />
+ <include name="org/jboss/test/perf/interfaces/**" />
+ <include name="org/jboss/test/util/ejb/**" />
+ <include name="META-INF/**" />
+ </jar>
+ </target>
</project>
1.2.2.1 +1 -0 jbosstest/src/build/subprojects/build-testbean.xml
Index: build-testbean.xml
===================================================================
RCS file: /cvsroot/jboss/jbosstest/src/build/subprojects/build-testbean.xml,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -r1.2 -r1.2.2.1
--- build-testbean.xml 2001/06/06 15:30:31 1.2
+++ build-testbean.xml 2001/07/09 01:06:01 1.2.2.1
@@ -32,6 +32,7 @@
basedir="${build.classes.dir}"
manifest="${etc.dir}/manifest.mf"
>
+ <include name="org/jboss/test/util/**"/>
<include name="org/jboss/test/testbean/interfaces/**" />
<include name="org/jboss/test/testbean/test/**" />
<include name="org/jboss/test/testbean2/interfaces/**" />
1.5.2.1 +3 -1 jbosstest/src/build/subprojects/build-web.xml
Index: build-web.xml
===================================================================
RCS file: /cvsroot/jboss/jbosstest/src/build/subprojects/build-web.xml,v
retrieving revision 1.5
retrieving revision 1.5.2.1
diff -u -r1.5 -r1.5.2.1
--- build-web.xml 2001/06/01 14:08:48 1.5
+++ build-web.xml 2001/07/09 01:06:01 1.5.2.1
@@ -49,12 +49,14 @@
>
<include name="org/jboss/test/web/util/*" />
<include name="weblog4j.properties" />
+ <exclude name="org/jboss/test/web/util/ClassInClasses.class" />
</jar>
<!-- The web application jar -->
<copy todir="${build.dir}/web/WEB-INF/classes">
<fileset dir="${build.classes.dir}">
- <include name="org/jboss/test/web/servlets/**" />
+ <include name="org/jboss/test/web/servlets/**" />
+ <include name="org/jboss/test/web/util/ClassInClasses.class" />
</fileset>
</copy>
<jar jarfile="${build.dir}/web/jbosstest-web.war"
1.3.2.1 +1 -1 jbosstest/src/build/subprojects/build-xa.xml
Index: build-xa.xml
===================================================================
RCS file: /cvsroot/jboss/jbosstest/src/build/subprojects/build-xa.xml,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -u -r1.3 -r1.3.2.1
--- build-xa.xml 2001/06/09 16:36:40 1.3
+++ build-xa.xml 2001/07/09 01:06:01 1.3.2.1
@@ -28,7 +28,7 @@
<jar jarfile="${build.lib.dir}/xatestclient.jar"
basedir="${build.classes.dir}"
manifest="${etc.dir}/manifest.mf"
-
includes="org/jboss/test/xa/interfaces/**,org/jboss/test/xa/test/**,client.policy"
+
includes="org/jboss/test/util/**,org/jboss/test/xa/interfaces/**,org/jboss/test/xa/test/**,client.policy"
/>
<jar jarfile="${build.deploy.dir}/xatest.jar"
No revision
No revision
1.1.2.1 +0 -0 jbosstest/src/build/subprojects/build-jbossmq.xml
Index: build-jbossmq.xml
===================================================================
RCS file: /cvsroot/jboss/jbosstest/src/build/subprojects/build-jbossmq.xml,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
1.2.2.1 +0 -0 jbosstest/src/build/subprojects/build-readahead.xml
Index: build-readahead.xml
===================================================================
RCS file: /cvsroot/jboss/jbosstest/src/build/subprojects/build-readahead.xml,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -r1.2 -r1.2.2.1
1.1.2.1 +0 -0 jbosstest/src/build/subprojects/build-threading.xml
Index: build-threading.xml
===================================================================
RCS file: /cvsroot/jboss/jbosstest/src/build/subprojects/build-threading.xml,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
_______________________________________________
Jboss-development mailing list
[EMAIL PROTECTED]
http://lists.sourceforge.net/lists/listinfo/jboss-development
