morgand 2002/07/24 11:44: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
IncludeTestServlet.java
Log:
moved IncludeTestServlet target from hardcoded value to servlet init param
Revision Changes Path
1.4 +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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- servlet-tests.web.xml 24 Jul 2002 18:22:44 -0000 1.3
+++ servlet-tests.web.xml 24 Jul 2002 18:44:17 -0000 1.4
@@ -834,6 +834,11 @@
<servlet-class>tests.javax_servlet.RequestDispatcher.IncludeTestServlet</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>
1.13 +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.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- web.xml 24 Jul 2002 18:22:45 -0000 1.12
+++ web.xml 24 Jul 2002 18:44:17 -0000 1.13
@@ -402,6 +402,10 @@
<servlet-name>IncludeTest</servlet-name>
<display-name>IncludeTest</display-name>
<servlet-class>tests.javax_servlet.RequestDispatcher.IncludeTestServlet</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>
1.3 +1 -1
jakarta-watchdog-4.0/src/server/servlet-tests/WEB-INF/classes/tests/javax_servlet/RequestDispatcher/IncludeTestServlet.java
Index: IncludeTestServlet.java
===================================================================
RCS file:
/home/cvs/jakarta-watchdog-4.0/src/server/servlet-tests/WEB-INF/classes/tests/javax_servlet/RequestDispatcher/IncludeTestServlet.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- IncludeTestServlet.java 11 Jan 2002 22:20:54 -0000 1.2
+++ IncludeTestServlet.java 24 Jul 2002 18:44:17 -0000 1.3
@@ -77,7 +77,7 @@
public void service( HttpServletRequest request, HttpServletResponse response )
throws ServletException, IOException {
- 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]>
