M jsf-api/src/javax/faces/component/UICommand.java
M jsf-api/src/javax/faces/component/UIInput.java
Fix for JSFRI Issue 65. Port the fix from webtier alignment.
M jsf-ri/src/com/sun/faces/renderkit/html_basic/FormRenderer.java
Generated javascript should only clear out the hidden fields rendered
by the f
orm. Ported fix from webtier alignment.
M jsf-ri/src/com/sun/faces/renderkit/html_basic/OutputMessageRenderer.java
Fix for bug 6196704. If "value" is null, do not render anything.
M jsf-ri/web/test/RenderResponse_correct
updated golden file.
M jsf-tools/src/com/sun/faces/config/rules/AttributeRule.java
M jsf-tools/src/com/sun/faces/config/rules/ComponentRule.java
M jsf-tools/src/com/sun/faces/config/rules/ConverterRule.java
M jsf-tools/src/com/sun/faces/config/rules/ListEntriesRule.java
M jsf-tools/src/com/sun/faces/config/rules/ManagedBeanRule.java
M jsf-tools/src/com/sun/faces/config/rules/ManagedPropertyRule.java
M jsf-tools/src/com/sun/faces/config/rules/MapEntriesRule.java
M jsf-tools/src/com/sun/faces/config/rules/NavigationRuleRule.java
M jsf-tools/src/com/sun/faces/config/rules/PropertyRule.java
M jsf-tools/src/com/sun/faces/config/rules/ReferencedBeanRule.java
M jsf-tools/src/com/sun/faces/config/rules/RendererRule.java
M jsf-tools/src/com/sun/faces/config/rules/ValidatorRule.java
Fix for JSFRI Issue 81. when merging rules for converters, validator
etc, while parsing faces-config, lower the logging level to
"debug" from "warn"
Index: jsf-api/src/javax/faces/component/UICommand.java
===================================================================
RCS file: /cvs/javaserverfaces-sources/jsf-api/src/javax/faces/component/UICommand.java,v
retrieving revision 1.69
diff -u -r1.69 UICommand.java
--- jsf-api/src/javax/faces/component/UICommand.java 26 Feb 2004 20:30:30 -0000 1.69
+++ jsf-api/src/javax/faces/component/UICommand.java 10 Mar 2005 18:33:16 -0000
@@ -9,23 +9,16 @@
package javax.faces.component;
-
-import javax.faces.FacesException;
-import javax.faces.application.Application;
import javax.faces.context.FacesContext;
+import javax.faces.el.EvaluationException;
import javax.faces.el.MethodBinding;
import javax.faces.el.ValueBinding;
import javax.faces.event.AbortProcessingException;
import javax.faces.event.ActionEvent;
import javax.faces.event.ActionListener;
import javax.faces.event.FacesEvent;
-import javax.faces.event.FacesListener;
import javax.faces.event.PhaseId;
-import javax.faces.render.Renderer;
-import java.io.IOException;
-import java.util.Iterator;
-import java.util.List;
/**
@@ -300,9 +293,21 @@
FacesContext context = getFacesContext();
// Notify the specified action listener method (if any)
- MethodBinding mb = getActionListener();
- if (mb != null) {
- mb.invoke(context, new Object[] { event });
+ try {
+ MethodBinding mb = getActionListener();
+ if (mb != null) {
+ mb.invoke(context, new Object[] { event });
+ }
+ } catch (EvaluationException ee) {
+ Throwable cause = ee.getCause();
+ if (cause != null &&
+ cause instanceof AbortProcessingException) {
+ throw ((AbortProcessingException) cause);
+ }
+ if (cause != null && cause instanceof RuntimeException) {
+ throw ((RuntimeException) cause);
+ }
+ throw new IllegalStateException(ee.getMessage());
}
// Invoke the default ActionListener
Index: jsf-api/src/javax/faces/component/UIInput.java
===================================================================
RCS file: /cvs/javaserverfaces-sources/jsf-api/src/javax/faces/component/UIInput.java,v
retrieving revision 1.76
diff -u -r1.76 UIInput.java
--- jsf-api/src/javax/faces/component/UIInput.java 7 Mar 2005 21:50:27 -0000 1.76
+++ jsf-api/src/javax/faces/component/UIInput.java 10 Mar 2005 18:33:17 -0000
@@ -489,7 +489,19 @@
MethodBinding method = getValueChangeListener();
if (method != null) {
FacesContext context = getFacesContext();
- method.invoke(context, new Object[] { event });
+ try {
+ method.invoke(context, new Object[] { event });
+ } catch (EvaluationException ee) {
+ Throwable cause = ee.getCause();
+ if (cause != null &&
+ cause instanceof AbortProcessingException) {
+ throw ((AbortProcessingException) cause);
+ }
+ if (cause != null && cause instanceof RuntimeException) {
+ throw ((RuntimeException) cause);
+ }
+ throw new IllegalStateException(ee.getMessage());
+ }
}
}
Index: jsf-ri/src/com/sun/faces/renderkit/html_basic/FormRenderer.java
===================================================================
RCS file: /cvs/javaserverfaces-sources/jsf-ri/src/com/sun/faces/renderkit/html_basic/FormRenderer.java,v
retrieving revision 1.82
diff -u -r1.82 FormRenderer.java
--- jsf-ri/src/com/sun/faces/renderkit/html_basic/FormRenderer.java 16 Dec 2004 17:56:37 -0000 1.82
+++ jsf-ri/src/com/sun/faces/renderkit/html_basic/FormRenderer.java 10 Mar 2005 18:33:20 -0000
@@ -300,11 +300,16 @@
writer.write("(curFormName) {");
writer.write("\n var curForm = document.forms[curFormName];");
if (formParams != null) {
- for (Iterator it = formParams.keySet().iterator(); it.hasNext();){
- writer.write("\n curForm.elements['");
- writer.write((String)it.next());
- writer.write("'].value = null;");
- }
+ Iterator entries = formParams.entrySet().iterator();
+ // clear only the hidden fields rendered by the form.
+ while (entries.hasNext()) {
+ Map.Entry entry = (Map.Entry) entries.next();
+ if (Boolean.TRUE.equals(entry.getValue())) {
+ writer.write("\n curForm.elements['");
+ writer.write((String) entry.getKey());
+ writer.write("'].value = null;");
+ }
+ }
}
// clear form target attribute if its present
if (formTarget != null && formTarget.length() > 0) {
Index: jsf-ri/src/com/sun/faces/renderkit/html_basic/OutputMessageRenderer.java
===================================================================
RCS file: /cvs/javaserverfaces-sources/jsf-ri/src/com/sun/faces/renderkit/html_basic/OutputMessageRenderer.java,v
retrieving revision 1.17
diff -u -r1.17 OutputMessageRenderer.java
--- jsf-ri/src/com/sun/faces/renderkit/html_basic/OutputMessageRenderer.java 16 Dec 2004 17:56:38 -0000 1.17
+++ jsf-ri/src/com/sun/faces/renderkit/html_basic/OutputMessageRenderer.java 10 Mar 2005 18:33:20 -0000
@@ -124,6 +124,9 @@
} else {
currentValue = currentObj.toString();
}
+ } else {
+ // if the value is null, do not output anything.
+ return;
}
ArrayList parameterList = new ArrayList();
Index: jsf-ri/web/test/RenderResponse_correct
===================================================================
RCS file: /cvs/javaserverfaces-sources/jsf-ri/web/test/RenderResponse_correct,v
retrieving revision 1.116
diff -u -r1.116 RenderResponse_correct
--- jsf-ri/web/test/RenderResponse_correct 22 Feb 2005 15:56:18 -0000 1.116
+++ jsf-ri/web/test/RenderResponse_correct 10 Mar 2005 18:33:21 -0000
@@ -15,7 +15,7 @@
-<form id="basicForm" method="post" action="/test/faces/TestRenderResponsePhase.jsp;jsessionid=37C1D3C7AE588366085757C1E7074DA2" class="formClass" accept-charset="some-charset" accept="html,wml" enctype="application/x-www-form-urlencoded" target="_self" title="basicForm">
+<form id="basicForm" method="post" action="/test/faces/TestRenderResponsePhase.jsp;jsessionid=05F97B55D74F332D93FE3BF52D84CFAA" class="formClass" accept-charset="some-charset" accept="html,wml" enctype="application/x-www-form-urlencoded" target="_self" title="basicForm">
<TABLE BORDER="1">
@@ -130,12 +130,12 @@
- <a id="basicForm:imageLink" href="#" style="someStyle" onclick="clearFormHiddenParams_basicForm('basicForm');document.forms['basicForm']['basicForm:_idcl'].value='basicForm:imageLink'; document.forms['basicForm'].submit(); return false;"><img src="duke.gif;jsessionid=37C1D3C7AE588366085757C1E7074DA2" /></a>
+ <a id="basicForm:imageLink" href="#" style="someStyle" onclick="clearFormHiddenParams_basicForm('basicForm');document.forms['basicForm']['basicForm:_idcl'].value='basicForm:imageLink'; document.forms['basicForm'].submit(); return false;"><img src="duke.gif;jsessionid=05F97B55D74F332D93FE3BF52D84CFAA" /></a>
</TD>
<TD>
- <img id="basicForm:graphicImage" src="/test/duke.gif;jsessionid=37C1D3C7AE588366085757C1E7074DA2" style="someStyle" usemap="#map1" ismap="ismap" />
+ <img id="basicForm:graphicImage" src="/test/duke.gif;jsessionid=05F97B55D74F332D93FE3BF52D84CFAA" style="someStyle" usemap="#map1" ismap="ismap" />
</TD>
</TR>
@@ -169,7 +169,7 @@
- <a id="basicForm:hrefParamLink" href="#" onclick="clearFormHiddenParams_basicForm('basicForm');document.forms['basicForm']['basicForm:_idcl'].value='basicForm:hrefParamLink';document.forms['basicForm']['name'].value='horwat';document.forms['basicForm']['value'].value='password'; document.forms['basicForm'].target='_top'; document.forms['basicForm'].submit(); return false;"><img src="duke.gif;jsessionid=37C1D3C7AE588366085757C1E7074DA2" /></a>
+ <a id="basicForm:hrefParamLink" href="#" onclick="clearFormHiddenParams_basicForm('basicForm');document.forms['basicForm']['basicForm:_idcl'].value='basicForm:hrefParamLink';document.forms['basicForm']['name'].value='horwat';document.forms['basicForm']['value'].value='password'; document.forms['basicForm'].target='_top'; document.forms['basicForm'].submit(); return false;"><img src="duke.gif;jsessionid=05F97B55D74F332D93FE3BF52D84CFAA" /></a>
</TD>
</TR>
@@ -177,7 +177,7 @@
<TD>
- <a id="basicForm:outputLink" href="test.html;jsessionid=37C1D3C7AE588366085757C1E7074DA2" class="hyperlinkClass">output link text</a>
+ <a id="basicForm:outputLink" href="test.html;jsessionid=05F97B55D74F332D93FE3BF52D84CFAA" class="hyperlinkClass">output link text</a>
</TD>
@@ -189,12 +189,12 @@
- <a id="basicForm:output_imageLink" href="test.html;jsessionid=37C1D3C7AE588366085757C1E7074DA2" style="position: absolute; left: 96px; top: 168px"><img src="duke.gif;jsessionid=37C1D3C7AE588366085757C1E7074DA2" /></a>
+ <a id="basicForm:output_imageLink" href="test.html;jsessionid=05F97B55D74F332D93FE3BF52D84CFAA" style="position: absolute; left: 96px; top: 168px"><img src="duke.gif;jsessionid=05F97B55D74F332D93FE3BF52D84CFAA" /></a>
</TD>
<TD>
- <img id="basicForm:output_graphicImage" src="/test/duke.gif;jsessionid=37C1D3C7AE588366085757C1E7074DA2" usemap="#map1" ismap="ismap" />
+ <img id="basicForm:output_graphicImage" src="/test/duke.gif;jsessionid=05F97B55D74F332D93FE3BF52D84CFAA" usemap="#map1" ismap="ismap" />
</TD>
</TR>
@@ -202,7 +202,7 @@
<TR>
<TD>
- <a id="basicForm:output_commandLink" href="test.html;jsessionid=37C1D3C7AE588366085757C1E7074DA2" style="position: absolute; left: 96px; top: 168px" class="hyperlinkClass">link text</a>
+ <a id="basicForm:output_commandLink" href="test.html;jsessionid=05F97B55D74F332D93FE3BF52D84CFAA" style="position: absolute; left: 96px; top: 168px" class="hyperlinkClass">link text</a>
</TD>
</TR>
@@ -212,13 +212,13 @@
- <a id="basicForm:output_commandParamLink" href="test.html;jsessionid=37C1D3C7AE588366085757C1E7074DA2?name=horwat&value=password" class="hyperlinkClass">link text</a>
+ <a id="basicForm:output_commandParamLink" href="test.html;jsessionid=05F97B55D74F332D93FE3BF52D84CFAA?name=horwat&value=password" class="hyperlinkClass">link text</a>
</TD>
</TR>
<TR>
<TD>
- <a id="basicForm:output_hrefLink" href="test.html;jsessionid=37C1D3C7AE588366085757C1E7074DA2"><img src="duke.gif"></a>
+ <a id="basicForm:output_hrefLink" href="test.html;jsessionid=05F97B55D74F332D93FE3BF52D84CFAA"><img src="duke.gif"></a>
</TD>
</TR>
@@ -228,7 +228,7 @@
- <a id="basicForm:output_hrefParamLink" href="test.html;jsessionid=37C1D3C7AE588366085757C1E7074DA2?name=horwat&value=password"><img src="duke.gif;jsessionid=37C1D3C7AE588366085757C1E7074DA2" /></a>
+ <a id="basicForm:output_hrefParamLink" href="test.html;jsessionid=05F97B55D74F332D93FE3BF52D84CFAA?name=horwat&value=password"><img src="duke.gif;jsessionid=05F97B55D74F332D93FE3BF52D84CFAA" /></a>
</TD>
</TR>
@@ -917,7 +917,6 @@
<!--
function clearFormHiddenParams_basicForm(curFormName) {
var curForm = document.forms[curFormName];
- curForm.elements['basicForm:_id82'].value = null;
curForm.elements['value'].value = null;
curForm.elements['basicForm:_idcl'].value = null;
curForm.elements['name'].value = null;
Index: jsf-tools/src/com/sun/faces/config/rules/AttributeRule.java
===================================================================
RCS file: /cvs/javaserverfaces-sources/jsf-tools/src/com/sun/faces/config/rules/AttributeRule.java,v
retrieving revision 1.3
diff -u -r1.3 AttributeRule.java
--- jsf-tools/src/com/sun/faces/config/rules/AttributeRule.java 4 Feb 2004 23:46:20 -0000 1.3
+++ jsf-tools/src/com/sun/faces/config/rules/AttributeRule.java 10 Mar 2005 18:33:21 -0000
@@ -116,8 +116,8 @@
}
ah.addAttribute(top);
} else {
- if (digester.getLogger().isWarnEnabled()) {
- digester.getLogger().warn("[AttributeRule]{" +
+ if (digester.getLogger().isDebugEnabled()) {
+ digester.getLogger().debug("[AttributeRule]{" +
digester.getMatch() +
"} Merge(" +
top.getAttributeName() +
Index: jsf-tools/src/com/sun/faces/config/rules/ComponentRule.java
===================================================================
RCS file: /cvs/javaserverfaces-sources/jsf-tools/src/com/sun/faces/config/rules/ComponentRule.java,v
retrieving revision 1.3
diff -u -r1.3 ComponentRule.java
--- jsf-tools/src/com/sun/faces/config/rules/ComponentRule.java 4 Feb 2004 23:46:20 -0000 1.3
+++ jsf-tools/src/com/sun/faces/config/rules/ComponentRule.java 10 Mar 2005 18:33:21 -0000
@@ -116,8 +116,8 @@
}
fcb.addComponent(top);
} else {
- if (digester.getLogger().isWarnEnabled()) {
- digester.getLogger().warn("[ComponentRule]{" +
+ if (digester.getLogger().isDebugEnabled()) {
+ digester.getLogger().debug("[ComponentRule]{" +
digester.getMatch() +
"} Merge(" +
top.getComponentType() +
Index: jsf-tools/src/com/sun/faces/config/rules/ConverterRule.java
===================================================================
RCS file: /cvs/javaserverfaces-sources/jsf-tools/src/com/sun/faces/config/rules/ConverterRule.java,v
retrieving revision 1.3
diff -u -r1.3 ConverterRule.java
--- jsf-tools/src/com/sun/faces/config/rules/ConverterRule.java 4 Feb 2004 23:46:21 -0000 1.3
+++ jsf-tools/src/com/sun/faces/config/rules/ConverterRule.java 10 Mar 2005 18:33:21 -0000
@@ -123,8 +123,8 @@
}
fcb.addConverter(top);
} else {
- if (digester.getLogger().isWarnEnabled()) {
- digester.getLogger().warn("[ConverterRule]{" +
+ if (digester.getLogger().isDebugEnabled()) {
+ digester.getLogger().debug("[ConverterRule]{" +
digester.getMatch() +
"} Merge(" +
top.getConverterId() +
Index: jsf-tools/src/com/sun/faces/config/rules/ListEntriesRule.java
===================================================================
RCS file: /cvs/javaserverfaces-sources/jsf-tools/src/com/sun/faces/config/rules/ListEntriesRule.java,v
retrieving revision 1.3
diff -u -r1.3 ListEntriesRule.java
--- jsf-tools/src/com/sun/faces/config/rules/ListEntriesRule.java 4 Feb 2004 23:46:22 -0000 1.3
+++ jsf-tools/src/com/sun/faces/config/rules/ListEntriesRule.java 10 Mar 2005 18:33:21 -0000
@@ -114,8 +114,8 @@
}
leh.setListEntries(top);
} else {
- if (digester.getLogger().isWarnEnabled()) {
- digester.getLogger().warn("[ManagedBeanRule]{" +
+ if (digester.getLogger().isDebugEnabled()) {
+ digester.getLogger().debug("[ManagedBeanRule]{" +
digester.getMatch() +
"} Merge");
}
Index: jsf-tools/src/com/sun/faces/config/rules/ManagedBeanRule.java
===================================================================
RCS file: /cvs/javaserverfaces-sources/jsf-tools/src/com/sun/faces/config/rules/ManagedBeanRule.java,v
retrieving revision 1.4
diff -u -r1.4 ManagedBeanRule.java
--- jsf-tools/src/com/sun/faces/config/rules/ManagedBeanRule.java 23 Nov 2004 19:26:55 -0000 1.4
+++ jsf-tools/src/com/sun/faces/config/rules/ManagedBeanRule.java 10 Mar 2005 18:33:21 -0000
@@ -130,8 +130,8 @@
}
fcb.addManagedBean(top);
} else {
- if (digester.getLogger().isWarnEnabled()) {
- digester.getLogger().warn("[ManagedBeanRule]{" +
+ if (digester.getLogger().isDebugEnabled()) {
+ digester.getLogger().debug("[ManagedBeanRule]{" +
digester.getMatch() +
"} Merge(" +
top.getManagedBeanName() +
Index: jsf-tools/src/com/sun/faces/config/rules/ManagedPropertyRule.java
===================================================================
RCS file: /cvs/javaserverfaces-sources/jsf-tools/src/com/sun/faces/config/rules/ManagedPropertyRule.java,v
retrieving revision 1.4
diff -u -r1.4 ManagedPropertyRule.java
--- jsf-tools/src/com/sun/faces/config/rules/ManagedPropertyRule.java 23 Nov 2004 19:26:56 -0000 1.4
+++ jsf-tools/src/com/sun/faces/config/rules/ManagedPropertyRule.java 10 Mar 2005 18:33:21 -0000
@@ -120,8 +120,8 @@
}
mbb.addManagedProperty(top);
} else {
- if (digester.getLogger().isWarnEnabled()) {
- digester.getLogger().warn("[ManagedPropertyRule]{" +
+ if (digester.getLogger().isDebugEnabled()) {
+ digester.getLogger().debug("[ManagedPropertyRule]{" +
digester.getMatch() +
"} Merge(" +
top.getPropertyName() +
Index: jsf-tools/src/com/sun/faces/config/rules/MapEntriesRule.java
===================================================================
RCS file: /cvs/javaserverfaces-sources/jsf-tools/src/com/sun/faces/config/rules/MapEntriesRule.java,v
retrieving revision 1.3
diff -u -r1.3 MapEntriesRule.java
--- jsf-tools/src/com/sun/faces/config/rules/MapEntriesRule.java 4 Feb 2004 23:46:22 -0000 1.3
+++ jsf-tools/src/com/sun/faces/config/rules/MapEntriesRule.java 10 Mar 2005 18:33:21 -0000
@@ -115,8 +115,8 @@
}
meh.setMapEntries(top);
} else {
- if (digester.getLogger().isWarnEnabled()) {
- digester.getLogger().warn("[ManagedBeanRule]{" +
+ if (digester.getLogger().isDebugEnabled()) {
+ digester.getLogger().debug("[ManagedBeanRule]{" +
digester.getMatch() +
"} Merge");
}
Index: jsf-tools/src/com/sun/faces/config/rules/NavigationRuleRule.java
===================================================================
RCS file: /cvs/javaserverfaces-sources/jsf-tools/src/com/sun/faces/config/rules/NavigationRuleRule.java,v
retrieving revision 1.3
diff -u -r1.3 NavigationRuleRule.java
--- jsf-tools/src/com/sun/faces/config/rules/NavigationRuleRule.java 4 Feb 2004 23:46:23 -0000 1.3
+++ jsf-tools/src/com/sun/faces/config/rules/NavigationRuleRule.java 10 Mar 2005 18:33:22 -0000
@@ -117,8 +117,8 @@
}
fcb.addNavigationRule(top);
} else {
- if (digester.getLogger().isWarnEnabled()) {
- digester.getLogger().warn("[NavigationRuleRule]{" +
+ if (digester.getLogger().isDebugEnabled()) {
+ digester.getLogger().debug("[NavigationRuleRule]{" +
digester.getMatch() +
"} Merge(" +
top.getFromViewId() +
Index: jsf-tools/src/com/sun/faces/config/rules/PropertyRule.java
===================================================================
RCS file: /cvs/javaserverfaces-sources/jsf-tools/src/com/sun/faces/config/rules/PropertyRule.java,v
retrieving revision 1.3
diff -u -r1.3 PropertyRule.java
--- jsf-tools/src/com/sun/faces/config/rules/PropertyRule.java 4 Feb 2004 23:46:23 -0000 1.3
+++ jsf-tools/src/com/sun/faces/config/rules/PropertyRule.java 10 Mar 2005 18:33:22 -0000
@@ -116,8 +116,8 @@
}
ah.addProperty(top);
} else {
- if (digester.getLogger().isWarnEnabled()) {
- digester.getLogger().warn("[PropertyRule]{" +
+ if (digester.getLogger().isDebugEnabled()) {
+ digester.getLogger().debug("[PropertyRule]{" +
digester.getMatch() +
"} Merge(" +
top.getPropertyName() +
Index: jsf-tools/src/com/sun/faces/config/rules/ReferencedBeanRule.java
===================================================================
RCS file: /cvs/javaserverfaces-sources/jsf-tools/src/com/sun/faces/config/rules/ReferencedBeanRule.java,v
retrieving revision 1.3
diff -u -r1.3 ReferencedBeanRule.java
--- jsf-tools/src/com/sun/faces/config/rules/ReferencedBeanRule.java 4 Feb 2004 23:46:23 -0000 1.3
+++ jsf-tools/src/com/sun/faces/config/rules/ReferencedBeanRule.java 10 Mar 2005 18:33:22 -0000
@@ -116,8 +116,8 @@
}
fcb.addReferencedBean(top);
} else {
- if (digester.getLogger().isWarnEnabled()) {
- digester.getLogger().warn("[ReferencedBeanRule]{" +
+ if (digester.getLogger().isDebugEnabled()) {
+ digester.getLogger().debug("[ReferencedBeanRule]{" +
digester.getMatch() +
"} Merge(" +
top.getReferencedBeanName() +
Index: jsf-tools/src/com/sun/faces/config/rules/RendererRule.java
===================================================================
RCS file: /cvs/javaserverfaces-sources/jsf-tools/src/com/sun/faces/config/rules/RendererRule.java,v
retrieving revision 1.4
diff -u -r1.4 RendererRule.java
--- jsf-tools/src/com/sun/faces/config/rules/RendererRule.java 4 Feb 2004 23:46:23 -0000 1.4
+++ jsf-tools/src/com/sun/faces/config/rules/RendererRule.java 10 Mar 2005 18:33:22 -0000
@@ -119,8 +119,8 @@
}
rkb.addRenderer(top);
} else {
- if (digester.getLogger().isWarnEnabled()) {
- digester.getLogger().warn("[RendererRule]{" +
+ if (digester.getLogger().isDebugEnabled()) {
+ digester.getLogger().debug("[RendererRule]{" +
digester.getMatch() +
"} Merge(" +
top.getComponentFamily() +
Index: jsf-tools/src/com/sun/faces/config/rules/ValidatorRule.java
===================================================================
RCS file: /cvs/javaserverfaces-sources/jsf-tools/src/com/sun/faces/config/rules/ValidatorRule.java,v
retrieving revision 1.3
diff -u -r1.3 ValidatorRule.java
--- jsf-tools/src/com/sun/faces/config/rules/ValidatorRule.java 4 Feb 2004 23:46:24 -0000 1.3
+++ jsf-tools/src/com/sun/faces/config/rules/ValidatorRule.java 10 Mar 2005 18:33:22 -0000
@@ -116,8 +116,8 @@
}
fcb.addValidator(top);
} else {
- if (digester.getLogger().isWarnEnabled()) {
- digester.getLogger().warn("[ValidatorRule]{" +
+ if (digester.getLogger().isDebugEnabled()) {
+ digester.getLogger().debug("[ValidatorRule]{" +
digester.getMatch() +
"} Merge(" +
top.getValidatorId() +