clean up websocket jetty-logging.properties files

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-09-11 15:31:57 +10:00 · 2019-09-11 15:31:57 +10:00 · 387faa7e33
parent 3de6d6f6e7
commit 387faa7e33
7 changed files with 15 additions and 137 deletions
--- a/jetty-websocket/javax-websocket-common/src/test/resources/jetty-logging.properties
+++ b/jetty-websocket/javax-websocket-common/src/test/resources/jetty-logging.properties
@ -1,25 +1,5 @@
-#
-#
-#  ========================================================================
-#  Copyright (c) 1995-2017 Mort Bay Consulting Pty. Ltd.
-#  ------------------------------------------------------------------------
-#  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.opensource.org/licenses/apache2.0.php
-#
-#  You may elect to redistribute this code under either of these licenses.
-#  ========================================================================
-#
-#
-# org.eclipse.jetty.util.log.class=org.eclipse.jetty.util.log.Slf4jLog
 org.eclipse.jetty.util.log.class=org.eclipse.jetty.util.log.StdErrLog
-org.eclipse.jetty.LEVEL=WARN
+# org.eclipse.jetty.LEVEL=DEBUG
 # org.eclipse.jetty.util.log.stderr.LONG=true
 # org.eclipse.jetty.server.AbstractConnector.LEVEL=DEBUG
 # org.eclipse.jetty.io.WriteFlusher.LEVEL=DEBUG
--- a/jetty-websocket/javax-websocket-server/src/test/resources/jetty-logging.properties
+++ b/jetty-websocket/javax-websocket-server/src/test/resources/jetty-logging.properties
@ -1,11 +1,10 @@
 org.eclipse.jetty.util.log.class=org.eclipse.jetty.util.log.StdErrLog
-org.eclipse.jetty.LEVEL=WARN
+# org.eclipse.jetty.LEVEL=DEBUG
 # org.eclipse.jetty.websocket.LEVEL=DEBUG
 # org.eclipse.jetty.websocket.LEVEL=INFO
 # org.eclipse.jetty.websocket.LEVEL=WARN
 # org.eclipse.jetty.websocket.common.io.LEVEL=DEBUG
 # org.eclipse.jetty.websocket.common.WebSocketSession.LEVEL=DEBUG
-# org.eclipse.jetty.websocket.jsr356.LEVEL=DEBUG
 ### Show state changes on BrowserDebugTool
 # -- LEAVE THIS AT DEBUG LEVEL --
-org.eclipse.jetty.websocket.jsr356.server.browser.LEVEL=DEBUG
+org.eclipse.jetty.websocket.javax.server.browser.LEVEL=DEBUG
--- a/jetty-websocket/javax-websocket-tests/src/test/resources/jetty-logging.properties
+++ b/jetty-websocket/javax-websocket-tests/src/test/resources/jetty-logging.properties
@ -1,25 +1,5 @@
-#
-#
-#  ========================================================================
-#  Copyright (c) 1995-2017 Mort Bay Consulting Pty. Ltd.
-#  ------------------------------------------------------------------------
-#  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.opensource.org/licenses/apache2.0.php
-#
-#  You may elect to redistribute this code under either of these licenses.
-#  ========================================================================
-#
-#
-# org.eclipse.jetty.util.log.class=org.eclipse.jetty.util.log.Slf4jLog
 org.eclipse.jetty.util.log.class=org.eclipse.jetty.util.log.StdErrLog
-org.eclipse.jetty.LEVEL=WARN
+# org.eclipse.jetty.LEVEL=DEBUG
 # org.eclipse.jetty.util.log.stderr.LONG=true
 # org.eclipse.jetty.server.AbstractConnector.LEVEL=DEBUG
 # org.eclipse.jetty.io.WriteFlusher.LEVEL=DEBUG
@ -28,16 +8,8 @@ org.eclipse.jetty.LEVEL=WARN
 # org.eclipse.jetty.io.LEVEL=DEBUG
 # org.eclipse.jetty.io.ManagedSelector.LEVEL=INFO
 # org.eclipse.jetty.websocket.LEVEL=DEBUG
