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 2007/02/26 22:14:23 UTC

svn commit: r512013 - in /logging/log4j/branches/v1_2-branch: build.xml build/manifest.mf docs/HISTORY.txt pom.xml src/xdocs/download.xml src/xdocs/plan.xml

Author: carnold
Date: Mon Feb 26 13:14:22 2007
New Revision: 512013

URL: http://svn.apache.org/viewvc?view=rev&rev=512013
Log:
Bug 40951: log4j 1.2.15 release

Modified:
    logging/log4j/branches/v1_2-branch/build.xml
    logging/log4j/branches/v1_2-branch/build/manifest.mf
    logging/log4j/branches/v1_2-branch/docs/HISTORY.txt
    logging/log4j/branches/v1_2-branch/pom.xml
    logging/log4j/branches/v1_2-branch/src/xdocs/download.xml
    logging/log4j/branches/v1_2-branch/src/xdocs/plan.xml

Modified: logging/log4j/branches/v1_2-branch/build.xml
URL: http://svn.apache.org/viewvc/logging/log4j/branches/v1_2-branch/build.xml?view=diff&rev=512013&r1=512012&r2=512013
==============================================================================
--- logging/log4j/branches/v1_2-branch/build.xml (original)
+++ logging/log4j/branches/v1_2-branch/build.xml Mon Feb 26 13:14:22 2007
@@ -20,10 +20,6 @@
 <!-- It is available from http://ant.apache.org                        -->
 
 
-<!-- ================================================================= -->
-<!-- NOTE: all directories are relative to logging-log4j/              -->
-<!-- the parent of build/                                              -->
-<!-- ================================================================= -->
 <project name="log4j" default="usage" basedir="." >
 
   
@@ -34,7 +30,7 @@
   <!-- prefixed with "env". -->
   <property environment="env"/>
 
-  <property name="version" value="1.2.14"/>
+  <property name="version" value="1.2.15"/>
 
   <!-- The base directory relative to which most targets are built -->
   <property name="base" value="."/>
@@ -60,6 +56,7 @@
 
   <!-- The jar file that the jar task will generate -->
   <property name="jar.filename" value="log4j-${version}.jar"/>
+  <property name="sources-jar.filename" value="log4j-${version}-sources.jar"/>
 
   <!-- Destination for documentation files -->
   <property name="docs.dest" value="./docs"/>
@@ -95,12 +92,6 @@
   <property name="apache.javadoc_dest" value="/www/logging.apache.org/log4j/docs"/>
   <!--  Apache web host  -->
   <property name="apache.host" value="people.apache.org"/>
-  
-  <property name="maven.base" value="${packaging.dir}/maven"/>
-  <property name="maven.src" value="${maven.base}/logging-log4j-${version}"/>
-  <property name="maven.dest" value="${maven.base}/repo"/>
-  
-
 
 
   <!-- Construct compile classpath -->
@@ -422,11 +413,11 @@
   <!-- Remove the temporary manifest file, actual work is done in the    -->
   <!-- dependencies.                                                     -->
   <!-- ================================================================= -->
-  <target name="jar" depends="log4j.jar">
+  <target name="jar" depends="log4j.jar, log4j-sources.jar">
      <delete file="${jar.dest}/manifest.mf"/>
   </target>
 
-  <target name="prejar" depends="build">
+  <target name="prejar" depends="init">
     <mkdir dir="${jar.dest}"/>
     <filter token="version" value="${version}" />
     <copy file="${manifest.src}" tofile="${jar.dest}/manifest.mf"
@@ -436,10 +427,10 @@
  <!-- ================================================================= -->
  <!-- Create log4j.jar, excluding tests and other odds and ends.        -->
  <!-- ================================================================= -->
-  <target name="log4j.jar" depends="prejar">
+  <target name="log4j.jar" depends="build, prejar">
     <delete>
       <fileset dir="${jar.dest}">
-   <include name="*.jar"/>
+   			<include name="${jar.filename}"/>
       </fileset>
     </delete>
 
@@ -470,6 +461,22 @@
   </target>
 
 
