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 15:02:50 UTC
svn commit: r544477 - in /logging/log4j/companions/rolling/trunk: ./
src/assembly/ src/changes/ src/main/java/org/apache/log4j/rolling/
src/main/java/org/apache/log4j/rolling/helper/ src/site/ src/site/apt/
src/test/java/org/apache/log4j/rolling/ src/t...
Author: carnold
Date: Tue Jun 5 06:02:49 2007
New Revision: 544477
URL: http://svn.apache.org/viewvc?view=rev&rev=544477
Log:
Bug 42251: Change version to 1.0, productization fixes
Added:
logging/log4j/companions/rolling/trunk/src/assembly/
- copied from r544335, logging/log4j/companions/component/trunk/src/assembly/
logging/log4j/companions/rolling/trunk/src/assembly/bin.xml
- copied, changed from r544376, logging/log4j/companions/component/trunk/src/assembly/bin.xml
logging/log4j/companions/rolling/trunk/src/site/apt/
- copied from r544335, logging/log4j/companions/component/trunk/src/site/apt/
logging/log4j/companions/rolling/trunk/src/site/apt/download.apt
- copied, changed from r544376, logging/log4j/companions/component/trunk/src/site/apt/download.apt
Modified:
logging/log4j/companions/rolling/trunk/build.xml
logging/log4j/companions/rolling/trunk/pom.xml
logging/log4j/companions/rolling/trunk/src/changes/changes.xml
logging/log4j/companions/rolling/trunk/src/main/java/org/apache/log4j/rolling/FilterBasedTriggeringPolicy.java
logging/log4j/companions/rolling/trunk/src/main/java/org/apache/log4j/rolling/RollingConfigurator.java
logging/log4j/companions/rolling/trunk/src/main/java/org/apache/log4j/rolling/RollingFileAppender.java
logging/log4j/companions/rolling/trunk/src/main/java/org/apache/log4j/rolling/helper/GZCompressAction.java
logging/log4j/companions/rolling/trunk/src/main/java/org/apache/log4j/rolling/helper/ZipCompressAction.java
logging/log4j/companions/rolling/trunk/src/site/apt/index.apt
logging/log4j/companions/rolling/trunk/src/site/apt/roadmap.apt
logging/log4j/companions/rolling/trunk/src/site/site.xml
logging/log4j/companions/rolling/trunk/src/test/java/org/apache/log4j/rolling/FilterBasedRollingTest.java
logging/log4j/companions/rolling/trunk/src/test/java/org/apache/log4j/rolling/RenamingTest.java
logging/log4j/companions/rolling/trunk/src/test/java/org/apache/log4j/rolling/SizeBasedRollingTest.java
logging/log4j/companions/rolling/trunk/src/test/java/org/apache/log4j/rolling/TimeBasedRollingTest.java
logging/log4j/companions/rolling/trunk/src/test/resources/org/apache/log4j/rolling/filter1.xml
logging/log4j/companions/rolling/trunk/src/test/resources/org/apache/log4j/rolling/time1.xml
Modified: logging/log4j/companions/rolling/trunk/build.xml
URL: http://svn.apache.org/viewvc/logging/log4j/companions/rolling/trunk/build.xml?view=diff&rev=544477&r1=544476&r2=544477
==============================================================================
--- logging/log4j/companions/rolling/trunk/build.xml (original)
+++ logging/log4j/companions/rolling/trunk/build.xml Tue Jun 5 06:02:49 2007
@@ -29,17 +29,17 @@
<!-- project details -->
<property name="project.name" value="apache-log4j-rolling"/>
<property name="project.title" value="Apache Rolling File Appender 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="pattern-layout.version" value="0.1-SNAPSHOT"/>
- <property name="filters.version" value="0.1-SNAPSHOT"/>
+ <property name="log4j.version" value="1.2.8"/>
+ <property name="junit.version" value="4.3.1"/>
+ <property name="pattern-layout.version" value="1.0-SNAPSHOT"/>
+ <property name="filters.version" value="1.0-SNAPSHOT"/>
<!-- Dependency locations - assumed to be in Maven 2 repository -->
<property name="junit.jar"
@@ -52,8 +52,8 @@
location="${m2_repo}/log4j/apache-log4j-filters/${filters.version}/apache-log4j-filters-${filters.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/rolling/trunk/pom.xml
URL: http://svn.apache.org/viewvc/logging/log4j/companions/rolling/trunk/pom.xml?view=diff&rev=544477&r1=544476&r2=544477
==============================================================================
--- logging/log4j/companions/rolling/trunk/pom.xml (original)
+++ logging/log4j/companions/rolling/trunk/pom.xml Tue Jun 5 06:02:49 2007
@@ -21,11 +21,11 @@
<groupId>log4j</groupId>
<artifactId>apache-log4j-rolling</artifactId>
<packaging>jar</packaging>
- <version>0.1-SNAPSHOT</version>
+ <version>1.0-SNAPSHOT</version>
<name>Apache Rolling File Appender Companion for log4j 1.2.</name>
<description>This companion provides the new rolling file appender
from the log4j 1.3 project to log4j 1.2 users.</description>
- <url>http://logging.apache.org/log4j/companions/rollingt</url>
+ <url>http://logging.apache.org:80/log4j/companions/rolling</url>
<issueManagement>
<system>Bugzilla</system>
<url>http://issues.apache.org/bugzilla/</url>
@@ -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/rolling</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/logging/sandbox/log4j/rolling</developerConnection>
- <url>http://svn.apache.org/viewcvs.cgi/logging/sandbox/log4j/rolling</url>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/logging/log4j/companions/rolling/trunk</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/logging/log4j/companions/rolling/trunk</developerConnection>
+ <url>http://svn.apache.org/viewcvs.cgi/logging/log4j/companions/rolling/trunk</url>
</scm>
<organization>
<name>Apache Software Foundation</name>
@@ -85,94 +77,150 @@
<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>
</configuration>
- </plugin>
+ </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>log4j</groupId>
<artifactId>apache-log4j-pattern-layout</artifactId>
- <version>0.1-SNAPSHOT</version>
+ <version>1.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>apache-log4j-filters</artifactId>
- <version>0.1-SNAPSHOT</version>
+ <version>1.0-SNAPSHOT</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>
@@ -185,13 +233,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/rolling</url>
+ <id>logging.site</id>
+ <url>scp://people.apache.org/www/logging.apache.org/log4j/companions/rolling</url>
</site>
</distributionManagement>
-
</project>
Copied: logging/log4j/companions/rolling/trunk/src/assembly/bin.xml (from r544376, logging/log4j/companions/component/trunk/src/assembly/bin.xml)
URL: http://svn.apache.org/viewvc/logging/log4j/companions/rolling/trunk/src/assembly/bin.xml?view=diff&rev=544477&p1=logging/log4j/companions/component/trunk/src/assembly/bin.xml&r1=544376&p2=logging/log4j/companions/rolling/trunk/src/assembly/bin.xml&r2=544477
==============================================================================
--- logging/log4j/companions/component/trunk/src/assembly/bin.xml (original)
+++ logging/log4j/companions/rolling/trunk/src/assembly/bin.xml Tue Jun 5 06:02:49 2007
@@ -21,7 +21,7 @@
<format>zip</format>
<format>tar.gz</format>
</formats>
- <baseDirectory>apache-log4j-component-${project.version}</baseDirectory>
+ <baseDirectory>apache-log4j-rolling-${project.version}</baseDirectory>
<includeSiteDirectory>true</includeSiteDirectory>
<fileSets>
<fileSet>
@@ -37,7 +37,7 @@
<directory>target</directory>
<outputDirectory>.</outputDirectory>
<includes>
- <include>apache-log4j-component-${project.version}.jar</include>
+ <include>apache-log4j-rolling-${project.version}.jar</include>
</includes>
</fileSet>
</fileSets>
Modified: logging/log4j/companions/rolling/trunk/src/changes/changes.xml
URL: http://svn.apache.org/viewvc/logging/log4j/companions/rolling/trunk/src/changes/changes.xml?view=diff&rev=544477&r1=544476&r2=544477
==============================================================================
--- logging/log4j/companions/rolling/trunk/src/changes/changes.xml (original)
+++ logging/log4j/companions/rolling/trunk/src/changes/changes.xml Tue Jun 5 06:02:49 2007
@@ -17,11 +17,11 @@
-->
<document>
<properties>
- <title>Component</title>
+ <title>Rolling</title>
</properties>
<body>
- <release version="0.1" date="2099-01-01" description="First release">
- <action dev="carnold" issue="42094" type="add">
+ <release version="1.0" date="2007-06-05" description="First release">
+ <action issue="42251" type="add">
Initial release of companion.
</action>
</release>
Modified: logging/log4j/companions/rolling/trunk/src/main/java/org/apache/log4j/rolling/FilterBasedTriggeringPolicy.java
URL: http://svn.apache.org/viewvc/logging/log4j/companions/rolling/trunk/src/main/java/org/apache/log4j/rolling/FilterBasedTriggeringPolicy.java?view=diff&rev=544477&r1=544476&r2=544477
==============================================================================
--- logging/log4j/companions/rolling/trunk/src/main/java/org/apache/log4j/rolling/FilterBasedTriggeringPolicy.java (original)
+++ logging/log4j/companions/rolling/trunk/src/main/java/org/apache/log4j/rolling/FilterBasedTriggeringPolicy.java Tue Jun 5 06:02:49 2007
@@ -71,7 +71,7 @@
//
// otherwise loop through the filters
//
- for (Filter f = headFilter; f != null; f = f.getNext()) {
+ for (Filter f = headFilter; f != null; f = f.next) {
switch (f.decide(event)) {
case Filter.DENY:
return false;
@@ -93,7 +93,7 @@
headFilter = newFilter;
tailFilter = newFilter;
} else {
- tailFilter.setNext(newFilter);
+ tailFilter.next = newFilter;
tailFilter = newFilter;
}
}
@@ -120,7 +120,7 @@
* {@inheritDoc}
*/
public void activateOptions() {
- for (Filter f = headFilter; f != null; f = f.getNext()) {
+ for (Filter f = headFilter; f != null; f = f.next) {
f.activateOptions();
}
}
Modified: logging/log4j/companions/rolling/trunk/src/main/java/org/apache/log4j/rolling/RollingConfigurator.java
URL: http://svn.apache.org/viewvc/logging/log4j/companions/rolling/trunk/src/main/java/org/apache/log4j/rolling/RollingConfigurator.java?view=diff&rev=544477&r1=544476&r2=544477
==============================================================================
--- logging/log4j/companions/rolling/trunk/src/main/java/org/apache/log4j/rolling/RollingConfigurator.java (original)
+++ logging/log4j/companions/rolling/trunk/src/main/java/org/apache/log4j/rolling/RollingConfigurator.java Tue Jun 5 06:02:49 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;
@@ -994,7 +993,7 @@
}
/**
- Call {@link PropertyConfigurator#configure(String)} with the
+ Call {@link RollingConfigurator#configure(String)} with the
<code>filename</code> to reconfigure log4j. */
public
void doOnChange() {
Modified: logging/log4j/companions/rolling/trunk/src/main/java/org/apache/log4j/rolling/RollingFileAppender.java
URL: http://svn.apache.org/viewvc/logging/log4j/companions/rolling/trunk/src/main/java/org/apache/log4j/rolling/RollingFileAppender.java?view=diff&rev=544477&r1=544476&r2=544477
==============================================================================
--- logging/log4j/companions/rolling/trunk/src/main/java/org/apache/log4j/rolling/RollingFileAppender.java (original)
+++ logging/log4j/companions/rolling/trunk/src/main/java/org/apache/log4j/rolling/RollingFileAppender.java Tue Jun 5 06:02:49 2007
@@ -19,9 +19,7 @@
import org.apache.log4j.Appender;
import org.apache.log4j.FileAppender;
import org.apache.log4j.Logger;
-import org.apache.log4j.config.PropertySetter;
import org.apache.log4j.helpers.LogLog;
-import org.apache.log4j.helpers.OptionConverter;
import org.apache.log4j.helpers.QuietWriter;
import org.apache.log4j.rolling.helper.Action;
import org.apache.log4j.spi.ErrorHandler;
@@ -29,8 +27,6 @@
import org.apache.log4j.spi.OptionHandler;
import org.apache.log4j.xml.UnrecognizedElementHandler;
import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
import java.io.File;
import java.io.FileOutputStream;
@@ -53,8 +49,8 @@
* <code>RollingPolicy</code> and a <code>TriggeringPolicy</code>.
*
* <p><code>RollingFileAppender</code> can be configured programattically or
- * using {@link org.apache.log4j.xml.RollingConfigurator} or
- * {@link org.apache.log4j.DOMConfigurator} in log4j 1.2.15 or later. Here is a sample
+ * using {@link org.apache.log4j.rolling.RollingConfigurator} or
+ * {@link org.apache.log4j.xml.DOMConfigurator} in log4j 1.2.15 or later. Here is a sample
* configration file:
<pre><?xml version="1.0" encoding="UTF-8" ?>
@@ -193,7 +189,7 @@
}
- private final QuietWriter createQuietWriter(final Writer writer) {
+ private QuietWriter createQuietWriter(final Writer writer) {
ErrorHandler handler = errorHandler;
if (handler == null) {
handler = new DefaultErrorHandler(this);
Modified: logging/log4j/companions/rolling/trunk/src/main/java/org/apache/log4j/rolling/helper/GZCompressAction.java
URL: http://svn.apache.org/viewvc/logging/log4j/companions/rolling/trunk/src/main/java/org/apache/log4j/rolling/helper/GZCompressAction.java?view=diff&rev=544477&r1=544476&r2=544477
==============================================================================
--- logging/log4j/companions/rolling/trunk/src/main/java/org/apache/log4j/rolling/helper/GZCompressAction.java (original)
+++ logging/log4j/companions/rolling/trunk/src/main/java/org/apache/log4j/rolling/helper/GZCompressAction.java Tue Jun 5 06:02:49 2007
@@ -108,10 +108,8 @@
gzos.close();
fis.close();
- if (deleteSource) {
- if (!source.delete()) {
+ if (deleteSource && !source.delete()) {
LogLog.warn("Unable to delete " + source.toString() + ".");
- }
}
return true;
Modified: logging/log4j/companions/rolling/trunk/src/main/java/org/apache/log4j/rolling/helper/ZipCompressAction.java
URL: http://svn.apache.org/viewvc/logging/log4j/companions/rolling/trunk/src/main/java/org/apache/log4j/rolling/helper/ZipCompressAction.java?view=diff&rev=544477&r1=544476&r2=544477
==============================================================================
--- logging/log4j/companions/rolling/trunk/src/main/java/org/apache/log4j/rolling/helper/ZipCompressAction.java (original)
+++ logging/log4j/companions/rolling/trunk/src/main/java/org/apache/log4j/rolling/helper/ZipCompressAction.java Tue Jun 5 06:02:49 2007
@@ -113,10 +113,8 @@
zos.close();
fis.close();
- if (deleteSource) {
- if (!source.delete() ) {
+ if (deleteSource && !source.delete()) {
LogLog.warn("Unable to delete " + source.toString() + ".");
- }
}
return true;
Copied: logging/log4j/companions/rolling/trunk/src/site/apt/download.apt (from r544376, logging/log4j/companions/component/trunk/src/site/apt/download.apt)
URL: http://svn.apache.org/viewvc/logging/log4j/companions/rolling/trunk/src/site/apt/download.apt?view=diff&rev=544477&p1=logging/log4j/companions/component/trunk/src/site/apt/download.apt&r1=544376&p2=logging/log4j/companions/rolling/trunk/src/site/apt/download.apt&r2=544477
==============================================================================
--- logging/log4j/companions/component/trunk/src/site/apt/download.apt (original)
+++ logging/log4j/companions/rolling/trunk/src/site/apt/download.apt Tue Jun 5 06:02:49 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-rolling
------
------
------
-Download apache-log4j-component
+Download apache-log4j-rolling
- 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 Rolling 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-component-1.0-bin (tar.gz) | {{{http://www.apache.org/dyn/closer.cgi/logging/log4j/companions/component/1.0/apache-log4j-component-1.0-bin.tar.gz} apache-log4j-component-1.0-bin.tar.gz}} | {{{http://www.apache.org/dist/logging/log4j/companions/component/1.0/apache-log4j-component-1.0-bin.tar.gz.md5} apache-log4j-component-1.0-bin.tar.gz.md5}} | {{{http://www.apache.org/dist/logging/log4j/companions/component/1.0/apache-log4j-component-1.0-bin.tar.gz.asc} apache-log4j-component-1.0-bin.tar.gz.asc}} |
+| apache-log4j-rolling-1.0-bin (tar.gz) | {{{http://www.apache.org/dyn/closer.cgi/logging/log4j/companions/rolling/1.0/apache-log4j-rolling-1.0-bin.tar.gz} apache-log4j-rolling-1.0-bin.tar.gz}} | {{{http://www.apache.org/dist/logging/log4j/companions/rolling/1.0/apache-log4j-rolling-1.0-bin.tar.gz.md5} apache-log4j-rolling-1.0-bin.tar.gz.md5}} | {{{http://www.apache.org/dist/logging/log4j/companions/rolling/1.0/apache-log4j-rolling-1.0-bin.tar.gz.asc} apache-log4j-rolling-1.0-bin.tar.gz.asc}} |
*-------------------------+---------+----------+-----------+
-| apache-log4j-component-1.0-bin (zip) | {{{http://www.apache.org/dyn/closer.cgi/logging/log4j/companions/component/1.0/apache-log4j-component-1.0-bin.zip} apache-log4j-component-1.0-bin.zip}} | {{{http://www.apache.org/dist/logging/log4j/companions/component/1.0/apache-log4j-component-1.0-bin.zip.md5} apache-log4j-component-1.0-bin.zip.md5}} | {{{http://www.apache.org/dist/logging/log4j/companions/component/1.0/apache-log4j-component-1.0-bin.zip.asc} apache-log4j-component-1.0-bin.zip.asc}} |
+| apache-log4j-rolling-1.0-bin (zip) | {{{http://www.apache.org/dyn/closer.cgi/logging/log4j/companions/rolling/1.0/apache-log4j-rolling-1.0-bin.zip} apache-log4j-rolling-1.0-bin.zip}} | {{{http://www.apache.org/dist/logging/log4j/companions/rolling/1.0/apache-log4j-rolling-1.0-bin.zip.md5} apache-log4j-rolling-1.0-bin.zip.md5}} | {{{http://www.apache.org/dist/logging/log4j/companions/rolling/1.0/apache-log4j-rolling-1.0-bin.zip.asc} apache-log4j-rolling-1.0-bin.zip.asc}} |
*-------------------------+---------+----------+-----------+
Please read {{{http://httpd.apache.org/dev/verification.html}Verifying Apache HTTP Server Releases}}
Modified: logging/log4j/companions/rolling/trunk/src/site/apt/index.apt
URL: http://svn.apache.org/viewvc/logging/log4j/companions/rolling/trunk/src/site/apt/index.apt?view=diff&rev=544477&r1=544335&r2=544477
==============================================================================
--- logging/log4j/companions/rolling/trunk/src/site/apt/index.apt (original)
+++ logging/log4j/companions/rolling/trunk/src/site/apt/index.apt Tue Jun 5 06:02:49 2007
@@ -13,11 +13,11 @@
~~ See the License for the specific language governing permissions and
~~ limitations under the License.
------
- Apache Component Companion for log4j 1.2
+ Apache Rolling 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 the new rolling file appender
+ from the log4j 1.3 project to log4j 1.2 users.
+
Modified: logging/log4j/companions/rolling/trunk/src/site/apt/roadmap.apt
URL: http://svn.apache.org/viewvc/logging/log4j/companions/rolling/trunk/src/site/apt/roadmap.apt?view=diff&rev=544477&r1=544335&r2=544477
==============================================================================
--- logging/log4j/companions/rolling/trunk/src/site/apt/roadmap.apt (original)
+++ logging/log4j/companions/rolling/trunk/src/site/apt/roadmap.apt Tue Jun 5 06:02:49 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-rolling Roadmap
------
Curt Arnold
------
4 June 2007
------
-apache-log4j-component Roadmap
+apache-log4j-rolling Roadmap
- No additional development is anticipated.
+ No additional development is currently anticipated.
Modified: logging/log4j/companions/rolling/trunk/src/site/site.xml
URL: http://svn.apache.org/viewvc/logging/log4j/companions/rolling/trunk/src/site/site.xml?view=diff&rev=544477&r1=544476&r2=544477
==============================================================================
--- logging/log4j/companions/rolling/trunk/src/site/site.xml (original)
+++ logging/log4j/companions/rolling/trunk/src/site/site.xml Tue Jun 5 06:02:49 2007
@@ -15,22 +15,50 @@
limitations under the License.
-->
-<project name="Component">
+<project name="Rolling">
<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="rolling" href="http://logging.apache.org:80/log4j/companions/rolling/"/>
+ </breadcrumbs>
+
+ <menu name="Get rolling">
+ <item name="Download" href="/download.html"/>
+ <item name="Changes" href="/changes-report.html"/>
+ <item name="License" href="/license.html"/>
+ </menu>
+
+ <menu name="About rolling">
+ <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/rolling/trunk/src/test/java/org/apache/log4j/rolling/FilterBasedRollingTest.java
URL: http://svn.apache.org/viewvc/logging/log4j/companions/rolling/trunk/src/test/java/org/apache/log4j/rolling/FilterBasedRollingTest.java?view=diff&rev=544477&r1=544476&r2=544477
==============================================================================
--- logging/log4j/companions/rolling/trunk/src/test/java/org/apache/log4j/rolling/FilterBasedRollingTest.java (original)
+++ logging/log4j/companions/rolling/trunk/src/test/java/org/apache/log4j/rolling/FilterBasedRollingTest.java Tue Jun 5 06:02:49 2007
@@ -74,7 +74,7 @@
*/
public void test1() throws Exception {
configure("./input/rolling/filter1.xml");
- common("output/filterBased-test1");
+ common("filterBased-test1");
}
/**
@@ -96,10 +96,10 @@
fbtp.activateOptions();
swrp.setMinIndex(0);
- rfa.setFile("output/filterBased-test2.log");
+ rfa.setFile("filterBased-test2.log");
rfa.setAppend(false);
- swrp.setFileNamePattern("output/filterBased-test2.%i");
+ swrp.setFileNamePattern("filterBased-test2.%i");
swrp.activateOptions();
rfa.setRollingPolicy(swrp);
@@ -108,7 +108,7 @@
Logger.getRootLogger().addAppender(rfa);
Logger.getRootLogger().setLevel(Level.DEBUG);
- common("output/filterBased-test2");
+ common("filterBased-test2");
}
/**
Modified: logging/log4j/companions/rolling/trunk/src/test/java/org/apache/log4j/rolling/RenamingTest.java
URL: http://svn.apache.org/viewvc/logging/log4j/companions/rolling/trunk/src/test/java/org/apache/log4j/rolling/RenamingTest.java?view=diff&rev=544477&r1=544476&r2=544477
==============================================================================
--- logging/log4j/companions/rolling/trunk/src/test/java/org/apache/log4j/rolling/RenamingTest.java (original)
+++ logging/log4j/companions/rolling/trunk/src/test/java/org/apache/log4j/rolling/RenamingTest.java Tue Jun 5 06:02:49 2007
@@ -69,8 +69,8 @@
SimpleDateFormat sdf = new SimpleDateFormat(datePattern);
TimeBasedRollingPolicy tbrp = new TimeBasedRollingPolicy();
- tbrp.setFileNamePattern("output/test-%d{" + datePattern + "}");
- rfa.setFile("output/test.log");
+ tbrp.setFileNamePattern("test-%d{" + datePattern + "}");
+ rfa.setFile("test.log");
tbrp.activateOptions();
rfa.setRollingPolicy(tbrp);
rfa.activateOptions();
@@ -82,7 +82,7 @@
Thread.sleep(5000);
logger.debug("Hello " + 1);
- String rolledFile = "output/test-" + sdf.format(cal.getTime());
+ String rolledFile = "test-" + sdf.format(cal.getTime());
//
// if the rolled file exists
@@ -93,13 +93,13 @@
assertTrue(Compare.compare(RenamingTest.class,
rolledFile, "witness/rolling/renaming.0"));
assertTrue(Compare.compare(RenamingTest.class,
- "output/test.log", "witness/rolling/renaming.1"));
+ "test.log", "witness/rolling/renaming.1"));
} else {
//
// otherwise the rollover should have been blocked
//
assertTrue(Compare.compare(RenamingTest.class,
- "output/test.log", "witness/rolling/renaming.2"));
+ "test.log", "witness/rolling/renaming.2"));
}
}
}
Modified: logging/log4j/companions/rolling/trunk/src/test/java/org/apache/log4j/rolling/SizeBasedRollingTest.java
URL: http://svn.apache.org/viewvc/logging/log4j/companions/rolling/trunk/src/test/java/org/apache/log4j/rolling/SizeBasedRollingTest.java?view=diff&rev=544477&r1=544476&r2=544477
==============================================================================
--- logging/log4j/companions/rolling/trunk/src/test/java/org/apache/log4j/rolling/SizeBasedRollingTest.java (original)
+++ logging/log4j/companions/rolling/trunk/src/test/java/org/apache/log4j/rolling/SizeBasedRollingTest.java Tue Jun 5 06:02:49 2007
@@ -72,7 +72,7 @@
sbtp.setMaxFileSize(100);
swrp.setMinIndex(0);
- swrp.setFileNamePattern("output/sizeBased-test1.%i");
+ swrp.setFileNamePattern("sizeBased-test1.%i");
swrp.activateOptions();
rfa.setRollingPolicy(swrp);
@@ -89,18 +89,18 @@
}
}
- assertTrue(new File("output/sizeBased-test1.0").exists());
- assertTrue(new File("output/sizeBased-test1.1").exists());
- assertTrue(new File("output/sizeBased-test1.2").exists());
+ assertTrue(new File("sizeBased-test1.0").exists());
+ assertTrue(new File("sizeBased-test1.1").exists());
+ assertTrue(new File("sizeBased-test1.2").exists());
assertTrue(Compare.compare(SizeBasedRollingTest.class,
- "output/sizeBased-test1.0",
+ "sizeBased-test1.0",
"witness/rolling/sbr-test2.log"));
assertTrue(Compare.compare(SizeBasedRollingTest.class,
- "output/sizeBased-test1.1",
+ "sizeBased-test1.1",
"witness/rolling/sbr-test2.0"));
assertTrue(Compare.compare(SizeBasedRollingTest.class,
- "output/sizeBased-test1.2",
+ "sizeBased-test1.2",
"witness/rolling/sbr-test2.1"));
}
@@ -113,7 +113,7 @@
rfa.setName("ROLLING");
rfa.setAppend(false);
rfa.setLayout(layout);
- rfa.setFile("output/sizeBased-test2.log");
+ rfa.setFile("sizeBased-test2.log");
FixedWindowRollingPolicy swrp = new FixedWindowRollingPolicy();
SizeBasedTriggeringPolicy sbtp = new SizeBasedTriggeringPolicy();
@@ -121,7 +121,7 @@
sbtp.setMaxFileSize(100);
swrp.setMinIndex(0);
- swrp.setFileNamePattern("output/sizeBased-test2.%i");
+ swrp.setFileNamePattern("sizeBased-test2.%i");
swrp.activateOptions();
rfa.setRollingPolicy(swrp);
@@ -138,18 +138,18 @@
}
}
- assertTrue(new File("output/sizeBased-test2.log").exists());
- assertTrue(new File("output/sizeBased-test2.0").exists());
- assertTrue(new File("output/sizeBased-test2.1").exists());
+ assertTrue(new File("sizeBased-test2.log").exists());
+ assertTrue(new File("sizeBased-test2.0").exists());
+ assertTrue(new File("sizeBased-test2.1").exists());
assertTrue(Compare.compare(SizeBasedRollingTest.class,
- "output/sizeBased-test2.log",
+ "sizeBased-test2.log",
"witness/rolling/sbr-test2.log"));
assertTrue(Compare.compare(SizeBasedRollingTest.class,
- "output/sizeBased-test2.0",
+ "sizeBased-test2.0",
"witness/rolling/sbr-test2.0"));
assertTrue(Compare.compare(SizeBasedRollingTest.class,
- "output/sizeBased-test2.1",
+ "sizeBased-test2.1",
"witness/rolling/sbr-test2.1"));
}
@@ -167,8 +167,8 @@
sbtp.setMaxFileSize(100);
fwrp.setMinIndex(0);
- rfa.setFile("output/sbr-test3.log");
- fwrp.setFileNamePattern("output/sbr-test3.%i.gz");
+ rfa.setFile("sbr-test3.log");
+ fwrp.setFileNamePattern("sbr-test3.%i.gz");
fwrp.activateOptions();
rfa.setRollingPolicy(fwrp);
rfa.setTriggeringPolicy(sbtp);
@@ -185,16 +185,16 @@
}
}
- assertTrue(new File("output/sbr-test3.log").exists());
- assertTrue(new File("output/sbr-test3.0.gz").exists());
- assertTrue(new File("output/sbr-test3.1.gz").exists());
+ assertTrue(new File("sbr-test3.log").exists());
+ assertTrue(new File("sbr-test3.0.gz").exists());
+ assertTrue(new File("sbr-test3.1.gz").exists());
assertTrue(Compare.compare(SizeBasedRollingTest.class,
- "output/sbr-test3.log", "witness/rolling/sbr-test3.log"));
+ "sbr-test3.log", "witness/rolling/sbr-test3.log"));
assertTrue(Compare.gzCompare(SizeBasedRollingTest.class,
- "output/sbr-test3.0.gz", "witness/rolling/sbr-test3.0.gz"));
+ "sbr-test3.0.gz", "witness/rolling/sbr-test3.0.gz"));
assertTrue(Compare.gzCompare(SizeBasedRollingTest.class,
- "output/sbr-test3.1.gz", "witness/rolling/sbr-test3.1.gz"));
+ "sbr-test3.1.gz", "witness/rolling/sbr-test3.1.gz"));
}
/**
@@ -206,7 +206,7 @@
rfa.setName("ROLLING");
rfa.setAppend(false);
rfa.setLayout(layout);
- rfa.setFile("output/sizeBased-test4.log");
+ rfa.setFile("sizeBased-test4.log");
FixedWindowRollingPolicy swrp = new FixedWindowRollingPolicy();
SizeBasedTriggeringPolicy sbtp = new SizeBasedTriggeringPolicy();
@@ -217,7 +217,7 @@
//
// test4 directory should not exists. Should cause all rollover attempts to fail.
//
- swrp.setFileNamePattern("output/test4/sizeBased-test4.%i");
+ swrp.setFileNamePattern("test4/sizeBased-test4.%i");
swrp.activateOptions();
rfa.setRollingPolicy(swrp);
@@ -234,10 +234,10 @@
}
}
- assertTrue(new File("output/sizeBased-test4.log").exists());
+ assertTrue(new File("sizeBased-test4.log").exists());
assertTrue(Compare.compare(SizeBasedRollingTest.class,
- "output/sizeBased-test4.log",
+ "sizeBased-test4.log",
"witness/rolling/sbr-test4.log"));
}
@@ -251,7 +251,7 @@
rfa.setName("ROLLING");
rfa.setAppend(false);
rfa.setLayout(layout);
- rfa.setFile("output/sizeBased-test5.log");
+ rfa.setFile("sizeBased-test5.log");
FixedWindowRollingPolicy swrp = new FixedWindowRollingPolicy();
SizeBasedTriggeringPolicy sbtp = new SizeBasedTriggeringPolicy();
@@ -259,7 +259,7 @@
sbtp.setMaxFileSize(100);
swrp.setMinIndex(0);
- swrp.setFileNamePattern("output/sizeBased-test5.%i");
+ swrp.setFileNamePattern("sizeBased-test5.%i");
swrp.activateOptions();
rfa.setRollingPolicy(swrp);
@@ -269,11 +269,11 @@
//
// put stray file about locked file
- FileOutputStream os1 = new FileOutputStream("output/sizeBased-test5.1");
+ FileOutputStream os1 = new FileOutputStream("sizeBased-test5.1");
os1.close();
- FileOutputStream os0 = new FileOutputStream("output/sizeBased-test5.0");
+ FileOutputStream os0 = new FileOutputStream("sizeBased-test5.0");
// Write exactly 10 bytes with each log
for (int i = 0; i < 25; i++) {
@@ -286,25 +286,25 @@
os0.close();
- if (new File("output/sizeBased-test5.3").exists()) {
+ if (new File("sizeBased-test5.3").exists()) {
//
// looks like platform where open files can be renamed
//
- assertTrue(new File("output/sizeBased-test5.log").exists());
- assertTrue(new File("output/sizeBased-test5.0").exists());
- assertTrue(new File("output/sizeBased-test5.1").exists());
- assertTrue(new File("output/sizeBased-test5.2").exists());
- assertTrue(new File("output/sizeBased-test5.3").exists());
+ assertTrue(new File("sizeBased-test5.log").exists());
+ assertTrue(new File("sizeBased-test5.0").exists());
+ assertTrue(new File("sizeBased-test5.1").exists());
+ assertTrue(new File("sizeBased-test5.2").exists());
+ assertTrue(new File("sizeBased-test5.3").exists());
assertTrue(Compare.compare(
SizeBasedRollingTest.class,
- "output/sizeBased-test5.log",
+ "sizeBased-test5.log",
"witness/rolling/sbr-test2.log"));
assertTrue(Compare.compare(SizeBasedRollingTest.class,
- "output/sizeBased-test5.0",
+ "sizeBased-test5.0",
"witness/rolling/sbr-test2.0"));
assertTrue(Compare.compare(SizeBasedRollingTest.class,
- "output/sizeBased-test5.1",
+ "sizeBased-test5.1",
"witness/rolling/sbr-test2.1"));
} else {
@@ -313,12 +313,12 @@
// so initial log file should have all log content
// open file should be unaffected
// stray file should have only been moved one slot.
- assertTrue(new File("output/sizeBased-test5.log").exists());
- assertTrue(new File("output/sizeBased-test5.0").exists());
- assertTrue(new File("output/sizeBased-test5.2").exists());
+ assertTrue(new File("sizeBased-test5.log").exists());
+ assertTrue(new File("sizeBased-test5.0").exists());
+ assertTrue(new File("sizeBased-test5.2").exists());
assertTrue(Compare.compare(
- SizeBasedRollingTest.class,"output/sizeBased-test5.log",
+ SizeBasedRollingTest.class,"sizeBased-test5.log",
"witness/rolling/sbr-test4.log"));
}
}
@@ -341,9 +341,9 @@
sbtp.setMaxFileSize(100);
swrp.setMinIndex(0);
- swrp.setActiveFileName("output/sizeBased-test6.log");
+ swrp.setActiveFileName("sizeBased-test6.log");
- swrp.setFileNamePattern("output/sizeBased-test6.%i");
+ swrp.setFileNamePattern("sizeBased-test6.%i");
swrp.activateOptions();
rfa.setRollingPolicy(swrp);
@@ -360,18 +360,18 @@
}
}
- assertTrue(new File("output/sizeBased-test6.log").exists());
- assertTrue(new File("output/sizeBased-test6.0").exists());
- assertTrue(new File("output/sizeBased-test6.1").exists());
+ assertTrue(new File("sizeBased-test6.log").exists());
+ assertTrue(new File("sizeBased-test6.0").exists());
+ assertTrue(new File("sizeBased-test6.1").exists());
assertTrue(Compare.compare(SizeBasedRollingTest.class,
- "output/sizeBased-test6.log",
+ "sizeBased-test6.log",
"witness/rolling/sbr-test2.log"));
assertTrue(Compare.compare(SizeBasedRollingTest.class,
- "output/sizeBased-test6.0",
+ "sizeBased-test6.0",
"witness/rolling/sbr-test2.0"));
assertTrue(Compare.compare(SizeBasedRollingTest.class,
- "output/sizeBased-test6.1",
+ "sizeBased-test6.1",
"witness/rolling/sbr-test2.1"));
}
Modified: logging/log4j/companions/rolling/trunk/src/test/java/org/apache/log4j/rolling/TimeBasedRollingTest.java
URL: http://svn.apache.org/viewvc/logging/log4j/companions/rolling/trunk/src/test/java/org/apache/log4j/rolling/TimeBasedRollingTest.java?view=diff&rev=544477&r1=544476&r2=544477
==============================================================================
--- logging/log4j/companions/rolling/trunk/src/test/java/org/apache/log4j/rolling/TimeBasedRollingTest.java (original)
+++ logging/log4j/companions/rolling/trunk/src/test/java/org/apache/log4j/rolling/TimeBasedRollingTest.java Tue Jun 5 06:02:49 2007
@@ -105,7 +105,7 @@
String datePattern = "yyyy-MM-dd_HH_mm_ss";
TimeBasedRollingPolicy tbrp = new TimeBasedRollingPolicy();
- tbrp.setFileNamePattern("output/test1-%d{" + datePattern + "}");
+ tbrp.setFileNamePattern("test1-%d{" + datePattern + "}");
tbrp.activateOptions();
rfa.setRollingPolicy(tbrp);
rfa.activateOptions();
@@ -117,7 +117,7 @@
Calendar cal = Calendar.getInstance();
for (int i = 0; i < 4; i++) {
- filenames[i] = "output/test1-" + sdf.format(cal.getTime());
+ filenames[i] = "test1-" + sdf.format(cal.getTime());
cal.add(Calendar.SECOND, 1);
}
@@ -150,7 +150,7 @@
rfa1.setLayout(layout1);
TimeBasedRollingPolicy tbrp1 = new TimeBasedRollingPolicy();
- tbrp1.setFileNamePattern("output/test2-%d{" + datePattern + "}");
+ tbrp1.setFileNamePattern("test2-%d{" + datePattern + "}");
tbrp1.activateOptions();
rfa1.setRollingPolicy(tbrp1);
rfa1.activateOptions();
@@ -162,7 +162,7 @@
Calendar cal = Calendar.getInstance();
for (int i = 0; i < 4; i++) {
- filenames[i] = "output/test2-" + sdf.format(cal.getTime());
+ filenames[i] = "test2-" + sdf.format(cal.getTime());
cal.add(Calendar.SECOND, 1);
}
@@ -183,7 +183,7 @@
rfa2.setLayout(layout2);
TimeBasedRollingPolicy tbrp2 = new TimeBasedRollingPolicy();
- tbrp2.setFileNamePattern("output/test2-%d{" + datePattern + "}");
+ tbrp2.setFileNamePattern("test2-%d{" + datePattern + "}");
tbrp2.activateOptions();
rfa2.setRollingPolicy(tbrp2);
rfa2.activateOptions();
@@ -212,7 +212,7 @@
String datePattern = "yyyy-MM-dd_HH_mm_ss";
TimeBasedRollingPolicy tbrp = new TimeBasedRollingPolicy();
- tbrp.setFileNamePattern("output/test3-%d{" + datePattern + "}.gz");
+ tbrp.setFileNamePattern("test3-%d{" + datePattern + "}.gz");
tbrp.activateOptions();
rfa.setRollingPolicy(tbrp);
rfa.activateOptions();
@@ -224,11 +224,11 @@
Calendar cal = Calendar.getInstance();
for (int i = 0; i < 3; i++) {
- filenames[i] = "output/test3-" + sdf.format(cal.getTime()) + ".gz";
+ filenames[i] = "test3-" + sdf.format(cal.getTime()) + ".gz";
cal.add(Calendar.SECOND, 1);
}
- filenames[3] = "output/test3-" + sdf.format(cal.getTime());
+ filenames[3] = "test3-" + sdf.format(cal.getTime());
System.out.println("Waiting until next second and 100 millis.");
delayUntilNextSecond(100);
@@ -263,8 +263,8 @@
rfa1.setLayout(layout1);
TimeBasedRollingPolicy tbrp1 = new TimeBasedRollingPolicy();
- rfa1.setFile("output/test4.log");
- tbrp1.setFileNamePattern("output/test4-%d{" + datePattern + "}");
+ rfa1.setFile("test4.log");
+ tbrp1.setFileNamePattern("test4-%d{" + datePattern + "}");
tbrp1.activateOptions();
rfa1.setRollingPolicy(tbrp1);
rfa1.setAppend(false);
@@ -277,10 +277,10 @@
Calendar cal = Calendar.getInstance();
for (int i = 0; i < 3; i++) {
- filenames[i] = "output/test4-" + sdf.format(cal.getTime());
+ filenames[i] = "test4-" + sdf.format(cal.getTime());
cal.add(Calendar.SECOND, 1);
}
- filenames[3] = "output/test4.log";
+ filenames[3] = "test4.log";
System.out.println("Waiting until next second and 100 millis.");
delayUntilNextSecond(100);
@@ -299,8 +299,8 @@
rfa2.setLayout(layout2);
TimeBasedRollingPolicy tbrp2 = new TimeBasedRollingPolicy();
- tbrp2.setFileNamePattern("output/test4-%d{" + datePattern + "}");
- rfa2.setFile("output/test4.log");
+ tbrp2.setFileNamePattern("test4-%d{" + datePattern + "}");
+ rfa2.setFile("test4.log");
tbrp2.activateOptions();
rfa2.setRollingPolicy(tbrp2);
rfa2.activateOptions();
@@ -329,8 +329,8 @@
String datePattern = "yyyy-MM-dd_HH_mm_ss";
TimeBasedRollingPolicy tbrp = new TimeBasedRollingPolicy();
- tbrp.setFileNamePattern("output/test5-%d{" + datePattern + "}");
- rfa.setFile("output/test5.log");
+ tbrp.setFileNamePattern("test5-%d{" + datePattern + "}");
+ rfa.setFile("test5.log");
tbrp.activateOptions();
rfa.setRollingPolicy(tbrp);
rfa.setAppend(false);
@@ -343,11 +343,11 @@
Calendar cal = Calendar.getInstance();
for (int i = 0; i < 3; i++) {
- filenames[i] = "output/test5-" + sdf.format(cal.getTime());
+ filenames[i] = "test5-" + sdf.format(cal.getTime());
cal.add(Calendar.SECOND, 1);
}
- filenames[3] = "output/test5.log";
+ filenames[3] = "test5.log";
System.out.println("Waiting until next second and 100 millis.");
delayUntilNextSecond(100);
@@ -374,8 +374,8 @@
String datePattern = "yyyy-MM-dd_HH_mm_ss";
TimeBasedRollingPolicy tbrp = new TimeBasedRollingPolicy();
- tbrp.setFileNamePattern("output/test6-%d{" + datePattern + "}.gz");
- rfa.setFile("output/test6.log");
+ tbrp.setFileNamePattern("test6-%d{" + datePattern + "}.gz");
+ rfa.setFile("test6.log");
tbrp.activateOptions();
rfa.setRollingPolicy(tbrp);
rfa.setAppend(false);
@@ -388,11 +388,11 @@
Calendar cal = Calendar.getInstance();
for (int i = 0; i < 3; i++) {
- filenames[i] = "output/test6-" + sdf.format(cal.getTime()) + ".gz";
+ filenames[i] = "test6-" + sdf.format(cal.getTime()) + ".gz";
cal.add(Calendar.SECOND, 1);
}
- filenames[3] = "output/test6.log";
+ filenames[3] = "test6.log";
System.out.println("Waiting until next second and 100 millis.");
delayUntilNextSecond(100);
@@ -427,7 +427,7 @@
Calendar cal = Calendar.getInstance();
for (int i = 0; i < 4; i++) {
- filenames[i] = "output/test1-" + sdf.format(cal.getTime());
+ filenames[i] = "test1-" + sdf.format(cal.getTime());
cal.add(Calendar.SECOND, 1);
}
@@ -460,7 +460,7 @@
Calendar cal = Calendar.getInstance();
- filenames[0] = "output/test1-" + sdf.format(cal.getTime());
+ filenames[0] = "test1-" + sdf.format(cal.getTime());
for (int i = 0; i < 5; i++) {
logger.debug("Hello---" + i);
Modified: logging/log4j/companions/rolling/trunk/src/test/resources/org/apache/log4j/rolling/filter1.xml
URL: http://svn.apache.org/viewvc/logging/log4j/companions/rolling/trunk/src/test/resources/org/apache/log4j/rolling/filter1.xml?view=diff&rev=544477&r1=544476&r2=544477
==============================================================================
--- logging/log4j/companions/rolling/trunk/src/test/resources/org/apache/log4j/rolling/filter1.xml (original)
+++ logging/log4j/companions/rolling/trunk/src/test/resources/org/apache/log4j/rolling/filter1.xml Tue Jun 5 06:02:49 2007
@@ -6,8 +6,8 @@
<appender name="ROLLING" class="org.apache.log4j.rolling.RollingFileAppender">
<param name="append" value="false"/>
<rollingPolicy class="org.apache.log4j.rolling.FixedWindowRollingPolicy">
- <param name="activeFileName" value="output/filterBased-test1.log"/>
- <param name="fileNamePattern" value="output/filterBased-test1.%i"/>
+ <param name="activeFileName" value="filterBased-test1.log"/>
+ <param name="fileNamePattern" value="filterBased-test1.%i"/>
<param name="minIndex" value="0"/>
</rollingPolicy>
<triggeringPolicy class="org.apache.log4j.rolling.FilterBasedTriggeringPolicy">
Modified: logging/log4j/companions/rolling/trunk/src/test/resources/org/apache/log4j/rolling/time1.xml
URL: http://svn.apache.org/viewvc/logging/log4j/companions/rolling/trunk/src/test/resources/org/apache/log4j/rolling/time1.xml?view=diff&rev=544477&r1=544476&r2=544477
==============================================================================
--- logging/log4j/companions/rolling/trunk/src/test/resources/org/apache/log4j/rolling/time1.xml (original)
+++ logging/log4j/companions/rolling/trunk/src/test/resources/org/apache/log4j/rolling/time1.xml Tue Jun 5 06:02:49 2007
@@ -5,7 +5,7 @@
<appender name="ROLL" class="org.apache.log4j.rolling.RollingFileAppender">
<rollingPolicy class="org.apache.log4j.rolling.TimeBasedRollingPolicy">
- <param name="fileNamePattern" value="output/test1-%d{yyyy-MM-dd_HH_mm_ss}"/>
+ <param name="fileNamePattern" value="test1-%d{yyyy-MM-dd_HH_mm_ss}"/>
</rollingPolicy>
<layout class="org.apache.log4j.PatternLayout">
---------------------------------------------------------------------
To unsubscribe, e-mail: log4j-dev-unsubscribe@logging.apache.org
For additional commands, e-mail: log4j-dev-help@logging.apache.org