Return-Path: 
 <watchdog-dev-return-1325-qmlist-jakarta-archive-watchdog-dev=jakarta.apache.org@jakarta.apache.org>
Delivered-To: apmail-jakarta-watchdog-dev-archive@apache.org
Received: (qmail 64326 invoked from network); 24 Jul 2002 19:00:26 -0000
Received: from unknown (HELO nagoya.betaversion.org) (192.18.49.131)
  by daedalus.apache.org with SMTP; 24 Jul 2002 19:00:26 -0000
Received: (qmail 24440 invoked by uid 97); 24 Jul 2002 19:00:48 -0000
Delivered-To: qmlist-jakarta-archive-watchdog-dev@jakarta.apache.org
Received: (qmail 24346 invoked by uid 97); 24 Jul 2002 19:00:47 -0000
Mailing-List: contact watchdog-dev-help@jakarta.apache.org; run by ezmlm
Precedence: bulk
List-Unsubscribe: <mailto:watchdog-dev-unsubscribe@jakarta.apache.org>
List-Subscribe: <mailto:watchdog-dev-subscribe@jakarta.apache.org>
List-Help: <mailto:watchdog-dev-help@jakarta.apache.org>
List-Post: <mailto:watchdog-dev@jakarta.apache.org>
List-Id: "Watchdog Developers List" <watchdog-dev.jakarta.apache.org>
Reply-To: "Watchdog Developers List" <watchdog-dev@jakarta.apache.org>
Delivered-To: mailing list watchdog-dev@jakarta.apache.org
Received: (qmail 24322 invoked by uid 97); 24 Jul 2002 19:00:45 -0000
X-Antivirus: nagoya (v4198 created Apr 24 2002)
Date: 24 Jul 2002 19:00:19 -0000
Message-ID: <20020724190019.45829.qmail@icarus.apache.org>
From: morgand@apache.org
To: jakarta-watchdog-4.0-cvs@apache.org
Subject: cvs commit:
 jakarta-watchdog-4.0/src/server/servlet-tests/WEB-INF/classes/tests/javax_servlet/RequestDispatcher
 Forward_1TestServlet.java Include_1TestServlet.java
X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N
X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N

morgand     2002/07/24 12:00:17

  Modified:    latka-scratch/src/distribution/tests servlet-tests.web.xml
               src/server/servlet-tests/WEB-INF web.xml
               src/server/servlet-tests/WEB-INF/classes/tests/javax_servlet/RequestDispatcher
                        Forward_1TestServlet.java Include_1TestServlet.java
  Log:
  moved Include and Forward test servlet targets from hardcoded value to servlet init param
  
  Revision  Changes    Path
  1.5       +10 -0     jakarta-watchdog-4.0/latka-scratch/src/distribution/tests/servlet-tests.web.xml
  
  Index: servlet-tests.web.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-watchdog-4.0/latka-scratch/src/distribution/tests/servlet-tests.web.xml,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- servlet-tests.web.xml	24 Jul 2002 18:44:17 -0000	1.4
  +++ servlet-tests.web.xml	24 Jul 2002 19:00:17 -0000	1.5
  @@ -869,6 +869,11 @@
       
       <servlet-class>tests.javax_servlet.RequestDispatcher.Include_1TestServlet</servlet-class>
       
  +    <init-param>
  +      <param-name>includeTarget</param-name>
  +      <param-value>/tests/javax_servlet/RequestDispatcher/IncludedServlet</param-value>
  +    </init-param>
  +    
       <load-on-startup>0</load-on-startup>
       
     
  @@ -894,6 +899,11 @@
       <display-name>Forward_1Test</display-name>
       
       <servlet-class>tests.javax_servlet.RequestDispatcher.Forward_1TestServlet</servlet-class>
  +    
  +    <init-param>
  +      <param-name>forwardTarget</param-name>
  +      <param-value>/tests/javax_servlet/RequestDispatcher/ForwardedServlet</param-value>
  +    </init-param>
       
       <load-on-startup>0</load-on-startup>
       
  
  
  
  1.14      +8 -0      jakarta-watchdog-4.0/src/server/servlet-tests/WEB-INF/web.xml
  
  Index: web.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-watchdog-4.0/src/server/servlet-tests/WEB-INF/web.xml,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- web.xml	24 Jul 2002 18:44:17 -0000	1.13
  +++ web.xml	24 Jul 2002 19:00:17 -0000	1.14
  @@ -422,6 +422,10 @@
       <servlet-name>Include_1Test</servlet-name>
       <display-name>Include_1Test</display-name>
       <servlet-class>tests.javax_servlet.RequestDispatcher.Include_1TestServlet</servlet-class>
  +    <init-param>
  +      <param-name>includeTarget</param-name>
  +      <param-value>/IncludedServlet</param-value>
  +    </init-param>
       <load-on-startup>0</load-on-startup>
     </servlet>
     <servlet>
  @@ -434,6 +438,10 @@
       <servlet-name>Forward_1Test</servlet-name>
       <display-name>Forward_1Test</display-name>
       <servlet-class>tests.javax_servlet.RequestDispatcher.Forward_1TestServlet</servlet-class>
  +    <init-param>
  +      <param-name>forwardTarget</param-name>
  +      <param-value>/ForwardedServlet</param-value>
  +    </init-param>
       <load-on-startup>0</load-on-startup>
     </servlet>
   
  
  
  
  1.3       +1 -1      jakarta-watchdog-4.0/src/server/servlet-tests/WEB-INF/classes/tests/javax_servlet/RequestDispatcher/Forward_1TestServlet.java
  
  Index: Forward_1TestServlet.java
  ===================================================================
  RCS file: /home/cvs/jakarta-watchdog-4.0/src/server/servlet-tests/WEB-INF/classes/tests/javax_servlet/RequestDispatcher/Forward_1TestServlet.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- Forward_1TestServlet.java	11 Jan 2002 22:20:54 -0000	1.2
  +++ Forward_1TestServlet.java	24 Jul 2002 19:00:17 -0000	1.3
  @@ -86,7 +86,7 @@
           //response is committed here
           out.println( "Committing some content to buffer" );
           out.flush();
  -        String path = "/ForwardedServlet";
  +        String path = getServletConfig().getInitParameter("forwardTarget");
           RequestDispatcher rd = getServletContext().getRequestDispatcher( path );
   
           try {
  
  
  
  1.3       +1 -1      jakarta-watchdog-4.0/src/server/servlet-tests/WEB-INF/classes/tests/javax_servlet/RequestDispatcher/Include_1TestServlet.java
  
  Index: Include_1TestServlet.java
  ===================================================================
  RCS file: /home/cvs/jakarta-watchdog-4.0/src/server/servlet-tests/WEB-INF/classes/tests/javax_servlet/RequestDispatcher/Include_1TestServlet.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- Include_1TestServlet.java	11 Jan 2002 22:20:54 -0000	1.2
  +++ Include_1TestServlet.java	24 Jul 2002 19:00:17 -0000	1.3
  @@ -88,7 +88,7 @@
   
           //setting content-type to text/plain
           response.setContentType( "text/plain" );
  -        String path = "/IncludedServlet";
  +        String path = getServletConfig().getInitParameter("includeTarget");
           RequestDispatcher rd = getServletContext().getRequestDispatcher( path );
           rd.include( request, response );
   
  
  
  

--
To unsubscribe, e-mail:   <mailto:watchdog-dev-unsubscribe@jakarta.apache.org>
For additional commands, e-mail: <mailto:watchdog-dev-help@jakarta.apache.org>