+ <!-- ================================================================= -->
+ <!-- Create log4j-sources.jar                                          -->
+ <!-- ================================================================= -->
+  <target name="log4j-sources.jar" depends="prejar">
+    <delete>
+      <fileset dir="${jar.dest}" includes="${sources-jar.filename}"/>
+    </delete>
+
+    <jar jarfile="${jar.dest}/${sources-jar.filename}" basedir="${java.source.dir}"
+         includes="**/*.java"
+         manifest="${jar.dest}/manifest.mf">
+         <metainf dir="." includes="NOTICE,LICENSE"/>
+     </jar>
+  </target>
+
+
   <!-- ================================================================= -->
   <!-- This target builds the javadoc files.                             -->
   <!-- ================================================================= -->
@@ -653,9 +660,9 @@
 
     <mkdir  dir="${dist.images}" />
     
-    <mkdir  dir="${dist.tmp}/logging-log4j-${version}" />
+    <mkdir  dir="${dist.tmp}/apache-log4j-${version}" />
 
-    <copy todir="${dist.tmp}/logging-log4j-${version}">
+    <copy todir="${dist.tmp}/apache-log4j-${version}">
        <fileset dir="${base}"
                 includes="src/java/**,
            docs/**,
@@ -667,7 +674,7 @@
            INSTALL,
            LICENSE,
            NOTICE,
-           ${dist.dir}/lib/log4j*.jar,
+           ${dist.dir}/lib/log4j-${version}.jar,
            ${dist.dir}/lib/NTEventLogAppender.dll,
            ${dist.dir}/classes/**,
            contribs/**"
@@ -682,21 +689,21 @@
     </copy>
 
 
-    <fixcrlf srcdir="${dist.tmp}/logging-log4j-${version}"
+    <fixcrlf srcdir="${dist.tmp}/apache-log4j-${version}"
              includes="build.sh" cr="remove"/>
-    <fixcrlf srcdir="${dist.tmp}/logging-log4j-${version}"
+    <fixcrlf srcdir="${dist.tmp}/apache-log4j-${version}"
              includes="build.bat" cr="add"/>
-    <chmod   dir="${dist.tmp}/logging-log4j-${version}"
+    <chmod   dir="${dist.tmp}/apache-log4j-${version}"
              includes="build.sh" perm="+x"/>
 
-    <tar tarfile="${dist.images}/logging-log4j-${version}.tar.gz"
+    <tar tarfile="${dist.images}/apache-log4j-${version}.tar.gz"
          basedir="${dist.tmp}"
-         includes="logging-log4j-${version}/**"
+         includes="apache-log4j-${version}/**"
          compression="gzip" />
 
-    <zip zipfile="${dist.images}/logging-log4j-${version}.zip"
+    <zip zipfile="${dist.images}/apache-log4j-${version}.zip"
          basedir="${dist.tmp}"
-         includes="logging-log4j-${version}/**" />
+         includes="apache-log4j-${version}/**" />
 
 
     <delete dir="${dist.tmp}" />
@@ -704,53 +711,68 @@
   
   <!-- This target will be incorporated init dist for the next release
            currently it will repackage a previously built release   -->
-  <target name="prep-maven" depends="init" description="Prepares a Maven package">
-      <delete dir="${maven.src}"/>
-      <delete dir="${maven.dest}"/>
-      <mkdir dir="${maven.base}"/>             
-      <untar src="${dist.images}/logging-log4j-${version}.tar.gz"
-             dest="${maven.base}"
-             compression="gzip"/>
-	  <mkdir dir="${maven.dest}/java-sources"/>
-      <jar destfile="${maven.dest}/java-sources/log4j-${version}-sources.jar"
-           basedir="${maven.src}/src/java"
-           includes="**/*.java">
-         <metainf dir="${maven.src}" includes="NOTICE,LICENSE"/>
-      </jar>
-      <mkdir dir="${maven.dest}/jars"/>
-      <copy todir="${maven.dest}/jars" file="${maven.src}/dist/lib/log4j-${version}.jar"/>
-      <mkdir dir="${maven.dest}/poms"/>
-      <copy tofile="${maven.dest}/poms/log4j-${version}.pom" file="pom.xml"/>
-      <mkdir dir="${maven.dest}/licenses"/>
-      <copy todir="${maven.dest}/licenses">
-          <fileset dir="${maven.src}" includes="LICENSE"/>
-      </copy>
+  <target name="maven-package" depends="jar" description="Prepares a Maven package">
+      <mkdir dir="${dist.dir}/poms"/>
+      <copy tofile="${dist.dir}/poms/log4j-${version}.pom" file="pom.xml"/>
+      <mkdir dir="${dist.dir}/licenses"/>
+      <copy todir="${dist.dir}/licenses" file="LICENSE"/>
+      
+	  <checksum forceOverwrite="yes" fileext=".md5">
+	  		<fileset dir="${jar.dest}" includes="${jar.filename} ${sources-jar.filename}"/>
+	  </checksum>           
 	  <checksum forceOverwrite="yes" fileext=".md5">