-# org.eclipse.jetty.websocket.core.internal.WebSocketCoreSessionsion.LEVEL=DEBUG
-# org.eclipse.jetty.websocket.jsr356.tests.LEVEL=DEBUG
+# org.eclipse.jetty.websocket.core.internal.WebSocketCoreSession.LEVEL=DEBUG
 # org.eclipse.jetty.websocket.LEVEL=INFO
-# org.eclipse.jetty.websocket.jsr356.messages.LEVEL=DEBUG
 # org.eclipse.jetty.websocket.tests.LEVEL=DEBUG
 # org.eclipse.jetty.websocket.tests.client.LEVEL=DEBUG
-# org.eclipse.jetty.websocket.tests.client.jsr356.LEVEL=DEBUG
-# org.eclipse.jetty.websocket.tests.server.LEVEL=DEBUG
-# org.eclipse.jetty.websocket.tests.server.jsr356.LEVEL=DEBUG
-### Showing any unintended (ignored) errors from CompletionCallback
-# org.eclipse.jetty.websocket.common.CompletionCallback.LEVEL=ALL
-### Disabling intentional error out of RFCSocket
-org.eclipse.jetty.websocket.tests.server.RFCSocket.LEVEL=OFF
+# org.eclipse.jetty.websocket.tests.server.LEVEL=DEBUG
--- a/jetty-websocket/jetty-websocket-client/src/test/resources/jetty-logging.properties
+++ b/jetty-websocket/jetty-websocket-client/src/test/resources/jetty-logging.properties
@ -1,5 +1,4 @@
 org.eclipse.jetty.util.log.class=org.eclipse.jetty.util.log.StdErrLog
-org.eclipse.jetty.LEVEL=WARN
 # org.eclipse.jetty.LEVEL=DEBUG
 # org.eclipse.jetty.io.LEVEL=INFO
 # org.eclipse.jetty.client.LEVEL=DEBUG
@ -8,11 +7,9 @@ org.eclipse.jetty.LEVEL=WARN
 # org.eclipse.jetty.websocket.LEVEL=DEBUG
 # org.eclipse.jetty.websocket.client.LEVEL=DEBUG
 # org.eclipse.jetty.websocket.client.ClientCloseTest.LEVEL=DEBUG
-org.eclipse.jetty.websocket.common.io.AbstractWebSocketConnection.LEVEL=DEBUG
+# org.eclipse.jetty.websocket.common.io.AbstractWebSocketConnection.LEVEL=DEBUG
 # org.eclipse.jetty.websocket.common.io.IOState.LEVEL=DEBUG
 # org.eclipse.jetty.websocket.common.test.LEVEL=DEBUG
 # org.eclipse.jetty.websocket.common.Generator.LEVEL=DEBUG
-org.eclipse.jetty.websocket.common.Parser.LEVEL=DEBUG
-# org.eclipse.jetty.websocket.client.TrackingSocket.LEVEL=DEBUG
-### Hide the stacktraces during testing
-org.eclipse.jetty.websocket.client.internal.io.UpgradeConnection.STACKS=false
+# org.eclipse.jetty.websocket.common.Parser.LEVEL=DEBUG
+# org.eclipse.jetty.websocket.client.TrackingSocket.LEVEL=DEBUG
--- a/jetty-websocket/jetty-websocket-common/src/test/resources/jetty-logging.properties
+++ b/jetty-websocket/jetty-websocket-common/src/test/resources/jetty-logging.properties
@ -1,18 +1 @@
-#
-#  ========================================================================
-#  Copyright (c) 1995-2017 Mort Bay Consulting Pty. Ltd.
-#  ------------------------------------------------------------------------
-#  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.opensource.org/licenses/apache2.0.php
-#
-#  You may elect to redistribute this code under either of these licenses.
-#  ========================================================================
-#
 org.eclipse.jetty.util.log.class=org.eclipse.jetty.util.log.StdErrLog
