[jboss-cvs] JBossAS SVN: r65047 - in projects/microcontainer/trunk: container/src/main/org/jboss/metadata/plugins/context and 12 other directories.

jboss-cvs-commits at lists.jboss.org jboss-cvs-commits at lists.jboss.org
Tue Sep 4 11:26:58 EDT 2007


Author: alesj
Date: 2007-09-04 11:26:58 -0400 (Tue, 04 Sep 2007)
New Revision: 65047

Modified:
   projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/integration/AOPConstructorJoinpoint.java
   projects/microcontainer/trunk/container/src/main/org/jboss/metadata/plugins/context/AbstractMetaDataContext.java
   projects/microcontainer/trunk/container/src/main/org/jboss/metadata/plugins/loader/SimpleMetaDataLoader.java
   projects/microcontainer/trunk/container/src/main/org/jboss/metadata/plugins/loader/memory/MemoryMetaDataLoader.java
   projects/microcontainer/trunk/container/src/main/org/jboss/metadata/plugins/loader/reflection/AnnotatedElementMetaDataLoader.java
   projects/microcontainer/trunk/container/src/main/org/jboss/metadata/plugins/loader/thread/ThreadLocalMetaDataLoader.java
   projects/microcontainer/trunk/container/src/main/org/jboss/metadata/spi/MetaData.java
   projects/microcontainer/trunk/container/src/main/org/jboss/metadata/spi/retrieval/MetaDataRetrieval.java
   projects/microcontainer/trunk/container/src/main/org/jboss/metadata/spi/retrieval/MetaDataRetrievalToMetaDataBridge.java
   projects/microcontainer/trunk/container/src/tests/org/jboss/test/metadata/context/cache/support/TestMetaDataLoader.java
   projects/microcontainer/trunk/container/src/tests/org/jboss/test/metadata/retrieval/support/TestBasicItemMetaDataLoader.java
   projects/microcontainer/trunk/container/src/tests/org/jboss/test/metadata/retrieval/support/TestMetaDataRetrieval.java
   projects/microcontainer/trunk/container/src/tests/org/jboss/test/metadata/shared/support/MetaDataAndMutableMetaDataImpl.java
   projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/dependency/KernelControllerContextAction.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:
Introducing MetaData.getScopeMetaData(ScopeLevel) and MetaData.isEmpty().
Removing KernelMetaDataRepository.getMetaDataRetrieval() and cleaning up the AOPConstructorJoinpoint.

Modified: projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/integration/AOPConstructorJoinpoint.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/integration/AOPConstructorJoinpoint.java	2007-09-04 15:22:28 UTC (rev 65046)
+++ projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/integration/AOPConstructorJoinpoint.java	2007-09-04 15:26:58 UTC (rev 65047)
@@ -21,9 +21,7 @@
 */
 package org.jboss.aop.microcontainer.integration;
 
-import java.lang.annotation.Annotation;
 import java.lang.reflect.Constructor;
-import java.util.List;
 
 import org.jboss.aop.Advisor;
 import org.jboss.aop.AspectManager;
@@ -35,15 +33,8 @@
 import org.jboss.aop.proxy.container.ContainerCache;
 import org.jboss.aop.proxy.container.GeneratedAOPProxyFactory;
 import org.jboss.joinpoint.plugins.BasicConstructorJoinPoint;
-import org.jboss.kernel.Kernel;
-import org.jboss.kernel.spi.dependency.KernelControllerContext;
-import org.jboss.kernel.spi.dependency.KernelControllerContextAware;
-import org.jboss.kernel.spi.metadata.KernelMetaDataRepository;
 import org.jboss.metadata.spi.MetaData;
-import org.jboss.metadata.spi.context.MetaDataContext;
-import org.jboss.metadata.spi.retrieval.MetaDataRetrieval;
 import org.jboss.metadata.spi.scope.CommonLevels;
-import org.jboss.metadata.spi.scope.ScopeKey;
 import org.jboss.metadata.spi.signature.MethodSignature;
 import org.jboss.metadata.spi.stack.MetaDataStack;
 import org.jboss.reflect.spi.ClassInfo;
@@ -60,13 +51,12 @@
  * @author <a href="adrian at jboss.com">Adrian Brock</a>
  * @version $Revision$
  */
