Author: kkolinko
Date: Thu Jan 10 12:42:39 2013
New Revision: 1431323
URL: http://svn.apache.org/viewvc?rev=1431323&view=rev
Log:
Merged revision 1431302 from tomcat/trunk:
Add name of JSP file to an error message in JspServlet.
Fix misconfiguration that caused
org.apache.catalina.core.TestStandardContextResources test to log this message,
javax.servlet.ServletException: missing jspFile
at org.apache.jasper.servlet.JspServlet.init(JspServlet.java:123)
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/jasper/servlet/JspServlet.java
tomcat/tc7.0.x/trunk/test/webapp-3.0-fragments/WEB-INF/web.xml
Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
Merged /tomcat/trunk:r1431302
Modified: tomcat/tc7.0.x/trunk/java/org/apache/jasper/servlet/JspServlet.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/jasper/servlet/JspServlet.java?rev=1431323&r1=1431322&r2=1431323&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/jasper/servlet/JspServlet.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/jasper/servlet/JspServlet.java Thu Jan
10 12:42:39 2013
@@ -120,7 +120,7 @@ public class JspServlet extends HttpServ
jspFile = config.getInitParameter("jspFile");
try {
if (null == context.getResource(jspFile)) {
- throw new ServletException("missing jspFile");
+ throw new ServletException("missing jspFile: [" + jspFile
+ "]");
}
} catch (MalformedURLException e) {
throw new ServletException("Can not locate jsp file", e);
Modified: tomcat/tc7.0.x/trunk/test/webapp-3.0-fragments/WEB-INF/web.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/webapp-3.0-fragments/WEB-INF/web.xml?rev=1431323&r1=1431322&r2=1431323&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/test/webapp-3.0-fragments/WEB-INF/web.xml (original)
+++ tomcat/tc7.0.x/trunk/test/webapp-3.0-fragments/WEB-INF/web.xml Thu Jan 10
12:42:39 2013
@@ -46,7 +46,7 @@
<!-- Bug 51396 -->
<servlet>
<servlet-name>bug51396</servlet-name>
- <jsp-file>/bug5nnnn/bug51396.jsp</jsp-file>
+ <jsp-file>/bug51396.jsp</jsp-file>
</servlet>
<post-construct>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
