[jboss-cvs] JBossAS SVN: r102122 - in projects/weld-int/branches: kabir_mc_weld and 7 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Mar 9 06:25:19 EST 2010
Author: kabir.khan at jboss.com
Date: 2010-03-09 06:25:18 -0500 (Tue, 09 Mar 2010)
New Revision: 102122
Added:
projects/weld-int/branches/kabir_mc_weld/
Removed:
projects/weld-int/branches/kabir_mc_weld/deployer-mc-int/src/test/java/org/jboss/test/deployers/support/mcandweld/bidirectional/end/
projects/weld-int/branches/kabir_mc_weld/deployer-mc-int/src/test/java/org/jboss/test/deployers/support/mcandweld/bidirectional/middle/
Modified:
projects/weld-int/branches/kabir_mc_weld/deployer-mc-int/pom.xml
projects/weld-int/branches/kabir_mc_weld/deployer-mc-int/src/test/java/org/jboss/test/deployers/support/mcandweld/mc/fromweld/McBeanWithInjectedWeldBean.java
projects/weld-int/branches/kabir_mc_weld/deployer-mc-int/src/test/java/org/jboss/test/deployers/support/mcandweld/mc/simple/SimpleBean.java
projects/weld-int/branches/kabir_mc_weld/deployer-mc-int/src/test/java/org/jboss/test/deployers/test/AbstractWeldTest.java
projects/weld-int/branches/kabir_mc_weld/deployer-mc-int/src/test/java/org/jboss/test/deployers/test/McIntegrationTestCase.java
projects/weld-int/branches/kabir_mc_weld/deployer-mc-int/src/test/resources/weld/mcandweld/bidirectional/mc/end/META-INF/end-beans.xml
projects/weld-int/branches/kabir_mc_weld/deployer-mc-int/src/test/resources/weld/mcandweld/bidirectional/mc/middle/META-INF/middle-beans.xml
projects/weld-int/branches/kabir_mc_weld/pom.xml
Log:
Branch off trunk for mc/weld integration
Copied: projects/weld-int/branches/kabir_mc_weld (from rev 102077, projects/weld-int/trunk)
Modified: projects/weld-int/branches/kabir_mc_weld/deployer-mc-int/pom.xml
===================================================================
--- projects/weld-int/trunk/deployer-mc-int/pom.xml 2010-03-08 19:08:12 UTC (rev 102077)
+++ projects/weld-int/branches/kabir_mc_weld/deployer-mc-int/pom.xml 2010-03-09 11:25:18 UTC (rev 102122)
@@ -33,7 +33,7 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
- <skip>true</skip>
+ <!-- skip>true</skip -->
<!--testFailureIgnore>true</testFailureIgnore-->
</configuration>
</plugin>
@@ -46,6 +46,12 @@
<groupId>org.jboss.weld.integration</groupId>
<artifactId>weld-jboss-int-jboss-ejb</artifactId>
<optional>true</optional>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-mdr</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
@@ -253,6 +259,12 @@
<dependency>
<groupId>org.jboss.ejb3</groupId>
<artifactId>jboss-ejb3-core</artifactId>
+ <!-- exclusions>
+ <exclusion>
+ <groupId>org.jboss.aop</groupId>
+ <artifactId>jboss-aop</artifactId>
+ </exclusion>
+ </exclusions -->
</dependency>
<dependency>
Modified: projects/weld-int/branches/kabir_mc_weld/deployer-mc-int/src/test/java/org/jboss/test/deployers/support/mcandweld/mc/fromweld/McBeanWithInjectedWeldBean.java
===================================================================
--- projects/weld-int/trunk/deployer-mc-int/src/test/java/org/jboss/test/deployers/support/mcandweld/mc/fromweld/McBeanWithInjectedWeldBean.java 2010-03-08 19:08:12 UTC (rev 102077)
+++ projects/weld-int/branches/kabir_mc_weld/deployer-mc-int/src/test/java/org/jboss/test/deployers/support/mcandweld/mc/fromweld/McBeanWithInjectedWeldBean.java 2010-03-09 11:25:18 UTC (rev 102122)
@@ -24,6 +24,7 @@
import javax.enterprise.inject.Default;
import javax.inject.Inject;
+import org.jboss.kernel.weld.metadata.api.annotations.Weld;
import org.jboss.test.deployers.support.mcandweld.weld.simple.SimpleWebBean;
/**
@@ -33,7 +34,7 @@
*/
public class McBeanWithInjectedWeldBean
{
- @Inject @Default
+ @Weld @Inject @Default
SimpleWebBean simpleWebBean;
public SimpleWebBean getSimpleWebBean()
Modified: projects/weld-int/branches/kabir_mc_weld/deployer-mc-int/src/test/java/org/jboss/test/deployers/support/mcandweld/mc/simple/SimpleBean.java
===================================================================
--- projects/weld-int/trunk/deployer-mc-int/src/test/java/org/jboss/test/deployers/support/mcandweld/mc/simple/SimpleBean.java 2010-03-08 19:08:12 UTC (rev 102077)
+++ projects/weld-int/branches/kabir_mc_weld/deployer-mc-int/src/test/java/org/jboss/test/deployers/support/mcandweld/mc/simple/SimpleBean.java 2010-03-09 11:25:18 UTC (rev 102122)
@@ -34,5 +34,4 @@
@WeldEnabled
public class SimpleBean
{
-
}
Modified: projects/weld-int/branches/kabir_mc_weld/deployer-mc-int/src/test/java/org/jboss/test/deployers/test/AbstractWeldTest.java
===================================================================
--- projects/weld-int/trunk/deployer-mc-int/src/test/java/org/jboss/test/deployers/test/AbstractWeldTest.java 2010-03-08 19:08:12 UTC (rev 102077)
+++ projects/weld-int/branches/kabir_mc_weld/deployer-mc-int/src/test/java/org/jboss/test/deployers/test/AbstractWeldTest.java 2010-03-09 11:25:18 UTC (rev 102122)
@@ -74,87 +74,6 @@
return (Boolean)m.invoke(target);
}
-// protected AssembledDirectory createBasicEar() throws Exception
-// {
-// return createBasicEar(SomeUtil.class);
-// }
-//
-// protected AssembledDirectory createTopLevelWithUtil() throws Exception
-// {
-// return createTopLevelWithUtil("/weld/simple");
-// }
-//
-// protected AssembledDirectory createTopLevelWithUtil(Class<?> utilClass) throws Exception
-// {
-// return createTopLevelWithUtil("/weld/simple", utilClass);
-// }
-//
-// protected AssembledDirectory createTopLevelWithUtil(String path) throws Exception
-// {
-// return createTopLevelWithUtil(path, SomeUtil.class);
-// }
-//
-// protected AssembledDirectory createTopLevelWithUtil(String path, Class<?> utilClass) throws Exception
-// {
-// AssembledDirectory topLevel = createAssembledDirectory("top-level.ear", "top-level.ear");
-// addPath(topLevel, path, "META-INF");
-//
-// AssembledDirectory earLib = topLevel.mkdir("lib");
-//
-// AssembledDirectory util = earLib.mkdir("util.jar");
-// addPackage(util, utilClass);
-//
-// AssembledDirectory ext = earLib.mkdir("ext.jar");
-// addPackage(ext, ExternalWebBean.class);
-// addPath(ext, "/weld/simple/ext", "META-INF");
-//
-// return topLevel;
-// }
-//
-// protected AssembledDirectory createWarInEar() throws Exception
-// {
-// AssembledDirectory ear = createAssembledDirectory("war-in-ear.ear", "war-in-ear.ear");
-// addPath(ear, "/weld/warinear", "META-INF");
-//
-// AssembledDirectory war = ear.mkdir("simple.war");
-// AssembledDirectory webinf = war.mkdir("WEB-INF");
-// AssembledDirectory classes = webinf.mkdir("classes");
-// addPackage(classes, ServletWebBean.class);
-// addPath(war, "/weld/simple/web", "WEB-INF");
-//
-// return ear;
-// }
-//
-// protected AssembledDirectory createJarInEar() throws Exception
-// {
-// AssembledDirectory ear = createAssembledDirectory("jar-in-ear.ear", "jar-in-ear.ear");
-// addPath(ear, "/weld/jarinear", "META-INF");
-//
-// AssembledDirectory jar = ear.mkdir("simple.jar");
-// addPackage(jar, PlainJavaBean.class);
-// addPath(jar, "/weld/simple/jar", "META-INF");
-//
-// return ear;
-// }
-//
-// protected AssembledDirectory createWar(String warName, Class<?> reference) throws Exception
-// {
-// AssembledDirectory war = createAssembledDirectory(warName, warName);
-// AssembledDirectory webinf = war.mkdir("WEB-INF");
-// AssembledDirectory classes = webinf.mkdir("classes");
-// addPackage(classes, reference);
-// addPath(war, "/weld/simple/web", "WEB-INF");
-// return war;
-// }
-//
-// protected AssembledDirectory createEjbJar(String jarName, Class<?> reference) throws Exception
-// {
-// AssembledDirectory jar = createAssembledDirectory(jarName, jarName);
-// addPackage(jar, reference);
-// addPath(jar, "/weld/simple/ejb", "META-INF");
-// return jar;
-// }
-
protected void createMcLib(AssembledDirectory dir, String metaInfParent, Class<?> clazz) throws Exception
{
AssembledDirectory mcDir = dir.mkdir("mc.jar");
Modified: projects/weld-int/branches/kabir_mc_weld/deployer-mc-int/src/test/java/org/jboss/test/deployers/test/McIntegrationTestCase.java
===================================================================
--- projects/weld-int/trunk/deployer-mc-int/src/test/java/org/jboss/test/deployers/test/McIntegrationTestCase.java 2010-03-08 19:08:12 UTC (rev 102077)
+++ projects/weld-int/branches/kabir_mc_weld/deployer-mc-int/src/test/java/org/jboss/test/deployers/test/McIntegrationTestCase.java 2010-03-09 11:25:18 UTC (rev 102122)
@@ -35,9 +35,6 @@
import org.jboss.deployers.structure.spi.DeploymentUnit;
import org.jboss.kernel.spi.dependency.KernelControllerContext;
import org.jboss.kernel.weld.plugins.dependency.WeldKernelControllerContext;
-import org.jboss.test.deployers.support.mcandweld.bidirectional.end.First;
-import org.jboss.test.deployers.support.mcandweld.bidirectional.end.Last;
-import org.jboss.test.deployers.support.mcandweld.bidirectional.middle.Middle;
import org.jboss.test.deployers.support.mcandweld.mc.fromweld.McBeanWithInjectedWeldBean;
import org.jboss.test.deployers.support.mcandweld.mc.simple.SimpleBean;
import org.jboss.test.deployers.support.mcandweld.weld.frommc.WeldBeanWithInjectedMcBean;
@@ -64,173 +61,173 @@
return suite(McIntegrationTestCase.class);
}
- public void testMcDeployment() throws Exception
- {
- AssembledDirectory top = createAssembledDirectory("top-level.ear", "top-level.ear");
- addPath(top, "/weld/mcandweld/ear/mconly", "META-INF");
- createMcLib(top, "/weld/mcandweld/mc/simple", SimpleBean.class);
-
- Deployment deployment = createVFSDeployment(top);
- DeployerClient mainDeployer = getDeployerClient();
- mainDeployer.addDeployment(deployment);
- mainDeployer.process();
- try
- {
- Object o = getBean("SimpleBean");
- assertNotNull(o);
- }
- finally
- {
- mainDeployer.removeDeployment(deployment);
- mainDeployer.process();
- }
- }
+// public void testMcDeployment() throws Exception
+// {
+// AssembledDirectory top = createAssembledDirectory("top-level.ear", "top-level.ear");
+// addPath(top, "/weld/mcandweld/ear/mconly", "META-INF");
+// createMcLib(top, "/weld/mcandweld/mc/simple", SimpleBean.class);
+//
+// Deployment deployment = createVFSDeployment(top);
+// DeployerClient mainDeployer = getDeployerClient();
+// mainDeployer.addDeployment(deployment);
+// mainDeployer.process();
+// try
+// {
+// Object o = getBean("SimpleBean");
+// assertNotNull(o);
+// }
+// finally
+// {
+// mainDeployer.removeDeployment(deployment);
+// mainDeployer.process();
+// }
+// }
+//
+// public void testWeldDeployment() throws Exception
+// {
+// AssembledDirectory top = createAssembledDirectory("top-level.ear", "top-level.ear");
+// addPath(top, "/weld/mcandweld/ear/weldonly", "META-INF");
+// createWeldLib(top, "/weld/mcandweld/weld", SimpleWebBean.class);
+//
+// testBootstrap(top, new RunSpecificTest()
+// {
+// public void runTest(BeanManager manager, DeploymentUnit unit) throws Exception
+// {
+// assertWebBean(manager, unit, SimpleWebBean.class.getName());
+// }
+// });
+// }
+//
+// public void testWeldAndMcDeployment() throws Exception
+// {
+// AssembledDirectory top = createAssembledDirectory("top-level.ear", "top-level.ear");
+// addPath(top, "/weld/mcandweld/ear/weldandmc", "META-INF");
+// createMcLib(top, "/weld/mcandweld/mc/simple", SimpleBean.class);
+// createWeldLib(top, "/weld/mcandweld/weld", SimpleWebBean.class);
+//
+// testBootstrap(top, new RunSpecificTest()
+// {
+// public void runTest(BeanManager manager, DeploymentUnit unit) throws Exception
+// {
+// assertInstanceOf(getControllerContext("SimpleBean"), WeldKernelControllerContext.class);
+// Object o = getBean("SimpleBean");
+// assertNotNull(o);
+// assertWebBean(manager, unit, SimpleWebBean.class.getName());
+// assertNoWebBean(manager, unit, SimpleBean.class.getName());
+// }
+// });
+// assertNoControllerContext("SimpleBean", null);
+// }
+//
+// public void testMcInjectedByWeld() throws Exception
+// {
+// AssembledDirectory top = createAssembledDirectory("top-level.ear", "top-level.ear");
+// addPath(top, "/weld/mcandweld/ear/weldandmc", "META-INF");
+// createMcLib(top, "/weld/mcandweld/mc/fromweld", McBeanWithInjectedWeldBean.class);
+// createWeldLib(top, "/weld/mcandweld/weld", SimpleWebBean.class);
+//
+// testBootstrap(top, new RunSpecificTest()
+// {
+// public void runTest(BeanManager manager, DeploymentUnit unit) throws Exception
+// {
+// Object mc = getBean("McBean");
+// assertNotNull(mc);
+// Object weldBean = assertWebBean(manager, unit, SimpleWebBean.class.getName());
+// assertNoWebBean(manager, unit, McBeanWithInjectedWeldBean.class.getName());
+//
+// Method m = mc.getClass().getMethod("getSimpleWebBean");
+// Object injectedWeldBean = m.invoke(mc);
+// assertNotNull(injectedWeldBean);
+// assertSame(weldBean.getClass(), injectedWeldBean.getClass());
+// }
+// });
+// }
+//
+// public void testWeldInjectedByMc() throws Exception
+// {
+// AssembledDirectory top = createAssembledDirectory("top-level.ear", "top-level.ear");
+// addPath(top, "/weld/mcandweld/ear/weldandmc", "META-INF");
+// createMcLib(top, "/weld/mcandweld/mc/simple", SimpleBean.class);
+// createWeldLib(top, "/weld/mcandweld/weld", WeldBeanWithInjectedMcBean.class);
+//
+// testBootstrap(top, new RunSpecificTest()
+// {
+// public void runTest(BeanManager manager, DeploymentUnit unit) throws Exception
+// {
+// Object mc = getBean("SimpleBean");
+// assertNotNull(mc);
+// Object weldBean = assertWebBean(manager, unit, WeldBeanWithInjectedMcBean.class.getName());
+// assertSame(mc, assertWebBean(manager, unit, mc));
+//
+// Method m = weldBean.getClass().getMethod("getSimpleBean");
+// Object injectedBean = m.invoke(weldBean);
+// assertNotNull(injectedBean);
+// assertSame(mc, injectedBean);
+// }
+// });
+// }
+//
+// public void testMcInjectedIntoWeldInjectedIntoMc() throws Exception
+// {
+// AssembledDirectory top = createAssembledDirectory("top-level.ear", "top-level.ear");
+// addPath(top, "/weld/mcandweld/bidirectional", "META-INF");
+// createMcLib(top, "/weld/mcandweld/bidirectional/mc/end", org.jboss.test.deployers.support.mcandweld.bidirectional.mcend.end.First.class);
+// createWeldLib(top, "/weld/mcandweld/weld", org.jboss.test.deployers.support.mcandweld.bidirectional.mcend.middle.Middle.class);
+//
+// testBootstrap(top, new RunSpecificTest()
+// {
+// public void runTest(BeanManager manager, DeploymentUnit unit) throws Exception
+// {
+// Object first = getBean("First");
+// assertNotNull(first);
+// Object middle = assertWebBean(manager, unit, org.jboss.test.deployers.support.mcandweld.bidirectional.mcend.middle.Middle.class.getName());
+// Object last = getBean("Last");
+//
+// Method getLast = middle.getClass().getMethod("getLast");
+// Object injectedLast = getLast.invoke(middle);
+// assertNotNull(injectedLast);
+// assertSame(last, injectedLast);
+// assertSame(last, assertWebBean(manager, unit, last));
+//
+// Method getMiddle = first.getClass().getMethod("getMiddle");
+// Object injectedMiddle = getMiddle.invoke(first);
+// assertNotNull(injectedMiddle);
+//
+// assertSame(first, assertWebBean(manager, unit, first));
+// }
+// });
+// }
+//
+// public void testWeldInjectedIntoMcInjectedIntoWeld() throws Exception
+// {
+// AssembledDirectory top = createAssembledDirectory("top-level.ear", "top-level.ear");
+// addPath(top, "/weld/mcandweld/bidirectional", "META-INF");
+// createMcLib(top, "/weld/mcandweld/bidirectional/mc/middle", org.jboss.test.deployers.support.mcandweld.bidirectional.mcmiddle.middle.Middle.class);
+// createWeldLib(top, "/weld/mcandweld/weld", org.jboss.test.deployers.support.mcandweld.bidirectional.mcmiddle.end.First.class);
+//
+// testBootstrap(top, new RunSpecificTest()
+// {
+// public void runTest(BeanManager manager, DeploymentUnit unit) throws Exception
+// {
+// Object first = assertWebBean(manager, unit, org.jboss.test.deployers.support.mcandweld.bidirectional.mcmiddle.end.First.class.getName());
+// assertNotNull(first);
+// Object middle = getBean("Middle");
+// assertNotNull(middle);
+// assertWebBean(manager, unit, org.jboss.test.deployers.support.mcandweld.bidirectional.mcmiddle.end.Last.class.getName());
+//
+// Method getLast = middle.getClass().getMethod("getLast");
+// Object injectedLast = getLast.invoke(middle);
+// assertNotNull(injectedLast);
+//
+// Method getMiddle = first.getClass().getMethod("getMiddle");
+// Object injectedMiddle = getMiddle.invoke(first);
+// assertNotNull(injectedMiddle);
+// assertSame(middle, injectedMiddle);
+// assertSame(middle, assertWebBean(manager, unit, middle));
+// }
+// });
+// }
- public void testWeldDeployment() throws Exception
- {
- AssembledDirectory top = createAssembledDirectory("top-level.ear", "top-level.ear");
- addPath(top, "/weld/mcandweld/ear/weldonly", "META-INF");
- createWeldLib(top, "/weld/mcandweld/weld", SimpleWebBean.class);
-
- testBootstrap(top, new RunSpecificTest()
- {
- public void runTest(BeanManager manager, DeploymentUnit unit) throws Exception
- {
- assertWebBean(manager, unit, SimpleWebBean.class.getName());
- }
- });
- }
-
- public void testWeldAndMcDeployment() throws Exception
- {
- AssembledDirectory top = createAssembledDirectory("top-level.ear", "top-level.ear");
- addPath(top, "/weld/mcandweld/ear/weldandmc", "META-INF");
- createMcLib(top, "/weld/mcandweld/mc/simple", SimpleBean.class);
- createWeldLib(top, "/weld/mcandweld/weld", SimpleWebBean.class);
-
- testBootstrap(top, new RunSpecificTest()
- {
- public void runTest(BeanManager manager, DeploymentUnit unit) throws Exception
- {
- assertInstanceOf(getControllerContext("SimpleBean"), WeldKernelControllerContext.class);
- Object o = getBean("SimpleBean");
- assertNotNull(o);
- assertWebBean(manager, unit, SimpleWebBean.class.getName());
- assertNoWebBean(manager, unit, SimpleBean.class.getName());
- }
- });
- assertNoControllerContext("SimpleBean", null);
- }
-
- public void testMcInjectedByWeld() throws Exception
- {
- AssembledDirectory top = createAssembledDirectory("top-level.ear", "top-level.ear");
- addPath(top, "/weld/mcandweld/ear/weldandmc", "META-INF");
- createMcLib(top, "/weld/mcandweld/mc/fromweld", McBeanWithInjectedWeldBean.class);
- createWeldLib(top, "/weld/mcandweld/weld", SimpleWebBean.class);
-
- testBootstrap(top, new RunSpecificTest()
- {
- public void runTest(BeanManager manager, DeploymentUnit unit) throws Exception
- {
- Object mc = getBean("McBean");
- assertNotNull(mc);
- Object weldBean = assertWebBean(manager, unit, SimpleWebBean.class.getName());
- assertNoWebBean(manager, unit, McBeanWithInjectedWeldBean.class.getName());
-
- Method m = mc.getClass().getMethod("getSimpleWebBean");
- Object injectedWeldBean = m.invoke(mc);
- assertNotNull(injectedWeldBean);
- assertSame(weldBean.getClass(), injectedWeldBean.getClass());
- }
- });
- }
-
- public void testWeldInjectedByMc() throws Exception
- {
- AssembledDirectory top = createAssembledDirectory("top-level.ear", "top-level.ear");
- addPath(top, "/weld/mcandweld/ear/weldandmc", "META-INF");
- createMcLib(top, "/weld/mcandweld/mc/simple", SimpleBean.class);
- createWeldLib(top, "/weld/mcandweld/weld", WeldBeanWithInjectedMcBean.class);
-
- testBootstrap(top, new RunSpecificTest()
- {
- public void runTest(BeanManager manager, DeploymentUnit unit) throws Exception
- {
- Object mc = getBean("SimpleBean");
- assertNotNull(mc);
- Object weldBean = assertWebBean(manager, unit, WeldBeanWithInjectedMcBean.class.getName());
- assertSame(mc, assertWebBean(manager, unit, mc));
-
- Method m = weldBean.getClass().getMethod("getSimpleBean");
- Object injectedBean = m.invoke(weldBean);
- assertNotNull(injectedBean);
- assertSame(mc, injectedBean);
- }
- });
- }
-
- public void testMcInjectedIntoWeldInjectedIntoMc() throws Exception
- {
- AssembledDirectory top = createAssembledDirectory("top-level.ear", "top-level.ear");
- addPath(top, "/weld/mcandweld/bidirectional", "META-INF");
- createMcLib(top, "/weld/mcandweld/bidirectional/mc/end", First.class);
- createWeldLib(top, "/weld/mcandweld/weld", Middle.class);
-
- testBootstrap(top, new RunSpecificTest()
- {
- public void runTest(BeanManager manager, DeploymentUnit unit) throws Exception
- {
- Object first = getBean("First");
- assertNotNull(first);
- Object middle = assertWebBean(manager, unit, Middle.class.getName());
- Object last = getBean("Last");
-
- Method getLast = middle.getClass().getMethod("getLast");
- Object injectedLast = getLast.invoke(middle);
- assertNotNull(injectedLast);
- assertSame(last, injectedLast);
- assertSame(last, assertWebBean(manager, unit, last));
-
- Method getMiddle = first.getClass().getMethod("getMiddle");
- Object injectedMiddle = getMiddle.invoke(first);
- assertNotNull(injectedMiddle);
-
- assertSame(first, assertWebBean(manager, unit, first));
- }
- });
- }
-
- public void testWeldInjectedIntoMcInjectedIntoWeld() throws Exception
- {
- AssembledDirectory top = createAssembledDirectory("top-level.ear", "top-level.ear");
- addPath(top, "/weld/mcandweld/bidirectional", "META-INF");
- createMcLib(top, "/weld/mcandweld/bidirectional/mc/middle", Middle.class);
- createWeldLib(top, "/weld/mcandweld/weld", First.class);
-
- testBootstrap(top, new RunSpecificTest()
- {
- public void runTest(BeanManager manager, DeploymentUnit unit) throws Exception
- {
- Object first = assertWebBean(manager, unit, First.class.getName());
- assertNotNull(first);
- Object middle = getBean("Middle");
- assertNotNull(middle);
- assertWebBean(manager, unit, Last.class.getName());
-
- Method getLast = middle.getClass().getMethod("getLast");
- Object injectedLast = getLast.invoke(middle);
- assertNotNull(injectedLast);
-
- Method getMiddle = first.getClass().getMethod("getMiddle");
- Object injectedMiddle = getMiddle.invoke(first);
- assertNotNull(injectedMiddle);
- assertSame(middle, injectedMiddle);
- assertSame(middle, assertWebBean(manager, unit, middle));
- }
- });
- }
-
public void testExternalMcBeanInjectedIntoWeld() throws Exception
{
AssembledDirectory mcEar = createAssembledDirectory("mc.ear", "mc.ear");
@@ -266,52 +263,52 @@
}
}
- public void testExternalMcBeanInjectedIntoWeld2() throws Exception
- {
- AssembledDirectory mcEar = createAssembledDirectory("mc.ear", "mc.ear");
- addPath(mcEar, "/weld/mcandweld/ear/mconly", "META-INF");
- createMcLib(mcEar, "/weld/mcandweld/mc/simple", SimpleBean.class);
- Deployment mc = deploy(mcEar);
-
- undeploy(mc);
-
- AssembledDirectory weldEar = createAssembledDirectory("weld.ear", "weld.ear");
- addPath(weldEar, "/weld/mcandweld/ear/weldonly", "META-INF");
- createWeldLib(weldEar, "/weld/mcandweld/weld", WeldBeanWithInjectedMcBean.class);
-
- try
- {
- testBootstrap(weldEar, null);
- fail("Weld deployment should not have worked without mc deployment");
- }
- catch(Exception expected)
- {
- }
-
- mc = deploy(mcEar);
- try
- {
- testBootstrap(weldEar, new RunSpecificTest()
- {
- public void runTest(BeanManager manager, DeploymentUnit unit) throws Exception
- {
- Object mc = getBean("SimpleBean");
- assertNotNull(mc);
- Object weldBean = assertWebBean(manager, unit, WeldBeanWithInjectedMcBean.class.getName());
- assertSame(mc, assertWebBean(manager, unit, mc));
-
- Method m = weldBean.getClass().getMethod("getSimpleBean");
- Object injectedBean = m.invoke(weldBean);
- assertNotNull(injectedBean);
- assertSame(mc, injectedBean);
- }
- });
- }
- finally
- {
- undeploy(mc);
- }
- }
+// public void testExternalMcBeanInjectedIntoWeld2() throws Exception
+// {
+// AssembledDirectory mcEar = createAssembledDirectory("mc.ear", "mc.ear");
+// addPath(mcEar, "/weld/mcandweld/ear/mconly", "META-INF");
+// createMcLib(mcEar, "/weld/mcandweld/mc/simple", SimpleBean.class);
+// Deployment mc = deploy(mcEar);
+//
+// undeploy(mc);
+//
+// AssembledDirectory weldEar = createAssembledDirectory("weld.ear", "weld.ear");
+// addPath(weldEar, "/weld/mcandweld/ear/weldonly", "META-INF");
+// createWeldLib(weldEar, "/weld/mcandweld/weld", WeldBeanWithInjectedMcBean.class);
+//
+// try
+// {
+// testBootstrap(weldEar, null);
+// fail("Weld deployment should not have worked without mc deployment");
+// }
+// catch(Exception expected)
+// {
+// }
+//
+// mc = deploy(mcEar);
+// try
+// {
+// testBootstrap(weldEar, new RunSpecificTest()
+// {
+// public void runTest(BeanManager manager, DeploymentUnit unit) throws Exception
+// {
+// Object mc = getBean("SimpleBean");
+// assertNotNull(mc);
+// Object weldBean = assertWebBean(manager, unit, WeldBeanWithInjectedMcBean.class.getName());
+// assertSame(mc, assertWebBean(manager, unit, mc));
+//
+// Method m = weldBean.getClass().getMethod("getSimpleBean");
+// Object injectedBean = m.invoke(weldBean);
+// assertNotNull(injectedBean);
+// assertSame(mc, injectedBean);
+// }
+// });
+// }
+// finally
+// {
+// undeploy(mc);
+// }
+// }
protected void testBootstrap(VirtualFile ear, RunSpecificTest test) throws Exception
{
Modified: projects/weld-int/branches/kabir_mc_weld/deployer-mc-int/src/test/resources/weld/mcandweld/bidirectional/mc/end/META-INF/end-beans.xml
===================================================================
--- projects/weld-int/trunk/deployer-mc-int/src/test/resources/weld/mcandweld/bidirectional/mc/end/META-INF/end-beans.xml 2010-03-08 19:08:12 UTC (rev 102077)
+++ projects/weld-int/branches/kabir_mc_weld/deployer-mc-int/src/test/resources/weld/mcandweld/bidirectional/mc/end/META-INF/end-beans.xml 2010-03-09 11:25:18 UTC (rev 102122)
@@ -1,6 +1,6 @@
<deployment xmlns="urn:jboss:bean-deployer:2.0">
- <bean name="First" class="org.jboss.test.deployers.support.mcandweld.bidirectional.end.First">
+ <bean name="First" class="org.jboss.test.deployers.support.mcandweld.bidirectional.mcend.end.First">
<annotation>@org.jboss.kernel.weld.metadata.api.annotations.WeldEnabled</annotation>
</bean>
- <weld xmlns="urn:jboss:weld-beans:1.0" name="Last" class="org.jboss.test.deployers.support.mcandweld.bidirectional.end.Last"/>
+ <weld xmlns="urn:jboss:weld-beans:1.0" name="Last" class="org.jboss.test.deployers.support.mcandweld.bidirectional.mcend.end.Last"/>
</deployment>
\ No newline at end of file
Modified: projects/weld-int/branches/kabir_mc_weld/deployer-mc-int/src/test/resources/weld/mcandweld/bidirectional/mc/middle/META-INF/middle-beans.xml
===================================================================
--- projects/weld-int/trunk/deployer-mc-int/src/test/resources/weld/mcandweld/bidirectional/mc/middle/META-INF/middle-beans.xml 2010-03-08 19:08:12 UTC (rev 102077)
+++ projects/weld-int/branches/kabir_mc_weld/deployer-mc-int/src/test/resources/weld/mcandweld/bidirectional/mc/middle/META-INF/middle-beans.xml 2010-03-09 11:25:18 UTC (rev 102122)
@@ -1,5 +1,5 @@
<deployment xmlns="urn:jboss:bean-deployer:2.0">
- <bean name="Middle" class="org.jboss.test.deployers.support.mcandweld.bidirectional.middle.Middle">
+ <bean name="Middle" class="org.jboss.test.deployers.support.mcandweld.bidirectional.mcmiddle.middle.Middle">
<annotation>@org.jboss.kernel.weld.metadata.api.annotations.WeldEnabled</annotation>
</bean>
</deployment>
\ No newline at end of file
Modified: projects/weld-int/branches/kabir_mc_weld/pom.xml
===================================================================
--- projects/weld-int/trunk/pom.xml 2010-03-08 19:08:12 UTC (rev 102077)
+++ projects/weld-int/branches/kabir_mc_weld/pom.xml 2010-03-09 11:25:18 UTC (rev 102122)
@@ -29,7 +29,7 @@
<version.jboss.interceptor>1.0.0-CR11</version.jboss.interceptor>
<version.jboss.vfs>2.2.0.Alpha2</version.jboss.vfs>
<version.jboss.man>2.1.1.SP1</version.jboss.man>
- <version.jboss.microcontainer>2.2.0.Alpha4</version.jboss.microcontainer>
+ <version.jboss.microcontainer>2.2.0-SNAPSHOT</version.jboss.microcontainer>
<version.jboss.cl>2.2.0.Alpha1</version.jboss.cl>
<version.jboss.deployers>2.2.0.Alpha1</version.jboss.deployers>
<version.jboss.common.core>2.2.17.GA</version.jboss.common.core>
@@ -331,6 +331,12 @@
</dependency>
<dependency>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-log4j</artifactId>
+ <version>${version.jboss.logging.spi}</version>
+ </dependency>
+
+ <dependency>
<groupId>org.jboss.integration</groupId>
<artifactId>jboss-classloading-spi</artifactId>
<version>${version.jboss.classloading.spi}</version>
More information about the jboss-cvs-commits
mailing list