aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Becker2012-07-30 10:19:24 (EDT)
committerThomas Becker2012-07-30 10:19:24 (EDT)
commit51d74049564308cd0b1f3e1c74eb43785feacc9e (patch)
tree6486ad2737aae0b1caa6499e8ac59fac703e87d9
parent36729c424886e0544bca345f56d96c3b1c6fbe26 (diff)
downloadorg.eclipse.jetty.project-51d74049564308cd0b1f3e1c74eb43785feacc9e.zip
org.eclipse.jetty.project-51d74049564308cd0b1f3e1c74eb43785feacc9e.tar.gz
org.eclipse.jetty.project-51d74049564308cd0b1f3e1c74eb43785feacc9e.tar.bz2
jetty-9: spdy replaced log4j with jetty-logging.properties
-rw-r--r--jetty-spdy/spdy-core/pom.xml6
-rw-r--r--jetty-spdy/spdy-core/src/test/resources/jetty-logging.properties2
-rw-r--r--jetty-spdy/spdy-core/src/test/resources/log4j.properties14
-rw-r--r--jetty-spdy/spdy-jetty-http-webapp/src/main/resources/jetty-logging.properties2
-rw-r--r--jetty-spdy/spdy-jetty-http-webapp/src/main/resources/log4j.properties16
-rw-r--r--jetty-spdy/spdy-jetty-http/pom.xml6
-rw-r--r--jetty-spdy/spdy-jetty-http/src/test/resources/jetty-logging.properties2
-rw-r--r--jetty-spdy/spdy-jetty-http/src/test/resources/log4j.properties14
-rw-r--r--jetty-spdy/spdy-jetty/pom.xml6
-rw-r--r--jetty-spdy/spdy-jetty/src/test/resources/jetty-logging.properties2
-rw-r--r--jetty-spdy/spdy-jetty/src/test/resources/log4j.properties15
11 files changed, 8 insertions, 77 deletions
diff --git a/jetty-spdy/spdy-core/pom.xml b/jetty-spdy/spdy-core/pom.xml
index 00b04b0..0354f82 100644
--- a/jetty-spdy/spdy-core/pom.xml
+++ b/jetty-spdy/spdy-core/pom.xml
@@ -36,12 +36,6 @@
<artifactId>mockito-core</artifactId>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <version>${slf4j-version}</version>
- <scope>test</scope>
- </dependency>
</dependencies>
</project>
diff --git a/jetty-spdy/spdy-core/src/test/resources/jetty-logging.properties b/jetty-spdy/spdy-core/src/test/resources/jetty-logging.properties
new file mode 100644
index 0000000..5250a08
--- /dev/null
+++ b/jetty-spdy/spdy-core/src/test/resources/jetty-logging.properties
@@ -0,0 +1,2 @@
+org.eclipse.jetty.util.log.class=org.eclipse.jetty.util.log.StdErrLog
+org.eclipse.jetty.spdy.LEVEL=WARN
diff --git a/jetty-spdy/spdy-core/src/test/resources/log4j.properties b/jetty-spdy/spdy-core/src/test/resources/log4j.properties
deleted file mode 100644
index aa88d64..0000000
--- a/jetty-spdy/spdy-core/src/test/resources/log4j.properties
+++ /dev/null
@@ -1,14 +0,0 @@
-# LOG4J levels: OFF, FATAL, ERROR, WARN, INFO, DEBUG, ALL
-#
-log4j.rootLogger=ALL,CONSOLE
-
-log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender
-#log4j.appender.CONSOLE.threshold=INFO
-log4j.appender.CONSOLE.layout=org.apache.log4j.PatternLayout
-#log4j.appender.CONSOLE.layout.ConversionPattern=%d %t [%5p][%c{1}] %m%n
-log4j.appender.CONSOLE.layout.ConversionPattern=%d %t [%5p][%c{1}] %m%n
-log4j.appender.CONSOLE.target=System.err
-
-# Level tuning
-log4j.logger.org.eclipse.jetty=INFO
-#log4j.logger.org.eclipse.jetty.spdy=DEBUG
diff --git a/jetty-spdy/spdy-jetty-http-webapp/src/main/resources/jetty-logging.properties b/jetty-spdy/spdy-jetty-http-webapp/src/main/resources/jetty-logging.properties
new file mode 100644
index 0000000..5250a08
--- /dev/null
+++ b/jetty-spdy/spdy-jetty-http-webapp/src/main/resources/jetty-logging.properties
@@ -0,0 +1,2 @@
+org.eclipse.jetty.util.log.class=org.eclipse.jetty.util.log.StdErrLog
+org.eclipse.jetty.spdy.LEVEL=WARN
diff --git a/jetty-spdy/spdy-jetty-http-webapp/src/main/resources/log4j.properties b/jetty-spdy/spdy-jetty-http-webapp/src/main/resources/log4j.properties
deleted file mode 100644
index d15b6be..0000000
--- a/jetty-spdy/spdy-jetty-http-webapp/src/main/resources/log4j.properties
+++ /dev/null
@@ -1,16 +0,0 @@
-# LOG4J levels: OFF, FATAL, ERROR, WARN, INFO, DEBUG, ALL
-#
-log4j.rootLogger=ALL,CONSOLE
-
-log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender
-#log4j.appender.CONSOLE.threshold=INFO
-log4j.appender.CONSOLE.layout=org.apache.log4j.PatternLayout
-#log4j.appender.CONSOLE.layout.ConversionPattern=%d %t [%5p][%c{1}] %m%n
-log4j.appender.CONSOLE.layout.ConversionPattern=%d %t [%5p][%c] %m%n
-log4j.appender.CONSOLE.target=System.err
-
-# Level tuning
-log4j.logger.jndi=INFO
-log4j.logger.org.mortbay.jetty=INFO
-log4j.logger.org.eclipse.jetty=INFO
-log4j.logger.org.eclipse.jetty.spdy=DEBUG
diff --git a/jetty-spdy/spdy-jetty-http/pom.xml b/jetty-spdy/spdy-jetty-http/pom.xml
index 151cb9c..4039101 100644
--- a/jetty-spdy/spdy-jetty-http/pom.xml
+++ b/jetty-spdy/spdy-jetty-http/pom.xml
@@ -67,12 +67,6 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <version>${slf4j-version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<scope>test</scope>
diff --git a/jetty-spdy/spdy-jetty-http/src/test/resources/jetty-logging.properties b/jetty-spdy/spdy-jetty-http/src/test/resources/jetty-logging.properties
new file mode 100644
index 0000000..5250a08
--- /dev/null
+++ b/jetty-spdy/spdy-jetty-http/src/test/resources/jetty-logging.properties
@@ -0,0 +1,2 @@
+org.eclipse.jetty.util.log.class=org.eclipse.jetty.util.log.StdErrLog
+org.eclipse.jetty.spdy.LEVEL=WARN
diff --git a/jetty-spdy/spdy-jetty-http/src/test/resources/log4j.properties b/jetty-spdy/spdy-jetty-http/src/test/resources/log4j.properties
deleted file mode 100644
index aa88d64..0000000
--- a/jetty-spdy/spdy-jetty-http/src/test/resources/log4j.properties
+++ /dev/null
@@ -1,14 +0,0 @@
-# LOG4J levels: OFF, FATAL, ERROR, WARN, INFO, DEBUG, ALL
-#
-log4j.rootLogger=ALL,CONSOLE
-
-log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender
-#log4j.appender.CONSOLE.threshold=INFO
-log4j.appender.CONSOLE.layout=org.apache.log4j.PatternLayout
-#log4j.appender.CONSOLE.layout.ConversionPattern=%d %t [%5p][%c{1}] %m%n
-log4j.appender.CONSOLE.layout.ConversionPattern=%d %t [%5p][%c{1}] %m%n
-log4j.appender.CONSOLE.target=System.err
-
-# Level tuning
-log4j.logger.org.eclipse.jetty=INFO
-#log4j.logger.org.eclipse.jetty.spdy=DEBUG
diff --git a/jetty-spdy/spdy-jetty/pom.xml b/jetty-spdy/spdy-jetty/pom.xml
index d9891e0..36863a3 100644
--- a/jetty-spdy/spdy-jetty/pom.xml
+++ b/jetty-spdy/spdy-jetty/pom.xml
@@ -72,12 +72,6 @@
<artifactId>hamcrest-all</artifactId>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <version>${slf4j-version}</version>
- <scope>test</scope>
- </dependency>
</dependencies>
</project>
diff --git a/jetty-spdy/spdy-jetty/src/test/resources/jetty-logging.properties b/jetty-spdy/spdy-jetty/src/test/resources/jetty-logging.properties
new file mode 100644
index 0000000..5250a08
--- /dev/null
+++ b/jetty-spdy/spdy-jetty/src/test/resources/jetty-logging.properties
@@ -0,0 +1,2 @@
+org.eclipse.jetty.util.log.class=org.eclipse.jetty.util.log.StdErrLog
+org.eclipse.jetty.spdy.LEVEL=WARN
diff --git a/jetty-spdy/spdy-jetty/src/test/resources/log4j.properties b/jetty-spdy/spdy-jetty/src/test/resources/log4j.properties
deleted file mode 100644
index 0459682..0000000
--- a/jetty-spdy/spdy-jetty/src/test/resources/log4j.properties
+++ /dev/null
@@ -1,15 +0,0 @@
-# LOG4J levels: OFF, FATAL, ERROR, WARN, INFO, DEBUG, ALL
-#
-log4j.rootLogger=ALL,CONSOLE
-
-log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender
-#log4j.appender.CONSOLE.threshold=INFO
-log4j.appender.CONSOLE.layout=org.apache.log4j.PatternLayout
-#log4j.appender.CONSOLE.layout.ConversionPattern=%d %t [%5p][%c{1}] %m%n
-log4j.appender.CONSOLE.layout.ConversionPattern=%d %t [%5p][%c{1}] %m%n
-log4j.appender.CONSOLE.target=System.err
-
-# Level tuning
-log4j.logger.org.eclipse.jetty=INFO
-#log4j.logger.org.eclipse.jetty.io=DEBUG
-#log4j.logger.org.eclipse.jetty.spdy=DEBUG