[jboss-cvs] jbosstest build.xml

[Frederick N. B. <fb...@us...>]

  User: fbrier  
  Date: 02/06/27 08:08:23

  Modified:    .        build.xml
  Log:
  Upgraded several of the .jars including Ant 1.5 Beta 2, Crimson 1.1.3, and Xalan 2.4.D1.  Moved XDoclet from the ./tools/lib into thirdparty subtree with all the modules specifying xdoclet/xdoclet using the current xdoclet, and jboss.net using a version based on xdoclet 1.1.2 in xdoclet/jboss.net.  This is due to a choice not to move ahead with the currect XDoclet in CVS.  log4j-core.jar was also removed from the ./tools/lib and all build.xml specify the log4j in the thirdparty subtree.
  
  Revision  Changes    Path
  1.148     +17 -26    jbosstest/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /cvsroot/jboss/jbosstest/build.xml,v
  retrieving revision 1.147
  retrieving revision 1.148
  diff -u -r1.147 -r1.148
  --- build.xml	25 Jun 2002 18:05:44 -0000	1.147
  +++ build.xml	27 Jun 2002 15:08:23 -0000	1.148
  @@ -13,7 +13,7 @@
   <!--                                                                        -->
   <!-- ====================================================================== -->
   
  -<!-- $Id: build.xml,v 1.147 2002/06/25 18:05:44 dsundstrom Exp $ -->
  +<!-- $Id: build.xml,v 1.148 2002/06/27 15:08:23 fbrier Exp $ -->
   
   <project default="main" name="JBoss/Testsuite">
   
  @@ -74,22 +74,6 @@
       <!-- Libraries -->
       <!-- ========= -->
   
  -    <!-- Java API for XML Processing (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}">
  -        <include name="*.jar"/>
  -      </fileset>
  -    </path>
  -
  -    <!-- Java Authentication and Authorization Service (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.lib" value="${sun.jce.root}/lib"/>
  @@ -120,6 +104,13 @@
         <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>
  +
       <!-- Log4j -->
       <property name="apache.log4j.root" value="${project.thirdparty}/apache/log4j"/>
       <property name="apache.log4j.lib" value="${apache.log4j.root}/lib"/>
  @@ -173,12 +164,11 @@
   
       <!-- The combined library classpath -->
       <path id="library.classpath">
  -      <path refid="sun.jaxp.classpath"/>
  -      <path refid="sun.jaas.classpath"/>
         <path refid="sun.jce.classpath"/>
         <path refid="sun.jsse.classpath"/>
         <path refid="sun.javamail.classpath"/>
         <path refid="sun.servlet.classpath"/>
  +      <path refid="apache.crimson.classpath"/>
         <path refid="apache.log4j.classpath"/>
         <path refid="oswego.concurrent.classpath"/>
         <path refid="jacorb.jacorb.classpath"/>
  @@ -258,6 +248,7 @@
       <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}/jaas.jar"/>
       </path>
   
       <!-- Connector -->
  @@ -410,9 +401,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"/>
  @@ -440,7 +431,7 @@
   
     <!-- Compile EJB beans with XDoclet -->
     <target name="compile-bean-sources" depends="init">
  -    <taskdef name="xdoclet" classname="xdoclet.ejb.EjbDocletTask"/>
  +    <taskdef name="xdoclet" classname="xdoclet.ejb.EjbDocletTask" classpathref="xdoclet.task.classpath"/>
   
       <mkdir dir="${build.gen-src}"/>
   
  @@ -704,7 +695,7 @@
     </target>
   
     <target name="compile-mbean-sources" depends="init">
  -    <taskdef name="jmxdoclet" classname="xdoclet.jmx.JMXDocletTask"/>
  +    <taskdef name="jmxdoclet" classname="xdoclet.jmx.JMXDocletTask" classpathref="xdoclet.task.classpath"/>
   <echo message="xdoclet.mergedir: ${xdoclet.mergedir}"/>
       <mkdir dir="${build.gen-src}"/>
       <jmxdoclet destdir="${build.gen-src}"
  @@ -720,7 +711,7 @@
     </target>
   
     <target name="compile-xmbean-dds" depends="init">
  -    <taskdef name="jmxdoclet" classname="xdoclet.jmx.JMXDocletTask"/>
  +    <taskdef name="jmxdoclet" classname="xdoclet.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"
  @@ -736,7 +727,7 @@
     </target>
   
     <target name="compile-proxycompiler-bean-sources" depends="init">
  -    <taskdef name="xdoclet" classname="xdoclet.ejb.EjbDocletTask"/>
  +    <taskdef name="xdoclet" classname="xdoclet.ejb.EjbDocletTask" classpathref="xdoclet.task.classpath"/>
   
       <mkdir dir="${build.gen-src}"/>