diff options
author | Joakim Erdfelt | 2011-08-10 22:03:04 +0000 |
---|---|---|
committer | Joakim Erdfelt | 2011-08-10 22:03:04 +0000 |
commit | 82f54460de10df460843a108d9a2bea396b6b782 (patch) | |
tree | a03f201352807e5cc2bb46d32246d974d49b10c9 | |
parent | 2cd224c13fbb48ec1a9e101700a05947bee57ea6 (diff) | |
download | org.eclipse.jetty.sandbox-82f54460de10df460843a108d9a2bea396b6b782.tar.gz org.eclipse.jetty.sandbox-82f54460de10df460843a108d9a2bea396b6b782.tar.xz org.eclipse.jetty.sandbox-82f54460de10df460843a108d9a2bea396b6b782.zip |
jetty-logback moved into permanent home at codehaus
-rw-r--r-- | jetty-logback/.gitignore | 9 | ||||
-rw-r--r-- | jetty-logback/pom.xml | 167 | ||||
-rw-r--r-- | jetty-logback/src/main/config/etc/jetty-logback.xml | 27 | ||||
-rw-r--r-- | jetty-logback/src/main/config/etc/logback-access.xml | 12 | ||||
-rw-r--r-- | jetty-logback/src/main/java/org/eclipse/jetty/logback/SLF4JHelper.java | 45 |
5 files changed, 0 insertions, 260 deletions
diff --git a/jetty-logback/.gitignore b/jetty-logback/.gitignore deleted file mode 100644 index 9c65b19..0000000 --- a/jetty-logback/.gitignore +++ /dev/null @@ -1,9 +0,0 @@ -target/ -.classpath -.project -.settings -*.swp -*.patch -*.diff -*.log -cobertura.ser diff --git a/jetty-logback/pom.xml b/jetty-logback/pom.xml deleted file mode 100644 index 3404d0e..0000000 --- a/jetty-logback/pom.xml +++ /dev/null @@ -1,167 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- -// ======================================================================== -// Copyright (c) Webtide LLC -// -// All rights reserved. This program and the accompanying materials -// are made available under the terms of the Eclipse Public License v1.0 -// and Apache License v2.0 which accompanies this distribution. -// -// The Eclipse Public License is available at -// http://www.eclipse.org/legal/epl-v10.html -// -// The Apache License v2.0 is available at -// http://www.apache.org/licenses/LICENSE-2.0.txt -// -// You may elect to redistribute this code under either of these licenses. -// ======================================================================== - --> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-project</artifactId> - <version>7.0.2-SNAPSHOT</version> - </parent> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-logback</artifactId> - <name>Jetty :: Logback Logging</name> - <packaging>jar</packaging> - <properties> - <slf4j.version>1.5.10</slf4j.version> - <logback.version>0.9.18</logback.version> - </properties> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-assembly-plugin</artifactId> - <executions> - <execution> - <phase>package</phase> - <goals> - <goal>single</goal> - </goals> - <configuration> - <descriptors> - <descriptor>config.xml</descriptor> - </descriptors> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> - <dependencies> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> - <version>${slf4j.version}</version> - </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>jcl-over-slf4j</artifactId> - <version>${slf4j.version}</version> - </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>log4j-over-slf4j</artifactId> - <version>${slf4j.version}</version> - </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>jul-to-slf4j</artifactId> - <version>${slf4j.version}</version> - </dependency> - <dependency> - <groupId>ch.qos.logback</groupId> - <artifactId>logback-core</artifactId> - <version>${logback.version}</version> - </dependency> - <dependency> - <groupId>ch.qos.logback</groupId> - <artifactId>logback-classic</artifactId> - <version>${logback.version}</version> - </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <scope>test</scope> - </dependency> - </dependencies> - <reporting> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-project-info-reports-plugin</artifactId> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-javadoc-plugin</artifactId> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-jxr-plugin</artifactId> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>cobertura-maven-plugin</artifactId> - </plugin> - </plugins> - </reporting> - - <profiles> - <profile> - <id>copy-fresh-webapps</id> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-dependency-plugin</artifactId> - <executions> - <execution> - <id>copy-testing-wars</id> - <phase>validate</phase> - <goals> - <goal>copy</goal> - </goals> - <configuration> - <artifactItems> - <artifactItem> - <groupId>org.eclipse.jetty.tests</groupId> - <artifactId>dummy-webapp-logging-commons</artifactId> - <version>${project.version}</version> - <type>war</type> - </artifactItem> - <artifactItem> - <groupId>org.eclipse.jetty.tests</groupId> - <artifactId>dummy-webapp-logging-java</artifactId> - <version>${project.version}</version> - <type>war</type> - </artifactItem> - <artifactItem> - <groupId>org.eclipse.jetty.tests</groupId> - <artifactId>dummy-webapp-logging-log4j</artifactId> - <version>${project.version}</version> - <type>war</type> - </artifactItem> - <artifactItem> - <groupId>org.eclipse.jetty.tests</groupId> - <artifactId>dummy-webapp-logging-slf4j</artifactId> - <version>${project.version}</version> - <type>war</type> - </artifactItem> - </artifactItems> - <outputDirectory>${basedir}/src/test/resources/webapps</outputDirectory> - <overWriteIfNewer>true</overWriteIfNewer> - <stripVersion>true</stripVersion> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> - </profiles> -</project> diff --git a/jetty-logback/src/main/config/etc/jetty-logback.xml b/jetty-logback/src/main/config/etc/jetty-logback.xml deleted file mode 100644 index 1ac6bd3..0000000 --- a/jetty-logback/src/main/config/etc/jetty-logback.xml +++ /dev/null @@ -1,27 +0,0 @@ -<?xml version="1.0"?> -<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure.dtd"> - - -<!-- =============================================================== --> -<!-- Configure logback logging under Jetty --> -<!-- =============================================================== --> -<Configure id="Server" class="org.eclipse.jetty.server.Server"> - - <!-- =========================================================== --> - <!-- Use LogBack for Request Logging --> - <!-- =========================================================== --> - - <Ref id="requestLog"> - <Set name="requestLog"> - <New id="requestLogImpl" - class="ch.qos.logback.access.jetty.RequestLogImpl" /> - </Set> - </Ref> - - <!-- =========================================================== --> - <!-- Enable java.util.logging routing to slf4j --> - <!-- =========================================================== --> - <Call class="org.slf4j.bridge.SLF4JBridgeHandler" name="install" /> - -</Configure> - diff --git a/jetty-logback/src/main/config/etc/logback-access.xml b/jetty-logback/src/main/config/etc/logback-access.xml deleted file mode 100644 index dc16c0c..0000000 --- a/jetty-logback/src/main/config/etc/logback-access.xml +++ /dev/null @@ -1,12 +0,0 @@ -<configuration> - <appender name="STDOUT" - class="ch.qos.logback.core.ConsoleAppender"> - <layout - class="ch.qos.logback.access.PatternLayout"> - <Pattern>%h %l %u %user %date "%r" %s %b</Pattern> - </layout> - </appender> - - <appender-ref ref="STDOUT" /> -</configuration> - diff --git a/jetty-logback/src/main/java/org/eclipse/jetty/logback/SLF4JHelper.java b/jetty-logback/src/main/java/org/eclipse/jetty/logback/SLF4JHelper.java deleted file mode 100644 index fd85e6a..0000000 --- a/jetty-logback/src/main/java/org/eclipse/jetty/logback/SLF4JHelper.java +++ /dev/null @@ -1,45 +0,0 @@ -// ======================================================================== -// Copyright (c) Webtide LLC -// ------------------------------------------------------------------------ -// All rights reserved. This program and the accompanying materials -// are made available under the terms of the Eclipse Public License v1.0 -// and Apache License v2.0 which accompanies this distribution. -// -// The Eclipse Public License is available at -// http://www.eclipse.org/legal/epl-v10.html -// -// The Apache License v2.0 is available at -// http://www.apache.org/licenses/LICENSE-2.0.txt -// -// You may elect to redistribute this code under either of these licenses. -// ======================================================================== -package org.eclipse.jetty.logback; - -import java.util.logging.Handler; -import java.util.logging.LogManager; - -import org.slf4j.bridge.SLF4JBridgeHandler; - -/** - * Helper functions for working with Slf4j logging. - */ -public class SLF4JHelper -{ - /** - * Establish the SLF4JBridgeHandler as the only handler for java.util.logging - */ - public static void establishJavaUtilLoggingBridge() - { - java.util.logging.Logger rootLogger = LogManager.getLogManager().getLogger(""); - Handler[] handlers = rootLogger.getHandlers(); - - // Remove all previous handlers - for (int i = 0; i < handlers.length; i++) - { - rootLogger.removeHandler(handlers[i]); - } - - // Install jul to slf4j bridge - SLF4JBridgeHandler.install(); - } -} |