[jboss-cvs] JBossAS SVN: r105919 - in projects/weld-int/trunk: deployer-mc-int and 12 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Jun 10 04:57:18 EDT 2010
Author: kabir.khan at jboss.com
Date: 2010-06-10 04:57:17 -0400 (Thu, 10 Jun 2010)
New Revision: 105919
Added:
projects/weld-int/trunk/deployer-mc-int/src/test/java/org/jboss/test/deployers/support/mcandweld/bidirectional/mcend/
projects/weld-int/trunk/deployer-mc-int/src/test/java/org/jboss/test/deployers/support/mcandweld/bidirectional/mcend/end/
projects/weld-int/trunk/deployer-mc-int/src/test/java/org/jboss/test/deployers/support/mcandweld/bidirectional/mcend/end/First.java
projects/weld-int/trunk/deployer-mc-int/src/test/java/org/jboss/test/deployers/support/mcandweld/bidirectional/mcend/end/Last.java
projects/weld-int/trunk/deployer-mc-int/src/test/java/org/jboss/test/deployers/support/mcandweld/bidirectional/mcend/middle/
projects/weld-int/trunk/deployer-mc-int/src/test/java/org/jboss/test/deployers/support/mcandweld/bidirectional/mcend/middle/Middle.java
projects/weld-int/trunk/deployer-mc-int/src/test/java/org/jboss/test/deployers/support/mcandweld/bidirectional/mcmiddle/
projects/weld-int/trunk/deployer-mc-int/src/test/java/org/jboss/test/deployers/support/mcandweld/bidirectional/mcmiddle/end/
projects/weld-int/trunk/deployer-mc-int/src/test/java/org/jboss/test/deployers/support/mcandweld/bidirectional/mcmiddle/end/First.java
projects/weld-int/trunk/deployer-mc-int/src/test/java/org/jboss/test/deployers/support/mcandweld/bidirectional/mcmiddle/end/Last.java
projects/weld-int/trunk/deployer-mc-int/src/test/java/org/jboss/test/deployers/support/mcandweld/bidirectional/mcmiddle/middle/
projects/weld-int/trunk/deployer-mc-int/src/test/java/org/jboss/test/deployers/support/mcandweld/bidirectional/mcmiddle/middle/Middle.java
Removed:
projects/weld-int/trunk/deployer-mc-int/src/test/java/org/jboss/test/deployers/support/mcandweld/bidirectional/end/
projects/weld-int/trunk/deployer-mc-int/src/test/java/org/jboss/test/deployers/support/mcandweld/bidirectional/middle/
Modified:
projects/weld-int/trunk/deployer-mc-int/pom.xml
projects/weld-int/trunk/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/simple/SimpleBean.java
projects/weld-int/trunk/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/McIntegrationNoBootstrapBeanTestCase.java
projects/weld-int/trunk/deployer-mc-int/src/test/java/org/jboss/test/deployers/test/McIntegrationTestCase.java
projects/weld-int/trunk/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/middle/META-INF/middle-beans.xml
projects/weld-int/trunk/pom.xml
Log:
[WELDINT-29] Fix standalone tests
Modified: projects/weld-int/trunk/deployer-mc-int/pom.xml
===================================================================
--- projects/weld-int/trunk/deployer-mc-int/pom.xml 2010-06-10 08:39:52 UTC (rev 105918)
+++ projects/weld-int/trunk/deployer-mc-int/pom.xml 2010-06-10 08:57:17 UTC (rev 105919)
@@ -27,25 +27,18 @@
</repository>
</repositories>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <skip>true</skip>
- <!--testFailureIgnore>true</testFailureIgnore-->
- </configuration>
- </plugin>
- </plugins>
- </build>
-
<dependencies>
<dependency>
<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>
@@ -188,26 +181,6 @@
<artifactId>jboss-deployers-vfs</artifactId>
<type>test-jar</type>
<scope>test</scope>
- <!--
- <exclusions>
- <exclusion>
- <groupId>org.jboss.deployers</groupId>
- <artifactId>jboss-deployers-impl</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss.deployers</groupId>
- <artifactId>jboss-deployers-spi</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss.microcontainer</groupId>
- <artifactId>jboss-kernel</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss.cl</groupId>
- <artifactId>jboss-classloading</artifactId>
- </exclusion>
- </exclusions>
- -->
</dependency>
<dependency>
@@ -266,6 +239,18 @@
<artifactId>slf4j-simple</artifactId>
<scope>test</scope>
</dependency>
+
+ <dependency>
+ <groupId>org.jboss.shrinkwrap</groupId>
+ <artifactId>shrinkwrap-api</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.shrinkwrap</groupId>
+ <artifactId>shrinkwrap-impl-base</artifactId>
+ <scope>test</scope>
+ </dependency>
+
</dependencies>
Added: projects/weld-int/trunk/deployer-mc-int/src/test/java/org/jboss/test/deployers/support/mcandweld/bidirectional/mcend/end/First.java
===================================================================
--- projects/weld-int/trunk/deployer-mc-int/src/test/java/org/jboss/test/deployers/support/mcandweld/bidirectional/mcend/end/First.java (rev 0)
+++ projects/weld-int/trunk/deployer-mc-int/src/test/java/org/jboss/test/deployers/support/mcandweld/bidirectional/mcend/end/First.java 2010-06-10 08:57:17 UTC (rev 105919)
@@ -0,0 +1,45 @@
+/*
+* JBoss, Home of Professional Open Source.
+* Copyright 2006, Red Hat Middleware LLC, and individual contributors
+* as indicated by the @author tags. See the copyright.txt file 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.mcandweld.bidirectional.mcend.end;
+
+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.bidirectional.mcend.middle.Middle;
+
+/**
+ *
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision: 1.1 $
+ */
+ at Default
+public class First
+{
+ @Weld @Inject @Default
+ Middle middle;
+
+ public Middle getMiddle()
+ {
+ return middle;
+ }
+}
Added: projects/weld-int/trunk/deployer-mc-int/src/test/java/org/jboss/test/deployers/support/mcandweld/bidirectional/mcend/end/Last.java
===================================================================
--- projects/weld-int/trunk/deployer-mc-int/src/test/java/org/jboss/test/deployers/support/mcandweld/bidirectional/mcend/end/Last.java (rev 0)
+++ projects/weld-int/trunk/deployer-mc-int/src/test/java/org/jboss/test/deployers/support/mcandweld/bidirectional/mcend/end/Last.java 2010-06-10 08:57:17 UTC (rev 105919)
@@ -0,0 +1,35 @@
+/*
+* JBoss, Home of Professional Open Source.
+* Copyright 2006, Red Hat Middleware LLC, and individual contributors
+* as indicated by the @author tags. See the copyright.txt file 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.mcandweld.bidirectional.mcend.end;
+
+import javax.enterprise.inject.Default;
+
+/**
+ *
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision: 1.1 $
+ */
+ at Default
+public class Last
+{
+
+}
Added: projects/weld-int/trunk/deployer-mc-int/src/test/java/org/jboss/test/deployers/support/mcandweld/bidirectional/mcend/middle/Middle.java
===================================================================
--- projects/weld-int/trunk/deployer-mc-int/src/test/java/org/jboss/test/deployers/support/mcandweld/bidirectional/mcend/middle/Middle.java (rev 0)
+++ projects/weld-int/trunk/deployer-mc-int/src/test/java/org/jboss/test/deployers/support/mcandweld/bidirectional/mcend/middle/Middle.java 2010-06-10 08:57:17 UTC (rev 105919)
@@ -0,0 +1,44 @@
+/*
+* JBoss, Home of Professional Open Source.
+* Copyright 2006, Red Hat Middleware LLC, and individual contributors
+* as indicated by the @author tags. See the copyright.txt file 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.mcandweld.bidirectional.mcend.middle;
+
+import javax.enterprise.inject.Default;
+import javax.inject.Inject;
+
+import org.jboss.test.deployers.support.mcandweld.bidirectional.mcend.end.Last;
+
+/**
+ *
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision: 1.1 $
+ */
+ at Default
+public class Middle
+{
+ @Inject @Default
+ Last last;
+
+ public Last getLast()
+ {
+ return last;
+ }
+}
Added: projects/weld-int/trunk/deployer-mc-int/src/test/java/org/jboss/test/deployers/support/mcandweld/bidirectional/mcmiddle/end/First.java
===================================================================
--- projects/weld-int/trunk/deployer-mc-int/src/test/java/org/jboss/test/deployers/support/mcandweld/bidirectional/mcmiddle/end/First.java (rev 0)
+++ projects/weld-int/trunk/deployer-mc-int/src/test/java/org/jboss/test/deployers/support/mcandweld/bidirectional/mcmiddle/end/First.java 2010-06-10 08:57:17 UTC (rev 105919)
@@ -0,0 +1,44 @@
+/*
+* JBoss, Home of Professional Open Source.
+* Copyright 2006, Red Hat Middleware LLC, and individual contributors
+* as indicated by the @author tags. See the copyright.txt file 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.mcandweld.bidirectional.mcmiddle.end;
+
+import javax.enterprise.inject.Default;
+import javax.inject.Inject;
+
+import org.jboss.test.deployers.support.mcandweld.bidirectional.mcmiddle.middle.Middle;
+
+/**
+ *
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision: 1.1 $
+ */
+ at Default
+public class First
+{
+ @Inject @Default
+ Middle middle;
+
+ public Middle getMiddle()
+ {
+ return middle;
+ }
+}
Added: projects/weld-int/trunk/deployer-mc-int/src/test/java/org/jboss/test/deployers/support/mcandweld/bidirectional/mcmiddle/end/Last.java
===================================================================
--- projects/weld-int/trunk/deployer-mc-int/src/test/java/org/jboss/test/deployers/support/mcandweld/bidirectional/mcmiddle/end/Last.java (rev 0)
+++ projects/weld-int/trunk/deployer-mc-int/src/test/java/org/jboss/test/deployers/support/mcandweld/bidirectional/mcmiddle/end/Last.java 2010-06-10 08:57:17 UTC (rev 105919)
@@ -0,0 +1,35 @@
+/*
+* JBoss, Home of Professional Open Source.
+* Copyright 2006, Red Hat Middleware LLC, and individual contributors
+* as indicated by the @author tags. See the copyright.txt file 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.mcandweld.bidirectional.mcmiddle.end;
+
+import javax.enterprise.inject.Default;
+
+/**
+ *
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision: 1.1 $
+ */
+ at Default
+public class Last
+{
+
+}
Added: projects/weld-int/trunk/deployer-mc-int/src/test/java/org/jboss/test/deployers/support/mcandweld/bidirectional/mcmiddle/middle/Middle.java
===================================================================
--- projects/weld-int/trunk/deployer-mc-int/src/test/java/org/jboss/test/deployers/support/mcandweld/bidirectional/mcmiddle/middle/Middle.java (rev 0)
+++ projects/weld-int/trunk/deployer-mc-int/src/test/java/org/jboss/test/deployers/support/mcandweld/bidirectional/mcmiddle/middle/Middle.java 2010-06-10 08:57:17 UTC (rev 105919)
@@ -0,0 +1,45 @@
+/*
+* JBoss, Home of Professional Open Source.
+* Copyright 2006, Red Hat Middleware LLC, and individual contributors
+* as indicated by the @author tags. See the copyright.txt file 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.mcandweld.bidirectional.mcmiddle.middle;
+
+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.bidirectional.mcmiddle.end.Last;
+
+/**
+ *
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision: 1.1 $
+ */
+ at Default
+public class Middle
+{
+ @Weld @Inject @Default
+ Last last;
+
+ public Last getLast()
+ {
+ return last;
+ }
+}
Modified: projects/weld-int/trunk/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-06-10 08:39:52 UTC (rev 105918)
+++ projects/weld-int/trunk/deployer-mc-int/src/test/java/org/jboss/test/deployers/support/mcandweld/mc/fromweld/McBeanWithInjectedWeldBean.java 2010-06-10 08:57:17 UTC (rev 105919)
@@ -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/trunk/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-06-10 08:39:52 UTC (rev 105918)
+++ projects/weld-int/trunk/deployer-mc-int/src/test/java/org/jboss/test/deployers/support/mcandweld/mc/simple/SimpleBean.java 2010-06-10 08:57:17 UTC (rev 105919)
@@ -34,5 +34,4 @@
@WeldEnabled
public class SimpleBean
{
-
}
Modified: projects/weld-int/trunk/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-06-10 08:39:52 UTC (rev 105918)
+++ projects/weld-int/trunk/deployer-mc-int/src/test/java/org/jboss/test/deployers/test/AbstractWeldTest.java 2010-06-10 08:57:17 UTC (rev 105919)
@@ -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(VirtualFile dir, String metaInfParent, Class<?> clazz) throws Exception
{
VirtualFile mcDir = dir.getChild("mc.jar");
Modified: projects/weld-int/trunk/deployer-mc-int/src/test/java/org/jboss/test/deployers/test/McIntegrationNoBootstrapBeanTestCase.java
===================================================================
--- projects/weld-int/trunk/deployer-mc-int/src/test/java/org/jboss/test/deployers/test/McIntegrationNoBootstrapBeanTestCase.java 2010-06-10 08:39:52 UTC (rev 105918)
+++ projects/weld-int/trunk/deployer-mc-int/src/test/java/org/jboss/test/deployers/test/McIntegrationNoBootstrapBeanTestCase.java 2010-06-10 08:57:17 UTC (rev 105919)
@@ -37,7 +37,7 @@
/**
* Test boot deployer.
*
- * @author <a href="mailto:ales.justin at jboss.org">Ales Justin</a>
+ * @author <a href="mailto:kabir.khan at jboss.com">Kabir Khan</a>
*/
public class McIntegrationNoBootstrapBeanTestCase extends AbstractWeldTest
{
Modified: projects/weld-int/trunk/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-06-10 08:39:52 UTC (rev 105918)
+++ projects/weld-int/trunk/deployer-mc-int/src/test/java/org/jboss/test/deployers/test/McIntegrationTestCase.java 2010-06-10 08:57:17 UTC (rev 105919)
@@ -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;
@@ -180,8 +177,8 @@
VirtualFile top = VFS.getChild("top-level.ear");
createAssembledDirectory(top)
.addPath("/weld/mcandweld/bidirectional");
- createMcLib(top, "/weld/mcandweld/bidirectional/mc/end", First.class);
- createWeldLib(top, "/weld/mcandweld/weld", Middle.class);
+ 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()
{
@@ -189,7 +186,7 @@
{
Object first = getBean("First");
assertNotNull(first);
- Object middle = assertWebBean(manager, unit, Middle.class.getName());
+ 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");
@@ -212,18 +209,18 @@
VirtualFile top = VFS.getChild("top-level.ear");
createAssembledDirectory(top)
.addPath("/weld/mcandweld/bidirectional");
- createMcLib(top, "/weld/mcandweld/bidirectional/mc/middle", Middle.class);
- createWeldLib(top, "/weld/mcandweld/weld", First.class);
+ 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, First.class.getName());
+ 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, Last.class.getName());
+ 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);
@@ -237,7 +234,7 @@
}
});
}
-
+
public void testExternalMcBeanInjectedIntoWeld() throws Exception
{
VirtualFile mcEar = VFS.getChild("mc.ear");
@@ -392,4 +389,4 @@
void runTest(BeanManager manager, DeploymentUnit unit) throws Exception;
}
-}
\ No newline at end of file
+}
Modified: projects/weld-int/trunk/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-06-10 08:39:52 UTC (rev 105918)
+++ projects/weld-int/trunk/deployer-mc-int/src/test/resources/weld/mcandweld/bidirectional/mc/end/META-INF/end-beans.xml 2010-06-10 08:57:17 UTC (rev 105919)
@@ -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/trunk/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-06-10 08:39:52 UTC (rev 105918)
+++ projects/weld-int/trunk/deployer-mc-int/src/test/resources/weld/mcandweld/bidirectional/mc/middle/META-INF/middle-beans.xml 2010-06-10 08:57:17 UTC (rev 105919)
@@ -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>
+ </bean>
</deployment>
\ No newline at end of file
Modified: projects/weld-int/trunk/pom.xml
===================================================================
--- projects/weld-int/trunk/pom.xml 2010-06-10 08:39:52 UTC (rev 105918)
+++ projects/weld-int/trunk/pom.xml 2010-06-10 08:57:17 UTC (rev 105919)
@@ -46,6 +46,7 @@
<version.jboss.jpa>1.0.0-CR1</version.jboss.jpa>
<version.jboss.web>2.1.4.GA</version.jboss.web>
<version.jboss.naming.deployers>0.1.0</version.jboss.naming.deployers>
+ <version.org.jboss.shrinkwrap>1.0.0-alpha-10</version.org.jboss.shrinkwrap>
<version.servlet.api>2.5</version.servlet.api>
<version.jsp.api>2.1</version.jsp.api>
<version.org.jboss.test>1.1.1.GA</version.org.jboss.test>
@@ -555,6 +556,19 @@
<type>pom</type>
</dependency>
+ <dependency>
+ <groupId>org.jboss.shrinkwrap</groupId>
+ <artifactId>shrinkwrap-api</artifactId>
+ <version>${version.org.jboss.shrinkwrap}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.shrinkwrap</groupId>
+ <artifactId>shrinkwrap-impl-base</artifactId>
+ <version>${version.org.jboss.shrinkwrap}</version>
+ <scope>test</scope>
+ </dependency>
+
</dependencies>
</dependencyManagement>
More information about the jboss-cvs-commits
mailing list