Author: carnold
Date: Thu Apr 26 11:03:07 2007
New Revision: 532826
URL: http://svn.apache.org/viewvc?view=rev&rev=532826
Log:
Bug 42257: Tweaks on unrecognized element delegation
Modified:
logging/log4j/branches/v1_2-branch/src/java/org/apache/log4j/xml/DOMConfigurator.java
logging/log4j/branches/v1_2-branch/src/java/org/apache/log4j/xml/log4j.dtd
Modified:
logging/log4j/branches/v1_2-branch/src/java/org/apache/log4j/xml/DOMConfigurator.java
URL:
http://svn.apache.org/viewvc/logging/log4j/branches/v1_2-branch/src/java/org/apache/log4j/xml/DOMConfigurator.java?view=diff&rev=532826&r1=532825&r2=532826
==============================================================================
---
logging/log4j/branches/v1_2-branch/src/java/org/apache/log4j/xml/DOMConfigurator.java
(original)
+++
logging/log4j/branches/v1_2-branch/src/java/org/apache/log4j/xml/DOMConfigurator.java
Thu Apr 26 11:03:07 2007
@@ -278,7 +278,7 @@
"] which does not implement
org.apache.log4j.spi.AppenderAttachable.");
}
} else {
- parseUnrecognizedElement(instance, appenderElement, props);
+ parseUnrecognizedElement(instance, currentElement, props);
}
}
}
@@ -907,7 +907,9 @@
parseRoot(currentElement);
} else if(tagName.equals(RENDERER_TAG)) {
parseRenderer(currentElement);
- } else if (!tagName.equals(CATEGORY_FACTORY_TAG)) {
+ } else if (!(tagName.equals(APPENDER_TAG)
+ || tagName.equals(CATEGORY_FACTORY_TAG)
+ || tagName.equals(LOGGER_FACTORY_TAG))) {
quietParseUnrecognizedElement(repository, currentElement, props);
}
}
Modified:
logging/log4j/branches/v1_2-branch/src/java/org/apache/log4j/xml/log4j.dtd
URL:
http://svn.apache.org/viewvc/logging/log4j/branches/v1_2-branch/src/java/org/apache/log4j/xml/log4j.dtd?view=diff&rev=532826&r1=532825&r2=532826
==============================================================================
--- logging/log4j/branches/v1_2-branch/src/java/org/apache/log4j/xml/log4j.dtd
(original)
+++ logging/log4j/branches/v1_2-branch/src/java/org/apache/log4j/xml/log4j.dtd
Thu Apr 26 11:03:07 2007
@@ -136,14 +136,14 @@
>
<!ELEMENT triggeringPolicy ((param|filter)*)>
-<!ATTLIST plugin
- name CDATA #REQUIRED
+<!ATTLIST triggeringPolicy
+ name CDATA #IMPLIED
class CDATA #REQUIRED
>
<!ELEMENT rollingPolicy (param*)>
-<!ATTLIST plugin
- name CDATA #REQUIRED
+<!ATTLIST rollingPolicy
+ name CDATA #IMPLIED
class CDATA #REQUIRED
>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
