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

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

Author: kabir.khan at jboss.com
Date: 2009-12-21 10:12:19 -0500 (Mon, 21 Dec 2009)
New Revision: 98084

Modified:
   projects/kernel/trunk/kernel/src/main/java/org/jboss/kernel/plugins/annotations/CommonAnnotationAdapter.java
   projects/kernel/trunk/kernel/src/main/java/org/jboss/kernel/plugins/dependency/QualifiersMdrUtil.java
Log:
[JBKERNEL-63] Utils for cached metadata context has been moved

Modified: projects/kernel/trunk/kernel/src/main/java/org/jboss/kernel/plugins/annotations/CommonAnnotationAdapter.java
===================================================================
--- projects/kernel/trunk/kernel/src/main/java/org/jboss/kernel/plugins/annotations/CommonAnnotationAdapter.java	2009-12-21 14:56:34 UTC (rev 98083)
+++ projects/kernel/trunk/kernel/src/main/java/org/jboss/kernel/plugins/annotations/CommonAnnotationAdapter.java	2009-12-21 15:12:19 UTC (rev 98084)
@@ -40,8 +40,8 @@
 import org.jboss.beans.info.spi.PropertyInfo;
 import org.jboss.beans.metadata.api.annotations.MCAnnotations;
 import org.jboss.logging.Logger;
-import org.jboss.metadata.api.MetaDataUtils;
 import org.jboss.metadata.spi.MetaData;
+import org.jboss.metadata.spi.retrieval.RetrievalUtils;
 import org.jboss.metadata.spi.signature.ConstructorSignature;
 import org.jboss.metadata.spi.signature.DeclaredMethodSignature;
 import org.jboss.metadata.spi.signature.FieldSignature;
@@ -328,7 +328,7 @@
          throw new IllegalArgumentException("Null handle.");
 
       //Use cached metadata context
-      retrieval = MetaDataUtils.createCachedMetaData(retrieval);
+      retrieval = RetrievalUtils.createCachedMetaData(retrieval);
       
       boolean trace = log.isTraceEnabled();
       if (trace)

Modified: projects/kernel/trunk/kernel/src/main/java/org/jboss/kernel/plugins/dependency/QualifiersMdrUtil.java
===================================================================
--- projects/kernel/trunk/kernel/src/main/java/org/jboss/kernel/plugins/dependency/QualifiersMdrUtil.java	2009-12-21 14:56:34 UTC (rev 98083)
+++ projects/kernel/trunk/kernel/src/main/java/org/jboss/kernel/plugins/dependency/QualifiersMdrUtil.java	2009-12-21 15:12:19 UTC (rev 98084)
@@ -45,13 +45,13 @@
 import org.jboss.kernel.plugins.config.Configurator;
 import org.jboss.kernel.spi.dependency.KernelControllerContext;
 import org.jboss.logging.Logger;
-import org.jboss.metadata.api.MetaDataUtils;
 import org.jboss.metadata.spi.MetaData;
 import org.jboss.metadata.spi.MutableMetaData;
 import org.jboss.metadata.spi.repository.MetaDataRepository;
 import org.jboss.metadata.spi.repository.MutableMetaDataRepository;
 import org.jboss.metadata.spi.retrieval.MetaDataItem;
 import org.jboss.metadata.spi.retrieval.MetaDataRetrieval;
+import org.jboss.metadata.spi.retrieval.RetrievalUtils;
 import org.jboss.metadata.spi.scope.ScopeKey;
 import org.jboss.metadata.spi.signature.ConstructorParametersSignature;
 import org.jboss.metadata.spi.signature.ConstructorSignature;
@@ -392,7 +392,7 @@
       Set<Annotation> annotationQualifiers = null;
       
       //Use cached metadata context
-      metaData = MetaDataUtils.createCachedMetaData(metaData);
+      metaData = RetrievalUtils.createCachedMetaData(metaData);
       
       for (int i = 0 ; i < parents.size() ; i++)
       {