[jboss-cvs] contrib/catalina build.xml

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

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

  Modified:    catalina 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.19      +17 -19    contrib/catalina/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /cvsroot/jboss/contrib/catalina/build.xml,v
  retrieving revision 1.18
  retrieving revision 1.19
  diff -u -r1.18 -r1.19
  --- build.xml	25 Jun 2002 19:39:06 -0000	1.18
  +++ build.xml	27 Jun 2002 15:08:18 -0000	1.19
  @@ -12,7 +12,7 @@
   <!--                                                                        -->
   <!-- ====================================================================== -->
   
  -<!-- $Id: build.xml,v 1.18 2002/06/25 19:39:06 tpeuss Exp $ -->
  +<!-- $Id: build.xml,v 1.19 2002/06/27 15:08:18 fbrier Exp $ -->
   
   <project default="main" name="JBoss/Tomcat-4">
   
  @@ -50,22 +50,6 @@
         <pathelement path="${project.thirdparty}/javagroups/javagroups/lib/javagroups-2.0.jar"/>
       </path>
   
  -    <!-- 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 Secure Socket Extension (JSSE) -->
       <property name="sun.jsse.root" value="${project.thirdparty}/sun/jsse"/>
       <property name="sun.jsse.lib" value="${sun.jsse.root}/lib"/>
  @@ -75,6 +59,13 @@
         </fileset>
       </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"/>
  @@ -91,9 +82,8 @@
   
       <!-- The combined library classpath -->
       <path id="library.classpath">
  -      <path refid="sun.jaxp.classpath"/>
  -      <path refid="sun.jaas.classpath"/>
         <path refid="sun.jsse.classpath"/>
  +      <path refid="apache.crimson.classpath"/>
         <path refid="apache.log4j.classpath"/>
         <path refid="junit.junit.classpath"/>
         <path refid="javagroups.classpath"/>
  @@ -139,6 +129,13 @@
         <pathelement path="${jboss.jmx.lib}/jboss-jmx.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}/jaas.jar"/>
  +    </path>
  +
       <!-- Cluster -->
       <property name="jboss.cluster.root" value="${project.root}/cluster/output"/>
       <property name="jboss.cluster.lib" value="${jboss.cluster.root}/lib"/>
  @@ -162,6 +159,7 @@
         <path refid="jboss.j2ee.classpath"/>
         <path refid="jboss.system.classpath"/>
         <path refid="jboss.server.classpath"/>
  +      <path refid="jboss.security.classpath"/>
         <path refid="jboss.common.classpath"/>
         <path refid="jboss.jmx.classpath"/>
         <path refid="jboss.cluster.classpath"/>