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:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
