tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r...@apache.org
Subject cvs commit: jakarta-tomcat-catalina/catalina build.xml
Date Mon, 04 Oct 2004 21:35:21 GMT
remm        2004/10/04 14:35:21

  Modified:    .        build.xml
               catalina build.xml
  Log:
  - Move back naming-resources to common/lib for now. Probably what could be done is to move
both naming-* JARs to server/lib.
  
  Revision  Changes    Path
  1.217     +1 -1      jakarta-tomcat-5/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-5/build.xml,v
  retrieving revision 1.216
  retrieving revision 1.217
  diff -u -r1.216 -r1.217
  --- build.xml	4 Oct 2004 09:27:26 -0000	1.216
  +++ build.xml	4 Oct 2004 21:35:18 -0000	1.217
  @@ -852,11 +852,11 @@
         <fileset dir="build/common/lib">
           <include name="naming-factory.jar"/>
           <include name="servlet-api.jar"/>
  +        <include name="naming-resources.jar"/>
         </fileset>
         <fileset dir="build/server/lib">
           <include name="catalina.jar"/>
           <include name="catalina-optional.jar"/>
  -        <include name="naming-resources.jar"/>
           <include name="servlets-default.jar"/>
         </fileset>
       </copy>
  
  
  
  1.77      +7 -1      jakarta-tomcat-catalina/catalina/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/build.xml,v
  retrieving revision 1.76
  retrieving revision 1.77
  diff -u -r1.76 -r1.77
  --- build.xml	1 Oct 2004 09:12:56 -0000	1.76
  +++ build.xml	4 Oct 2004 21:35:19 -0000	1.77
  @@ -1024,6 +1024,12 @@
         <fileset dir="${classes.dir}">
           <include name="org/apache/naming/**" />
           <exclude name="org/apache/naming/resources/**" />
  +        <exclude name="org/apache/naming/JndiPermission.class" />
  +      	<exclude name="org/apache/naming/NameParserImpl.class" />
  +      	<exclude name="org/apache/naming/NamingContextBindingsEnumeration.class" />
  +      	<exclude name="org/apache/naming/NamingContextEnumeration.class" />
  +      	<exclude name="org/apache/naming/NamingEntry.class" />
  +      	<exclude name="org/apache/naming/StringManager.class" />
           <!-- Javadoc and i18n exclusions -->
           <exclude name="**/package.html" />
           <exclude name="**/LocalStrings_*" />
  @@ -1031,7 +1037,7 @@
       </jar>
   
       <!-- Naming - Resources JAR File -->
  -    <jar jarfile="${catalina.deploy}/server/lib/naming-resources.jar" index="true">
  +    <jar jarfile="${catalina.deploy}/common/lib/naming-resources.jar" index="true">
         <fileset dir="${classes.dir}">
           <include name="org/apache/naming/JndiPermission.class" />
         	<include name="org/apache/naming/NameParserImpl.class" />
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: tomcat-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: tomcat-dev-help@jakarta.apache.org


Mime
View raw message