Return-Path: <costin@locus.apache.org>
Mailing-List: contact tomcat-dev-help@jakarta.apache.org; run by ezmlm
Delivered-To: mailing list tomcat-dev@jakarta.apache.org
Received: (qmail 37248 invoked by uid 500); 3 Apr 2000 22:23:42 -0000
Delivered-To: apmail-jakarta-tomcat-cvs@apache.org
Received: (qmail 37244 invoked by uid 1052); 3 Apr 2000 22:23:42 -0000
Date: 3 Apr 2000 22:23:42 -0000
Message-ID: <20000403222342.37243.qmail@locus.apache.org>
From: costin@locus.apache.org
To: jakarta-tomcat-cvs@apache.org
Subject: cvs commit: jakarta-tomcat/src/tests/webpages/WEB-INF web.xml

costin      00/04/03 15:23:42

  Modified:    src/build main.xml
               src/examples/WEB-INF web.xml
               src/share/org/apache/tomcat/core ResponseImpl.java
               src/share/org/apache/tomcat/util/xml XmlMapper.java
               src/tests/webpages/WEB-INF web.xml
  Log:
  Another fix to fix ( workaround to set ant.home )
  
  Revision  Changes    Path
  1.7       +1 -1      jakarta-tomcat/src/build/main.xml
  
  Index: main.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat/src/build/main.xml,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- main.xml	2000/04/03 20:38:56	1.6
  +++ main.xml	2000/04/03 22:23:40	1.7
  @@ -36,7 +36,7 @@
     <target name="tomcat" depends="init">
        <ant dir="${ws.dir}/jakarta-tomcat" antfile="${ws.dir}/jakarta-tomcat/build.xml" target="dist" >
           <property name="tomcat.home" value="${ws.dir}/dist/tomcat" />
  -        <property name="ant.home" value="${ws.dir}/jakarta-ant" />
  +        <property name="ant.home" value="${ant.home}" />
        </ant>
     </target>
   
  
  
  
  1.6       +2 -6      jakarta-tomcat/src/examples/WEB-INF/web.xml
  
  Index: web.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat/src/examples/WEB-INF/web.xml,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- web.xml	2000/03/31 20:59:45	1.5
  +++ web.xml	2000/04/03 22:23:40	1.6
  @@ -14,12 +14,8 @@
           </servlet-class>
   <!--
           <init-param>
  -            <param-name>
  -                foo
  -            </param-name>
  -            <param-value>
  -                bar
  -            </param-value>
  +            <param-name>foo</param-name>
  +            <param-value>bar</param-value>
           </init-param>
   -->
       </servlet>
  
  
  
  1.19      +9 -7      jakarta-tomcat/src/share/org/apache/tomcat/core/ResponseImpl.java
  
  Index: ResponseImpl.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/core/ResponseImpl.java,v
  retrieving revision 1.18
  retrieving revision 1.19
  diff -u -r1.18 -r1.19
  --- ResponseImpl.java	2000/03/27 22:20:16	1.18
  +++ ResponseImpl.java	2000/04/03 22:23:41	1.19
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/core/ResponseImpl.java,v 1.18 2000/03/27 22:20:16 costin Exp $
  - * $Revision: 1.18 $
  - * $Date: 2000/03/27 22:20:16 $
  + * $Header: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/core/ResponseImpl.java,v 1.19 2000/04/03 22:23:41 costin Exp $
  + * $Revision: 1.19 $
  + * $Date: 2000/04/03 22:23:41 $
    *
    * ====================================================================
    *
  @@ -323,10 +323,12 @@
       }
   
       public void flushBuffer() throws IOException {
  -	if (usingWriter == true && writer != null)
  -	    writer.flush();
  -
  -	out.reallyFlush();
  +	if( notIncluded) {
  +	    if (usingWriter == true && writer != null)
  +		writer.flush();
  +	    
  +	    out.reallyFlush();
  +	} 
       }
   
   
  
  
  
  1.12      +7 -1      jakarta-tomcat/src/share/org/apache/tomcat/util/xml/XmlMapper.java
  
  Index: XmlMapper.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/util/xml/XmlMapper.java,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- XmlMapper.java	2000/03/01 07:50:52	1.11
  +++ XmlMapper.java	2000/04/03 22:23:41	1.12
  @@ -697,7 +697,13 @@
   	    }
   	}
   
  -	Method m=parent.getClass().getMethod( mName, paramT );
  +	Method m=null;
  +	try {
  +	    m=parent.getClass().getMethod( mName, paramT );
  +	} catch( NoSuchMethodException ex ) {
  +	    ctx.log("Can't find method " + mName + " in " + parent + " CLASS " + parent.getClass());
  +	    return;
  +	}
   	m.invoke( parent, realParam );
   
   	if(ctx.getDebug() > 0 ) {
  
  
  
  1.6       +8 -24     jakarta-tomcat/src/tests/webpages/WEB-INF/web.xml
  
  Index: web.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat/src/tests/webpages/WEB-INF/web.xml,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- web.xml	2000/02/16 17:46:58	1.5
  +++ web.xml	2000/04/03 22:23:41	1.6
  @@ -78,20 +78,12 @@
               ServletParam
           </servlet-class>
           <init-param>
  -            <param-name>
  -                param1
  -            </param-name>
  -            <param-value>
  -                value1
  -            </param-value>
  +            <param-name>param1</param-name>
  +            <param-value>value1</param-value>
           </init-param>
           <init-param>
  -            <param-name>
  -                param2
  -            </param-name>
  -            <param-value>
  -                value2
  -            </param-value>
  +            <param-name>param2</param-name>
  +            <param-value>value2</param-value>
           </init-param>
       </servlet>          
   
  @@ -103,20 +95,12 @@
               ServletParam
           </servlet-class>
           <init-param>
  -            <param-name>
  -                param3
  -            </param-name>
  -            <param-value>
  -                value3
  -            </param-value>
  +            <param-name>param3</param-name>
  +            <param-value>value3</param-value>
           </init-param>
           <init-param>
  -            <param-name>
  -                param4
  -            </param-name>
  -            <param-value>
  -                value4
  -            </param-value>
  +            <param-name>param4</param-name>
  +            <param-value>value4</param-value>
           </init-param>
       </servlet>