-	  		<fileset dir="${maven.dest}" excludes="logging-log4j-${version}/** **/*.md5 **/*.sha1 **/*.asc"/>
+	  		<fileset dir="${dist.dir}" includes="poms/log4j-${version}.pom licenses/LICENSE"/>
 	  </checksum>           
 	  <checksum forceOverwrite="yes" fileext=".sha1" algorithm="SHA">
-	  		<fileset dir="${maven.dest}" excludes="logging-log4j-${version}/** **/*.md5 **/*.sha1 **/*.asc"/>
+	  		<fileset dir="${jar.dest}" includes="${jar.filename} ${sources-jar.filename}"/>
 	  </checksum>
-	  <exec executable="gpg" dir="${maven.dest}/jars">
+	  <checksum forceOverwrite="yes" fileext=".sha1" algorithm="SHA">
+	  		<fileset dir="${dist.dir}" includes="poms/log4j-${version}.pom licenses/LICENSE"/>
+	  </checksum>           
+	  <mkdir dir="${dist.images}"/>
+      <!--  Does not include PGP signatures to allow for review prior to publication -->
+	  <tar tarfile="${dist.images}/apache-log4j-${version}-maven.tar.gz"
+         compression="gzip">
+         <tarfileset dir="${dist.dir}" includes="poms/* licenses/*" excludes="**/*.asc"/>
+         <tarfileset dir="${jar.dest}" includes="${jar.filename} ${jar.filename}.*" prefix="jars"  excludes="**/*.asc"/>
+         <tarfileset dir="${jar.dest}" includes="${sources-jar.filename} ${sources-jar.filename}.*" prefix="java-sources"  excludes="**/*.asc"/>
+      </tar>
+
+	  <exec executable="gpg" dir="${jar.dest}">
 	      <arg value="--armor"/>
 	      <arg value="--output"/>
-	      <arg value="log4j-${version}.jar.asc"/>
+	      <arg value="${jar.filename}.asc"/>
 	      <arg value="--detach-sig"/>
-	      <arg value="log4j-${version}.jar"/>	      
+	      <arg value="${jar.filename}"/>	      
 	  </exec>           
-	  <exec executable="gpg" dir="${maven.dest}/java-sources">
+	  <exec executable="gpg" dir="${jar.dest}">
 	      <arg value="--armor"/>
 	      <arg value="--output"/>
-	      <arg value="log4j-${version}-sources.jar.asc"/>
+	      <arg value="${sources-jar.filename}.asc"/>
 	      <arg value="--detach-sig"/>
-	      <arg value="log4j-${version}-sources.jar"/>	      
+	      <arg value="${sources-jar.filename}"/>	      
 	  </exec>           
-  </target>
+	  <exec executable="gpg" dir="${dist.dir}/poms">
+	      <arg value="--armor"/>
+	      <arg value="--output"/>
+	      <arg value="log4j-${version}.pom.asc"/>
+	      <arg value="--detach-sig"/>
+	      <arg value="log4j-${version}.pom"/>	      
+	  </exec>           
+	  <exec executable="gpg" dir="${dist.dir}/licenses">
+	      <arg value="--armor"/>
+	      <arg value="--output"/>
+	      <arg value="LICENSE.asc"/>
+	      <arg value="--detach-sig"/>
+	      <arg value="LICENSE"/>	      
+	  </exec>           
+	  <tar tarfile="${dist.images}/apache-log4j-${version}-maven-pgpsigs.tar.gz"
+         compression="gzip">
+         <tarfileset dir="${dist.dir}" includes="poms/*.asc licenses/*.asc"/>
+         <tarfileset dir="${jar.dest}" includes="${jar.filename}.asc" prefix="jars"/>
+         <tarfileset dir="${jar.dest}" includes="${sources-jar.filename}.asc" prefix="java-sources"/>
+      </tar>
 
