[jboss-cvs] JBossAS SVN: r96744 - in projects/kernel/trunk: dependency/src/main/java/org/jboss/dependency/plugins and 1 other directory.

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

Author: alesj
Date: 2009-11-23 12:38:19 -0500 (Mon, 23 Nov 2009)
New Revision: 96744

Modified:
   projects/kernel/trunk/dependency/src/main/java/org/jboss/dependency/plugins/AbstractControllerContext.java
   projects/kernel/trunk/pom.xml
Log:
[JBKERNEL-61]; add ContextTracker lookup from MDR.
Update XB to 2.0.2.Beta3.
Some weird JDK reflect bug wrt security ... how to handle?

Modified: projects/kernel/trunk/dependency/src/main/java/org/jboss/dependency/plugins/AbstractControllerContext.java
===================================================================
--- projects/kernel/trunk/dependency/src/main/java/org/jboss/dependency/plugins/AbstractControllerContext.java	2009-11-23 17:32:35 UTC (rev 96743)
+++ projects/kernel/trunk/dependency/src/main/java/org/jboss/dependency/plugins/AbstractControllerContext.java	2009-11-23 17:38:19 UTC (rev 96744)
@@ -25,6 +25,7 @@
 import java.io.StringWriter;
 import java.util.Collections;
 import java.util.HashSet;
+import java.util.List;
 import java.util.Set;
 
 import org.jboss.dependency.spi.Controller;
@@ -37,6 +38,10 @@
 import org.jboss.dependency.spi.ScopeInfo;
 import org.jboss.dependency.spi.tracker.ContextTracker;
 import org.jboss.dependency.spi.tracker.ContextTracking;
+import org.jboss.metadata.spi.MetaData;
+import org.jboss.metadata.spi.scope.CommonLevels;
+import org.jboss.metadata.spi.scope.CommonLevelsUtil;
+import org.jboss.metadata.spi.scope.ScopeLevel;
 import org.jboss.util.JBossObject;
 import org.jboss.util.JBossStringBuilder;
 
@@ -44,6 +49,7 @@
  * A ControllerContext.
  * 
  * @author <a href="adrian at jboss.com">Adrian Brock</a>
+ * @author <a href="ales.justin at jboss.org">Ales Justin</a>
  * @version $Revision$
  */
 public class AbstractControllerContext extends JBossObject implements ControllerContext, ContextTracking
@@ -84,6 +90,9 @@
    /** Any error */
    private Throwable error;
 
+   /** The context tracker */
+   private ContextTracker tracker;
+
    /**
     * Create a new AbstractControllerContext.
     * 
@@ -355,7 +364,27 @@
 
    public ContextTracker getContextTracker()
    {
-      return null; // TODO
+      if (tracker == null)
+      {
+         MetaData metaData = scopeInfo.getMetaData();
+         if (metaData != null)
+         {
+            ContextTracker ct = metaData.getMetaData(ContextTracker.class);
+            if (ct == null)
+            {
+               List<ScopeLevel> levels = CommonLevelsUtil.getSubLevels(CommonLevels.SERVER);
+               int instanceIndex = levels.indexOf(CommonLevels.INSTANCE);
+               for (int i = instanceIndex; i >= 0 && ct == null; i--)
+               {
+                  MetaData md = metaData.getScopeMetaData(levels.get(instanceIndex));
+                  if (md != null)
+                     ct = md.getMetaData(ContextTracker.class);
+               }
+            }
+            tracker = ct; // should we care if it's still null?
+         }
+      }
+      return tracker;
    }
 
    public Object getTarget(ControllerContext user)

Modified: projects/kernel/trunk/pom.xml
===================================================================
--- projects/kernel/trunk/pom.xml	2009-11-23 17:32:35 UTC (rev 96743)
+++ projects/kernel/trunk/pom.xml	2009-11-23 17:38:19 UTC (rev 96744)
@@ -37,7 +37,7 @@
     <version.jboss.common.core>2.2.16.GA</version.jboss.common.core>
     <version.jboss.logging.spi>2.1.0.GA</version.jboss.logging.spi>
     <version.jboss.logging.log4j>2.0.5.GA</version.jboss.logging.log4j>
-    <version.jbossxb>2.0.2-SNAPSHOT</version.jbossxb>
+    <version.jbossxb>2.0.2.Beta3</version.jbossxb>
     <version.jboss.man>2.1.1.GA</version.jboss.man>
     <version.jboss.vfs>2.1.3.SP1</version.jboss.vfs>
     <version.javassist>3.11.0.GA</version.javassist>