Bug 43113: Move log4j 1.2 to trunk

git-svn-id: https://svn.apache.org/repos/asf/logging/log4j/trunk@565520 13f79535-47bb-0310-9956-ffa450edef68

Author: Curtis William Arnold

pom.xml

@@ -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>

tests/src/java/org/apache/log4j/xml/XMLLayoutTestCase.java

@@ -128,7 +128,7 @@ public void testNull() throws Exception {
 
   /**
    * 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 {