423646 - WebSocket / JSR / WebSocketContainer (Client) should have it…

…s LifeCycle stop on standalone use

+ Set Daemon on Executor and Scheduler threads to allow them to shutdown
  with the JVM

jetty-websocket/javax-websocket-client-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/ClientContainer.java

@@ -83,7 +83,9 @@ public class ClientContainer extends ContainerLifeCycle implements WebSocketCont
 
     public ClientContainer()
     {
+        // This constructor is used with Standalone JSR Client usage.
         this(null);
+        client.setDaemon(true);
     }
 
     public ClientContainer(Executor executor)

jetty-websocket/websocket-client/src/main/java/org/eclipse/jetty/websocket/client/WebSocketClient.java

@@ -72,6 +72,7 @@ public class WebSocketClient extends ContainerLifeCycle implements SessionListen
     private final WebSocketPolicy policy;
     private final SslContextFactory sslContextFactory;
     private final WebSocketExtensionFactory extensionRegistry;
+    private boolean daemon = false;
     private EventDriverFactory eventDriverFactory;
     private SessionFactory sessionFactory;
     private Set<WebSocketSession> openSessions = new CopyOnWriteArraySet<>();
@@ -227,7 +228,7 @@ protected void doStart() throws Exception
 
         if (scheduler == null)
         {
-            scheduler = new ScheduledExecutorScheduler(name + "-scheduler",false);
+            scheduler = new ScheduledExecutorScheduler(name + "-scheduler",daemon);
         }
         addBean(scheduler);
 
@@ -290,7 +291,7 @@ public CookieStore getCookieStore()
     {
         return cookieStore;
     }
-
+    
     public EventDriverFactory getEventDriverFactory()
     {
         return eventDriverFactory;
@@ -419,6 +420,7 @@ private synchronized void initialiseClient() throws IOException
             QueuedThreadPool threadPool = new QueuedThreadPool();
             String name = WebSocketClient.class.getSimpleName() + "@" + hashCode();
             threadPool.setName(name);
+            threadPool.setDaemon(daemon);
             executor = threadPool;
             addBean(executor,true);
         }
@@ -505,6 +507,11 @@ public void setCookieStore(CookieStore cookieStore)
     {
         this.cookieStore = cookieStore;
     }
+
+    public void setDaemon(boolean daemon)
+    {
+        this.daemon = daemon;
+    }
 
     public void setEventDriverFactory(EventDriverFactory factory)
     {