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)

git-svn-id: https://svn.apache.org/repos/asf/tomcat/tc7.0.x/trunk@1431323 13f79535-47bb-0310-9956-ffa450edef68
Merged revision 1431310 from tomcat/trunk:
Tests for https://issues.apache.org/bugzilla/show_bug.cgi?id=54391


git-svn-id: https://svn.apache.org/repos/asf/tomcat/tc7.0.x/trunk@1431324 13f79535-47bb-0310-9956-ffa450edef68
Merged revision 1431298 from tomcat/trunk:
Remove unnecessary warnings
(It was me who added those @SuppressWarnings several days ago. These are unneeded if "Potential resource leaks" warning is turned off in IDE).

git-svn-id: https://svn.apache.org/repos/asf/tomcat/tc7.0.x/trunk@1431337 13f79535-47bb-0310-9956-ffa450edef68