morgand 2002/07/25 09:51:32
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
GetRequestURITestServlet.java
Log:
moved RequestURITestServlet expected URI from hardcoded value to servlet init param
Revision Changes Path
1.6 +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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- servlet-tests.web.xml 24 Jul 2002 19:00:17 -0000 1.5
+++ servlet-tests.web.xml 25 Jul 2002 16:51:31 -0000 1.6
@@ -3603,6 +3603,11 @@
<servlet-class>tests.javax_servlet_http.HttpServletRequest.GetRequestURITestServlet</servlet-class>
+ <init-param>
+ <param-name>expectedResult</param-name>
+
<param-value>/servlet-tests/tests/javax_servlet_http/HttpServletRequest/GetRequestURITestServlet</param-value>
+ </init-param>
+
<load-on-startup>0</load-on-startup>
1.15 +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.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- web.xml 24 Jul 2002 19:00:17 -0000 1.14
+++ web.xml 25 Jul 2002 16:51:32 -0000 1.15
@@ -1719,6 +1719,10 @@
<servlet-name>GetRequestURITest</servlet-name>
<display-name>GetRequestURITest</display-name>
<servlet-class>tests.javax_servlet_http.HttpServletRequest.GetRequestURITestServlet</servlet-class>
+ <init-param>
+ <param-name>expectedResult</param-name>
+ <param-value>/servlet-tests/GetRequestURITest</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/GetRequestURITestServlet.java
Index: GetRequestURITestServlet.java
===================================================================
RCS file:
/home/cvs/jakarta-watchdog-4.0/src/server/servlet-tests/WEB-INF/classes/tests/javax_servlet_http/HttpServletRequest/GetRequestURITestServlet.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- GetRequestURITestServlet.java 11 Jan 2002 22:29:15 -0000 1.2
+++ GetRequestURITestServlet.java 25 Jul 2002 16:51:32 -0000 1.3
@@ -77,7 +77,7 @@
public void service ( HttpServletRequest request, HttpServletResponse response
) throws ServletException, IOException {
PrintWriter out = response.getWriter();
- String expectedResult = "/servlet-tests/GetRequestURITest";
+ String expectedResult =
getServletConfig().getInitParameter("expectedResult");
String result = request.getRequestURI();
//not null value expected
if ( result != null ) {
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
