You are viewing a plain text version of this content. The canonical link for it is here.
Posted to log4j-dev@logging.apache.org by ca...@apache.org on 2009/08/05 04:38:10 UTC
svn commit: r801049 - in /logging/log4j/trunk:
examples/lf5/InitUsingXMLPropertiesFile/ src/changes/
src/main/java/org/apache/log4j/xml/
src/main/javadoc/org/apache/log4j/xml/examples/
src/performance/java/org/apache/log4j/performance/xml/
Author: carnold
Date: Wed Aug 5 02:38:09 2009
New Revision: 801049
URL: http://svn.apache.org/viewvc?rev=801049&view=rev
Log:
bug 42842: Create a public identifier for log4j.dtd
Modified:
logging/log4j/trunk/examples/lf5/InitUsingXMLPropertiesFile/example.xml
logging/log4j/trunk/src/changes/changes.xml
logging/log4j/trunk/src/main/java/org/apache/log4j/xml/Log4jEntityResolver.java
logging/log4j/trunk/src/main/java/org/apache/log4j/xml/XMLLayout.java
logging/log4j/trunk/src/main/javadoc/org/apache/log4j/xml/examples/sample1.xml
logging/log4j/trunk/src/main/javadoc/org/apache/log4j/xml/examples/sample2.xml
logging/log4j/trunk/src/main/javadoc/org/apache/log4j/xml/examples/sample3.xml
logging/log4j/trunk/src/main/javadoc/org/apache/log4j/xml/examples/sample4.xml
logging/log4j/trunk/src/main/javadoc/org/apache/log4j/xml/examples/sample5.xml
logging/log4j/trunk/src/performance/java/org/apache/log4j/performance/xml/logging1.xml
Modified: logging/log4j/trunk/examples/lf5/InitUsingXMLPropertiesFile/example.xml
URL: http://svn.apache.org/viewvc/logging/log4j/trunk/examples/lf5/InitUsingXMLPropertiesFile/example.xml?rev=801049&r1=801048&r2=801049&view=diff
==============================================================================
--- logging/log4j/trunk/examples/lf5/InitUsingXMLPropertiesFile/example.xml (original)
+++ logging/log4j/trunk/examples/lf5/InitUsingXMLPropertiesFile/example.xml Wed Aug 5 02:38:09 2009
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
+<!DOCTYPE log4j:configuration PUBLIC "-//APACHE//DTD LOG4J 1.2//EN" "log4j.dtd">
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
Modified: logging/log4j/trunk/src/changes/changes.xml
URL: http://svn.apache.org/viewvc/logging/log4j/trunk/src/changes/changes.xml?rev=801049&r1=801048&r2=801049&view=diff
==============================================================================
--- logging/log4j/trunk/src/changes/changes.xml (original)
+++ logging/log4j/trunk/src/changes/changes.xml Wed Aug 5 02:38:09 2009
@@ -23,6 +23,7 @@
<release version="1.2.16" date="TBD" description="">
<action issue="43313">log4j 1.2.16 release preparation.</action>
+ <action action="add" issue="42842">Create a public identifier for log4j.dtd ("-//APACHE//DTD LOG4J 1.2//EN")</action>
<action action="fix" issue="44108">TelnetAppender misses messages when one of many clients disconnect.</action>
<action action="fix" issue="44109">TelnetAppender throws null pointers at log time when socket couldn't be opened.</action>
<action action="fix" issue="44032">ThrowableInformation.getThrowableStringRep can return null strings.</action>
Modified: logging/log4j/trunk/src/main/java/org/apache/log4j/xml/Log4jEntityResolver.java
URL: http://svn.apache.org/viewvc/logging/log4j/trunk/src/main/java/org/apache/log4j/xml/Log4jEntityResolver.java?rev=801049&r1=801048&r2=801049&view=diff
==============================================================================
--- logging/log4j/trunk/src/main/java/org/apache/log4j/xml/Log4jEntityResolver.java (original)
+++ logging/log4j/trunk/src/main/java/org/apache/log4j/xml/Log4jEntityResolver.java Wed Aug 5 02:38:09 2009
@@ -32,9 +32,10 @@
* @author Paul Austin
* */
public class Log4jEntityResolver implements EntityResolver {
+ private static final String PUBLIC_ID = "-//APACHE//DTD LOG4J 1.2//EN";
public InputSource resolveEntity (String publicId, String systemId) {
- if (systemId.endsWith("log4j.dtd")) {
+ if (systemId.endsWith("log4j.dtd") || PUBLIC_ID.equals(publicId)) {
Class clazz = getClass();
InputStream in = clazz.getResourceAsStream("/org/apache/log4j/xml/log4j.dtd");
if (in == null) {
Modified: logging/log4j/trunk/src/main/java/org/apache/log4j/xml/XMLLayout.java
URL: http://svn.apache.org/viewvc/logging/log4j/trunk/src/main/java/org/apache/log4j/xml/XMLLayout.java?rev=801049&r1=801048&r2=801049&view=diff
==============================================================================
--- logging/log4j/trunk/src/main/java/org/apache/log4j/xml/XMLLayout.java (original)
+++ logging/log4j/trunk/src/main/java/org/apache/log4j/xml/XMLLayout.java Wed Aug 5 02:38:09 2009
@@ -41,7 +41,7 @@
<pre>
<?xml version="1.0" ?>
- <!DOCTYPE log4j:eventSet SYSTEM "log4j.dtd" [<!ENTITY data SYSTEM "abc">]>
+ <!DOCTYPE log4j:eventSet PUBLIC "-//APACHE//DTD LOG4J 1.2//EN" "log4j.dtd" [<!ENTITY data SYSTEM "abc">]>
<log4j:eventSet version="1.2" xmlns:log4j="http://jakarta.apache.org/log4j/">
&data;
Modified: logging/log4j/trunk/src/main/javadoc/org/apache/log4j/xml/examples/sample1.xml
URL: http://svn.apache.org/viewvc/logging/log4j/trunk/src/main/javadoc/org/apache/log4j/xml/examples/sample1.xml?rev=801049&r1=801048&r2=801049&view=diff
==============================================================================
--- logging/log4j/trunk/src/main/javadoc/org/apache/log4j/xml/examples/sample1.xml (original)
+++ logging/log4j/trunk/src/main/javadoc/org/apache/log4j/xml/examples/sample1.xml Wed Aug 5 02:38:09 2009
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
+<!DOCTYPE log4j:configuration PUBLIC "-//APACHE//DTD LOG4J 1.2//EN" "log4j.dtd">
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
Modified: logging/log4j/trunk/src/main/javadoc/org/apache/log4j/xml/examples/sample2.xml
URL: http://svn.apache.org/viewvc/logging/log4j/trunk/src/main/javadoc/org/apache/log4j/xml/examples/sample2.xml?rev=801049&r1=801048&r2=801049&view=diff
==============================================================================
--- logging/log4j/trunk/src/main/javadoc/org/apache/log4j/xml/examples/sample2.xml (original)
+++ logging/log4j/trunk/src/main/javadoc/org/apache/log4j/xml/examples/sample2.xml Wed Aug 5 02:38:09 2009
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
+<!DOCTYPE log4j:configuration PUBLIC "-//APACHE//DTD LOG4J 1.2//EN" "log4j.dtd">
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
Modified: logging/log4j/trunk/src/main/javadoc/org/apache/log4j/xml/examples/sample3.xml
URL: http://svn.apache.org/viewvc/logging/log4j/trunk/src/main/javadoc/org/apache/log4j/xml/examples/sample3.xml?rev=801049&r1=801048&r2=801049&view=diff
==============================================================================
--- logging/log4j/trunk/src/main/javadoc/org/apache/log4j/xml/examples/sample3.xml (original)
+++ logging/log4j/trunk/src/main/javadoc/org/apache/log4j/xml/examples/sample3.xml Wed Aug 5 02:38:09 2009
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
+<!DOCTYPE log4j:configuration PUBLIC "-//APACHE//DTD LOG4J 1.2//EN" "log4j.dtd">
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
Modified: logging/log4j/trunk/src/main/javadoc/org/apache/log4j/xml/examples/sample4.xml
URL: http://svn.apache.org/viewvc/logging/log4j/trunk/src/main/javadoc/org/apache/log4j/xml/examples/sample4.xml?rev=801049&r1=801048&r2=801049&view=diff
==============================================================================
--- logging/log4j/trunk/src/main/javadoc/org/apache/log4j/xml/examples/sample4.xml (original)
+++ logging/log4j/trunk/src/main/javadoc/org/apache/log4j/xml/examples/sample4.xml Wed Aug 5 02:38:09 2009
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
+<!DOCTYPE log4j:configuration PUBLIC "-//APACHE//DTD LOG4J 1.2//EN" "log4j.dtd">
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
Modified: logging/log4j/trunk/src/main/javadoc/org/apache/log4j/xml/examples/sample5.xml
URL: http://svn.apache.org/viewvc/logging/log4j/trunk/src/main/javadoc/org/apache/log4j/xml/examples/sample5.xml?rev=801049&r1=801048&r2=801049&view=diff
==============================================================================
--- logging/log4j/trunk/src/main/javadoc/org/apache/log4j/xml/examples/sample5.xml (original)
+++ logging/log4j/trunk/src/main/javadoc/org/apache/log4j/xml/examples/sample5.xml Wed Aug 5 02:38:09 2009
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
+<!DOCTYPE log4j:configuration PUBLIC "-//APACHE//DTD LOG4J 1.2//EN" "log4j.dtd">
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
Modified: logging/log4j/trunk/src/performance/java/org/apache/log4j/performance/xml/logging1.xml
URL: http://svn.apache.org/viewvc/logging/log4j/trunk/src/performance/java/org/apache/log4j/performance/xml/logging1.xml?rev=801049&r1=801048&r2=801049&view=diff
==============================================================================
--- logging/log4j/trunk/src/performance/java/org/apache/log4j/performance/xml/logging1.xml (original)
+++ logging/log4j/trunk/src/performance/java/org/apache/log4j/performance/xml/logging1.xml Wed Aug 5 02:38:09 2009
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
+<!DOCTYPE log4j:configuration PUBLIC "-//APACHE//DTD LOG4J 1.2//EN" "log4j.dtd">
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
---------------------------------------------------------------------
To unsubscribe, e-mail: log4j-dev-unsubscribe@logging.apache.org
For additional commands, e-mail: log4j-dev-help@logging.apache.org