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 2008/07/10 00:38:12 UTC
svn commit: r675369 - in /myfaces/core/trunk_1.2.x/api/src/main:
java/javax/faces/webapp/ resources/META-INF/rsc/
Author: lu4242
Date: Wed Jul 9 15:38:11 2008
New Revision: 675369
URL: http://svn.apache.org/viewvc?rev=675369&view=rev
Log:
MYFACES-1853 ErrorPageWriter causes Facelets/MyFaces confusion
Added:
myfaces/core/trunk_1.2.x/api/src/main/resources/META-INF/rsc/myfaces-dev-debug.xml
- copied unchanged from r674935, myfaces/core/trunk_1.2.x/api/src/main/resources/META-INF/rsc/facelet-dev-debug.xml
myfaces/core/trunk_1.2.x/api/src/main/resources/META-INF/rsc/myfaces-dev-error.xml
- copied unchanged from r674935, myfaces/core/trunk_1.2.x/api/src/main/resources/META-INF/rsc/facelet-dev-error.xml
Removed:
myfaces/core/trunk_1.2.x/api/src/main/resources/META-INF/rsc/facelet-dev-debug.xml
myfaces/core/trunk_1.2.x/api/src/main/resources/META-INF/rsc/facelet-dev-error.xml
Modified:
myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/webapp/_ErrorPageWriter.java
Modified: myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/webapp/_ErrorPageWriter.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/webapp/_ErrorPageWriter.java?rev=675369&r1=675368&r2=675369&view=diff
==============================================================================
--- myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/webapp/_ErrorPageWriter.java (original)
+++ myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/webapp/_ErrorPageWriter.java Wed Jul 9 15:38:11 2008
@@ -47,25 +47,49 @@
private final static String TS = "<";
- private static final String ERROR_TEMPLATE = "META-INF/rsc/facelet-dev-error.xml";
+ private static final String ERROR_TEMPLATE = "META-INF/rsc/myfaces-dev-error.xml";
+
+ private static final String ERROR_TEMPLATE_RESOURCE = "org.apache.myfaces.ERROR_TEMPLATE_RESOURCE";
private static String[] ERROR_PARTS;
- private static final String DEBUG_TEMPLATE = "META-INF/rsc/facelet-dev-debug.xml";
+ private static final String DEBUG_TEMPLATE = "META-INF/rsc/myfaces-dev-debug.xml";
+
+ private static final String DEBUG_TEMPLATE_RESOURCE = "org.apache.myfaces.DEBUG_TEMPLATE_RESOURCE";
private static String[] DEBUG_PARTS;
public _ErrorPageWriter() {
super();
}
-
- private static void init() throws IOException {
+
+ private static String getErrorTemplate(FacesContext context)
+ {
+ String errorTemplate = context.getExternalContext().getInitParameter(ERROR_TEMPLATE_RESOURCE);
+ if (errorTemplate != null)
+ {
+ return errorTemplate;
+ }
+ return ERROR_TEMPLATE;
+ }
+
+ private static String getDebugTemplate(FacesContext context)
+ {
+ String debugTemplate = context.getExternalContext().getInitParameter(DEBUG_TEMPLATE_RESOURCE);
+ if (debugTemplate != null)
+ {
+ return debugTemplate;
+ }
+ return DEBUG_TEMPLATE;
+ }
+
+ private static void init(FacesContext context) throws IOException {
if (ERROR_PARTS == null) {
- ERROR_PARTS = splitTemplate(ERROR_TEMPLATE);
+ ERROR_PARTS = splitTemplate(getErrorTemplate(context));
}
if (DEBUG_PARTS == null) {
- DEBUG_PARTS = splitTemplate(DEBUG_TEMPLATE);
+ DEBUG_PARTS = splitTemplate(getDebugTemplate(context));
}
}
@@ -117,7 +141,7 @@
}
public static void debugHtml(Writer writer, FacesContext faces, Throwable e) throws IOException {
- init();
+ init(faces);
Date now = new Date();
for (int i = 0; i < ERROR_PARTS.length; i++) {
if ("message".equals(ERROR_PARTS[i])) {
@@ -147,7 +171,7 @@
public static void debugHtml(Writer writer, FacesContext faces, List exceptionList) throws IOException
{
- init();
+ init(faces);
Date now = new Date();
for (int i = 0; i < ERROR_PARTS.length; i++)
{
@@ -235,7 +259,7 @@
}
public static void debugHtml(Writer writer, FacesContext faces) throws IOException {
- init();
+ init(faces);
Date now = new Date();
for (int i = 0; i < DEBUG_PARTS.length; i++) {
if ("message".equals(DEBUG_PARTS[i])) {