|
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>
|