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

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

Author: alesj
Date: 2008-08-08 15:05:38 -0400 (Fri, 08 Aug 2008)
New Revision: 76842

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/plugins/metadata/basic/CachingBasicKernelMetaDataRepository.java
   projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/spi/metadata/KernelMetaDataRepository.java
Log:
[JBMICROCONT-330]; minimizing on interface dependency; MetaDataContext --> MetaDataRetrieval.

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 17:16:20 UTC (rev 76841)
+++ projects/microcontainer/trunk/dependency/src/main/org/jboss/dependency/plugins/AbstractScopeInfo.java	2008-08-08 19:05:38 UTC (rev 76842)
@@ -237,10 +237,10 @@
          }
          retrievals.add(0, retrieval);
       }
-      MetaDataContext metaDataContext = createMetaDataContext(context, retrievals);
-      repository.addMetaDataRetrieval(metaDataContext);
-      addedScopes.add(metaDataContext.getScope());
-      return metaDataContext;
+      MetaDataRetrieval metaDataRetrieval = createMetaDataRetrieval(context, retrievals);
+      repository.addMetaDataRetrieval(metaDataRetrieval);
+      addedScopes.add(metaDataRetrieval.getScope());
+      return metaDataRetrieval;
    }
    
    public ScopeKey getScope()
@@ -278,13 +278,13 @@
    }
 
    /**
-    * Create metadata context.
+    * Create metadata retrieval.
     *
     * @param context the controller context
     * @param retrievals the retrievals
-    * @return new metadata context instance
+    * @return new metadata retrieval instance
     */
-   protected MetaDataContext createMetaDataContext(ControllerContext context, List<MetaDataRetrieval> retrievals)
+   protected MetaDataRetrieval createMetaDataRetrieval(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 17:16:20 UTC (rev 76841)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/dependency/KernelScopeInfo.java	2008-08-08 19:05:38 UTC (rev 76842)
@@ -38,7 +38,6 @@
 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;
@@ -330,16 +329,16 @@
    }
 
    @Override
-   protected MetaDataContext createMetaDataContext(ControllerContext context, List<MetaDataRetrieval> retrievals)
+   protected MetaDataRetrieval createMetaDataRetrieval(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);
+         MetaDataRetrieval result = kernelController.getKernel().getMetaDataRepository().createMetaDataRetrieval(context, retrievals);
          if (result != null)
             return result;
       }
-      return super.createMetaDataContext(context, retrievals);
+      return super.createMetaDataRetrieval(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 17:16:20 UTC (rev 76841)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/metadata/basic/BasicKernelMetaDataRepository.java	2008-08-08 19:05:38 UTC (rev 76842)
@@ -28,7 +28,6 @@
 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;
@@ -88,12 +87,12 @@
       return context.getScopeInfo().getMutableScope();
    }
 
-   public MetaDataContext createMetaDataContext(ControllerContext context, List<MetaDataRetrieval> retrievals)
+   public MetaDataRetrieval createMetaDataRetrieval(ControllerContext context, List<MetaDataRetrieval> retrievals)
    {
-      return createMetaDataContext(retrievals);
+      return createMetaDataRetrieval(retrievals);
    }
 
-   protected MetaDataContext createMetaDataContext(List<MetaDataRetrieval> retrievals)
+   protected MetaDataRetrieval createMetaDataRetrieval(List<MetaDataRetrieval> retrievals)
    {
       return null;
    }

Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/metadata/basic/CachingBasicKernelMetaDataRepository.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/metadata/basic/CachingBasicKernelMetaDataRepository.java	2008-08-08 17:16:20 UTC (rev 76841)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/metadata/basic/CachingBasicKernelMetaDataRepository.java	2008-08-08 19:05:38 UTC (rev 76842)
@@ -23,9 +23,8 @@
 
 import java.util.List;
 
+import org.jboss.metadata.plugins.cache.CacheFactory;
 import org.jboss.metadata.plugins.context.CachingMetaDataContext;
-import org.jboss.metadata.plugins.cache.CacheFactory;
-import org.jboss.metadata.spi.context.MetaDataContext;
 import org.jboss.metadata.spi.retrieval.MetaDataRetrieval;
 
 /**
@@ -56,7 +55,8 @@
       return factory;
    }
 
-   protected MetaDataContext createMetaDataContext(List<MetaDataRetrieval> retrievals)
+   @Override
+   protected MetaDataRetrieval createMetaDataRetrieval(List<MetaDataRetrieval> retrievals)
    {
       return new CachingMetaDataContext(null, retrievals, getFactory());
    }

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 17:16:20 UTC (rev 76841)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/spi/metadata/KernelMetaDataRepository.java	2008-08-08 19:05:38 UTC (rev 76842)
@@ -26,7 +26,6 @@
 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;
@@ -85,11 +84,11 @@
    ScopeKey getMutableScope(ControllerContext context);
 
    /**
-    * Create a metadata context
+    * Create a metadata retrieval
     * 
-    * @param context the context
+    * @param context the controller context
     * @param retrievals the retrievals
     * @return the metadata context
     */
-   MetaDataContext createMetaDataContext(ControllerContext context, List<MetaDataRetrieval> retrievals);
+   MetaDataRetrieval createMetaDataRetrieval(ControllerContext context, List<MetaDataRetrieval> retrievals);
 }