Author: carnold
Date: Fri Jun 29 15:48:09 2007
New Revision: 552052
URL: http://svn.apache.org/viewvc?view=rev&rev=552052
Log:
Bug 42783: Create extras companion from original companions
Added:
logging/log4j/companions/extras/
logging/log4j/companions/extras/branches/
logging/log4j/companions/extras/tags/
logging/log4j/companions/extras/trunk/
- copied from r551876, logging/log4j/companions/filters/trunk/
logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/EnhancedPatternLayout.java
- copied unchanged from r551876, logging/log4j/companions/pattern-layout/trunk/src/main/java/org/apache/log4j/EnhancedPatternLayout.java
logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/LogMF.java
- copied unchanged from r551876, logging/log4j/companions/logmf/trunk/src/main/java/org/apache/log4j/LogMF.java
logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/LogSF.java
- copied unchanged from r551876, logging/log4j/companions/logsf/trunk/src/main/java/org/apache/log4j/LogSF.java
logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/pattern/
- copied from r551876, logging/log4j/companions/pattern-layout/trunk/src/main/java/org/apache/log4j/pattern/
logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/rolling/
- copied from r551876, logging/log4j/companions/rolling/trunk/src/main/java/org/apache/log4j/rolling/
logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/varia/
- copied from r551876, logging/log4j/companions/sound/trunk/src/main/java/org/apache/log4j/varia/
logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/xml/
- copied from r551876, logging/log4j/companions/rolling/trunk/src/main/java/org/apache/log4j/xml/
logging/log4j/companions/extras/trunk/src/main/resources/org/
logging/log4j/companions/extras/trunk/src/main/resources/org/apache/
logging/log4j/companions/extras/trunk/src/main/resources/org/apache/log4j/
logging/log4j/companions/extras/trunk/src/main/resources/org/apache/log4j/rolling/
- copied from r551876, logging/log4j/companions/rolling/trunk/src/main/resources/org/apache/log4j/rolling/
logging/log4j/companions/extras/trunk/src/test/java/org/apache/log4j/LayoutTest.java
- copied unchanged from r551876, logging/log4j/companions/pattern-layout/trunk/src/test/java/org/apache/log4j/LayoutTest.java
logging/log4j/companions/extras/trunk/src/test/java/org/apache/log4j/LogCapture.java
- copied unchanged from r551876, logging/log4j/companions/logmf/trunk/src/test/java/org/apache/log4j/LogCapture.java
logging/log4j/companions/extras/trunk/src/test/java/org/apache/log4j/MyPatternLayout.java
- copied unchanged from r551876, logging/log4j/companions/pattern-layout/trunk/src/test/java/org/apache/log4j/MyPatternLayout.java
logging/log4j/companions/extras/trunk/src/test/java/org/apache/log4j/MyPatternParser.java
- copied unchanged from r551876, logging/log4j/companions/pattern-layout/trunk/src/test/java/org/apache/log4j/MyPatternParser.java
logging/log4j/companions/extras/trunk/src/test/java/org/apache/log4j/PatternLayoutTest.java
- copied unchanged from r551876, logging/log4j/companions/pattern-layout/trunk/src/test/java/org/apache/log4j/PatternLayoutTest.java
logging/log4j/companions/extras/trunk/src/test/java/org/apache/log4j/PatternLayoutTestCase.java
- copied unchanged from r551876, logging/log4j/companions/pattern-layout/trunk/src/test/java/org/apache/log4j/PatternLayoutTestCase.java
logging/log4j/companions/extras/trunk/src/test/java/org/apache/log4j/TestLogMF.java
- copied unchanged from r551876, logging/log4j/companions/logmf/trunk/src/test/java/org/apache/log4j/TestLogMF.java
logging/log4j/companions/extras/trunk/src/test/java/org/apache/log4j/TestLogSF.java
- copied unchanged from r551876, logging/log4j/companions/logsf/trunk/src/test/java/org/apache/log4j/TestLogSF.java
logging/log4j/companions/extras/trunk/src/test/java/org/apache/log4j/VectorAppender.java
- copied unchanged from r551876, logging/log4j/companions/logmf/trunk/src/test/java/org/apache/log4j/VectorAppender.java
logging/log4j/companions/extras/trunk/src/test/java/org/apache/log4j/pattern/
- copied from r551876, logging/log4j/companions/pattern-layout/trunk/src/test/java/org/apache/log4j/pattern/
logging/log4j/companions/extras/trunk/src/test/java/org/apache/log4j/rolling/
- copied from r551876, logging/log4j/companions/rolling/trunk/src/test/java/org/apache/log4j/rolling/
logging/log4j/companions/extras/trunk/src/test/java/org/apache/log4j/util/AbsoluteDateAndTimeFilter.java
- copied unchanged from r551876, logging/log4j/companions/pattern-layout/trunk/src/test/java/org/apache/log4j/util/AbsoluteDateAndTimeFilter.java
logging/log4j/companions/extras/trunk/src/test/java/org/apache/log4j/util/AbsoluteTimeFilter.java
- copied unchanged from r551876, logging/log4j/companions/pattern-layout/trunk/src/test/java/org/apache/log4j/util/AbsoluteTimeFilter.java
logging/log4j/companions/extras/trunk/src/test/java/org/apache/log4j/util/ISO8601Filter.java
- copied unchanged from r551876, logging/log4j/companions/pattern-layout/trunk/src/test/java/org/apache/log4j/util/ISO8601Filter.java
logging/log4j/companions/extras/trunk/src/test/java/org/apache/log4j/util/MDCOrderFilter.java
- copied unchanged from r551876, logging/log4j/companions/pattern-layout/trunk/src/test/java/org/apache/log4j/util/MDCOrderFilter.java
logging/log4j/companions/extras/trunk/src/test/java/org/apache/log4j/util/RelativeTimeFilter.java
- copied unchanged from r551876, logging/log4j/companions/pattern-layout/trunk/src/test/java/org/apache/log4j/util/RelativeTimeFilter.java
logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/TestLogMFPatterns.properties
- copied unchanged from r551876, logging/log4j/companions/logmf/trunk/src/test/resources/org/apache/log4j/TestLogMFPatterns.properties
logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/TestLogSFPatterns.properties
- copied unchanged from r551876, logging/log4j/companions/logsf/trunk/src/test/resources/org/apache/log4j/TestLogSFPatterns.properties
logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/patternLayout.1
- copied unchanged from r551876, logging/log4j/companions/pattern-layout/trunk/src/test/resources/org/apache/log4j/patternLayout.1
logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/patternLayout.10
- copied unchanged from r551876, logging/log4j/companions/pattern-layout/trunk/src/test/resources/org/apache/log4j/patternLayout.10
logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/patternLayout.11
- copied unchanged from r551876, logging/log4j/companions/pattern-layout/trunk/src/test/resources/org/apache/log4j/patternLayout.11
logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/patternLayout.12
- copied unchanged from r551876, logging/log4j/companions/pattern-layout/trunk/src/test/resources/org/apache/log4j/patternLayout.12
logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/patternLayout.13
- copied unchanged from r551876, logging/log4j/companions/pattern-layout/trunk/src/test/resources/org/apache/log4j/patternLayout.13
logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/patternLayout.14
- copied unchanged from r551876, logging/log4j/companions/pattern-layout/trunk/src/test/resources/org/apache/log4j/patternLayout.14
logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/patternLayout.15
- copied unchanged from r551876, logging/log4j/companions/pattern-layout/trunk/src/test/resources/org/apache/log4j/patternLayout.15
logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/patternLayout.2
- copied unchanged from r551876, logging/log4j/companions/pattern-layout/trunk/src/test/resources/org/apache/log4j/patternLayout.2
logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/patternLayout.3
- copied unchanged from r551876, logging/log4j/companions/pattern-layout/trunk/src/test/resources/org/apache/log4j/patternLayout.3
logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/patternLayout.4
- copied unchanged from r551876, logging/log4j/companions/pattern-layout/trunk/src/test/resources/org/apache/log4j/patternLayout.4
logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/patternLayout.5
- copied unchanged from r551876, logging/log4j/companions/pattern-layout/trunk/src/test/resources/org/apache/log4j/patternLayout.5
logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/patternLayout.6
- copied unchanged from r551876, logging/log4j/companions/pattern-layout/trunk/src/test/resources/org/apache/log4j/patternLayout.6
logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/patternLayout.7
- copied unchanged from r551876, logging/log4j/companions/pattern-layout/trunk/src/test/resources/org/apache/log4j/patternLayout.7
logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/patternLayout.8
- copied unchanged from r551876, logging/log4j/companions/pattern-layout/trunk/src/test/resources/org/apache/log4j/patternLayout.8
logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/patternLayout.9
- copied unchanged from r551876, logging/log4j/companions/pattern-layout/trunk/src/test/resources/org/apache/log4j/patternLayout.9
logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/patternLayout.mdc.1
- copied unchanged from r551876, logging/log4j/companions/pattern-layout/trunk/src/test/resources/org/apache/log4j/patternLayout.mdc.1
logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/patternLayout.mdc.1.properties
- copied unchanged from r551876, logging/log4j/companions/pattern-layout/trunk/src/test/resources/org/apache/log4j/patternLayout.mdc.1.properties
logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/patternLayout.mdc.2
- copied unchanged from r551876, logging/log4j/companions/pattern-layout/trunk/src/test/resources/org/apache/log4j/patternLayout.mdc.2
logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/patternLayout1.properties
- copied unchanged from r551876, logging/log4j/companions/pattern-layout/trunk/src/test/resources/org/apache/log4j/patternLayout1.properties
logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/patternLayout10.properties
- copied unchanged from r551876, logging/log4j/companions/pattern-layout/trunk/src/test/resources/org/apache/log4j/patternLayout10.properties
logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/patternLayout11.properties
- copied unchanged from r551876, logging/log4j/companions/pattern-layout/trunk/src/test/resources/org/apache/log4j/patternLayout11.properties
logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/patternLayout12.properties
- copied unchanged from r551876, logging/log4j/companions/pattern-layout/trunk/src/test/resources/org/apache/log4j/patternLayout12.properties
logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/patternLayout13.properties
- copied unchanged from r551876, logging/log4j/companions/pattern-layout/trunk/src/test/resources/org/apache/log4j/patternLayout13.properties
logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/patternLayout14.properties
- copied unchanged from r551876, logging/log4j/companions/pattern-layout/trunk/src/test/resources/org/apache/log4j/patternLayout14.properties
logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/patternLayout15.properties
- copied unchanged from r551876, logging/log4j/companions/pattern-layout/trunk/src/test/resources/org/apache/log4j/patternLayout15.properties
logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/patternLayout16.properties
- copied unchanged from r551876, logging/log4j/companions/pattern-layout/trunk/src/test/resources/org/apache/log4j/patternLayout16.properties
logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/patternLayout2.properties
- copied unchanged from r551876, logging/log4j/companions/pattern-layout/trunk/src/test/resources/org/apache/log4j/patternLayout2.properties
logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/patternLayout3.properties
- copied unchanged from r551876, logging/log4j/companions/pattern-layout/trunk/src/test/resources/org/apache/log4j/patternLayout3.properties
logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/patternLayout4.properties
- copied unchanged from r551876, logging/log4j/companions/pattern-layout/trunk/src/test/resources/org/apache/log4j/patternLayout4.properties
logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/patternLayout5.properties
- copied unchanged from r551876, logging/log4j/companions/pattern-layout/trunk/src/test/resources/org/apache/log4j/patternLayout5.properties
logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/patternLayout6.properties
- copied unchanged from r551876, logging/log4j/companions/pattern-layout/trunk/src/test/resources/org/apache/log4j/patternLayout6.properties
logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/patternLayout7.properties
- copied unchanged from r551876, logging/log4j/companions/pattern-layout/trunk/src/test/resources/org/apache/log4j/patternLayout7.properties
logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/patternLayout8.properties
- copied unchanged from r551876, logging/log4j/companions/pattern-layout/trunk/src/test/resources/org/apache/log4j/patternLayout8.properties
logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/patternLayout9.properties
- copied unchanged from r551876, logging/log4j/companions/pattern-layout/trunk/src/test/resources/org/apache/log4j/patternLayout9.properties
logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/rolling/
- copied from r551876, logging/log4j/companions/rolling/trunk/src/test/resources/org/apache/log4j/rolling/
Modified:
logging/log4j/companions/extras/trunk/NOTICE
logging/log4j/companions/extras/trunk/build.xml
logging/log4j/companions/extras/trunk/pom.xml
logging/log4j/companions/extras/trunk/src/assembly/bin.xml
logging/log4j/companions/extras/trunk/src/changes/changes.xml
logging/log4j/companions/extras/trunk/src/main/resources/META-INF/NOTICE
logging/log4j/companions/extras/trunk/src/site/apt/download.apt
logging/log4j/companions/extras/trunk/src/site/apt/index.apt
logging/log4j/companions/extras/trunk/src/site/apt/roadmap.apt
logging/log4j/companions/extras/trunk/src/test/java/org/apache/log4j/filter/SimpleFilterTest.java
logging/log4j/companions/extras/trunk/src/test/java/org/apache/log4j/util/Compare.java
logging/log4j/companions/extras/trunk/src/test/java/org/apache/log4j/util/JunitTestRunnerFilter.java
Modified: logging/log4j/companions/extras/trunk/NOTICE
URL: http://svn.apache.org/viewvc/logging/log4j/companions/extras/trunk/NOTICE?view=diff&rev=552052&r1=551876&r2=552052
==============================================================================
--- logging/log4j/companions/extras/trunk/NOTICE (original)
+++ logging/log4j/companions/extras/trunk/NOTICE Fri Jun 29 15:48:09 2007
@@ -1,4 +1,4 @@
-Apache log4j ExpressionFilter
+Apache Extras Companion for log4j 1.2.
Copyright 2007 The Apache Software Foundation
This product includes software developed at
Modified: logging/log4j/companions/extras/trunk/build.xml
URL: http://svn.apache.org/viewvc/logging/log4j/companions/extras/trunk/build.xml?view=diff&rev=552052&r1=551876&r2=552052
==============================================================================
--- logging/log4j/companions/extras/trunk/build.xml (original)
+++ logging/log4j/companions/extras/trunk/build.xml Fri Jun 29 15:48:09 2007
@@ -29,8 +29,8 @@
<property file="build.properties"/>
<!-- project details -->
- <property name="project.name" value="apache-log4j-filters"/>
- <property name="project.title" value="Apache Filters Companion for log4j 1.2."/>
+ <property name="project.name" value="apache-log4j-extras"/>
+ <property name="project.title" value="Apache Extras Companion for log4j 1.2."/>
<property name="project.version" value="1.0"/>
<property name="project.jar" value="${project.name}-${project.version}.jar"/>
Modified: logging/log4j/companions/extras/trunk/pom.xml
URL: http://svn.apache.org/viewvc/logging/log4j/companions/extras/trunk/pom.xml?view=diff&rev=552052&r1=551876&r2=552052
==============================================================================
--- logging/log4j/companions/extras/trunk/pom.xml (original)
+++ logging/log4j/companions/extras/trunk/pom.xml Fri Jun 29 15:48:09 2007
@@ -15,23 +15,25 @@
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">
+<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">
<modelVersion>4.0.0</modelVersion>
<groupId>log4j</groupId>
- <artifactId>apache-log4j-filters</artifactId>
+ <artifactId>apache-log4j-extras</artifactId>
<packaging>jar</packaging>
- <version>1.1-SNAPSHOT</version>
- <name>Apache Filters Companion for log4j 1.2.</name>
- <description>This companion provides a selection of filters from the Apache log4j
1.3 project
- for use with Apache log4j 1.2.</description>
- <url>http://logging.apache.org:80/log4j/companions/filters</url>
+ <version>1.0-SNAPSHOT</version>
+ <name>Apache Extras Companion for log4j 1.2.</name>
+ <description>This companion provides additional appenders, filters and
+ other capabilities for log4j 1.2. Several of these were backported from
+ the abandoned log4j 1.3 development effort.</description>
+ <url>http://logging.apache.org:80/log4j/companions/extras</url>
<issueManagement>
<system>Bugzilla</system>
<url>http://issues.apache.org/bugzilla/</url>
</issueManagement>
<ciManagement>
<system>Gump</system>
- <url>http://vmgump.apache.org/gump/public/logging-log4j-filters/logging-log4j-filters/index.html</url>
+ <url>http://vmgump.apache.org/gump/public/logging-log4j-extras/logging-log4j-extras/index.html</url>
</ciManagement>
<mailingLists>
<mailingList>
@@ -65,9 +67,9 @@
</license>
</licenses>
<scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/logging/log4j/companions/filters/trunk</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/logging/log4j/companions/filters/trunk</developerConnection>
- <url>http://svn.apache.org/viewcvs.cgi/logging/log4j/companions/filters/trunk</url>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/logging/log4j/companions/extras/trunk</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/logging/log4j/companions/extras/trunk</developerConnection>
+ <url>http://svn.apache.org/viewcvs.cgi/logging/log4j/companions/extras/trunk</url>
</scm>
<organization>
<name>Apache Software Foundation</name>
@@ -244,7 +246,7 @@
</repository>
<site>
<id>logging.site</id>
- <url>scp://people.apache.org/www/logging.apache.org/log4j/companions/filters</url>
+ <url>scp://people.apache.org/www/logging.apache.org/log4j/companions/extras</url>
</site>
</distributionManagement>
</project>
Modified: logging/log4j/companions/extras/trunk/src/assembly/bin.xml
URL: http://svn.apache.org/viewvc/logging/log4j/companions/extras/trunk/src/assembly/bin.xml?view=diff&rev=552052&r1=551876&r2=552052
==============================================================================
--- logging/log4j/companions/extras/trunk/src/assembly/bin.xml (original)
+++ logging/log4j/companions/extras/trunk/src/assembly/bin.xml Fri Jun 29 15:48:09 2007
@@ -21,7 +21,7 @@
<format>zip</format>
<format>tar.gz</format>
</formats>
- <baseDirectory>apache-log4j-filters-${project.version}</baseDirectory>
+ <baseDirectory>apache-log4j-extras-${project.version}</baseDirectory>
<includeSiteDirectory>true</includeSiteDirectory>
<fileSets>
<fileSet>
@@ -37,7 +37,7 @@
<directory>target</directory>
<outputDirectory>.</outputDirectory>
<includes>
- <include>apache-log4j-filters-${project.version}.jar</include>
+ <include>apache-log4j-extras-${project.version}.jar</include>
</includes>
</fileSet>
</fileSets>
Modified: logging/log4j/companions/extras/trunk/src/changes/changes.xml
URL: http://svn.apache.org/viewvc/logging/log4j/companions/extras/trunk/src/changes/changes.xml?view=diff&rev=552052&r1=551876&r2=552052
==============================================================================
--- logging/log4j/companions/extras/trunk/src/changes/changes.xml (original)
+++ logging/log4j/companions/extras/trunk/src/changes/changes.xml Fri Jun 29 15:48:09 2007
@@ -22,7 +22,7 @@
<body>
<release version="1.0" date="2007-06-27" description="First release">
<action issue="42099" type="add">
- Initial release of filters backported from log4j 1.3.
+ Initial release.
</action>
</release>
</body>
Modified: logging/log4j/companions/extras/trunk/src/main/resources/META-INF/NOTICE
URL: http://svn.apache.org/viewvc/logging/log4j/companions/extras/trunk/src/main/resources/META-INF/NOTICE?view=diff&rev=552052&r1=551876&r2=552052
==============================================================================
--- logging/log4j/companions/extras/trunk/src/main/resources/META-INF/NOTICE (original)
+++ logging/log4j/companions/extras/trunk/src/main/resources/META-INF/NOTICE Fri Jun 29 15:48:09
2007
@@ -1,4 +1,4 @@
-Apache Filters Companion for log4j 1.2.
+Apache Extras Companion for log4j 1.2.
Copyright 2007 The Apache Software Foundation
This product includes software developed at
Modified: logging/log4j/companions/extras/trunk/src/site/apt/download.apt
URL: http://svn.apache.org/viewvc/logging/log4j/companions/extras/trunk/src/site/apt/download.apt?view=diff&rev=552052&r1=551876&r2=552052
==============================================================================
--- logging/log4j/companions/extras/trunk/src/site/apt/download.apt (original)
+++ logging/log4j/companions/extras/trunk/src/site/apt/download.apt Fri Jun 29 15:48:09 2007
@@ -13,14 +13,14 @@
~~ See the License for the specific language governing permissions and
~~ limitations under the License.
------
-Download apache-log4j-filters
+Download apache-log4j-extras
------
------
------
-Download apache-log4j-filters
+Download apache-log4j-extras
- Apache Filters Companion for log4j 1.2 is distributed under the {{{http://www.apache.org/licenses/LICENSE-2.0.html}
Apache License, version 2.0}}.
+ Apache Extras 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,
@@ -30,9 +30,9 @@
*-------------------------+---------+----------+-----------+
| | Mirrors | Checksum | Signature |
*-------------------------+---------+----------+-----------+
-| apache-log4j-filters-1.0 (tar.gz) | {{{http://www.apache.org/dyn/closer.cgi/logging/log4j/companions/filters/1.0/apache-log4j-filters-1.0.tar.gz}
apache-log4j-filters-1.0.tar.gz}} | {{{http://www.apache.org/dist/logging/log4j/companions/filters/1.0/apache-log4j-filters-1.0.tar.gz.md5}
apache-log4j-filters-1.0.tar.gz.md5}} | {{{http://www.apache.org/dist/logging/log4j/companions/filters/1.0/apache-log4j-filters-1.0.tar.gz.asc}
apache-log4j-filters-1.0.tar.gz.asc}} |
+| apache-log4j-extras-1.0 (tar.gz) | {{{http://www.apache.org/dyn/closer.cgi/logging/log4j/companions/extras/1.0/apache-log4j-extras-1.0.tar.gz}
apache-log4j-extras-1.0.tar.gz}} | {{{http://www.apache.org/dist/logging/log4j/companions/extras/1.0/apache-log4j-extras-1.0.tar.gz.md5}
apache-log4j-extras-1.0.tar.gz.md5}} | {{{http://www.apache.org/dist/logging/log4j/companions/extras/1.0/apache-log4j-extras-1.0.tar.gz.asc}
apache-log4j-extras-1.0.tar.gz.asc}} |
*-------------------------+---------+----------+-----------+
-| apache-log4j-filters-1.0 (zip) | {{{http://www.apache.org/dyn/closer.cgi/logging/log4j/companions/filters/1.0/apache-log4j-filters-1.0.zip}
apache-log4j-filters-1.0.zip}} | {{{http://www.apache.org/dist/logging/log4j/companions/filters/1.0/apache-log4j-filters-1.0.zip.md5}
apache-log4j-filters-1.0.zip.md5}} | {{{http://www.apache.org/dist/logging/log4j/companions/filters/1.0/apache-log4j-filters-1.0.zip.asc}
apache-log4j-filters-1.0.zip.asc}} |
+| apache-log4j-extras-1.0 (zip) | {{{http://www.apache.org/dyn/closer.cgi/logging/log4j/companions/extras/1.0/apache-log4j-extras-1.0.zip}
apache-log4j-extras-1.0.zip}} | {{{http://www.apache.org/dist/logging/log4j/companions/extras/1.0/apache-log4j-extras-1.0.zip.md5}
apache-log4j-extras-1.0.zip.md5}} | {{{http://www.apache.org/dist/logging/log4j/companions/extras/1.0/apache-log4j-extras-1.0.zip.asc}
apache-log4j-extras-1.0.zip.asc}} |
*-------------------------+---------+----------+-----------+
Please read {{{http://httpd.apache.org/dev/verification.html}Verifying Apache HTTP Server
Releases}}
Modified: logging/log4j/companions/extras/trunk/src/site/apt/index.apt
URL: http://svn.apache.org/viewvc/logging/log4j/companions/extras/trunk/src/site/apt/index.apt?view=diff&rev=552052&r1=551876&r2=552052
==============================================================================
--- logging/log4j/companions/extras/trunk/src/site/apt/index.apt (original)
+++ logging/log4j/companions/extras/trunk/src/site/apt/index.apt Fri Jun 29 15:48:09 2007
@@ -13,10 +13,17 @@
~~ See the License for the specific language governing permissions and
~~ limitations under the License.
------
- Apache Filters Companion for log4j 1.2
+ Apache Extras Companion for log4j 1.2
------
------
------
- This companion provides a selection of filters from the Apache log4j 1.3 project
- for use with Apache log4j 1.2.
\ No newline at end of file
+ This companion provides additional appenders, filters, formatters and other
+ components for log4j 1.2. These components have been built against log4j 1.2.9,
+ but will work with any later 1.2 release and are likely to work with 1.2.8
+ and some earlier releases.
+
+ Many of these components were original developed in the discontinued log4j 1.3
+ development effort.
+
+
\ No newline at end of file
Modified: logging/log4j/companions/extras/trunk/src/site/apt/roadmap.apt
URL: http://svn.apache.org/viewvc/logging/log4j/companions/extras/trunk/src/site/apt/roadmap.apt?view=diff&rev=552052&r1=551876&r2=552052
==============================================================================
--- logging/log4j/companions/extras/trunk/src/site/apt/roadmap.apt (original)
+++ logging/log4j/companions/extras/trunk/src/site/apt/roadmap.apt Fri Jun 29 15:48:09 2007
@@ -13,13 +13,15 @@
~~ See the License for the specific language governing permissions and
~~ limitations under the License.
------
- apache-log4j-filters Roadmap
+ apache-log4j-extras Roadmap
------
Curt Arnold
------
- 4 June 2007
+ 29 June 2007
------
-apache-log4j-filters Roadmap
+apache-log4j-extras Roadmap
- No additional development is anticipated.
+
+ The extras component is open to additional generally useful features that are compatible
+ with the widely deployed log4j 1.2 releases and do not add additional dependencies.
\ No newline at end of file
Modified: logging/log4j/companions/extras/trunk/src/test/java/org/apache/log4j/filter/SimpleFilterTest.java
URL: http://svn.apache.org/viewvc/logging/log4j/companions/extras/trunk/src/test/java/org/apache/log4j/filter/SimpleFilterTest.java?view=diff&rev=552052&r1=551876&r2=552052
==============================================================================
--- logging/log4j/companions/extras/trunk/src/test/java/org/apache/log4j/filter/SimpleFilterTest.java
(original)
+++ logging/log4j/companions/extras/trunk/src/test/java/org/apache/log4j/filter/SimpleFilterTest.java
Fri Jun 29 15:48:09 2007
@@ -1,3 +1,19 @@
+/*
+ * 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.
+ */
package org.apache.log4j.filter;
import junit.framework.Test;
Modified: logging/log4j/companions/extras/trunk/src/test/java/org/apache/log4j/util/Compare.java
URL: http://svn.apache.org/viewvc/logging/log4j/companions/extras/trunk/src/test/java/org/apache/log4j/util/Compare.java?view=diff&rev=552052&r1=551876&r2=552052
==============================================================================
--- logging/log4j/companions/extras/trunk/src/test/java/org/apache/log4j/util/Compare.java
(original)
+++ logging/log4j/companions/extras/trunk/src/test/java/org/apache/log4j/util/Compare.java
Fri Jun 29 15:48:09 2007
@@ -1,9 +1,10 @@
/*
- * Copyright 1999,2004 The Apache Software Foundation.
- *
- * Licensed 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
+ * 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
*
Modified: logging/log4j/companions/extras/trunk/src/test/java/org/apache/log4j/util/JunitTestRunnerFilter.java
URL: http://svn.apache.org/viewvc/logging/log4j/companions/extras/trunk/src/test/java/org/apache/log4j/util/JunitTestRunnerFilter.java?view=diff&rev=552052&r1=551876&r2=552052
==============================================================================
--- logging/log4j/companions/extras/trunk/src/test/java/org/apache/log4j/util/JunitTestRunnerFilter.java
(original)
+++ logging/log4j/companions/extras/trunk/src/test/java/org/apache/log4j/util/JunitTestRunnerFilter.java
Fri Jun 29 15:48:09 2007
@@ -23,6 +23,16 @@
public class JunitTestRunnerFilter implements Filter {
Perl5Util util = new Perl5Util();
+ private static final String[] patterns = {
+ "/at org.eclipse.jdt.internal.junit.runner.RemoteTestRunner/",
+ "/at org.apache.tools.ant/",
+ "/at junit.textui.TestRunner/",
+ "/at com.intellij.rt.execution.junit/",
+ "/at java.lang.reflect.Method.invoke/",
+ "/at org.apache.maven.surefire./",
+ "/at org.junit.internal.runners./"
+ };
+
/**
* Filter out stack trace lines coming from the various JUnit TestRunners.
*/
@@ -31,17 +41,18 @@
return null;
}
- if (
- util.match(
- "/at org.eclipse.jdt.internal.junit.runner.RemoteTestRunner/", in)) {
- return null;
- } else if (
- util.match(
- "/at org.apache.tools.ant.taskdefs.optional.junit.JUnitTestRunner/",
- in)) {
- return null;
- } else {
- return in;
+ //
+ // restore the one instance of Method.invoke that we actually want
+ //
+ if (util.match("/at junit.framework.TestCase.runTest/", in)) {
+ return "\tat java.lang.reflect.Method.invoke(X)\n" + in;
+ }
+
+ for (int i = 0; i < patterns.length; i++) {
+ if(util.match(patterns[i], in)) {
+ return null;
+ }
}
+ return in;
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: log4j-dev-unsubscribe@logging.apache.org
For additional commands, e-mail: log4j-dev-help@logging.apache.org
|