-  <target name="publish-maven">
-    <scp todir="${username}@people.apache.org:/www/people.apache.org/repo/m1-ibiblio-rsync-repository/log4j/">
-        <fileset dir="${maven.dest}"/>
-    </scp>
   </target>
 
     <!-- ================================================================= -->
@@ -782,7 +804,27 @@
                    classname="org.apache.log4j.net.SMTPAppender"
                    classpath="${jar.dest}/${jar.filename}"/>
         <fail unless="javamail-found" message="JAVAMAIL was not found."/>
-
+        <antcall target="maven-package"/>
+	  <checksum forceOverwrite="yes" fileext=".md5">
+	  		<fileset dir="${dist.images}" includes="apache-log4j-${version}.tar.gz apache-log4j-${version}.zip"/>
+	  </checksum>           
+	  <checksum forceOverwrite="yes" fileext=".sha1" algorithm="SHA">
+	  		<fileset dir="${dist.images}" includes="apache-log4j-${version}.tar.gz apache-log4j-${version}.zip"/>
+	  </checksum>
+	  <exec executable="gpg" dir="${dist.images}">
+	      <arg value="--armor"/>
+	      <arg value="--output"/>
+	      <arg value="apache-log4j-${version}.tar.gz.asc"/>
+	      <arg value="--detach-sig"/>
+	      <arg value="apache-log4j-${version}.tar.gz"/>	      
+	  </exec>           
+	  <exec executable="gpg" dir="${dist.images}">
+	      <arg value="--armor"/>
+	      <arg value="--output"/>
+	      <arg value="apache-log4j-${version}.zip.asc"/>
+	      <arg value="--detach-sig"/>
+	      <arg value="apache-log4j-${version}.zip"/>	      
+	  </exec>           
    </target>
 
 <target name="fixcrlf" depends="init"

Modified: logging/log4j/branches/v1_2-branch/build/manifest.mf
URL: http://svn.apache.org/viewvc/logging/log4j/branches/v1_2-branch/build/manifest.mf?view=diff&rev=512013&r1=512012&r2=512013
==============================================================================
--- logging/log4j/branches/v1_2-branch/build/manifest.mf (original)
+++ logging/log4j/branches/v1_2-branch/build/manifest.mf Mon Feb 26 13:14:22 2007
@@ -1,7 +1,7 @@
 Manifest-version: 1.0
 
 Name: org/apache/log4j/
-Implementation-Title: log4j
+Implementation-Title: Apache log4j
 Implementation-Version: @version@
 Implementation-Vendor: "Apache Software Foundation"
 

Modified: logging/log4j/branches/v1_2-branch/docs/HISTORY.txt
URL: http://svn.apache.org/viewvc/logging/log4j/branches/v1_2-branch/docs/HISTORY.txt?view=diff&rev=512013&r1=512012&r2=512013
==============================================================================
--- logging/log4j/branches/v1_2-branch/docs/HISTORY.txt (original)
+++ logging/log4j/branches/v1_2-branch/docs/HISTORY.txt Mon Feb 26 13:14:22 2007
@@ -5,6 +5,31 @@
        client code. 
  [***] Changes requiring important modifications to existing client code.
  
+ March 5th, 2007
+ 
+ - Release of version 1.2.15
+ 
+ SyslogAppender: Added "header" property which if set to true will cause the appender
+        to produce the HEADER part (timestamp and hostname) of the syslog packet.
+        Default value is false for compatibility with previous behavior.  The
+        SyslogAppender also now sends any header from the associated
+        layout when activateOptions is called or first logging event is sent and
+        any footer when the appender is closed.
+ 
+ - Fixed following bugs:
+       40944: PropertyConfigurator.configure(URL) does not close resource stream.
+       40937: In Turkish locale level "info" is not equivalent to "INFO"
+       41339: Javadoc of PatternLayout should use %n in TTCC layout examples
+       41219: Stacktraces of exceptions disappear occassionally
+       38680: Incorrect message when specified custom level class does not implement toLevel
+       37282: SyslogAppender leaks descriptors
+       41040: SyslogAppender should prefix message with TIMESTAMP and local hostname
+       40502: SyslogAppender assumes all lines start with tab
+       41169: NTEventLogAppender.dll :: "missing" event description
+       41487: Warning when configuring inner-class logger
+       41186: AsyncAppender in 1.2.14 DiscardSummary events create NullPointerExceptions in layouts
+ 
+ 
  September 18th, 2006
  
  - Release of version 1.2.14

