Issue #1650 - testcase stability effort (take 3 w/debug)

Jenkinsfile

@@ -53,7 +53,7 @@ node {
       withEnv(mvnEnv) {
         timeout(time: 90, unit: 'MINUTES') {
           // Run test phase / ignore test failures
-          sh "mvn -B install -Dmaven.test.failure.ignore=true"
+          sh "mvn -B install -Dmaven.test.failure.ignore=true -Dtest=**/org/eclipse/jetty/cdi/**"
           // Report failures in the jenkins UI
           step([$class: 'JUnitResultArchiver', 
               testResults: '**/target/surefire-reports/TEST-*.xml'])

jetty-cdi/cdi-websocket/src/test/java/org/eclipse/jetty/cdi/websocket/basicapp/BasicAppTest.java

@@ -29,7 +29,6 @@ import javax.websocket.server.ServerContainer;
 
 import org.eclipse.jetty.cdi.servlet.EmbeddedCdiHandler;
 import org.eclipse.jetty.cdi.websocket.CheckSocket;
-import org.eclipse.jetty.cdi.websocket.cdiapp.InfoSocket;
 import org.eclipse.jetty.server.Server;
 import org.eclipse.jetty.server.ServerConnector;
 import org.eclipse.jetty.toolchain.test.MavenTestingUtils;
@@ -75,7 +74,6 @@ public class BasicAppTest
         // Add some websockets
         ServerContainer container = WebSocketServerContainerInitializer.configureContext(context);
         container.addEndpoint(EchoSocket.class);
-        container.addEndpoint(InfoSocket.class);
 
         server.start();
 

jetty-cdi/cdi-websocket/src/test/java/org/eclipse/jetty/cdi/websocket/cdiapp/DataMaker.java

@@ -20,7 +20,6 @@ package org.eclipse.jetty.cdi.websocket.cdiapp;
 
 import javax.inject.Inject;
 
-import org.eclipse.jetty.cdi.websocket.annotation.WebSocketScope;
 import org.eclipse.jetty.util.log.Log;
 import org.eclipse.jetty.util.log.Logger;
 import org.eclipse.jetty.websocket.api.Session;
@@ -30,8 +29,7 @@ public class DataMaker
     private static final Logger LOG = Log.getLogger(DataMaker.class);
     
     @Inject
-    @WebSocketScope
-    private Session session;
+    public Session session;
 
     public void processMessage(String msg) 
     {

jetty-cdi/cdi-websocket/src/test/java/org/eclipse/jetty/cdi/websocket/cdiapp/InfoSocket.java

@@ -22,7 +22,6 @@ import java.io.PrintWriter;
 import java.io.StringWriter;
 import java.util.logging.Level;
 
-import javax.enterprise.context.SessionScoped;
 import javax.inject.Inject;
 import javax.servlet.ServletContext;
 import javax.servlet.http.HttpSession;
@@ -38,15 +37,14 @@ public class InfoSocket
 {
     private static final java.util.logging.Logger LOG = java.util.logging.Logger.getLogger(InfoSocket.class.getName());
 
-    @SessionScoped
     @Inject
-    private HttpSession httpSession;
+    public HttpSession httpSession;
 
     @Inject
-    private ServletContext servletContext;
+    public ServletContext servletContext;
     
     @Inject
-    private DataMaker dataMaker;
+    public DataMaker dataMaker;
 
     private Session session;
     

jetty-cdi/cdi-websocket/src/test/java/org/eclipse/jetty/cdi/websocket/wsscope/BogusSocket.java

@@ -20,14 +20,12 @@ package org.eclipse.jetty.cdi.websocket.wsscope;
 
 import javax.inject.Inject;
 
-import org.eclipse.jetty.cdi.websocket.annotation.WebSocketScope;
 import org.eclipse.jetty.websocket.api.Session;
 
 public class BogusSocket
 {
     @Inject
-    @WebSocketScope
-    private Session session;
+    public Session session;
     
     public Session getSession()
     {

jetty-cdi/cdi-websocket/src/test/resources/jetty-logging.properties

@@ -6,8 +6,8 @@ org.jboss.LEVEL=INFO
 # org.eclipse.jetty.util.component.LEVEL=DEBUG
 
 # org.eclipse.jetty.websocket.common.LEVEL=DEBUG
-# org.eclipse.jetty.util.DecoratedObjectFactory.LEVEL=DEBUG
-# org.eclipse.jetty.cdi.LEVEL=DEBUG
+org.eclipse.jetty.util.DecoratedObjectFactory.LEVEL=DEBUG
+org.eclipse.jetty.cdi.LEVEL=DEBUG
 
 # org.eclipse.jetty.LEVEL=DEBUG
 # org.eclipse.jetty.websocket.LEVEL=DEBUG