-public class AOPConstructorJoinpoint extends BasicConstructorJoinPoint implements KernelControllerContextAware
+public class AOPConstructorJoinpoint extends BasicConstructorJoinPoint
 {
    private final static String[] EMPTY_PARAM_ARRAY = new String[0];
    
    AOPProxyFactory proxyFactory = new GeneratedAOPProxyFactory();
-   
-   KernelControllerContext context;
+
    /**
     * Create a new AOPConstructorJoinpoint.
     *
@@ -77,17 +67,6 @@
       super(constructorInfo);
    }
 
-   public void setKernelControllerContext(KernelControllerContext context) throws Exception
-   {
-      this.context = context;
-   }
-
-   public void unsetKernelControllerContext(KernelControllerContext context) throws Exception
-   {
-      this.context = null;
-   }
-
-
    public Object dispatch() throws Throwable
    {
       Class clazz = constructorInfo.getDeclaringClass().getType();
@@ -122,40 +101,13 @@
          return false;
       }
 
-      if (context != null)
+      MetaData instanceMetaData = metaData.getScopeMetaData(CommonLevels.INSTANCE);
+      if (instanceMetaData != null && instanceMetaData.isEmpty() == false)
       {
-         //TODO We might need the context injected somehow by the GenericBeanFactory, since that is used for creating the aspect instances...
-         Kernel kernel = context.getKernel();
-         KernelMetaDataRepository repository = kernel.getMetaDataRepository();
-         MetaDataRetrieval retrieval = repository.getMetaDataRetrieval(context);
-
-         if (retrieval instanceof MetaDataContext)
-         {
-            ScopeKey instanceKey = new ScopeKey(CommonLevels.INSTANCE, (String)context.getName());
-            
-            List<MetaDataRetrieval> retrievals =((MetaDataContext)retrieval).getLocalRetrievals();
-            for (MetaDataRetrieval ret : retrievals)
-            {
-               ScopeKey key = ret.getScope();
-               if (instanceKey.equals(key))
-               {
-                  Annotation[] anns = ret.retrieveAnnotations().getValue();
-                  if (anns != MetaData.NO_ANNOTATIONS)
-                  {
-                     return true;
-                  }
-               }
-            }
-         }
-         
-         //Check for method annotations
-         if (hasMethodMetaData(metaData))
-         {
-            return true;
-         }
-      }      
-      
-      return false; 
+         return true;  
+      }
+      //Check for method annotations
+      return hasMethodMetaData(metaData);
    }
    
    private boolean hasMethodMetaData(MetaData metaData)
@@ -184,7 +136,7 @@
    private boolean methodHasAnnotations(MetaData metaData, MethodInfo mi)
    {
       TypeInfo[] types = mi.getParameterTypes();
-      String[] typeStrings = null;
+      String[] typeStrings;
       
       if (types.length == 0)
       {

Modified: projects/microcontainer/trunk/container/src/main/org/jboss/metadata/plugins/context/AbstractMetaDataContext.java
===================================================================
--- projects/microcontainer/trunk/container/src/main/org/jboss/metadata/plugins/context/AbstractMetaDataContext.java	2007-09-04 15:22:28 UTC (rev 65046)
+++ projects/microcontainer/trunk/container/src/main/org/jboss/metadata/plugins/context/AbstractMetaDataContext.java	2007-09-04 15:26:58 UTC (rev 65047)
@@ -128,10 +128,9 @@
          result = parent.getValidTime();
          resultLong = result.getValidTime();
       }
-      
-      for (int i = 0; i < retrievals.size(); ++i)
+
+      for (MetaDataRetrieval retrieval : retrievals)
       {
-         MetaDataRetrieval retrieval = retrievals.get(i);
          ValidTime temp = retrieval.getValidTime();
          long tempLong = temp.getValidTime();
          if (tempLong > resultLong || result == null)
@@ -140,7 +139,7 @@
             resultLong = tempLong;
          }
       }
-      
+
       return result;
    }
 
@@ -212,14 +211,13 @@
 
    public <T extends Annotation> AnnotationItem<T> retrieveAnnotation(Class<T> annotationType)
    {
-      for (int i = 0; i < retrievals.size(); ++i)
+      for (MetaDataRetrieval retrieval : retrievals)
       {
-         MetaDataRetrieval retrieval = retrievals.get(i);
          AnnotationItem<T> item = retrieval.retrieveAnnotation(annotationType);
          if (item != null)
             return item;
       }
-      
+
       if (parent != null)
          return parent.retrieveAnnotation(annotationType);
       
@@ -238,14 +236,13 @@
 
    public <T> MetaDataItem<T> retrieveMetaData(Class<T> type)
    {
-      for (int i = 0; i < retrievals.size(); ++i)
+      for (MetaDataRetrieval retrieval : retrievals)
       {
-         MetaDataRetrieval retrieval = retrievals.get(i);
          MetaDataItem<T> item = retrieval.retrieveMetaData(type);
          if (item != null)
             return item;
       }
-      
+
       if (parent != null)
          return parent.retrieveMetaData(type);
       
@@ -254,14 +251,13 @@
 
    public MetaDataItem retrieveMetaData(String name)
    {
-      for (int i = 0; i < retrievals.size(); ++i)
+      for (MetaDataRetrieval retrieval : retrievals)
       {
-         MetaDataRetrieval retrieval = retrievals.get(i);
          MetaDataItem item = retrieval.retrieveMetaData(name);
          if (item != null)
             return item;
       }
-      
+
       if (parent != null)
          return parent.retrieveMetaData(name);
       
@@ -274,9 +270,8 @@
          return null;
       
       List<MetaDataRetrieval> componentRetrievals = null;
-      for (int i = 0; i < retrievals.size(); ++i)
+      for (MetaDataRetrieval retrieval : retrievals)
       {
-         MetaDataRetrieval retrieval = retrievals.get(i);
          retrieval = retrieval.getComponentMetaDataRetrieval(signature);
          if (retrieval != null)
          {
@@ -285,7 +280,7 @@
             componentRetrievals.add(retrieval);
          }
       }
-      
+
       MetaDataContext parentComponent = null;
       if (parent != null)
          parentComponent = (MetaDataContext) parent.getComponentMetaDataRetrieval(signature);
@@ -295,4 +290,14 @@
       
       return new AbstractMetaDataContext(parentComponent, componentRetrievals);
    }
+
+   public boolean isEmpty()
+   {
+      for(MetaDataRetrieval retrieval : retrievals)
+      {
+         if (retrieval.isEmpty() == false)
+            return false;
+      }
+      return (parent == null || parent.isEmpty());
+   }
 }

Modified: projects/microcontainer/trunk/container/src/main/org/jboss/metadata/plugins/loader/SimpleMetaDataLoader.java
===================================================================
--- projects/microcontainer/trunk/container/src/main/org/jboss/metadata/plugins/loader/SimpleMetaDataLoader.java	2007-09-04 15:22:28 UTC (rev 65046)
+++ projects/microcontainer/trunk/container/src/main/org/jboss/metadata/plugins/loader/SimpleMetaDataLoader.java	2007-09-04 15:26:58 UTC (rev 65047)
@@ -61,4 +61,9 @@
    {
       return annotationsItem;
    }
+
+   public boolean isEmpty()
+   {
+      return annotationsItem.getAnnotations().length == 0;
+   }
 }

Modified: projects/microcontainer/trunk/container/src/main/org/jboss/metadata/plugins/loader/memory/MemoryMetaDataLoader.java
===================================================================
--- projects/microcontainer/trunk/container/src/main/org/jboss/metadata/plugins/loader/memory/MemoryMetaDataLoader.java	2007-09-04 15:22:28 UTC (rev 65046)
+++ projects/microcontainer/trunk/container/src/main/org/jboss/metadata/plugins/loader/memory/MemoryMetaDataLoader.java	2007-09-04 15:26:58 UTC (rev 65047)
@@ -393,7 +393,23 @@
       return components.get(signature);
    }
 
+   public boolean isEmpty()
+   {
+      return isNullOrEmpty(annotations) && isNullOrEmpty(metaDataByName) && isNullOrEmpty(components);
+   }
+
    /**
+    * Is map null or empty.
+    *
+    * @param map the map
+    * @return is null or empty
+    */
+   protected static boolean isNullOrEmpty(Map map)
+   {
+      return map == null || map.isEmpty();
+   }
+
+   /**
     * Invalidate the annotations item
     */
    protected void invalidateAnnotationsItem()

Modified: projects/microcontainer/trunk/container/src/main/org/jboss/metadata/plugins/loader/reflection/AnnotatedElementMetaDataLoader.java
===================================================================
--- projects/microcontainer/trunk/container/src/main/org/jboss/metadata/plugins/loader/reflection/AnnotatedElementMetaDataLoader.java	2007-09-04 15:22:28 UTC (rev 65046)
+++ projects/microcontainer/trunk/container/src/main/org/jboss/metadata/plugins/loader/reflection/AnnotatedElementMetaDataLoader.java	2007-09-04 15:26:58 UTC (rev 65047)
@@ -196,6 +196,12 @@
       return null;
    }
 
