Menu
▾
▴
[jboss-cvs] jbosstest build.xml
|
From: Scott M S. <st...@us...> - 2003-07-26 02:47:55
|
User: starksm
Date: 03/07/25 12:14:26
Modified: . Tag: Branch_3_2 build.xml
Log:
Use the libraries.ent and modules.ent definitions for the classpath
definitions
Revision Changes Path
No revision
No revision
1.165.2.87 +8 -220 jbosstest/build.xml
Index: build.xml
===================================================================
RCS file: /cvsroot/jboss/jbosstest/build.xml,v
retrieving revision 1.165.2.86
retrieving revision 1.165.2.87
diff -u -r1.165.2.86 -r1.165.2.87
--- build.xml 25 Jul 2003 13:51:31 -0000 1.165.2.86
+++ build.xml 25 Jul 2003 19:14:26 -0000 1.165.2.87
@@ -1,6 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE project [
<!ENTITY buildmagic SYSTEM "../tools/etc/buildmagic/buildmagic.ent">
+ <!ENTITY libraries SYSTEM "../tools/etc/buildmagic/libraries.ent">
+ <!ENTITY modules SYSTEM "../tools/etc/buildmagic/modules.ent">
<!ENTITY mqstress SYSTEM "mqstress.xml">
]>
@@ -13,7 +15,7 @@
<!-- -->
<!-- ====================================================================== -->
-<!-- $Id: build.xml,v 1.165.2.86 2003/07/25 13:51:31 pilhuhn Exp $ -->
+<!-- $Id: build.xml,v 1.165.2.87 2003/07/25 19:14:26 starksm Exp $ -->
<project default="main" name="JBoss/Testsuite">
@@ -80,109 +82,7 @@
<!-- Libraries -->
<!-- ========= -->
- <!-- Java Cryptography Extension (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.lib" value="${sun.jsse.root}/lib"/>
- <path id="sun.jsse.classpath">
- <pathelement path="${sun.jsse.lib}/jcert.jar"/>
- <pathelement path="${sun.jsse.lib}/jnet.jar"/>
- <pathelement path="${sun.jsse.lib}/jsse.jar"/>
- </path>
-
- <!-- 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.lib" value="${sun.servlet.root}/lib"/>
- <path id="sun.servlet.classpath">
- <pathelement path="${sun.servlet.lib}/servlet.jar"/>
- </path>
-
- <!-- Apache Crimson (XML/DOM) -->
- <property name="apache.crimson.root" value="${project.thirdparty}/apache/crimson"/>
- <property name="apache.crimson.lib" value="${apache.crimson.root}/lib"/>
- <path id="apache.crimson.classpath">
- <pathelement path="${apache.crimson.lib}/crimson.jar"/>
- </path>
-
- <!-- Apache Commons -->
- <property name="apache.commons.root" value="${project.thirdparty}/apache/commons"/>
- <property name="apache.commons.lib" value="${apache.commons.root}/lib"/>
- <path id="apache.commons.classpath">
- <pathelement path="${apache.commons.lib}/commons-collections.jar"/>
- <pathelement path="${apache.commons.lib}/commons-logging.jar"/>
- </path>
-
- <!-- 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.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.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.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.lib" value="${gnu.regexp.root}/lib"/>
- <path id="gnu.regexp.classpath">
- <pathelement path="${gnu.regexp.lib}/gnu-regexp.jar"/>
- </path>
-
- <!-- JUnitEJB -->
- <property name="junitejb.junitejb.root"
- value="${project.thirdparty}/junitejb/junitejb"/>
- <property name="junitejb.junitejb.lib"
- value="${junitejb.junitejb.root}/lib"/>
- <path id="junitejb.junitejb.classpath">
- <pathelement path="${junitejb.junitejb.lib}/junitejb.jar"/>
- </path>
-
- <!-- 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.lib" value="${hsqldb.root}/lib"/>
- <path id="hsqldb.classpath">
- <pathelement path="${hsqldb.lib}/hsqldb.jar"/>
- </path>
-
+ &libraries;
<!-- The combined library classpath -->
<path id="library.classpath">
<path refid="sun.jce.classpath"/>
@@ -196,6 +96,7 @@
<path refid="jacorb.jacorb.classpath"/>
<path refid="junit.junit.classpath"/>
<path refid="junitejb.junitejb.classpath"/>
+ <path refid="junitejb.junitejb.classpath"/>
<!-- needed for JBossMQ selector tests -->
<path refid="gnu.regexp.classpath"/>
@@ -203,52 +104,13 @@
<!-- needed for proxy tests -->
<path refid="apache.bcel.classpath"/>
<!-- needed for security login module tests -->
- <path refid="hsqldb.classpath"/>
+ <path refid="hsqldb.hsqldb.classpath"/>
</path>
<!-- ======= -->
<!-- Modules -->
<!-- ======= -->
-
- <!-- J2EE -->
- <property name="jboss.j2ee.root" value="${project.root}/j2ee/output"/>
- <property name="jboss.j2ee.lib" value="${jboss.j2ee.root}/lib"/>
- <path id="jboss.j2ee.classpath">
- <pathelement path="${jboss.j2ee.lib}/jboss-j2ee.jar"/>
- </path>
-
- <!-- Common -->
- <property name="jboss.common.root" value="${project.root}/common/output"/>
- <property name="jboss.common.lib" value="${jboss.common.root}/lib"/>
- <path id="jboss.common.classpath">
- <pathelement path="${jboss.common.lib}/jboss-common.jar"/>
- <pathelement path="${jboss.common.lib}/testsuite-support.jar"/>
- </path>
-
- <!-- System -->
- <property name="jboss.system.root" value="${project.root}/system/output"/>
- <property name="jboss.system.lib" value="${jboss.system.root}/lib"/>
- <path id="jboss.system.classpath">
- <pathelement path="${jboss.system.lib}/testsuite-support.jar"/>
- </path>
-
- <!-- Naming -->
- <property name="jboss.naming.root" value="${project.root}/naming/output"/>
- <property name="jboss.naming.lib" value="${jboss.naming.root}/lib"/>
- <path id="jboss.naming.classpath">
- <pathelement path="${jboss.naming.lib}/jnpserver.jar"/>
- </path>
-
- <!-- Server -->
- <property name="jboss.server.root" value="${project.root}/server/output"/>
- <property name="jboss.server.lib" value="${jboss.server.root}/lib"/>
- <path id="jboss.server.classpath">
- <pathelement path="${jboss.server.lib}/jboss-client.jar"/>
- <pathelement path="${jboss.server.lib}/jmx-invoker-adaptor-client.jar"/>
- <pathelement path="${jboss.server.lib}/jmx-rmi-connector-client.jar"/>
- <pathelement path="${jboss.server.lib}/testsuite-support.jar"/>
- </path>
-
+ &modules;
<!-- InternalServer -->
<!-- This could be a mistake. Perhaps, though, it would be a good idea to separate
tests that need internal jboss classes from those that don't. When I put it in, only
@@ -260,79 +122,6 @@
<pathelement path="${jboss.server.lib}/jboss-system.jar"/>
</path>
- <!-- Messaging -->
- <property name="jboss.messaging.root" value="${project.root}/messaging/output"/>
- <property name="jboss.messaging.lib" value="${jboss.messaging.root}/lib"/>
- <path id="jboss.messaging.classpath">
- <pathelement path="${jboss.messaging.lib}/jbossmq-client.jar"/>
- </path>
-
- <!-- Security -->
- <property name="jboss.security.root" value="${project.root}/security/output"/>
- <property name="jboss.security.lib" value="${jboss.security.root}/lib"/>
- <path id="jboss.security.classpath">
- <pathelement path="${jboss.security.lib}/jbosssx-client.jar"/>
- <pathelement path="${jboss.security.lib}/jbosssx.jar"/>
- <pathelement path="${jboss.security.lib}/jboss-jaas.jar"/>
- </path>
-
- <!-- Connector -->
- <property name="jboss.connector.root" value="${project.root}/connector/output"/>
- <property name="jboss.connector.lib" value="${jboss.connector.root}/lib"/>
- <path id="jboss.connector.classpath">
- <pathelement path="${jboss.connector.lib}/jboss-jca.sar"/>
- <pathelement path="${jboss.connector.lib}/jboss-local-jdbc.jar"/>
- <pathelement path="${jboss.connector.lib}/jboss-common-jdbc-wrapper.jar"/>
- </path>
-
- <!-- Cluster -->
- <property name="jboss.cluster.root" value="${project.root}/cluster/output"/>
- <property name="jboss.cluster.lib" value="${jboss.cluster.root}/lib"/>
- <path id="jboss.cluster.classpath">
- <pathelement path="${jboss.cluster.lib}/jbossha-client.jar"/>
- </path>
- <path id="jboss.cluster.all.classpath">
- <pathelement path="${jboss.cluster.lib}/jbossha.jar"/>
- </path>
-
- <!-- Transaction -->
- <property name="jboss.transaction.root" value="${project.root}/transaction/output"/>
- <property name="jboss.transaction.lib" value="${jboss.transaction.root}/lib"/>
- <path id="jboss.transaction.classpath">
- <pathelement path="${jboss.transaction.lib}/testsuite-support.jar"/>
- </path>
-
- <!-- JBossMX -->
- <property name="jboss.jmx.root" value="${project.root}/jmx/output"/>
- <property name="jboss.jmx.lib" value="${jboss.jmx.root}/lib"/>
- <path id="jboss.jmx.classpath">
- <pathelement path="${jboss.jmx.lib}/jboss-jmx.jar"/>
- <pathelement path="${jboss.server.lib}/jboss.jar"/>
- </path>
-
- <!-- Management -->
- <property name="jboss.management.root" value="${project.root}/management/output"/>
- <property name="jboss.management.lib" value="${jboss.management.root}/lib"/>
- <path id="jboss.management.classpath">
- <pathelement path="${jboss.management.lib}/jboss-jsr77-client.jar"/>
- <pathelement path="${jboss.management.lib}/jboss-management.jar"/>
- </path>
-
- <!-- IIOP -->
- <property name="jboss.iiop.root" value="${project.root}/iiop/output"/>
- <property name="jboss.iiop.lib" value="${jboss.iiop.root}/lib"/>
- <path id="jboss.iiop.classpath">
- <pathelement path="${jboss.iiop.lib}/jboss-iiop-client.jar"/>
- </path>
-
- <!-- Varia -->
- <property name="jboss.varia.root" value="${project.root}/varia/output"/>
- <property name="jboss.varia.lib" value="${jboss.varia.root}/lib"/>
- <path id="jboss.varia.classpath">
- <pathelement path="${jboss.varia.lib}/autonumber-plugin.jar"/>
- <pathelement path="${jboss.varia.lib}/scheduler-plugin.jar"/>
- </path>
-
<!-- The combined dependant module classpath -->
<path id="dependentmodule.classpath">
<path refid="jboss.j2ee.classpath"/>
@@ -343,9 +132,8 @@
<path refid="jboss.internal-server.classpath"/>
<path refid="jboss.messaging.classpath"/>
<path refid="jboss.security.classpath"/>
- <path refid="jboss.connector.classpath"/>
+ <path refid="jboss.jca.classpath"/>
<path refid="jboss.cluster.classpath"/>
- <path refid="jboss.cluster.all.classpath"/>
<path refid="jboss.management.classpath"/>
<path refid="jboss.transaction.classpath"/>
<path refid="jboss.varia.classpath"/>
|
