You are viewing a plain text version of this content. The canonical link for it is here.
Posted to log4j-dev@logging.apache.org by ca...@apache.org on 2007/06/05 06:41:33 UTC
svn commit: r544373 - in /logging/log4j/companions/filters/trunk: ./
src/assembly/ src/changes/ src/main/java/org/apache/log4j/filter/
src/main/java/org/apache/log4j/rule/ src/site/ src/site/apt/
src/test/java/org/apache/log4j/filter/ src/test/resource...
Author: carnold
Date: Mon Jun 4 21:41:32 2007
New Revision: 544373
URL: http://svn.apache.org/viewvc?view=rev&rev=544373
Log:
Bug 42099: Change version to 1.0, productization fixes
Added:
logging/log4j/companions/filters/trunk/src/assembly/
logging/log4j/companions/filters/trunk/src/assembly/bin.xml
logging/log4j/companions/filters/trunk/src/site/apt/
- copied from r544335, logging/log4j/companions/component/trunk/src/site/apt/
Modified:
logging/log4j/companions/filters/trunk/build.xml
logging/log4j/companions/filters/trunk/pom.xml
logging/log4j/companions/filters/trunk/src/changes/changes.xml
logging/log4j/companions/filters/trunk/src/main/java/org/apache/log4j/filter/AndFilter.java
logging/log4j/companions/filters/trunk/src/main/java/org/apache/log4j/filter/LevelRangeFilter.java
logging/log4j/companions/filters/trunk/src/main/java/org/apache/log4j/filter/LocationInfoFilter.java
logging/log4j/companions/filters/trunk/src/main/java/org/apache/log4j/rule/LevelEqualsRule.java
logging/log4j/companions/filters/trunk/src/main/java/org/apache/log4j/rule/LevelInequalityRule.java
logging/log4j/companions/filters/trunk/src/site/apt/download.apt
logging/log4j/companions/filters/trunk/src/site/apt/index.apt
logging/log4j/companions/filters/trunk/src/site/apt/roadmap.apt
logging/log4j/companions/filters/trunk/src/site/site.xml
logging/log4j/companions/filters/trunk/src/test/java/org/apache/log4j/filter/SimpleFilterTest.java
logging/log4j/companions/filters/trunk/src/test/resources/org/apache/log4j/filter/simpleFilter1.xml
Modified: logging/log4j/companions/filters/trunk/build.xml
URL: http://svn.apache.org/viewvc/logging/log4j/companions/filters/trunk/build.xml?view=diff&rev=544373&r1=544372&r2=544373
==============================================================================
--- logging/log4j/companions/filters/trunk/build.xml (original)
+++ logging/log4j/companions/filters/trunk/build.xml Mon Jun 4 21:41:32 2007
@@ -29,15 +29,15 @@
<!-- 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.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"/>
<property name="oro.version" value="2.0.8"/>
<!-- Dependency locations - assumed to be in Maven 2 repository -->
@@ -49,8 +49,8 @@
location="${m2_repo}/oro/oro/${oro.version}/oro-${oro.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/filters/trunk/pom.xml
URL: http://svn.apache.org/viewvc/logging/log4j/companions/filters/trunk/pom.xml?view=diff&rev=544373&r1=544372&r2=544373
==============================================================================
--- logging/log4j/companions/filters/trunk/pom.xml (original)
+++ logging/log4j/companions/filters/trunk/pom.xml Mon Jun 4 21:41:32 2007
@@ -21,18 +21,18 @@
<groupId>log4j</groupId>
<artifactId>apache-log4j-filters</artifactId>
<packaging>jar</packaging>
- <version>0.1-SNAPSHOT</version>
+ <version>1.0-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/log4j/companions/filters</url>
+ <url>http://logging.apache.org:80/log4j/companions/filters</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-filter/logging-log4j-filters/index.html</url>
+ <url>http://vmgump.apache.org/gump/public/logging-log4j-filters/logging-log4j-filters/index.html</url>
</ciManagement>
<mailingLists>
<mailingList>
@@ -58,14 +58,6 @@
</otherArchives>
</mailingList>
</mailingLists>
-<developers>
- <developer>
- <id>carnold</id>
- <name>Curt Arnold</name>
- <email>carnold@apache.org</email>
- <timezone>-6</timezone>
- </developer>
- </developers>
<licenses>
<license>
<name>Apache License, Version 2.0</name>
@@ -74,9 +66,9 @@
</license>
</licenses>
<scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/logging/sandbox/log4j/expression-filter</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/logging/sandbox/log4j/expression-filter</developerConnection>
- <url>http://svn.apache.org/viewcvs.cgi/logging/sandbox/log4j/expression-filter</url>
+ <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>
</scm>
<organization>
<name>Apache Software Foundation</name>
@@ -85,48 +77,109 @@
<build>
<plugins>
<plugin>
- <artifactId>maven-checkstyle-plugin</artifactId>
- <dependencies>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>1.2.14</version>
- </dependency>
- </dependencies>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <workingDirectory>target</workingDirectory>
+ </configuration>
</plugin>
<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>
<dependency>
<groupId>oro</groupId>
@@ -135,36 +188,35 @@
</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.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-report-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 +229,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/filters</url>
+ <id>logging.site</id>
+ <url>scp://people.apache.org/www/logging.apache.org/log4j/companions/filters</url>
</site>
</distributionManagement>
-
</project>
Added: logging/log4j/companions/filters/trunk/src/assembly/bin.xml
URL: http://svn.apache.org/viewvc/logging/log4j/companions/filters/trunk/src/assembly/bin.xml?view=auto&rev=544373
==============================================================================
--- logging/log4j/companions/filters/trunk/src/assembly/bin.xml (added)
+++ logging/log4j/companions/filters/trunk/src/assembly/bin.xml Mon Jun 4 21:41:32 2007
@@ -0,0 +1,45 @@
+<!--
+ 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.
+
+-->
+<assembly>
+ <id>bin</id>
+ <formats>
+ <format>zip</format>
+ <format>tar.gz</format>
+ </formats>
+ <baseDirectory>apache-log4j-filters-${project.version}</baseDirectory>
+ <includeSiteDirectory>true</includeSiteDirectory>
+ <fileSets>
+ <fileSet>
+ <includes>
+ <include>LICENSE</include>
+ <include>NOTICE</include>
+ <include>build.xml</include>
+ <include>pom.xml</include>
+ <include>src/**</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>target</directory>
+ <outputDirectory>.</outputDirectory>
+ <includes>
+ <include>apache-log4j-filters-${project.version}.jar</include>
+ </includes>
+ </fileSet>
+ </fileSets>
+
+</assembly>
Modified: logging/log4j/companions/filters/trunk/src/changes/changes.xml
URL: http://svn.apache.org/viewvc/logging/log4j/companions/filters/trunk/src/changes/changes.xml?view=diff&rev=544373&r1=544372&r2=544373
==============================================================================
--- logging/log4j/companions/filters/trunk/src/changes/changes.xml (original)
+++ logging/log4j/companions/filters/trunk/src/changes/changes.xml Mon Jun 4 21:41:32 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 filters 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>Filters</title>
+ </properties>
+ <body>
+ <release version="1.0" date="2007-06-05" description="First release">
+ <action issue="42099" type="add">
+ Initial release of filters backported from log4j 1.3.
+ </action>
+ </release>
+ </body>
+</document>
\ No newline at end of file
Modified: logging/log4j/companions/filters/trunk/src/main/java/org/apache/log4j/filter/AndFilter.java
URL: http://svn.apache.org/viewvc/logging/log4j/companions/filters/trunk/src/main/java/org/apache/log4j/filter/AndFilter.java?view=diff&rev=544373&r1=544372&r2=544373
==============================================================================
--- logging/log4j/companions/filters/trunk/src/main/java/org/apache/log4j/filter/AndFilter.java (original)
+++ logging/log4j/companions/filters/trunk/src/main/java/org/apache/log4j/filter/AndFilter.java Mon Jun 4 21:41:32 2007
@@ -72,17 +72,17 @@
public void activateOptions() {
}
- public void addFilter(Filter filter) {
+ public void addFilter(final Filter filter) {
System.out.println("add"+filter);
if (headFilter == null) {
headFilter = filter;
tailFilter = filter;
} else {
- tailFilter.setNext(filter);
+ tailFilter.next = filter;
}
}
- public void setAcceptOnMatch(boolean acceptOnMatch) {
+ public void setAcceptOnMatch(final boolean acceptOnMatch) {
this.acceptOnMatch = acceptOnMatch;
}
/**
@@ -94,12 +94,12 @@
*
* Returns {@link Filter#NEUTRAL}
*/
- public int decide(LoggingEvent event) {
+ public int decide(final LoggingEvent event) {
boolean accepted = true;
Filter f = headFilter;
while (f != null) {
accepted = accepted && (Filter.ACCEPT == f.decide(event));
- f = f.getNext();
+ f = f.next;
}
if (accepted) {
if(acceptOnMatch) {
Modified: logging/log4j/companions/filters/trunk/src/main/java/org/apache/log4j/filter/LevelRangeFilter.java
URL: http://svn.apache.org/viewvc/logging/log4j/companions/filters/trunk/src/main/java/org/apache/log4j/filter/LevelRangeFilter.java?view=diff&rev=544373&r1=544372&r2=544373
==============================================================================
--- logging/log4j/companions/filters/trunk/src/main/java/org/apache/log4j/filter/LevelRangeFilter.java (original)
+++ logging/log4j/companions/filters/trunk/src/main/java/org/apache/log4j/filter/LevelRangeFilter.java Mon Jun 4 21:41:32 2007
@@ -66,21 +66,19 @@
*/
public
int decide(LoggingEvent event) {
- if(this.levelMin != null) {
- if (event.getLevel().isGreaterOrEqual(levelMin) == false) {
+ if(this.levelMin != null
+ && event.getLevel().isGreaterOrEqual(levelMin) == false) {
// level of event is less than minimum
return Filter.DENY;
- }
}
- if(this.levelMax != null) {
- if (event.getLevel().toInt() > levelMax.toInt()) {
+ if(this.levelMax != null
+ && event.getLevel().toInt() > levelMax.toInt()) {
// level of event is greater than maximum
// Alas, there is no Level.isGreater method. and using
// a combo of isGreaterOrEqual && !Equal seems worse than
// checking the int values of the level objects..
return Filter.DENY;
- }
}
if (acceptOnMatch) {
Modified: logging/log4j/companions/filters/trunk/src/main/java/org/apache/log4j/filter/LocationInfoFilter.java
URL: http://svn.apache.org/viewvc/logging/log4j/companions/filters/trunk/src/main/java/org/apache/log4j/filter/LocationInfoFilter.java?view=diff&rev=544373&r1=544372&r2=544373
==============================================================================
--- logging/log4j/companions/filters/trunk/src/main/java/org/apache/log4j/filter/LocationInfoFilter.java (original)
+++ logging/log4j/companions/filters/trunk/src/main/java/org/apache/log4j/filter/LocationInfoFilter.java Mon Jun 4 21:41:32 2007
@@ -21,7 +21,6 @@
import org.apache.log4j.rule.Rule;
import org.apache.log4j.spi.Filter;
import org.apache.log4j.spi.LoggingEvent;
-import org.apache.log4j.spi.LocationInfo;
/**
@@ -52,12 +51,6 @@
* Compiled expression.
*/
Rule expressionRule;
- /**
- HACK: Category is the last of the internal layers -
- pass this in as the class name
- in order for parsing to work correctly.
- */
- private String className = "org.apache.log4j.Category";
/**
* {@inheritDoc}
Modified: logging/log4j/companions/filters/trunk/src/main/java/org/apache/log4j/rule/LevelEqualsRule.java
URL: http://svn.apache.org/viewvc/logging/log4j/companions/filters/trunk/src/main/java/org/apache/log4j/rule/LevelEqualsRule.java?view=diff&rev=544373&r1=544372&r2=544373
==============================================================================
--- logging/log4j/companions/filters/trunk/src/main/java/org/apache/log4j/rule/LevelEqualsRule.java (original)
+++ logging/log4j/companions/filters/trunk/src/main/java/org/apache/log4j/rule/LevelEqualsRule.java Mon Jun 4 21:41:32 2007
@@ -70,7 +70,10 @@
levelList.add(Level.WARN.toString());
levelList.add(Level.INFO.toString());
levelList.add(Level.DEBUG.toString());
- levelList.add(Level.TRACE.toString());
+ Level trace = Level.toLevel(5000, null);
+ if (trace != null) {
+ levelList.add(trace.toString());
+ }
}
/**
Modified: logging/log4j/companions/filters/trunk/src/main/java/org/apache/log4j/rule/LevelInequalityRule.java
URL: http://svn.apache.org/viewvc/logging/log4j/companions/filters/trunk/src/main/java/org/apache/log4j/rule/LevelInequalityRule.java?view=diff&rev=544373&r1=544372&r2=544373
==============================================================================
--- logging/log4j/companions/filters/trunk/src/main/java/org/apache/log4j/rule/LevelInequalityRule.java (original)
+++ logging/log4j/companions/filters/trunk/src/main/java/org/apache/log4j/rule/LevelInequalityRule.java Mon Jun 4 21:41:32 2007
@@ -63,7 +63,10 @@
levelList.add(Level.WARN.toString());
levelList.add(Level.INFO.toString());
levelList.add(Level.DEBUG.toString());
- levelList.add(Level.TRACE.toString());
+ Level trace = Level.toLevel(5000, null);
+ if (trace != null) {
+ levelList.add(trace.toString());
+ }
utilLoggingLevelList = new LinkedList();
Modified: logging/log4j/companions/filters/trunk/src/site/apt/download.apt
URL: http://svn.apache.org/viewvc/logging/log4j/companions/filters/trunk/src/site/apt/download.apt?view=diff&rev=544373&r1=544335&r2=544373
==============================================================================
--- logging/log4j/companions/filters/trunk/src/site/apt/download.apt (original)
+++ logging/log4j/companions/filters/trunk/src/site/apt/download.apt Mon Jun 4 21:41:32 2007
@@ -13,14 +13,14 @@
~~ See the License for the specific language governing permissions and
~~ limitations under the License.
------
-Download apache-log4j-component
+Download apache-log4j-filters
------
------
------
-Download apache-log4j-component
+Download apache-log4j-filters
- 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}}.
+ 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}}.
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,10 +29,10 @@
*-------------------------+---------+----------+-----------+
| | 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-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}} |
+| apache-log4j-filters-1.0-bin (tar.gz) | {{{http://www.apache.org/dyn/closer.cgi/logging/log4j/companions/filters/1.0/apache-log4j-filters-1.0-bin.tar.gz} apache-log4j-filters-1.0-bin.tar.gz}} | {{{http://www.apache.org/dist/logging/log4j/companions/filters/1.0/apache-log4j-filters-1.0-bin.tar.gz.md5} apache-log4j-filters-1.0-bin.tar.gz.md5}} | {{{http://www.apache.org/dist/logging/log4j/companions/filters/1.0/apache-log4j-filters-1.0-bin.tar.gz.asc} apache-log4j-filters-1.0-bin.tar.gz.asc}} |
+*-------------------------+---------+----------+-----------+
+| apache-log4j-filters-1.0-bin (zip) | {{{http://www.apache.org/dyn/closer.cgi/logging/log4j/companions/filters/1.0/apache-log4j-filters-1.0-bin.zip} apache-log4j-filters-1.0-bin.zip}} | {{{http://www.apache.org/dist/logging/log4j/companions/filters/1.0/apache-log4j-filters-1.0-bin.zip.md5} apache-log4j-filters-1.0-bin.zip.md5}} | {{{http://www.apache.org/dist/logging/log4j/companions/filters/1.0/apache-log4j-filters-1.0-bin.zip.asc} apache-log4j-filters-1.0-bin.zip.asc}} |
*-------------------------+---------+----------+-----------+
Please read {{{http://httpd.apache.org/dev/verification.html}Verifying Apache HTTP Server Releases}}
Modified: logging/log4j/companions/filters/trunk/src/site/apt/index.apt
URL: http://svn.apache.org/viewvc/logging/log4j/companions/filters/trunk/src/site/apt/index.apt?view=diff&rev=544373&r1=544335&r2=544373
==============================================================================
--- logging/log4j/companions/filters/trunk/src/site/apt/index.apt (original)
+++ logging/log4j/companions/filters/trunk/src/site/apt/index.apt Mon Jun 4 21:41:32 2007
@@ -13,11 +13,10 @@
~~ See the License for the specific language governing permissions and
~~ limitations under the License.
------
- Apache Component Companion for log4j 1.2
+ Apache Filters Companion for log4j 1.2
------
------
------
- 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.
+ 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
Modified: logging/log4j/companions/filters/trunk/src/site/apt/roadmap.apt
URL: http://svn.apache.org/viewvc/logging/log4j/companions/filters/trunk/src/site/apt/roadmap.apt?view=diff&rev=544373&r1=544335&r2=544373
==============================================================================
--- logging/log4j/companions/filters/trunk/src/site/apt/roadmap.apt (original)
+++ logging/log4j/companions/filters/trunk/src/site/apt/roadmap.apt Mon Jun 4 21:41:32 2007
@@ -13,13 +13,13 @@
~~ See the License for the specific language governing permissions and
~~ limitations under the License.
------
- apache-log4j-component Roadmap
+ apache-log4j-filters Roadmap
------
Curt Arnold
------
4 June 2007
------
-apache-log4j-component Roadmap
+apache-log4j-filters Roadmap
No additional development is anticipated.
Modified: logging/log4j/companions/filters/trunk/src/site/site.xml
URL: http://svn.apache.org/viewvc/logging/log4j/companions/filters/trunk/src/site/site.xml?view=diff&rev=544373&r1=544372&r2=544373
==============================================================================
--- logging/log4j/companions/filters/trunk/src/site/site.xml (original)
+++ logging/log4j/companions/filters/trunk/src/site/site.xml Mon Jun 4 21:41:32 2007
@@ -15,22 +15,50 @@
limitations under the License.
-->
-<project name="Component">
+<project name="Filters">
<bannerLeft>
<name>Logging Services</name>
<src>images/ls-logo.jpg</src>
<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="filters" href="http://logging.apache.org:80/log4j/companions/filters/"/>
+ </breadcrumbs>
+
+ <menu name="Get filters">
+ <item name="Download" href="/download.html"/>
+ <item name="Changes" href="/changes-report.html"/>
+ <item name="License" href="/license.html"/>
+ </menu>
+
+ <menu name="About filters">
+ <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>
\ No newline at end of file
+</project>
Modified: logging/log4j/companions/filters/trunk/src/test/java/org/apache/log4j/filter/SimpleFilterTest.java
URL: http://svn.apache.org/viewvc/logging/log4j/companions/filters/trunk/src/test/java/org/apache/log4j/filter/SimpleFilterTest.java?view=diff&rev=544373&r1=544372&r2=544373
==============================================================================
--- logging/log4j/companions/filters/trunk/src/test/java/org/apache/log4j/filter/SimpleFilterTest.java (original)
+++ logging/log4j/companions/filters/trunk/src/test/java/org/apache/log4j/filter/SimpleFilterTest.java Mon Jun 4 21:41:32 2007
@@ -32,8 +32,8 @@
Logger root;
Logger logger;
- public final static String FILTERED = "output/filtered";
- public final static String TEMP = "output/temp";
+ public final static String FILTERED = "filtered";
+ public final static String TEMP = "temp";
static String TEST1_PAT = "(DEBUG|INFO|WARN|ERROR|FATAL) - Message \\d";
static String EXCEPTION1 = "java.lang.Exception: Just testing";
Modified: logging/log4j/companions/filters/trunk/src/test/resources/org/apache/log4j/filter/simpleFilter1.xml
URL: http://svn.apache.org/viewvc/logging/log4j/companions/filters/trunk/src/test/resources/org/apache/log4j/filter/simpleFilter1.xml?view=diff&rev=544373&r1=544372&r2=544373
==============================================================================
--- logging/log4j/companions/filters/trunk/src/test/resources/org/apache/log4j/filter/simpleFilter1.xml (original)
+++ logging/log4j/companions/filters/trunk/src/test/resources/org/apache/log4j/filter/simpleFilter1.xml Mon Jun 4 21:41:32 2007
@@ -1,4 +1,21 @@
<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+ 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.
+
+-->
<!DOCTYPE configuration >
<log4j:configuration xmlns:log4j='http://logging.apache.org/'>
@@ -6,7 +23,7 @@
<appender name="A1" class="org.apache.log4j.FileAppender">
<param name="Append" value="false" />
- <param name="File" value="output/temp" />
+ <param name="File" value="temp" />
<layout class="org.apache.log4j.PatternLayout">
<param name="ConversionPattern" value="%p - %m\n"/>
---------------------------------------------------------------------
To unsubscribe, e-mail: log4j-dev-unsubscribe@logging.apache.org
For additional commands, e-mail: log4j-dev-help@logging.apache.org