rleland 2003/07/14 20:41:51
Modified: src/share/org/apache/struts/action Tag: STRUTS_1_1_BRANCH
ActionResources.properties ActionServlet.java
Log:
Pull change for Adding for more descriptiove error message when web.xml
not found plus add missing resource message.PR# 21203
Revision Changes Path
No revision
No revision
1.11.2.1 +1 -0
jakarta-struts/src/share/org/apache/struts/action/ActionResources.properties
Index: ActionResources.properties
===================================================================
RCS file:
/home/cvs/jakarta-struts/src/share/org/apache/struts/action/ActionResources.properties,v
retrieving revision 1.11
retrieving revision 1.11.2.1
diff -u -r1.11 -r1.11.2.1
--- ActionResources.properties 7 Jan 2003 06:14:59 -0000 1.11
+++ ActionResources.properties 15 Jul 2003 03:41:50 -0000 1.11.2.1
@@ -9,6 +9,7 @@
configMissing=Missing configuration resource for path {0}
configParse=Parsing error processing resource path {0}
configVerifying=Verifying ModuleConfig for this application module
+configWebXml=The /WEB-INF/web.xml was not found.
dataSource.destroy=Finalizing application data source {0}
dataSource.init=Initializing application data source {0}
destroyDataSource=Exception destroying application data source {0}
1.150.2.1 +9 -4
jakarta-struts/src/share/org/apache/struts/action/ActionServlet.java
Index: ActionServlet.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/src/share/org/apache/struts/action/ActionServlet.java,v
retrieving revision 1.150
retrieving revision 1.150.2.1
diff -u -r1.150 -r1.150.2.1
--- ActionServlet.java 28 Jun 2003 06:16:34 -0000 1.150
+++ ActionServlet.java 15 Jul 2003 03:41:50 -0000 1.150.2.1
@@ -1428,6 +1428,11 @@
InputStream input =
getServletContext().getResourceAsStream("/WEB-INF/web.xml");
+
+ if (input == null) {
+ log.error(internal.getMessage("configWebXml"));
+ throw new ServletException(internal.getMessage("configWebXml"));
+ }
try {
digester.parse(input);
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
