yoavs 2005/07/28 12:26:57
Modified: . Tag: v1_2-branch build.xml
docs Tag: v1_2-branch HISTORY.txt
src/java/org/apache/log4j/xml Tag: v1_2-branch
DOMConfigurator.java XMLLayout.java
src/java/org/apache/log4j/xml/examples Tag: v1_2-branch
XMLSample.java package.html
Log:
Fixed Bugzilla 14551 (and its duplicates) by fixing JavaDoc links to XML
samples.
http://issues.apache.org/bugzilla/show_bug.cgi?id=14551
Revision Changes Path
No revision
No revision
1.34.2.26 +10 -0 logging-log4j/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/logging-log4j/build.xml,v
retrieving revision 1.34.2.25
retrieving revision 1.34.2.26
diff -u -r1.34.2.25 -r1.34.2.26
--- build.xml 28 Jul 2005 02:20:12 -0000 1.34.2.25
+++ build.xml 28 Jul 2005 19:26:55 -0000 1.34.2.26
@@ -409,6 +409,16 @@
<link href="http://java.sun.com/j2ee/sdk_1.3/techdocs/api/"/>
<classpath refid="compile.classpath"/>
</javadoc>
+
+ <!-- Extra files referenced by JavaDocs -->
+ <copy file="${java.source.dir}/org/apache/log4j/xml/log4j.dtd"
+ tofile="${javadoc.dest}/org/apache/log4j/xml/log4j.dtd" />
+ <copy todir="${javadoc.dest}/org/apache/log4j/xml/examples">
+ <fileset dir="${java.source.dir}/org/apache/log4j/xml/examples">
+ <include name="sample*.xml" />
+ <include name="XMLSample.java" />
+ </fileset>
+ </copy>
</target>
<!-- ================================================================= -->
No revision
No revision
1.27.2.10 +9 -0 logging-log4j/docs/HISTORY.txt
Index: HISTORY.txt
===================================================================
RCS file: /home/cvs/logging-log4j/docs/HISTORY.txt,v
retrieving revision 1.27.2.9
retrieving revision 1.27.2.10
diff -u -r1.27.2.9 -r1.27.2.10
--- HISTORY.txt 28 Jul 2005 02:20:12 -0000 1.27.2.9
+++ HISTORY.txt 28 Jul 2005 19:26:56 -0000 1.27.2.10
@@ -5,6 +5,15 @@
client code.
[***] Changes requiring important modifications to existing client code.
+ [FILL IN DATE, 2005]
+
+ - Release of versions 1.2.12rc2
+
+ - Fixed Bugzilla 14551 and its duplicates by fixing the JavaDoc links
+ for the XML sample files.
+ http://issues.apache.org/bugzilla/show_bug.cgi?id=14551 [*]
+
+
July 27th, 2005
- Release of version 1.2.12rc1
No revision
No revision
1.49.2.8 +1 -1
logging-log4j/src/java/org/apache/log4j/xml/DOMConfigurator.java
Index: DOMConfigurator.java
===================================================================
RCS file:
/home/cvs/logging-log4j/src/java/org/apache/log4j/xml/DOMConfigurator.java,v
retrieving revision 1.49.2.7
retrieving revision 1.49.2.8
diff -u -r1.49.2.7 -r1.49.2.8
--- DOMConfigurator.java 14 Jul 2005 21:23:48 -0000 1.49.2.7
+++ DOMConfigurator.java 28 Jul 2005 19:26:56 -0000 1.49.2.8
@@ -46,7 +46,7 @@
Use this class to initialize the log4j environment using a DOM tree.
<p>The DTD is specified in <a
- href="doc-files/log4j.dtd"><b>log4j.dtd</b></a>.
+ href="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
1.18.2.6 +2 -2
logging-log4j/src/java/org/apache/log4j/xml/XMLLayout.java
Index: XMLLayout.java
===================================================================
RCS file:
/home/cvs/logging-log4j/src/java/org/apache/log4j/xml/XMLLayout.java,v
retrieving revision 1.18.2.5
retrieving revision 1.18.2.6
diff -u -r1.18.2.5 -r1.18.2.6
--- XMLLayout.java 21 Jul 2005 22:11:21 -0000 1.18.2.5
+++ XMLLayout.java 28 Jul 2005 19:26:56 -0000 1.18.2.6
@@ -28,7 +28,7 @@
/**
* The output of the XMLLayout consists of a series of log4j:event
* elements as defined in the <a
- * href="doc-files/log4j.dtd">log4j.dtd</a>. It does not output a
+ * href="log4j.dtd">log4j.dtd</a>. It does not output a
* complete well-formed XML file. The output is designed to be
* included as an <em>external entity</em> in a separate file to form
* a correct XML file.
@@ -94,7 +94,7 @@
/**
- * Formats a [EMAIL PROTECTED] LoggingEvent} in conformance with the
log4j.dtd.
+ * Formats a [EMAIL PROTECTED] org.apache.log4j.spi.LoggingEvent} in
conformance with the log4j.dtd.
* */
public String format(LoggingEvent event) {
No revision
No revision
1.4.2.3 +3 -3
logging-log4j/src/java/org/apache/log4j/xml/examples/XMLSample.java
Index: XMLSample.java
===================================================================
RCS file:
/home/cvs/logging-log4j/src/java/org/apache/log4j/xml/examples/XMLSample.java,v
retrieving revision 1.4.2.2
retrieving revision 1.4.2.3
diff -u -r1.4.2.2 -r1.4.2.3
--- XMLSample.java 27 May 2005 03:27:56 -0000 1.4.2.2
+++ XMLSample.java 28 Jul 2005 19:26:56 -0000 1.4.2.3
@@ -22,11 +22,11 @@
/**
- This <a href="doc-files/XMLSample.java">example code</a> shows how to
+ This <a href="XMLSample.java">example code</a> shows how to
read an XML based configuration file using a DOM parser.
- <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>Sample XML files <a href="sample1.xml">sample1.xml</a>
+ and <a href="sample2.xml">sample2.xml</a> are provided.
<p>Note that the log4j.dtd is not in the local directory.
1.3.2.1 +6 -6
logging-log4j/src/java/org/apache/log4j/xml/examples/package.html
Index: package.html
===================================================================
RCS file:
/home/cvs/logging-log4j/src/java/org/apache/log4j/xml/examples/package.html,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -u -r1.3 -r1.3.2.1
--- package.html 27 Jun 2001 21:34:39 -0000 1.3
+++ package.html 28 Jul 2005 19:26:56 -0000 1.3.2.1
@@ -10,13 +10,13 @@
configuration file.
<p>See source code of <a
-href="../doc-files/XMLSample.java">XMLSample.java</a> showing how to
+href="XMLSample.java">XMLSample.java</a> showing how to
configure with an XML file. Sample XML files
-<a href="../doc-files/sample1.xml">sample1.xml</a>,
-<a href="../doc-files/sample2.xml">sample2.xml</a>,
-<a href="../doc-files/sample3.xml">sample3.xml</a>,
-<a href="../doc-files/sample4.xml">sample4.xml</a>,
-<a href="../doc-files/sample5.xml">sample5.xml</a> are provided.
+<a href="sample1.xml">sample1.xml</a>,
+<a href="sample2.xml">sample2.xml</a>,
+<a href="sample3.xml">sample3.xml</a>,
+<a href="sample4.xml">sample4.xml</a>,
+<a href="sample5.xml">sample5.xml</a> are provided.
<hr>
<address></address>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
