332937 Added Destroyable interface and reworked dependent lifecycles, specially of JNDI

Also added Dumpable interface to improve and standardize the output of nested structures while debugging

git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2615 7e9141cc-0065-0410-87d8-b60c137991c4

1 files changed, 6 insertions, 11 deletions

diff --git a/jetty-security/src/main/java/org/eclipse/jetty/security/ConstraintSecurityHandler.java b/jetty-security/src/main/java/org/eclipse/jetty/security/ConstraintSecurityHandler.java
index bd783ce1f0..19d6466828 100644
--- a/jetty-security/src/main/java/org/eclipse/jetty/security/ConstraintSecurityHandler.java
+++ b/jetty-security/src/main/java/org/eclipse/jetty/security/ConstraintSecurityHandler.java
@@ -16,6 +16,7 @@ package org.eclipse.jetty.security;
 import java.io.IOException;
 import java.util.Arrays;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
@@ -34,6 +35,7 @@ import org.eclipse.jetty.server.UserIdentity;
 import org.eclipse.jetty.server.handler.ContextHandler;
 import org.eclipse.jetty.server.session.SessionHandler;
 import org.eclipse.jetty.util.StringMap;
+import org.eclipse.jetty.util.TypeUtil;
 
 /* ------------------------------------------------------------ */
 /**
@@ -419,19 +421,12 @@ public class ConstraintSecurityHandler extends SecurityHandler implements Constr
         }
         return false;
     }
-    
+
     /* ------------------------------------------------------------ */
     @Override
-    protected void dump(Appendable out,String indent) throws IOException
+    public void dump(Appendable out,String indent) throws IOException
     {
-        out.append(toString()).append(isStarted()?" started":" STOPPED").append('\n');
-        out.append(indent).append(" +-").append(String.valueOf(_roles)).append('\n');
-        
-        for (Object path : _constraintMap.keySet())
-        {
-            Object constraint = _constraintMap.get(path);
-            out.append(indent).append(" +-").append(String.valueOf(path)).append('=').append(String.valueOf(constraint)).append('\n');
-        }
-        dumpHandlers(out,indent);
+        dumpThis(out);
+        dump(out,indent,TypeUtil.asList(getHandlers()),getBeans(),Collections.singleton(_roles),_constraintMap.entrySet());
     }
 }