apache · 091313422 · Nov 1, 2004 · Nov 1, 2004 · Nov 3, 2004 · Nov 3, 2004
diff --git a/.cvsignore b/.cvsignore
diff --git a/BUILD-INFO.txt b/BUILD-INFO.txt
@@ -0,0 +1,58 @@
+This is a detailed instruction to reproduce the log4j distribution
+either to verify that the release is reproducable or to prepare
+a hot-fix.
+
+Install VMWare Player or Workstation appropriate for machine.
+
+Download Ubuntu-6.06-1 desktop from http://www.vmware.com/vmtn/appliances/directory/ubuntu.html
+
+Launch Ubuntu 6.06-1 in VMWare Player (user name and password are ubuntu)
+
+Launch Synaptics Package Manager (System > Administration > Synaptic Package Manager), select all available repositories (Settings > Repositories), press Reload button to update list of available packages.  Select the following packages for installation: Subversion, mingw32, sun-java6-jdk.  Press Apply to install.  Exit Synaptics.
+
+Download Maven-2.0.6 from http://maven.apache.org
+Download JMX 1.2.1 Reference Implementation from 
+   http://java.sun.com/products/JavaManagement/download.html
+Download JMS 1.1 from http://java.sun.com/products/jms/docs.html
+Unzip all in ~
+
+Copy include/win32/jni_md.h from a Windows JDK to ~
+
+From a command prompt:
+
+$ export JAVA_HOME=/usr/lib/jvm/java-6-sun
+$ export PATH=$JAVA_HOME/bin:/home/ubuntu/maven-2.0.6/bin:$PATH
+$ export JNI_WIN32_INCLUDE_DIR=/home/ubuntu
+$ svn co https://svn.apache.org/repos/asf/logging/log4j/tags/v1_2_15 log4j
+$ mvn install:install-file -DgroupId=com.sun.jdmk -DartifactId=jmxtools \
+          -Dversion=1.2.1 -Dpackaging=jar -Dfile=~/jmx-1_2_1-bin/lib/jmxtools.jar
+$ mvn install:install-file -DgroupId=com.sun.jmx -DartifactId=jmxri \
+          -Dversion=1.2.1 -Dpackaging=jar -Dfile=~/jmx-1_2_1-bin/lib/jmxri.jar
+$ mvn install:install-file -DgroupId=javax.jms -DartifactId=jms \
+          -Dversion=1.1 -Dpackaging=jar -Dfile=~/jms1.1/lib/jms.jar
+$ cd log4j
+$ mvn site assembly:assembly
+
+
+If you intended to deploy jars to the repo or update the site,
+you need to copy your private keys for people.apache.org 
+over to ~/.ssh and update ~/maven-2.0.6/conf/settings.xml
+to specify user name and key location.
+
+    <server>
+      <id>logging.repo</id>
+      <username>USERNAME for people.apache.org</username>
+      <privateKey>/home/ubuntu/.ssh/id_rsa</privateKey>
+      <passphrase></passphrase>
+    </server>
+    <server>
+      <id>logging.site</id>
+      <username>USERNAME for people.apache.org</username>
+      <privateKey>/home/ubuntu/.ssh/id_rsa</privateKey>
+      <passphrase></passphrase>
+    </server>
+
+You should test your ssh connection to people.apache.org before
+attempting a deployment like:
+
+$ ssh -l USERNAME people.apache.org
diff --git a/INSTALL b/INSTALL
@@ -1,3 +1,18 @@
+ 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.
+
 
 ===========
 Using log4j
@@ -7,12 +22,11 @@ Using log4j
 
 2) Assuming you chose to extract the distribution in to the
    PATH_OF_YOUR_CHOICE, untarring the distribution file should create
-   a jakarta-log4j-VERSION directory, where VERSION is the log4j
+   a logging-log4j-VERSION directory, where VERSION is the log4j
    version number, under PATH_OF_YOUR_CHOICE. We will refer to the
-   directory PATH_OF_YOUR_CHOICE/jakarta-log4j-VERSION/ as $LOG4J_HOME/.
+   directory PATH_OF_YOUR_CHOICE/apache-log4j-VERSION/ as $LOG4J_HOME/.
 
-3) Assuming you are using log4j version 1.2, add
-   $LOG4J_HOME/dist/lib/log4j-1.2.jar to your CLASSPATH,
+3) Add $LOG4J_HOME/log4j-VERSION.jar to your CLASSPATH,
 
 4) You can now test your installation by first compiling the following
    simple program.
