tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From lar...@apache.org
Subject cvs commit: jakarta-tomcat build.xml
Date Sat, 22 Sep 2001 02:21:33 GMT
larryi      01/09/21 19:21:33

  Modified:    .        build.xml
  Log:
  Fix admin based tests to be compatible with Ant 1.4.
  
  Since Ant 1.4's TaskAdapter insists on calling setProject(Project), the Ant
  classes must be visible to the org.apache.tomcat.util.test classes.
  
  Removed the test classes from tomcat_util.jar and placed them in a
  tomcat_util_test.jar in the admin's WEB-INF/lib directory, which is where
  ant.jar lives.
  
  Revision  Changes    Path
  1.156     +5 -0      jakarta-tomcat/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat/build.xml,v
  retrieving revision 1.155
  retrieving revision 1.156
  diff -u -r1.155 -r1.156
  --- build.xml	2001/09/21 11:03:41	1.155
  +++ build.xml	2001/09/22 02:21:33	1.156
  @@ -292,6 +292,7 @@
       <jar jarfile="${tomcat.build}/lib/container/tomcat_util.jar"
            basedir="${tomcat.build}/classes">
         <include name="org/apache/tomcat/util/**"/>
  +      <exclude name="org/apache/tomcat/util/test/**"/>
       </jar>
     </target>
   
  @@ -589,6 +590,10 @@
       </copy>
       <copy tofile="${tomcat.build}/webapps/admin/WEB-INF/lib/ant.jar"
             file="${ant.lib}/ant.jar"/>
  +    <jar jarfile="${tomcat.build}/webapps/admin/WEB-INF/lib/tomcat_util_test.jar"
  +         basedir="${tomcat.build}/classes">
  +      <include name="org/apache/tomcat/util/**"/>
  +    </jar>
       <javac srcdir="src/admin/WEB-INF/classes"
              optimize="${optimize}"
              destdir="${tomcat.build}/webapps/admin/WEB-INF/classes"
  
  
  

Mime
View raw message