remm        2003/06/16 14:53:39

  Modified:    catalina build.xml
  Log:
  - Oops, fix the exclusion list.
  
  Revision  Changes    Path
  1.52      +11 -15    jakarta-tomcat-catalina/catalina/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/build.xml,v
  retrieving revision 1.51
  retrieving revision 1.52
  diff -u -r1.51 -r1.52
  --- build.xml 16 Jun 2003 21:36:08 -0000      1.51
  +++ build.xml 16 Jun 2003 21:53:39 -0000      1.52
  @@ -894,28 +894,24 @@
       <!-- Excluding files from here is worse than duplicating them - a loader that 
uses the
            package name as index and includes both bootstrap and catalina will be 
confused -->
   
  -    <jar jarfile="${catalina.deploy}/server/lib/catalina.jar"
  -         index="true">
  +    <jar jarfile="${catalina.deploy}/server/lib/catalina.jar">
         <fileset dir="${classes.dir}">
  +
           <include name="org/apache/catalina/**" />
           <include name="org/apache/coyote/tomcat5/**" />
  +
  +        <!-- Javadoc and i18n exclusions -->
  +        <exclude name="**/package.html" />
  +        <exclude name="**/LocalStrings_*" />
  +
  +        <!-- Modules -->
           <exclude name="org/apache/catalina/ant/**" />
  +        <exclude name="org/apache/catalina/cluster/**" />
           <exclude name="org/apache/catalina/launcher/**" />
  -        <exclude name="org/apache/naming/**" />
  +        <exclude name="org/apache/catalina/servlets/**" />
           <exclude name="org/apache/catalina/startup/Bootstrap.class" />
  -<!--
  -        <exclude name="org/apache/catalina/startup/catalina.properties" />
  -        <exclude name="org/apache/catalina/startup/CatalinaProperties.class" />
  -        <exclude name="org/apache/catalina/startup/ClassLoaderFactory.class" />
  -        <exclude name="org/apache/catalina/startup/Tool.class" />
  -        <exclude name="org/apache/catalina/startup/SecurityClassLoad.class" />
  -        <exclude name="org/apache/catalina/loader/StandardClassLoader*.class" />
  -        <exclude name="org/apache/catalina/loader/Extension.class" />
  -        <exclude name="org/apache/catalina/loader/Reloader.class" />
  --->
           <exclude name="org/apache/catalina/ssi/**" />
  -        <exclude name="**/package.html" />
  -        <exclude name="**/LocalStrings_*" />
  +        <exclude name="org/apache/naming/**" />
   
           <!-- Catalina-optional classes -->
           <exclude name="org/apache/catalina/realm/DataSourceRealm.class" />
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to