vote passed
git-svn-id: https://svn.apache.org/repos/asf/logging/log4j/tags/v1_2_17@1342873 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/BUILD-INFO.txt b/BUILD-INFO.txt
deleted file mode 100644
index 2be1965..0000000
--- a/BUILD-INFO.txt
+++ /dev/null
@@ -1,141 +0,0 @@
- 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.
-
-=============
-
-Preparing log4j releases.
-
-=============
-
-
-This is a detailed instruction to reproduce the log4j distribution
-either to verify that the release is reproducable or to prepare
-a hot-fix.
-
-The log4j build is platform dependent. The best is to setup a VM using virtualbox (or similar),
-install Ubuntu and follow the steps here.
-
-History:
- * Initial: Apache log4j 1.2.16 was prepared using Ubuntu 9.10.
- * Updated in preparation for 1.2.17.
-
-
-Preparation of environment:
-
-1. Install Sun Java 6:
-
-$> sudo sed 's/restricted/restricted universe multiverse/' -i /etc/apt/sources.list
-$> sudo apt-get update && sudo apt-get -y update
-$> sudo apt-get install openjdk-6-jdk
-
-2. Install Maven 2, Subversion, mingw and xemacs21, openssh-server:
-
-$> sudo apt-get install maven2 subversion mingw32 xemacs21 openssh-server
-
-3. Copy Win32 version of jni_md.h for NTEventLogAppender.dll
-
-c:\>cd "\Program Files\Java\jdk_1.6.0_16\include\win32
-c:\>scp jni_md.h username@hostname:
-
-$> export JNI_WIN32_INCLUDE_DIR=/home/username
-
-4. Create a local ssh key with no passphrase to enable
-"deployment" of site back to the local machine using scp.
-
-$> ssh-keygen
-$> cd ~/.ssh
-$> cat id_rsa.pub >> authorized_keys
-$> ssh localhost
-$> exit
-
-It's important to add localhost and people.a.o to the list of permanent allowed hosts.
-Besides the above, this should have been runned at least once:
-
-$> ssh people.apache.org
-
-From a command prompt:
-
-$ export SVN_EDITOR=xemacs
-$ svn co https://svn.apache.org/repos/asf/logging/log4j/tags/v1_2_16
-$ cd v1_2_16
-$ mvn site assembly:assembly
-
-
-If you intended to deploy jars to the repo or update the site,
-you need to set up ssh to use private keys to access people.apache.org
-and create or modify ~/.m2/settings.xml to specify user name and key location.
-
-<settings xmlns="http://maven.apache.org/SETTINGS/1.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0
- http://maven.apache.org/xsd/settings-1.0.0.xsd">
- <servers>
- <server>
- <id>logging.repo</id>
- <username>USERNAME for people.apache.org</username>
- <privateKey>/home/username/.ssh/id_rsa</privateKey>
- <passphrase></passphrase>
- </server>
- </servers>
-</settings>
-
-You should test your ssh connection to people.apache.org
-and localhost before attempting a deployment like:
-
-$ ssh -l USERNAME people.apache.org
-$ ssh localhost
-
-The release artifacts were originally built by:
-
-$> svn co http://svn.apache.org/repos/asf/logging/log4j/trunk log4j
-$> cd log4j
-$> mvn package release:prepare
-$> mvn release:perform
-
-Attention: this is an non-interactive build. In some cases it is necessary
-to add: -Dusername=paouser -Dpassword=paopassword
-to the release plugin commands. This is surely not safe because your password
-can be seen clearly.
-
-
-The release artifacts can be rebuilt by:
-
-$ mvn release:perform -DconnectionUrl=scm:svn:https://svn.apache.org/repos/asf/logging/log4j/tags/v1_2_16
-
-The website content will automatically be staged to the ASF SVN repo by "mvn site-deploy".
-This phase checks out https://svn.apache.org/repos/asf/logging/site/trunk/docs/log4j/1.2
-into target/site-deploy, copys the generated documentation to that directory using
-scp to localhost and then commits the changed content. You will be prompted for an
-SVN commit message using the configured SVN_EDITOR. A commit message must be entered or the
-site commit will be aborted.
-
-The staged content can be tested by opening
-http://svn.apache.org/repos/asf/logging/site/trunk/docs/1.2/index.html,
-however some links may be broken due to the staged location.
-The staged version can be published to the main public site by executing
-"svn update" in /www/logging.apache.org/log4j/1.2 on people.apache.org.
-
-
- * CREATING ANOTHER RELEASE CANDIDATE
-
-If a RC has not passed the vote, these steps are necessary:
-
-Rename the tag:
-$> svn mv https://svn.apache.org/repos/asf/logging/log4j/tags/log4j-1.2.17 https://svn.apache.org/repos/asf/logging/log4j/tags/log4j-1.2.17-rc1
-
-Delete the RC artifacts from:
-http://people.apache.org/builds/logging/repo/log4j/log4j/
-
-Change the pom.xml version to the prior version number.
\ No newline at end of file
diff --git a/doap_log4j.rdf b/doap_log4j.rdf
index 03c5bb8..1c314c3 100644
--- a/doap_log4j.rdf
+++ b/doap_log4j.rdf
@@ -36,9 +36,9 @@
<category rdf:resource="http://projects.apache.org/category/library" />
<release>
<Version>
- <name>Apache log4j 1.2.15</name>
- <created>2007-08-24</created>
- <revision>1.2.15</revision>
+ <name>Apache log4j 1.2.17</name>
+ <created>2012-05-06</created>
+ <revision>1.2.17</revision>
</Version>
</release>
<repository>
diff --git a/pom.xml b/pom.xml
index c7fc7e7..93881cd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -76,9 +76,9 @@
</license>
</licenses>
<scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/logging/log4j/tags/v1_2_17</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/logging/log4j/tags/v1_2_17</developerConnection>
- <url>http://svn.apache.org/viewvc/logging/log4j/tags/v1_2_17</url>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/logging/log4j/tags/v1_2_17_rc3</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/logging/log4j/tags/v1_2_17_rc3</developerConnection>
+ <url>http://svn.apache.org/viewvc/logging/log4j/tags/v1_2_17_rc3</url>
</scm>
<organization>
<name>Apache Software Foundation</name>
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 86c88ce..d5a75c3 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -20,8 +20,9 @@
<title>Apache log4j 1.2</title>
</properties>
<body>
- <release version="1.2.17" date="2010-06-99" description="Maintenance release">
+ <release version="1.2.17" date="2012-05-06" description="Maintenance release">
<action issue="49470">log4j 1.2.17 release preparation</action>
+ <action issue="52913" action="add" dev="ggregory">Configure from an InputStream</action>
<action issue="51597" action="fix">JDBCAppender not closed due to SQL Exception while executing an SQL (thanks to Anurag Agarwal)</action>
<action issue="50486" action="fix">Memoryleak - org.apache.log4j.helpers.ThreadLocalMap</action>
<action issue="48588" action="fix">DOMConfigurator does not close input stream when configured based on URL.</action>
diff --git a/src/main/java/org/apache/log4j/net/JMSAppender.java b/src/main/java/org/apache/log4j/net/JMSAppender.java
index 60bd5d0..3482702 100644
--- a/src/main/java/org/apache/log4j/net/JMSAppender.java
+++ b/src/main/java/org/apache/log4j/net/JMSAppender.java
@@ -43,7 +43,7 @@
* <p>JMS {@link Topic topics} and {@link TopicConnectionFactory topic
* connection factories} are administered objects that are retrieved
- * using JNDI messaging which in turn requires the retreival of a JNDI
+ * using JNDI messaging which in turn requires the retrieval of a JNDI
* {@link Context}.
* <p>There are two common methods for retrieving a JNDI {@link
@@ -63,7 +63,7 @@
* <p>In the second approach, several predetermined properties are set
* and these properties are passed to the <code>InitialContext</code>
- * contructor to connect to the naming service provider. For example,
+ * constructor to connect to the naming service provider. For example,
* to connect to JBoss naming service one would write:
<pre>
@@ -74,7 +74,7 @@
InitialContext jndiContext = new InitialContext(env);
</pre>
- * where <em>hostname</em> is the host where the JBoss applicaiton
+ * where <em>hostname</em> is the host where the JBoss application
* server is running.
*
* <p>To connect to the the naming service of Weblogic application
diff --git a/src/site/site.xml b/src/site/site.xml
index 9c5b3f6..e233aef 100644
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -51,6 +51,7 @@
<item name="Introduction" href="/manual.html"/>
<item name="JavaDoc" href="/apidocs/index.html"/>
<item name="Publications" href="/publications.html"/>
+ <item name="Building" href="/building.html"/>
<item name="Wiki" href="http://wiki.apache.org/logging-log4j"/>
</menu>
diff --git a/src/site/xdoc/building.xml b/src/site/xdoc/building.xml
new file mode 100644
index 0000000..f323645
--- /dev/null
+++ b/src/site/xdoc/building.xml
@@ -0,0 +1,197 @@
+<!--
+ 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.
+
+-->
+<document>
+
+ <properties>
+ <author email="log4j-dev@logging.apache.org">The Apache log4j team</author>
+ <title>How to build Apache log4j</title>
+ </properties>
+ <body>
+<section name="Building Apache log4j">
+
+<h2>Introduction</h2>
+
+<p>This is a detailed instruction to reproduce the log4j distribution
+either to verify that the release is reproducable or to prepare
+a hot-fix.</p>
+
+<p>The log4j build is platform dependent. The best is to setup a VM using virtualbox (or similar),
+install Ubuntu and follow the steps here.</p>
+
+<h2>Preparation of environment</h2>
+
+<h3>Install Sun Java 6</h3>
+<pre>
+$> sudo sed 's/restricted/restricted universe multiverse/' -i /etc/apt/sources.list
+$> sudo apt-get update && sudo apt-get -y update
+$> sudo apt-get install openjdk-6-jdk
+</pre>
+
+
+<h3>Install Maven 2, Subversion, mingw and xemacs21, openssh-server:</h3>
+
+<pre>
+$> sudo apt-get install maven2 subversion mingw32 xemacs21 openssh-server
+</pre>
+
+<h3>Copy Win32 version of jni_md.h for NTEventLogAppender.dll</h3>
+
+<pre>
+c:\>cd "\Program Files\Java\jdk_1.6.0_16\include\win32
+c:\>scp jni_md.h username@hostname:
+
+$> export JNI_WIN32_INCLUDE_DIR=/home/username
+</pre>
+
+<h3>Signing & Deploying</h3>
+
+<p>Create a local ssh key with no passphrase to enable
+"deployment" of site back to the local machine using scp.</p>
+
+<pre>
+$> ssh-keygen
+$> cd ~/.ssh
+$> cat id_rsa.pub >> authorized_keys
+$> ssh localhost
+$> exit
+</pre>
+
+<p>It's important to add localhost and people.a.o to the list of permanent allowed hosts.
+Besides the above, this should have been runned at least once:</p>
+
+<pre>
+$> ssh people.apache.org
+</pre>
+
+<p>If you intended to deploy jars to the repo or update the site,
+you need to set up ssh to use private keys to access people.apache.org
+and create or modify ~/.m2/settings.xml to specify user name and key location.
+</p>
+
+<pre>
+<settings xmlns="http://maven.apache.org/SETTINGS/1.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0
+ http://maven.apache.org/xsd/settings-1.0.0.xsd">
+ <servers>
+ <server>
+ <id>logging.repo</id>
+ <username>USERNAME for people.apache.org</username>
+ <privateKey>/home/username/.ssh/id_rsa</privateKey>
+ <passphrase></passphrase>
+ </server>
+ </servers>
+</settings>
+</pre>
+
+<p>You should test your ssh connection to people.apache.org
+and localhost before attempting a deployment like:</p>
+
+<pre>
+$ ssh -l USERNAME people.apache.org
+$ ssh localhost
+</pre>
+
+<h2>Building release artifacts</h2>
+
+<p>Before you build, please make sure you have a nonblocking editor set as SVN editor. Like:</p>
+
+<pre>
+$ export SVN_EDITOR=xemacs
+</pre>
+
+<p>Other checks:</p>
+
+<ul>
+ <li>Please make sure changes.xml reflect all fixed issues. The release date in changes is to be set
+ to the date the release candidate is created.</li>
+ <li>Please update doap_log4j.rdf to reflect the correct version. Use the same release date as in changes.</li>
+</ul>
+<p>The release artifacts were originally built by:</p>
+
+<pre>
+$> svn co http://svn.apache.org/repos/asf/logging/log4j/trunk log4j
+$> cd log4j
+$> mvn package release:prepare
+$> mvn release:perform
+</pre>
+
+<p>Note: you'll be ask for a SVN tagname. Please use the following pattern: v1.2.17-RC1.</p>
+
+<p>
+Attention: this is an non-interactive build. In some cases it is necessary
+to add: -Dusername=paouser -Dpassword=paopassword
+to the release plugin commands. This is surely not safe because your password
+can be seen clearly.
+</p>
+
+<p>The release artifacts can be rebuilt by:</p>
+
+<pre>
+$ mvn release:perform -DconnectionUrl=scm:svn:https://svn.apache.org/repos/asf/logging/log4j/tags/v1_2_16
+</pre>
+
+<p>Building site and artifacts from a tag:</p>
+
+<pre>
+$ svn co https://svn.apache.org/repos/asf/logging/log4j/tags/v1_2_16
+$ cd v1_2_16
+$ mvn site assembly:assembly
+</pre>
+
+<p>TODO: the following section describes site staging. This must be altered: the staging must not happen in SVN.</p>
+
+<p>
+The website content will automatically be staged to the ASF SVN repo by "mvn site-deploy".
+This phase checks out https://svn.apache.org/repos/asf/logging/site/trunk/docs/log4j/1.2
+into target/site-deploy, copys the generated documentation to that directory using
+scp to localhost and then commits the changed content. You will be prompted for an
+SVN commit message using the configured SVN_EDITOR. A commit message must be entered or the
+site commit will be aborted.
+</p>
+
+<p>
+The staged content can be tested by opening
+http://svn.apache.org/repos/asf/logging/site/trunk/docs/1.2/index.html,
+however some links may be broken due to the staged location.
+The staged version can be published to the main public site by executing
+"svn update" in /www/logging.apache.org/log4j/1.2 on people.apache.org.
+</p>
+
+<h2>If a vote has failed</h2>
+<ul>
+ <li>Send a "cancel" note to the mailinglist (usually resend the vote mail with [CANCEL] in subject</li>
+ <li>Delete the RC artifacts from:<pre>http://people.apache.org/builds/logging/repo/log4j/log4j/</pre></li>
+</ul>
+
+
+
+<h2>If a vote has passed</h2>
+
+<p>If a RC has passed the vote, these steps are necessary:</p>
+
+<p>Rename the tag:</p>
+<pre>
+$> svn mv https://svn.apache.org/repos/asf/logging/log4j/tags/log4j-1.2.17-RC1 https://svn.apache.org/repos/asf/logging/log4j/tags/log4j-1.2.17
+</pre>
+
+<p>Change the pom.xml version to the prior version number.</p>
+
+</section>
+</body>
+</document>
\ No newline at end of file
