Author: carnold
Date: Sat Mar 20 21:46:47 2010
New Revision: 925689
URL: http://svn.apache.org/viewvc?rev=925689&view=rev
Log:
Bug 48784: Links to example code broken in the Javadocs
Added:
logging/log4j/trunk/src/main/javadoc/org/apache/log4j/xml/doc-files/
logging/log4j/trunk/src/main/javadoc/org/apache/log4j/xml/doc-files/log4j.dtd
- copied unchanged from r910832,
logging/log4j/trunk/src/main/javadoc/org/apache/log4j/xml/log4j.dtd
logging/log4j/trunk/src/main/javadoc/org/apache/log4j/xml/examples/doc-files/
logging/log4j/trunk/src/main/javadoc/org/apache/log4j/xml/examples/doc-files/XMLSample.java
- copied unchanged from r910832,
logging/log4j/trunk/src/main/javadoc/org/apache/log4j/xml/examples/XMLSample.java
logging/log4j/trunk/src/main/javadoc/org/apache/log4j/xml/examples/doc-files/sample1.xml
- copied unchanged from r910832,
logging/log4j/trunk/src/main/javadoc/org/apache/log4j/xml/examples/sample1.xml
logging/log4j/trunk/src/main/javadoc/org/apache/log4j/xml/examples/doc-files/sample2.xml
- copied unchanged from r910832,
logging/log4j/trunk/src/main/javadoc/org/apache/log4j/xml/examples/sample2.xml
logging/log4j/trunk/src/main/javadoc/org/apache/log4j/xml/examples/doc-files/sample3.xml
- copied unchanged from r910832,
logging/log4j/trunk/src/main/javadoc/org/apache/log4j/xml/examples/sample3.xml
logging/log4j/trunk/src/main/javadoc/org/apache/log4j/xml/examples/doc-files/sample4.xml
- copied unchanged from r910832,
logging/log4j/trunk/src/main/javadoc/org/apache/log4j/xml/examples/sample4.xml
logging/log4j/trunk/src/main/javadoc/org/apache/log4j/xml/examples/doc-files/sample5.xml
- copied unchanged from r910832,
logging/log4j/trunk/src/main/javadoc/org/apache/log4j/xml/examples/sample5.xml
Removed:
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/main/javadoc/org/apache/log4j/xml/log4j.dtd
Modified:
logging/log4j/trunk/pom.xml
logging/log4j/trunk/src/main/java/org/apache/log4j/xml/DOMConfigurator.java
logging/log4j/trunk/src/main/javadoc/org/apache/log4j/xml/examples/XMLSample.java
Modified: logging/log4j/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/logging/log4j/trunk/pom.xml?rev=925689&r1=925688&r2=925689&view=diff
==============================================================================
--- logging/log4j/trunk/pom.xml (original)
+++ logging/log4j/trunk/pom.xml Sat Mar 20 21:46:47 2010
@@ -334,6 +334,7 @@ target platform and specify -Dntdll_targ
<artifactId>maven-javadoc-plugin</artifactId>
<version>2.6.1</version>
<configuration>
+ <docfilessubdirs>true</docfilessubdirs>
<encoding>UTF-8</encoding>
</configuration>
<executions>
Modified:
logging/log4j/trunk/src/main/java/org/apache/log4j/xml/DOMConfigurator.java
URL:
http://svn.apache.org/viewvc/logging/log4j/trunk/src/main/java/org/apache/log4j/xml/DOMConfigurator.java?rev=925689&r1=925688&r2=925689&view=diff
==============================================================================
--- logging/log4j/trunk/src/main/java/org/apache/log4j/xml/DOMConfigurator.java
(original)
+++ logging/log4j/trunk/src/main/java/org/apache/log4j/xml/DOMConfigurator.java
Sat Mar 20 21:46:47 2010
@@ -67,7 +67,7 @@ import java.util.Properties;
Use this class to initialize the log4j environment using a DOM tree.
<p>The DTD is specified in <a
- href="log4j.dtd"><b>log4j.dtd</b></a>.
+ href="doc-files/log4j.dtd"><b>log4j.dtd</b></a>.
<p>Sometimes it is useful to see how log4j is reading configuration
files. You can enable log4j internal logging by defining the
Modified:
logging/log4j/trunk/src/main/javadoc/org/apache/log4j/xml/examples/XMLSample.java
URL:
http://svn.apache.org/viewvc/logging/log4j/trunk/src/main/javadoc/org/apache/log4j/xml/examples/XMLSample.java?rev=925689&r1=925688&r2=925689&view=diff
==============================================================================
---
logging/log4j/trunk/src/main/javadoc/org/apache/log4j/xml/examples/XMLSample.java
(original)
+++
logging/log4j/trunk/src/main/javadoc/org/apache/log4j/xml/examples/XMLSample.java
Sat Mar 20 21:46:47 2010
@@ -22,11 +22,11 @@ import org.apache.log4j.Logger;
/**
- This <a href="XMLSample.java">example code</a> shows how to
+ This <a href="doc-files/XMLSample.java">example code</a> shows how to
read an XML based configuration file using a DOM parser.
- <p>Sample XML files <a href="sample1.xml">sample1.xml</a>
- and <a href="sample2.xml">sample2.xml</a> are provided.
+ <p>Sample XML files <a href="doc-files/sample1.xml">sample1.xml</a>
+ and <a href="doc-files/sample2.xml">sample2.xml</a> are provided.
<p>Note that the log4j.dtd is not in the local directory.
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
