[logback-dev] [GIT] Logback: the generic, reliable, fast and flexible logging framework. branch, master, updated. v_0.9.27-1-g4a792d8
added by portage for gitosis-gentoo
git-noreply at pixie.qos.ch
Mon Dec 27 17:17:24 CET 2010
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Logback: the generic, reliable, fast and flexible logging framework.".
The branch, master has been updated
via 4a792d8efd47548dedbf838ef5d32531e9a928c8 (commit)
from c6c098ff63d8af47d10da2bb5a90f6aaea011c59 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://git.qos.ch/gitweb/?p=logback.git;a=commit;h=4a792d8efd47548dedbf838ef5d32531e9a928c8
http://github.com/ceki/logback/commit/4a792d8efd47548dedbf838ef5d32531e9a928c8
commit 4a792d8efd47548dedbf838ef5d32531e9a928c8
Author: Ceki Gulcu <ceki at qos.ch>
Date: Mon Dec 27 17:17:35 2010 +0100
moving various tests to scala
diff --git a/logback-access/pom.xml b/logback-access/pom.xml
index 11bb3db..dcfeb31 100644
--- a/logback-access/pom.xml
+++ b/logback-access/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-parent</artifactId>
- <version>0.9.27</version>
+ <version>0.9.28-SNAPSHOT</version>
</parent>
<artifactId>logback-access</artifactId>
diff --git a/logback-classic/pom.xml b/logback-classic/pom.xml
index 7eea5e8..ed392a5 100644
--- a/logback-classic/pom.xml
+++ b/logback-classic/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-parent</artifactId>
- <version>0.9.27</version>
+ <version>0.9.28-SNAPSHOT</version>
</parent>
<artifactId>logback-classic</artifactId>
diff --git a/logback-classic/src/test/java/ch/qos/logback/classic/turbo/ReconfigureOnChangeTest.java b/logback-classic/src/test/java/ch/qos/logback/classic/turbo/ReconfigureOnChangeTest.java
index 546a653..f080e50 100644
--- a/logback-classic/src/test/java/ch/qos/logback/classic/turbo/ReconfigureOnChangeTest.java
+++ b/logback-classic/src/test/java/ch/qos/logback/classic/turbo/ReconfigureOnChangeTest.java
@@ -179,7 +179,7 @@ public class ReconfigureOnChangeTest {
// we can't have the test succeed under JDK 1.5, punt and require 1.6+
if (Env.isJDK6OrHigher()) {
assertTrue(failMsg,
- (effectiveResets * 1.4) >= (expectedReconfigurations * 1.0));
+ (effectiveResets * 1.5) >= (expectedReconfigurations * 1.0));
}
}
diff --git a/logback-core/pom.xml b/logback-core/pom.xml
index ec015b0..4c2f517 100644
--- a/logback-core/pom.xml
+++ b/logback-core/pom.xml
@@ -1,167 +1,193 @@
<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>
-
- <parent>
- <groupId>ch.qos.logback</groupId>
- <artifactId>logback-parent</artifactId>
- <version>0.9.27</version>
- </parent>
-
- <artifactId>logback-core</artifactId>
- <packaging>jar</packaging>
- <name>Logback Core Module</name>
-
- <url>http://logback.qos.ch</url>
- <description>
- <!--
- Never _never_ let Eclipse's auto format function add
- a line return in the description.
- The generated jar will contain a corrupt MANIFEST file.
- -->
- Logback: the generic, reliable, fast and flexible logging library for Java.
- </description>
-
- <licenses>
- <license>
- <name>Eclipse Public License - v 1.0</name>
- <url>http://www.eclipse.org/legal/epl-v10.html</url>
- </license>
-
- <license>
- <name>GNU Lesser General Public License</name>
- <url>http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html</url>
- </license>
- </licenses>
-
- <dependencies>
- <dependency>
- <groupId>janino</groupId>
- <artifactId>janino</artifactId>
- <scope>compile</scope>
- <optional>true</optional>
- </dependency>
-
- <dependency>
- <groupId>org.codehaus.groovy</groupId>
- <artifactId>groovy-all</artifactId>
- <scope>compile</scope>
- <optional>true</optional>
- </dependency>
-
-
- <dependency>
- <groupId>javax.mail</groupId>
- <artifactId>mail</artifactId>
- <scope>compile</scope>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jms_1.1_spec</artifactId>
- <scope>compile</scope>
- <optional>true</optional>
- </dependency>
-
- <dependency>
- <groupId>org.easymock</groupId>
- <artifactId>easymock</artifactId>
- <version>2.4</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <scope>compile</scope>
- <optional>true</optional>
- </dependency>
- </dependencies>
-
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <forkMode>once</forkMode>
- <reportFormat>plain</reportFormat>
- <trimStackTrace>false</trimStackTrace>
- <excludes>
- <exclude>**/All*Test.java</exclude>
- <exclude>**/PackageTest.java</exclude>
- </excludes>
- </configuration>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <configuration>
- <archive>
- <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
- </archive>
- </configuration>
- <executions>
- <execution>
- <id>bundle-test-jar</id>
- <phase>package</phase>
- <goals>
- <goal>jar</goal>
- <goal>test-jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
-
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <extensions>true</extensions>
- <executions>
- <execution>
- <id>bundle-manifest</id>
- <phase>process-classes</phase>
- <goals>
- <goal>manifest</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <instructions>
- <Export-Package>ch.qos.logback.core.*</Export-Package>
- <Import-Package>
- javax.*;resolution:=optional,
- org.xml.*;resolution:=optional,
- org.codehaus.janino;resolution:=optional,
- *
- </Import-Package>
- <Bundle-RequiredExecutionEnvironment>J2SE-1.5</Bundle-RequiredExecutionEnvironment>
- </instructions>
- </configuration>
- </plugin>
- </plugins>
- </build>
+ 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>
+
+ <parent>
+ <groupId>ch.qos.logback</groupId>
+ <artifactId>logback-parent</artifactId>
+ <version>0.9.28-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>logback-core</artifactId>
+ <packaging>jar</packaging>
+ <name>Logback Core Module</name>
+
+ <url>http://logback.qos.ch</url>
+ <description>
+ <!--
+ Never _never_ let Eclipse's auto format function add
+ a line return in the description.
+ The generated jar will contain a corrupt MANIFEST file.
+ -->
+ Logback: the generic, reliable, fast and flexible logging library for Java.
+ </description>
+
+ <licenses>
+ <license>
+ <name>Eclipse Public License - v 1.0</name>
+ <url>http://www.eclipse.org/legal/epl-v10.html</url>
+ </license>
+
+ <license>
+ <name>GNU Lesser General Public License</name>
+ <url>http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html</url>
+ </license>
+ </licenses>
+
+ <dependencies>
+ <dependency>
+ <groupId>janino</groupId>
+ <artifactId>janino</artifactId>
+ <scope>compile</scope>
+ <optional>true</optional>
+ </dependency>
+
+ <dependency>
+ <groupId>org.codehaus.groovy</groupId>
+ <artifactId>groovy-all</artifactId>
+ <scope>compile</scope>
+ <optional>true</optional>
+ </dependency>
+
+
+ <dependency>
+ <groupId>javax.mail</groupId>
+ <artifactId>mail</artifactId>
+ <scope>compile</scope>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jms_1.1_spec</artifactId>
+ <scope>compile</scope>
+ <optional>true</optional>
+ </dependency>
+
+ <dependency>
+ <groupId>org.easymock</groupId>
+ <artifactId>easymock</artifactId>
+ <version>2.4</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <scope>compile</scope>
+ <optional>true</optional>
+ </dependency>
+
+ <dependency>
+ <groupId>org.scala-lang</groupId>
+ <artifactId>scala-library</artifactId>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.5</source>
+ <target>1.5</target>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.5</source>
+ <target>1.5</target>
+ </configuration>
+ </plugin>
+
+
+ <plugin>
+ <groupId>org.scala-tools</groupId>
+ <artifactId>maven-scala-plugin</artifactId>
+ <version>2.14.3</version>
+ <configuration>
+ <testSourceDir>src/test/scala</testSourceDir>
+ </configuration>
+ <executions>
+ <execution>
+ <id>scala-test-compile</id>
+ <phase>process-test-resources</phase>
+ <goals>
+ <goal>testCompile</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <forkMode>once</forkMode>
+ <reportFormat>plain</reportFormat>
+ <trimStackTrace>false</trimStackTrace>
+ <excludes>
+ <exclude>**/All*Test.java</exclude>
+ <exclude>**/PackageTest.java</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <configuration>
+ <archive>
+ <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
+ </archive>
+ </configuration>
+ <executions>
+ <execution>
+ <id>bundle-test-jar</id>
+ <phase>package</phase>
+ <goals>
+ <goal>jar</goal>
+ <goal>test-jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <extensions>true</extensions>
+ <executions>
+ <execution>
+ <id>bundle-manifest</id>
+ <phase>process-classes</phase>
+ <goals>
+ <goal>manifest</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <instructions>
+ <Export-Package>ch.qos.logback.core.*</Export-Package>
+ <Import-Package>
+ javax.*;resolution:=optional,
+ org.xml.*;resolution:=optional,
+ org.codehaus.janino;resolution:=optional,
+ *
+ </Import-Package>
+ <Bundle-RequiredExecutionEnvironment>J2SE-1.5</Bundle-RequiredExecutionEnvironment>
+ </instructions>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</project>
\ No newline at end of file
diff --git a/logback-core/src/test/scala/ch/qos/logback/core/rolling/A.scala b/logback-core/src/test/scala/ch/qos/logback/core/rolling/A.scala
new file mode 100644
index 0000000..b446737
--- /dev/null
+++ b/logback-core/src/test/scala/ch/qos/logback/core/rolling/A.scala
@@ -0,0 +1,41 @@
+package ch.qos.logback.core.rolling
+
+import collection.mutable.ListBuffer
+import org.junit.Test
+
+/**
+ * Created by IntelliJ IDEA.
+ * User: ceki
+ * Date: 27.12.10
+ * Time: 14:19
+ * To change this template use File | Settings | File Templates.
+ */
+
+class A {
+
+
+ val initial = List(1,2, 3, 5)
+ def mon[B](f: Int => B): List[B] = {
+ val b = new ListBuffer[B]
+ var these = initial
+ while (!these.isEmpty) {
+ var that = f(these.head)
+ b += that
+ these = these.tail
+ }
+ b.toList
+ }
+
+ def asString(in: Any):String = {
+ "-"+ in.toString;
+ }
+
+ @Test
+ def doTest() {
+ val res: List[String] = mon(asString);
+ println(res)
+
+
+ }
+
+}
\ No newline at end of file
diff --git a/logback-core/src/test/scala/ch/qos/logback/core/rolling/RollingScaffolding.scala b/logback-core/src/test/scala/ch/qos/logback/core/rolling/RollingScaffolding.scala
new file mode 100644
index 0000000..ed78e3e
--- /dev/null
+++ b/logback-core/src/test/scala/ch/qos/logback/core/rolling/RollingScaffolding.scala
@@ -0,0 +1,85 @@
+/**
+ * Logback: the reliable, generic, fast and flexible logging framework.
+ * Copyright (C) 1999-2010, QOS.ch. All rights reserved.
+ *
+ * This program and the accompanying materials are dual-licensed under
+ * either the terms of the Eclipse Public License v1.0 as published by
+ * the Eclipse Foundation
+ *
+ * or (per the licensee's choosing)
+ *
+ * under the terms of the GNU Lesser General Public License version 2.1
+ * as published by the Free Software Foundation.
+ */
+package ch.qos.logback.core.rolling
+
+import ch.qos.logback.core.{ContextBase, Context}
+import ch.qos.logback.core.util.CoreTestConstants
+import ch.qos.logback.core.testUtil.RandomUtil
+import java.util.{Date, Calendar}
+import java.util.concurrent.TimeUnit
+import java.text.SimpleDateFormat
+
+trait RollingScaffolding {
+ final val DATE_PATTERN_WITH_SECONDS = "yyyy-MM-dd_HH_mm_ss"
+ final val SDF = new SimpleDateFormat(DATE_PATTERN_WITH_SECONDS)
+ private[rolling] var context: Context = new ContextBase
+ private[rolling] var diff: Int = RandomUtil.getPositiveInt
+ protected var currentTime: Long = 0L
+ protected var randomOutputDir: String = CoreTestConstants.OUTPUT_DIR_PREFIX + diff + "/"
+ private[rolling] var cal: Calendar = Calendar.getInstance
+ protected var nextRolloverThreshold: Long = 0;
+ protected var expectedFilenameList: List[String] = Nil
+
+ def setUpScaffolding: Unit = {
+ context.setName("test")
+ cal.set(Calendar.MILLISECOND, 333)
+ currentTime = cal.getTimeInMillis
+ nextRolloverThreshold = recomputeRolloverThreshold(currentTime)
+ }
+
+ protected def incCurrentTime(increment: Long): Unit = {
+ currentTime += increment
+ }
+
+ protected def getDateOfCurrentPeriodsStart: Date = {
+ var delta: Long = currentTime % 1000
+ return new Date(currentTime - delta)
+ }
+
+ protected def addExpectedFileName_ByDate(outputDir: String, testId: String, date: Date, gzExtension: Boolean): Unit = {
+ var fn: String = outputDir + testId + "-" + SDF.format(date)
+ if (gzExtension) {
+ fn += ".gz"
+ }
+ expectedFilenameList += fn
+
+ }
+
+ protected def addExpectedFileNamedIfItsTime_ByDate(outputDir: String, testId: String, gzExtension: Boolean): Unit = {
+ if (passThresholdTime(nextRolloverThreshold)) {
+ addExpectedFileName_ByDate(outputDir, testId, getDateOfCurrentPeriodsStart, gzExtension)
+ nextRolloverThreshold = recomputeRolloverThreshold(currentTime)
+ }
+ }
+
+ protected def passThresholdTime(nextRolloverThreshold: Long): Boolean = {
+ return currentTime >= nextRolloverThreshold
+ }
+
+ protected def recomputeRolloverThreshold(ct: Long): Long = {
+ var delta: Long = ct % 1000
+ (ct - delta) + 1000
+ }
+
+ private[rolling] def addGZIfNotLast(i: Int, suff: String): String = {
+ var lastIndex: Int = expectedFilenameList.size - 1
+ if (i != lastIndex) suff else ""
+ }
+
+ private[rolling] def waitForCompression(tbrp: TimeBasedRollingPolicy[AnyRef]): Unit = {
+ if (tbrp.future != null && !tbrp.future.isDone) {
+ tbrp.future.get(200, TimeUnit.MILLISECONDS)
+ }
+ }
+ }
\ No newline at end of file
diff --git a/logback-core/src/test/scala/ch/qos/logback/core/rolling/TimeBasedRolling2Test.scala b/logback-core/src/test/scala/ch/qos/logback/core/rolling/TimeBasedRolling2Test.scala
new file mode 100644
index 0000000..06bd4af
--- /dev/null
+++ b/logback-core/src/test/scala/ch/qos/logback/core/rolling/TimeBasedRolling2Test.scala
@@ -0,0 +1,104 @@
+/**
+ * Logback: the reliable, generic, fast and flexible logging framework.
+ * Copyright (C) 1999-2010, QOS.ch. All rights reserved.
+ *
+ * This program and the accompanying materials are dual-licensed under
+ * either the terms of the Eclipse Public License v1.0 as published by
+ * the Eclipse Foundation
+ *
+ * or (per the licensee's choosing)
+ *
+ * under the terms of the GNU Lesser General Public License version 2.1
+ * as published by the Free Software Foundation.
+ */
+package ch.qos.logback.core.rolling
+
+import org.junit.Assert.assertTrue
+import org.junit.Before
+import org.junit.Test
+import ch.qos.logback.core.util.Compare
+import ch.qos.logback.core.util.CoreTestConstants
+import ch.qos.logback.core.encoder.EchoEncoder
+
+class TimeBasedRolling2Test extends RollingScaffolding {
+
+ private[rolling] var rfa1: RollingFileAppender[AnyRef] = new RollingFileAppender[AnyRef]
+ private[rolling] var tbrp1: TimeBasedRollingPolicy[AnyRef] = new TimeBasedRollingPolicy[AnyRef]
+ private[rolling] var encoder: EchoEncoder[AnyRef] = new EchoEncoder[AnyRef]
+
+ @Before
+ def setUp: Unit = {
+ setUpScaffolding
+ }
+
+ private[rolling] def initRFA(rfa: RollingFileAppender[AnyRef], filename: String): Unit = {
+ rfa.setContext(context)
+ rfa.setEncoder(encoder)
+ if (filename != null) {
+ rfa.setFile(filename)
+ }
+ }
+
+ private[rolling] def initTRBP(rfa: RollingFileAppender[AnyRef], tbrp: TimeBasedRollingPolicy[AnyRef], filenamePattern: String, givenTime: Long): Unit = {
+ tbrp.setContext(context)
+ tbrp.setFileNamePattern(filenamePattern)
+ tbrp.setParent(rfa)
+ tbrp.timeBasedFileNamingAndTriggeringPolicy = new DefaultTimeBasedFileNamingAndTriggeringPolicy[AnyRef]
+ tbrp.timeBasedFileNamingAndTriggeringPolicy.setCurrentTime(givenTime)
+ rfa.setRollingPolicy(tbrp)
+ tbrp.start
+ rfa.start
+ }
+
+ def genericTest(testId: String, compressionSuffix: String): Unit = {
+ val withCompression = compressionSuffix.length > 0
+ initRFA(rfa1, null);
+ println(randomOutputDir + testId + "-%d{"
+ + DATE_PATTERN_WITH_SECONDS + "}" + compressionSuffix )
+
+ initTRBP(rfa1, tbrp1, randomOutputDir + testId + "-%d{"
+ + DATE_PATTERN_WITH_SECONDS + "}" + compressionSuffix, currentTime);
+
+ // compute the current filename
+ addExpectedFileName_ByDate(randomOutputDir, testId, getDateOfCurrentPeriodsStart, withCompression);
+
+ incCurrentTime(1100);
+ tbrp1.timeBasedFileNamingAndTriggeringPolicy.setCurrentTime(currentTime);
+
+ for (i <- 0 until 3) {
+ rfa1.doAppend("Hello---" + i);
+ addExpectedFileNamedIfItsTime_ByDate(randomOutputDir, testId, withCompression && (i !=2))
+ incCurrentTime(500);
+ tbrp1.timeBasedFileNamingAndTriggeringPolicy.setCurrentTime(currentTime)
+ if(withCompression)
+ waitForCompression(tbrp1)
+ }
+
+ var i = 0;
+ for (fn <- expectedFilenameList) {
+ val suffix: String = if(withCompression) addGZIfNotLast(i, compressionSuffix) else ""
+ val witnessFileName: String = CoreTestConstants.TEST_DIR_PREFIX + "witness/rolling/tbr-" + testId + "." + i.toString + suffix
+ assertTrue(Compare.compare(fn, witnessFileName));
+ i += 1
+ }
+
+ }
+
+ /**
+ * Test rolling without compression, file option left blank, no stop/start
+ */
+ @Test
+ def noCompression_FileBlank_NoRestart_1 = {
+ genericTest("test1", "")
+ }
+
+ /**
+ * With compression, file option left blank, no stop/restart
+ */
+ @Test
+ def withCompression_FileBlank_NoRestart_2 = {
+ genericTest("test2", ".gz");
+ }
+
+
+}
\ No newline at end of file
diff --git a/logback-examples/pom.xml b/logback-examples/pom.xml
index 2428f24..48b65ba 100644
--- a/logback-examples/pom.xml
+++ b/logback-examples/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-parent</artifactId>
- <version>0.9.27</version>
+ <version>0.9.28-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/logback-site/pom.xml b/logback-site/pom.xml
index 2c2b192..a1707da 100644
--- a/logback-site/pom.xml
+++ b/logback-site/pom.xml
@@ -3,7 +3,7 @@
<parent>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-parent</artifactId>
- <version>0.9.27</version>
+ <version>0.9.28-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/logback-site/src/site/pages/documentation.html b/logback-site/src/site/pages/documentation.html
index bdfcf72..5c07e09 100644
--- a/logback-site/src/site/pages/documentation.html
+++ b/logback-site/src/site/pages/documentation.html
@@ -90,12 +90,8 @@
</li>
<li><a
- href="http://www.devoxx.com:5080/player/main.html#state=state_player&id=357&slide=1">SLF4J
- and Logback projects</a>, by C. Gülcü and S. Pennec
- (Jazoon presentation with audio). If the previous link does not
- work, please try the <a
- href="http://beta.parleys.com/share/parleysshare2.swf?pageId=357">back
- up</a>.
+ href="http://beta.parleys.com/#id=1701&st=5&sl=1"><b>Devoxx-2009
+ video presentation</b></a>, by C. Gülcü
</li>
<li><a
diff --git a/logback-site/src/site/pages/news.html b/logback-site/src/site/pages/news.html
index 4144b5d..178c2d8 100644
--- a/logback-site/src/site/pages/news.html
+++ b/logback-site/src/site/pages/news.html
@@ -28,6 +28,10 @@
<hr width="80%" align="center" />
+ <h3>January xx, 2011 - Release of version 0.9.28</h3>
+
+ <hr width="80%" align="center" />
+
<h3>December 22nd, 2010 - Release of version 0.9.27</h3>
<p>Added a new section in the documentation about <a
diff --git a/pom.xml b/pom.xml
index b91736b..992972d 100755
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
<groupId>ch.qos.logback</groupId>
<artifactId>logback-parent</artifactId>
- <version>0.9.27</version>
+ <version>0.9.28-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Logback-Parent</name>
@@ -34,7 +34,7 @@
<slf4j.version>1.6.1</slf4j.version>
<junit.version>4.7</junit.version>
<janino.version>2.5.10</janino.version>
-
+ <scala.version>2.7.7</scala.version>
<consolePlugin.version>1.1.0</consolePlugin.version>
</properties>
@@ -154,10 +154,17 @@
<version>1.0</version>
</dependency>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>2.5</version>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.5</version>
</dependency>
+
+ <dependency>
+ <groupId>org.scala-lang</groupId>
+ <artifactId>scala-library</artifactId>
+ <version>${scala.version}</version>
+ </dependency>
+
</dependencies>
</dependencyManagement>
@@ -225,6 +232,7 @@
<outputDirectory>target/site/dist/</outputDirectory>
</configuration>
</plugin>
+
</plugins>
</build>
diff --git a/src/main/header.txt b/src/main/header.txt
index 56d0e7b..cf0e315 100644
--- a/src/main/header.txt
+++ b/src/main/header.txt
@@ -1,6 +1,6 @@
Logback: the generic, reliable, fast and flexible logging framework.
-Copyright (C) 1999-2009, QOS.ch. All rights reserved.
+Copyright (C) 1999-2010, QOS.ch. All rights reserved.
This program and the accompanying materials are dual-licensed under
either the terms of the Eclipse Public License v1.0 as published by
-----------------------------------------------------------------------
Summary of changes:
logback-access/pom.xml | 2 +-
logback-classic/pom.xml | 2 +-
.../classic/turbo/ReconfigureOnChangeTest.java | 2 +-
logback-core/pom.xml | 354 +++++++++++---------
.../test/scala/ch/qos/logback/core/rolling/A.scala | 41 +++
.../logback/core/rolling/RollingScaffolding.scala | 85 +++++
.../core/rolling/TimeBasedRolling2Test.scala | 104 ++++++
logback-examples/pom.xml | 2 +-
logback-site/pom.xml | 2 +-
logback-site/src/site/pages/documentation.html | 8 +-
logback-site/src/site/pages/news.html | 4 +
pom.xml | 18 +-
src/main/header.txt | 2 +-
13 files changed, 445 insertions(+), 181 deletions(-)
create mode 100644 logback-core/src/test/scala/ch/qos/logback/core/rolling/A.scala
create mode 100644 logback-core/src/test/scala/ch/qos/logback/core/rolling/RollingScaffolding.scala
create mode 100644 logback-core/src/test/scala/ch/qos/logback/core/rolling/TimeBasedRolling2Test.scala
hooks/post-receive
--
Logback: the generic, reliable, fast and flexible logging framework.
More information about the logback-dev
mailing list