Modified: logging/log4j/branches/v1_2-branch/pom.xml
URL: http://svn.apache.org/viewvc/logging/log4j/branches/v1_2-branch/pom.xml?view=diff&rev=512013&r1=512012&r2=512013
==============================================================================
--- logging/log4j/branches/v1_2-branch/pom.xml (original)
+++ logging/log4j/branches/v1_2-branch/pom.xml Mon Feb 26 13:14:22 2007
@@ -1 +1 @@
-<!--
 Licensed to the Apache Software Foundation (ASF) under one or more
 contributor license agreements.  See the NOTICE file distributed with
 this work for additional information regarding copyright ownership.
 The ASF licenses this file to You under the Apache License, Version 2.0
 (the "License"); you may not use this file except in compliance with
 the License.  You may obtain a copy of the License at

      http://www.apache.org/licenses/LICENSE-2.0

 Unless required by applicable law or agreed to in writing, software
 distributed under the License is distributed on an "AS IS" BASIS,
 WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.

-->
<project xmlns="http://maven.apache.org/POM/4.0.0"
  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
  <m
 odelVersion>4.0.0</modelVersion>
  <groupId>log4j</groupId>
  <artifactId>log4j</artifactId>
  <packaging>jar</packaging>
  <name>Log4j</name>
  <version>1.2.14</version>
  <description>Log4j</description>
  <url>http://logging.apache.org/log4j/docs/</url>
  <issueManagement>
     <system>Bugzilla</system>
     <url>http://issues.apache.org/bugzilla</url>
  </issueManagement>
  <inceptionYear>1999</inceptionYear>
  <mailingLists>
	<mailingList>
		<name>log4j-user</name>
		<subscribe>log4j-user-subscribe@logging.apache.org</subscribe>
		<unsubscribe>log4j-user-unsubscribe@logging.apache.org</unsubscribe>
		<post>log4j-user@logging.apache.org</post>
		<archive>http://mail-archives.apache.org/mod_mbox/logging-log4j-dev/</archive>
		<otherArchives>
			<otherArchive>http://marc.theaimsgroup.com/?l=log4j-user&amp;r=1&amp;w=2</otherArchive>
		    <otherArchive>http://dir.gmane.org/gmane.comp.jakarta.log4j.user</otherArchive>
		</otherArchives>
	</mailingList>
	<mailingList>
		<name
 >log4j-dev</name>
		<subscribe>log4j-dev-subscribe@logging.apache.org</subscribe>
		<unsubscribe>log4j-dev-unsubscribe@logging.apache.org</unsubscribe>
		<post>log4j-dev@logging.apache.org</post>
		<archive>http://mail-archives.apache.org/mod_mbox/logging-log4j-dev/</archive>
		<otherArchives>
		    <otherArchive>http://marc.theaimsgroup.com/?l=log4j-dev&amp;r=1&amp;w=2</otherArchive>
		    <otherArchive>http://dir.gmane.org/gmane.comp.jakarta.log4j.devel</otherArchive>
		</otherArchives>
	</mailingList>
  </mailingLists>
  <licenses>
    <license>
      <name>The Apache Software License, Version 2.0</name>
      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
      <distribution>repo</distribution>
    </license>
  </licenses>
  <scm>
	<connection>scm:svn:http://svn.apache.org/repos/asf/logging/log4j/tags/v1_2_14</connection>
	<developerConnection>scm:svn:https://svn.apache.org/repos/asf/logging/log4j/tags/v1_2_14</developerConnection>
    <url>http://svn.apache.o
 rg/viewcvs.cgi/logging/log4j/tags/v1_2_14/</url>
  </scm>
  <organization>
    <name>Apache Software Foundation</name>
    <url>http://www.apache.org</url>
  </organization>
</project>
\ No newline at end of file
+<!--
 Licensed to the Apache Software Foundation (ASF) under one or more
 contributor license agreements.  See the NOTICE file distributed with
 this work for additional information regarding copyright ownership.
 The ASF licenses this file to You under the Apache License, Version 2.0
 (the "License"); you may not use this file except in compliance with
 the License.  You may obtain a copy of the License at

      http://www.apache.org/licenses/LICENSE-2.0

 Unless required by applicable law or agreed to in writing, software
 distributed under the License is distributed on an "AS IS" BASIS,
 WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.