@@ -22,7 +36,7 @@ Using log4j
 
     public class Hello {
 
-      static Logger logger = Logger.getLogger(Hello.class);
+      private static final Logger logger = Logger.getLogger(Hello.class);
 
       public
       static
@@ -48,80 +62,23 @@ JAR files
 =========
 
 The log4j distribution comes with one jar file: log4j-VERSION.jar
-under the $LOG4J_HOME/dist/lib/ directory.
+under the LOG4J_HOME directory.
 
 This jar file contains all the class files of the log4j project,
 except test cases and classes from the "examples" and
 "org.apache.log4j.performance" packages.
 
-==================   
-log4j dependencies
-==================
-
-Log4j is based on JDK 1.1 with the following additional requirements:
-
-    ----------------------------
-    Package org.apache.log4j.xml 
-    ----------------------------
-
-    The DOMConfigurator is based on the DOM Level 1 API. The
-    DOMConfigurator.configure(Element) method will work with any
-    XML parser that will pass it a DOM tree.
-
-    The DOMConfigurator.configure(String filename) method and its variants
-    require a JAXP compatible XMLparser, for example the Apache Xerces
-    parser. Compiling the DOMConfigurator requires the presence of a
-    JAXP parser in the classpath.  
-
-    Log4j is shipped with jaxp.jar and parser.jar files under the
-    build/lib/ directory.
-
-    ------------
-    SMTPAppender
-    ------------
-
-    The SMTPAppender relies on the JavaMail API. It has been tested with
-    JavaMail API version 1.2. The JavaMail API requires the
-    JavaBeans Activation Framework package. You can download the JavaMail API at:
-
-	http://java.sun.com/products/javamail/
-
-    and the JavaBeans Activation Framework at:
-
-	http://java.sun.com/beans/glasgow/jaf.html
-
-    -----------
-    JMSAppender
-    -----------
-
-    The JMSAppender requires the JMS API as well as JNDI. The JMS API
-    is usually bundled with the products of the vendors listed under
-
-       http://java.sun.com/products/jms/vendors.html
-
-    -----------------------
-    JUnit testing framework
-    -----------------------
-
-    Log4j uses the JUnit framework version 3.7 for internal unit
-    testing.  If you want to compile the source code in the tests/
-    directory, then you will need JUnit. JUnit is available from:
-
-          http://www.junit.org
 
 ==============
 Building log4j
 ==============
-
-Like most java appilicatios today, log4j relies on ANT as its build
-tool. ANT is availale from "http://jakarta.apache.org/ant/".  ANT
-requires a build file called build.xml which is part of this
-distribution. Required components from other projects are specified in
-the build.properties and example of which is supplied in the
-build.properties.sample file.
+
+log4j (as of 1.2.15) is built with Maven 2.  To rebuild log4j-VERSION.jar,
+place Maven 2 on the PATH and execute "mvn package".    
+
 
 In case of problems send an e-mail note to
-log4j-user@jakarta.apache.org.  Please do not directly e-mail any
+log4j-user@logging.apache.org.  Please do not directly e-mail any
 log4j developers. The answer to your question might be useful to other
 users. Moreover, there are many knowledgeable users on the log4j-user
 mailing lists who can quickly answer your questions.
diff --git a/KEYS b/KEYS
@@ -0,0 +1,93 @@
+This file contains the PGP&GPG keys of various Apache developers.
+Please don't use them for email unless you have to. Their main
+purpose is code signing.
+
+Apache users: pgp < KEYS
+Apache developers: 
+        (pgpk -ll <your name> && pgpk -xa <your name>) >> this file.
+      or
+        (gpg --fingerprint --list-sigs <your name>
+             && gpg --armor --export <your name>) >> this file.
+
+Apache developers: please ensure that your key is also available via the
+PGP keyservers (such as pgpkeys.mit.edu).
+
+
+Type bits /keyID    Date       User ID
+pub  1024D/0C7C4F05 2005/06/10 Mark Dwayne Womack <mwomack@apache.org>
+                               Mark Dwayne Womack <markwomack@womacknet.com>
+
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: PGP Key Server 0.9.6
+
+mQGiBEKqEj8RBADR8e9Xl0kFJqv8SspvDP8kUsivBxWVZz+HVKf0pL2wOie0LfsF
+E0Y3dI7k0k8i8KXtWYmHY3dpJGLUaruqIRxPFen/No56Q7udlK5hj7vKEUb46krx
+sLgik1s+WX8+61Yu5cLuGdqnfwRGuNV7uf3JF1Q78VXIyUlS4BFMXGtqjwCg//s6
+1m7N3p8AtIgma+U13rEkq9cEAJ6l9eEPgOdRx53nKkCgkVpDxxhpbg90STQ1s94f
+rZIc+y5LN7FEERiQSiXvuzCwxiritiv+03sqdjYicxYZux+aladi0mHDIdgZkrAP
+MrRJ+8AKs7jv+WXcyaJcja8h3IZLShszgUM6uCW4Wr8mzZ+ns/65ihe4A/jS/Gu+
+cD44A/9doNrvOnNXPD+N/R9ME3zS6FY8d5F6f8oxZOEsMll/AG1HhOR4yxOmZMOl
++ZTg9AacHWMtTkjbs6JkT6uA8+tU+txoYjofkaGcJgq/SQYen89ifXZXVkUMWjqL
+ioUUKCsu4OQPnH5k3jCQp7DrkpDAgIBGZ5F3QGaYsrkVjxNoE7QnTWFyayBEd2F5
+bmUgV29tYWNrIDxtd29tYWNrQGFwYWNoZS5vcmc+iEYEEBECAAYFAkKwy1kACgkQ
+vhbJXS4RQyKOYQCfddSBIMCd3kaFPvL90/piH/QIdIgAnRwG83V+KMRltnPRclDH
+IcTI5unMiQBOBBARAgAOBQJCqhI/BAsDAgECGQEACgkQErKHWAx8TwWGeACgnN9d
+jKDT2mjBKnApaDkMzmAaMvMAoKEcdBBCx62RPNIEBnxZ6zAxH244tC1NYXJrIER3
+YXluZSBXb21hY2sgPG1hcmt3b21hY2tAd29tYWNrbmV0LmNvbT6IRgQQEQIABgUC
+QrDLXgAKCRC+FsldLhFDIgvLAJ9VsCFN6uBcObkb+UCN70ukHH5VWQCdEjPNvKCs
+c4+FGbTTsEoabhoNhsuJAEsEEBECAAsFAkKqFqUECwMCAQAKCRASsodYDHxPBeU1
+AKDUIGqVzFZDXgK8PcLW8OlL2dXRmgCgwwxRkgpzuKNMnkphSZNend3VdJa5Ag0E
+QqoSPxAIAPZCV7cIfwgXcqK61qlC8wXo+VMROU+28W65Szgg2gGnVqMU6Y9AVfPQ
+B8bLQ6mUrfdMZIZJ+AyDvWXpF9Sh01D49Vlf3HZSTz09jdvOmeFXklnN/biudE/F
+/Ha8g8VHMGHOfMlm/xX5u/2RXscBqtNbno2gpXI61Brwv0YAWCvl9Ij9WE5J280g
+tJ3kkQc2azNsOA1FHQ98iLMcfFstjvbzySPAQ/ClWxiNjrtVjLhdONM0/XwXV0Oj
+HRhs3jMhLLUq/zzhsSlAGBGNfISnCnLWhsQDGcgHKXrKlQzZlp+r0ApQmwJG0wg9
+ZqRdQZ+cfL2JSyIZJrqrol7DVekyCzsAAgIH/2A8l4YFI5dYs5ZV3OgspEh0Qa/N
+qd/JiVWBdygI77zp9TEgUtFBPDItEjmJq8sgnao0Cd5d68l9c+PQJ1xr4fOpdug0
+YmYUgIaKutha3SSNRbD+T0WYmtTO5A4wxbsF3hYU7fvBJrt8gnO4tx6KAn/O2rRk
+wPfNTZ1EdnKttZDM2Mz4OiK0SsQ9mS7zP+HPx3kzdl1Oj0Vk2tUElD1R1hVjLa/o
+v5YgJCrwSD7RfCZAOEoPxXXN6StCqW1zT6HgcSR0clM5BC+ZyBJzczzD9I5+TrlH
+d3ISaCOuP5NeYQdTsQ446bjiNk7LT25gNHF6U6WjmLQ3lXCz4kNoBG6fiOKIRgQY
+EQIABgUCQqoSPwAKCRASsodYDHxPBQ7wAKD4DO0Se4+SvSqUKDfxhI0lJTgK0gCg
+0lICv0KXT6PKyTndK+lr6K2AL4o=
+=GKga
+-----END PGP PUBLIC KEY BLOCK-----
+
+
+pub   1024D/2E114322 2005-06-11 [expires: 2010-06-10]
+      Key fingerprint = A1A2 B554 6D43 31B2 A41E  1C07 BE16 C95D 2E11 4322
+uid                  Curt Arnold <carnold@apache.org>
+sig 3        2E114322 2005-06-11  Curt Arnold <carnold@apache.org>
+sub   2048g/209ECE57 2005-06-11 [expires: 2010-06-10]
+sig          2E114322 2005-06-11  Curt Arnold <carnold@apache.org>
+
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v1.4.3 (Darwin)
+
+mQGiBEKrSNQRBAC4J7udOBoC5+gVxBaPAbjXfnq12l5Pau1WD+UothePNGjI2hOp
++Rnzikk3ISgyrjiX3A8ScZYbu3iXvMpF4zknkGLdmerpf4Gz9xGeushwun+UFaFL
+MX5u7LWJo9wDKzbcJJit1j/qGEg/HRp5fnVYCh0/l4dLansL60NhxtYdxwCguu2e
+wZMZFroaiIXqnce7+cGDRq8D/2HgKGtEJHY3z8OtUqncWbW+RAQqdcT0Z+bMB8o6
+0UCHxUoJrFS1lA62qU3kcZ8ACPoh9xDW4X47EgNPELX81alymTI5FdqiDK7RIwzE
+JlOH/8JJgC6eSwiUXJ0cOJwpMonitcpMLouxuURuPSpfE5b1mQ1gFzN5MBL8xlZQ
+8IO6A/9qWwyWyQBoJud0RDIsVRosdoSBZtw9PHsURgsqfNsS2NXTWK4HjxExw1KO
+AXmRlALfrH8yAShy/AyiUrwlKHG2WPTe6Etygjlr4dIxqTiCOoi+qv+H8SXW4Qy3
+SnyozJ2RlKoYG0oDTbVMsPhOFdytHjConDLL9vS14j4kN9zWB7QgQ3VydCBBcm5v
+bGQgPGNhcm5vbGRAYXBhY2hlLm9yZz6IZAQTEQIAJAUCQqtI1AIbAwUJCWYBgAYL
+CQgHAwIDFQIDAxYCAQIeAQIXgAAKCRC+FsldLhFDIs5CAJ9roOB39ithHoCLaDJx
+l14efLwgNgCfcDBYutNX5W627kCeheDqhQbTqTi5Ag0EQqtJBRAIAN8maiGIO44S
+dc9Ep3CAm0aXDeR8IQ/F253WcMQtkFBjeHEDd6/+EFT52vswMI6ZJDVV/A7pe4VM
+XAdNutFmUG2gy9OJOu8gMuO3jTCLxUXyQYNF/RasOAQJgc7q1N5QgKtXVH2InQ21
+vHvlHM1fVe4rYDPr4JL2lZHe0P8kTzeQ7jI5pQnfYRJmS8I5AMQYFOiM48Pd7Sbs
+Wu/rym7ikcmKUe6ZE59hSioneVP31CDMNRxCAQJVS1mZxTozsAEoh+cvmRjOD1Es
+0iXvu6Sfe8+sLRL+7CNUZgixE1UFbdnNxuZGlG9qs0LGP7hDWijT1/Y4SHz4ovXx
+k0oocmFtiLcAAwcIAMbY7K99hLAFVaU2ukxCSp1TNPcD+IB3gtpRieKaZvBn/LGe
+CO+fNAogkw537lmpLk4nI+JiP/xWohyJ9lyEpW7yD4c9AHKNjqvEWD5Bhpnw4qKJ
+ohQSVQwEeJRsftY4D0jCP9xbgPiq5woBzHWNok3BVaHqLK0fd0/+KygnT+k6cR22
+Mus9RsEisXk9Oj5lvC0miDOWof4vk2Ll8/H3xt4CXAr13n5Yj2632HolOHrFUQXT
+gwc9v5CNIihOQMEiXFxHh743qbsUZktjxeYH7r8wSCV93/QQ4qELiWoUzndpkCRT
+lEKenucAv6f5qqZqG7pVW8S48T99HwzwqgFX5VOITwQYEQIADwUCQqtJBQIbDAUJ
+CWYBgAAKCRC+FsldLhFDIjnoAJ9ECOIrTH3adnVLOkHZnewyp2ssxwCgtLjlwZ7/
+4QtL3W5Id3nKxPFiI+c=
+=9ut1
+-----END PGP PUBLIC KEY BLOCK-----