开源软件构建与测试

_service:tar_scm:logback.spec Changed

@@ -1,17 +1,12 @@
 Name: logback
-Version: 1.1.7
-Release: 7
+Version: 1.2.8
+Release: 2
 Summary: A Java logging library
-License: LGPLv2 or EPL
+License: LGPLv2 or EPL-1.0
 URL: http://logback.qos.ch/
 Source0: https://github.com/qos-ch/logback/archive/v_%{version}.tar.gz
 
-# servlet 3.1 support
-Patch0001: %{name}-1.1.7-servlet.patch
-# Remove deprecate methods,otherwise it will cause compilation to fail
-Patch0002: %{name}-1.1.7-jetty.patch
-Patch0003: %{name}-1.1.7-tomcat.patch
-Patch0004: CVE-2017-5929.patch
+Patch0001:	logback-1.2.8-jetty.patch
 
 BuildRequires: java-devel >= 1:1.6.0 maven-local mvn(javax.mail:mail)
 BuildRequires: mvn(javax.servlet:javax.servlet-api) mvn(junit:junit) mvn(log4j:log4j:1.2.17)
@@ -79,9 +74,8 @@
 %pom_remove_plugin -r :maven-dependency-plugin
 %pom_remove_plugin -r :cobertura-maven-plugin
 
-sed -i 's/\r//' LICENSE.txt README.txt
+sed -i 's/\r//' LICENSE.txt
 
-%pom_change_dep -r :servlet-api javax.servlet:javax.servlet-api:3.1.0
 sed -i 's#javax.servlet.*;version="2.5"#javax.servlet.*;version="3.1"#' %{name}-access/pom.xml
 
 rm -r %{name}-*/src/test/java/*
@@ -94,24 +88,13 @@
 %pom_xpath_remove "pom:project/pom:profiles" %{name}-classic
 
 %pom_xpath_remove "pom:project/pom:profiles/pom:profilepom:id = 'javadocjar'"
+%pom_xpath_remove "pom:executions/pom:execution/pom:goals/pom:goaltext() = 'generateTestStubs'" logback-classic
+%pom_xpath_remove "pom:executions/pom:execution/pom:goals/pom:goaltext() = 'compileTests'" logback-classic
 
 %pom_disable_module logback-site
 
 %pom_xpath_remove "pom:build/pom:extensions"
 
-%pom_remove_plugin :maven-compiler-plugin logback-classic
-%pom_add_plugin org.codehaus.gmavenplus:gmavenplus-plugin:1.5 logback-classic "
- <executions>
- <execution>
- <goals>
- <goal>generateStubs</goal>
- <goal>testGenerateStubs</goal>
- 
- </goals>
- </execution>
- </executions>"
-
 %mvn_package ":%{name}-access" access
 %mvn_package ":%{name}-examples" examples
 
@@ -127,7 +110,6 @@
 cp -r %{name}-examples/pom.xml %{name}-examples/src %{buildroot}%{_datadir}/%{name}/examples
 
 %files -f .mfiles
-%doc README.txt
 %license LICENSE.txt
 
 %files access -f .mfiles-access
@@ -140,6 +122,12 @@
 %files help -f .mfiles-javadoc
 
 %changelog
+* Mon Aug 8 2022 Chenyx <chenyixiong3@huawei.com> - 1.2.8-2
+- License compliance rectification
+
+* Mon Dec 27 2021 houyingchao <houyingchao@huawei.com> - 1.2.8-1
+- Upgrade to 1.2.8
+- Fix CVE-2021-42550
 * Sat Sep 19 2020 wangxiao <wangxiao65@huawei.com> - 1.1.7-7
 - fix CVE-2017-5929
 * Wed Mar 4 2020 dingyiming <dingyiming3@huawei.com> - 1.1.7-6

_service:tar_scm:CVE-2017-5929.patch Deleted

@@ -1,303 +0,0 @@
-From f46044b805bca91efe5fd6afe52257cd02f775f8 Mon Sep 17 00:00:00 2001
-From: Ceki Gulcu <ceki@qos.ch>
-Date: Tue, 7 Feb 2017 23:12:51 +0100
-Subject: PATCH harden serialization
-
----
- .../classic/net/SimpleSocketServer.java | 1 -
- .../LogbackClassicSerializationHelper.java | 28 ++++++++
- .../classic/LoggerSerializationTest.java | 10 ++-
- .../core/net/HardenedObjectInputStream.java | 48 +++++++++++++
- .../net/HardenedObjectInputStreamTest.java | 61 ++++++++++++++++
- .../ch/qos/logback/core/net/Innocent.java | 69 +++++++++++++++++++
- 6 files changed, 214 insertions(+), 3 deletions(-)
- create mode 100755 logback-classic/src/main/java/ch/qos/logback/classic/net/server/LogbackClassicSerializationHelper.java
- create mode 100755 logback-core/src/main/java/ch/qos/logback/core/net/HardenedObjectInputStream.java
- create mode 100755 logback-core/src/test/java/ch/qos/logback/core/net/HardenedObjectInputStreamTest.java
- create mode 100755 logback-core/src/test/java/ch/qos/logback/core/net/Innocent.java
-
-diff --git a/logback-classic/src/main/java/ch/qos/logback/classic/net/SimpleSocketServer.java b/logback-classic/src/main/java/ch/qos/logback/classic/net/SimpleSocketServer.java
-index 6d39a2473..3083f45ce 100755
---- a/logback-classic/src/main/java/ch/qos/logback/classic/net/SimpleSocketServer.java
-+++ b/logback-classic/src/main/java/ch/qos/logback/classic/net/SimpleSocketServer.java
-@@ -14,7 +14,6 @@
- package ch.qos.logback.classic.net;
- 
- import java.io.IOException;
--import java.lang.reflect.Constructor;
- import java.net.ServerSocket;
- import java.net.Socket;
- import java.util.ArrayList;
-diff --git a/logback-classic/src/main/java/ch/qos/logback/classic/net/server/LogbackClassicSerializationHelper.java b/logback-classic/src/main/java/ch/qos/logback/classic/net/server/LogbackClassicSerializationHelper.java
-new file mode 100755
-index 000000000..00a974f81
---- /dev/null
-+++ b/logback-classic/src/main/java/ch/qos/logback/classic/net/server/LogbackClassicSerializationHelper.java
-@@ -0,0 +1,28 @@
-+package ch.qos.logback.classic.net.server;
-+
-+import java.util.ArrayList;
-+import java.util.List;
-+
-+import org.slf4j.helpers.BasicMarker;
-+
-+import ch.qos.logback.classic.Logger;
-+import ch.qos.logback.classic.spi.LoggerContextVO;
-+import ch.qos.logback.classic.spi.LoggingEventVO;
-+import ch.qos.logback.classic.spi.ThrowableProxyVO;
-+
-+public class LogbackClassicSerializationHelper {
-+
-+ 
-+ 
-+ static public List<String> getWhilelist() {
-+ List<String> whitelist = new ArrayList<String>();
-+ whitelist.add(LoggingEventVO.class.getName());
-+ whitelist.add(LoggerContextVO.class.getName());
-+ whitelist.add(ThrowableProxyVO.class.getName());
-+ whitelist.add(StackTraceElement.class.getName());
-+ whitelist.add(BasicMarker.class.getName());
-+ whitelist.add(BasicMarker.class.getName());
-+ whitelist.add(Logger.class.getName());
-+ return whitelist;
-+ }
-+}
-diff --git a/logback-classic/src/test/java/ch/qos/logback/classic/LoggerSerializationTest.java b/logback-classic/src/test/java/ch/qos/logback/classic/LoggerSerializationTest.java
-index ec6cb01d7..618d1756e 100644
---- a/logback-classic/src/test/java/ch/qos/logback/classic/LoggerSerializationTest.java
-+++ b/logback-classic/src/test/java/ch/qos/logback/classic/LoggerSerializationTest.java
-@@ -14,7 +14,10 @@
- package ch.qos.logback.classic;
- 
- import java.io.*;
-+import java.util.List;
- 
-+import ch.qos.logback.classic.net.server.LogbackClassicSerializationHelper;
-+import ch.qos.logback.core.net.HardenedObjectInputStream;
- import ch.qos.logback.core.util.CoreTestConstants;
- import org.junit.After;
- import org.junit.Before;
-@@ -36,7 +39,8 @@
- ByteArrayOutputStream bos;
- ObjectOutputStream oos;
- ObjectInputStream inputStream;
--
-+ List<String> whitelist ;
-+ 
- @Before
- public void setUp() throws Exception {
- lc = new LoggerContext();
-@@ -45,6 +49,8 @@ public void setUp() throws Exception {
- // create the byte output stream
- bos = new ByteArrayOutputStream();
- oos = new ObjectOutputStream(bos);
-+ whitelist = LogbackClassicSerializationHelper.getWhilelist();
-+ whitelist.add(Foo.class.getName());
- }
- 
- @After
-@@ -110,7 +116,7 @@ public void deepTreeSerialization() throws IOException {
- private Foo writeAndRead(Foo foo) throws IOException, ClassNotFoundException {
- writeObject(oos, foo);
- ByteArrayInputStream bis = new ByteArrayInputStream(bos.toByteArray());
-- inputStream = new ObjectInputStream(bis);
-+ inputStream = new HardenedObjectInputStream(bis, whitelist);
- Foo fooBack = readFooObject(inputStream);
- inputStream.close();
- return fooBack;
-diff --git a/logback-core/src/main/java/ch/qos/logback/core/net/HardenedObjectInputStream.java b/logback-core/src/main/java/ch/qos/logback/core/net/HardenedObjectInputStream.java
-new file mode 100755
-index 000000000..439e2bde5
---- /dev/null
-+++ b/logback-core/src/main/java/ch/qos/logback/core/net/HardenedObjectInputStream.java
-@@ -0,0 +1,48 @@
-+package ch.qos.logback.core.net;
-+
-+import java.io.IOException;
-+import java.io.InputStream;
-+import java.io.InvalidClassException;
-+import java.io.ObjectInputStream;
-+import java.io.ObjectStreamClass;
-+import java.util.ArrayList;
-+import java.util.Collections;
-+import java.util.List;
-+
-+/**
-+ * 
-+ * @author Ceki G&uuml;lc&uuml;
-+ * @since 1.2.0
-+ */
-+public class HardenedObjectInputStream extends ObjectInputStream {
-+
-+ List<String> whitelistedClassNames;
-+ String javaPackages = new String {"java.lang", "java.util"};
-+ 
-+ public HardenedObjectInputStream(InputStream in, List<String> whilelist) throws IOException {
-+ super(in);
-+ this.whitelistedClassNames = Collections.synchronizedList(new ArrayList<String>(whilelist));
-+ }
-+
-+ @Override
-+ protected Class<?> resolveClass(ObjectStreamClass anObjectStreamClass) throws IOException, ClassNotFoundException {
-+ String incomingClassName = anObjectStreamClass.getName();
-+ if(!isWhitelisted(incomingClassName)) {
-+ throw new InvalidClassException("Unauthorized deserialization attempt", anObjectStreamClass.getName());
-+ }
-+ 
-+ return super.resolveClass(anObjectStreamClass);
-+ }
-+
-+ private boolean isWhitelisted(String incomingClassName) {
-+ for(int i = 0; i < javaPackages.length; i++) {
-+ if(incomingClassName.startsWith(javaPackagesi))
-+ return true;
-+ }
-+ for(String className: whitelistedClassNames) {
-+ if(incomingClassName.equals(className))
-+ return true;
-+ }
-+ return false;
-+ }
-+}
-diff --git a/logback-core/src/test/java/ch/qos/logback/core/net/HardenedObjectInputStreamTest.java b/logback-core/src/test/java/ch/qos/logback/core/net/HardenedObjectInputStreamTest.java
-new file mode 100755
-index 000000000..6a3489755
---- /dev/null
-+++ b/logback-core/src/test/java/ch/qos/logback/core/net/HardenedObjectInputStreamTest.java
-@@ -0,0 +1,61 @@
-+package ch.qos.logback.core.net;
-+
-+import static org.junit.Assert.*;
-+
-+import java.io.ByteArrayInputStream;
-+import java.io.ByteArrayOutputStream;
-+import java.io.IOException;
-+import java.io.ObjectOutputStream;
-+import java.util.ArrayList;
-+import java.util.List;
-+
-+import org.junit.After;
-+import org.junit.Before;
-+import org.junit.Test;
-+
-+public class HardenedObjectInputStreamTest {
-+
-+ ByteArrayOutputStream bos;
-+ ObjectOutputStream oos;
-+ HardenedObjectInputStream inputStream;
-+ List<String> whitelist = new ArrayList<String>();
-+ 
-+ @Before
-+ public void setUp() throws Exception {
-+ whitelist.add(Innocent.class.getName());
-+ bos = new ByteArrayOutputStream();
-+ oos = new ObjectOutputStream(bos);
-+ }
-+
-+ @After
-+ public void tearDown() throws Exception {
-+ }
-+
-+ @Test
-+ public void smoke() throws ClassNotFoundException, IOException {
-+ Innocent innocent = new Innocent();
-+ innocent.setAnInt(1);
-+ innocent.setAnInteger(2);
-+ innocent.setaString("smoke");
-+ Innocent back = writeAndRead(innocent);
-+ assertEquals(innocent, back);
-+ }
-+
-+
-+
-+ private Innocent writeAndRead(Innocent innocent) throws IOException, ClassNotFoundException {
-+ writeObject(oos, innocent);
-+ ByteArrayInputStream bis = new ByteArrayInputStream(bos.toByteArray());
-+ inputStream = new HardenedObjectInputStream(bis, whitelist);
-+ Innocent fooBack = (Innocent) inputStream.readObject();
-+ inputStream.close();
-+ return fooBack;
-+ }
-+ 
-+ private void writeObject(ObjectOutputStream oos, Object o) throws IOException {
-+ oos.writeObject(o);
-+ oos.flush();
-+ oos.close();
-+ }
-+ 
-+}
-diff --git a/logback-core/src/test/java/ch/qos/logback/core/net/Innocent.java b/logback-core/src/test/java/ch/qos/logback/core/net/Innocent.java
-new file mode 100755
-index 000000000..2cef5a08e
---- /dev/null
-+++ b/logback-core/src/test/java/ch/qos/logback/core/net/Innocent.java
-@@ -0,0 +1,69 @@
-+package ch.qos.logback.core.net;
-+
-+public class Innocent implements java.io.Serializable {
-+
-+ private static final long serialVersionUID = -1227008349289885025L;
-+
-+ int anInt;
-+ Integer anInteger;
-+ String aString;
-+
-+ public int getAnInt() {
-+ return anInt;
-+ }
-+
-+ public void setAnInt(int anInt) {
-+ this.anInt = anInt;
-+ }
-+
-+ public Integer getAnInteger() {
-+ return anInteger;
-+ }
-+
-+ public void setAnInteger(Integer anInteger) {
-+ this.anInteger = anInteger;
-+ }
-+
-+ public String getaString() {
-+ return aString;
-+ }
-+
-+ public void setaString(String aString) {
-+ this.aString = aString;
-+ }
-+
-+ @Override
-+ public int hashCode() {
-+ final int prime = 31;
-+ int result = 1;
-+ result = prime * result + ((aString == null) ? 0 : aString.hashCode());
-+ result = prime * result + anInt;
-+ result = prime * result + ((anInteger == null) ? 0 : anInteger.hashCode());
-+ return result;
-+ }
-+
-+ @Override
-+ public boolean equals(Object obj) {
-+ if (this == obj)
-+ return true;
-+ if (obj == null)
-+ return false;
-+ if (getClass() != obj.getClass())
-+ return false;
-+ Innocent other = (Innocent) obj;
-+ if (aString == null) {
-+ if (other.aString != null)
-+ return false;
-+ } else if (!aString.equals(other.aString))
-+ return false;
-+ if (anInt != other.anInt)
-+ return false;
-+ if (anInteger == null) {
-+ if (other.anInteger != null)
-+ return false;
-+ } else if (!anInteger.equals(other.anInteger))
-+ return false;
-+ return true;
-+ }
-+
-+}

_service:tar_scm:logback-1.1.7-jetty.patch Deleted

@@ -1,80 +0,0 @@
-diff -Nru logback-1.1.7/logback-access/pom.xml logback-1.1.7.jetty/logback-access/pom.xml
---- logback-1.1.7/logback-access/pom.xml	2016-03-29 22:09:38.000000000 +0200
-+++ logback-1.1.7.jetty/logback-access/pom.xml	2016-06-23 17:18:59.640249538 +0200
-@@ -46,6 +46,12 @@
- <optional>true</optional>
- </dependency>
- <dependency>
-+ <groupId>org.eclipse.jetty</groupId>
-+ <artifactId>jetty-util</artifactId>
-+ <scope>compile</scope>
-+ <optional>true</optional>
-+ </dependency>
-+ <dependency>
- <groupId>org.codehaus.janino</groupId>
- <artifactId>janino</artifactId>
- <scope>compile</scope>
-@@ -173,4 +179,4 @@
- </profile>
- </profiles>
- 
--</project>
-\ Manca newline alla fine del file
-+</project>
-diff -Nru logback-1.1.7/logback-access/src/main/java/ch/qos/logback/access/jetty/RequestLogImpl.java logback-1.1.7.jetty/logback-access/src/main/java/ch/qos/logback/access/jetty/RequestLogImpl.java
---- logback-1.1.7/logback-access/src/main/java/ch/qos/logback/access/jetty/RequestLogImpl.java	2016-02-25 22:15:50.000000000 +0100
-+++ logback-1.1.7.jetty/logback-access/src/main/java/ch/qos/logback/access/jetty/RequestLogImpl.java	2016-06-23 17:04:46.410310065 +0200
-@@ -210,11 +210,6 @@
- started = false;
- }
- 
-- @Override
-- public boolean isRunning() {
-- return started;
-- }
--
- public void setFileName(String fileName) {
- this.fileName = fileName;
- }
-@@ -228,26 +223,6 @@
- return started;
- }
- 
-- @Override
-- public boolean isStarting() {
-- return false;
-- }
--
-- @Override
-- public boolean isStopping() {
-- return false;
-- }
--
-- @Override
-- public boolean isStopped() {
-- return !started;
-- }
--
-- @Override
-- public boolean isFailed() {
-- return false;
-- }
--
- public boolean isQuiet() {
- return quiet;
- }
-@@ -311,13 +286,7 @@
- return fai.getFilterChainDecision(event);
- }
- 
-- @Override
-- public void addLifeCycleListener(Listener listener) {
-- // we'll implement this when asked
-- }
--
-- @Override
-- public void removeLifeCycleListener(Listener listener) {
-+ public void log(Request request, int status, long written) {
- // we'll implement this when asked
- }
-

_service:tar_scm:logback-1.1.7-servlet.patch Deleted

@@ -1,57 +0,0 @@
-diff -Nru logback-1.1.7/logback-access/src/main/java/ch/qos/logback/access/servlet/TeeServletInputStream.java logback-1.1.7.servlet/logback-access/src/main/java/ch/qos/logback/access/servlet/TeeServletInputStream.java
---- logback-1.1.7/logback-access/src/main/java/ch/qos/logback/access/servlet/TeeServletInputStream.java	2016-02-25 22:15:50.000000000 +0100
-+++ logback-1.1.7.servlet/logback-access/src/main/java/ch/qos/logback/access/servlet/TeeServletInputStream.java	2016-06-23 17:00:02.886622532 +0200
-@@ -18,6 +18,7 @@ import java.io.ByteArrayOutputStream;
- import java.io.IOException;
- import java.io.InputStream;
-
-+import javax.servlet.ReadListener;
- import javax.servlet.ServletInputStream;
- import javax.servlet.http.HttpServletRequest;
-
-@@ -71,4 +71,19 @@
-     byte getInputBuffer() {
-         return inputBuffer;
-     }
-+
-+    @Override
-+    public boolean isReady() {
-+        return false;
-+    }
-+
-+    @Override
-+    public boolean isFinished() {
-+        return false;
-+    }
-+
-+    @Override
-+    public void setReadListener(ReadListener listener) {
-+        throw new UnsupportedOperationException("Not implemented yet.");
-+    }
- }
-diff -Nru logback-1.1.7/logback-access/src/main/java/ch/qos/logback/access/servlet/TeeServletOutputStream.java logback-1.1.7.servlet/logback-access/src/main/java/ch/qos/logback/access/servlet/TeeServletOutputStream.java
---- logback-1.1.7/logback-access/src/main/java/ch/qos/logback/access/servlet/TeeServletOutputStream.java	2016-02-25 22:15:50.000000000 +0100
-+++ logback-1.1.7.servlet/logback-access/src/main/java/ch/qos/logback/access/servlet/TeeServletOutputStream.java	2016-06-23 16:56:24.056883117 +0200
-@@ -18,6 +18,7 @@ import java.io.IOException;
-
- import javax.servlet.ServletOutputStream;
- import javax.servlet.ServletResponse;
-+import javax.servlet.WriteListener;
-
- public class TeeServletOutputStream extends ServletOutputStream {
-
-@@ -82,4 +82,14 @@
-         underlyingStream.flush();
-         baosCopy.flush();
-     }
-+
-+    @Override
-+    public boolean isReady() {
-+        return false;
-+    }
-+
-+    @Override
-+    public void setWriteListener(WriteListener listener) {
-+        throw new UnsupportedOperationException("Not implemented yet.");
-+    }
- }

_service:tar_scm:logback-1.1.7-tomcat.patch Deleted

_service:tar_scm:logback-1.2.8-jetty.patch Added

@@ -0,0 +1,71 @@
+--- logback-1.2.8/logback-access/pom.xml	2021-12-14 12:55:51.000000000 +0100
++++ logback-1.2.8/logback-access/pom.xml	2021-12-16 15:35:11.255651389 +0100
+@@ -47,6 +47,12 @@
+ <optional>true</optional>
+ </dependency>
+ <dependency>
++ <groupId>org.eclipse.jetty</groupId>
++ <artifactId>jetty-util</artifactId>
++ <scope>compile</scope>
++ <optional>true</optional>
++ </dependency>
++ <dependency>
+ <groupId>org.codehaus.janino</groupId>
+ <artifactId>janino</artifactId>
+ <scope>compile</scope>
+--- logback-1.2.8/logback-access/src/main/java/ch/qos/logback/access/jetty/RequestLogImpl.java	2021-12-14 12:55:51.000000000 +0100
++++ logback-1.2.8/logback-access/src/main/java/ch/qos/logback/access/jetty/RequestLogImpl.java	2021-12-16 15:35:11.255651389 +0100
+@@ -209,11 +209,6 @@
+ started = false;
+ }
+ 
+- @Override
+- public boolean isRunning() {
+- return started;
+- }
+-
+ public void setFileName(String fileName) {
+ this.fileName = fileName;
+ }
+@@ -227,26 +222,6 @@
+ return started;
+ }
+ 
+- @Override
+- public boolean isStarting() {
+- return false;
+- }
+-
+- @Override
+- public boolean isStopping() {
+- return false;
+- }
+-
+- @Override
+- public boolean isStopped() {
+- return !started;
+- }
+-
+- @Override
+- public boolean isFailed() {
+- return false;
+- }
+-
+ public boolean isQuiet() {
+ return quiet;
+ }
+@@ -310,13 +285,7 @@
+ return fai.getFilterChainDecision(event);
+ }
+ 
+- @Override
+- public void addLifeCycleListener(Listener listener) {
+- // we'll implement this when asked
+- }
+-
+- @Override
+- public void removeLifeCycleListener(Listener listener) {
++ public void log(Request request, int status, long written) {
+ // we'll implement this when asked
+ }
+

_service Changed

_service:tar_scm:v_1.1.7.tar.gz/README.txt Deleted

_service:tar_scm:v_1.1.7.tar.gz/logback-access/src/main/java/ch/qos/logback/access/db Deleted

_service:tar_scm:v_1.1.7.tar.gz/logback-access/src/main/java/ch/qos/logback/access/db/DBAppender.java Deleted

@@ -1,140 +0,0 @@
-/**
- * Logback: the reliable, generic, fast and flexible logging framework.
- * Copyright (C) 1999-2015, 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.access.db;
-
-import java.lang.reflect.Method;
-import java.sql.Connection;
-import java.sql.PreparedStatement;
-import java.sql.SQLException;
-import java.util.Enumeration;
-
-import ch.qos.logback.access.spi.IAccessEvent;
-import ch.qos.logback.core.db.DBAppenderBase;
-
-/**
- * The DBAppender inserts access events into three database tables in a format
- * independent of the Java programming language. 
- * 
- * For more information about this appender, please refer to the online manual at
- * http://logback.qos.ch/manual/appenders.html#AccessDBAppender
- * 
- * @author Ceki G&uuml;lc&uuml;
- * @author Ray DeCampo
- * @author S&eacute;bastien Pennec
- */
-public class DBAppender extends DBAppenderBase<IAccessEvent> {
- protected static final String insertSQL;
- protected final String insertHeaderSQL = "INSERT INTO access_event_header (event_id, header_key, header_value) VALUES (?, ?, ?)";
- protected static final Method GET_GENERATED_KEYS_METHOD;
-
- private boolean insertHeaders = false;
-
- static {
- StringBuilder sql = new StringBuilder();
- sql.append("INSERT INTO access_event (");
- sql.append("timestmp, ");
- sql.append("requestURI, ");
- sql.append("requestURL, ");
- sql.append("remoteHost, ");
- sql.append("remoteUser, ");
- sql.append("remoteAddr, ");
- sql.append("protocol, ");
- sql.append("method, ");
- sql.append("serverName, ");
- sql.append("postContent) ");
- sql.append(" VALUES (?, ?, ? ,?, ?, ?, ?, ?, ?, ?)");
- insertSQL = sql.toString();
-
- Method getGeneratedKeysMethod;
- try {
- getGeneratedKeysMethod = PreparedStatement.class.getMethod("getGeneratedKeys", (Class) null);
- } catch (Exception ex) {
- getGeneratedKeysMethod = null;
- }
- GET_GENERATED_KEYS_METHOD = getGeneratedKeysMethod;
- }
-
- @Override
- protected void subAppend(IAccessEvent event, Connection connection, PreparedStatement insertStatement) throws Throwable {
-
- addAccessEvent(insertStatement, event);
-
- int updateCount = insertStatement.executeUpdate();
- if (updateCount != 1) {
- addWarn("Failed to insert access event");
- }
- }
-
- @Override
- protected void secondarySubAppend(IAccessEvent event, Connection connection, long eventId) throws Throwable {
- if (insertHeaders) {
- addRequestHeaders(event, connection, eventId);
- }
- }
-
- void addAccessEvent(PreparedStatement stmt, IAccessEvent event) throws SQLException {
- stmt.setLong(1, event.getTimeStamp());
- stmt.setString(2, event.getRequestURI());
- stmt.setString(3, event.getRequestURL());
- stmt.setString(4, event.getRemoteHost());
- stmt.setString(5, event.getRemoteUser());
- stmt.setString(6, event.getRemoteAddr());
- stmt.setString(7, event.getProtocol());
- stmt.setString(8, event.getMethod());
- stmt.setString(9, event.getServerName());
- stmt.setString(10, event.getRequestContent());
- }
-
- void addRequestHeaders(IAccessEvent event, Connection connection, long eventId) throws SQLException {
- Enumeration names = event.getRequestHeaderNames();
- if (names.hasMoreElements()) {
- PreparedStatement insertHeaderStatement = connection.prepareStatement(insertHeaderSQL);
-
- while (names.hasMoreElements()) {
- String key = (String) names.nextElement();
- String value = (String) event.getRequestHeader(key);
-
- insertHeaderStatement.setLong(1, eventId);
- insertHeaderStatement.setString(2, key);
- insertHeaderStatement.setString(3, value);
-
- if (cnxSupportsBatchUpdates) {
- insertHeaderStatement.addBatch();
- } else {
- insertHeaderStatement.execute();
- }
- }
-
- if (cnxSupportsBatchUpdates) {
- insertHeaderStatement.executeBatch();
- }
-
- insertHeaderStatement.close();
- }
- }
-
- @Override
- protected Method getGeneratedKeysMethod() {
- return GET_GENERATED_KEYS_METHOD;
- }
-
- @Override
- protected String getInsertSQL() {
- return insertSQL;
- }
-
- public void setInsertHeaders(boolean insertHeaders) {
- this.insertHeaders = insertHeaders;
- }
-}

_service:tar_scm:v_1.1.7.tar.gz/logback-access/src/main/java/ch/qos/logback/access/db/package.html Deleted

_service:tar_scm:v_1.1.7.tar.gz/logback-access/src/test/java/ch/qos/logback/access/db Deleted

_service:tar_scm:v_1.1.7.tar.gz/logback-access/src/test/java/ch/qos/logback/access/db/DBAppenderHSQLTest.java Deleted

@@ -1,221 +0,0 @@
-/**
- * Logback: the reliable, generic, fast and flexible logging framework.
- * Copyright (C) 1999-2015, 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.access.db;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.fail;
-
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.sql.Statement;
-
-import ch.qos.logback.access.spi.IAccessEvent;
-import org.junit.After;
-import org.junit.AfterClass;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-import ch.qos.logback.access.dummy.DummyRequest;
-import ch.qos.logback.access.dummy.DummyResponse;
-import ch.qos.logback.access.dummy.DummyServerAdapter;
-import ch.qos.logback.access.spi.AccessContext;
-import ch.qos.logback.access.spi.AccessEvent;
-import ch.qos.logback.core.db.DriverManagerConnectionSource;
-import ch.qos.logback.core.util.StatusPrinter;
-
-public class DBAppenderHSQLTest {
- static DBAppenderHSQLTestFixture DB_APPENDER_HSQL_TEST_FIXTURE;
-
- AccessContext context;
- DBAppender appender;
- DriverManagerConnectionSource connectionSource;
-
- int existingEventTableRowCount;
- Statement stmt;
-
- @BeforeClass
- static public void fixtureSetUp() throws SQLException {
- DB_APPENDER_HSQL_TEST_FIXTURE = new DBAppenderHSQLTestFixture();
- DB_APPENDER_HSQL_TEST_FIXTURE.setUp();
- }
-
- @AfterClass
- static public void fixtureTearDown() throws SQLException {
- DB_APPENDER_HSQL_TEST_FIXTURE.tearDown();
- }
-
- @Before
- public void setUp() throws SQLException {
- context = new AccessContext();
- context.setName("default");
- appender = new DBAppender();
- appender.setName("DB");
- appender.setContext(context);
- connectionSource = new DriverManagerConnectionSource();
- connectionSource.setContext(context);
- connectionSource.setDriverClass(DBAppenderHSQLTestFixture.DRIVER_CLASS);
- connectionSource.setUrl(DB_APPENDER_HSQL_TEST_FIXTURE.url);
- connectionSource.setUser(DB_APPENDER_HSQL_TEST_FIXTURE.user);
- connectionSource.setPassword(DB_APPENDER_HSQL_TEST_FIXTURE.password);
- connectionSource.start();
- appender.setConnectionSource(connectionSource);
-
- stmt = connectionSource.getConnection().createStatement();
- existingEventTableRowCount = existingEventTableRowCount(stmt);
- }
-
- @After
- public void tearDown() throws SQLException {
- context = null;
- appender = null;
- connectionSource = null;
- stmt.close();
- }
-
- int existingEventTableRowCount(Statement stmt) throws SQLException {
- ResultSet rs = stmt.executeQuery("SELECT count(*) FROM access_event");
- int result = -1;
- if (rs.next()) {
- result = rs.getInt(1);
- }
- rs.close();
- return result;
- }
-
- private void setInsertHeadersAndStart(boolean insert) {
- appender.setInsertHeaders(insert);
- appender.start();
- }
-
- @Test
- public void testAppendAccessEvent() throws SQLException {
- setInsertHeadersAndStart(false);
-
- IAccessEvent event = createAccessEvent();
- appender.append(event);
-
- Statement stmt = connectionSource.getConnection().createStatement();
- ResultSet rs = null;
- rs = stmt.executeQuery("SELECT * FROM access_event where EVENT_ID = " + existingEventTableRowCount);
- if (rs.next()) {
- assertEquals(event.getTimeStamp(), rs.getLong(1));
- assertEquals(event.getRequestURI(), rs.getString(2));
- assertEquals(event.getRequestURL(), rs.getString(3));
- assertEquals(event.getRemoteHost(), rs.getString(4));
- assertEquals(event.getRemoteUser(), rs.getString(5));
- assertEquals(event.getRemoteAddr(), rs.getString(6));
- assertEquals(event.getProtocol(), rs.getString(7));
- assertEquals(event.getMethod(), rs.getString(8));
- assertEquals(event.getServerName(), rs.getString(9));
- assertEquals(event.getRequestContent(), rs.getString(10));
- } else {
- fail("No row was inserted in the database");
- }
- rs.close();
- stmt.close();
- }
-
- @Test
- public void testCheckNoHeadersAreInserted() throws Exception {
- setInsertHeadersAndStart(false);
-
- IAccessEvent event = createAccessEvent();
- appender.append(event);
- StatusPrinter.print(context.getStatusManager());
-
- // Check that no headers were inserted
- Statement stmt = connectionSource.getConnection().createStatement();
- ResultSet rs = null;
- rs = stmt.executeQuery("SELECT * FROM access_event_header where EVENT_ID = " + existingEventTableRowCount);
-
- assertFalse(rs.next());
- rs.close();
- stmt.close();
- }
-
- @Test
- public void testAppendHeaders() throws SQLException {
- setInsertHeadersAndStart(true);
-
- IAccessEvent event = createAccessEvent();
- appender.append(event);
-
- Statement stmt = connectionSource.getConnection().createStatement();
- ResultSet rs = null;
- rs = stmt.executeQuery("SELECT * FROM access_event_header");
- String key;
- String value;
- if (!rs.next()) {
- fail("There should be results to this query");
- } else {
- key = rs.getString(2);
- value = rs.getString(3);
- assertNotNull(key);
- assertNotNull(value);
- assertEquals(event.getRequestHeader(key), value);
- rs.next();
- key = rs.getString(2);
- value = rs.getString(3);
- assertNotNull(key);
- assertNotNull(value);
- assertEquals(event.getRequestHeader(key), value);
- }
- if (rs.next()) {
- fail("There should be no more rows available");
- }
-
- rs.close();
- stmt.close();
- }
-
- @Test
- public void testAppendMultipleEvents() throws SQLException {
- setInsertHeadersAndStart(false);
- String uri = "testAppendMultipleEvents";
- for (int i = 0; i < 10; i++) {
- IAccessEvent event = createAccessEvent(uri);
- appender.append(event);
- }
-
- StatusPrinter.print(context);
-
- Statement stmt = connectionSource.getConnection().createStatement();
- ResultSet rs = null;
- rs = stmt.executeQuery("SELECT * FROM access_event where requestURI='" + uri + "'");
- int count = 0;
- while (rs.next()) {
- count++;
- }
- assertEquals(10, count);
-
- rs.close();
- stmt.close();
- }
-
- private IAccessEvent createAccessEvent() {
- return createAccessEvent("");
- }
-
- private IAccessEvent createAccessEvent(String uri) {
- DummyRequest request = new DummyRequest();
- request.setRequestUri(uri);
- DummyResponse response = new DummyResponse();
- DummyServerAdapter adapter = new DummyServerAdapter(request, response);
-
- return new AccessEvent(request, response, adapter);
- }
-}

_service:tar_scm:v_1.1.7.tar.gz/logback-access/src/test/java/ch/qos/logback/access/db/DBAppenderHSQLTestFixture.java Deleted

@@ -1,127 +0,0 @@
-/**
- * Logback: the reliable, generic, fast and flexible logging framework.
- * Copyright (C) 1999-2015, 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.access.db;
-
-import java.sql.Connection;
-import java.sql.DriverManager;
-import java.sql.SQLException;
-import java.sql.Statement;
-
-import org.hsqldb.Server;
-
-public class DBAppenderHSQLTestFixture {
-
-    public static final String DRIVER_CLASS = "org.hsqldb.jdbcDriver";
-    String serverProps;
-    String url;
-    String user = "sa";
-    String password = "";
-    Server server;
-    boolean isNetwork = true;
-
-    void setUp() throws SQLException {
-        if (isNetwork) {
-            if (url == null) {
-                url = "jdbc:hsqldb:hsql://localhost/test";
-            }
-
-            server = new Server();
-
-            server.setDatabaseName(0, "test");
-            server.setDatabasePath(0, "mem:test;sql.enforce_strict_size=true");
-            server.setLogWriter(null);
-            server.setErrWriter(null);
-            server.setTrace(false);
-            server.setSilent(true);
-            server.start();
-        } else {
-            if (url == null) {
-                url = "jdbc:hsqldb:file:test;sql.enforce_strict_size=true";
-            }
-        }
-
-        try {
-            Class.forName(DRIVER_CLASS);
-        } catch (Exception e) {
-            e.printStackTrace();
-            System.out.println(this + ".setUp() error: " + e.getMessage());
-        }
-        Thread.yield();
-
-        createTables();
-    }
-
-    void tearDown() throws SQLException {
-        dropTables();
-        if (isNetwork) {
-            server.stop();
-            server = null;
-        }
-    }
-
-    Connection newConnection() throws SQLException {
-        return DriverManager.getConnection(url, user, password);
-    }
-
-    private void createTables() throws SQLException {
-        Connection conn = newConnection();
-        StringBuilder buf = new StringBuilder();
-        buf.append("CREATE TABLE access_event (");
-        buf.append("timestmp BIGINT NOT NULL,");
-        buf.append("requestURI VARCHAR(254),");
-        buf.append("requestURL VARCHAR(254),");
-        buf.append("remoteHost VARCHAR(254),");
-        buf.append("remoteUser VARCHAR(254),");
-        buf.append("remoteAddr VARCHAR(254),");
-        buf.append("protocol VARCHAR(254),");
-        buf.append("method VARCHAR(254),");
-        buf.append("serverName VARCHAR(254),");
-        buf.append("postContent VARCHAR(254),");
-        buf.append("event_id INT NOT NULL IDENTITY);");
-        query(conn, buf.toString());
-
-        buf = new StringBuilder();
-        buf.append("CREATE TABLE access_event_header (");
-        buf.append("event_id INT NOT NULL,");
-        buf.append("header_key  VARCHAR(254) NOT NULL,");
-        buf.append("header_value LONGVARCHAR,");
-        buf.append("PRIMARY KEY(event_id, header_key),");
-        buf.append("FOREIGN KEY (event_id) REFERENCES access_event(event_id));");
-        query(conn, buf.toString());
-    }
-
-    private void dropTables() throws SQLException {
-        Connection conn = newConnection();
-
-        StringBuilder buf = new StringBuilder();
-        buf.append("DROP TABLE access_event_header IF EXISTS;");
-        query(conn, buf.toString());
-
-        buf = new StringBuilder();
-        buf.append("DROP TABLE access_event IF EXISTS;");
-        query(conn, buf.toString());
-    }
-
-    private void query(Connection conn, String expression) throws SQLException {
-        Statement st = null;
-        st = conn.createStatement();
-
-        int i = st.executeUpdate(expression);
-        if (i == -1) {
-            System.out.println("db error : " + expression);
-        }
-
-        st.close();
-    }
-}

_service:tar_scm:v_1.1.7.tar.gz/logback-access/src/test/java/ch/qos/logback/access/db/DBAppenderIntegrationTest.java Deleted

@@ -1,138 +0,0 @@
-/**
- * Logback: the reliable, generic, fast and flexible logging framework.
- * Copyright (C) 1999-2015, 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.access.db;
-
-import static org.junit.Assert.assertEquals;
-
-import java.util.Random;
-
-import ch.qos.logback.access.spi.IAccessEvent;
-import ch.qos.logback.core.status.StatusChecker;
-import ch.qos.logback.core.testUtil.EnvUtilForTests;
-import ch.qos.logback.core.util.EnvUtil;
-import org.junit.After;
-import org.junit.AfterClass;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Ignore;
-import org.junit.Test;
-
-import ch.qos.logback.access.dummy.DummyAccessEventBuilder;
-import ch.qos.logback.access.joran.JoranConfigurator;
-import ch.qos.logback.access.spi.AccessContext;
-import ch.qos.logback.core.Appender;
-import ch.qos.logback.core.joran.spi.JoranException;
-import ch.qos.logback.core.status.Status;
-import ch.qos.logback.core.util.StatusPrinter;
-
-public class DBAppenderIntegrationTest {
-
- static String LOCAL_HOST_NAME = EnvUtilForTests.getLocalHostName();
- static String CONFORMING_HOST_LIST = new String { "Orion" };
-
- int diff = new Random(System.nanoTime()).nextInt(10000);
- AccessContext context = new AccessContext();
- StatusChecker statusChecker = new StatusChecker(context);
-
- @BeforeClass
- public static void setUpBeforeClass() throws Exception {
- }
-
- @AfterClass
- public static void tearDownAfterClass() throws Exception {
- }
-
- @Before
- public void setUp() throws Exception {
- }
-
- @After
- public void tearDown() throws Exception {
-
- }
-
- public void doTest(String configFile) throws JoranException {
- JoranConfigurator configurator = new JoranConfigurator();
- configurator.setContext(context);
- configurator.doConfigure(configFile);
-
- Appender<IAccessEvent> appender = context.getAppender("DB");
-
- for (int i = 0; i < 10; i++) {
- IAccessEvent event = DummyAccessEventBuilder.buildNewAccessEvent();
- appender.doAppend(event);
- }
-
- StatusPrinter.print(context);
-
- // check that there were no errors
- assertEquals(Status.INFO, statusChecker.getHighestLevel(0));
-
- }
-
- static boolean isConformingHostAndJDK16OrHigher() {
- if (!EnvUtil.isJDK6OrHigher()) {
- return false;
- }
- return EnvUtilForTests.isLocalHostNameInList(CONFORMING_HOST_LIST);
- }
-
- @Test
- public void sqlserver() throws Exception {
- // perform test only on conforming hosts
- if (!isConformingHostAndJDK16OrHigher()) {
- return;
- }
- doTest("src/test/input/integration/db/sqlserver-with-driver.xml");
- }
-
- @Test
- @Ignore
- public void oracle10g() throws Exception {
- // perform test only on conforming hosts
- if (!isConformingHostAndJDK16OrHigher()) {
- return;
- }
- doTest("src/test/input/integration/db/oracle10g-with-driver.xml");
- }
-
- @Test
- @Ignore
- public void oracle11g() throws Exception {
- // perform test only on conforming hosts
- if (!isConformingHostAndJDK16OrHigher()) {
- return;
- }
- doTest("src/test/input/integration/db/oracle11g-with-driver.xml");
- }
-
- @Test
- public void mysql() throws Exception {
- // perform test only on conforming hosts
- if (!isConformingHostAndJDK16OrHigher()) {
- return;
- }
- doTest("src/test/input/integration/db/mysql-with-driver.xml");
- }
-
- @Test
- public void postgres() throws Exception {
- // perform test only on conforming hosts
- if (!isConformingHostAndJDK16OrHigher()) {
- return;
- }
- doTest("src/test/input/integration/db/postgresql-with-driver.xml");
- }
-
-}

_service:tar_scm:v_1.1.7.tar.gz/logback-access/src/test/java/ch/qos/logback/access/db/PackageTest.java Deleted

_service:tar_scm:v_1.1.7.tar.gz/logback-classic/src/main/java/ch/qos/logback/classic/db/DBAppender.java Deleted

@@ -1,295 +0,0 @@
-/**
- * Logback: the reliable, generic, fast and flexible logging framework.
- * Copyright (C) 1999-2015, 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.classic.db;
-
-import static ch.qos.logback.core.db.DBHelper.closeStatement;
-
-import java.lang.reflect.Method;
-import java.sql.Connection;
-import java.sql.PreparedStatement;
-import java.sql.SQLException;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Set;
-
-import ch.qos.logback.classic.db.names.DBNameResolver;
-import ch.qos.logback.classic.db.names.DefaultDBNameResolver;
-import ch.qos.logback.classic.spi.*;
-import ch.qos.logback.core.CoreConstants;
-import ch.qos.logback.core.db.DBAppenderBase;
-
-/**
- * The DBAppender inserts logging events into three database tables in a format
- * independent of the Java programming language.
- *
- * For more information about this appender, please refer to the online manual
- * at http://logback.qos.ch/manual/appenders.html#DBAppender
- *
- * @author Ceki G&uuml;lc&uuml;
- * @author Ray DeCampo
- * @author S&eacute;bastien Pennec
- */
-public class DBAppender extends DBAppenderBase<ILoggingEvent> {
- protected String insertPropertiesSQL;
- protected String insertExceptionSQL;
- protected String insertSQL;
- protected static final Method GET_GENERATED_KEYS_METHOD;
-
- private DBNameResolver dbNameResolver;
-
- static final int TIMESTMP_INDEX = 1;
- static final int FORMATTED_MESSAGE_INDEX = 2;
- static final int LOGGER_NAME_INDEX = 3;
- static final int LEVEL_STRING_INDEX = 4;
- static final int THREAD_NAME_INDEX = 5;
- static final int REFERENCE_FLAG_INDEX = 6;
- static final int ARG0_INDEX = 7;
- static final int ARG1_INDEX = 8;
- static final int ARG2_INDEX = 9;
- static final int ARG3_INDEX = 10;
- static final int CALLER_FILENAME_INDEX = 11;
- static final int CALLER_CLASS_INDEX = 12;
- static final int CALLER_METHOD_INDEX = 13;
- static final int CALLER_LINE_INDEX = 14;
- static final int EVENT_ID_INDEX = 15;
-
- static final StackTraceElement EMPTY_CALLER_DATA = CallerData.naInstance();
-
- static {
- // PreparedStatement.getGeneratedKeys() method was added in JDK 1.4
- Method getGeneratedKeysMethod;
- try {
- // the
- getGeneratedKeysMethod = PreparedStatement.class.getMethod("getGeneratedKeys", (Class) null);
- } catch (Exception ex) {
- getGeneratedKeysMethod = null;
- }
- GET_GENERATED_KEYS_METHOD = getGeneratedKeysMethod;
- }
-
- public void setDbNameResolver(DBNameResolver dbNameResolver) {
- this.dbNameResolver = dbNameResolver;
- }
-
- @Override
- public void start() {
- if (dbNameResolver == null)
- dbNameResolver = new DefaultDBNameResolver();
- insertExceptionSQL = SQLBuilder.buildInsertExceptionSQL(dbNameResolver);
- insertPropertiesSQL = SQLBuilder.buildInsertPropertiesSQL(dbNameResolver);
- insertSQL = SQLBuilder.buildInsertSQL(dbNameResolver);
- super.start();
- }
-
- @Override
- protected void subAppend(ILoggingEvent event, Connection connection, PreparedStatement insertStatement) throws Throwable {
-
- bindLoggingEventWithInsertStatement(insertStatement, event);
- bindLoggingEventArgumentsWithPreparedStatement(insertStatement, event.getArgumentArray());
-
- // This is expensive... should we do it every time?
- bindCallerDataWithPreparedStatement(insertStatement, event.getCallerData());
-
- int updateCount = insertStatement.executeUpdate();
- if (updateCount != 1) {
- addWarn("Failed to insert loggingEvent");
- }
- }
-
- protected void secondarySubAppend(ILoggingEvent event, Connection connection, long eventId) throws Throwable {
- Map<String, String> mergedMap = mergePropertyMaps(event);
- insertProperties(mergedMap, connection, eventId);
-
- if (event.getThrowableProxy() != null) {
- insertThrowable(event.getThrowableProxy(), connection, eventId);
- }
- }
-
- void bindLoggingEventWithInsertStatement(PreparedStatement stmt, ILoggingEvent event) throws SQLException {
- stmt.setLong(TIMESTMP_INDEX, event.getTimeStamp());
- stmt.setString(FORMATTED_MESSAGE_INDEX, event.getFormattedMessage());
- stmt.setString(LOGGER_NAME_INDEX, event.getLoggerName());
- stmt.setString(LEVEL_STRING_INDEX, event.getLevel().toString());
- stmt.setString(THREAD_NAME_INDEX, event.getThreadName());
- stmt.setShort(REFERENCE_FLAG_INDEX, DBHelper.computeReferenceMask(event));
- }
-
- void bindLoggingEventArgumentsWithPreparedStatement(PreparedStatement stmt, Object argArray) throws SQLException {
-
- int arrayLen = argArray != null ? argArray.length : 0;
-
- for (int i = 0; i < arrayLen && i < 4; i++) {
- stmt.setString(ARG0_INDEX + i, asStringTruncatedTo254(argArrayi));
- }
- if (arrayLen < 4) {
- for (int i = arrayLen; i < 4; i++) {
- stmt.setString(ARG0_INDEX + i, null);
- }
- }
- }
-
- String asStringTruncatedTo254(Object o) {
- String s = null;
- if (o != null) {
- s = o.toString();
- }
-
- if (s == null) {
- return null;
- }
- if (s.length() <= 254) {
- return s;
- } else {
- return s.substring(0, 254);
- }
- }
-
- void bindCallerDataWithPreparedStatement(PreparedStatement stmt, StackTraceElement callerDataArray) throws SQLException {
-
- StackTraceElement caller = extractFirstCaller(callerDataArray);
-
- stmt.setString(CALLER_FILENAME_INDEX, caller.getFileName());
- stmt.setString(CALLER_CLASS_INDEX, caller.getClassName());
- stmt.setString(CALLER_METHOD_INDEX, caller.getMethodName());
- stmt.setString(CALLER_LINE_INDEX, Integer.toString(caller.getLineNumber()));
- }
-
- private StackTraceElement extractFirstCaller(StackTraceElement callerDataArray) {
- StackTraceElement caller = EMPTY_CALLER_DATA;
- if (hasAtLeastOneNonNullElement(callerDataArray))
- caller = callerDataArray0;
- return caller;
- }
-
- private boolean hasAtLeastOneNonNullElement(StackTraceElement callerDataArray) {
- return callerDataArray != null && callerDataArray.length > 0 && callerDataArray0 != null;
- }
-
- Map<String, String> mergePropertyMaps(ILoggingEvent event) {
- Map<String, String> mergedMap = new HashMap<String, String>();
- // we add the context properties first, then the event properties, since
- // we consider that event-specific properties should have priority over
- // context-wide properties.
- Map<String, String> loggerContextMap = event.getLoggerContextVO().getPropertyMap();
- Map<String, String> mdcMap = event.getMDCPropertyMap();
- if (loggerContextMap != null) {
- mergedMap.putAll(loggerContextMap);
- }
- if (mdcMap != null) {
- mergedMap.putAll(mdcMap);
- }
-
- return mergedMap;
- }
-
- @Override
- protected Method getGeneratedKeysMethod() {
- return GET_GENERATED_KEYS_METHOD;
- }
-
- @Override
- protected String getInsertSQL() {
- return insertSQL;
- }
-
- protected void insertProperties(Map<String, String> mergedMap, Connection connection, long eventId) throws SQLException {
- Set<String> propertiesKeys = mergedMap.keySet();
- if (propertiesKeys.size() > 0) {
- PreparedStatement insertPropertiesStatement = null;
- try {
- insertPropertiesStatement = connection.prepareStatement(insertPropertiesSQL);
-
- for (String key : propertiesKeys) {
- String value = mergedMap.get(key);
-
- insertPropertiesStatement.setLong(1, eventId);
- insertPropertiesStatement.setString(2, key);
- insertPropertiesStatement.setString(3, value);
-
- if (cnxSupportsBatchUpdates) {
- insertPropertiesStatement.addBatch();
- } else {
- insertPropertiesStatement.execute();
- }
- }
-
- if (cnxSupportsBatchUpdates) {
- insertPropertiesStatement.executeBatch();
- }
- } finally {
- closeStatement(insertPropertiesStatement);
- }
- }
- }
-
- /**
- * Add an exception statement either as a batch or execute immediately if
- * batch updates are not supported.
- */
- void updateExceptionStatement(PreparedStatement exceptionStatement, String txt, short i, long eventId) throws SQLException {
- exceptionStatement.setLong(1, eventId);
- exceptionStatement.setShort(2, i);
- exceptionStatement.setString(3, txt);
- if (cnxSupportsBatchUpdates) {
- exceptionStatement.addBatch();
- } else {
- exceptionStatement.execute();
- }
- }
-
- short buildExceptionStatement(IThrowableProxy tp, short baseIndex, PreparedStatement insertExceptionStatement, long eventId) throws SQLException {
-
- StringBuilder buf = new StringBuilder();
- ThrowableProxyUtil.subjoinFirstLine(buf, tp);
- updateExceptionStatement(insertExceptionStatement, buf.toString(), baseIndex++, eventId);
-
- int commonFrames = tp.getCommonFrames();
- StackTraceElementProxy stepArray = tp.getStackTraceElementProxyArray();
- for (int i = 0; i < stepArray.length - commonFrames; i++) {
- StringBuilder sb = new StringBuilder();
- sb.append(CoreConstants.TAB);
- ThrowableProxyUtil.subjoinSTEP(sb, stepArrayi);
- updateExceptionStatement(insertExceptionStatement, sb.toString(), baseIndex++, eventId);
- }
-
- if (commonFrames > 0) {
- StringBuilder sb = new StringBuilder();
- sb.append(CoreConstants.TAB).append("... ").append(commonFrames).append(" common frames omitted");
- updateExceptionStatement(insertExceptionStatement, sb.toString(), baseIndex++, eventId);
- }
-
- return baseIndex;
- }
-
- protected void insertThrowable(IThrowableProxy tp, Connection connection, long eventId) throws SQLException {
-
- PreparedStatement exceptionStatement = null;
- try {
- exceptionStatement = connection.prepareStatement(insertExceptionSQL);
-
- short baseIndex = 0;
- while (tp != null) {
- baseIndex = buildExceptionStatement(tp, baseIndex, exceptionStatement, eventId);
- tp = tp.getCause();
- }
-
- if (cnxSupportsBatchUpdates) {
- exceptionStatement.executeBatch();
- }
- } finally {
- closeStatement(exceptionStatement);
- }
-
- }
-}

_service:tar_scm:v_1.1.7.tar.gz/logback-classic/src/main/java/ch/qos/logback/classic/db/DBHelper.java Deleted

@@ -1,47 +0,0 @@
-/**
- * Logback: the reliable, generic, fast and flexible logging framework.
- * Copyright (C) 1999-2015, 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.classic.db;
-
-import ch.qos.logback.classic.spi.ILoggingEvent;
-
-/**
- * @author Ceki G&uuml;lc&uuml;
- * 
- */
-public class DBHelper {
-
-    public static final short PROPERTIES_EXIST = 0x01;
-    public static final short EXCEPTION_EXISTS = 0x02;
-
-    public static short computeReferenceMask(ILoggingEvent event) {
-        short mask = 0;
-
-        int mdcPropSize = 0;
-        if (event.getMDCPropertyMap() != null) {
-            mdcPropSize = event.getMDCPropertyMap().keySet().size();
-        }
-        int contextPropSize = 0;
-        if (event.getLoggerContextVO().getPropertyMap() != null) {
-            contextPropSize = event.getLoggerContextVO().getPropertyMap().size();
-        }
-
-        if (mdcPropSize > 0 || contextPropSize > 0) {
-            mask = PROPERTIES_EXIST;
-        }
-        if (event.getThrowableProxy() != null) {
-            mask |= EXCEPTION_EXISTS;
-        }
-        return mask;
-    }
-}

_service:tar_scm:v_1.1.7.tar.gz/logback-classic/src/main/java/ch/qos/logback/classic/db/SQLBuilder.java Deleted

@@ -1,64 +0,0 @@
-/**
- * Logback: the reliable, generic, fast and flexible logging framework.
- * Copyright (C) 1999-2015, 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.classic.db;
-
-import ch.qos.logback.classic.db.names.*;
-
-/**
- * @author Tomasz Nurkiewicz
- * @since 2010-03-16
- */
-public class SQLBuilder {
-
-    static String buildInsertPropertiesSQL(DBNameResolver dbNameResolver) {
-        StringBuilder sqlBuilder = new StringBuilder("INSERT INTO ");
-        sqlBuilder.append(dbNameResolver.getTableName(TableName.LOGGING_EVENT_PROPERTY)).append(" (");
-        sqlBuilder.append(dbNameResolver.getColumnName(ColumnName.EVENT_ID)).append(", ");
-        sqlBuilder.append(dbNameResolver.getColumnName(ColumnName.MAPPED_KEY)).append(", ");
-        sqlBuilder.append(dbNameResolver.getColumnName(ColumnName.MAPPED_VALUE)).append(") ");
-        sqlBuilder.append("VALUES (?, ?, ?)");
-        return sqlBuilder.toString();
-    }
-
-    static String buildInsertExceptionSQL(DBNameResolver dbNameResolver) {
-        StringBuilder sqlBuilder = new StringBuilder("INSERT INTO ");
-        sqlBuilder.append(dbNameResolver.getTableName(TableName.LOGGING_EVENT_EXCEPTION)).append(" (");
-        sqlBuilder.append(dbNameResolver.getColumnName(ColumnName.EVENT_ID)).append(", ");
-        sqlBuilder.append(dbNameResolver.getColumnName(ColumnName.I)).append(", ");
-        sqlBuilder.append(dbNameResolver.getColumnName(ColumnName.TRACE_LINE)).append(") ");
-        sqlBuilder.append("VALUES (?, ?, ?)");
-        return sqlBuilder.toString();
-    }
-
-    static String buildInsertSQL(DBNameResolver dbNameResolver) {
-        StringBuilder sqlBuilder = new StringBuilder("INSERT INTO ");
-        sqlBuilder.append(dbNameResolver.getTableName(TableName.LOGGING_EVENT)).append(" (");
-        sqlBuilder.append(dbNameResolver.getColumnName(ColumnName.TIMESTMP)).append(", ");
-        sqlBuilder.append(dbNameResolver.getColumnName(ColumnName.FORMATTED_MESSAGE)).append(", ");
-        sqlBuilder.append(dbNameResolver.getColumnName(ColumnName.LOGGER_NAME)).append(", ");
-        sqlBuilder.append(dbNameResolver.getColumnName(ColumnName.LEVEL_STRING)).append(", ");
-        sqlBuilder.append(dbNameResolver.getColumnName(ColumnName.THREAD_NAME)).append(", ");
-        sqlBuilder.append(dbNameResolver.getColumnName(ColumnName.REFERENCE_FLAG)).append(", ");
-        sqlBuilder.append(dbNameResolver.getColumnName(ColumnName.ARG0)).append(", ");
-        sqlBuilder.append(dbNameResolver.getColumnName(ColumnName.ARG1)).append(", ");
-        sqlBuilder.append(dbNameResolver.getColumnName(ColumnName.ARG2)).append(", ");
-        sqlBuilder.append(dbNameResolver.getColumnName(ColumnName.ARG3)).append(", ");
-        sqlBuilder.append(dbNameResolver.getColumnName(ColumnName.CALLER_FILENAME)).append(", ");
-        sqlBuilder.append(dbNameResolver.getColumnName(ColumnName.CALLER_CLASS)).append(", ");
-        sqlBuilder.append(dbNameResolver.getColumnName(ColumnName.CALLER_METHOD)).append(", ");
-        sqlBuilder.append(dbNameResolver.getColumnName(ColumnName.CALLER_LINE)).append(") ");
-        sqlBuilder.append("VALUES (?, ?, ? ,?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)");
-        return sqlBuilder.toString();
-    }
-}

_service:tar_scm:v_1.1.7.tar.gz/logback-classic/src/main/java/ch/qos/logback/classic/db/package.html Deleted

_service:tar_scm:v_1.1.7.tar.gz/logback-classic/src/main/java/ch/qos/logback/classic/net/JMSQueueAppender.java Deleted

@@ -1,206 +0,0 @@
-/**
- * Logback: the reliable, generic, fast and flexible logging framework.
- * Copyright (C) 1999-2015, 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.classic.net;
-
-import java.io.Serializable;
-
-import javax.jms.ObjectMessage;
-import javax.jms.Queue;
-import javax.jms.QueueConnection;
-import javax.jms.QueueConnectionFactory;
-import javax.jms.QueueSender;
-import javax.jms.QueueSession;
-import javax.jms.Session;
-import javax.naming.Context;
-
-import ch.qos.logback.classic.spi.ILoggingEvent;
-import ch.qos.logback.core.AppenderBase;
-import ch.qos.logback.core.net.JMSAppenderBase;
-import ch.qos.logback.core.spi.PreSerializationTransformer;
-
-/**
- * A simple appender that publishes events to a JMS Queue. The events are
- * serialized and transmitted as JMS message type {@link
- * javax.jms.ObjectMessage}.
- * 
- * For more information about this appender, please refer to:
- * http://logback.qos.ch/manual/appenders.html#JMSQueueAppender
- * 
- * @author Ceki G&uuml;lc&uuml;
- */
-public class JMSQueueAppender extends JMSAppenderBase<ILoggingEvent> {
-
- static int SUCCESSIVE_FAILURE_LIMIT = 3;
-
- String queueBindingName;
- String qcfBindingName;
- QueueConnection queueConnection;
- QueueSession queueSession;
- QueueSender queueSender;
-
- int successiveFailureCount = 0;
-
- private PreSerializationTransformer<ILoggingEvent> pst = new LoggingEventPreSerializationTransformer();
-
- /**
- * The QueueConnectionFactoryBindingName option takes a string value.
- * Its value will be used to lookup the appropriate
- * <code>QueueConnectionFactory</code> from the JNDI context.
- */
- public void setQueueConnectionFactoryBindingName(String qcfBindingName) {
- this.qcfBindingName = qcfBindingName;
- }
-
- /**
- * Returns the value of the QueueConnectionFactoryBindingName option.
- */
- public String getQueueConnectionFactoryBindingName() {
- return qcfBindingName;
- }
-
- /**
- * The QueueBindingName option takes a string value. Its value will be
- * used to lookup the appropriate <code>Queue</code> from the JNDI context.
- */
- public void setQueueBindingName(String queueBindingName) {
- this.queueBindingName = queueBindingName;
- }
-
- /**
- * Returns the value of the QueueBindingName option.
- */
- public String getQueueBindingName() {
- return queueBindingName;
- }
-
- /**
- * Options are activated and become effective only after calling this method.
- */
- public void start() {
- QueueConnectionFactory queueConnectionFactory;
-
- try {
- Context jndi = buildJNDIContext();
-
- // addInfo("Looking up " + qcfBindingName + "");
- queueConnectionFactory = (QueueConnectionFactory) lookup(jndi, qcfBindingName);
- // addInfo("About to create QueueConnection.");
- if (userName != null) {
- this.queueConnection = queueConnectionFactory.createQueueConnection(userName, password);
- } else {
- this.queueConnection = queueConnectionFactory.createQueueConnection();
- }
-
- // addInfo(
- // "Creating QueueSession, non-transactional, "
- // + "in AUTO_ACKNOWLEDGE mode.");
- this.queueSession = queueConnection.createQueueSession(false, Session.AUTO_ACKNOWLEDGE);
-
- // addInfo("Looking up queue name " + queueBindingName + ".");
- Queue queue = (Queue) lookup(jndi, queueBindingName);
-
- // addInfo("Creating QueueSender.");
- this.queueSender = queueSession.createSender(queue);
-
- // addInfo("Starting QueueConnection.");
- queueConnection.start();
-
- jndi.close();
- } catch (Exception e) {
- addError("Error while activating options for appender named " + name + ".", e);
- }
-
- if (this.queueConnection != null && this.queueSession != null && this.queueSender != null) {
- super.start();
- }
- }
-
- /**
- * Close this JMSAppender. Closing releases all resources used by the
- * appender. A closed appender cannot be re-opened.
- */
- public synchronized void stop() {
- // The synchronized modifier avoids concurrent append and close operations
- if (!this.started) {
- return;
- }
-
- this.started = false;
-
- try {
- if (queueSession != null) {
- queueSession.close();
- }
- if (queueConnection != null) {
- queueConnection.close();
- }
- } catch (Exception e) {
- addError("Error while closing JMSAppender " + name + ".", e);
- }
-
- // Help garbage collection
- queueSender = null;
- queueSession = null;
- queueConnection = null;
- }
-
- /**
- * This method called by {@link AppenderBase#doAppend} method to do most
- * of the real appending work.
- */
- public void append(ILoggingEvent event) {
- if (!isStarted()) {
- return;
- }
-
- try {
- ObjectMessage msg = queueSession.createObjectMessage();
- Serializable so = pst.transform(event);
- msg.setObject(so);
- queueSender.send(msg);
- successiveFailureCount = 0;
- } catch (Exception e) {
- successiveFailureCount++;
- if (successiveFailureCount > SUCCESSIVE_FAILURE_LIMIT) {
- stop();
- }
- addError("Could not send message in JMSQueueAppender " + name + ".", e);
-
- }
- }
-
- /**
- * Returns the QueueConnection used for this appender. Only valid after
- * start() method has been invoked.
- */
- protected QueueConnection getQueueConnection() {
- return queueConnection;
- }
-
- /**
- * Returns the QueueSession used for this appender. Only valid after start()
- * method has been invoked.
- */
- protected QueueSession getQueueSession() {
- return queueSession;
- }
-
- /**
- * Returns the QueueSender used for this appender. Only valid after start()
- * method has been invoked.
- */
- protected QueueSender getQueueSender() {
- return queueSender;
- }
-}

_service:tar_scm:v_1.1.7.tar.gz/logback-classic/src/main/java/ch/qos/logback/classic/net/JMSQueueSink.java Deleted

@@ -1,141 +0,0 @@
-/**
- * Logback: the reliable, generic, fast and flexible logging framework.
- * Copyright (C) 1999-2015, 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.classic.net;
-
-import java.io.BufferedReader;
-import java.io.InputStreamReader;
-import java.util.Properties;
-
-import javax.jms.JMSException;
-import javax.jms.MessageConsumer;
-import javax.jms.ObjectMessage;
-import javax.jms.Queue;
-import javax.jms.QueueConnection;
-import javax.jms.QueueConnectionFactory;
-import javax.jms.QueueSession;
-import javax.jms.Session;
-import javax.naming.Context;
-import javax.naming.InitialContext;
-import javax.naming.NameNotFoundException;
-import javax.naming.NamingException;
-
-import org.slf4j.LoggerFactory;
-
-import ch.qos.logback.classic.Logger;
-import ch.qos.logback.classic.LoggerContext;
-import ch.qos.logback.classic.spi.ILoggingEvent;
-import ch.qos.logback.classic.util.ContextInitializer;
-
-/**
- * A simple application that consumes logging events sent by a {@link
- * JMSQueueAppender}.
- * 
- * @author Ceki G&uuml;lc&uuml;
- */
-public class JMSQueueSink implements javax.jms.MessageListener {
-
- private Logger logger = (Logger) LoggerFactory.getLogger(JMSTopicSink.class);
-
- static public void main(String args) throws Exception {
- if (args.length < 2) {
- usage("Wrong number of arguments.");
- }
-
- String qcfBindingName = args0;
- String queueBindingName = args1;
- String username = null;
- String password = null;
- if (args.length == 4) {
- username = args2;
- password = args3;
- }
-
- LoggerContext loggerContext = (LoggerContext) LoggerFactory.getILoggerFactory();
- new ContextInitializer(loggerContext).autoConfig();
-
- new JMSQueueSink(qcfBindingName, queueBindingName, username, password);
-
- BufferedReader stdin = new BufferedReader(new InputStreamReader(System.in));
- // Loop until the word "exit" is typed
- System.out.println("Type \"exit\" to quit JMSQueueSink.");
- while (true) {
- String s = stdin.readLine();
- if (s.equalsIgnoreCase("exit")) {
- System.out.println("Exiting. Kill the application if it does not exit " + "due to daemon threads.");
- return;
- }
- }
- }
-
- public JMSQueueSink(String qcfBindingName, String queueBindingName, String username, String password) {
-
- try {
- Properties env = new Properties();
- env.put(Context.INITIAL_CONTEXT_FACTORY, "org.apache.activemq.jndi.ActiveMQInitialContextFactory");
- env.put(Context.PROVIDER_URL, "tcp://localhost:61616");
- Context ctx = new InitialContext(env);
- QueueConnectionFactory queueConnectionFactory;
- queueConnectionFactory = (QueueConnectionFactory) lookup(ctx, qcfBindingName);
- System.out.println("Queue Cnx Factory found");
- Queue queue = (Queue) ctx.lookup(queueBindingName);
- System.out.println("Queue found: " + queue.getQueueName());
-
- QueueConnection queueConnection = queueConnectionFactory.createQueueConnection(username, password);
- System.out.println("Queue Connection created");
-
- QueueSession queueSession = queueConnection.createQueueSession(false, Session.AUTO_ACKNOWLEDGE);
-
- MessageConsumer queueConsumer = queueSession.createConsumer(queue);
-
- queueConsumer.setMessageListener(this);
-
- queueConnection.start();
- System.out.println("Queue Connection started");
-
- } catch (Exception e) {
- logger.error("Could not read JMS message.", e);
- }
- }
-
- public void onMessage(javax.jms.Message message) {
- ILoggingEvent event;
- try {
- if (message instanceof ObjectMessage) {
- ObjectMessage objectMessage = (ObjectMessage) message;
- event = (ILoggingEvent) objectMessage.getObject();
- Logger log = (Logger) LoggerFactory.getLogger(event.getLoggerName());
- log.callAppenders(event);
- } else {
- logger.warn("Received message is of type " + message.getJMSType() + ", was expecting ObjectMessage.");
- }
- } catch (JMSException jmse) {
- logger.error("Exception thrown while processing incoming message.", jmse);
- }
- }
-
- protected Object lookup(Context ctx, String name) throws NamingException {
- try {
- return ctx.lookup(name);
- } catch (NameNotFoundException e) {
- logger.error("Could not find name " + name + ".");
- throw e;
- }
- }
-
- static void usage(String msg) {
- System.err.println(msg);
- System.err.println("Usage: java " + JMSQueueSink.class.getName() + " QueueConnectionFactoryBindingName QueueBindingName Username Password");
- System.exit(1);
- }
-}

_service:tar_scm:v_1.1.7.tar.gz/logback-classic/src/main/java/ch/qos/logback/classic/net/JMSTopicAppender.java Deleted

@@ -1,205 +0,0 @@
-/**
- * Logback: the reliable, generic, fast and flexible logging framework.
- * Copyright (C) 1999-2015, 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.classic.net;
-
-import java.io.Serializable;
-
-import javax.jms.ObjectMessage;
-import javax.jms.Session;
-import javax.jms.Topic;
-import javax.jms.TopicConnection;
-import javax.jms.TopicConnectionFactory;
-import javax.jms.TopicPublisher;
-import javax.jms.TopicSession;
-import javax.naming.Context;
-
-import ch.qos.logback.classic.spi.ILoggingEvent;
-import ch.qos.logback.core.AppenderBase;
-import ch.qos.logback.core.net.JMSAppenderBase;
-import ch.qos.logback.core.spi.PreSerializationTransformer;
-
-/**
- * A simple appender that publishes events to a JMS Topic. The events are
- * serialized and transmitted as JMS message type {@link
- * javax.jms.ObjectMessage}.
- * 
- * For more information about this appender, please refer to
- * http://logback.qos.ch/manual/appenders.html#JMSTopicAppender
- * 
- * @author Ceki G&uuml;lc&uuml;
- */
-public class JMSTopicAppender extends JMSAppenderBase<ILoggingEvent> {
-
- static int SUCCESSIVE_FAILURE_LIMIT = 3;
-
- String topicBindingName;
- String tcfBindingName;
- TopicConnection topicConnection;
- TopicSession topicSession;
- TopicPublisher topicPublisher;
-
- int successiveFailureCount = 0;
-
- private PreSerializationTransformer<ILoggingEvent> pst = new LoggingEventPreSerializationTransformer();
-
- /**
- * The TopicConnectionFactoryBindingName option takes a string value.
- * Its value will be used to lookup the appropriate
- * <code>TopicConnectionFactory</code> from the JNDI context.
- */
- public void setTopicConnectionFactoryBindingName(String tcfBindingName) {
- this.tcfBindingName = tcfBindingName;
- }
-
- /**
- * Returns the value of the TopicConnectionFactoryBindingName option.
- */
- public String getTopicConnectionFactoryBindingName() {
- return tcfBindingName;
- }
-
- /**
- * The TopicBindingName option takes a string value. Its value will be
- * used to lookup the appropriate <code>Topic</code> from the JNDI context.
- */
- public void setTopicBindingName(String topicBindingName) {
- this.topicBindingName = topicBindingName;
- }
-
- /**
- * Returns the value of the TopicBindingName option.
- */
- public String getTopicBindingName() {
- return topicBindingName;
- }
-
- /**
- * Options are activated and become effective only after calling this method.
- */
- public void start() {
- TopicConnectionFactory topicConnectionFactory;
-
- try {
- Context jndi = buildJNDIContext();
-
- // addInfo("Looking up " + tcfBindingName + "");
- topicConnectionFactory = (TopicConnectionFactory) lookup(jndi, tcfBindingName);
- // addInfo("About to create TopicConnection.");
- if (userName != null) {
- this.topicConnection = topicConnectionFactory.createTopicConnection(userName, password);
- } else {
- this.topicConnection = topicConnectionFactory.createTopicConnection();
- }
-
- // addInfo(
- // "Creating TopicSession, non-transactional, "
- // + "in AUTO_ACKNOWLEDGE mode.");
- this.topicSession = topicConnection.createTopicSession(false, Session.AUTO_ACKNOWLEDGE);
-
- // addInfo("Looking up topic name " + topicBindingName + ".");
- Topic topic = (Topic) lookup(jndi, topicBindingName);
-
- // addInfo("Creating TopicPublisher.");
- this.topicPublisher = topicSession.createPublisher(topic);
-
- // addInfo("Starting TopicConnection.");
- topicConnection.start();
-
- jndi.close();
- } catch (Exception e) {
- addError("Error while activating options for appender named " + name + ".", e);
- }
-
- if (this.topicConnection != null && this.topicSession != null && this.topicPublisher != null) {
- super.start();
- }
- }
-
- /**
- * Close this JMSAppender. Closing releases all resources used by the
- * appender. A closed appender cannot be re-opened.
- */
- public synchronized void stop() {
- // The synchronized modifier avoids concurrent append and close operations
- if (!this.started) {
- return;
- }
-
- this.started = false;
-
- try {
- if (topicSession != null) {
- topicSession.close();
- }
- if (topicConnection != null) {
- topicConnection.close();
- }
- } catch (Exception e) {
- addError("Error while closing JMSAppender " + name + ".", e);
- }
-
- // Help garbage collection
- topicPublisher = null;
- topicSession = null;
- topicConnection = null;
- }
-
- /**
- * This method called by {@link AppenderBase#doAppend} method to do most
- * of the real appending work.
- */
- public void append(ILoggingEvent event) {
- if (!isStarted()) {
- return;
- }
-
- try {
- ObjectMessage msg = topicSession.createObjectMessage();
- Serializable so = pst.transform(event);
- msg.setObject(so);
- topicPublisher.publish(msg);
- successiveFailureCount = 0;
- } catch (Exception e) {
- successiveFailureCount++;
- if (successiveFailureCount > SUCCESSIVE_FAILURE_LIMIT) {
- stop();
- }
- addError("Could not publish message in JMSTopicAppender " + name + ".", e);
- }
- }
-
- /**
- * Returns the TopicConnection used for this appender. Only valid after
- * start() method has been invoked.
- */
- protected TopicConnection getTopicConnection() {
- return topicConnection;
- }
-
- /**
- * Returns the TopicSession used for this appender. Only valid after start()
- * method has been invoked.
- */
- protected TopicSession getTopicSession() {
- return topicSession;
- }
-
- /**
- * Returns the TopicPublisher used for this appender. Only valid after start()
- * method has been invoked.
- */
- protected TopicPublisher getTopicPublisher() {
- return topicPublisher;
- }
-}

_service:tar_scm:v_1.1.7.tar.gz/logback-classic/src/main/java/ch/qos/logback/classic/net/JMSTopicSink.java Deleted

@@ -1,141 +0,0 @@
-/**
- * Logback: the reliable, generic, fast and flexible logging framework.
- * Copyright (C) 1999-2015, 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.classic.net;
-
-import java.io.BufferedReader;
-import java.io.InputStreamReader;
-import java.util.Properties;
-
-import javax.jms.JMSException;
-import javax.jms.ObjectMessage;
-import javax.jms.Session;
-import javax.jms.Topic;
-import javax.jms.TopicConnection;
-import javax.jms.TopicConnectionFactory;
-import javax.jms.TopicSession;
-import javax.jms.TopicSubscriber;
-import javax.naming.Context;
-import javax.naming.InitialContext;
-import javax.naming.NameNotFoundException;
-import javax.naming.NamingException;
-
-import org.slf4j.LoggerFactory;
-
-import ch.qos.logback.classic.Logger;
-import ch.qos.logback.classic.LoggerContext;
-import ch.qos.logback.classic.spi.ILoggingEvent;
-import ch.qos.logback.classic.util.ContextInitializer;
-
-/**
- * A simple application that consumes logging events sent by a {@link
- * JMSTopicAppender}.
- * 
- * @author Ceki G&uuml;lc&uuml;
- */
-public class JMSTopicSink implements javax.jms.MessageListener {
-
- private Logger logger = (Logger) LoggerFactory.getLogger(JMSTopicSink.class);
-
- static public void main(String args) throws Exception {
- if (args.length < 2) {
- usage("Wrong number of arguments.");
- }
-
- String tcfBindingName = args0;
- String topicBindingName = args1;
- String username = null;
- String password = null;
- if (args.length == 4) {
- username = args2;
- password = args3;
- }
-
- LoggerContext loggerContext = (LoggerContext) LoggerFactory.getILoggerFactory();
- new ContextInitializer(loggerContext).autoConfig();
-
- new JMSTopicSink(tcfBindingName, topicBindingName, username, password);
-
- BufferedReader stdin = new BufferedReader(new InputStreamReader(System.in));
- // Loop until the word "exit" is typed
- System.out.println("Type \"exit\" to quit JMSTopicSink.");
- while (true) {
- String s = stdin.readLine();
- if (s.equalsIgnoreCase("exit")) {
- System.out.println("Exiting. Kill the application if it does not exit " + "due to daemon threads.");
- return;
- }
- }
- }
-
- public JMSTopicSink(String tcfBindingName, String topicBindingName, String username, String password) {
-
- try {
- Properties env = new Properties();
- env.put(Context.INITIAL_CONTEXT_FACTORY, "org.apache.activemq.jndi.ActiveMQInitialContextFactory");
- env.put(Context.PROVIDER_URL, "tcp://localhost:61616");
- Context ctx = new InitialContext(env);
- TopicConnectionFactory topicConnectionFactory;
- topicConnectionFactory = (TopicConnectionFactory) lookup(ctx, tcfBindingName);
- System.out.println("Topic Cnx Factory found");
- Topic topic = (Topic) ctx.lookup(topicBindingName);
- System.out.println("Topic found: " + topic.getTopicName());
-
- TopicConnection topicConnection = topicConnectionFactory.createTopicConnection(username, password);
- System.out.println("Topic Connection created");
-
- TopicSession topicSession = topicConnection.createTopicSession(false, Session.AUTO_ACKNOWLEDGE);
-
- TopicSubscriber topicSubscriber = topicSession.createSubscriber(topic);
-
- topicSubscriber.setMessageListener(this);
-
- topicConnection.start();
- System.out.println("Topic Connection started");
-
- } catch (Exception e) {
- logger.error("Could not read JMS message.", e);
- }
- }
-
- public void onMessage(javax.jms.Message message) {
- ILoggingEvent event;
- try {
- if (message instanceof ObjectMessage) {
- ObjectMessage objectMessage = (ObjectMessage) message;
- event = (ILoggingEvent) objectMessage.getObject();
- Logger log = (Logger) LoggerFactory.getLogger(event.getLoggerName());
- log.callAppenders(event);
- } else {
- logger.warn("Received message is of type " + message.getJMSType() + ", was expecting ObjectMessage.");
- }
- } catch (JMSException jmse) {
- logger.error("Exception thrown while processing incoming message.", jmse);
- }
- }
-
- protected Object lookup(Context ctx, String name) throws NamingException {
- try {
- return ctx.lookup(name);
- } catch (NameNotFoundException e) {
- logger.error("Could not find name " + name + ".");
- throw e;
- }
- }
-
- static void usage(String msg) {
- System.err.println(msg);
- System.err.println("Usage: java " + JMSTopicSink.class.getName() + " TopicConnectionFactoryBindingName TopicBindingName Username Password");
- System.exit(1);
- }
-}

_service:tar_scm:v_1.1.7.tar.gz/logback-classic/src/test/java/ch/qos/logback/classic/db Deleted

_service:tar_scm:v_1.1.7.tar.gz/logback-classic/src/test/java/ch/qos/logback/classic/db/DBAppenderH2Test.java Deleted

@@ -1,219 +0,0 @@
-/**
- * Logback: the reliable, generic, fast and flexible logging framework.
- * Copyright (C) 1999-2015, 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.classic.db;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.sql.Statement;
-import java.util.Date;
-import java.util.Map;
-
-import ch.qos.logback.classic.spi.CallerData;
-import ch.qos.logback.core.status.StatusChecker;
-import org.apache.log4j.MDC;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-import ch.qos.logback.classic.Level;
-import ch.qos.logback.classic.Logger;
-import ch.qos.logback.classic.LoggerContext;
-import ch.qos.logback.classic.spi.ILoggingEvent;
-import ch.qos.logback.classic.spi.LoggingEvent;
-import ch.qos.logback.core.db.DriverManagerConnectionSource;
-import ch.qos.logback.core.testUtil.RandomUtil;
-import ch.qos.logback.core.util.StatusPrinter;
-
-public class DBAppenderH2Test {
-
- LoggerContext loggerContext = new LoggerContext();;
- Logger logger;
- DBAppender appender;
- DriverManagerConnectionSource connectionSource;
- DBAppenderH2TestFixture dbAppenderH2TestFixture;
- int diff = RandomUtil.getPositiveInt();
- StatusChecker checker = new StatusChecker(loggerContext);
-
- @Before
- public void setUp() throws SQLException {
- dbAppenderH2TestFixture = new DBAppenderH2TestFixture();
- dbAppenderH2TestFixture.setUp();
- loggerContext.setName("default");
- logger = loggerContext.getLogger("root");
- appender = new DBAppender();
- appender.setName("DB");
- appender.setContext(loggerContext);
- connectionSource = new DriverManagerConnectionSource();
- connectionSource.setContext(loggerContext);
- connectionSource.setDriverClass(DBAppenderH2TestFixture.H2_DRIVER_CLASS);
- connectionSource.setUrl(dbAppenderH2TestFixture.url);
- System.out.println("cs.url=" + dbAppenderH2TestFixture.url);
- connectionSource.setUser(dbAppenderH2TestFixture.user);
- connectionSource.setPassword(dbAppenderH2TestFixture.password);
-
- connectionSource.start();
- appender.setConnectionSource(connectionSource);
- appender.start();
- }
-
- @After
- public void tearDown() throws SQLException {
- logger = null;
- loggerContext = null;
- appender = null;
- connectionSource = null;
- dbAppenderH2TestFixture.tearDown();
- }
-
- @Test
- public void testAppendLoggingEvent() throws SQLException {
- ILoggingEvent event = createLoggingEvent();
-
- appender.append(event);
-
- StatusPrinter.print(loggerContext);
-
- Statement stmt = connectionSource.getConnection().createStatement();
- ResultSet rs = null;
- rs = stmt.executeQuery("SELECT * FROM logging_event");
- if (rs.next()) {
- assertEquals(event.getTimeStamp(), rs.getLong(DBAppender.TIMESTMP_INDEX));
- assertEquals(event.getFormattedMessage(), rs.getString(DBAppender.FORMATTED_MESSAGE_INDEX));
- assertEquals(event.getLoggerName(), rs.getString(DBAppender.LOGGER_NAME_INDEX));
- assertEquals(event.getLevel().toString(), rs.getString(DBAppender.LEVEL_STRING_INDEX));
- assertEquals(event.getThreadName(), rs.getString(DBAppender.THREAD_NAME_INDEX));
- assertEquals(DBHelper.computeReferenceMask(event), rs.getShort(DBAppender.REFERENCE_FLAG_INDEX));
- assertEquals(String.valueOf(diff), rs.getString(DBAppender.ARG0_INDEX));
- StackTraceElement callerData = event.getCallerData()0;
- assertEquals(callerData.getFileName(), rs.getString(DBAppender.CALLER_FILENAME_INDEX));
- assertEquals(callerData.getClassName(), rs.getString(DBAppender.CALLER_CLASS_INDEX));
- assertEquals(callerData.getMethodName(), rs.getString(DBAppender.CALLER_METHOD_INDEX));
- } else {
- fail("No row was inserted in the database");
- }
-
- rs.close();
- stmt.close();
- }
-
- @Test
- public void testAppendThrowable() throws SQLException {
- ILoggingEvent event = createLoggingEvent();
- appender.append(event);
- Statement stmt = connectionSource.getConnection().createStatement();
- ResultSet rs = null;
- rs = stmt.executeQuery("SELECT * FROM LOGGING_EVENT_EXCEPTION WHERE EVENT_ID=1");
- rs.next();
- String expected = "java.lang.Exception: test Ex";
- String firstLine = rs.getString(3);
- assertTrue("" + firstLine + " does not match " + expected + "", firstLine.contains(expected));
-
- int i = 0;
- while (rs.next()) {
- expected = event.getThrowableProxy().getStackTraceElementProxyArray()i.toString();
- String st = rs.getString(3);
- assertTrue("" + st + " does not match " + expected + "", st.contains(expected));
- i++;
- }
- assertTrue(i != 0);
-
- rs.close();
- stmt.close();
- }
-
- @Test
- public void withNullArgument() throws SQLException {
- ILoggingEvent event = createLoggingEvent("Processing code {}; code type is {}; request date {}; record from date {}", new Object { 1, 2, new Date(),
- null });
- appender.append(event);
-
- Statement stmt = connectionSource.getConnection().createStatement();
- ResultSet rs = null;
- rs = stmt.executeQuery("SELECT * FROM logging_event");
- if (rs.next()) {
- assertEquals(event.getTimeStamp(), rs.getLong(DBAppender.TIMESTMP_INDEX));
- assertEquals(event.getFormattedMessage(), rs.getString(DBAppender.FORMATTED_MESSAGE_INDEX));
- }
- }
-
- @Test
- public void testContextInfo() throws SQLException {
- loggerContext.putProperty("testKey1", "testValue1");
- MDC.put("k" + diff, "v" + diff);
- ILoggingEvent event = createLoggingEvent();
-
- appender.append(event);
-
- Statement stmt = connectionSource.getConnection().createStatement();
- ResultSet rs = null;
- rs = stmt.executeQuery("SELECT * FROM LOGGING_EVENT_PROPERTY WHERE EVENT_ID=1");
- Map<String, String> map = appender.mergePropertyMaps(event);
- int i = 0;
- while (rs.next()) {
- String key = rs.getString(2);
- assertEquals(map.get(key), rs.getString(3));
- i++;
- }
- assertTrue(map.size() != 0);
- assertEquals(map.size(), i);
- rs.close();
- stmt.close();
- }
-
- @Test
- public void testAppendMultipleEvents() throws SQLException {
- for (int i = 0; i < 10; i++) {
- ILoggingEvent event = createLoggingEvent();
- appender.append(event);
- }
-
- Statement stmt = connectionSource.getConnection().createStatement();
- ResultSet rs = null;
- rs = stmt.executeQuery("SELECT * FROM logging_event");
- int count = 0;
- while (rs.next()) {
- count++;
- }
- assertEquals(10, count);
-
- rs.close();
- stmt.close();
- }
-
- // http://jira.qos.ch/browse/LOGBACK-805
- @Test
- public void emptyCallerDataShouldBeHandledGracefully() {
- LoggingEvent event = createLoggingEvent();
- event.setCallerData(new StackTraceElement0);
- appender.append(event);
-
- event.setCallerData(new StackTraceElement { null });
- appender.append(event);
-
- checker.assertIsErrorFree();
- }
-
- private LoggingEvent createLoggingEvent(String msg, Object args) {
- return new LoggingEvent(this.getClass().getName(), logger, Level.DEBUG, msg, new Exception("test Ex"), args);
- }
-
- private LoggingEvent createLoggingEvent() {
- return createLoggingEvent("test message", new Integer { diff });
- }
-
-}

_service:tar_scm:v_1.1.7.tar.gz/logback-classic/src/test/java/ch/qos/logback/classic/db/DBAppenderH2TestFixture.java Deleted

@@ -1,141 +0,0 @@
-/**
- * Logback: the reliable, generic, fast and flexible logging framework.
- * Copyright (C) 1999-2015, 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.classic.db;
-
-import static org.junit.Assert.assertNotNull;
-
-import java.sql.Connection;
-import java.sql.SQLException;
-import java.sql.Statement;
-import java.util.Properties;
-
-import org.h2.Driver;
-
-import ch.qos.logback.core.testUtil.RandomUtil;
-
-public class DBAppenderH2TestFixture {
-
-    public enum H2Mode {
-        MEM, FILE, NET;
-    }
-
-    public static final String H2_DRIVER_CLASS = "org.h2.Driver";
-    String url = null;
-    String user = "sa";
-    String password = "";
-
-    // boolean isNetwork = true;
-    H2Mode mode = H2Mode.MEM;
-
-    int diff = RandomUtil.getPositiveInt();
-
-    Connection connection;
-
-    public void setUp() throws SQLException {
-
-        switch (mode) {
-        case NET:
-            url = "jdbc:h2:tcp://localhost:4808/test";
-            break;
-        case MEM:
-            url = "jdbc:h2:mem:test" + diff;
-            break;
-        case FILE:
-            url = "jdbc:hsqldb:file:test;sql.enforce_strict_size=true";
-            break;
-
-        }
-        connection = newConnection();
-        createTables();
-    }
-
-    public void tearDown() throws SQLException {
-        dropTables();
-        connection.close();
-    }
-
-    Connection newConnection() throws SQLException {
-        System.out.println("url=" + url);
-        org.h2.Driver driver = Driver.load();
-        Properties props = new Properties();
-        props.setProperty("user", user);
-        props.setProperty("password", password);
-        return driver.connect(url, props);
-    }
-
-    private void createTables() throws SQLException {
-        assertNotNull(connection);
-        StringBuilder buf = new StringBuilder();
-        buf.append("CREATE TABLE LOGGING_EVENT (");
-        buf.append("TIMESTMP BIGINT NOT NULL,");
-        buf.append("FORMATTED_MESSAGE LONGVARCHAR NOT NULL,");
-        buf.append("LOGGER_NAME VARCHAR(256) NOT NULL,");
-        buf.append("LEVEL_STRING VARCHAR(256) NOT NULL,");
-        buf.append("THREAD_NAME VARCHAR(256),");
-        buf.append("REFERENCE_FLAG SMALLINT,");
-        buf.append("ARG0 VARCHAR(256),");
-        buf.append("ARG1 VARCHAR(256),");
-        buf.append("ARG2 VARCHAR(256),");
-        buf.append("ARG3 VARCHAR(256),");
-        buf.append("CALLER_FILENAME VARCHAR(256), ");
-        buf.append("CALLER_CLASS VARCHAR(256), ");
-        buf.append("CALLER_METHOD VARCHAR(256), ");
-        buf.append("CALLER_LINE CHAR(4), ");
-        buf.append("EVENT_ID IDENTITY NOT NULL);");
-        executeQuery(connection, buf.toString());
-
-        buf = new StringBuilder();
-        buf.append("CREATE TABLE LOGGING_EVENT_PROPERTY (");
-        buf.append("EVENT_ID BIGINT NOT NULL,");
-        buf.append("MAPPED_KEY  VARCHAR(254) NOT NULL,");
-        buf.append("MAPPED_VALUE LONGVARCHAR,");
-        buf.append("PRIMARY KEY(EVENT_ID, MAPPED_KEY),");
-        buf.append("FOREIGN KEY (EVENT_ID) REFERENCES LOGGING_EVENT(EVENT_ID));");
-        executeQuery(connection, buf.toString());
-
-        buf = new StringBuilder();
-        buf.append("CREATE TABLE LOGGING_EVENT_EXCEPTION (");
-        buf.append("EVENT_ID BIGINT NOT NULL,");
-        buf.append("I SMALLINT NOT NULL,");
-        buf.append("TRACE_LINE VARCHAR(256) NOT NULL,");
-        buf.append("PRIMARY KEY(EVENT_ID, I),");
-        buf.append("FOREIGN KEY (EVENT_ID) REFERENCES LOGGING_EVENT(EVENT_ID));");
-        executeQuery(connection, buf.toString());
-    }
-
-    private void dropTables() throws SQLException {
-        StringBuilder buf = new StringBuilder();
-        buf.append("DROP TABLE LOGGING_EVENT_EXCEPTION IF EXISTS;");
-        executeQuery(connection, buf.toString());
-
-        buf = new StringBuilder();
-        buf.append("DROP TABLE LOGGING_EVENT_PROPERTY IF EXISTS;");
-        executeQuery(connection, buf.toString());
-
-        buf = new StringBuilder();
-        buf.append("DROP TABLE LOGGING_EVENT IF EXISTS;");
-        executeQuery(connection, buf.toString());
-    }
-
-    private void executeQuery(Connection conn, String expression) throws SQLException {
-        Statement st = null;
-        st = conn.createStatement();
-        int i = st.executeUpdate(expression);
-        if (i == -1) {
-            throw new IllegalStateException("db error : " + expression);
-        }
-        st.close();
-    }
-
-}

_service:tar_scm:v_1.1.7.tar.gz/logback-classic/src/test/java/ch/qos/logback/classic/db/DBAppenderHSQLTest.java Deleted

@@ -1,199 +0,0 @@
-/**
- * Logback: the reliable, generic, fast and flexible logging framework.
- * Copyright (C) 1999-2015, 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.classic.db;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.sql.Statement;
-import java.util.Map;
-
-import org.apache.log4j.MDC;
-import org.junit.*;
-
-import ch.qos.logback.classic.Level;
-import ch.qos.logback.classic.Logger;
-import ch.qos.logback.classic.LoggerContext;
-import ch.qos.logback.classic.spi.ILoggingEvent;
-import ch.qos.logback.classic.spi.LoggingEvent;
-import ch.qos.logback.core.db.DriverManagerConnectionSource;
-import ch.qos.logback.core.testUtil.RandomUtil;
-import ch.qos.logback.core.util.StatusPrinter;
-
-public class DBAppenderHSQLTest {
-
- LoggerContext lc;
- Logger logger;
- DBAppender appender;
- DriverManagerConnectionSource connectionSource;
-
- static DBAppenderHSQLTestFixture DB_APPENDER_HSQL_TEST_FIXTURE;
- int diff = RandomUtil.getPositiveInt();
- int existingRowCount;
- Statement stmt;
-
- @BeforeClass
- public static void beforeClass() throws SQLException {
- DB_APPENDER_HSQL_TEST_FIXTURE = new DBAppenderHSQLTestFixture();
- DB_APPENDER_HSQL_TEST_FIXTURE.setUp();
- }
-
- @AfterClass
- public static void afterClass() throws SQLException {
- DB_APPENDER_HSQL_TEST_FIXTURE.tearDown();
- }
-
- @Before
- public void setUp() throws SQLException {
- lc = new LoggerContext();
- lc.setName("default");
- logger = lc.getLogger("root");
- appender = new DBAppender();
- appender.setName("DB");
- appender.setContext(lc);
- connectionSource = new DriverManagerConnectionSource();
- connectionSource.setContext(lc);
- connectionSource.setDriverClass(DBAppenderHSQLTestFixture.HSQLDB_DRIVER_CLASS);
- connectionSource.setUrl(DB_APPENDER_HSQL_TEST_FIXTURE.url);
- connectionSource.setUser(DB_APPENDER_HSQL_TEST_FIXTURE.user);
- connectionSource.setPassword(DB_APPENDER_HSQL_TEST_FIXTURE.password);
- connectionSource.start();
- appender.setConnectionSource(connectionSource);
- appender.start();
-
- stmt = connectionSource.getConnection().createStatement();
- existingRowCount = existingRowCount(stmt);
-
- }
-
- @After
- public void tearDown() throws SQLException {
- logger = null;
- lc = null;
- appender = null;
- connectionSource = null;
- stmt.close();
- }
-
- int existingRowCount(Statement stmt) throws SQLException {
- ResultSet rs = stmt.executeQuery("SELECT count(*) FROM logging_event");
- int result = -1;
- if (rs.next()) {
- result = rs.getInt(1);
- }
- rs.close();
- return result;
- }
-
- @Test
- public void testAppendLoggingEvent() throws SQLException {
-
- ILoggingEvent event = createLoggingEvent();
- appender.append(event);
- StatusPrinter.printInCaseOfErrorsOrWarnings(lc);
-
- ResultSet rs = null;
- rs = stmt.executeQuery("SELECT * FROM logging_event where EVENT_ID = " + existingRowCount);
- if (rs.next()) {
- assertEquals(event.getTimeStamp(), rs.getLong(DBAppender.TIMESTMP_INDEX));
- assertEquals(event.getFormattedMessage(), rs.getString(DBAppender.FORMATTED_MESSAGE_INDEX));
- assertEquals(event.getLoggerName(), rs.getString(DBAppender.LOGGER_NAME_INDEX));
- assertEquals(event.getLevel().toString(), rs.getString(DBAppender.LEVEL_STRING_INDEX));
- assertEquals(event.getThreadName(), rs.getString(DBAppender.THREAD_NAME_INDEX));
- assertEquals(DBHelper.computeReferenceMask(event), rs.getShort(DBAppender.REFERENCE_FLAG_INDEX));
- assertEquals(String.valueOf(diff), rs.getString(DBAppender.ARG0_INDEX));
- StackTraceElement callerData = event.getCallerData()0;
- assertEquals(callerData.getFileName(), rs.getString(DBAppender.CALLER_FILENAME_INDEX));
- assertEquals(callerData.getClassName(), rs.getString(DBAppender.CALLER_CLASS_INDEX));
- assertEquals(callerData.getMethodName(), rs.getString(DBAppender.CALLER_METHOD_INDEX));
- } else {
- fail("No row was inserted in the database");
- }
- rs.close();
- }
-
- @Test
- public void testAppendThrowable() throws SQLException {
- ILoggingEvent event = createLoggingEvent();
- appender.append(event);
-
- ResultSet rs = null;
- rs = stmt.executeQuery("SELECT * FROM LOGGING_EVENT_EXCEPTION where EVENT_ID = " + existingRowCount);
-
- rs.next();
- String expected = "java.lang.Exception: test Ex";
- String firstLine = rs.getString(3);
- assertTrue("" + firstLine + " does not match " + expected + "", firstLine.contains(expected));
-
- int i = 0;
- while (rs.next()) {
- expected = event.getThrowableProxy().getStackTraceElementProxyArray()i.toString();
- String st = rs.getString(3);
- assertTrue("" + st + " does not match " + expected + "", st.contains(expected));
- i++;
- }
- assertTrue(i != 0);
- rs.close();
- }
-
- @Test
- public void testContextInfo() throws SQLException {
- lc.putProperty("testKey1", "testValue1");
- MDC.put("k" + diff, "v" + diff);
- ILoggingEvent event = createLoggingEvent();
-
- appender.append(event);
-
- Statement stmt = connectionSource.getConnection().createStatement();
- ResultSet rs = null;
- rs = stmt.executeQuery("SELECT * FROM LOGGING_EVENT_PROPERTY WHERE EVENT_ID = " + existingRowCount);
- Map<String, String> map = appender.mergePropertyMaps(event);
- System.out.println("ma.size=" + map.size());
- int i = 0;
- while (rs.next()) {
- String key = rs.getString(2);
- assertEquals(map.get(key), rs.getString(3));
- i++;
- }
- assertTrue(map.size() != 0);
- assertEquals(map.size(), i);
- rs.close();
- }
-
- @Test
- public void testAppendMultipleEvents() throws SQLException {
- int numEvents = 3;
- for (int i = 0; i < numEvents; i++) {
- ILoggingEvent event = createLoggingEvent();
- appender.append(event);
- }
-
- Statement stmt = connectionSource.getConnection().createStatement();
- ResultSet rs = null;
- rs = stmt.executeQuery("SELECT * FROM logging_event WHERE EVENT_ID >=" + existingRowCount);
- int count = 0;
- while (rs.next()) {
- count++;
- }
- assertEquals(numEvents, count);
- rs.close();
- }
-
- private ILoggingEvent createLoggingEvent() {
- return new LoggingEvent(this.getClass().getName(), logger, Level.DEBUG, "test message", new Exception("test Ex"), new Integer { diff });
- }
-}

_service:tar_scm:v_1.1.7.tar.gz/logback-classic/src/test/java/ch/qos/logback/classic/db/DBAppenderHSQLTestFixture.java Deleted

@@ -1,175 +0,0 @@
-/**
- * Logback: the reliable, generic, fast and flexible logging framework.
- * Copyright (C) 1999-2015, 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.classic.db;
-
-import static org.junit.Assert.assertNotNull;
-
-import java.io.PrintWriter;
-import java.sql.Connection;
-import java.sql.SQLException;
-import java.sql.Statement;
-import java.util.Properties;
-
-import org.hsqldb.Server;
-import org.hsqldb.ServerConstants;
-import org.hsqldb.jdbcDriver;
-
-public class DBAppenderHSQLTestFixture {
-
- public static final String HSQLDB_DRIVER_CLASS = "org.hsqldb.jdbcDriver";
- // String serverProps;
- String url = null;
- String user = "sa";
- String password = "";
- Server server;
-
- // boolean isNetwork = true;
- HsqlMode mode = HsqlMode.MEM;
-
- public void setUp() throws SQLException {
-
- switch (mode) {
- case NET:
- url = "jdbc:hsqldb:hsql://localhost:4808/test";
- break;
- case MEM:
- url = "jdbc:hsqldb:mem:test;sql.enforce_strict_size=true";
- server = new Server();
- server.setDatabaseName(0, "test");
- server.setDatabasePath(0, url);
- server.setLogWriter(new PrintWriter(System.out));
- server.setErrWriter(new PrintWriter(System.out));
- server.setTrace(false);
- server.setSilent(false);
- server.start();
-
- break;
- case FILE:
- url = "jdbc:hsqldb:file:test;sql.enforce_strict_size=true";
- break;
-
- }
-
- // try {
- // Class.forName(DRIVER_CLASS);
- // } catch (Exception e) {
- // e.printStackTrace();
- // System.out.println(this + ".setUp() error: " + e.getMessage());
- // }
- // Thread.yield();
- System.out.println(server.getState());
-
- int waitCount = 0;
- while (server.getState() != ServerConstants.SERVER_STATE_ONLINE && waitCount < 5) {
- try {
- waitCount++;
- Thread.sleep(1);
- } catch (InterruptedException e) {
- }
- }
- createTables();
- }
-
- public void tearDown() throws SQLException {
- dropTables();
-
- if (mode == HsqlMode.MEM) {
- server.stop();
- server = null;
- }
- }
-
- Connection newConnection() throws SQLException {
- jdbcDriver driver = new jdbcDriver();
- Properties props = new Properties();
- props.setProperty("user", user);
- props.setProperty("password", password);
- return driver.connect(url, props);
-
- // return DriverManager.getConnection(url, user, password);
- }
-
- private void createTables() throws SQLException {
- Connection conn = newConnection();
- assertNotNull(conn);
- StringBuilder buf = new StringBuilder();
- buf.append("CREATE TABLE LOGGING_EVENT (");
- buf.append("TIMESTMP BIGINT NOT NULL,");
- buf.append("FORMATTED_MESSAGE LONGVARCHAR NOT NULL,");
- buf.append("LOGGER_NAME VARCHAR(256) NOT NULL,");
- buf.append("LEVEL_STRING VARCHAR(256) NOT NULL,");
- buf.append("THREAD_NAME VARCHAR(256),");
- buf.append("REFERENCE_FLAG SMALLINT,");
-
- buf.append("ARG0 VARCHAR(256),");
- buf.append("ARG1 VARCHAR(256),");
- buf.append("ARG2 VARCHAR(256),");
- buf.append("ARG3 VARCHAR(256),");
-
- buf.append("CALLER_FILENAME VARCHAR(256), ");
- buf.append("CALLER_CLASS VARCHAR(256), ");
- buf.append("CALLER_METHOD VARCHAR(256), ");
- buf.append("CALLER_LINE CHAR(4), ");
- buf.append("EVENT_ID BIGINT NOT NULL IDENTITY);");
- query(conn, buf.toString());
-
- buf = new StringBuilder();
- buf.append("CREATE TABLE LOGGING_EVENT_PROPERTY (");
- buf.append("EVENT_ID BIGINT NOT NULL,");
- buf.append("MAPPED_KEY VARCHAR(254) NOT NULL,");
- buf.append("MAPPED_VALUE LONGVARCHAR,");
- buf.append("PRIMARY KEY(EVENT_ID, MAPPED_KEY),");
- buf.append("FOREIGN KEY (EVENT_ID) REFERENCES LOGGING_EVENT(EVENT_ID));");
- query(conn, buf.toString());
-
- buf = new StringBuilder();
- buf.append("CREATE TABLE LOGGING_EVENT_EXCEPTION (");
- buf.append("EVENT_ID BIGINT NOT NULL,");
- buf.append("I SMALLINT NOT NULL,");
- buf.append("TRACE_LINE VARCHAR(256) NOT NULL,");
- buf.append("PRIMARY KEY(EVENT_ID, I),");
- buf.append("FOREIGN KEY (EVENT_ID) REFERENCES LOGGING_EVENT(EVENT_ID));");
- query(conn, buf.toString());
- }
-
- private void dropTables() throws SQLException {
- Connection conn = newConnection();
- StringBuilder buf = new StringBuilder();
- buf.append("DROP TABLE LOGGING_EVENT_EXCEPTION IF EXISTS;");
- query(conn, buf.toString());
-
- buf = new StringBuilder();
- buf.append("DROP TABLE LOGGING_EVENT_PROPERTY IF EXISTS;");
- query(conn, buf.toString());
-
- buf = new StringBuilder();
- buf.append("DROP TABLE LOGGING_EVENT IF EXISTS;");
- query(conn, buf.toString());
- }
-
- private void query(Connection conn, String expression) throws SQLException {
-
- Statement st = null;
- st = conn.createStatement();
- int i = st.executeUpdate(expression);
- if (i == -1) {
- System.out.println("db error : " + expression);
- }
- st.close();
- }
-
- public enum HsqlMode {
- MEM, FILE, NET;
- }
-}

_service:tar_scm:v_1.1.7.tar.gz/logback-classic/src/test/java/ch/qos/logback/classic/db/DBAppenderIntegrationTest.java Deleted

@@ -1,235 +0,0 @@
-/**
- * Logback: the reliable, generic, fast and flexible logging framework.
- * Copyright (C) 1999-2015, 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.classic.db;
-
-import ch.qos.logback.classic.LoggerContext;
-import ch.qos.logback.classic.joran.JoranConfigurator;
-import ch.qos.logback.core.db.DriverManagerConnectionSource;
-import ch.qos.logback.core.joran.spi.JoranException;
-import ch.qos.logback.core.status.StatusChecker;
-import ch.qos.logback.core.testUtil.RandomUtil;
-import ch.qos.logback.core.util.EnvUtil;
-import ch.qos.logback.core.util.StatusPrinter;
-import org.junit.*;
-import org.slf4j.Logger;
-import org.slf4j.MDC;
-
-import java.net.InetAddress;
-import java.sql.Connection;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.sql.Statement;
-import java.util.HashMap;
-import java.util.Map;
-
-import static org.junit.Assert.*;
-
-public class DBAppenderIntegrationTest {
-
- static String LOCAL_HOST_NAME;
- static String CONFORMING_HOST_LIST = new String { "Orion" };
- static String POSTGRES_CONFORMING_HOST_LIST = new String { "haro" };
- static String MYSQL_CONFORMING_HOST_LIST = new String { "xharo" };
- static String ORACLE_CONFORMING_HOST_LIST = new String { "xharo" };
-
- int diff = RandomUtil.getPositiveInt();
- LoggerContext lc = new LoggerContext();
-
- @BeforeClass
- public static void setUpBeforeClass() throws Exception {
- InetAddress localhostIA = InetAddress.getLocalHost();
- LOCAL_HOST_NAME = localhostIA.getHostName();
- }
-
- @AfterClass
- public static void tearDownAfterClass() throws Exception {
- }
-
- @Before
- public void setUp() throws Exception {
- lc.setName("lc" + diff);
- }
-
- @After
- public void tearDown() throws Exception {
- // lc will never be used again
- lc.stop();
- }
-
- DriverManagerConnectionSource getConnectionSource() {
- ch.qos.logback.classic.Logger root = (ch.qos.logback.classic.Logger) lc.getLogger(Logger.ROOT_LOGGER_NAME);
-
- DBAppender dbAppender = (DBAppender) root.getAppender("DB");
- assertNotNull(dbAppender);
- return (DriverManagerConnectionSource) dbAppender.getConnectionSource();
-
- }
-
- public void doTest(String configFile) throws JoranException, SQLException {
- JoranConfigurator configurator = new JoranConfigurator();
- configurator.setContext(lc);
- configurator.doConfigure(configFile);
-
- Logger logger = lc.getLogger(DBAppenderIntegrationTest.class);
-
- // the key userid is used in SiftingAppender test
- // suffix with diff to avoid collision
- MDC.put("userid" + diff, "user" + diff);
- int runLength = 5;
- for (int i = 1; i <= runLength; i++) {
- logger.debug("This is a debug message. Message number: " + (diff + i));
- }
-
- Exception e = new Exception("Just testing", getCause());
- logger.error("At last an error.", e);
-
- StatusPrinter.printInCaseOfErrorsOrWarnings(lc);
-
- long lastEventId = getLastEventId();
- verify(lastEventId);
-
- // check that there were no errors
- StatusChecker checker = new StatusChecker(lc);
- checker.assertIsErrorFree();
- }
-
- long getLastEventId() throws SQLException {
- DriverManagerConnectionSource cs = getConnectionSource();
-
- Connection con = cs.getConnection();
- Statement statement = con.createStatement();
- statement.setMaxRows(1);
- ResultSet rs = statement.executeQuery("select event_id from logging_event order by event_id desc");
- rs.next();
- long eventId = rs.getLong(1);
- rs.close();
- statement.close();
- return eventId;
- }
-
- void verify(long lastEventId) throws SQLException {
- verifyDebugMsg(lastEventId);
- verifyException(lastEventId);
- verifyProperty(lastEventId);
-
- }
-
- void verifyDebugMsg(long lastEventId) throws SQLException {
- DriverManagerConnectionSource cs = getConnectionSource();
- Connection con = cs.getConnection();
- Statement statement = con.createStatement();
- ResultSet rs = statement.executeQuery("select formatted_message from logging_event where event_id='" + (lastEventId - 1) + "'");
- rs.next();
- String msg = rs.getString(1);
- assertEquals("This is a debug message. Message number: " + (diff + 5), msg);
- }
-
- @SuppressWarnings("unchecked")
- void verifyProperty(long lastEventId) throws SQLException {
- DriverManagerConnectionSource cs = getConnectionSource();
- Connection con = cs.getConnection();
- Statement statement = con.createStatement();
- ResultSet rs = statement.executeQuery("select mapped_key, mapped_value from logging_event_property where event_id='" + (lastEventId - 1) + "'");
-
- Map<String, String> witness = lc.getCopyOfPropertyMap();
- witness.putAll(MDC.getCopyOfContextMap());
-
- Map<String, String> map = new HashMap<String, String>();
- while (rs.next()) {
- String key = rs.getString(1);
- String val = rs.getString(2);
- map.put(key, val);
- }
-
- assertEquals(witness, map);
- }
-
- void verifyException(long lastEventId) throws SQLException {
- DriverManagerConnectionSource cs = getConnectionSource();
- Connection con = cs.getConnection();
- Statement statement = con.createStatement();
- ResultSet rs = statement.executeQuery("select trace_line from logging_event_exception where event_id='" + (lastEventId) + "' AND I='0'");
- rs.next();
- String traceLine = rs.getString(1);
- assertEquals("java.lang.Exception: Just testing", traceLine);
- }
-
- Throwable getCause() {
- return new IllegalStateException("test cause");
- }
-
- static boolean isConformingHostAndJDK16OrHigher(String conformingHostList) {
- if (!EnvUtil.isJDK6OrHigher()) {
- return false;
- }
- for (String conformingHost : conformingHostList) {
- if (conformingHost.equalsIgnoreCase(LOCAL_HOST_NAME)) {
- return true;
- }
- }
- return false;
- }
-
- static boolean isConformingHostAndJDK16OrHigher() {
- return isConformingHostAndJDK16OrHigher(CONFORMING_HOST_LIST);
- }
-
- @Test
- public void sqlserver() throws Exception {
- // perform test only on conforming hosts
- if (!isConformingHostAndJDK16OrHigher()) {
- return;
- }
- doTest("src/test/input/integration/db/sqlserver-with-driver.xml");
- }
-
- @Test
- public void oracle10g() throws Exception {
- // perform test only on conforming hosts
- if (!isConformingHostAndJDK16OrHigher(ORACLE_CONFORMING_HOST_LIST)) {
- return;
- }
- doTest("src/test/input/integration/db/oracle10g-with-driver.xml");
- }
-
- @Test
- @Ignore
- public void oracle11g() throws Exception {
- // perform test only on conforming hosts
- if (!isConformingHostAndJDK16OrHigher()) {
- return;
- }
- doTest("src/test/input/integration/db/oracle11g-with-driver.xml");
- }
-
- @Test
- public void mysql() throws Exception {
- // perform test only on conforming hosts
- if (!isConformingHostAndJDK16OrHigher(MYSQL_CONFORMING_HOST_LIST)) {
- return;
- }
- doTest("src/test/input/integration/db/mysql-with-driver.xml");
- }
-
- @Test
- public void postgres() throws Exception {
- // perform test only on conforming hosts
- if (!isConformingHostAndJDK16OrHigher(POSTGRES_CONFORMING_HOST_LIST)) {
- return;
- }
- System.out.println("running postgres() test");
- doTest("src/test/input/integration/db/postgresql-with-driver.xml");
- }
-
-}

_service:tar_scm:v_1.1.7.tar.gz/logback-classic/src/test/java/ch/qos/logback/classic/db/PackageTest.java Deleted

_service:tar_scm:v_1.1.7.tar.gz/logback-classic/src/test/java/ch/qos/logback/classic/db/SQLBuilderTest.java Deleted

@@ -1,117 +0,0 @@
-/**
- * Logback: the reliable, generic, fast and flexible logging framework.
- * Copyright (C) 1999-2015, 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.classic.db;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-import org.junit.Test;
-
-import ch.qos.logback.classic.db.names.DBNameResolver;
-import ch.qos.logback.classic.db.names.DefaultDBNameResolver;
-import ch.qos.logback.classic.db.names.SimpleDBNameResolver;
-
-/**
- * @author Tomasz Nurkiewicz
- * @since 2010-03-22
- */
-public class SQLBuilderTest {
-
-    @Test
-    public void shouldReturnDefaultSqlInsertLoggingEventQuery() throws Exception {
-        // given
-        DBNameResolver nameResolver = new DefaultDBNameResolver();
-
-        // when
-        String sql = SQLBuilder.buildInsertSQL(nameResolver);
-
-        // then
-        final String expected = "INSERT INTO logging_event (timestmp, formatted_message, logger_name, level_string, thread_name, reference_flag, arg0, arg1, arg2, arg3, caller_filename, caller_class, caller_method, caller_line) VALUES (?, ?, ? ,?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)";
-        assertThat(sql).isEqualTo(expected);
-    }
-
-    @Test
-    public void shouldReturnDefaultSqlInsertExceptionQuery() throws Exception {
-        // given
-        DBNameResolver nameResolver = new DefaultDBNameResolver();
-
-        // when
-        String sql = SQLBuilder.buildInsertExceptionSQL(nameResolver);
-
-        // then
-        final String expected = "INSERT INTO logging_event_exception (event_id, i, trace_line) VALUES (?, ?, ?)";
-        assertThat(sql).isEqualTo(expected);
-    }
-
-    @Test
-    public void shouldReturnDefaultSqlInsertLoggingPropertyQuery() throws Exception {
-        // given
-        DBNameResolver nameResolver = new DefaultDBNameResolver();
-
-        // when
-        String sql = SQLBuilder.buildInsertPropertiesSQL(nameResolver);
-
-        // then
-        final String expected = "INSERT INTO logging_event_property (event_id, mapped_key, mapped_value) VALUES (?, ?, ?)";
-        assertThat(sql).isEqualTo(expected);
-    }
-
-    private DBNameResolver createSimpleDBNameResolver() {
-        final SimpleDBNameResolver nameResolver = new SimpleDBNameResolver();
-        nameResolver.setTableNamePrefix("tp_");
-        nameResolver.setTableNameSuffix("_ts");
-        nameResolver.setColumnNamePrefix("cp_");
-        nameResolver.setColumnNameSuffix("_cs");
-        return nameResolver;
-    }
-
-    @Test
-    public void shouldReturnSimpleSqlInsertLoggingEventQuery() throws Exception {
-        // given
-        DBNameResolver nameResolver = createSimpleDBNameResolver();
-
-        // when
-        String sql = SQLBuilder.buildInsertSQL(nameResolver);
-
-        // then
-        final String expected = "INSERT INTO tp_logging_event_ts (cp_timestmp_cs, cp_formatted_message_cs, cp_logger_name_cs, cp_level_string_cs, cp_thread_name_cs, cp_reference_flag_cs, cp_arg0_cs, cp_arg1_cs, cp_arg2_cs, cp_arg3_cs, cp_caller_filename_cs, cp_caller_class_cs, cp_caller_method_cs, cp_caller_line_cs) VALUES (?, ?, ? ,?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)";
-        assertThat(sql).isEqualTo(expected);
-    }
-
-    @Test
-    public void shouldReturnSimpleSqlInsertExceptionQuery() throws Exception {
-        // given
-        DBNameResolver nameResolver = createSimpleDBNameResolver();
-
-        // when
-        String sql = SQLBuilder.buildInsertExceptionSQL(nameResolver);
-
-        // then
-        final String expected = "INSERT INTO tp_logging_event_exception_ts (cp_event_id_cs, cp_i_cs, cp_trace_line_cs) VALUES (?, ?, ?)";
-        assertThat(sql).isEqualTo(expected);
-    }
-
-    @Test
-    public void shouldReturnSimpleSqlInsertLoggingPropertyQuery() throws Exception {
-        // given
-        DBNameResolver nameResolver = createSimpleDBNameResolver();
-
-        // when
-        String sql = SQLBuilder.buildInsertPropertiesSQL(nameResolver);
-
-        // then
-        final String expected = "INSERT INTO tp_logging_event_property_ts (cp_event_id_cs, cp_mapped_key_cs, cp_mapped_value_cs) VALUES (?, ?, ?)";
-        assertThat(sql).isEqualTo(expected);
-    }
-
-}

_service:tar_scm:v_1.1.7.tar.gz/logback-classic/src/test/java/ch/qos/logback/classic/db/names Deleted

_service:tar_scm:v_1.1.7.tar.gz/logback-classic/src/test/java/ch/qos/logback/classic/db/names/DefaultDBNameResolverTest.java Deleted

@@ -1,70 +0,0 @@
-/**
- * Logback: the reliable, generic, fast and flexible logging framework.
- * Copyright (C) 1999-2015, 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.classic.db.names;
-
-import org.junit.Before;
-import org.junit.Test;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-/**
- * @author Tomasz Nurkiewicz
- * @since 2010-03-18
- */
-public class DefaultDBNameResolverTest {
-
-    private DefaultDBNameResolver resolver;
-
-    @Before
-    public void setUp() throws Exception {
-        resolver = new DefaultDBNameResolver();
-    }
-
-    @Test
-    public void testGetLoggingEventColumnName() throws Exception {
-        // when
-        String columnName = resolver.getColumnName(ColumnName.LOGGER_NAME);
-
-        // then
-        assertThat(columnName).isEqualTo("logger_name");
-    }
-
-    @Test
-    public void testGetLoggingEventPropertyColumnName() throws Exception {
-        // when
-        String columnName = resolver.getColumnName(ColumnName.MAPPED_KEY);
-
-        // then
-        assertThat(columnName).isEqualTo("mapped_key");
-    }
-
-    @Test
-    public void testGetLoggingEventExceptionColumnName() throws Exception {
-        // when
-        String columnName = resolver.getColumnName(ColumnName.TRACE_LINE);
-
-        // then
-        assertThat(columnName).isEqualTo("trace_line");
-    }
-
-    @Test
-    public void testGetTableName() throws Exception {
-        // when
-        String tableName = resolver.getTableName(TableName.LOGGING_EVENT_EXCEPTION);
-
-        // then
-        assertThat(tableName).isEqualTo("logging_event_exception");
-    }
-
-}

_service:tar_scm:v_1.1.7.tar.gz/logback-classic/src/test/java/ch/qos/logback/classic/db/names/PackageTest.java Deleted

_service:tar_scm:v_1.1.7.tar.gz/logback-classic/src/test/java/ch/qos/logback/classic/db/names/SimpleDBNameResolverTest.java Deleted

@@ -1,142 +0,0 @@
-/**
- * Logback: the reliable, generic, fast and flexible logging framework.
- * Copyright (C) 1999-2015, 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.classic.db.names;
-
-import org.junit.Before;
-import org.junit.Test;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-/**
- * @author Tomasz Nurkiewicz
- * @since 2010-03-22
- */
-public class SimpleDBNameResolverTest {
-
-    private SimpleDBNameResolver nameResolver;
-
-    @Before
-    public void setUp() throws Exception {
-        nameResolver = new SimpleDBNameResolver();
-        /*
-         * nameResolver.setTableNameSuffix("_ts"); nameResolver.setColumnNamePrefix("cp_");
-         * nameResolver.setColumnNameSuffix("_cs");
-         */
-    }
-
-    @Test
-    public void shouldReturnTableNameWithPrefix() throws Exception {
-        // given
-
-        // when
-        nameResolver.setTableNamePrefix("tp_");
-
-        // then
-        assertThat(nameResolver.getTableName(TableName.LOGGING_EVENT)).isEqualTo("tp_logging_event");
-        assertThat(nameResolver.getColumnName(ColumnName.THREAD_NAME)).isEqualTo("thread_name");
-    }
-
-    @Test
-    public void shouldReturnTableNameWithSuffix() throws Exception {
-        // given
-
-        // when
-        nameResolver.setTableNameSuffix("_ts");
-
-        // then
-        assertThat(nameResolver.getTableName(TableName.LOGGING_EVENT)).isEqualTo("logging_event_ts");
-        assertThat(nameResolver.getColumnName(ColumnName.THREAD_NAME)).isEqualTo("thread_name");
-    }
-
-    @Test
-    public void shouldReturnTableNameWithBothPrefixAndSuffix() throws Exception {
-        // given
-
-        // when
-        nameResolver.setTableNamePrefix("tp_");
-        nameResolver.setTableNameSuffix("_ts");
-
-        // then
-        assertThat(nameResolver.getTableName(TableName.LOGGING_EVENT)).isEqualTo("tp_logging_event_ts");
-        assertThat(nameResolver.getColumnName(ColumnName.THREAD_NAME)).isEqualTo("thread_name");
-    }
-
-    @Test
-    public void shouldReturnColumnNameWithPrefix() throws Exception {
-        // given
-
-        // when
-        nameResolver.setColumnNamePrefix("cp_");
-
-        // then
-        assertThat(nameResolver.getTableName(TableName.LOGGING_EVENT)).isEqualTo("logging_event");
-        assertThat(nameResolver.getColumnName(ColumnName.THREAD_NAME)).isEqualTo("cp_thread_name");
-    }
-
-    @Test
-    public void shouldReturnColumnNameWithSuffix() throws Exception {
-        // given
-
-        // when
-        nameResolver.setColumnNameSuffix("_cs");
-
-        // then
-        assertThat(nameResolver.getTableName(TableName.LOGGING_EVENT)).isEqualTo("logging_event");
-        assertThat(nameResolver.getColumnName(ColumnName.THREAD_NAME)).isEqualTo("thread_name_cs");
-    }
-
-    @Test
-    public void shouldReturnColumnNameWithBothPrefixAndSuffix() throws Exception {
-        // given
-
-        // when
-        nameResolver.setColumnNamePrefix("cp_");
-        nameResolver.setColumnNameSuffix("_cs");
-
-        // then
-        assertThat(nameResolver.getTableName(TableName.LOGGING_EVENT)).isEqualTo("logging_event");
-        assertThat(nameResolver.getColumnName(ColumnName.THREAD_NAME)).isEqualTo("cp_thread_name_cs");
-    }
-
-    @Test
-    public void shouldReturnTableAndColumnNamesWithBothPrefixAndSuffix() throws Exception {
-        // given
-
-        // when
-        nameResolver.setTableNamePrefix("tp_");
-        nameResolver.setTableNameSuffix("_ts");
-        nameResolver.setColumnNamePrefix("cp_");
-        nameResolver.setColumnNameSuffix("_cs");
-
-        // then
-        assertThat(nameResolver.getTableName(TableName.LOGGING_EVENT)).isEqualTo("tp_logging_event_ts");
-        assertThat(nameResolver.getColumnName(ColumnName.THREAD_NAME)).isEqualTo("cp_thread_name_cs");
-    }
-
-    @Test
-    public void shouldHandleNullsAsEmptyStrings() throws Exception {
-        // given
-
-        // when
-        nameResolver.setTableNamePrefix(null);
-        nameResolver.setTableNameSuffix(null);
-        nameResolver.setColumnNamePrefix(null);
-        nameResolver.setColumnNameSuffix(null);
-
-        // then
-        assertThat(nameResolver.getTableName(TableName.LOGGING_EVENT)).isEqualTo("logging_event");
-        assertThat(nameResolver.getColumnName(ColumnName.THREAD_NAME)).isEqualTo("thread_name");
-    }
-
-}

_service:tar_scm:v_1.1.7.tar.gz/logback-classic/src/test/java/ch/qos/logback/classic/net/JMSQueueAppenderTest.java Deleted

@@ -1,143 +0,0 @@
-/**
- * Logback: the reliable, generic, fast and flexible logging framework.
- * Copyright (C) 1999-2015, 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.classic.net;
-
-import java.io.Serializable;
-
-import javax.jms.ObjectMessage;
-
-import junit.framework.TestCase;
-import ch.qos.logback.classic.Level;
-import ch.qos.logback.classic.net.mock.MockQueue;
-import ch.qos.logback.classic.net.mock.MockQueueConnectionFactory;
-import ch.qos.logback.classic.net.mock.MockQueueSender;
-import ch.qos.logback.classic.spi.ILoggingEvent;
-import ch.qos.logback.classic.spi.LoggingEvent;
-import ch.qos.logback.classic.util.MockInitialContext;
-import ch.qos.logback.classic.util.MockInitialContextFactory;
-import ch.qos.logback.core.ContextBase;
-import ch.qos.logback.core.spi.PreSerializationTransformer;
-
-public class JMSQueueAppenderTest extends TestCase {
-
- ch.qos.logback.core.Context context;
- JMSQueueAppender appender;
- PreSerializationTransformer<ILoggingEvent> pst = new LoggingEventPreSerializationTransformer();
-
- @Override
- protected void setUp() throws Exception {
- context = new ContextBase();
- appender = new JMSQueueAppender();
- appender.setContext(context);
- appender.setName("jmsQueue");
- appender.qcfBindingName = "queueCnxFactory";
- appender.queueBindingName = "testQueue";
- appender.setProviderURL("url");
- appender.setInitialContextFactoryName(MockInitialContextFactory.class.getName());
-
- MockInitialContext mic = MockInitialContextFactory.getContext();
- mic.map.put(appender.qcfBindingName, new MockQueueConnectionFactory());
- mic.map.put(appender.queueBindingName, new MockQueue(appender.queueBindingName));
-
- super.setUp();
- }
-
- @Override
- protected void tearDown() throws Exception {
- appender = null;
- context = null;
- super.tearDown();
- }
-
- public void testAppendOk() {
- appender.start();
-
- ILoggingEvent le = createLoggingEvent();
- appender.append(le);
-
- MockQueueSender qs = (MockQueueSender) appender.queueSender;
- assertEquals(1, qs.getMessageList().size());
- ObjectMessage message = (ObjectMessage) qs.getMessageList().get(0);
- try {
- Serializable witness = pst.transform(le);
- assertEquals(witness, message.getObject());
- } catch (Exception e) {
- fail();
- }
- }
-
- public void testAppendFailure() {
- appender.start();
-
- // make sure the append method does not work
- appender.queueSender = null;
-
- ILoggingEvent le = createLoggingEvent();
- for (int i = 1; i <= 3; i++) {
- appender.append(le);
- assertEquals(i, context.getStatusManager().getCount());
- assertTrue(appender.isStarted());
- }
- appender.append(le);
- assertEquals(4, context.getStatusManager().getCount());
- assertFalse(appender.isStarted());
- }
-
- public void testStartMinimalInfo() {
- // let's leave only what's in the setup()
- // method, minus the providerURL
- appender.setProviderURL(null);
- appender.start();
-
- assertTrue(appender.isStarted());
-
- try {
- assertEquals(appender.queueBindingName, appender.queueSender.getQueue().getQueueName());
- } catch (Exception e) {
- fail();
- }
- }
-
- public void testStartUserPass() {
- appender.setUserName("test");
- appender.setPassword("test");
-
- appender.start();
-
- assertTrue(appender.isStarted());
-
- try {
- assertEquals(appender.queueBindingName, appender.queueSender.getQueue().getQueueName());
- } catch (Exception e) {
- fail();
- }
- }
-
- public void testStartFails() {
- appender.queueBindingName = null;
-
- appender.start();
-
- assertFalse(appender.isStarted());
- }
-
- private ILoggingEvent createLoggingEvent() {
- LoggingEvent le = new LoggingEvent();
- le.setLevel(Level.DEBUG);
- le.setMessage("test message");
- le.setTimeStamp(System.currentTimeMillis());
- le.setThreadName(Thread.currentThread().getName());
- return le;
- }
-}

_service:tar_scm:v_1.1.7.tar.gz/logback-classic/src/test/java/ch/qos/logback/classic/net/JMSQueueAppenderTestApp.java Deleted

@@ -1,61 +0,0 @@
-/**
- * Logback: the reliable, generic, fast and flexible logging framework.
- * Copyright (C) 1999-2015, 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.classic.net;
-
-import org.slf4j.LoggerFactory;
-
-import ch.qos.logback.classic.Logger;
-import ch.qos.logback.classic.LoggerContext;
-import ch.qos.logback.core.util.StatusPrinter;
-
-public class JMSQueueAppenderTestApp {
-
- public static void main(String args) {
- Logger logger = (Logger) LoggerFactory.getLogger(JMSTopicAppenderTestApp.class);
- LoggerContext lc = (LoggerContext) LoggerFactory.getILoggerFactory();
- lc.reset();
-
- JMSQueueAppender appender = new JMSQueueAppender();
- appender.setContext(lc);
- appender.setName("jmsQueue");
- appender.setInitialContextFactoryName("org.apache.activemq.jndi.ActiveMQInitialContextFactory");
- // appender.setPassword("");
- appender.setProviderURL("tcp://localhost:61616");
- // appender.setSecurityCredentials("");
- // appender.setSecurityPrincipalName("");
- appender.setQueueBindingName("MyQueue");
- appender.setQueueConnectionFactoryBindingName("ConnectionFactory");
- // appender.setURLPkgPrefixes("");
- // appender.setUserName("");
-
- appender.start();
- logger.addAppender(appender);
-
- // JIT
- for (int i = 0; i < 10000; i++) {
- logger.debug("** Hello world. n=" + i);
- }
-
- long before = System.nanoTime();
- for (int i = 0; i < 10000; i++) {
- logger.debug("** Hello world. n=" + i);
- }
- long after = System.nanoTime();
-
- System.out.println("Time per logs for 10'000 logs: " + (after - before) / 10000);
-
- StatusPrinter.print(lc.getStatusManager());
- }
-
-}
\ No newline at end of file

_service:tar_scm:v_1.1.7.tar.gz/logback-classic/src/test/java/ch/qos/logback/classic/net/JMSTopicAppenderTest.java Deleted

@@ -1,230 +0,0 @@
-/**
- * Logback: the reliable, generic, fast and flexible logging framework.
- * Copyright (C) 1999-2015, 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.classic.net;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-
-import java.io.Serializable;
-import java.util.Properties;
-
-import javax.jms.ObjectMessage;
-import javax.naming.Context;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-import ch.qos.logback.classic.Level;
-import ch.qos.logback.classic.net.mock.MockTopic;
-import ch.qos.logback.classic.net.mock.MockTopicConnectionFactory;
-import ch.qos.logback.classic.net.mock.MockTopicPublisher;
-import ch.qos.logback.classic.spi.ILoggingEvent;
-import ch.qos.logback.classic.spi.LoggingEvent;
-import ch.qos.logback.classic.util.MockInitialContext;
-import ch.qos.logback.classic.util.MockInitialContextFactory;
-import ch.qos.logback.core.ContextBase;
-import ch.qos.logback.core.spi.PreSerializationTransformer;
-
-public class JMSTopicAppenderTest {
-
- ch.qos.logback.core.Context context;
- JMSTopicAppender appender;
- PreSerializationTransformer<ILoggingEvent> pst = new LoggingEventPreSerializationTransformer();
-
- @Before
- public void setUp() throws Exception {
- context = new ContextBase();
- appender = new JMSTopicAppender();
- appender.setContext(context);
- appender.setName("jmsTopic");
- appender.tcfBindingName = "topicCnxFactory";
- appender.topicBindingName = "testTopic";
- appender.setProviderURL("url");
- appender.setInitialContextFactoryName(MockInitialContextFactory.class.getName());
-
- MockInitialContext mic = MockInitialContextFactory.getContext();
- mic.map.put(appender.tcfBindingName, new MockTopicConnectionFactory());
- mic.map.put(appender.topicBindingName, new MockTopic(appender.topicBindingName));
-
- }
-
- @After
- public void tearDown() throws Exception {
- appender = null;
- context = null;
- }
-
- @Test
- public void testAppendOk() {
- appender.start();
-
- ILoggingEvent le = createLoggingEvent();
- appender.append(le);
-
- MockTopicPublisher tp = (MockTopicPublisher) appender.topicPublisher;
- assertEquals(1, tp.getMessageList().size());
- ObjectMessage message = (ObjectMessage) tp.getMessageList().get(0);
- try {
- Serializable witness = pst.transform(le);
- assertEquals(witness, message.getObject());
- } catch (Exception e) {
- fail();
- }
- }
-
- @Test
- public void testAppendFailure() {
- appender.start();
-
- // make sure the append method does not work
- appender.topicPublisher = null;
-
- ILoggingEvent le = createLoggingEvent();
- for (int i = 1; i <= 3; i++) {
- appender.append(le);
- assertEquals(i, context.getStatusManager().getCount());
- assertTrue(appender.isStarted());
- }
- appender.append(le);
- assertEquals(4, context.getStatusManager().getCount());
- assertFalse(appender.isStarted());
- }
-
- @Test
- public void testBuildEnvProperties() {
- appender.setInitialContextFactoryName("icfn");
- appender.setProviderURL("url");
- appender.setURLPkgPrefixes("pkgPref");
- appender.setSecurityPrincipalName("user");
- appender.setSecurityCredentials("cred");
-
- Properties props = appender.buildEnvProperties();
- assertEquals(5, props.size());
- assertEquals(appender.getInitialContextFactoryName(), props.getProperty(Context.INITIAL_CONTEXT_FACTORY));
- assertEquals(appender.getProviderURL(), props.getProperty(Context.PROVIDER_URL));
- assertEquals(appender.getURLPkgPrefixes(), props.getProperty(Context.URL_PKG_PREFIXES));
- assertEquals(appender.getSecurityPrincipalName(), props.getProperty(Context.SECURITY_PRINCIPAL));
- assertEquals(appender.getSecurityCredentials(), props.getProperty(Context.SECURITY_CREDENTIALS));
- }
-
- @Test
- public void testBuildEnvPropertiesWithNullProviderURL() {
- appender.setInitialContextFactoryName("icfn");
- appender.setProviderURL(null);
- appender.setURLPkgPrefixes("pkgPref");
- appender.setSecurityPrincipalName("user");
- appender.setSecurityCredentials("cred");
-
- Properties props = appender.buildEnvProperties();
- assertEquals(4, props.size());
- assertEquals(appender.getInitialContextFactoryName(), props.getProperty(Context.INITIAL_CONTEXT_FACTORY));
- assertEquals(null, props.getProperty(Context.PROVIDER_URL));
- assertEquals(appender.getURLPkgPrefixes(), props.getProperty(Context.URL_PKG_PREFIXES));
- assertEquals(appender.getSecurityPrincipalName(), props.getProperty(Context.SECURITY_PRINCIPAL));
- assertEquals(appender.getSecurityCredentials(), props.getProperty(Context.SECURITY_CREDENTIALS));
-
- assertEquals(1, context.getStatusManager().getCount());
- }
-
- @Test
- public void testBuildEnvPropertiesWithNullCredentials() {
- appender.setInitialContextFactoryName("icfn");
- appender.setProviderURL("url");
- appender.setURLPkgPrefixes("pkgPref");
- appender.setSecurityPrincipalName("user");
- appender.setSecurityCredentials(null);
-
- Properties props = appender.buildEnvProperties();
- assertEquals(4, props.size());
- assertEquals(appender.getInitialContextFactoryName(), props.getProperty(Context.INITIAL_CONTEXT_FACTORY));
- assertEquals(appender.getProviderURL(), props.getProperty(Context.PROVIDER_URL));
- assertEquals(appender.getURLPkgPrefixes(), props.getProperty(Context.URL_PKG_PREFIXES));
- assertEquals(appender.getSecurityPrincipalName(), props.getProperty(Context.SECURITY_PRINCIPAL));
- assertEquals(null, props.getProperty(Context.SECURITY_CREDENTIALS));
-
- assertEquals(1, context.getStatusManager().getCount());
- }
-
- @Test
- public void testBuildEnvPropertiesWithPkgNull() {
- appender.setInitialContextFactoryName("icfn");
- appender.setProviderURL("url");
- appender.setURLPkgPrefixes(null);
- appender.setSecurityPrincipalName("user");
- appender.setSecurityCredentials("cred");
-
- Properties props = appender.buildEnvProperties();
- assertEquals(4, props.size());
- assertEquals(appender.getInitialContextFactoryName(), props.getProperty(Context.INITIAL_CONTEXT_FACTORY));
- assertEquals(appender.getProviderURL(), props.getProperty(Context.PROVIDER_URL));
- assertEquals(null, props.getProperty(Context.URL_PKG_PREFIXES));
- assertEquals(appender.getSecurityPrincipalName(), props.getProperty(Context.SECURITY_PRINCIPAL));
- assertEquals(appender.getSecurityCredentials(), props.getProperty(Context.SECURITY_CREDENTIALS));
-
- assertEquals(0, context.getStatusManager().getCount());
- }
-
- @Test
- public void testStartMinimalInfo() {
- // let's leave only what's in the setup()
- // method, minus the providerURL
- appender.setProviderURL(null);
- appender.start();
-
- assertTrue(appender.isStarted());
-
- try {
- assertEquals(appender.topicBindingName, appender.topicPublisher.getTopic().getTopicName());
- } catch (Exception e) {
- fail();
- }
- }
-
- @Test
- public void testStartUserPass() {
- appender.setUserName("test");
- appender.setPassword("test");
-
- appender.start();
-
- assertTrue(appender.isStarted());
-
- try {
- assertEquals(appender.topicBindingName, appender.topicPublisher.getTopic().getTopicName());
- } catch (Exception e) {
- fail();
- }
- }
-
- @Test
- public void testStartFails() {
- appender.topicBindingName = null;
-
- appender.start();
-
- assertFalse(appender.isStarted());
- }
-
- private ILoggingEvent createLoggingEvent() {
- LoggingEvent le = new LoggingEvent();
- le.setLevel(Level.DEBUG);
- le.setMessage("test message");
- le.setTimeStamp(System.currentTimeMillis());
- le.setThreadName(Thread.currentThread().getName());
- return le;
- }
-}

_service:tar_scm:v_1.1.7.tar.gz/logback-classic/src/test/java/ch/qos/logback/classic/net/JMSTopicAppenderTestApp.java Deleted

@@ -1,61 +0,0 @@
-/**
- * Logback: the reliable, generic, fast and flexible logging framework.
- * Copyright (C) 1999-2015, 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.classic.net;
-
-import org.slf4j.LoggerFactory;
-
-import ch.qos.logback.classic.Logger;
-import ch.qos.logback.classic.LoggerContext;
-import ch.qos.logback.core.util.StatusPrinter;
-
-public class JMSTopicAppenderTestApp {
-
- public static void main(String args) {
- Logger logger = (Logger) LoggerFactory.getLogger(JMSTopicAppenderTestApp.class);
- LoggerContext lc = (LoggerContext) LoggerFactory.getILoggerFactory();
- lc.reset();
-
- JMSTopicAppender appender = new JMSTopicAppender();
- appender.setContext(lc);
- appender.setName("jmsTopic");
- appender.setInitialContextFactoryName("org.apache.activemq.jndi.ActiveMQInitialContextFactory");
- // appender.setPassword("");
- appender.setProviderURL("tcp://localhost:61616");
- // appender.setSecurityCredentials("");
- // appender.setSecurityPrincipalName("");
- appender.setTopicBindingName("MyTopic");
- appender.setTopicConnectionFactoryBindingName("ConnectionFactory");
- // appender.setURLPkgPrefixes("");
- // appender.setUserName("");
-
- appender.start();
- logger.addAppender(appender);
-
- // JIT
- for (int i = 0; i < 10000; i++) {
- logger.debug("** Hello world. n=" + i);
- }
-
- long before = System.nanoTime();
- for (int i = 0; i < 10000; i++) {
- logger.debug("** Hello world. n=" + i);
- }
- long after = System.nanoTime();
-
- System.out.println("Time per logs for 10'000 logs: " + (after - before) / 10000);
-
- StatusPrinter.print(lc.getStatusManager());
- }
-
-}
\ No newline at end of file

_service:tar_scm:v_1.1.7.tar.gz/logback-classic/src/test/java/ch/qos/logback/classic/net/mock/MockObjectMessage.java Deleted

@@ -1,237 +0,0 @@
-/**
- * Logback: the reliable, generic, fast and flexible logging framework.
- * Copyright (C) 1999-2015, 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.classic.net.mock;
-
-import java.io.Serializable;
-import java.util.Enumeration;
-
-import javax.jms.Destination;
-import javax.jms.JMSException;
-import javax.jms.ObjectMessage;
-
-public class MockObjectMessage implements ObjectMessage {
-
-    Serializable object;
-
-    public Serializable getObject() throws JMSException {
-        return object;
-    }
-
-    public void setObject(Serializable object) throws JMSException {
-        this.object = object;
-    }
-
-    public void acknowledge() throws JMSException {
-
-    }
-
-    public void clearBody() throws JMSException {
-
-    }
-
-    public void clearProperties() throws JMSException {
-
-    }
-
-    public boolean getBooleanProperty(String arg0) throws JMSException {
-
-        return false;
-    }
-
-    public byte getByteProperty(String arg0) throws JMSException {
-
-        return 0;
-    }
-
-    public double getDoubleProperty(String arg0) throws JMSException {
-
-        return 0;
-    }
-
-    public float getFloatProperty(String arg0) throws JMSException {
-
-        return 0;
-    }
-
-    public int getIntProperty(String arg0) throws JMSException {
-
-        return 0;
-    }
-
-    public String getJMSCorrelationID() throws JMSException {
-
-        return null;
-    }
-
-    public byte getJMSCorrelationIDAsBytes() throws JMSException {
-
-        return null;
-    }
-
-    public int getJMSDeliveryMode() throws JMSException {
-
-        return 0;
-    }
-
-    public Destination getJMSDestination() throws JMSException {
-
-        return null;
-    }
-
-    public long getJMSExpiration() throws JMSException {
-
-        return 0;
-    }
-
-    public String getJMSMessageID() throws JMSException {
-
-        return null;
-    }
-
-    public int getJMSPriority() throws JMSException {
-
-        return 0;
-    }
-
-    public boolean getJMSRedelivered() throws JMSException {
-
-        return false;
-    }
-
-    public Destination getJMSReplyTo() throws JMSException {
-
-        return null;
-    }
-
-    public long getJMSTimestamp() throws JMSException {
-
-        return 0;
-    }
-
-    public String getJMSType() throws JMSException {
-
-        return null;
-    }
-
-    public long getLongProperty(String arg0) throws JMSException {
-
-        return 0;
-    }
-
-    public Object getObjectProperty(String arg0) throws JMSException {
-
-        return null;
-    }
-
-    public Enumeration getPropertyNames() throws JMSException {
-
-        return null;
-    }
-
-    public short getShortProperty(String arg0) throws JMSException {
-
-        return 0;
-    }
-
-    public String getStringProperty(String arg0) throws JMSException {
-
-        return null;
-    }
-
-    public boolean propertyExists(String arg0) throws JMSException {
-
-        return false;
-    }
-
-    public void setBooleanProperty(String arg0, boolean arg1) throws JMSException {
-
-    }
-
-    public void setByteProperty(String arg0, byte arg1) throws JMSException {
-
-    }
-
-    public void setDoubleProperty(String arg0, double arg1) throws JMSException {
-
-    }
-
-    public void setFloatProperty(String arg0, float arg1) throws JMSException {
-
-    }
-
-    public void setIntProperty(String arg0, int arg1) throws JMSException {
-
-    }
-
-    public void setJMSCorrelationID(String arg0) throws JMSException {
-
-    }
-
-    public void setJMSCorrelationIDAsBytes(byte arg0) throws JMSException {
-
-    }
-
-    public void setJMSDeliveryMode(int arg0) throws JMSException {
-
-    }
-
-    public void setJMSDestination(Destination arg0) throws JMSException {
-
-    }
-
-    public void setJMSExpiration(long arg0) throws JMSException {
-
-    }
-
-    public void setJMSMessageID(String arg0) throws JMSException {
-
-    }
-
-    public void setJMSPriority(int arg0) throws JMSException {
-
-    }
-
-    public void setJMSRedelivered(boolean arg0) throws JMSException {
-
-    }
-
-    public void setJMSReplyTo(Destination arg0) throws JMSException {
-
-    }
-
-    public void setJMSTimestamp(long arg0) throws JMSException {
-
-    }
-
-    public void setJMSType(String arg0) throws JMSException {
-
-    }
-
-    public void setLongProperty(String arg0, long arg1) throws JMSException {
-
-    }
-
-    public void setObjectProperty(String arg0, Object arg1) throws JMSException {
-
-    }
-
-    public void setShortProperty(String arg0, short arg1) throws JMSException {
-
-    }
-
-    public void setStringProperty(String arg0, String arg1) throws JMSException {
-
-    }
-
-}

_service:tar_scm:v_1.1.7.tar.gz/logback-classic/src/test/java/ch/qos/logback/classic/net/mock/MockQueue.java Deleted

_service:tar_scm:v_1.1.7.tar.gz/logback-classic/src/test/java/ch/qos/logback/classic/net/mock/MockQueueConnection.java Deleted

@@ -1,91 +0,0 @@
-/**
- * Logback: the reliable, generic, fast and flexible logging framework.
- * Copyright (C) 1999-2015, 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.classic.net.mock;
-
-import javax.jms.ConnectionConsumer;
-import javax.jms.ConnectionMetaData;
-import javax.jms.Destination;
-import javax.jms.ExceptionListener;
-import javax.jms.JMSException;
-import javax.jms.Queue;
-import javax.jms.QueueConnection;
-import javax.jms.QueueSession;
-import javax.jms.ServerSessionPool;
-import javax.jms.Session;
-import javax.jms.Topic;
-
-public class MockQueueConnection implements QueueConnection {
-
-    MockQueueSession session = new MockQueueSession();
-
-    public QueueSession createQueueSession(boolean arg0, int arg1) throws JMSException {
-        return session;
-    }
-
-    public ConnectionConsumer createConnectionConsumer(Queue arg0, String arg1, ServerSessionPool arg2, int arg3) throws JMSException {
-
-        return null;
-    }
-
-    public void close() throws JMSException {
-
-    }
-
-    public ConnectionConsumer createConnectionConsumer(Destination arg0, String arg1, ServerSessionPool arg2, int arg3) throws JMSException {
-
-        return null;
-    }
-
-    public ConnectionConsumer createDurableConnectionConsumer(Topic arg0, String arg1, String arg2, ServerSessionPool arg3, int arg4) throws JMSException {
-
-        return null;
-    }
-
-    public Session createSession(boolean arg0, int arg1) throws JMSException {
-
-        return null;
-    }
-
-    public String getClientID() throws JMSException {
-
-        return null;
-    }
-
-    public ExceptionListener getExceptionListener() throws JMSException {
-
-        return null;
-    }
-
-    public ConnectionMetaData getMetaData() throws JMSException {
-
-        return null;
-    }
-
-    public void setClientID(String arg0) throws JMSException {
-
-    }
-
-    public void setExceptionListener(ExceptionListener arg0) throws JMSException {
-
-    }
-
-    public void start() throws JMSException {
-
-    }
-
-    public void stop() throws JMSException {
-
-    }
-
-}

_service:tar_scm:v_1.1.7.tar.gz/logback-classic/src/test/java/ch/qos/logback/classic/net/mock/MockQueueConnectionFactory.java Deleted

@@ -1,42 +0,0 @@
-/**
- * Logback: the reliable, generic, fast and flexible logging framework.
- * Copyright (C) 1999-2015, 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.classic.net.mock;
-
-import javax.jms.Connection;
-import javax.jms.JMSException;
-import javax.jms.QueueConnection;
-import javax.jms.QueueConnectionFactory;
-
-public class MockQueueConnectionFactory implements QueueConnectionFactory {
-
-    MockQueueConnection cnx = new MockQueueConnection();
-
-    public QueueConnection createQueueConnection() throws JMSException {
-        return cnx;
-    }
-
-    public QueueConnection createQueueConnection(String user, String pass) throws JMSException {
-
-        return cnx;
-    }
-
-    public Connection createConnection() throws JMSException {
-        return null;
-    }
-
-    public Connection createConnection(String arg0, String arg1) throws JMSException {
-        return null;
-    }
-
-}

_service:tar_scm:v_1.1.7.tar.gz/logback-classic/src/test/java/ch/qos/logback/classic/net/mock/MockQueueSender.java Deleted

@@ -1,121 +0,0 @@
-/**
- * Logback: the reliable, generic, fast and flexible logging framework.
- * Copyright (C) 1999-2015, 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.classic.net.mock;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.jms.Destination;
-import javax.jms.JMSException;
-import javax.jms.Message;
-import javax.jms.Queue;
-import javax.jms.QueueSender;
-
-public class MockQueueSender implements QueueSender {
-
- List<Message> messageList = new ArrayList<Message>();
- Queue queue;
-
- public MockQueueSender(Queue queue) {
- this.queue = queue;
- }
-
- public List<Message> getMessageList() {
- return messageList;
- }
-
- public Queue getQueue() throws JMSException {
- return queue;
- }
-
- public void send(Message message) throws JMSException {
- messageList.add(message);
-
- }
-
- public void send(Queue arg0, Message arg1) throws JMSException {
-
- }
-
- public void send(Message arg0, int arg1, int arg2, long arg3) throws JMSException {
-
- }
-
- public void send(Queue arg0, Message arg1, int arg2, int arg3, long arg4) throws JMSException {
-
- }
-
- public void close() throws JMSException {
-
- }
-
- public int getDeliveryMode() throws JMSException {
-
- return 0;
- }
-
- public Destination getDestination() throws JMSException {
-
- return null;
- }
-
- public boolean getDisableMessageID() throws JMSException {
-
- return false;
- }
-
- public boolean getDisableMessageTimestamp() throws JMSException {
-
- return false;
- }
-
- public int getPriority() throws JMSException {
-
- return 0;
- }
-
- public long getTimeToLive() throws JMSException {
-
- return 0;
- }
-
- public void send(Destination arg0, Message arg1) throws JMSException {
-
- }
-
- public void send(Destination arg0, Message arg1, int arg2, int arg3, long arg4) throws JMSException {
-
- }
-
- public void setDeliveryMode(int arg0) throws JMSException {
-
- }
-
- public void setDisableMessageID(boolean arg0) throws JMSException {
-
- }
-
- public void setDisableMessageTimestamp(boolean arg0) throws JMSException {
-
- }
-
- public void setPriority(int arg0) throws JMSException {
-
- }
-
- public void setTimeToLive(long arg0) throws JMSException {
-
- }
-
-}

_service:tar_scm:v_1.1.7.tar.gz/logback-classic/src/test/java/ch/qos/logback/classic/net/mock/MockQueueSession.java Deleted

@@ -1,200 +0,0 @@
-/**
- * Logback: the reliable, generic, fast and flexible logging framework.
- * Copyright (C) 1999-2015, 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.classic.net.mock;
-
-import java.io.Serializable;
-
-import javax.jms.BytesMessage;
-import javax.jms.Destination;
-import javax.jms.JMSException;
-import javax.jms.MapMessage;
-import javax.jms.Message;
-import javax.jms.MessageConsumer;
-import javax.jms.MessageListener;
-import javax.jms.MessageProducer;
-import javax.jms.ObjectMessage;
-import javax.jms.Queue;
-import javax.jms.QueueBrowser;
-import javax.jms.QueueReceiver;
-import javax.jms.QueueSender;
-import javax.jms.QueueSession;
-import javax.jms.StreamMessage;
-import javax.jms.TemporaryQueue;
-import javax.jms.TemporaryTopic;
-import javax.jms.TextMessage;
-import javax.jms.Topic;
-import javax.jms.TopicSubscriber;
-
-public class MockQueueSession implements QueueSession {
-
-    public ObjectMessage createObjectMessage() throws JMSException {
-        return new MockObjectMessage();
-    }
-
-    public QueueSender createSender(Queue queue) throws JMSException {
-        if (queue == null) {
-            return null;
-        }
-        return new MockQueueSender(queue);
-    }
-
-    public QueueBrowser createBrowser(Queue arg0) throws JMSException {
-
-        return null;
-    }
-
-    public QueueBrowser createBrowser(Queue arg0, String arg1) throws JMSException {
-
-        return null;
-    }
-
-    public Queue createQueue(String arg0) throws JMSException {
-
-        return null;
-    }
-
-    public QueueReceiver createReceiver(Queue arg0) throws JMSException {
-
-        return null;
-    }
-
-    public QueueReceiver createReceiver(Queue arg0, String arg1) throws JMSException {
-
-        return null;
-    }
-
-    public TemporaryQueue createTemporaryQueue() throws JMSException {
-
-        return null;
-    }
-
-    public void close() throws JMSException {
-
-    }
-
-    public void commit() throws JMSException {
-
-    }
-
-    public BytesMessage createBytesMessage() throws JMSException {
-
-        return null;
-    }
-
-    public MessageConsumer createConsumer(Destination arg0) throws JMSException {
-
-        return null;
-    }
-
-    public MessageConsumer createConsumer(Destination arg0, String arg1) throws JMSException {
-
-        return null;
-    }
-
-    public MessageConsumer createConsumer(Destination arg0, String arg1, boolean arg2) throws JMSException {
-
-        return null;
-    }
-
-    public TopicSubscriber createDurableSubscriber(Topic arg0, String arg1) throws JMSException {
-
-        return null;
-    }
-
-    public TopicSubscriber createDurableSubscriber(Topic arg0, String arg1, String arg2, boolean arg3) throws JMSException {
-
-        return null;
-    }
-
-    public MapMessage createMapMessage() throws JMSException {
-
-        return null;
-    }
-
-    public Message createMessage() throws JMSException {
-
-        return null;
-    }
-
-    public ObjectMessage createObjectMessage(Serializable arg0) throws JMSException {
-
-        return null;
-    }
-
-    public MessageProducer createProducer(Destination arg0) throws JMSException {
-
-        return null;
-    }
-
-    public StreamMessage createStreamMessage() throws JMSException {
-
-        return null;
-    }
-
-    public TemporaryTopic createTemporaryTopic() throws JMSException {
-
-        return null;
-    }
-
-    public TextMessage createTextMessage() throws JMSException {
-
-        return null;
-    }
-
-    public TextMessage createTextMessage(String arg0) throws JMSException {
-
-        return null;
-    }
-
-    public Topic createTopic(String arg0) throws JMSException {
-
-        return null;
-    }
-
-    public int getAcknowledgeMode() throws JMSException {
-
-        return 0;
-    }
-
-    public MessageListener getMessageListener() throws JMSException {
-
-        return null;
-    }
-
-    public boolean getTransacted() throws JMSException {
-
-        return false;
-    }
-
-    public void recover() throws JMSException {
-
-    }
-
-    public void rollback() throws JMSException {
-
-    }
-
-    public void run() {
-
-    }
-
-    public void setMessageListener(MessageListener arg0) throws JMSException {
-
-    }
-
-    public void unsubscribe(String arg0) throws JMSException {
-
-    }
-
-}

_service:tar_scm:v_1.1.7.tar.gz/logback-classic/src/test/java/ch/qos/logback/classic/net/mock/MockTopic.java Deleted

_service:tar_scm:v_1.1.7.tar.gz/logback-classic/src/test/java/ch/qos/logback/classic/net/mock/MockTopicConnection.java Deleted

@@ -1,90 +0,0 @@
-/**
- * Logback: the reliable, generic, fast and flexible logging framework.
- * Copyright (C) 1999-2015, 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.classic.net.mock;
-
-import javax.jms.ConnectionConsumer;
-import javax.jms.ConnectionMetaData;
-import javax.jms.Destination;
-import javax.jms.ExceptionListener;
-import javax.jms.JMSException;
-import javax.jms.ServerSessionPool;
-import javax.jms.Session;
-import javax.jms.Topic;
-import javax.jms.TopicConnection;
-import javax.jms.TopicSession;
-
-public class MockTopicConnection implements TopicConnection {
-
-    MockTopicSession session = new MockTopicSession();
-
-    public TopicSession createTopicSession(boolean arg0, int arg1) throws JMSException {
-        return session;
-    }
-
-    public ConnectionConsumer createConnectionConsumer(Topic arg0, String arg1, ServerSessionPool arg2, int arg3) throws JMSException {
-
-        return null;
-    }
-
-    public ConnectionConsumer createDurableConnectionConsumer(Topic arg0, String arg1, String arg2, ServerSessionPool arg3, int arg4) throws JMSException {
-
-        return null;
-    }
-
-    public void close() throws JMSException {
-
-    }
-
-    public ConnectionConsumer createConnectionConsumer(Destination arg0, String arg1, ServerSessionPool arg2, int arg3) throws JMSException {
-
-        return null;
-    }
-
-    public Session createSession(boolean arg0, int arg1) throws JMSException {
-
-        return null;
-    }
-
-    public String getClientID() throws JMSException {
-
-        return null;
-    }
-
-    public ExceptionListener getExceptionListener() throws JMSException {
-
-        return null;
-    }
-
-    public ConnectionMetaData getMetaData() throws JMSException {
-
-        return null;
-    }
-
-    public void setClientID(String arg0) throws JMSException {
-
-    }
-
-    public void setExceptionListener(ExceptionListener arg0) throws JMSException {
-
-    }
-
-    public void start() throws JMSException {
-
-    }
-
-    public void stop() throws JMSException {
-
-    }
-
-}

_service:tar_scm:v_1.1.7.tar.gz/logback-classic/src/test/java/ch/qos/logback/classic/net/mock/MockTopicConnectionFactory.java Deleted

@@ -1,42 +0,0 @@
-/**
- * Logback: the reliable, generic, fast and flexible logging framework.
- * Copyright (C) 1999-2015, 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.classic.net.mock;
-
-import javax.jms.Connection;
-import javax.jms.JMSException;
-import javax.jms.TopicConnection;
-import javax.jms.TopicConnectionFactory;
-
-public class MockTopicConnectionFactory implements TopicConnectionFactory {
-
-    MockTopicConnection cnx = new MockTopicConnection();
-
-    public TopicConnection createTopicConnection() throws JMSException {
-        return cnx;
-    }
-
-    public TopicConnection createTopicConnection(String user, String pass) throws JMSException {
-
-        return cnx;
-    }
-
-    public Connection createConnection() throws JMSException {
-        return null;
-    }
-
-    public Connection createConnection(String arg0, String arg1) throws JMSException {
-        return null;
-    }
-
-}

_service:tar_scm:v_1.1.7.tar.gz/logback-classic/src/test/java/ch/qos/logback/classic/net/mock/MockTopicPublisher.java Deleted

@@ -1,128 +0,0 @@
-/**
- * Logback: the reliable, generic, fast and flexible logging framework.
- * Copyright (C) 1999-2015, 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.classic.net.mock;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.jms.Destination;
-import javax.jms.JMSException;
-import javax.jms.Message;
-import javax.jms.Topic;
-import javax.jms.TopicPublisher;
-
-public class MockTopicPublisher implements TopicPublisher {
-
- List<Message> messageList = new ArrayList<Message>();
- Topic topic;
-
- public MockTopicPublisher(Topic topic) {
- this.topic = topic;
- }
-
- public void publish(Message message) throws JMSException {
- messageList.add(message);
- }
-
- public List<Message> getMessageList() {
- return messageList;
- }
-
- public Topic getTopic() throws JMSException {
- return topic;
- }
-
- public void publish(Message arg0, int arg1, int arg2, long arg3) throws JMSException {
-
- }
-
- public void publish(Topic arg0, Message arg1, int arg2, int arg3, long arg4) throws JMSException {
-
- }
-
- public void publish(Topic arg0, Message arg1) throws JMSException {
-
- }
-
- public void close() throws JMSException {
-
- }
-
- public int getDeliveryMode() throws JMSException {
-
- return 0;
- }
-
- public Destination getDestination() throws JMSException {
-
- return null;
- }
-
- public boolean getDisableMessageID() throws JMSException {
-
- return false;
- }
-
- public boolean getDisableMessageTimestamp() throws JMSException {
-
- return false;
- }
-
- public int getPriority() throws JMSException {
-
- return 0;
- }
-
- public long getTimeToLive() throws JMSException {
-
- return 0;
- }
-
- public void send(Destination arg0, Message arg1, int arg2, int arg3, long arg4) throws JMSException {
-
- }
-
- public void send(Destination arg0, Message arg1) throws JMSException {
-
- }
-
- public void send(Message arg0, int arg1, int arg2, long arg3) throws JMSException {
-
- }
-
- public void send(Message arg0) throws JMSException {
-
- }
-
- public void setDeliveryMode(int arg0) throws JMSException {
-
- }
-
- public void setDisableMessageID(boolean arg0) throws JMSException {
-
- }
-
- public void setDisableMessageTimestamp(boolean arg0) throws JMSException {
-
- }
-
- public void setPriority(int arg0) throws JMSException {
-
- }
-
- public void setTimeToLive(long arg0) throws JMSException {
-
- }
-
-}

_service:tar_scm:v_1.1.7.tar.gz/logback-classic/src/test/java/ch/qos/logback/classic/net/mock/MockTopicSession.java Deleted

@@ -1,193 +0,0 @@
-/**
- * Logback: the reliable, generic, fast and flexible logging framework.
- * Copyright (C) 1999-2015, 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.classic.net.mock;
-
-import java.io.Serializable;
-
-import javax.jms.BytesMessage;
-import javax.jms.Destination;
-import javax.jms.JMSException;
-import javax.jms.MapMessage;
-import javax.jms.Message;
-import javax.jms.MessageConsumer;
-import javax.jms.MessageListener;
-import javax.jms.MessageProducer;
-import javax.jms.ObjectMessage;
-import javax.jms.Queue;
-import javax.jms.QueueBrowser;
-import javax.jms.StreamMessage;
-import javax.jms.TemporaryQueue;
-import javax.jms.TemporaryTopic;
-import javax.jms.TextMessage;
-import javax.jms.Topic;
-import javax.jms.TopicPublisher;
-import javax.jms.TopicSession;
-import javax.jms.TopicSubscriber;
-
-public class MockTopicSession implements TopicSession {
-
-    public ObjectMessage createObjectMessage() throws JMSException {
-        return new MockObjectMessage();
-    }
-
-    public TopicPublisher createPublisher(Topic topic) throws JMSException {
-        if (topic == null) {
-            return null;
-        }
-        return new MockTopicPublisher(topic);
-    }
-
-    public TopicSubscriber createDurableSubscriber(Topic arg0, String arg1) throws JMSException {
-        return null;
-    }
-
-    public TopicSubscriber createDurableSubscriber(Topic arg0, String arg1, String arg2, boolean arg3) throws JMSException {
-        return null;
-    }
-
-    public TopicSubscriber createSubscriber(Topic arg0) throws JMSException {
-        return null;
-    }
-
-    public TopicSubscriber createSubscriber(Topic arg0, String arg1, boolean arg2) throws JMSException {
-        return null;
-    }
-
-    public TemporaryTopic createTemporaryTopic() throws JMSException {
-        return null;
-    }
-
-    public Topic createTopic(String arg0) throws JMSException {
-        return null;
-    }
-
-    public void unsubscribe(String arg0) throws JMSException {
-
-    }
-
-    public void close() throws JMSException {
-
-    }
-
-    public void commit() throws JMSException {
-
-    }
-
-    public QueueBrowser createBrowser(Queue arg0) throws JMSException {
-
-        return null;
-    }
-
-    public QueueBrowser createBrowser(Queue arg0, String arg1) throws JMSException {
-
-        return null;
-    }
-
-    public BytesMessage createBytesMessage() throws JMSException {
-
-        return null;
-    }
-
-    public MessageConsumer createConsumer(Destination arg0) throws JMSException {
-
-        return null;
-    }
-
-    public MessageConsumer createConsumer(Destination arg0, String arg1) throws JMSException {
-
-        return null;
-    }
-
-    public MessageConsumer createConsumer(Destination arg0, String arg1, boolean arg2) throws JMSException {
-
-        return null;
-    }
-
-    public MapMessage createMapMessage() throws JMSException {
-
-        return null;
-    }
-
-    public Message createMessage() throws JMSException {
-
-        return null;
-    }
-
-    public ObjectMessage createObjectMessage(Serializable arg0) throws JMSException {
-
-        return null;
-    }
-
-    public MessageProducer createProducer(Destination arg0) throws JMSException {
-
-        return null;
-    }
-
-    public Queue createQueue(String arg0) throws JMSException {
-
-        return null;
-    }
-
-    public StreamMessage createStreamMessage() throws JMSException {
-
-        return null;
-    }
-
-    public TemporaryQueue createTemporaryQueue() throws JMSException {
-
-        return null;
-    }
-
-    public TextMessage createTextMessage() throws JMSException {
-
-        return null;
-    }
-
-    public TextMessage createTextMessage(String arg0) throws JMSException {
-
-        return null;
-    }
-
-    public int getAcknowledgeMode() throws JMSException {
-
-        return 0;
-    }
-
-    public MessageListener getMessageListener() throws JMSException {
-
-        return null;
-    }
-
-    public boolean getTransacted() throws JMSException {
-
-        return false;
-    }
-
-    public void recover() throws JMSException {
-
-    }
-
-    public void rollback() throws JMSException {
-
-    }
-
-    public void run() {
-
-    }
-
-    public void setMessageListener(MessageListener arg0) throws JMSException {
-
-    }
-
-}

_service:tar_scm:v_1.1.7.tar.gz/logback-core/src/main/java/ch/qos/logback/core/db Deleted

_service:tar_scm:v_1.1.7.tar.gz/logback-core/src/main/java/ch/qos/logback/core/db/BindDataSourceToJNDIAction.java Deleted

@@ -1,91 +0,0 @@
-/**
- * Logback: the reliable, generic, fast and flexible logging framework.
- * Copyright (C) 1999-2015, 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.db;
-
-import javax.naming.Context;
-import javax.naming.InitialContext;
-import javax.sql.DataSource;
-
-import org.xml.sax.Attributes;
-
-import ch.qos.logback.core.joran.action.Action;
-import ch.qos.logback.core.joran.spi.InterpretationContext;
-import ch.qos.logback.core.joran.util.PropertySetter;
-import ch.qos.logback.core.joran.util.beans.BeanDescriptionCache;
-import ch.qos.logback.core.util.OptionHelper;
-
-/**
- *
- * @author Ceki Gulcu
- *
- */
-public class BindDataSourceToJNDIAction extends Action {
-
-    static final String DATA_SOURCE_CLASS = "dataSourceClass";
-    static final String URL = "url";
-    static final String USER = "user";
-    static final String PASSWORD = "password";
-	private final BeanDescriptionCache beanDescriptionCache;
-
-    public BindDataSourceToJNDIAction(BeanDescriptionCache beanDescriptionCache) {
-		this.beanDescriptionCache = beanDescriptionCache;
-	}
-
-	/**
-     * Instantiates an a data source and bind it to JNDI
-     * Most of the required parameters are placed in the ec.substitutionProperties
-     */
-    public void begin(InterpretationContext ec, String localName, Attributes attributes) {
-        String dsClassName = ec.getProperty(DATA_SOURCE_CLASS);
-
-        if (OptionHelper.isEmpty(dsClassName)) {
-            addWarn("dsClassName is a required parameter");
-            ec.addError("dsClassName is a required parameter");
-
-            return;
-        }
-
-        String urlStr = ec.getProperty(URL);
-        String userStr = ec.getProperty(USER);
-        String passwordStr = ec.getProperty(PASSWORD);
-
-        try {
-            DataSource ds = (DataSource) OptionHelper.instantiateByClassName(dsClassName, DataSource.class, context);
-
-            PropertySetter setter = new PropertySetter(beanDescriptionCache,ds);
-            setter.setContext(context);
-
-            if (!OptionHelper.isEmpty(urlStr)) {
-                setter.setProperty("url", urlStr);
-            }
-
-            if (!OptionHelper.isEmpty(userStr)) {
-                setter.setProperty("user", userStr);
-            }
-
-            if (!OptionHelper.isEmpty(passwordStr)) {
-                setter.setProperty("password", passwordStr);
-            }
-
-            Context ctx = new InitialContext();
-            ctx.rebind("dataSource", ds);
-        } catch (Exception oops) {
-            addError("Could not bind  datasource. Reported error follows.", oops);
-            ec.addError("Could not not bind  datasource of type " + dsClassName + ".");
-        }
-    }
-
-    public void end(InterpretationContext ec, String name) {
-    }
-}

_service:tar_scm:v_1.1.7.tar.gz/logback-core/src/main/java/ch/qos/logback/core/db/ConnectionSource.java Deleted

@@ -1,61 +0,0 @@
-/**
- * Logback: the reliable, generic, fast and flexible logging framework.
- * Copyright (C) 1999-2015, 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.db;
-
-import java.sql.Connection;
-import java.sql.SQLException;
-
-import ch.qos.logback.core.db.dialect.SQLDialectCode;
-import ch.qos.logback.core.spi.LifeCycle;
-
-/**
- * The <id>ConnectionSource</id> interface provides a pluggable means of
- * transparently obtaining JDBC {@link java.sql.Connection}s for logback classes
- * that require the use of a {@link java.sql.Connection}.
- * 
- * For more information about this component, please refer to the online manual at
- * http://logback.qos.ch/manual/appenders.html#DBAppender
- *
- * @author <a href="mailto:rdecampo@twcny.rr.com">Ray DeCampo</a>
- */
-public interface ConnectionSource extends LifeCycle {
-
- /**
- * Obtain a {@link java.sql.Connection} for use. The client is
- * responsible for closing the {@link java.sql.Connection} when it is no
- * longer required.
- *
- * @throws SQLException if a {@link java.sql.Connection} could not be
- * obtained
- */
- Connection getConnection() throws SQLException;
-
- /**
- * Get the SQL dialect that should be used for this connection. Note that the
- * dialect is not needed if the JDBC driver supports the getGeneratedKeys 
- * method.
- */
- SQLDialectCode getSQLDialectCode();
-
- /**
- * If the connection supports the JDBC 3.0 getGeneratedKeys method, then
- * we do not need any specific dialect support.
- */
- boolean supportsGetGeneratedKeys();
-
- /**
- * If the connection does not support batch updates, we will avoid using them.
- */
- boolean supportsBatchUpdates();
-}

_service:tar_scm:v_1.1.7.tar.gz/logback-core/src/main/java/ch/qos/logback/core/db/ConnectionSourceBase.java Deleted

@@ -1,128 +0,0 @@
-/**
- * Logback: the reliable, generic, fast and flexible logging framework.
- * Copyright (C) 1999-2015, 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.db;
-
-import java.sql.Connection;
-import java.sql.DatabaseMetaData;
-import java.sql.SQLException;
-
-import ch.qos.logback.core.db.dialect.DBUtil;
-import ch.qos.logback.core.db.dialect.SQLDialectCode;
-import ch.qos.logback.core.spi.ContextAwareBase;
-
-/**
- * @author Ceki G&uuml;lc&uuml;
- */
-public abstract class ConnectionSourceBase extends ContextAwareBase implements ConnectionSource {
-
-    private boolean started;
-
-    private String user = null;
-    private String password = null;
-
-    // initially we have an unknown dialect
-    private SQLDialectCode dialectCode = SQLDialectCode.UNKNOWN_DIALECT;
-    private boolean supportsGetGeneratedKeys = false;
-    private boolean supportsBatchUpdates = false;
-
-    /**
-     * Learn relevant information about this connection source.
-     *
-     */
-    public void discoverConnectionProperties() {
-        Connection connection = null;
-        try {
-            connection = getConnection();
-            if (connection == null) {
-                addWarn("Could not get a connection");
-                return;
-            }
-            DatabaseMetaData meta = connection.getMetaData();
-            DBUtil util = new DBUtil();
-            util.setContext(getContext());
-            supportsGetGeneratedKeys = util.supportsGetGeneratedKeys(meta);
-            supportsBatchUpdates = util.supportsBatchUpdates(meta);
-            dialectCode = DBUtil.discoverSQLDialect(meta);
-            addInfo("Driver name=" + meta.getDriverName());
-            addInfo("Driver version=" + meta.getDriverVersion());
-            addInfo("supportsGetGeneratedKeys=" + supportsGetGeneratedKeys);
-
-        } catch (SQLException se) {
-            addWarn("Could not discover the dialect to use.", se);
-        } finally {
-            DBHelper.closeConnection(connection);
-        }
-    }
-
-    /**
-     * Does this connection support the JDBC Connection.getGeneratedKeys method?
-     */
-    public final boolean supportsGetGeneratedKeys() {
-        return supportsGetGeneratedKeys;
-    }
-
-    public final SQLDialectCode getSQLDialectCode() {
-        return dialectCode;
-    }
-
-    /**
-     * Get the password for this connection source.
-     */
-    public final String getPassword() {
-        return password;
-    }
-
-    /**
-     * Sets the password.
-     * @param password The password to set
-     */
-    public final void setPassword(final String password) {
-        this.password = password;
-    }
-
-    /**
-     * Get the user for this connection source.
-     */
-    public final String getUser() {
-        return user;
-    }
-
-    /**
-     * Sets the username.
-     * @param username The username to set
-     */
-    public final void setUser(final String username) {
-        this.user = username;
-    }
-
-    /**
-     * Does this connection support batch updates?
-     */
-    public final boolean supportsBatchUpdates() {
-        return supportsBatchUpdates;
-    }
-
-    public boolean isStarted() {
-        return started;
-    }
-
-    public void start() {
-        started = true;
-    }
-
-    public void stop() {
-        started = false;
-    }
-
-}

_service:tar_scm:v_1.1.7.tar.gz/logback-core/src/main/java/ch/qos/logback/core/db/DBAppenderBase.java Deleted

@@ -1,170 +0,0 @@
-/**
- * Logback: the reliable, generic, fast and flexible logging framework.
- * Copyright (C) 1999-2015, 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.db;
-
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.sql.Connection;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.sql.Statement;
-
-import ch.qos.logback.core.UnsynchronizedAppenderBase;
-import ch.qos.logback.core.db.dialect.DBUtil;
-import ch.qos.logback.core.db.dialect.SQLDialect;
-import ch.qos.logback.core.db.dialect.SQLDialectCode;
-
-/**
- * @author Ceki G&uuml;lc&uuml;
- * @author Ray DeCampo
- * @author S&eacute;bastien Pennec
- */
-public abstract class DBAppenderBase<E> extends UnsynchronizedAppenderBase<E> {
-
- protected ConnectionSource connectionSource;
- protected boolean cnxSupportsGetGeneratedKeys = false;
- protected boolean cnxSupportsBatchUpdates = false;
- protected SQLDialect sqlDialect;
-
- protected abstract Method getGeneratedKeysMethod();
-
- protected abstract String getInsertSQL();
-
- @Override
- public void start() {
-
- if (connectionSource == null) {
- throw new IllegalStateException("DBAppender cannot function without a connection source");
- }
-
- sqlDialect = DBUtil.getDialectFromCode(connectionSource.getSQLDialectCode());
- if (getGeneratedKeysMethod() != null) {
- cnxSupportsGetGeneratedKeys = connectionSource.supportsGetGeneratedKeys();
- } else {
- cnxSupportsGetGeneratedKeys = false;
- }
- cnxSupportsBatchUpdates = connectionSource.supportsBatchUpdates();
- if (!cnxSupportsGetGeneratedKeys && (sqlDialect == null)) {
- throw new IllegalStateException(
- "DBAppender cannot function if the JDBC driver does not support getGeneratedKeys method *and* without a specific SQL dialect");
- }
-
- // all nice and dandy on the eastern front
- super.start();
- }
-
- /**
- * @return Returns the connectionSource.
- */
- public ConnectionSource getConnectionSource() {
- return connectionSource;
- }
-
- /**
- * @param connectionSource
- * The connectionSource to set.
- */
- public void setConnectionSource(ConnectionSource connectionSource) {
- this.connectionSource = connectionSource;
- }
-
- @Override
- public void append(E eventObject) {
- Connection connection = null;
- PreparedStatement insertStatement = null;
- try {
- connection = connectionSource.getConnection();
- connection.setAutoCommit(false);
-
- if (cnxSupportsGetGeneratedKeys) {
- String EVENT_ID_COL_NAME = "EVENT_ID";
- // see
- if (connectionSource.getSQLDialectCode() == SQLDialectCode.POSTGRES_DIALECT) {
- EVENT_ID_COL_NAME = EVENT_ID_COL_NAME.toLowerCase();
- }
- insertStatement = connection.prepareStatement(getInsertSQL(), new String { EVENT_ID_COL_NAME });
- } else {
- insertStatement = connection.prepareStatement(getInsertSQL());
- }
-
- long eventId;
- // inserting an event and getting the result must be exclusive
- synchronized (this) {
- subAppend(eventObject, connection, insertStatement);
- eventId = selectEventId(insertStatement, connection);
- }
- secondarySubAppend(eventObject, connection, eventId);
-
- connection.commit();
- } catch (Throwable sqle) {
- addError("problem appending event", sqle);
- } finally {
- DBHelper.closeStatement(insertStatement);
- DBHelper.closeConnection(connection);
- }
- }
-
- protected abstract void subAppend(E eventObject, Connection connection, PreparedStatement statement) throws Throwable;
-
- protected abstract void secondarySubAppend(E eventObject, Connection connection, long eventId) throws Throwable;
-
- protected long selectEventId(PreparedStatement insertStatement, Connection connection) throws SQLException, InvocationTargetException {
- ResultSet rs = null;
- Statement idStatement = null;
- try {
- boolean gotGeneratedKeys = false;
- if (cnxSupportsGetGeneratedKeys) {
- try {
- rs = (ResultSet) getGeneratedKeysMethod().invoke(insertStatement, (Object) null);
- gotGeneratedKeys = true;
- } catch (InvocationTargetException ex) {
- Throwable target = ex.getTargetException();
- if (target instanceof SQLException) {
- throw (SQLException) target;
- }
- throw ex;
- } catch (IllegalAccessException ex) {
- addWarn("IllegalAccessException invoking PreparedStatement.getGeneratedKeys", ex);
- }
- }
-
- if (!gotGeneratedKeys) {
- idStatement = connection.createStatement();
- idStatement.setMaxRows(1);
- String selectInsertIdStr = sqlDialect.getSelectInsertId();
- rs = idStatement.executeQuery(selectInsertIdStr);
- }
-
- // A ResultSet cursor is initially positioned before the first row;
- // the first call to the method next makes the first row the current row
- rs.next();
- long eventId = rs.getLong(1);
- return eventId;
- } finally {
- if (rs != null) {
- try {
- rs.close();
- } catch (SQLException e) {
- }
- }
- DBHelper.closeStatement(idStatement);
- }
- }
-
- @Override
- public void stop() {
- super.stop();
- }
-}

_service:tar_scm:v_1.1.7.tar.gz/logback-core/src/main/java/ch/qos/logback/core/db/DBHelper.java Deleted

@@ -1,45 +0,0 @@
-/**
- * Logback: the reliable, generic, fast and flexible logging framework.
- * Copyright (C) 1999-2015, 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.db;
-
-import java.sql.Connection;
-import java.sql.SQLException;
-import java.sql.Statement;
-
-/**
- * @author Ceki G&uuml;lc&uuml;
- * 
- */
-public class DBHelper {
-
-    static public void closeConnection(Connection connection) {
-        if (connection != null) {
-            try {
-                connection.close();
-            } catch (SQLException sqle) {
-                // static utility classes should not log without an explicit repository
-                // reference
-            }
-        }
-    }
-
-    public static void closeStatement(Statement statement) {
-        if (statement != null) {
-            try {
-                statement.close();
-            } catch (SQLException sqle) {
-            }
-        }
-    }
-}

_service:tar_scm:v_1.1.7.tar.gz/logback-core/src/main/java/ch/qos/logback/core/db/DataSourceConnectionSource.java Deleted

@@ -1,75 +0,0 @@
-/**
- * Logback: the reliable, generic, fast and flexible logging framework.
- * Copyright (C) 1999-2015, 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.db;
-
-import java.sql.Connection;
-import java.sql.SQLException;
-
-import javax.sql.DataSource;
-
-import ch.qos.logback.core.db.dialect.SQLDialectCode;
-
-/**
- * The DataSourceConnectionSource is an implementation of
- * {@link ConnectionSource} that obtains the Connection in the recommended JDBC
- * manner based on a {@link javax.sql.DataSource DataSource}.
- * 
- * 
- * For more information about this component, please refer to the online manual at
- * http://logback.qos.ch/manual/appenders.html#DBAppender
- * 
- * @author Ray DeCampo
- * @author Ceki G&uuml;lc&uuml;
- */
-public class DataSourceConnectionSource extends ConnectionSourceBase {
-
- private DataSource dataSource;
-
- @Override
- public void start() {
- if (dataSource == null) {
- addWarn("WARNING: No data source specified");
- } else {
- discoverConnectionProperties();
- if (!supportsGetGeneratedKeys() && getSQLDialectCode() == SQLDialectCode.UNKNOWN_DIALECT) {
- addWarn("Connection does not support GetGeneratedKey method and could not discover the dialect.");
- }
- }
- super.start();
- }
-
- /**
- * @see ch.qos.logback.core.db.ConnectionSource#getConnection()
- */
- public Connection getConnection() throws SQLException {
- if (dataSource == null) {
- addError("WARNING: No data source specified");
- return null;
- }
-
- if (getUser() == null) {
- return dataSource.getConnection();
- } else {
- return dataSource.getConnection(getUser(), getPassword());
- }
- }
-
- public DataSource getDataSource() {
- return dataSource;
- }
-
- public void setDataSource(DataSource dataSource) {
- this.dataSource = dataSource;
- }
-}

_service:tar_scm:v_1.1.7.tar.gz/logback-core/src/main/java/ch/qos/logback/core/db/DriverManagerConnectionSource.java Deleted

@@ -1,95 +0,0 @@
-/**
- * Logback: the reliable, generic, fast and flexible logging framework.
- * Copyright (C) 1999-2015, 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.db;
-
-import java.sql.Connection;
-import java.sql.DriverManager;
-import java.sql.SQLException;
-
-/**
- * The DriverManagerConnectionSource is an implementation of
- * {@link ConnectionSource} that obtains the Connection in the traditional JDBC
- * manner based on the connection URL.
- * 
- * For more information about this component, please refer to the online manual at
- * http://logback.qos.ch/manual/appenders.html#DBAppender
- * 
- * @author <a href="mailto:rdecampo@twcny.rr.com">Ray DeCampo</a>
- */
-public class DriverManagerConnectionSource extends ConnectionSourceBase {
- private String driverClass = null;
- private String url = null;
-
- public void start() {
- try {
- if (driverClass != null) {
- Class.forName(driverClass);
- discoverConnectionProperties();
- } else {
- addError("WARNING: No JDBC driver specified for logback DriverManagerConnectionSource.");
- }
- } catch (final ClassNotFoundException cnfe) {
- addError("Could not load JDBC driver class: " + driverClass, cnfe);
- }
- }
-
- /**
- * @see ch.qos.logback.core.db.ConnectionSource#getConnection()
- */
- public Connection getConnection() throws SQLException {
- if (getUser() == null) {
- return DriverManager.getConnection(url);
- } else {
- return DriverManager.getConnection(url, getUser(), getPassword());
- }
- }
-
- /**
- * Returns the url.
- * 
- * @return String
- */
- public String getUrl() {
- return url;
- }
-
- /**
- * Sets the url.
- * 
- * @param url
- * The url to set
- */
- public void setUrl(String url) {
- this.url = url;
- }
-
- /**
- * Returns the name of the driver class.
- * 
- * @return String
- */
- public String getDriverClass() {
- return driverClass;
- }
-
- /**
- * Sets the driver class.
- * 
- * @param driverClass
- * The driver class to set
- */
- public void setDriverClass(String driverClass) {
- this.driverClass = driverClass;
- }
-}

_service:tar_scm:v_1.1.7.tar.gz/logback-core/src/main/java/ch/qos/logback/core/db/JNDIConnectionSource.java Deleted

@@ -1,109 +0,0 @@
-/**
- * Logback: the reliable, generic, fast and flexible logging framework.
- * Copyright (C) 1999-2015, 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.db;
-
-import java.sql.Connection;
-import java.sql.SQLException;
-
-import javax.naming.Context;
-import javax.naming.InitialContext;
-import javax.naming.NamingException;
-
-// PortableRemoteObject was introduced in JDK 1.3. We won't use it.
-// import javax.rmi.PortableRemoteObject;
-import javax.sql.DataSource;
-
-/**
- * The <id>JNDIConnectionSource</id> is an implementation of
- * {@link ConnectionSource} that obtains a {@link javax.sql.DataSource} from a
- * JNDI provider and uses it to obtain a {@link java.sql.Connection}. It is
- * primarily designed to be used inside of J2EE application servers or
- * application server clients, assuming the application server supports remote
- * access of {@link javax.sql.DataSource}s. In this way one can take advantage
- * of connection pooling and whatever other goodies the application server
- * provides.
- * 
- * For more information about this component, please refer to the online manual at
- * http://logback.qos.ch/manual/appenders.html#DBAppender
- * 
- * @author <a href="mailto:rdecampo@twcny.rr.com">Ray DeCampo</a>
- */
-public class JNDIConnectionSource extends ConnectionSourceBase {
- private String jndiLocation = null;
- private DataSource dataSource = null;
-
- public void start() {
- if (jndiLocation == null) {
- addError("No JNDI location specified for JNDIConnectionSource.");
- }
- discoverConnectionProperties();
- }
-
- public Connection getConnection() throws SQLException {
- Connection conn = null;
- try {
- if (dataSource == null) {
- dataSource = lookupDataSource();
- }
- if (getUser() != null) {
- addWarn("Ignoring property user with value " + getUser() + " for obtaining a connection from a DataSource.");
- }
- conn = dataSource.getConnection();
- } catch (final NamingException ne) {
- addError("Error while getting data source", ne);
- throw new SQLException("NamingException while looking up DataSource: " + ne.getMessage());
- } catch (final ClassCastException cce) {
- addError("ClassCastException while looking up DataSource.", cce);
- throw new SQLException("ClassCastException while looking up DataSource: " + cce.getMessage());
- }
-
- return conn;
- }
-
- /**
- * Returns the jndiLocation.
- * 
- * @return String
- */
- public String getJndiLocation() {
- return jndiLocation;
- }
-
- /**
- * Sets the jndiLocation.
- * 
- * @param jndiLocation
- * The jndiLocation to set
- */
- public void setJndiLocation(String jndiLocation) {
- this.jndiLocation = jndiLocation;
- }
-
- private DataSource lookupDataSource() throws NamingException, SQLException {
- addInfo("Looking up " + jndiLocation + " in JNDI");
- DataSource ds;
- Context initialContext = new InitialContext();
- Object obj = initialContext.lookup(jndiLocation);
-
- // PortableRemoteObject was introduced in JDK 1.3. We won't use it.
- // ds = (DataSource)PortableRemoteObject.narrow(obj, DataSource.class);
- ds = (DataSource) obj;
-
- if (ds == null) {
- throw new SQLException("Failed to obtain data source from JNDI location " + jndiLocation);
- } else {
- return ds;
- }
- }
-}

_service:tar_scm:v_1.1.7.tar.gz/logback-core/src/main/java/ch/qos/logback/core/db/dialect Deleted

_service:tar_scm:v_1.1.7.tar.gz/logback-core/src/main/java/ch/qos/logback/core/db/dialect/DBUtil.java Deleted

@@ -1,139 +0,0 @@
-/**
- * Logback: the reliable, generic, fast and flexible logging framework.
- * Copyright (C) 1999-2015, 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.db.dialect;
-
-import java.sql.DatabaseMetaData;
-import java.sql.SQLException;
-
-import ch.qos.logback.core.spi.ContextAwareBase;
-
-/**
- * 
- * @author Ceki Gulcu
- * 
- */
-public class DBUtil extends ContextAwareBase {
-    private static final String POSTGRES_PART = "postgresql";
-    private static final String MYSQL_PART = "mysql";
-    private static final String ORACLE_PART = "oracle";
-    // private static final String MSSQL_PART = "mssqlserver4";
-    private static final String MSSQL_PART = "microsoft";
-    private static final String HSQL_PART = "hsql";
-    private static final String H2_PART = "h2";
-    private static final String SYBASE_SQLANY_PART = "sql anywhere";
-    private static final String SQLITE_PART = "sqlite";
-
-    public static SQLDialectCode discoverSQLDialect(DatabaseMetaData meta) {
-        SQLDialectCode dialectCode = SQLDialectCode.UNKNOWN_DIALECT;
-
-        try {
-
-            String dbName = meta.getDatabaseProductName().toLowerCase();
-
-            if (dbName.indexOf(POSTGRES_PART) != -1) {
-                return SQLDialectCode.POSTGRES_DIALECT;
-            } else if (dbName.indexOf(MYSQL_PART) != -1) {
-                return SQLDialectCode.MYSQL_DIALECT;
-            } else if (dbName.indexOf(ORACLE_PART) != -1) {
-                return SQLDialectCode.ORACLE_DIALECT;
-            } else if (dbName.indexOf(MSSQL_PART) != -1) {
-                return SQLDialectCode.MSSQL_DIALECT;
-            } else if (dbName.indexOf(HSQL_PART) != -1) {
-                return SQLDialectCode.HSQL_DIALECT;
-            } else if (dbName.indexOf(H2_PART) != -1) {
-                return SQLDialectCode.H2_DIALECT;
-            } else if (dbName.indexOf(SYBASE_SQLANY_PART) != -1) {
-                return SQLDialectCode.SYBASE_SQLANYWHERE_DIALECT;
-            } else if (dbName.indexOf(SQLITE_PART) != -1) {
-                return SQLDialectCode.SQLITE_DIALECT;
-            } else {
-                return SQLDialectCode.UNKNOWN_DIALECT;
-            }
-        } catch (SQLException sqle) {
-            // we can't do much here
-        }
-
-        return dialectCode;
-    }
-
-    public static SQLDialect getDialectFromCode(SQLDialectCode sqlDialectType) {
-        SQLDialect sqlDialect = null;
-
-        switch (sqlDialectType) {
-        case POSTGRES_DIALECT:
-            sqlDialect = new PostgreSQLDialect();
-            break;
-
-        case MYSQL_DIALECT:
-            sqlDialect = new MySQLDialect();
-            break;
-
-        case ORACLE_DIALECT:
-            sqlDialect = new OracleDialect();
-            break;
-
-        case MSSQL_DIALECT:
-            sqlDialect = new MsSQLDialect();
-            break;
-
-        case HSQL_DIALECT:
-            sqlDialect = new HSQLDBDialect();
-            break;
-
-        case H2_DIALECT:
-            sqlDialect = new H2Dialect();
-            break;
-
-        case SYBASE_SQLANYWHERE_DIALECT:
-            sqlDialect = new SybaseSqlAnywhereDialect();
-            break;
-
-        case SQLITE_DIALECT:
-            sqlDialect = new SQLiteDialect();
-            break;
-        }
-        return sqlDialect;
-    }
-
-    /**
-     * This method handles cases where the
-     * {@link DatabaseMetaData#supportsGetGeneratedKeys} method is missing in the
-     * JDBC driver implementation.
-     */
-    public boolean supportsGetGeneratedKeys(DatabaseMetaData meta) {
-        try {
-            //
-            // invoking JDBC 1.4 method by reflection
-            //
-            return ((Boolean) DatabaseMetaData.class.getMethod("supportsGetGeneratedKeys", (Class) null).invoke(meta, (Object) null)).booleanValue();
-        } catch (Throwable e) {
-            addInfo("Could not call supportsGetGeneratedKeys method. This may be recoverable");
-            return false;
-        }
-    }
-
-    /**
-     * This method handles cases where the
-     * {@link DatabaseMetaData#supportsBatchUpdates} method is missing in the JDBC
-     * driver implementation.
-     */
-    public boolean supportsBatchUpdates(DatabaseMetaData meta) {
-        try {
-            return meta.supportsBatchUpdates();
-        } catch (Throwable e) {
-            addInfo("Missing DatabaseMetaData.supportsBatchUpdates method.");
-            return false;
-        }
-    }
-}

_service:tar_scm:v_1.1.7.tar.gz/logback-core/src/main/java/ch/qos/logback/core/db/dialect/H2Dialect.java Deleted

_service:tar_scm:v_1.1.7.tar.gz/logback-core/src/main/java/ch/qos/logback/core/db/dialect/HSQLDBDialect.java Deleted

_service:tar_scm:v_1.1.7.tar.gz/logback-core/src/main/java/ch/qos/logback/core/db/dialect/MsSQLDialect.java Deleted

_service:tar_scm:v_1.1.7.tar.gz/logback-core/src/main/java/ch/qos/logback/core/db/dialect/MySQLDialect.java Deleted

_service:tar_scm:v_1.1.7.tar.gz/logback-core/src/main/java/ch/qos/logback/core/db/dialect/OracleDialect.java Deleted

_service:tar_scm:v_1.1.7.tar.gz/logback-core/src/main/java/ch/qos/logback/core/db/dialect/PostgreSQLDialect.java Deleted

_service:tar_scm:v_1.1.7.tar.gz/logback-core/src/main/java/ch/qos/logback/core/db/dialect/SQLDialect.java Deleted

_service:tar_scm:v_1.1.7.tar.gz/logback-core/src/main/java/ch/qos/logback/core/db/dialect/SQLDialectCode.java Deleted

_service:tar_scm:v_1.1.7.tar.gz/logback-core/src/main/java/ch/qos/logback/core/db/dialect/SQLiteDialect.java Deleted

_service:tar_scm:v_1.1.7.tar.gz/logback-core/src/main/java/ch/qos/logback/core/db/dialect/SybaseSqlAnywhereDialect.java Deleted

@@ -1,33 +0,0 @@
-/**
- * Logback: the reliable, generic, fast and flexible logging framework.
- * Copyright (C) 1999-2015, 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.db.dialect;
-
-public class SybaseSqlAnywhereDialect implements SQLDialect {
-
-    /** 
-    * The Sybase SQLAnywhere Dialect 
-    * 
-    * Note that the dialect is not needed if your JDBC driver supports 
-    * the getGeneratedKeys method introduced in JDBC 3.0 specification.
-    * 
-    * @author Michael Lynch 
-    */
-
-    public static final String SELECT_CURRVAL = "SELECT @@identity id";
-
-    public String getSelectInsertId() {
-        return SELECT_CURRVAL;
-    }
-
-}

_service:tar_scm:v_1.1.7.tar.gz/logback-core/src/main/java/ch/qos/logback/core/db/dialect/package.html Deleted

_service:tar_scm:v_1.1.7.tar.gz/logback-core/src/main/java/ch/qos/logback/core/db/package.html Deleted

_service:tar_scm:v_1.1.7.tar.gz/logback-core/src/main/java/ch/qos/logback/core/encoder/EventObjectInputStream.java Deleted

@@ -1,156 +0,0 @@
-/**
- * Logback: the reliable, generic, fast and flexible logging framework.
- * Copyright (C) 1999-2015, 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.encoder;
-
-import static ch.qos.logback.core.CoreConstants.BYTES_PER_INT;
-import static ch.qos.logback.core.encoder.ObjectStreamEncoder.START_PEBBLE;
-import static ch.qos.logback.core.encoder.ObjectStreamEncoder.STOP_PEBBLE;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.ObjectInputStream;
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * Restitute the contents of an input stream as java objects.
- * 
- * @author Ceki G&uuml;lc&uuml;
- *
- * @param <E>
- */
-public class EventObjectInputStream<E> extends InputStream {
-
- NonClosableInputStream ncis;
- List<E> buffer = new ArrayList<E>();
-
- int index = 0;
-
- EventObjectInputStream(InputStream is) throws IOException {
- this.ncis = new NonClosableInputStream(is);
- }
-
- @Override
- public int read() throws IOException {
- throw new UnsupportedOperationException("Only the readEvent method is supported.");
- }
-
- /**
- * Returns the number of bytes available
- */
- public int available() throws IOException {
- return ncis.available();
- }
-
- public E readEvent() throws IOException {
-
- E event = getFromBuffer();
- if (event != null) {
- return event;
- }
-
- internalReset();
- int count = readHeader();
- if (count == -1) {
- return null;
- }
- readPayload(count);
- readFooter(count);
- return getFromBuffer();
- }
-
- private void internalReset() {
- index = 0;
- buffer.clear();
- }
-
- E getFromBuffer() {
- if (index >= buffer.size()) {
- return null;
- }
- return buffer.get(this.index++);
- }
-
- int readHeader() throws IOException {
- byte headerBA = new byte4 * BYTES_PER_INT;
- // System.out.println("available="+ncis.available());
- int bytesRead = ncis.read(headerBA);
- if (bytesRead == -1) {
- return -1;
- }
- // System.out.println("**bytesRead="+bytesRead);
-
- // System.out.println(ByteArrayUtil.toHexString(headerBA));
-
- int offset = 0;
- int startPebble = ByteArrayUtil.readInt(headerBA, offset);
- if (startPebble != START_PEBBLE) {
- throw new IllegalStateException("Does not look like data created by ObjectStreamEncoder");
- }
- offset += BYTES_PER_INT;
- int count = ByteArrayUtil.readInt(headerBA, offset);
- offset += BYTES_PER_INT;
- int endPointer = ByteArrayUtil.readInt(headerBA, offset);
- offset += BYTES_PER_INT;
- int checksum = ByteArrayUtil.readInt(headerBA, offset);
- if (checksum != (START_PEBBLE ^ count)) {
- throw new IllegalStateException("Invalid checksum");
- }
- return count;
- }
-
- @SuppressWarnings("unchecked")
- E readEvents(ObjectInputStream ois) throws IOException {
- E e = null;
- try {
- e = (E) ois.readObject();
- buffer.add(e);
- } catch (ClassNotFoundException e1) {
- // FIXME Auto-generated catch block
- e1.printStackTrace();
- }
- return e;
- }
-
- void readFooter(int count) throws IOException {
- byte headerBA = new byte2 * BYTES_PER_INT;
- ncis.read(headerBA);
-
- int offset = 0;
- int stopPebble = ByteArrayUtil.readInt(headerBA, offset);
- if (stopPebble != STOP_PEBBLE) {
- throw new IllegalStateException("Looks like a corrupt stream");
- }
- offset += BYTES_PER_INT;
- int checksum = ByteArrayUtil.readInt(headerBA, offset);
- if (checksum != (STOP_PEBBLE ^ count)) {
- throw new IllegalStateException("Invalid checksum");
- }
- }
-
- void readPayload(int count) throws IOException {
- List<E> eventList = new ArrayList<E>(count);
- ObjectInputStream ois = new ObjectInputStream(ncis);
- for (int i = 0; i < count; i++) {
- E e = (E) readEvents(ois);
- eventList.add(e);
- }
- ois.close();
- }
-
- public void close() throws IOException {
- ncis.realClose();
- }
-
-}

_service:tar_scm:v_1.1.7.tar.gz/logback-core/src/main/java/ch/qos/logback/core/encoder/ObjectStreamEncoder.java Deleted

@@ -1,95 +0,0 @@
-/**
- * Logback: the reliable, generic, fast and flexible logging framework.
- * Copyright (C) 1999-2015, 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.encoder;
-
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.ObjectOutputStream;
-import java.io.OutputStream;
-import java.util.ArrayList;
-import java.util.List;
-
-import ch.qos.logback.core.CoreConstants;
-
-/**
- * Write out events as java objects.
- * 
- * @author Ceki G&uuml;lc&uuml;
- *
- * @param <E>
- */
-public class ObjectStreamEncoder<E> extends EncoderBase<E> {
-
- static public final int START_PEBBLE = 1853421169;
- static public final int STOP_PEBBLE = 640373619;
-
- private int MAX_BUFFER_SIZE = 100;
-
- List<E> bufferList = new ArrayList<E>(MAX_BUFFER_SIZE);
-
- public void doEncode(E event) throws IOException {
- bufferList.add(event);
- if (bufferList.size() == MAX_BUFFER_SIZE) {
- writeBuffer();
- }
- }
-
- void writeHeader(ByteArrayOutputStream baos, int bufferSize) {
- ByteArrayUtil.writeInt(baos, START_PEBBLE);
- ByteArrayUtil.writeInt(baos, bufferSize);
- ByteArrayUtil.writeInt(baos, 0);
- ByteArrayUtil.writeInt(baos, START_PEBBLE ^ bufferSize);
- }
-
- void writeFooter(ByteArrayOutputStream baos, int bufferSize) {
- ByteArrayUtil.writeInt(baos, STOP_PEBBLE);
- ByteArrayUtil.writeInt(baos, STOP_PEBBLE ^ bufferSize);
- }
-
- void writeBuffer() throws IOException {
- ByteArrayOutputStream baos = new ByteArrayOutputStream(10000);
-
- int size = bufferList.size();
- writeHeader(baos, size);
- ObjectOutputStream oos = new ObjectOutputStream(baos);
- for (E e : bufferList) {
- oos.writeObject(e);
- }
- bufferList.clear();
- oos.flush();
-
- writeFooter(baos, size);
-
- byte byteArray = baos.toByteArray();
- oos.close();
- writeEndPosition(byteArray);
- outputStream.write(byteArray);
-
- }
-
- void writeEndPosition(byte byteArray) {
- int offset = 2 * CoreConstants.BYTES_PER_INT;
- ByteArrayUtil.writeInt(byteArray, offset, byteArray.length - offset);
- }
-
- @Override
- public void init(OutputStream os) throws IOException {
- super.init(os);
- bufferList.clear();
- }
-
- public void close() throws IOException {
- writeBuffer();
- }
-}

_service:tar_scm:v_1.1.7.tar.gz/logback-core/src/main/java/ch/qos/logback/core/net/JMSAppenderBase.java Deleted

@@ -1,171 +0,0 @@
-/**
- * Logback: the reliable, generic, fast and flexible logging framework.
- * Copyright (C) 1999-2015, 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.net;
-
-import java.util.Hashtable;
-import java.util.Properties;
-
-import javax.naming.Context;
-import javax.naming.InitialContext;
-import javax.naming.NameNotFoundException;
-import javax.naming.NamingException;
-
-import ch.qos.logback.core.AppenderBase;
-
-/**
- * This class serves as a base class for 
- * JMSTopicAppender and JMSQueueAppender
- * 
- * For more information about this appender, please refer to:
- * http://logback.qos.ch/manual/appenders.html#JMSAppenderBase
- *
- * @author Ceki G&uuml;lc&uuml;
- * @author S&eacute;bastien Pennec
- */
-public abstract class JMSAppenderBase<E> extends AppenderBase<E> {
-
- protected String securityPrincipalName;
- protected String securityCredentials;
- protected String initialContextFactoryName;
- protected String urlPkgPrefixes;
- protected String providerURL;
- protected String userName;
- protected String password;
-
- protected Object lookup(Context ctx, String name) throws NamingException {
- try {
- return ctx.lookup(name);
- } catch (NameNotFoundException e) {
- addError("Could not find name " + name + ".");
- throw e;
- }
- }
-
- public Context buildJNDIContext() throws NamingException {
- Context jndi = null;
-
- // addInfo("Getting initial context.");
- if (initialContextFactoryName != null) {
- Properties env = buildEnvProperties();
- jndi = new InitialContext(env);
- } else {
- jndi = new InitialContext();
- }
- return jndi;
- }
-
- public Properties buildEnvProperties() {
- Properties env = new Properties();
- env.put(Context.INITIAL_CONTEXT_FACTORY, initialContextFactoryName);
- if (providerURL != null) {
- env.put(Context.PROVIDER_URL, providerURL);
- } else {
- addWarn("You have set InitialContextFactoryName option but not the " + "ProviderURL. This is likely to cause problems.");
- }
- if (urlPkgPrefixes != null) {
- env.put(Context.URL_PKG_PREFIXES, urlPkgPrefixes);
- }
-
- if (securityPrincipalName != null) {
- env.put(Context.SECURITY_PRINCIPAL, securityPrincipalName);
- if (securityCredentials != null) {
- env.put(Context.SECURITY_CREDENTIALS, securityCredentials);
- } else {
- addWarn("You have set SecurityPrincipalName option but not the " + "SecurityCredentials. This is likely to cause problems.");
- }
- }
- return env;
- }
-
- /**
- * Returns the value of the InitialContextFactoryName option. See
- * {@link #setInitialContextFactoryName} for more details on the meaning of
- * this option.
- */
- public String getInitialContextFactoryName() {
- return initialContextFactoryName;
- }
-
- /**
- * Setting the InitialContextFactoryName method will cause this
- * <code>JMSAppender</code> instance to use the {@link
- * InitialContext#InitialContext(Hashtable)} method instead of the no-argument
- * constructor. If you set this option, you should also at least set the
- * ProviderURL option.
- * 
- * 
- * See also {@link #setProviderURL(String)}.
- */
- public void setInitialContextFactoryName(String initialContextFactoryName) {
- this.initialContextFactoryName = initialContextFactoryName;
- }
-
- public String getProviderURL() {
- return providerURL;
- }
-
- public void setProviderURL(String providerURL) {
- this.providerURL = providerURL;
- }
-
- public String getURLPkgPrefixes() {
- return urlPkgPrefixes;
- }
-
- public void setURLPkgPrefixes(String urlPkgPrefixes) {
- this.urlPkgPrefixes = urlPkgPrefixes;
- }
-
- public String getSecurityCredentials() {
- return securityCredentials;
- }
-
- public void setSecurityCredentials(String securityCredentials) {
- this.securityCredentials = securityCredentials;
- }
-
- public String getSecurityPrincipalName() {
- return securityPrincipalName;
- }
-
- public void setSecurityPrincipalName(String securityPrincipalName) {
- this.securityPrincipalName = securityPrincipalName;
- }
-
- public String getUserName() {
- return userName;
- }
-
- /**
- * The user name to use when {@link
- * javax.jms.TopicConnectionFactory#createTopicConnection(String, String)}
- * creating a topic session}. If you set this option, you should also set the
- * Password option. See {@link #setPassword(String)}.
- */
- public void setUserName(String userName) {
- this.userName = userName;
- }
-
- public String getPassword() {
- return password;
- }
-
- /**
- * The password to use when creating a topic session.
- */
- public void setPassword(String password) {
- this.password = password;
- }
-
-}

_service:tar_scm:v_1.1.7.tar.gz/logback-core/src/test/java/ch/qos/logback/core/encoder/ObjectEncodeDecodeTest.java Deleted

@@ -1,92 +0,0 @@
-/**
- * Logback: the reliable, generic, fast and flexible logging framework.
- * Copyright (C) 1999-2015, 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.encoder;
-
-import static org.junit.Assert.assertEquals;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.junit.Before;
-import org.junit.Test;
-
-import ch.qos.logback.core.testUtil.RandomUtil;
-import ch.qos.logback.core.util.CoreTestConstants;
-
-public class ObjectEncodeDecodeTest {
-
- ObjectStreamEncoder<String> encoder = new ObjectStreamEncoder<String>();
- EventObjectInputStream<String> eventStream;
-
- int diff = RandomUtil.getPositiveInt();
- protected String randomOutputDir = CoreTestConstants.OUTPUT_DIR_PREFIX + diff + "/";
-
- @Before
- public void setUp() {
- File randomOupurDirFile = new File(randomOutputDir);
- randomOupurDirFile.mkdirs();
- }
-
- void encodeList(File file, List<String> list) throws IOException {
- FileOutputStream fos = new FileOutputStream(file);
- encoder.init(fos);
- for (String s : list) {
- encoder.doEncode(s);
- }
- encoder.close();
- fos.close();
- }
-
- List<String> decodeList(File file) throws IOException {
- FileInputStream fis = new FileInputStream(file);
- eventStream = new EventObjectInputStream<String>(fis);
- List<String> back = new ArrayList<String>();
- String e;
- while ((e = eventStream.readEvent()) != null) {
- back.add(e);
- }
- return back;
- }
-
- @Test
- public void singleBatch() throws IOException {
- File file = new File(randomOutputDir + "x.lbo");
-
- List<String> witness = new ArrayList<String>();
- for (int i = 0; i < 10; i++) {
- witness.add("hello" + i);
- }
- encodeList(file, witness);
- List<String> back = decodeList(file);
- assertEquals(witness, back);
- }
-
- @Test
- public void multipleBatches() throws IOException {
- File file = new File(randomOutputDir + "m.lbo");
-
- List<String> witness = new ArrayList<String>();
- for (int i = 0; i < 100 * 10; i++) {
- witness.add("hello" + i);
- }
- encodeList(file, witness);
- List<String> back = decodeList(file);
- assertEquals(witness, back);
- }
-
-}

_service:tar_scm:v_1.1.7.tar.gz/logback-core/src/test/java/ch/qos/logback/core/net/AbstractSocketAppenderTest.java Deleted

@@ -1,527 +0,0 @@
-/**
- * Logback: the reliable, generic, fast and flexible logging framework.
- * Copyright (C) 1999-2015, 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.net;
-
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyInt;
-import static org.mockito.Matchers.anyLong;
-import static org.mockito.Matchers.anyObject;
-import static org.mockito.Matchers.anyString;
-import static org.mockito.Matchers.contains;
-import static org.mockito.Matchers.eq;
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.doThrow;
-import static org.mockito.Mockito.inOrder;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.reset;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.timeout;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.verifyZeroInteractions;
-import static org.mockito.Mockito.when;
-
-import java.io.IOException;
-import java.io.OutputStream;
-import java.io.Serializable;
-import java.net.InetAddress;
-import java.net.Socket;
-import java.util.concurrent.LinkedBlockingDeque;
-import java.util.concurrent.ScheduledExecutorService;
-import java.util.concurrent.TimeUnit;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.mockito.InOrder;
-
-import ch.qos.logback.core.net.mock.MockContext;
-import ch.qos.logback.core.spi.PreSerializationTransformer;
-import ch.qos.logback.core.util.Duration;
-import ch.qos.logback.core.util.ExecutorServiceUtil;
-
-/**
- * Unit tests for {@link AbstractSocketAppender}.
- *
- * @author Carl Harris
- * @author Sebastian Gr&ouml;bler
- */
-public class AbstractSocketAppenderTest {
-
- /**
- * Timeout used for all blocking operations in multi-threading contexts.
- */
- private static final int TIMEOUT = 1000;
-
- private ScheduledExecutorService executorService = spy((ScheduledExecutorService) ExecutorServiceUtil.newScheduledExecutorService());
- private MockContext mockContext = new MockContext(executorService);
- private PreSerializationTransformer<String> preSerializationTransformer = spy(new StringPreSerializationTransformer());
- private Socket socket = mock(Socket.class);
- private SocketConnector socketConnector = mock(SocketConnector.class);
- private AutoFlushingObjectWriter objectWriter = mock(AutoFlushingObjectWriter.class);
- private ObjectWriterFactory objectWriterFactory = mock(ObjectWriterFactory.class);
- private LinkedBlockingDeque<String> deque = spy(new LinkedBlockingDeque<String>(1));
- private QueueFactory queueFactory = mock(QueueFactory.class);
- private InstrumentedSocketAppender appender = spy(new InstrumentedSocketAppender(preSerializationTransformer, queueFactory, objectWriterFactory,
- socketConnector));
-
- @Before
- public void setupValidAppenderWithMockDependencies() throws Exception {
-
- doReturn(objectWriter).when(objectWriterFactory).newAutoFlushingObjectWriter(any(OutputStream.class));
- doReturn(deque).when(queueFactory).<String> newLinkedBlockingDeque(anyInt());
-
- appender.setContext(mockContext);
- appender.setRemoteHost("localhost");
- }
-
- @After
- public void tearDown() throws Exception {
- appender.stop();
- assertFalse(appender.isStarted());
-
- executorService.shutdownNow();
- assertTrue(executorService.awaitTermination(TIMEOUT, TimeUnit.MILLISECONDS));
- }
-
- @Test
- public void failsToStartWithoutValidPort() throws Exception {
-
- // given
- appender.setPort(-1);
-
- // when
- appender.start();
-
- // then
- assertFalse(appender.isStarted());
- verify(appender).addError(contains("port"));
- }
-
- @Test
- public void failsToStartWithoutValidRemoteHost() throws Exception {
-
- // given
- appender.setRemoteHost(null);
-
- // when
- appender.start();
-
- // then
- assertFalse(appender.isStarted());
- verify(appender).addError(contains("remote host"));
- }
-
- @Test
- public void failsToStartWithNegativeQueueSize() throws Exception {
-
- // given
- appender.setQueueSize(-1);
-
- // when
- appender.start();
-
- // then
- assertFalse(appender.isStarted());
- verify(appender).addError(contains("Queue size must be greater than zero"));
- }
-
- @Test
- public void failsToStartWithUnresolvableRemoteHost() throws Exception {
-
- // given
- appender.setRemoteHost("NOT.A.VALID.REMOTE.HOST.NAME");
-
- // when
- appender.start();
-
- // then
- assertFalse(appender.isStarted());
- verify(appender).addError(contains("unknown host"));
- }
-
- @Test
- public void startsButOutputsWarningWhenQueueSizeIsZero() throws Exception {
-
- // given
- appender.setQueueSize(0);
-
- // when
- appender.start();
-
- // then
- assertTrue(appender.isStarted());
- verify(appender).addWarn("Queue size of zero is deprecated, use a size of one to indicate synchronous processing");
- }
-
- @Test
- public void startsWithValidParameters() throws Exception {
-
- // when
- appender.start();
-
- // then
- assertTrue(appender.isStarted());
- }
-
- @Test
- public void createsSocketConnectorWithConfiguredParameters() throws Exception {
-
- // given
- appender.setReconnectionDelay(new Duration(42));
- appender.setRemoteHost("localhost");
- appender.setPort(21);
-
- // when
- appender.start();
-
- // then
- verify(appender, timeout(TIMEOUT)).newConnector(InetAddress.getByName("localhost"), 21, 0, 42);
- }
-
- @Test
- public void addsInfoMessageWhenSocketConnectionWasEstablished() throws Exception {
-
- // when
- mockOneSuccessfulSocketConnection();
- appender.start();
-
- // then
- verify(appender, timeout(TIMEOUT)).addInfo(contains("connection established"));
- }
-
- @Test
- public void addsInfoMessageWhenSocketConnectionFailed() throws Exception {
-
- // given
- mockOneSuccessfulSocketConnection();
- doThrow(new IOException()).when(objectWriterFactory).newAutoFlushingObjectWriter(any(OutputStream.class));
- appender.start();
-
- // when
- appender.append("some event");
-
- // then
- verify(appender, timeout(TIMEOUT).atLeastOnce()).addInfo(contains("connection failed"));
- }
-
- @Test
- public void closesSocketOnException() throws Exception {
-
- // given
- mockOneSuccessfulSocketConnection();
- doThrow(new IOException()).when(objectWriterFactory).newAutoFlushingObjectWriter(any(OutputStream.class));
- appender.start();
-
- // when
- appender.append("some event");
-
- // then
- verify(socket, timeout(TIMEOUT).atLeastOnce()).close();
- }
-
- @Test
- public void addsInfoMessageWhenSocketConnectionClosed() throws Exception {
-
- // given
- mockOneSuccessfulSocketConnection();
- doThrow(new IOException()).when(objectWriterFactory).newAutoFlushingObjectWriter(any(OutputStream.class));
- appender.start();
-
- // when
- appender.append("some event");
-
- // then
- verify(appender, timeout(TIMEOUT).atLeastOnce()).addInfo(contains("connection closed"));
- }
-
- @Test
- public void shutsDownOnInterruptWhileWaitingForEvent() throws Exception {
-
- // given
- mockOneSuccessfulSocketConnection();
- doThrow(new InterruptedException()).when(deque).takeFirst();
-
- // when
- appender.start();
-
- // then
- verify(deque, timeout(TIMEOUT)).takeFirst();
- }
-
- @Test
- public void shutsDownOnInterruptWhileWaitingForSocketConnection() throws Exception {
-
- // given
- doThrow(new InterruptedException()).when(socketConnector).call();
-
- // when
- appender.start();
-
- // then
- verify(socketConnector, timeout(TIMEOUT)).call();
- }
-
- @Test
- public void addsInfoMessageWhenShuttingDownDueToInterrupt() throws Exception {
-
- // given
- doThrow(new InterruptedException()).when(socketConnector).call();
-
- // when
- appender.start();
-
- // then
- verify(appender, timeout(TIMEOUT)).addInfo(contains("shutting down"));
- }
-
- @Test
- public void offersEventsToTheEndOfTheDeque() throws Exception {
-
- // given
- appender.start();
-
- // when
- appender.append("some event");
-
- // then
- verify(deque).offer(eq("some event"), anyLong(), any(TimeUnit.class));
- }
-
- @Test
- public void doesNotQueueAnyEventsWhenStopped() throws Exception {
-
- // given
- appender.start();
- appender.stop();
-
- // when
- appender.append("some event");
-
- // then
- verifyZeroInteractions(deque);
- }
-
- @Test
- public void addsInfoMessageWhenEventCouldNotBeQueuedInConfiguredTimeoutDueToQueueSizeLimitation() throws Exception {
-
- // given
- long eventDelayLimit = 42;
- doReturn(false).when(deque).offer("some event", eventDelayLimit, TimeUnit.MILLISECONDS);
- appender.setEventDelayLimit(new Duration(eventDelayLimit));
- appender.start();
-
- // when
- appender.append("some event");
-
- // then
- verify(appender).addInfo("Dropping event due to timeout limit of " + eventDelayLimit + " milliseconds being exceeded");
- }
-
- @Test
- public void takesEventsFromTheFrontOfTheDeque() throws Exception {
-
- // given
- mockOneSuccessfulSocketConnection();
- appender.start();
- awaitStartOfEventDispatching();
-
- // when
- appender.append("some event");
-
- // then
- verify(deque, timeout(TIMEOUT).atLeastOnce()).takeFirst();
- }
-
- @Test
- public void reAddsEventAtTheFrontOfTheDequeWhenTransmissionFails() throws Exception {
-
- // given
- mockOneSuccessfulSocketConnection();
- doThrow(new IOException()).when(objectWriter).write(anyObject());
- appender.start();
- awaitStartOfEventDispatching();
-
- // when
- appender.append("some event");
-
- // then
- verify(deque, timeout(TIMEOUT).atLeastOnce()).offerFirst("some event");
- }
-
- @Test
- public void addsErrorMessageWhenAppendingIsInterruptedWhileWaitingForTheQueueToAcceptTheEvent() throws Exception {
-
- // given
- final InterruptedException interruptedException = new InterruptedException();
- doThrow(interruptedException).when(deque).offer(eq("some event"), anyLong(), any(TimeUnit.class));
- appender.start();
-
- // when
- appender.append("some event");
-
- // then
- verify(appender).addError("Interrupted while appending event to SocketAppender", interruptedException);
- }
-
- @Test
- public void postProcessesEventsBeforeTransformingItToASerializable() throws Exception {
-
- // given
- mockOneSuccessfulSocketConnection();
- appender.start();
- awaitStartOfEventDispatching();
-
- // when
- appender.append("some event");
- awaitAtLeastOneEventToBeDispatched();
-
- // then
- InOrder inOrder = inOrder(appender, preSerializationTransformer);
- inOrder.verify(appender).postProcessEvent("some event");
- inOrder.verify(preSerializationTransformer).transform("some event");
- }
-
- @Test
- public void writesSerializedEventToStream() throws Exception {
-
- // given
- mockOneSuccessfulSocketConnection();
- when(preSerializationTransformer.transform("some event")).thenReturn("some serialized event");
- appender.start();
- awaitStartOfEventDispatching();
-
- // when
- appender.append("some event");
-
- // then
- verify(objectWriter, timeout(TIMEOUT)).write("some serialized event");
- }
-
- @Test
- public void addsInfoMessageWhenEventIsBeingDroppedBecauseOfConnectionProblemAndDequeCapacityLimitReached() throws Exception {
-
- // given
- mockOneSuccessfulSocketConnection();
- doThrow(new IOException()).when(objectWriter).write(anyObject());
- doReturn(false).when(deque).offerFirst("some event");
- appender.start();
- awaitStartOfEventDispatching();
- reset(appender);
-
- // when
- appender.append("some event");
-
- // then
- verify(appender, timeout(TIMEOUT)).addInfo("Dropping event due to socket connection error and maxed out deque capacity");
- }
-
- @Test
- public void reEstablishesSocketConnectionOnConnectionDropWhenWritingEvent() throws Exception {
-
- // given
- mockTwoSuccessfulSocketConnections();
- doThrow(new IOException()).when(objectWriter).write(anyObject());
- appender.start();
- awaitStartOfEventDispatching();
-
- // when
- appender.append("some event");
-
- // then
- verify(objectWriterFactory, timeout(TIMEOUT).atLeast(2)).newAutoFlushingObjectWriter(any(OutputStream.class));
- }
-
- @Test
- public void triesToReEstablishSocketConnectionIfItFailed() throws Exception {
-
- // given
- mockOneSuccessfulSocketConnection();
- doThrow(new IOException()).when(socket).getOutputStream();
- appender.start();
-
- // when
- appender.append("some event");
-
- // then
- verify(socketConnector, timeout(TIMEOUT).atLeast(2)).call();
- }
-
- @Test
- public void usesConfiguredAcceptConnectionTimeoutAndResetsSocketTimeoutAfterSuccessfulConnection() throws Exception {
-
- // when
- mockOneSuccessfulSocketConnection();
- appender.setAcceptConnectionTimeout(42);
- appender.start();
- awaitStartOfEventDispatching();
-
- // then
- InOrder inOrder = inOrder(socket);
- inOrder.verify(socket).setSoTimeout(42);
- inOrder.verify(socket).setSoTimeout(0);
- }
-
- private void awaitAtLeastOneEventToBeDispatched() throws IOException {
- verify(objectWriter, timeout(TIMEOUT)).write(anyString());
- }
-
- private void awaitStartOfEventDispatching() throws InterruptedException {
- verify(deque, timeout(TIMEOUT)).takeFirst();
- }
-
- private void mockOneSuccessfulSocketConnection() throws InterruptedException {
- doReturn(socket).doReturn(null).when(socketConnector).call();
- }
-
- private void mockTwoSuccessfulSocketConnections() throws InterruptedException {
- doReturn(socket).doReturn(socket).doReturn(null).when(socketConnector).call();
- }
-
- private static class InstrumentedSocketAppender extends AbstractSocketAppender<String> {
-
- private PreSerializationTransformer<String> preSerializationTransformer;
- private SocketConnector socketConnector;
-
- public InstrumentedSocketAppender(PreSerializationTransformer<String> preSerializationTransformer, QueueFactory queueFactory,
- ObjectWriterFactory objectWriterFactory, SocketConnector socketConnector) {
- super(queueFactory, objectWriterFactory);
- this.preSerializationTransformer = preSerializationTransformer;
- this.socketConnector = socketConnector;
- }
-
- @Override
- protected void postProcessEvent(String event) {
- }
-
- @Override
- protected PreSerializationTransformer<String> getPST() {
- return preSerializationTransformer;
- }
-
- @Override
- protected SocketConnector newConnector(InetAddress address, int port, long initialDelay, long retryDelay) {
- return socketConnector;
- }
- }
-
- private static class StringPreSerializationTransformer implements PreSerializationTransformer<String> {
-
- @Override
- public Serializable transform(String event) {
- return event;
- }
- }
-}

_service:tar_scm:v_1.1.7.tar.gz/logback-core/src/test/java/ch/qos/logback/core/rolling/SizeBasedTriggeringPolicyTest.java Deleted

@@ -1,57 +0,0 @@
-/**
- * Logback: the reliable, generic, fast and flexible logging framework.
- * Copyright (C) 1999-2015, 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 junit.framework.TestCase;
-import ch.qos.logback.core.Context;
-import ch.qos.logback.core.ContextBase;
-
-public class SizeBasedTriggeringPolicyTest extends TestCase {
-
-    public void testStringToLong() {
-        Context context = new ContextBase();
-        SizeBasedTriggeringPolicy policy = new SizeBasedTriggeringPolicy();
-        policy.setContext(context);
-
-        Long result;
-
-        {
-            result = policy.toFileSize("123");
-            assertEquals(new Long("123"), result);
-        }
-        {
-            result = policy.toFileSize("123KB");
-            // = 123 * 1024
-            assertEquals(new Long("125952"), result);
-        }
-        {
-            result = policy.toFileSize("123MB");
-            // = 123 * 1024 * 1024
-            assertEquals(new Long("128974848"), result);
-        }
-        {
-            result = policy.toFileSize("123GB");
-            // = 123 * 1024 * 1024 * 1024
-            assertEquals(new Long("132070244352"), result);
-        }
-
-        {
-            result = policy.toFileSize("123xxxx");
-            // = 123 * 1024 * 1024 * 1024
-            assertEquals(new Long(SizeBasedTriggeringPolicy.DEFAULT_MAX_FILE_SIZE), result);
-            assertEquals(2, context.getStatusManager().getCount());
-        }
-
-    }
-}

_service:tar_scm:v_1.2.8.tar.gz/README.md Added

@@ -0,0 +1,57 @@
+
+#About logback
+
+Thank you for your interest in logback, the reliable, generic, fast
+and flexible logging library for Java.
+
+The Logback documentation can be found on the project
+web-site(https://logback.qos.ch/documentation.html) as well as under
+the docs/ folder of the logback distribution.
+
+#Building logback
+
+Building logback is documented at:
+
+  https://logback.qos.ch/setup.html#ide
+
+#In case of problems
+
+In case of problems please do not hesitate to post an e-mail message
+on the logback-user@qos.ch mailing list.  However, please do not
+directly e-mail logback developers. The answer to your question might
+be useful to other users. Moreover, there are many knowledgeable users
+on the logback-user mailing lists who can quickly answer your
+questions.
+
+
+#Pull requests
+
+If you are interested in improving logback, great! The logback community
+looks forward to your contribution. Please follow this process:
+
+1. Please file a bug
+   report(https://logback.qos.ch/bugreport.html). Pull requests with
+   an associated JIRA issue will get more attention.
+
+   Optional: Start a discussion on the logback-dev mailing
+   list(https://logback.qos.ch/mailinglist.html) about your proposed
+   change.
+
+2. Fork qos-ch/logback. Ideally, create a new branch from your fork for
+   your contribution to make it easier to merge your changes back.
+
+3. Make your changes on the branch you hopefuly created in Step 2. Be
+   sure that your code passes existing unit tests.
+
+4. Please add unit tests for your work if appropriate. It usually is.
+
+5. Push your changes to your fork/branch in github. Don't push it to
+   your master! If you do it will make it harder to submit new changes
+   later.
+
+6. Submit a pull request to logback from from your commit page on
+   github.
+
+
+# Build Status
+!Build Status(https://travis-ci.org/qos-ch/slf4j.png)(https://travis-ci.org/qos-ch/slf4j)

_service:tar_scm:v_1.1.7.tar.gz/logback-access/pom.xml -> _service:tar_scm:v_1.2.8.tar.gz/logback-access/pom.xml Changed

_service:tar_scm:v_1.1.7.tar.gz/logback-access/src/main/java/ch/qos/logback/access/jetty/RequestLogImpl.java -> _service:tar_scm:v_1.2.8.tar.gz/logback-access/src/main/java/ch/qos/logback/access/jetty/RequestLogImpl.java Changed

_service:tar_scm:v_1.1.7.tar.gz/logback-access/src/main/java/ch/qos/logback/access/joran/JoranConfigurator.java -> _service:tar_scm:v_1.2.8.tar.gz/logback-access/src/main/java/ch/qos/logback/access/joran/JoranConfigurator.java Changed

@@ -19,6 +19,7 @@
 import ch.qos.logback.access.joran.action.ConfigurationAction;
 import ch.qos.logback.access.joran.action.EvaluatorAction;
 import ch.qos.logback.access.sift.SiftAction;
+import ch.qos.logback.access.spi.IAccessEvent;
 import ch.qos.logback.core.AppenderBase;
 import ch.qos.logback.core.UnsynchronizedAppenderBase;
 import ch.qos.logback.core.filter.EvaluatorFilter;
@@ -39,14 +40,14 @@
 *
 * @author Ceki G&uuml;lc&uuml;
 */
-public class JoranConfigurator extends JoranConfiguratorBase {
+public class JoranConfigurator extends JoranConfiguratorBase<IAccessEvent> {
 
 @Override
 public void addInstanceRules(RuleStore rs) {
 super.addInstanceRules(rs);
 
 rs.addRule(new ElementSelector("configuration"), new ConfigurationAction());
- rs.addRule(new ElementSelector("configuration/appender-ref"), new AppenderRefAction());
+ rs.addRule(new ElementSelector("configuration/appender-ref"), new AppenderRefAction<IAccessEvent>());
 
 rs.addRule(new ElementSelector("configuration/appender/sift"), new SiftAction());
 rs.addRule(new ElementSelector("configuration/appender/sift/*"), new NOPAction());

_service:tar_scm:v_1.1.7.tar.gz/logback-access/src/main/java/ch/qos/logback/access/joran/action/ConfigurationAction.java -> _service:tar_scm:v_1.2.8.tar.gz/logback-access/src/main/java/ch/qos/logback/access/joran/action/ConfigurationAction.java Changed

@@ -13,15 +13,13 @@
  */
 package ch.qos.logback.access.joran.action;
 
-import ch.qos.logback.core.status.OnConsoleStatusListener;
-import ch.qos.logback.core.util.OptionHelper;
-import ch.qos.logback.core.util.StatusListenerConfigHelper;
-
 import org.xml.sax.Attributes;
 
 import ch.qos.logback.core.joran.action.Action;
 import ch.qos.logback.core.joran.spi.InterpretationContext;
-import ch.qos.logback.core.util.ContextUtil;
+import ch.qos.logback.core.status.OnConsoleStatusListener;
+import ch.qos.logback.core.util.OptionHelper;
+import ch.qos.logback.core.util.StatusListenerConfigHelper;
 
 public class ConfigurationAction extends Action {
     static final String INTERNAL_DEBUG_ATTR = "debug";
@@ -44,8 +42,6 @@
             StatusListenerConfigHelper.addOnConsoleListenerInstance(context, new OnConsoleStatusListener());
         }
 
-        new ContextUtil(context).addHostNameAsProperty();
-
         // the context is appender attachable, so it is pushed on top of the stack
         ec.pushObject(getContext());
     }

_service:tar_scm:v_1.2.8.tar.gz/logback-access/src/main/java/ch/qos/logback/access/net/HardenedAccessEventInputStream.java Added

_service:tar_scm:v_1.1.7.tar.gz/logback-access/src/main/java/ch/qos/logback/access/net/SocketNode.java -> _service:tar_scm:v_1.2.8.tar.gz/logback-access/src/main/java/ch/qos/logback/access/net/SocketNode.java Changed

@@ -15,7 +15,6 @@
 
 import java.io.BufferedInputStream;
 import java.io.IOException;
-import java.io.ObjectInputStream;
 import java.net.Socket;
 
 import ch.qos.logback.access.spi.AccessContext;
@@ -42,18 +41,18 @@
 
     Socket socket;
     AccessContext context;
-    ObjectInputStream ois;
+    HardenedAccessEventInputStream hardenedOIS;
 
     public SocketNode(Socket socket, AccessContext context) {
         this.socket = socket;
         this.context = context;
         try {
-            ois = new ObjectInputStream(new BufferedInputStream(socket.getInputStream()));
+            hardenedOIS = new HardenedAccessEventInputStream(new BufferedInputStream(socket.getInputStream()));
         } catch (Exception e) {
-            System.out.println("Could not open ObjectInputStream to " + socket + e);
+            System.out.println("Could not open HardenedObjectInputStream to " + socket + e);
         }
     }
-
+    
     @Override
     public void run() {
         IAccessEvent event;
@@ -61,7 +60,7 @@
         try {
             while (true) {
                 // read an event from the wire
-                event = (IAccessEvent) ois.readObject();
+                event = (IAccessEvent) hardenedOIS.readObject();
                 // check that the event should be logged
                 if (context.getFilterChainDecision(event) == FilterReply.DENY) {
                     break;
@@ -81,7 +80,7 @@
         }
 
         try {
-            ois.close();
+            hardenedOIS.close();
         } catch (Exception e) {
             System.out.println("Could not close connection." + e);
         }

_service:tar_scm:v_1.1.7.tar.gz/logback-access/src/main/java/ch/qos/logback/access/servlet/TeeServletInputStream.java -> _service:tar_scm:v_1.2.8.tar.gz/logback-access/src/main/java/ch/qos/logback/access/servlet/TeeServletInputStream.java Changed

@@ -18,6 +18,7 @@
 import java.io.IOException;
 import java.io.InputStream;
 
+import javax.servlet.ReadListener;
 import javax.servlet.ServletInputStream;
 import javax.servlet.http.HttpServletRequest;
 
@@ -30,11 +31,6 @@
         duplicateInputStream(request);
     }
 
-    @Override
-    public int read() throws IOException {
-        return in.read();
-    }
-
     private void duplicateInputStream(HttpServletRequest request) {
         ServletInputStream originalSIS = null;
         try {
@@ -44,10 +40,15 @@
         } catch (IOException e) {
             e.printStackTrace();
         } finally {
-            closeStrean(originalSIS);
+            closeStream(originalSIS);
         }
     }
 
+    @Override
+    public int read() throws IOException {
+        return in.read();
+    }
+
     byte consumeBufferAndReturnAsByteArray(InputStream is) throws IOException {
         int len = 1024;
         byte temp = new bytelen;
@@ -59,7 +60,7 @@
         return baos.toByteArray();
     }
 
-    void closeStrean(ServletInputStream is) {
+    void closeStream(ServletInputStream is) {
         if (is != null) {
             try {
                 is.close();
@@ -71,4 +72,19 @@
     byte getInputBuffer() {
         return inputBuffer;
     }
+
+    @Override
+    public boolean isFinished() {
+        throw new RuntimeException("Not yet implemented");
+    }
+
+    @Override
+    public boolean isReady() {
+        throw new RuntimeException("Not yet implemented");
+    }
+
+    @Override
+    public void setReadListener(ReadListener listener) {
+        throw new RuntimeException("Not yet implemented");
+    }
 }

_service:tar_scm:v_1.1.7.tar.gz/logback-access/src/main/java/ch/qos/logback/access/servlet/TeeServletOutputStream.java -> _service:tar_scm:v_1.2.8.tar.gz/logback-access/src/main/java/ch/qos/logback/access/servlet/TeeServletOutputStream.java Changed

_service:tar_scm:v_1.1.7.tar.gz/logback-access/src/main/java/ch/qos/logback/access/sift/SiftingJoranConfigurator.java -> _service:tar_scm:v_1.2.8.tar.gz/logback-access/src/main/java/ch/qos/logback/access/sift/SiftingJoranConfigurator.java Changed

@@ -39,15 +39,15 @@
 
 @Override
 protected void addInstanceRules(RuleStore rs) {
- rs.addRule(new ElementSelector("configuration/appender"), new AppenderAction());
+ rs.addRule(new ElementSelector("configuration/appender"), new AppenderAction<IAccessEvent>());
 }
 
 @Override
 protected void buildInterpreter() {
 super.buildInterpreter();
 Map<String, Object> omap = interpreter.getInterpretationContext().getObjectMap();
- omap.put(ActionConst.APPENDER_BAG, new HashMap());
- omap.put(ActionConst.FILTER_CHAIN_BAG, new HashMap());
+ omap.put(ActionConst.APPENDER_BAG, new HashMap<String, Appender<IAccessEvent>>());
+ //omap.put(ActionConst.FILTER_CHAIN_BAG, new HashMap());
 Map<String, String> propertiesMap = new HashMap<String, String>();
 propertiesMap.putAll(parentPropertyMap);
 propertiesMap.put(key, value);
@@ -58,9 +58,9 @@
 @Override
 public Appender<IAccessEvent> getAppender() {
 Map<String, Object> omap = interpreter.getInterpretationContext().getObjectMap();
- HashMap appenderMap = (HashMap) omap.get(ActionConst.APPENDER_BAG);
+ HashMap<String, Appender<?>> appenderMap = (HashMap<String, Appender<?>>) omap.get(ActionConst.APPENDER_BAG);
 oneAndOnlyOneCheck(appenderMap);
- Collection values = appenderMap.values();
+ Collection<Appender<?>> values = appenderMap.values();
 if (values.size() == 0) {
 return null;
 }

_service:tar_scm:v_1.1.7.tar.gz/logback-access/src/main/java/ch/qos/logback/access/spi/AccessEvent.java -> _service:tar_scm:v_1.2.8.tar.gz/logback-access/src/main/java/ch/qos/logback/access/spi/AccessEvent.java Changed

@@ -44,6 +44,8 @@
 */
 public class AccessEvent implements Serializable, IAccessEvent {
 
+ private static final String NA_STRING_ARRAY = new String { NA };
+
 private static final long serialVersionUID = 866718993618836343L;
 
 private static final String EMPTY = "";
@@ -371,6 +373,11 @@
 return;
 }
 
+ // attributeMap has been copied already. See also LOGBACK-1189
+ if(attributeMap != null) {
+ return;
+ }
+ 
 attributeMap = new HashMap<String, Object>();
 
 Enumeration<String> names = httpRequest.getAttributeNames();
@@ -400,16 +407,15 @@
 
 @Override
 public String getRequestParameter(String key) {
- if (httpRequest != null) {
- String value = httpRequest.getParameterValues(key);
- if (value == null) {
- return new String { NA };
- } else {
- return value;
- }
- } else {
- return new String { NA };
+ String value = null;
+ 
+ if(requestParameterMap != null) {
+ value = requestParameterMap.get(key);
+ } else if (httpRequest != null) {
+ value = httpRequest.getParameterValues(key);
 }
+
+ return (value != null) ? value: NA_STRING_ARRAY;
 }
 
 @Override

_service:tar_scm:v_1.1.7.tar.gz/logback-access/src/main/java/ch/qos/logback/access/spi/IAccessEvent.java -> _service:tar_scm:v_1.2.8.tar.gz/logback-access/src/main/java/ch/qos/logback/access/spi/IAccessEvent.java Changed

_service:tar_scm:v_1.1.7.tar.gz/logback-access/src/main/java/ch/qos/logback/access/tomcat/LogbackValve.java -> _service:tar_scm:v_1.2.8.tar.gz/logback-access/src/main/java/ch/qos/logback/access/tomcat/LogbackValve.java Changed

@@ -108,7 +108,7 @@
 boolean started;
 boolean alreadySetLogbackStatusManager = false;
 
- private ExecutorService executorService;
+ private ScheduledExecutorService scheduledExecutorService;
 
 public LogbackValve() {
 putObject(CoreConstants.EVALUATOR_MAP, new HashMap<String, EventEvaluator<?>>());
@@ -120,7 +120,7 @@
 
 @Override
 public void startInternal() throws LifecycleException {
- executorService = ExecutorServiceUtil.newExecutorService();
+ scheduledExecutorService = ExecutorServiceUtil.newScheduledExecutorService();
 
 String filename;
 
@@ -286,9 +286,9 @@
 started = false;
 setState(LifecycleState.STOPPING);
 lifeCycleManager.reset();
- if (executorService != null) {
- ExecutorServiceUtil.shutdown(executorService);
- executorService = null;
+ if (scheduledExecutorService != null) {
+ ExecutorServiceUtil.shutdown(scheduledExecutorService);
+ scheduledExecutorService = null;
 }
 }
 
@@ -328,7 +328,6 @@
 return aai.detachAppender(name);
 }
 
- @Override
 public String getInfo() {
 return "Logback's implementation of ValveBase";
 }
@@ -390,7 +389,7 @@
 
 @Override
 public ExecutorService getExecutorService() {
- return executorService;
+ return getScheduledExecutorService();
 }
 
 @Override
@@ -449,7 +448,7 @@
 
 @Override
 public ScheduledExecutorService getScheduledExecutorService() {
- throw new UnsupportedOperationException();
+ return scheduledExecutorService;
 }
 
 @Override

_service:tar_scm:v_1.1.7.tar.gz/logback-access/src/test/java/ch/qos/logback/access/AllAccessTest.java -> _service:tar_scm:v_1.2.8.tar.gz/logback-access/src/test/java/ch/qos/logback/access/AllAccessTest.java Changed

_service:tar_scm:v_1.1.7.tar.gz/logback-access/src/test/java/ch/qos/logback/access/dummy/DummyRequest.java -> _service:tar_scm:v_1.2.8.tar.gz/logback-access/src/test/java/ch/qos/logback/access/dummy/DummyRequest.java Changed

@@ -33,7 +33,9 @@
 public static final String DUMMY_RESPONSE_CONTENT_STRING = "response contents";
 public static final byte DUMMY_RESPONSE_CONTENT_BYTES = DUMMY_RESPONSE_CONTENT_STRING.getBytes();
 
- Hashtable<String, String> headerNames;
+ Hashtable<String, String> headerMap;
+ Hashtable<String, String> parameterMap;
+ 
 String uri;
 Map<String, Object> attributes;
 
@@ -44,10 +46,13 @@
 }
 
 public DummyRequest() {
- headerNames = new Hashtable<String, String>();
- headerNames.put("headerName1", "headerValue1");
- headerNames.put("headerName2", "headerValue2");
+ headerMap = new Hashtable<String, String>();
+ headerMap.put("headerName1", "headerValue1");
+ headerMap.put("headerName2", "headerValue2");
 
+ parameterMap = new Hashtable<String, String>();
+ parameterMap.put("param1", new String {"value1"});
+ 
 attributes = new HashMap<String, Object>(DUMMY_DEFAULT_ATTR_MAP);
 }
 
@@ -69,17 +74,25 @@
 }
 
 public String getHeader(String key) {
- return headerNames.get(key);
+ return headerMap.get(key);
 }
 
- public Enumeration getHeaderNames() {
- return headerNames.keys();
+
+ @Override
+ public Enumeration<String> getHeaderNames() {
+ return headerMap.keys();
 }
 
- public Enumeration getHeaders(String arg0) {
+ @Override
+ public Enumeration<String> getHeaders(String arg) {
 return null;
 }
 
+ public Map<String, String> getHeaders() {
+ return headerMap;
+ }
+
+ 
 public int getIntHeader(String arg0) {
 return 0;
 }
@@ -176,7 +189,7 @@
 return attributes.get(key);
 }
 
- public Enumeration getAttributeNames() {
+ public Enumeration<String> getAttributeNames() {
 return Collections.enumeration(attributes.keySet());
 }
 
@@ -240,24 +253,31 @@
 return null;
 }
 
- public Enumeration getLocales() {
+ @Override
+ public Enumeration<Locale> getLocales() {
 return null;
 }
 
- public String getParameter(String arg0) {
- return null;
+ public String getParameter(String arg) {
+ String stringArray = parameterMap.get(arg);
+ if(stringArray == null || stringArray.length == 0)
+ return null;
+ else
+ return stringArray0;
 }
 
- public Map getParameterMap() {
- return null;
+ @Override
+ public Map<String, String> getParameterMap() {
+ return parameterMap;
 }
 
- public Enumeration getParameterNames() {
- return null;
+ public Enumeration<String> getParameterNames() {
+ return parameterMap.keys();
+ //eturn Collections.enumeration(parameterMap.keySet());
 }
 
- public String getParameterValues(String arg0) {
- return null;
+ public String getParameterValues(String arg) {
+ return parameterMap.get(arg);
 }
 
 public String getProtocol() {
@@ -317,4 +337,20 @@
 public void setRequestUri(String uri) {
 this.uri = uri;
 }
+
+ @Override
+ public long getContentLengthLong() {
+ // TODO Auto-generated method stub
+ return 0;
+ }
+
+ @Override
+ public String changeSessionId() {
+ return null;
+ }
+
+ @Override
+ public <T extends HttpUpgradeHandler> T upgrade(Class<T> httpUpgradeHandlerClass) throws IOException, ServletException {
+ return null;
+ }
 }

_service:tar_scm:v_1.1.7.tar.gz/logback-access/src/test/java/ch/qos/logback/access/dummy/DummyResponse.java -> _service:tar_scm:v_1.2.8.tar.gz/logback-access/src/test/java/ch/qos/logback/access/dummy/DummyResponse.java Changed

_service:tar_scm:v_1.1.7.tar.gz/logback-access/src/test/java/ch/qos/logback/access/dummy/DummyServletOutputStream.java -> _service:tar_scm:v_1.2.8.tar.gz/logback-access/src/test/java/ch/qos/logback/access/dummy/DummyServletOutputStream.java Changed

_service:tar_scm:v_1.1.7.tar.gz/logback-access/src/test/java/ch/qos/logback/access/joran/ConditionalTest.java -> _service:tar_scm:v_1.2.8.tar.gz/logback-access/src/test/java/ch/qos/logback/access/joran/ConditionalTest.java Changed

_service:tar_scm:v_1.1.7.tar.gz/logback-access/src/test/java/ch/qos/logback/access/joran/PackageTest.java -> _service:tar_scm:v_1.2.8.tar.gz/logback-access/src/test/java/ch/qos/logback/access/joran/PackageTest.java Changed

_service:tar_scm:v_1.1.7.tar.gz/logback-access/src/test/java/ch/qos/logback/access/spi/AccessEventSerializationTest.java -> _service:tar_scm:v_1.2.8.tar.gz/logback-access/src/test/java/ch/qos/logback/access/spi/AccessEventSerializationTest.java Changed

@@ -13,16 +13,21 @@
  */
 package ch.qos.logback.access.spi;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.ObjectOutputStream;
+
+import org.junit.Test;
+
 import ch.qos.logback.access.dummy.DummyAccessEventBuilder;
 import ch.qos.logback.access.dummy.DummyRequest;
 import ch.qos.logback.access.dummy.DummyResponse;
 import ch.qos.logback.access.dummy.DummyServerAdapter;
-import org.junit.Test;
-
-import java.io.*;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
+import ch.qos.logback.access.net.HardenedAccessEventInputStream;
 
 public class AccessEventSerializationTest {
 
@@ -36,9 +41,11 @@
         oos.flush();
 
         ByteArrayInputStream bais = new ByteArrayInputStream(baos.toByteArray());
-        ObjectInputStream ois = new ObjectInputStream(bais);
+        HardenedAccessEventInputStream hardenedOIS = new HardenedAccessEventInputStream(bais);
 
-        return ois.readObject();
+        Object sae = hardenedOIS.readObject();
+        hardenedOIS.close();
+        return sae;
     }
 
     @Test

_service:tar_scm:v_1.2.8.tar.gz/logback-access/src/test/java/ch/qos/logback/access/spi/AccessEventTest.java Added

@@ -0,0 +1,57 @@
+package ch.qos.logback.access.spi;
+
+import static org.junit.Assert.*;
+
+import java.util.Map;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
+import ch.qos.logback.access.dummy.DummyAccessEventBuilder;
+import ch.qos.logback.access.dummy.DummyRequest;
+import ch.qos.logback.core.testUtil.RandomUtil;
+
+public class AccessEventTest {
+
+ int diff = RandomUtil.getPositiveInt();
+ 
+ @Before
+ public void setUp() throws Exception {
+ }
+
+ @After
+ public void tearDown() throws Exception {
+ }
+
+ // See LOGBACK-1189
+ @Test
+ public void callingPrepareForDeferredProcessingShouldBeIdempotent() {
+ String key = "key-"+diff;
+ String val = "val-"+diff;
+ 
+ IAccessEvent ae = DummyAccessEventBuilder.buildNewAccessEvent();
+ DummyRequest request = (DummyRequest) ae.getRequest();
+ Map<String, String> headersMap = request.getHeaders();
+ Map<String, String> parametersMap = request.getParameterMap();
+ 
+ headersMap.put(key, val);
+ request.setAttribute(key, val);
+ parametersMap.put(key, new String {val});
+ ae.prepareForDeferredProcessing();
+ assertEquals(val, ae.getAttribute(key));
+ assertEquals(val, ae.getRequestHeader(key));
+ assertEquals(val, ae.getRequestParameter(key)0);
+ 
+ 
+ request.setAttribute(key, "change");
+ headersMap.put(key, "change");
+ parametersMap.put(key, new String {"change"});
+ ae.prepareForDeferredProcessing();
+ assertEquals(val, ae.getAttribute(key));
+ assertEquals(val, ae.getRequestHeader(key));
+ assertEquals(val, ae.getRequestParameter(key)0);
+ 
+ }
+
+}

_service:tar_scm:v_1.1.7.tar.gz/logback-access/src/test/java/ch/qos/logback/access/tomcat/LogbackValveTest.java -> _service:tar_scm:v_1.2.8.tar.gz/logback-access/src/test/java/ch/qos/logback/access/tomcat/LogbackValveTest.java Changed

_service:tar_scm:v_1.1.7.tar.gz/logback-classic/integration.xml -> _service:tar_scm:v_1.2.8.tar.gz/logback-classic/integration.xml Changed

_service:tar_scm:v_1.1.7.tar.gz/logback-classic/osgi-build.xml -> _service:tar_scm:v_1.2.8.tar.gz/logback-classic/osgi-build.xml Changed

@@ -11,15 +11,26 @@
 		define the currentVersion property on the command line, e.g.:
 		
 		ant -DcurrentVersion=1.5.4-SNAPSHOT	
+
+ See test results in target/unit-reports 
 	-->
 	
 
 
+
+
 	<echo message="compile classpath: ${currentVersion}" />
 <echo message="slfj4: ${org.slf4j:slf4j-api:jar}" />
 <echo message="felix: ${org.apache.felix:org.apache.felix.main:jar}" />
 
+
+
 <property name="iBundleJar" value="target/iBundle.jar"/>
 <property name="bundlesDir" value="bundle"/>

_service:tar_scm:v_1.1.7.tar.gz/logback-classic/pom.xml -> _service:tar_scm:v_1.2.8.tar.gz/logback-classic/pom.xml Changed

@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <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/xsd/maven-4.0.0.xsd">
@@ -7,7 +8,7 @@
 <parent>
 <groupId>ch.qos.logback</groupId>
 <artifactId>logback-parent</artifactId>
- <version>1.1.7</version>
+ <version>1.2.8</version>
 </parent>
 
 <artifactId>logback-classic</artifactId>
@@ -24,6 +25,7 @@
 <dependency>
 <groupId>org.slf4j</groupId>
 <artifactId>slf4j-api</artifactId>
+ <version>${slf4j.version}</version>
 <scope>compile</scope>
 </dependency>
 <dependency>
@@ -32,6 +34,14 @@
 <version>${slf4j.version}</version>
 <scope>test</scope>
 </dependency>
+
+ <dependency>
+ <groupId>ch.qos.cal10n.plugins</groupId>
+ <artifactId>maven-cal10n-plugin</artifactId>
+ <version>${cal10n.version}</version>
+ <scope>test</scope>
+ </dependency>
+
 <dependency>
 <groupId>org.slf4j</groupId>
 <artifactId>slf4j-api</artifactId>
@@ -66,26 +76,6 @@
 <scope>test</scope>
 </dependency>
 <dependency>
- <groupId>hsqldb</groupId>
- <artifactId>hsqldb</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>com.h2database</groupId>
- <artifactId>h2</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>postgresql</groupId>
- <artifactId>postgresql</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>mysql</groupId>
- <artifactId>mysql-connector-java</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
 <groupId>javax.mail</groupId>
 <artifactId>mail</artifactId>
 <scope>compile</scope>
@@ -99,10 +89,17 @@
 </dependency>
 <dependency>
 <groupId>org.codehaus.groovy</groupId>
- <artifactId>groovy-all</artifactId>
+ <artifactId>groovy</artifactId>
 <scope>compile</scope>
 <optional>true</optional>
 </dependency>
+
+ <dependency>
+ <groupId>org.codehaus.groovy</groupId>
+ <artifactId>groovy-test</artifactId>
+ <scope>test</scope>
+ </dependency>
+ 
 <dependency>
 <groupId>ch.qos.logback</groupId>
 <artifactId>logback-core</artifactId>
@@ -116,14 +113,8 @@
 <scope>test</scope>
 </dependency>
 <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jms_1.1_spec</artifactId>
- <scope>compile</scope>
- <optional>true</optional>
- </dependency>
- <dependency>
 <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
+ <artifactId>javax.servlet-api</artifactId>
 <scope>compile</scope>
 <optional>true</optional>
 </dependency>
@@ -151,6 +142,13 @@
 <version>2.0.2</version>
 <scope>test</scope>
 </dependency>
+
+ <dependency>
+ <groupId>org.mockito</groupId>
+ <artifactId>mockito-core</artifactId>
+ <scope>test</scope>
+ </dependency>
+
 </dependencies>
 
 <build>
@@ -170,43 +168,19 @@
 <plugins>
 
 <plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <compilerId>groovy-eclipse-compiler</compilerId>
- </configuration>
- <dependencies>
- <dependency>
- <groupId>org.codehaus.groovy</groupId>
- <artifactId>groovy-eclipse-compiler</artifactId>
- <version>2.9.1-01</version>
- </dependency>
- 
- <dependency>
- <groupId>org.codehaus.groovy</groupId>
- <artifactId>groovy-eclipse-batch</artifactId>
- <version>2.3.7-01</version>
- </dependency>
- </dependencies>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-eclipse-plugin</artifactId>
- <version>2.8</version>
- <configuration>
- <additionalProjectnatures>
- <projectnature>org.eclipse.jdt.groovy.core.groovyNature</projectnature>
- </additionalProjectnatures>
- 
- <sourceIncludes>
- <sourceInclude>**/*.groovy</sourceInclude>
- </sourceIncludes>
- 
- <downloadSources>true</downloadSources>
- <downloadJavadocs>true</downloadJavadocs>
- </configuration>
+ <groupId>org.codehaus.gmavenplus</groupId>
+ <artifactId>gmavenplus-plugin</artifactId>
+ <version>1.12.1</version>
+ <executions>
+ <execution>
+ <goals>
+ <goal>generateStubs</goal>
+ <goal>compile</goal>
+ <goal>generateTestStubs</goal>
+ <goal>compileTests</goal>
+ </goals>
+ </execution>
+ </executions>
 </plugin>
 
 <plugin>
@@ -234,7 +208,7 @@
 <plugin>
 <groupId>org.apache.maven.plugins</groupId>
 <artifactId>maven-antrun-plugin</artifactId>
- <version>1.7</version>
+ <version>1.8</version>
 <dependencies>
 <dependency>
 <groupId>org.apache.ant</groupId>
@@ -344,6 +318,34 @@
 </plugins>
 <pluginManagement>
 <plugins>
+ 
+ <plugin>
+ <groupId>org.eclipse.m2e</groupId>
+ <artifactId>lifecycle-mapping</artifactId>
+ <version>1.0.0</version>
+ <configuration>
+ <lifecycleMappingMetadata>
+ <pluginExecutions>
+ <pluginExecution>
+ <pluginExecutionFilter>
+ <groupId>org.codehaus.gmavenplus</groupId>
+ <artifactId>gmavenplus-plugin</artifactId>
+ <versionRange>1.5,)</versionRange>
+ <goals>
+ <goal>testGenerateStubs</goal>
+ <goal>generateStubs</goal>
+ <goal>testCompile</goal>
+ <goal>compile</goal>
+ </goals>
+ </pluginExecutionFilter>
+ <action>
+ <ignore></ignore>
+ </action>
+ </pluginExecution>
+ </pluginExecutions>
+ </lifecycleMappingMetadata>
+ </configuration>
+ </plugin>
 </plugins>
 </pluginManagement>
 </build>

_service:tar_scm:v_1.1.7.tar.gz/logback-classic/src/main/groovy/ch/qos/logback/classic/gaffer/ComponentDelegate.groovy -> _service:tar_scm:v_1.2.8.tar.gz/logback-classic/src/main/groovy/ch/qos/logback/classic/gaffer/ComponentDelegate.groovy Changed

@@ -36,15 +36,16 @@
   String getLabelFistLetterInUpperCase() { getLabel()0.toUpperCase() + getLabel().substring(1) }
 
   void methodMissing(String name, def args) {
-    NestingType nestingType = PropertyUtil.nestingType(component, name);
+    NestingType nestingType = PropertyUtil.nestingType(component, name, null);
     if (nestingType == NestingType.NA) {
-      addError("${getLabelFistLetterInUpperCase()} ${getComponentName()} of type ${component.getClass().canonicalName} has no appplicable ${name} property ")
+      addError("${getLabelFistLetterInUpperCase()} ${getComponentName()} of type ${component.getClass().canonicalName} has no appplicable ${name} property.")
       return;
     }
 
     String subComponentName
     Class clazz
     Closure closure
+    
     (subComponentName, clazz, closure) = analyzeArgs(args)
     if (clazz != null) {
       Object subComponent = clazz.newInstance()
@@ -86,7 +87,7 @@
   }
 
   void propertyMissing(String name, def value) {
-    NestingType nestingType = PropertyUtil.nestingType(component, name);
+    NestingType nestingType = PropertyUtil.nestingType(component, name, value);
     if (nestingType == NestingType.NA) {
       addError("${getLabelFistLetterInUpperCase()} ${getComponentName()} of type ${component.getClass().canonicalName} has no appplicable ${name} property ")
       return;

_service:tar_scm:v_1.1.7.tar.gz/logback-classic/src/main/groovy/ch/qos/logback/classic/gaffer/NestedType.groovy -> _service:tar_scm:v_1.2.8.tar.gz/logback-classic/src/main/groovy/ch/qos/logback/classic/gaffer/NestedType.groovy Changed

_service:tar_scm:v_1.1.7.tar.gz/logback-classic/src/main/groovy/ch/qos/logback/classic/gaffer/PropertyUtil.groovy -> _service:tar_scm:v_1.2.8.tar.gz/logback-classic/src/main/groovy/ch/qos/logback/classic/gaffer/PropertyUtil.groovy Changed

@@ -14,6 +14,10 @@
 package ch.qos.logback.classic.gaffer
 
 import java.lang.reflect.Method
+
+import com.sun.org.apache.xpath.internal.axes.SubContextList;
+
+import ch.qos.logback.core.joran.util.StringToObjectConverter;
 import ch.qos.logback.core.joran.util.beans.BeanUtil
 
 /**
@@ -21,52 +25,72 @@
  */
 class PropertyUtil {
 
-  static boolean hasAdderMethod(Object obj, String name) {
-    String addMethod = "add${upperCaseFirstLetter(name)}";
-    return obj.metaClass.respondsTo(obj, addMethod);
-  }
-
-  static NestingType nestingType(Object obj, String name) {
-    def decapitalizedName = BeanUtil.INSTANCE.toLowerCamelCase(name);
-    if (obj.hasProperty(decapitalizedName)) {
-      return NestingType.SINGLE;
+    static boolean hasAdderMethod(Object obj, String name) {
+        String addMethod = "add${upperCaseFirstLetter(name)}";
+        return obj.metaClass.respondsTo(obj, addMethod);
     }
-    if (hasAdderMethod(obj, name)) {
-      return NestingType.AS_COLLECTION;
-    }
-    return NestingType.NA;
-  }
 
-  static void attach(NestingType nestingType, Object component, Object subComponent, String name) {
-    switch (nestingType) {
-      case NestingType.SINGLE:
-        name = BeanUtil.INSTANCE.toLowerCamelCase(name);
-        component."${name}" = subComponent;
-        break;
-      case NestingType.AS_COLLECTION:
-        String firstUpperName = PropertyUtil.upperCaseFirstLetter(name)
-        component."add${firstUpperName}"(subComponent);
-        break;
+
+    static NestingType nestingType(Object obj, String name, Object value) {
+        def decapitalizedName = BeanUtil.toLowerCamelCase(name);
+        MetaProperty metaProperty = obj.hasProperty(decapitalizedName);
+
+        if(metaProperty != null) {
+            boolean VALUE_IS_A_STRING = value instanceof String;
+            
+            if(VALUE_IS_A_STRING && StringToObjectConverter.followsTheValueOfConvention(metaProperty.getType())) {
+                return NestingType.SINGLE_WITH_VALUE_OF_CONVENTION;
+            } else {
+                return NestingType.SINGLE;
+            }
+        }
+        if (hasAdderMethod(obj, name)) {
+            return NestingType.AS_COLLECTION;
+        }
+        return NestingType.NA;
     }
-  }
 
-  static String transformFirstLetter(String s, Closure closure) {
-    if (s == null || s.length() == 0)
-      return s;
+    static Object convertByValueMethod(Object component, String name, String value) {
+        def decapitalizedName = BeanUtil.toLowerCamelCase(name);
+        MetaProperty metaProperty = component.hasProperty(decapitalizedName);
+        Method valueOfMethod = StringToObjectConverter.getValueOfMethod(metaProperty.getType());
+        return valueOfMethod.invoke(null, value);
+    }
+    
+    static void attach(NestingType nestingType, Object component, Object subComponent, String name) {
+        switch (nestingType) {
+            case NestingType.SINGLE_WITH_VALUE_OF_CONVENTION:
+                name = BeanUtil.toLowerCamelCase(name);
+                Object value = convertByValueMethod(component, name, subComponent);
+                component."${name}" = value;
+                break;
+            case NestingType.SINGLE:
+                name = BeanUtil.toLowerCamelCase(name);
+                component."${name}" = subComponent;
+                break;
 
-    String firstLetter = new String(s.getAt(0));
+            case NestingType.AS_COLLECTION:
+                String firstUpperName = PropertyUtil.upperCaseFirstLetter(name)
+                component."add${firstUpperName}"(subComponent);
+                break;
+        }
+    }
 
-    String modifiedFistLetter = closure(firstLetter);
+    static String transformFirstLetter(String s, Closure closure) {
+        if (s == null || s.length() == 0)
+            return s;
 
-    if (s.length() == 1)
-      return modifiedFistLetter
-    else
-      return modifiedFistLetter + s.substring(1);
+        String firstLetter = new String(s.getAt(0));
 
-  }
+        String modifiedFistLetter = closure(firstLetter);
 
-  static String upperCaseFirstLetter(String s) {
-    return transformFirstLetter(s, {String it -> it.toUpperCase()})
-  }
+        if (s.length() == 1)
+            return modifiedFistLetter
+        else
+            return modifiedFistLetter + s.substring(1);
+    }
 
+    static String upperCaseFirstLetter(String s) {
+        return transformFirstLetter(s, {String it -> it.toUpperCase()})
+    }
 }

_service:tar_scm:v_1.1.7.tar.gz/logback-classic/src/main/java/ch/qos/logback/classic/PatternLayout.java -> _service:tar_scm:v_1.2.8.tar.gz/logback-classic/src/main/java/ch/qos/logback/classic/PatternLayout.java Changed

@@ -38,92 +38,116 @@
 
 public class PatternLayout extends PatternLayoutBase<ILoggingEvent> {
 
- public static final Map<String, String> defaultConverterMap = new HashMap<String, String>();
+ public static final Map<String, String> DEFAULT_CONVERTER_MAP = new HashMap<String, String>();
+ public static final Map<String, String> CONVERTER_CLASS_TO_KEY_MAP = new HashMap<String, String>();
+ 
+ /**
+ * @deprecated replaced by DEFAULT_CONVERTER_MAP
+ */
+ public static final Map<String, String> defaultConverterMap = DEFAULT_CONVERTER_MAP;
+ 
 public static final String HEADER_PREFIX = "#logback.classic pattern: ";
 
 static {
- defaultConverterMap.putAll(Parser.DEFAULT_COMPOSITE_CONVERTER_MAP);
-
- defaultConverterMap.put("d", DateConverter.class.getName());
- defaultConverterMap.put("date", DateConverter.class.getName());
-
- defaultConverterMap.put("r", RelativeTimeConverter.class.getName());
- defaultConverterMap.put("relative", RelativeTimeConverter.class.getName());
-
- defaultConverterMap.put("level", LevelConverter.class.getName());
- defaultConverterMap.put("le", LevelConverter.class.getName());
- defaultConverterMap.put("p", LevelConverter.class.getName());
-
- defaultConverterMap.put("t", ThreadConverter.class.getName());
- defaultConverterMap.put("thread", ThreadConverter.class.getName());
-
- defaultConverterMap.put("lo", LoggerConverter.class.getName());
- defaultConverterMap.put("logger", LoggerConverter.class.getName());
- defaultConverterMap.put("c", LoggerConverter.class.getName());
-
- defaultConverterMap.put("m", MessageConverter.class.getName());
- defaultConverterMap.put("msg", MessageConverter.class.getName());
- defaultConverterMap.put("message", MessageConverter.class.getName());
-
- defaultConverterMap.put("C", ClassOfCallerConverter.class.getName());
- defaultConverterMap.put("class", ClassOfCallerConverter.class.getName());
-
- defaultConverterMap.put("M", MethodOfCallerConverter.class.getName());
- defaultConverterMap.put("method", MethodOfCallerConverter.class.getName());
-
- defaultConverterMap.put("L", LineOfCallerConverter.class.getName());
- defaultConverterMap.put("line", LineOfCallerConverter.class.getName());
-
- defaultConverterMap.put("F", FileOfCallerConverter.class.getName());
- defaultConverterMap.put("file", FileOfCallerConverter.class.getName());
-
- defaultConverterMap.put("X", MDCConverter.class.getName());
- defaultConverterMap.put("mdc", MDCConverter.class.getName());
-
- defaultConverterMap.put("ex", ThrowableProxyConverter.class.getName());
- defaultConverterMap.put("exception", ThrowableProxyConverter.class.getName());
- defaultConverterMap.put("rEx", RootCauseFirstThrowableProxyConverter.class.getName());
- defaultConverterMap.put("rootException", RootCauseFirstThrowableProxyConverter.class.getName());
- defaultConverterMap.put("throwable", ThrowableProxyConverter.class.getName());
-
- defaultConverterMap.put("xEx", ExtendedThrowableProxyConverter.class.getName());
- defaultConverterMap.put("xException", ExtendedThrowableProxyConverter.class.getName());
- defaultConverterMap.put("xThrowable", ExtendedThrowableProxyConverter.class.getName());
-
- defaultConverterMap.put("nopex", NopThrowableInformationConverter.class.getName());
- defaultConverterMap.put("nopexception", NopThrowableInformationConverter.class.getName());
-
- defaultConverterMap.put("cn", ContextNameConverter.class.getName());
- defaultConverterMap.put("contextName", ContextNameConverter.class.getName());
-
- defaultConverterMap.put("caller", CallerDataConverter.class.getName());
-
- defaultConverterMap.put("marker", MarkerConverter.class.getName());
-
- defaultConverterMap.put("property", PropertyConverter.class.getName());
-
- defaultConverterMap.put("n", LineSeparatorConverter.class.getName());
-
- defaultConverterMap.put("black", BlackCompositeConverter.class.getName());
- defaultConverterMap.put("red", RedCompositeConverter.class.getName());
- defaultConverterMap.put("green", GreenCompositeConverter.class.getName());
- defaultConverterMap.put("yellow", YellowCompositeConverter.class.getName());
- defaultConverterMap.put("blue", BlueCompositeConverter.class.getName());
- defaultConverterMap.put("magenta", MagentaCompositeConverter.class.getName());
- defaultConverterMap.put("cyan", CyanCompositeConverter.class.getName());
- defaultConverterMap.put("white", WhiteCompositeConverter.class.getName());
- defaultConverterMap.put("gray", GrayCompositeConverter.class.getName());
- defaultConverterMap.put("boldRed", BoldRedCompositeConverter.class.getName());
- defaultConverterMap.put("boldGreen", BoldGreenCompositeConverter.class.getName());
- defaultConverterMap.put("boldYellow", BoldYellowCompositeConverter.class.getName());
- defaultConverterMap.put("boldBlue", BoldBlueCompositeConverter.class.getName());
- defaultConverterMap.put("boldMagenta", BoldMagentaCompositeConverter.class.getName());
- defaultConverterMap.put("boldCyan", BoldCyanCompositeConverter.class.getName());
- defaultConverterMap.put("boldWhite", BoldWhiteCompositeConverter.class.getName());
- defaultConverterMap.put("highlight", HighlightingCompositeConverter.class.getName());
-
- defaultConverterMap.put("lsn", LocalSequenceNumberConverter.class.getName());
-
+ DEFAULT_CONVERTER_MAP.putAll(Parser.DEFAULT_COMPOSITE_CONVERTER_MAP);
+
+ DEFAULT_CONVERTER_MAP.put("d", DateConverter.class.getName());
+ DEFAULT_CONVERTER_MAP.put("date", DateConverter.class.getName());
+ CONVERTER_CLASS_TO_KEY_MAP.put(DateConverter.class.getName(), "date");
+ 
+ DEFAULT_CONVERTER_MAP.put("r", RelativeTimeConverter.class.getName());
+ DEFAULT_CONVERTER_MAP.put("relative", RelativeTimeConverter.class.getName());
+ CONVERTER_CLASS_TO_KEY_MAP.put(RelativeTimeConverter.class.getName(), "relative");
+ 
+ DEFAULT_CONVERTER_MAP.put("level", LevelConverter.class.getName());
+ DEFAULT_CONVERTER_MAP.put("le", LevelConverter.class.getName());
+ DEFAULT_CONVERTER_MAP.put("p", LevelConverter.class.getName());
+ CONVERTER_CLASS_TO_KEY_MAP.put(LevelConverter.class.getName(), "level");
+ 
+ 
+ DEFAULT_CONVERTER_MAP.put("t", ThreadConverter.class.getName());
+ DEFAULT_CONVERTER_MAP.put("thread", ThreadConverter.class.getName());
+ CONVERTER_CLASS_TO_KEY_MAP.put(ThreadConverter.class.getName(), "thread");
+ 
+ DEFAULT_CONVERTER_MAP.put("lo", LoggerConverter.class.getName());
+ DEFAULT_CONVERTER_MAP.put("logger", LoggerConverter.class.getName());
+ DEFAULT_CONVERTER_MAP.put("c", LoggerConverter.class.getName());
+ CONVERTER_CLASS_TO_KEY_MAP.put(LoggerConverter.class.getName(), "logger");
+ 
+ DEFAULT_CONVERTER_MAP.put("m", MessageConverter.class.getName());
+ DEFAULT_CONVERTER_MAP.put("msg", MessageConverter.class.getName());
+ DEFAULT_CONVERTER_MAP.put("message", MessageConverter.class.getName());
+ CONVERTER_CLASS_TO_KEY_MAP.put(MessageConverter.class.getName(), "message");
+ 
+ DEFAULT_CONVERTER_MAP.put("C", ClassOfCallerConverter.class.getName());
+ DEFAULT_CONVERTER_MAP.put("class", ClassOfCallerConverter.class.getName());
+ CONVERTER_CLASS_TO_KEY_MAP.put(ClassOfCallerConverter.class.getName(), "class");
+ 
+ DEFAULT_CONVERTER_MAP.put("M", MethodOfCallerConverter.class.getName());
+ DEFAULT_CONVERTER_MAP.put("method", MethodOfCallerConverter.class.getName());
+ CONVERTER_CLASS_TO_KEY_MAP.put(MethodOfCallerConverter.class.getName(), "method");
+ 
+ DEFAULT_CONVERTER_MAP.put("L", LineOfCallerConverter.class.getName());
+ DEFAULT_CONVERTER_MAP.put("line", LineOfCallerConverter.class.getName());
+ CONVERTER_CLASS_TO_KEY_MAP.put(LineOfCallerConverter.class.getName(), "line");
+ 
+ DEFAULT_CONVERTER_MAP.put("F", FileOfCallerConverter.class.getName());
+ DEFAULT_CONVERTER_MAP.put("file", FileOfCallerConverter.class.getName());
+ CONVERTER_CLASS_TO_KEY_MAP.put(FileOfCallerConverter.class.getName(), "file");
+ 
+ DEFAULT_CONVERTER_MAP.put("X", MDCConverter.class.getName());
+ DEFAULT_CONVERTER_MAP.put("mdc", MDCConverter.class.getName());
+
+ DEFAULT_CONVERTER_MAP.put("ex", ThrowableProxyConverter.class.getName());
+ DEFAULT_CONVERTER_MAP.put("exception", ThrowableProxyConverter.class.getName());
+ DEFAULT_CONVERTER_MAP.put("rEx", RootCauseFirstThrowableProxyConverter.class.getName());
+ DEFAULT_CONVERTER_MAP.put("rootException", RootCauseFirstThrowableProxyConverter.class.getName());
+ DEFAULT_CONVERTER_MAP.put("throwable", ThrowableProxyConverter.class.getName());
+
+ DEFAULT_CONVERTER_MAP.put("xEx", ExtendedThrowableProxyConverter.class.getName());
+ DEFAULT_CONVERTER_MAP.put("xException", ExtendedThrowableProxyConverter.class.getName());
+ DEFAULT_CONVERTER_MAP.put("xThrowable", ExtendedThrowableProxyConverter.class.getName());
+
+ DEFAULT_CONVERTER_MAP.put("nopex", NopThrowableInformationConverter.class.getName());
+ DEFAULT_CONVERTER_MAP.put("nopexception", NopThrowableInformationConverter.class.getName());
+
+ DEFAULT_CONVERTER_MAP.put("cn", ContextNameConverter.class.getName());
+ DEFAULT_CONVERTER_MAP.put("contextName", ContextNameConverter.class.getName());
+ CONVERTER_CLASS_TO_KEY_MAP.put(ContextNameConverter.class.getName(), "contextName");
+ 
+ DEFAULT_CONVERTER_MAP.put("caller", CallerDataConverter.class.getName());
+ CONVERTER_CLASS_TO_KEY_MAP.put(CallerDataConverter.class.getName(), "caller");
+ 
+ DEFAULT_CONVERTER_MAP.put("marker", MarkerConverter.class.getName());
+ CONVERTER_CLASS_TO_KEY_MAP.put(MarkerConverter.class.getName(), "marker");
+ 
+ DEFAULT_CONVERTER_MAP.put("property", PropertyConverter.class.getName());
+
+ DEFAULT_CONVERTER_MAP.put("n", LineSeparatorConverter.class.getName());
+
+ DEFAULT_CONVERTER_MAP.put("black", BlackCompositeConverter.class.getName());
+ DEFAULT_CONVERTER_MAP.put("red", RedCompositeConverter.class.getName());
+ DEFAULT_CONVERTER_MAP.put("green", GreenCompositeConverter.class.getName());
+ DEFAULT_CONVERTER_MAP.put("yellow", YellowCompositeConverter.class.getName());
+ DEFAULT_CONVERTER_MAP.put("blue", BlueCompositeConverter.class.getName());
+ DEFAULT_CONVERTER_MAP.put("magenta", MagentaCompositeConverter.class.getName());
+ DEFAULT_CONVERTER_MAP.put("cyan", CyanCompositeConverter.class.getName());
+ DEFAULT_CONVERTER_MAP.put("white", WhiteCompositeConverter.class.getName());
+ DEFAULT_CONVERTER_MAP.put("gray", GrayCompositeConverter.class.getName());
+ DEFAULT_CONVERTER_MAP.put("boldRed", BoldRedCompositeConverter.class.getName());
+ DEFAULT_CONVERTER_MAP.put("boldGreen", BoldGreenCompositeConverter.class.getName());
+ DEFAULT_CONVERTER_MAP.put("boldYellow", BoldYellowCompositeConverter.class.getName());
+ DEFAULT_CONVERTER_MAP.put("boldBlue", BoldBlueCompositeConverter.class.getName());
+ DEFAULT_CONVERTER_MAP.put("boldMagenta", BoldMagentaCompositeConverter.class.getName());
+ DEFAULT_CONVERTER_MAP.put("boldCyan", BoldCyanCompositeConverter.class.getName());
+ DEFAULT_CONVERTER_MAP.put("boldWhite", BoldWhiteCompositeConverter.class.getName());
+ DEFAULT_CONVERTER_MAP.put("highlight", HighlightingCompositeConverter.class.getName());
+
+ DEFAULT_CONVERTER_MAP.put("lsn", LocalSequenceNumberConverter.class.getName());
+ CONVERTER_CLASS_TO_KEY_MAP.put(LocalSequenceNumberConverter.class.getName(), "lsn");
+ 
+ DEFAULT_CONVERTER_MAP.put("prefix", PrefixCompositeConverter.class.getName());
+ 
 }
 
 public PatternLayout() {
@@ -131,7 +155,7 @@
 }
 
 public Map<String, String> getDefaultConverterMap() {
- return defaultConverterMap;
+ return DEFAULT_CONVERTER_MAP;
 }
 
 public String doLayout(ILoggingEvent event) {

_service:tar_scm:v_1.1.7.tar.gz/logback-classic/src/main/java/ch/qos/logback/classic/boolex/IEvaluator.java -> _service:tar_scm:v_1.2.8.tar.gz/logback-classic/src/main/java/ch/qos/logback/classic/boolex/IEvaluator.java Changed

_service:tar_scm:v_1.1.7.tar.gz/logback-classic/src/main/java/ch/qos/logback/classic/gaffer/GafferUtil.java -> _service:tar_scm:v_1.2.8.tar.gz/logback-classic/src/main/java/ch/qos/logback/classic/gaffer/GafferUtil.java Changed

_service:tar_scm:v_1.1.7.tar.gz/logback-classic/src/main/java/ch/qos/logback/classic/html/HTMLLayout.java -> _service:tar_scm:v_1.2.8.tar.gz/logback-classic/src/main/java/ch/qos/logback/classic/html/HTMLLayout.java Changed

_service:tar_scm:v_1.1.7.tar.gz/logback-classic/src/main/java/ch/qos/logback/classic/joran/JoranConfigurator.java -> _service:tar_scm:v_1.2.8.tar.gz/logback-classic/src/main/java/ch/qos/logback/classic/joran/JoranConfigurator.java Changed

_service:tar_scm:v_1.1.7.tar.gz/logback-classic/src/main/java/ch/qos/logback/classic/joran/action/ConfigurationAction.java -> _service:tar_scm:v_1.2.8.tar.gz/logback-classic/src/main/java/ch/qos/logback/classic/joran/action/ConfigurationAction.java Changed

_service:tar_scm:v_1.1.7.tar.gz/logback-classic/src/main/java/ch/qos/logback/classic/net/SSLSocketAppender.java -> _service:tar_scm:v_1.2.8.tar.gz/logback-classic/src/main/java/ch/qos/logback/classic/net/SSLSocketAppender.java Changed

_service:tar_scm:v_1.1.7.tar.gz/logback-classic/src/main/java/ch/qos/logback/classic/net/SimpleSocketServer.java -> _service:tar_scm:v_1.2.8.tar.gz/logback-classic/src/main/java/ch/qos/logback/classic/net/SimpleSocketServer.java Changed

_service:tar_scm:v_1.1.7.tar.gz/logback-classic/src/main/java/ch/qos/logback/classic/net/SocketAppender.java -> _service:tar_scm:v_1.2.8.tar.gz/logback-classic/src/main/java/ch/qos/logback/classic/net/SocketAppender.java Changed

_service:tar_scm:v_1.1.7.tar.gz/logback-classic/src/main/java/ch/qos/logback/classic/net/SocketNode.java -> _service:tar_scm:v_1.2.8.tar.gz/logback-classic/src/main/java/ch/qos/logback/classic/net/SocketNode.java Changed

@@ -15,13 +15,12 @@
 
 import java.io.BufferedInputStream;
 import java.io.IOException;
-import java.io.ObjectInputStream;
 import java.net.Socket;
 import java.net.SocketAddress;
 
 import ch.qos.logback.classic.Logger;
-
 import ch.qos.logback.classic.LoggerContext;
+import ch.qos.logback.classic.net.server.HardenedLoggingEventInputStream;
 import ch.qos.logback.classic.spi.ILoggingEvent;
 
 // Contributors: Moses Hohman <mmhohman@rainbow.uchicago.edu>
@@ -44,7 +43,7 @@
 
 Socket socket;
 LoggerContext context;
- ObjectInputStream ois;
+ HardenedLoggingEventInputStream hardenedLoggingEventInputStream;
 SocketAddress remoteSocketAddress;
 
 Logger logger;
@@ -68,7 +67,7 @@
 public void run() {
 
 try {
- ois = new ObjectInputStream(new BufferedInputStream(socket.getInputStream()));
+ hardenedLoggingEventInputStream = new HardenedLoggingEventInputStream(new BufferedInputStream(socket.getInputStream()));
 } catch (Exception e) {
 logger.error("Could not open ObjectInputStream to " + socket, e);
 closed = true;
@@ -80,7 +79,7 @@
 try {
 while (!closed) {
 // read an event from the wire
- event = (ILoggingEvent) ois.readObject();
+ event = (ILoggingEvent) hardenedLoggingEventInputStream.readObject();
 // get a logger from the hierarchy. The name of the logger is taken to
 // be the name contained in the event.
 remoteLogger = context.getLogger(event.getLoggerName());
@@ -110,13 +109,13 @@
 return;
 }
 closed = true;
- if (ois != null) {
+ if (hardenedLoggingEventInputStream != null) {
 try {
- ois.close();
+ hardenedLoggingEventInputStream.close();
 } catch (IOException e) {
 logger.warn("Could not close connection.", e);
 } finally {
- ois = null;
+ hardenedLoggingEventInputStream = null;
 }
 }
 }

_service:tar_scm:v_1.1.7.tar.gz/logback-classic/src/main/java/ch/qos/logback/classic/net/SocketReceiver.java -> _service:tar_scm:v_1.2.8.tar.gz/logback-classic/src/main/java/ch/qos/logback/classic/net/SocketReceiver.java Changed

@@ -28,6 +28,7 @@
 
 import ch.qos.logback.classic.Logger;
 import ch.qos.logback.classic.LoggerContext;
+import ch.qos.logback.classic.net.server.HardenedLoggingEventInputStream;
 import ch.qos.logback.classic.spi.ILoggingEvent;
 import ch.qos.logback.core.net.DefaultSocketConnector;
 import ch.qos.logback.core.net.AbstractSocketAppender;
@@ -153,9 +154,10 @@
     }
 
     private void dispatchEvents(LoggerContext lc) {
+        ObjectInputStream ois = null;
         try {
             socket.setSoTimeout(acceptConnectionTimeout);
-            ObjectInputStream ois = new ObjectInputStream(socket.getInputStream());
+            ois = new HardenedLoggingEventInputStream(socket.getInputStream());
             socket.setSoTimeout(0);
             addInfo(receiverId + "connection established");
             while (true) {
@@ -172,6 +174,7 @@
         } catch (ClassNotFoundException ex) {
             addInfo(receiverId + "unknown event class: " + ex);
         } finally {
+            CloseUtil.closeQuietly(ois);
             CloseUtil.closeQuietly(socket);
             socket = null;
             addInfo(receiverId + "connection closed");

_service:tar_scm:v_1.2.8.tar.gz/logback-classic/src/main/java/ch/qos/logback/classic/net/server/HardenedLoggingEventInputStream.java Added

@@ -0,0 +1,56 @@
+package ch.qos.logback.classic.net.server;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.slf4j.helpers.BasicMarker;
+
+import ch.qos.logback.classic.Level;
+import ch.qos.logback.classic.Logger;
+import ch.qos.logback.classic.spi.ClassPackagingData;
+import ch.qos.logback.classic.spi.IThrowableProxy;
+import ch.qos.logback.classic.spi.LoggerContextVO;
+import ch.qos.logback.classic.spi.LoggerRemoteView;
+import ch.qos.logback.classic.spi.LoggingEventVO;
+import ch.qos.logback.classic.spi.StackTraceElementProxy;
+import ch.qos.logback.classic.spi.ThrowableProxy;
+import ch.qos.logback.classic.spi.ThrowableProxyVO;
+import ch.qos.logback.core.net.HardenedObjectInputStream;
+
+public class HardenedLoggingEventInputStream extends HardenedObjectInputStream {
+
+ static final String ARRAY_PREFIX = "L";
+ 
+ static public List<String> getWhilelist() {
+ List<String> whitelist = new ArrayList<String>();
+ whitelist.add(LoggingEventVO.class.getName());
+ whitelist.add(LoggerContextVO.class.getName());
+ whitelist.add(LoggerRemoteView.class.getName());
+ whitelist.add(ThrowableProxyVO.class.getName());
+ whitelist.add(BasicMarker.class.getName());
+ whitelist.add(Level.class.getName());
+ whitelist.add(Logger.class.getName());
+ whitelist.add(StackTraceElement.class.getName());
+ whitelist.add(StackTraceElement.class.getName());
+ whitelist.add(ThrowableProxy.class.getName());
+ whitelist.add(ThrowableProxy.class.getName());
+ whitelist.add(IThrowableProxy.class.getName());
+ whitelist.add(IThrowableProxy.class.getName());
+ whitelist.add(StackTraceElementProxy.class.getName());
+ whitelist.add(StackTraceElementProxy.class.getName());
+ whitelist.add(ClassPackagingData.class.getName());
+
+ return whitelist;
+ }
+ 
+ public HardenedLoggingEventInputStream(InputStream is) throws IOException {
+ super(is, getWhilelist());
+ }
+ 
+ public HardenedLoggingEventInputStream(InputStream is, List<String> additionalAuthorizedClasses) throws IOException {
+ this(is);
+ super.addToWhitelist(additionalAuthorizedClasses);
+ }
+}

_service:tar_scm:v_1.1.7.tar.gz/logback-classic/src/main/java/ch/qos/logback/classic/net/server/RemoteAppenderStreamClient.java -> _service:tar_scm:v_1.2.8.tar.gz/logback-classic/src/main/java/ch/qos/logback/classic/net/server/RemoteAppenderStreamClient.java Changed

@@ -16,12 +16,12 @@
 import java.io.EOFException;
 import java.io.IOException;
 import java.io.InputStream;
-import java.io.ObjectInputStream;
 import java.net.Socket;
 
 import ch.qos.logback.classic.Logger;
 import ch.qos.logback.classic.LoggerContext;
 import ch.qos.logback.classic.spi.ILoggingEvent;
+import ch.qos.logback.core.net.HardenedObjectInputStream;
 import ch.qos.logback.core.util.CloseUtil;
 
 /**
@@ -87,7 +87,7 @@
      */
     public void run() {
         logger.info(this + ": connected");
-        ObjectInputStream ois = null;
+        HardenedObjectInputStream ois = null;
         try {
             ois = createObjectInputStream();
             while (true) {
@@ -120,11 +120,11 @@
         }
     }
 
-    private ObjectInputStream createObjectInputStream() throws IOException {
+    private HardenedObjectInputStream createObjectInputStream() throws IOException {
         if (inputStream != null) {
-            return new ObjectInputStream(inputStream);
+            return new HardenedLoggingEventInputStream(inputStream);
         }
-        return new ObjectInputStream(socket.getInputStream());
+        return new HardenedLoggingEventInputStream(socket.getInputStream());
     }
 
     /**

_service:tar_scm:v_1.1.7.tar.gz/logback-classic/src/main/java/ch/qos/logback/classic/pattern/DateConverter.java -> _service:tar_scm:v_1.2.8.tar.gz/logback-classic/src/main/java/ch/qos/logback/classic/pattern/DateConverter.java Changed

_service:tar_scm:v_1.1.7.tar.gz/logback-classic/src/main/java/ch/qos/logback/classic/pattern/MDCConverter.java -> _service:tar_scm:v_1.2.8.tar.gz/logback-classic/src/main/java/ch/qos/logback/classic/pattern/MDCConverter.java Changed

_service:tar_scm:v_1.2.8.tar.gz/logback-classic/src/main/java/ch/qos/logback/classic/pattern/PrefixCompositeConverter.java Added

@@ -0,0 +1,57 @@
+/**
+ * Logback: the reliable, generic, fast and flexible logging framework.
+ * Copyright (C) 1999-2021, 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.classic.pattern;
+
+import ch.qos.logback.classic.PatternLayout;
+import ch.qos.logback.classic.spi.ILoggingEvent;
+import ch.qos.logback.core.pattern.CompositeConverter;
+import ch.qos.logback.core.pattern.Converter;
+
+public class PrefixCompositeConverter extends CompositeConverter<ILoggingEvent> {
+
+ public String convert(ILoggingEvent event) {
+ StringBuilder buf = new StringBuilder();
+ Converter<ILoggingEvent> childConverter = this.getChildConverter();
+
+ for (Converter<ILoggingEvent> c = childConverter; c != null; c = c.getNext()) {
+ if (c instanceof MDCConverter) {
+ MDCConverter mdcConverter = (MDCConverter) c;
+
+ String key = mdcConverter.getKey();
+ if (key != null) {
+ buf.append(key).append("=");
+ } 
+ } else if (c instanceof PropertyConverter) {
+ 	PropertyConverter pc = (PropertyConverter) c;
+ 	String key = pc.getKey();
+ 	if (key != null) {
+ buf.append(key).append("=");
+ } 
+ } else {
+ 	String classOfConverter = c.getClass().getName();
+ 	
+ 	String key = PatternLayout.CONVERTER_CLASS_TO_KEY_MAP.get(classOfConverter);
+ if(key != null) 
+ 	buf.append(key).append("=");
+ }
+ buf.append(c.convert(event));
+ }
+ return buf.toString();
+ }
+
+ protected String transform(ILoggingEvent event, String in) {
+ throw new UnsupportedOperationException();
+ }
+
+}

_service:tar_scm:v_1.1.7.tar.gz/logback-classic/src/main/java/ch/qos/logback/classic/pattern/PropertyConverter.java -> _service:tar_scm:v_1.2.8.tar.gz/logback-classic/src/main/java/ch/qos/logback/classic/pattern/PropertyConverter.java Changed

_service:tar_scm:v_1.1.7.tar.gz/logback-classic/src/main/java/ch/qos/logback/classic/selector/ContextJNDISelector.java -> _service:tar_scm:v_1.2.8.tar.gz/logback-classic/src/main/java/ch/qos/logback/classic/selector/ContextJNDISelector.java Changed

_service:tar_scm:v_1.1.7.tar.gz/logback-classic/src/main/java/ch/qos/logback/classic/selector/servlet/ContextDetachingSCL.java -> _service:tar_scm:v_1.2.8.tar.gz/logback-classic/src/main/java/ch/qos/logback/classic/selector/servlet/ContextDetachingSCL.java Changed

@@ -26,9 +26,15 @@
 import ch.qos.logback.classic.selector.ContextSelector;
 import ch.qos.logback.classic.util.ContextSelectorStaticBinder;
 import ch.qos.logback.classic.util.JNDIUtil;
+import ch.qos.logback.core.util.EnvUtil;
+import ch.qos.logback.core.util.OptionHelper;
 
 public class ContextDetachingSCL implements ServletContextListener {
 
+    public void contextInitialized(ServletContextEvent arg0) {
+        // do nothing
+    }
+    
     public void contextDestroyed(ServletContextEvent servletContextEvent) {
         String loggerContextName = null;
 
@@ -38,7 +44,7 @@
         } catch (NamingException ne) {
         }
 
-        if (loggerContextName != null) {
+        if (!OptionHelper.isEmpty(loggerContextName)) {
             System.out.println("About to detach context named " + loggerContextName);
 
             ContextSelector selector = ContextSelectorStaticBinder.getSingleton().getContextSelector();
@@ -59,8 +65,6 @@
         }
     }
 
-    public void contextInitialized(ServletContextEvent arg0) {
-        // do nothing
-    }
+ 
 
 }

_service:tar_scm:v_1.2.8.tar.gz/logback-classic/src/main/java/ch/qos/logback/classic/servlet Added

_service:tar_scm:v_1.2.8.tar.gz/logback-classic/src/main/java/ch/qos/logback/classic/servlet/LogbackServletContainerInitializer.java Added

@@ -0,0 +1,66 @@
+package ch.qos.logback.classic.servlet;
+
+import static ch.qos.logback.core.CoreConstants.DISABLE_SERVLET_CONTAINER_INITIALIZER_KEY;
+
+import java.util.Set;
+
+import javax.servlet.ServletContainerInitializer;
+import javax.servlet.ServletContext;
+import javax.servlet.ServletException;
+
+import ch.qos.logback.classic.util.StatusViaSLF4JLoggerFactory;
+import ch.qos.logback.core.util.OptionHelper;
+
+/**
+ * Attaches a new instance of {@link LogbackServletContextListener} to the current web-applications {@link ServletContext}.
+ * 
+ * @author Ceki Gulcu
+ * @since 1.1.10
+ */
+public class LogbackServletContainerInitializer implements ServletContainerInitializer {
+
+ @Override
+ public void onStartup(Set<Class<?>> c, ServletContext ctx) throws ServletException {
+
+ if (isDisabledByConfiguration(ctx)) {
+ StatusViaSLF4JLoggerFactory.addInfo("Due to deployment instructions will NOT register an instance of " + LogbackServletContextListener.class
+ + " to the current web-app", this);
+
+ return;
+ }
+
+ StatusViaSLF4JLoggerFactory.addInfo("Adding an instance of " + LogbackServletContextListener.class + " to the current web-app", this);
+ LogbackServletContextListener lscl = new LogbackServletContextListener();
+ ctx.addListener(lscl);
+ }
+
+ /**
+ * Search for value of DISABLE_SERVLET_CONTAINER_INITIALIZER_KEY in the web-app first, then as a system property and 
+ * as an environment variable last.
+ *
+ * @param ctx
+ * @return True if value of DISABLE_SERVLET_CONTAINER_INITIALIZER_KEY is available and set to "true", false otherwise.
+ */
+ boolean isDisabledByConfiguration(ServletContext ctx) {
+ String disableAttributeStr = null;
+ Object disableAttribute = ctx.getInitParameter(DISABLE_SERVLET_CONTAINER_INITIALIZER_KEY);
+ if (disableAttribute instanceof String) {
+ disableAttributeStr = (String) disableAttribute;
+ }
+
+ if (OptionHelper.isEmpty(disableAttributeStr)) {
+ disableAttributeStr = OptionHelper.getSystemProperty(DISABLE_SERVLET_CONTAINER_INITIALIZER_KEY);
+ }
+
+ if (OptionHelper.isEmpty(disableAttributeStr)) {
+ disableAttributeStr = OptionHelper.getEnv(DISABLE_SERVLET_CONTAINER_INITIALIZER_KEY);
+ }
+
+ if (OptionHelper.isEmpty(disableAttributeStr))
+ return false;
+
+ return disableAttributeStr.equalsIgnoreCase("true");
+
+ }
+
+}

_service:tar_scm:v_1.2.8.tar.gz/logback-classic/src/main/java/ch/qos/logback/classic/servlet/LogbackServletContextListener.java Added

@@ -0,0 +1,40 @@
+package ch.qos.logback.classic.servlet;
+
+import javax.servlet.ServletContextEvent;
+import javax.servlet.ServletContextListener;
+
+import org.slf4j.ILoggerFactory;
+import org.slf4j.LoggerFactory;
+
+import ch.qos.logback.classic.LoggerContext;
+import ch.qos.logback.classic.util.StatusViaSLF4JLoggerFactory;
+import ch.qos.logback.core.spi.ContextAwareBase;
+
+/**
+ * Allows for graceful shutdown of the {@link LoggerContext} associated with this web-app.
+ * 
+ * @author Ceki Gulcu
+ * @since 1.1.10
+ */
+public class LogbackServletContextListener implements ServletContextListener {
+
+    ContextAwareBase contextAwareBase = new ContextAwareBase();
+
+    @Override
+    public void contextInitialized(ServletContextEvent sce) {
+
+    }
+
+    @Override
+    public void contextDestroyed(ServletContextEvent sce) {
+
+        ILoggerFactory iLoggerFactory = LoggerFactory.getILoggerFactory();
+        if (iLoggerFactory instanceof LoggerContext) {
+            LoggerContext loggerContext = (LoggerContext) iLoggerFactory;
+            contextAwareBase.setContext(loggerContext);
+            StatusViaSLF4JLoggerFactory.addInfo("About to stop " + loggerContext.getClass().getCanonicalName() + " " + loggerContext.getName() + "", this);
+            loggerContext.stop();
+        }
+    }
+
+}

_service:tar_scm:v_1.1.7.tar.gz/logback-classic/src/main/java/ch/qos/logback/classic/sift/SiftingJoranConfigurator.java -> _service:tar_scm:v_1.2.8.tar.gz/logback-classic/src/main/java/ch/qos/logback/classic/sift/SiftingJoranConfigurator.java Changed

@@ -42,7 +42,7 @@
 @Override
 protected void addInstanceRules(RuleStore rs) {
 super.addInstanceRules(rs);
- rs.addRule(new ElementSelector("configuration/appender"), new AppenderAction());
+ rs.addRule(new ElementSelector("configuration/appender"), new AppenderAction<ILoggingEvent>());
 }
 
 @Override
@@ -54,8 +54,8 @@
 protected void buildInterpreter() {
 super.buildInterpreter();
 Map<String, Object> omap = interpreter.getInterpretationContext().getObjectMap();
- omap.put(ActionConst.APPENDER_BAG, new HashMap());
- omap.put(ActionConst.FILTER_CHAIN_BAG, new HashMap());
+ omap.put(ActionConst.APPENDER_BAG, new HashMap<String, Appender<?>>());
+ //omap.put(ActionConst.FILTER_CHAIN_BAG, new HashMap());
 Map<String, String> propertiesMap = new HashMap<String, String>();
 propertiesMap.putAll(parentPropertyMap);
 propertiesMap.put(key, value);
@@ -65,9 +65,9 @@
 @SuppressWarnings("unchecked")
 public Appender<ILoggingEvent> getAppender() {
 Map<String, Object> omap = interpreter.getInterpretationContext().getObjectMap();
- HashMap appenderMap = (HashMap) omap.get(ActionConst.APPENDER_BAG);
+ HashMap<String, Appender<?>> appenderMap = (HashMap<String, Appender<?>>) omap.get(ActionConst.APPENDER_BAG);
 oneAndOnlyOneCheck(appenderMap);
- Collection values = appenderMap.values();
+ Collection<Appender<?>> values = appenderMap.values();
 if (values.size() == 0) {
 return null;
 }

_service:tar_scm:v_1.1.7.tar.gz/logback-classic/src/main/java/ch/qos/logback/classic/turbo/DynamicThresholdFilter.java -> _service:tar_scm:v_1.2.8.tar.gz/logback-classic/src/main/java/ch/qos/logback/classic/turbo/DynamicThresholdFilter.java Changed

_service:tar_scm:v_1.1.7.tar.gz/logback-classic/src/main/java/ch/qos/logback/classic/turbo/MDCValueLevelPair.java -> _service:tar_scm:v_1.2.8.tar.gz/logback-classic/src/main/java/ch/qos/logback/classic/turbo/MDCValueLevelPair.java Changed

_service:tar_scm:v_1.1.7.tar.gz/logback-classic/src/main/java/ch/qos/logback/classic/util/ContextInitializer.java -> _service:tar_scm:v_1.2.8.tar.gz/logback-classic/src/main/java/ch/qos/logback/classic/util/ContextInitializer.java Changed

_service:tar_scm:v_1.1.7.tar.gz/logback-classic/src/main/java/ch/qos/logback/classic/util/EnvUtil.java -> _service:tar_scm:v_1.2.8.tar.gz/logback-classic/src/main/java/ch/qos/logback/classic/util/EnvUtil.java Changed

_service:tar_scm:v_1.1.7.tar.gz/logback-classic/src/main/java/ch/qos/logback/classic/util/JNDIUtil.java -> _service:tar_scm:v_1.2.8.tar.gz/logback-classic/src/main/java/ch/qos/logback/classic/util/JNDIUtil.java Changed

@@ -17,9 +17,14 @@
 import javax.naming.InitialContext;
 import javax.naming.NamingException;
 
+import ch.qos.logback.core.CoreConstants;
+
 /**
 * A simple utility class to create and use a JNDI Context.
 *
+ * Given JNDI based attacks, replaced with emtpy code returning null or "" 
+ * until better options are found.
+ *
 * @author Ceki G&uuml;lc&uuml;
 * @author S&eacute;bastien Pennec
 */
@@ -27,18 +32,23 @@
 public class JNDIUtil {
 
 public static Context getInitialContext() throws NamingException {
- return new InitialContext();
+ return null; 
+ //new InitialContext();
 }
 
+ static int counter = 0;
+ 
 public static String lookup(Context ctx, String name) {
- if (ctx == null) {
- return null;
- }
- try {
- Object lookup = ctx.lookup(name);
- return lookup == null ? null : lookup.toString();
- } catch (NamingException e) {
- return null;
- }
+ 	return CoreConstants.EMPTY_STRING;
+ 	
+// 	if (ctx == null) {
+// return null;
+// }
+// try {
+// Object lookup = ctx.lookup(name);
+// return lookup == null ? null : lookup.toString();
+// } catch (NamingException e) {
+// return null;
+// }
 }
 }

_service:tar_scm:v_1.2.8.tar.gz/logback-classic/src/main/java/ch/qos/logback/classic/util/StatusViaSLF4JLoggerFactory.java Added

@@ -0,0 +1,40 @@
+package ch.qos.logback.classic.util;
+
+import org.slf4j.ILoggerFactory;
+import org.slf4j.LoggerFactory;
+
+import ch.qos.logback.classic.LoggerContext;
+import ch.qos.logback.core.spi.ContextAwareBase;
+import ch.qos.logback.core.status.ErrorStatus;
+import ch.qos.logback.core.status.InfoStatus;
+import ch.qos.logback.core.status.Status;
+
+/**
+ * Add a status message to the {@link LoggerContext} returned by {@link LoggerFactory#getILoggerFactory}.
+ * @author ceki
+ * @since 1.1.10
+ */
+public class StatusViaSLF4JLoggerFactory {
+
+    public static void addInfo(String msg, Object o) {
+        addStatus(new InfoStatus(msg, o));
+    }
+
+    public static void addError(String msg, Object o) {
+        addStatus(new ErrorStatus(msg, o));
+    }
+
+    public static void addError(String msg, Object o, Throwable t) {
+        addStatus(new ErrorStatus(msg, o, t));
+    }
+
+    public static void addStatus(Status status) {
+        ILoggerFactory iLoggerFactory = LoggerFactory.getILoggerFactory();
+        if (iLoggerFactory instanceof LoggerContext) {
+            ContextAwareBase contextAwareBase = new ContextAwareBase();
+            LoggerContext loggerContext = (LoggerContext) iLoggerFactory;
+            contextAwareBase.setContext(loggerContext);
+            contextAwareBase.addStatus(status);
+        }
+    }
+}

_service:tar_scm:v_1.1.7.tar.gz/logback-classic/src/main/java/org/slf4j/impl/StaticLoggerBinder.java -> _service:tar_scm:v_1.2.8.tar.gz/logback-classic/src/main/java/org/slf4j/impl/StaticLoggerBinder.java Changed

_service:tar_scm:v_1.2.8.tar.gz/logback-classic/src/main/resources/META-INF Added

_service:tar_scm:v_1.2.8.tar.gz/logback-classic/src/main/resources/META-INF/services Added

_service:tar_scm:v_1.2.8.tar.gz/logback-classic/src/main/resources/META-INF/services/javax.servlet.ServletContainerInitializer Added

_service:tar_scm:v_1.1.7.tar.gz/logback-classic/src/test/groovy/ch/qos/logback/classic/gaffer/ConfigurationDelegateTest.groovy -> _service:tar_scm:v_1.2.8.tar.gz/logback-classic/src/test/groovy/ch/qos/logback/classic/gaffer/ConfigurationDelegateTest.groovy Changed

@@ -33,6 +33,7 @@
 import ch.qos.logback.core.ConsoleAppender
 import ch.qos.logback.core.encoder.LayoutWrappingEncoder
 import ch.qos.logback.classic.PatternLayout
+import ch.qos.logback.core.util.FileSize
 import ch.qos.logback.core.util.StatusPrinter
 import ch.qos.logback.classic.net.SMTPAppender
 import ch.qos.logback.core.rolling.RollingFileAppender
@@ -235,16 +236,29 @@
   }
 
 
-  // See LBCLASSIC-231
+  // See LOGBACK-458
   @Test
   void withSizeAndTimeBasedFNATP() {
+      withSizeAndTimeBasedFNATP(false);
+  }
+
+  // See LOGBACK-1232
+  @Test
+  void withSizeAndTimeBasedFNATP_AsString() {
+      withSizeAndTimeBasedFNATP(true);
+  }
+  
+  void withSizeAndTimeBasedFNATP(boolean asString) {
     String logFile = randomOutputDir + "log.txt";
     configurationDelegate.appender("ROLLING", RollingFileAppender) {
       file = logFile
       rollingPolicy(TimeBasedRollingPolicy) {
         fileNamePattern = "mylog-%d{yyyy-MM-dd}.%i.txt"
         timeBasedFileNamingAndTriggeringPolicy(SizeAndTimeBasedFNATP) {
-          maxFileSize = "100MB"
+          if(asString)   
+            maxFileSize = "100MB"
+          else 
+           maxFileSize = FileSize.valueOf("100MB")
         }
       }
       encoder(PatternLayoutEncoder) {
@@ -252,6 +266,7 @@
       }
     }
     RollingFileAppender back = configurationDelegate.appenderList.find {it.name = "ROLLING"}
+    StatusPrinter.print(context)
     assertNotNull(back)
     assertEquals(logFile, back.rollingPolicy.getParentsRawFileProperty())
     assertTrue(back.rollingPolicy.timeBasedFileNamingAndTriggeringPolicy.isStarted())

_service:tar_scm:v_1.1.7.tar.gz/logback-classic/src/test/input/gaffer/appenderRefWithNonAppenderAttachable.groovy -> _service:tar_scm:v_1.2.8.tar.gz/logback-classic/src/test/input/gaffer/appenderRefWithNonAppenderAttachable.groovy Changed

_service:tar_scm:v_1.1.7.tar.gz/logback-classic/src/test/input/gaffer/asyncAppender.groovy -> _service:tar_scm:v_1.2.8.tar.gz/logback-classic/src/test/input/gaffer/asyncAppender.groovy Changed

_service:tar_scm:v_1.2.8.tar.gz/logback-classic/src/test/input/issue/logback-1159.xml Added

_service:tar_scm:v_1.2.8.tar.gz/logback-classic/src/test/input/joran/compatibility/immediateFlushInEncoder.xml Added

_service:tar_scm:v_1.2.8.tar.gz/logback-classic/src/test/input/joran/hostnameProperty.xml Added

_service:tar_scm:v_1.2.8.tar.gz/logback-classic/src/test/input/joran/issues/logback-1277.xml Added

@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration debug="true">
+ <jmxConfigurator/>
+
+ <appender name="SIZE_AND_TIME_BASED_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
+ 
+ <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
+ 
+ <fileNamePattern>/var/log/logbook-%d{yyyy-MM-dd}-%i.log</fileNamePattern>
+ 
+ <maxFileSize>16MB</maxFileSize>
+ <maxHistory>2</maxHistory>
+ <totalSizeCap>2500MB</totalSizeCap>
+ 
+ </rollingPolicy>
+ <encoder>
+ <pattern>%d{"ISO8601","Europe/Berlin"} %contextName %X{server} %relative %thread %-5level %logger{35} - %msg%n</pattern>
+ </encoder>
+ </appender>
+
+ <root level="DEBUG">
+ <appender-ref ref="SIZE_AND_TIME_BASED_FILE"/>
+ </root>
+</configuration>
\ No newline at end of file

_service:tar_scm:v_1.2.8.tar.gz/logback-classic/src/test/input/joran/pattern/replaceNewline.xml Added

_service:tar_scm:v_1.2.8.tar.gz/logback-classic/src/test/input/joran/rolling/depratedSizeAndTimeBasedFNATPWarning.xml Added

_service:tar_scm:v_1.1.7.tar.gz/logback-classic/src/test/input/joran/rolling/timeAndSize.xml -> _service:tar_scm:v_1.2.8.tar.gz/logback-classic/src/test/input/joran/rolling/timeAndSize.xml Changed

_service:tar_scm:v_1.1.7.tar.gz/logback-classic/src/test/input/joran/rolling/timeAndSizeWithoutIntegerToken.xml -> _service:tar_scm:v_1.2.8.tar.gz/logback-classic/src/test/input/joran/rolling/timeAndSizeWithoutIntegerToken.xml Changed

_service:tar_scm:v_1.2.8.tar.gz/logback-classic/src/test/input/joran/rolling/timeAndSizeWithoutMaxFileSize.xml Added

_service:tar_scm:v_1.2.8.tar.gz/logback-classic/src/test/input/joran/rolling/totalSizeCapSmallerThanMaxFileSize.xml Added

_service:tar_scm:v_1.2.8.tar.gz/logback-classic/src/test/input/joran/sift/fileAppender.xml Added

_service:tar_scm:v_1.1.7.tar.gz/logback-classic/src/test/java/ch/qos/logback/classic/AllClassicTest.java -> _service:tar_scm:v_1.2.8.tar.gz/logback-classic/src/test/java/ch/qos/logback/classic/AllClassicTest.java Changed

_service:tar_scm:v_1.1.7.tar.gz/logback-classic/src/test/java/ch/qos/logback/classic/LoggerContextTest.java -> _service:tar_scm:v_1.2.8.tar.gz/logback-classic/src/test/java/ch/qos/logback/classic/LoggerContextTest.java Changed

_service:tar_scm:v_1.1.7.tar.gz/logback-classic/src/test/java/ch/qos/logback/classic/LoggerSerializationTest.java -> _service:tar_scm:v_1.2.8.tar.gz/logback-classic/src/test/java/ch/qos/logback/classic/LoggerSerializationTest.java Changed

@@ -13,16 +13,25 @@
 */
 package ch.qos.logback.classic;
 
-import java.io.*;
+import static junit.framework.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.ObjectOutputStream;
+import java.util.ArrayList;
+import java.util.List;
 
-import ch.qos.logback.core.util.CoreTestConstants;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 import org.slf4j.LoggerFactory;
 
-import static junit.framework.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import ch.qos.logback.classic.net.server.HardenedLoggingEventInputStream;
+import ch.qos.logback.core.net.HardenedObjectInputStream;
+import ch.qos.logback.core.util.CoreTestConstants;
 
 public class LoggerSerializationTest {
 
@@ -35,8 +44,9 @@
 
 ByteArrayOutputStream bos;
 ObjectOutputStream oos;
- ObjectInputStream inputStream;
-
+ HardenedLoggingEventInputStream hardenedLoggingEventInputStream;
+ List<String> whitelist = new ArrayList<String>();
+ 
 @Before
 public void setUp() throws Exception {
 lc = new LoggerContext();
@@ -45,6 +55,7 @@
 // create the byte output stream
 bos = new ByteArrayOutputStream();
 oos = new ObjectOutputStream(bos);
+ whitelist.add(Foo.class.getName());
 }
 
 @After
@@ -110,17 +121,17 @@
 private Foo writeAndRead(Foo foo) throws IOException, ClassNotFoundException {
 writeObject(oos, foo);
 ByteArrayInputStream bis = new ByteArrayInputStream(bos.toByteArray());
- inputStream = new ObjectInputStream(bis);
- Foo fooBack = readFooObject(inputStream);
- inputStream.close();
+ hardenedLoggingEventInputStream = new HardenedLoggingEventInputStream(bis, whitelist);
+ Foo fooBack = readFooObject(hardenedLoggingEventInputStream);
+ hardenedLoggingEventInputStream.close();
 return fooBack;
 }
 
- Foo readFooObject(ObjectInputStream inputStream) throws IOException, ClassNotFoundException {
+ Foo readFooObject(HardenedObjectInputStream inputStream) throws IOException, ClassNotFoundException {
 return (Foo) readObject(inputStream);
 }
 
- private Object readObject(ObjectInputStream inputStream) throws IOException, ClassNotFoundException {
+ private Object readObject(HardenedObjectInputStream inputStream) throws IOException, ClassNotFoundException {
 return inputStream.readObject();
 }
 
@@ -133,7 +144,7 @@
 @Test
 public void testCompatibilityWith_v1_0_11() throws IOException, ClassNotFoundException {
 FileInputStream fis = new FileInputStream(SERIALIZATION_PREFIX + "logger_v1.0.11.ser");
- ObjectInputStream ois = new ObjectInputStream(fis);
+ HardenedObjectInputStream ois = new HardenedLoggingEventInputStream(fis); // new String {Logger.class.getName(), LoggerRemoteView.class.getName()});
 Logger a = (Logger) ois.readObject();
 ois.close();
 assertEquals("a", a.getName());
@@ -145,7 +156,7 @@
 @Test
 public void testCompatibilityWith_v1_0_12() throws IOException, ClassNotFoundException {
 FileInputStream fis = new FileInputStream(SERIALIZATION_PREFIX + "logger_v1.0.12.ser");
- ObjectInputStream ois = new ObjectInputStream(fis);
+ HardenedObjectInputStream ois = new HardenedObjectInputStream(fis, new String {Logger.class.getName()});
 Logger a = (Logger) ois.readObject();
 ois.close();
 assertEquals("a", a.getName());

_service:tar_scm:v_1.1.7.tar.gz/logback-classic/src/test/java/ch/qos/logback/classic/PatternLayoutTest.java -> _service:tar_scm:v_1.2.8.tar.gz/logback-classic/src/test/java/ch/qos/logback/classic/PatternLayoutTest.java Changed

@@ -22,6 +22,8 @@
 import ch.qos.logback.core.joran.spi.JoranException;
 import ch.qos.logback.core.pattern.PatternLayoutBase;
 import ch.qos.logback.core.pattern.parser.AbstractPatternLayoutBaseTest;
+import ch.qos.logback.core.testUtil.FileTestUtil;
+import ch.qos.logback.core.testUtil.RandomUtil;
 import ch.qos.logback.core.testUtil.StringListAppender;
 import ch.qos.logback.core.util.OptionHelper;
 import ch.qos.logback.core.util.StatusPrinter;
@@ -40,12 +42,14 @@
 Logger logger = lc.getLogger(ConverterTest.class);
 Logger root = lc.getLogger(Logger.ROOT_LOGGER_NAME);
 
+ String aMessage = "Some message";
+ 
 ILoggingEvent le;
 
 public PatternLayoutTest() {
 super();
 Exception ex = new Exception("Bogus exception");
- le = makeLoggingEvent(ex);
+ le = makeLoggingEvent(aMessage, ex);
 }
 
 @Before
@@ -53,16 +57,16 @@
 pl.setContext(lc);
 }
 
- ILoggingEvent makeLoggingEvent(Exception ex) {
- return new LoggingEvent(ch.qos.logback.core.pattern.FormattingConverter.class.getName(), logger, Level.INFO, "Some message", ex, null);
+ ILoggingEvent makeLoggingEvent(String msg, Exception ex) {
+ return new LoggingEvent(ch.qos.logback.core.pattern.FormattingConverter.class.getName(), logger, Level.INFO, msg, ex, null);
 }
 
- @Override
+
 public ILoggingEvent getEventObject() {
- return makeLoggingEvent(null);
+ return makeLoggingEvent("Some message", null);
 }
 
- public PatternLayoutBase<ILoggingEvent> getPatternLayoutBase() {
+ public PatternLayoutBase<ILoggingEvent> getPatternLayoutBase() {
 return new PatternLayout();
 }
 
@@ -119,9 +123,8 @@
 public void testWithParenthesis() {
 pl.setPattern("\$%msg:%msg\$ %msg");
 pl.start();
- le = makeLoggingEvent(null);
+ le = makeLoggingEvent(aMessage, null);
 String val = pl.doLayout(le);
- // System.out.println("VAL == " + val);
 assertEquals("(Some message:Some message) Some message", val);
 }
 
@@ -193,7 +196,7 @@
 }
 
 @Test
- public void somekeReplace() {
+ public void smokeReplace() {
 pl.setPattern("%replace(a1234b){'\\d{4}', 'XXXX'}");
 pl.start();
 StatusPrinter.print(lc);
@@ -202,6 +205,18 @@
 }
 
 @Test
+ public void replaceNewline() {
+ String pattern = "%replace(A\nB){'\n', '\n\t'}";
+ String substPattern = OptionHelper.substVars(pattern, null, lc);
+ assertEquals(pattern, substPattern);
+ pl.setPattern(substPattern);
+ pl.start();
+ StatusPrinter.print(lc);
+ String val = pl.doLayout(makeLoggingEvent("", null));
+ assertEquals("A\n\tB", val);
+ }
+ 
+ @Test
 public void replaceWithJoran() throws JoranException {
 configure(ClassicTestConstants.JORAN_INPUT_PREFIX + "pattern/replace0.xml");
 StatusPrinter.print(lc);
@@ -214,4 +229,68 @@
 assertEquals("And the number is XXXX, expiring on 12/2010", sla.strList.get(0));
 }
 
+ @Test
+ public void replaceWithJoran_NEWLINE() throws JoranException {
+ lc.putProperty("TAB", "\t");
+ configure(ClassicTestConstants.JORAN_INPUT_PREFIX + "pattern/replaceNewline.xml");
+ StatusPrinter.print(lc);
+ root.getAppender("LIST");
+ String msg = "A\nC";
+ logger.debug(msg);
+ StringListAppender<ILoggingEvent> sla = (StringListAppender<ILoggingEvent>) root.getAppender("LIST");
+ assertNotNull(sla);
+ assertEquals(1, sla.strList.size());
+ assertEquals("A\n\tC", sla.strList.get(0));
+ }
+ 
+ @Test
+ public void prefixConverterSmoke() {
+ 	 String pattern = "%prefix(%logger) %message";
+ pl.setPattern(pattern);
+ pl.start();
+ String val = pl.doLayout(makeLoggingEvent("hello", null));
+ assertEquals("logger="+logger.getName() + " hello", val);
+ }
+ 
+ @Test
+ public void prefixConverterWithMDC() {
+ 	String mdcKey = "boo";
+ 	String mdcVal = "moo";
+ 	
+ 	 String pattern = "%prefix(%level %logger %X{"+mdcKey+"}) %message";
+ pl.setPattern(pattern);
+ pl.start();
+ MDC.put(mdcKey, mdcVal);
+ try {
+ 	 String val = pl.doLayout(makeLoggingEvent("hello", null));
+ 	 
+ assertEquals("level="+"INFO logger="+logger.getName() +" "+mdcKey+"="+mdcVal+ " hello", val);
+ 
+ } finally {
+ MDC.remove(mdcKey);
+ }
+ }
+ 
+ @Test
+ public void prefixConverterWithProperty() {
+ 	
+ try {
+ 	 String propertyKey = "px1953";
+ 	 String propertyVal = "pxVal";
+ 	 
+ 	 System.setProperty(propertyKey, propertyVal);	
+ 	
+ 	 String pattern = "%prefix(%logger %property{"+propertyKey+"}) %message";
+ pl.setPattern(pattern);
+ pl.start();
+ 
+ 	 String val = pl.doLayout(makeLoggingEvent("hello", null));
+ 	 
+ assertEquals("logger="+logger.getName() +" "+propertyKey+"="+propertyVal+ " hello", val);
+ 
+ } finally {
+ 	 System.clearProperty("px");	
+ }
+ }
+
 }

_service:tar_scm:v_1.1.7.tar.gz/logback-classic/src/test/java/ch/qos/logback/classic/boolex/ConditionalWithoutJanino.java -> _service:tar_scm:v_1.2.8.tar.gz/logback-classic/src/test/java/ch/qos/logback/classic/boolex/ConditionalWithoutJanino.java Changed

_service:tar_scm:v_1.1.7.tar.gz/logback-classic/src/test/java/ch/qos/logback/classic/boolex/GEventEvaluatorTest.java -> _service:tar_scm:v_1.2.8.tar.gz/logback-classic/src/test/java/ch/qos/logback/classic/boolex/GEventEvaluatorTest.java Changed

_service:tar_scm:v_1.1.7.tar.gz/logback-classic/src/test/java/ch/qos/logback/classic/encoder/LayoutInsteadOfEncoderTest.java -> _service:tar_scm:v_1.2.8.tar.gz/logback-classic/src/test/java/ch/qos/logback/classic/encoder/LayoutInsteadOfEncoderTest.java Changed

@@ -15,6 +15,7 @@
 
 import static ch.qos.logback.core.CoreConstants.CODES_URL;
 import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.assertEquals;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -58,4 +59,32 @@
 assertTrue(fileAppender.isStarted());
 assertTrue(fileAppender.getEncoder() instanceof LayoutWrappingEncoder);
 }
+ 
+ @Test
+ public void immediateFlushInEncoder_TRUE() throws JoranException {
+ immediateFlushInEncoder(true);
+ }
+ 
+ @Test
+ public void immediateFlushInEncoder_FALSE() throws JoranException {
+ immediateFlushInEncoder(false);
+ }
+ 
+ public void immediateFlushInEncoder(Boolean immediateFlush) throws JoranException {
+ loggerContext.putProperty("immediateFlush", immediateFlush.toString());
+ jc.doConfigure(ClassicTestConstants.JORAN_INPUT_PREFIX + "compatibility/immediateFlushInEncoder.xml");
+ StatusPrinter.print(loggerContext);
+ StatusChecker checker = new StatusChecker(loggerContext);
+
+ checker.assertContainsMatch(Status.WARN, "As of version 1.2.0 \"immediateFlush\" property should be set within the enclosing Appender.");
+ checker.assertContainsMatch(Status.WARN, "Please move \"immediateFlush\" property into the enclosing appender.");
+ checker.assertContainsMatch(Status.WARN, "Setting the \"immediateFlush\" property of the enclosing appender to "+immediateFlush);
+
+ ch.qos.logback.classic.Logger root = (ch.qos.logback.classic.Logger) loggerContext.getLogger(Logger.ROOT_LOGGER_NAME);
+ FileAppender<ILoggingEvent> fileAppender = (FileAppender<ILoggingEvent>) root.getAppender("LIOE");
+ assertTrue(fileAppender.isStarted());
+ assertEquals(immediateFlush, Boolean.valueOf(fileAppender.isImmediateFlush())); 
+ }
+
+ 
 }

_service:tar_scm:v_1.1.7.tar.gz/logback-classic/src/test/java/ch/qos/logback/classic/encoder/PatternLayoutEncoderTest.java -> _service:tar_scm:v_1.2.8.tar.gz/logback-classic/src/test/java/ch/qos/logback/classic/encoder/PatternLayoutEncoderTest.java Changed

@@ -52,15 +52,17 @@
         init(baos);
         String msg = "hello";
         ILoggingEvent event = makeLoggingEvent(msg);
-        ple.doEncode(event);
-        ple.close();
+        byte eventBytes = ple.encode(event);
+        baos.write(eventBytes);
+        ple.footerBytes();
         assertEquals(msg, baos.toString());
     }
 
     void init(ByteArrayOutputStream baos) throws IOException {
         ple.start();
         ((PatternLayout) ple.getLayout()).setOutputPatternAsHeader(false);
-        ple.init(baos);
+        byte header = ple.headerBytes();
+        baos.write(header);
     }
 
     @Test
@@ -69,9 +71,10 @@
         init(baos);
         String msg = "\u03b1";
         ILoggingEvent event = makeLoggingEvent(msg);
-        ple.doEncode(event);
-        ple.close();
-        assertEquals(msg, new String(baos.toByteArray(), utf8Charset.name()));
+        byte eventBytes = ple.encode(event);
+        baos.write(eventBytes);
+        ple.footerBytes();
+        assertEquals(msg, new String(baos.toByteArray(), utf8Charset));
     }
 
 }

_service:tar_scm:v_1.1.7.tar.gz/logback-classic/src/test/java/ch/qos/logback/classic/issue/lbclassic36/SelectiveDateFormattingRunnable.java -> _service:tar_scm:v_1.2.8.tar.gz/logback-classic/src/test/java/ch/qos/logback/classic/issue/lbclassic36/SelectiveDateFormattingRunnable.java Changed

_service:tar_scm:v_1.1.7.tar.gz/logback-classic/src/test/java/ch/qos/logback/classic/issue/lbcore211/Lbcore211.java -> _service:tar_scm:v_1.2.8.tar.gz/logback-classic/src/test/java/ch/qos/logback/classic/issue/lbcore211/Lbcore211.java Changed

_service:tar_scm:v_1.1.7.tar.gz/logback-classic/src/test/java/ch/qos/logback/classic/issue/lbcore_155/Main.java -> _service:tar_scm:v_1.2.8.tar.gz/logback-classic/src/test/java/ch/qos/logback/classic/issue/lbcore_155/Main.java Changed

_service:tar_scm:v_1.1.7.tar.gz/logback-classic/src/test/java/ch/qos/logback/classic/issue/lbcore_155/OThread.java -> _service:tar_scm:v_1.2.8.tar.gz/logback-classic/src/test/java/ch/qos/logback/classic/issue/lbcore_155/OThread.java Changed

_service:tar_scm:v_1.2.8.tar.gz/logback-classic/src/test/java/ch/qos/logback/classic/issue/logback1159 Added

_service:tar_scm:v_1.2.8.tar.gz/logback-classic/src/test/java/ch/qos/logback/classic/issue/logback1159/LogbackListener.java Added

@@ -0,0 +1,37 @@
+package ch.qos.logback.classic.issue.logback1159;
+
+import java.io.IOException;
+
+import ch.qos.logback.core.spi.ContextAwareBase;
+import ch.qos.logback.core.spi.LifeCycle;
+import ch.qos.logback.core.status.Status;
+import ch.qos.logback.core.status.StatusListener;
+import ch.qos.logback.core.status.ErrorStatus;
+
+public class LogbackListener extends ContextAwareBase implements StatusListener, LifeCycle {
+    private boolean started;
+
+    @Override
+    public void start() {
+        this.started = true;
+    }
+
+    @Override
+    public void stop() {
+        this.started = false;
+    }
+
+    @Override
+    public boolean isStarted() {
+        return this.started;
+    }
+
+    @Override
+    public void addStatusEvent(final Status status) {
+        if (status instanceof ErrorStatus && status.getThrowable() instanceof IOException) {
+            System.out.println("*************************LogbackListener.addStatusEvent");
+            throw new LoggingError(status.getMessage(), status.getThrowable());
+        }
+    }
+
+}
\ No newline at end of file

_service:tar_scm:v_1.2.8.tar.gz/logback-classic/src/test/java/ch/qos/logback/classic/issue/logback1159/LogbackListenerTest.java Added

@@ -0,0 +1,66 @@
+package ch.qos.logback.classic.issue.logback1159;
+
+import java.io.File;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.nio.file.attribute.PosixFilePermission;
+import java.util.Collections;
+import java.util.Set;
+
+
+//import org.apache.commons.io.FileUtils;
+//import org.apache.commons.lang3.RandomStringUtils;
+import org.junit.After;
+import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.slf4j.impl.StaticLoggerBinderFriend;
+
+import ch.qos.logback.classic.LoggerContext;
+import ch.qos.logback.classic.joran.JoranConfigurator;
+import ch.qos.logback.core.joran.spi.JoranException;
+
+public class LogbackListenerTest {
+ private File logFile = new File("target/test.log");
+
+ private void doConfigure() throws JoranException {
+ LoggerContext context = (LoggerContext) LoggerFactory.getILoggerFactory();
+ JoranConfigurator configurator = new JoranConfigurator();
+ configurator.setContext(context);
+ configurator.doConfigure(new File("src/test/input/issue/logback-1159.xml"));
+ }
+
+ @After
+ public void after() {
+ logFile.delete();
+ StaticLoggerBinderFriend.reset();
+ }
+
+ private void disableLogFileAccess() throws IOException {
+ logFile.createNewFile();
+ logFile.deleteOnExit();
+ Path path = Paths.get(logFile.toURI());
+ Set<PosixFilePermission> permissions = Collections.emptySet();
+ try {
+ Files.setPosixFilePermissions(path, permissions);
+ } catch (UnsupportedOperationException e) {
+ path.toFile().setReadOnly();
+ }
+ }
+
+ @Test(expected = LoggingError.class)
+ public void testThatErrorIsDetectedAtLogInit() throws Exception {
+ disableLogFileAccess();
+ doConfigure();
+ }
+
+ @Test
+ public void assertThatNonFailSafeAppendersNotAffected() throws JoranException {
+ doConfigure();
+ Logger logger = LoggerFactory.getLogger("NOTJOURNAL");
+ logger.error("This should not fail");
+ }
+
+}
\ No newline at end of file

_service:tar_scm:v_1.2.8.tar.gz/logback-classic/src/test/java/ch/qos/logback/classic/issue/logback1159/LoggingError.java Added

_service:tar_scm:v_1.2.8.tar.gz/logback-classic/src/test/java/ch/qos/logback/classic/issue/logback_1277 Added

_service:tar_scm:v_1.2.8.tar.gz/logback-classic/src/test/java/ch/qos/logback/classic/issue/logback_1277/Main.java Added

@@ -0,0 +1,47 @@
+/**
+ * Logback: the reliable, generic, fast and flexible logging framework.
+ * Copyright (C) 1999-2015, 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.classic.issue.logback_1277;
+
+import ch.qos.logback.classic.ClassicTestConstants;
+import ch.qos.logback.classic.LoggerContext;
+import ch.qos.logback.classic.joran.JoranConfigurator;
+import ch.qos.logback.core.joran.spi.JoranException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class Main {
+
+ static Logger logger = LoggerFactory.getLogger(Main.class);
+ static String CONFIG_FILE = ClassicTestConstants.ISSUES_PREFIX + "logback-1277.xml";
+
+ public static void main(String args) throws JoranException, InterruptedException {
+ init(CONFIG_FILE);
+ int runLen = 1000 * 1000;
+ for (int i = 0; i < runLen; i++) {
+ logger.debug("hello");
+ }
+ System.out.println("Will sleep for 60 seconds");
+ Thread.sleep(1000 * 60);
+ System.out.println("Exiting");
+
+ }
+
+ static void init(String file) throws JoranException {
+ LoggerContext loggerContext = (LoggerContext) LoggerFactory.getILoggerFactory();
+ JoranConfigurator jc = new JoranConfigurator();
+ jc.setContext(loggerContext);
+ loggerContext.reset();
+ jc.doConfigure(file);
+ }
+}

_service:tar_scm:v_1.1.7.tar.gz/logback-classic/src/test/java/ch/qos/logback/classic/joran/JoranConfiguratorTest.java -> _service:tar_scm:v_1.2.8.tar.gz/logback-classic/src/test/java/ch/qos/logback/classic/joran/JoranConfiguratorTest.java Changed

@@ -390,7 +390,6 @@
     @Test
     public void properties() throws JoranException {
         String configFileAsStr = ClassicTestConstants.JORAN_INPUT_PREFIX + "properties.xml";
-        assertNull(loggerContext.getProperty(CoreConstants.HOSTNAME_KEY));
         assertNull(System.getProperty("sys"));
 
         configure(configFileAsStr);
@@ -403,6 +402,13 @@
         checker.assertIsErrorFree();
     }
 
+    @Test
+    public void hostnameProperty() throws JoranException {
+        String configFileAsStr = ClassicTestConstants.JORAN_INPUT_PREFIX + "hostnameProperty.xml";
+        configure(configFileAsStr);
+        assertEquals("A", loggerContext.getProperty(CoreConstants.HOSTNAME_KEY));
+    }
+
     // see also http://jira.qos.ch/browse/LBCORE-254
     @Test
     public void sysProps() throws JoranException {
@@ -427,8 +433,7 @@
         configure(configFileAsStr);
         assertTrue(loggerContext.isPackagingDataEnabled());
     }
-    
-    
+
     @Test
     public void valueOfConvention() throws JoranException {
         String configFileAsStr = ClassicTestConstants.JORAN_INPUT_PREFIX + "valueOfConvention.xml";

_service:tar_scm:v_1.1.7.tar.gz/logback-classic/src/test/java/ch/qos/logback/classic/net/PackageTest.java -> _service:tar_scm:v_1.2.8.tar.gz/logback-classic/src/test/java/ch/qos/logback/classic/net/PackageTest.java Changed

_service:tar_scm:v_1.1.7.tar.gz/logback-classic/src/test/java/ch/qos/logback/classic/net/SocketAppenderMessageLossTest.java -> _service:tar_scm:v_1.2.8.tar.gz/logback-classic/src/test/java/ch/qos/logback/classic/net/SocketAppenderMessageLossTest.java Changed

@@ -13,28 +13,28 @@
  */
 package ch.qos.logback.classic.net;
 
+import static org.junit.Assert.assertTrue;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.CountDownLatch;
+
+import org.junit.Test;
+
 import ch.qos.logback.classic.Logger;
 import ch.qos.logback.classic.LoggerContext;
 import ch.qos.logback.classic.spi.ILoggingEvent;
 import ch.qos.logback.core.AppenderBase;
 import ch.qos.logback.core.testUtil.RandomUtil;
 import ch.qos.logback.core.util.Duration;
-import org.junit.Test;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.concurrent.CountDownLatch;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
 
 public class SocketAppenderMessageLossTest {
     int runLen = 100;
     Duration reconnectionDelay = new Duration(1000);
 
     static final int TIMEOUT = 3000;
-    
-    @Test(timeout = TIMEOUT)
+
+    @Test  // (timeout = TIMEOUT)
     public void synchronousSocketAppender() throws Exception {
 
         SocketAppender socketAppender = new SocketAppender();
@@ -90,9 +90,9 @@
         listAppender.setContext(serverLoggerContext);
         listAppender.start();
 
-        Logger serverLogger = serverLoggerContext.getLogger(getClass());
-        serverLogger.setAdditive(false);
-        serverLogger.addAppender(listAppender);
+        Logger serverRootLogger = serverLoggerContext.getLogger(Logger.ROOT_LOGGER_NAME);
+        serverRootLogger.setAdditive(false);
+        serverRootLogger.addAppender(listAppender);
 
         LoggerContext loggerContext = new LoggerContext();
         loggerContext.setName("clientLoggerContext");
@@ -120,9 +120,9 @@
         }
 
         allMessagesReceivedLatch.await();
-
-        assertEquals(runLen, listAppender.list.size());
         loggerContext.stop();
         simpleSocketServer.close();
+
+ 
     }
 }

_service:tar_scm:v_1.1.7.tar.gz/logback-classic/src/test/java/ch/qos/logback/classic/pattern/ThrowableProxyConverterTest.java -> _service:tar_scm:v_1.2.8.tar.gz/logback-classic/src/test/java/ch/qos/logback/classic/pattern/ThrowableProxyConverterTest.java Changed

@@ -160,34 +160,37 @@
 
     @Test
     public void skipSelectedLine() throws Exception {
+        String nameOfContainingMethod = "skipSelectedLine";
         // given
         final Throwable t = TestHelper.makeNestedException(0);
         t.printStackTrace(pw);
         final ILoggingEvent le = createLoggingEvent(t);
-        tpc.setOptionList(Arrays.asList("full", "skipSelectedLines"));
+        tpc.setOptionList(Arrays.asList("full", nameOfContainingMethod));
         tpc.start();
 
         // when
         final String result = tpc.convert(le);
 
         // then
-        assertThat(result).doesNotContain("skipSelectedLines");
+        assertThat(result).doesNotContain(nameOfContainingMethod);
+        
     }
 
     @Test
     public void skipMultipleLines() throws Exception {
+        String nameOfContainingMethod = "skipMultipleLines";
         // given
         final Throwable t = TestHelper.makeNestedException(0);
         t.printStackTrace(pw);
         final ILoggingEvent le = createLoggingEvent(t);
-        tpc.setOptionList(Arrays.asList("full", "skipMultipleLines", "junit"));
+        tpc.setOptionList(Arrays.asList("full", nameOfContainingMethod, "junit"));
         tpc.start();
 
         // when
         final String result = tpc.convert(le);
 
         // then
-        assertThat(result).doesNotContain("skipSelectedLines").doesNotContain("junit");
+        assertThat(result).doesNotContain(nameOfContainingMethod).doesNotContain("junit");
     }
 
     @Test

_service:tar_scm:v_1.1.7.tar.gz/logback-classic/src/test/java/ch/qos/logback/classic/rolling/TimeBasedRollingWithConfigFileTest.java -> _service:tar_scm:v_1.2.8.tar.gz/logback-classic/src/test/java/ch/qos/logback/classic/rolling/TimeBasedRollingWithConfigFileTest.java Changed

@@ -27,11 +27,13 @@
 import ch.qos.logback.classic.LoggerContext;
 import ch.qos.logback.classic.joran.JoranConfigurator;
 import ch.qos.logback.classic.spi.ILoggingEvent;
+import ch.qos.logback.core.CoreConstants;
 import ch.qos.logback.core.joran.spi.JoranException;
 import ch.qos.logback.core.rolling.RollingFileAppender;
 import ch.qos.logback.core.rolling.ScaffoldingForRollingTests;
 import ch.qos.logback.core.rolling.TimeBasedFileNamingAndTriggeringPolicy;
 import ch.qos.logback.core.rolling.TimeBasedRollingPolicy;
+import ch.qos.logback.core.status.Status;
 import ch.qos.logback.core.status.StatusChecker;
 import ch.qos.logback.core.util.StatusPrinter;
 
@@ -94,6 +96,15 @@
 }
 
 @Test
+ public void depratedSizeAndTimeBasedFNATPWarning() throws Exception {
+ String testId = "depratedSizeAndTimeBasedFNATPWarning";
+ lc.putProperty("testId", testId);
+ loadConfig(ClassicTestConstants.JORAN_INPUT_PREFIX + "rolling/" + testId + ".xml");
+ StatusPrinter.print(lc);
+ statusChecker.assertContainsMatch(Status.WARN, CoreConstants.SIZE_AND_TIME_BASED_FNATP_IS_DEPRECATED);
+ }
+ 
+ @Test
 public void timeAndSize() throws Exception {
 String testId = "timeAndSize";
 lc.putProperty("testId", testId);
@@ -105,6 +116,11 @@
 sizeThreshold = prefix.length() * approxWritesPerPeriod;
 lc.putProperty("sizeThreshold", "" + sizeThreshold);
 loadConfig(ClassicTestConstants.JORAN_INPUT_PREFIX + "rolling/" + testId + ".xml");
+ 
+ StatusPrinter.print(lc);
+ // Test http://jira.qos.ch/browse/LOGBACK-1236
+ statusChecker.assertNoMatch(CoreConstants.SIZE_AND_TIME_BASED_FNATP_IS_DEPRECATED);
+ 
 Logger root = lc.getLogger(Logger.ROOT_LOGGER_NAME);
 
 expectedFilenameList.add(randomOutputDir + "z" + testId);
@@ -146,7 +162,36 @@
 
 statusChecker.assertContainsMatch("Missing integer token");
 assertFalse(rfa.isStarted());
+ }
+
 
+ // see also LOGBACK-1176
+ @Test
+ public void timeAndSizeWithoutMaxFileSize() throws Exception {
+ String testId = "timeAndSizeWithoutMaxFileSize";
+ loadConfig(ClassicTestConstants.JORAN_INPUT_PREFIX + "rolling/" + testId + ".xml");
+ Logger root = lc.getLogger(Logger.ROOT_LOGGER_NAME);
+ //expectedFilenameList.add(randomOutputDir + "z" + testId);
+ RollingFileAppender<ILoggingEvent> rfa = (RollingFileAppender<ILoggingEvent>) root.getAppender("ROLLING");
+ 
+
+ //statusChecker.assertContainsMatch("Missing integer token");
+ assertFalse(rfa.isStarted());
+ StatusPrinter.print(lc);
+ }
+
+ @Test
+ public void totalSizeCapSmallerThanMaxFileSize() throws Exception {
+ String testId = "totalSizeCapSmallerThanMaxFileSize";
+ lc.putProperty("testId", testId);
+ loadConfig(ClassicTestConstants.JORAN_INPUT_PREFIX + "rolling/" + testId + ".xml");
+ Logger root = lc.getLogger(Logger.ROOT_LOGGER_NAME);
+ //expectedFilenameList.add(randomOutputDir + "z" + testId);
+ RollingFileAppender<ILoggingEvent> rfa = (RollingFileAppender<ILoggingEvent>) root.getAppender("ROLLING");
+ 
+ statusChecker.assertContainsMatch("totalSizeCap of \\\\d* \\w*\\ is smaller than maxFileSize \\\\d* \\w*\\ which is non-sensical");
+ assertFalse(rfa.isStarted());
+ 
 }
 
 void addExpectedFileNamedIfItsTime(String testId, String msg, boolean gzExtension) {

_service:tar_scm:v_1.1.7.tar.gz/logback-classic/src/test/java/ch/qos/logback/classic/selector/ContextDetachingSCLTest.java -> _service:tar_scm:v_1.2.8.tar.gz/logback-classic/src/test/java/ch/qos/logback/classic/selector/ContextDetachingSCLTest.java Changed

_service:tar_scm:v_1.1.7.tar.gz/logback-classic/src/test/java/ch/qos/logback/classic/selector/ContextJNDISelectorTest.java -> _service:tar_scm:v_1.2.8.tar.gz/logback-classic/src/test/java/ch/qos/logback/classic/selector/ContextJNDISelectorTest.java Changed

_service:tar_scm:v_1.2.8.tar.gz/logback-classic/src/test/java/ch/qos/logback/classic/servlet Added

_service:tar_scm:v_1.2.8.tar.gz/logback-classic/src/test/java/ch/qos/logback/classic/servlet/LogbackServletContainerInitializerTest.java Added

@@ -0,0 +1,43 @@
+package ch.qos.logback.classic.servlet;
+
+import static org.junit.Assert.*;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
+import ch.qos.logback.core.CoreConstants;
+
+import static org.mockito.Mockito.*;
+
+import javax.servlet.ServletContext;
+import javax.servlet.ServletException;
+
+public class LogbackServletContainerInitializerTest {
+
+    LogbackServletContainerInitializer lsci = new LogbackServletContainerInitializer();
+    
+    @Before
+    public void setUp() throws Exception {
+    }
+
+    @After
+    public void tearDown() throws Exception {
+    }
+
+    @Test
+    public void testOnStartup() throws ServletException {
+        ServletContext mockedServletContext = mock(ServletContext.class);
+        lsci.onStartup(null, mockedServletContext);
+        verify(mockedServletContext).addListener(any(LogbackServletContextListener.class));
+    }
+
+    @Test
+    public void noListenerShouldBeAddedWhenDisabled() throws ServletException {
+        ServletContext mockedServletContext = mock(ServletContext.class);
+        when(mockedServletContext.getInitParameter(CoreConstants.DISABLE_SERVLET_CONTAINER_INITIALIZER_KEY)).thenReturn("true");
+        lsci.onStartup(null, mockedServletContext);
+        verify(mockedServletContext, times(0)).addListener(any(LogbackServletContextListener.class));
+    }
+
+}

_service:tar_scm:v_1.1.7.tar.gz/logback-classic/src/test/java/ch/qos/logback/classic/sift/MDCBasedDiscriminatorTest.java -> _service:tar_scm:v_1.2.8.tar.gz/logback-classic/src/test/java/ch/qos/logback/classic/sift/MDCBasedDiscriminatorTest.java Changed

_service:tar_scm:v_1.1.7.tar.gz/logback-classic/src/test/java/ch/qos/logback/classic/sift/SiftingAppenderTest.java -> _service:tar_scm:v_1.2.8.tar.gz/logback-classic/src/test/java/ch/qos/logback/classic/sift/SiftingAppenderTest.java Changed

@@ -18,7 +18,7 @@
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
-
+import static ch.qos.logback.core.util.CoreTestConstants.OUTPUT_DIR_PREFIX;
 import static org.assertj.core.api.Assertions.*;
 
 import java.util.List;
@@ -40,6 +40,7 @@
 import ch.qos.logback.classic.spi.LoggingEvent;
 import ch.qos.logback.core.Appender;
 import ch.qos.logback.core.Context;
+import ch.qos.logback.core.FileAppender;
 import ch.qos.logback.core.helpers.NOPAppender;
 import ch.qos.logback.core.joran.spi.JoranException;
 import ch.qos.logback.core.read.ListAppender;
@@ -55,6 +56,7 @@
 import ch.qos.logback.core.testUtil.RandomUtil;
 import ch.qos.logback.core.testUtil.StringListAppender;
 import ch.qos.logback.core.util.CoreTestConstants;
+import ch.qos.logback.core.util.FileSize;
 import ch.qos.logback.core.util.StatusPrinter;
 
 public class SiftingAppenderTest {
@@ -66,6 +68,7 @@
 Logger root = loggerContext.getLogger(Logger.ROOT_LOGGER_NAME);
 StatusChecker statusChecker = new StatusChecker(loggerContext);
 int diff = RandomUtil.getPositiveInt();
+ String randomOutputDir = OUTPUT_DIR_PREFIX + diff + "/";
 int now = 0;
 
 protected void configure(String file) throws JoranException {
@@ -117,7 +120,7 @@
 logger.debug("hello");
 logger.debug("hello");
 logger.debug("hello");
- 
+
 Appender<ILoggingEvent> nopa = getAppenderTracker().find("zeroDefault");
 assertNotNull(nopa);
 assertThat(nopa).isInstanceOf(NOPAppender.class);
@@ -154,6 +157,39 @@
 }
 
 @Test
+ public void fileAppenderCollision() throws JoranException, InterruptedException {
+ loggerContext.putProperty("DIR_PREFIX", randomOutputDir);
+ String key = "collision";
+ configure(SIFT_FOLDER_PREFIX + "fileAppender.xml");
+ SiftingAppender sa = (SiftingAppender) root.getAppender("SIFT");
+
+ long timestamp = System.currentTimeMillis();
+
+ MDC.put(key, "A-"+diff);
+ logNewEventViaSiftingAppender(sa, timestamp);
+ FileAppender<ILoggingEvent> fileAppenderA = (FileAppender<ILoggingEvent>) sa.getAppenderTracker().find("A-"+diff);
+ assertNotNull(fileAppenderA);
+ assertTrue(fileAppenderA.isStarted());
+ timestamp += ComponentTracker.DEFAULT_TIMEOUT + 1;
+ MDC.put(key, "B-"+diff);
+ logNewEventViaSiftingAppender(sa, timestamp);
+ assertFalse(fileAppenderA.isStarted());
+ 
+ MDC.put(key, "A-"+diff);
+ timestamp += 1;
+ logNewEventViaSiftingAppender(sa, timestamp);
+ FileAppender<ILoggingEvent> fileAppenderA_2 = (FileAppender<ILoggingEvent>) sa.getAppenderTracker().find("A-"+diff);
+ assertTrue(fileAppenderA_2.isStarted());
+ 
+ }
+
+ private void logNewEventViaSiftingAppender(SiftingAppender sa, long timestamp) {
+ LoggingEvent le = new LoggingEvent("x", logger, Level.INFO, "hello", null, null);
+ le.setTimeStamp(timestamp + ComponentTracker.DEFAULT_TIMEOUT + 1);
+ sa.doAppend(le);
+ }
+
+ @Test
 public void testWholeCycle() throws JoranException {
 String mdcKey = "cycle";
 configure(SIFT_FOLDER_PREFIX + "completeCycle.xml");
@@ -168,9 +204,7 @@
 assertEquals("smoke", eventList.get(0).getMessage());
 
 MDC.remove(mdcKey);
- LoggingEvent le = new LoggingEvent("x", logger, Level.INFO, "hello", null, null);
- le.setTimeStamp(timestamp + ComponentTracker.DEFAULT_TIMEOUT + 1);
- sa.doAppend(le);
+ logNewEventViaSiftingAppender(sa, timestamp);
 assertFalse(listAppender.isStarted());
 assertEquals(1, sa.getAppenderTracker().allKeys().size());
 assertTrue(sa.getAppenderTracker().allKeys().contains("cycleDefault"));
@@ -291,16 +325,15 @@
 statusChecker.assertIsErrorFree();
 }
 
- 
 // LOGBACK-1127
 @Ignore
- @Test 
+ @Test
 public void programmicSiftingAppender() {
- 
+
 SiftingAppender connectorAppender = new SiftingAppender();
 connectorAppender.setContext(loggerContext);
 connectorAppender.setName("SIFTING_APPENDER");
- 
+
 MDCBasedDiscriminator discriminator = new MDCBasedDiscriminator();
 discriminator.setKey("SKEY");
 discriminator.setDefaultValue("DEF_KEY");
@@ -309,43 +342,43 @@
 
 connectorAppender.setAppenderFactory(new AppenderFactory<ILoggingEvent>() {
 
- @Override
- public Appender<ILoggingEvent> buildAppender(Context context, String discriminatingValue) throws JoranException {
+ @Override
+ public Appender<ILoggingEvent> buildAppender(Context context, String discriminatingValue) throws JoranException {
 
- RollingFileAppender<ILoggingEvent> appender = new RollingFileAppender<ILoggingEvent>();
- appender.setName("ROLLING_APPENDER_"+discriminatingValue);
- appender.setContext(context);
- appender.setFile("/var/logs/active_"+discriminatingValue+".log");
+ RollingFileAppender<ILoggingEvent> appender = new RollingFileAppender<ILoggingEvent>();
+ appender.setName("ROLLING_APPENDER_" + discriminatingValue);
+ appender.setContext(context);
+ appender.setFile("/var/logs/active_" + discriminatingValue + ".log");
 
- TimeBasedRollingPolicy<ILoggingEvent> policy = new TimeBasedRollingPolicy<ILoggingEvent>();
- policy.setContext(context);
- policy.setMaxHistory(365);
- policy.setFileNamePattern(CoreTestConstants.OUTPUT_DIR_PREFIX+"/logback1127/"+discriminatingValue+"_%d{yyyy_MM_dd}_%i.log");
- policy.setParent(appender);
- policy.setCleanHistoryOnStart(true);
+ TimeBasedRollingPolicy<ILoggingEvent> policy = new TimeBasedRollingPolicy<ILoggingEvent>();
+ policy.setContext(context);
+ policy.setMaxHistory(365);
+ policy.setFileNamePattern(CoreTestConstants.OUTPUT_DIR_PREFIX + "/logback1127/" + discriminatingValue + "_%d{yyyy_MM_dd}_%i.log");
+ policy.setParent(appender);
+ policy.setCleanHistoryOnStart(true);
 
- SizeAndTimeBasedFNATP<ILoggingEvent> innerpolicy = new SizeAndTimeBasedFNATP<ILoggingEvent>();
- innerpolicy.setContext(context);
- innerpolicy.setMaxFileSize("5KB");
- innerpolicy.setTimeBasedRollingPolicy(policy);
+ SizeAndTimeBasedFNATP<ILoggingEvent> innerpolicy = new SizeAndTimeBasedFNATP<ILoggingEvent>();
+ innerpolicy.setContext(context);
+ innerpolicy.setMaxFileSize(FileSize.valueOf("5KB"));
+ innerpolicy.setTimeBasedRollingPolicy(policy);
 
- policy.setTimeBasedFileNamingAndTriggeringPolicy(innerpolicy);
- policy.start();
- appender.setRollingPolicy(policy);
+ policy.setTimeBasedFileNamingAndTriggeringPolicy(innerpolicy);
+ policy.start();
+ appender.setRollingPolicy(policy);
 
- PatternLayoutEncoder pl = new PatternLayoutEncoder();
- pl.setContext(context);
- pl.setPattern("%d{yyyy/MM/dd'T'HH:mm:ss} %-5level - %msg\n");
+ PatternLayoutEncoder pl = new PatternLayoutEncoder();
+ pl.setContext(context);
+ pl.setPattern("%d{yyyy/MM/dd'T'HH:mm:ss} %-5level - %msg\n");
 
- pl.start();
- appender.setEncoder(pl);
+ pl.start();
+ appender.setEncoder(pl);
 
- appender.start();
- return appender;
- }
+ appender.start();
+ return appender;
+ }
 });
 connectorAppender.start();
- 
+
 ch.qos.logback.classic.Logger logger = loggerContext.getLogger("org.test");
 logger.addAppender(connectorAppender);
 logger.setLevel(Level.DEBUG);
@@ -354,12 +387,12 @@
 MDC.put("SKEY", "K1");
 logger.info("bla1");
 MDC.clear();
- 
+
 MDC.put("SKEY", "K2");
 logger.info("bla2");
 MDC.clear();
 
 StatusPrinter.print(loggerContext);
- 
+
 }
 }

_service:tar_scm:v_1.1.7.tar.gz/logback-classic/src/test/java/ch/qos/logback/classic/spi/LoggingEventSerializationTest.java -> _service:tar_scm:v_1.2.8.tar.gz/logback-classic/src/test/java/ch/qos/logback/classic/spi/LoggingEventSerializationTest.java Changed

@@ -34,11 +34,12 @@
 import ch.qos.logback.classic.Logger;
 import ch.qos.logback.classic.LoggerContext;
 import ch.qos.logback.classic.net.LoggingEventPreSerializationTransformer;
+import ch.qos.logback.classic.net.server.HardenedLoggingEventInputStream;
 import ch.qos.logback.core.spi.PreSerializationTransformer;
 
 public class LoggingEventSerializationTest {
 
-    LoggerContext lc;
+    LoggerContext loggerContext;
     Logger logger;
 
     ByteArrayOutputStream bos;
@@ -48,9 +49,9 @@
 
     @Before
     public void setUp() throws Exception {
-        lc = new LoggerContext();
-        lc.setName("testContext");
-        logger = lc.getLogger(Logger.ROOT_LOGGER_NAME);
+        loggerContext = new LoggerContext();
+        loggerContext.setName("testContext");
+        logger = loggerContext.getLogger(Logger.ROOT_LOGGER_NAME);
         // create the byte output stream
         bos = new ByteArrayOutputStream();
         oos = new ObjectOutputStream(bos);
@@ -58,7 +59,7 @@
 
     @After
     public void tearDown() throws Exception {
-        lc = null;
+        loggerContext = null;
         logger = null;
         oos.close();
     }
@@ -72,7 +73,7 @@
 
     @Test
     public void context() throws Exception {
-        lc.putProperty("testKey", "testValue");
+        loggerContext.putProperty("testKey", "testValue");
         ILoggingEvent event = createLoggingEvent();
         ILoggingEvent remoteEvent = writeAndRead(event);
         checkForEquality(event, remoteEvent);
@@ -140,11 +141,17 @@
     }
 
     @Test
-    public void _Throwable() throws Exception {
-        LoggingEvent event = createLoggingEvent();
+    public void testWithThrowable() throws Exception {
         Throwable throwable = new Throwable("just testing");
-        ThrowableProxy tp = new ThrowableProxy(throwable);
-        event.setThrowableProxy(tp);
+        LoggingEvent event = createLoggingEventWithThrowable(throwable);
+        ILoggingEvent remoteEvent = writeAndRead(event);
+        checkForEquality(event, remoteEvent);
+    }
+
+    @Test
+    public void testWithCallerData() throws Exception {
+        LoggingEvent event = createLoggingEvent();
+        event.getCallerData();
         ILoggingEvent remoteEvent = writeAndRead(event);
         checkForEquality(event, remoteEvent);
     }
@@ -187,6 +194,10 @@
         return new LoggingEvent(this.getClass().getName(), logger, Level.DEBUG, "test message", null, null);
     }
 
+    private LoggingEvent createLoggingEventWithThrowable(Throwable t) {
+        return new LoggingEvent(this.getClass().getName(), logger, Level.DEBUG, "test message", t, null);
+    }
+
     private void checkForEquality(ILoggingEvent original, ILoggingEvent afterSerialization) {
         assertEquals(original.getLevel(), afterSerialization.getLevel());
         assertEquals(original.getFormattedMessage(), afterSerialization.getFormattedMessage());
@@ -203,8 +214,8 @@
         Serializable ser = pst.transform(event);
         oos.writeObject(ser);
         ByteArrayInputStream bis = new ByteArrayInputStream(bos.toByteArray());
-        inputStream = new ObjectInputStream(bis);
-
+        inputStream = new HardenedLoggingEventInputStream(bis);
+        
         return (ILoggingEvent) inputStream.readObject();
     }

_service:tar_scm:v_1.1.7.tar.gz/logback-classic/src/test/java/ch/qos/logback/classic/util/ContextInitializerAutoConfigTest.java -> _service:tar_scm:v_1.2.8.tar.gz/logback-classic/src/test/java/ch/qos/logback/classic/util/ContextInitializerAutoConfigTest.java Changed

_service:tar_scm:v_1.1.7.tar.gz/logback-classic/src/test/java/ch/qos/logback/classic/util/ContextInitializerTest.java -> _service:tar_scm:v_1.2.8.tar.gz/logback-classic/src/test/java/ch/qos/logback/classic/util/ContextInitializerTest.java Changed

@@ -59,7 +59,7 @@
 @After
 public void tearDown() throws Exception {
 System.clearProperty(ContextInitializer.CONFIG_FILE_PROPERTY);
- System.clearProperty(CoreConstants.STATUS_LISTENER_CLASS);
+ System.clearProperty(CoreConstants.STATUS_LISTENER_CLASS_KEY);
 MockConfigurator.context = null;
 }
 
@@ -119,7 +119,7 @@
 
 @Test
 public void autoStatusListener() throws JoranException {
- System.setProperty(CoreConstants.STATUS_LISTENER_CLASS, TrivialStatusListener.class.getName());
+ System.setProperty(CoreConstants.STATUS_LISTENER_CLASS_KEY, TrivialStatusListener.class.getName());
 List<StatusListener> statusListenerList = loggerContext.getStatusManager().getCopyOfStatusListenerList();
 assertEquals(0, statusListenerList.size());
 doAutoConfigFromSystemProperties(ClassicTestConstants.INPUT_PREFIX + "autoConfig.xml");
@@ -132,7 +132,7 @@
 
 @Test
 public void autoOnConsoleStatusListener() throws JoranException {
- System.setProperty(CoreConstants.STATUS_LISTENER_CLASS, CoreConstants.SYSOUT);
+ System.setProperty(CoreConstants.STATUS_LISTENER_CLASS_KEY, CoreConstants.SYSOUT);
 List<StatusListener> sll = loggerContext.getStatusManager().getCopyOfStatusListenerList();
 assertEquals(0, sll.size());
 doAutoConfigFromSystemProperties(ClassicTestConstants.INPUT_PREFIX + "autoConfig.xml");

_service:tar_scm:v_1.1.7.tar.gz/logback-classic/src/test/java/ch/qos/logback/classic/util/InitializationIntegrationTest.java -> _service:tar_scm:v_1.2.8.tar.gz/logback-classic/src/test/java/ch/qos/logback/classic/util/InitializationIntegrationTest.java Changed

_service:tar_scm:v_1.1.7.tar.gz/logback-classic/src/test/java/org/slf4j/impl/InitializationOutputTest.java -> _service:tar_scm:v_1.2.8.tar.gz/logback-classic/src/test/java/org/slf4j/impl/InitializationOutputTest.java Changed

_service:tar_scm:v_1.1.7.tar.gz/logback-classic/src/test/java/org/slf4j/test_osgi/FelixHost.java -> _service:tar_scm:v_1.2.8.tar.gz/logback-classic/src/test/java/org/slf4j/test_osgi/FelixHost.java Changed

_service:tar_scm:v_1.1.7.tar.gz/logback-core/pom.xml -> _service:tar_scm:v_1.2.8.tar.gz/logback-core/pom.xml Changed

@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <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/xsd/maven-4.0.0.xsd">
@@ -7,7 +8,7 @@
 <parent>
 <groupId>ch.qos.logback</groupId>
 <artifactId>logback-parent</artifactId>
- <version>1.1.7</version>
+ <version>1.2.8</version>
 </parent>
 
 <artifactId>logback-core</artifactId>
@@ -25,7 +26,7 @@
 <dependency>
 <groupId>org.fusesource.jansi</groupId>
 <artifactId>jansi</artifactId>
- <optional>true</optional> 
+ <optional>true</optional>
 </dependency>
 <dependency>
 <groupId>javax.mail</groupId>
@@ -34,20 +35,13 @@
 <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.mockito</groupId>
 <artifactId>mockito-core</artifactId>
- <version>1.9.5</version>
 <scope>test</scope>
 </dependency>
 <dependency>
 <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
+ <artifactId>javax.servlet-api</artifactId>
 <scope>compile</scope>
 <optional>true</optional>
 </dependency>
@@ -84,8 +78,7 @@
 <artifactId>maven-jar-plugin</artifactId>
 <configuration>
 <archive>
- <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF
- </manifestFile>
+ <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
 </archive>
 </configuration>
 <executions>

_service:tar_scm:v_1.1.7.tar.gz/logback-core/src/main/java/ch/qos/logback/core/AsyncAppenderBase.java -> _service:tar_scm:v_1.2.8.tar.gz/logback-core/src/main/java/ch/qos/logback/core/AsyncAppenderBase.java Changed

@@ -15,6 +15,7 @@
 
 import ch.qos.logback.core.spi.AppenderAttachable;
 import ch.qos.logback.core.spi.AppenderAttachableImpl;
+import ch.qos.logback.core.util.InterruptUtil;
 
 import java.util.Iterator;
 import java.util.concurrent.ArrayBlockingQueue;
@@ -123,7 +124,12 @@
         // interrupt the worker thread so that it can terminate. Note that the interruption can be consumed
         // by sub-appenders
         worker.interrupt();
+
+        InterruptUtil interruptUtil = new InterruptUtil(context);
+
         try {
+            interruptUtil.maskInterruptFlag();
+
             worker.join(maxFlushTime);
 
             // check to see if the thread ended and if not add a warning message
@@ -135,10 +141,17 @@
             }
 
         } catch (InterruptedException e) {
-            addError("Failed to join worker thread. " + blockingQueue.size() + " queued events may be discarded.", e);
+            int remaining = blockingQueue.size();
+            addError("Failed to join worker thread. " + remaining + " queued events may be discarded.", e);
+        } finally {
+            interruptUtil.unmaskInterruptFlag();
         }
     }
 
+
+
+
+
     @Override
     protected void append(E eventObject) {
         if (isQueueBelowDiscardingThreshold() && isDiscardable(eventObject)) {
@@ -156,11 +169,23 @@
         if (neverBlock) {
             blockingQueue.offer(eventObject);
         } else {
-            try {
-                blockingQueue.put(eventObject);
-            } catch (InterruptedException e) {
-                // Interruption of current thread when in doAppend method should not be consumed
-                // by AsyncAppender
+            putUninterruptibly(eventObject);
+        }
+    }
+
+    private void putUninterruptibly(E eventObject) {
+        boolean interrupted = false;
+        try {
+            while (true) {
+                try {
+                    blockingQueue.put(eventObject);
+                    break;
+                } catch (InterruptedException e) {
+                    interrupted = true;
+                }
+            }
+        } finally {
+            if (interrupted) {
                 Thread.currentThread().interrupt();
             }
         }

_service:tar_scm:v_1.1.7.tar.gz/logback-core/src/main/java/ch/qos/logback/core/ContextBase.java -> _service:tar_scm:v_1.2.8.tar.gz/logback-core/src/main/java/ch/qos/logback/core/ContextBase.java Changed

@@ -14,6 +14,7 @@
 package ch.qos.logback.core;
 
 import static ch.qos.logback.core.CoreConstants.CONTEXT_NAME_KEY;
+import static ch.qos.logback.core.CoreConstants.HOSTNAME_KEY;
 import static ch.qos.logback.core.CoreConstants.FA_FILENAME_COLLISION_MAP;
 import static ch.qos.logback.core.CoreConstants.RFA_FILENAME_PATTERN_COLLISION_MAP;
 
@@ -25,9 +26,11 @@
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.ScheduledFuture;
 
+import ch.qos.logback.core.rolling.helper.FileNamePattern;
 import ch.qos.logback.core.spi.LifeCycle;
 import ch.qos.logback.core.spi.LogbackLock;
 import ch.qos.logback.core.status.StatusManager;
+import ch.qos.logback.core.util.ContextUtil;
 import ch.qos.logback.core.util.ExecutorServiceUtil;
 
 public class ContextBase implements Context, LifeCycle {
@@ -44,7 +47,6 @@
 
 LogbackLock configurationLock = new LogbackLock();
 
- private ExecutorService executorService;
 private ScheduledExecutorService scheduledExecutorService;
 protected List<ScheduledFuture<?>> scheduledFutures = new ArrayList<ScheduledFuture<?>>(1);
 private LifeCycleManager lifeCycleManager;
@@ -81,12 +83,16 @@
 }
 
 public void putProperty(String key, String val) {
- this.propertyMap.put(key, val);
+ if (HOSTNAME_KEY.equalsIgnoreCase(key)) {
+ putHostnameProperty(val);
+ } else {
+ this.propertyMap.put(key, val);
+ }
 }
 
 protected void initCollisionMaps() {
 putObject(FA_FILENAME_COLLISION_MAP, new HashMap<String, String>());
- putObject(RFA_FILENAME_PATTERN_COLLISION_MAP, new HashMap<String, String>());
+ putObject(RFA_FILENAME_PATTERN_COLLISION_MAP, new HashMap<String, FileNamePattern>());
 }
 
 /**
@@ -99,10 +105,31 @@
 public String getProperty(String key) {
 if (CONTEXT_NAME_KEY.equals(key))
 return getName();
+ if (HOSTNAME_KEY.equalsIgnoreCase(key)) {
+ return lazyGetHostname();
+ }
 
 return (String) this.propertyMap.get(key);
 }
 
+ private String lazyGetHostname() {
+ String hostname = (String) this.propertyMap.get(HOSTNAME_KEY);
+ if (hostname == null) {
+ hostname = new ContextUtil(this).safelyGetLocalHostName();
+ putHostnameProperty(hostname);
+ }
+ return hostname;
+ }
+
+ private void putHostnameProperty(String hostname) {
+ String existingHostname = (String) this.propertyMap.get(HOSTNAME_KEY);
+ if (existingHostname == null) {
+ this.propertyMap.put(CoreConstants.HOSTNAME_KEY, hostname);
+ } else {
+
+ }
+ }
+
 public Object getObject(String key) {
 return objectMap.get(key);
 }
@@ -129,7 +156,8 @@
 public void stop() {
 // We don't check "started" here, because the executor service uses
 // lazy initialization, rather than being created in the start method
- stopExecutorServices();
+ stopExecutorService();
+
 started = false;
 }
 
@@ -142,6 +170,7 @@
 * shutdown hook
 */
 public void reset() {
+
 removeShutdownHook();
 getLifeCycleManager().reset();
 propertyMap.clear();
@@ -190,11 +219,7 @@
 return scheduledExecutorService;
 }
 
- private synchronized void stopExecutorServices() {
- if (executorService != null) {
- ExecutorServiceUtil.shutdown(executorService);
- executorService = null;
- }
+ private synchronized void stopExecutorService() {
 if (scheduledExecutorService != null) {
 ExecutorServiceUtil.shutdown(scheduledExecutorService);
 scheduledExecutorService = null;
@@ -250,7 +275,5 @@
 public List<ScheduledFuture<?>> getScheduledFutures() {
 return new ArrayList<ScheduledFuture<?>>(scheduledFutures);
 }
- 
- 
 
 }

_service:tar_scm:v_1.1.7.tar.gz/logback-core/src/main/java/ch/qos/logback/core/CoreConstants.java -> _service:tar_scm:v_1.2.8.tar.gz/logback-core/src/main/java/ch/qos/logback/core/CoreConstants.java Changed

@@ -16,7 +16,8 @@
 
 public class CoreConstants {
 
-    final public static String STATUS_LISTENER_CLASS = "logback.statusListenerClass";
+    final public static String DISABLE_SERVLET_CONTAINER_INITIALIZER_KEY = "logbackDisableServletContainerInitializer";
+    final public static String STATUS_LISTENER_CLASS_KEY = "logback.statusListenerClass";
     final public static String SYSOUT = "SYSOUT";
 
     /**
@@ -30,7 +31,7 @@
     // This causes tests failures in SocketReceiverTest.testDispatchEventForEnabledLevel and
     // ServerSocketReceiverFunctionalTest.testLogEventFromClient.
     // We thus set a pool size > 0 for tests to pass.
-    public static final int SCHEDULED_EXECUTOR_POOL_SIZE = 2;
+    public static final int SCHEDULED_EXECUTOR_POOL_SIZE = 8;
 
     
     /**
@@ -46,6 +47,7 @@
     public static final int LINE_SEPARATOR_LEN = LINE_SEPARATOR.length();
 
     public static final String CODES_URL = "http://logback.qos.ch/codes.html";
+    public static final String MANUAL_URL_PREFIX = "http://logback.qos.ch/manual/";   
     public static final String MORE_INFO_PREFIX = "For more information, please visit ";
 
     /**
@@ -77,7 +79,7 @@
      * 
      * The collision map consists of enties of the type (appender name, File option) 
      */
-    public static final String FA_FILENAME_COLLISION_MAP = "RFA_FILENAME_COLLISION_MAP";
+    public static final String FA_FILENAME_COLLISION_MAP = "FA_FILENAME_COLLISION_MAP";
 
     /**
      * Key used to locate a collision map for RollingFileAppender instances in context's object map.
@@ -148,8 +150,8 @@
     public static final char TAB = '\t';
     public static final char DOLLAR = '$';
 
-    public static final String SEE_FNP_NOT_SET = "See also http://logback.qos.ch/codes.html#tbr_fnp_not_set";
-    public static final String SEE_MISSING_INTEGER_TOKEN = "See also http://logback.qos.ch/codes.html#sat_missing_integer_token";
+    public static final String SEE_FNP_NOT_SET = "See also "+CODES_URL+"#tbr_fnp_not_set";
+    public static final String SEE_MISSING_INTEGER_TOKEN = "See also "+CODES_URL+"#sat_missing_integer_token";
 
     public static final String CONFIGURATION_WATCH_LIST = "CONFIGURATION_WATCH_LIST";
     public static final String CONFIGURATION_WATCH_LIST_RESET_X = "CONFIGURATION_WATCH_LIST_RESET";
@@ -166,6 +168,8 @@
      */
     public static final String HOSTNAME_KEY = "HOSTNAME";
 
+    public static final String UNKNOWN_LOCALHOST = "UNKNOWN_LOCALHOST";
+
     /**
      * The key under which the current context name is registered in the logger
      * context.
@@ -194,9 +198,10 @@
 
     public static final String LEFT_ACCOLADE = new String(new char { CURLY_LEFT });
     public static final String RIGHT_ACCOLADE = new String(new char { CURLY_RIGHT });
-    public static final long UNBOUND_TOTAL_SIZE = 0;
+    public static final long UNBOUNDED_TOTAL_SIZE_CAP = 0;
     public static final int UNBOUND_HISTORY = 0;
     
     public static final String RECONFIGURE_ON_CHANGE_TASK = "RECONFIGURE_ON_CHANGE_TASK";
+    public static final String SIZE_AND_TIME_BASED_FNATP_IS_DEPRECATED = "SizeAndTimeBasedFNATP is deprecated. Use SizeAndTimeBasedRollingPolicy instead";
 
 }

_service:tar_scm:v_1.1.7.tar.gz/logback-core/src/main/java/ch/qos/logback/core/FileAppender.java -> _service:tar_scm:v_1.2.8.tar.gz/logback-core/src/main/java/ch/qos/logback/core/FileAppender.java Changed

@@ -24,6 +24,8 @@
 import java.util.Map.Entry;
 
 import ch.qos.logback.core.recovery.ResilientFileOutputStream;
+import ch.qos.logback.core.util.ContextUtil;
+import ch.qos.logback.core.util.FileSize;
 import ch.qos.logback.core.util.FileUtil;
 
 /**
@@ -36,6 +38,8 @@
 */
 public class FileAppender<E> extends OutputStreamAppender<E> {
 
+ public static final long DEFAULT_BUFFER_SIZE = 8192;
+
 static protected String COLLISION_WITH_EARLIER_APPENDER_URL = CODES_URL + "#earlier_fa_collision";
 
 /**
@@ -52,6 +56,8 @@
 
 private boolean prudent = false;
 
+ private FileSize bufferSize = new FileSize(DEFAULT_BUFFER_SIZE);
+
 /**
 * The File property takes a string value which should be the name of
 * the file to append to.
@@ -104,12 +110,6 @@
 if (getFile() != null) {
 addInfo("File property is set to " + fileName + "");
 
- if (checkForFileCollisionInPreviousFileAppenders()) {
- addError("Collisions detected with FileAppender/RollingAppender instances defined earlier. Aborting.");
- addError(MORE_INFO_PREFIX + COLLISION_WITH_EARLIER_APPENDER_URL);
- errors++;
- }
-
 if (prudent) {
 if (!isAppend()) {
 setAppend(true);
@@ -117,11 +117,18 @@
 }
 }
 
- try {
- openFile(getFile());
- } catch (java.io.IOException e) {
+ if (checkForFileCollisionInPreviousFileAppenders()) {
+ addError("Collisions detected with FileAppender/RollingAppender instances defined earlier. Aborting.");
+ addError(MORE_INFO_PREFIX + COLLISION_WITH_EARLIER_APPENDER_URL);
 errors++;
- addError("openFile(" + fileName + "," + append + ") call failed.", e);
+ } else {
+ // file should be opened only if collision free
+ try {
+ openFile(getFile());
+ } catch (java.io.IOException e) {
+ errors++;
+ addError("openFile(" + fileName + "," + append + ") call failed.", e);
+ }
 }
 } else {
 errors++;
@@ -132,13 +139,24 @@
 }
 }
 
+ @Override
+ public void stop() {
+ super.stop();
+
+ Map<String, String> map = ContextUtil.getFilenameCollisionMap(context);
+ if (map == null || getName() == null)
+ return;
+
+ map.remove(getName());
+ }
+
 protected boolean checkForFileCollisionInPreviousFileAppenders() {
 boolean collisionsDetected = false;
 if (fileName == null) {
 return false;
 }
 @SuppressWarnings("unchecked")
- Map<String, String> map = (Map<String, String>) context.getObject(CoreConstants.RFA_FILENAME_PATTERN_COLLISION_MAP);
+ Map<String, String> map = (Map<String, String>) context.getObject(CoreConstants.FA_FILENAME_COLLISION_MAP);
 if (map == null) {
 return collisionsDetected;
 }
@@ -183,7 +201,7 @@
 addError("Failed to create parent directories for " + file.getAbsolutePath() + "");
 }
 
- ResilientFileOutputStream resilientFos = new ResilientFileOutputStream(file, append);
+ ResilientFileOutputStream resilientFos = new ResilientFileOutputStream(file, append, bufferSize.getSize());
 resilientFos.setContext(context);
 setOutputStream(resilientFos);
 } finally {
@@ -213,6 +231,11 @@
 public void setAppend(boolean append) {
 this.append = append;
 }
+ 
+ public void setBufferSize(FileSize bufferSize) {
+ addInfo("Setting bufferSize to "+bufferSize.toString()+"");
+ this.bufferSize = bufferSize;
+ }
 
 private void safeWrite(E event) throws IOException {
 ResilientFileOutputStream resilientFOS = (ResilientFileOutputStream) getOutputStream();

_service:tar_scm:v_1.1.7.tar.gz/logback-core/src/main/java/ch/qos/logback/core/OutputStreamAppender.java -> _service:tar_scm:v_1.2.8.tar.gz/logback-core/src/main/java/ch/qos/logback/core/OutputStreamAppender.java Changed

@@ -44,18 +44,20 @@
     /**
      * All synchronization in this class is done via the lock object.
      */
-    protected final ReentrantLock lock = new ReentrantLock(true);
+    protected final ReentrantLock lock = new ReentrantLock(false);
 
     /**
      * This is the {@link OutputStream outputStream} where output will be written.
      */
     private OutputStream outputStream;
 
+    boolean immediateFlush = true;
+
     /**
-     * The underlying output stream used by this appender.
-     * 
-     * @return
-     */
+    * The underlying output stream used by this appender.
+    * 
+    * @return
+    */
     public OutputStream getOutputStream() {
         return outputStream;
     }
@@ -133,21 +135,11 @@
         }
     }
 
-    void encoderInit() {
-        if (encoder != null && this.outputStream != null) {
-            try {
-                encoder.init(outputStream);
-            } catch (IOException ioe) {
-                this.started = false;
-                addStatus(new ErrorStatus("Failed to initialize encoder for appender named " + name + ".", this, ioe));
-            }
-        }
-    }
-
     void encoderClose() {
         if (encoder != null && this.outputStream != null) {
             try {
-                encoder.close();
+                byte footer = encoder.footerBytes();
+                writeBytes(footer);
             } catch (IOException ioe) {
                 this.started = false;
                 addStatus(new ErrorStatus("Failed to write footer for appender named " + name + ".", this, ioe));
@@ -170,7 +162,6 @@
         try {
             // close any previously opened output stream
             closeOutputStream();
-
             this.outputStream = outputStream;
             if (encoder == null) {
                 addWarn("Encoder has not been set. Cannot invoke its init method.");
@@ -183,8 +174,35 @@
         }
     }
 
+    void encoderInit() {
+        if (encoder != null && this.outputStream != null) {
+            try {
+                byte header = encoder.headerBytes();
+                writeBytes(header);
+            } catch (IOException ioe) {
+                this.started = false;
+                addStatus(new ErrorStatus("Failed to initialize encoder for appender named " + name + ".", this, ioe));
+            }
+        }
+    }
     protected void writeOut(E event) throws IOException {
-        this.encoder.doEncode(event);
+        byte byteArray = this.encoder.encode(event);
+        writeBytes(byteArray);
+    }
+
+    private void writeBytes(byte byteArray) throws IOException {
+        if(byteArray == null || byteArray.length == 0)
+            return;
+        
+        lock.lock();
+        try {
+            this.outputStream.write(byteArray);
+            if (immediateFlush) {
+                this.outputStream.flush();
+            }
+        } finally {
+            lock.unlock();
+        }
     }
 
     /**
@@ -207,12 +225,11 @@
             // the synchronization prevents the OutputStream from being closed while we
             // are writing. It also prevents multiple threads from entering the same
             // converter. Converters assume that they are in a synchronized block.
-            lock.lock();
-            try {
-                writeOut(event);
-            } finally {
-                lock.unlock();
-            }
+            // lock.lock();
+
+            byte byteArray = this.encoder.encode(event);
+            writeBytes(byteArray);
+
         } catch (IOException ioe) {
             // as soon as an exception occurs, move to non-started state
             // and add a single ErrorStatus to the SM.
@@ -229,4 +246,12 @@
         this.encoder = encoder;
     }
 
+    public boolean isImmediateFlush() {
+        return immediateFlush;
+    }
+
+    public void setImmediateFlush(boolean immediateFlush) {
+        this.immediateFlush = immediateFlush;
+    }
+
 }

_service:tar_scm:v_1.1.7.tar.gz/logback-core/src/main/java/ch/qos/logback/core/encoder/EchoEncoder.java -> _service:tar_scm:v_1.2.8.tar.gz/logback-core/src/main/java/ch/qos/logback/core/encoder/EchoEncoder.java Changed

@@ -13,9 +13,6 @@
 */
 package ch.qos.logback.core.encoder;
 
-import java.io.IOException;
-import java.io.OutputStream;
-
 import ch.qos.logback.core.CoreConstants;
 
 public class EchoEncoder<E> extends EncoderBase<E> {
@@ -23,25 +20,22 @@
 String fileHeader;
 String fileFooter;
 
- public void doEncode(E event) throws IOException {
+ public byte encode(E event) {
 String val = event + CoreConstants.LINE_SEPARATOR;
- outputStream.write(val.getBytes());
- // necessary if ResilientFileOutputStream is buffered
- outputStream.flush();
+ return val.getBytes();
 }
 
- public void close() throws IOException {
+ public byte footerBytes() {
 if (fileFooter == null) {
- return;
+ return null;
 }
- outputStream.write(fileFooter.getBytes());
+ return fileFooter.getBytes();
 }
 
- public void init(OutputStream os) throws IOException {
- super.init(os);
+ public byte headerBytes() {
 if (fileHeader == null) {
- return;
+ return null;
 }
- outputStream.write(fileHeader.getBytes());
+ return fileHeader.getBytes();
 }
 }

_service:tar_scm:v_1.1.7.tar.gz/logback-core/src/main/java/ch/qos/logback/core/encoder/Encoder.java -> _service:tar_scm:v_1.2.8.tar.gz/logback-core/src/main/java/ch/qos/logback/core/encoder/Encoder.java Changed

@@ -13,21 +13,14 @@
 */
 package ch.qos.logback.core.encoder;
 
-import java.io.IOException;
-import java.io.OutputStream;
-
 import ch.qos.logback.core.spi.ContextAware;
 import ch.qos.logback.core.spi.LifeCycle;
 
 /**
 * Encoders are responsible for transform an incoming event into a byte array
- * *and* writing out the byte array onto the appropriate {@link OutputStream}.
- * Thus, encoders have total control of what and when gets written to the
- * {@link OutputStream} maintained by the owning appender.
- * 
 * 
 * @author Ceki G&uuml;lc&uuml;
- * @author Joen Huxhorn
+ * @author Joern Huxhorn
 * @author Maarten Bosteels
 * 
 * @param <E>
@@ -37,32 +30,25 @@
 public interface Encoder<E> extends ContextAware, LifeCycle {
 
 /**
- * This method is called when the owning appender starts or whenever output
- * needs to be directed to a new OutputStream, for instance as a result of a
- * rollover. Implementing encoders should at the very least remember the
- * OutputStream passed as argument and use it in future operations.
+ * Get header bytes. This method is typically called upon opening of 
+ * an output stream.
 * 
- * @param os
- * @throws IOException
+ * @return header bytes. Null values are allowed.
 */
- void init(OutputStream os) throws IOException;
+ byte headerBytes();
 
 /**
- * Encode and write an event to the appropriate {@link OutputStream}.
- * Implementations are free to differ writing out of the encoded event and
- * instead write in batches.
- * 
+ * Encode an event as bytes.
+ * 
 * @param event
- * @throws IOException
 */
- void doEncode(E event) throws IOException;
-
+ byte encode(E event);
+ 
 /**
- * This method is called prior to the closing of the underling
- * {@link OutputStream}. Implementations MUST not close the underlying
- * {@link OutputStream} which is the responsibility of the owning appender.
+ * Get footer bytes. This method is typically called prior to the closing 
+ * of the stream where events are written.
 * 
- * @throws IOException
+ * @return footer bytes. Null values are allowed.
 */
- void close() throws IOException;
+ byte footerBytes();
 }

_service:tar_scm:v_1.1.7.tar.gz/logback-core/src/main/java/ch/qos/logback/core/encoder/EncoderBase.java -> _service:tar_scm:v_1.2.8.tar.gz/logback-core/src/main/java/ch/qos/logback/core/encoder/EncoderBase.java Changed

_service:tar_scm:v_1.1.7.tar.gz/logback-core/src/main/java/ch/qos/logback/core/encoder/LayoutWrappingEncoder.java -> _service:tar_scm:v_1.2.8.tar.gz/logback-core/src/main/java/ch/qos/logback/core/encoder/LayoutWrappingEncoder.java Changed

@@ -13,13 +13,13 @@
 */
 package ch.qos.logback.core.encoder;
 
-import java.io.IOException;
-import java.io.OutputStream;
-import java.io.UnsupportedEncodingException;
 import java.nio.charset.Charset;
 
+import ch.qos.logback.core.Appender;
 import ch.qos.logback.core.CoreConstants;
 import ch.qos.logback.core.Layout;
+import ch.qos.logback.core.OutputStreamAppender;
+import ch.qos.logback.core.spi.ContextAware;
 
 public class LayoutWrappingEncoder<E> extends EncoderBase<E> {
 
@@ -34,22 +34,8 @@
 */
 private Charset charset;
 
- private boolean immediateFlush = true;
-
- /**
- * Sets the immediateFlush option. The default value for immediateFlush is 'true'. If set to true,
- * the doEncode() method will immediately flush the underlying OutputStream. Although immediate flushing
- * is safer, it also significantly degrades logging throughput.
- *
- * @since 1.0.3
- */
- public void setImmediateFlush(boolean immediateFlush) {
- this.immediateFlush = immediateFlush;
- }
-
- public boolean isImmediateFlush() {
- return immediateFlush;
- }
+ ContextAware parent;
+ Boolean immediateFlush = null;
 
 public Layout<E> getLayout() {
 return layout;
@@ -77,60 +63,58 @@
 this.charset = charset;
 }
 
- public void init(OutputStream os) throws IOException {
- super.init(os);
- writeHeader();
+ /**
+ * Sets the immediateFlush option. The default value for immediateFlush is 'true'. If set to true,
+ * the doEncode() method will immediately flush the underlying OutputStream. Although immediate flushing
+ * is safer, it also significantly degrades logging throughput.
+ *
+ * @since 1.0.3
+ */
+ public void setImmediateFlush(boolean immediateFlush) {
+ addWarn("As of version 1.2.0 \"immediateFlush\" property should be set within the enclosing Appender.");
+ addWarn("Please move \"immediateFlush\" property into the enclosing appender.");
+ this.immediateFlush = immediateFlush;
 }
 
- void writeHeader() throws IOException {
- if (layout != null && (outputStream != null)) {
- StringBuilder sb = new StringBuilder();
- appendIfNotNull(sb, layout.getFileHeader());
- appendIfNotNull(sb, layout.getPresentationHeader());
- if (sb.length() > 0) {
- sb.append(CoreConstants.LINE_SEPARATOR);
- // If at least one of file header or presentation header were not
- // null, then append a line separator.
- // This should be useful in most cases and should not hurt.
- outputStream.write(convertToBytes(sb.toString()));
- outputStream.flush();
- }
+ @Override
+ public byte headerBytes() {
+ if (layout == null)
+ return null;
+
+ StringBuilder sb = new StringBuilder();
+ appendIfNotNull(sb, layout.getFileHeader());
+ appendIfNotNull(sb, layout.getPresentationHeader());
+ if (sb.length() > 0) {
+ // If at least one of file header or presentation header were not
+ // null, then append a line separator.
+ // This should be useful in most cases and should not hurt.
+ sb.append(CoreConstants.LINE_SEPARATOR);
 }
+ return convertToBytes(sb.toString());
 }
 
- public void close() throws IOException {
- writeFooter();
- }
+ @Override
+ public byte footerBytes() {
+ if (layout == null)
+ return null;
 
- void writeFooter() throws IOException {
- if (layout != null && outputStream != null) {
- StringBuilder sb = new StringBuilder();
- appendIfNotNull(sb, layout.getPresentationFooter());
- appendIfNotNull(sb, layout.getFileFooter());
- if (sb.length() > 0) {
- outputStream.write(convertToBytes(sb.toString()));
- outputStream.flush();
- }
- }
+ StringBuilder sb = new StringBuilder();
+ appendIfNotNull(sb, layout.getPresentationFooter());
+ appendIfNotNull(sb, layout.getFileFooter());
+ return convertToBytes(sb.toString());
 }
 
 private byte convertToBytes(String s) {
 if (charset == null) {
 return s.getBytes();
 } else {
- try {
- return s.getBytes(charset.name());
- } catch (UnsupportedEncodingException e) {
- throw new IllegalStateException("An existing charset cannot possibly be unsupported.");
- }
+ return s.getBytes(charset);
 }
 }
 
- public void doEncode(E event) throws IOException {
+ public byte encode(E event) {
 String txt = layout.doLayout(event);
- outputStream.write(convertToBytes(txt));
- if (immediateFlush)
- outputStream.flush();
+ return convertToBytes(txt);
 }
 
 public boolean isStarted() {
@@ -138,17 +122,21 @@
 }
 
 public void start() {
+ if (immediateFlush != null) {
+ if (parent instanceof OutputStreamAppender) {
+ addWarn("Setting the \"immediateFlush\" property of the enclosing appender to " + immediateFlush);
+ @SuppressWarnings("unchecked")
+ OutputStreamAppender<E> parentOutputStreamAppender = (OutputStreamAppender<E>) parent;
+ parentOutputStreamAppender.setImmediateFlush(immediateFlush);
+ } else {
+ addError("Could not set the \"immediateFlush\" property of the enclosing appender.");
+ }
+ }
 started = true;
 }
 
 public void stop() {
 started = false;
- if (outputStream != null) {
- try {
- outputStream.flush();
- } catch (IOException e) {
- }
- }
 }
 
 private void appendIfNotNull(StringBuilder sb, String s) {
@@ -157,4 +145,13 @@
 }
 }
 
+ /**
+ * This method allows RollingPolicy implementations to be aware of their
+ * containing appender.
+ * 
+ * @param parent
+ */
+ public void setParent(ContextAware parent) {
+ this.parent = parent;
+ }
 }

_service:tar_scm:v_1.1.7.tar.gz/logback-core/src/main/java/ch/qos/logback/core/hook/DelayingShutdownHook.java -> _service:tar_scm:v_1.2.8.tar.gz/logback-core/src/main/java/ch/qos/logback/core/hook/DelayingShutdownHook.java Changed

_service:tar_scm:v_1.1.7.tar.gz/logback-core/src/main/java/ch/qos/logback/core/joran/GenericConfigurator.java -> _service:tar_scm:v_1.2.8.tar.gz/logback-core/src/main/java/ch/qos/logback/core/joran/GenericConfigurator.java Changed

@@ -36,7 +36,7 @@
 
 public abstract class GenericConfigurator extends ContextAwareBase {
 
-    private final BeanDescriptionCache beanDescriptionCache = new BeanDescriptionCache();
+    private BeanDescriptionCache beanDescriptionCache;
 
     protected Interpreter interpreter;
 
@@ -50,7 +50,7 @@
             urlConnection.setUseCaches(false);
 
             in = urlConnection.getInputStream();
-            doConfigure(in);
+            doConfigure(in, url.toExternalForm());
         } catch (IOException ioe) {
             String errMsg = "Could not open URL " + url + ".";
             addError(errMsg, ioe);
@@ -75,9 +75,10 @@
     public final void doConfigure(File file) throws JoranException {
         FileInputStream fis = null;
         try {
-            informContextOfURLUsedForConfiguration(getContext(), file.toURI().toURL());
+            URL url = file.toURI().toURL();
+            informContextOfURLUsedForConfiguration(getContext(), url);
             fis = new FileInputStream(file);
-            doConfigure(fis);
+            doConfigure(fis, url.toExternalForm());
         } catch (IOException ioe) {
             String errMsg = "Could not open " + file.getPath() + ".";
             addError(errMsg, ioe);
@@ -103,7 +104,16 @@
         doConfigure(new InputSource(inputStream));
     }
 
+    public final void doConfigure(InputStream inputStream, String systemId) throws JoranException {
+        InputSource inputSource = new InputSource(inputStream);
+        inputSource.setSystemId(systemId);
+        doConfigure(inputSource);
+    }
+
     protected BeanDescriptionCache getBeanDescriptionCache() {
+        if (beanDescriptionCache == null) {
+            beanDescriptionCache = new BeanDescriptionCache(getContext());
+        }
         return beanDescriptionCache;
     }

_service:tar_scm:v_1.1.7.tar.gz/logback-core/src/main/java/ch/qos/logback/core/joran/JoranConfiguratorBase.java -> _service:tar_scm:v_1.2.8.tar.gz/logback-core/src/main/java/ch/qos/logback/core/joran/JoranConfiguratorBase.java Changed

@@ -14,7 +14,6 @@
 package ch.qos.logback.core.joran;
 
 import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
 
 import ch.qos.logback.core.Appender;
@@ -50,11 +49,7 @@
 *
 * @author Ceki G&uuml;lc&uuml;
 */
-abstract public class JoranConfiguratorBase extends GenericConfigurator {
-
- public List getErrorList() {
- return null;
- }
+abstract public class JoranConfiguratorBase<E> extends GenericConfigurator {
 
 @Override
 protected void addInstanceRules(RuleStore rs) {
@@ -77,8 +72,8 @@
 
 rs.addRule(new ElementSelector("configuration/statusListener"), new StatusListenerAction());
 
- rs.addRule(new ElementSelector("configuration/appender"), new AppenderAction());
- rs.addRule(new ElementSelector("configuration/appender/appender-ref"), new AppenderRefAction());
+ rs.addRule(new ElementSelector("configuration/appender"), new AppenderAction<E>());
+ rs.addRule(new ElementSelector("configuration/appender/appender-ref"), new AppenderRefAction<E>());
 rs.addRule(new ElementSelector("configuration/newRule"), new NewRuleAction());
 rs.addRule(new ElementSelector("*/param"), new ParamAction(getBeanDescriptionCache()));
 }
@@ -100,7 +95,7 @@
 super.buildInterpreter();
 Map<String, Object> omap = interpreter.getInterpretationContext().getObjectMap();
 omap.put(ActionConst.APPENDER_BAG, new HashMap<String, Appender<?>>());
- omap.put(ActionConst.FILTER_CHAIN_BAG, new HashMap());
+ //omap.put(ActionConst.FILTER_CHAIN_BAG, new HashMap());
 }
 
 public InterpretationContext getInterpretationContext() {

_service:tar_scm:v_1.1.7.tar.gz/logback-core/src/main/java/ch/qos/logback/core/joran/action/ActionConst.java -> _service:tar_scm:v_1.2.8.tar.gz/logback-core/src/main/java/ch/qos/logback/core/joran/action/ActionConst.java Changed

_service:tar_scm:v_1.1.7.tar.gz/logback-core/src/main/java/ch/qos/logback/core/joran/action/NestedBasicPropertyIA.java -> _service:tar_scm:v_1.2.8.tar.gz/logback-core/src/main/java/ch/qos/logback/core/joran/action/NestedBasicPropertyIA.java Changed

_service:tar_scm:v_1.1.7.tar.gz/logback-core/src/main/java/ch/qos/logback/core/joran/action/ParamAction.java -> _service:tar_scm:v_1.2.8.tar.gz/logback-core/src/main/java/ch/qos/logback/core/joran/action/ParamAction.java Changed

_service:tar_scm:v_1.1.7.tar.gz/logback-core/src/main/java/ch/qos/logback/core/joran/event/SaxEventRecorder.java -> _service:tar_scm:v_1.2.8.tar.gz/logback-core/src/main/java/ch/qos/logback/core/joran/event/SaxEventRecorder.java Changed

_service:tar_scm:v_1.1.7.tar.gz/logback-core/src/main/java/ch/qos/logback/core/joran/spi/ConfigurationWatchList.java -> _service:tar_scm:v_1.2.8.tar.gz/logback-core/src/main/java/ch/qos/logback/core/joran/spi/ConfigurationWatchList.java Changed

_service:tar_scm:v_1.1.7.tar.gz/logback-core/src/main/java/ch/qos/logback/core/joran/spi/DefaultNestedComponentRegistry.java -> _service:tar_scm:v_1.2.8.tar.gz/logback-core/src/main/java/ch/qos/logback/core/joran/spi/DefaultNestedComponentRegistry.java Changed

_service:tar_scm:v_1.1.7.tar.gz/logback-core/src/main/java/ch/qos/logback/core/joran/spi/Interpreter.java -> _service:tar_scm:v_1.2.8.tar.gz/logback-core/src/main/java/ch/qos/logback/core/joran/spi/Interpreter.java Changed

_service:tar_scm:v_1.1.7.tar.gz/logback-core/src/main/java/ch/qos/logback/core/joran/util/ConfigurationWatchListUtil.java -> _service:tar_scm:v_1.2.8.tar.gz/logback-core/src/main/java/ch/qos/logback/core/joran/util/ConfigurationWatchListUtil.java Changed

_service:tar_scm:v_1.1.7.tar.gz/logback-core/src/main/java/ch/qos/logback/core/joran/util/PropertySetter.java -> _service:tar_scm:v_1.2.8.tar.gz/logback-core/src/main/java/ch/qos/logback/core/joran/util/PropertySetter.java Changed

@@ -62,13 +62,12 @@
 * @param obj
 * the object for which to set properties
 */
- public PropertySetter(BeanDescriptionCache beanDescriptionCache,Object obj) {
+ public PropertySetter(BeanDescriptionCache beanDescriptionCache, Object obj) {
 this.obj = obj;
 this.objClass = obj.getClass();
- 	this.beanDescription = beanDescriptionCache.getBeanDescription(objClass);
+ this.beanDescription = beanDescriptionCache.getBeanDescription(objClass);
 }
 
-
 /**
 * Set a property on this PropertySetter's Object. If successful, this method
 * will invoke a setter method on the underlying Object. The setter is the one
@@ -103,8 +102,7 @@
 }
 }
 
-
-	/**
+ /**
 * Set the named property given a {@link PropertyDescriptor}.
 *
 * @param prop
@@ -116,7 +114,7 @@
 * The value of the property.
 */
 private void setProperty(Method setter, String name, String value) throws PropertySetterException {
- 	Class<?> paramTypes = setter.getParameterTypes();
+ Class<?> paramTypes = setter.getParameterTypes();
 
 Object arg;
 
@@ -141,7 +139,6 @@
 
 Method addMethod = findAdderMethod(cName);
 
- // if the
 if (addMethod != null) {
 AggregationType type = computeRawAggregationType(addMethod);
 switch (type) {
@@ -149,8 +146,12 @@
 return AggregationType.NOT_FOUND;
 case AS_BASIC_PROPERTY:
 return AggregationType.AS_BASIC_PROPERTY_COLLECTION;
+
 case AS_COMPLEX_PROPERTY:
 return AggregationType.AS_COMPLEX_PROPERTY_COLLECTION;
+ case AS_BASIC_PROPERTY_COLLECTION:
+ case AS_COMPLEX_PROPERTY_COLLECTION:
+ addError("Unexpected AggregationType " + type);
 }
 }
 
@@ -164,12 +165,12 @@
 }
 
 private Method findAdderMethod(String name) {
- 	String propertyName = BeanUtil.INSTANCE.toLowerCamelCase(name);
- 	return beanDescription.getAdder(propertyName);
+ String propertyName = BeanUtil.toLowerCamelCase(name);
+ return beanDescription.getAdder(propertyName);
 }
 
 private Method findSetterMethod(String name) {
- String propertyName = BeanUtil.INSTANCE.toLowerCamelCase(name);
+ String propertyName = BeanUtil.toLowerCamelCase(name);
 return beanDescription.getSetter(propertyName);
 }
 
@@ -283,7 +284,7 @@
 }
 
 public void setComplexProperty(String name, Object complexProperty) {
- Method setter =findSetterMethod(name);
+ Method setter = findSetterMethod(name);
 
 if (setter == null) {
 addWarn("Not setter method for property " + name + " in " + obj.getClass().getName());
@@ -327,7 +328,6 @@
 return name.substring(0, 1).toUpperCase() + name.substring(1);
 }
 
-
 public Object getObj() {
 return obj;
 }

_service:tar_scm:v_1.1.7.tar.gz/logback-core/src/main/java/ch/qos/logback/core/joran/util/StringToObjectConverter.java -> _service:tar_scm:v_1.2.8.tar.gz/logback-core/src/main/java/ch/qos/logback/core/joran/util/StringToObjectConverter.java Changed

@@ -72,7 +72,7 @@
 return Boolean.FALSE;
 }
 } else if (type.isEnum()) {
- return convertToEnum(ca, v, (Class<? extends Enum>) type);
+ return convertToEnum(ca, v, (Class<? extends Enum<?>>) type);
 } else if (StringToObjectConverter.followsTheValueOfConvention(type)) {
 return convertByValueOfMethod(ca, type, v);
 } else if (isOfTypeCharset(type)) {
@@ -95,19 +95,24 @@
 }
 }
 
- static private boolean followsTheValueOfConvention(Class<?> parameterClass) {
+ // returned value may be null and in most cases it is null.
+ public static Method getValueOfMethod(Class<?> type) {
 try {
- Method valueOfMethod = parameterClass.getMethod(CoreConstants.VALUE_OF, STING_CLASS_PARAMETER);
- int mod = valueOfMethod.getModifiers();
- if (Modifier.isStatic(mod)) {
- return true;
- }
- } catch (SecurityException e) {
- // nop
+ return type.getMethod(CoreConstants.VALUE_OF, STING_CLASS_PARAMETER);
 } catch (NoSuchMethodException e) {
- // nop
+ return null;
+ } catch (SecurityException e) {
+ return null;
 }
- return false;
+ }
+
+ static private boolean followsTheValueOfConvention(Class<?> parameterClass) {
+ Method valueOfMethod = getValueOfMethod(parameterClass);
+ if (valueOfMethod == null)
+ return false;
+
+ int mod = valueOfMethod.getModifiers();
+ return Modifier.isStatic(mod);
 }
 
 private static Object convertByValueOfMethod(ContextAware ca, Class<?> type, String val) {
@@ -120,7 +125,7 @@
 }
 }
 
- @SuppressWarnings("unchecked")
+ @SuppressWarnings({ "unchecked", "rawtypes" })
 private static Object convertToEnum(ContextAware ca, String val, Class<? extends Enum> enumType) {
 return Enum.valueOf(enumType, val);
 }

_service:tar_scm:v_1.1.7.tar.gz/logback-core/src/main/java/ch/qos/logback/core/joran/util/beans/BeanDescriptionCache.java -> _service:tar_scm:v_1.2.8.tar.gz/logback-core/src/main/java/ch/qos/logback/core/joran/util/beans/BeanDescriptionCache.java Changed

@@ -3,6 +3,9 @@
 import java.util.HashMap;
 import java.util.Map;
 
+import ch.qos.logback.core.Context;
+import ch.qos.logback.core.spi.ContextAwareBase;
+
 /**
 *
 * Cache for {@link BeanDescription} instances. All the cache users which use
@@ -14,9 +17,21 @@
 * @author urechm
 *
 */
-public class BeanDescriptionCache {
+public class BeanDescriptionCache extends ContextAwareBase {
 
 private Map<Class<?>, BeanDescription> classToBeanDescription = new HashMap<Class<?>, BeanDescription>();
+ private BeanDescriptionFactory beanDescriptionFactory;
+
+ public BeanDescriptionCache(Context context) {
+ setContext(context);
+ }
+
+ private BeanDescriptionFactory getBeanDescriptionFactory() {
+ if (beanDescriptionFactory == null) {
+ beanDescriptionFactory = new BeanDescriptionFactory(getContext());
+ }
+ return beanDescriptionFactory;
+ }
 
 /**
 * Returned bean descriptions are hold in a cache. If the cache does not
@@ -29,7 +44,7 @@
 */
 public BeanDescription getBeanDescription(Class<?> clazz) {
 if (!classToBeanDescription.containsKey(clazz)) {
- BeanDescription beanDescription = BeanDescriptionFactory.INSTANCE.create(clazz);
+ BeanDescription beanDescription = getBeanDescriptionFactory().create(clazz);
 classToBeanDescription.put(clazz, beanDescription);
 }
 return classToBeanDescription.get(clazz);

_service:tar_scm:v_1.1.7.tar.gz/logback-core/src/main/java/ch/qos/logback/core/joran/util/beans/BeanDescriptionFactory.java -> _service:tar_scm:v_1.2.8.tar.gz/logback-core/src/main/java/ch/qos/logback/core/joran/util/beans/BeanDescriptionFactory.java Changed

@@ -4,6 +4,9 @@
 import java.util.HashMap;
 import java.util.Map;
 
+import ch.qos.logback.core.Context;
+import ch.qos.logback.core.spi.ContextAwareBase;
+
 /**
 * Encapsulates creation of {@link BeanDescription} instances.
 * This factory is kind of a lightweight Introspector as described in the Java Beans API specification.
@@ -14,51 +17,53 @@
 *
 * @author urechm
 */
-public class BeanDescriptionFactory {
-
-	public static final BeanDescriptionFactory INSTANCE=new BeanDescriptionFactory();
-
-	private BeanUtil beanUtil=BeanUtil.INSTANCE;
-
-	/**
-	 *
-	 * @param clazz to create a {@link BeanDescription} for.
-	 * @return a {@link BeanDescription} for the given class.
-	 */
-	public BeanDescription create(Class<?> clazz){
-		Map<String, Method> propertyNameToGetter=new HashMap<String, Method>();
-		Map<String, Method> propertyNameToSetter=new HashMap<String, Method>();
-		Map<String, Method> propertyNameToAdder=new HashMap<String, Method>();
-		Method methods = clazz.getMethods();
-		for (Method method : methods) {
-			if(beanUtil.isGetter(method)){
-				String propertyName=beanUtil.getPropertyName(method);
-				Method oldGetter = propertyNameToGetter.put(propertyName, method);
-				if(oldGetter!=null){
-					if(oldGetter.getName().startsWith(BeanUtil.PREFIX_GETTER_IS)){
-						propertyNameToGetter.put(propertyName, oldGetter);
-					}
-					String message=String.format("Warning: Class '%s' contains multiple getters for the same property '%s'.", clazz.getCanonicalName(),propertyName);
-					System.err.println(message);
-				}
-			}else if(beanUtil.isSetter(method)){
-				String propertyName=beanUtil.getPropertyName(method);
-				Method oldSetter = propertyNameToSetter.put(propertyName, method);
-				if(oldSetter!=null){
-					String message=String.format("Warning: Class '%s' contains multiple setters for the same property '%s'.", clazz.getCanonicalName(),propertyName);
-					System.err.println(message);
-				}
-			}else if(beanUtil.isAdder(method)){
-				String propertyName=beanUtil.getPropertyName(method);
-				Method oldAdder = propertyNameToAdder.put(propertyName, method);
-				if(oldAdder!=null){
-					String message=String.format("Warning: Class '%s' contains multiple adders for the same property '%s'.", clazz.getCanonicalName(),propertyName);
-					System.err.println(message);
-				}
-			}
-		}
-		return new BeanDescription(clazz,propertyNameToGetter,propertyNameToSetter,propertyNameToAdder);
-	}
+public class BeanDescriptionFactory extends ContextAwareBase {
 
+ BeanDescriptionFactory(Context context) {
+ setContext(context);
+ }
 
+ /**
+ *
+ * @param clazz to create a {@link BeanDescription} for.
+ * @return a {@link BeanDescription} for the given class.
+ */
+ public BeanDescription create(Class<?> clazz) {
+ Map<String, Method> propertyNameToGetter = new HashMap<String, Method>();
+ Map<String, Method> propertyNameToSetter = new HashMap<String, Method>();
+ Map<String, Method> propertyNameToAdder = new HashMap<String, Method>();
+ Method methods = clazz.getMethods();
+ for (Method method : methods) {
+ if(method.isBridge()) {
+ // we can safely ignore bridge methods
+ continue;
+ }
+ if (BeanUtil.isGetter(method)) {
+ String propertyName = BeanUtil.getPropertyName(method);
+ Method oldGetter = propertyNameToGetter.put(propertyName, method);
+ if (oldGetter != null) {
+ if (oldGetter.getName().startsWith(BeanUtil.PREFIX_GETTER_IS)) {
+ propertyNameToGetter.put(propertyName, oldGetter);
+ }
+ String message = String.format("Class '%s' contains multiple getters for the same property '%s'.", clazz.getCanonicalName(), propertyName);
+ addWarn(message);
+ }
+ } else if (BeanUtil.isSetter(method)) {
+ String propertyName = BeanUtil.getPropertyName(method);
+ Method oldSetter = propertyNameToSetter.put(propertyName, method);
+ if (oldSetter != null) {
+ String message = String.format("Class '%s' contains multiple setters for the same property '%s'.", clazz.getCanonicalName(), propertyName);
+ addWarn(message);
+ }
+ } else if (BeanUtil.isAdder(method)) {
+ String propertyName = BeanUtil.getPropertyName(method);
+ Method oldAdder = propertyNameToAdder.put(propertyName, method);
+ if (oldAdder != null) {
+ String message = String.format("Class '%s' contains multiple adders for the same property '%s'.", clazz.getCanonicalName(), propertyName);
+ addWarn(message);
+ }
+ }
+ }
+ return new BeanDescription(clazz, propertyNameToGetter, propertyNameToSetter, propertyNameToAdder);
+ }
 }

_service:tar_scm:v_1.1.7.tar.gz/logback-core/src/main/java/ch/qos/logback/core/joran/util/beans/BeanUtil.java -> _service:tar_scm:v_1.2.8.tar.gz/logback-core/src/main/java/ch/qos/logback/core/joran/util/beans/BeanUtil.java Changed

@@ -8,130 +8,129 @@
 */
 public class BeanUtil {
 
-	public static final BeanUtil INSTANCE=new BeanUtil();
+ //public static final BeanUtil SINGLETON = new BeanUtil();
 
-	public static final String PREFIX_GETTER_IS="is";
-	public static final String PREFIX_GETTER_GET="get";
-	public static final String PREFIX_SETTER="set";
-	public static final String PREFIX_ADDER="add";
+ public static final String PREFIX_GETTER_IS = "is";
+ public static final String PREFIX_GETTER_GET = "get";
+ public static final String PREFIX_SETTER = "set";
+ public static final String PREFIX_ADDER = "add";
 
-	/**
-	 *
-	 * @param method to check if it is an 'adder' method.
-	 * @return true if the given method is an 'adder' method.
-	 */
-	public boolean isAdder(Method method) {
-		int parameterCount = getParameterCount(method);
-		if(parameterCount!=1){
-			return false;
-		}
-		Class<?> returnType = method.getReturnType();
-		if(returnType!=void.class){
-			return false;
-		}
-		String methodName = method.getName();
-		return methodName.startsWith(PREFIX_ADDER);
-	}
+ /**
+ *
+ * @param method to check if it is an 'adder' method.
+ * @return true if the given method is an 'adder' method.
+ */
+ static public boolean isAdder(Method method) {
+ int parameterCount = getParameterCount(method);
+ if (parameterCount != 1) {
+ return false;
+ }
+ Class<?> returnType = method.getReturnType();
+ if (returnType != void.class) {
+ return false;
+ }
+ String methodName = method.getName();
+ return methodName.startsWith(PREFIX_ADDER);
+ }
 
-	/**
-	 *
-	 * @param method to check if it is a standard java beans getter.
-	 * @return true if the given method is a standard java beans getter.
-	 */
-	public boolean isGetter(Method method) {
-		int parameterCount = getParameterCount(method);
-		if(parameterCount>0){
-			return false;
-		}
-		Class<?> returnType = method.getReturnType();
-		if(returnType==void.class){
-			return false;
-		}
-		String methodName = method.getName();
-		if(!methodName.startsWith(PREFIX_GETTER_GET)&&!methodName.startsWith(PREFIX_GETTER_IS)){
-			return false;
-		}
-		if(methodName.startsWith(PREFIX_GETTER_IS)){
-			if(!returnType.equals(boolean.class)&&!returnType.equals(Boolean.class)){
-				return false;
-			}
-		}
-		return true;
-	}
+ /**
+ *
+ * @param method to check if it is a standard java beans getter.
+ * @return true if the given method is a standard java beans getter.
+ */
+ static public boolean isGetter(Method method) {
+ int parameterCount = getParameterCount(method);
+ if (parameterCount > 0) {
+ return false;
+ }
+ Class<?> returnType = method.getReturnType();
+ if (returnType == void.class) {
+ return false;
+ }
+ String methodName = method.getName();
+ if (!methodName.startsWith(PREFIX_GETTER_GET) && !methodName.startsWith(PREFIX_GETTER_IS)) {
+ return false;
+ }
+ if (methodName.startsWith(PREFIX_GETTER_IS)) {
+ if (!returnType.equals(boolean.class) && !returnType.equals(Boolean.class)) {
+ return false;
+ }
+ }
+ return true;
+ }
 
-	private int getParameterCount(Method method) {
-		return method.getParameterTypes().length;
-	}
+ static private int getParameterCount(Method method) {
+ return method.getParameterTypes().length;
+ }
 
-	/**
-	 *
-	 * @param method to check if it is a standard java beans setter.
-	 * @return true if the given method is a standard java beans setter.
-	 */
-	public boolean isSetter(Method method){
-		int parameterCount = getParameterCount(method);
-		if(parameterCount!=1){
-			return false;
-		}
-		Class<?> returnType = method.getReturnType();
-		if(returnType!=void.class){
-			return false;
-		}
-		String methodName = method.getName();
-		if(!methodName.startsWith(PREFIX_SETTER)){
-			return false;
-		}
-		return true;
-	}
+ /**
+ *
+ * @param method to check if it is a standard java beans setter.
+ * @return true if the given method is a standard java beans setter.
+ */
+ static public boolean isSetter(Method method) {
+ int parameterCount = getParameterCount(method);
+ if (parameterCount != 1) {
+ return false;
+ }
+ Class<?> returnType = method.getReturnType();
+ if (returnType != void.class) {
+ return false;
+ }
+ String methodName = method.getName();
+ if (!methodName.startsWith(PREFIX_SETTER)) {
+ return false;
+ }
+ return true;
+ }
 
-	/**
-	 * @param method to get the associated property name for.
-	 * @return The property name of the associated property if the given method matches a standard java beans getter or setter.
-	 */
-	public String getPropertyName(Method method) {
-		String methodName = method.getName();
-		String rawPropertyName=getSubstringIfPrefixMatches(methodName,PREFIX_GETTER_GET);
-		if(rawPropertyName==null){
-			rawPropertyName=getSubstringIfPrefixMatches(methodName, PREFIX_SETTER);
-		}
-		if(rawPropertyName==null){
-			rawPropertyName=getSubstringIfPrefixMatches(methodName,PREFIX_GETTER_IS);
-		}
-		if(rawPropertyName==null){
-			rawPropertyName=getSubstringIfPrefixMatches(methodName,PREFIX_ADDER);
-		}
-		return toLowerCamelCase(rawPropertyName);
-	}
+ /**
+ * @param method to get the associated property name for.
+ * @return The property name of the associated property if the given method matches a standard java beans getter or setter.
+ */
+ static public String getPropertyName(Method method) {
+ String methodName = method.getName();
+ String rawPropertyName = getSubstringIfPrefixMatches(methodName, PREFIX_GETTER_GET);
+ if (rawPropertyName == null) {
+ rawPropertyName = getSubstringIfPrefixMatches(methodName, PREFIX_SETTER);
+ }
+ if (rawPropertyName == null) {
+ rawPropertyName = getSubstringIfPrefixMatches(methodName, PREFIX_GETTER_IS);
+ }
+ if (rawPropertyName == null) {
+ rawPropertyName = getSubstringIfPrefixMatches(methodName, PREFIX_ADDER);
+ }
+ return toLowerCamelCase(rawPropertyName);
+ }
 
-	/**
-	 * Converts the given String into lower camel case form.
-	 * @param string to decapitalize.
-	 * @return null if the given String is null.
-	 * Emtpy string if the given string is empty.
-	 * The given string if the first two consecutive letters are in upper case.
-	 * The given string with the first letter in lower case otherwise, which might be the given string.
-	 */
-	public String toLowerCamelCase(String string){
-		if(string==null){
-			return null;
-		}
-		if(string.isEmpty()){
-			return string;
-		}
- if (string.length() > 1 && Character.isUpperCase(string.charAt(1)) &&
- Character.isUpperCase(string.charAt(0))){
- 	return string;
+ /**
+ * Converts the given String into lower camel case form.
+ * @param string to decapitalize.
+ * @return null if the given String is null.
+ * Emtpy string if the given string is empty.
+ * The given string if the first two consecutive letters are in upper case.
+ * The given string with the first letter in lower case otherwise, which might be the given string.
+ */
+ static public String toLowerCamelCase(String string) {
+ if (string == null) {
+ return null;
+ }
+ if (string.isEmpty()) {
+ return string;
+ }
+ if (string.length() > 1 && Character.isUpperCase(string.charAt(1)) && Character.isUpperCase(string.charAt(0))) {
+ return string;
 }
 char chars = string.toCharArray();
 chars0 = Character.toLowerCase(chars0);
 return new String(chars);
-	}
+ }
 
-	private String getSubstringIfPrefixMatches(String wholeString,String prefix) {
-		if(wholeString.startsWith(prefix)){
-			return wholeString.substring(prefix.length());
-		}
-		return null;
-	}
+ static private String getSubstringIfPrefixMatches(String wholeString, String prefix) {
+ if (wholeString.startsWith(prefix)) {
+ return wholeString.substring(prefix.length());
+ }
+ return null;
+ }
 
 }

_service:tar_scm:v_1.1.7.tar.gz/logback-core/src/main/java/ch/qos/logback/core/net/AbstractSocketAppender.java -> _service:tar_scm:v_1.2.8.tar.gz/logback-core/src/main/java/ch/qos/logback/core/net/AbstractSocketAppender.java Changed

_service:tar_scm:v_1.2.8.tar.gz/logback-core/src/main/java/ch/qos/logback/core/net/HardenedObjectInputStream.java Added

@@ -0,0 +1,71 @@
+package ch.qos.logback.core.net;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InvalidClassException;
+import java.io.ObjectInputStream;
+import java.io.ObjectStreamClass;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * HardenedObjectInputStream restricts the set of classes that can be deserialized to a set of 
+ * explicitly whitelisted classes. This prevents certain type of attacks from being successful.
+ * 
+ * It is assumed that classes in the "java.lang" and "java.util" packages are 
+ * always authorized.
+ * 
+ * @author Ceki G&uuml;lc&uuml;
+ * @since 1.2.0
+ */
+public class HardenedObjectInputStream extends ObjectInputStream {
+
+ final List<String> whitelistedClassNames;
+ final static String JAVA_PACKAGES = new String { "java.lang", "java.util" };
+
+ public HardenedObjectInputStream(InputStream in, String whilelist) throws IOException {
+ super(in);
+
+ this.whitelistedClassNames = new ArrayList<String>();
+ if (whilelist != null) {
+ for (int i = 0; i < whilelist.length; i++) {
+ this.whitelistedClassNames.add(whilelisti);
+ }
+ }
+ }
+
+ public HardenedObjectInputStream(InputStream in, List<String> whitelist) throws IOException {
+ super(in);
+
+ this.whitelistedClassNames = new ArrayList<String>();
+ this.whitelistedClassNames.addAll(whitelist);
+ }
+
+ @Override
+ protected Class<?> resolveClass(ObjectStreamClass anObjectStreamClass) throws IOException, ClassNotFoundException {
+ 
+ String incomingClassName = anObjectStreamClass.getName();
+ 
+ if (!isWhitelisted(incomingClassName)) {
+ throw new InvalidClassException("Unauthorized deserialization attempt", anObjectStreamClass.getName());
+ }
+
+ return super.resolveClass(anObjectStreamClass);
+ }
+
+ private boolean isWhitelisted(String incomingClassName) {
+ for (int i = 0; i < JAVA_PACKAGES.length; i++) {
+ if (incomingClassName.startsWith(JAVA_PACKAGESi))
+ return true;
+ }
+ for (String whiteListed : whitelistedClassNames) {
+ if (incomingClassName.equals(whiteListed))
+ return true;
+ }
+ return false;
+ }
+
+ protected void addToWhitelist(List<String> additionalAuthorizedClasses) {
+ whitelistedClassNames.addAll(additionalAuthorizedClasses);
+ }
+}

_service:tar_scm:v_1.1.7.tar.gz/logback-core/src/main/java/ch/qos/logback/core/net/SMTPAppenderBase.java -> _service:tar_scm:v_1.2.8.tar.gz/logback-core/src/main/java/ch/qos/logback/core/net/SMTPAppenderBase.java Changed

_service:tar_scm:v_1.1.7.tar.gz/logback-core/src/main/java/ch/qos/logback/core/net/ssl/SSLConfigurable.java -> _service:tar_scm:v_1.2.8.tar.gz/logback-core/src/main/java/ch/qos/logback/core/net/ssl/SSLConfigurable.java Changed

_service:tar_scm:v_1.1.7.tar.gz/logback-core/src/main/java/ch/qos/logback/core/net/ssl/SSLConfigurableServerSocket.java -> _service:tar_scm:v_1.2.8.tar.gz/logback-core/src/main/java/ch/qos/logback/core/net/ssl/SSLConfigurableServerSocket.java Changed

_service:tar_scm:v_1.1.7.tar.gz/logback-core/src/main/java/ch/qos/logback/core/net/ssl/SSLConfigurableSocket.java -> _service:tar_scm:v_1.2.8.tar.gz/logback-core/src/main/java/ch/qos/logback/core/net/ssl/SSLConfigurableSocket.java Changed

_service:tar_scm:v_1.1.7.tar.gz/logback-core/src/main/java/ch/qos/logback/core/net/ssl/SSLParametersConfiguration.java -> _service:tar_scm:v_1.2.8.tar.gz/logback-core/src/main/java/ch/qos/logback/core/net/ssl/SSLParametersConfiguration.java Changed

@@ -29,6 +29,7 @@
  * A configuration of SSL parameters for an {@link SSLEngine}.
  *
  * @author Carl Harris
+ * @author Bruno Harbulot 
  */
 public class SSLParametersConfiguration extends ContextAwareBase {
 
@@ -40,7 +41,8 @@
     private Boolean wantClientAuth;
     private String enabledProtocols;
     private String enabledCipherSuites;
-
+    private Boolean hostnameVerification;
+    
     /**
      * Configures SSL parameters on an {@link SSLConfigurable}.
      * @param socket the subject configurable
@@ -54,8 +56,23 @@
         if (isWantClientAuth() != null) {
             socket.setWantClientAuth(isWantClientAuth());
         }
+        if(hostnameVerification != null) {
+        	addInfo("hostnameVerification="+hostnameVerification);
+            socket.setHostnameVerification(hostnameVerification);
+        }
     }
 
+ 
+    public boolean getHostnameVerification() {
+    	if(hostnameVerification == null)
+    		return false;
+    	return hostnameVerification;
+    }
+
+    public void setHostnameVerification(boolean hostnameVerification) {
+    	this.hostnameVerification = hostnameVerification;
+    }
+    
     /**
      * Gets the set of enabled protocols based on the configuration.
      * @param supportedProtocols protocols supported by the SSL engine

_service:tar_scm:v_1.1.7.tar.gz/logback-core/src/main/java/ch/qos/logback/core/pattern/PatternLayoutBase.java -> _service:tar_scm:v_1.2.8.tar.gz/logback-core/src/main/java/ch/qos/logback/core/pattern/PatternLayoutBase.java Changed

@@ -13,6 +13,9 @@
 */
 package ch.qos.logback.core.pattern;
 
+import java.util.HashMap;
+import java.util.Map;
+
 import ch.qos.logback.core.Context;
 import ch.qos.logback.core.CoreConstants;
 import ch.qos.logback.core.LayoutBase;
@@ -22,18 +25,16 @@
 import ch.qos.logback.core.status.ErrorStatus;
 import ch.qos.logback.core.status.StatusManager;
 
-import java.util.HashMap;
-import java.util.Map;
-
 abstract public class PatternLayoutBase<E> extends LayoutBase<E> {
 
+ static final int INTIAL_STRING_BUILDER_SIZE = 256;
 Converter<E> head;
 String pattern;
 protected PostCompileProcessor<E> postCompileProcessor;
-
+ 
 Map<String, String> instanceConverterMap = new HashMap<String, String>();
 protected boolean outputPatternAsHeader = false;
-
+ 
 /**
 * Concrete implementations of this class are responsible for elaborating the
 * mapping between pattern words and converters.
@@ -108,13 +109,13 @@
 }
 
 protected String writeLoopOnConverters(E event) {
- StringBuilder buf = new StringBuilder(128);
+ StringBuilder strBuilder = new StringBuilder(INTIAL_STRING_BUILDER_SIZE);
 Converter<E> c = head;
 while (c != null) {
- c.write(buf, event);
+ c.write(strBuilder, event);
 c = c.getNext();
 }
- return buf.toString();
+ return strBuilder.toString();
 }
 
 public String getPattern() {

_service:tar_scm:v_1.1.7.tar.gz/logback-core/src/main/java/ch/qos/logback/core/property/FileExistsPropertyDefiner.java -> _service:tar_scm:v_1.2.8.tar.gz/logback-core/src/main/java/ch/qos/logback/core/property/FileExistsPropertyDefiner.java Changed

_service:tar_scm:v_1.1.7.tar.gz/logback-core/src/main/java/ch/qos/logback/core/recovery/ResilientFileOutputStream.java -> _service:tar_scm:v_1.2.8.tar.gz/logback-core/src/main/java/ch/qos/logback/core/recovery/ResilientFileOutputStream.java Changed

_service:tar_scm:v_1.1.7.tar.gz/logback-core/src/main/java/ch/qos/logback/core/rolling/DefaultTimeBasedFileNamingAndTriggeringPolicy.java -> _service:tar_scm:v_1.2.8.tar.gz/logback-core/src/main/java/ch/qos/logback/core/rolling/DefaultTimeBasedFileNamingAndTriggeringPolicy.java Changed

_service:tar_scm:v_1.1.7.tar.gz/logback-core/src/main/java/ch/qos/logback/core/rolling/FixedWindowRollingPolicy.java -> _service:tar_scm:v_1.2.8.tar.gz/logback-core/src/main/java/ch/qos/logback/core/rolling/FixedWindowRollingPolicy.java Changed

_service:tar_scm:v_1.1.7.tar.gz/logback-core/src/main/java/ch/qos/logback/core/rolling/RollingFileAppender.java -> _service:tar_scm:v_1.2.8.tar.gz/logback-core/src/main/java/ch/qos/logback/core/rolling/RollingFileAppender.java Changed

@@ -25,6 +25,7 @@
 import ch.qos.logback.core.FileAppender;
 import ch.qos.logback.core.rolling.helper.CompressionMode;
 import ch.qos.logback.core.rolling.helper.FileNamePattern;
+import ch.qos.logback.core.util.ContextUtil;
 
 /**
 * <code>RollingFileAppender</code> extends {@link FileAppender} to backup the
@@ -117,23 +118,23 @@
 if (triggeringPolicy instanceof RollingPolicyBase) {
 final RollingPolicyBase base = (RollingPolicyBase) triggeringPolicy;
 final FileNamePattern fileNamePattern = base.fileNamePattern;
- boolean collisionsDetected = innerCheckForFileNamePatternCollisionInPreviousRFA(fileNamePattern.toString());
+ boolean collisionsDetected = innerCheckForFileNamePatternCollisionInPreviousRFA(fileNamePattern);
 if (collisionsDetected)
 collisionResult = true;
 }
 return collisionResult;
 }
 
- private boolean innerCheckForFileNamePatternCollisionInPreviousRFA(String fileNamePattern) {
+ private boolean innerCheckForFileNamePatternCollisionInPreviousRFA(FileNamePattern fileNamePattern) {
 boolean collisionsDetected = false;
 @SuppressWarnings("unchecked")
- Map<String, String> map = (Map<String, String>) context.getObject(CoreConstants.FA_FILENAME_COLLISION_MAP);
+ Map<String, FileNamePattern> map = (Map<String, FileNamePattern>) context.getObject(CoreConstants.RFA_FILENAME_PATTERN_COLLISION_MAP);
 if (map == null) {
 return collisionsDetected;
 }
- for (Entry<String, String> entry : map.entrySet()) {
+ for (Entry<String, FileNamePattern> entry : map.entrySet()) {
 if (fileNamePattern.equals(entry.getValue())) {
- addErrorForCollision("FileNamePattern", entry.getValue(), entry.getKey());
+ addErrorForCollision("FileNamePattern", entry.getValue().toString(), entry.getKey());
 collisionsDetected = true;
 }
 }
@@ -145,11 +146,17 @@
 
 @Override
 public void stop() {
+ super.stop();
+ 
 if (rollingPolicy != null)
 rollingPolicy.stop();
 if (triggeringPolicy != null)
 triggeringPolicy.stop();
- super.stop();
+
+ Map<String, FileNamePattern> map = ContextUtil.getFilenamePatternCollisionMap(context);
+ if (map != null && getName() != null)
+ map.remove(getName());
+
 }
 
 @Override

_service:tar_scm:v_1.1.7.tar.gz/logback-core/src/main/java/ch/qos/logback/core/rolling/SizeAndTimeBasedFNATP.java -> _service:tar_scm:v_1.2.8.tar.gz/logback-core/src/main/java/ch/qos/logback/core/rolling/SizeAndTimeBasedFNATP.java Changed

@@ -13,6 +13,8 @@
 */
 package ch.qos.logback.core.rolling;
 
+import static ch.qos.logback.core.CoreConstants.MANUAL_URL_PREFIX;
+
 import java.io.File;
 import java.util.Date;
 
@@ -29,23 +31,48 @@
 @NoAutoStart
 public class SizeAndTimeBasedFNATP<E> extends TimeBasedFileNamingAndTriggeringPolicyBase<E> {
 
+ enum Usage {EMBEDDED, DIRECT};
+
+ 
 int currentPeriodsCounter = 0;
 FileSize maxFileSize;
- String maxFileSizeAsString;
+ // String maxFileSizeAsString;
+
 long nextSizeCheck = 0;
 static String MISSING_INT_TOKEN = "Missing integer token, that is %i, in FileNamePattern ";
 static String MISSING_DATE_TOKEN = "Missing date token, that is %d, in FileNamePattern ";
 
+ private final Usage usage;
+ 
+ public SizeAndTimeBasedFNATP() {
+ this(Usage.DIRECT);
+ }
+ 
+ public SizeAndTimeBasedFNATP(Usage usage) {
+ this.usage = usage;
+ }
+ 
 @Override
 public void start() {
 // we depend on certain fields having been initialized in super class
 super.start();
-
+ 
+ if(usage == Usage.DIRECT) {
+ addWarn(CoreConstants.SIZE_AND_TIME_BASED_FNATP_IS_DEPRECATED);
+ addWarn("For more information see "+MANUAL_URL_PREFIX+"appenders.html#SizeAndTimeBasedRollingPolicy");
+ }
+ 
 if (!super.isErrorFree())
 return;
 
+ 
+ if (maxFileSize == null) {
+ addError("maxFileSize property is mandatory.");
+ withErrors();
+ }
+
 if (!validateDateAndIntegerTokens()) {
- started = false;
+ withErrors();
 return;
 }
 
@@ -60,7 +87,9 @@
 
 computeCurrentPeriodsHighestCounterValue(stemRegex);
 
- started = true;
+ if (isErrorFree()) {
+ started = true;
+ }
 }
 
 private boolean validateDateAndIntegerTokens() {
@@ -102,32 +131,39 @@
 }
 }
 
-
 InvocationGate invocationGate = new DefaultInvocationGate();
- 
+
+ @Override
 public boolean isTriggeringEvent(File activeFile, final E event) {
 
 long time = getCurrentTime();
- 
- // first check for roll-over based on time
+
+ // first check for roll-over based on time
 if (time >= nextCheck) {
 Date dateInElapsedPeriod = dateInCurrentPeriod;
- elapsedPeriodsFileName = tbrp.fileNamePatternWCS.convertMultipleArguments(dateInElapsedPeriod, currentPeriodsCounter);
+ elapsedPeriodsFileName = tbrp.fileNamePatternWithoutCompSuffix.convertMultipleArguments(dateInElapsedPeriod, currentPeriodsCounter);
 currentPeriodsCounter = 0;
 setDateInCurrentPeriod(time);
 computeNextCheck();
 return true;
 }
 
- 
 // next check for roll-over based on size
 if (invocationGate.isTooSoon(time)) {
 return false;
 }
- 
+
+ if (activeFile == null) {
+ addWarn("activeFile == null");
+ return false;
+ }
+ if (maxFileSize == null) {
+ addWarn("maxFileSize = null");
+ return false;
+ }
 if (activeFile.length() >= maxFileSize.getSize()) {
- 
- elapsedPeriodsFileName = tbrp.fileNamePatternWCS.convertMultipleArguments(dateInCurrentPeriod, currentPeriodsCounter);
+
+ elapsedPeriodsFileName = tbrp.fileNamePatternWithoutCompSuffix.convertMultipleArguments(dateInCurrentPeriod, currentPeriodsCounter);
 currentPeriodsCounter++;
 return true;
 }
@@ -135,19 +171,13 @@
 return false;
 }
 
-
 @Override
 public String getCurrentPeriodsFileNameWithoutCompressionSuffix() {
- return tbrp.fileNamePatternWCS.convertMultipleArguments(dateInCurrentPeriod, currentPeriodsCounter);
- }
-
- public String getMaxFileSize() {
- return maxFileSizeAsString;
+ return tbrp.fileNamePatternWithoutCompSuffix.convertMultipleArguments(dateInCurrentPeriod, currentPeriodsCounter);
 }
 
- public void setMaxFileSize(String maxFileSize) {
- this.maxFileSizeAsString = maxFileSize;
- this.maxFileSize = FileSize.valueOf(maxFileSize);
+ public void setMaxFileSize(FileSize aMaxFileSize) {
+ this.maxFileSize = aMaxFileSize;
 }
 
 }

_service:tar_scm:v_1.1.7.tar.gz/logback-core/src/main/java/ch/qos/logback/core/rolling/SizeAndTimeBasedRollingPolicy.java -> _service:tar_scm:v_1.2.8.tar.gz/logback-core/src/main/java/ch/qos/logback/core/rolling/SizeAndTimeBasedRollingPolicy.java Changed

@@ -1,31 +1,39 @@
 package ch.qos.logback.core.rolling;
 
+import ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP.Usage;
+import ch.qos.logback.core.util.FileSize;
+
 
 
 public class SizeAndTimeBasedRollingPolicy<E> extends TimeBasedRollingPolicy<E> {
 
- String maxFileSizeAsString;
+ FileSize maxFileSize;
 
 @Override
 public void start() {
- SizeAndTimeBasedFNATP<E> sizeAndTimeBasedFNATP = new SizeAndTimeBasedFNATP<E>(); 
- if(maxFileSizeAsString == null) {
- addError("MaxFileSize property must be set");
+ SizeAndTimeBasedFNATP<E> sizeAndTimeBasedFNATP = new SizeAndTimeBasedFNATP<E>(Usage.EMBEDDED); 
+ if(maxFileSize == null) {
+ addError("maxFileSize property is mandatory.");
 return;
 } else {
- addInfo("Achive files will be limied to "+maxFileSizeAsString+" each.");
+ addInfo("Archive files will be limited to "+maxFileSize+" each.");
 }
 
- sizeAndTimeBasedFNATP.setMaxFileSize(maxFileSizeAsString);
+ sizeAndTimeBasedFNATP.setMaxFileSize(maxFileSize);
 timeBasedFileNamingAndTriggeringPolicy = sizeAndTimeBasedFNATP;
 
+ if(!isUnboundedTotalSizeCap() && totalSizeCap.getSize() < maxFileSize.getSize()) {
+ addError("totalSizeCap of "+totalSizeCap+" is smaller than maxFileSize "+maxFileSize+" which is non-sensical");
+ return;
+ }
+ 
 // most work is done by the parent
 super.start();
 }
 
 
- public void setMaxFileSize(String maxFileSize) {
- this.maxFileSizeAsString = maxFileSize;
+ public void setMaxFileSize(FileSize aMaxFileSize) {
+ this.maxFileSize = aMaxFileSize;
 }
 
 @Override

_service:tar_scm:v_1.1.7.tar.gz/logback-core/src/main/java/ch/qos/logback/core/rolling/SizeBasedTriggeringPolicy.java -> _service:tar_scm:v_1.2.8.tar.gz/logback-core/src/main/java/ch/qos/logback/core/rolling/SizeBasedTriggeringPolicy.java Changed

@@ -38,20 +38,14 @@
      */
     public static final long DEFAULT_MAX_FILE_SIZE = 10 * 1024 * 1024; // 10 MB
 
-    String maxFileSizeAsString = Long.toString(DEFAULT_MAX_FILE_SIZE);
-    FileSize maxFileSize;
+    FileSize maxFileSize = new FileSize(DEFAULT_MAX_FILE_SIZE);
 
     public SizeBasedTriggeringPolicy() {
     }
 
-    public SizeBasedTriggeringPolicy(final String maxFileSize) {
-        setMaxFileSize(maxFileSize);
-    }
-
     InvocationGate invocationGate = new DefaultInvocationGate();
 
     public boolean isTriggeringEvent(final File activeFile, final E event) {
-
         long now = System.currentTimeMillis();
         if (invocationGate.isTooSoon(now))
             return false;
@@ -59,41 +53,8 @@
         return (activeFile.length() >= maxFileSize.getSize());
     }
 
-    public String getMaxFileSize() {
-        return maxFileSizeAsString;
-    }
-
-    public void setMaxFileSize(String maxFileSize) {
-        this.maxFileSizeAsString = maxFileSize;
-        this.maxFileSize = FileSize.valueOf(maxFileSize);
+    public void setMaxFileSize(FileSize aMaxFileSize) {
+        this.maxFileSize = aMaxFileSize;
     }
 
-    long toFileSize(String value) {
-        if (value == null)
-            return DEFAULT_MAX_FILE_SIZE;
-
-        String s = value.trim().toUpperCase();
-        long multiplier = 1;
-        int index;
-
-        if ((index = s.indexOf("KB")) != -1) {
-            multiplier = 1024;
-            s = s.substring(0, index);
-        } else if ((index = s.indexOf("MB")) != -1) {
-            multiplier = 1024 * 1024;
-            s = s.substring(0, index);
-        } else if ((index = s.indexOf("GB")) != -1) {
-            multiplier = 1024 * 1024 * 1024;
-            s = s.substring(0, index);
-        }
-        if (s != null) {
-            try {
-                return Long.valueOf(s).longValue() * multiplier;
-            } catch (NumberFormatException e) {
-                addError("" + s + " is not in proper int format. Please refer to " + SEE_SIZE_FORMAT);
-                addError("" + value + " not in expected format.", e);
-            }
-        }
-        return DEFAULT_MAX_FILE_SIZE;
-    }
 }

_service:tar_scm:v_1.1.7.tar.gz/logback-core/src/main/java/ch/qos/logback/core/rolling/TimeBasedFileNamingAndTriggeringPolicyBase.java -> _service:tar_scm:v_1.2.8.tar.gz/logback-core/src/main/java/ch/qos/logback/core/rolling/TimeBasedFileNamingAndTriggeringPolicyBase.java Changed

_service:tar_scm:v_1.1.7.tar.gz/logback-core/src/main/java/ch/qos/logback/core/rolling/TimeBasedRollingPolicy.java -> _service:tar_scm:v_1.2.8.tar.gz/logback-core/src/main/java/ch/qos/logback/core/rolling/TimeBasedRollingPolicy.java Changed

@@ -14,7 +14,7 @@
 package ch.qos.logback.core.rolling;
 
 import static ch.qos.logback.core.CoreConstants.UNBOUND_HISTORY;
-import static ch.qos.logback.core.CoreConstants.UNBOUND_TOTAL_SIZE;
+import static ch.qos.logback.core.CoreConstants.UNBOUNDED_TOTAL_SIZE_CAP;
 
 import java.io.File;
 import java.util.Date;
@@ -44,7 +44,7 @@
 public class TimeBasedRollingPolicy<E> extends RollingPolicyBase implements TriggeringPolicy<E> {
 static final String FNP_NOT_SET = "The FileNamePattern option must be set before using TimeBasedRollingPolicy. ";
 // WCS: without compression suffix
- FileNamePattern fileNamePatternWCS;
+ FileNamePattern fileNamePatternWithoutCompSuffix;
 
 private Compressor compressor;
 private RenameUtil renameUtil = new RenameUtil();
@@ -52,7 +52,7 @@
 Future<?> cleanUpFuture;
 
 private int maxHistory = UNBOUND_HISTORY;
- private FileSize totalSizeCap = new FileSize(UNBOUND_TOTAL_SIZE);
+ protected FileSize totalSizeCap = new FileSize(UNBOUNDED_TOTAL_SIZE_CAP);
 
 private ArchiveRemover archiveRemover;
 
@@ -78,9 +78,9 @@
 compressor.setContext(context);
 
 // wcs : without compression suffix
- fileNamePatternWCS = new FileNamePattern(Compressor.computeFileNameStr_WCS(fileNamePatternStr, compressionMode), this.context);
+ fileNamePatternWithoutCompSuffix = new FileNamePattern(Compressor.computeFileNameStrWithoutCompSuffix(fileNamePatternStr, compressionMode), this.context);
 
- addInfo("Will use the pattern " + fileNamePatternWCS + " for the active file");
+ addInfo("Will use the pattern " + fileNamePatternWithoutCompSuffix + " for the active file");
 
 if (compressionMode == CompressionMode.ZIP) {
 String zipEntryFileNamePatternStr = transformFileNamePattern2ZipEntry(fileNamePatternStr);
@@ -111,13 +111,17 @@
 Date now = new Date(timeBasedFileNamingAndTriggeringPolicy.getCurrentTime());
 cleanUpFuture = archiveRemover.cleanAsynchronously(now);
 }
- } else if (totalSizeCap.getSize() != UNBOUND_TOTAL_SIZE) {
+ } else if (!isUnboundedTotalSizeCap()) {
 addWarn("'maxHistory' is not set, ignoring 'totalSizeCap' option with value "+totalSizeCap+"");
 }
 
 super.start();
 }
 
+ protected boolean isUnboundedTotalSizeCap() {
+ return totalSizeCap.getSize() == UNBOUNDED_TOTAL_SIZE_CAP;
+ }
+
 @Override
 public void stop() {
 if (!isStarted())
@@ -169,19 +173,19 @@
 if (getParentsRawFileProperty() == null) {
 compressionFuture = compressor.asyncCompress(elapsedPeriodsFileName, elapsedPeriodsFileName, elapsedPeriodStem);
 } else {
- compressionFuture = renamedRawAndAsyncCompress(elapsedPeriodsFileName, elapsedPeriodStem);
+ compressionFuture = renameRawAndAsyncCompress(elapsedPeriodsFileName, elapsedPeriodStem);
 }
 }
 
 if (archiveRemover != null) {
 Date now = new Date(timeBasedFileNamingAndTriggeringPolicy.getCurrentTime());
- cleanUpFuture = archiveRemover.cleanAsynchronously(now);
+ this.cleanUpFuture = archiveRemover.cleanAsynchronously(now);
 }
 }
 
- Future<?> renamedRawAndAsyncCompress(String nameOfCompressedFile, String innerEntryName) throws RolloverFailure {
+ Future<?> renameRawAndAsyncCompress(String nameOfCompressedFile, String innerEntryName) throws RolloverFailure {
 String parentsRawFile = getParentsRawFileProperty();
- String tmpTarget = parentsRawFile + System.nanoTime() + ".tmp";
+ String tmpTarget = nameOfCompressedFile + System.nanoTime() + ".tmp";
 renameUtil.rename(parentsRawFile, tmpTarget);
 return compressor.asyncCompress(tmpTarget, nameOfCompressedFile, innerEntryName);
 }
@@ -257,6 +261,7 @@
 }
 
 public void setTotalSizeCap(FileSize totalSizeCap) {
+ addInfo("setting totalSizeCap to "+totalSizeCap.toString());
 this.totalSizeCap = totalSizeCap;
 }
 }

_service:tar_scm:v_1.1.7.tar.gz/logback-core/src/main/java/ch/qos/logback/core/rolling/helper/Compressor.java -> _service:tar_scm:v_1.2.8.tar.gz/logback-core/src/main/java/ch/qos/logback/core/rolling/helper/Compressor.java Changed

@@ -159,7 +159,7 @@
 }
 
 ZipEntry computeZipEntry(String filename) {
- String nameOfFileNestedWithinArchive = computeFileNameStr_WCS(filename, compressionMode);
+ String nameOfFileNestedWithinArchive = computeFileNameStrWithoutCompSuffix(filename, compressionMode);
 return new ZipEntry(nameOfFileNestedWithinArchive);
 }
 
@@ -226,7 +226,7 @@
 }
 }
 
- static public String computeFileNameStr_WCS(String fileNamePatternStr, CompressionMode compressionMode) {
+ static public String computeFileNameStrWithoutCompSuffix(String fileNamePatternStr, CompressionMode compressionMode) {
 int len = fileNamePatternStr.length();
 switch (compressionMode) {
 case GZ:
@@ -260,7 +260,7 @@
 
 public Future<?> asyncCompress(String nameOfFile2Compress, String nameOfCompressedFile, String innerEntryName) throws RolloverFailure {
 CompressionRunnable runnable = new CompressionRunnable(nameOfFile2Compress, nameOfCompressedFile, innerEntryName);
- ExecutorService executorService = context.getExecutorService();
+ ExecutorService executorService = context.getScheduledExecutorService();
 Future<?> future = executorService.submit(runnable);
 return future;
 }
@@ -278,6 +278,7 @@
 }
 
 public void run() {
+ 
 Compressor.this.compress(nameOfFile2Compress, nameOfCompressedFile, innerEntryName);
 }
 }

_service:tar_scm:v_1.1.7.tar.gz/logback-core/src/main/java/ch/qos/logback/core/rolling/helper/DateTokenConverter.java -> _service:tar_scm:v_1.2.8.tar.gz/logback-core/src/main/java/ch/qos/logback/core/rolling/helper/DateTokenConverter.java Changed

_service:tar_scm:v_1.1.7.tar.gz/logback-core/src/main/java/ch/qos/logback/core/rolling/helper/FileNamePattern.java -> _service:tar_scm:v_1.2.8.tar.gz/logback-core/src/main/java/ch/qos/logback/core/rolling/helper/FileNamePattern.java Changed

@@ -30,7 +30,7 @@
 /**
 * After parsing file name patterns, given a number or a date, instances of this
 * class can be used to compute a file name according to the file name pattern
- * and the given integer or date.
+ * and the current date or integer.
 * 
 * @author Ceki G&uuml;lc&uuml;
 * 
@@ -54,9 +54,10 @@
 ConverterUtil.startConverters(this.headTokenConverter);
 }
 
+ 
 void parse() {
 try {
- // http://jira.qos.ch/browse/LBCORE-130
+ // http://jira.qos.ch/browse/LOGBACK-197
 // we escape ')' for parsing purposes. Note that the original pattern is preserved
 // because it is shown to the user in status messages. We don't want the escaped version
 // to leak out.
@@ -79,6 +80,33 @@
 return pattern;
 }
 
+ @Override
+ public int hashCode() {
+ final int prime = 31;
+ int result = 1;
+ result = prime * result + ((pattern == null) ? 0 : pattern.hashCode());
+ return result;
+ }
+
+
+ @Override
+ public boolean equals(Object obj) {
+ if (this == obj)
+ return true;
+ if (obj == null)
+ return false;
+ if (getClass() != obj.getClass())
+ return false;
+ FileNamePattern other = (FileNamePattern) obj;
+ if (pattern == null) {
+ if (other.pattern != null)
+ return false;
+ } else if (!pattern.equals(other.pattern))
+ return false;
+ return true;
+ }
+
+
 public DateTokenConverter<Object> getPrimaryDateTokenConverter() {
 Converter<Object> p = headTokenConverter;
 
@@ -171,7 +199,7 @@
 if (p instanceof LiteralConverter) {
 buf.append(p.convert(null));
 } else if (p instanceof IntegerTokenConverter) {
- buf.append("(\\d{1,3})");
+ buf.append("(\\d{1,5})");
 } else if (p instanceof DateTokenConverter) {
 buf.append(p.convert(date));
 }

_service:tar_scm:v_1.1.7.tar.gz/logback-core/src/main/java/ch/qos/logback/core/rolling/helper/IntegerTokenConverter.java -> _service:tar_scm:v_1.2.8.tar.gz/logback-core/src/main/java/ch/qos/logback/core/rolling/helper/IntegerTokenConverter.java Changed

_service:tar_scm:v_1.1.7.tar.gz/logback-core/src/main/java/ch/qos/logback/core/rolling/helper/MonoTypedConverter.java -> _service:tar_scm:v_1.2.8.tar.gz/logback-core/src/main/java/ch/qos/logback/core/rolling/helper/MonoTypedConverter.java Changed

_service:tar_scm:v_1.1.7.tar.gz/logback-core/src/main/java/ch/qos/logback/core/rolling/helper/RollingCalendar.java -> _service:tar_scm:v_1.2.8.tar.gz/logback-core/src/main/java/ch/qos/logback/core/rolling/helper/RollingCalendar.java Changed

@@ -14,6 +14,9 @@
 package ch.qos.logback.core.rolling.helper;
 
 import static ch.qos.logback.core.CoreConstants.MILLIS_IN_ONE_HOUR;
+import static ch.qos.logback.core.CoreConstants.MILLIS_IN_ONE_MINUTE;
+import static ch.qos.logback.core.CoreConstants.MILLIS_IN_ONE_SECOND;
+import static ch.qos.logback.core.CoreConstants.MILLIS_IN_ONE_WEEK;
 import static ch.qos.logback.core.CoreConstants.MILLIS_IN_ONE_DAY;
 
 import java.text.SimpleDateFormat;
@@ -23,7 +26,6 @@
 import java.util.Locale;
 import java.util.TimeZone;
 
-import ch.qos.logback.core.CoreConstants;
 import ch.qos.logback.core.spi.ContextAwareBase;
 
 /**
@@ -71,7 +73,6 @@
     public PeriodicityType computePeriodicityType() {
 
         GregorianCalendar calendar = new GregorianCalendar(GMT_TIMEZONE, Locale.getDefault());
-                        
 
         // set sate to 1970-01-01 00:00:00 GMT
         Date epoch = new Date(0);
@@ -180,25 +181,26 @@
         if (start > end)
             throw new IllegalArgumentException("Start cannot come before end");
 
-        Date startFloored = getsStartOfCurrentPeriod(start);
-        Date endFloored = getsStartOfCurrentPeriod(end);
-        
-        long diff = endFloored.getTime() - startFloored.getTime();
-        
+        long startFloored = getStartOfCurrentPeriodWithGMTOffsetCorrection(start, getTimeZone());
+        long endFloored = getStartOfCurrentPeriodWithGMTOffsetCorrection(end, getTimeZone());
+
+        long diff = endFloored - startFloored;
+
         switch (periodicityType) {
 
         case TOP_OF_MILLISECOND:
             return diff;
         case TOP_OF_SECOND:
-            return diff / CoreConstants.MILLIS_IN_ONE_SECOND;
+            return diff / MILLIS_IN_ONE_SECOND;
         case TOP_OF_MINUTE:
-            return diff / CoreConstants.MILLIS_IN_ONE_MINUTE;
+            return diff / MILLIS_IN_ONE_MINUTE;
         case TOP_OF_HOUR:
-            return (int) diff / CoreConstants.MILLIS_IN_ONE_HOUR;
+
+            return (int) diff / MILLIS_IN_ONE_HOUR;
         case TOP_OF_DAY:
-            return diff / CoreConstants.MILLIS_IN_ONE_DAY;
+            return diff / MILLIS_IN_ONE_DAY;
         case TOP_OF_WEEK:
-            return diff / CoreConstants.MILLIS_IN_ONE_WEEK;
+            return diff / MILLIS_IN_ONE_WEEK;
         case TOP_OF_MONTH:
             return diffInMonths(start, end);
         default:
@@ -263,7 +265,7 @@
             cal.set(Calendar.MILLISECOND, 0);
             cal.add(Calendar.WEEK_OF_YEAR, numPeriods);
             break;
-            
+
         case TOP_OF_MONTH:
             cal.set(Calendar.DATE, 1);
             cal.set(Calendar.HOUR_OF_DAY, 0);
@@ -287,10 +289,20 @@
     public Date getNextTriggeringDate(Date now) {
         return getEndOfNextNthPeriod(now, 1);
     }
-    
-    public Date getsStartOfCurrentPeriod(long now) {
-        Calendar aCal = Calendar.getInstance(getTimeZone());
-        aCal.setTimeInMillis(now);
-        return getEndOfNextNthPeriod(aCal.getTime(), 0);
+
+    public long getStartOfCurrentPeriodWithGMTOffsetCorrection(long now, TimeZone timezone) {
+        Date toppedDate;
+
+        // there is a bug in Calendar which prevents it from
+        // computing the correct DST_OFFSET when the time changes
+        {
+            Calendar aCal = Calendar.getInstance(timezone);
+            aCal.setTimeInMillis(now);
+            toppedDate = getEndOfNextNthPeriod(aCal.getTime(), 0);
+        }
+        Calendar secondCalendar = Calendar.getInstance(timezone);
+        secondCalendar.setTimeInMillis(toppedDate.getTime());
+        long gmtOffset = secondCalendar.get(Calendar.ZONE_OFFSET) + secondCalendar.get(Calendar.DST_OFFSET);
+        return toppedDate.getTime() + gmtOffset;
     }
 }

_service:tar_scm:v_1.1.7.tar.gz/logback-core/src/main/java/ch/qos/logback/core/rolling/helper/TimeBasedArchiveRemover.java -> _service:tar_scm:v_1.2.8.tar.gz/logback-core/src/main/java/ch/qos/logback/core/rolling/helper/TimeBasedArchiveRemover.java Changed

@@ -13,7 +13,7 @@
 */
 package ch.qos.logback.core.rolling.helper;
 
-import static ch.qos.logback.core.CoreConstants.UNBOUND_TOTAL_SIZE;
+import static ch.qos.logback.core.CoreConstants.UNBOUNDED_TOTAL_SIZE_CAP;
 
 import java.io.File;
 import java.util.Arrays;
@@ -30,17 +30,15 @@
 
 public class TimeBasedArchiveRemover extends ContextAwareBase implements ArchiveRemover {
 
- // we wish to leave two archive files alone even if their total is over totalSizeCap
- private static final int UNTOUCHABLE_ARCHIVE_FILE_COUNT = 2;
 static protected final long UNINITIALIZED = -1;
- // aim for 64 days, except in case of hourly rollover
+ // aim for 32 days, except in case of hourly rollover
 static protected final long INACTIVITY_TOLERANCE_IN_MILLIS = 32L * (long) CoreConstants.MILLIS_IN_ONE_DAY;
 static final int MAX_VALUE_FOR_INACTIVITY_PERIODS = 14 * 24; // 14 days in case of hourly rollover
 
 final FileNamePattern fileNamePattern;
 final RollingCalendar rc;
 private int maxHistory = CoreConstants.UNBOUND_HISTORY;
- private long totalSizeCap = CoreConstants.UNBOUND_TOTAL_SIZE;
+ private long totalSizeCap = CoreConstants.UNBOUNDED_TOTAL_SIZE_CAP;
 final boolean parentClean;
 long lastHeartBeat = UNINITIALIZED;
 
@@ -50,9 +48,11 @@
 this.parentClean = computeParentCleaningFlag(fileNamePattern);
 }
 
+ int callCount = 0;
 public void clean(Date now) {
+ 
 long nowInMillis = now.getTime();
- // for a live appender periodsElapsed is usually one
+ // for a live appender periodsElapsed is expected to be 1
 int periodsElapsed = computeElapsedPeriodsSinceLastClean(nowInMillis);
 lastHeartBeat = nowInMillis;
 if (periodsElapsed > 1) {
@@ -95,8 +95,8 @@
 }
 
 void capTotalSize(Date now) {
- int totalSize = 0;
- int totalRemoved = 0;
+ long totalSize = 0;
+ long totalRemoved = 0;
 for (int offset = 0; offset < maxHistory; offset++) {
 Date date = rc.getEndOfNextNthPeriod(now, -offset);
 File matchingFileArray = getFilesInPeriod(date);
@@ -104,13 +104,9 @@
 for (File f : matchingFileArray) {
 long size = f.length();
 if (totalSize + size > totalSizeCap) {
- if (offset >= UNTOUCHABLE_ARCHIVE_FILE_COUNT) {
- addInfo("Deleting " + f + "" + " of size " + new FileSize(size));
- totalRemoved += size;
- f.delete();
- } else {
- addWarn("Skipping " + f + "" + " of size " + new FileSize(size) + " as it is one of the two newest log achives.");
- }
+ addInfo("Deleting " + f + "" + " of size " + new FileSize(size));
+ totalRemoved += size;
+ f.delete();
 }
 totalSize += size;
 }
@@ -149,7 +145,7 @@
 periodsElapsed = Math.min(periodsElapsed, MAX_VALUE_FOR_INACTIVITY_PERIODS);
 } else {
 periodsElapsed = rc.periodBarriersCrossed(lastHeartBeat, nowInMillis);
- // periodsElapsed of zero is possible for Size and time based policies
+ // periodsElapsed of zero is possible for size and time based policies
 }
 return (int) periodsElapsed;
 }
@@ -244,7 +240,7 @@
 @Override
 public void run() {
 clean(now);
- if (totalSizeCap != UNBOUND_TOTAL_SIZE && totalSizeCap > 0) {
+ if (totalSizeCap != UNBOUNDED_TOTAL_SIZE_CAP && totalSizeCap > 0) {
 capTotalSize(now);
 }
 }

_service:tar_scm:v_1.1.7.tar.gz/logback-core/src/main/java/ch/qos/logback/core/sift/DefaultDiscriminator.java -> _service:tar_scm:v_1.2.8.tar.gz/logback-core/src/main/java/ch/qos/logback/core/sift/DefaultDiscriminator.java Changed

_service:tar_scm:v_1.1.7.tar.gz/logback-core/src/main/java/ch/qos/logback/core/spi/AppenderAttachableImpl.java -> _service:tar_scm:v_1.2.8.tar.gz/logback-core/src/main/java/ch/qos/logback/core/spi/AppenderAttachableImpl.java Changed

@@ -14,9 +14,9 @@
 package ch.qos.logback.core.spi;
 
 import java.util.Iterator;
-import java.util.concurrent.CopyOnWriteArrayList;
 
 import ch.qos.logback.core.Appender;
+import ch.qos.logback.core.util.COWArrayList;
 
 /**
 * A ReentrantReadWriteLock based implementation of the
@@ -26,7 +26,8 @@
 */
 public class AppenderAttachableImpl<E> implements AppenderAttachable<E> {
 
- final private CopyOnWriteArrayList<Appender<E>> appenderList = new CopyOnWriteArrayList<Appender<E>>();
+ @SuppressWarnings("unchecked")
+ final private COWArrayList<Appender<E>> appenderList = new COWArrayList<Appender<E>>(new Appender0);
 
 /**
 * Attach an appender. If the appender is already in the list in won't be
@@ -44,8 +45,10 @@
 */
 public int appendLoopOnAppenders(E e) {
 int size = 0;
- for (Appender<E> appender : appenderList) {
- appender.doAppend(e);
+ final Appender<E> appenderArray = appenderList.asTypedArray();
+ final int len = appenderArray.length;
+ for (int i = 0; i < len; i++) {
+ appenderArrayi.doAppend(e);
 size++;
 }
 return size;

_service:tar_scm:v_1.1.7.tar.gz/logback-core/src/main/java/ch/qos/logback/core/spi/CyclicBufferTracker.java -> _service:tar_scm:v_1.2.8.tar.gz/logback-core/src/main/java/ch/qos/logback/core/spi/CyclicBufferTracker.java Changed

_service:tar_scm:v_1.1.7.tar.gz/logback-core/src/main/java/ch/qos/logback/core/spi/FilterAttachableImpl.java -> _service:tar_scm:v_1.2.8.tar.gz/logback-core/src/main/java/ch/qos/logback/core/spi/FilterAttachableImpl.java Changed

@@ -15,9 +15,9 @@
 
 import java.util.ArrayList;
 import java.util.List;
-import java.util.concurrent.CopyOnWriteArrayList;
 
 import ch.qos.logback.core.filter.Filter;
+import ch.qos.logback.core.util.COWArrayList;
 
 /**
 * Implementation of FilterAttachable.
@@ -26,7 +26,8 @@
 */
 final public class FilterAttachableImpl<E> implements FilterAttachable<E> {
 
- CopyOnWriteArrayList<Filter<E>> filterList = new CopyOnWriteArrayList<Filter<E>>();
+ @SuppressWarnings("unchecked")
+ COWArrayList<Filter<E>> filterList = new COWArrayList<Filter<E>>(new Filter0);
 
 /**
 * Add a filter to end of the filter list.
@@ -48,12 +49,18 @@
 * NEUTRAL, then NEUTRAL is returned.
 */
 public FilterReply getFilterChainDecision(E event) {
- for (Filter<E> f : filterList) {
- final FilterReply r = f.decide(event);
+
+ final Filter<E> filterArrray = filterList.asTypedArray();
+ final int len = filterArrray.length;
+
+ for (int i = 0; i < len; i++) {
+ final FilterReply r = filterArrrayi.decide(event);
 if (r == FilterReply.DENY || r == FilterReply.ACCEPT) {
 return r;
 }
 }
+
+ // no decision
 return FilterReply.NEUTRAL;
 }

_service:tar_scm:v_1.1.7.tar.gz/logback-core/src/main/java/ch/qos/logback/core/spi/LogbackLock.java -> _service:tar_scm:v_1.2.8.tar.gz/logback-core/src/main/java/ch/qos/logback/core/spi/LogbackLock.java Changed

_service:tar_scm:v_1.1.7.tar.gz/logback-core/src/main/java/ch/qos/logback/core/status/NopStatusListener.java -> _service:tar_scm:v_1.2.8.tar.gz/logback-core/src/main/java/ch/qos/logback/core/status/NopStatusListener.java Changed

_service:tar_scm:v_1.1.7.tar.gz/logback-core/src/main/java/ch/qos/logback/core/status/OnConsoleStatusListener.java -> _service:tar_scm:v_1.2.8.tar.gz/logback-core/src/main/java/ch/qos/logback/core/status/OnConsoleStatusListener.java Changed

_service:tar_scm:v_1.1.7.tar.gz/logback-core/src/main/java/ch/qos/logback/core/status/OnErrorConsoleStatusListener.java -> _service:tar_scm:v_1.2.8.tar.gz/logback-core/src/main/java/ch/qos/logback/core/status/OnErrorConsoleStatusListener.java Changed

_service:tar_scm:v_1.1.7.tar.gz/logback-core/src/main/java/ch/qos/logback/core/status/OnPrintStreamStatusListenerBase.java -> _service:tar_scm:v_1.2.8.tar.gz/logback-core/src/main/java/ch/qos/logback/core/status/OnPrintStreamStatusListenerBase.java Changed

@@ -22,15 +22,21 @@
 
 /**
  *  Print all new incoming status messages on the on the designated PrintStream.
- * @author Ceki G&uuml;c&uuml;
+ * @author Ceki G&uuml;lc&uuml;
  */
-abstract class OnPrintStreamStatusListenerBase extends ContextAwareBase implements StatusListener, LifeCycle {
+abstract public class OnPrintStreamStatusListenerBase extends ContextAwareBase implements StatusListener, LifeCycle {
 
     boolean isStarted = false;
 
     static final long DEFAULT_RETROSPECTIVE = 300;
     long retrospectiveThresold = DEFAULT_RETROSPECTIVE;
-
+    
+    /**
+     * The prefix to place before each status message
+     * @since 1.1.10
+     */
+    String prefix;
+    
     /**
      * The PrintStream used by derived classes
      * @return
@@ -39,6 +45,9 @@
 
     private void print(Status status) {
         StringBuilder sb = new StringBuilder();
+        if(prefix != null)
+            sb.append(prefix);
+        
         StatusPrinter.buildStr(sb, "", status);
         getPrintStream().print(sb);
     }
@@ -82,6 +91,14 @@
         }
     }
 
+    public String getPrefix() {
+        return prefix;
+    }
+
+    public void setPrefix(String prefix) {
+        this.prefix = prefix;
+    }
+    
     public void setRetrospective(long retrospective) {
         this.retrospectiveThresold = retrospective;
     }

_service:tar_scm:v_1.1.7.tar.gz/logback-core/src/main/java/ch/qos/logback/core/subst/NodeToStringTransformer.java -> _service:tar_scm:v_1.2.8.tar.gz/logback-core/src/main/java/ch/qos/logback/core/subst/NodeToStringTransformer.java Changed

_service:tar_scm:v_1.2.8.tar.gz/logback-core/src/main/java/ch/qos/logback/core/util/COWArrayList.java Added

@@ -0,0 +1,227 @@
+package ch.qos.logback.core.util;
+
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.List;
+import java.util.ListIterator;
+import java.util.concurrent.CopyOnWriteArrayList;
+import java.util.concurrent.atomic.AtomicBoolean;
+
+/**
+ * A GC-free lock-free thread-safe implementation of the {@link List} interface for use cases where iterations over the list vastly out-number modifications on the list.
+ * 
+ * Underneath, it wraps an instance of {@link CopyOnWriteArrayList} and exposes a copy of the array used by that instance.
+ * 
+ * Typical use:
+ * 
+ * <pre>
+ * COWArrayList<Integer> list = new COWArrayList(new Integer0);
+ * 
+ * // modify the list
+ * list.add(1);
+ * list.add(2);
+ * 
+ * Integer intArray = list.asTypedArray();
+ * int sum = 0;
+ * // iteration over the array is thread-safe
+ * for(int i = 0; i < intArray.length; i++) {
+ * sum != intArrayi;
+ * }
+ * </pre> 
+ * 
+ * If the list is not modified, then repetitive calls to {@link #asTypedArray()}, {@link #toArray()} and 
+ * {@link #toArray(Object)} are guaranteed to be GC-free. Note that iterating over the list using 
+ * {@link COWArrayList#iterator()} and {@link COWArrayList#listIterator()} are not GC-free.
+ * 
+ * @author Ceki Gulcu
+ * @since 1.1.10
+ */
+public class COWArrayList<E> implements List<E> {
+
+ // Implementation note: markAsStale() should always be invoked *after* list-modifying actions.
+ // If not, readers might get a stale array until the next write. The potential problem is nicely
+ // explained by Rob Eden. See https://github.com/qos-ch/logback/commit/32a2047a1adfc#commitcomment-20791176
+ 
+ AtomicBoolean fresh = new AtomicBoolean(false);
+ CopyOnWriteArrayList<E> underlyingList = new CopyOnWriteArrayList<E>();
+ E ourCopy;
+ final E modelArray;
+
+ public COWArrayList(E modelArray) {
+ this.modelArray = modelArray;
+ }
+
+ @Override
+ public int size() {
+ return underlyingList.size();
+ }
+
+ @Override
+ public boolean isEmpty() {
+ return underlyingList.isEmpty();
+ }
+
+ @Override
+ public boolean contains(Object o) {
+ return underlyingList.contains(o);
+ }
+
+ @Override
+ public Iterator<E> iterator() {
+ return underlyingList.iterator();
+ }
+
+ private void refreshCopyIfNecessary() {
+ if (!isFresh()) {
+ refreshCopy();
+ }
+ }
+
+ private boolean isFresh() {
+ return fresh.get();
+ }
+
+ private void refreshCopy() {
+ ourCopy = underlyingList.toArray(modelArray);
+ fresh.set(true);
+ }
+
+ @Override
+ public Object toArray() {
+ refreshCopyIfNecessary();
+ return ourCopy;
+ }
+
+ @SuppressWarnings("unchecked")
+ @Override
+ public <T> T toArray(T a) {
+ refreshCopyIfNecessary();
+ return (T) ourCopy;
+ }
+
+ /**
+ * Return an array of type E. The returned array is intended to be iterated over. 
+ * If the list is modified, subsequent calls to this method will return different/modified 
+ * array instances.
+ * 
+ * @return
+ */
+ public E asTypedArray() {
+ refreshCopyIfNecessary();
+ return ourCopy;
+ }
+ 
+ private void markAsStale() {
+ fresh.set(false);
+ }
+ 
+ public void addIfAbsent(E e) {
+ underlyingList.addIfAbsent(e);
+ markAsStale();
+ }
+
+ @Override
+ public boolean add(E e) {
+ boolean result = underlyingList.add(e);
+ markAsStale();
+ return result;
+ }
+
+ @Override
+ public boolean remove(Object o) {
+ boolean result = underlyingList.remove(o);
+ markAsStale();
+ return result;
+ }
+
+ @Override
+ public boolean containsAll(Collection<?> c) {
+ return underlyingList.containsAll(c);
+ }
+
+ @Override
+ public boolean addAll(Collection<? extends E> c) {
+ boolean result = underlyingList.addAll(c);
+ markAsStale();
+ return result;
+ }
+
+ @Override
+ public boolean addAll(int index, Collection<? extends E> col) {
+ boolean result = underlyingList.addAll(index, col);
+ markAsStale();
+ return result;
+ }
+
+ @Override
+ public boolean removeAll(Collection<?> col) {
+ boolean result = underlyingList.removeAll(col);
+ markAsStale();
+ return result;
+ }
+
+ @Override
+ public boolean retainAll(Collection<?> col) {
+ boolean result = underlyingList.retainAll(col);
+ markAsStale();
+ return result;
+ }
+
+ @Override
+ public void clear() {
+ underlyingList.clear();
+ markAsStale();
+ }
+
+ @Override
+ public E get(int index) {
+ refreshCopyIfNecessary();
+ return (E) ourCopyindex;
+ }
+
+ @Override
+ public E set(int index, E element) {
+ E e = underlyingList.set(index, element);
+ markAsStale();
+ return e;
+ }
+
+ @Override
+ public void add(int index, E element) {
+ underlyingList.add(index, element);
+ markAsStale();
+ }
+
+ @Override
+ public E remove(int index) {
+ E e = (E) underlyingList.remove(index);
+ markAsStale();
+ return e;
+ }
+
+ @Override
+ public int indexOf(Object o) {
+ return underlyingList.indexOf(o);
+ }
+
+ @Override
+ public int lastIndexOf(Object o) {
+ return underlyingList.lastIndexOf(o);
+ }
+
+ @Override
+ public ListIterator<E> listIterator() {
+ return underlyingList.listIterator();
+ }
+
+ @Override
+ public ListIterator<E> listIterator(int index) {
+ return underlyingList.listIterator(index);
+ }
+
+ @Override
+ public List<E> subList(int fromIndex, int toIndex) {
+ return underlyingList.subList(fromIndex, toIndex);
+ }
+
+}

_service:tar_scm:v_1.1.7.tar.gz/logback-core/src/main/java/ch/qos/logback/core/util/CachingDateFormatter.java -> _service:tar_scm:v_1.2.8.tar.gz/logback-core/src/main/java/ch/qos/logback/core/util/CachingDateFormatter.java Changed

_service:tar_scm:v_1.1.7.tar.gz/logback-core/src/main/java/ch/qos/logback/core/util/ContextUtil.java -> _service:tar_scm:v_1.2.8.tar.gz/logback-core/src/main/java/ch/qos/logback/core/util/ContextUtil.java Changed

@@ -13,9 +13,8 @@
 */
 package ch.qos.logback.core.util;
 
-import ch.qos.logback.core.Context;
-import ch.qos.logback.core.CoreConstants;
-import ch.qos.logback.core.spi.ContextAwareBase;
+import static ch.qos.logback.core.CoreConstants.FA_FILENAME_COLLISION_MAP;
+import static ch.qos.logback.core.CoreConstants.RFA_FILENAME_PATTERN_COLLISION_MAP;
 
 import java.net.InetAddress;
 import java.net.NetworkInterface;
@@ -24,8 +23,14 @@
 import java.util.Enumeration;
 import java.util.Iterator;
 import java.util.List;
+import java.util.Map;
 import java.util.Properties;
 
+import ch.qos.logback.core.Context;
+import ch.qos.logback.core.CoreConstants;
+import ch.qos.logback.core.rolling.helper.FileNamePattern;
+import ch.qos.logback.core.spi.ContextAwareBase;
+
 public class ContextUtil extends ContextAwareBase {
 
 public ContextUtil(Context context) {
@@ -62,10 +67,10 @@
 /**
 * Add the local host's name as a property
 */
- public void addHostNameAsProperty() {
+ public String safelyGetLocalHostName() {
 try {
 String localhostName = getLocalHostName();
- context.putProperty(CoreConstants.HOSTNAME_KEY, localhostName);
+ return localhostName;
 } catch (UnknownHostException e) {
 addError("Failed to get local hostname", e);
 } catch (SocketException e) {
@@ -73,12 +78,14 @@
 } catch (SecurityException e) {
 addError("Failed to get local hostname", e);
 }
+ return CoreConstants.UNKNOWN_LOCALHOST;
 }
 
 public void addProperties(Properties props) {
 if (props == null) {
 return;
 }
+ @SuppressWarnings("rawtypes")
 Iterator i = props.keySet().iterator();
 while (i.hasNext()) {
 String key = (String) i.next();
@@ -86,6 +93,22 @@
 }
 }
 
+ public static Map<String, String> getFilenameCollisionMap(Context context) {
+ if (context == null)
+ return null;
+ @SuppressWarnings("unchecked")
+ Map<String, String> map = (Map<String, String>) context.getObject(FA_FILENAME_COLLISION_MAP);
+ return map;
+ }
+
+ public static Map<String, FileNamePattern> getFilenamePatternCollisionMap(Context context) {
+ if (context == null)
+ return null;
+ @SuppressWarnings("unchecked")
+ Map<String, FileNamePattern> map = (Map<String, FileNamePattern>) context.getObject(RFA_FILENAME_PATTERN_COLLISION_MAP);
+ return map;
+ }
+ 
 public void addGroovyPackages(List<String> frameworkPackages) {
 // addFrameworkPackage(frameworkPackages, "groovy.lang");
 addFrameworkPackage(frameworkPackages, "org.codehaus.groovy.runtime");

_service:tar_scm:v_1.1.7.tar.gz/logback-core/src/main/java/ch/qos/logback/core/util/EnvUtil.java -> _service:tar_scm:v_1.2.8.tar.gz/logback-core/src/main/java/ch/qos/logback/core/util/EnvUtil.java Changed

_service:tar_scm:v_1.1.7.tar.gz/logback-core/src/main/java/ch/qos/logback/core/util/FileSize.java -> _service:tar_scm:v_1.2.8.tar.gz/logback-core/src/main/java/ch/qos/logback/core/util/FileSize.java Changed

_service:tar_scm:v_1.1.7.tar.gz/logback-core/src/main/java/ch/qos/logback/core/util/FixedDelay.java -> _service:tar_scm:v_1.2.8.tar.gz/logback-core/src/main/java/ch/qos/logback/core/util/FixedDelay.java Changed

_service:tar_scm:v_1.2.8.tar.gz/logback-core/src/main/java/ch/qos/logback/core/util/InterruptUtil.java Added

@@ -0,0 +1,54 @@
+package ch.qos.logback.core.util;
+
+import ch.qos.logback.core.Context;
+import ch.qos.logback.core.spi.ContextAwareBase;
+
+/**
+ * Allows masking of interrupt flag if previously the flag is already set. Does nothing otherwise.
+ * 
+ * Typical use:
+ * 
+ * <pre>
+ * InterruptUtil interruptUtil = new InterruptUtil(context);
+ * 
+ * try {
+ * interruptUtil.maskInterruptFlag();
+ * someOtherThread.join(delay); 
+ * } catch(InterruptedException e) {
+ * // reachable only if join does not succeed within delay.
+ * // Without the maskInterruptFlag() call, the join() would have returned immediately
+ * // had the current thread been interrupted previously, i.e. before entering the above block 
+ * } finally {
+ * interruptUtil.unmaskInterruptFlag();
+ * }
+ * </pre>
+ * @author Ceki Gulcu
+ * @since 1.2.2
+ */
+public class InterruptUtil extends ContextAwareBase {
+
+ final boolean previouslyInterrupted;
+
+ public InterruptUtil(Context context) {
+ super();
+ setContext(context);
+ previouslyInterrupted = Thread.currentThread().isInterrupted();
+ }
+
+ public void maskInterruptFlag() {
+ if (previouslyInterrupted) {
+ Thread.interrupted();
+ }
+ }
+
+ public void unmaskInterruptFlag() {
+ if (previouslyInterrupted) {
+ try {
+ Thread.currentThread().interrupt();
+ } catch (SecurityException se) {
+ addError("Failed to intrreupt current thread", se);
+ }
+ }
+ }
+
+}

_service:tar_scm:v_1.1.7.tar.gz/logback-core/src/main/java/ch/qos/logback/core/util/StatusListenerConfigHelper.java -> _service:tar_scm:v_1.2.8.tar.gz/logback-core/src/main/java/ch/qos/logback/core/util/StatusListenerConfigHelper.java Changed

_service:tar_scm:v_1.2.8.tar.gz/logback-core/src/test/input/joran/implicitAction/statusListenerWithPrefix.xml Added

_service:tar_scm:v_1.2.8.tar.gz/logback-core/src/test/input/joran/inclusion/includedEntity.xml Added

_service:tar_scm:v_1.2.8.tar.gz/logback-core/src/test/input/joran/inclusion/topByEntity.xml Added

_service:tar_scm:v_1.1.7.tar.gz/logback-core/src/test/java/ch/qos/logback/core/AsyncAppenderBaseTest.java -> _service:tar_scm:v_1.2.8.tar.gz/logback-core/src/test/java/ch/qos/logback/core/AsyncAppenderBaseTest.java Changed

@@ -103,6 +103,7 @@
         asyncAppenderBase.stop();
         verify(delayingListAppender, 1);
         assertTrue(delayingListAppender.interrupted);
+        Thread.interrupted();
     }
 
     @Test(timeout = 2000)
@@ -239,10 +240,47 @@
         Thread.currentThread().interrupt();
         asyncAppenderBase.doAppend(new Integer(0));
         assertTrue(Thread.currentThread().isInterrupted());
-        // clear flag for next test
+        // clear interrupt flag for subsequent tests
         Thread.interrupted();
     }
 
+    // Interruption of current thread should not prevent logging. 
+    // See also http://jira.qos.ch/browse/LOGBACK-910
+    // and https://jira.qos.ch/browse/LOGBACK-1247
+    @Test
+    public void verifyInterruptionDoesNotPreventLogging() {
+        asyncAppenderBase.addAppender(listAppender);
+        asyncAppenderBase.start();
+        asyncAppenderBase.doAppend(new Integer(0));
+        Thread.currentThread().interrupt();
+        asyncAppenderBase.doAppend(new Integer(1));
+        asyncAppenderBase.doAppend(new Integer(1));
+        assertTrue(Thread.currentThread().isInterrupted());
+        // the interruption needs to be consumed
+        Thread.interrupted();
+        asyncAppenderBase.stop();
+        verify(listAppender, 3);
+    }
+   
+    @Test
+    public void verifyInterruptionFlagWhenStopping_INTERUPPTED() {
+        asyncAppenderBase.addAppender(listAppender);
+        asyncAppenderBase.start();
+        Thread.currentThread().interrupt();
+        asyncAppenderBase.stop();
+        assertTrue(Thread.currentThread().isInterrupted());
+        Thread.interrupted();
+    }
+    
+    @Test
+    public void verifyInterruptionFlagWhenStopping_NOT_INTERUPPTED() {
+        asyncAppenderBase.addAppender(listAppender);
+        asyncAppenderBase.start();
+        asyncAppenderBase.stop();
+        assertFalse(Thread.currentThread().isInterrupted());
+    }
+    
+    
     @Test
     public void verifyInterruptionOfWorkerIsSwallowed() {
         asyncAppenderBase.addAppender(delayingListAppender);

_service:tar_scm:v_1.1.7.tar.gz/logback-core/src/test/java/ch/qos/logback/core/appender/ConsoleAppenderTest.java -> _service:tar_scm:v_1.2.8.tar.gz/logback-core/src/test/java/ch/qos/logback/core/appender/ConsoleAppenderTest.java Changed

_service:tar_scm:v_1.1.7.tar.gz/logback-core/src/test/java/ch/qos/logback/core/appender/DummyAppenderTest.java -> _service:tar_scm:v_1.2.8.tar.gz/logback-core/src/test/java/ch/qos/logback/core/appender/DummyAppenderTest.java Changed

_service:tar_scm:v_1.1.7.tar.gz/logback-core/src/test/java/ch/qos/logback/core/encoder/DummyEncoder.java -> _service:tar_scm:v_1.2.8.tar.gz/logback-core/src/test/java/ch/qos/logback/core/encoder/DummyEncoder.java Changed

@@ -13,8 +13,7 @@
  */
 package ch.qos.logback.core.encoder;
 
-import java.io.IOException;
-import java.io.OutputStream;
+import java.nio.charset.Charset;
 
 import ch.qos.logback.core.CoreConstants;
 
@@ -24,14 +23,14 @@
     String val = DUMMY;
     String fileHeader;
     String fileFooter;
-    String encodingName;
+    Charset charset;
 
-    public String getEncodingName() {
-        return encodingName;
+    public Charset getCharset() {
+        return charset;
     }
 
-    public void setEncodingName(String encodingName) {
-        this.encodingName = encodingName;
+    public void setCharset(Charset charset) {
+        this.charset = charset;
     }
 
     public DummyEncoder() {
@@ -41,50 +40,45 @@
         this.val = val;
     }
 
-    public void doEncode(E event) throws IOException {
-        writeOut(val);
+    public byte encode(E event)  {
+        return encodeString(val);
     }
 
-    private void appendIfNotNull(StringBuilder sb, String s) {
-        if (s != null) {
-            sb.append(s);
+    byte encodeString(String s) {
+        if (charset == null) {
+            return s.getBytes();
+        } else {
+            return s.getBytes(charset);
         }
     }
 
-    void writeOut(String s) throws IOException {
-        if (encodingName == null) {
-            outputStream.write(s.getBytes());
-        } else {
-            outputStream.write(s.getBytes(encodingName));
+    private void appendIfNotNull(StringBuilder sb, String s) {
+        if (s != null) {
+            sb.append(s);
         }
     }
 
-    void writeHeader() throws IOException {
+    byte header() {
         StringBuilder sb = new StringBuilder();
         appendIfNotNull(sb, fileHeader);
         if (sb.length() > 0) {
-            sb.append(CoreConstants.LINE_SEPARATOR);
             // If at least one of file header or presentation header were not
             // null, then append a line separator.
             // This should be useful in most cases and should not hurt.
-            writeOut(sb.toString());
+            sb.append(CoreConstants.LINE_SEPARATOR);
         }
+        return encodeString(sb.toString());
     }
 
-    public void init(OutputStream os) throws IOException {
-        super.init(os);
-        writeHeader();
+    public byte headerBytes() {
+        return header();
     }
 
-    public void close() throws IOException {
+    public byte footerBytes()  {
         if (fileFooter == null) {
-            return;
-        }
-        if (encodingName == null) {
-            outputStream.write(fileFooter.getBytes());
-        } else {
-            outputStream.write(fileFooter.getBytes(encodingName));
+            return null;
         }
+        return encodeString(fileFooter);
     }
 
     public String getFileHeader() {

_service:tar_scm:v_1.1.7.tar.gz/logback-core/src/test/java/ch/qos/logback/core/encoder/NopEncoder.java -> _service:tar_scm:v_1.2.8.tar.gz/logback-core/src/test/java/ch/qos/logback/core/encoder/NopEncoder.java Changed

_service:tar_scm:v_1.1.7.tar.gz/logback-core/src/test/java/ch/qos/logback/core/encoder/PackageTest.java -> _service:tar_scm:v_1.2.8.tar.gz/logback-core/src/test/java/ch/qos/logback/core/encoder/PackageTest.java Changed

_service:tar_scm:v_1.1.7.tar.gz/logback-core/src/test/java/ch/qos/logback/core/joran/SimpleConfigurator.java -> _service:tar_scm:v_1.2.8.tar.gz/logback-core/src/test/java/ch/qos/logback/core/joran/SimpleConfigurator.java Changed

@@ -16,12 +16,11 @@
 import java.util.HashMap;
 
 import ch.qos.logback.core.joran.action.Action;
-import ch.qos.logback.core.joran.action.NestedComplexPropertyIA;
 import ch.qos.logback.core.joran.action.NestedBasicPropertyIA;
-import ch.qos.logback.core.joran.spi.Interpreter;
+import ch.qos.logback.core.joran.action.NestedComplexPropertyIA;
 import ch.qos.logback.core.joran.spi.ElementSelector;
+import ch.qos.logback.core.joran.spi.Interpreter;
 import ch.qos.logback.core.joran.spi.RuleStore;
-import ch.qos.logback.core.joran.util.beans.BeanDescriptionCache;
 
 public class SimpleConfigurator extends GenericConfigurator {
 
@@ -33,11 +32,11 @@
 
     @Override
     protected void addImplicitRules(Interpreter interpreter) {
-        NestedComplexPropertyIA nestedIA = new NestedComplexPropertyIA(new BeanDescriptionCache());
+        NestedComplexPropertyIA nestedIA = new NestedComplexPropertyIA(getBeanDescriptionCache());
         nestedIA.setContext(context);
         interpreter.addImplicitAction(nestedIA);
 
-        NestedBasicPropertyIA nestedSimpleIA = new NestedBasicPropertyIA(new BeanDescriptionCache());
+        NestedBasicPropertyIA nestedSimpleIA = new NestedBasicPropertyIA(getBeanDescriptionCache());
         nestedSimpleIA.setContext(context);
         interpreter.addImplicitAction(nestedSimpleIA);
     }

_service:tar_scm:v_1.1.7.tar.gz/logback-core/src/test/java/ch/qos/logback/core/joran/action/IncludeActionTest.java -> _service:tar_scm:v_1.2.8.tar.gz/logback-core/src/test/java/ch/qos/logback/core/joran/action/IncludeActionTest.java Changed

@@ -71,6 +71,8 @@
 
 static final String TOP_BY_URL = INCLUSION_DIR_PREFIX + "topByUrl.xml";
 
+ static final String TOP_BY_ENTITY = INCLUSION_DIR_PREFIX + "topByEntity.xml";
+
 static final String INCLUDE_BY_RESOURCE = INCLUSION_DIR_PREFIX + "topByResource.xml";
 
 static final String INCLUDED_FILE = INCLUSION_DIR_PREFIX + "included.xml";
@@ -181,7 +183,8 @@
 
 @Test
 public void malformedURL() throws JoranException {
- System.setProperty(INCLUDE_KEY, "htp://logback.qos.ch");
+ 	String MALFORMED = "htp://logback.qos.ch";
+ System.setProperty(INCLUDE_KEY, MALFORMED);
 tc.doConfigure(TOP_BY_URL);
 assertEquals(Status.ERROR, statusChecker.getHighestLevel(0));
 assertTrue(statusChecker.containsException(MalformedURLException.class));
@@ -213,11 +216,22 @@
 tc.doConfigure(MULTI_INCLUDE_BY_FILE);
 verifyConfig(new String { "IA", "IB", "SECOND" });
 }
-
+ 
+ @Test
+ public void includeAsEntity() throws JoranException {
+ tc.doConfigure(TOP_BY_ENTITY);
+ 
+ // entity inclusion disabled
+ // verifyConfig(new String { "EA", "EB" });
+ verifyConfig(new String { });
+ }
+ 
 void verifyConfig(String expected) {
 Stack<String> witness = new Stack<String>();
 witness.addAll(Arrays.asList(expected));
 assertEquals(witness, stackAction.getStack());
 }
 
+
+ 
 }

_service:tar_scm:v_1.1.7.tar.gz/logback-core/src/test/java/ch/qos/logback/core/joran/action/PropertyActionTest.java -> _service:tar_scm:v_1.2.8.tar.gz/logback-core/src/test/java/ch/qos/logback/core/joran/action/PropertyActionTest.java Changed

@@ -26,6 +26,7 @@
 import ch.qos.logback.core.ContextBase;
 import ch.qos.logback.core.joran.spi.InterpretationContext;
 import ch.qos.logback.core.status.ErrorStatus;
+import ch.qos.logback.core.status.Status;
 import ch.qos.logback.core.util.CoreTestConstants;
 import ch.qos.logback.core.util.StatusPrinter;
 
@@ -148,13 +149,13 @@
 }
 
 private boolean checkError() {
- Iterator it = context.getStatusManager().getCopyOfStatusList().iterator();
+ Iterator<Status> it = context.getStatusManager().getCopyOfStatusList().iterator();
 ErrorStatus es = (ErrorStatus) it.next();
 return PropertyAction.INVALID_ATTRIBUTES.equals(es.getMessage());
 }
 
 private boolean checkFileErrors() {
- Iterator it = context.getStatusManager().getCopyOfStatusList().iterator();
+ Iterator<Status> it = context.getStatusManager().getCopyOfStatusList().iterator();
 ErrorStatus es1 = (ErrorStatus) it.next();
 return "Could not find properties file toto.".equals(es1.getMessage());
 }

_service:tar_scm:v_1.1.7.tar.gz/logback-core/src/test/java/ch/qos/logback/core/joran/implicitAction/ImplicitActionTest.java -> _service:tar_scm:v_1.2.8.tar.gz/logback-core/src/test/java/ch/qos/logback/core/joran/implicitAction/ImplicitActionTest.java Changed

@@ -24,7 +24,9 @@
 
 import ch.qos.logback.core.joran.SimpleConfigurator;
 import ch.qos.logback.core.joran.action.Action;
+import ch.qos.logback.core.joran.action.StatusListenerAction;
 import ch.qos.logback.core.joran.spi.ElementSelector;
+import ch.qos.logback.core.status.StatusChecker;
 import ch.qos.logback.core.util.CoreTestConstants;
 import ch.qos.logback.core.util.StatusPrinter;
 
@@ -34,12 +36,14 @@
 
 FruitContext fruitContext = new FruitContext();
 SimpleConfigurator simpleConfigurator;
-
+ StatusChecker checker = new StatusChecker(fruitContext);
+ 
 @Before
 public void setUp() throws Exception {
 fruitContext.setName("fruits");
 HashMap<ElementSelector, Action> rulesMap = new HashMap<ElementSelector, Action>();
 rulesMap.put(new ElementSelector("/context/"), new FruitContextAction());
+ rulesMap.put(new ElementSelector("/context/statusListener"), new StatusListenerAction());
 simpleConfigurator = new SimpleConfigurator(rulesMap);
 simpleConfigurator.setContext(fruitContext);
 }
@@ -118,4 +122,16 @@
 }
 }
 
+ @Test
+ public void statusListenerWithPrefix() throws Exception {
+ try { 
+ simpleConfigurator.doConfigure(IMPLCIT_DIR + "statusListenerWithPrefix.xml");
+ StatusPrinter.print(fruitContext);
+ checker.assertIsErrorFree();
+ } catch (Exception je) {
+ StatusPrinter.print(fruitContext);
+ throw je;
+ }
+ }
+
 }

_service:tar_scm:v_1.1.7.tar.gz/logback-core/src/test/java/ch/qos/logback/core/joran/replay/FruitConfigurator.java -> _service:tar_scm:v_1.2.8.tar.gz/logback-core/src/test/java/ch/qos/logback/core/joran/replay/FruitConfigurator.java Changed

@@ -17,15 +17,14 @@
 
 import ch.qos.logback.core.joran.GenericConfigurator;
 import ch.qos.logback.core.joran.action.NOPAction;
-import ch.qos.logback.core.joran.action.NestedComplexPropertyIA;
 import ch.qos.logback.core.joran.action.NestedBasicPropertyIA;
+import ch.qos.logback.core.joran.action.NestedComplexPropertyIA;
 import ch.qos.logback.core.joran.event.SaxEvent;
+import ch.qos.logback.core.joran.spi.ElementSelector;
 import ch.qos.logback.core.joran.spi.EventPlayer;
 import ch.qos.logback.core.joran.spi.Interpreter;
 import ch.qos.logback.core.joran.spi.JoranException;
-import ch.qos.logback.core.joran.spi.ElementSelector;
 import ch.qos.logback.core.joran.spi.RuleStore;
-import ch.qos.logback.core.joran.util.beans.BeanDescriptionCache;
 
 public class FruitConfigurator extends GenericConfigurator {
 
@@ -45,12 +44,11 @@
 
     @Override
     protected void addImplicitRules(Interpreter interpreter) {
-    	BeanDescriptionCache beanDescriptionCache=new BeanDescriptionCache();
-        NestedComplexPropertyIA nestedIA = new NestedComplexPropertyIA(beanDescriptionCache);
+        NestedComplexPropertyIA nestedIA = new NestedComplexPropertyIA(getBeanDescriptionCache());
         nestedIA.setContext(context);
         interpreter.addImplicitAction(nestedIA);
 
-        NestedBasicPropertyIA nestedSimpleIA = new NestedBasicPropertyIA(beanDescriptionCache);
+        NestedBasicPropertyIA nestedSimpleIA = new NestedBasicPropertyIA(getBeanDescriptionCache());
         nestedIA.setContext(context);
         interpreter.addImplicitAction(nestedSimpleIA);
     }

_service:tar_scm:v_1.1.7.tar.gz/logback-core/src/test/java/ch/qos/logback/core/joran/spi/ConfigurationWatchListTest.java -> _service:tar_scm:v_1.2.8.tar.gz/logback-core/src/test/java/ch/qos/logback/core/joran/spi/ConfigurationWatchListTest.java Changed

_service:tar_scm:v_1.2.8.tar.gz/logback-core/src/test/java/ch/qos/logback/core/joran/util/Citrus.java Added

_service:tar_scm:v_1.1.7.tar.gz/logback-core/src/test/java/ch/qos/logback/core/joran/util/House.java -> _service:tar_scm:v_1.2.8.tar.gz/logback-core/src/test/java/ch/qos/logback/core/joran/util/House.java Changed

_service:tar_scm:v_1.2.8.tar.gz/logback-core/src/test/java/ch/qos/logback/core/joran/util/Orange.java Added

_service:tar_scm:v_1.1.7.tar.gz/logback-core/src/test/java/ch/qos/logback/core/joran/util/PropertySetterTest.java -> _service:tar_scm:v_1.2.8.tar.gz/logback-core/src/test/java/ch/qos/logback/core/joran/util/PropertySetterTest.java Changed

@@ -22,6 +22,7 @@
 import java.nio.charset.Charset;
 import java.nio.charset.UnsupportedCharsetException;
 
+import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 
@@ -32,20 +33,27 @@
 import ch.qos.logback.core.spi.FilterReply;
 import ch.qos.logback.core.status.StatusChecker;
 import ch.qos.logback.core.util.AggregationType;
+import ch.qos.logback.core.util.StatusPrinter;
 
 public class PropertySetterTest {
 
     DefaultNestedComponentRegistry defaultComponentRegistry = new DefaultNestedComponentRegistry();
 
     Context context = new ContextBase();
+    StatusChecker checker = new StatusChecker(context);
     House house = new House();
-    PropertySetter setter = new PropertySetter(new BeanDescriptionCache(),house);
+    
+    PropertySetter setter = new PropertySetter(new BeanDescriptionCache(context), house);
 
     @Before
     public void setUp() {
         setter.setContext(context);
     }
 
+    @After
+    public void tearDown() {
+    }
+
     @Test
     public void testCanAggregateComponent() {
         assertEquals(AggregationType.AS_COMPLEX_PROPERTY, setter.computeAggregationType("door"));
@@ -67,15 +75,13 @@
 
         assertEquals(AggregationType.AS_BASIC_PROPERTY, setter.computeAggregationType("filterReply"));
         assertEquals(AggregationType.AS_BASIC_PROPERTY, setter.computeAggregationType("houseColor"));
-
-        System.out.println();
     }
 
     @Test
     public void testSetProperty() {
         {
             House house = new House();
-            PropertySetter setter = new PropertySetter(new BeanDescriptionCache(),house);
+            PropertySetter setter = new PropertySetter(new BeanDescriptionCache(context), house);
             setter.setProperty("count", "10");
             setter.setProperty("temperature", "33.1");
 
@@ -90,7 +96,7 @@
 
         {
             House house = new House();
-            PropertySetter setter = new PropertySetter(new BeanDescriptionCache(),house);
+            PropertySetter setter = new PropertySetter(new BeanDescriptionCache(context), house);
             setter.setProperty("Count", "10");
             setter.setProperty("Name", "jack");
             setter.setProperty("Open", "true");
@@ -220,4 +226,17 @@
         StatusChecker checker = new StatusChecker(context);
         checker.containsException(UnsupportedCharsetException.class);
     }
+
+    // see also http://jira.qos.ch/browse/LOGBACK-1164
+    @Test
+    public void bridgeMethodsShouldBeIgnored() {
+        Orange orange = new Orange();
+        
+        PropertySetter orangeSetter = new PropertySetter(new BeanDescriptionCache(context), orange);
+        assertEquals(AggregationType.AS_BASIC_PROPERTY, orangeSetter.computeAggregationType(Citrus.PRECARP_PROPERTY_NAME));
+        assertEquals(AggregationType.AS_BASIC_PROPERTY, orangeSetter.computeAggregationType(Citrus.PREFIX_PROPERTY_NAME));
+        
+        StatusPrinter.print(context);
+        checker.assertIsWarningOrErrorFree();
+    }
 }

_service:tar_scm:v_1.1.7.tar.gz/logback-core/src/test/java/ch/qos/logback/core/net/DefaultSocketConnectorTest.java -> _service:tar_scm:v_1.2.8.tar.gz/logback-core/src/test/java/ch/qos/logback/core/net/DefaultSocketConnectorTest.java Changed

_service:tar_scm:v_1.2.8.tar.gz/logback-core/src/test/java/ch/qos/logback/core/net/HardenedObjectInputStreamTest.java Added

@@ -0,0 +1,58 @@
+package ch.qos.logback.core.net;
+
+import static org.junit.Assert.assertEquals;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.ObjectOutputStream;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
+public class HardenedObjectInputStreamTest {
+
+    ByteArrayOutputStream bos;
+    ObjectOutputStream oos;
+    HardenedObjectInputStream inputStream;
+    String whitelist = new String {Innocent.class.getName()};
+    
+    @Before
+    public void setUp() throws Exception {
+        bos = new ByteArrayOutputStream();
+        oos = new ObjectOutputStream(bos);
+    }
+
+    @After
+    public void tearDown() throws Exception {
+    }
+
+    @Test
+    public void smoke() throws ClassNotFoundException, IOException {
+        Innocent innocent = new Innocent();
+        innocent.setAnInt(1);
+        innocent.setAnInteger(2);
+        innocent.setaString("smoke");
+        Innocent back = writeAndRead(innocent);
+        assertEquals(innocent, back);
+    }
+
+
+
+    private Innocent writeAndRead(Innocent innocent) throws IOException, ClassNotFoundException {
+        writeObject(oos, innocent);
+        ByteArrayInputStream bis = new ByteArrayInputStream(bos.toByteArray());
+        inputStream = new HardenedObjectInputStream(bis, whitelist);
+        Innocent fooBack = (Innocent) inputStream.readObject();
+        inputStream.close();
+        return fooBack;
+    }
+    
+    private void writeObject(ObjectOutputStream oos, Object o) throws IOException {
+        oos.writeObject(o);
+        oos.flush();
+        oos.close();
+    }
+    
+}

_service:tar_scm:v_1.2.8.tar.gz/logback-core/src/test/java/ch/qos/logback/core/net/Innocent.java Added

@@ -0,0 +1,69 @@
+package ch.qos.logback.core.net;
+
+public class Innocent implements java.io.Serializable {
+
+    private static final long serialVersionUID = -1227008349289885025L;
+
+    int anInt;
+    Integer anInteger;
+    String aString;
+
+    public int getAnInt() {
+        return anInt;
+    }
+
+    public void setAnInt(int anInt) {
+        this.anInt = anInt;
+    }
+
+    public Integer getAnInteger() {
+        return anInteger;
+    }
+
+    public void setAnInteger(Integer anInteger) {
+        this.anInteger = anInteger;
+    }
+
+    public String getaString() {
+        return aString;
+    }
+
+    public void setaString(String aString) {
+        this.aString = aString;
+    }
+
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int result = 1;
+        result = prime * result + ((aString == null) ? 0 : aString.hashCode());
+        result = prime * result + anInt;
+        result = prime * result + ((anInteger == null) ? 0 : anInteger.hashCode());
+        return result;
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj)
+            return true;
+        if (obj == null)
+            return false;
+        if (getClass() != obj.getClass())
+            return false;
+        Innocent other = (Innocent) obj;
+        if (aString == null) {
+            if (other.aString != null)
+                return false;
+        } else if (!aString.equals(other.aString))
+            return false;
+        if (anInt != other.anInt)
+            return false;
+        if (anInteger == null) {
+            if (other.anInteger != null)
+                return false;
+        } else if (!anInteger.equals(other.anInteger))
+            return false;
+        return true;
+    }
+
+}

_service:tar_scm:v_1.1.7.tar.gz/logback-core/src/test/java/ch/qos/logback/core/net/PackageTest.java -> _service:tar_scm:v_1.2.8.tar.gz/logback-core/src/test/java/ch/qos/logback/core/net/PackageTest.java Changed

_service:tar_scm:v_1.1.7.tar.gz/logback-core/src/test/java/ch/qos/logback/core/net/ssl/mock/MockSSLConfigurable.java -> _service:tar_scm:v_1.2.8.tar.gz/logback-core/src/test/java/ch/qos/logback/core/net/ssl/mock/MockSSLConfigurable.java Changed

_service:tar_scm:v_1.1.7.tar.gz/logback-core/src/test/java/ch/qos/logback/core/pattern/parser/AbstractPatternLayoutBaseTest.java -> _service:tar_scm:v_1.2.8.tar.gz/logback-core/src/test/java/ch/qos/logback/core/pattern/parser/AbstractPatternLayoutBaseTest.java Changed

_service:tar_scm:v_1.1.7.tar.gz/logback-core/src/test/java/ch/qos/logback/core/recovery/ResilientOutputStreamTest.java -> _service:tar_scm:v_1.2.8.tar.gz/logback-core/src/test/java/ch/qos/logback/core/recovery/ResilientOutputStreamTest.java Changed

_service:tar_scm:v_1.2.8.tar.gz/logback-core/src/test/java/ch/qos/logback/core/rolling/CollisionDetectionTest.java Added

@@ -0,0 +1,141 @@
+package ch.qos.logback.core.rolling;
+
+import static ch.qos.logback.core.CoreConstants.FA_FILENAME_COLLISION_MAP;
+import static ch.qos.logback.core.util.CoreTestConstants.OUTPUT_DIR_PREFIX;
+
+import java.util.Map;
+
+import org.junit.After;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+
+import ch.qos.logback.core.Context;
+import ch.qos.logback.core.ContextBase;
+import ch.qos.logback.core.FileAppender;
+import ch.qos.logback.core.encoder.NopEncoder;
+import ch.qos.logback.core.status.Status;
+import ch.qos.logback.core.status.StatusChecker;
+import ch.qos.logback.core.testUtil.RandomUtil;
+import ch.qos.logback.core.util.StatusPrinter;
+
+public class CollisionDetectionTest {
+
+ Context context = new ContextBase();
+ StatusChecker statusChecker = new StatusChecker(context);
+ int diff = RandomUtil.getPositiveInt();
+ protected String randomOutputDir = OUTPUT_DIR_PREFIX + diff + "/";
+ 
+ @Before
+ public void setUp() throws Exception {
+ }
+
+ @After
+ public void tearDown() throws Exception {
+ }
+
+ 
+ FileAppender<String> buildFileAppender(String name, String filenameSuffix) {
+ FileAppender<String> fileAppender = new FileAppender<String>();
+ fileAppender.setName(name);
+ fileAppender.setContext(context);
+ fileAppender.setFile(randomOutputDir+filenameSuffix);
+ fileAppender.setEncoder(new NopEncoder<String>());
+ return fileAppender;
+ }
+ 
+ RollingFileAppender<String> buildRollingFileAppender(String name, String filenameSuffix, String patternSuffix) {
+ RollingFileAppender<String> rollingFileAppender = new RollingFileAppender<String>();
+ rollingFileAppender.setName(name);
+ rollingFileAppender.setContext(context);
+ rollingFileAppender.setFile(randomOutputDir+filenameSuffix);
+ rollingFileAppender.setEncoder(new NopEncoder<String>());
+ 
+ TimeBasedRollingPolicy<String> tbrp = new TimeBasedRollingPolicy<String>();
+ tbrp.setContext(context);
+ tbrp.setFileNamePattern(randomOutputDir+patternSuffix);
+ tbrp.setParent(rollingFileAppender);
+ //tbrp.timeBasedFileNamingAndTriggeringPolicy = new DefaultTimeBasedFileNamingAndTriggeringPolicy<Object>();
+ //tbrp.timeBasedFileNamingAndTriggeringPolicy.setCurrentTime(givenTime);
+ rollingFileAppender.setRollingPolicy(tbrp);
+ tbrp.start();
+
+ 
+ return rollingFileAppender;
+ }
+ 
+ 
+ @Test
+ public void collisionImpossibleForSingleAppender() {
+ FileAppender<String> fileAppender = buildFileAppender("FA", "collisionImpossibleForSingleAppender");
+ fileAppender.start();
+ statusChecker.assertIsErrorFree();
+ 
+ }
+
+ @Test
+ public void appenderStopShouldClearEntryInCollisionMap() {
+ String key = "FA";
+ FileAppender<String> fileAppender = buildFileAppender(key, "collisionImpossibleForSingleAppender");
+ fileAppender.start();
+ assertCollisionMapHasEntry(FA_FILENAME_COLLISION_MAP, key);
+ fileAppender.stop();
+ assertCollisionMapHasNoEntry(FA_FILENAME_COLLISION_MAP, key);
+ statusChecker.assertIsErrorFree();
+ 
+ 
+ }
+ 
+ private void assertCollisionMapHasEntry(String mapName, String key) {
+ @SuppressWarnings("unchecked")
+ Map<String, ?> map = (Map<String, ?>) context.getObject(mapName);
+ Assert.assertNotNull(map);
+ Assert.assertNotNull(map.get(key));
+ }
+ private void assertCollisionMapHasNoEntry(String mapName, String key) {
+ @SuppressWarnings("unchecked")
+ Map<String, ?> map = (Map<String, ?>) context.getObject(mapName);
+ Assert.assertNotNull(map);
+ Assert.assertNull(map.get(key));
+ }
+
+ @Test
+ public void collisionWithTwoFileAppenders() {
+ String suffix = "collisionWithToFileAppenders";
+ 
+ FileAppender<String> fileAppender1 = buildFileAppender("FA1", suffix);
+ fileAppender1.start();
+ 
+ FileAppender<String> fileAppender2 = buildFileAppender("FA2", suffix);
+ fileAppender2.start();
+ statusChecker.assertContainsMatch(Status.ERROR, "'File' option has the same value");
+ //StatusPrinter.print(context);
+ }
+
+ @Test
+ public void collisionWith_FA_RFA() {
+ String suffix = "collisionWith_FA_RFA";
+ 
+ FileAppender<String> fileAppender1 = buildFileAppender("FA", suffix);
+ fileAppender1.start();
+ 
+ RollingFileAppender<String> rollingfileAppender = buildRollingFileAppender("RFA", suffix, "bla-%d.log");
+ rollingfileAppender.start();
+ StatusPrinter.print(context);
+ statusChecker.assertContainsMatch(Status.ERROR, "'File' option has the same value"); 
+ }
+
+ @Test
+ public void collisionWith_2RFA() {
+ String suffix = "collisionWith_2RFA";
+ 
+ RollingFileAppender<String> rollingfileAppender1 = buildRollingFileAppender("RFA1", suffix, "bla-%d.log");
+ rollingfileAppender1.start();
+ RollingFileAppender<String> rollingfileAppender2 = buildRollingFileAppender("RFA1", suffix, "bla-%d.log");
+ rollingfileAppender2.start();
+ 
+ StatusPrinter.print(context);
+ statusChecker.assertContainsMatch(Status.ERROR, "'FileNamePattern' option has the same value"); 
+ }
+
+}

_service:tar_scm:v_1.2.8.tar.gz/logback-core/src/test/java/ch/qos/logback/core/rolling/JVMExitBeforeCompressionISDoneTest.java Added

@@ -0,0 +1,113 @@
+package ch.qos.logback.core.rolling;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+import java.io.File;
+import java.util.Date;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Ignore;
+import org.junit.Test;
+
+import ch.qos.logback.core.CoreConstants;
+import ch.qos.logback.core.encoder.EchoEncoder;
+import ch.qos.logback.core.hook.DelayingShutdownHook;
+import ch.qos.logback.core.status.OnConsoleStatusListener;
+import ch.qos.logback.core.testUtil.RandomUtil;
+import ch.qos.logback.core.util.StatusListenerConfigHelper;
+import ch.qos.logback.core.util.StatusPrinter;
+@Ignore
+public class JVMExitBeforeCompressionISDoneTest extends ScaffoldingForRollingTests {
+
+ RollingFileAppender<Object> rfa = new RollingFileAppender<Object>();
+ TimeBasedRollingPolicy<Object> tbrp = new TimeBasedRollingPolicy<Object>();
+ DelayingShutdownHook delayingShutdownHook = new DelayingShutdownHook();
+ 
+ static final long FRI_2016_05_13_T_170415_GMT = 1463159055630L;
+ 
+ EchoEncoder<Object> encoder = new EchoEncoder<Object>();
+
+ @Before
+ @Override
+ public void setUp() {
+ super.setUp();
+ StatusListenerConfigHelper.addOnConsoleListenerInstance(context, new OnConsoleStatusListener());
+ delayingShutdownHook.setContext(context);
+ initRFA(rfa);
+ }
+
+ void initRFA(RollingFileAppender<Object> rfa) {
+ rfa.setContext(context);
+ rfa.setEncoder(encoder);
+ }
+
+ void initTRBP(RollingFileAppender<Object> rfa, TimeBasedRollingPolicy<Object> tbrp, String filenamePattern, long givenTime) {
+ tbrp.setContext(context);
+ tbrp.setFileNamePattern(filenamePattern);
+ tbrp.setParent(rfa);
+ tbrp.timeBasedFileNamingAndTriggeringPolicy = new DefaultTimeBasedFileNamingAndTriggeringPolicy<Object>();
+ tbrp.timeBasedFileNamingAndTriggeringPolicy.setCurrentTime(givenTime);
+ rfa.setRollingPolicy(tbrp);
+ tbrp.start();
+ rfa.start();
+ }
+
+ @After
+ public void tearDown() throws Exception {
+ StatusPrinter.print(context);
+ }
+
+ @Ignore
+ @Test
+ public void test1() {
+ Thread shutdownThread = new Thread(delayingShutdownHook);
+ Runtime.getRuntime().addShutdownHook(shutdownThread);
+ 
+ String patternPrefix = "test1";
+ String compressionSuffix = ".zip";
+
+ this.currentTime = FRI_2016_05_13_T_170415_GMT;
+ 
+ Date d = new Date(FRI_2016_05_13_T_170415_GMT); //WED_2016_03_23_T_230705_CET);
+ System.out.println(d);
+ System.out.print(d.getTime());
+ 
+ int ticksPerHour = 100;
+ int hours = 7;
+ int totalTicks = ticksPerHour*hours;
+ long singleTickDuration = CoreConstants.MILLIS_IN_ONE_HOUR/ticksPerHour;
+ 
+ String fileNamePatternStr = randomOutputDir + patternPrefix + "-%d{" + DATE_PATTERN_BY_DAY + ", GMT}" + compressionSuffix;
+ initTRBP(rfa, tbrp, fileNamePatternStr, currentTime);
+
+ incCurrentTime(singleTickDuration);
+ tbrp.timeBasedFileNamingAndTriggeringPolicy.setCurrentTime(currentTime);
+
+ for (int i = 0; i < totalTicks; i++) {
+ StringBuilder sb = new StringBuilder(1000);
+ sb.append("Hello");
+ for(int j = 0; j < 100; j++) {
+ sb.append(RandomUtil.getPositiveInt());
+ }
+ sb.append(i);
+ 
+ rfa.doAppend(sb.toString());
+ addExpectedFileNamedIfItsTime_ByDate(fileNamePatternStr);
+ incCurrentTime(singleTickDuration);
+ tbrp.timeBasedFileNamingAndTriggeringPolicy.setCurrentTime(currentTime);
+ }
+ 
+
+ 
+ 
+ String nameOfExpectedZipFile = randomOutputDir + patternPrefix+"-2016-05-13.zip";;
+ 
+ // File expectedZipFile = new File(nameOfExpectedZipFile);
+ // assertTrue("expecting file "+nameOfExpectedZipFile+" to exist", expectedZipFile.exists());
+ // File files = getFilesInDirectory(randomOutputDir);
+ // assertEquals(2, files.length);
+ }
+
+}

_service:tar_scm:v_1.1.7.tar.gz/logback-core/src/test/java/ch/qos/logback/core/rolling/MultiThreadedRollingTest.java -> _service:tar_scm:v_1.2.8.tar.gz/logback-core/src/test/java/ch/qos/logback/core/rolling/MultiThreadedRollingTest.java Changed

_service:tar_scm:v_1.1.7.tar.gz/logback-core/src/test/java/ch/qos/logback/core/rolling/PackageTest.java -> _service:tar_scm:v_1.2.8.tar.gz/logback-core/src/test/java/ch/qos/logback/core/rolling/PackageTest.java Changed

_service:tar_scm:v_1.1.7.tar.gz/logback-core/src/test/java/ch/qos/logback/core/rolling/ScaffoldingForRollingTests.java -> _service:tar_scm:v_1.2.8.tar.gz/logback-core/src/test/java/ch/qos/logback/core/rolling/ScaffoldingForRollingTests.java Changed

_service:tar_scm:v_1.1.7.tar.gz/logback-core/src/test/java/ch/qos/logback/core/rolling/SizeAndTimeBasedFNATP_Test.java -> _service:tar_scm:v_1.2.8.tar.gz/logback-core/src/test/java/ch/qos/logback/core/rolling/SizeAndTimeBasedFNATP_Test.java Changed

@@ -14,6 +14,7 @@
 package ch.qos.logback.core.rolling;
 
 import static org.junit.Assert.assertFalse;
+
 import java.io.File;
 import java.io.IOException;
 import java.util.Date;
@@ -27,6 +28,7 @@
 import ch.qos.logback.core.status.InfoStatus;
 import ch.qos.logback.core.status.StatusChecker;
 import ch.qos.logback.core.status.StatusManager;
+import ch.qos.logback.core.util.FileSize;
 
 public class SizeAndTimeBasedFNATP_Test extends ScaffoldingForRollingTests {
 private SizeAndTimeBasedFNATP<Object> sizeAndTimeBasedFNATP = null;
@@ -57,7 +59,7 @@
 long lastCheck) {
 sizeAndTimeBasedFNATP = new SizeAndTimeBasedFNATP<Object>();
 tbrp.setContext(context);
- sizeAndTimeBasedFNATP.setMaxFileSize(Integer.toString(sizeThreshold));
+ sizeAndTimeBasedFNATP.setMaxFileSize(new FileSize(sizeThreshold));
 tbrp.setTimeBasedFileNamingAndTriggeringPolicy(sizeAndTimeBasedFNATP);
 tbrp.setFileNamePattern(filenamePattern);
 tbrp.setParent(rfa);

_service:tar_scm:v_1.1.7.tar.gz/logback-core/src/test/java/ch/qos/logback/core/rolling/SizeBasedRollingTest.java -> _service:tar_scm:v_1.2.8.tar.gz/logback-core/src/test/java/ch/qos/logback/core/rolling/SizeBasedRollingTest.java Changed

@@ -13,14 +13,16 @@
  */
 package ch.qos.logback.core.rolling;
 
-import ch.qos.logback.core.encoder.EchoEncoder;
-import ch.qos.logback.core.util.CoreTestConstants;
+import java.io.IOException;
+import java.util.List;
+
 import org.junit.Before;
 import org.junit.Test;
 
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
+import ch.qos.logback.core.encoder.EchoEncoder;
+import ch.qos.logback.core.util.CoreTestConstants;
+import ch.qos.logback.core.util.FileSize;
+import ch.qos.logback.core.util.StatusPrinter;
 
 public class SizeBasedRollingTest extends ScaffoldingForRollingTests {
 
@@ -51,7 +53,7 @@
      */
     @Test(expected = IllegalStateException.class)
     public void activeFileNameNotSet() {
-        sizeBasedTriggeringPolicy.setMaxFileSize("100");
+        sizeBasedTriggeringPolicy.setMaxFileSize(new FileSize(100));
         sizeBasedTriggeringPolicy.start();
 
         fwrp.setFileNamePattern(CoreTestConstants.OUTPUT_DIR_PREFIX + "sizeBased-test1.%i");
@@ -63,7 +65,7 @@
         rfa.setName("ROLLING");
         initRFA(randomOutputDir + fileName);
 
-        sizeBasedTriggeringPolicy.setMaxFileSize("100");
+        sizeBasedTriggeringPolicy.setMaxFileSize(new FileSize(100));
         fwrp.setMinIndex(0);
         fwrp.setFileNamePattern(randomOutputDir + filenamePattern);
 
@@ -82,6 +84,7 @@
         }
         rfa.stop();
 
+        StatusPrinter.print(context);
         existenceCheck(expectedFilenameList);
         reverseSortedContentCheck(randomOutputDir, runLength, prefix);
     }

_service:tar_scm:v_1.1.7.tar.gz/logback-core/src/test/java/ch/qos/logback/core/rolling/TimeBasedFileNamingAndTriggeringPolicyBaseTest.java -> _service:tar_scm:v_1.2.8.tar.gz/logback-core/src/test/java/ch/qos/logback/core/rolling/TimeBasedFileNamingAndTriggeringPolicyBaseTest.java Changed

_service:tar_scm:v_1.1.7.tar.gz/logback-core/src/test/java/ch/qos/logback/core/rolling/TimeBasedRollingTest.java -> _service:tar_scm:v_1.2.8.tar.gz/logback-core/src/test/java/ch/qos/logback/core/rolling/TimeBasedRollingTest.java Changed

@@ -185,7 +185,7 @@
 
 @Test
 public void noCompression_FileSet_NoRestart_5() throws IOException {
- defaultTest("test5", "test6", "", FILE_OPTION_SET, NO_RESTART);
+ defaultTest("test5", "test5", "", FILE_OPTION_SET, NO_RESTART);
 }
 
 @Test
@@ -196,12 +196,12 @@
 // LOGBACK-168
 @Test
 public void withMissingTargetDirWithCompression() throws IOException {
- defaultTest("test7", "%d{yyyy-MM-dd, aux}/", ".gz", FILE_OPTION_SET, NO_RESTART);
+ defaultTest("test7", "%d{yyyy-MM-dd, aux}/test7", ".gz", FILE_OPTION_SET, NO_RESTART);
 }
 
 @Test
 public void withMissingTargetDirWithZipCompression() throws IOException {
- defaultTest("test8", "%d{yyyy-MM-dd, aux}/", ".zip", FILE_OPTION_SET, NO_RESTART);
+ defaultTest("test8", "%d{yyyy-MM-dd, aux}/test8", ".zip", FILE_OPTION_SET, NO_RESTART);
 }
 
 @Test
@@ -228,55 +228,6 @@
 }
 }
 
- //
- // @Test
- // public void withMissingTargetDir() throws Exception {
- // String testId = "missingTargetDir";
- //
- // initRFA(rfa1, testId2FileName(testId));
- // int secondDiff = RandomUtil.getPositiveInt();
- // String randomTargetDir = CoreTestConstants.OUTPUT_DIR_PREFIX + secondDiff + '/';
- //
- // System.out.println("randomOutputDir" + randomOutputDir);
- // System.out.println("randomTargetDir" + randomTargetDir);
- //
- // initTRBP(rfa1, tbrp1, randomTargetDir + testId + "-%d{"
- // + DATE_PATTERN_WITH_SECONDS + "}", currentTime);
- //
- // addExpectedFileName_ByDate(randomTargetDir, testId, getDateOfCurrentPeriodsStart(), false);
- //
- // incCurrentTime(1100);
- // tbrp1.timeBasedFileNamingAndTriggeringPolicy.setCurrentTime(currentTime);
- //
- // for (int i = 0; i < 3; i++) {
- // rfa1.doAppend("Hello---" + i);
- // addExpectedFileNamedIfItsTime_ByDate(randomTargetDir, testId, false);
- // incCurrentTime(500);
- // tbrp1.timeBasedFileNamingAndTriggeringPolicy.setCurrentTime(currentTime);
- // }
- // massageExpectedFilesToCorresponToCurrentTarget("missingTargetDir.log");
- // int i = 0;
- // for (String fn : expectedFilenameList) {
- // System.out.println("expectedFile=" + fn);
- // assertTrue(Compare.compare(fn, CoreTestConstants.TEST_SRC_PREFIX
- // + "witness/rolling/tbr-test5." + i++));
- // }
- //
- // }
- //
- // =========================================================================
- // utility methods
- // =========================================================================
- //
- // void massageExpectedFilesToCorresponToCurrentTarget(String file) {
- // // we added one too many files by date
- // expectedFilenameList.remove(expectedFilenameList.size() - 1);
- // // since file is set, we have to add it
- // addExpectedFileName_ByFile(file);
- // }
- //
- // void addExpectedFileName_ByFile(String filenameSuffix) {
- // String fn = randomOutputDir + filenameSuffix;
- // expectedFilenameList.add(fn);
- // }
+ 
+ 
 }

_service:tar_scm:v_1.1.7.tar.gz/logback-core/src/test/java/ch/qos/logback/core/rolling/TimeBasedRollingWithArchiveRemoval_Test.java -> _service:tar_scm:v_1.2.8.tar.gz/logback-core/src/test/java/ch/qos/logback/core/rolling/TimeBasedRollingWithArchiveRemoval_Test.java Changed

@@ -57,7 +57,7 @@
 TimeBasedFileNamingAndTriggeringPolicy<Object> tbfnatp = new DefaultTimeBasedFileNamingAndTriggeringPolicy<Object>();
 
 StatusChecker checker = new StatusChecker(context);
- 
+
 static long MILLIS_IN_MINUTE = 60 * 1000;
 static long MILLIS_IN_HOUR = 60 * MILLIS_IN_MINUTE;
 static long MILLIS_IN_DAY = 24 * MILLIS_IN_HOUR;
@@ -68,13 +68,12 @@
 static final long WED_2016_03_23_T_230705_CET = 1458770825333L;
 static final long THU_2016_03_17_T_230330_CET = 1458252210975L;
 
- 
 int slashCount = 0;
- int ticksPerPeriod = 216; 
- 
+ int ticksPerPeriod = 216;
+
 ConfigParameters cp; // initialized in setup
- FixedRateInvocationGate fixedRateInvocationGate = new FixedRateInvocationGate(ticksPerPeriod/2);
- 
+ FixedRateInvocationGate fixedRateInvocationGate = new FixedRateInvocationGate(ticksPerPeriod / 2);
+
 @Before
 public void setUp() {
 super.setUp();
@@ -129,31 +128,30 @@
 
 long generateDailyRolloverAndCheckFileCount(ConfigParameters cp) {
 long millisAtEnd = generateDailyRollover(cp);
- int periodBarriersCrossed= computeCrossedDayBarriers(currentTime, millisAtEnd); 
- System.out.println("**** "+periodBarriersCrossed);
+ int periodBarriersCrossed = computeCrossedDayBarriers(currentTime, millisAtEnd);
+ System.out.println("**** periodBarriersCrossed=" + periodBarriersCrossed);
 checkFileCount(expectedCountWithoutFoldersWithInactivity(cp.maxHistory, periodBarriersCrossed, cp.startInactivity + cp.numInactivityPeriods));
 return millisAtEnd;
 }
 
 @Test
 public void checkCrossedPeriodsWithDSTBarrier() {
- long SAT_2016_03_26_T_230705_CET = WED_2016_03_23_T_230705_CET+3*CoreConstants.MILLIS_IN_ONE_DAY;
- System.out.println("SAT_2016_03_26_T_230705_CET "+new Date(SAT_2016_03_26_T_230705_CET));
- long MON_2016_03_28_T_000705_CET = SAT_2016_03_26_T_230705_CET+CoreConstants.MILLIS_IN_ONE_DAY;
- System.out.println("MON_2016_03_28_T_000705_CET "+new Date(MON_2016_03_28_T_000705_CET));
- 
+ long SAT_2016_03_26_T_230705_CET = WED_2016_03_23_T_230705_CET + 3 * CoreConstants.MILLIS_IN_ONE_DAY;
+ System.out.println("SAT_2016_03_26_T_230705_CET " + new Date(SAT_2016_03_26_T_230705_CET));
+ long MON_2016_03_28_T_000705_CET = SAT_2016_03_26_T_230705_CET + CoreConstants.MILLIS_IN_ONE_DAY;
+ System.out.println("MON_2016_03_28_T_000705_CET " + new Date(MON_2016_03_28_T_000705_CET));
+
 int result = computeCrossedDayBarriers(SAT_2016_03_26_T_230705_CET, MON_2016_03_28_T_000705_CET, "CET");
 assertEquals(2, result);
 }
- 
+
 private int computeCrossedDayBarriers(long currentTime, long millisAtEnd) {
 return computeCrossedDayBarriers(currentTime, millisAtEnd, null);
 }
 
-
 private int computeCrossedDayBarriers(long currentTime, long millisAtEnd, String timeZoneID) {
 DateTimeZone dateTimeZone = DateTimeZone.getDefault();
- if(timeZoneID != null) {
+ if (timeZoneID != null) {
 dateTimeZone = DateTimeZone.forID(timeZoneID);
 }
 LocalDate startInstant = new LocalDate(currentTime, dateTimeZone);
@@ -161,7 +159,7 @@
 Days days = Days.daysBetween(startInstant, endInstant);
 return days.getDays();
 }
- 
+
 @Test
 public void checkCleanupForBasicDailyRollover() {
 cp.maxHistory(20).simulatedNumberOfPeriods(20 * 3).startInactivity(0).numInactivityPeriods(0);
@@ -173,32 +171,27 @@
 long bytesOutputPerPeriod = 15984;
 int sizeInUnitsOfBytesPerPeriod = 2;
 
- cp.maxHistory(5).simulatedNumberOfPeriods(10).sizeCap(sizeInUnitsOfBytesPerPeriod * bytesOutputPerPeriod+1000);
+ cp.maxHistory(5).simulatedNumberOfPeriods(10).sizeCap(sizeInUnitsOfBytesPerPeriod * bytesOutputPerPeriod + 1000);
 generateDailyRollover(cp);
 StatusPrinter.print(context);
- checkFileCount(sizeInUnitsOfBytesPerPeriod+1);
+ checkFileCount(sizeInUnitsOfBytesPerPeriod + 1);
 }
 
- 
 @Test
 public void checkThatSmallTotalSizeCapLeavesAtLeastOneArhcive() {
- long WED_2016_03_23_T_131345_CET = WED_2016_03_23_T_230705_CET-10*CoreConstants.MILLIS_IN_ONE_HOUR;
- 
- //long bytesOutputPerPeriod = 15984;
+ long WED_2016_03_23_T_131345_CET = WED_2016_03_23_T_230705_CET - 10 * CoreConstants.MILLIS_IN_ONE_HOUR;
+
+ // long bytesOutputPerPeriod = 15984;
 
 cp = new ConfigParameters(WED_2016_03_23_T_131345_CET);
 final int verySmallCapSize = 1;
 cp.maxHistory(5).simulatedNumberOfPeriods(3).sizeCap(verySmallCapSize);
 generateDailyRollover(cp);
 StatusPrinter.print(context);
- checkFileCount(2);
- // at least two archive files. See TimeBasedArchiveRemover.UNTOUCHABLE_ARCHIVE_FILE_COUNT
- checker.assertNoMatch("Deleting.*clean-2016-03-25.txt");
- // we don't want active file deleted
- checker.assertNoMatch("Deleting.*clean-2016-03-26.txt");
+ checkFileCountAtMost(1);
+ 
 }
 
- 
 @Test
 public void checkCleanupForBasicDailyRolloverWithMaxSize() {
 cp.maxHistory(6).simulatedNumberOfPeriods(30).startInactivity(10).numInactivityPeriods(1);
@@ -215,13 +208,11 @@
 
 @Test
 public void checkCleanupForDailyRolloverWithInactivity_30Periods() {
- /// -------
+ // / -------
 cp.maxHistory(2).simulatedNumberOfPeriods(30).startInactivity(3).numInactivityPeriods(1);
 generateDailyRolloverAndCheckFileCount(cp);
 }
 
- 
- 
 @Test
 public void checkCleanupForDailyRolloverWithInactivity_10Periods() {
 this.currentTime = THU_2016_03_17_T_230330_CET;
@@ -260,8 +251,8 @@
 public void dailySizeBasedRolloverWithoutCap() {
 SizeAndTimeBasedFNATP<Object> sizeAndTimeBasedFNATP = new SizeAndTimeBasedFNATP<Object>();
 sizeAndTimeBasedFNATP.invocationGate = fixedRateInvocationGate;
- 
- sizeAndTimeBasedFNATP.setMaxFileSize("10000");
+
+ sizeAndTimeBasedFNATP.setMaxFileSize(new FileSize(10000));
 tbfnatp = sizeAndTimeBasedFNATP;
 this.slashCount = computeSlashCount(DAILY_DATE_PATTERN);
 String fileNamePattern = randomOutputDir + "/%d{" + DAILY_DATE_PATTERN + "}-clean.%i.zip";
@@ -271,19 +262,19 @@
 }
 
 @Test
- public void dailySizeBasedRolloverWithSizeCap() {
+ public void dailySizeBasedRolloverWithSizeCap() {
 SizeAndTimeBasedFNATP<Object> sizeAndTimeBasedFNATP = new SizeAndTimeBasedFNATP<Object>();
- sizeAndTimeBasedFNATP.invocationGate = new FixedRateInvocationGate(ticksPerPeriod/8);
+ sizeAndTimeBasedFNATP.invocationGate = new FixedRateInvocationGate(ticksPerPeriod / 8);
 long bytesPerPeriod = 17000;
- long fileSize = (bytesPerPeriod)/5;
+ long fileSize = (bytesPerPeriod) / 5;
 int expectedFileCount = 10;
 long sizeCap = expectedFileCount * fileSize;
- sizeAndTimeBasedFNATP.setMaxFileSize(Long.toString(fileSize));
+ sizeAndTimeBasedFNATP.setMaxFileSize(new FileSize(fileSize));
 tbfnatp = sizeAndTimeBasedFNATP;
 this.slashCount = computeSlashCount(DAILY_DATE_PATTERN);
 
- // 2016-03-05 00:14:39 CET 
- long simulatedTime = 1457133279186L; 
+ // 2016-03-05 00:14:39 CET
+ long simulatedTime = 1457133279186L;
 ConfigParameters params = new ConfigParameters(simulatedTime);
 String fileNamePattern = randomOutputDir + "/%d{" + DAILY_DATE_PATTERN + "}-clean.%i";
 params.maxHistory(60).fileNamePattern(fileNamePattern).simulatedNumberOfPeriods(10).sizeCap(sizeCap);
@@ -305,7 +296,7 @@
 @Test
 public void dailyChronologSizeBasedRollover() {
 SizeAndTimeBasedFNATP<Object> sizeAndTimeBasedFNATP = new SizeAndTimeBasedFNATP<Object>();
- sizeAndTimeBasedFNATP.setMaxFileSize("10000");
+ sizeAndTimeBasedFNATP.setMaxFileSize(new FileSize(10000));
 sizeAndTimeBasedFNATP.invocationGate = fixedRateInvocationGate;
 tbfnatp = sizeAndTimeBasedFNATP;
 slashCount = 1;
@@ -318,7 +309,7 @@
 @Test
 public void dailyChronologSizeBasedRolloverWithSecondPhase() {
 SizeAndTimeBasedFNATP<Object> sizeAndTimeBasedFNATP = new SizeAndTimeBasedFNATP<Object>();
- sizeAndTimeBasedFNATP.setMaxFileSize("10000");
+ sizeAndTimeBasedFNATP.setMaxFileSize(new FileSize(10000));
 sizeAndTimeBasedFNATP.invocationGate = fixedRateInvocationGate;
 tbfnatp = sizeAndTimeBasedFNATP;
 this.slashCount = 1;
@@ -338,7 +329,7 @@
 ConfigParameters params = new ConfigParameters(currentTime).fileNamePattern(fileNamePattern).maxHistory(maxHistory);
 buildRollingFileAppender(params, DO_CLEAN_HISTORY_ON_START);
 rfa.doAppend("Hello ----------------------------------------------------------" + new Date(currentTime));
- currentTime += MILLIS_IN_DAY/2;
+ currentTime += MILLIS_IN_DAY / 2;
 add(tbrp.compressionFuture);
 add(tbrp.cleanUpFuture);
 waitForJobsToComplete();
@@ -351,7 +342,7 @@
 public void cleanHistoryOnStart() {
 long simulatedTime = WED_2016_03_23_T_230705_CET;
 System.out.println(new Date(simulatedTime));
- 
+
 String fileNamePattern = randomOutputDir + "clean-%d{" + DAILY_DATE_PATTERN + "}.txt";
 int maxHistory = 3;
 for (int i = 0; i <= 5; i++) {
@@ -428,42 +419,51 @@
 long logOverMultiplePeriods(ConfigParameters cp) {
 
 buildRollingFileAppender(cp, DO_NOT_CLEAN_HISTORY_ON_START);
- 
+
 int runLength = cp.simulatedNumberOfPeriods * ticksPerPeriod;
 int startInactivityIndex = cp.startInactivity * ticksPerPeriod;
 int endInactivityIndex = startInactivityIndex + cp.numInactivityPeriods * ticksPerPeriod;
 long tickDuration = cp.periodDurationInMillis / ticksPerPeriod;
 
- System.out.println("cp.periodDurationInMillis="+cp.periodDurationInMillis+", tickDuration=:"+tickDuration+", runLength="+runLength);
+ System.out.println("cp.periodDurationInMillis=" + cp.periodDurationInMillis + ", tickDuration=:" + tickDuration + ", runLength=" + runLength);
 for (int i = 0; i <= runLength; i++) {
+ Date currentDate = new Date(tbrp.timeBasedFileNamingAndTriggeringPolicy.getCurrentTime());
 if (i < startInactivityIndex || i > endInactivityIndex) {
 StringBuilder sb = new StringBuilder("Hello");
+ String currentDateStr = currentDate.toString();
 String iAsString = Integer.toString(i);
- SpacePadder.spacePad(sb, 66+(6-iAsString.length()));
+ sb.append(currentDateStr);
+ SpacePadder.spacePad(sb, 66 + (3 - iAsString.length() - currentDateStr.length()));
+ sb.append(iAsString);
 rfa.doAppend(sb.toString());
- } else {
- @SuppressWarnings("unused")
- Date d = new Date(tbrp.timeBasedFileNamingAndTriggeringPolicy.getCurrentTime());
- System.out.print("");
- }
- 
+ } 
+
 tbrp.timeBasedFileNamingAndTriggeringPolicy.setCurrentTime(addTime(tbrp.timeBasedFileNamingAndTriggeringPolicy.getCurrentTime(), tickDuration));
+ 
 add(tbrp.compressionFuture);
 add(tbrp.cleanUpFuture);
 waitForJobsToComplete();
 }
- rfa.stop();
 
- System.out.println(new Date( tbrp.timeBasedFileNamingAndTriggeringPolicy.getCurrentTime()));
+ 
+ try {
+ Thread.sleep(100);
+ } catch (InterruptedException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
+ rfa.stop();
+
+ System.out.println("Current time at end of loop: "+new Date(tbrp.timeBasedFileNamingAndTriggeringPolicy.getCurrentTime()));
 return tbrp.timeBasedFileNamingAndTriggeringPolicy.getCurrentTime();
 }
 
- void fillWithChar(StringBuffer sb, char c, int count) {
- for(int i = 0; i<count; i++) {
+ void fillWithChar(StringBuffer sb, char c, int count) {
+ for (int i = 0; i < count; i++) {
 sb.append(c);
 }
 }
- 
+
 boolean extraFolder(int numPeriods, int periodsPerEra, int beginPeriod, int maxHistory) {
 int valueOfLastMonth = ((beginPeriod) + numPeriods) % periodsPerEra;
 return (valueOfLastMonth < maxHistory);
@@ -490,6 +490,15 @@
 assertEquals(expectedCount, fileList.size());
 }
 
+ void checkFileCountAtMost(int expectedCount) {
+ File dir = new File(randomOutputDir);
+ List<File> fileList = new ArrayList<File>();
+ findAllDirsOrStringContainsFilesRecursively(dir, fileList, "clean");
+ int fileListSize = fileList.size();
+ 
+ assertTrue("file list size "+ fileListSize+", expectedCount="+expectedCount, fileListSize <= expectedCount);
+ }
+ 
 int expectedCountWithoutFoldersWithInactivity(int maxHistory, int totalPeriods, int endOfInactivity) {
 int availableHistory = (totalPeriods + 1) - endOfInactivity;
 int actualHistory = Math.min(availableHistory, maxHistory + 1);

_service:tar_scm:v_1.1.7.tar.gz/logback-core/src/test/java/ch/qos/logback/core/rolling/helper/FileNamePatternTest.java -> _service:tar_scm:v_1.2.8.tar.gz/logback-core/src/test/java/ch/qos/logback/core/rolling/helper/FileNamePatternTest.java Changed

@@ -54,6 +54,12 @@
         pp = new FileNamePattern("foo.%i.log", context);
         assertEquals("foo.3.log", pp.convertInt(3));
 
+        pp = new FileNamePattern("foo.%3i.log", context);
+        assertEquals("foo.003.log", pp.convertInt(3));
+
+        pp = new FileNamePattern("foo.%1i.log", context);
+        assertEquals("foo.43.log", pp.convertInt(43));
+
         // pp = new FileNamePattern("%i.foo\\%", context);
         // assertEquals("3.foo%", pp.convertInt(3));
 
@@ -145,12 +151,12 @@
         {
             FileNamePattern fnp = new FileNamePattern("foo-%d{yyyy.MM.dd}-%i.txt", context);
             String regex = fnp.toRegexForFixedDate(cal.getTime());
-            assertEquals("foo-2003.05.20-(\\d{1,3}).txt", regex);
+            assertEquals("foo-2003.05.20-(\\d{1,5}).txt", regex);
         }
         {
             FileNamePattern fnp = new FileNamePattern("\\toto\\foo-%d{yyyy\\MM\\dd}-%i.txt", context);
             String regex = fnp.toRegexForFixedDate(cal.getTime());
-            assertEquals("/toto/foo-2003/05/20-(\\d{1,3}).txt", regex);
+            assertEquals("/toto/foo-2003/05/20-(\\d{1,5}).txt", regex);
         }
     }

_service:tar_scm:v_1.1.7.tar.gz/logback-core/src/test/java/ch/qos/logback/core/rolling/helper/RollingCalendarTest.java -> _service:tar_scm:v_1.2.8.tar.gz/logback-core/src/test/java/ch/qos/logback/core/rolling/helper/RollingCalendarTest.java Changed

@@ -18,7 +18,11 @@
 import static org.junit.Assert.assertTrue;
 
 import java.util.Date;
+import java.util.Locale;
+import java.util.TimeZone;
 
+import org.junit.After;
+import org.junit.Before;
 import org.junit.Test;
 
 import ch.qos.logback.core.CoreConstants;
@@ -26,6 +30,33 @@
 
 public class RollingCalendarTest {
 
+  String dailyPattern = "yyyy-MM-dd";
+
+   @Before
+   public void setUp() {
+       
+       // Most surprisingly, in certain environments (e.g. Windows 7), setting the default locale
+       // allows certain tests to pass which otherwise fail.
+       //
+       // These tests are:
+       //
+       //  checkCollisionFreeness("yyyy-WW", false);
+       //  checkCollisionFreeness("yyyy-ww", true);
+       //  checkCollisionFreeness("ww", false);
+       //  {
+       //    RollingCalendar rc = new RollingCalendar("yyyy-ww");
+       //    assertEquals(PeriodicityType.TOP_OF_WEEK, rc.getPeriodicityType());
+       //  }
+       // 
+       
+       Locale oldLocale = Locale.getDefault();
+       Locale.setDefault(oldLocale);
+   }
+
+   @After
+   public void tearDown() {
+   }
+   
     @Test
     public void testPeriodicity() {
         {
@@ -145,11 +176,17 @@
 
         // weekly
         checkCollisionFreeness("yyyy-MM-WW", true);
+        dumpCurrentLocale(Locale.getDefault());
         checkCollisionFreeness("yyyy-WW", false);
         checkCollisionFreeness("yyyy-ww", true);
         checkCollisionFreeness("ww", false);
     }
 
+    private void dumpCurrentLocale(Locale locale) {
+       System.out.println("***Current default locale is "+locale);
+        
+    }
+
     private void checkCollisionFreeness(String pattern, boolean expected) {
         RollingCalendar rc = new RollingCalendar(pattern);
         if (expected) {
@@ -159,4 +196,49 @@
         }
     }
 
+    @Test
+    public void basicPeriodBarriersCrossed() {
+        RollingCalendar rc = new RollingCalendar(dailyPattern, TimeZone.getTimeZone("CET"), Locale.US);
+        // Thu Jan 26 19:46:58 CET 2017, GMT offset = -1h
+        long start = 1485456418969L;
+        // Fri Jan 27 19:46:58 CET 2017,  GMT offset = -1h
+        long end = start+CoreConstants.MILLIS_IN_ONE_DAY;
+        assertEquals(1, rc.periodBarriersCrossed(start, end));
+    }
+    
+    @Test
+    public void testPeriodBarriersCrossedWhenGoingIntoDaylightSaving() {
+        RollingCalendar rc = new RollingCalendar(dailyPattern, TimeZone.getTimeZone("CET"), Locale.US);
+        // Sun Mar 26 00:02:03 CET  2017, GMT offset = -1h
+        long start = 1490482923333L;
+        // Mon Mar 27 00:02:03 CEST 2017,  GMT offset = -2h
+        long end = 1490565723333L;
+        
+        assertEquals(1, rc.periodBarriersCrossed(start, end));
+    }
+
+    @Test
+    public void testPeriodBarriersCrossedWhenLeavingDaylightSaving() {
+        RollingCalendar rc = new RollingCalendar(dailyPattern, TimeZone.getTimeZone("CET"), Locale.US);
+        // Sun Oct 29 00:02:03 CEST 2017, GMT offset = -2h
+        long start = 1509228123333L;//1490482923333L+217*CoreConstants.MILLIS_IN_ONE_DAY-CoreConstants.MILLIS_IN_ONE_HOUR;
+        // Mon Oct 30 00:02:03 CET  2017,  GMT offset = -1h
+        long end = 1509228123333L+25*CoreConstants.MILLIS_IN_ONE_HOUR;
+        assertEquals(1, rc.periodBarriersCrossed(start, end));
+    }
+    
+    @Test
+    public void testPeriodBarriersCrossedJustBeforeEnteringDaylightSaving() {
+        RollingCalendar rc = new RollingCalendar(dailyPattern, TimeZone.getTimeZone("CET"), Locale.US);
+        // Sun Mar 26 22:18:38 CEST 2017, GMT offset = +2h
+        long start = 1490559518333L;
+        System.out.println(new Date(start));
+        
+        // Mon Mar 27 00:05:18 CEST 2017, GMT offset = +2h
+        long end = 1490565918333L;
+        System.out.println(new Date(end));
+        assertEquals(1, rc.periodBarriersCrossed(start, end));
+        
+        
+    }
 }
\ No newline at end of file

_service:tar_scm:v_1.1.7.tar.gz/logback-core/src/test/java/ch/qos/logback/core/spi/CyclicBufferTrackerSimulator.java -> _service:tar_scm:v_1.2.8.tar.gz/logback-core/src/test/java/ch/qos/logback/core/spi/CyclicBufferTrackerSimulator.java Changed

_service:tar_scm:v_1.1.7.tar.gz/logback-core/src/test/java/ch/qos/logback/core/spi/CyclicBufferTrackerT.java -> _service:tar_scm:v_1.2.8.tar.gz/logback-core/src/test/java/ch/qos/logback/core/spi/CyclicBufferTrackerT.java Changed

_service:tar_scm:v_1.1.7.tar.gz/logback-core/src/test/java/ch/qos/logback/core/spi/CyclicBufferTrackerTest.java -> _service:tar_scm:v_1.2.8.tar.gz/logback-core/src/test/java/ch/qos/logback/core/spi/CyclicBufferTrackerTest.java Changed

_service:tar_scm:v_1.1.7.tar.gz/logback-core/src/test/java/ch/qos/logback/core/spi/ScenarioBasedCyclicBufferTrackerTest.java -> _service:tar_scm:v_1.2.8.tar.gz/logback-core/src/test/java/ch/qos/logback/core/spi/ScenarioBasedCyclicBufferTrackerTest.java Changed

_service:tar_scm:v_1.1.7.tar.gz/logback-core/src/test/java/ch/qos/logback/core/status/StatusUtilTest.java -> _service:tar_scm:v_1.2.8.tar.gz/logback-core/src/test/java/ch/qos/logback/core/status/StatusUtilTest.java Changed

_service:tar_scm:v_1.1.7.tar.gz/logback-core/src/test/java/ch/qos/logback/core/subst/NodeToStringTransformerTest.java -> _service:tar_scm:v_1.2.8.tar.gz/logback-core/src/test/java/ch/qos/logback/core/subst/NodeToStringTransformerTest.java Changed

_service:tar_scm:v_1.1.7.tar.gz/logback-core/src/test/java/ch/qos/logback/core/testUtil/DelayingListAppender.java -> _service:tar_scm:v_1.2.8.tar.gz/logback-core/src/test/java/ch/qos/logback/core/testUtil/DelayingListAppender.java Changed

_service:tar_scm:v_1.1.7.tar.gz/logback-core/src/test/java/ch/qos/logback/core/testUtil/FileTestUtil.java -> _service:tar_scm:v_1.2.8.tar.gz/logback-core/src/test/java/ch/qos/logback/core/testUtil/FileTestUtil.java Changed

_service:tar_scm:v_1.2.8.tar.gz/logback-core/src/test/java/ch/qos/logback/core/util/COWArrayListTest.java Added

@@ -0,0 +1,44 @@
+package ch.qos.logback.core.util;
+
+import static org.junit.Assert.*;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
+public class COWArrayListTest {
+
+ Integer model = new Integer0;
+ COWArrayList<Integer> cowaList = new COWArrayList<Integer>(model);
+
+ @Before
+ public void setUp() throws Exception {
+ }
+
+ @After
+ public void tearDown() throws Exception {
+ }
+
+ @Test
+ public void basicToArray() {
+ cowaList.add(1);
+ Object result = cowaList.toArray();
+ assertArrayEquals(new Integer { 1 }, result);
+ }
+
+ @Test
+ public void basicToArrayWithModel() {
+ cowaList.add(1);
+ Integer result = cowaList.toArray(model);
+ assertArrayEquals(new Integer { 1 }, result);
+ }
+
+ 
+ @Test
+ public void basicToArrayTyped() {
+ cowaList.add(1);
+ Integer result = cowaList.asTypedArray();
+ assertArrayEquals(new Integer { 1 }, result);
+ }
+
+}

_service:tar_scm:v_1.1.7.tar.gz/logback-core/src/test/java/ch/qos/logback/core/util/FileSizeTest.java -> _service:tar_scm:v_1.2.8.tar.gz/logback-core/src/test/java/ch/qos/logback/core/util/FileSizeTest.java Changed

_service:tar_scm:v_1.1.7.tar.gz/logback-examples/pom.xml -> _service:tar_scm:v_1.2.8.tar.gz/logback-examples/pom.xml Changed

@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <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/xsd/maven-4.0.0.xsd">
@@ -7,7 +8,7 @@
 <parent>
 <groupId>ch.qos.logback</groupId>
 <artifactId>logback-parent</artifactId>
- <version>1.1.7</version>
+ <version>1.2.8</version>
 </parent>
 
 <artifactId>logback-examples</artifactId>
@@ -40,7 +41,7 @@
 </dependency>
 <dependency>
 <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
+ <artifactId>javax.servlet-api</artifactId>
 <scope>compile</scope>
 <optional>true</optional>
 </dependency>
@@ -89,7 +90,7 @@
 <artifactId>cobertura-maven-plugin</artifactId>
 <version>${cobertura.maven.plugin.version}</version>
 <configuration>
- <instrumentation> 
+ <instrumentation>
 <excludes>
 <exclude>chapters/**/*.class</exclude>
 </excludes>
@@ -97,7 +98,6 @@
 </configuration>
 </plugin>
 
-
 </plugins>
 </build>
 </project>
\ No newline at end of file

_service:tar_scm:v_1.1.7.tar.gz/logback-examples/src/main/java/chapters/appenders/CountingConsoleAppender.java -> _service:tar_scm:v_1.2.8.tar.gz/logback-examples/src/main/java/chapters/appenders/CountingConsoleAppender.java Changed

@@ -13,18 +13,16 @@
 */
 package chapters.appenders;
 
-import java.io.IOException;
-
-import ch.qos.logback.classic.encoder.PatternLayoutEncoder;
 import ch.qos.logback.classic.spi.ILoggingEvent;
 import ch.qos.logback.core.AppenderBase;
+import ch.qos.logback.core.Layout;
 
 public class CountingConsoleAppender extends AppenderBase<ILoggingEvent> {
 static int DEFAULT_LIMIT = 10;
 int counter = 0;
 int limit = DEFAULT_LIMIT;
 
- PatternLayoutEncoder encoder;
+ Layout<ILoggingEvent> layout;
 
 public void setLimit(int limit) {
 this.limit = limit;
@@ -36,15 +34,13 @@
 
 @Override
 public void start() {
- if (this.encoder == null) {
- addError("No encoder set for the appender named " + name + ".");
+ if (this.layout == null) {
+ addError("No layout set for the appender named " + name + ".");
 return;
 }
 
- try {
- encoder.init(System.out);
- } catch (IOException e) {
- }
+ String header = layout.getFileHeader();
+ System.out.print(header);
 super.start();
 }
 
@@ -52,21 +48,20 @@
 if (counter >= limit) {
 return;
 }
- // output the events as formatted by the wrapped layout
- try {
- this.encoder.doEncode(event);
- } catch (IOException e) {
- }
+ // output the events as formatted by patternLayout
+ String eventStr = this.layout.doLayout(event);
+
+ System.out.print(eventStr);
 
 // prepare for next event
 counter++;
 }
 
- public PatternLayoutEncoder getEncoder() {
- return encoder;
+ public Layout<ILoggingEvent> getLayout() {
+ return layout;
 }
 
- public void setEncoder(PatternLayoutEncoder encoder) {
- this.encoder = encoder;
+ public void setLayout(Layout<ILoggingEvent> layout) {
+ this.layout = layout;
 }
 }

_service:tar_scm:v_1.1.7.tar.gz/logback-examples/src/main/java/chapters/appenders/mail/EMail.java -> _service:tar_scm:v_1.2.8.tar.gz/logback-examples/src/main/java/chapters/appenders/mail/EMail.java Changed

_service:tar_scm:v_1.1.7.tar.gz/logback-examples/src/main/java/chapters/architecture/SelectionRule.java -> _service:tar_scm:v_1.2.8.tar.gz/logback-examples/src/main/java/chapters/architecture/SelectionRule.java Changed

_service:tar_scm:v_1.1.7.tar.gz/logback-examples/src/main/java/chapters/migrationFromLog4j/LogbackMain.java -> _service:tar_scm:v_1.2.8.tar.gz/logback-examples/src/main/java/chapters/migrationFromLog4j/LogbackMain.java Changed

_service:tar_scm:v_1.1.7.tar.gz/logback-examples/src/main/java/chapters/migrationFromLog4j/TrivialLogbackAppender.java -> _service:tar_scm:v_1.2.8.tar.gz/logback-examples/src/main/java/chapters/migrationFromLog4j/TrivialLogbackAppender.java Changed

@@ -13,48 +13,40 @@
 */
 package chapters.migrationFromLog4j;
 
-import java.io.IOException;
-
-import ch.qos.logback.classic.encoder.PatternLayoutEncoder;
 import ch.qos.logback.classic.spi.ILoggingEvent;
 import ch.qos.logback.core.AppenderBase;
+import ch.qos.logback.core.Layout;
 
 public class TrivialLogbackAppender extends AppenderBase<ILoggingEvent> {
 
- PatternLayoutEncoder encoder;
-
- public PatternLayoutEncoder getEncoder() {
- return encoder;
- }
-
- public void setEncoder(PatternLayoutEncoder encoder) {
- this.encoder = encoder;
- }
+ Layout<ILoggingEvent> layout;
 
 @Override
 public void start() {
- if (this.encoder == null) {
- addError("No encoder set for the appender named " + name + ".");
+ if (this.layout == null) {
+ addError("No layout set for the appender named " + name + ".");
 return;
 }
- try {
- encoder.init(System.out);
- } catch (IOException e) {
- }
+ String header = layout.getFileHeader();
+ System.out.println(header);
 super.start();
 }
 
 @Override
- protected void append(ILoggingEvent loggingevent) {
+ protected void append(ILoggingEvent loggingEvent) {
 // note that AppenderBase.doAppend will invoke this method only if
 // this appender was successfully started.
- try {
- this.encoder.doEncode(loggingevent);
- } catch (IOException e) {
- // we can't do much with the exception except halting
- super.stop();
- addError("Failed to write to the console");
- }
+ String eventAsStr = this.layout.doLayout(loggingEvent);
+ System.out.println(eventAsStr);
+ }
+
+
+ public Layout<ILoggingEvent> getLayout() {
+ return layout;
+ }
+
+ public void setLayout(Layout<ILoggingEvent> layout) {
+ this.layout = layout;
 }
 
 }

_service:tar_scm:v_1.1.7.tar.gz/logback-examples/src/main/java/chapters/onJoran/SimpleConfigurator.java -> _service:tar_scm:v_1.2.8.tar.gz/logback-examples/src/main/java/chapters/onJoran/SimpleConfigurator.java Changed

_service:tar_scm:v_1.1.7.tar.gz/logback-examples/src/main/java/chapters/onJoran/calculator/Calculator1.java -> _service:tar_scm:v_1.2.8.tar.gz/logback-examples/src/main/java/chapters/onJoran/calculator/Calculator1.java Changed

_service:tar_scm:v_1.1.7.tar.gz/logback-examples/src/main/java/chapters/onJoran/calculator/Calculator2.java -> _service:tar_scm:v_1.2.8.tar.gz/logback-examples/src/main/java/chapters/onJoran/calculator/Calculator2.java Changed

_service:tar_scm:v_1.1.7.tar.gz/logback-examples/src/main/java/chapters/onJoran/implicit/PrintMe.java -> _service:tar_scm:v_1.2.8.tar.gz/logback-examples/src/main/java/chapters/onJoran/implicit/PrintMe.java Changed

_service:tar_scm:v_1.1.7.tar.gz/logback-examples/src/main/java/chapters/onJoran/newRule/NewRuleCalculator.java -> _service:tar_scm:v_1.2.8.tar.gz/logback-examples/src/main/java/chapters/onJoran/newRule/NewRuleCalculator.java Changed

_service:tar_scm:v_1.1.7.tar.gz/logback-examples/src/main/resources/chapters/appenders/conf/logback-fileAppender.xml -> _service:tar_scm:v_1.2.8.tar.gz/logback-examples/src/main/resources/chapters/appenders/conf/logback-fileAppender.xml Changed

_service:tar_scm:v_1.2.8.tar.gz/logback-examples/src/main/resources/chapters/receivers/socket/appender-1574.xml Added

_service:tar_scm:v_1.1.7.tar.gz/logback-site/pom.xml -> _service:tar_scm:v_1.2.8.tar.gz/logback-site/pom.xml Changed

@@ -7,7 +7,7 @@
 <parent>
 <groupId>ch.qos.logback</groupId>
 <artifactId>logback-parent</artifactId>
- <version>1.1.7</version>
+ <version>1.2.8</version>
 </parent>
 
 <artifactId>logback-site</artifactId>
@@ -33,11 +33,42 @@
 <groupId>org.apache.maven.plugins</groupId>
 <artifactId>maven-site-plugin</artifactId>
 <configuration>
- <outputDirectory>${project.parent.basedir}/target/site
- </outputDirectory>
+ <outputDirectory>${project.parent.basedir}/target/site</outputDirectory>
 </configuration>
 </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-resources-plugin</artifactId>
+ <configuration>
+ <nonFilteredFileExtensions>
+ <nonFilteredFileExtension>js</nonFilteredFileExtension>
+ </nonFilteredFileExtensions>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-source-plugin</artifactId>
+ <version>${maven-source-plugin.version}</version>
+ <configuration>
+ 
+ <includes>
+ <include>**/META-INF/*</include>
+ </includes> 
+ </configuration>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+
 </plugins>
 </build>
 
-</project>
\ No newline at end of file
+</project>

_service:tar_scm:v_1.2.8.tar.gz/logback-site/src/main Added

_service:tar_scm:v_1.2.8.tar.gz/logback-site/src/main/resources Added

_service:tar_scm:v_1.2.8.tar.gz/logback-site/src/main/resources/META-INF Added

_service:tar_scm:v_1.2.8.tar.gz/logback-site/src/main/resources/META-INF/MANIFEST.MF Added

_service:tar_scm:v_1.1.7.tar.gz/logback-site/src/site/pages/cla.txt -> _service:tar_scm:v_1.2.8.tar.gz/logback-site/src/site/pages/cla.txt Changed

@@ -10,13 +10,14 @@
 just QOS.CH.   In order to  clarify the intellectual  property license
 granted with Contributions from any person or entity, QOS.CH must have
 a Contributor License  Agreement ("CLA") on file that  has been signed
-by each Contributor, indicating  agreement to the license terms below.
-This license  is for your protection  as a Contributor as  well as the
-protection of QOS.CH and its users;  it does not change your rights to
-use your  own Contributions  for any other  purpose.  If you  have not
+by  each  Contributor,  indicating  agreement  to  the  license  terms
+below. This license is for your protection as a Contributor as well as
+the protection of QOS.CH and its users; it does not change your rights
+to use your own Contributions for  any other purpose.  If you have not
 already done so, please complete and send an original signed Agreement
-to QOS.CH, rue Enning 4,  1003 Lausanne, Switzerland. Please read this
-document carefully before signing and keep a copy for your records.
+to QOS.CH,  rue de la Ria  8B, 1462 Yvonand,  Switzerland. Please read
+this  document carefully  before  signing  and keep  a  copy for  your
+records.
 
   Full name: ____________________________  E-Mail:    ___________________

_service:tar_scm:v_1.1.7.tar.gz/logback-site/src/site/pages/css/screen.css -> _service:tar_scm:v_1.2.8.tar.gz/logback-site/src/site/pages/css/screen.css Changed

@@ -37,22 +37,6 @@
  font-size: smaller;
 }
 
-
-#leftOld {
-  position: absolute;
-  font-size: 80%;
-  left: 0px;
-  width: 15em;
-  color: #564b47;
-  margin: 4px 0px 0px 4px; 
-  padding: 0px;
-  border: 1px solid #cccccc;
-  background-color: #fff8e8;
-  -webkit-border-radius: 3px;
-  -moz-border-radius: 3px;
-  border-radius: 3px;
-}
-
 #left {
   position: absolute;
   left: 0px;
@@ -75,7 +59,6 @@
 
 #left a, #right a {
   display: block; 
-  width: 95.5%; 
   margin: 0px; 
   padding: 2px; 
   border: solid 1px #fff8e8; 
@@ -100,6 +83,18 @@
   -moz-border-radius: 3px;
   border-radius: 3px;
 }
+.pub {
+  text-align: center;
+}
+
+#left .pub a:hover {
+  background-color: transparent;
+  border: solid 0px #FFFFFF;
+}
+
+#left img {
+	border: none;
+}
 
 #left div.jobadd {
   font-size: 140%;
@@ -140,13 +135,6 @@
   font-size: 80%;
 }
 
-#left img {
-	display: block;
-	margin: 20px 0 20px 17px;
-	border: none;
-	width: 90px;
-	height: 30px;
-}
 
 #headerLine {
   background-color:#FFD0A0;

_service:tar_scm:v_1.1.7.tar.gz/logback-site/src/site/pages/download.html -> _service:tar_scm:v_1.2.8.tar.gz/logback-site/src/site/pages/download.html Changed

@@ -90,9 +90,10 @@
 </dt>
 
 <dd>
- Lilith is a Logging- and AccessEvent viewer for logback. 
+ Lilith is a Logging- and AccessEvent viewer for logback. 
 </dd>
 
+ 
 
 <dt>
 <a
@@ -101,11 +102,13 @@
 </dt>
 
 <dd>
- Consists of several akka-based logback utilities, including
+ Consists of several akka-based logback utilities, including
 ActorAppender, HoptoadActorAppender and Logstash redis
 appender.
- 
+ 
 </dd>
+ 
+ 
 
 
 <dt>
@@ -115,11 +118,10 @@
 </dt>
 
 <dd>
- Logback-Android brings the power of Logback to Android.
- 
+ Logback-Android brings the power of Logback to Android. 
 </dd>
 
-
+ 
 
 <dt>
 <a
@@ -128,11 +130,13 @@
 </dt>
 
 <dd>
- Logback Appender writing to Amazon SimpleDB. See also <a
+ Logback Appender writing to Amazon SimpleDB. See also <a
 href="http://www.peecho.com/blog/logging-the-cloud-with-simpledb.html">Logging
- the cloud with SimpleDB</a>.
+ the cloud with SimpleDB</a>.
 </dd>
 
+ 
+
 
 <dt>
 <a
@@ -141,13 +145,14 @@
 </dt>
 
 <dd>
- A service layer (using Spring) and a REST interface which
+ A service layer (using Spring) and a REST interface which
 provides methods to: add or update loggers, resolve a log
 file, resolve the logback configuration file, and upload a
 logback configuration file and reload it.
- 
+ 
 </dd>
 
+ 
 
 
 
@@ -172,7 +177,18 @@
 href="http://graylog2.org/">Graylog2</a> server via GELF
 messages.
 </dd>
- 
+ 
+ 
+ <dt>
+ <a
+ href="https://github.com/sbabcoc/logback-testng">Logback-testng</a>
+ by Scott Babcock
+ </dt>
+
+ <dd>Logback appender for TestNG Reporter. </dd>
+
+ 
+
 </dl>

_service:tar_scm:v_1.1.7.tar.gz/logback-site/src/site/pages/js/dsl.js -> _service:tar_scm:v_1.2.8.tar.gz/logback-site/src/site/pages/js/dsl.js Changed

_service:tar_scm:v_1.1.7.tar.gz/logback-site/src/site/pages/license.html -> _service:tar_scm:v_1.2.8.tar.gz/logback-site/src/site/pages/license.html Changed

_service:tar_scm:v_1.1.7.tar.gz/logback-site/src/site/pages/manual/appenders.html -> _service:tar_scm:v_1.2.8.tar.gz/logback-site/src/site/pages/manual/appenders.html Changed

@@ -272,7 +272,24 @@
 underlying <code>OutputStreamAppender</code>. Encoders are
 described in a <a href="encoders.html">dedicated chapter</a>.
 			</td>
-		</tr>
+ </tr>
+ <tr>
+ <td>immediateFlush</td>
+ <td><code>boolean</code></td>
+ 
+ <td>The default value for immediateFlush is 'true'. Immediate
+ flushing of the output stream ensures that logging events are
+ immediately written out and will not be lost in case your
+ application exits without properly closing appenders. On the
+ other hand, setting this property to 'false' is likely to
+ quadruple (your mileage may vary) logging throughput. Again, if
+ immediateFlush is set to 'false' and
+ if appenders are not closed properly when your application exits,
+ then logging events not yet written to disk may be lost.
+ </td>
+ </tr>
+	
 	
 	</table>
 
@@ -435,7 +452,6 @@
 
 </td>
 </tr>
- 
 
 <tr>
 <td>prudent</td>
@@ -509,11 +525,8 @@
 events are not lost in case your application exits without properly
 closing appenders. However, for significantly increased logging
 throughput, you may want to set the immediateFlush property of the underlying
- <code>Encoder</code> to <code>false</code> . Encoders and in
- particular <a
- href="encoders.html#LayoutWrappingEncoder"><code>LayoutWrappingEncoder</code></a>
- are described in a separate chapter.
+ class="prop">immediateFlush property to
+ <code>false</code>.
 
 Below is an example of a configuration file for
 <code>FileAppender</code>:
@@ -528,6 +541,8 @@
 &lt;appender name="FILE" class="ch.qos.logback.core.FileAppender">
 &lt;file>testFile.log&lt;/file>
 &lt;append>true&lt;/append>
+ &lt;!-- set immediateFlush to false for much higher logging throughput -->
+ &lt;immediateFlush>true&lt;/immediateFlush>
 &lt;!-- encoders are assigned the type
 ch.qos.logback.classic.encoder.PatternLayoutEncoder by default -->
 &lt;encoder>
@@ -597,7 +612,7 @@
 denotes the date pattern used to convert the current time (at which
 the configuration file is parsed) into a string. The date pattern
 should follow the conventions defined in <a
- href="http://java.sun.com/j2se/1.4.2/docs/api/java/text/SimpleDateFormat.html">SimpleDateFormat</a>. The
+ href="https://docs.oracle.com/javase/8/docs/api/java/text/SimpleDateFormat.html">SimpleDateFormat</a>. The
 timeReference attribute denotes the time
 reference for the time stamp. The default is the
 interpretation/parsing time of the configuration file, i.e. the
@@ -2364,7 +2379,7 @@
 <td><code>String</code></td>
 <td>The outgoing email message will be encoded in the
 designated <a
- href="http://java.sun.com/j2se/1.4.2/docs/api/java/nio/charset/Charset.html">charset</a>. The
+ href="https://docs.oracle.com/javase/8/docs/api/java/nio/charset/Charset.html">charset</a>. The
 default charset encoding is "UTF-8" which works well for most
 purposes.
 </td>

_service:tar_scm:v_1.1.7.tar.gz/logback-site/src/site/pages/manual/appenders_ja.html -> _service:tar_scm:v_1.2.8.tar.gz/logback-site/src/site/pages/manual/appenders_ja.html Changed

@@ -356,7 +356,7 @@
 &lt;/configuration&gt;</pre>
 
 
- timestamp要素には、key属性およびdatePattern属性という2つの必須属性と、timeReference属性という任意属性があります。key属性には、<a href="./configuration.html#variableSubstitution">変数</a>と同じく、他の設定要素からタイムスタンプを参照するときの名前を指定します。datePattern属性には、設定ファイルを解釈した時点の日時を文字列に変換するための日付パターン文字列を指定します。日付パターン文字列に指定できるのは、<a href="http://java.sun.com/j2se/1.4.2/docs/api/java/text/SimpleDateFormat.html">SimpleDateFormat</a>で利用できるものと同じです。timeReference属性には、タイムスタンプの基準時間を指定します。デフォルトでは、現在の日時、つまり、設定ファイルを解析、解釈した時点の日時になります。ですが、コンテキストを生成した時間を基準時間としたほうが便利な場合もあるでしょう。そういう場合は、timeReference属性に<code>"contextBirth"</code>を指定すればよいです。
+ timestamp要素には、key属性およびdatePattern属性という2つの必須属性と、timeReference属性という任意属性があります。key属性には、<a href="./configuration.html#variableSubstitution">変数</a>と同じく、他の設定要素からタイムスタンプを参照するときの名前を指定します。datePattern属性には、設定ファイルを解釈した時点の日時を文字列に変換するための日付パターン文字列を指定します。日付パターン文字列に指定できるのは、<a href="https://docs.oracle.com/javase/8/docs/api/java/text/SimpleDateFormat.html">SimpleDateFormat</a>で利用できるものと同じです。timeReference属性には、タイムスタンプの基準時間を指定します。デフォルトでは、現在の日時、つまり、設定ファイルを解析、解釈した時点の日時になります。ですが、コンテキストを生成した時間を基準時間としたほうが便利な場合もあるでしょう。そういう場合は、timeReference属性に<code>"contextBirth"</code>を指定すればよいです。
 
 
 次のコマンドを実行して、<code>timestamp要素</code>がどうなるのか試してみましょう。
@@ -1371,7 +1371,7 @@
 <tr>
 <td>charsetEncoding</td>
 <td><code>String</code></td>
- <td>送信されるメッセージは指定された<a href="http://java.sun.com/j2se/1.4.2/docs/api/java/nio/charset/Charset.html">文字セット</a>でエンコードされます。デフォルトの文字セットは"UTF-8"ですが、ほとんどの場合十分でしょう。
+ <td>送信されるメッセージは指定された<a href="https://docs.oracle.com/javase/8/docs/api/java/nio/charset/Charset.html">文字セット</a>でエンコードされます。デフォルトの文字セットは"UTF-8"ですが、ほとんどの場合十分でしょう。
 </td>
 </tr>

_service:tar_scm:v_1.1.7.tar.gz/logback-site/src/site/pages/manual/configuration.html -> _service:tar_scm:v_1.2.8.tar.gz/logback-site/src/site/pages/manual/configuration.html Changed

@@ -81,20 +81,21 @@
 
 
 <ol>
+
 <li>
 Logback tries to find a file called
- logback.groovy <a
+ logback-test.xml <a
 href="../faq.html#configFileLocation">in the
- classpath</a>.
- </li>
+ classpath</a>. </li>
 
 <li>
- If no such file is found, logback tries to find a file
- called logback-test.xml <a
+ If no such file is found, logback tries to find a file called
+ logback.groovy <a
 href="../faq.html#configFileLocation">in the
 classpath</a>.
 </li>
 
+
 <li>If no such file is found, it checks for the file
 logback.xml <a
 href="../faq.html#configFileLocation">in the
@@ -160,7 +161,7 @@
 <code>BasicConfigurator</code> usage <a
 href="../xref/chapters/configuration/MyApp1.html">(logback-examples/src/main/java/chapters/configuration/MyApp1.java)</a>
 
- <pre class="prettyprint source">package manual.configuration;
+ <pre class="prettyprint source">package chapters.configuration;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -337,6 +338,13 @@
 which allow convenient access to logback's internal state.
 
 
+ <h4 class="doAnchor" name="dumpingStatusData">Status data</h4>
+
+ Enabling output of status data usually goes a
+ long way in the diagnosis of issues with logback. As such, it is
+ highly recommended and should be considered as a recourse of
+ first resort.
+
 Instead of invoking <code>StatusPrinter</code> programmatically
 from your code, you can instruct the configuration file to dump
 status data, even in the absence of errors. To achieve this, you
@@ -350,7 +358,6 @@
 <code>DEBUG</code>.)
 
 
-
 Example: Basic configuration file using debug
 mode
 (logback-examples/src/main/resources/chapters/configuration/sample1.xml)
@@ -372,7 +379,7 @@
 &lt;/root>
 &lt;/configuration></pre>
 
- Setting the <code>debug</code> attribute within the
+ Setting <code>debug="true"</code> within the
 &lt;configuration&gt; element will output status information,
 assuming that:
 
@@ -395,6 +402,7 @@
 every case.
 
 
+ 
 Forcing status output In the absence
 of status messages, tracking down a rogue logback.xml
 configuration file can be difficult, especially in production where
@@ -407,6 +415,29 @@
 generated in case of errors.
 
 
+ By the way, setting <code>debug="true"</code> is strictly
+ equivalent to installing an
+ <code>OnConsoleStatusListener</code>. Status listeners are
+ disccussed further below. The installation of
+ <code>OnConsoleStatusListener</code> is shown next. 
+
+ Example: Registering a status listener
+ (logback-examples/src/main/resources/chapters/configuration/onConsoleStatusListener.xml)
+ View as .groovy
+ <pre id="onConsoleStatusListener" class="prettyprint source">&lt;configuration>
+ &lt;statusListener class="ch.qos.logback.core.status.OnConsoleStatusListener" /> 
+
+ ... the rest of the configuration file 
+&lt;/configuration></pre>
+
+
+ Enabling output of status data, either via the debug attribute
+ or equivalently by installing <code>OnConsoleStatusListener</code>,
+ will go a long way in helping you diagnose logback issues. As such,
+ enabling logback status data is very highly recommended and should
+ be considered as a recourse of first resort.
+ 
+
 <h3 class="doAnchor" name="configFileProperty">Specifying the
 location of the default configuration file as a system
 property</h3>
@@ -748,8 +779,8 @@
 java -Dlogback.statusListenerClass=ch.qos.logback.core.status.NopStatusListener&nbsp;...
 
 
- <h3 class="doAnchor" name="stopContext">Stopping
- logback-classic</h3>
+ <h2 class="doAnchor" name="stopContext">Stopping
+ logback-classic</h2>
 
 In order to release the resources used by logback-classic, it is
 always a good idea to stop the logback context. Stopping the
@@ -770,7 +801,9 @@
 the <a
 href="http://docs.oracle.com/javaee/6/api/javax/servlet/ServletContextListener.html#contextDestroyed(javax.servlet.ServletContextEvent)">contextDestroyed</a>
 method of <code>ServletContextListener</code> in order to stop
- logback-classic and release resources.
+ logback-classic and release resources. Starting with version
+ 1.1.10, the appropriate <code>ServletContextListener</code> is
+ installed automatically for you (<a href="#webShutdownHook">see just below</a>).
 
 
 <h4 class="doAnchor" name="shutdownHook">Stopping logback-classic 
@@ -793,8 +826,48 @@
 can delay shutdown by a user specified duration. Note that you may
 install a shutdown hook of your own making by setting the class attribute to correspond to your shutdown
- hook's class name..
+ hook's class name.
+
+ <h4 class="doAnchor" name="webShutdownHook">Stopping logback-classic 
+ in web-applications</h4>
+ 
+ since 1.1.10 Logback-classic will
+ automatically ask the web-server to install a <code><a
+ href="../apidocs/ch/qos/logback/classic/servlet/LogbackServletContainerInitializer.html">LogbackServletContainerInitializer</a></code>
+ implementing the <code>ServletContainerInitializer</code> interface
+ (available in servlet-api 3.x and later). This initializer will in
+ turn install and instance of <code><a
+ href="../apidocs/ch/qos/logback/classic/servlet/LogbackServletContextListener.html">LogbackServletContextListener</a></code>.
+ This listener will stop the current logback-classic context when
+ the web-app is stopped or reloaded.
+ 
+
+ You may disable the automatic the installation of
+ <code>LogbackServletContextListener</code> by setting a
+ &lt;context-param> named
+ <code>logbackDisableServletContainerInitializer</code> in your
+ web-application's web.xml file. Here is the relevant snippet.
+
+ 
+<pre class="prettyprint source">&lt;web-app>
+ &lt;context-param>
+ &lt;param-name>logbackDisableServletContainerInitializer&lt;/param-name>
+ &lt;param-value>true&lt;/param-value>
+ &lt;/context-param>
+ .... 
+&lt;/web-app></pre>
+
+ Note that
+ <code>logbackDisableServletContainerInitializer</code> variable
+ can also be set as a Java system property an OS environment
+ variable. The most local setting has priority, i.e. web-app first,
+ system property second and OS environment last.
+
 
+
+ 
+ 
+
 <h2 class="doAnchor" name="syntax">Configuration file syntax</h2>
 
 As you have seen thus far in the manual with plenty of examples
@@ -1418,10 +1491,11 @@
 
 
 As in many scripting languages, logback configuration files
- support definition and substitution of variables. Variables can be
+ support definition and substitution of variables. Variables have a
+ <a href="#scopes">scope</a> (see below). Moreover, variables can be
 defined within the configuration file itself, in an external file,
 in an external resource or even computed and <a
- href="#definingPropsOnTheFly">defined on the fly</a>. 
+ href="#definingPropsOnTheFly">defined on the fly</a>.
 
 
 Variable substitution can occur at any point in
@@ -1436,10 +1510,15 @@
 value held by the aName property.
 
 
- Variables have a <a href="#scopes">scope</a> (see below).
+ 
 
 As they often come in handy, the HOSTNAME and CONTEXT_NAME
- variables are automatically defined and have context scope.
+ variables are automatically defined and have context scope. Given
+ that in some environments it may take some time to compute the
+ hostname, its value is computed lazily (only when needed). Moreover,
+ HOSTNAME can be set from within the <a
+ href="#definingProps">configuration directly.</a>
+ 
 
 <h4 class="doAnchor" name="definingProps">Defining variables</h4>

_service:tar_scm:v_1.1.7.tar.gz/logback-site/src/site/pages/manual/encoders.html -> _service:tar_scm:v_1.2.8.tar.gz/logback-site/src/site/pages/manual/encoders.html Changed

@@ -142,13 +142,11 @@
 
 protected Layout&lt;E> layout;
 private Charset charset;
- private boolean immediateFlush = true;
-
- public void doEncode(E event) throws IOException {
- String txt = layout.doLayout(event);
- outputStream.write(convertToBytes(txt));
- if (immediateFlush)
- outputStream.flush();
+ 
+ // encode a given event as a byte
+ public byte encode(E event) {
+ String txt = layout.doLayout(event);
+ return convertToBytes(txt);
 }
 
 private byte convertToBytes(String s) {
@@ -163,15 +161,7 @@
 The <code>doEncode</code>() method starts by having the wrapped
 layout convert the incoming event into string. The resulting text
 string is converted to bytes according to the charset encoding
- chosen by the user. Those bytes are then written to the
- <code>OutputStream</code> given by the owning appender. By
- default, the <code>OutputStream</code> is immediately flushed,
- unless the immediateFlush property is
- explicitly set to 'false'. Setting the immediateFlush property to false can
- significantly improve logging throughput. See
- <code>PatternLayoutEncoder</code> below for sample configuration..
- 
+ chosen by the user.
 
 
 <h2 class="doAnchor">PatternLayoutEncoder</h2>
@@ -194,36 +184,9 @@
 
 <h4 class="doAnchor" name="immediateFlush">immediateFlush property</h4>
 
- As a sub-class of <a
- href="../xref/ch/qos/logback/core/encoder/LayoutWrappingEncoder.html"><code>LayoutWrappingEncoder</code></a>,
- <code>PatternLayoutEncoder</code> admits the immediateFlush property. The default value
- for immediateFlush is 'true'. Immediate
- flushing of the output stream ensures that logging events are
- immediately written to disk and will not be lost in case your
- application exits without properly closing appenders. On the
- other hand, setting this property to 'false' is likely to
- quintuple (your mileage may vary) logging throughput. As
- mentioned previously, if immediateFlush
- is set to 'false' and if appenders are not closed properly when
- your application exits, then logging events not yet written to
- disk may be lost.
- 
-
- Below is a sample configuration for a
- <code>FileAppender</code> containing a
- <code>PatternLayoutEncoder</code> with its immediateFlush property set to 'false'.
-
-<pre class="prettyprint">&lt;appender name="FILE" class="ch.qos.logback.core.FileAppender"> 
- &lt;file>foo.log&lt;/file>
- &lt;encoder>
- &lt;pattern>%d %-5level %thread %logger{0}: %msg%n&lt;/pattern>
- &lt;!-- this quadruples logging throughput --&gt;
- &lt;immediateFlush>false&lt;/immediateFlush>
- &lt;/encoder> 
-&lt;/appender></pre>
-
+ As of logback 1.2.0, the
+ immediateFlush property is part of the
+ enclosing Appender.
 
 <h4 class="doAnchor" name="outputPatternAsHeader">Output pattern
 string as header</h4>

_service:tar_scm:v_1.1.7.tar.gz/logback-site/src/site/pages/manual/groovy.html -> _service:tar_scm:v_1.2.8.tar.gz/logback-site/src/site/pages/manual/groovy.html Changed

_service:tar_scm:v_1.1.7.tar.gz/logback-site/src/site/pages/manual/groovy_ja.html -> _service:tar_scm:v_1.2.8.tar.gz/logback-site/src/site/pages/manual/groovy_ja.html Changed

@@ -142,7 +142,7 @@
  
 <h3>• timestamp(String datePattern, long timeReference = -1)</h3>
 
- <code>timestamp()</code>メソッドは、<code>datePattern</code>に指定された書式文字列で<code>timeReference</code>に指定されたlong値の時間を書式化した文字列を返します。第一引数の<code>datePattern</code>に指定する書式文字列は、<a href="http://java.sun.com/j2se/1.4.2/docs/api/java/text/SimpleDateFormat.html">SimpleDateFormat</a>で定義されている規則に従わなければなりません。第二引数の<code>timeReference</code>が省略された場合-1が指定されたものとして扱います。これは設定ファイルを解析しているときの現在日時を表す値です。状況によりますが、基準時間として<code>context.birthTime</code>を使うこともあるでしょう。
+ <code>timestamp()</code>メソッドは、<code>datePattern</code>に指定された書式文字列で<code>timeReference</code>に指定されたlong値の時間を書式化した文字列を返します。第一引数の<code>datePattern</code>に指定する書式文字列は、<a href="https://docs.oracle.com/javase/8/docs/api/java/text/SimpleDateFormat.html">SimpleDateFormat</a>で定義されている規則に従わなければなりません。第二引数の<code>timeReference</code>が省略された場合-1が指定されたものとして扱います。これは設定ファイルを解析しているときの現在日時を表す値です。状況によりますが、基準時間として<code>context.birthTime</code>を使うこともあるでしょう。
 
 
 次の例では、 <code>bySecond</code>変数に"yyyyMMdd'T'HHmmss"という書式で文字列化した現在日時を代入していますそして、"bySecond" 変数をfileプロパティの値として使っています。

_service:tar_scm:v_1.1.7.tar.gz/logback-site/src/site/pages/manual/layouts.html -> _service:tar_scm:v_1.2.8.tar.gz/logback-site/src/site/pages/manual/layouts.html Changed

@@ -543,7 +543,7 @@
 Used to output the date of the logging event. The date
 conversion word admits a pattern string as a parameter. The
 pattern syntax is compatible with the format accepted by <a
- href="http://java.sun.com/j2se/1.4.2/docs/api/java/text/SimpleDateFormat.html"><code>java.text.SimpleDateFormat</code></a>.
+ href="https://docs.oracle.com/javase/8/docs/api/java/text/SimpleDateFormat.html"><code>java.text.SimpleDateFormat</code></a>.
 
 You can specify the string "ISO8601" for the
 ISO8601 date format. Note that the %date conversion word
@@ -819,7 +819,8 @@
 					full stack trace will be output.
 				 
 
-				 The throwable conversion word can followed by one of
+
+ 			 The throwable conversion word can followed by one of
 						the following options:
 				 
 				 <ul>
@@ -870,6 +871,17 @@
 					negative answer. Evaluators are described further
 					down in this document.
 					
+
+ If you do not specify %throwable or another
+ throwable-related conversion word in the conversion pattern,
+ <code>PatternLayout</code> will automatically add it as the
+ last conversion word, on account of the importance of stack
+ trace information. The $nopex conversion word can be
+ substituted for %throwable, if you do not wish stack trace
+ information to be displayed. See also the %nopex conversion
+ word.
+ 
+
 				</td>
 			</tr>
 
@@ -888,16 +900,6 @@
 					Same as the %throwable conversion word above with the
 					addition of class packaging information.
 
- If you do not specify %xThrowable or another
- throwable-related conversion word in the conversion pattern,
- <code>PatternLayout</code> will automatically add it as the
- last conversion word, on account of the importance of stack
- trace information. The $nopex conversion word can be
- substituted for %xThrowable, if you do not wish stack
- trace information to be displayed. See also the %nopex
- conversion word.
- 
-
 At the end of each stack frame of the exception, a string
 consisting of the jar file containing the relevant class
 followed by the "Implementation-Version" as found in that
@@ -934,15 +936,18 @@
 by a tilde, it is possible that the correct packaging data is
 in reality wombat.jar:1.7.
 
- 
+
+ Please note that given its potential cost, computation of
+ <a href="configuration.html#packagingData">packaging data
+ is disabled by default</a>. When computation of
+ packaging data is enabled, <code>PatternLayout</code> will
+ automatically assume the %xThrowable suffix instead of
+ %throwable suffix at the end of the pattern string.
+
 <a
 href="http://jira.qos.ch/browse/LBCLASSIC-212">Feedback from
 users</a> indicates that Netbeans chokes on packaging
- information. If you are a Netbeans user, then you should
- disable packaging information in stack traces by adding
- "%ex" at the end of of your conversion pattern. For example,
- "%d %logger - %m%n" should be rewritten as "%d %logger -
- %m%n%ex"
+ information.
 
 </td>

_service:tar_scm:v_1.1.7.tar.gz/logback-site/src/site/pages/manual/layouts_ja.html -> _service:tar_scm:v_1.2.8.tar.gz/logback-site/src/site/pages/manual/layouts_ja.html Changed

_service:tar_scm:v_1.1.7.tar.gz/logback-site/src/site/pages/manual/mdc.html -> _service:tar_scm:v_1.2.8.tar.gz/logback-site/src/site/pages/manual/mdc.html Changed

@@ -89,18 +89,18 @@
 		lets the developer place information in a diagnostic
 		context that can be subsequently retrieved by certain logback
 		components. The <code>MDC</code> manages contextual information on
-		a per thread basis. A child thread automatically
-		inherits a copy of the mapped diagnostic context of its
-		parent. Typically, while starting to service a new client request,
-		the developer will insert pertinent contextual information, such
-		as the client id, client's IP address, request parameters
-		etc. into the <code>MDC</code>. Logback components, if
-		appropriately configured, will automatically include this
-		information in each log entry.
+		a per thread basis. Typically, while starting to service
+		a new client request, the developer will insert pertinent
+		contextual information, such as the client id, client's IP
+		address, request parameters etc. into the
+		<code>MDC</code>. Logback components, if appropriately configured,
+		will automatically include this information in each log entry.
 		
 
 Please note that MDC as implemented by logback-classic assumes
- that values are placed into the MDC with moderate frequency. 
+ that values are placed into the MDC with moderate frequency. Also
+ note that a child thread does not automatically inherit a copy of
+ the mapped diagnostic context of its parent.
 
 		
 			The next application named

_service:tar_scm:v_1.1.7.tar.gz/logback-site/src/site/pages/news.html -> _service:tar_scm:v_1.2.8.tar.gz/logback-site/src/site/pages/news.html Changed

@@ -30,6 +30,282 @@
 the <a href="http://www.qos.ch/mailman/listinfo/announce">QOS.ch
 announce</a> mailing list.
 
+ 
+ 
+ <hr width="80%" align="center" />
+
+ <h3>March 30th, 2017, Release of version 1.2.3</h3>
+
+ Fix unintentional dependency on
+ <code>OutputStreamAppender</code> in
+ <code>LayoutWrappingEncoder</code> as reported in <a
+ href="https://jira.qos.ch/browse/LOGBACK-1287">LOGBACK-1287</a>.
+ 
+ 
+ Fix spurious <code>System.out.println</code> in AsyncAppender's
+ worker thread. This issue was reported in <a
+ href="https://jira.qos.ch/browse/LOGBACK-1292">LOGBACK-1292</a> by
+ Nikolas Loutas with Thibault Meyer the relevant patch.
+
+ ConsoleAppender exception when run under Java WebStart. This
+ problem was reported in <a
+ href="https://jira.qos.ch/browse/LOGBACK-1282">LOGBACK-1282</a> by
+ Clas Forsberg.
+ 
+ <h3>March 16th, 2017, Release of version 1.2.2</h3>
+
+ <code>AsyncAppender</code> no longer drops events when the
+ current thread has its interrupt flag set. This issue was reported
+ in <a
+ href="https://jira.qos.ch/browse/LOGBACK-1247">LOGBACK-1247</a> by
+ Jakob Bergendahl who also provided the relevant pull request.
+ 
+
+ Removed <code>JMSQueueAppender</code> and
+ <code>JMSTopicAppender</code>. These appenders were undocumented
+ and had no apparent users.
+ 
+ Remove comment in logback-classic's
+ <code>META-INF/services/javax.servlet.ServletContainerInitializer</code>
+ file in order to keep Wildfly 8 happy. This issue was reported in
+ <a href="https://jira.qos.ch/browse/LOGBACK-1265">LOGBACK-1265</a>
+ by Andy Wilkinson.
+ 
+
+ <code>FileSize.toString()</code> now reports files sizes in GB
+ in addition to sizes in MB and KB and Bytes. This fixes issue <a
+ href="https://jira.qos.ch/browse/LOGBACK-1278">LOGBACK-1278</a>.
+ 
+ <hr width="80%" align="center" />
+
+ <h3>March 1st, 2017, Release of version 1.1.11</h3>
+ 
+ Fix thread-safety issue with <code>PatternLayoutBase</code>
+ reported in <a
+ href="https://jira.qos.ch/browse/LOGBACK-1270">LOGBACK-1270</a> by
+ Artem Bilan. Note that the fix was already present in the 1.2.x
+ series and was back-ported to the 1.1.x series.
+
+ <hr width="80%" align="center" />
+
+ <h3>February 9th, 2017, Release of version 1.2.1</h3>
+
+ To ensure backward compatibility of configuration files, the
+ immediateFlush property set for a
+ <code>LayoutWrappingEncoder</code> is propagated to the enclosing
+ <code>OutputStreamAppender</code>.
+ 
+
+ <hr width="80%" align="center" />
+
+ <h3>February 8th, 2017, Release of version 1.2.0</h3>
+
+ <div class="breaking">
+ <h4><code>Encoder</code> interface has changed and is no longer
+ expected to handle an <code>OutputStream</code>.</h4>
+ </div>
+
+
+ <code>Encoder</code> interface has changed and is no longer
+ expected to handle an <code>OutputStream</code>. This
+ simplification allows finer-grain locking resulting in <a class="big"
+ href="https://docs.google.com/spreadsheets/d/1cpb5D7qnyye4W0RTlHUnXedYK98catNZytYIu5D91m0/edit?usp=sharing">significantly
+ improved performance</a>.
+ 
+
+ Release 1.2.0 fixes a rather severe
+ serialization vulnerability in <code>SocketServer</code> and
+ <code>ServerSocketReceiver</code>. Users running these components
+ should upgrade immediately.
+
+ 
+ This release fixes a rather severe serialization vulnerability
+ in <code>SocketServer</code> and
+ <code>ServerSocketReceiver</code>. Users running these components
+ should upgrade immediately.
+ 
+
+ In <code>TimeBasedRollingPolicy</code>, fixed issue with totalSizeCap of more than 2^31. This problem
+ was reported in <a
+ href="https://jira.qos.ch/browse/LOGBACK-1231">1231</a> by Simon
+ Teng.
+ 
+
+ Logback-classic now searches for the file
+ logback-test.xml first, logback.groovy second
+ and logback.xml third. In previous versions
+ logback.groovy was looked up first which was non-sensical
+ in presense of logback-test.xml. This fixes <a
+ href="http://jira.qos.ch/browse/LOGBACK-1245">LOGBACK-1245</a>
+ reported by Joern Huxhorn.
+ 
+ 
+
+ <hr width="80%" align="center" />
+
+ <h3>February 5th, 2017, Release of version 1.1.10</h3>
+
+ Several changes to improve throughput (see <a
+ href="https://docs.google.com/spreadsheets/d/1cpb5D7qnyye4W0RTlHUnXedYK98catNZytYIu5D91m0/edit?usp=sharing">spreadsheet</a>)
+ 
+
+ <ol>
+ <li>The <code>ReentrantLock</code> in
+ <code>OutputStreamAppender</code> is now "unfair". In previous
+ versions of logback, a fair lock was used. Fair locks are much
+ slower. Just as importanly, logback has no mandate to influence
+ thread scheduling.
+ </li>
+
+ <li><code>FileAppender</code> now offers the bufferSize option. Previously, a
+ fixed-size 8K buffer was used. Increasing the bufferSize, for example to 256K,
+ significantly reduces thread-contention.
+ </li>
+
+ <li>Critical parts of the code now use
+ <code>COWArrayList</code>, a custom developed allocation-free
+ lock-free thread-safe implementation of the {@link List}
+ interface. It is optimized for cases where iterations over the
+ list vastly outnumber modifications on the list. It is based on
+ <code>CopyOnWriteArrayList</code> but allows allocation-free
+ iterations over the list.
+ </li>
+
+ <li>In <code>PatternLayoutBase</code> the same
+ <code>StringBuilder</code> is used over and over to reduce
+ memory allocation. This is safe as long as the owning appender
+ guarantees serial access to its layout. In the next version of
+ logback, i.e. 1.2.x, the read-write lock will no longer protect
+ access to the layout and there will be no guarantee of
+ serial access.
+ </li>
+ </ol>
+
+ In web-applications, logback-classic will <a
+ href="manual/configuration.html#webShutdownHook">automatically
+ install a listener</a> which will stop the logging context and
+ release resources when your web-app is reloaded. This enhancement
+ was requested <a
+ href="https://jira.qos.ch/browse/LOGBACK-1170">LOGBACK-1170</a> by
+ Martin Wegner.
+ 
+
+ The <code>AccessEvent.prepareForDeferredProcessing()</code>
+ method was not idempotent. This caused subtle bugs under
+ Jetty. See <a
+ href="https://jira.qos.ch/browse/LOGBACK-1189">LOGBACK-1189</a>
+ for details. Many thanks to Per Olesen, Evan Meagher, Nick Babcock
+ and Mark Elliot for hunting down this bug.
+ 
+ 
+ As it may be time consuming in certain environments, the
+ HOSTNAME property is now computed lazily. This optimization
+ requested in <a
+ href="https://jira.qos.ch/browse/LOGBACK-1221">LOGBACK-1221</a> by
+ Eugene Petrenko.
+ 
+
+
+ Joran now supports external XML entities. This feature was
+ requested in <a
+ href="https://jira.qos.ch/browse/LOGBACK-1091">1091</a> and the
+ relevant PR graciously provided by Jonas Neukomm.
+ 
+
+ <hr width="80%" align="center" />
+
+ <h3>January 20th, 2017, Release of version 1.1.9</h3>
+
+ Logback's internal executor service had a thread pool size of 2
+ which could be used up rather quickly, e.g. configuration scanning
+ in addition to an active <code>ServerSocketAppender</code>. When
+ both threads where permanently in use, compression could not
+ proceed. To alleviate this problem, the thread pool size has been
+ increased to 8. See issue <a
+ href="https://jira.qos.ch/browse/LOGBACK-1238">LOGBACK-1238</a>
+ for more details.
+ 
+
+ Fixed issue with <code>FileAppender</code> instances embedded
+ within <code>SiftingAppender</code> reporting filename collisions
+ after reaching timeout and subsequently restarted. This problem
+ was reported in <a
+ href="https://jira.qos.ch/browse/LOGBACK-1167">LOGBACK-1167</a> by
+ Michael Edgar.
+ 
+
+ Fixed <code>SizeAndTimeBasedFNATP</code> deprecation warning
+ emitted even the replacement,
+ i.e. <code>SizeAndTimeBasedRollingPolicy</code>, is in use. See <a
+ href="http://jira.qos.ch/browse/LOGBACK-1236">LOGBACK-1236</a>. This
+ issue was reported by Claudius Nicolae. 
+ 
+ 
+ Added proper implementation for
+ <code>LobackValve.getScheduledExecutorService()</code> method. The
+ missing implementation manifested itself in the form of an
+ <code>UnsupportedOperationException</code> thrown by
+ LogbackValve. This problem is further described in <a
+ href="http://jira.qos.ch/browse/LOGBACK-1181">LOGBACK-1181</a>
+ reported by Andreas von Roepenack.
+ 
+
+ <hr width="80%" align="center" />
+
+ <h3>December 9th, 2016, Release of version 1.1.8</h3>
+
+ Removed the two period safeguard, aka untouchable periods, for
+ archive removal beyond the size specified by totalSizeCap in
+ <code>TimeBasedRollingPolicy</code>. It turns out the safegaurd is
+ not required and is unexpected as attested by <a
+ href="http://jira.qos.ch/browse/LOGBACK-1166">LOGBACK-1166</a>.
+ 
+ 
+ Fixed issue with Joran incorrectly reporting "Unexpected
+ aggregationType AS_BASIC_PROPERTY_COLLECTION". This issue was
+ raised in <a
+ href="http://jira.qos.ch/browse/LOGBACK-1158">LOGBACK-1158</a> by
+ Christian H&uuml;bner.
+ 
+
+ Gaffer (logback's groovy configurator) now supports the
+ <code>valueOf</code> convention. This issue was raised in <a
+ href="http://jira.qos.ch/browse/LOGBACK-1232">LOGBACK-1232</a> by
+ Frans Orsel.
+ 
+
+ The <code>org.slf4j.impl.StaticLoggerBinder</code> class
+ shipping in logback-classic no longer catches
+ <code>Throwable</code> but <code>Exception</code>. This change was
+ requested in <a
+ href="http://jira.qos.ch/browse/LOGBACK-1159">LOGBACK-1159</a> by
+ David J. M. Karlsen.
+ 
+
+ <code>BeanDescriptionFactory</code> no longer outputs a
+ superflous warning message in case the class contains bridge
+ methods. This fixes <a
+ href="http://jira.qos.ch/browse/LOGBACK-1164">LOGBACK-1164</a>
+ reported by Phil Clay.
+ 
+
+  
 
 <hr width="80%" align="center" />

_service:tar_scm:v_1.1.7.tar.gz/logback-site/src/site/pages/setup.html -> _service:tar_scm:v_1.2.8.tar.gz/logback-site/src/site/pages/setup.html Changed

@@ -43,15 +43,15 @@
 
 
 
-
 <h3 class="doAnchor" name="commandLine">Running from the command
 line</h3>
 
- Assuming your current directory is
+ You can launch the first sample application,
+ chapters.introduction.HelloWord1 with the following
+ command. This assumes that your current directory is
 $LOGBACK_HOME/logback-examples, where
 $LOGBACK_HOME stands for the directory where you
- installed logback, you can launch the first sample application,
- chapters.introduction.HelloWord1 with the following command:
+ installed logback:
 
 
 java -cp lib/slf4j-api-${slf4j.version}.jar;../logback-core-${project.version}.jar;\
@@ -78,6 +78,80 @@
 $LOGBACK_HOME/logback-examples directory.
 
 
+ 
+ <h2 class="doAnchor" name="mavenBuild">Maven dependency
+ declaration</h2>
+
+ To use logback-classic in your Maven project, declare the
+ following dependency in your project's pom file.
+
+ <pre class="prettyprint source">&lt;dependency>
+ &lt;groupId>ch.qos.logback&lt;/groupId>
+ &lt;artifactId>logback-classic&lt;/artifactId>
+ &lt;version>${project.version}&lt;/version>
+&lt;/dependency></pre>
+
+ TRANSITIVITY Note that in
+ addition to logback-classic.jar, the above declaration
+ will automatically pull-in slf4j-api.jar and
+ logback-core.jar into your project by virtue of Maven's
+ transitivity rules.
+
+
+ To include logback-access in your Maven project, declare the following
+ dependency in your project's pom file.
+
+ <pre class="prettyprint source">&lt;dependency>
+ &lt;groupId>ch.qos.logback&lt;/groupId>
+ &lt;artifactId>logback-access&lt;/artifactId>
+ &lt;version>${project.version}&lt;/version>
+&lt;/dependency></pre>
+
+
+
+ <h2 class="doAnchor" name="optionalDeps">Optional dependencies</h2>
+
 <h3 class="doAnchor" name="SMTP"><code>SMTPAppender</code> requires
 JavaMail API</h3>
 
@@ -156,7 +230,7 @@
 
 
 
- <h3 class="doAnchor" name="ide">Building with an IDE</h3>
+ <h2 class="doAnchor" name="ide">Building with an IDE</h2>
 
 If you wish to contribute to the project or just hack for fun,
 you will probably want to import logback as a project into your
@@ -187,7 +261,7 @@
 Root directory. The import should finish successfully in a few
 seconds.
 
- <h3 class="doAnchor" name="eclipse">Building with Eclipse</h3>
+ <h3 class="doAnchor" name="eclipse">Building with Eclipse and "mvn eclipse:eclipse"</h3>
 
 Building logback under Eclipse is a little trickier. Here are
 instructions for building logback under Eclipse using the maven
@@ -206,13 +280,7 @@
 
 
 <ol>
- <li>Install Eclipse</li>
-
-
-
- <li>Install the Groovy plugin for Eclipse. 
+ <li>Ensure that the Groovy plugin for Eclipse is installed.
 
 <ul>
 <li>
@@ -227,9 +295,7 @@
 
 <li>In Eclipse, select Help &rarr; Intall new Software &rarr;
 Work with the update site you chose in the previous step and
- then Select "Groovy-Eclipse Feature". Installation of other
- plugins in particular "m2e Configurator for Groovy-Eclipse"
- is not necessary
+ then Select "Groovy-Eclipse Feature". 
 </li>
 </ul>
 </li>
@@ -248,30 +314,7 @@
 <li>In Eclipse, import the logback project: Import&rarr;
 General&rarr; Existing Projects into Workspace, select
 $LOGBACK_HOME folder for the import
- </li> 
-
- 
-
- 
+ </li> 
 
 <li>In Eclipse, clean all projects in Eclipse (Project &rarr;
 Clean)
@@ -286,13 +329,90 @@
 
 
 The above listed procedure has been last tested by the author
- using Eclipse Luna on February 25th, 2016.
+ using Eclipse Neon on March 17th, 2017.
+
+ <h3>Building with Eclipse+m2eclipse</h3>
+ 
+ Building with Eclipse and m2eclipse is a bit more complicated
+ due to the use of Groovy in logback-classic.
+ 
+
+ Here are the required steps:
+ 
+
+ <ol>
+ <li>Ensure that the Groovy plugin for Eclipse is installed. See
+ above for instructions.</li>
+
+ <li>In Eclipse, import the logback project: Import&rarr;
+ Maven&rarr; Existing Maven Projects, select
+ $LOGBACK_HOME folder for the import
+ </li>
+
+ <li>Install any discovered m2e connections,
+ e.g. "maven-bundle-plugin".
+ 
+ <a href="images/setup/discoverM2EConnectors.png">
+ <img src="images/setup/discoverM2EConnectors.png" alt="Click to enlarge" height="400"/>
+ </a>
+ 
 
+ You may need to restart Eclipse..
+
+ </li>
+
+ <li>In Eclipse, select logback-classic project and check that it
+ has "Groovy" nature. If not add it by right clicking on
+ logback-classic project &rarr; Groovy &rarr; Convert Groovy to
+ Project.
+ </li>
+ 
+ <li>At this stage Eclipse may complain about
+ <code>GafferConfigurator</code> not being resolved. To fix these
+ errors, select logback-classic project properties, select "Java
+ Build Path" &rarr; Source &rarr; "logback-classic/src/main/groovy".
+ Select "Excluded" and then click on Remove.
+ 
+ 
+ <a href="images/setup/removeGroovyExclusions.png">
+ <img src="images/setup/removeGroovyExclusions.png" alt="Click to enlarge" height="400"/>
+ </a>
+ 
+
+ </li>
+
+ <li>
+ Project &rarr; Clean &rarr; Clean all projects. 
+ </li>
+
+ 
+ <li>To fix the errors in the logback-examples project, you need
+ to instruct logback-classic to not export its Maven dependencies.
+ Select logback-classic project properties, select "Java
+ Build Path" &rarr; Order and Export and deselect "Maven Dependencies".
+
+ 
+ <a href="images/setup/deselectMavenDependenciesExport.png">
+ <img src="images/setup/deselectMavenDependenciesExport.png" alt="Click to enlarge" height="400"/>
+ </a>
+ 
+ </li>
+
+ <li>
+ Project &rarr; Clean &rarr; Clean all projects. 
+ </li>
+ 
+ 
+
+ </ol>
+ 
+ 
+ 
 
- Call for volunteers Given that many
- users prefer M2Eclipse for building projects under Eclipse IDE, we
- are looking for volunteers to help work out the steps for building
- logback with M2Eclipse.
+ Call for volunteers Given that
+ many users prefer M2Eclipse for building projects under Eclipse
+ IDE, we are looking for volunteers to help simplify the steps
+ required for building logback with M2Eclipse.

_service:tar_scm:v_1.1.7.tar.gz/logback-site/src/site/pages/templates/creative.js -> _service:tar_scm:v_1.2.8.tar.gz/logback-site/src/site/pages/templates/creative.js Changed

_service:tar_scm:v_1.1.7.tar.gz/logback-site/src/site/pages/templates/footer.js -> _service:tar_scm:v_1.2.8.tar.gz/logback-site/src/site/pages/templates/footer.js Changed

_service:tar_scm:v_1.1.7.tar.gz/logback-site/src/site/pages/templates/header.js -> _service:tar_scm:v_1.2.8.tar.gz/logback-site/src/site/pages/templates/header.js Changed

_service:tar_scm:v_1.1.7.tar.gz/logback-site/src/site/pages/templates/left.js -> _service:tar_scm:v_1.2.8.tar.gz/logback-site/src/site/pages/templates/left.js Changed

@@ -20,12 +20,22 @@
 document.write('<a href="http://audit.qos.ch/">Logback-audit</a>');
 
 document.write('Online Tools');
-document.write('<a href="http://logback.qos.ch/translator/">log4j.properties Translator</a>');
-document.write('<a href="http://logback.qos.ch/translator/asGroovy.html">logback.XML to Groovy</a>');
+document.write('<a href="https://logback.qos.ch/translator/">log4j.properties Translator</a>');
+document.write('<a href="https://logback.qos.ch/translator/asGroovy.html">logback.XML to Groovy</a>');
 
 document.write('');
 document.write('</div>');
 
-document.write('');
+document.write('&nbsp;');
+
+document.write('<div class="pub">');
+document.write(' <a href="http://twitter.com/qos_ch" style="">');
+document.write(' <img alt="Follow @qos_ch" src="' + prefix + 'images/follow_us.png" />');
+document.write(' </a>');
+document.write('</div>');
+
+document.write('&nbsp;');
+document.write('<div class="pub"><img src="https://travis-ci.org/qos-ch/logback.svg?branch=master"/></div>');
+
 
 //document.write('<div class="jobadd"><a href="'+prefix +'job.html">Your career @QOS.ch</a></div>');
\ No newline at end of file

_service:tar_scm:v_1.2.8.tar.gz/logback-site/src/site/resources/images/follow_us.png Added

_service:tar_scm:v_1.2.8.tar.gz/logback-site/src/site/resources/images/setup/deselectMavenDependenciesExport.png Added

_service:tar_scm:v_1.2.8.tar.gz/logback-site/src/site/resources/images/setup/discoverM2EConnectors.png Added

_service:tar_scm:v_1.2.8.tar.gz/logback-site/src/site/resources/images/setup/removeGroovyExclusions.png Added

_service:tar_scm:v_1.1.7.tar.gz/pom.xml -> _service:tar_scm:v_1.2.8.tar.gz/pom.xml Changed

@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <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/xsd/maven-4.0.0.xsd">
@@ -6,8 +7,9 @@
 
 <groupId>ch.qos.logback</groupId>
 <artifactId>logback-parent</artifactId>
- <version>1.1.7</version>
+ <version>1.2.8</version>
 <packaging>pom</packaging>
+
 <name>Logback-Parent</name>
 <description>logback project pom.xml file</description>
 
@@ -33,7 +35,7 @@
 
 <scm>
 <url>https://github.com/ceki/logback</url>
- <connection>git@github.com:ceki/logback.git</connection>
+ <connection>scm:git@github.com:qos-ch/logback.git</connection>
 </scm>
 
 <modules>
@@ -48,21 +50,33 @@
 <maven.compiler.source>1.6</maven.compiler.source>
 <maven.compiler.target>1.6</maven.compiler.target>
 <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- 
- <slf4j.version>1.7.20</slf4j.version>
 <junit.version>4.10</junit.version>
 <javax.mail.version>1.4</javax.mail.version>
- <janino.version>2.7.8</janino.version>
+ <janino.version>3.0.6</janino.version>
 <groovy.version>2.4.0</groovy.version>
-
+  
+ <slf4j.version>1.7.32</slf4j.version>
+ <cal10n.version>0.8.1</cal10n.version>
 <consolePlugin.version>1.1.0</consolePlugin.version>
- <tomcat.version>7.0.59</tomcat.version>
- <jetty.version>7.5.1.v20110908</jetty.version>
+ 
+ <tomcat.version>8.5.9</tomcat.version>
+ 
+ <jetty.version>8.2.0.v20160908</jetty.version>
+ 
 <jansi.version>1.9</jansi.version>
- <javadoc.plugin.version>2.9.1</javadoc.plugin.version>
- <cobertura.maven.plugin.version>2.6</cobertura.maven.plugin.version>
- <maven-license-plugin.version>1.9.0</maven-license-plugin.version>
+ <maven-compiler-plugin.version>3.8.1</maven-compiler-plugin.version>
+ <maven-surefire-plugin.version>2.19.1</maven-surefire-plugin.version> 
+ <maven-site-plugin.version>3.7.1</maven-site-plugin.version>
+ <maven-javadoc-plugin.version>3.1.0</maven-javadoc-plugin.version>
+ <maven-source-plugin.version>3.2.0</maven-source-plugin.version>
+ <maven-license-plugin.version>3.0</maven-license-plugin.version>
+ <maven-jar-plugin.version>2.6</maven-jar-plugin.version>
+ <maven-jxr-plugin.version>3.1.1</maven-jxr-plugin.version>
+ <maven-deploy-plugin.version>3.0.0-M1</maven-deploy-plugin.version>
+ <cobertura.maven.plugin.version>2.7</cobertura.maven.plugin.version>
+
 </properties>
 
 <developers>
@@ -96,7 +110,7 @@
 
 <dependencyManagement>
 <dependencies>
- 
+ 
 <dependency>
 <groupId>ch.qos.logback</groupId>
 <artifactId>logback-core</artifactId>
@@ -104,14 +118,13 @@
 </dependency>
 <dependency>
 <groupId>ch.qos.logback</groupId>
- <artifactId>logback-core</artifactId>
+ <artifactId>logback-classic</artifactId>
 <version>${project.version}</version>
- <type>test-jar</type>
 </dependency>
 <dependency>
- <groupId>ch.qos.logback</groupId>
- <artifactId>logback-classic</artifactId>
- <version>${project.version}</version>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <version>${slf4j.version}</version>
 </dependency>
 <dependency>
 <groupId>ch.qos.logback</groupId>
@@ -119,10 +132,13 @@
 <version>${project.version}</version>
 </dependency>
 <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- <version>${slf4j.version}</version>
+ <groupId>ch.qos.logback</groupId>
+ <artifactId>logback-core</artifactId>
+ <version>${project.version}</version>
+ <type>test-jar</type>
 </dependency>
+ 
+ 
 <dependency>
 <groupId>org.codehaus.janino</groupId>
 <artifactId>janino</artifactId>
@@ -130,9 +146,16 @@
 </dependency>
 <dependency>
 <groupId>org.codehaus.groovy</groupId>
- <artifactId>groovy-all</artifactId>
+ <artifactId>groovy</artifactId>
+ <version>${groovy.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.codehaus.groovy</groupId>
+ <artifactId>groovy-test</artifactId>
 <version>${groovy.version}</version>
 </dependency>
+ 
 <dependency>
 <groupId>org.fusesource.jansi</groupId>
 <artifactId>jansi</artifactId>
@@ -149,26 +172,6 @@
 <version>1.6.1</version>
 </dependency>
 <dependency>
- <groupId>hsqldb</groupId>
- <artifactId>hsqldb</artifactId>
- <version>1.8.0.7</version>
- </dependency>
- <dependency>
- <groupId>com.h2database</groupId>
- <artifactId>h2</artifactId>
- <version>1.2.132</version>
- </dependency>
- <dependency>
- <groupId>postgresql</groupId>
- <artifactId>postgresql</artifactId>
- <version>8.4-701.jdbc4</version>
- </dependency>
- <dependency>
- <groupId>mysql</groupId>
- <artifactId>mysql-connector-java</artifactId>
- <version>5.1.9</version>
- </dependency>
- <dependency>
 <groupId>org.apache.tomcat</groupId>
 <artifactId>tomcat-catalina</artifactId>
 <version>${tomcat.version}</version>
@@ -183,30 +186,34 @@
 <artifactId>jetty-server</artifactId>
 <version>${jetty.version}</version>
 </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jms_1.1_spec</artifactId>
- <version>1.0</version>
- </dependency>
+
 <dependency>
 <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>2.5</version>
+ <artifactId>javax.servlet-api</artifactId>
+ <version>3.1.0</version>
 </dependency>
+
 <dependency>
 <groupId>joda-time</groupId>
 <artifactId>joda-time</artifactId>
 <version>2.9.2</version>
 </dependency>
+
+ <dependency>
+ <groupId>org.mockito</groupId>
+ <artifactId>mockito-core</artifactId>
+ <version>2.7.9</version>
+ </dependency>
 </dependencies>
 </dependencyManagement>
 
+
 <build>
 <extensions>
 <extension>
 <groupId>org.apache.maven.wagon</groupId>
 <artifactId>wagon-ssh</artifactId>
- <version>2.8</version>
+ <version>2.10</version>
 </extension>
 </extensions>
 
@@ -215,17 +222,17 @@
 <plugin>
 <groupId>org.apache.maven.plugins</groupId>
 <artifactId>maven-clean-plugin</artifactId>
- <version>2.6.1</version>
+ <version>3.0.0</version>
 </plugin>
 <plugin>
 <groupId>org.apache.maven.plugins</groupId>
 <artifactId>maven-compiler-plugin</artifactId>
- <version>3.5.1</version>
+ <version>${maven-compiler-plugin.version}</version>
 </plugin>
 <plugin>
 <groupId>org.apache.maven.plugins</groupId>
 <artifactId>maven-deploy-plugin</artifactId>
- <version>2.8.2</version>
+ <version>${maven-deploy-plugin.version}</version>
 </plugin>
 <plugin>
 <groupId>org.apache.maven.plugins</groupId>
@@ -235,27 +242,27 @@
 <plugin>
 <groupId>org.apache.maven.plugins</groupId>
 <artifactId>maven-resources-plugin</artifactId>
- <version>2.6</version> 
+ <version>3.0.1</version>
 </plugin>
 <plugin>
 <groupId>org.apache.maven.plugins</groupId>
 <artifactId>maven-site-plugin</artifactId>
- <version>3.4</version>
+ <version>${maven-site-plugin.version}</version>
 </plugin>
 <plugin>
 <groupId>org.apache.maven.plugins</groupId>
 <artifactId>maven-surefire-plugin</artifactId>
- <version>2.19.1</version>
+ <version>${maven-surefire-plugin.version}</version>
 </plugin>
 <plugin>
 <groupId>org.apache.maven.plugins</groupId>
 <artifactId>maven-jar-plugin</artifactId>
- <version>2.5</version>
+ <version>${maven-jar-plugin.version}</version>
 </plugin>
 <plugin>
 <groupId>org.apache.maven.plugins</groupId>
 <artifactId>maven-javadoc-plugin</artifactId>
- <version>${javadoc.plugin.version}</version>
+ <version>${maven-javadoc-plugin.version}</version>
 </plugin>
 <plugin>
 <groupId>org.apache.maven.plugins</groupId>
@@ -265,28 +272,28 @@
 <plugin>
 <groupId>org.apache.maven.plugins</groupId>
 <artifactId>maven-release-plugin</artifactId>
- <version>2.5.1</version>
+ <version>2.5.3</version>
 </plugin>
 <plugin>
 <groupId>org.apache.maven.plugins</groupId>
 <artifactId>maven-source-plugin</artifactId>
- <version>2.4</version>
+ <version>${maven-source-plugin.version}</version>
 </plugin>
 <plugin>
 <groupId>org.codehaus.mojo</groupId>
 <artifactId>findbugs-maven-plugin</artifactId>
- <version>3.0.0</version>
+ <version>3.0.4</version>
 </plugin>
 <plugin>
 <groupId>org.apache.felix</groupId>
 <artifactId>maven-bundle-plugin</artifactId>
- <version>2.5.3</version>
+ <version>2.5.4</version>
 </plugin>
 
 <plugin>
 <groupId>org.codehaus.mojo</groupId>
 <artifactId>animal-sniffer-maven-plugin</artifactId>
- <version>1.14</version>
+ <version>1.15</version>
 <configuration>
 <ignores>
 <ignore>sun.reflect.Reflection</ignore>
@@ -321,7 +328,7 @@
 <plugin>
 <groupId>org.apache.maven.plugins</groupId>
 <artifactId>maven-assembly-plugin</artifactId>
- <version>2.5.3</version>
+ <version>3.0.0</version>
 <configuration>
 <descriptors>
 <descriptor>src/main/assembly/dist.xml</descriptor>
@@ -355,7 +362,7 @@
 <plugin>
 <groupId>org.apache.maven.plugins</groupId>
 <artifactId>maven-jxr-plugin</artifactId>
- <version>2.5</version>
+ <version>${maven-jxr-plugin.version}</version>
 <configuration>
 <aggregate>true</aggregate>
 <javadocDir>target/site/apidocs/</javadocDir>
@@ -366,9 +373,14 @@
 <plugin>
 <groupId>org.apache.maven.plugins</groupId>
 <artifactId>maven-javadoc-plugin</artifactId>
- <version>2.10.1</version>
+ <version>${maven-javadoc-plugin.version}</version>
 <configuration>
 <aggregate>true</aggregate>
+ <linksource>true</linksource>
+ <additionalOptions>
+ <additionalOption>-Xdoclint:none</additionalOption>
+ <doclint>none</doclint>
+ </additionalOptions>
 <links>
 <link>
 http://docs.oracle.com/javase/6/docs/api/
@@ -412,16 +424,13 @@
 <distributionManagement>
 
 <site>
- <id>tao</id>
- <url>scp://tao.qos.ch/var/www/logback.qos.ch/htdocs/</url>
+ <id>qos_ch</id>
+ <url>scp://te.qos.ch/var/www/logback.qos.ch/htdocs/</url>
 </site>
 
 <repository>
 <id>sonatype-nexus-staging</id>
 <url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
-
- 
- 
 </repository>
 
 </distributionManagement>
@@ -438,9 +447,9 @@
 <build>
 <plugins>
 <plugin>
- <groupId>com.mycila.maven-license-plugin</groupId>
- <artifactId>maven-license-plugin</artifactId>
- <version>1.9.0</version>
+ <groupId>com.mycila</groupId>
+ <artifactId>license-maven-plugin</artifactId>
+ <version>${maven-license-plugin.version}</version>
 <configuration>
 <header>src/main/licenseHeader.txt</header>
 <quiet>false</quiet>
@@ -471,7 +480,7 @@
 <plugin>
 <groupId>org.apache.maven.plugins</groupId>
 <artifactId>maven-javadoc-plugin</artifactId>
- <version>${javadoc.plugin.version}</version>
+ <version>${maven-javadoc-plugin.version}</version>
 <executions>
 <execution>
 <id>attach-javadocs</id>
@@ -481,6 +490,10 @@
 </goals>
 </execution>
 </executions>
+ <configuration>
+ <additionalparam>-Xdoclint:none</additionalparam>
+ <doclint>none</doclint>
+ </configuration>
 </plugin>
 </plugins>
 </build>

_service:tar_scm:v_1.1.7.tar.gz/release.sh -> _service:tar_scm:v_1.2.8.tar.gz/release.sh Changed

_service:tar_scm:v_1.1.7.tar.gz/src/main/assembly/dist.xml -> _service:tar_scm:v_1.2.8.tar.gz/src/main/assembly/dist.xml Changed

@@ -66,6 +66,17 @@
 				<exclude>*.bak</exclude>
 			</excludes>
 		</fileSet>
+ 
 		
 		<fileSet>
 			<directory>logback-core/src/</directory>
@@ -125,21 +136,21 @@
 		
 		<fileSet>
 			<directory>logback-core/target/</directory>
-			<outputDirectory>/</outputDirectory>
+			<outputDirectory>./</outputDirectory>
 			<includes>
 				<include>logback-core-${project.version}.jar</include>
 			</includes>
 		</fileSet>
 		<fileSet>
 			<directory>logback-classic/target/</directory>
-			<outputDirectory>/</outputDirectory>
+			<outputDirectory>./</outputDirectory>
 			<includes>
 				<include>logback-classic-${project.version}.jar</include>
 			</includes>
 		</fileSet>		
 		<fileSet>
 			<directory>logback-access/target/</directory>
-			<outputDirectory>/</outputDirectory>
+			<outputDirectory>./</outputDirectory>
 			<includes>
 				<include>logback-access-${project.version}.jar</include>
 			</includes>
@@ -147,21 +158,21 @@
 		
 		<fileSet>
 			<directory>logback-core/target/</directory>
-			<outputDirectory>/</outputDirectory>
+			<outputDirectory>./</outputDirectory>
 			<includes>
 				<include>logback-core-${project.version}-sources.jar</include>
 			</includes>
 		</fileSet>
 		<fileSet>
 			<directory>logback-classic/target/</directory>
-			<outputDirectory>/</outputDirectory>
+			<outputDirectory>./</outputDirectory>
 			<includes>
 				<include>logback-classic-${project.version}-sources.jar</include>
 			</includes>
 		</fileSet>		
 		<fileSet>
 			<directory>logback-access/target/</directory>
-			<outputDirectory>/</outputDirectory>
+			<outputDirectory>./</outputDirectory>
 			<includes>
 				<include>logback-access-${project.version}-sources.jar</include>
 			</includes>

_service:tar_scm:v_1.1.7.tar.gz/src/main/clas/signed-clas.txt -> _service:tar_scm:v_1.2.8.tar.gz/src/main/clas/signed-clas.txt Changed

Changes of Revision 2