-->
<project xmlns="http://maven.apache.org/POM/4.0.0"
  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
  <m
 odelVersion>4.0.0</modelVersion>
  <groupId>log4j</groupId>
  <artifactId>log4j</artifactId>
  <packaging>jar</packaging>
  <name>Apache Log4j</name>
  <version>1.2.15</version>
  <description>Apache Log4j</description>
  <url>http://logging.apache.org/log4j/docs/</url>
  <issueManagement>
     <system>Bugzilla</system>
     <url>http://issues.apache.org/bugzilla</url>
  </issueManagement>
  <inceptionYear>1999</inceptionYear>
  <mailingLists>
	<mailingList>
		<name>log4j-user</name>
		<subscribe>log4j-user-subscribe@logging.apache.org</subscribe>
		<unsubscribe>log4j-user-unsubscribe@logging.apache.org</unsubscribe>
		<post>log4j-user@logging.apache.org</post>
		<archive>http://mail-archives.apache.org/mod_mbox/logging-log4j-dev/</archive>
		<otherArchives>
			<otherArchive>http://marc.theaimsgroup.com/?l=log4j-user&amp;r=1&amp;w=2</otherArchive>
		    <otherArchive>http://dir.gmane.org/gmane.comp.jakarta.log4j.user</otherArchive>
		</otherArchives>
	</mailingList>
	<mailin
 gList>
		<name>log4j-dev</name>
		<subscribe>log4j-dev-subscribe@logging.apache.org</subscribe>
		<unsubscribe>log4j-dev-unsubscribe@logging.apache.org</unsubscribe>
		<post>log4j-dev@logging.apache.org</post>
		<archive>http://mail-archives.apache.org/mod_mbox/logging-log4j-dev/</archive>
		<otherArchives>
		    <otherArchive>http://marc.theaimsgroup.com/?l=log4j-dev&amp;r=1&amp;w=2</otherArchive>
		    <otherArchive>http://dir.gmane.org/gmane.comp.jakarta.log4j.devel</otherArchive>
		</otherArchives>
	</mailingList>
  </mailingLists>
  <licenses>
    <license>
      <name>The Apache Software License, Version 2.0</name>
      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
      <distribution>repo</distribution>
    </license>
  </licenses>
  <scm>
	<connection>scm:svn:http://svn.apache.org/repos/asf/logging/log4j/tags/v1_2_15</connection>
	<developerConnection>scm:svn:https://svn.apache.org/repos/asf/logging/log4j/tags/v1_2_15</developerConnection>
    <url>http:
 //svn.apache.org/viewcvs.cgi/logging/log4j/tags/v1_2_15/</url>
  </scm>
  <organization>
    <name>Apache Software Foundation</name>
    <url>http://www.apache.org</url>
  </organization>
</project>
\ No newline at end of file

Modified: logging/log4j/branches/v1_2-branch/src/xdocs/download.xml
URL: http://svn.apache.org/viewvc/logging/log4j/branches/v1_2-branch/src/xdocs/download.xml?view=diff&rev=512013&r1=512012&r2=512013
==============================================================================
--- logging/log4j/branches/v1_2-branch/src/xdocs/download.xml (original)
+++ logging/log4j/branches/v1_2-branch/src/xdocs/download.xml Mon Feb 26 13:14:22 2007
@@ -26,7 +26,7 @@
     <meta name="keywords" content="java, log4j download, logging, tracing, component, framework, API, log4j"/>
       <body>
 	
-      <section name="log4j version 1.2.14">
+      <section name="log4j version 1.2.15">
 	  <p>Log4j is <a
 	      href="http://logging.apache.org/site/binindex.cgi"><b>available
 	      for download</b></a> from a number of mirrors. Please
@@ -34,51 +34,29 @@
 	      bandwidth.
 	  </p>
 	  
-	  <p>Changes in log4j 1.2.14:
+	  <p>Changes in log4j 1.2.15:
     <ul>