+   public boolean isEmpty()
+   {
+      Annotation[] annotations = annotated.getAnnotations();
+      return annotations == null || annotations.length == 0;
+   }
+
    public String toString()
    {
       JBossStringBuilder buffer = new JBossStringBuilder();

Modified: projects/microcontainer/trunk/container/src/main/org/jboss/metadata/plugins/loader/thread/ThreadLocalMetaDataLoader.java
===================================================================
--- projects/microcontainer/trunk/container/src/main/org/jboss/metadata/plugins/loader/thread/ThreadLocalMetaDataLoader.java	2007-09-04 15:22:28 UTC (rev 65046)
+++ projects/microcontainer/trunk/container/src/main/org/jboss/metadata/plugins/loader/thread/ThreadLocalMetaDataLoader.java	2007-09-04 15:26:58 UTC (rev 65047)
@@ -217,4 +217,10 @@
          return null;
       return delegate.removeMetaData(name, type);
    }
+
+   public boolean isEmpty()
+   {
+      MemoryMetaDataLoader delegate = threadLocal.get();
+      return delegate == null || delegate.isEmpty(); 
+   }
 }

Modified: projects/microcontainer/trunk/container/src/main/org/jboss/metadata/spi/MetaData.java
===================================================================
--- projects/microcontainer/trunk/container/src/main/org/jboss/metadata/spi/MetaData.java	2007-09-04 15:22:28 UTC (rev 65046)
+++ projects/microcontainer/trunk/container/src/main/org/jboss/metadata/spi/MetaData.java	2007-09-04 15:26:58 UTC (rev 65047)
@@ -23,6 +23,7 @@
 
 import java.lang.annotation.Annotation;
 
