Author: carnold
Date: Tue Jun 5 14:55:08 2007
New Revision: 544650
URL: http://svn.apache.org/viewvc?view=rev&rev=544650
Log:
Bug 42257: Add DBAppender related elements to log4j.dtd and change sig of
DOMConfigurator.parseElement
Modified:
logging/log4j/branches/v1_2-branch/pom.xml
logging/log4j/branches/v1_2-branch/src/main/java/org/apache/log4j/xml/DOMConfigurator.java
logging/log4j/branches/v1_2-branch/src/main/javadoc/org/apache/log4j/xml/log4j.dtd
logging/log4j/branches/v1_2-branch/src/main/resources/org/apache/log4j/xml/log4j.dtd
Modified: logging/log4j/branches/v1_2-branch/pom.xml
URL:
http://svn.apache.org/viewvc/logging/log4j/branches/v1_2-branch/pom.xml?view=diff&rev=544650&r1=544649&r2=544650
==============================================================================
--- logging/log4j/branches/v1_2-branch/pom.xml (original)
+++ logging/log4j/branches/v1_2-branch/pom.xml Tue Jun 5 14:55:08 2007
@@ -1,3 +1,20 @@
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+-->
<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
<modelVersion>4.0.0</modelVersion>
<groupId>log4j</groupId>
Modified:
logging/log4j/branches/v1_2-branch/src/main/java/org/apache/log4j/xml/DOMConfigurator.java
URL:
http://svn.apache.org/viewvc/logging/log4j/branches/v1_2-branch/src/main/java/org/apache/log4j/xml/DOMConfigurator.java?view=diff&rev=544650&r1=544649&r2=544650
==============================================================================
---
logging/log4j/branches/v1_2-branch/src/main/java/org/apache/log4j/xml/DOMConfigurator.java
(original)
+++
logging/log4j/branches/v1_2-branch/src/main/java/org/apache/log4j/xml/DOMConfigurator.java
Tue Jun 5 14:55:08 2007
@@ -959,7 +959,7 @@
}
/**
- * Creates an OptionHandler and processes any nested param elements
+ * Creates an object and processes any nested param elements
* but does not call activateOptions. If the class also supports
* UnrecognizedElementParser, the parseUnrecognizedElement method
* will be call for any child elements other than param.
@@ -972,16 +972,15 @@
* @throws Exception thrown if the contain object should be abandoned.
* @since 1.2.15
*/
- public static OptionHandler parseElement(final Element element,
+ public static Object parseElement(final Element element,
final Properties props,
final Class expectedClass) throws
Exception {
String clazz = subst(element.getAttribute("class"), props);
Object instance = OptionConverter.instantiateByClassName(clazz,
expectedClass, null);
- if (instance instanceof OptionHandler) {
- OptionHandler optionHandler = (OptionHandler) instance;
- PropertySetter propSetter = new PropertySetter(optionHandler);
+ if (instance != null) {
+ PropertySetter propSetter = new PropertySetter(instance);
NodeList children = element.getChildNodes();
final int length = children.getLength();
@@ -997,7 +996,7 @@
}
}
}
- return optionHandler;
+ return instance;
}
return null;
}
Modified:
logging/log4j/branches/v1_2-branch/src/main/javadoc/org/apache/log4j/xml/log4j.dtd
URL:
http://svn.apache.org/viewvc/logging/log4j/branches/v1_2-branch/src/main/javadoc/org/apache/log4j/xml/log4j.dtd?view=diff&rev=544650&r1=544649&r2=544650
==============================================================================
---
logging/log4j/branches/v1_2-branch/src/main/javadoc/org/apache/log4j/xml/log4j.dtd
(original)
+++
logging/log4j/branches/v1_2-branch/src/main/javadoc/org/apache/log4j/xml/log4j.dtd
Tue Jun 5 14:55:08 2007
@@ -44,7 +44,8 @@
<!-- Appenders may contain an error handler, a layout, optional parameters -->
<!-- and filters. They may also reference (or include) other appenders. -->
<!ELEMENT appender (errorHandler?, param*,
- rollingPolicy?, triggeringPolicy?, layout?, filter*, appender-ref*)>
+ rollingPolicy?, triggeringPolicy?, connectionSource?,
+ layout?, filter*, appender-ref*)>
<!ATTLIST appender
name CDATA #REQUIRED
class CDATA #REQUIRED
@@ -129,9 +130,19 @@
>
<!-- plugins must have a name and class and can have optional parameters -->
-<!ELEMENT plugin (param*)>
+<!ELEMENT plugin (param*, connectionSource?)>
<!ATTLIST plugin
name CDATA #REQUIRED
+ class CDATA #REQUIRED
+>
+
+<!ELEMENT connectionSource (dataSource?, param*)>
+<!ATTLIST connectionSource
+ class CDATA #REQUIRED
+>
+
+<!ELEMENT dataSource (param*)>
+<!ATTLIST dataSource
class CDATA #REQUIRED
>
Modified:
logging/log4j/branches/v1_2-branch/src/main/resources/org/apache/log4j/xml/log4j.dtd
URL:
http://svn.apache.org/viewvc/logging/log4j/branches/v1_2-branch/src/main/resources/org/apache/log4j/xml/log4j.dtd?view=diff&rev=544650&r1=544649&r2=544650
==============================================================================
---
logging/log4j/branches/v1_2-branch/src/main/resources/org/apache/log4j/xml/log4j.dtd
(original)
+++
logging/log4j/branches/v1_2-branch/src/main/resources/org/apache/log4j/xml/log4j.dtd
Tue Jun 5 14:55:08 2007
@@ -44,7 +44,8 @@
<!-- Appenders may contain an error handler, a layout, optional parameters -->
<!-- and filters. They may also reference (or include) other appenders. -->
<!ELEMENT appender (errorHandler?, param*,
- rollingPolicy?, triggeringPolicy?, layout?, filter*, appender-ref*)>
+ rollingPolicy?, triggeringPolicy?, connectionSource?,
+ layout?, filter*, appender-ref*)>
<!ATTLIST appender
name CDATA #REQUIRED
class CDATA #REQUIRED
@@ -129,9 +130,19 @@
>
<!-- plugins must have a name and class and can have optional parameters -->
-<!ELEMENT plugin (param*)>
+<!ELEMENT plugin (param*, connectionSource?)>
<!ATTLIST plugin
name CDATA #REQUIRED
+ class CDATA #REQUIRED
+>
+
+<!ELEMENT connectionSource (dataSource?, param*)>
+<!ATTLIST connectionSource
+ class CDATA #REQUIRED
+>
+
+<!ELEMENT dataSource (param*)>
+<!ATTLIST dataSource
class CDATA #REQUIRED
>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
