You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lu...@apache.org on 2009/12/28 22:54:31 UTC
svn commit: r894253 - in
/myfaces/shared/trunk_4.0.x/core/src/main/java/org/apache/myfaces/shared/webapp/webxml:
WebXml.java WebXmlParser.java
Author: lu4242
Date: Mon Dec 28 21:54:28 2009
New Revision: 894253
URL: http://svn.apache.org/viewvc?rev=894253&view=rev
Log:
MYFACES-2454 Adapt default error page generation to new spec (Thanks to Jakob Korherr for this patch)
Modified:
myfaces/shared/trunk_4.0.x/core/src/main/java/org/apache/myfaces/shared/webapp/webxml/WebXml.java
myfaces/shared/trunk_4.0.x/core/src/main/java/org/apache/myfaces/shared/webapp/webxml/WebXmlParser.java
Modified: myfaces/shared/trunk_4.0.x/core/src/main/java/org/apache/myfaces/shared/webapp/webxml/WebXml.java
URL: http://svn.apache.org/viewvc/myfaces/shared/trunk_4.0.x/core/src/main/java/org/apache/myfaces/shared/webapp/webxml/WebXml.java?rev=894253&r1=894252&r2=894253&view=diff
==============================================================================
--- myfaces/shared/trunk_4.0.x/core/src/main/java/org/apache/myfaces/shared/webapp/webxml/WebXml.java (original)
+++ myfaces/shared/trunk_4.0.x/core/src/main/java/org/apache/myfaces/shared/webapp/webxml/WebXml.java Mon Dec 28 21:54:28 2009
@@ -53,6 +53,7 @@
private volatile List _facesExtensionsFilterMappings = null;
private String _delegateFacesServlet = null;
+ private boolean errorPagePresent = false;
void addServlet(String servletName, String servletClass)
{
@@ -212,6 +213,24 @@
{
this._delegateFacesServlet = delegateFacesServlet;
}
+
+ /**
+ * Sets if, the web.xml contains an error-page entry
+ * @param errorPagePresent
+ */
+ public void setErrorPagePresent(boolean errorPagePresent)
+ {
+ this.errorPagePresent = errorPagePresent;
+ }
+
+ /**
+ * Determines, if the web.xml contains an error-page entry
+ * @return
+ */
+ public boolean isErrorPagePresent()
+ {
+ return errorPagePresent;
+ }
protected boolean isOld(ExternalContext context)
{
Modified: myfaces/shared/trunk_4.0.x/core/src/main/java/org/apache/myfaces/shared/webapp/webxml/WebXmlParser.java
URL: http://svn.apache.org/viewvc/myfaces/shared/trunk_4.0.x/core/src/main/java/org/apache/myfaces/shared/webapp/webxml/WebXmlParser.java?rev=894253&r1=894252&r2=894253&view=diff
==============================================================================
--- myfaces/shared/trunk_4.0.x/core/src/main/java/org/apache/myfaces/shared/webapp/webxml/WebXmlParser.java (original)
+++ myfaces/shared/trunk_4.0.x/core/src/main/java/org/apache/myfaces/shared/webapp/webxml/WebXmlParser.java Mon Dec 28 21:54:28 2009
@@ -63,7 +63,7 @@
private static final String WEB_APP_2_3_SYSTEM_ID = "http://java.sun.com/dtd/web-app_2_3.dtd";
private static final String WEB_APP_2_3_RESOURCE = "javax/servlet/resources/web-app_2_3.dtd";
-
+
private ExternalContext _context;
private org.apache.myfaces.shared.webapp.webxml.WebXml _webXml;
@@ -108,7 +108,7 @@
}
readWebApp(webAppElem);
-
+
return _webXml;
}
catch (Exception e)
@@ -220,6 +220,10 @@
{
readFilterMapping((Element)n);
}
+ if (n.getNodeName().equals("error-page"))
+ {
+ _webXml.setErrorPagePresent(true);
+ }
}
else
{