Menu
▾
▴
[jboss-cvs] jbosstest build.xml
|
From: Stephen C. <sc...@us...> - 2003-03-22 03:11:59
|
User: scoy
Date: 03/03/21 19:11:58
Modified: . Tag: Branch_3_0 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.106.2.67 +50 -47 jbosstest/build.xml
Index: build.xml
===================================================================
RCS file: /cvsroot/jboss/jbosstest/build.xml,v
retrieving revision 1.106.2.66
retrieving revision 1.106.2.67
diff -u -r1.106.2.66 -r1.106.2.67
--- build.xml 12 Mar 2003 10:42:22 -0000 1.106.2.66
+++ build.xml 22 Mar 2003 03:11:58 -0000 1.106.2.67
@@ -13,7 +13,7 @@
<!-- -->
<!-- ====================================================================== -->
-<!-- $Id: build.xml,v 1.106.2.66 2003/03/12 10:42:22 lqd Exp $ -->
+<!-- $Id: build.xml,v 1.106.2.67 2003/03/22 03:11:58 scoy Exp $ -->
<project default="main" name="JBoss/Testsuite">
@@ -121,6 +121,14 @@
<pathelement path="${sun.servlet.lib}/servlet.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"/>
@@ -188,6 +196,7 @@
<path refid="sun.javamail.classpath"/>
<path refid="sun.servlet.classpath"/>
<path refid="apache.log4j.classpath"/>
+ <path refid="apache.commons.classpath"/>
<path refid="oswego.concurrent.classpath"/>
<path refid="jacorb.jacorb.classpath"/>
<path refid="junit.junit.classpath"/>
@@ -416,9 +425,9 @@
<!-- xdoclet -->
<path id="xdoclet.task.classpath">
<path refid="tests.classpath"/>
- <pathelement location="${project.tools}/lib/xdoclet.jar"/>
- <pathelement location="${project.tools}/lib/xjavadoc.jar"/>
- <pathelement location="${project.tools}/lib/ant.jar"/>
+ <fileset dir="${project.thirdparty}/xdoclet/xdoclet/lib">
+ <include name="**/*.jar"/>
+ </fileset>
</path>
<property name="xdoclet.task.classpath"
refid="xdoclet.task.classpath"/>
@@ -449,17 +458,18 @@
<!-- Compile EJB beans with XDoclet -->
<target name="compile-bean-sources" depends="init" unless="noxdoclet">
- <taskdef name="xdoclet" classname="xdoclet.ejb.EjbDocletTask"/>
+ <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">
+ mergedir="${source.resources}/ejb-conf/readonly">
<fileset dir="${source.java}">
<include name="org/jboss/test/ejbconf/beans/**/*Bean.java"/>
</fileset>
@@ -478,15 +488,14 @@
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">
+ mergedir="${source.resources}/eardeployment/a">
<fileset dir="${source.java}">
<include name="org/jboss/test/jmx/eardeployment/a/ejb/SessionABean.java"/>
</fileset>
@@ -502,15 +511,14 @@
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">
+ mergedir="${source.resources}/eardeployment/b">
<fileset dir="${source.java}">
<include name="org/jboss/test/jmx/eardeployment/b/ejb/*Bean.java"/>
</fileset>
@@ -526,15 +534,14 @@
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">
+ mergedir="${source.resources}/cmp2/cmr">
<fileset dir="${source.java}">
<include name="org/jboss/test/cmp2/cmr/ejb/*Bean.java"/>
</fileset>
@@ -552,13 +559,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"-->
@@ -579,12 +585,11 @@
mergedir="${source.resources}/jmx/undeploy/"
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"-->
@@ -603,11 +608,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"-->
@@ -624,14 +628,13 @@
destdir="${build.resources}/jca/bank/META-INF"/>
<jboss xmlencoding="UTF-8"
version="3.0"
- destdir="${build.resources}/jca/bank/META-INF"
+ destdir="${build.resources}/jca/bank/META-INF"
mergedir="${source.resources}/jca/bank/"/>
- </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}">
@@ -643,12 +646,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">
@@ -670,18 +672,18 @@
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"/>
-<echo message="xdoclet.mergedir: ${xdoclet.mergedir}"/>
+ <taskdef name="jmxdoclet"
+ classname="xdoclet.modules.jmx.JMXDocletTask"
+ classpathref="xdoclet.task.classpath"/>
<mkdir dir="${build.gen-src}"/>
<jmxdoclet destdir="${build.gen-src}"
- classpath="${xdoclet.task.classpath}"
force="true"
- excludedtags="@version,@author">
+ excludedtags="@version,@author">
<fileset dir="${source.java}">
<include name="org/jboss/test/jmx/deployer/*.java"/>
<include name="org/jboss/test/jmx/mbean/*.java"/>
@@ -694,16 +696,17 @@
</target>
<target name="compile-proxycompiler-bean-sources" depends="init" unless="noxdoclet">
- <taskdef name="xdoclet" classname="xdoclet.ejb.EjbDocletTask"/>
+ <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">
+ mergedir="${source.resources}/proxycompiler">
<fileset dir="${source.java}">
<include name="org/jboss/test/proxycompiler/beans/**/*Bean.java"/>
</fileset>
@@ -717,9 +720,9 @@
destdir="${build.resources}/proxycompiler/META-INF"/>
<jboss xmlencoding="UTF-8"
version="3.0"
- destdir="${build.resources}/proxycompiler/META-INF"
+ destdir="${build.resources}/proxycompiler/META-INF"
mergedir="${source.resources}/proxycompiler"/>
- </xdoclet>
+ </ejbdoclet>
</target>
|
