416812 - Don't start WebSocketClient for every context

turn off for all contexts in demo

6 files changed, 24 insertions, 7 deletions

diff --git a/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/listener/ELContextCleaner.java b/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/listener/ELContextCleaner.java
index 8ffa98b27d..a1979fae22 100644
--- a/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/listener/ELContextCleaner.java
+++ b/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/listener/ELContextCleaner.java
@@ -60,7 +60,7 @@ public class ELContextCleaner implements ServletContextListener
             //Get rid of references
             purgeEntries(field);
 
-            LOG.info("javax.el.BeanELResolver purged");
+            LOG.debug("javax.el.BeanELResolver purged");
         }
 
         catch (ClassNotFoundException e)
@@ -81,7 +81,7 @@ public class ELContextCleaner implements ServletContextListener
         }
         catch (NoSuchFieldException e)
         {
-            LOG.info("Not cleaning cached beans: no such field javax.el.BeanELResolver.properties");
+            LOG.debug("Not cleaning cached beans: no such field javax.el.BeanELResolver.properties");
         }
 
     }
@@ -113,14 +113,14 @@ public class ELContextCleaner implements ServletContextListener
         while (itor.hasNext())
         {
             Class clazz = itor.next();
-            LOG.info("Clazz: "+clazz+" loaded by "+clazz.getClassLoader());
+            LOG.debug("Clazz: "+clazz+" loaded by "+clazz.getClassLoader());
             if (Thread.currentThread().getContextClassLoader().equals(clazz.getClassLoader()))
             {
                 itor.remove();
-                LOG.info("removed");
+                LOG.debug("removed");
             }
             else
-                LOG.info("not removed: "+"contextclassloader="+Thread.currentThread().getContextClassLoader()+"clazz's classloader="+clazz.getClassLoader());
+                LOG.debug("not removed: "+"contextclassloader="+Thread.currentThread().getContextClassLoader()+"clazz's classloader="+clazz.getClassLoader());
         }
     }
 }
diff --git a/jetty-websocket/javax-websocket-server-impl/src/main/config/etc/jetty-websockets.xml b/jetty-websocket/javax-websocket-server-impl/src/main/config/etc/jetty-websockets.xml
index 190a58e5bb..9fc362d5bf 100644
--- a/jetty-websocket/javax-websocket-server-impl/src/main/config/etc/jetty-websockets.xml
+++ b/jetty-websocket/javax-websocket-server-impl/src/main/config/etc/jetty-websockets.xml
@@ -16,5 +16,12 @@
       </Arg>
     </Call>
   </Call>
+  
+  <!-- Should a Websocket container be initialized for each context? -->
+  <!-- Can be overridden by context attribute -->
+  <Call name="setAttribute">
+    <Arg>org.eclipse.jetty.websocket.jsr356</Arg>
+    <Arg type="Boolean"><Property name="org.eclipse.jetty.websocket.jsr356" default="true"/></Arg>
+  </Call>
 
 </Configure>
diff --git a/jetty-websocket/javax-websocket-server-impl/src/main/config/modules/websocket.mod b/jetty-websocket/javax-websocket-server-impl/src/main/config/modules/websocket.mod
index ecf5b3c070..60957680e4 100644
--- a/jetty-websocket/javax-websocket-server-impl/src/main/config/modules/websocket.mod
+++ b/jetty-websocket/javax-websocket-server-impl/src/main/config/modules/websocket.mod
@@ -15,3 +15,6 @@ lib/websocket/*.jar
 # WebSocket needs websocket configuration
 etc/jetty-websockets.xml
 
+[ini-template]
+# Start Websocket containter for all contexts
+org.eclipse.jetty.websocket.jsr356=true
\ No newline at end of file
diff --git a/jetty-websocket/websocket-client/src/main/java/org/eclipse/jetty/websocket/client/WebSocketClient.java b/jetty-websocket/websocket-client/src/main/java/org/eclipse/jetty/websocket/client/WebSocketClient.java
index 0dfd03f321..f64913f933 100644
--- a/jetty-websocket/websocket-client/src/main/java/org/eclipse/jetty/websocket/client/WebSocketClient.java
+++ b/jetty-websocket/websocket-client/src/main/java/org/eclipse/jetty/websocket/client/WebSocketClient.java
@@ -246,7 +246,7 @@ public class WebSocketClient extends ContainerLifeCycle
 
         super.doStart();
 
-        LOG.info("Started {}",this);
+        LOG.debug("Started {}",this);
     }
 
     @Override
diff --git a/tests/test-webapps/test-jetty-webapp/src/main/config/demo-base/start.ini b/tests/test-webapps/test-jetty-webapp/src/main/config/demo-base/start.ini
index 7738e921af..e625afec2c 100644
--- a/tests/test-webapps/test-jetty-webapp/src/main/config/demo-base/start.ini
+++ b/tests/test-webapps/test-jetty-webapp/src/main/config/demo-base/start.ini
@@ -26,6 +26,8 @@ etc/demo-rewrite-rules.xml
 --module=client
 
 # Websocket chat examples needs websocket enabled
+# Don't start for all contexts (set to true in test.xml context)
+org.eclipse.jetty.websocket.jsr356=false
 --module=websocket
 
 # Create and configure the test realm
diff --git a/tests/test-webapps/test-jetty-webapp/src/main/config/demo-base/webapps/test.xml b/tests/test-webapps/test-jetty-webapp/src/main/config/demo-base/webapps/test.xml
index 09f59b7ce9..73493e105a 100644
--- a/tests/test-webapps/test-jetty-webapp/src/main/config/demo-base/webapps/test.xml
+++ b/tests/test-webapps/test-jetty-webapp/src/main/config/demo-base/webapps/test.xml
@@ -29,7 +29,12 @@ detected.
   <Set name="defaultsDescriptor"><Property name="jetty.home" default="."/>/etc/webdefault.xml</Set>
   <Set name="overrideDescriptor"><Property name="jetty.base" default="."/>/etc/override-web.xml</Set>
   
-
+  <!-- Enable WebSocket container -->
+  <Call name="setAttribute">
+    <Arg>org.eclipse.jetty.websocket.jsr356</Arg>
+    <Arg type="Boolean">true</Arg>
+  </Call>
+  
   <!-- virtual hosts
   <Set name="virtualHosts">
     <Array type="String">