[jboss-cvs] JBossAS SVN: r76705 - in projects/jboss-deployers/trunk/deployers-vfs/src/tests/org/jboss/test/deployers/vfs/deployer: bean/support and 1 other directories.

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

Author: adrian at jboss.org
Date: 2008-08-06 06:51:38 -0400 (Wed, 06 Aug 2008)
New Revision: 76705

Modified:
   projects/jboss-deployers/trunk/deployers-vfs/src/tests/org/jboss/test/deployers/vfs/deployer/AbstractDeployerUnitTest.java
   projects/jboss-deployers/trunk/deployers-vfs/src/tests/org/jboss/test/deployers/vfs/deployer/bean/support/TestMetaDataBeanDeployer.java
   projects/jboss-deployers/trunk/deployers-vfs/src/tests/org/jboss/test/deployers/vfs/deployer/bean/test/KernelScopeUnitTestCase.java
Log:
[JBDEPLOY-69] - Use getMutableMetaData()

Modified: projects/jboss-deployers/trunk/deployers-vfs/src/tests/org/jboss/test/deployers/vfs/deployer/AbstractDeployerUnitTest.java
===================================================================
--- projects/jboss-deployers/trunk/deployers-vfs/src/tests/org/jboss/test/deployers/vfs/deployer/AbstractDeployerUnitTest.java	2008-08-06 09:24:22 UTC (rev 76704)
+++ projects/jboss-deployers/trunk/deployers-vfs/src/tests/org/jboss/test/deployers/vfs/deployer/AbstractDeployerUnitTest.java	2008-08-06 10:51:38 UTC (rev 76705)
@@ -21,11 +21,14 @@
 */
 package org.jboss.test.deployers.vfs.deployer;
 
+import org.jboss.deployers.plugins.deployers.DeployersImpl;
+import org.jboss.deployers.spi.deployer.Deployers;
 import org.jboss.deployers.vfs.plugins.structure.file.FileStructure;
 import org.jboss.deployers.vfs.plugins.structure.jar.JARStructure;
 import org.jboss.kernel.Kernel;
 import org.jboss.kernel.plugins.bootstrap.basic.BasicBootstrap;
 import org.jboss.kernel.spi.dependency.KernelController;
+import org.jboss.metadata.spi.repository.MutableMetaDataRepository;
 
 /**
  * AbstractDeployerUnitTestCase.
@@ -41,6 +44,11 @@
       super(name);
    }
 
+   protected KernelController getController()
+   {
+      return controller;
+   }
+
    protected void setUp() throws Exception
    {
       super.setUp();
@@ -63,5 +71,14 @@
       }
    }
 
+   protected Deployers createDeployers()
+   {
+      DeployersImpl deployers = (DeployersImpl) super.createDeployers();
+      KernelController controller = getController();
+      MutableMetaDataRepository repository = controller.getKernel().getMetaDataRepository().getMetaDataRepository();
+      deployers.setRepository(repository);
+      return deployers;
+   }
+
    protected abstract void addDeployers(Kernel kernel);
 }
\ No newline at end of file

Modified: projects/jboss-deployers/trunk/deployers-vfs/src/tests/org/jboss/test/deployers/vfs/deployer/bean/support/TestMetaDataBeanDeployer.java
===================================================================
--- projects/jboss-deployers/trunk/deployers-vfs/src/tests/org/jboss/test/deployers/vfs/deployer/bean/support/TestMetaDataBeanDeployer.java	2008-08-06 09:24:22 UTC (rev 76704)
+++ projects/jboss-deployers/trunk/deployers-vfs/src/tests/org/jboss/test/deployers/vfs/deployer/bean/support/TestMetaDataBeanDeployer.java	2008-08-06 10:51:38 UTC (rev 76705)
@@ -25,11 +25,7 @@
 import org.jboss.deployers.spi.deployer.DeploymentStages;
 import org.jboss.deployers.spi.deployer.helpers.AbstractDeployer;
 import org.jboss.deployers.structure.spi.DeploymentUnit;
-import org.jboss.metadata.plugins.loader.memory.MemoryMetaDataLoader;
 import org.jboss.metadata.spi.repository.MutableMetaDataRepository;
-import org.jboss.metadata.spi.scope.CommonLevels;
-import org.jboss.metadata.spi.scope.Scope;
-import org.jboss.metadata.spi.scope.ScopeKey;
 
 /**
  * TestMetaDataBeanDeployer.
@@ -49,18 +45,6 @@
 
    public void deploy(DeploymentUnit unit) throws DeploymentException
    {
-      Scope applicationScope = unit.getScope().getScope(CommonLevels.APPLICATION);
-      
-      MemoryMetaDataLoader applicationMetaData = new MemoryMetaDataLoader(new ScopeKey(applicationScope));
-      repository.addMetaDataRetrieval(applicationMetaData);
-      
-      applicationMetaData.addMetaData("test", this, TestMetaDataBeanDeployer.class);
+      unit.getMutableMetaData().addMetaData("test", this, TestMetaDataBeanDeployer.class);
    }
-
-   public void undeploy(DeploymentUnit unit)
-   {
-      Scope applicationScope = unit.getScope().getScope(CommonLevels.APPLICATION);
-      
-      repository.removeMetaDataRetrieval(new ScopeKey(applicationScope));
-   }
 }

Modified: projects/jboss-deployers/trunk/deployers-vfs/src/tests/org/jboss/test/deployers/vfs/deployer/bean/test/KernelScopeUnitTestCase.java
===================================================================
--- projects/jboss-deployers/trunk/deployers-vfs/src/tests/org/jboss/test/deployers/vfs/deployer/bean/test/KernelScopeUnitTestCase.java	2008-08-06 09:24:22 UTC (rev 76704)
+++ projects/jboss-deployers/trunk/deployers-vfs/src/tests/org/jboss/test/deployers/vfs/deployer/bean/test/KernelScopeUnitTestCase.java	2008-08-06 10:51:38 UTC (rev 76705)
@@ -24,6 +24,7 @@
 import java.util.Collections;
 
 import junit.framework.Test;
+
 import org.jboss.beans.metadata.plugins.AbstractBeanMetaData;
 import org.jboss.beans.metadata.spi.BeanMetaDataFactory;
 import org.jboss.dependency.spi.ControllerContext;