Author: carnold
Date: Mon Aug 13 14:04:22 2007
New Revision: 565520
URL: http://svn.apache.org/viewvc?view=rev&rev=565520
Log:
Bug 43113: Move log4j 1.2 to trunk
Modified:
logging/log4j/trunk/pom.xml
logging/log4j/trunk/tests/src/java/org/apache/log4j/xml/XMLLayoutTestCase.java
Modified: logging/log4j/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/logging/log4j/trunk/pom.xml?view=diff&rev=565520&r1=565519&r2=565520
==============================================================================
--- logging/log4j/trunk/pom.xml (original)
+++ logging/log4j/trunk/pom.xml Mon Aug 13 14:04:22 2007
@@ -65,9 +65,9 @@
</license>
</licenses>
<scm>
-
<connection>scm:svn:http://svn.apache.org/repos/asf/logging/log4j/trunk</connection>
-
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/logging/log4j/trunk</developerConnection>
- <url>http://svn.apache.org/viewcvs.cgi/logging/log4j/trunk</url>
+
<connection>scm:svn:http://svn.apache.org/repos/asf/logging/log4j/branches/BRANCH_1_3_ABANDONED</connection>
+
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/logging/log4j/branches/BRANCH_1_3_ABANDONED</developerConnection>
+
<url>http://svn.apache.org/viewcvs.cgi/logging/log4j/branches/BRANCH_1_3_ABANDONED</url>
</scm>
<organization>
<name>Apache Software Foundation</name>
@@ -227,7 +227,7 @@
<configuration>
<tasks>
<taskdef name="replaceregexp"
classname="org.apache.tools.ant.taskdefs.optional.ReplaceRegExp" />
- <replaceregexp file="target/site/source-repository.html"
match="/tags/[^ ]*" replace="/branches/v1_2-branch" flags="g" />
+ <replaceregexp file="target/site/source-repository.html"
match="/tags/[^ ]*" replace="/branches/BRANCH_1_3_ABANDONED" flags="g" />
<replaceregexp match="-- Generated by (.*) on .*--"
replace="-- Generated by \1 --" flags="g">
<fileset dir="target/site/apidocs"
includes="**/*.html"/>
</replaceregexp>
Modified:
logging/log4j/trunk/tests/src/java/org/apache/log4j/xml/XMLLayoutTestCase.java
URL:
http://svn.apache.org/viewvc/logging/log4j/trunk/tests/src/java/org/apache/log4j/xml/XMLLayoutTestCase.java?view=diff&rev=565520&r1=565519&r2=565520
==============================================================================
---
logging/log4j/trunk/tests/src/java/org/apache/log4j/xml/XMLLayoutTestCase.java
(original)
+++
logging/log4j/trunk/tests/src/java/org/apache/log4j/xml/XMLLayoutTestCase.java
Mon Aug 13 14:04:22 2007
@@ -128,7 +128,7 @@
/**
* Tests the format of the MDC portion of the layout to ensure
- * the KVP's we put in turn up in the output file.
+ * the key-value pairs we put in turn up in the output file.
* @throws Exception
*/
public void testMDC() throws Exception {
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
