Return-Path: 
 <watchdog-dev-return-1328-qmlist-jakarta-archive-watchdog-dev=jakarta.apache.org@jakarta.apache.org>
Delivered-To: apmail-jakarta-watchdog-dev-archive@apache.org
Received: (qmail 14596 invoked from network); 25 Jul 2002 18:26:17 -0000
Received: from unknown (HELO nagoya.betaversion.org) (192.18.49.131)
  by daedalus.apache.org with SMTP; 25 Jul 2002 18:26:17 -0000
Received: (qmail 4818 invoked by uid 97); 25 Jul 2002 18:26:39 -0000
Delivered-To: qmlist-jakarta-archive-watchdog-dev@jakarta.apache.org
Received: (qmail 4784 invoked by uid 97); 25 Jul 2002 18:26:38 -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 4773 invoked by uid 97); 25 Jul 2002 18:26:37 -0000
X-Antivirus: nagoya (v4198 created Apr 24 2002)
Date: 25 Jul 2002 18:26:12 -0000
Message-ID: <20020725182612.35614.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_http/HttpServletRequest
 GetServletPathTestServlet.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/25 11:26:12

  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_http/HttpServletRequest
                        GetServletPathTestServlet.java
  Log:
  moved  expected URI from hardcoded value to servlet init param
  
  Revision  Changes    Path
  1.8       +5 -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.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- servlet-tests.web.xml	25 Jul 2002 17:02:51 -0000	1.7
  +++ servlet-tests.web.xml	25 Jul 2002 18:26:12 -0000	1.8
  @@ -3621,6 +3621,11 @@
       
       <servlet-class>tests.javax_servlet_http.HttpServletRequest.GetServletPathTestServlet</servlet-class>
       
  +    <init-param>
  +      <param-name>expectedResult</param-name>
  +      <param-value>/tests/javax_servlet_http/HttpServletRequest/GetServletPathTestServlet</param-value>
  +    </init-param>
  +    
       <load-on-startup>0</load-on-startup>
       
     
  
  
  
  1.17      +4 -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.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- web.xml	25 Jul 2002 17:02:51 -0000	1.16
  +++ web.xml	25 Jul 2002 18:26:12 -0000	1.17
  @@ -1729,6 +1729,10 @@
       <servlet-name>GetServletPathTest</servlet-name>
       <display-name>GetServletPathTest</display-name>
       <servlet-class>tests.javax_servlet_http.HttpServletRequest.GetServletPathTestServlet</servlet-class>
  +    <init-param>
  +      <param-name>expectedResult</param-name>
  +      <param-value>/GetServletPathTest</param-value>
  +    </init-param>
       <load-on-startup>0</load-on-startup>
     </servlet>
     <servlet>
  
  
  
  1.3       +4 -4      jakarta-watchdog-4.0/src/server/servlet-tests/WEB-INF/classes/tests/javax_servlet_http/HttpServletRequest/GetServletPathTestServlet.java
  
  Index: GetServletPathTestServlet.java
  ===================================================================
  RCS file: /home/cvs/jakarta-watchdog-4.0/src/server/servlet-tests/WEB-INF/classes/tests/javax_servlet_http/HttpServletRequest/GetServletPathTestServlet.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- GetServletPathTestServlet.java	11 Jan 2002 22:29:15 -0000	1.2
  +++ GetServletPathTestServlet.java	25 Jul 2002 18:26:12 -0000	1.3
  @@ -76,7 +76,7 @@
       public void service ( HttpServletRequest request, HttpServletResponse response ) throws ServletException, IOException {
   
           PrintWriter out = response.getWriter();
  -        String expectedResult = "/GetServletPathTest";
  +        String expectedResult = getServletConfig().getInitParameter("expectedResult");
           String result = request.getServletPath();
   
           if ( result != null ) {
  
  
  

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