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

jboss-cvs-commits at lists.jboss.org jboss-cvs-commits at lists.jboss.org
Tue Aug 5 03:54:38 EDT 2008


Author: adrian at jboss.org
Date: 2008-08-05 03:54:38 -0400 (Tue, 05 Aug 2008)
New Revision: 76637

Added:
   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
Modified:
   projects/jboss-deployers/trunk/deployers-vfs/src/main/org/jboss/deployers/vfs/deployer/kernel/BeanMetaDataDeployer.java
   projects/jboss-deployers/trunk/deployers-vfs/src/tests/org/jboss/test/deployers/vfs/deployer/bean/BeanDeployerTestSuite.java
Log:
[JBDEPLOY-69] - Initialise the kernel scopes from the deployment scopes

Modified: projects/jboss-deployers/trunk/deployers-vfs/src/main/org/jboss/deployers/vfs/deployer/kernel/BeanMetaDataDeployer.java
===================================================================
--- projects/jboss-deployers/trunk/deployers-vfs/src/main/org/jboss/deployers/vfs/deployer/kernel/BeanMetaDataDeployer.java	2008-08-05 07:42:16 UTC (rev 76636)
+++ projects/jboss-deployers/trunk/deployers-vfs/src/main/org/jboss/deployers/vfs/deployer/kernel/BeanMetaDataDeployer.java	2008-08-05 07:54:38 UTC (rev 76637)
@@ -27,6 +27,7 @@
 import org.jboss.beans.metadata.spi.ClassLoaderMetaData;
 import org.jboss.beans.metadata.spi.ValueMetaData;
 import org.jboss.dependency.spi.Controller;
+import org.jboss.dependency.spi.ScopeInfo;
 import org.jboss.deployers.spi.DeploymentException;
 import org.jboss.deployers.spi.deployer.helpers.AbstractSimpleRealDeployer;
 import org.jboss.deployers.structure.spi.DeploymentUnit;
@@ -108,6 +109,9 @@
          }
       }
       KernelControllerContext context = new AbstractKernelControllerContext(null, deployment, null);
+      ScopeInfo scopeInfo = context.getScopeInfo();
+      scopeInfo.setScope(unit.getScope());
+      scopeInfo.setMutableScope(unit.getMutableScope());
       try
       {
          controller.install(context);

Modified: projects/jboss-deployers/trunk/deployers-vfs/src/tests/org/jboss/test/deployers/vfs/deployer/bean/BeanDeployerTestSuite.java
===================================================================
--- projects/jboss-deployers/trunk/deployers-vfs/src/tests/org/jboss/test/deployers/vfs/deployer/bean/BeanDeployerTestSuite.java	2008-08-05 07:42:16 UTC (rev 76636)
+++ projects/jboss-deployers/trunk/deployers-vfs/src/tests/org/jboss/test/deployers/vfs/deployer/bean/BeanDeployerTestSuite.java	2008-08-05 07:54:38 UTC (rev 76637)
@@ -28,6 +28,7 @@
 import org.jboss.test.deployers.vfs.deployer.bean.test.BeanScanningUnitTestCase;
 import org.jboss.test.deployers.vfs.deployer.bean.test.BeanManagedDeploymentUnitTestCase;
 import org.jboss.test.deployers.vfs.deployer.bean.test.BeanMetaDataFactoryDeployerUnitTestCase;
+import org.jboss.test.deployers.vfs.deployer.bean.test.KernelScopeUnitTestCase;
 
 import junit.framework.Test;
 import junit.framework.TestSuite;
@@ -58,6 +59,7 @@
       suite.addTest(BeanManagedDeploymentUnitTestCase.suite());
       suite.addTest(BeanScanningUnitTestCase.suite());
       suite.addTest(BeanMetaDataFactoryDeployerUnitTestCase.suite());
+      suite.addTest(KernelScopeUnitTestCase.suite());
 
       return suite;
    }

Added: 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	                        (rev 0)
+++ projects/jboss-deployers/trunk/deployers-vfs/src/tests/org/jboss/test/deployers/vfs/deployer/bean/support/TestMetaDataBeanDeployer.java	2008-08-05 07:54:38 UTC (rev 76637)
@@ -0,0 +1,66 @@
+/*
+* 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.test.deployers.vfs.deployer.bean.support;
+
+import org.jboss.deployers.spi.DeploymentException;
+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.
+ * 
+ * @author <a href="adrian at jboss.com">Adrian Brock</a>
+ * @version $Revision: 1.1 $
+ */
+public class TestMetaDataBeanDeployer extends AbstractDeployer
+{
+   MutableMetaDataRepository repository;
+   
+   public TestMetaDataBeanDeployer(MutableMetaDataRepository repository)
+   {
+      this.repository = repository;
+      setStage(DeploymentStages.PRE_REAL);
+   }
+
+   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);
+   }
+
+   public void undeploy(DeploymentUnit unit)
+   {
+      Scope applicationScope = unit.getScope().getScope(CommonLevels.APPLICATION);
+      
+      repository.removeMetaDataRetrieval(new ScopeKey(applicationScope));
+   }
+}

