453834 - CDI Support for WebSocket

+ Verifying ServletContextHandler behavior of Decorators
+ Marking old ServletContextHandler methods as deprecated
+ Updates to DecoratedObjectFactory
+ Removing customized weld scopes/context (for now)
+ Deferring JSR356 ServerContainer endpoint init
  till Container.doStart() to allow weld to init properly first
+ Removing JSR356 BasicServerEndpointConfigurator in favor
  of ContainerDefaultEndpointConfigurator
+ Only decorating server endpoints if they were created by
  ContainerDefaultEndpointConfigurator, all others are trusted
  to be complete and injected already.

1 files changed, 11 insertions, 1 deletions

diff --git a/jetty-util/src/main/java/org/eclipse/jetty/util/DecoratedObjectFactory.java b/jetty-util/src/main/java/org/eclipse/jetty/util/DecoratedObjectFactory.java
index 5feb1c9e2b..f409d76066 100644
--- a/jetty-util/src/main/java/org/eclipse/jetty/util/DecoratedObjectFactory.java
+++ b/jetty-util/src/main/java/org/eclipse/jetty/util/DecoratedObjectFactory.java
@@ -62,7 +62,7 @@ public class DecoratedObjectFactory implements Iterable<Decorator>
     {
         if (LOG.isDebugEnabled())
         {
-            LOG.debug("Creating Instance: " + clazz,new Throwable("Creation Stack"));
+            LOG.debug("Creating Instance: " + clazz);
         }
         T o = clazz.newInstance();
         return decorate(o);
@@ -106,4 +106,14 @@ public class DecoratedObjectFactory implements Iterable<Decorator>
             this.decorators.addAll(decorators);
         }
     }
+    
+    @Override
+    public String toString()
+    {
+        StringBuilder str = new StringBuilder();
+        str.append(this.getClass().getName()).append("[decorators=");
+        str.append(Integer.toString(decorators.size()));
+        str.append("]");
+        return str.toString();
+    }
 }