[jboss-cvs] JBossAS SVN: r96060 - projects/jboss-deployers/trunk/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:45:22 -0500 (Thu, 05 Nov 2009)
New Revision: 96060

Modified:
   projects/jboss-deployers/trunk/deployers-vfs/src/main/java/org/jboss/deployers/vfs/deployer/kernel/BeanMetaDataDeployer.java
Log:
Remove deprecated method.

Modified: projects/jboss-deployers/trunk/deployers-vfs/src/main/java/org/jboss/deployers/vfs/deployer/kernel/BeanMetaDataDeployer.java
===================================================================
--- projects/jboss-deployers/trunk/deployers-vfs/src/main/java/org/jboss/deployers/vfs/deployer/kernel/BeanMetaDataDeployer.java	2009-11-05 16:44:09 UTC (rev 96059)
+++ projects/jboss-deployers/trunk/deployers-vfs/src/main/java/org/jboss/deployers/vfs/deployer/kernel/BeanMetaDataDeployer.java	2009-11-05 16:45:22 UTC (rev 96060)
@@ -211,30 +211,7 @@
       }
       return new AbstractKernelControllerContext(null, deployment, null);
    }
-   
-   /**
-    * Merge scope keys.
-    *
-    * @param contextKey the context key
-    * @param unitKey the unit key
-    * @deprecated no longer in use
-    */
-   @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)
    {