+import org.jboss.metadata.spi.scope.ScopeLevel;
 import org.jboss.metadata.spi.signature.Signature;
 
 /**
@@ -150,4 +151,21 @@
     * @return the component metadata
     */
    MetaData getComponentMetaData(Signature signature);
+
+   // TODO -- add tests for getScopeMD/isEmpty
+
+   /**
+    * Get the scope metadata.
+    *
+    * @param level the scope level
+    * @return the scope metadata
+    */
+   MetaData getScopeMetaData(ScopeLevel level);
+
+   /**
+    * Is metadata empty.
+    *
+    * @return true if empty
+    */
+   boolean isEmpty();
 }

Modified: projects/microcontainer/trunk/container/src/main/org/jboss/metadata/spi/retrieval/MetaDataRetrieval.java
===================================================================
--- projects/microcontainer/trunk/container/src/main/org/jboss/metadata/spi/retrieval/MetaDataRetrieval.java	2007-09-04 15:22:28 UTC (rev 65046)
+++ projects/microcontainer/trunk/container/src/main/org/jboss/metadata/spi/retrieval/MetaDataRetrieval.java	2007-09-04 15:26:58 UTC (rev 65047)
@@ -109,4 +109,11 @@
     * @return the component metadata retrieval
     */
    MetaDataRetrieval getComponentMetaDataRetrieval(Signature signature);
+
+   /**
+    * Is metadata empty.
+    *
+    * @return true if metadata empty
+    */
+   boolean isEmpty();
 }

Modified: projects/microcontainer/trunk/container/src/main/org/jboss/metadata/spi/retrieval/MetaDataRetrievalToMetaDataBridge.java
===================================================================
--- projects/microcontainer/trunk/container/src/main/org/jboss/metadata/spi/retrieval/MetaDataRetrievalToMetaDataBridge.java	2007-09-04 15:22:28 UTC (rev 65046)
+++ projects/microcontainer/trunk/container/src/main/org/jboss/metadata/spi/retrieval/MetaDataRetrievalToMetaDataBridge.java	2007-09-04 15:26:58 UTC (rev 65047)
@@ -22,9 +22,15 @@
 package org.jboss.metadata.spi.retrieval;
 
 import java.lang.annotation.Annotation;
