Menu
▾
▴
[jboss-cvs] jbosstest build.xml
|
From: Stephen C. <sc...@us...> - 2003-03-21 13:41:56
|
User: scoy
Date: 03/03/21 05:41:53
Modified: . Tag: Branch_3_2 build.xml
Log:
XDoclet 1.2 update.
Standardized task names to ejbdoclet and jmxdoclet where appropriate.
Adjusted xdoclet classpath to suit.
Revision Changes Path
No revision
No revision
1.165.2.47 +51 -61 jbosstest/build.xml
Index: build.xml
===================================================================
RCS file: /cvsroot/jboss/jbosstest/build.xml,v
retrieving revision 1.165.2.46
retrieving revision 1.165.2.47
diff -u -r1.165.2.46 -r1.165.2.47
--- build.xml 19 Mar 2003 17:26:45 -0000 1.165.2.46
+++ build.xml 21 Mar 2003 13:41:52 -0000 1.165.2.47
@@ -13,7 +13,7 @@
<!-- -->
<!-- ====================================================================== -->
-<!-- $Id: build.xml,v 1.165.2.46 2003/03/19 17:26:45 starksm Exp $ -->
+<!-- $Id: build.xml,v 1.165.2.47 2003/03/21 13:41:52 scoy Exp $ -->
<project default="main" name="JBoss/Testsuite">
@@ -116,6 +116,14 @@
<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"/>
@@ -181,6 +189,7 @@
<path refid="sun.javamail.classpath"/>
<path refid="sun.servlet.classpath"/>
<path refid="apache.crimson.classpath"/>
+ <path refid="apache.commons.classpath"/>
<path refid="apache.log4j.classpath"/>
<path refid="oswego.concurrent.classpath"/>
<path refid="jacorb.jacorb.classpath"/>
@@ -466,14 +475,14 @@
<!-- Compile EJB beans with XDoclet -->
<target name="compile-bean-sources" depends="init" unless="noxdoclet">
- <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">
@@ -495,12 +504,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">
@@ -519,12 +527,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">
@@ -543,12 +550,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">
@@ -569,12 +575,11 @@
mergedir="${source.resources}/cmp2/cmr/"
Datasource="java:/DefaultDS"
Typemapping="Hypersonic SQL"/>
- </xdoclet>
+ </ejbdoclet>
<!-- optimistic lock test -->
<mkdir dir="${build.resources}/cmp2/optimisticlock/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/optimisticlock">
@@ -586,12 +591,11 @@
<localinterface/>
<homeinterface/>
<localhomeinterface/>
- </xdoclet>
+ </ejbdoclet>
<!-- foreign key mapping tests -->
<mkdir dir="${build.resources}/cmp2/fkmapping/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/fkmapping">
@@ -606,12 +610,11 @@
<utilobject cacheHomes="true" includeGUID="false"/>
<entitycmp/>
<session/>
- </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"-->
@@ -633,12 +636,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"-->
@@ -657,11 +659,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"-->
@@ -680,11 +681,10 @@
version="3.0"
destdir="${build.resources}/jca/bank/META-INF"
mergedir="${source.resources}/jca/bank/"/>
- </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"-->
@@ -707,12 +707,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"-->
@@ -733,12 +732,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"-->
@@ -755,12 +753,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"-->
@@ -781,12 +778,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"-->
@@ -807,12 +803,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"-->
@@ -833,12 +828,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}">
@@ -850,12 +844,11 @@
<!--session/-->
<deploymentdescriptor xmlencoding ="UTF-8"
destdir="${build.resources}/jmx/loading/cpmanifest/META-INF"/>
- </xdoclet>
+ </ejbdoclet>
<!-- entity test -->
<mkdir dir="${build.resources}/entity/entity/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}/entity/entity">
@@ -877,16 +870,15 @@
datasource="java:/DefaultDS"
typemapping="Hypersonic SQL"
destdir="${build.resources}/entity/entity/META-INF"/>
- </xdoclet>
+ </ejbdoclet>
</target>
<target name="compile-mbean-sources" depends="init" unless="noxdoclet">
- <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}">
@@ -901,11 +893,10 @@
</target>
<target name="compile-xmbean-dds" depends="init" unless="noxdoclet">
- <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}">
@@ -917,13 +908,12 @@
</target>
<target name="compile-proxycompiler-bean-sources" depends="init" unless="noxdoclet">
- <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">
@@ -942,7 +932,7 @@
version="3.0"
destdir="${build.resources}/proxycompiler/META-INF"
mergedir="${source.resources}/proxycompiler"/>
- </xdoclet>
+ </ejbdoclet>
</target>
|