--- a/jetty-websocket/jetty-websocket-tests/src/test/resources/jetty-logging.properties
+++ b/jetty-websocket/jetty-websocket-tests/src/test/resources/jetty-logging.properties
@ -1,44 +1,10 @@
-#
-#
-#  ========================================================================
-#  Copyright (c) 1995-2017 Mort Bay Consulting Pty. Ltd.
-#  ------------------------------------------------------------------------
-#  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.opensource.org/licenses/apache2.0.php
-#
-#  You may elect to redistribute this code under either of these licenses.
-#  ========================================================================
-#
-#
-# org.eclipse.jetty.util.log.class=org.eclipse.jetty.util.log.Slf4jLog
 org.eclipse.jetty.util.log.class=org.eclipse.jetty.util.log.StdErrLog
-org.eclipse.jetty.LEVEL=WARN
-# org.eclipse.jetty.websocket.tests.LEVEL=DEBUG
-# org.eclipse.jetty.util.log.stderr.LONG=true
+# org.eclipse.jetty.LEVEL=DEBUG
+# org.eclipse.jetty.websocket.LEVEL=DEBUG
+# org.eclipse.jetty.websocket.test.LEVEL=DEBUG
 # org.eclipse.jetty.server.AbstractConnector.LEVEL=DEBUG
 # org.eclipse.jetty.io.WriteFlusher.LEVEL=DEBUG
 # org.eclipse.jetty.io.FillInterest.LEVEL=DEBUG
 # org.eclipse.jetty.client.LEVEL=DEBUG
 # org.eclipse.jetty.io.LEVEL=DEBUG
-# org.eclipse.jetty.io.ManagedSelector.LEVEL=INFO
-# org.eclipse.jetty.websocket.LEVEL=DEBUG
-# org.eclipse.jetty.websocket.core.internal.WebSocketCoreSessionsion.LEVEL=DEBUG
-# org.eclipse.jetty.websocket.jsr356.tests.LEVEL=DEBUG
-# org.eclipse.jetty.websocket.LEVEL=INFO
-# org.eclipse.jetty.websocket.jsr356.messages.LEVEL=DEBUG
-# org.eclipse.jetty.websocket.tests.LEVEL=DEBUG
-# org.eclipse.jetty.websocket.tests.client.LEVEL=DEBUG
-# org.eclipse.jetty.websocket.tests.client.jsr356.LEVEL=DEBUG
-# org.eclipse.jetty.websocket.tests.server.LEVEL=DEBUG
-# org.eclipse.jetty.websocket.tests.server.jsr356.LEVEL=DEBUG
-### Showing any unintended (ignored) errors from CompletionCallback
-# org.eclipse.jetty.websocket.common.CompletionCallback.LEVEL=ALL
-### Disabling intentional error out of RFCSocket
-org.eclipse.jetty.websocket.tests.server.RFCSocket.LEVEL=OFF
+# org.eclipse.jetty.io.ManagedSelector.LEVEL=INFO
--- a/jetty-websocket/websocket-core/src/test/resources/jetty-logging.properties
+++ b/jetty-websocket/websocket-core/src/test/resources/jetty-logging.properties
@ -1,22 +1,5 @@
-#
-#  ========================================================================
-#  Copyright (c) 1995-2017 Mort Bay Consulting Pty. Ltd.
-#  ------------------------------------------------------------------------
-#  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.opensource.org/licenses/apache2.0.php
-#
-#  You may elect to redistribute this code under either of these licenses.
-#  ========================================================================
-#
 org.eclipse.jetty.util.log.class=org.eclipse.jetty.util.log.StdErrLog
-org.eclipse.jetty.LEVEL=WARN
+# org.eclipse.jetty.LEVEL=DEBUG
 # org.eclipse.jetty.io.LEVEL=DEBUG
 # org.eclipse.jetty.websocket.core.LEVEL=DEBUG
 # org.eclipse.jetty.util.log.stderr.LONG=true
@ -28,6 +11,4 @@ org.eclipse.jetty.LEVEL=WARN
 # org.eclipse.jetty.io.ManagedSelector.LEVEL=DEBUG
 # org.eclipse.jetty.websocket.LEVEL=DEBUG
 # org.eclipse.jetty.websocket.LEVEL=INFO
-# org.eclipse.jetty.websocket.core.LEVEL=DEBUG
-### Showing any unintended (ignored) errors from CompletionCallback
-# org.eclipse.jetty.websocket.core.CompletionCallback.LEVEL=ALL
+# org.eclipse.jetty.websocket.core.LEVEL=DEBUG