+import java.util.List;
+import java.util.ArrayList;
 
 import org.jboss.metadata.spi.MetaData;
+import org.jboss.metadata.spi.context.MetaDataContext;
+import org.jboss.metadata.spi.scope.ScopeKey;
+import org.jboss.metadata.spi.scope.ScopeLevel;
 import org.jboss.metadata.spi.signature.Signature;
+import org.jboss.metadata.plugins.context.AbstractMetaDataContext;
 
 /**
  * MetaDataRetrievalToMetaDataBridge.
@@ -162,6 +168,35 @@
       return new MetaDataRetrievalToMetaDataBridge(component);
    }
 
+   public MetaData getScopeMetaData(ScopeLevel level)
+   {
+      if (level == null)
+         throw new IllegalArgumentException("Null scope level");
+
+      if (retrieval instanceof MetaDataContext)
+      {
+         MetaDataContext context = (MetaDataContext)retrieval;
+         List<MetaDataRetrieval> matchingRetrievals = new ArrayList<MetaDataRetrieval>();
+         List<MetaDataRetrieval> localRetrievals = context.getLocalRetrievals();
+         for (MetaDataRetrieval localRetrieval : localRetrievals)
+         {
+            ScopeKey scopeKey = localRetrieval.getScope();
+            if (scopeKey.getScopeLevel(level) != null)
+               matchingRetrievals.add(localRetrieval);
+         }
+         if (matchingRetrievals.isEmpty() == false)
+            return new MetaDataRetrievalToMetaDataBridge(new AbstractMetaDataContext(context, matchingRetrievals));
+      }
+      else if (retrieval.getScope().getScopeLevel(level) != null)
+         return new MetaDataRetrievalToMetaDataBridge(new AbstractMetaDataContext(retrieval));
+      return null;
+   }
+
+   public boolean isEmpty()
+   {
+      return retrieval.isEmpty();
+   }
+
    public boolean equals(Object obj)
    {
       if (obj == this)

Modified: projects/microcontainer/trunk/container/src/tests/org/jboss/test/metadata/context/cache/support/TestMetaDataLoader.java
===================================================================
--- projects/microcontainer/trunk/container/src/tests/org/jboss/test/metadata/context/cache/support/TestMetaDataLoader.java	2007-09-04 15:22:28 UTC (rev 65046)
+++ projects/microcontainer/trunk/container/src/tests/org/jboss/test/metadata/context/cache/support/TestMetaDataLoader.java	2007-09-04 15:26:58 UTC (rev 65047)
@@ -63,4 +63,9 @@
       retrieved = true;
       return item;
    }
+
+   public boolean isEmpty()
+   {
+      return true;
+   }
 }

Modified: projects/microcontainer/trunk/container/src/tests/org/jboss/test/metadata/retrieval/support/TestBasicItemMetaDataLoader.java
===================================================================
--- projects/microcontainer/trunk/container/src/tests/org/jboss/test/metadata/retrieval/support/TestBasicItemMetaDataLoader.java	2007-09-04 15:22:28 UTC (rev 65046)
+++ projects/microcontainer/trunk/container/src/tests/org/jboss/test/metadata/retrieval/support/TestBasicItemMetaDataLoader.java	2007-09-04 15:26:58 UTC (rev 65047)
@@ -50,4 +50,9 @@
    {
       throw new NotImplementedException("retrieveAnnotations");
    }
+
+   public boolean isEmpty()
+   {
+      return true;
+   }
 }

Modified: projects/microcontainer/trunk/container/src/tests/org/jboss/test/metadata/retrieval/support/TestMetaDataRetrieval.java
===================================================================
--- projects/microcontainer/trunk/container/src/tests/org/jboss/test/metadata/retrieval/support/TestMetaDataRetrieval.java	2007-09-04 15:22:28 UTC (rev 65046)
+++ projects/microcontainer/trunk/container/src/tests/org/jboss/test/metadata/retrieval/support/TestMetaDataRetrieval.java	2007-09-04 15:26:58 UTC (rev 65047)
@@ -104,4 +104,9 @@
    {
       return null;
    }
+
+   public boolean isEmpty()
+   {
+      return true;
+   }
 }

Modified: projects/microcontainer/trunk/container/src/tests/org/jboss/test/metadata/shared/support/MetaDataAndMutableMetaDataImpl.java
===================================================================
--- projects/microcontainer/trunk/container/src/tests/org/jboss/test/metadata/shared/support/MetaDataAndMutableMetaDataImpl.java	2007-09-04 15:22:28 UTC (rev 65046)
+++ projects/microcontainer/trunk/container/src/tests/org/jboss/test/metadata/shared/support/MetaDataAndMutableMetaDataImpl.java	2007-09-04 15:26:58 UTC (rev 65047)
@@ -25,6 +25,7 @@
 
 import org.jboss.metadata.spi.MetaData;
 import org.jboss.metadata.spi.MutableMetaData;
+import org.jboss.metadata.spi.scope.ScopeLevel;
 import org.jboss.metadata.spi.signature.Signature;
 
 /**
@@ -143,4 +144,14 @@
    {
       return metaData.getComponentMetaData(signature);
    }
+
+   public MetaData getScopeMetaData(ScopeLevel level)
+   {
+      return metaData.getScopeMetaData(level);
+   }
+
+   public boolean isEmpty()
+   {
+      return metaData.isEmpty();
+   }
 }

Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/dependency/KernelControllerContextAction.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/dependency/KernelControllerContextAction.java	2007-09-04 15:22:28 UTC (rev 65046)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/dependency/KernelControllerContextAction.java	2007-09-04 15:26:58 UTC (rev 65047)
@@ -97,8 +97,6 @@
          {
             if (cl != null && access == null)
                Thread.currentThread().setContextClassLoader(cl);
-            if (joinpoint instanceof KernelControllerContextAware)
-               ((KernelControllerContextAware) joinpoint).setKernelControllerContext(context);
 
             if (access == null)
             {
@@ -121,8 +119,6 @@
          {
             if (cl != null && access == null)
                Thread.currentThread().setContextClassLoader(tcl);
-            if (joinpoint instanceof KernelControllerContextAware)
-               ((KernelControllerContextAware) joinpoint).unsetKernelControllerContext(null);
          }
       }
       finally

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	2007-09-04 15:22:28 UTC (rev 65046)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/metadata/basic/BasicKernelMetaDataRepository.java	2007-09-04 15:26:58 UTC (rev 65047)
@@ -64,16 +64,6 @@
       return metaData;
    }
 
-   public MetaDataRetrieval getMetaDataRetrieval(ControllerContext context)
-   {
-      MutableMetaDataRepository repository = getMetaDataRepository();
-      ScopeKey scope = context.getScopeInfo().getScope();
-      MetaDataRetrieval metaDataRetrieval = repository.getMetaDataRetrieval(scope);
-      if (metaDataRetrieval == null)
-         metaDataRetrieval = initMetaDataRetrieval(context);
-      return metaDataRetrieval;
-   }
-
    public void addMetaData(ControllerContext context)
    {
       MutableMetaDataRepository repository = getMetaDataRepository();

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	2007-09-04 15:22:28 UTC (rev 65046)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/spi/metadata/KernelMetaDataRepository.java	2007-09-04 15:26:58 UTC (rev 65047)
@@ -25,7 +25,6 @@
 import org.jboss.kernel.spi.KernelObject;
 import org.jboss.metadata.spi.MetaData;
 import org.jboss.metadata.spi.repository.MutableMetaDataRepository;
-import org.jboss.metadata.spi.retrieval.MetaDataRetrieval;
 import org.jboss.metadata.spi.scope.ScopeKey;
 
 /**
@@ -52,14 +51,6 @@
    MetaData getMetaData(ControllerContext context);
 
    /**
-    * Get the MetaData retrieval
-    * 
-    * @param context the context
-    * @return the metadata retrieval
-    */
-   MetaDataRetrieval getMetaDataRetrieval(ControllerContext context);
-   
-   /**
     * Add metadata to the bean.
     * 
     * @param context the context




More information about the jboss-cvs-commits mailing list