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

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

Author: adrian at jboss.org
Date: 2008-08-08 13:16:20 -0400 (Fri, 08 Aug 2008)
New Revision: 76841

Modified:
   projects/microcontainer/trunk/dependency/src/main/org/jboss/dependency/plugins/AbstractScopeInfo.java
   projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/dependency/KernelScopeInfo.java
   projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/metadata/basic/BasicKernelMetaDataRepository.java
   projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/spi/metadata/KernelMetaDataRepository.java
Log:
[JBMICROCONT-330] - Small rework to fix a backwards compatibilty breakage

Modified: projects/microcontainer/trunk/dependency/src/main/org/jboss/dependency/plugins/AbstractScopeInfo.java
===================================================================
--- projects/microcontainer/trunk/dependency/src/main/org/jboss/dependency/plugins/AbstractScopeInfo.java	2008-08-08 16:52:51 UTC (rev 76840)
+++ projects/microcontainer/trunk/dependency/src/main/org/jboss/dependency/plugins/AbstractScopeInfo.java	2008-08-08 17:16:20 UTC (rev 76841)
@@ -237,7 +237,7 @@
          }
          retrievals.add(0, retrieval);
       }
-      MetaDataContext metaDataContext = createMetaDataContext(retrievals);
+      MetaDataContext metaDataContext = createMetaDataContext(context, retrievals);
       repository.addMetaDataRetrieval(metaDataContext);
       addedScopes.add(metaDataContext.getScope());
       return metaDataContext;
@@ -280,10 +280,11 @@
    /**
     * Create metadata context.
     *
+    * @param context the controller context
     * @param retrievals the retrievals
     * @return new metadata context instance
     */
-   protected MetaDataContext createMetaDataContext(List<MetaDataRetrieval> retrievals)
+   protected MetaDataContext createMetaDataContext(ControllerContext context, List<MetaDataRetrieval> retrievals)
    {
       return new AbstractMetaDataContext(null, retrievals);
    }

Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/dependency/KernelScopeInfo.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/dependency/KernelScopeInfo.java	2008-08-08 16:52:51 UTC (rev 76840)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/dependency/KernelScopeInfo.java	2008-08-08 17:16:20 UTC (rev 76841)
@@ -22,6 +22,7 @@
 package org.jboss.kernel.plugins.dependency;
 
 import java.lang.annotation.Annotation;
+import java.util.List;
 import java.util.Set;
 
 import org.jboss.beans.info.spi.BeanInfo;
@@ -30,11 +31,14 @@
 import org.jboss.beans.metadata.spi.BeanMetaData;
 import org.jboss.beans.metadata.spi.PropertyMetaData;
 import org.jboss.dependency.plugins.AbstractScopeInfo;
+import org.jboss.dependency.spi.Controller;
 import org.jboss.dependency.spi.ControllerContext;
 import org.jboss.kernel.plugins.config.Configurator;
+import org.jboss.kernel.spi.dependency.KernelController;
 import org.jboss.kernel.spi.dependency.KernelControllerContext;
 import org.jboss.logging.Logger;
 import org.jboss.metadata.spi.ComponentMutableMetaData;
+import org.jboss.metadata.spi.context.MetaDataContext;
 import org.jboss.metadata.spi.loader.MutableMetaDataLoader;
 import org.jboss.metadata.spi.repository.MutableMetaDataRepository;
 import org.jboss.metadata.spi.retrieval.MetaDataRetrieval;
@@ -324,4 +328,18 @@
          }
       }
    }
+
+   @Override
+   protected MetaDataContext createMetaDataContext(ControllerContext context, List<MetaDataRetrieval> retrievals)
+   {
+      Controller controller = context.getController();
+      if (controller instanceof KernelController)
+      {
+         KernelController kernelController = (KernelController) controller;
+         MetaDataContext result = kernelController.getKernel().getMetaDataRepository().createMetaDataContext(context, retrievals);
+         if (result != null)
+            return result;
+      }
+      return super.createMetaDataContext(context, retrievals);
+   }
 }

Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/metadata/basic/BasicKernelMetaDataRepository.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/metadata/basic/BasicKernelMetaDataRepository.java	2008-08-08 16:52:51 UTC (rev 76840)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/metadata/basic/BasicKernelMetaDataRepository.java	2008-08-08 17:16:20 UTC (rev 76841)
@@ -21,11 +21,14 @@
 */
 package org.jboss.kernel.plugins.metadata.basic;
 
+import java.util.List;
+
 import org.jboss.dependency.spi.ControllerContext;
 import org.jboss.dependency.spi.ScopeInfo;
 import org.jboss.kernel.plugins.metadata.AbstractKernelMetaDataRepository;
 import org.jboss.metadata.plugins.repository.basic.BasicMetaDataRepository;
 import org.jboss.metadata.spi.MetaData;
+import org.jboss.metadata.spi.context.MetaDataContext;
 import org.jboss.metadata.spi.repository.MutableMetaDataRepository;
 import org.jboss.metadata.spi.retrieval.MetaDataRetrieval;
 import org.jboss.metadata.spi.scope.ScopeKey;
@@ -85,6 +88,16 @@
       return context.getScopeInfo().getMutableScope();
    }
 
+   public MetaDataContext createMetaDataContext(ControllerContext context, List<MetaDataRetrieval> retrievals)
+   {
+      return createMetaDataContext(retrievals);
+   }
+
+   protected MetaDataContext createMetaDataContext(List<MetaDataRetrieval> retrievals)
+   {
+      return null;
+   }
+
    /**
     * Initialise metadata retrieval
     * 

Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/spi/metadata/KernelMetaDataRepository.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/spi/metadata/KernelMetaDataRepository.java	2008-08-08 16:52:51 UTC (rev 76840)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/spi/metadata/KernelMetaDataRepository.java	2008-08-08 17:16:20 UTC (rev 76841)
@@ -21,10 +21,14 @@
 */
 package org.jboss.kernel.spi.metadata;
 
+import java.util.List;
+
 import org.jboss.dependency.spi.ControllerContext;
 import org.jboss.kernel.spi.KernelObject;
 import org.jboss.metadata.spi.MetaData;
+import org.jboss.metadata.spi.context.MetaDataContext;
 import org.jboss.metadata.spi.repository.MutableMetaDataRepository;
+import org.jboss.metadata.spi.retrieval.MetaDataRetrieval;
 import org.jboss.metadata.spi.scope.ScopeKey;
 
 /**
@@ -79,4 +83,13 @@
     * @return the default scope
     */
    ScopeKey getMutableScope(ControllerContext context);
+
+   /**
+    * Create a metadata context
+    * 
+    * @param context the context
+    * @param retrievals the retrievals
+    * @return the metadata context
+    */
+   MetaDataContext createMetaDataContext(ControllerContext context, List<MetaDataRetrieval> retrievals);
 }