[jboss-cvs] JBossAS SVN: r75339 - in projects/microcontainer/trunk: kernel/src/main/org/jboss/kernel/plugins/metadata/basic and 1 other directory.

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

Author: alesj
Date: 2008-07-03 05:51:10 -0400 (Thu, 03 Jul 2008)
New Revision: 75339

Added:
   projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/metadata/basic/CachingBasicKernelMetaDataRepository.java
Modified:
   projects/microcontainer/trunk/build/pom.xml
   projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/metadata/basic/BasicKernelMetaDataRepository.java
Log:
Prepare for caching metadata context impl.

Modified: projects/microcontainer/trunk/build/pom.xml
===================================================================
--- projects/microcontainer/trunk/build/pom.xml	2008-07-03 09:33:29 UTC (rev 75338)
+++ projects/microcontainer/trunk/build/pom.xml	2008-07-03 09:51:10 UTC (rev 75339)
@@ -41,7 +41,7 @@
     <version.javassist>3.8.0.GA</version.javassist>
     <version.jboss.aop>2.0.0.CR14</version.jboss.aop>
     <version.org.jboss.reflect>2.0.0.Beta12</version.org.jboss.reflect>
-    <version.org.jboss.mdr>2.0.0.Beta15</version.org.jboss.mdr>
+    <version.org.jboss.mdr>2.0.0-SNAPSHOT</version.org.jboss.mdr>
     <version.org.jboss.test>1.0.5.GA</version.org.jboss.test>
     <version.junit>4.4</version.junit>
     <version.jboss.profiler.jvmti>1.0.0.CR5</version.jboss.profiler.jvmti>

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-07-03 09:33:29 UTC (rev 75338)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/metadata/basic/BasicKernelMetaDataRepository.java	2008-07-03 09:51:10 UTC (rev 75339)
@@ -22,6 +22,7 @@
 package org.jboss.kernel.plugins.metadata.basic;
 
 import java.util.ArrayList;
+import java.util.List;
 
 import org.jboss.dependency.spi.ControllerContext;
 import org.jboss.dependency.spi.ScopeInfo;
@@ -30,6 +31,7 @@
 import org.jboss.metadata.plugins.loader.memory.MemoryMetaDataLoader;
 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.Scope;
@@ -101,7 +103,7 @@
       MutableMetaDataRepository repository = getMetaDataRepository();
       ScopeInfo scopeInfo = context.getScopeInfo();
       ScopeKey scopeKey = scopeInfo.getScope();
-      ArrayList<MetaDataRetrieval> retrievals = new ArrayList<MetaDataRetrieval>();
+      List<MetaDataRetrieval> retrievals = new ArrayList<MetaDataRetrieval>();
       for (Scope scope : scopeKey.getScopes())
       {
          ScopeKey thisScope = new ScopeKey(scope);
@@ -117,8 +119,19 @@
          }
          retrievals.add(0, retrieval);
       }
-      AbstractMetaDataContext metaDataContext = new AbstractMetaDataContext(null, retrievals);
+      MetaDataContext metaDataContext = createMetaDataContext(retrievals);
       repository.addMetaDataRetrieval(metaDataContext);
       return metaDataContext;
    }
+
+   /**
+    * Create metadata context.
+    *
+    * @param retrievals the retrievals
+    * @return new metadata context instance
+    */
+   protected MetaDataContext createMetaDataContext(List<MetaDataRetrieval> retrievals)
+   {
+      return new AbstractMetaDataContext(null, retrievals);
+   }
 }

Copied: projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/metadata/basic/CachingBasicKernelMetaDataRepository.java (from rev 75212, 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	                        (rev 0)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/metadata/basic/CachingBasicKernelMetaDataRepository.java	2008-07-03 09:51:10 UTC (rev 75339)
@@ -0,0 +1,57 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2006, JBoss Inc., and individual contributors as indicated
+* by the @authors tag. See the copyright.txt in the distribution for a
+* full listing of individual contributors.
+*
+* This is free software; you can redistribute it and/or modify it
+* under the terms of the GNU Lesser General Public License as
+* published by the Free Software Foundation; either version 2.1 of
+* the License, or (at your option) any later version.
+*
+* This software is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this software; if not, write to the Free
+* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+*/
+package org.jboss.kernel.plugins.metadata.basic;
+
+import java.util.List;
+
+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;
+
+/**
+ * CachingBasicKernelMetaDataRepository.
+ *
+ * @author <a href="ales.justin at jboss.com">Ales Justin</a>
+ */
+public abstract class CachingBasicKernelMetaDataRepository extends BasicKernelMetaDataRepository
+{
+   private CacheFactory factory;
+
+   public CachingBasicKernelMetaDataRepository()
+   {
+      super();
+      factory = createCacheFactory();
+   }
+
+   /**
+    * Create cache factory.
+    *
+    * @return the cache factory
+    */
+   protected abstract CacheFactory createCacheFactory();
+
+   protected MetaDataContext createMetaDataContext(List<MetaDataRetrieval> retrievals)
+   {
+      return new CachingMetaDataContext(null, retrievals, factory);
+   }
+}
\ No newline at end of file