|
From: Adrian B. <ej...@us...> - 2002-08-31 23:01:34
|
User: ejort
Date: 02/08/31 16:01:34
Modified: . Tag: Branch_3_0 build.xml
Log:
Resources tests
Revision Changes Path
No revision
No revision
1.106.2.44 +9 -1 jbosstest/build.xml
Index: build.xml
===================================================================
RCS file: /cvsroot/jboss/jbosstest/build.xml,v
retrieving revision 1.106.2.43
retrieving revision 1.106.2.44
diff -u -r1.106.2.43 -r1.106.2.44
--- build.xml 17 Aug 2002 21:50:01 -0000 1.106.2.43
+++ build.xml 31 Aug 2002 23:01:33 -0000 1.106.2.44
@@ -13,7 +13,7 @@
<!-- -->
<!-- ====================================================================== -->
-<!-- $Id: build.xml,v 1.106.2.43 2002/08/17 21:50:01 starksm Exp $ -->
+<!-- $Id: build.xml,v 1.106.2.44 2002/08/31 23:01:33 ejort Exp $ -->
<project default="main" name="JBoss/Testsuite">
@@ -2726,6 +2726,14 @@
<metainf dir="${source.resources}/classloader/interrupt" />
<fileset dir="${build.classes}">
<include name="org/jboss/test/classloader/interrupt/**"/>
+ </fileset>
+ </jar>
+
+ <!-- build loadingresource.sar -->
+ <jar jarfile="${build.lib}/loadingresource.sar">
+ <metainf dir="${source.resources}/classloader/resource" />
+ <fileset dir="${build.classes}">
+ <include name="org/jboss/test/classloader/resource/**"/>
</fileset>
</jar>
</target>
|
|
From: Adrian B. <ej...@us...> - 2002-08-31 23:10:04
|
User: ejort
Date: 02/08/31 16:10:03
Modified: . build.xml
Log:
Resources tests + missing interrupt support
Revision Changes Path
1.170 +9 -1 jbosstest/build.xml
Index: build.xml
===================================================================
RCS file: /cvsroot/jboss/jbosstest/build.xml,v
retrieving revision 1.169
retrieving revision 1.170
diff -u -r1.169 -r1.170
--- build.xml 30 Aug 2002 04:36:18 -0000 1.169
+++ build.xml 31 Aug 2002 23:10:02 -0000 1.170
@@ -13,7 +13,7 @@
<!-- -->
<!-- ====================================================================== -->
-<!-- $Id: build.xml,v 1.169 2002/08/30 04:36:18 d_jencks Exp $ -->
+<!-- $Id: build.xml,v 1.170 2002/08/31 23:10:02 ejort Exp $ -->
<project default="main" name="JBoss/Testsuite">
@@ -3022,6 +3022,14 @@
<metainf dir="${source.resources}/classloader/interrupt" />
<fileset dir="${build.classes}">
<include name="org/jboss/test/classloader/interrupt/**"/>
+ </fileset>
+ </jar>
+
+ <!-- build loadingresource.sar -->
+ <jar jarfile="${build.lib}/loadingresource.sar">
+ <metainf dir="${source.resources}/classloader/resource" />
+ <fileset dir="${build.classes}">
+ <include name="org/jboss/test/classloader/resource/**"/>
</fileset>
</jar>
</target>
|
|
From: Adrian B. <ej...@us...> - 2002-08-31 23:12:26
|
User: ejort
Date: 02/08/31 16:12:26
Modified: . Tag: Branch_3_2 build.xml
Log:
Resources test + missing interrupt tests
Revision Changes Path
No revision
No revision
1.165.2.5 +9 -1 jbosstest/build.xml
Index: build.xml
===================================================================
RCS file: /cvsroot/jboss/jbosstest/build.xml,v
retrieving revision 1.165.2.4
retrieving revision 1.165.2.5
diff -u -r1.165.2.4 -r1.165.2.5
--- build.xml 17 Aug 2002 21:10:38 -0000 1.165.2.4
+++ build.xml 31 Aug 2002 23:12:26 -0000 1.165.2.5
@@ -13,7 +13,7 @@
<!-- -->
<!-- ====================================================================== -->
-<!-- $Id: build.xml,v 1.165.2.4 2002/08/17 21:10:38 d_jencks Exp $ -->
+<!-- $Id: build.xml,v 1.165.2.5 2002/08/31 23:12:26 ejort Exp $ -->
<project default="main" name="JBoss/Testsuite">
@@ -3012,6 +3012,14 @@
<metainf dir="${source.resources}/classloader/interrupt" />
<fileset dir="${build.classes}">
<include name="org/jboss/test/classloader/interrupt/**"/>
+ </fileset>
+ </jar>
+
+ <!-- build loadingresource.sar -->
+ <jar jarfile="${build.lib}/loadingresource.sar">
+ <metainf dir="${source.resources}/classloader/resource" />
+ <fileset dir="${build.classes}">
+ <include name="org/jboss/test/classloader/resource/**"/>
</fileset>
</jar>
</target>
|
|
From: David J. <d_j...@us...> - 2002-09-01 23:32:21
|
User: d_jencks
Date: 02/09/01 16:32:20
Modified: . build.xml
Log:
upgrade build files to work with xdoclet nearly-1.2
Revision Changes Path
1.171 +37 -55 jbosstest/build.xml
Index: build.xml
===================================================================
RCS file: /cvsroot/jboss/jbosstest/build.xml,v
retrieving revision 1.170
retrieving revision 1.171
diff -u -r1.170 -r1.171
--- build.xml 31 Aug 2002 23:10:02 -0000 1.170
+++ build.xml 1 Sep 2002 23:32:20 -0000 1.171
@@ -13,7 +13,7 @@
<!-- -->
<!-- ====================================================================== -->
-<!-- $Id: build.xml,v 1.170 2002/08/31 23:10:02 ejort Exp $ -->
+<!-- $Id: build.xml,v 1.171 2002/09/01 23:32:20 d_jencks Exp $ -->
<project default="main" name="JBoss/Testsuite">
@@ -453,14 +453,13 @@
<!-- Compile EJB beans with XDoclet -->
<target name="compile-bean-sources" depends="init">
- <taskdef name="xdoclet" classname="xdoclet.ejb.EjbDocletTask" classpathref="xdoclet.task.classpath"/>
+ <taskdef name="ejbdoclet" classname="xdoclet.modules.ejb.EjbDocletTask" classpathref="xdoclet.task.classpath"/>
<mkdir dir="${build.gen-src}"/>
<!--ejbconf-->
<mkdir dir="${build.resources}/ejb-conf/readonly/META-INF"/>
- <xdoclet destdir="${build.gen-src}"
- classpath="${xdoclet.task.classpath}"
+ <ejbdoclet destdir="${build.gen-src}"
ejbspec="2.0"
excludedtags="@version,@author"
mergedir="${source.resources}/ejb-conf/readonly">
@@ -482,12 +481,11 @@
Datasource="java:/DefaultDS"
Typemapping="Hypersonic SQL"
/>
- </xdoclet>
+ </ejbdoclet>
<!--eardeployment, SessionA-->
<mkdir dir="${build.resources}/jmx/eardeployment/a/META-INF"/>
- <xdoclet destdir="${build.gen-src}"
- classpath="${xdoclet.task.classpath}"
+ <ejbdoclet destdir="${build.gen-src}"
ejbspec="2.0"
excludedtags="@version,@author"
mergedir="${source.resources}/eardeployment/a">
@@ -506,12 +504,11 @@
version="3.0"
destdir="${build.resources}/jmx/eardeployment/a/META-INF"
mergedir="${source.resources}/jmx/eardeployment/a/"/>
- </xdoclet>
+ </ejbdoclet>
<!--eardeployment, SessionB-->
<mkdir dir="${build.resources}/jmx/eardeployment/b/META-INF"/>
- <xdoclet destdir="${build.gen-src}"
- classpath="${xdoclet.task.classpath}"
+ <ejbdoclet destdir="${build.gen-src}"
ejbspec="2.0"
excludedtags="@version,@author"
mergedir="${source.resources}/eardeployment/b">
@@ -530,12 +527,11 @@
version="3.0"
destdir="${build.resources}/jmx/eardeployment/b/META-INF"
mergedir="${source.resources}/jmx/eardeployment/b/"/>
- </xdoclet>
+ </ejbdoclet>
<!-- cmr written after post create -->
<mkdir dir="${build.resources}/cmp2/cmr/META-INF"/>
- <xdoclet destdir="${build.gen-src}"
- classpath="${xdoclet.task.classpath}"
+ <ejbdoclet destdir="${build.gen-src}"
ejbspec="2.0"
excludedtags="@version,@author"
mergedir="${source.resources}/cmp2/cmr">
@@ -556,13 +552,12 @@
mergedir="${source.resources}/cmp2/cmr/"
Datasource="java:/DefaultDS"
Typemapping="Hypersonic SQL"/>
- </xdoclet>
+ </ejbdoclet>
<!--undeploy of broken packages-->
<mkdir dir="${build.resources}/jmx/undeploy/META-INF"/>
- <xdoclet destdir="${build.gen-src}"
- classpath="${xdoclet.task.classpath}"
+ <ejbdoclet destdir="${build.gen-src}"
ejbspec="2.0"
excludedtags="@version,@author">
<!--mergedir="${source.resources}/jmx/ejb"-->
@@ -584,12 +579,11 @@
Datasource="java:/DefaultDS"
Typemapping="Hypersonic SQL"
/>
- </xdoclet>
+ </ejbdoclet>
<!--jca framework tests-->
<mkdir dir="${build.resources}/jca/META-INF"/>
- <xdoclet destdir="${build.gen-src}"
- classpath="${xdoclet.task.classpath}"
+ <ejbdoclet destdir="${build.gen-src}"
ejbspec="2.0"
excludedtags="@version,@author">
<!--mergedir="${source.resources}/jca/ejb"-->
@@ -608,11 +602,10 @@
version="3.0"
destdir="${build.resources}/jca/META-INF"
mergedir="${source.resources}/jca/"/>
- </xdoclet>
+ </ejbdoclet>
<mkdir dir="${build.resources}/jca/bank/META-INF"/>
- <xdoclet destdir="${build.gen-src}"
- classpath="${xdoclet.task.classpath}"
+ <ejbdoclet destdir="${build.gen-src}"
ejbspec="2.0"
excludedtags="@version,@author">
<!--mergedir="${source.resources}/jca/ejb"-->
@@ -631,12 +624,11 @@
version="3.0"
destdir="${build.resources}/jca/bank/META-INF"
mergedir="${source.resources}/jca/bank/"/>
- </xdoclet>
+ </ejbdoclet>
<!-- mdb for jca 1.5 message inflow -->
<mkdir dir="${build.resources}/jca/inflow/META-INF"/>
- <xdoclet destdir="${build.gen-src}"
- classpath="${xdoclet.task.classpath}"
+ <ejbdoclet destdir="${build.gen-src}"
ejbspec="2.0"
excludedtags="@version,@author">
<!--mergedir="${source.resources}/jca/ejb"-->
@@ -651,11 +643,10 @@
version="3.0"
destdir="${build.resources}/jca/inflow/META-INF"
mergedir="${source.resources}/jca/inflow/"/>
- </xdoclet>
+ </ejbdoclet>
<mkdir dir="${build.resources}/banknew/META-INF"/>
- <xdoclet destdir="${build.gen-src}"
- classpath="${xdoclet.task.classpath}"
+ <ejbdoclet destdir="${build.gen-src}"
ejbspec="2.0"
excludedtags="@version,@author">
<!--mergedir="${source.resources}/jca/ejb"-->
@@ -678,12 +669,11 @@
version="3.0"
destdir="${build.resources}/banknew/META-INF"
mergedir="${source.resources}/banknew/"/>
- </xdoclet>
+ </ejbdoclet>
<!-- Foe-Deployer: Simple Test -->
<mkdir dir="${build.resources}/foedeployer/simple/META-INF"/>
- <xdoclet destdir="${build.gen-src}"
- classpath="${xdoclet.task.classpath}"
+ <ejbdoclet destdir="${build.gen-src}"
ejbspec="2.0"
excludedtags="@version,@author">
<!--mergedir="${source.resources}/jca/ejb"-->
@@ -704,12 +694,11 @@
datasource="java:/DefaultDS"
mergedir="${source.resources}/foedeployer/"/>
<!-- No JBoss DD generation here because that is what we can to use FoeDeployer for -->
- </xdoclet>
+ </ejbdoclet>
<!-- Foe-Deployer: Message Test -->
<mkdir dir="${build.resources}/foedeployer/message/META-INF"/>
- <xdoclet destdir="${build.gen-src}"
- classpath="${xdoclet.task.classpath}"
+ <ejbdoclet destdir="${build.gen-src}"
ejbspec="2.0"
excludedtags="@version,@author">
<!--mergedir="${source.resources}/jca/ejb"-->
@@ -726,12 +715,11 @@
datasource="java:/DefaultDS"
mergedir="${source.resources}/foedeployer/"/>
<!-- No JBoss DD generation here because that is what we can to use FoeDeployer for -->
- </xdoclet>
+ </ejbdoclet>
<!-- Foe-Deployer: O2MB Test -->
<mkdir dir="${build.resources}/foedeployer/o2mb/META-INF"/>
- <xdoclet destdir="${build.gen-src}"
- classpath="${xdoclet.task.classpath}"
+ <ejbdoclet destdir="${build.gen-src}"
ejbspec="2.0"
excludedtags="@version,@author">
<!--mergedir="${source.resources}/jca/ejb"-->
@@ -752,12 +740,11 @@
datasource="java:/DefaultDS"
mergedir="${source.resources}/foedeployer/"/>
<!-- No JBoss DD generation here because that is what we can to use FoeDeployer for -->
- </xdoclet>
+ </ejbdoclet>
<!-- Foe-Deployer: M2MB Test -->
<mkdir dir="${build.resources}/foedeployer/m2mb/META-INF"/>
- <xdoclet destdir="${build.gen-src}"
- classpath="${xdoclet.task.classpath}"
+ <ejbdoclet destdir="${build.gen-src}"
ejbspec="2.0"
excludedtags="@version,@author">
<!--mergedir="${source.resources}/jca/ejb"-->
@@ -778,12 +765,11 @@
datasource="java:/DefaultDS"
mergedir="${source.resources}/foedeployer/"/>
<!-- No JBoss DD generation here because that is what we can to use FoeDeployer for -->
- </xdoclet>
+ </ejbdoclet>
<!-- Foe-Deployer: QL Test -->
<mkdir dir="${build.resources}/foedeployer/ql/META-INF"/>
- <xdoclet destdir="${build.gen-src}"
- classpath="${xdoclet.task.classpath}"
+ <ejbdoclet destdir="${build.gen-src}"
ejbspec="2.0"
excludedtags="@version,@author">
<!--mergedir="${source.resources}/jca/ejb"-->
@@ -804,12 +790,11 @@
datasource="java:/DefaultDS"
mergedir="${source.resources}/foedeployer/"/>
<!-- No JBoss DD generation here because that is what we can to use FoeDeployer for -->
- </xdoclet>
+ </ejbdoclet>
<!-- cpmanifest test -->
<mkdir dir="${build.resources}/jmx/loading/cpmanifest/META-INF"/>
- <xdoclet destdir="${build.gen-src}"
- classpath="${xdoclet.task.classpath}"
+ <ejbdoclet destdir="${build.gen-src}"
ejbspec="2.0"
excludedtags="@version,@author">
<fileset dir="${source.java}">
@@ -821,16 +806,15 @@
<!--session/-->
<deploymentdescriptor xmlencoding ="UTF-8"
destdir="${build.resources}/jmx/loading/cpmanifest/META-INF"/>
- </xdoclet>
+ </ejbdoclet>
</target>
<target name="compile-mbean-sources" depends="init">
- <taskdef name="jmxdoclet" classname="xdoclet.jmx.JMXDocletTask" classpathref="xdoclet.task.classpath"/>
+ <taskdef name="jmxdoclet" classname="xdoclet.modules.jmx.JMXDocletTask" classpathref="xdoclet.task.classpath"/>
<echo message="xdoclet.mergedir: ${xdoclet.mergedir}"/>
<mkdir dir="${build.gen-src}"/>
<jmxdoclet destdir="${build.gen-src}"
- classpath="${xdoclet.task.classpath}"
force="true"
excludedtags="@version,@author">
<fileset dir="${source.java}">
@@ -846,11 +830,10 @@
</target>
<target name="compile-xmbean-dds" depends="init">
- <taskdef name="jmxdoclet" classname="xdoclet.jmx.JMXDocletTask" classpathref="xdoclet.task.classpath"/>
+ <taskdef name="jmxdoclet" classname="xdoclet.modules.jmx.JMXDocletTask" classpathref="xdoclet.task.classpath"/>
<echo message="xdoclet.mergedir: ${xdoclet.mergedir}"/>
<mkdir dir="${build.resources}/jmx/xmbean/META-INF"/>
<jmxdoclet destdir="${build.resources}/jmx/xmbean/META-INF"
- classpath="${xdoclet.task.classpath}"
force="true"
excludedtags="@version,@author">
<fileset dir="${source.java}">
@@ -862,13 +845,12 @@
</target>
<target name="compile-proxycompiler-bean-sources" depends="init">
- <taskdef name="xdoclet" classname="xdoclet.ejb.EjbDocletTask" classpathref="xdoclet.task.classpath"/>
+ <taskdef name="ejbdoclet" classname="xdoclet.modules.ejb.EjbDocletTask" classpathref="xdoclet.task.classpath"/>
<mkdir dir="${build.gen-src}"/>
<mkdir dir="${build.resources}/proxycompiler/META-INF"/>
- <xdoclet destdir="${build.gen-src}"
- classpath="${xdoclet.task.classpath}"
+ <ejbdoclet destdir="${build.gen-src}"
ejbspec="2.0"
excludedtags="@version,@author"
mergedir="${source.resources}/proxycompiler">
@@ -887,7 +869,7 @@
version="3.0"
destdir="${build.resources}/proxycompiler/META-INF"
mergedir="${source.resources}/proxycompiler"/>
- </xdoclet>
+ </ejbdoclet>
</target>
|
|
From: David J. <d_j...@us...> - 2002-09-02 19:06:30
|
User: d_jencks
Date: 02/09/02 12:06:28
Modified: . build.xml
Log:
Fixed xmbean deployment functionality and added some tests
Revision Changes Path
1.172 +8 -1 jbosstest/build.xml
Index: build.xml
===================================================================
RCS file: /cvsroot/jboss/jbosstest/build.xml,v
retrieving revision 1.171
retrieving revision 1.172
diff -u -r1.171 -r1.172
--- build.xml 1 Sep 2002 23:32:20 -0000 1.171
+++ build.xml 2 Sep 2002 19:06:28 -0000 1.172
@@ -13,7 +13,7 @@
<!-- -->
<!-- ====================================================================== -->
-<!-- $Id: build.xml,v 1.171 2002/09/01 23:32:20 d_jencks Exp $ -->
+<!-- $Id: build.xml,v 1.172 2002/09/02 19:06:28 d_jencks Exp $ -->
<project default="main" name="JBoss/Testsuite">
@@ -2046,6 +2046,13 @@
<include name="META-INF/**/*.xml"/>
</fileset>
</jar>
+
+ <copy todir="${build.lib}" filtering="no">
+ <fileset dir="${build.resources}/jmx/xmbean">
+ <include name="inline-xmbean-service.xml"/>
+ </fileset>
+ </copy>
+
<!-- missing classes test -->
<jar jarfile="${build.lib}/missingclassmbean.jar">
|
|
From: Julien V. <coo...@us...> - 2002-09-09 19:08:39
|
User: cooperfbi
Date: 02/09/09 12:08:35
Modified: . build.xml
Log:
Added build for FederationWithExternalContextTestCase.
Revision Changes Path
1.173 +12 -1 jbosstest/build.xml
Index: build.xml
===================================================================
RCS file: /cvsroot/jboss/jbosstest/build.xml,v
retrieving revision 1.172
retrieving revision 1.173
diff -u -r1.172 -r1.173
--- build.xml 2 Sep 2002 19:06:28 -0000 1.172
+++ build.xml 9 Sep 2002 19:08:35 -0000 1.173
@@ -13,7 +13,7 @@
<!-- -->
<!-- ====================================================================== -->
-<!-- $Id: build.xml,v 1.172 2002/09/02 19:06:28 d_jencks Exp $ -->
+<!-- $Id: build.xml,v 1.173 2002/09/09 19:08:35 cooperfbi Exp $ -->
<project default="main" name="JBoss/Testsuite">
@@ -2131,6 +2131,17 @@
<include name="META-INF/*.xml"/>
</fileset>
</jar>
+
+ <!-- build naming.sar -->
+ <jar jarfile="${build.lib}/naming.sar">
+ <fileset dir="${build.resources}/naming/sar">
+ <include name="META-INF/*.xml"/>
+ </fileset>
+ <fileset dir="${build.classes}">
+ <include name="org/jboss/test/naming/federation/**"/>
+ </fileset>
+ </jar>
+
</target>
<!-- jbossmq test -->
|
|
From: Hiram C. <ch...@us...> - 2002-09-13 03:58:18
|
User: chirino
Date: 02/09/12 20:06:06
Modified: . build.xml
Log:
Added a few testcases for the aspect stuff I just commited.
Revision Changes Path
1.174 +9 -1 jbosstest/build.xml
Index: build.xml
===================================================================
RCS file: /cvsroot/jboss/jbosstest/build.xml,v
retrieving revision 1.173
retrieving revision 1.174
diff -u -r1.173 -r1.174
--- build.xml 9 Sep 2002 19:08:35 -0000 1.173
+++ build.xml 13 Sep 2002 03:06:06 -0000 1.174
@@ -13,7 +13,7 @@
<!-- -->
<!-- ====================================================================== -->
-<!-- $Id: build.xml,v 1.173 2002/09/09 19:08:35 cooperfbi Exp $ -->
+<!-- $Id: build.xml,v 1.174 2002/09/13 03:06:06 chirino Exp $ -->
<project default="main" name="JBoss/Testsuite">
@@ -118,6 +118,13 @@
<pathelement path="${apache.log4j.lib}/log4j.jar"/>
</path>
+ <!-- dom4j -->
+ <property name="dom4j.dom4j.root" value="${project.thirdparty}/dom4j/dom4j"/>
+ <property name="dom4j.dom4j.lib" value="${dom4j.dom4j.root}/lib"/>
+ <path id="dom4j.dom4j.classpath">
+ <pathelement path="${dom4j.dom4j.lib}/dom4j.jar"/>
+ </path>
+
<!-- EDU.oswego.cs.dl.util.concurrent -->
<property name="oswego.concurrent.root" value="${project.thirdparty}/oswego/concurrent"/>
<property name="oswego.concurrent.lib" value="${oswego.concurrent.root}/lib"/>
@@ -181,6 +188,7 @@
<path refid="jacorb.jacorb.classpath"/>
<path refid="junit.junit.classpath"/>
<path refid="junitejb.junitejb.classpath"/>
+ <path refid="dom4j.dom4j.classpath"/>
<!-- needed for JBossMQ selector tests -->
<path refid="gnu.regexp.classpath"/>
|
|
From: David J. <d_j...@us...> - 2002-09-13 19:17:37
|
User: d_jencks
Date: 02/09/13 12:17:35
Modified: . build.xml
Log:
split libraries into needed-for-jmx and other to make jmx project work without all of thirdparty. I hope for a better solution soon
Revision Changes Path
1.175 +9 -2 jbosstest/build.xml
Index: build.xml
===================================================================
RCS file: /cvsroot/jboss/jbosstest/build.xml,v
retrieving revision 1.174
retrieving revision 1.175
diff -u -r1.174 -r1.175
--- build.xml 13 Sep 2002 03:06:06 -0000 1.174
+++ build.xml 13 Sep 2002 19:17:35 -0000 1.175
@@ -1,6 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE project [
<!ENTITY buildmagic SYSTEM "resource://org/jboss/tools/buildmagic/common.xml">
+ <!ENTITY xdoclet SYSTEM "../tools/etc/buildfragments/xdoclet.ent">
+ <!ENTITY libraries-jmx SYSTEM "../tools/etc/buildfragments/libraries-jmx.ent">
+ <!ENTITY libraries SYSTEM "../tools/etc/buildfragments/libraries.ent">
+ <!ENTITY modules SYSTEM "../tools/etc/buildfragments/modules.ent">
+ <!ENTITY documentation SYSTEM "../tools/etc/buildfragments/documentation.ent">
<!ENTITY mqstress SYSTEM "mqstress.xml">
]>
@@ -13,7 +18,7 @@
<!-- -->
<!-- ====================================================================== -->
-<!-- $Id: build.xml,v 1.174 2002/09/13 03:06:06 chirino Exp $ -->
+<!-- $Id: build.xml,v 1.175 2002/09/13 19:17:35 d_jencks Exp $ -->
<project default="main" name="JBoss/Testsuite">
@@ -73,6 +78,8 @@
<!-- ========= -->
<!-- Libraries -->
<!-- ========= -->
+ &libraries-jmx;
+ &libraries;
<!-- Java Cryptography Extension (JCE) -->
<property name="sun.jce.root" value="${project.thirdparty}/sun/jce"/>
@@ -182,7 +189,7 @@
<path refid="sun.jsse.classpath"/>
<path refid="sun.javamail.classpath"/>
<path refid="sun.servlet.classpath"/>
- <path refid="apache.crimson.classpath"/>
+ <path refid="apache.xalan.classpath"/>
<path refid="apache.log4j.classpath"/>
<path refid="oswego.concurrent.classpath"/>
<path refid="jacorb.jacorb.classpath"/>
|
|
From: David J. <d_j...@us...> - 2002-09-14 19:38:54
|
User: d_jencks
Date: 02/09/14 12:38:53
Modified: . build.xml
Log:
revert to previous version, changes were incomplete
Revision Changes Path
1.176 +1 -8 jbosstest/build.xml
Index: build.xml
===================================================================
RCS file: /cvsroot/jboss/jbosstest/build.xml,v
retrieving revision 1.175
retrieving revision 1.176
diff -u -r1.175 -r1.176
--- build.xml 13 Sep 2002 19:17:35 -0000 1.175
+++ build.xml 14 Sep 2002 19:38:53 -0000 1.176
@@ -1,11 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE project [
<!ENTITY buildmagic SYSTEM "resource://org/jboss/tools/buildmagic/common.xml">
- <!ENTITY xdoclet SYSTEM "../tools/etc/buildfragments/xdoclet.ent">
- <!ENTITY libraries-jmx SYSTEM "../tools/etc/buildfragments/libraries-jmx.ent">
- <!ENTITY libraries SYSTEM "../tools/etc/buildfragments/libraries.ent">
- <!ENTITY modules SYSTEM "../tools/etc/buildfragments/modules.ent">
- <!ENTITY documentation SYSTEM "../tools/etc/buildfragments/documentation.ent">
<!ENTITY mqstress SYSTEM "mqstress.xml">
]>
@@ -18,7 +13,7 @@
<!-- -->
<!-- ====================================================================== -->
-<!-- $Id: build.xml,v 1.175 2002/09/13 19:17:35 d_jencks Exp $ -->
+<!-- $Id: build.xml,v 1.176 2002/09/14 19:38:53 d_jencks Exp $ -->
<project default="main" name="JBoss/Testsuite">
@@ -78,8 +73,6 @@
<!-- ========= -->
<!-- Libraries -->
<!-- ========= -->
- &libraries-jmx;
- &libraries;
<!-- Java Cryptography Extension (JCE) -->
<property name="sun.jce.root" value="${project.thirdparty}/sun/jce"/>
@@ -189,7 +182,7 @@
<path refid="sun.jsse.classpath"/>
<path refid="sun.javamail.classpath"/>
<path refid="sun.servlet.classpath"/>
- <path refid="apache.xalan.classpath"/>
+ <path refid="apache.crimson.classpath"/>
<path refid="apache.log4j.classpath"/>
<path refid="oswego.concurrent.classpath"/>
<path refid="jacorb.jacorb.classpath"/>
|
|
From: Scott M S. <st...@us...> - 2002-09-16 14:42:04
|
User: starksm
Date: 02/09/16 07:42:03
Modified: . Tag: Branch_3_2 build.xml
Log:
Include the ${build.resources}/security in the classpath of the test
target for those tests that need common security resources
Revision Changes Path
No revision
No revision
1.165.2.6 +3 -1 jbosstest/build.xml
Index: build.xml
===================================================================
RCS file: /cvsroot/jboss/jbosstest/build.xml,v
retrieving revision 1.165.2.5
retrieving revision 1.165.2.6
diff -u -r1.165.2.5 -r1.165.2.6
--- build.xml 31 Aug 2002 23:12:26 -0000 1.165.2.5
+++ build.xml 16 Sep 2002 14:42:02 -0000 1.165.2.6
@@ -13,7 +13,7 @@
<!-- -->
<!-- ====================================================================== -->
-<!-- $Id: build.xml,v 1.165.2.5 2002/08/31 23:12:26 ejort Exp $ -->
+<!-- $Id: build.xml,v 1.165.2.6 2002/09/16 14:42:02 starksm Exp $ -->
<project default="main" name="JBoss/Testsuite">
@@ -4086,6 +4086,8 @@
<classpath>
<pathelement location="${build.classes}"/>
<pathelement location="${build.resources}"/>
+ <!-- Include for those tests that need common security resources -->
+ <pathelement location="${build.resources}/security"/>
<path refid="tests.classpath"/>
</classpath>
|
|
From: Scott M S. <st...@us...> - 2002-09-23 13:51:30
|
User: starksm
Date: 02/09/23 06:51:28
Modified: . Tag: Branch_3_0 build.xml
Log:
Seperate the security related naming tests
Revision Changes Path
No revision
No revision
1.106.2.45 +14 -2 jbosstest/build.xml
Index: build.xml
===================================================================
RCS file: /cvsroot/jboss/jbosstest/build.xml,v
retrieving revision 1.106.2.44
retrieving revision 1.106.2.45
diff -u -r1.106.2.44 -r1.106.2.45
--- build.xml 31 Aug 2002 23:01:33 -0000 1.106.2.44
+++ build.xml 23 Sep 2002 13:51:27 -0000 1.106.2.45
@@ -13,7 +13,7 @@
<!-- -->
<!-- ====================================================================== -->
-<!-- $Id: build.xml,v 1.106.2.44 2002/08/31 23:01:33 ejort Exp $ -->
+<!-- $Id: build.xml,v 1.106.2.45 2002/09/23 13:51:27 starksm Exp $ -->
<project default="main" name="JBoss/Testsuite">
@@ -2089,7 +2089,16 @@
<include name="org/somepackage/**"/>
</fileset>
<fileset dir="${build.resources}/testbeancluster">
- <include name="**/*.xml"/>
+ <include name="META-INF/*.xml"/>
+ </fileset>
+ </jar>
+
+ <jar jarfile="${build.lib}/clusterinfo.sar">
+ <metainf dir="${build.resources}/testbeancluster/clusterinfo">
+ <include name="jboss-service.xml" />
+ </metainf>
+ <fileset dir="${build.classes}">
+ <include name="org/jboss/test/testbeancluster/service/**"/>
</fileset>
</jar>
</target>
@@ -2966,6 +2975,7 @@
<!-- do not include the dyn loading or security tests -->
<exclude name="**/test/jrmp/test/DynLoadingUnitTestCase.class"/>
+ <exclude name="**/test/naming/test/Security*"/>
<exclude name="**/test/security/test/*"/>
<exclude name="**/test/securitymgr/test/*"/>
@@ -3023,6 +3033,7 @@
<!-- do not include the perf, security, or iiop tests -->
<!--mq test seems to break things-->
<!--exclude name="**/JBossMQPerfStressTestCase.class"/-->
+ <exclude name="**/test/naming/test/Security*"/>
<exclude name="**/test/perf/test/SecurePerfStressTestCase.class"/>
<exclude name="**/test/security/test/*"/>
<exclude name="**/test/securitymgr/test/*"/>
@@ -3174,6 +3185,7 @@
<fileset dir="${build.classes}">
<exclude name="**/test/security/test/SRPUnitTestCase.class"/>
+ <include name="**/test/naming/test/Security*"/>
<include name="**/test/security/test/**UnitTestCase.class"/>
</fileset>
</batchtest>
|
|
From: Scott M S. <st...@us...> - 2002-09-23 20:25:17
|
User: starksm
Date: 02/09/23 13:25:16
Modified: . build.xml
Log:
Add the https-service.sar build
Revision Changes Path
1.177 +12 -1 jbosstest/build.xml
Index: build.xml
===================================================================
RCS file: /cvsroot/jboss/jbosstest/build.xml,v
retrieving revision 1.176
retrieving revision 1.177
diff -u -r1.176 -r1.177
--- build.xml 14 Sep 2002 19:38:53 -0000 1.176
+++ build.xml 23 Sep 2002 20:25:16 -0000 1.177
@@ -13,7 +13,7 @@
<!-- -->
<!-- ====================================================================== -->
-<!-- $Id: build.xml,v 1.176 2002/09/14 19:38:53 d_jencks Exp $ -->
+<!-- $Id: build.xml,v 1.177 2002/09/23 20:25:16 starksm Exp $ -->
<project default="main" name="JBoss/Testsuite">
@@ -2697,6 +2697,17 @@
</fileset>
<fileset dir="${build.lib}">
<include name="security-srp.jar"/>
+ </fileset>
+ </jar>
+
+ <!-- build https-service.sar -->
+ <jar jarfile="${build.lib}/https-service.sar">
+ <metainf dir="${build.resources}/security/META-INF"/>
+ <metainf dir="${build.resources}/security">
+ <include name="tst.keystore"/>
+ </metainf>
+ <fileset dir="${build.classes}">
+ <include name="org/jboss/test/security/service/Https*.class"/>
</fileset>
</jar>
|
|
From: Scott M S. <st...@us...> - 2002-09-23 21:24:35
|
User: starksm
Date: 02/09/23 14:24:34
Modified: . Tag: Branch_3_0 build.xml
Log:
Remove the clusterinfo.sar build
Revision Changes Path
No revision
No revision
1.106.2.46 +1 -9 jbosstest/build.xml
Index: build.xml
===================================================================
RCS file: /cvsroot/jboss/jbosstest/build.xml,v
retrieving revision 1.106.2.45
retrieving revision 1.106.2.46
diff -u -r1.106.2.45 -r1.106.2.46
--- build.xml 23 Sep 2002 13:51:27 -0000 1.106.2.45
+++ build.xml 23 Sep 2002 21:24:33 -0000 1.106.2.46
@@ -13,7 +13,7 @@
<!-- -->
<!-- ====================================================================== -->
-<!-- $Id: build.xml,v 1.106.2.45 2002/09/23 13:51:27 starksm Exp $ -->
+<!-- $Id: build.xml,v 1.106.2.46 2002/09/23 21:24:33 starksm Exp $ -->
<project default="main" name="JBoss/Testsuite">
@@ -2093,14 +2093,6 @@
</fileset>
</jar>
- <jar jarfile="${build.lib}/clusterinfo.sar">
- <metainf dir="${build.resources}/testbeancluster/clusterinfo">
- <include name="jboss-service.xml" />
- </metainf>
- <fileset dir="${build.classes}">
- <include name="org/jboss/test/testbeancluster/service/**"/>
- </fileset>
- </jar>
</target>
<!-- perf test -->
|
|
From: Scott M S. <st...@us...> - 2002-09-24 15:35:22
|
User: starksm
Date: 02/09/24 08:35:21
Modified: . Tag: Branch_3_2 build.xml
Log:
Update the web integration tests to include the redeploy wars and ears
Revision Changes Path
No revision
No revision
1.165.2.7 +60 -6 jbosstest/build.xml
Index: build.xml
===================================================================
RCS file: /cvsroot/jboss/jbosstest/build.xml,v
retrieving revision 1.165.2.6
retrieving revision 1.165.2.7
diff -u -r1.165.2.6 -r1.165.2.7
--- build.xml 16 Sep 2002 14:42:02 -0000 1.165.2.6
+++ build.xml 24 Sep 2002 15:35:20 -0000 1.165.2.7
@@ -13,7 +13,7 @@
<!-- -->
<!-- ====================================================================== -->
-<!-- $Id: build.xml,v 1.165.2.6 2002/09/16 14:42:02 starksm Exp $ -->
+<!-- $Id: build.xml,v 1.165.2.7 2002/09/24 15:35:20 starksm Exp $ -->
<project default="main" name="JBoss/Testsuite">
@@ -2524,8 +2524,9 @@
</war>
<!-- build notjbosstest-web.war -->
- <war warfile="${build.lib}/notjbosstest-web.war"
- webxml="${build.resources}/web/WEB-INF/notjbosstest-web.xml">
+ <mkdir dir="${build.lib}/wars" />
+ <war warfile="${build.lib}/wars/notjbosstest-web.war"
+ webxml="${build.resources}/web/WEB-INF/notjbosstest-web.xml">
<webinf dir="${build.resources}/web/html/other/WEB-INF">
<include name="*"/>
</webinf>
@@ -2542,7 +2543,7 @@
<!-- build jbosstest-web.war -->
<war warfile="${build.lib}/jbosstest-web.war"
- webxml="${build.resources}/web/WEB-INF/jbosstest-web.xml">
+ webxml="${build.resources}/web/WEB-INF/jbosstest-web.xml">
<webinf dir="${build.resources}/web/html/jbosstest/WEB-INF">
<include name="*"/>
</webinf>
@@ -2562,15 +2563,68 @@
</fileset>
</war>
+ <!-- Create a war with a bad web.xml descriptor to test redeployment
+ of a failed war. The good-web.war is the same war with the web.xml
+ descriptor fixed. Both use a context-root of /redeploy
+ -->
+ <war warfile="${build.lib}/bad-web.war"
+ webxml="${build.resources}/web/WEB-INF/bad-web.xml">
+ <webinf dir="${build.resources}/web/html/bad/WEB-INF">
+ <include name="*"/>
+ </webinf>
+ <fileset dir="${build.resources}/web/html/bad">
+ <include name="**/*.html"/>
+ </fileset>
+ </war>
+ <war warfile="${build.lib}/good-web.war"
+ webxml="${build.resources}/web/WEB-INF/good-web.xml">
+ <webinf dir="${build.resources}/web/html/bad/WEB-INF">
+ <include name="*"/>
+ </webinf>
+ <fileset dir="${build.resources}/web/html/bad">
+ <include name="**/*.html"/>
+ </fileset>
+ </war>
+
+
<!-- build jbosstest-web.ear -->
<ear earfile="${build.lib}/jbosstest-web.ear"
- appxml="${build.resources}/web/META-INF/application.xml">
+ appxml="${build.resources}/web/META-INF/application.xml">
+ <metainf dir="${build.resources}/web/META-INF">
+ <include name="jboss-app.xml" />
+ </metainf>
<fileset dir="${build.lib}">
<include name="jbosstest-web-ejbs.jar"/>
<include name="root-web.war"/>
<include name="jbosstest-web.war"/>
- <include name="notjbosstest-web.war"/>
+ <include name="wars/notjbosstest-web.war"/>
<include name="cts.jar"/>
+ </fileset>
+ </ear>
+
+ <!-- Create an ear with the same war as the jbosstest-web.ear to test
+ conflicts with unpackaging ear content
+ -->
+ <ear earfile="${build.lib}/jbosstest-web2.ear"
+ appxml="${build.resources}/web/META-INF/application2.xml">
+ <metainf dir="${build.resources}/web/META-INF">
+ <include name="jboss-app.xml" />
+ </metainf>
+ <fileset dir="${build.lib}">
+ <include name="wars/notjbosstest-web.war"/>
+ </fileset>
+ </ear>
+
+ <ear earfile="${build.lib}/jbosstest-bad.ear"
+ appxml="${build.resources}/web/META-INF/application-bad.xml">
+ <fileset dir="${build.lib}">
+ <include name="bad-web.war"/>
+ </fileset>
+ </ear>
+ <ear earfile="${build.lib}/jbosstest-good.ear"
+ appxml="${build.resources}/web/META-INF/application-good.xml">
+ <fileset dir="${build.lib}">
+ <include name="good-web.war"/>
</fileset>
</ear>
</target>
|
|
From: David J. <d_j...@us...> - 2002-09-29 19:45:56
|
User: d_jencks
Date: 02/09/29 12:45:55
Modified: . build.xml
Log:
fixed mbean tests and some broken functionality
Revision Changes Path
1.178 +21 -4 jbosstest/build.xml
Index: build.xml
===================================================================
RCS file: /cvsroot/jboss/jbosstest/build.xml,v
retrieving revision 1.177
retrieving revision 1.178
diff -u -r1.177 -r1.178
--- build.xml 23 Sep 2002 20:25:16 -0000 1.177
+++ build.xml 29 Sep 2002 19:45:54 -0000 1.178
@@ -13,7 +13,7 @@
<!-- -->
<!-- ====================================================================== -->
-<!-- $Id: build.xml,v 1.177 2002/09/23 20:25:16 starksm Exp $ -->
+<!-- $Id: build.xml,v 1.178 2002/09/29 19:45:54 d_jencks Exp $ -->
<project default="main" name="JBoss/Testsuite">
@@ -840,8 +840,8 @@
<target name="compile-xmbean-dds" depends="init">
<taskdef name="jmxdoclet" classname="xdoclet.modules.jmx.JMXDocletTask" classpathref="xdoclet.task.classpath"/>
<echo message="xdoclet.mergedir: ${xdoclet.mergedir}"/>
- <mkdir dir="${build.resources}/jmx/xmbean/META-INF"/>
- <jmxdoclet destdir="${build.resources}/jmx/xmbean/META-INF"
+ <mkdir dir="${build.resources}/jmx/xmbean/org/jboss/test/jmx/xmbean"/>
+ <jmxdoclet destdir="${build.resources}/jmx/xmbean"
force="true"
excludedtags="@version,@author">
<fileset dir="${source.java}">
@@ -2046,18 +2046,35 @@
</jar>
<!--xmbean test deployment-->
+ <jar jarfile="${build.lib}/user-xmbean.jar">
+ <fileset dir="${build.classes}">
+ <include name="org/jboss/test/jmx/xmbean/*.class"/>
+ </fileset>
+ <fileset dir="${build.resources}/jmx/xmbean">
+ <include name="org/jboss/test/jmx/xmbean/User.xml"/>
+ </fileset>
+ </jar>
+
<jar jarfile="${build.lib}/user-xmbean.sar">
<fileset dir="${build.classes}">
<include name="org/jboss/test/jmx/xmbean/*.class"/>
</fileset>
<fileset dir="${build.resources}/jmx/xmbean">
- <include name="META-INF/**/*.xml"/>
+ <include name="META-INF/jboss-service.xml"/>
+ </fileset>
+ <fileset dir="${build.resources}/jmx/xmbean">
+ <include name="org/jboss/test/jmx/xmbean/User.xml"/>
</fileset>
</jar>
<copy todir="${build.lib}" filtering="no">
<fileset dir="${build.resources}/jmx/xmbean">
<include name="inline-xmbean-service.xml"/>
+ </fileset>
+ </copy>
+ <copy tofile="${build.lib}/user-xmbean-service.xml" filtering="no">
+ <fileset dir="${build.resources}/jmx/xmbean/META-INF">
+ <include name="jboss-service.xml"/>
</fileset>
</copy>
|
|
From: Scott M S. <st...@us...> - 2002-09-29 20:55:56
|
User: starksm
Date: 02/09/29 13:55:54
Modified: . Tag: Branch_3_0 build.xml
Log:
Include the SRPUnitTestCase in the basic security tests and include the
security-srp.sar in the security-srp.jar
Revision Changes Path
No revision
No revision
1.106.2.47 +13 -19 jbosstest/build.xml
Index: build.xml
===================================================================
RCS file: /cvsroot/jboss/jbosstest/build.xml,v
retrieving revision 1.106.2.46
retrieving revision 1.106.2.47
diff -u -r1.106.2.46 -r1.106.2.47
--- build.xml 23 Sep 2002 21:24:33 -0000 1.106.2.46
+++ build.xml 29 Sep 2002 20:55:54 -0000 1.106.2.47
@@ -13,7 +13,7 @@
<!-- -->
<!-- ====================================================================== -->
-<!-- $Id: build.xml,v 1.106.2.46 2002/09/23 21:24:33 starksm Exp $ -->
+<!-- $Id: build.xml,v 1.106.2.47 2002/09/29 20:55:54 starksm Exp $ -->
<project default="main" name="JBoss/Testsuite">
@@ -2431,18 +2431,6 @@
</jar>
<!-- build security-srp.jar and security-srp.sar -->
- <jar jarfile="${build.lib}/security-srp.jar">
- <metainf dir="${build.resources}/security-srp/ejb-inf" />
- <fileset dir="${build.classes}">
- <include name="org/jboss/test/security/interfaces/StatelessSession*"/>
- <include name="org/jboss/test/security/ejb/StatelessSessionBean.class"/>
- </fileset>
- <fileset dir="${build.resources}/security-srp">
- <include name="users.properties"/>
- <include name="roles.properties"/>
- </fileset>
- </jar>
-
<jar jarfile="${build.lib}/security-srp.sar">
<metainf dir="${build.resources}/security-srp/service-inf" />
<fileset dir="${build.classes}">
@@ -2455,14 +2443,21 @@
</fileset>
</jar>
-<!--
- <ear earfile="${build.lib}/security-srp.ear">
+ <jar jarfile="${build.lib}/security-srp.jar">
+ <metainf dir="${build.resources}/security-srp/ejb-inf" />
+ <fileset dir="${build.classes}">
+ <include name="org/jboss/test/security/interfaces/StatelessSession*"/>
+ <include name="org/jboss/test/security/ejb/StatelessSessionBean.class"/>
+ </fileset>
+ <fileset dir="${build.resources}/security-srp">
+ <include name="users.properties"/>
+ <include name="roles.properties"/>
+ </fileset>
<fileset dir="${build.lib}">
<include name="security-srp.sar"/>
- <include name="security-srp.jar"/>
</fileset>
- </ear>
--->
+ </jar>
+
<!-- build https-service.sar -->
<jar jarfile="${build.lib}/https-service.sar">
@@ -3176,7 +3171,6 @@
fork="${junit.batchtest.fork}">
<fileset dir="${build.classes}">
- <exclude name="**/test/security/test/SRPUnitTestCase.class"/>
<include name="**/test/naming/test/Security*"/>
<include name="**/test/security/test/**UnitTestCase.class"/>
</fileset>
|
|
From: Scott M S. <st...@us...> - 2002-10-02 20:59:01
|
User: starksm
Date: 02/10/02 13:58:59
Modified: . Tag: Branch_3_2 build.xml
Log:
Add a concurrentloader.ear to test multi-threaded class loading through
a HeirarchicalLoaderRepository2
Revision Changes Path
No revision
No revision
1.165.2.8 +13 -1 jbosstest/build.xml
Index: build.xml
===================================================================
RCS file: /cvsroot/jboss/jbosstest/build.xml,v
retrieving revision 1.165.2.7
retrieving revision 1.165.2.8
diff -u -r1.165.2.7 -r1.165.2.8
--- build.xml 24 Sep 2002 15:35:20 -0000 1.165.2.7
+++ build.xml 2 Oct 2002 20:58:58 -0000 1.165.2.8
@@ -13,7 +13,7 @@
<!-- -->
<!-- ====================================================================== -->
-<!-- $Id: build.xml,v 1.165.2.7 2002/09/24 15:35:20 starksm Exp $ -->
+<!-- $Id: build.xml,v 1.165.2.8 2002/10/02 20:58:58 starksm Exp $ -->
<project default="main" name="JBoss/Testsuite">
@@ -3052,6 +3052,18 @@
<include name="org/jboss/test/classloader/concurrentload/**"/>
</fileset>
</jar>
+ <!-- build concurrentloader.ear which deploys the concurrentloader.sar
+ with a HeirarchicalLoaderRepository
+ -->
+ <ear earfile="${build.lib}/concurrentloader.ear"
+ appxml="${build.resources}/classloader/concurrentloader/application.xml">
+ <metainf dir="${build.resources}/classloader/concurrentloader">
+ <include name="jboss-app.xml" />
+ </metainf>
+ <fileset dir="${build.lib}">
+ <include name="concurrentloader.sar" />
+ </fileset>
+ </ear>
<!-- build circularity.sar -->
<jar jarfile="${build.lib}/circularity.sar">
|
|
From: Jason D. <us...@us...> - 2002-10-04 09:52:06
|
User: user57
Date: 02/10/04 02:52:04
Modified: . build.xml
Log:
o speed up the build using <parallel> task (builds for me in ~2 minutes)
Revision Changes Path
1.180 +66 -79 jbosstest/build.xml
Index: build.xml
===================================================================
RCS file: /cvsroot/jboss/jbosstest/build.xml,v
retrieving revision 1.179
retrieving revision 1.180
diff -u -r1.179 -r1.180
--- build.xml 3 Oct 2002 11:34:53 -0000 1.179
+++ build.xml 4 Oct 2002 09:52:04 -0000 1.180
@@ -10,7 +10,7 @@
<!ENTITY mqstress SYSTEM "./mqstress.xml">
]>
-<!-- $Id: build.xml,v 1.179 2002/10/03 11:34:53 user57 Exp $ -->
+<!-- $Id: build.xml,v 1.180 2002/10/04 09:52:04 user57 Exp $ -->
<!--+======================================================================+-->
<!--| JBoss (The OpenSource J2EE WebOS) Build File |-->
@@ -177,17 +177,23 @@
<!--| documentation compiles. |-->
<!--+====================================================================+-->
- <target name="compile"
- description="Compile all source files."
- depends="compile-bean-sources,
- compile-mbean-sources,
- compile-proxycompiler-bean-sources,
- compile-classes,
- compile-xmbean-dds,
- _default:compile-stylesheets,
- _default:compile-resources,
- _default:compile-etc">
- <!-- Add module specific elements here. -->
+ <target name="compile" depends="init"
+ description="Compile all source files.">
+
+ <parallel>
+ <call target="_default:compile-stylesheets"/>
+ <call target="_default:compile-resources"/>
+ <call target="_default:compile-etc"/>
+ <sequential>
+ <call target="compile-xmbean-dds"/>
+ <call target="compile-bean-sources"/>
+ <call target="compile-mbean-sources"/>
+ <call target="compile-proxycompiler-bean-sources"/>
+ </sequential>
+ </parallel>
+
+ <call target="_default:compile-classes"/>
+
</target>
<!-- Compile EJB beans with XDoclet -->
@@ -606,26 +612,6 @@
</target>
- <target name="compile-classes" depends="init">
- <mkdir dir="${build.classes}"/>
- <javac destdir="${build.classes}"
- optimize="${javac.optimize}"
- target="${javac.target}"
- debug="${javac.debug}"
- depend="${javac.depend}"
- verbose="${javac.verbose}"
- deprecation="${javac.deprecation}"
- includeAntRuntime="${javac.include.ant.runtime}"
- includeJavaRuntime="${javac.include.java.runtime}"
- failonerror="${javac.fail.onerror}">
- <src path="${source.java}"/>
- <src path="${build.gen-src}"/>
- <classpath refid="tests.classpath"/>
- <include name="${javac.includes}"/>
- <exclude name="${javac.excludes}"/>
- </javac>
- </target>
-
<!--+====================================================================+-->
<!--| Generate Output |-->
@@ -637,48 +623,50 @@
<target name="output"
description="Generate all target output."
- depends="compile,
- _output:bank,
- _output:bank-new,
- _output:bmp,
- _output:cts,
- _output:entityexc,
- _output:hello,
- _output:idgen,
- _output:dbtest,
- _output:jmsra,
- _output:mdb,
- _output:lock,
- _output:readahead,
- _output:xa,
- _output:jca,
- _output:jmx,
- _output:naming,
- _output:jbossmq,
- _output:load,
- _output:jrmp,
- _output:invokers,
- _output:threading,
- _output:deadlock,
- _output:testbean,
- _output:testbeancluster,
- _output:perf,
- _output:web,
- _output:bench,
- _output:security,
- _output:exception,
- _output:cmp2,
- _output:jsr77,
- _output:scheduler,
- _output:foedeployer,
- _output:jbossmx,
- _output:ejbconf,
- _output:proxycompiler,
- _output:helloiiop,
- _output:bankiiop,
- _output:hellojrmpiiop,
- _output:marathon,
- _output:classloader">
+ depends="compile">
+ <parallel>
+ <call target="_output:bank"/>
+ <call target="_output:bank-new"/>
+ <call target="_output:bmp"/>
+ <call target="_output:cts"/>
+ <call target="_output:entityexc"/>
+ <call target="_output:hello"/>
+ <call target="_output:idgen"/>
+ <call target="_output:dbtest"/>
+ <call target="_output:jmsra"/>
+ <call target="_output:mdb"/>
+ <call target="_output:lock"/>
+ <call target="_output:readahead"/>
+ <call target="_output:xa"/>
+ <call target="_output:jca"/>
+ <call target="_output:jmx"/>
+ <call target="_output:naming"/>
+ <call target="_output:jbossmq"/>
+ <call target="_output:load"/>
+ <call target="_output:jrmp"/>
+ <call target="_output:invokers"/>
+ <call target="_output:threading"/>
+ <call target="_output:deadlock"/>
+ <call target="_output:testbean"/>
+ <call target="_output:testbeancluster"/>
+ <call target="_output:perf"/>
+ <call target="_output:web"/>
+ <call target="_output:bench"/>
+ <call target="_output:security"/>
+ <call target="_output:exception"/>
+ <call target="_output:cmp2"/>
+ <call target="_output:jsr77"/>
+ <call target="_output:scheduler"/>
+ <call target="_output:foedeployer"/>
+ <call target="_output:jbossmx"/>
+ <call target="_output:ejbconf"/>
+ <call target="_output:proxycompiler"/>
+ <call target="_output:helloiiop"/>
+ <call target="_output:bankiiop"/>
+ <call target="_output:hellojrmpiiop"/>
+ <call target="_output:marathon"/>
+ <call target="_output:classloader"/>
+ </parallel>
</target>
<!--
@@ -1292,8 +1280,7 @@
</target>
<!-- jca test -->
- <target name="_output:jca"
- depends="compile">
+ <target name="_output:jca">
<mkdir dir="${build.lib}"/>
<!-- build test adapter -->
@@ -2096,7 +2083,7 @@
</target>
<!-- testbeancluster test -->
- <target name="_output:testbeancluster" depends="_output:testbean">
+ <target name="_output:testbeancluster">
<mkdir dir="${build.lib}"/>
<!-- build testbeancluster.jar -->
@@ -2199,7 +2186,7 @@
</target>
<!-- web test -->
- <target name="_output:web" depends="_output:cts">
+ <target name="_output:web">
<mkdir dir="${build.lib}"/>
<!-- build jbosstest-web-ejbs.jar -->
@@ -2719,7 +2706,7 @@
</target>
<!-- classloader test -->
- <target name="_output:classloader" depends="compile-classes">
+ <target name="_output:classloader">
<mkdir dir="${build.lib}"/>
<!-- build concurrentloader.sar -->
|
|
From: Scott M S. <st...@us...> - 2002-10-05 02:05:24
|
User: starksm
Date: 02/10/04 19:05:23
Modified: . Tag: Branch_3_2 build.xml
Log:
Add the https-service.sar target
Revision Changes Path
No revision
No revision
1.165.2.9 +12 -1 jbosstest/build.xml
Index: build.xml
===================================================================
RCS file: /cvsroot/jboss/jbosstest/build.xml,v
retrieving revision 1.165.2.8
retrieving revision 1.165.2.9
diff -u -r1.165.2.8 -r1.165.2.9
--- build.xml 2 Oct 2002 20:58:58 -0000 1.165.2.8
+++ build.xml 5 Oct 2002 02:05:23 -0000 1.165.2.9
@@ -13,7 +13,7 @@
<!-- -->
<!-- ====================================================================== -->
-<!-- $Id: build.xml,v 1.165.2.8 2002/10/02 20:58:58 starksm Exp $ -->
+<!-- $Id: build.xml,v 1.165.2.9 2002/10/05 02:05:23 starksm Exp $ -->
<project default="main" name="JBoss/Testsuite">
@@ -2750,6 +2750,17 @@
</fileset>
<fileset dir="${build.lib}">
<include name="security-srp.jar"/>
+ </fileset>
+ </jar>
+
+ <!-- build https-service.sar -->
+ <jar jarfile="${build.lib}/https-service.sar">
+ <metainf dir="${build.resources}/security/META-INF"/>
+ <metainf dir="${build.resources}/security">
+ <include name="tst.keystore"/>
+ </metainf>
+ <fileset dir="${build.classes}">
+ <include name="org/jboss/test/security/service/Https*.class"/>
</fileset>
</jar>
|
|
From: Sacha L. <sla...@us...> - 2002-10-05 19:35:15
|
User: slaboure
Date: 02/10/05 12:35:13
Modified: . Tag: Branch_3_2 build.xml
Log:
Allows execution of the only testcases that require a cluster setup
Revision Changes Path
No revision
No revision
1.165.2.10 +52 -1 jbosstest/build.xml
Index: build.xml
===================================================================
RCS file: /cvsroot/jboss/jbosstest/build.xml,v
retrieving revision 1.165.2.9
retrieving revision 1.165.2.10
diff -u -r1.165.2.9 -r1.165.2.10
--- build.xml 5 Oct 2002 02:05:23 -0000 1.165.2.9
+++ build.xml 5 Oct 2002 19:35:13 -0000 1.165.2.10
@@ -13,7 +13,7 @@
<!-- -->
<!-- ====================================================================== -->
-<!-- $Id: build.xml,v 1.165.2.9 2002/10/05 02:05:23 starksm Exp $ -->
+<!-- $Id: build.xml,v 1.165.2.10 2002/10/05 19:35:13 slaboure Exp $ -->
<project default="main" name="JBoss/Testsuite">
@@ -3277,6 +3277,12 @@
tests-report">
</target>
+ <target name="tests-clustering" description="Execute clustering tests requiring two nodes."
+ depends="init,
+ tests-clustering-unit,
+ tests-report">
+ </target>
+
<!--
| Helper for running all jbossmx tests
-->
@@ -3397,6 +3403,51 @@
<exclude name="**/test/security/test/*"/>
<exclude name="**/test/securitymgr/test/*"/>
<exclude name="**/test/*iiop/test/*"/>
+ </fileset>
+ </batchtest>
+ </junit>
+ </target>
+
+ <!--target name="tests-clustering-unit" depends="maybejars"-->
+ <target name="tests-clustering-unit" >
+ <mkdir dir="${build.reports}"/>
+ <mkdir dir="${build.testlog}"/>
+ <junit dir="${module.output}"
+ printsummary="${junit.printsummary}"
+ haltonerror="${junit.haltonerror}"
+ haltonfailure="${junit.haltonfailure}"
+ fork="${junit.fork}"
+ timeout="${junit.timeout}"
+ jvm="${junit.jvm}">
+
+ <sysproperty key="jbosstest.deploy.dir" file="${build.lib}"/>
+ <sysproperty key="build.testlog" value="${build.testlog}"/>
+ <sysproperty key="log4j.configuration" value="file:${build.resources}/log4j.xml"/>
+
+ <!--jvmarg value="${junit.jvm.options}"/>
+ <jvmarg value="-Xrunjdwp:transport=dt_socket,address=8789,server=y,suspend=y"/>
+ <jvmarg value="-Djava.compiler=NONE"/>
+ <jvmarg value="-Xdebug"/>
+ <jvmarg value="-Xnoagent"/-->
+
+ <classpath>
+ <pathelement location="${build.classes}"/>
+ <pathelement location="${build.resources}"/>
+ <path refid="tests.classpath"/>
+ </classpath>
+
+ <formatter classname="org.jboss.ant.taskdefs.XMLJUnitResultFormatter"
+ extension=".xml" usefile="${junit.formatter.usefile}"/>
+
+ <batchtest todir="${build.reports}"
+ haltonerror="${junit.batchtest.haltonerror}"
+ haltonfailure="${junit.batchtest.haltonfailure}"
+ fork="${junit.batchtest.fork}">
+
+ <fileset dir="${build.classes}">
+
+ <include name="org/jboss/test/testbeancluster/**/*UnitTestCase*.class"/>
+
</fileset>
</batchtest>
</junit>
|
|
From: Jason D. <us...@us...> - 2002-10-06 03:28:45
|
User: user57
Date: 02/10/05 20:28:44
Modified: . build.xml
Log:
Revision Changes Path
1.182 +6 -5 jbosstest/build.xml
Index: build.xml
===================================================================
RCS file: /cvsroot/jboss/jbosstest/build.xml,v
retrieving revision 1.181
retrieving revision 1.182
diff -u -r1.181 -r1.182
--- build.xml 6 Oct 2002 00:54:31 -0000 1.181
+++ build.xml 6 Oct 2002 03:28:44 -0000 1.182
@@ -10,7 +10,7 @@
<!ENTITY mqstress SYSTEM "./mqstress.xml">
]>
-<!-- $Id: build.xml,v 1.181 2002/10/06 00:54:31 user57 Exp $ -->
+<!-- $Id: build.xml,v 1.182 2002/10/06 03:28:44 user57 Exp $ -->
<!--+======================================================================+-->
<!--| JBoss (The OpenSource J2EE WebOS) Build File |-->
@@ -127,11 +127,7 @@
<!-- Override JUnit defaults -->
<property name="junit.timeout" value="1200000"/> <!-- 20 minutes -->
- <property name="jbosstest.iterationcount" value="10"/>
- <property name="jbosstest.threadcount" value="5"/>
- <property name="jbosstest.beancount" value="5"/>
<property name="junit.batchtest.todir" value="${build.reports}"/>
- <property name="junit.jvm.options" value="-Ddummy"/>
<!-- Configure defaults & build tools -->
<call target="configure-defaults"/>
@@ -141,6 +137,10 @@
<!--| Define module specific elements here. |-->
<!--+=======================================+-->
+ <property name="jbosstest.iterationcount" value="10"/>
+ <property name="jbosstest.threadcount" value="5"/>
+ <property name="jbosstest.beancount" value="5"/>
+
<!-- Classpath to build and run the tests -->
<path id="tests.classpath">
<pathelement path="${classpath}"/>
@@ -621,6 +621,7 @@
depends="compile">
<call target="_output:support"/>
+
<parallel>
<call target="_output:bank"/>
<call target="_output:bank-new"/>
|
|
From: Peter F. <pe...@us...> - 2002-10-07 10:28:10
|
User: peter_f
Date: 02/10/07 03:28:09
Modified: . build.xml
Log:
Fixing a buildbreaker
Revision Changes Path
1.183 +2 -2 jbosstest/build.xml
Index: build.xml
===================================================================
RCS file: /cvsroot/jboss/jbosstest/build.xml,v
retrieving revision 1.182
retrieving revision 1.183
diff -u -r1.182 -r1.183
--- build.xml 6 Oct 2002 03:28:44 -0000 1.182
+++ build.xml 7 Oct 2002 10:28:09 -0000 1.183
@@ -10,7 +10,7 @@
<!ENTITY mqstress SYSTEM "./mqstress.xml">
]>
-<!-- $Id: build.xml,v 1.182 2002/10/06 03:28:44 user57 Exp $ -->
+<!-- $Id: build.xml,v 1.183 2002/10/07 10:28:09 peter_f Exp $ -->
<!--+======================================================================+-->
<!--| JBoss (The OpenSource J2EE WebOS) Build File |-->
@@ -81,7 +81,7 @@
<path refid="dom4j.dom4j.classpath"/>
<path refid="gnu.regexp.classpath"/>
<path refid="apache.bcel.classpath"/>
- <path refid="hsqldb.classpath"/>
+ <path refid="hsqldb.hsqldb.classpath"/>
<path refid="apache.ant.classpath"/>
</path>
|
|
From: Sacha L. <sla...@us...> - 2002-10-07 13:27:41
|
User: slaboure
Date: 02/10/07 06:27:39
Modified: . Tag: Branch_3_2 build.xml
Log:
Add build dependency
Revision Changes Path
No revision
No revision
1.165.2.11 +2 -3 jbosstest/build.xml
Index: build.xml
===================================================================
RCS file: /cvsroot/jboss/jbosstest/build.xml,v
retrieving revision 1.165.2.10
retrieving revision 1.165.2.11
diff -u -r1.165.2.10 -r1.165.2.11
--- build.xml 5 Oct 2002 19:35:13 -0000 1.165.2.10
+++ build.xml 7 Oct 2002 13:27:38 -0000 1.165.2.11
@@ -13,7 +13,7 @@
<!-- -->
<!-- ====================================================================== -->
-<!-- $Id: build.xml,v 1.165.2.10 2002/10/05 19:35:13 slaboure Exp $ -->
+<!-- $Id: build.xml,v 1.165.2.11 2002/10/07 13:27:38 slaboure Exp $ -->
<project default="main" name="JBoss/Testsuite">
@@ -3408,8 +3408,7 @@
</junit>
</target>
- <!--target name="tests-clustering-unit" depends="maybejars"-->
- <target name="tests-clustering-unit" >
+ <target name="tests-clustering-unit" depends="maybejars">
<mkdir dir="${build.reports}"/>
<mkdir dir="${build.testlog}"/>
<junit dir="${module.output}"
|
|
From: Sacha L. <sla...@us...> - 2002-10-07 15:12:01
|
User: slaboure
Date: 02/10/07 08:12:00
Modified: . build.xml
Log:
Port from Branch_3_2
Revision Changes Path
1.184 +51 -1 jbosstest/build.xml
Index: build.xml
===================================================================
RCS file: /cvsroot/jboss/jbosstest/build.xml,v
retrieving revision 1.183
retrieving revision 1.184
diff -u -r1.183 -r1.184
--- build.xml 7 Oct 2002 10:28:09 -0000 1.183
+++ build.xml 7 Oct 2002 15:11:58 -0000 1.184
@@ -10,7 +10,7 @@
<!ENTITY mqstress SYSTEM "./mqstress.xml">
]>
-<!-- $Id: build.xml,v 1.183 2002/10/07 10:28:09 peter_f Exp $ -->
+<!-- $Id: build.xml,v 1.184 2002/10/07 15:11:58 slaboure Exp $ -->
<!--+======================================================================+-->
<!--| JBoss (The OpenSource J2EE WebOS) Build File |-->
@@ -2839,6 +2839,12 @@
tests-report">
</target>
+ <target name="tests-clustering" description="Execute clustering tests requiring two nodes."
+ depends="init,
+ tests-clustering-unit,
+ tests-report">
+ </target>
+
<!--
| Helper for running all jbossmx tests
-->
@@ -2959,6 +2965,50 @@
<exclude name="**/test/security/test/*"/>
<exclude name="**/test/securitymgr/test/*"/>
<exclude name="**/test/*iiop/test/*"/>
+ </fileset>
+ </batchtest>
+ </junit>
+ </target>
+
+ <target name="tests-clustering-unit" depends="maybejars">
+ <mkdir dir="${build.reports}"/>
+ <mkdir dir="${build.log}"/>
+ <junit dir="${module.output}"
+ printsummary="${junit.printsummary}"
+ haltonerror="${junit.haltonerror}"
+ haltonfailure="${junit.haltonfailure}"
+ fork="${junit.fork}"
+ timeout="${junit.timeout}"
+ jvm="${junit.jvm}">
+
+ <sysproperty key="jbosstest.deploy.dir" file="${build.lib}"/>
+ <sysproperty key="build.log" value="${build.log}"/>
+ <sysproperty key="log4j.configuration" value="file:${build.resources}/log4j.xml"/>
+
+ <!--jvmarg value="${junit.jvm.options}"/>
+ <jvmarg value="-Xrunjdwp:transport=dt_socket,address=8789,server=y,suspend=y"/>
+ <jvmarg value="-Djava.compiler=NONE"/>
+ <jvmarg value="-Xdebug"/>
+ <jvmarg value="-Xnoagent"/-->
+
+ <classpath>
+ <pathelement location="${build.classes}"/>
+ <pathelement location="${build.resources}"/>
+ <path refid="tests.classpath"/>
+ </classpath>
+
+ <formatter classname="org.jboss.ant.taskdefs.XMLJUnitResultFormatter"
+ extension=".xml" usefile="${junit.formatter.usefile}"/>
+
+ <batchtest todir="${build.reports}"
+ haltonerror="${junit.batchtest.haltonerror}"
+ haltonfailure="${junit.batchtest.haltonfailure}"
+ fork="${junit.batchtest.fork}">
+
+ <fileset dir="${build.classes}">
+
+ <include name="org/jboss/test/testbeancluster/**/*UnitTestCase*.class"/>
+
</fileset>
</batchtest>
</junit>
|
|
From: Sacha L. <sla...@us...> - 2002-10-07 17:14:54
|
User: slaboure
Date: 02/10/07 10:14:53
Modified: . Tag: Branch_3_0 build.xml
Log:
Jason, thirdparty structure has been flattened, right? Then we need to flatten definitions in build.xml files aswell
Revision Changes Path
No revision
No revision
1.106.2.48 +15 -15 jbosstest/build.xml
Index: build.xml
===================================================================
RCS file: /cvsroot/jboss/jbosstest/build.xml,v
retrieving revision 1.106.2.47
retrieving revision 1.106.2.48
diff -u -r1.106.2.47 -r1.106.2.48
--- build.xml 29 Sep 2002 20:55:54 -0000 1.106.2.47
+++ build.xml 7 Oct 2002 17:14:52 -0000 1.106.2.48
@@ -13,7 +13,7 @@
<!-- -->
<!-- ====================================================================== -->
-<!-- $Id: build.xml,v 1.106.2.47 2002/09/29 20:55:54 starksm Exp $ -->
+<!-- $Id: build.xml,v 1.106.2.48 2002/10/07 17:14:52 slaboure Exp $ -->
<project default="main" name="JBoss/Testsuite">
@@ -71,7 +71,7 @@
<!-- ========= -->
<!-- Java API for XML Processing (JAXP) -->
- <property name="sun.jaxp.root" value="${project.thirdparty}/sun/jaxp"/>
+ <property name="sun.jaxp.root" value="${project.thirdparty}/sun-jaxp"/>
<property name="sun.jaxp.lib" value="${sun.jaxp.root}/lib"/>
<path id="sun.jaxp.classpath">
<fileset dir="${sun.jaxp.lib}">
@@ -80,21 +80,21 @@
</path>
<!-- Java Authentication and Authorization Service (JAAS) -->
- <property name="sun.jaas.root" value="${project.thirdparty}/sun/jaas"/>
+ <property name="sun.jaas.root" value="${project.thirdparty}/sun-jaas"/>
<property name="sun.jaas.lib" value="${sun.jaas.root}/lib"/>
<path id="sun.jaas.classpath">
<pathelement path="${sun.jaas.lib}/jaas.jar"/>
</path>
<!-- Java Cryptography Extension (JCE) -->
- <property name="sun.jce.root" value="${project.thirdparty}/sun/jce"/>
+ <property name="sun.jce.root" value="${project.thirdparty}/sun-jce"/>
<property name="sun.jce.lib" value="${sun.jce.root}/lib"/>
<path id="sun.jce.classpath">
<pathelement path="${sun.jce.lib}/jce1_2_1.jar"/>
</path>
<!-- Java Secure Sockets Extension (JSSE) -->
- <property name="sun.jsse.root" value="${project.thirdparty}/sun/jsse"/>
+ <property name="sun.jsse.root" value="${project.thirdparty}/sun-jsse"/>
<property name="sun.jsse.lib" value="${sun.jsse.root}/lib"/>
<path id="sun.jsse.classpath">
<pathelement path="${sun.jsse.lib}/jcert.jar"/>
@@ -103,49 +103,49 @@
</path>
<!-- JavaMail -->
- <property name="sun.javamail.root" value="${project.thirdparty}/sun/javamail"/>
+ <property name="sun.javamail.root" value="${project.thirdparty}/sun-javamail"/>
<property name="sun.javamail.lib" value="${sun.javamail.root}/lib"/>
<path id="sun.javamail.classpath">
<pathelement path="${sun.javamail.lib}/mail.jar"/>
</path>
<!-- Java Servlets -->
- <property name="sun.servlet.root" value="${project.thirdparty}/sun/servlet"/>
+ <property name="sun.servlet.root" value="${project.thirdparty}/sun-servlet"/>
<property name="sun.servlet.lib" value="${sun.servlet.root}/lib"/>
<path id="sun.servlet.classpath">
<pathelement path="${sun.servlet.lib}/servlet.jar"/>
</path>
<!-- Log4j -->
- <property name="apache.log4j.root" value="${project.thirdparty}/apache/log4j"/>
+ <property name="apache.log4j.root" value="${project.thirdparty}/apache-log4j"/>
<property name="apache.log4j.lib" value="${apache.log4j.root}/lib"/>
<path id="apache.log4j.classpath">
<pathelement path="${apache.log4j.lib}/log4j.jar"/>
</path>
<!-- EDU.oswego.cs.dl.util.concurrent -->
- <property name="oswego.concurrent.root" value="${project.thirdparty}/oswego/concurrent"/>
+ <property name="oswego.concurrent.root" value="${project.thirdparty}/oswego-concurrent"/>
<property name="oswego.concurrent.lib" value="${oswego.concurrent.root}/lib"/>
<path id="oswego.concurrent.classpath">
<pathelement path="${oswego.concurrent.lib}/concurrent.jar"/>
</path>
<!-- JacORB -->
- <property name="jacorb.jacorb.root" value="${project.thirdparty}/jacorb/jacorb"/>
+ <property name="jacorb.jacorb.root" value="${project.thirdparty}/jacorb-jacorb"/>
<property name="jacorb.jacorb.lib" value="${jacorb.jacorb.root}/lib"/>
<path id="jacorb.jacorb.classpath">
<pathelement path="${jacorb.jacorb.lib}/jacorb.jar"/>
</path>
<!-- JUnit -->
- <property name="junit.junit.root" value="${project.thirdparty}/junit/junit"/>
+ <property name="junit.junit.root" value="${project.thirdparty}/junit-junit"/>
<property name="junit.junit.lib" value="${junit.junit.root}/lib"/>
<path id="junit.junit.classpath">
<pathelement path="${junit.junit.lib}/junit.jar"/>
</path>
<!-- GNU Regexp -->
- <property name="gnu.regexp.root" value="${project.thirdparty}/gnu/regexp"/>
+ <property name="gnu.regexp.root" value="${project.thirdparty}/gnu-regexp"/>
<property name="gnu.regexp.lib" value="${gnu.regexp.root}/lib"/>
<path id="gnu.regexp.classpath">
<pathelement path="${gnu.regexp.lib}/gnu-regexp.jar"/>
@@ -153,7 +153,7 @@
<!-- JUnitEJB -->
<property name="junitejb.junitejb.root"
- value="${project.thirdparty}/junitejb/junitejb"/>
+ value="${project.thirdparty}/junitejb-junitejb"/>
<property name="junitejb.junitejb.lib"
value="${junitejb.junitejb.root}/lib"/>
<path id="junitejb.junitejb.classpath">
@@ -161,14 +161,14 @@
</path>
<!-- BCEL -->
- <property name="apache.bcel.root" value="${project.thirdparty}/apache/bcel"/>
+ <property name="apache.bcel.root" value="${project.thirdparty}/apache-bcel"/>
<property name="apache.bcel.lib" value="${apache.bcel.root}/lib"/>
<path id="apache.bcel.classpath">
<pathelement path="${apache.bcel.lib}/bcel.jar"/>
</path>
<!-- Hypersonic -->
- <property name="hsqldb.root" value="${project.thirdparty}/hsqldb/hsqldb"/>
+ <property name="hsqldb.root" value="${project.thirdparty}/hsqldb-hsqldb"/>
<property name="hsqldb.lib" value="${hsqldb.root}/lib"/>
<path id="hsqldb.classpath">
<pathelement path="${hsqldb.lib}/hsqldb.jar"/>
|