[jboss-cvs] JBossAS SVN: r75398 - in projects/microcontainer/trunk: dependency/src/main/org/jboss/dependency/plugins and 1 other directories.

[jboss-cvs-commits at lists.jboss.org]

Author: alesj
Date: 2008-07-04 17:43:26 -0400 (Fri, 04 Jul 2008)
New Revision: 75398

Modified:
   projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/aop/junit/ScopingAOPMicrocontainerTestDelegate.java
   projects/microcontainer/trunk/dependency/src/main/org/jboss/dependency/plugins/AbstractController.java
   projects/microcontainer/trunk/dependency/src/main/org/jboss/dependency/plugins/graph/AbstractLookupStrategy.java
Log:
Some trace log.
First usage of Depth lookup strategy.

Modified: projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/aop/junit/ScopingAOPMicrocontainerTestDelegate.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/aop/junit/ScopingAOPMicrocontainerTestDelegate.java	2008-07-04 21:34:40 UTC (rev 75397)
+++ projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/aop/junit/ScopingAOPMicrocontainerTestDelegate.java	2008-07-04 21:43:26 UTC (rev 75398)
@@ -21,10 +21,10 @@
 */
 package org.jboss.test.aop.junit;
 
-import org.jboss.dependency.plugins.AbstractController;
+import org.jboss.dependency.plugins.graph.Search;
 import org.jboss.dependency.spi.Controller;
-import org.jboss.dependency.spi.ControllerContext;
 import org.jboss.dependency.spi.ControllerState;
+import org.jboss.dependency.spi.graph.GraphController;
 import org.jboss.kernel.spi.dependency.KernelControllerContext;
 
 /**
@@ -45,50 +45,16 @@
    {
       try
       {
-         Controller controller = new TestController((AbstractController)kernel.getController());
-         KernelControllerContext context = (KernelControllerContext)controller.getContext(name, state);
+         Controller controller = kernel.getController();
+         GraphController gc = (GraphController)controller;
+         KernelControllerContext context = (KernelControllerContext)gc.getContext(name, state, Search.DEPTH);
          if (context == null)
             throw new IllegalStateException("Bean not found " + name + " at state " + state);
          return context;
       }
-      catch (Exception e)
+      catch (Throwable t)
       {
-         throw new Error(e);
+         throw new Error(t);
       }
    }
-
-   private class TestController extends AbstractController
-   {
-      private AbstractController delegate;
-
-      public TestController(AbstractController controller) throws Exception
-      {
-         this.delegate = controller;
-      }
-
-      public ControllerContext getContext(Object name, ControllerState state)
-      {
-         return findContext(delegate, name, state);
-      }
-
-      private ControllerContext findContext(AbstractController controller, Object name, ControllerState state)
-      {
-         ControllerContext context = controller.getContext(name, state);
-         if (context != null)
-         {
-            return context;
-         }
-         else
-         {
-            for (AbstractController childController : controller.getControllers())
-            {
-               ControllerContext ctx = findContext(childController, name, state);
-               if (ctx != null)
-                  return ctx;
-            }
-         }
-         return null;
-      }
-   }
-
 }

Modified: projects/microcontainer/trunk/dependency/src/main/org/jboss/dependency/plugins/AbstractController.java
===================================================================
--- projects/microcontainer/trunk/dependency/src/main/org/jboss/dependency/plugins/AbstractController.java	2008-07-04 21:34:40 UTC (rev 75397)
+++ projects/microcontainer/trunk/dependency/src/main/org/jboss/dependency/plugins/AbstractController.java	2008-07-04 21:43:26 UTC (rev 75398)
@@ -358,6 +358,9 @@
       if (strategy == null)
          throw new IllegalArgumentException("AbstractController doesn't implement this search info: " + info);
 
+      if (log.isTraceEnabled())
+         log.trace("Executing search " + info.type());
+
       return strategy.getContext(this, name, state);
    }
 

Modified: projects/microcontainer/trunk/dependency/src/main/org/jboss/dependency/plugins/graph/AbstractLookupStrategy.java
===================================================================
--- projects/microcontainer/trunk/dependency/src/main/org/jboss/dependency/plugins/graph/AbstractLookupStrategy.java	2008-07-04 21:34:40 UTC (rev 75397)
+++ projects/microcontainer/trunk/dependency/src/main/org/jboss/dependency/plugins/graph/AbstractLookupStrategy.java	2008-07-04 21:43:26 UTC (rev 75398)
@@ -43,7 +43,7 @@
       if (type == null)
       {
          String simpleName = getClass().getSimpleName();
-         int p = simpleName.indexOf("Strategy");
+         int p = simpleName.indexOf("LookupStrategy");
          type = simpleName.substring(0, p);
       }
       return type;