[jboss-cvs] JBossAS SVN: r96059 - projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/main/java/org/jboss/deployers/vfs/deployer/kernel.

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

Author: alesj
Date: 2009-11-05 11:44:09 -0500 (Thu, 05 Nov 2009)
New Revision: 96059

Modified:
   projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/main/java/org/jboss/deployers/vfs/deployer/kernel/BeanMetaDataDeployer.java
Log:
Put back the method, don't wanna break api - but mark it as deprecated.

Modified: projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/main/java/org/jboss/deployers/vfs/deployer/kernel/BeanMetaDataDeployer.java
===================================================================
--- projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/main/java/org/jboss/deployers/vfs/deployer/kernel/BeanMetaDataDeployer.java	2009-11-05 16:43:10 UTC (rev 96058)
+++ projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/main/java/org/jboss/deployers/vfs/deployer/kernel/BeanMetaDataDeployer.java	2009-11-05 16:44:09 UTC (rev 96059)
@@ -21,6 +21,8 @@
 */
 package org.jboss.deployers.vfs.deployer.kernel;
 
+import java.util.Collection;
+
 import org.jboss.beans.metadata.plugins.AbstractClassLoaderMetaData;
 import org.jboss.beans.metadata.plugins.AbstractValueMetaData;
 import org.jboss.beans.metadata.spi.BeanMetaData;
@@ -34,6 +36,8 @@
 import org.jboss.kernel.Kernel;
 import org.jboss.kernel.plugins.dependency.AbstractKernelControllerContext;
 import org.jboss.kernel.spi.dependency.KernelControllerContext;
+import org.jboss.metadata.spi.scope.Scope;
+import org.jboss.metadata.spi.scope.ScopeKey;
 
 /**
  * BeanMetaDataDeployer.<p>
@@ -122,6 +126,29 @@
       }
    }
 
+   /**
+    * Merge scope keys.
+    *
+    * @param contextKey the context key
+    * @param unitKey the unit key
+    * @deprecated no current usage in VDF code
+    */
+   @Deprecated
+   protected static void mergeScopes(ScopeKey contextKey, ScopeKey unitKey)
+   {
+      if (contextKey == null)
+         return;
+      if (unitKey == null)
+         return;
+
+      Collection<Scope> unitScopes = unitKey.getScopes();
+      if (unitScopes == null || unitScopes.isEmpty())
+         return;
+
+      for (Scope scope : unitScopes)
+         contextKey.addScope(scope);
+   }
+
    @Override
    public void undeploy(DeploymentUnit unit, BeanMetaData deployment)
    {