Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGreg Wilkins2012-11-01 22:17:53 -0400
committerGreg Wilkins2012-11-01 22:17:53 -0400
commit872340873153e778008866c0bcceaab49917b7f4 (patch)
tree66912f384ce7bcf9d842a331a02ebe984be828c2 /jetty-websocket/src/test/resources
parent3d198a94fb328ca92e3f5f4bced36d0efe8d1003 (diff)
parent65202e9abe2c56a05b45140e46c70a94b4119cbb (diff)
downloadorg.eclipse.jetty.project-872340873153e778008866c0bcceaab49917b7f4.tar.gz
org.eclipse.jetty.project-872340873153e778008866c0bcceaab49917b7f4.tar.xz
org.eclipse.jetty.project-872340873153e778008866c0bcceaab49917b7f4.zip
Merge remote-tracking branch 'origin/jetty-7' into jetty-8
Conflicts: jetty-servlets/src/main/java/org/eclipse/jetty/servlets/MultiPartFilter.java
Diffstat (limited to 'jetty-websocket/src/test/resources')
-rw-r--r--jetty-websocket/src/test/resources/jetty-logging.properties4
1 files changed, 4 insertions, 0 deletions
diff --git a/jetty-websocket/src/test/resources/jetty-logging.properties b/jetty-websocket/src/test/resources/jetty-logging.properties
new file mode 100644
index 0000000000..78d8a9d812
--- /dev/null
+++ b/jetty-websocket/src/test/resources/jetty-logging.properties
@@ -0,0 +1,4 @@
+# Setup default logging implementation for during testing
+org.eclipse.jetty.util.log.class=org.eclipse.jetty.util.log.StdErrLog
+org.eclipse.jetty.LEVEL=INFO
+org.eclipse.jetty.websocket.LEVEL=DEBUG \ No newline at end of file

Back to the top