- <li>AsyncAppender was rewritten to eliminate reported deadlocks (bugs <a href="http://issues.apache.org/bugzilla/show_bug.cgi?id=26224">26224</a>, <a href="http://issues.apache.org/bugzilla/show_bug.cgi?id=28006">28006</a>, <a href="http://issues.apache.org/bugzilla/show_bug.cgi?id=37904">37904</a>, <a href="http://issues.apache.org/bugzilla/show_bug.cgi?id=38137">38137</a>), 
-   and to add an option to not block if the event queue becomes full (bug <a href="http://issues.apache.org/bugzilla/show_bug.cgi?id=38982">38982</a>).</li>
-   
-  <li>SyslogAppender can now accept a port specification (bug <a href="http://issues.apache.org/bugzilla/show_bug.cgi?id=39687">39687</a>) in its syslogHost attribute.</li>
- 
-  <li>SMPTAppender can now accept cc and bcc addresses (bug <a href="http://issues.apache.org/bugzilla/show_bug.cgi?id=19125">19125</a>) and perform password authentication (bug <a href="http://issues.apache.org/bugzilla/show_bug.cgi?id=24969">24969</a>).</li>
+  <li>SyslogAppender now supports a "header" property which if true, causes the appender to produce the HEADER part (timestamp and hostname) of the syslog
+  packet.  Default value is false for compatibility with previous behavior.  The SyslogAppender also now sends any header from the associated layout when
+  activateOptions is called or the first logging event is send and any footer when the appender is closed.</li>
  
   <li>The following bugs were fixed:
       <ul>
-       <li><a href="http://issues.apache.org/bugzilla/show_bug.cgi?id=40159">40159</a>: NullPointerException in org.apache.log4j.NDC.get.
-       </li><li><a href="http://issues.apache.org/bugzilla/show_bug.cgi?id=36787">36787</a>: org.apache.log4j.lf5.util.DateFormatManager.setTimeZone assignment error.
-       </li><li><a href="http://issues.apache.org/bugzilla/show_bug.cgi?id=38559">38559</a>: Monthly logs not generated at midnight with DailyRollingFileAppender.
-       </li><li><a href="http://issues.apache.org/bugzilla/show_bug.cgi?id=40145">40145</a>: PatternLayout specifier %r is not consistent with documentation.
-       </li><li><a href="http://issues.apache.org/bugzilla/show_bug.cgi?id=37119">37119</a>: Space after log level causes default level to be used.
-       </li><li><a href="http://issues.apache.org/bugzilla/show_bug.cgi?id=39135">39135</a>: Bad patterns in ISO8601DateFormat and DateTimeDateFormat.
-       </li><li><a href="http://issues.apache.org/bugzilla/show_bug.cgi?id=35743">35743</a>: SyslogAppender throws NullPointerException upon misconfiguration.
-       </li><li><a href="http://issues.apache.org/bugzilla/show_bug.cgi?id=15501">15501</a>: FallbackErrorHandler throws NullPointerException if no loggers are set.
-       </li><li><a href="http://issues.apache.org/bugzilla/show_bug.cgi?id=38564">38564</a>: Bad documentation for WriterAppender.encoding.
-       </li><li><a href="http://issues.apache.org/bugzilla/show_bug.cgi?id=37866">37866</a>: NTEventLogAppender not build, tested and placed in distribution.
-       </li><li><a href="http://issues.apache.org/bugzilla/show_bug.cgi?id=38662">38662</a>: SMTPAppender does not output newlines between stack trace lines.
-       </li><li><a href="http://issues.apache.org/bugzilla/show_bug.cgi?id=30294">30294</a>: SMTPAppender will not run within sandbox.
-       </li><li><a href="http://issues.apache.org/bugzilla/show_bug.cgi?id=16922">16922</a>: MDC with SMTPAppender doesn't work.
-       </li><li><a href="http://issues.apache.org/bugzilla/show_bug.cgi?id=31507">31507</a>: Misspelling in HierarchyDynamicMBean.
-       </li><li><a href="http://issues.apache.org/bugzilla/show_bug.cgi?id=35123">35123</a>: Additivity not exported by PropertyPrinter.
-       </li><li><a href="http://issues.apache.org/bugzilla/show_bug.cgi?id=31003">31003</a>: RollingFileAppender, if removed, can cause NullPointerExceptions.
-       </li><li><a href="http://issues.apache.org/bugzilla/show_bug.cgi?id=23021">23021</a>: AsyncAppender blocks on thread death.
-       </li><li><a href="http://issues.apache.org/bugzilla/show_bug.cgi?id=40412">40412</a>: NOTICE file added to distribution and jar.
-       </li><li><a href="http://issues.apache.org/bugzilla/show_bug.cgi?id=40378">40378</a>: Chainsaw of log4j 1.2 does not show TRACE level.
-       </li><li><a href="http://issues.apache.org/bugzilla/show_bug.cgi?id=40501">40501</a>: TRACE level missing in short introduction to log4j.
-       </li><li><a href="http://issues.apache.org/bugzilla/show_bug.cgi?id=37960">37960</a>: Update site generation to velocity 1.4 and remove dependency on logging/site project.
-       </li></ul>
+       <li><a href="http://issues.apache.org/bugzilla/show_bug.cgi?id=40944">40944</a>: PropertyConfigurator.configure(URL) does not close resource stream.</li>
+       <li><a href="http://issues.apache.org/bugzilla/show_bug.cgi?id=40937">40937</a>: In Turkish locale level "info" is not equivalent to "INFO"</li>
+       <li><a href="http://issues.apache.org/bugzilla/show_bug.cgi?id=41339">41339</a>: Javadoc of PatternLayout should use %n in TTCC layout examples</li>
+       <li><a href="http://issues.apache.org/bugzilla/show_bug.cgi?id=41219">41219</a>: Stacktraces of exceptions disappear occassionally</li>
+       <li><a href="http://issues.apache.org/bugzilla/show_bug.cgi?id=38680">38680</a>: Incorrect message when specified custom level class does not implement toLevel</li>
+       <li><a href="http://issues.apache.org/bugzilla/show_bug.cgi?id=37282">37282</a>: SyslogAppender leaks descriptors</li>
+       <li><a href="http://issues.apache.org/bugzilla/show_bug.cgi?id=41040">41040</a>: SyslogAppender should prefix message with TIMESTAMP and local hostname</li>
+       <li><a href="http://issues.apache.org/bugzilla/show_bug.cgi?id=40502">40502</a>: SyslogAppender assumes all lines start with tab</li>
+       <li><a href="http://issues.apache.org/bugzilla/show_bug.cgi?id=41169">41169</a>: NTEventLogAppender.dll :: "missing" event description</li>
+       <li><a href="http://issues.apache.org/bugzilla/show_bug.cgi?id=41487">41487</a>: Warning when configuring inner-class logger</li>
+       <li><a href="http://issues.apache.org/bugzilla/show_bug.cgi?id=41186">41186</a>: AsyncAppender in 1.2.14 DiscardSummary events create NullPointerExceptions in layouts</li>
+      </ul>
    </li>
     </ul>
     </p>