Added: 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	                        (rev 0)
+++ projects/jboss-deployers/trunk/deployers-vfs/src/tests/org/jboss/test/deployers/vfs/deployer/bean/test/KernelScopeUnitTestCase.java	2008-08-05 07:54:38 UTC (rev 76637)
@@ -0,0 +1,108 @@
+/*
+* 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.test.deployers.vfs.deployer.bean.test;
+
+import java.util.Collections;
+
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
+import org.jboss.beans.metadata.plugins.AbstractBeanMetaData;
+import org.jboss.beans.metadata.spi.BeanMetaDataFactory;
+import org.jboss.dependency.spi.ControllerContext;
+import org.jboss.dependency.spi.ScopeInfo;
+import org.jboss.deployers.client.spi.Deployment;
+import org.jboss.deployers.spi.attachments.MutableAttachments;
+import org.jboss.deployers.structure.spi.DeploymentUnit;
+import org.jboss.deployers.structure.spi.main.MainDeployerStructure;
+import org.jboss.deployers.vfs.deployer.kernel.BeanMetaDataDeployer;
+import org.jboss.deployers.vfs.deployer.kernel.KernelDeploymentDeployer;
+import org.jboss.kernel.Kernel;
+import org.jboss.kernel.plugins.deployment.AbstractKernelDeployment;
+import org.jboss.metadata.spi.MetaData;
+import org.jboss.metadata.spi.repository.MutableMetaDataRepository;
+import org.jboss.test.deployers.vfs.deployer.AbstractDeployerUnitTest;
+import org.jboss.test.deployers.vfs.deployer.bean.support.Simple;
+import org.jboss.test.deployers.vfs.deployer.bean.support.TestMetaDataBeanDeployer;
+
+/**
+ * BeanDeployerUnitTestCase.
+ * 
+ * @author <a href="adrian at jboss.com">Adrian Brock</a>
+ * @version $Revision: 1.1 $
+ */
+public class KernelScopeUnitTestCase extends AbstractDeployerUnitTest
+{
+   public static Test suite()
+   {
+      return new TestSuite(KernelScopeUnitTestCase.class);
+   }
+
+   TestMetaDataBeanDeployer testMetaDataDeployer;
+
+   public KernelScopeUnitTestCase(String name) throws Throwable
+   {
+      super(name);
+   }
+
+   protected void addDeployers(Kernel kernel)
+   {
+      MutableMetaDataRepository repository = kernel.getMetaDataRepository().getMetaDataRepository();
+      testMetaDataDeployer = new TestMetaDataBeanDeployer(repository);
+      KernelDeploymentDeployer kernelDeploymentDeployer = new KernelDeploymentDeployer();
+      BeanMetaDataDeployer beanMetaDataDeployer = new BeanMetaDataDeployer(kernel);
+      addDeployer(main, testMetaDataDeployer);
+      addDeployer(main, kernelDeploymentDeployer);
+      addDeployer(main, beanMetaDataDeployer);
+   }
+
+   public void testKernelScope() throws Exception
+   {
+      Deployment context = createSimpleDeployment("KernelDeployerTest");
+
+      AbstractKernelDeployment deployment = new AbstractKernelDeployment();
+      deployment.setName("KernelDeployerTest");
+      
+      BeanMetaDataFactory metaData = new AbstractBeanMetaData("Test", Simple.class.getName());
+      deployment.setBeanFactories(Collections.singletonList(metaData));
+
+      MutableAttachments attachments = (MutableAttachments) context.getPredeterminedManagedObjects();
+      attachments.addAttachment("KernelDeployerTest", deployment);
+      
+      assertDeploy(context);
+      ControllerContext ctx = controller.getInstalledContext("Test");
+
+      ScopeInfo scopeInfo = ctx.getScopeInfo();
+      
+      MainDeployerStructure mds = (MainDeployerStructure) main;
+      DeploymentUnit unit = mds.getDeploymentUnit("KernelDeployerTest", true);
+      DeploymentUnit component = unit.getComponent("Test");
+      assertEquals(component.getScope(), scopeInfo.getScope());
+      assertEquals(component.getMutableScope(), scopeInfo.getMutableScope());
+      
+      MetaData md = ctx.getScopeInfo().getMetaData();
+      assertEquals(testMetaDataDeployer, md.getMetaData("test"));
+      
+      assertUndeploy(context);
+      assertNull(controller.getContext("Test", null));
+   }
+}




More information about the jboss-cvs-commits mailing list