improved debugging

3 files changed, 135 insertions, 1 deletions

diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/HttpChannel.java b/jetty-server/src/main/java/org/eclipse/jetty/server/HttpChannel.java
index 5d563264cf..968b8210b0 100644
--- a/jetty-server/src/main/java/org/eclipse/jetty/server/HttpChannel.java
+++ b/jetty-server/src/main/java/org/eclipse/jetty/server/HttpChannel.java
@@ -120,6 +120,9 @@ public class HttpChannel<T> implements HttpParser.RequestHandler<T>, Runnable, H
         input.init(_state);
         _request = new Request(this, input);
         _response = new Response(this, new HttpOutput(this));
+        
+        if (LOG.isDebugEnabled())
+            LOG.debug("new {} -> {},{},{}",this,_endPoint,_endPoint.getConnection(),_state);
     }
 
     public HttpChannelState getState()
diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/Server.java b/jetty-server/src/main/java/org/eclipse/jetty/server/Server.java
index b2ac61491f..bdf03b3f32 100644
--- a/jetty-server/src/main/java/org/eclipse/jetty/server/Server.java
+++ b/jetty-server/src/main/java/org/eclipse/jetty/server/Server.java
@@ -485,7 +485,7 @@ public class Server extends HandlerWrapper implements Attributes
         final Response response=connection.getResponse();
 
         if (LOG.isDebugEnabled())
-            LOG.debug(request.getDispatcherType()+" "+target+" on "+connection);
+            LOG.debug(request.getDispatcherType()+" "+request.getMethod()+" "+target+" on "+connection);
 
         if ("*".equals(target))
         {
diff --git a/jetty-xml/src/test/java/org/eclipse/jetty/xml/XmlConfigurationTest.java b/jetty-xml/src/test/java/org/eclipse/jetty/xml/XmlConfigurationTest.java
index d4bb45d056..f4c6478b2e 100644
--- a/jetty-xml/src/test/java/org/eclipse/jetty/xml/XmlConfigurationTest.java
+++ b/jetty-xml/src/test/java/org/eclipse/jetty/xml/XmlConfigurationTest.java
@@ -646,4 +646,135 @@ public class XmlConfigurationTest
         Assert.assertEquals("nested second parameter not wired correctly","arg2", atc.getNested().getSecond());
         Assert.assertEquals("nested third parameter not wired correctly","arg3", atc.getNested().getThird());
     }
+
+    public static class NativeHolder
+    {
+        private boolean _boolean;
+        private int _integer;
+        private float _float;
+
+        public boolean getBoolean()
+        {
+            return _boolean;
+        }
+
+        public void setBoolean(boolean value)
+        {
+            this._boolean = value;
+        }
+
+        public int getInteger()
+        {
+            return _integer;
+        }
+
+        public void setInteger(int integer)
+        {
+            _integer = integer;
+        }
+
+        public float getFloat()
+        {
+            return _float;
+        }
+
+        public void setFloat(float f)
+        {
+            _float = f;
+        }
+        
+    }
+    
+    @Test
+    public void testSetBooleanTrue() throws Exception
+    {
+        XmlConfiguration xmlConfiguration = new XmlConfiguration("" +
+                "<Configure class=\"org.eclipse.jetty.xml.XmlConfigurationTest$NativeHolder\">" +
+                "  <Set name=\"boolean\">true</Set>" +
+                "</Configure>");
+
+        NativeHolder bh = (NativeHolder)xmlConfiguration.configure();
+        Assert.assertTrue(bh.getBoolean());
+    }
+    
+    @Test
+    public void testSetBooleanFalse() throws Exception
+    {
+        XmlConfiguration xmlConfiguration = new XmlConfiguration("" +
+                "<Configure class=\"org.eclipse.jetty.xml.XmlConfigurationTest$NativeHolder\">" +
+                "  <Set name=\"boolean\">false</Set>" +
+                "</Configure>");
+
+        NativeHolder bh = (NativeHolder)xmlConfiguration.configure();
+        Assert.assertFalse(bh.getBoolean());
+    }
+    
+    @Test
+    public void testSetBadBoolean() throws Exception
+    {
+        XmlConfiguration xmlConfiguration = new XmlConfiguration("" +
+                "<Configure class=\"org.eclipse.jetty.xml.XmlConfigurationTest$NativeHolder\">" +
+                "  <Set name=\"boolean\">tru</Set>" +
+                "</Configure>");
+
+        NativeHolder bh = (NativeHolder)xmlConfiguration.configure();
+        Assert.assertTrue(bh.getBoolean());
+    }
+    
+    @Test
+    public void testSetBadInteger() throws Exception
+    {
+        XmlConfiguration xmlConfiguration = new XmlConfiguration("" +
+                "<Configure class=\"org.eclipse.jetty.xml.XmlConfigurationTest$NativeHolder\">" +
+                "  <Set name=\"integer\">bad</Set>" +
+                "</Configure>");
+
+        try
+        {
+            xmlConfiguration.configure();
+            Assert.fail();
+        }
+        catch (Exception e)
+        {
+            
+        }
+    }
+    
+    @Test
+    public void testSetBadExtraInteger() throws Exception
+    {
+        XmlConfiguration xmlConfiguration = new XmlConfiguration("" +
+                "<Configure class=\"org.eclipse.jetty.xml.XmlConfigurationTest$NativeHolder\">" +
+                "  <Set name=\"integer\">100 bas</Set>" +
+                "</Configure>");
+
+        try
+        {
+            xmlConfiguration.configure();
+            Assert.fail();
+        }
+        catch (Exception e)
+        {
+            
+        }
+    }
+    
+    @Test
+    public void testSetBadFloatInteger() throws Exception
+    {
+        XmlConfiguration xmlConfiguration = new XmlConfiguration("" +
+                "<Configure class=\"org.eclipse.jetty.xml.XmlConfigurationTest$NativeHolder\">" +
+                "  <Set name=\"integer\">1.5</Set>" +
+                "</Configure>");
+
+        try
+        {
+            xmlConfiguration.configure();
+            Assert.fail();
+        }
+        catch (Exception e)
+        {
+            
+        }
+    }
 }