cvs commit: jakarta-tomcat-4.0/catalina build.xml

[craigmcc]

craigmcc    01/09/13 12:57:04

  Modified:    catalina build.xml
  Log:
  Revert Glenn's change to build.xml.
  
  Revision  Changes    Path
  1.58      +8 -15     jakarta-tomcat-4.0/catalina/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/build.xml,v
  retrieving revision 1.57
  retrieving revision 1.58
  diff -u -r1.57 -r1.58
  --- build.xml 2001/09/13 18:56:11     1.57
  +++ build.xml 2001/09/13 19:57:04     1.58
  @@ -72,9 +72,6 @@
   
       <available classname="junit.framework.TestCase" property="junit.present" />
       <available file="${jaxp.jar}" property="jaxp.jar.present" />
  -    <available file="${jndi.jar}" property="jndi.jar.present" />
  -    <available file="${activation.jar}" property="activation.jar.present" />
  -    <available file="${mail.jar}" property="mail.jar.present" />
   
       <mkdir dir="${catalina.build}"/>
       <mkdir dir="${catalina.build}/bin"/>
  @@ -88,6 +85,7 @@
   
     </target>
   
  +
     <!-- =================== BUILD: Copy Static Files ======================= -->
     <target name="build-static" depends="build-prepare,copy-jaxp-jar">
   
  @@ -112,18 +110,13 @@
       <!-- Common Extensions -->
       <!--   All applications need the servlet API classes -->
       <copy file="${servlet.jar}" tofile="${catalina.build}/common/lib/servlet.jar" />
  -    <!--   Copy the jndi, activation, and mail jar files only if they are present. 
-->
  -    <copy todir="${catalina.build}/common/lib/">
  -      <fileset dir="${jndi.home}">
  -        <include name="lib/jndi.jar" if="jndi.jar.present"/>
  -      </fileset>
  -      <fileset dir="${activation.home}">
  -        <include name="activation.jar" if="activation.jar.present"/>
  -      </fileset>
  -      <fileset dir="${mail.home}">
  -        <include name="mail.jar" if="mail.jar.present"/>
  -      </fileset>
  -    </copy>
  +    <!--   Copy the JNDI JAR file for use under JDK 1.2.2 -->
  +    <copy file="${jndi.jar}"    tofile="${catalina.build}/common/lib/jndi.jar" />
  +    <!--   Copy activation.jar and mail.jar for the mail resource factories -->
  +    <copy file="${activation.jar}"
  +        tofile="${catalina.build}/common/lib/activation.jar"/>
  +    <copy file="${mail.jar}"
  +        tofile="${catalina.build}/common/lib/mail.jar"/>
   
       <!-- Server Components -->
       <!--   Catalina needs JAXP compliant XML parser -->