-
-    <p>The next major release of log4j will be version 1.3.  It will contain
-    many new features and changes, and if you have written custom code, it may
-    need to be modified to work with it.  Please see the document entitled <a
-    href="http://www.qos.ch/logging/preparingFor13.jsp">preparing
-    for log4j 1.3</a> for a more detailed discussion.
-    </p>
-          
-          
 
 	  <subsection name='Earlier Releases'>
 	    <p>We also maintain <a

Modified: logging/log4j/branches/v1_2-branch/src/xdocs/plan.xml
URL: http://svn.apache.org/viewvc/logging/log4j/branches/v1_2-branch/src/xdocs/plan.xml?view=diff&rev=512013&r1=512012&r2=512013
==============================================================================
--- logging/log4j/branches/v1_2-branch/src/xdocs/plan.xml (original)
+++ logging/log4j/branches/v1_2-branch/src/xdocs/plan.xml Mon Feb 26 13:14:22 2007
@@ -46,14 +46,11 @@
 
     </section>
 
-    <section name="Release 1.2.15">
+    <section name="Release 1.2.16">
       <p>Expected timeframe: As needed</p>
       
-      <p>log4j 1.2.14 was released in September 2006.  log4j 1.2 is continuing to be maintained
-	  in response to reported, but no active development is anticipated in the near future.  Backporting
-	  the org.apache.log4j.rolling package from log4j 1.3 might be desirable since usage problems
-	  with the original org.apache.log4j.RollingFileAppender and org.apache.log4j.DailyRollingFileAppender
-	  are commonly reported.</p>
+      <p>log4j 1.2.15 was released in March 2007.  log4j 1.2 is continuing to be maintained
+	  in response to reported issues and requests for back-ported features from log4j 1.3.</p>
     </section>
     
     <section name="Release 1.3">



---------------------------------------------------------------------
To unsubscribe, e-mail: log4j-dev-unsubscribe@logging.apache.org
For additional commands, e-mail: log4j-dev-help@logging.apache.org