Author: carnold
Date: Mon Jun 4 17:34:09 2007
New Revision: 544335
URL: http://svn.apache.org/viewvc?view=rev&rev=544335
Log:
Bug 42094: Change version to 1.0, add docs, other product goodies
Added:
logging/log4j/companions/component/trunk/src/assembly/
logging/log4j/companions/component/trunk/src/assembly/bin.xml
- copied, changed from r544250,
logging/log4j/branches/v1_2-branch/src/assembly/bin.xml
logging/log4j/companions/component/trunk/src/site/apt/
- copied from r544259, logging/log4j/branches/v1_2-branch/src/site/apt/
Removed:
logging/log4j/companions/component/trunk/src/site/apt/publications.apt
Modified:
logging/log4j/companions/component/trunk/build.xml
logging/log4j/companions/component/trunk/pom.xml
logging/log4j/companions/component/trunk/src/changes/changes.xml
logging/log4j/companions/component/trunk/src/main/java/org/apache/log4j/LoggerRepositoryExImpl.java
logging/log4j/companions/component/trunk/src/main/java/org/apache/log4j/plugins/PluginConfigurator.java
logging/log4j/companions/component/trunk/src/main/java/org/apache/log4j/spi/ComponentBase.java
logging/log4j/companions/component/trunk/src/main/java/org/apache/log4j/spi/LoggerEventListener.java
logging/log4j/companions/component/trunk/src/main/java/org/apache/log4j/spi/LoggerRepositoryEventListener.java
logging/log4j/companions/component/trunk/src/main/java/org/apache/log4j/spi/LoggerRepositoryEx.java
logging/log4j/companions/component/trunk/src/site/apt/download.apt
logging/log4j/companions/component/trunk/src/site/apt/index.apt
logging/log4j/companions/component/trunk/src/site/apt/roadmap.apt
logging/log4j/companions/component/trunk/src/site/site.xml
logging/log4j/companions/component/trunk/src/test/java/org/apache/log4j/plugins/PluginTestCase.java
Modified: logging/log4j/companions/component/trunk/build.xml
URL:
http://svn.apache.org/viewvc/logging/log4j/companions/component/trunk/build.xml?view=diff&rev=544335&r1=544334&r2=544335
==============================================================================
--- logging/log4j/companions/component/trunk/build.xml (original)
+++ logging/log4j/companions/component/trunk/build.xml Mon Jun 4 17:34:09 2007
@@ -29,15 +29,15 @@
<!-- project details -->
<property name="project.name" value="apache-log4j-component"/>
<property name="project.title" value="Component"/>
- <property name="project.version" value="0.1-SNAPSHOT"/>
+ <property name="project.version" value="1.0"/>
<property name="project.jar"
value="${project.name}-${project.version}.jar"/>
<!-- Location of local Maven 2 repository -->
<property name="m2_repo" location="${user.home}/.m2/repository"/>
<!-- Versions for dependencies -->
- <property name="log4j.version" value="1.2.14"/>
- <property name="junit.version" value="3.8.1"/>
+ <property name="log4j.version" value="1.2.8"/>
+ <property name="junit.version" value="4.3.1"/>
<!-- Dependency locations - assumed to be in Maven 2 repository -->
<property name="junit.jar"
@@ -46,8 +46,8 @@
location="${m2_repo}/log4j/log4j/${log4j.version}/log4j-${log4j.version}.jar"/>
<!-- Java compiler settings -->
- <property name="javac.source" value="1.3"/>
- <property name="javac.target" value="1.2"/>
+ <property name="javac.source" value="1.2"/>
+ <property name="javac.target" value="1.1"/>
<property name="javac.deprecation" value="true"/>
<property name="javac.debug" value="true"/>
Modified: logging/log4j/companions/component/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/logging/log4j/companions/component/trunk/pom.xml?view=diff&rev=544335&r1=544334&r2=544335
==============================================================================
--- logging/log4j/companions/component/trunk/pom.xml (original)
+++ logging/log4j/companions/component/trunk/pom.xml Mon Jun 4 17:34:09 2007
@@ -21,13 +21,13 @@
<groupId>log4j</groupId>
<artifactId>apache-log4j-component</artifactId>
<packaging>jar</packaging>
- <version>0.1-SNAPSHOT</version>
+ <version>1.0-SNAPSHOT</version>
<name>Apache Component Companion for log4j 1.2.</name>
<description>This companion emulates the log4j 1.3 Component Framework to
simplify the back-porting of code that made use of its services. It does
not provide any immediately useful functionality to log4j by itself,
but is used by Receivers and Chainsaw.</description>
- <url>http://logging.apache.org/log4j/companions/component</url>
+ <url>http://logging.apache.org:80/log4j/companions/component</url>
<issueManagement>
<system>Bugzilla</system>
<url>http://issues.apache.org/bugzilla/</url>
@@ -60,14 +60,6 @@
</otherArchives>
</mailingList>
</mailingLists>
-<developers>
- <developer>
- <id>carnold</id>
- <name>Curt Arnold</name>
- <email>[EMAIL PROTECTED]</email>
- <timezone>-6</timezone>
- </developer>
- </developers>
<licenses>
<license>
<name>Apache License, Version 2.0</name>
@@ -76,9 +68,9 @@
</license>
</licenses>
<scm>
-
<connection>scm:svn:http://svn.apache.org/repos/asf/logging/sandbox/log4j/component</connection>
-
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/logging/sandbox/log4j/component</developerConnection>
-
<url>http://svn.apache.org/viewcvs.cgi/logging/sandbox/log4j/component</url>
+
<connection>scm:svn:http://svn.apache.org/repos/asf/logging/log4j/companions/component/trunk</connection>
+
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/logging/log4j/companions/component/trunk</developerConnection>
+
<url>http://svn.apache.org/viewcvs.cgi/logging/log4j/companions/component/trunk</url>
</scm>
<organization>
<name>Apache Software Foundation</name>
@@ -87,17 +79,6 @@
<build>
<plugins>
<plugin>
- <artifactId>maven-checkstyle-plugin</artifactId>
- <dependencies>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>1.2.14</version>
- </dependency>
- </dependencies>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<workingDirectory>target</workingDirectory>
@@ -106,65 +87,132 @@
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
- <source>1.3</source>
- <target>1.3</target>
+ <source>1.2</source>
+ <target>1.1</target>
</configuration>
</plugin>
- <!-- clean stray cobertura.ser -->
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>cobertura-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>clean</id>
- <goals>
- <goal>clean</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
+ <plugin>
+ <artifactId>maven-jar-plugin</artifactId>
+ <configuration>
+ <archive>
+ <manifestSections>
+ <manifestSection>
+ <name>org.apache.log4j</name>
+ <manifestEntries>
+
<Implementation-Title>${project.name}</Implementation-Title>
+
<Implementation-Version>${project.version}</Implementation-Version>
+ <Implementation-Vendor>"Apache Software
Foundation"</Implementation-Vendor>
+ </manifestEntries>
+ </manifestSection>
+ </manifestSections>
+ </archive>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>site</phase>
+ <id>untag-site</id>
+ <configuration>
+ <tasks>
+ <taskdef name="replaceregexp"
classname="org.apache.tools.ant.taskdefs.optional.ReplaceRegExp" />
+ <replaceregexp file="target/site/source-repository.html"
match="/tags/[^ ]*" replace="/trunk" flags="g" />
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ <dependencies>
+ <dependency>
+ <groupId>ant</groupId>
+ <artifactId>ant-nodeps</artifactId>
+ <version>1.6.5</version>
+ </dependency>
+ </dependencies>
+ </plugin>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <configuration>
+ <descriptors>
+ <descriptor>src/assembly/bin.xml</descriptor>
+ </descriptors>
+ </configuration>
+ <executions>
+ <execution>
+ <goals>
+ <goal>assembly</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>jar</goal>
+ <goal>javadoc</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <artifactId>maven-source-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
<dependencies>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>3.8.1</version>
+ <version>4.3.1</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
- <version>1.2.14</version>
+ <version>1.2.8</version>
</dependency>
</dependencies>
<reporting>
+ <excludeDefaults>true</excludeDefaults>
<plugins>
<plugin>
- <artifactId>maven-checkstyle-plugin</artifactId>
- </plugin>
- <plugin>
- <artifactId>maven-pmd-plugin</artifactId>
- </plugin>
- <plugin>
- <artifactId>maven-javadoc-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-project-info-reports-plugin</artifactId>
+ <reportSets>
+ <reportSet>
+ <reports>
+ <report>scm</report>
+ <report>dependencies</report>
+ <report>cim</report>
+ <report>issue-tracking</report>
+ <report>mailing-list</report>
+ <report>license</report>
+ </reports>
+ </reportSet>
+ </reportSets>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>jxr-maven-plugin</artifactId>
</plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>cobertura-maven-plugin</artifactId>
- <!-- version 2.1 was flawed and reports 100% coverage -->
- <version>2.0</version>
- </plugin>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-release-plugin</artifactId>
+ <configuration>
+ <goals>site-deploy</goals>
+ </configuration>
+ </plugin>
+ <plugin>
<artifactId>maven-changes-plugin</artifactId>
<reportSets>
<reportSet>
@@ -177,13 +225,22 @@
<issueLinkTemplate>%URL%/show_bug.cgi?id=%ISSUE%</issueLinkTemplate>
</configuration>
</plugin>
+ <plugin>
+ <artifactId>maven-pmd-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ </plugin>
</plugins>
</reporting>
<distributionManagement>
+ <repository>
+ <id>logging.repo</id>
+
<url>scp://people.apache.org/www/people.apache.org/builds/logging/repo/</url>
+ </repository>
<site>
- <id>apache.website</id>
-
<url>scp://people.apache.org/home/carnold/public_html/log4j/companions/component</url>
+ <id>logging.site</id>
+
<url>scp://people.apache.org/www/logging.apache.org/log4j/companions/component</url>
</site>
</distributionManagement>
-
</project>
Copied: logging/log4j/companions/component/trunk/src/assembly/bin.xml (from
r544250, logging/log4j/branches/v1_2-branch/src/assembly/bin.xml)
URL:
http://svn.apache.org/viewvc/logging/log4j/companions/component/trunk/src/assembly/bin.xml?view=diff&rev=544335&p1=logging/log4j/branches/v1_2-branch/src/assembly/bin.xml&r1=544250&p2=logging/log4j/companions/component/trunk/src/assembly/bin.xml&r2=544335
==============================================================================
--- logging/log4j/branches/v1_2-branch/src/assembly/bin.xml (original)
+++ logging/log4j/companions/component/trunk/src/assembly/bin.xml Mon Jun 4
17:34:09 2007
@@ -21,43 +21,6 @@
<format>zip</format>
<format>tar.gz</format>
</formats>
- <baseDirectory>apache-log4j-${project.version}</baseDirectory>
+ <baseDirectory>apache-log4j-component-${project.version}</baseDirectory>
<includeSiteDirectory>true</includeSiteDirectory>
- <fileSets>
- <fileSet>
- <includes>
- <include>*.txt</include>
- <include>*.sample</include>
- <include>*.xml</include>
- <include>INSTALL</include>
- <include>KEYS</include>
- <include>LICENSE</include>
- <include>NOTICE</include>
- <include>contribs/**</include>
- <include>examples/**</include>
- <include>src/assembly/**</include>
- <include>src/changes/**</include>
- <include>src/main/**</include>
- <include>src/ntdll/**</include>
- <include>src/performance/**</include>
- <include>src/site/**</include>
- <include>tests/README</include>
- <include>tests/*.xml</include>
- <include>tests/*.sample</include>
- <include>tests/*.bat</include>
- <include>tests/input/**</include>
- <include>tests/resources/**</include>
- <include>tests/src/**</include>
- <include>tests/witness/**</include>
- </includes>
- </fileSet>
- <fileSet>
- <directory>target</directory>
- <outputDirectory>.</outputDirectory>
- <includes>
- <include>log4j*.jar</include>
- <include>NTEventLogAppender.dll</include>
- </includes>
- </fileSet>
- </fileSets>
-</assembly>
\ No newline at end of file
+</assembly>
Modified: logging/log4j/companions/component/trunk/src/changes/changes.xml
URL:
http://svn.apache.org/viewvc/logging/log4j/companions/component/trunk/src/changes/changes.xml?view=diff&rev=544335&r1=544334&r2=544335
==============================================================================
--- logging/log4j/companions/component/trunk/src/changes/changes.xml (original)
+++ logging/log4j/companions/component/trunk/src/changes/changes.xml Mon Jun 4
17:34:09 2007
@@ -1 +1,29 @@
-<!--
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>
<title>Component</title>
</properties>
<body>
<release version="0.1" date="2099-01-01" description="First release">
<action dev="carnold" issue="42094" type="add">
Initial release of Component framework backported from log4j 1.3.
</action>
</release>
</body>
</document>
\ 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.
+
+-->
+<document>
+ <properties>
+ <title>Component</title>
+ </properties>
+ <body>
+ <release version="1.0" date="2007-06-05" description="Initial release">
+ <action dev="carnold" issue="42094" type="add">
+ Initial release of Component framework backported from log4j 1.3.
+ </action>
+ </release>
+ </body>
+</document>
Modified:
logging/log4j/companions/component/trunk/src/main/java/org/apache/log4j/LoggerRepositoryExImpl.java
URL:
http://svn.apache.org/viewvc/logging/log4j/companions/component/trunk/src/main/java/org/apache/log4j/LoggerRepositoryExImpl.java?view=diff&rev=544335&r1=544334&r2=544335
==============================================================================
---
logging/log4j/companions/component/trunk/src/main/java/org/apache/log4j/LoggerRepositoryExImpl.java
(original)
+++
logging/log4j/companions/component/trunk/src/main/java/org/apache/log4j/LoggerRepositoryExImpl.java
Mon Jun 4 17:34:09 2007
@@ -352,17 +352,16 @@
}
/**
- * @TODO
- Requests that a configuration changed event be sent to any registered
- [EMAIL PROTECTED] LoggerRepositoryEventListener}.
- @since 1.3*/
+ *
+ * Requests that a configuration changed event be sent to any registered
+ * [EMAIL PROTECTED] LoggerRepositoryEventListener}.
+ * @since 1.3*/
public void fireConfigurationChangedEvent() {
}
/**
- Returns a [EMAIL PROTECTED] Level} representation of the
<code>enable</code>
- state.
+ Returns the current threshold.
@return current threshold level
@since 1.2 */
@@ -479,7 +478,7 @@
default. This removes all appenders from all categories, sets
the level of all non-root categories to <code>null</code>,
sets their additivity flag to <code>true</code> and sets the level
- of the root logger to [EMAIL PROTECTED] Level#DEBUG DEBUG}. Moreover,
+ of the root logger to DEBUG. Moreover,
message disabling is set its default "off" value.
<p>Existing categories are not removed. They are just reset.
@@ -520,8 +519,8 @@
Shutting down a hierarchy will <em>safely</em> close and remove
all appenders in all categories including the root logger.
- <p>Some appenders such as [EMAIL PROTECTED]
org.apache.log4j.net.SocketAppender}
- and [EMAIL PROTECTED] AsyncAppender} need to be closed before the
+ <p>Some appenders such as org.apache.log4j.net.SocketAppender
+ and AsyncAppender need to be closed before the
application exists. Otherwise, pending logging events might be
lost.
Modified:
logging/log4j/companions/component/trunk/src/main/java/org/apache/log4j/plugins/PluginConfigurator.java
URL:
http://svn.apache.org/viewvc/logging/log4j/companions/component/trunk/src/main/java/org/apache/log4j/plugins/PluginConfigurator.java?view=diff&rev=544335&r1=544334&r2=544335
==============================================================================
---
logging/log4j/companions/component/trunk/src/main/java/org/apache/log4j/plugins/PluginConfigurator.java
(original)
+++
logging/log4j/companions/component/trunk/src/main/java/org/apache/log4j/plugins/PluginConfigurator.java
Mon Jun 4 17:34:09 2007
@@ -22,7 +22,6 @@
import org.apache.log4j.Level;
import org.apache.log4j.LogManager;
import org.apache.log4j.Logger;
-import org.apache.log4j.PropertyConfigurator;
import org.apache.log4j.config.PropertySetter;
import org.apache.log4j.helpers.FileWatchdog;
import org.apache.log4j.helpers.Loader;
@@ -993,7 +992,7 @@
}
/**
- Call [EMAIL PROTECTED] PropertyConfigurator#configure(String)} with
the
+ Call [EMAIL PROTECTED] PluginConfigurator#configure(String)} with the
<code>filename</code> to reconfigure log4j. */
public
void doOnChange() {
Modified:
logging/log4j/companions/component/trunk/src/main/java/org/apache/log4j/spi/ComponentBase.java
URL:
http://svn.apache.org/viewvc/logging/log4j/companions/component/trunk/src/main/java/org/apache/log4j/spi/ComponentBase.java?view=diff&rev=544335&r1=544334&r2=544335
==============================================================================
---
logging/log4j/companions/component/trunk/src/main/java/org/apache/log4j/spi/ComponentBase.java
(original)
+++
logging/log4j/companions/component/trunk/src/main/java/org/apache/log4j/spi/ComponentBase.java
Mon Jun 4 17:34:09 2007
@@ -77,7 +77,7 @@
}
/**
- * Return the [EMAIL PROTECTED] LoggerRepository} this component is
attached to.
+ * Return the LoggerRepository to which this component is attached.
*
* @return Owning LoggerRepository
*/
Modified:
logging/log4j/companions/component/trunk/src/main/java/org/apache/log4j/spi/LoggerEventListener.java
URL:
http://svn.apache.org/viewvc/logging/log4j/companions/component/trunk/src/main/java/org/apache/log4j/spi/LoggerEventListener.java?view=diff&rev=544335&r1=544334&r2=544335
==============================================================================
---
logging/log4j/companions/component/trunk/src/main/java/org/apache/log4j/spi/LoggerEventListener.java
(original)
+++
logging/log4j/companions/component/trunk/src/main/java/org/apache/log4j/spi/LoggerEventListener.java
Mon Jun 4 17:34:09 2007
@@ -22,11 +22,11 @@
/**
- Interface used to listen for [EMAIL PROTECTED] Logger} related events such as
+ Interface used to listen for Logger related events such as
add/remove appender or changing levels. Clients register an instance of
the interface and the instance is called back when the various events occur.
- [EMAIL PROTECTED] LoggerRepository} provides methods for adding and removing
+ LoggerRepository provides methods for adding and removing
LoggerEventListener instances.
When implementing the methods of this interface, it is useful to remember
Modified:
logging/log4j/companions/component/trunk/src/main/java/org/apache/log4j/spi/LoggerRepositoryEventListener.java
URL:
http://svn.apache.org/viewvc/logging/log4j/companions/component/trunk/src/main/java/org/apache/log4j/spi/LoggerRepositoryEventListener.java?view=diff&rev=544335&r1=544334&r2=544335
==============================================================================
---
logging/log4j/companions/component/trunk/src/main/java/org/apache/log4j/spi/LoggerRepositoryEventListener.java
(original)
+++
logging/log4j/companions/component/trunk/src/main/java/org/apache/log4j/spi/LoggerRepositoryEventListener.java
Mon Jun 4 17:34:09 2007
@@ -19,13 +19,13 @@
/**
- Interface used to listen for [EMAIL PROTECTED] LoggerRepository} related
+ Interface used to listen for LoggerRepository related
events such as startup, reset, and shutdown. Clients register
an instance of the interface and the instance is called back
when the various events occur.
- [EMAIL PROTECTED] LoggerRepository} provides methods for adding and removing
- LoggerEventListener instances.
+ LoggerRepository provides methods for adding and removing
+ LoggerRepositoryEventListener instances.
@author Ceki Gülcü
@author Mark Womack
Modified:
logging/log4j/companions/component/trunk/src/main/java/org/apache/log4j/spi/LoggerRepositoryEx.java
URL:
http://svn.apache.org/viewvc/logging/log4j/companions/component/trunk/src/main/java/org/apache/log4j/spi/LoggerRepositoryEx.java?view=diff&rev=544335&r1=544334&r2=544335
==============================================================================
---
logging/log4j/companions/component/trunk/src/main/java/org/apache/log4j/spi/LoggerRepositoryEx.java
(original)
+++
logging/log4j/companions/component/trunk/src/main/java/org/apache/log4j/spi/LoggerRepositoryEx.java
Mon Jun 4 17:34:09 2007
@@ -192,7 +192,7 @@
void putObject(String key, Object value);
/**
- * Sets the logger factory used by [EMAIL PROTECTED]
LoggerRepository#getLogger(String)}.
+ * Sets the logger factory used by LoggerRepository.getLogger(String).
* @param loggerFactory factory to use, may not be null
* @since 1.3
*/
@@ -200,7 +200,7 @@
/**
* Returns the logger factory used by
- * [EMAIL PROTECTED] LoggerRepository#getLogger(String)}.
+ * LoggerRepository.getLogger(String).
*
* @return non-null factory
* @since 1.3
Modified: logging/log4j/companions/component/trunk/src/site/apt/download.apt
URL:
http://svn.apache.org/viewvc/logging/log4j/companions/component/trunk/src/site/apt/download.apt?view=diff&rev=544335&r1=544259&r2=544335
==============================================================================
--- logging/log4j/companions/component/trunk/src/site/apt/download.apt
(original)
+++ logging/log4j/companions/component/trunk/src/site/apt/download.apt Mon Jun
4 17:34:09 2007
@@ -13,14 +13,14 @@
~~ See the License for the specific language governing permissions and
~~ limitations under the License.
------
-Download Apache log4j 1.2
+Download apache-log4j-component
------
------
------
-Download Apache log4j 1.2.15
+Download apache-log4j-component
- Apache log4j 1.2.15 is distributed under the
{{{http://www.apache.org/licenses/LICENSE-2.0.html} Apache License, version
2.0}}.
+ Apache Component Companion for log4j 1.2 is distributed under the
{{{http://www.apache.org/licenses/LICENSE-2.0.html} Apache License, version
2.0}}.
The link in the Mirrors column should display a list of available mirrors
with a
default selection based on your inferred location. If you do not see that
page,
@@ -29,16 +29,11 @@
*-------------------------+---------+----------+-----------+
| | Mirrors | Checksum | Signature |
+*-------------------------+---------+----------+-----------+apache-log4j-component-1.0
+| apache-log4j-component-1.0 (tar.gz) |
{{{http://www.apache.org/dyn/closer.cgi/logging/log4j/companions/component/1.0/apache-log4j-component-1.0.tar.gz}
apache-log4j-component-1.0.tar.gz}} |
{{{http://www.apache.org/dist/logging/log4j/companions/component/1.0/apache-log4j-component-1.0.tar.gz.md5}
apache-log4j-component-1.0.tar.gz.md5}} |
{{{http://www.apache.org/dist/logging/log4j/companions/component/1.0/apache-log4j-component-1.0.tar.gz.asc}
apache-log4j-component-1.0.tar.gz.asc}} |
*-------------------------+---------+----------+-----------+
-| Apache log4j 1.2.15 (tar.gz) |
{{{http://www.apache.org/dyn/closer.cgi/logging/log4j/1.2.15/apache-log4j-1.2.15.tar.gz}
apache-log4j-1.2.15.tar.gz}} |
{{{http://www.apache.org/dist/logging/log4j/1.2.15/apache-log4j-1.2.15.tar.gz.md5}
apache-log4j-1.2.15.tar.gz.md5}} |
{{{http://www.apache.org/dist/logging/log4j/1.2.15/apache-log4j-1.2.15.tar.gz.asc}
apache-log4j-1.2.15.tar.gz.asc}} |
-*-------------------------+---------+----------+-----------+
-| Apache log4j 1.2.15 (zip) |
{{{http://www.apache.org/dyn/closer.cgi/logging/log4j/1.2.15/apache-log4j-1.2.15.zip}
apache-log4j-1.2.15.zip}} |
{{{http://www.apache.org/dist/logging/log4j/1.2.15/apache-log4j-1.2.15.zip.md5}
apache-log4j-1.2.15.zip.md5}} |
{{{http://www.apache.org/dist/logging/log4j/1.2.15/apache-log4j-1.2.15.zip.asc}
apache-log4j-1.2.15.zip.asc}} |
+| apache-log4j-component-1.0 (zip) |
{{{http://www.apache.org/dyn/closer.cgi/logging/log4j/companions/component/1.0/apache-log4j-component-1.0.zip}
apache-log4j-component-1.0.zip}} |
{{{http://www.apache.org/dist/logging/log4j/companions/component/1.0/apache-log4j-component-1.0.zip.md5}
apache-log4j-component-1.0.zip.md5}} |
{{{http://www.apache.org/dist/logging/log4j/companions/component/1.0/apache-log4j-component-1.0.zip.asc}
apache-log4j-component-1.0.zip.asc}} |
*-------------------------+---------+----------+-----------+
Please read {{{http://httpd.apache.org/dev/verification.html}Verifying
Apache HTTP Server Releases}}
for more information on why you should verify our releases.
-
-
-* Previous Releases
-
- All previous releases of Apache log4j can be found in the
{{{http://archive.apache.org/dist/logging/log4j}archive repository}}.
Modified: logging/log4j/companions/component/trunk/src/site/apt/index.apt
URL:
http://svn.apache.org/viewvc/logging/log4j/companions/component/trunk/src/site/apt/index.apt?view=diff&rev=544335&r1=544259&r2=544335
==============================================================================
--- logging/log4j/companions/component/trunk/src/site/apt/index.apt (original)
+++ logging/log4j/companions/component/trunk/src/site/apt/index.apt Mon Jun 4
17:34:09 2007
@@ -13,58 +13,11 @@
~~ See the License for the specific language governing permissions and
~~ limitations under the License.
------
- log4j 1.2
+ Apache Component Companion for log4j 1.2
------
------
------
- Inserting log statements into your code is a low-tech method
- for debugging it. It may also be the only way because
- debuggers are not always available or applicable. This is
- often the case for distributed applications.
-
- On the other hand, some people argue that log statements
- pollute source code and decrease legibility. (We believe that
- the contrary is true). In the Java language where a
- preprocessor is not available, log statements increase the
- size of the code and reduce its speed, even when logging is
- turned off. Given that a reasonably sized application may
- contain thousands of log statements, speed is of particular
- importance.
-
-
- With log4j it is possible to enable logging at runtime
- without modifying the application binary. The log4j package is
- designed so that these statements can remain in shipped code
- without incurring a heavy performance cost. Logging behavior
- can be controlled by editing a configuration file, without
- touching the application binary.
-
- Logging equips the developer with detailed context for
- application failures. On the other hand, testing provides
- quality assurance and confidence in the application. Logging
- and testing should not be confused. They are
- complementary. When logging is wisely used, it can prove to be
- an essential tool.
-
- One of the distinctive features of log4j is the notion of
- inheritance in loggers. Using a logger
- hierarchy it is possible to control which log
- statements are output at arbitrarily fine granularity but also
- great ease. This helps reduce the volume of logged output and
- minimize the cost of logging.
-
- The target of the log output can be a file, an
- OutputStream, a java.io.Writer, a
- remote log4j server, a remote Unix Syslog daemon, or many other output
targets.
-
- On an AMD Duron clocked at 800Mhz running JDK 1.3.1, it costs
- about 5 nanoseconds to determine if a logging statement should
- be logged or not. Actual logging is also quite fast, ranging
- from 21 microseconds using the SimpleLayout, 37
- microseconds using the TTCCLayout. The performance of the
- PatternLayout is almost as good as the dedicated layouts,
- except that it is much more flexible.
-
- The package is being constantly improved thanks to input from
- users and code contributed by authors in the community.
+ This companion implements on log4j 1.2 the component framework from the
+ discontinued log4j 1.3 development activity to support backporting
+ log4j 1.3 code that depends on the framework.
Modified: logging/log4j/companions/component/trunk/src/site/apt/roadmap.apt
URL:
http://svn.apache.org/viewvc/logging/log4j/companions/component/trunk/src/site/apt/roadmap.apt?view=diff&rev=544335&r1=544259&r2=544335
==============================================================================
--- logging/log4j/companions/component/trunk/src/site/apt/roadmap.apt (original)
+++ logging/log4j/companions/component/trunk/src/site/apt/roadmap.apt Mon Jun
4 17:34:09 2007
@@ -13,16 +13,13 @@
~~ See the License for the specific language governing permissions and
~~ limitations under the License.
------
- log4j 1.2 Roadmap
+ apache-log4j-component Roadmap
------
Curt Arnold
------
- 8 May 2007
+ 4 June 2007
------
-log4j 1.2 Roadmap
+apache-log4j-component Roadmap
- log4j 1.2 is mature and future development on the log4j 1.2 branch
- is expected to be limited to bug fixes and minor enhancements.
- Any major new features for log4j 1.2 are likely to be developed
- as companion products for log4j 1.2.
+ No additional development is anticipated.
Modified: logging/log4j/companions/component/trunk/src/site/site.xml
URL:
http://svn.apache.org/viewvc/logging/log4j/companions/component/trunk/src/site/site.xml?view=diff&rev=544335&r1=544334&r2=544335
==============================================================================
--- logging/log4j/companions/component/trunk/src/site/site.xml (original)
+++ logging/log4j/companions/component/trunk/src/site/site.xml Mon Jun 4
17:34:09 2007
@@ -22,15 +22,43 @@
<href>http://logging.apache.org/</href>
</bannerLeft>
<bannerRight>
+ <name>Apache log4j</name>
<src>images/logo.jpg</src>
+ <href>http://logging.apache.org/log4j</href>
</bannerRight>
<body>
- <links>
- <item name="Apache" href="http://www.apache.org/" />
+ <breadcrumbs>
+ <item name="Apache" href="http://www.apache.org/"/>
<item name="Logging Services" href="http://logging.apache.org/"/>
- <item name="Log4j" href="http://logging.apache.org/log4j/"/>
- <item name="Log4j Companions"
href="http://logging.apache.org/log4j/companions"/>
- </links>
- <menu ref="reports"/>
+ <item name="log4j" href="http://logging.apache.org/log4j/"/>
+ <item name="Companions"
href="http://logging.apache.org/log4j/companions/"/>
+ <item name="component"
href="http://logging.apache.org:80/log4j/companions/component/"/>
+ </breadcrumbs>
+
+ <menu name="Get component">
+ <item name="Download" href="/download.html"/>
+ <item name="Changes" href="/changes-report.html"/>
+ <item name="License" href="/license.html"/>
+ </menu>
+
+ <menu name="About component">
+ <item name="What is it?" href="/index.html"/>
+ <item name="Roadmap" href="/roadmap.html"/>
+ <item name="JavaDoc" href="/apidocs/index.html"/>
+ </menu>
+
+ <menu name="Community">
+ <item name="Mailing Lists" href="/mail-lists.html"/>
+ <item name="Issue Tracking" href="/issue-tracking.html"/>
+ </menu>
+
+ <menu name="Development">
+ <item name="Repository" href="/source-repository.html"/>
+ <item name="Cross Reference" href="/jxr.html"/>
+ <item name="Dependencies" href="/dependencies.html"/>
+ <item name="Continuous Integration" href="/integration.html"/>
+ <item name="Duplication" href="/cpd.html"/>
+ <item name="PMD" href="/pmd.html"/>
+ </menu>
</body>
</project>
Modified:
logging/log4j/companions/component/trunk/src/test/java/org/apache/log4j/plugins/PluginTestCase.java
URL:
http://svn.apache.org/viewvc/logging/log4j/companions/component/trunk/src/test/java/org/apache/log4j/plugins/PluginTestCase.java?view=diff&rev=544335&r1=544334&r2=544335
==============================================================================
---
logging/log4j/companions/component/trunk/src/test/java/org/apache/log4j/plugins/PluginTestCase.java
(original)
+++
logging/log4j/companions/component/trunk/src/test/java/org/apache/log4j/plugins/PluginTestCase.java
Mon Jun 4 17:34:09 2007
@@ -17,34 +17,25 @@
package org.apache.log4j.plugins;
-import junit.framework.Test;
import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
import org.apache.log4j.FileAppender;
-import org.apache.log4j.Hierarchy;
import org.apache.log4j.Level;
import org.apache.log4j.LogManager;
import org.apache.log4j.Logger;
-import org.apache.log4j.SimpleLayout;
import org.apache.log4j.LoggerRepositoryExImpl;
-import org.apache.log4j.spi.LoggerRepository;
-import org.apache.log4j.spi.LoggerRepositoryEx;
-import org.apache.log4j.spi.RootLogger;
+import org.apache.log4j.SimpleLayout;
import org.apache.log4j.util.Compare;
import java.beans.PropertyChangeEvent;
import java.beans.PropertyChangeListener;
-
import java.io.File;
import java.io.IOException;
-
import java.util.HashMap;
public class PluginTestCase extends TestCase {
- static String FILE = "output/plugins.PluginTestCase";
+ static String FILE = "plugins.PluginTestCase";
static String WITNESS = "witness/plugins.PluginTestCase";
private static boolean verbosePluginOutput = true;
private static HashMap repositoryMap = new HashMap();
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]