[jboss-cvs] JBossAS SVN: r80485 - in projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src: test/java/org/jboss/test/deployers and 3 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Nov 4 07:42:08 EST 2008
Author: alesj
Date: 2008-11-04 07:42:08 -0500 (Tue, 04 Nov 2008)
New Revision: 80485
Added:
projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/support/
projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/support/TCCLClassLoaderDeployer.java
Removed:
projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/support/TCCLClassLoaderDeployer.java
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/BeanMetaDataFactoryVisitor.java
projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/deployer/bean/test/AbstractAnnotationBeansTest.java
projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/deployer/bean/test/AliasDeployerUnitTestCase.java
projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/deployer/bean/test/BeanDeployerUnitTestCase.java
projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/deployer/bean/test/BeanManagedDeploymentUnitTestCase.java
projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/deployer/bean/test/BeanMetaDataFactoryDeployerUnitTestCase.java
projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/deployer/bean/test/KernelDeployerUnitTestCase.java
projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/deployer/bean/test/KernelScopeUnitTestCase.java
projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/deployer/merge/test/BeanMergeUnitTestCase.java
projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/deployer/merge/test/MockRarUnitTestCase.java
projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/deployer/merge/test/MultiFilesUnitTestCase.java
Log:
Port trunk changes to branch.
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 2008-11-04 12:40:39 UTC (rev 80484)
+++ projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/main/java/org/jboss/deployers/vfs/deployer/kernel/BeanMetaDataDeployer.java 2008-11-04 12:42:08 UTC (rev 80485)
@@ -41,10 +41,10 @@
/**
* BeanMetaDataDeployer.<p>
- *
+ *
* This deployer is responsible for deploying all metadata of
* type {@link org.jboss.beans.metadata.spi.BeanMetaData}.
- *
+ *
* @author <a href="adrian at jboss.com">Adrian Brock</a>
* @version $Revision: 1.1 $
*/
@@ -52,10 +52,10 @@
{
/** The controller */
private Controller controller;
-
+
/**
* Create a new BeanDeployer.
- *
+ *
* @param kernel the kernel
* @throws IllegalArgumentException for a null kernel
* @deprecated use other constructor
@@ -114,11 +114,8 @@
}
KernelControllerContext context = new AbstractKernelControllerContext(null, deployment, null);
ScopeInfo scopeInfo = context.getScopeInfo();
- if (scopeInfo != null)
- {
- mergeScopes(scopeInfo.getScope(), unit.getScope());
- mergeScopes(scopeInfo.getMutableScope(), unit.getMutableScope());
- }
+ scopeInfo.setScope(unit.getScope());
+ scopeInfo.setMutableScope(unit.getMutableScope());
try
{
controller.install(context);
@@ -154,13 +151,13 @@
public void undeploy(DeploymentUnit unit, BeanMetaData deployment)
{
controller.uninstall(deployment.getName());
-
+
// Remove any classloader metadata we added (not necessary if we clone above)
ClassLoaderMetaData classLoader = deployment.getClassLoader();
if (classLoader instanceof DeploymentClassLoaderMetaData)
deployment.setClassLoader(null);
}
-
+
/**
* DeploymentClassLoaderMetaData.
*/
@@ -168,13 +165,13 @@
{
/** The serialVersionUID */
private static final long serialVersionUID = 1L;
-
+
/** The deployment unit */
private DeploymentUnit unit;
/**
* Create a new DeploymentClassLoaderMetaData.
- *
+ *
* @param unit the deployment unit
*/
public DeploymentClassLoaderMetaData(DeploymentUnit unit)
@@ -183,7 +180,7 @@
throw new IllegalArgumentException("Null unit");
this.unit = unit;
}
-
+
@Override
public ValueMetaData getClassLoader()
{
Modified: projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/main/java/org/jboss/deployers/vfs/deployer/kernel/BeanMetaDataFactoryVisitor.java
===================================================================
--- projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/main/java/org/jboss/deployers/vfs/deployer/kernel/BeanMetaDataFactoryVisitor.java 2008-11-04 12:40:39 UTC (rev 80484)
+++ projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/main/java/org/jboss/deployers/vfs/deployer/kernel/BeanMetaDataFactoryVisitor.java 2008-11-04 12:42:08 UTC (rev 80485)
@@ -29,6 +29,7 @@
import org.jboss.deployers.spi.deployer.helpers.DeploymentVisitor;
import org.jboss.deployers.structure.spi.DeploymentUnit;
import org.jboss.logging.Logger;
+import org.jboss.metadata.spi.scope.CommonLevels;
/**
* BeanMetaDataVisitor.<p>
@@ -50,6 +51,28 @@
{
DeploymentUnit component = unit.addComponent(bean.getName());
component.addAttachment(BeanMetaData.class.getName(), bean);
+ String className = bean.getBean();
+ if (className != null)
+ {
+ Object qualifier;
+ if (bean.getClassLoader() == null)
+ {
+ ClassLoader cl = unit.getClassLoader();
+ try
+ {
+ qualifier = cl.loadClass(className);
+ }
+ catch (Exception e)
+ {
+ throw new IllegalArgumentException("Exception loading class for ScopeKey addition.", e);
+ }
+ }
+ else
+ {
+ qualifier = className;
+ }
+ component.getScope().addScope(CommonLevels.CLASS, qualifier);
+ }
}
/**
Copied: projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/support (from rev 80180, projects/jboss-deployers/trunk/deployers-vfs/src/test/java/org/jboss/test/deployers/support)
Deleted: projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/support/TCCLClassLoaderDeployer.java
===================================================================
--- projects/jboss-deployers/trunk/deployers-vfs/src/test/java/org/jboss/test/deployers/support/TCCLClassLoaderDeployer.java 2008-10-29 11:03:08 UTC (rev 80180)
+++ projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/support/TCCLClassLoaderDeployer.java 2008-11-04 12:42:08 UTC (rev 80485)
@@ -1,36 +0,0 @@
-/*
-* 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.support;
-
-import org.jboss.deployers.spi.deployer.helpers.AbstractClassLoaderDeployer;
-import org.jboss.deployers.structure.spi.DeploymentUnit;
-
-/**
- * @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
- */
-public class TCCLClassLoaderDeployer extends AbstractClassLoaderDeployer
-{
- public ClassLoader createClassLoader(DeploymentUnit unit) throws Exception
- {
- return Thread.currentThread().getContextClassLoader();
- }
-}
Copied: projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/support/TCCLClassLoaderDeployer.java (from rev 80180, projects/jboss-deployers/trunk/deployers-vfs/src/test/java/org/jboss/test/deployers/support/TCCLClassLoaderDeployer.java)
===================================================================
--- projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/support/TCCLClassLoaderDeployer.java (rev 0)
+++ projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/support/TCCLClassLoaderDeployer.java 2008-11-04 12:42:08 UTC (rev 80485)
@@ -0,0 +1,36 @@
+/*
+* 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.support;
+
+import org.jboss.deployers.spi.deployer.helpers.AbstractClassLoaderDeployer;
+import org.jboss.deployers.structure.spi.DeploymentUnit;
+
+/**
+ * @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
+ */
+public class TCCLClassLoaderDeployer extends AbstractClassLoaderDeployer
+{
+ public ClassLoader createClassLoader(DeploymentUnit unit) throws Exception
+ {
+ return Thread.currentThread().getContextClassLoader();
+ }
+}
Modified: projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/deployer/bean/test/AbstractAnnotationBeansTest.java
===================================================================
--- projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/deployer/bean/test/AbstractAnnotationBeansTest.java 2008-11-04 12:40:39 UTC (rev 80484)
+++ projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/deployer/bean/test/AbstractAnnotationBeansTest.java 2008-11-04 12:42:08 UTC (rev 80485)
@@ -33,6 +33,7 @@
import org.jboss.kernel.plugins.deployment.AbstractKernelDeployment;
import org.jboss.test.deployers.vfs.deployer.AbstractDeployerUnitTest;
import org.jboss.test.deployers.vfs.deployer.bean.support.SimpleAnnotated;
+import org.jboss.test.deployers.support.TCCLClassLoaderDeployer;
/**
* AbstractAnnotationBeansTest.
@@ -48,8 +49,10 @@
protected void addDeployers(Kernel kernel)
{
+ TCCLClassLoaderDeployer tcclDeployer = new TCCLClassLoaderDeployer();
KernelDeploymentDeployer kernelDeploymentDeployer = new KernelDeploymentDeployer();
BeanMetaDataDeployer beanMetaDataDeployer = new BeanMetaDataDeployer(kernel.getController());
+ addDeployer(main, tcclDeployer);
addDeployer(main, kernelDeploymentDeployer);
addDeployer(main, beanMetaDataDeployer);
}
Modified: projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/deployer/bean/test/AliasDeployerUnitTestCase.java
===================================================================
--- projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/deployer/bean/test/AliasDeployerUnitTestCase.java 2008-11-04 12:40:39 UTC (rev 80484)
+++ projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/deployer/bean/test/AliasDeployerUnitTestCase.java 2008-11-04 12:42:08 UTC (rev 80485)
@@ -32,6 +32,7 @@
import org.jboss.deployers.vfs.spi.client.VFSDeployment;
import org.jboss.kernel.Kernel;
import org.jboss.test.deployers.vfs.deployer.AbstractDeployerUnitTest;
+import org.jboss.test.deployers.support.TCCLClassLoaderDeployer;
/**
* AliasDeployerUnitTestCase.
@@ -57,6 +58,7 @@
AliasDeploymentDeployer aliasDeploymentDeployer = new AliasDeploymentDeployer();
BeanMetaDataDeployer beanMetaDataDeployer = new BeanMetaDataDeployer(kernel);
DeploymentAliasMetaDataDeployer aliasMetaDataDeployer = new DeploymentAliasMetaDataDeployer(kernel.getController());
+ addDeployer(main, new TCCLClassLoaderDeployer());
addDeployer(main, beanDeployer);
addDeployer(main, kernelDeploymentDeployer);
addDeployer(main, aliasDeploymentDeployer);
Modified: projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/deployer/bean/test/BeanDeployerUnitTestCase.java
===================================================================
--- projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/deployer/bean/test/BeanDeployerUnitTestCase.java 2008-11-04 12:40:39 UTC (rev 80484)
+++ projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/deployer/bean/test/BeanDeployerUnitTestCase.java 2008-11-04 12:42:08 UTC (rev 80485)
@@ -29,6 +29,7 @@
import org.jboss.deployers.vfs.spi.client.VFSDeployment;
import org.jboss.kernel.Kernel;
import org.jboss.test.deployers.vfs.deployer.AbstractDeployerUnitTest;
+import org.jboss.test.deployers.support.TCCLClassLoaderDeployer;
/**
* BeanDeployerUnitTestCase.
@@ -54,6 +55,7 @@
BeanDeployer beanDeployer = new BeanDeployer();
KernelDeploymentDeployer kernelDeploymentDeployer = new KernelDeploymentDeployer();
BeanMetaDataDeployer beanMetaDataDeployer = new BeanMetaDataDeployer(kernel);
+ addDeployer(main, new TCCLClassLoaderDeployer());
addDeployer(main, beanDeployer);
addDeployer(main, kernelDeploymentDeployer);
addDeployer(main, beanMetaDataDeployer);
Modified: projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/deployer/bean/test/BeanManagedDeploymentUnitTestCase.java
===================================================================
--- projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/deployer/bean/test/BeanManagedDeploymentUnitTestCase.java 2008-11-04 12:40:39 UTC (rev 80484)
+++ projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/deployer/bean/test/BeanManagedDeploymentUnitTestCase.java 2008-11-04 12:42:08 UTC (rev 80485)
@@ -35,6 +35,7 @@
import org.jboss.metatype.api.values.CollectionValue;
import org.jboss.metatype.api.values.GenericValue;
import org.jboss.test.deployers.vfs.deployer.AbstractDeployerUnitTest;
+import org.jboss.test.deployers.support.TCCLClassLoaderDeployer;
/**
* Tests of bean deployment ManagedObject/ManagedDeployment creation.
@@ -105,6 +106,7 @@
BeanDeployer beanDeployer = new BeanDeployer();
KernelDeploymentDeployer kernelDeploymentDeployer = new KernelDeploymentDeployer();
BeanMetaDataDeployer beanMetaDataDeployer = new BeanMetaDataDeployer(kernel);
+ addDeployer(main, new TCCLClassLoaderDeployer());
addDeployer(main, beanDeployer);
addDeployer(main, kernelDeploymentDeployer);
addDeployer(main, beanMetaDataDeployer);
Modified: projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/deployer/bean/test/BeanMetaDataFactoryDeployerUnitTestCase.java
===================================================================
--- projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/deployer/bean/test/BeanMetaDataFactoryDeployerUnitTestCase.java 2008-11-04 12:40:39 UTC (rev 80484)
+++ projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/deployer/bean/test/BeanMetaDataFactoryDeployerUnitTestCase.java 2008-11-04 12:42:08 UTC (rev 80485)
@@ -28,6 +28,7 @@
import org.jboss.kernel.Kernel;
import org.jboss.test.deployers.vfs.deployer.bean.support.CustomBMDF;
import org.jboss.test.deployers.vfs.deployer.bean.support.TestComponentCheckerDeployer;
+import org.jboss.test.deployers.support.TCCLClassLoaderDeployer;
/**
* BeanMetaDataFactoryDeployerUnitTestCase.
@@ -52,6 +53,7 @@
BeanMetaDataFactoryDeployer<CustomBMDF> bmdfd = new BeanMetaDataFactoryDeployer<CustomBMDF>(CustomBMDF.class);
BeanMetaDataDeployer beanMetaDataDeployer = new BeanMetaDataDeployer(kernel);
+ addDeployer(main, new TCCLClassLoaderDeployer());
addDeployer(main, tccd);
addDeployer(main, bmdfd);
addDeployer(main, beanMetaDataDeployer);
Modified: projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/deployer/bean/test/KernelDeployerUnitTestCase.java
===================================================================
--- projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/deployer/bean/test/KernelDeployerUnitTestCase.java 2008-11-04 12:40:39 UTC (rev 80484)
+++ projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/deployer/bean/test/KernelDeployerUnitTestCase.java 2008-11-04 12:42:08 UTC (rev 80485)
@@ -36,6 +36,7 @@
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.TestBeanDeployer;
+import org.jboss.test.deployers.support.TCCLClassLoaderDeployer;
/**
* BeanDeployerUnitTestCase.
@@ -60,6 +61,7 @@
TestBeanDeployer testDeployer = new TestBeanDeployer();
KernelDeploymentDeployer kernelDeploymentDeployer = new KernelDeploymentDeployer();
BeanMetaDataDeployer beanMetaDataDeployer = new BeanMetaDataDeployer(kernel);
+ addDeployer(main, new TCCLClassLoaderDeployer());
addDeployer(main, testDeployer);
addDeployer(main, kernelDeploymentDeployer);
addDeployer(main, beanMetaDataDeployer);
Modified: projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/deployer/bean/test/KernelScopeUnitTestCase.java
===================================================================
--- projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/deployer/bean/test/KernelScopeUnitTestCase.java 2008-11-04 12:40:39 UTC (rev 80484)
+++ projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/deployer/bean/test/KernelScopeUnitTestCase.java 2008-11-04 12:42:08 UTC (rev 80485)
@@ -46,6 +46,7 @@
import org.jboss.test.deployers.vfs.deployer.bean.support.Simple;
import org.jboss.test.deployers.vfs.deployer.bean.support.TestInstanceMetaDataBeanDeployer;
import org.jboss.test.deployers.vfs.deployer.bean.support.TestMetaDataBeanDeployer;
+import org.jboss.test.deployers.support.TCCLClassLoaderDeployer;
/**
* BeanDeployerUnitTestCase.
@@ -76,6 +77,7 @@
testInstanceMetaDataDeployer = new TestInstanceMetaDataBeanDeployer();
KernelDeploymentDeployer kernelDeploymentDeployer = new KernelDeploymentDeployer();
BeanMetaDataDeployer beanMetaDataDeployer = new BeanMetaDataDeployer(kernel);
+ addDeployer(main, new TCCLClassLoaderDeployer());
addDeployer(main, testMetaDataDeployer);
addDeployer(main, testInstanceMetaDataDeployer);
addDeployer(main, kernelDeploymentDeployer);
Modified: projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/deployer/merge/test/BeanMergeUnitTestCase.java
===================================================================
--- projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/deployer/merge/test/BeanMergeUnitTestCase.java 2008-11-04 12:40:39 UTC (rev 80484)
+++ projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/deployer/merge/test/BeanMergeUnitTestCase.java 2008-11-04 12:42:08 UTC (rev 80485)
@@ -29,6 +29,7 @@
import org.jboss.kernel.Kernel;
import org.jboss.test.deployers.vfs.deployer.AbstractDeployerUnitTest;
import org.jboss.test.deployers.vfs.deployer.merge.support.TestBeanMergeDeployer;
+import org.jboss.test.deployers.support.TCCLClassLoaderDeployer;
/**
* BeanMergeUnitTestCase.
@@ -52,6 +53,7 @@
TestBeanMergeDeployer beanDeployer = new TestBeanMergeDeployer();
KernelDeploymentDeployer kernelDeploymentDeployer = new KernelDeploymentDeployer();
BeanMetaDataDeployer beanMetaDataDeployer = new BeanMetaDataDeployer(kernel);
+ addDeployer(main, new TCCLClassLoaderDeployer());
addDeployer(main, beanDeployer);
addDeployer(main, kernelDeploymentDeployer);
addDeployer(main, beanMetaDataDeployer);
Modified: projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/deployer/merge/test/MockRarUnitTestCase.java
===================================================================
--- projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/deployer/merge/test/MockRarUnitTestCase.java 2008-11-04 12:40:39 UTC (rev 80484)
+++ projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/deployer/merge/test/MockRarUnitTestCase.java 2008-11-04 12:42:08 UTC (rev 80485)
@@ -25,6 +25,7 @@
import org.jboss.test.deployers.vfs.deployer.AbstractDeployerUnitTest;
import org.jboss.test.deployers.vfs.deployer.merge.support.MockRarDeployer;
import org.jboss.test.deployers.vfs.deployer.merge.support.RarDeploymentDeployer;
+import org.jboss.test.deployers.support.TCCLClassLoaderDeployer;
import org.jboss.kernel.Kernel;
import org.jboss.deployers.vfs.deployer.kernel.KernelDeploymentDeployer;
import org.jboss.deployers.vfs.deployer.kernel.BeanMetaDataDeployer;
@@ -61,6 +62,7 @@
throw new RuntimeException(t);
}
addDeployer(main, deployer);
+ addDeployer(main, new TCCLClassLoaderDeployer());
addDeployer(main, new RarDeploymentDeployer());
addDeployer(main, new KernelDeploymentDeployer());
addDeployer(main, new BeanMetaDataDeployer(kernel));
Modified: projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/deployer/merge/test/MultiFilesUnitTestCase.java
===================================================================
--- projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/deployer/merge/test/MultiFilesUnitTestCase.java 2008-11-04 12:40:39 UTC (rev 80484)
+++ projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/deployer/merge/test/MultiFilesUnitTestCase.java 2008-11-04 12:42:08 UTC (rev 80485)
@@ -29,6 +29,7 @@
import org.jboss.test.deployers.vfs.deployer.AbstractDeployerUnitTest;
import org.jboss.test.deployers.vfs.deployer.merge.support.MultiRarDeployer;
import org.jboss.test.deployers.vfs.deployer.merge.support.RarDeploymentDeployer;
+import org.jboss.test.deployers.support.TCCLClassLoaderDeployer;
import org.jboss.dependency.spi.ControllerContext;
import org.jboss.beans.metadata.plugins.AbstractBeanMetaData;
@@ -60,6 +61,7 @@
throw new RuntimeException(t);
}
addDeployer(main, deployer);
+ addDeployer(main, new TCCLClassLoaderDeployer());
addDeployer(main, new RarDeploymentDeployer());
addDeployer(main, new KernelDeploymentDeployer());
addDeployer(main, new BeanMetaDataDeployer(kernel));
More information about the jboss-cvs-commits
mailing list