diff --git a/VERSION.txt b/VERSION.txt index ce46b8d4878..868370fb108 100644 --- a/VERSION.txt +++ b/VERSION.txt @@ -14,6 +14,7 @@ jetty-7.0.1-SNAPSHOT jetty-7.0.0 + 289958 StatisticsServlet incorrectly adds StatisticsHandler + + Remove printlns from jetty-plus + 290081 Eager consume LF after CR + 290761 HttpExchange isDone handles intercepted events. diff --git a/jetty-plus/src/main/java/org/eclipse/jetty/plus/annotation/Injection.java b/jetty-plus/src/main/java/org/eclipse/jetty/plus/annotation/Injection.java index bab996a0647..2c03312645c 100644 --- a/jetty-plus/src/main/java/org/eclipse/jetty/plus/annotation/Injection.java +++ b/jetty-plus/src/main/java/org/eclipse/jetty/plus/annotation/Injection.java @@ -237,12 +237,10 @@ public class Injection { try { - System.err.println("Value to inject="+lookupInjectedValue()); boolean accessibility = field.isAccessible(); field.setAccessible(true); field.set(injectable, lookupInjectedValue()); field.setAccessible(accessibility); - System.err.println("Injected field "+_fieldName+" of class "+_className); } catch (Exception e) { @@ -265,12 +263,10 @@ public class Injection { try { - System.err.println("Value to inject="+lookupInjectedValue()); boolean accessibility = method.isAccessible(); method.setAccessible(true); method.invoke(injectable, new Object[] {lookupInjectedValue()}); method.setAccessible(accessibility); - System.err.println("Injected method "+_methodName+" of class "+_className); } catch (Exception e) { @@ -311,14 +307,12 @@ public class Injection if (_targetClass == null) _targetClass = Loader.loadClass(null, _className); - System.err.println("Loaded target class "+_targetClass.getName()); - - System.err.println("Looking for method "+_methodName +" with argument of type "+_paramCanonicalName+" on class "+_className); + Class arg = TypeUtil.fromName(_paramCanonicalName); if (arg == null) arg = Loader.loadClass(null, _paramCanonicalName); - System.err.println("Loaded type: "+arg.getName()); + _target = _targetClass.getDeclaredMethod(_methodName, new Class[] {arg}); } @@ -331,7 +325,6 @@ public class Injection //JavaEE spec sec 5.2.4 if (_annotationResourceType != null) { - System.err.println("Validating against annotationResourceType="+_annotationResourceType); if (_target == null) return false; diff --git a/jetty-plus/src/main/java/org/eclipse/jetty/plus/annotation/LifeCycleCallback.java b/jetty-plus/src/main/java/org/eclipse/jetty/plus/annotation/LifeCycleCallback.java index 1ac9876d8be..0554901f46a 100644 --- a/jetty-plus/src/main/java/org/eclipse/jetty/plus/annotation/LifeCycleCallback.java +++ b/jetty-plus/src/main/java/org/eclipse/jetty/plus/annotation/LifeCycleCallback.java @@ -109,7 +109,6 @@ public abstract class LifeCycleCallback getTarget().setAccessible(true); getTarget().invoke(instance, __EMPTY_ARGS); getTarget().setAccessible(accessibility); - System.err.println("Calling callback on "+_className+"."+_methodName); } }