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 Wed, 08 Sep 2004 10:38:14 GMT
remm        2004/09/08 03:38:14

  Modified:    catalina/src/share/org/apache/catalina/servlets
                        InvokerHttpRequest.java
               catalina build.xml
  Log:
  - Tweak the packaging of the resources for servlets (bug 31110).
  
  Revision  Changes    Path
  1.5       +1 -10     jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/servlets/InvokerHttpRequest.java
  
  Index: InvokerHttpRequest.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/servlets/InvokerHttpRequest.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- InvokerHttpRequest.java	27 Feb 2004 14:58:46 -0000	1.4
  +++ InvokerHttpRequest.java	8 Sep 2004 10:38:14 -0000	1.5
  @@ -21,8 +21,6 @@
   import javax.servlet.http.HttpServletRequest;
   import javax.servlet.http.HttpServletRequestWrapper;
   
  -import org.apache.catalina.util.StringManager;
  -
   
   /**
    * Wrapper around a <code>javax.servlet.http.HttpServletRequest</code>
  @@ -88,13 +86,6 @@
        * The servlet path for this request.
        */
       protected String servletPath = null;
  -
  -
  -    /**
  -     * The string manager for this package.
  -     */
  -    protected static StringManager sm =
  -        StringManager.getManager(Constants.Package);
   
   
       // --------------------------------------------- HttpServletRequest Methods
  
  
  
  1.72      +2 -2      jakarta-tomcat-catalina/catalina/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/build.xml,v
  retrieving revision 1.71
  retrieving revision 1.72
  diff -u -r1.71 -r1.72
  --- build.xml	2 Sep 2004 00:47:42 -0000	1.71
  +++ build.xml	8 Sep 2004 10:38:14 -0000	1.72
  @@ -916,8 +916,6 @@
         <fileset dir="${classes.dir}">
   
           <include name="org/apache/catalina/**" />
  -        <include name="org/apache/catalina/servlets/Constants.class" />
  -        <include name="org/apache/catalina/servlets/LocalStrings.properties" />
   
           <!-- Javadoc and i18n exclusions -->
           <exclude name="**/package.html" />
  @@ -1083,6 +1081,8 @@
       <jar jarfile="${catalina.deploy}/server/lib/servlets-default.jar" index="true">
         <fileset dir="${classes.dir}">
           <include name="org/apache/catalina/servlets/Default*" />
  +        <include name="org/apache/catalina/servlets/Constants.class" />
  +        <include name="org/apache/catalina/servlets/LocalStrings.properties" />
         </fileset>
       </jar>
   
  
  
  

---------------------------------------------------------------------
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