[jboss-cvs] JBossAS SVN: r106092 - in trunk: depchain and 36 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Jun 16 13:19:31 EDT 2010
Author: kabir.khan at jboss.com
Date: 2010-06-16 13:19:30 -0400 (Wed, 16 Jun 2010)
New Revision: 106092
Added:
trunk/weld-int/deployer-mc-int/
trunk/weld-int/deployer-mc-int/src/test/java/org/jboss/test/deployers/as/
trunk/weld-int/deployer-mc-int/src/test/java/org/jboss/test/deployers/as/support/
trunk/weld-int/deployer-mc-int/src/test/java/org/jboss/test/deployers/as/support/Blue.java
trunk/weld-int/deployer-mc-int/src/test/java/org/jboss/test/deployers/as/support/HttpUtils.java
trunk/weld-int/deployer-mc-int/src/test/java/org/jboss/test/deployers/as/support/Red.java
trunk/weld-int/deployer-mc-int/src/test/java/org/jboss/test/deployers/as/support/mctoweld/
trunk/weld-int/deployer-mc-int/src/test/java/org/jboss/test/deployers/as/support/mctoweld/mc/
trunk/weld-int/deployer-mc-int/src/test/java/org/jboss/test/deployers/as/support/mctoweld/mc/BlueMcBeanNoDependencies.java
trunk/weld-int/deployer-mc-int/src/test/java/org/jboss/test/deployers/as/support/mctoweld/mc/McBeanNoDependencies.java
trunk/weld-int/deployer-mc-int/src/test/java/org/jboss/test/deployers/as/support/mctoweld/mc/RedMcBeanNoDependencies.java
trunk/weld-int/deployer-mc-int/src/test/java/org/jboss/test/deployers/as/support/mctoweld/weld/
trunk/weld-int/deployer-mc-int/src/test/java/org/jboss/test/deployers/as/support/mctoweld/weld/Kickstart.java
trunk/weld-int/deployer-mc-int/src/test/java/org/jboss/test/deployers/as/support/mctoweld/weld/KickstartEjb.java
trunk/weld-int/deployer-mc-int/src/test/java/org/jboss/test/deployers/as/support/mctoweld/weld/McToWeldLocalInterface.java
trunk/weld-int/deployer-mc-int/src/test/java/org/jboss/test/deployers/as/support/mctoweld/weld/WeldWithMcBean.java
trunk/weld-int/deployer-mc-int/src/test/java/org/jboss/test/deployers/as/support/mctoweld/weld/WeldWithMcEjb.java
trunk/weld-int/deployer-mc-int/src/test/java/org/jboss/test/deployers/as/support/weld/
trunk/weld-int/deployer-mc-int/src/test/java/org/jboss/test/deployers/as/support/weld/simple/
trunk/weld-int/deployer-mc-int/src/test/java/org/jboss/test/deployers/as/support/weld/simple/BlueWeldDependency.java
trunk/weld-int/deployer-mc-int/src/test/java/org/jboss/test/deployers/as/support/weld/simple/RedWeldDependency.java
trunk/weld-int/deployer-mc-int/src/test/java/org/jboss/test/deployers/as/support/weld/simple/SimpleLocalInterface.java
trunk/weld-int/deployer-mc-int/src/test/java/org/jboss/test/deployers/as/support/weld/simple/SimpleWeldBeanNoInjection.java
trunk/weld-int/deployer-mc-int/src/test/java/org/jboss/test/deployers/as/support/weld/simple/SimpleWeldBeanWeldInjection.java
trunk/weld-int/deployer-mc-int/src/test/java/org/jboss/test/deployers/as/support/weld/simple/SimpleWeldEjbNoInjection.java
trunk/weld-int/deployer-mc-int/src/test/java/org/jboss/test/deployers/as/support/weld/simple/SimpleWeldEjbWeldInjection.java
trunk/weld-int/deployer-mc-int/src/test/java/org/jboss/test/deployers/as/support/weld/simple/WeldDependency.java
trunk/weld-int/deployer-mc-int/src/test/java/org/jboss/test/deployers/as/support/weldtomctoweld/
trunk/weld-int/deployer-mc-int/src/test/java/org/jboss/test/deployers/as/support/weldtomctoweld/mc/
trunk/weld-int/deployer-mc-int/src/test/java/org/jboss/test/deployers/as/support/weldtomctoweld/mc/BlueMcBeanWeldDependencies.java
trunk/weld-int/deployer-mc-int/src/test/java/org/jboss/test/deployers/as/support/weldtomctoweld/mc/McBeanWeldDependencies.java
trunk/weld-int/deployer-mc-int/src/test/java/org/jboss/test/deployers/as/support/weldtomctoweld/mc/RedMcBeanWeldDependencies.java
trunk/weld-int/deployer-mc-int/src/test/java/org/jboss/test/deployers/as/support/weldtomctoweld/weld/
trunk/weld-int/deployer-mc-int/src/test/java/org/jboss/test/deployers/as/support/weldtomctoweld/weld/BlueWeldMcDependency.java
trunk/weld-int/deployer-mc-int/src/test/java/org/jboss/test/deployers/as/support/weldtomctoweld/weld/Kickstart.java
trunk/weld-int/deployer-mc-int/src/test/java/org/jboss/test/deployers/as/support/weldtomctoweld/weld/KickstartEjb.java
trunk/weld-int/deployer-mc-int/src/test/java/org/jboss/test/deployers/as/support/weldtomctoweld/weld/RedWeldMcDependency.java
trunk/weld-int/deployer-mc-int/src/test/java/org/jboss/test/deployers/as/support/weldtomctoweld/weld/WeldMcDependency.java
trunk/weld-int/deployer-mc-int/src/test/java/org/jboss/test/deployers/as/support/weldtomctoweld/weld/WeldToMcToWeldLocalInterface.java
trunk/weld-int/deployer-mc-int/src/test/java/org/jboss/test/deployers/as/support/weldtomctoweld/weld/WeldWithMcWithWeldBean.java
trunk/weld-int/deployer-mc-int/src/test/java/org/jboss/test/deployers/as/support/weldtomctoweld/weld/WeldWithMcWithWeldEjb.java
trunk/weld-int/deployer-mc-int/src/test/java/org/jboss/test/deployers/as/test/
trunk/weld-int/deployer-mc-int/src/test/java/org/jboss/test/deployers/as/test/ApplicationServerTestCase.java
trunk/weld-int/deployer-mc-int/src/test/resources/jndi.properties
trunk/weld-int/deployer-mc-int/src/test/resources/log4j.properties
trunk/weld-int/deployer-mc-int/src/test/resources/org/jboss/test/deployers/as/
trunk/weld-int/deployer-mc-int/src/test/resources/org/jboss/test/deployers/as/support/
trunk/weld-int/deployer-mc-int/src/test/resources/org/jboss/test/deployers/as/support/mctoweld/
trunk/weld-int/deployer-mc-int/src/test/resources/org/jboss/test/deployers/as/support/mctoweld/nodependencies/
trunk/weld-int/deployer-mc-int/src/test/resources/org/jboss/test/deployers/as/support/mctoweld/nodependencies/META-INF/
trunk/weld-int/deployer-mc-int/src/test/resources/org/jboss/test/deployers/as/support/mctoweld/nodependencies/META-INF/jboss-beans.xml
trunk/weld-int/deployer-mc-int/src/test/resources/org/jboss/test/deployers/as/support/webapp/
trunk/weld-int/deployer-mc-int/src/test/resources/org/jboss/test/deployers/as/support/webapp/WEB-INF/
trunk/weld-int/deployer-mc-int/src/test/resources/org/jboss/test/deployers/as/support/webapp/WEB-INF/faces-config.xml
trunk/weld-int/deployer-mc-int/src/test/resources/org/jboss/test/deployers/as/support/webapp/WEB-INF/web.xml
trunk/weld-int/deployer-mc-int/src/test/resources/org/jboss/test/deployers/as/support/webapp/mcInWeld.xhtml
trunk/weld-int/deployer-mc-int/src/test/resources/org/jboss/test/deployers/as/support/webapp/mcNoDependenciesInjectedIntoWeldBean.xhtml
trunk/weld-int/deployer-mc-int/src/test/resources/org/jboss/test/deployers/as/support/webapp/mcNoDependenciesInjectedIntoWeldEjb.xhtml
trunk/weld-int/deployer-mc-int/src/test/resources/org/jboss/test/deployers/as/support/webapp/simpleWeldBeanNoInjection.xhtml
trunk/weld-int/deployer-mc-int/src/test/resources/org/jboss/test/deployers/as/support/webapp/simpleWeldBeanWeldInjection.xhtml
trunk/weld-int/deployer-mc-int/src/test/resources/org/jboss/test/deployers/as/support/webapp/simpleWeldEjbNoInjection.xhtml
trunk/weld-int/deployer-mc-int/src/test/resources/org/jboss/test/deployers/as/support/webapp/simpleWeldEjbWeldInjection.xhtml
trunk/weld-int/deployer-mc-int/src/test/resources/org/jboss/test/deployers/as/support/webapp/weldInjectedIntoMcInjectedIntoWeldBean.xhtml
trunk/weld-int/deployer-mc-int/src/test/resources/org/jboss/test/deployers/as/support/webapp/weldInjectedIntoMcInjectedIntoWeldEjb.xhtml
trunk/weld-int/deployer-mc-int/src/test/resources/org/jboss/test/deployers/as/support/weld/
trunk/weld-int/deployer-mc-int/src/test/resources/org/jboss/test/deployers/as/support/weld/META-INF/
trunk/weld-int/deployer-mc-int/src/test/resources/org/jboss/test/deployers/as/support/weld/META-INF/beans.xml
trunk/weld-int/deployer-mc-int/src/test/resources/org/jboss/test/deployers/as/support/weldtomctoweld/
trunk/weld-int/deployer-mc-int/src/test/resources/org/jboss/test/deployers/as/support/weldtomctoweld/META-INF/
trunk/weld-int/deployer-mc-int/src/test/resources/org/jboss/test/deployers/as/support/weldtomctoweld/META-INF/jboss-beans.xml
Modified:
trunk/component-matrix/pom.xml
trunk/depchain/pom.xml
trunk/server/src/etc/conf/all/bootstrap/deployers.xml
trunk/weld-int/assembly/
trunk/weld-int/assembly/pom.xml
trunk/weld-int/assembly/src/main/assembly/assembly.xml
trunk/weld-int/assembly/src/main/assembly/resources/META-INF/weld-deployers-jboss-beans.xml
trunk/weld-int/deployer-mc-int/pom.xml
trunk/weld-int/deployer-mc-int/src/main/java/org/jboss/weld/integration/deployer/mc/WeldBeanMetaDataDeployerPlugin.java
trunk/weld-int/deployer-mc-int/src/test/java/org/jboss/test/deployers/support/deployer/MockValidatorFactoryDeployer.java
trunk/weld-int/deployer/
trunk/weld-int/ejb/
trunk/weld-int/pom.xml
trunk/weld-int/webtier/
Log:
[JBAS-8106] Add initial weld/mc integration. Although the jars are added to weld.deployer the feature is disabled unless the indicated section in weld-deployers-jboss-beans.xml is commented out
Modified: trunk/component-matrix/pom.xml
===================================================================
--- trunk/component-matrix/pom.xml 2010-06-16 17:03:38 UTC (rev 106091)
+++ trunk/component-matrix/pom.xml 2010-06-16 17:19:30 UTC (rev 106092)
@@ -3182,6 +3182,12 @@
<artifactId>jboss-jmx-mc-int</artifactId>
<version>${version.org.jboss.kernel}</version>
</dependency>
+
+ <dependency>
+ <groupId>org.jboss.kernel</groupId>
+ <artifactId>jboss-weld-int</artifactId>
+ <version>${version.org.jboss.kernel}</version>
+ </dependency>
<dependency>
<groupId>org.jboss.kernel</groupId>
@@ -3886,6 +3892,27 @@
<version>1.0</version>
</dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-simple</artifactId>
+ <version>${version.org.slf4j}</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>weld-int-deployer</artifactId>
+ <version>${project.version}</version>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>weld-int-deployer-mc-int</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
</dependencies>
</dependencyManagement>
Modified: trunk/depchain/pom.xml
===================================================================
--- trunk/depchain/pom.xml 2010-06-16 17:03:38 UTC (rev 106091)
+++ trunk/depchain/pom.xml 2010-06-16 17:19:30 UTC (rev 106092)
@@ -792,6 +792,22 @@
<artifactId>jboss-embedded-core</artifactId>
</dependency>
<dependency>
+ <groupId>org.jboss.kernel</groupId>
+ <artifactId>jboss-weld-int</artifactId>
+ <version>${version.org.jboss.kernel}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jboss.weld</groupId>
+ <artifactId>weld-core-test</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.weld</groupId>
+ <artifactId>weld-core</artifactId>
+ </exclusion>
+
+ </exclusions>
+ </dependency>
+ <dependency>
<groupId>org.jboss.spec.javax.interceptor</groupId>
<artifactId>jboss-interceptors-api_1.1_spec</artifactId>
</dependency>
Modified: trunk/server/src/etc/conf/all/bootstrap/deployers.xml
===================================================================
--- trunk/server/src/etc/conf/all/bootstrap/deployers.xml 2010-06-16 17:03:38 UTC (rev 106091)
+++ trunk/server/src/etc/conf/all/bootstrap/deployers.xml 2010-06-16 17:19:30 UTC (rev 106092)
@@ -233,6 +233,9 @@
</bean>
<bean name="BeanMetaDataDeployer" class="org.jboss.deployers.vfs.deployer.kernel.BeanMetaDataDeployer">
<constructor><parameter class="org.jboss.kernel.Kernel"><inject bean="jboss.kernel:service=Kernel"/></parameter></constructor>
+ <!-- Accept any implementor of KernelControllerContextCreator -->
+ <incallback method="addControllerContextCreator"/>
+ <uncallback method="removeControllerContextCreator"/>
</bean>
<!-- JMX Deployment -->
Property changes on: trunk/weld-int/assembly
___________________________________________________________________
Name: svn:ignore
- target
+ target
.classpath
.project
.settings
Modified: trunk/weld-int/assembly/pom.xml
===================================================================
--- trunk/weld-int/assembly/pom.xml 2010-06-16 17:03:38 UTC (rev 106091)
+++ trunk/weld-int/assembly/pom.xml 2010-06-16 17:19:30 UTC (rev 106092)
@@ -70,6 +70,56 @@
</dependency>
<dependency>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>weld-int-deployer-mc-int</artifactId>
+ <optional>true</optional>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.kernel</groupId>
+ <artifactId>jboss-weld-int</artifactId>
+ <optional>true</optional>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jboss.microcontainer</groupId>
+ <artifactId>jboss-kernel</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.microcontainer</groupId>
+ <artifactId>jboss-dependency</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-common-core</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-spi</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss</groupId>
+ <artifactId>jbossxb</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>javax.el</groupId>
+ <artifactId>el-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.interceptor</groupId>
+ <artifactId>jboss-interceptor-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>javax.transaction</groupId>
+ <artifactId>jta</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <dependency>
<groupId>org.jboss.weld</groupId>
<artifactId>weld-core</artifactId>
<optional>true</optional>
Modified: trunk/weld-int/assembly/src/main/assembly/assembly.xml
===================================================================
--- trunk/weld-int/assembly/src/main/assembly/assembly.xml 2010-06-16 17:03:38 UTC (rev 106091)
+++ trunk/weld-int/assembly/src/main/assembly/assembly.xml 2010-06-16 17:19:30 UTC (rev 106092)
@@ -29,6 +29,9 @@
<include>org.jboss.weld:weld-spi</include>
<include>org.jboss.jbossas:weld-int-ejb</include>
<include>org.jboss.jbossas:weld-int-deployer</include>
+ <include>org.jboss.jbossas:weld-int-deployer-mc-int</include>
+ <include>org.jboss.kernel:jboss-weld-int</include>
+
<include>org.jboss.interceptor:jboss-interceptor</include>
</includes>
</dependencySet>
Modified: trunk/weld-int/assembly/src/main/assembly/resources/META-INF/weld-deployers-jboss-beans.xml
===================================================================
--- trunk/weld-int/assembly/src/main/assembly/resources/META-INF/weld-deployers-jboss-beans.xml 2010-06-16 17:03:38 UTC (rev 106091)
+++ trunk/weld-int/assembly/src/main/assembly/resources/META-INF/weld-deployers-jboss-beans.xml 2010-06-16 17:19:30 UTC (rev 106092)
@@ -77,6 +77,7 @@
<depends>NameSpaces</depends>
</bean>
+ <!-- UNCOMMENT THIS TO ENABLE WELD/MC INJECTION - This feature is currently very experimental and so not enabled by default -->
<!-- Adds plugin to BeanMetaDataDeployer that installs WeldKernelControllerContexts -->
<!-- bean name="WeldBeanMetaDataDeployerPlugin" class="org.jboss.weld.integration.deployer.mc.WeldBeanMetaDataDeployerPlugin"/ -->
Property changes on: trunk/weld-int/deployer
___________________________________________________________________
Name: svn:ignore
- target
+ target
.settings
.classpath
.project
Copied: trunk/weld-int/deployer-mc-int (from rev 106025, projects/weld-int/trunk/deployer-mc-int)
Modified: trunk/weld-int/deployer-mc-int/pom.xml
===================================================================
--- projects/weld-int/trunk/deployer-mc-int/pom.xml 2010-06-14 09:54:25 UTC (rev 106025)
+++ trunk/weld-int/deployer-mc-int/pom.xml 2010-06-16 17:19:30 UTC (rev 106092)
@@ -1,37 +1,37 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.jboss.weld.integration</groupId>
- <artifactId>weld-jboss-int</artifactId>
- <version>6.0.0-SNAPSHOT</version>
- </parent>
-
- <groupId>org.jboss.weld.integration</groupId>
- <artifactId>weld-jboss-int-deployer-mc-int</artifactId>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-weld-int</artifactId>
+ <version>6.0.0-SNAPSHOT</version>
+ </parent>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>weld-int-deployer-mc-int</artifactId>
<packaging>jar</packaging>
<name>Weld JBoss AS Integration: MC Deployers for injection between Weld and MC</name>
<description>Weld deployers for JBoss AS enabling injection between Weld and MC</description>
- <repositories>
- <repository>
- <id>snapshots.jboss.org</id>
- <name>JBoss Snapshot's Repository</name>
- <url>http://snapshots.jboss.org/maven2</url>
- <releases>
- <enabled>false</enabled>
- </releases>
- <snapshots>
- <enabled>true</enabled>
- <updatePolicy>always</updatePolicy>
- </snapshots>
- </repository>
- </repositories>
+ <!--build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <skipTests>false</skipTests>
+ <redirectTestOutputToFile>true</redirectTestOutputToFile>
+ <excludes>
+ <exclude>org/jboss/test/deployers/as/test/*TestCase.java</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build-->
<dependencies>
<dependency>
- <groupId>org.jboss.weld.integration</groupId>
- <artifactId>weld-jboss-int-jboss-ejb</artifactId>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>weld-int-ejb</artifactId>
<optional>true</optional>
<exclusions>
<exclusion>
@@ -42,8 +42,8 @@
</dependency>
<dependency>
- <groupId>org.jboss.weld.integration</groupId>
- <artifactId>weld-jboss-int-deployer</artifactId>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>weld-int-deployer</artifactId>
<optional>true</optional>
<exclusions>
<exclusion>
@@ -76,10 +76,17 @@
<artifactId>jboss-deployers-vfs</artifactId>
<scope>provided</scope>
</dependency>
+
+ <dependency>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging</artifactId>
+ <scope>provided</scope>
+ </dependency>
<dependency>
<groupId>org.jboss.kernel</groupId>
<artifactId>jboss-weld-int</artifactId>
+ <scope>provided</scope>
<exclusions>
<exclusion>
<groupId>org.jboss.microcontainer</groupId>
@@ -101,6 +108,22 @@
<groupId>org.jboss</groupId>
<artifactId>jbossxb</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>javax.el</groupId>
+ <artifactId>el-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.interceptor</groupId>
+ <artifactId>jboss-interceptor-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>javax.transaction</groupId>
+ <artifactId>jta</artifactId>
+ </exclusion>
</exclusions>
</dependency>
@@ -170,8 +193,8 @@
<!-- Test dependencies -->
<dependency>
- <groupId>org.jboss.weld.integration</groupId>
- <artifactId>weld-jboss-int-deployer</artifactId>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>weld-int-deployer</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
@@ -184,6 +207,18 @@
</dependency>
<dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-vfs</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.spec.javax.el</groupId>
+ <artifactId>jboss-el-api_2.2_spec</artifactId>
+ <version>1.0.0.Beta2</version>
+ </dependency>
+
+ <dependency>
<groupId>org.jboss.test</groupId>
<artifactId>jboss-test</artifactId>
<scope>test</scope>
@@ -226,6 +261,68 @@
<dependency>
<groupId>org.jboss.ejb3</groupId>
<artifactId>jboss-ejb3-core</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jboss.microcontainer</groupId>
+ <artifactId>jboss-kernel</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>apache-xerces</groupId>
+ <artifactId>xml-apis</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.microcontainer</groupId>
+ <artifactId>jboss-dependency</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.microcontainer</groupId>
+ <artifactId>jboss-aop-mc-int</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.javaee</groupId>
+ <artifactId>jboss-jaspi-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.javaee</groupId>
+ <artifactId>jboss-jca-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.javaee</groupId>
+ <artifactId>jboss-jacc-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.javaee</groupId>
+ <artifactId>jboss-transaction-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.javaee</groupId>
+ <artifactId>jboss-jms-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.javaee</groupId>
+ <artifactId>jboss-ejb-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-spi</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-log4j</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>sun-jaxws</groupId>
+ <artifactId>jsr181-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>quartz</groupId>
+ <artifactId>quartz</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>sun-jaxws</groupId>
+ <artifactId>jaxws-api</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
@@ -241,17 +338,91 @@
</dependency>
<dependency>
- <groupId>org.jboss.shrinkwrap</groupId>
- <artifactId>shrinkwrap-api</artifactId>
- <scope>test</scope>
+ <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>
+ <groupId>org.jboss.shrinkwrap</groupId>
+ <artifactId>shrinkwrap-impl-base</artifactId>
+ <scope>test</scope>
</dependency>
+ </dependencies>
- </dependencies>
-
+ <profiles>
+ <profile>
+ <id>test-standalone</id>
+ <!-- This does not work for me -->
+ <!--
+ <activation>
+ <property>-test-in-as</property>
+ </activation>
+ -->
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>standalone-tests</id>
+ <phase>test</phase>
+ <goals>
+ <goal>test</goal>
+ </goals>
+ <configuration>
+ <skipTests>false</skipTests>
+ <redirectTestOutputToFile>true</redirectTestOutputToFile>
+ <excludes>
+ <include>org/jboss/test/deployers/as/test/*TestCase.java</include>
+ </excludes>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ <profile>
+ <id>test-in-as</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>in-as-tests</id>
+ <phase>test</phase>
+ <goals>
+ <goal>test</goal>
+ </goals>
+ <configuration>
+ <skipTests>false</skipTests>
+ <redirectTestOutputToFile>true</redirectTestOutputToFile>
+ <excludes>
+ <exclude>org/jboss/test/deployers/test/*TestCase.java</exclude>
+ </excludes>
+ <includes>
+ <include>org/jboss/test/deployers/as/test/*TestCase.java</include>
+ </includes>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-client</artifactId>
+ <version>${project.version}</version>
+ <type>pom</type>
+ </dependency>
+ </dependencies>
+ </profile>
+ </profiles>
+
+
</project>
Modified: trunk/weld-int/deployer-mc-int/src/main/java/org/jboss/weld/integration/deployer/mc/WeldBeanMetaDataDeployerPlugin.java
===================================================================
--- projects/weld-int/trunk/deployer-mc-int/src/main/java/org/jboss/weld/integration/deployer/mc/WeldBeanMetaDataDeployerPlugin.java 2010-06-14 09:54:25 UTC (rev 106025)
+++ trunk/weld-int/deployer-mc-int/src/main/java/org/jboss/weld/integration/deployer/mc/WeldBeanMetaDataDeployerPlugin.java 2010-06-16 17:19:30 UTC (rev 106092)
@@ -22,10 +22,13 @@
package org.jboss.weld.integration.deployer.mc;
import java.util.Map;
+import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import org.jboss.beans.metadata.api.model.FromContext;
+import org.jboss.beans.metadata.spi.AnnotationMetaData;
import org.jboss.beans.metadata.spi.BeanMetaData;
+import org.jboss.beans.metadata.spi.FeatureMetaData;
import org.jboss.beans.metadata.spi.builder.BeanMetaDataBuilder;
import org.jboss.dependency.spi.Controller;
import org.jboss.dependency.spi.ControllerState;
@@ -51,7 +54,7 @@
private final int order;
- private final String[] ignoredSuffixes = new String[] {"_JBossDeployment", "_JBossEjbServices", "_WBInjector", "_JBossJpaServices", "_JBossValidationServices", "_WeldBootstrap", "_WeldBootstrapBean"};
+ //private final String[] ignoredSuffixes = new String[] {"_JBossDeployment", "_JBossEjbServices", "_WBInjector", "_JBossJpaServices", "_JBossValidationServices", "_WeldBootstrap", "_WeldBootstrapBean", "_WebCompJndiBinder", "_JavaModuleJndiBinder"};
/** Map of real bean names and intermediate bean names */
private final Map<Object, Object> intermediateBeans = new ConcurrentHashMap<Object, Object>();
@@ -90,18 +93,24 @@
//Not a Weld deployment
return null;
}
- for (String suffix : ignoredSuffixes)
+// for (String suffix : ignoredSuffixes)
+// {
+// beanMetaData.getAnnotations()
+// if (beanMetaData.getName().endsWith(suffix))
+// {
+// if (beanMetaData.getName().equals(unit.getTopLevel().getName() + suffix))
+// {
+// //Install Weld deployment bean as normal KernelControllerContext
+// return null;
+// }
+// }
+// }
+ if (isSystemBean(unit, beanMetaData))
{
- if (beanMetaData.getName().endsWith(suffix))
- {
- if (beanMetaData.getName().equals(unit.getTopLevel().getName() + suffix))
- {
- //Install Weld deployment bean as normal KernelControllerContext
- return null;
- }
- }
+ //Install Weld deployment bean as normal KernelControllerContext
+ return null;
}
-
+
String beanName = unit.getTopLevel().getName() + "BootstrapBeanInstaller=" + beanMetaData.getName();
BeanMetaDataBuilder builder = BeanMetaDataBuilder.createBuilder(beanName, IntermediateWeldBootstrapBean.class.getName());
builder.addPropertyMetaData("bootstrapBean", builder.createInject(DeployersUtils.getBootstrapBeanName(unit), null, ControllerState.CONFIGURED, ControllerState.CREATE));
@@ -116,6 +125,21 @@
return ctx;
}
+ private boolean isSystemBean(DeploymentUnit unit, BeanMetaData beanMetaData)
+ {
+ String name = beanMetaData.getName();
+ String topLevelName = unit.getTopLevel().getName();
+ if (name.contains(topLevelName) ||
+ name.contains(unit.getSimpleName()) ||
+ name.startsWith("jboss.j2ee:") ||
+ name.startsWith("jboss.naming:") ||
+ name.startsWith("jboss.ejb3") ||
+ name.endsWith("_CompJndiBinder"))
+ return true;
+
+ return false;
+ }
+
public boolean uninstallContext(Controller controller, DeploymentUnit unit, BeanMetaData beanMetaData)
{
//Only remove the intermediate bean if there is one
Added: trunk/weld-int/deployer-mc-int/src/test/java/org/jboss/test/deployers/as/support/Blue.java
===================================================================
--- trunk/weld-int/deployer-mc-int/src/test/java/org/jboss/test/deployers/as/support/Blue.java (rev 0)
+++ trunk/weld-int/deployer-mc-int/src/test/java/org/jboss/test/deployers/as/support/Blue.java 2010-06-16 17:19:30 UTC (rev 106092)
@@ -0,0 +1,41 @@
+/*
+* 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.as.support;
+
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.Retention;
+
+import javax.inject.Qualifier;
+
+/**
+ *
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision: 1.1 $
+ */
+ at Retention(RUNTIME)
+ at Documented
+ at Qualifier
+public @interface Blue {
+
+}
Added: trunk/weld-int/deployer-mc-int/src/test/java/org/jboss/test/deployers/as/support/HttpUtils.java
===================================================================
--- trunk/weld-int/deployer-mc-int/src/test/java/org/jboss/test/deployers/as/support/HttpUtils.java (rev 0)
+++ trunk/weld-int/deployer-mc-int/src/test/java/org/jboss/test/deployers/as/support/HttpUtils.java 2010-06-16 17:19:30 UTC (rev 106092)
@@ -0,0 +1,177 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2008, 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.as.support;
+
+import java.net.URL;
+import java.net.HttpURLConnection;
+import java.io.IOException;
+import org.apache.commons.httpclient.HttpClient;
+import org.apache.commons.httpclient.UsernamePasswordCredentials;
+import org.apache.commons.httpclient.HttpMethodBase;
+import org.apache.commons.httpclient.Header;
+import org.apache.commons.httpclient.methods.GetMethod;
+import org.apache.commons.httpclient.methods.PostMethod;
+import org.apache.commons.httpclient.methods.HeadMethod;
+import org.apache.commons.httpclient.methods.OptionsMethod;
+import org.apache.commons.httpclient.methods.PutMethod;
+import org.apache.commons.httpclient.methods.DeleteMethod;
+import org.apache.commons.httpclient.methods.TraceMethod;
+import org.jboss.logging.Logger;
+
+/** Utilities for client http requests
+ *
+ * @author Scott.Stark at jboss.org
+ * @version $Revision: 81036 $
+ */
+public class HttpUtils
+{
+ private static Logger log = Logger.getLogger(HttpUtils.class);
+ private static String baseURL = "http://jduke:theduke@" + System.getProperty("jbosstest.server.host", "localhost") + ":" + Integer.getInteger("web.port", 8080) + "/";
+ private static String baseURLNoAuth = "http://" + System.getProperty("jbosstest.server.host", "localhost") + ":" + Integer.getInteger("web.port", 8080) + "/";
+
+ public static final int GET = 1;
+ public static final int POST = 2;
+ public static final int HEAD = 3;
+ public static final int OPTIONS = 4;
+ public static final int PUT = 5;
+ public static final int DELETE = 6;
+ public static final int TRACE = 7;
+
+ public static String getBaseURL()
+ {
+ return baseURL;
+ }
+ public static String getBaseURL(String username, String password)
+ {
+ String url = "http://"+username+":"+password+"@" + System.getProperty("jbosstest.server.host", "localhost") + ":"
+ + Integer.getInteger("web.port", 8080) + "/";
+ return url;
+ }
+ public static String getBaseURLNoAuth()
+ {
+ return baseURLNoAuth;
+ }
+
+ /** Perform a get on the indicated URL and assert an HTTP_OK response code
+ *
+ * @param url
+ * @return The commons HttpClient used to perform the get
+ * @throws Exception on any failure
+ */
+ public static HttpMethodBase accessURL(URL url) throws Exception
+ {
+ return accessURL(url, "JBossTest Servlets", HttpURLConnection.HTTP_OK);
+ }
+ /** Perform a get on the indicated URL and assert that the response code
+ * matches the expectedHttpCode argument.
+ *
+ * @param url
+ * @param expectedHttpCode the http response code expected
+ * @return The commons HttpClient used to perform the get
+ * @throws Exception on any failure
+ */
+ public static HttpMethodBase accessURL(URL url, String realm,
+ int expectedHttpCode)
+ throws Exception
+ {
+ return accessURL(url, realm, expectedHttpCode, null);
+ }
+ public static HttpMethodBase accessURL(URL url, String realm,
+ int expectedHttpCode, int type)
+ throws Exception
+ {
+ return accessURL(url, realm, expectedHttpCode, null, type);
+ }
+ public static HttpMethodBase accessURL(URL url, String realm,
+ int expectedHttpCode, Header[] hdrs)
+ throws Exception
+ {
+ return accessURL(url, realm, expectedHttpCode, hdrs, GET);
+ }
+ public static HttpMethodBase accessURL(URL url, String realm,
+ int expectedHttpCode, Header[] hdrs, int type)
+ throws Exception
+ {
+ HttpClient httpConn = new HttpClient();
+ HttpMethodBase request = createMethod(url, type);
+ int hdrCount = hdrs != null ? hdrs.length : 0;
+ for(int n = 0; n < hdrCount; n ++)
+ request.addRequestHeader(hdrs[n]);
+ try
+ {
+ log.debug("Connecting to: "+url);
+ String userInfo = url.getUserInfo();
+ if( userInfo != null )
+ {
+ UsernamePasswordCredentials auth = new UsernamePasswordCredentials(userInfo);
+ httpConn.getState().setCredentials(realm, url.getHost(), auth);
+ }
+ log.debug("RequestURI: "+request.getURI());
+ int responseCode = httpConn.executeMethod(request);
+ String response = request.getStatusText();
+ log.debug("responseCode="+responseCode+", response="+response);
+ String content = request.getResponseBodyAsString();
+ log.debug(content);
+ // Validate that we are seeing the requested response code
+ if( responseCode != expectedHttpCode )
+ {
+ throw new IOException("Expected reply code:"+expectedHttpCode
+ +", actual="+responseCode);
+ }
+ }
+ catch(IOException e)
+ {
+ throw e;
+ }
+ return request;
+ }
+
+ public static HttpMethodBase createMethod(URL url, int type)
+ {
+ HttpMethodBase request = null;
+ switch( type )
+ {
+ case GET:
+ request = new GetMethod(url.toString());
+ break;
+ case POST:
+ request = new PostMethod(url.toString());
+ break;
+ case HEAD:
+ request = new HeadMethod(url.toString());
+ break;
+ case OPTIONS:
+ request = new OptionsMethod(url.toString());
+ break;
+ case PUT:
+ request = new PutMethod(url.toString());
+ break;
+ case DELETE:
+ request = new DeleteMethod(url.toString());
+ break;
+ case TRACE:
+ request = new TraceMethod(url.toString());
+ break;
+ }
+ return request;
+ }
+}
Added: trunk/weld-int/deployer-mc-int/src/test/java/org/jboss/test/deployers/as/support/Red.java
===================================================================
--- trunk/weld-int/deployer-mc-int/src/test/java/org/jboss/test/deployers/as/support/Red.java (rev 0)
+++ trunk/weld-int/deployer-mc-int/src/test/java/org/jboss/test/deployers/as/support/Red.java 2010-06-16 17:19:30 UTC (rev 106092)
@@ -0,0 +1,41 @@
+/*
+* 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.as.support;
+
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.Retention;
+
+import javax.inject.Qualifier;
+
+/**
+ *
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision: 1.1 $
+ */
+ at Retention(RUNTIME)
+ at Documented
+ at Qualifier
+public @interface Red {
+
+}
Added: trunk/weld-int/deployer-mc-int/src/test/java/org/jboss/test/deployers/as/support/mctoweld/mc/BlueMcBeanNoDependencies.java
===================================================================
--- trunk/weld-int/deployer-mc-int/src/test/java/org/jboss/test/deployers/as/support/mctoweld/mc/BlueMcBeanNoDependencies.java (rev 0)
+++ trunk/weld-int/deployer-mc-int/src/test/java/org/jboss/test/deployers/as/support/mctoweld/mc/BlueMcBeanNoDependencies.java 2010-06-16 17:19:30 UTC (rev 106092)
@@ -0,0 +1,41 @@
+/*
+* 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.as.support.mctoweld.mc;
+
+import java.io.Serializable;
+
+import org.jboss.kernel.weld.metadata.api.annotations.WeldEnabled;
+import org.jboss.test.deployers.as.support.Blue;
+
+/**
+ *
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision: 1.1 $
+ */
+ at WeldEnabled
+ at Blue
+public class BlueMcBeanNoDependencies implements McBeanNoDependencies, Serializable
+{
+
+ private static final long serialVersionUID = 1L;
+
+}
Added: trunk/weld-int/deployer-mc-int/src/test/java/org/jboss/test/deployers/as/support/mctoweld/mc/McBeanNoDependencies.java
===================================================================
--- trunk/weld-int/deployer-mc-int/src/test/java/org/jboss/test/deployers/as/support/mctoweld/mc/McBeanNoDependencies.java (rev 0)
+++ trunk/weld-int/deployer-mc-int/src/test/java/org/jboss/test/deployers/as/support/mctoweld/mc/McBeanNoDependencies.java 2010-06-16 17:19:30 UTC (rev 106092)
@@ -0,0 +1,36 @@
+/*
+* 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.as.support.mctoweld.mc;
+
+import javax.enterprise.inject.Default;
+
+import org.jboss.kernel.weld.metadata.api.annotations.WeldEnabled;
+
+/**
+ *
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision: 1.1 $
+ */
+public interface McBeanNoDependencies
+{
+
+}
Added: trunk/weld-int/deployer-mc-int/src/test/java/org/jboss/test/deployers/as/support/mctoweld/mc/RedMcBeanNoDependencies.java
===================================================================
--- trunk/weld-int/deployer-mc-int/src/test/java/org/jboss/test/deployers/as/support/mctoweld/mc/RedMcBeanNoDependencies.java (rev 0)
+++ trunk/weld-int/deployer-mc-int/src/test/java/org/jboss/test/deployers/as/support/mctoweld/mc/RedMcBeanNoDependencies.java 2010-06-16 17:19:30 UTC (rev 106092)
@@ -0,0 +1,41 @@
+/*
+* 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.as.support.mctoweld.mc;
+
+import java.io.Serializable;
+
+import org.jboss.kernel.weld.metadata.api.annotations.WeldEnabled;
+import org.jboss.test.deployers.as.support.Red;
+
+/**
+ *
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision: 1.1 $
+ */
+ at WeldEnabled
+ at Red
+public class RedMcBeanNoDependencies implements McBeanNoDependencies, Serializable
+{
+
+ private static final long serialVersionUID = 1L;
+
+}
Added: trunk/weld-int/deployer-mc-int/src/test/java/org/jboss/test/deployers/as/support/mctoweld/weld/Kickstart.java
===================================================================
--- trunk/weld-int/deployer-mc-int/src/test/java/org/jboss/test/deployers/as/support/mctoweld/weld/Kickstart.java (rev 0)
+++ trunk/weld-int/deployer-mc-int/src/test/java/org/jboss/test/deployers/as/support/mctoweld/weld/Kickstart.java 2010-06-16 17:19:30 UTC (rev 106092)
@@ -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.as.support.mctoweld.weld;
+
+import javax.ejb.Local;
+
+/**
+ *
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision: 1.1 $
+ */
+ at Local
+public interface Kickstart
+{
+
+}
Added: trunk/weld-int/deployer-mc-int/src/test/java/org/jboss/test/deployers/as/support/mctoweld/weld/KickstartEjb.java
===================================================================
--- trunk/weld-int/deployer-mc-int/src/test/java/org/jboss/test/deployers/as/support/mctoweld/weld/KickstartEjb.java (rev 0)
+++ trunk/weld-int/deployer-mc-int/src/test/java/org/jboss/test/deployers/as/support/mctoweld/weld/KickstartEjb.java 2010-06-16 17:19:30 UTC (rev 106092)
@@ -0,0 +1,34 @@
+/*
+* 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.as.support.mctoweld.weld;
+
+import javax.ejb.Stateless;
+
+/**
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision: 1.1 $
+ */
+ at Stateless
+public class KickstartEjb
+{
+
+}
Added: trunk/weld-int/deployer-mc-int/src/test/java/org/jboss/test/deployers/as/support/mctoweld/weld/McToWeldLocalInterface.java
===================================================================
--- trunk/weld-int/deployer-mc-int/src/test/java/org/jboss/test/deployers/as/support/mctoweld/weld/McToWeldLocalInterface.java (rev 0)
+++ trunk/weld-int/deployer-mc-int/src/test/java/org/jboss/test/deployers/as/support/mctoweld/weld/McToWeldLocalInterface.java 2010-06-16 17:19:30 UTC (rev 106092)
@@ -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.as.support.mctoweld.weld;
+
+import javax.ejb.Local;
+
+/**
+ *
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision: 1.1 $
+ */
+ at Local
+public interface McToWeldLocalInterface
+{
+ String getResult();
+}
Added: trunk/weld-int/deployer-mc-int/src/test/java/org/jboss/test/deployers/as/support/mctoweld/weld/WeldWithMcBean.java
===================================================================
--- trunk/weld-int/deployer-mc-int/src/test/java/org/jboss/test/deployers/as/support/mctoweld/weld/WeldWithMcBean.java (rev 0)
+++ trunk/weld-int/deployer-mc-int/src/test/java/org/jboss/test/deployers/as/support/mctoweld/weld/WeldWithMcBean.java 2010-06-16 17:19:30 UTC (rev 106092)
@@ -0,0 +1,79 @@
+/*
+* 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.as.support.mctoweld.weld;
+
+import javax.enterprise.context.RequestScoped;
+import javax.inject.Inject;
+import javax.inject.Named;
+
+import org.jboss.logging.Logger;
+import org.jboss.test.deployers.as.support.Blue;
+import org.jboss.test.deployers.as.support.Red;
+import org.jboss.test.deployers.as.support.mctoweld.mc.BlueMcBeanNoDependencies;
+import org.jboss.test.deployers.as.support.mctoweld.mc.McBeanNoDependencies;
+import org.jboss.test.deployers.as.support.mctoweld.mc.RedMcBeanNoDependencies;
+import org.jboss.test.deployers.as.support.weld.simple.RedWeldDependency;
+
+/**
+ *
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision: 1.1 $
+ */
+ at Named
+ at RequestScoped
+public class WeldWithMcBean
+{
+ Logger log = Logger.getLogger(WeldWithMcBean.class);
+
+ @Inject @Blue
+ McBeanNoDependencies blue;
+
+ McBeanNoDependencies red;
+
+ @Inject
+ public void setRed(@Red McBeanNoDependencies red)
+ {
+ this.red = red;
+ }
+
+ public String getResult()
+ {
+ log.info("getting result");
+ String error = validate(blue, BlueMcBeanNoDependencies.class);
+ if (error != null)
+ return error;
+ error = validate(red, RedMcBeanNoDependencies.class);
+ if (error != null)
+ return error;
+ return "WeldWithMcBean#ok#";
+ }
+
+ private String validate(McBeanNoDependencies dependency, Class<?> expected)
+ {
+ if (dependency == null)
+ return "Null dependency (" + expected.getName() + ")";
+ if (!expected.isAssignableFrom(dependency.getClass()))
+ return "Expected (" + expected.getName() + ")";
+ return null;
+ }
+
+}
Added: trunk/weld-int/deployer-mc-int/src/test/java/org/jboss/test/deployers/as/support/mctoweld/weld/WeldWithMcEjb.java
===================================================================
--- trunk/weld-int/deployer-mc-int/src/test/java/org/jboss/test/deployers/as/support/mctoweld/weld/WeldWithMcEjb.java (rev 0)
+++ trunk/weld-int/deployer-mc-int/src/test/java/org/jboss/test/deployers/as/support/mctoweld/weld/WeldWithMcEjb.java 2010-06-16 17:19:30 UTC (rev 106092)
@@ -0,0 +1,78 @@
+/*
+* 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.as.support.mctoweld.weld;
+
+import javax.ejb.Stateless;
+import javax.inject.Inject;
+import javax.inject.Named;
+
+import org.jboss.logging.Logger;
+import org.jboss.test.deployers.as.support.Blue;
+import org.jboss.test.deployers.as.support.Red;
+import org.jboss.test.deployers.as.support.mctoweld.mc.BlueMcBeanNoDependencies;
+import org.jboss.test.deployers.as.support.mctoweld.mc.McBeanNoDependencies;
+import org.jboss.test.deployers.as.support.mctoweld.mc.RedMcBeanNoDependencies;
+
+/**
+ *
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision: 1.1 $
+ */
+ at Named("weldWithMcEjb")
+ at Stateless
+public class WeldWithMcEjb implements McToWeldLocalInterface
+{
+ Logger log = Logger.getLogger(WeldWithMcEjb.class);
+
+ @Inject @Blue
+ McBeanNoDependencies blue;
+
+ McBeanNoDependencies red;
+
+ @Inject
+ public void setRed(@Red McBeanNoDependencies red)
+ {
+ this.red = red;
+ }
+
+ public String getResult()
+ {
+ log.info("getting result");
+ String error = validate(blue, BlueMcBeanNoDependencies.class);
+ if (error != null)
+ return error;
+ error = validate(red, RedMcBeanNoDependencies.class);
+ if (error != null)
+ return error;
+ return "WeldWithMcEjb#ok#";
+ }
+
+ private String validate(McBeanNoDependencies dependency, Class<?> expected)
+ {
+ if (dependency == null)
+ return "Null dependency (" + expected.getName() + ")";
+ if (!expected.isAssignableFrom(dependency.getClass()))
+ return "Expected (" + expected.getName() + ")";
+ return null;
+ }
+
+}
Added: trunk/weld-int/deployer-mc-int/src/test/java/org/jboss/test/deployers/as/support/weld/simple/BlueWeldDependency.java
===================================================================
--- trunk/weld-int/deployer-mc-int/src/test/java/org/jboss/test/deployers/as/support/weld/simple/BlueWeldDependency.java (rev 0)
+++ trunk/weld-int/deployer-mc-int/src/test/java/org/jboss/test/deployers/as/support/weld/simple/BlueWeldDependency.java 2010-06-16 17:19:30 UTC (rev 106092)
@@ -0,0 +1,39 @@
+/*
+* 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.as.support.weld.simple;
+
+import java.io.Serializable;
+
+import org.jboss.test.deployers.as.support.Blue;
+
+/**
+ *
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision: 1.1 $
+ */
+ at Blue
+public class BlueWeldDependency implements WeldDependency, Serializable
+{
+
+ private static final long serialVersionUID = 1L;
+
+}
Added: trunk/weld-int/deployer-mc-int/src/test/java/org/jboss/test/deployers/as/support/weld/simple/RedWeldDependency.java
===================================================================
--- trunk/weld-int/deployer-mc-int/src/test/java/org/jboss/test/deployers/as/support/weld/simple/RedWeldDependency.java (rev 0)
+++ trunk/weld-int/deployer-mc-int/src/test/java/org/jboss/test/deployers/as/support/weld/simple/RedWeldDependency.java 2010-06-16 17:19:30 UTC (rev 106092)
@@ -0,0 +1,37 @@
+/*
+* 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.as.support.weld.simple;
+
+import java.io.Serializable;
+
+import org.jboss.test.deployers.as.support.Red;
+
+/**
+ *
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision: 1.1 $
+ */
+ at Red
+public class RedWeldDependency implements WeldDependency, Serializable
+{
+ private static final long serialVersionUID = 1L;
+}
Added: trunk/weld-int/deployer-mc-int/src/test/java/org/jboss/test/deployers/as/support/weld/simple/SimpleLocalInterface.java
===================================================================
--- trunk/weld-int/deployer-mc-int/src/test/java/org/jboss/test/deployers/as/support/weld/simple/SimpleLocalInterface.java (rev 0)
+++ trunk/weld-int/deployer-mc-int/src/test/java/org/jboss/test/deployers/as/support/weld/simple/SimpleLocalInterface.java 2010-06-16 17:19:30 UTC (rev 106092)
@@ -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.as.support.weld.simple;
+
+import javax.ejb.Local;
+
+/**
+ *
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision: 1.1 $
+ */
+ at Local
+public interface SimpleLocalInterface
+{
+ String getResult();
+}
Added: trunk/weld-int/deployer-mc-int/src/test/java/org/jboss/test/deployers/as/support/weld/simple/SimpleWeldBeanNoInjection.java
===================================================================
--- trunk/weld-int/deployer-mc-int/src/test/java/org/jboss/test/deployers/as/support/weld/simple/SimpleWeldBeanNoInjection.java (rev 0)
+++ trunk/weld-int/deployer-mc-int/src/test/java/org/jboss/test/deployers/as/support/weld/simple/SimpleWeldBeanNoInjection.java 2010-06-16 17:19:30 UTC (rev 106092)
@@ -0,0 +1,46 @@
+/*
+* 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.as.support.weld.simple;
+
+import javax.enterprise.context.RequestScoped;
+import javax.inject.Named;
+
+import org.jboss.logging.Logger;
+
+/**
+ *
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision: 1.1 $
+ */
+ at Named
+ at RequestScoped
+public class SimpleWeldBeanNoInjection
+{
+ Logger log = Logger.getLogger(SimpleWeldBeanNoInjection.class);
+
+ public String getResult()
+ {
+ log.info("getting result");
+ return "SimpleWeldBeanNoInjection#ok#";
+ }
+
+}
Added: trunk/weld-int/deployer-mc-int/src/test/java/org/jboss/test/deployers/as/support/weld/simple/SimpleWeldBeanWeldInjection.java
===================================================================
--- trunk/weld-int/deployer-mc-int/src/test/java/org/jboss/test/deployers/as/support/weld/simple/SimpleWeldBeanWeldInjection.java (rev 0)
+++ trunk/weld-int/deployer-mc-int/src/test/java/org/jboss/test/deployers/as/support/weld/simple/SimpleWeldBeanWeldInjection.java 2010-06-16 17:19:30 UTC (rev 106092)
@@ -0,0 +1,75 @@
+/*
+* 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.as.support.weld.simple;
+
+import javax.enterprise.context.RequestScoped;
+import javax.inject.Inject;
+import javax.inject.Named;
+
+import org.jboss.logging.Logger;
+import org.jboss.test.deployers.as.support.Blue;
+import org.jboss.test.deployers.as.support.Red;
+
+/**
+ *
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision: 1.1 $
+ */
+ at Named
+ at RequestScoped
+public class SimpleWeldBeanWeldInjection
+{
+ Logger log = Logger.getLogger(SimpleWeldBeanWeldInjection.class);
+
+ @Inject @Blue
+ WeldDependency blue;
+
+ WeldDependency red;
+
+ @Inject
+ public void setRed(@Red WeldDependency red)
+ {
+ this.red = red;
+ }
+
+ public String getResult()
+ {
+ log.info("getting result");
+ String error = validate(blue, BlueWeldDependency.class);
+ if (error != null)
+ return error;
+ error = validate(red, RedWeldDependency.class);
+ if (error != null)
+ return error;
+ return "SimpleWeldBeanWeldInjection#ok#";
+ }
+
+ private String validate(WeldDependency dependency, Class<?> expected)
+ {
+ if (dependency == null)
+ return "Null dependency (" + expected.getName() + ")";
+ if (!expected.isAssignableFrom(dependency.getClass()))
+ return "Expected (" + expected.getName() + ")";
+ return null;
+ }
+
+}
Added: trunk/weld-int/deployer-mc-int/src/test/java/org/jboss/test/deployers/as/support/weld/simple/SimpleWeldEjbNoInjection.java
===================================================================
--- trunk/weld-int/deployer-mc-int/src/test/java/org/jboss/test/deployers/as/support/weld/simple/SimpleWeldEjbNoInjection.java (rev 0)
+++ trunk/weld-int/deployer-mc-int/src/test/java/org/jboss/test/deployers/as/support/weld/simple/SimpleWeldEjbNoInjection.java 2010-06-16 17:19:30 UTC (rev 106092)
@@ -0,0 +1,46 @@
+/*
+* 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.as.support.weld.simple;
+
+import javax.ejb.Stateless;
+import javax.inject.Named;
+
+import org.jboss.logging.Logger;
+
+/**
+ *
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision: 1.1 $
+ */
+ at Named("simpleWeldEjbNoInjection")
+ at Stateless
+public class SimpleWeldEjbNoInjection implements SimpleLocalInterface
+{
+ Logger log = Logger.getLogger(SimpleWeldEjbNoInjection.class);
+
+ public String getResult()
+ {
+ log.info("getting result");
+ return "SimpleWeldEjbNoInjection#ok#";
+ }
+
+}
Added: trunk/weld-int/deployer-mc-int/src/test/java/org/jboss/test/deployers/as/support/weld/simple/SimpleWeldEjbWeldInjection.java
===================================================================
--- trunk/weld-int/deployer-mc-int/src/test/java/org/jboss/test/deployers/as/support/weld/simple/SimpleWeldEjbWeldInjection.java (rev 0)
+++ trunk/weld-int/deployer-mc-int/src/test/java/org/jboss/test/deployers/as/support/weld/simple/SimpleWeldEjbWeldInjection.java 2010-06-16 17:19:30 UTC (rev 106092)
@@ -0,0 +1,75 @@
+/*
+* 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.as.support.weld.simple;
+
+import javax.ejb.Stateful;
+import javax.inject.Inject;
+import javax.inject.Named;
+
+import org.jboss.logging.Logger;
+import org.jboss.test.deployers.as.support.Blue;
+import org.jboss.test.deployers.as.support.Red;
+
+/**
+ *
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision: 1.1 $
+ */
+ at Named("simpleWeldEjbWeldInjection")
+ at Stateful
+public class SimpleWeldEjbWeldInjection implements SimpleLocalInterface
+{
+ Logger log = Logger.getLogger(SimpleWeldEjbWeldInjection.class);
+
+ @Inject @Blue
+ WeldDependency blue;
+
+ WeldDependency red;
+
+ @Inject
+ public void setRed(@Red WeldDependency red)
+ {
+ this.red = red;
+ }
+
+ public String getResult()
+ {
+ log.info("getting result");
+ String error = validate(blue, BlueWeldDependency.class);
+ if (error != null)
+ return error;
+ error = validate(red, RedWeldDependency.class);
+ if (error != null)
+ return error;
+ return "SimpleWeldBeanEjbInjection#ok#";
+ }
+
+ private String validate(WeldDependency dependency, Class<?> expected)
+ {
+ if (dependency == null)
+ return "Null dependency (" + expected.getName() + ")";
+ if (!expected.isAssignableFrom(dependency.getClass()))
+ return "Expected (" + expected.getName() + ")";
+ return null;
+ }
+
+}
Added: trunk/weld-int/deployer-mc-int/src/test/java/org/jboss/test/deployers/as/support/weld/simple/WeldDependency.java
===================================================================
--- trunk/weld-int/deployer-mc-int/src/test/java/org/jboss/test/deployers/as/support/weld/simple/WeldDependency.java (rev 0)
+++ trunk/weld-int/deployer-mc-int/src/test/java/org/jboss/test/deployers/as/support/weld/simple/WeldDependency.java 2010-06-16 17:19:30 UTC (rev 106092)
@@ -0,0 +1,32 @@
+/*
+* 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.as.support.weld.simple;
+
+/**
+ *
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision: 1.1 $
+ */
+public interface WeldDependency
+{
+
+}
Added: trunk/weld-int/deployer-mc-int/src/test/java/org/jboss/test/deployers/as/support/weldtomctoweld/mc/BlueMcBeanWeldDependencies.java
===================================================================
--- trunk/weld-int/deployer-mc-int/src/test/java/org/jboss/test/deployers/as/support/weldtomctoweld/mc/BlueMcBeanWeldDependencies.java (rev 0)
+++ trunk/weld-int/deployer-mc-int/src/test/java/org/jboss/test/deployers/as/support/weldtomctoweld/mc/BlueMcBeanWeldDependencies.java 2010-06-16 17:19:30 UTC (rev 106092)
@@ -0,0 +1,73 @@
+/*
+* 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.as.support.weldtomctoweld.mc;
+
+import java.io.Serializable;
+
+import javax.inject.Inject;
+
+import org.jboss.kernel.weld.metadata.api.annotations.Weld;
+import org.jboss.kernel.weld.metadata.api.annotations.WeldEnabled;
+import org.jboss.test.deployers.as.support.Blue;
+import org.jboss.test.deployers.as.support.Red;
+import org.jboss.test.deployers.as.support.weldtomctoweld.weld.BlueWeldMcDependency;
+import org.jboss.test.deployers.as.support.weldtomctoweld.weld.RedWeldMcDependency;
+import org.jboss.test.deployers.as.support.weldtomctoweld.weld.WeldMcDependency;
+
+/**
+ *
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision: 1.1 $
+ */
+ at WeldEnabled
+ at Blue
+public class BlueMcBeanWeldDependencies implements McBeanWeldDependencies, Serializable
+{
+ private static final long serialVersionUID = 1L;
+
+ @Inject
+ @Weld
+ @Red
+ WeldMcDependency red;
+
+ WeldMcDependency blue;
+
+ @Inject @Weld
+ public void setBlue(@Blue WeldMcDependency blue)
+ {
+ this.blue = blue;
+ }
+
+ public String getResult()
+ {
+ if (red == null)
+ return "null red (MC)";
+ if (blue == null)
+ return "null blue (MC)";
+ if (red instanceof RedWeldMcDependency == false)
+ return "red is not a RedWeldDependency";
+ if (blue instanceof BlueWeldMcDependency == false)
+ return "blue is not a BlueWeldDependency";
+ return null;
+ }
+
+}
Added: trunk/weld-int/deployer-mc-int/src/test/java/org/jboss/test/deployers/as/support/weldtomctoweld/mc/McBeanWeldDependencies.java
===================================================================
--- trunk/weld-int/deployer-mc-int/src/test/java/org/jboss/test/deployers/as/support/weldtomctoweld/mc/McBeanWeldDependencies.java (rev 0)
+++ trunk/weld-int/deployer-mc-int/src/test/java/org/jboss/test/deployers/as/support/weldtomctoweld/mc/McBeanWeldDependencies.java 2010-06-16 17:19:30 UTC (rev 106092)
@@ -0,0 +1,33 @@
+/*
+* 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.as.support.weldtomctoweld.mc;
+
+
+/**
+ *
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision: 1.1 $
+ */
+public interface McBeanWeldDependencies
+{
+ String getResult();
+}
Added: trunk/weld-int/deployer-mc-int/src/test/java/org/jboss/test/deployers/as/support/weldtomctoweld/mc/RedMcBeanWeldDependencies.java
===================================================================
--- trunk/weld-int/deployer-mc-int/src/test/java/org/jboss/test/deployers/as/support/weldtomctoweld/mc/RedMcBeanWeldDependencies.java (rev 0)
+++ trunk/weld-int/deployer-mc-int/src/test/java/org/jboss/test/deployers/as/support/weldtomctoweld/mc/RedMcBeanWeldDependencies.java 2010-06-16 17:19:30 UTC (rev 106092)
@@ -0,0 +1,72 @@
+/*
+* 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.as.support.weldtomctoweld.mc;
+
+import java.io.Serializable;
+
+import javax.inject.Inject;
+
+import org.jboss.kernel.weld.metadata.api.annotations.Weld;
+import org.jboss.kernel.weld.metadata.api.annotations.WeldEnabled;
+import org.jboss.test.deployers.as.support.Blue;
+import org.jboss.test.deployers.as.support.Red;
+import org.jboss.test.deployers.as.support.weldtomctoweld.weld.BlueWeldMcDependency;
+import org.jboss.test.deployers.as.support.weldtomctoweld.weld.RedWeldMcDependency;
+import org.jboss.test.deployers.as.support.weldtomctoweld.weld.WeldMcDependency;
+
+/**
+ *
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision: 1.1 $
+ */
+ at WeldEnabled
+ at Red
+public class RedMcBeanWeldDependencies implements McBeanWeldDependencies, Serializable
+{
+ private static final long serialVersionUID = 1L;
+
+ @Inject
+ @Weld
+ @Red
+ WeldMcDependency red;
+
+ WeldMcDependency blue;
+
+ @Inject @Weld
+ public void setBlue(@Blue WeldMcDependency blue)
+ {
+ this.blue = blue;
+ }
+
+ public String getResult()
+ {
+ if (red == null)
+ return "null red (MC)";
+ if (blue == null)
+ return "null blue (MC)";
+ if (red instanceof RedWeldMcDependency == false)
+ return "red is not a RedWeldDependency";
+ if (blue instanceof BlueWeldMcDependency == false)
+ return "blue is not a BlueWeldDependency";
+ return null;
+ }
+}
Added: trunk/weld-int/deployer-mc-int/src/test/java/org/jboss/test/deployers/as/support/weldtomctoweld/weld/BlueWeldMcDependency.java
===================================================================
--- trunk/weld-int/deployer-mc-int/src/test/java/org/jboss/test/deployers/as/support/weldtomctoweld/weld/BlueWeldMcDependency.java (rev 0)
+++ trunk/weld-int/deployer-mc-int/src/test/java/org/jboss/test/deployers/as/support/weldtomctoweld/weld/BlueWeldMcDependency.java 2010-06-16 17:19:30 UTC (rev 106092)
@@ -0,0 +1,34 @@
+/*
+* 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.as.support.weldtomctoweld.weld;
+
+import org.jboss.test.deployers.as.support.Blue;
+
+/**
+ *
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision: 1.1 $
+ */
+ at Blue
+public class BlueWeldMcDependency implements WeldMcDependency
+{
+}
Added: trunk/weld-int/deployer-mc-int/src/test/java/org/jboss/test/deployers/as/support/weldtomctoweld/weld/Kickstart.java
===================================================================
--- trunk/weld-int/deployer-mc-int/src/test/java/org/jboss/test/deployers/as/support/weldtomctoweld/weld/Kickstart.java (rev 0)
+++ trunk/weld-int/deployer-mc-int/src/test/java/org/jboss/test/deployers/as/support/weldtomctoweld/weld/Kickstart.java 2010-06-16 17:19:30 UTC (rev 106092)
@@ -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.as.support.weldtomctoweld.weld;
+
+import javax.ejb.Local;
+
+/**
+ *
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision: 1.1 $
+ */
+ at Local
+public interface Kickstart
+{
+
+}
Added: trunk/weld-int/deployer-mc-int/src/test/java/org/jboss/test/deployers/as/support/weldtomctoweld/weld/KickstartEjb.java
===================================================================
--- trunk/weld-int/deployer-mc-int/src/test/java/org/jboss/test/deployers/as/support/weldtomctoweld/weld/KickstartEjb.java (rev 0)
+++ trunk/weld-int/deployer-mc-int/src/test/java/org/jboss/test/deployers/as/support/weldtomctoweld/weld/KickstartEjb.java 2010-06-16 17:19:30 UTC (rev 106092)
@@ -0,0 +1,34 @@
+/*
+* 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.as.support.weldtomctoweld.weld;
+
+import javax.ejb.Stateless;
+
+/**
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision: 1.1 $
+ */
+ at Stateless
+public class KickstartEjb
+{
+
+}
Added: trunk/weld-int/deployer-mc-int/src/test/java/org/jboss/test/deployers/as/support/weldtomctoweld/weld/RedWeldMcDependency.java
===================================================================
--- trunk/weld-int/deployer-mc-int/src/test/java/org/jboss/test/deployers/as/support/weldtomctoweld/weld/RedWeldMcDependency.java (rev 0)
+++ trunk/weld-int/deployer-mc-int/src/test/java/org/jboss/test/deployers/as/support/weldtomctoweld/weld/RedWeldMcDependency.java 2010-06-16 17:19:30 UTC (rev 106092)
@@ -0,0 +1,34 @@
+/*
+* 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.as.support.weldtomctoweld.weld;
+
+import org.jboss.test.deployers.as.support.Red;
+
+/**
+ *
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision: 1.1 $
+ */
+ at Red
+public class RedWeldMcDependency implements WeldMcDependency
+{
+}
Added: trunk/weld-int/deployer-mc-int/src/test/java/org/jboss/test/deployers/as/support/weldtomctoweld/weld/WeldMcDependency.java
===================================================================
--- trunk/weld-int/deployer-mc-int/src/test/java/org/jboss/test/deployers/as/support/weldtomctoweld/weld/WeldMcDependency.java (rev 0)
+++ trunk/weld-int/deployer-mc-int/src/test/java/org/jboss/test/deployers/as/support/weldtomctoweld/weld/WeldMcDependency.java 2010-06-16 17:19:30 UTC (rev 106092)
@@ -0,0 +1,32 @@
+/*
+* 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.as.support.weldtomctoweld.weld;
+
+/**
+ *
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision: 1.1 $
+ */
+public interface WeldMcDependency
+{
+
+}
Added: trunk/weld-int/deployer-mc-int/src/test/java/org/jboss/test/deployers/as/support/weldtomctoweld/weld/WeldToMcToWeldLocalInterface.java
===================================================================
--- trunk/weld-int/deployer-mc-int/src/test/java/org/jboss/test/deployers/as/support/weldtomctoweld/weld/WeldToMcToWeldLocalInterface.java (rev 0)
+++ trunk/weld-int/deployer-mc-int/src/test/java/org/jboss/test/deployers/as/support/weldtomctoweld/weld/WeldToMcToWeldLocalInterface.java 2010-06-16 17:19:30 UTC (rev 106092)
@@ -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.as.support.weldtomctoweld.weld;
+
+import javax.ejb.Local;
+
+/**
+ *
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision: 1.1 $
+ */
+ at Local
+public interface WeldToMcToWeldLocalInterface
+{
+ String getResult();
+}
Added: trunk/weld-int/deployer-mc-int/src/test/java/org/jboss/test/deployers/as/support/weldtomctoweld/weld/WeldWithMcWithWeldBean.java
===================================================================
--- trunk/weld-int/deployer-mc-int/src/test/java/org/jboss/test/deployers/as/support/weldtomctoweld/weld/WeldWithMcWithWeldBean.java (rev 0)
+++ trunk/weld-int/deployer-mc-int/src/test/java/org/jboss/test/deployers/as/support/weldtomctoweld/weld/WeldWithMcWithWeldBean.java 2010-06-16 17:19:30 UTC (rev 106092)
@@ -0,0 +1,84 @@
+/*
+* 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.as.support.weldtomctoweld.weld;
+
+import javax.enterprise.context.RequestScoped;
+import javax.inject.Inject;
+import javax.inject.Named;
+
+import org.jboss.logging.Logger;
+import org.jboss.test.deployers.as.support.Blue;
+import org.jboss.test.deployers.as.support.Red;
+import org.jboss.test.deployers.as.support.weldtomctoweld.mc.BlueMcBeanWeldDependencies;
+import org.jboss.test.deployers.as.support.weldtomctoweld.mc.McBeanWeldDependencies;
+import org.jboss.test.deployers.as.support.weldtomctoweld.mc.RedMcBeanWeldDependencies;
+
+/**
+ *
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision: 1.1 $
+ */
+ at Named
+ at RequestScoped
+public class WeldWithMcWithWeldBean
+{
+ Logger log = Logger.getLogger(WeldWithMcWithWeldBean.class);
+
+ @Inject @Blue
+ McBeanWeldDependencies blue;
+
+ McBeanWeldDependencies red;
+
+ @Inject
+ public void setRed(@Red McBeanWeldDependencies red)
+ {
+ this.red = red;
+ }
+
+ public String getResult()
+ {
+ log.info("getting result");
+ String error = validate(blue, BlueMcBeanWeldDependencies.class);
+ if (error != null)
+ return error;
+ error = validate(red, RedMcBeanWeldDependencies.class);
+ if (error != null)
+ return error;
+ error = red.getResult();
+ if (error != null)
+ return error;
+ error = blue.getResult();
+ if (error != null)
+ return error;
+ return "WeldWithMcWithWeldBean#ok#";
+ }
+
+ private String validate(McBeanWeldDependencies dependency, Class<?> expected)
+ {
+ if (dependency == null)
+ return "Null dependency (" + expected.getName() + ")";
+ if (!expected.isAssignableFrom(dependency.getClass()))
+ return "Expected (" + expected.getName() + ")";
+ return null;
+ }
+
+}
Added: trunk/weld-int/deployer-mc-int/src/test/java/org/jboss/test/deployers/as/support/weldtomctoweld/weld/WeldWithMcWithWeldEjb.java
===================================================================
--- trunk/weld-int/deployer-mc-int/src/test/java/org/jboss/test/deployers/as/support/weldtomctoweld/weld/WeldWithMcWithWeldEjb.java (rev 0)
+++ trunk/weld-int/deployer-mc-int/src/test/java/org/jboss/test/deployers/as/support/weldtomctoweld/weld/WeldWithMcWithWeldEjb.java 2010-06-16 17:19:30 UTC (rev 106092)
@@ -0,0 +1,84 @@
+/*
+* 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.as.support.weldtomctoweld.weld;
+
+import javax.ejb.Stateless;
+import javax.inject.Inject;
+import javax.inject.Named;
+
+import org.jboss.logging.Logger;
+import org.jboss.test.deployers.as.support.Blue;
+import org.jboss.test.deployers.as.support.Red;
+import org.jboss.test.deployers.as.support.weldtomctoweld.mc.BlueMcBeanWeldDependencies;
+import org.jboss.test.deployers.as.support.weldtomctoweld.mc.McBeanWeldDependencies;
+import org.jboss.test.deployers.as.support.weldtomctoweld.mc.RedMcBeanWeldDependencies;
+
+/**
+ *
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision: 1.1 $
+ */
+ at Named("weldWithMcWithWeldEjb")
+ at Stateless
+public class WeldWithMcWithWeldEjb implements WeldToMcToWeldLocalInterface
+{
+ Logger log = Logger.getLogger(WeldWithMcWithWeldEjb.class);
+
+ @Inject @Blue
+ McBeanWeldDependencies blue;
+
+ McBeanWeldDependencies red;
+
+ @Inject
+ public void setRed(@Red McBeanWeldDependencies red)
+ {
+ this.red = red;
+ }
+
+ public String getResult()
+ {
+ log.info("getting result");
+ String error = validate(blue, BlueMcBeanWeldDependencies.class);
+ if (error != null)
+ return error;
+ error = validate(red, RedMcBeanWeldDependencies.class);
+ if (error != null)
+ return error;
+ error = red.getResult();
+ if (error != null)
+ return error;
+ error = blue.getResult();
+ if (error != null)
+ return error;
+ return "WeldWithMcWithWeldEjb#ok#";
+ }
+
+ private String validate(McBeanWeldDependencies dependency, Class<?> expected)
+ {
+ if (dependency == null)
+ return "Null dependency (" + expected.getName() + ")";
+ if (!expected.isAssignableFrom(dependency.getClass()))
+ return "Expected (" + expected.getName() + ")";
+ return null;
+ }
+
+}
Added: trunk/weld-int/deployer-mc-int/src/test/java/org/jboss/test/deployers/as/test/ApplicationServerTestCase.java
===================================================================
--- trunk/weld-int/deployer-mc-int/src/test/java/org/jboss/test/deployers/as/test/ApplicationServerTestCase.java (rev 0)
+++ trunk/weld-int/deployer-mc-int/src/test/java/org/jboss/test/deployers/as/test/ApplicationServerTestCase.java 2010-06-16 17:19:30 UTC (rev 106092)
@@ -0,0 +1,569 @@
+/*
+* 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.as.test;
+
+import java.io.File;
+import java.net.URL;
+
+import org.apache.commons.httpclient.HttpMethodBase;
+import org.jboss.shrinkwrap.api.Archive;
+import org.jboss.shrinkwrap.api.ArchivePath;
+import org.jboss.shrinkwrap.api.ArchivePaths;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.exporter.ExplodedExporter;
+import org.jboss.shrinkwrap.api.spec.EnterpriseArchive;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
+import org.jboss.test.AbstractTestDelegate;
+import org.jboss.test.JBossTestCase;
+import org.jboss.test.JBossTestServices;
+import org.jboss.test.deployers.as.support.Blue;
+import org.jboss.test.deployers.as.support.HttpUtils;
+import org.jboss.test.deployers.as.support.Red;
+import org.jboss.test.deployers.as.support.mctoweld.mc.BlueMcBeanNoDependencies;
+import org.jboss.test.deployers.as.support.mctoweld.mc.McBeanNoDependencies;
+import org.jboss.test.deployers.as.support.mctoweld.mc.RedMcBeanNoDependencies;
+import org.jboss.test.deployers.as.support.mctoweld.weld.Kickstart;
+import org.jboss.test.deployers.as.support.mctoweld.weld.KickstartEjb;
+import org.jboss.test.deployers.as.support.mctoweld.weld.McToWeldLocalInterface;
+import org.jboss.test.deployers.as.support.mctoweld.weld.WeldWithMcBean;
+import org.jboss.test.deployers.as.support.mctoweld.weld.WeldWithMcEjb;
+import org.jboss.test.deployers.as.support.weld.simple.BlueWeldDependency;
+import org.jboss.test.deployers.as.support.weld.simple.RedWeldDependency;
+import org.jboss.test.deployers.as.support.weld.simple.SimpleLocalInterface;
+import org.jboss.test.deployers.as.support.weld.simple.SimpleWeldBeanNoInjection;
+import org.jboss.test.deployers.as.support.weld.simple.SimpleWeldBeanWeldInjection;
+import org.jboss.test.deployers.as.support.weld.simple.SimpleWeldEjbNoInjection;
+import org.jboss.test.deployers.as.support.weld.simple.SimpleWeldEjbWeldInjection;
+import org.jboss.test.deployers.as.support.weld.simple.WeldDependency;
+import org.jboss.test.deployers.as.support.weldtomctoweld.mc.BlueMcBeanWeldDependencies;
+import org.jboss.test.deployers.as.support.weldtomctoweld.mc.McBeanWeldDependencies;
+import org.jboss.test.deployers.as.support.weldtomctoweld.mc.RedMcBeanWeldDependencies;
+import org.jboss.test.deployers.as.support.weldtomctoweld.weld.BlueWeldMcDependency;
+import org.jboss.test.deployers.as.support.weldtomctoweld.weld.RedWeldMcDependency;
+import org.jboss.test.deployers.as.support.weldtomctoweld.weld.WeldMcDependency;
+import org.jboss.test.deployers.as.support.weldtomctoweld.weld.WeldToMcToWeldLocalInterface;
+import org.jboss.test.deployers.as.support.weldtomctoweld.weld.WeldWithMcWithWeldBean;
+import org.jboss.test.deployers.as.support.weldtomctoweld.weld.WeldWithMcWithWeldEjb;
+
+
+/**
+ *
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision: 1.1 $
+ */
+public class ApplicationServerTestCase extends JBossTestCase
+{
+ private final static ArchivePath META_INF = ArchivePaths.create("META-INF");
+ private final static ArchivePath WEB_INF = ArchivePaths.create("WEB-INF");
+ private final static ArchivePath FACES_CONFIG = ArchivePaths.create(WEB_INF, "faces-config.xml");
+ private final static ArchivePath WEB_XML = ArchivePaths.create(WEB_INF, "web.xml");
+ private final static ArchivePath META_BEANS_XML = ArchivePaths.create(META_INF, "beans.xml");
+ private final static ArchivePath WEB_BEANS_XML = ArchivePaths.create(WEB_INF, "beans.xml");
+ private final static ArchivePath JBOSS_BEANS_XML = ArchivePaths.create(META_INF, "jboss-beans.xml");
+
+ public ApplicationServerTestCase(String name)
+ {
+ super(name);
+ }
+
+ public static AbstractTestDelegate getDelegate(Class<?> clazz)
+ {
+ return new JBossTestServices(clazz);
+ }
+
+ /////////////////////////////////////////////////////////////////
+ //These first tests are just "sanity" tests to make sure we
+ //are deploying things the right way and that weld itself
+ //works as expected
+
+ public void testSimpleWeldBeanNoInjectionWar() throws Throwable
+ {
+ URL url = createAndDeployWar("simpleWeldBeanNoInjection", SimpleWeldBeanNoInjection.class);
+ try
+ {
+ accessWebApp("test-weld/simpleWeldBeanNoInjection.jsf", "SimpleWeldBeanNoInjection#ok#");
+ }
+ finally
+ {
+ if (url != null)
+ undeploy(url.toString());
+ }
+ }
+
+ public void testSimpleWeldBeanNoInjectionEar() throws Throwable
+ {
+ URL url = createAndDeployEar(
+ createWebArchive("simpleWeldBeanNoInjection"),
+ createWeldArchive(SimpleWeldBeanNoInjection.class));
+ try
+ {
+ accessWebApp("test-weld/simpleWeldBeanNoInjection.jsf", "SimpleWeldBeanNoInjection#ok#");
+ }
+ finally
+ {
+ if (url != null)
+ undeploy(url.toString());
+ }
+ }
+
+ public void testSimpleWeldEjbNoInjectionWar() throws Throwable
+ {
+ URL url = createAndDeployWar("simpleWeldEjbNoInjection",
+ SimpleWeldEjbNoInjection.class,
+ SimpleLocalInterface.class);
+ try
+ {
+ accessWebApp("test-weld/simpleWeldEjbNoInjection.jsf", "SimpleWeldEjbNoInjection#ok#");
+ }
+ finally
+ {
+ if (url != null)
+ undeploy(url.toString());
+ }
+ }
+
+ public void testSimpleWeldEjbNoInjectionEar() throws Throwable
+ {
+ URL url = createAndDeployEar(
+ createWebArchive("simpleWeldEjbNoInjection"),
+ createWeldArchive(SimpleWeldEjbNoInjection.class, SimpleLocalInterface.class));
+ try
+ {
+ accessWebApp("test-weld/simpleWeldEjbNoInjection.jsf", "SimpleWeldEjbNoInjection#ok#");
+ }
+ finally
+ {
+ if (url != null)
+ undeploy(url.toString());
+ }
+ }
+
+ public void testSimpleWeldBeanWeldInjectionWar() throws Throwable
+ {
+ URL url = createAndDeployWar("simpleWeldBeanWeldInjection",
+ SimpleWeldBeanWeldInjection.class,
+ WeldDependency.class,
+ RedWeldDependency.class,
+ BlueWeldDependency.class,
+ Red.class,
+ Blue.class);
+ try
+ {
+ accessWebApp("test-weld/simpleWeldBeanWeldInjection.jsf", "SimpleWeldBeanWeldInjection#ok#");
+ }
+ finally
+ {
+ if (url != null)
+ undeploy(url.toString());
+ }
+ }
+
+ public void testSimpleWeldBeanWeldInjectionEar() throws Throwable
+ {
+ URL url = createAndDeployEar(
+ createWebArchive("simpleWeldBeanWeldInjection"),
+ createWeldArchive(SimpleWeldBeanWeldInjection.class, WeldDependency.class, RedWeldDependency.class, BlueWeldDependency.class, Red.class, Blue.class));
+ try
+ {
+ accessWebApp("test-weld/simpleWeldBeanWeldInjection.jsf", "SimpleWeldBeanWeldInjection#ok#");
+ }
+ finally
+ {
+ if (url != null)
+ undeploy(url.toString());
+ }
+ }
+
+ public void testSimpleWeldEjbWeldInjectionWar() throws Throwable
+ {
+ URL url = createAndDeployWar("simpleWeldEjbWeldInjection",
+ SimpleWeldEjbWeldInjection.class,
+ SimpleLocalInterface.class,
+ WeldDependency.class,
+ RedWeldDependency.class,
+ BlueWeldDependency.class,
+ Red.class,
+ Blue.class);
+ try
+ {
+ accessWebApp("test-weld/simpleWeldEjbWeldInjection.jsf", "SimpleWeldBeanEjbInjection#ok#");
+ }
+ finally
+ {
+ if (url != null)
+ undeploy(url.toString());
+ }
+ }
+
+ public void testSimpleWeldEjbWeldInjectionEar() throws Throwable
+ {
+ URL url = createAndDeployEar(
+ createWebArchive("simpleWeldEjbWeldInjection"),
+ createWeldArchive(SimpleWeldEjbWeldInjection.class,
+ SimpleLocalInterface.class,
+ WeldDependency.class,
+ RedWeldDependency.class,
+ BlueWeldDependency.class,
+ Red.class,
+ Blue.class));
+ try
+ {
+ accessWebApp("test-weld/simpleWeldEjbWeldInjection.jsf", "SimpleWeldBeanEjbInjection#ok#");
+ }
+ finally
+ {
+ if (url != null)
+ undeploy(url.toString());
+ }
+ }
+
+ /////////////////////////////////////////////////////////////////
+ //These are the real Weld<->MC injection tests
+
+ public void testMcNoDependenciesInjectedIntoWeldBeanWar() throws Throwable
+ {
+ URL url = createAndDeployWar("mcNoDependenciesInjectedIntoWeldBean",
+ "mctoweld/nodependencies",
+ WeldWithMcBean.class,
+ Red.class,
+ Blue.class,
+ McBeanNoDependencies.class,
+ RedMcBeanNoDependencies.class,
+ BlueMcBeanNoDependencies.class,
+ //TODO Remove the Kickstart EJB, which is currently necessary to make sure that there are some EJB containers to wait for before BootstrapBean can start
+ KickstartEjb.class,
+ Kickstart.class);
+
+ try
+ {
+ accessWebApp("test-weld/mcNoDependenciesInjectedIntoWeldBean.jsf", "WeldWithMcBean#ok#");
+ }
+ finally
+ {
+ if (url != null)
+ undeploy(url.toString());
+ }
+ }
+
+ public void testMcNoDependenciesInjectedIntoWeldBeanEar() throws Throwable
+ {
+ URL url = createAndDeployEar(
+ createWebArchive("mcNoDependenciesInjectedIntoWeldBean"),
+ //TODO Remove the Kickstart EJB, which is currently necessary to make sure that there are some EJB containers to wait for before BootstrapBean can start
+ createWeldArchive(WeldWithMcBean.class, KickstartEjb.class, Kickstart.class),
+ createMcArchive("mctoweld/nodependencies", Red.class, Blue.class, McBeanNoDependencies.class, RedMcBeanNoDependencies.class, BlueMcBeanNoDependencies.class));
+
+ try
+ {
+ accessWebApp("test-weld/mcNoDependenciesInjectedIntoWeldBean.jsf", "WeldWithMcBean#ok#");
+ }
+ finally
+ {
+ if (url != null)
+ undeploy(url.toString());
+ }
+ }
+
+ public void testMcNoDependenciesInjectedIntoWeldEjbWar() throws Throwable
+ {
+ URL url = createAndDeployWar("mcNoDependenciesInjectedIntoWeldEjb",
+ "mctoweld/nodependencies",
+ WeldWithMcEjb.class,
+ McToWeldLocalInterface.class,
+ Red.class,
+ Blue.class,
+ McBeanNoDependencies.class,
+ RedMcBeanNoDependencies.class,
+ BlueMcBeanNoDependencies.class);
+
+ try
+ {
+ accessWebApp("test-weld/mcNoDependenciesInjectedIntoWeldEjb.jsf", "WeldWithMcEjb#ok#");
+ }
+ finally
+ {
+ if (url != null)
+ undeploy(url.toString());
+ }
+ }
+
+ public void testMcNoDependenciesInjectedIntoWeldEjbEar() throws Throwable
+ {
+ URL url = createAndDeployEar(
+ createWebArchive("mcNoDependenciesInjectedIntoWeldEjb"),
+ createWeldArchive(WeldWithMcEjb.class, McToWeldLocalInterface.class, Red.class, Blue.class),
+ createMcArchive("mctoweld/nodependencies", McBeanNoDependencies.class, RedMcBeanNoDependencies.class, BlueMcBeanNoDependencies.class));
+
+ try
+ {
+ accessWebApp("test-weld/mcNoDependenciesInjectedIntoWeldEjb.jsf", "WeldWithMcEjb#ok#");
+ }
+ finally
+ {
+ if (url != null)
+ undeploy(url.toString());
+ }
+ }
+
+ public void testWeldInjectedIntoMcInjectedIntoWeldBeanWar() throws Throwable
+ {
+ URL url = createAndDeployWar("weldInjectedIntoMcInjectedIntoWeldBean",
+ "weldtomctoweld",
+ WeldWithMcWithWeldBean.class,
+ WeldMcDependency.class,
+ RedWeldMcDependency.class,
+ BlueWeldMcDependency.class,
+ Red.class,
+ Blue.class,
+ McBeanWeldDependencies.class,
+ RedMcBeanWeldDependencies.class,
+ BlueMcBeanWeldDependencies.class,
+ //TODO Remove the Kickstart EJB, which is currently necessary to make sure that there are some EJB containers to wait for before BootstrapBean can start
+ KickstartEjb.class,
+ Kickstart.class);
+
+ try
+ {
+ accessWebApp("test-weld/weldInjectedIntoMcInjectedIntoWeldBean.jsf", "WeldWithMcWithWeldBean#ok#");
+ }
+ finally
+ {
+ if (url != null)
+ undeploy(url.toString());
+ }
+ }
+
+ public void testWeldInjectedIntoMcInjectedIntoWeldBeanEar() throws Throwable
+ {
+ URL url = createAndDeployEar(
+ createWebArchive("weldInjectedIntoMcInjectedIntoWeldBean"),
+ //TODO Remove the Kickstart EJB, which is currently necessary to make sure that there are some EJB containers to wait for before BootstrapBean can start
+ createWeldArchive(WeldWithMcWithWeldBean.class,
+ WeldMcDependency.class,
+ RedWeldMcDependency.class,
+ BlueWeldMcDependency.class,
+ KickstartEjb.class,
+ Kickstart.class),
+ createMcArchive("weldtomctoweld",
+ Red.class,
+ Blue.class,
+ McBeanWeldDependencies.class,
+ RedMcBeanWeldDependencies.class,
+ BlueMcBeanWeldDependencies.class));
+
+ try
+ {
+ accessWebApp("test-weld/weldInjectedIntoMcInjectedIntoWeldBean.jsf", "WeldWithMcWithWeldBean#ok#");
+ }
+ finally
+ {
+ if (url != null)
+ undeploy(url.toString());
+ }
+ }
+
+
+ public void testWeldInjectedIntoMcInjectedIntoWeldEjbWar() throws Throwable
+ {
+ URL url = createAndDeployWar("weldInjectedIntoMcInjectedIntoWeldEjb",
+ "weldtomctoweld",
+ WeldWithMcWithWeldEjb.class,
+ WeldToMcToWeldLocalInterface.class,
+ WeldMcDependency.class,
+ RedWeldMcDependency.class,
+ BlueWeldMcDependency.class,
+ Red.class,
+ Blue.class,
+ McBeanWeldDependencies.class,
+ RedMcBeanWeldDependencies.class,
+ BlueMcBeanWeldDependencies.class,
+ //TODO Remove the Kickstart EJB, which is currently necessary to make sure that there are some EJB containers to wait for before BootstrapBean can start
+ KickstartEjb.class,
+ Kickstart.class);
+
+ try
+ {
+ accessWebApp("test-weld/weldInjectedIntoMcInjectedIntoWeldEjb.jsf", "WeldWithMcWithWeldEjb#ok#");
+ }
+ finally
+ {
+ if (url != null)
+ undeploy(url.toString());
+ }
+
+ }
+
+ public void testWeldInjectedIntoMcInjectedIntoWeldEjbEar() throws Throwable
+ {
+ URL url = createAndDeployEar(
+ createWebArchive("weldInjectedIntoMcInjectedIntoWeldEjb"),
+ //TODO Remove the Kickstart EJB, which is currently necessary to make sure that there are some EJB containers to wait for before BootstrapBean can start
+ createWeldArchive(WeldWithMcWithWeldEjb.class,
+ WeldToMcToWeldLocalInterface.class,
+ WeldMcDependency.class,
+ RedWeldMcDependency.class,
+ BlueWeldMcDependency.class,
+ KickstartEjb.class,
+ Kickstart.class),
+ createMcArchive("weldtomctoweld",
+ Red.class,
+ Blue.class,
+ McBeanWeldDependencies.class,
+ RedMcBeanWeldDependencies.class,
+ BlueMcBeanWeldDependencies.class));
+
+ try
+ {
+ accessWebApp("test-weld/weldInjectedIntoMcInjectedIntoWeldEjb.jsf", "WeldWithMcWithWeldEjb#ok#");
+ }
+ finally
+ {
+ if (url != null)
+ undeploy(url.toString());
+ }
+
+ }
+
+ private WebArchive createWebArchive(String name)
+ {
+ WebArchive webArchive = ShrinkWrap.create(WebArchive.class, "test-weld.war");
+ webArchive
+ .addResource("org/jboss/test/deployers/as/support/webapp/" + name + ".xhtml", "/" + name + ".xhtml")
+ .addResource("org/jboss/test/deployers/as/support/webapp/WEB-INF/web.xml", WEB_XML)
+ .addResource("org/jboss/test/deployers/as/support/webapp/WEB-INF/faces-config.xml", FACES_CONFIG);
+
+
+
+ getLog().debug(webArchive.toString(true));
+
+ return webArchive;
+ }
+
+ private JavaArchive createWeldArchive(Class<?>...classes)
+ {
+ JavaArchive javaArchive = ShrinkWrap.create(JavaArchive.class, "weld.jar")
+ .addClasses(classes)
+ .addResource("org/jboss/test/deployers/as/support/weld/META-INF/beans.xml", META_BEANS_XML);
+
+ getLog().debug(javaArchive.toString(true));
+ return javaArchive;
+ }
+
+ private JavaArchive createMcArchive(String packageFragment, Class<?>...classes)
+ {
+
+ JavaArchive javaArchive = ShrinkWrap.create(JavaArchive.class, "mc.jar")
+ .addClasses(classes)
+ .addResource("org/jboss/test/deployers/as/support/" + packageFragment + "/META-INF/jboss-beans.xml", JBOSS_BEANS_XML);
+
+ getLog().debug(javaArchive.toString(true));
+ return javaArchive;
+ }
+
+ private URL createAndDeployWar(String name, Class<?>...classes) throws Exception
+ {
+ WebArchive webArchive = createWebArchive(name)
+ .addResource("org/jboss/test/deployers/as/support/weld/META-INF/beans.xml", WEB_BEANS_XML)
+ .addClasses(classes);
+
+ return explodeArchiveAndDeploy(webArchive);
+ }
+
+ private URL createAndDeployWar(String name, String mcDescriptorPackageFragment, Class<?>...classes) throws Exception
+ {
+ WebArchive webArchive = createWebArchive(name)
+ .addResource("org/jboss/test/deployers/as/support/weld/META-INF/beans.xml", WEB_BEANS_XML)
+ .addResource("org/jboss/test/deployers/as/support/" + mcDescriptorPackageFragment + "/META-INF/jboss-beans.xml", JBOSS_BEANS_XML)
+ .addClasses(classes);
+
+ return explodeArchiveAndDeploy(webArchive);
+ }
+
+ private URL createAndDeployEar(Archive<?>...archives) throws Exception
+ {
+ EnterpriseArchive enterpriseArchive = ShrinkWrap.create("simple.ear", EnterpriseArchive.class);
+ for (Archive<?> archive : archives)
+ enterpriseArchive.add(archive, "/");
+
+ return explodeArchiveAndDeploy(enterpriseArchive);
+ }
+
+ private URL explodeArchiveAndDeploy(Archive<?> archive) throws Exception
+ {
+ URL url = createExplodedArchive(archive);
+
+ getLog().debug(archive.toString(true));
+
+ undeploy(url.toString());
+ try
+ {
+ deploy(url.toString());
+ }
+ catch(Exception e)
+ {
+ undeploy(url.toString());
+ throw(e);
+ }
+
+ return url;
+ }
+
+ private void accessWebApp(String urlPath, String...tokens) throws Exception
+ {
+ HttpMethodBase request = HttpUtils.accessURL(new URL(HttpUtils.getBaseURL() + urlPath));
+ String body = request.getResponseBodyAsString();
+
+ assertTrue("Body was not transformed to html:\n" + body, body.indexOf("<h:") < 0);
+
+ System.out.println(body);
+
+
+ for (String token : tokens)
+ assertTrue("Could not find '" + token + "' in body:\n" + body, body.indexOf(token) >= 0);
+ }
+
+ private URL createExplodedArchive(Archive<?> archive) throws Exception
+ {
+ File file = new File("target/lib");
+ if (file.exists())
+ deleteFile(file);
+ file.mkdir();
+ File ear = new File(file, archive.getName());
+ if (ear.exists())
+ deleteFile(file);
+ file = archive.as(ExplodedExporter.class).exportExploded(file);
+
+ return file.toURI().toURL();
+ }
+
+ private void deleteFile(File file)
+ {
+ if (file.isDirectory())
+ {
+ for (String name : file.list())
+ deleteFile(new File(file, name));
+ }
+
+ file.delete();
+ }
+}
Modified: trunk/weld-int/deployer-mc-int/src/test/java/org/jboss/test/deployers/support/deployer/MockValidatorFactoryDeployer.java
===================================================================
--- projects/weld-int/trunk/deployer-mc-int/src/test/java/org/jboss/test/deployers/support/deployer/MockValidatorFactoryDeployer.java 2010-06-14 09:54:25 UTC (rev 106025)
+++ trunk/weld-int/deployer-mc-int/src/test/java/org/jboss/test/deployers/support/deployer/MockValidatorFactoryDeployer.java 2010-06-16 17:19:30 UTC (rev 106092)
@@ -25,6 +25,7 @@
import java.util.Locale;
import java.util.Set;
+import javax.validation.ConstraintValidatorFactory;
import javax.validation.ConstraintViolation;
import javax.validation.MessageInterpolator;
import javax.validation.TraversableResolver;
@@ -88,6 +89,16 @@
{
return context;
}
+
+ public ConstraintValidatorFactory getConstraintValidatorFactory()
+ {
+ return null;
+ }
+
+ public TraversableResolver getTraversableResolver()
+ {
+ return null;
+ }
}
private static class MockValidatorContext implements ValidatorContext
@@ -112,6 +123,10 @@
{
return this;
}
+ public ValidatorContext constraintValidatorFactory(ConstraintValidatorFactory factory)
+ {
+ return this;
+ }
}
private static class MockValidator implements Validator
Added: trunk/weld-int/deployer-mc-int/src/test/resources/jndi.properties
===================================================================
--- trunk/weld-int/deployer-mc-int/src/test/resources/jndi.properties (rev 0)
+++ trunk/weld-int/deployer-mc-int/src/test/resources/jndi.properties 2010-06-16 17:19:30 UTC (rev 106092)
@@ -0,0 +1,6 @@
+# DO NOT EDIT THIS FILE UNLESS YOU KNOW WHAT YOU ARE DOING
+#
+#jboss JNDI properties
+java.naming.factory.initial=org.jnp.interfaces.NamingContextFactory
+java.naming.provider.url=jnp://localhost:1099
+java.naming.factory.url.pkgs=org.jnp.interfaces
Added: trunk/weld-int/deployer-mc-int/src/test/resources/log4j.properties
===================================================================
--- trunk/weld-int/deployer-mc-int/src/test/resources/log4j.properties (rev 0)
+++ trunk/weld-int/deployer-mc-int/src/test/resources/log4j.properties 2010-06-16 17:19:30 UTC (rev 106092)
@@ -0,0 +1,21 @@
+### ====================================================================== ###
+## ##
+## JBoss Bootstrap Log4j Configuration ##
+## ##
+### ====================================================================== ###
+
+### $Id: log4j.properties 20741 2004-04-26 00:35:27Z starksm $ ###
+
+log4j.rootCategory=DEBUG, CONSOLE
+
+log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender
+log4j.appender.CONSOLE.Threshold=INFO
+log4j.appender.CONSOLE.Target=System.out
+log4j.appender.CONSOLE.layout=org.apache.log4j.PatternLayout
+log4j.appender.CONSOLE.layout.ConversionPattern=%d{ABSOLUTE} %-5p [%c{1}] %m%n
+
+#log4j.appender.FILE=org.apache.log4j.FileAppender
+#log4j.appender.FILE.File=twiddle.log
+#log4j.appender.FILE.Append=false
+#log4j.appender.FILE.layout=org.apache.log4j.PatternLayout
+#log4j.appender.FILE.layout.ConversionPattern=%d{ABSOLUTE} %-5p [%c{1}] %m%n
Added: trunk/weld-int/deployer-mc-int/src/test/resources/org/jboss/test/deployers/as/support/mctoweld/nodependencies/META-INF/jboss-beans.xml
===================================================================
--- trunk/weld-int/deployer-mc-int/src/test/resources/org/jboss/test/deployers/as/support/mctoweld/nodependencies/META-INF/jboss-beans.xml (rev 0)
+++ trunk/weld-int/deployer-mc-int/src/test/resources/org/jboss/test/deployers/as/support/mctoweld/nodependencies/META-INF/jboss-beans.xml 2010-06-16 17:19:30 UTC (rev 106092)
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+ <bean name="RedMcBean" class="org.jboss.test.deployers.as.support.mctoweld.mc.RedMcBeanNoDependencies"/>
+ <bean name="BlueMcBean" class="org.jboss.test.deployers.as.support.mctoweld.mc.BlueMcBeanNoDependencies"/>
+</deployment>
Added: trunk/weld-int/deployer-mc-int/src/test/resources/org/jboss/test/deployers/as/support/webapp/WEB-INF/faces-config.xml
===================================================================
--- trunk/weld-int/deployer-mc-int/src/test/resources/org/jboss/test/deployers/as/support/webapp/WEB-INF/faces-config.xml (rev 0)
+++ trunk/weld-int/deployer-mc-int/src/test/resources/org/jboss/test/deployers/as/support/webapp/WEB-INF/faces-config.xml 2010-06-16 17:19:30 UTC (rev 106092)
@@ -0,0 +1,8 @@
+<faces-config xmlns="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-facesconfig_2_0.xsd"
+ version="2.0">
+ <!-- application>
+ <view-handler>com.sun.facelets.FaceletViewHandler</view-handler>
+ </application -->
+</faces-config>
\ No newline at end of file
Added: trunk/weld-int/deployer-mc-int/src/test/resources/org/jboss/test/deployers/as/support/webapp/WEB-INF/web.xml
===================================================================
--- trunk/weld-int/deployer-mc-int/src/test/resources/org/jboss/test/deployers/as/support/webapp/WEB-INF/web.xml (rev 0)
+++ trunk/weld-int/deployer-mc-int/src/test/resources/org/jboss/test/deployers/as/support/webapp/WEB-INF/web.xml 2010-06-16 17:19:30 UTC (rev 106092)
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<web-app version="3.0" xmlns="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee web-app_3_0.xsd">
+
+ <display-name>Test</display-name>
+
+ <context-param>
+ <param-name>javax.faces.DEFAULT_SUFFIX</param-name>
+ <param-value>.xhtml</param-value>
+ </context-param>
+
+ <servlet>
+ <servlet-name>Faces Servlet</servlet-name>
+ <servlet-class>javax.faces.webapp.FacesServlet</servlet-class>
+ <load-on-startup>1</load-on-startup>
+ </servlet>
+
+ <servlet-mapping>
+ <servlet-name>Faces Servlet</servlet-name>
+ <url-pattern>*.jsf</url-pattern>
+ </servlet-mapping>
+
+</web-app>
\ No newline at end of file
Added: trunk/weld-int/deployer-mc-int/src/test/resources/org/jboss/test/deployers/as/support/webapp/mcInWeld.xhtml
===================================================================
--- trunk/weld-int/deployer-mc-int/src/test/resources/org/jboss/test/deployers/as/support/webapp/mcInWeld.xhtml (rev 0)
+++ trunk/weld-int/deployer-mc-int/src/test/resources/org/jboss/test/deployers/as/support/webapp/mcInWeld.xhtml 2010-06-16 17:19:30 UTC (rev 106092)
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:ui="http://java.sun.com/jsf/facelets">
+ <h:head>
+ <title>
+ Greetings
+ </title>
+ </h:head>
+
+ <h:body>
+ <h:outputText value="#{weldWithMcBean.formattedResult}"/>
+ </h:body>
+</html>
\ No newline at end of file
Added: trunk/weld-int/deployer-mc-int/src/test/resources/org/jboss/test/deployers/as/support/webapp/mcNoDependenciesInjectedIntoWeldBean.xhtml
===================================================================
--- trunk/weld-int/deployer-mc-int/src/test/resources/org/jboss/test/deployers/as/support/webapp/mcNoDependenciesInjectedIntoWeldBean.xhtml (rev 0)
+++ trunk/weld-int/deployer-mc-int/src/test/resources/org/jboss/test/deployers/as/support/webapp/mcNoDependenciesInjectedIntoWeldBean.xhtml 2010-06-16 17:19:30 UTC (rev 106092)
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:ui="http://java.sun.com/jsf/facelets">
+ <h:head>
+ <title>
+ Greetings
+ </title>
+ </h:head>
+
+ <h:body>
+ <h:outputText value="#{weldWithMcBean.result}"/>
+ </h:body>
+</html>
\ No newline at end of file
Added: trunk/weld-int/deployer-mc-int/src/test/resources/org/jboss/test/deployers/as/support/webapp/mcNoDependenciesInjectedIntoWeldEjb.xhtml
===================================================================
--- trunk/weld-int/deployer-mc-int/src/test/resources/org/jboss/test/deployers/as/support/webapp/mcNoDependenciesInjectedIntoWeldEjb.xhtml (rev 0)
+++ trunk/weld-int/deployer-mc-int/src/test/resources/org/jboss/test/deployers/as/support/webapp/mcNoDependenciesInjectedIntoWeldEjb.xhtml 2010-06-16 17:19:30 UTC (rev 106092)
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:ui="http://java.sun.com/jsf/facelets">
+ <h:head>
+ <title>
+ Greetings
+ </title>
+ </h:head>
+
+ <h:body>
+ <h:outputText value="#{weldWithMcEjb.result}"/>
+ </h:body>
+</html>
\ No newline at end of file
Added: trunk/weld-int/deployer-mc-int/src/test/resources/org/jboss/test/deployers/as/support/webapp/simpleWeldBeanNoInjection.xhtml
===================================================================
--- trunk/weld-int/deployer-mc-int/src/test/resources/org/jboss/test/deployers/as/support/webapp/simpleWeldBeanNoInjection.xhtml (rev 0)
+++ trunk/weld-int/deployer-mc-int/src/test/resources/org/jboss/test/deployers/as/support/webapp/simpleWeldBeanNoInjection.xhtml 2010-06-16 17:19:30 UTC (rev 106092)
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:ui="http://java.sun.com/jsf/facelets">
+ <h:head>
+ <title>
+ Greetings
+ </title>
+ </h:head>
+
+ <h:body>
+ <h:outputText value="#{simpleWeldBeanNoInjection.result}"/>
+ </h:body>
+</html>
\ No newline at end of file
Added: trunk/weld-int/deployer-mc-int/src/test/resources/org/jboss/test/deployers/as/support/webapp/simpleWeldBeanWeldInjection.xhtml
===================================================================
--- trunk/weld-int/deployer-mc-int/src/test/resources/org/jboss/test/deployers/as/support/webapp/simpleWeldBeanWeldInjection.xhtml (rev 0)
+++ trunk/weld-int/deployer-mc-int/src/test/resources/org/jboss/test/deployers/as/support/webapp/simpleWeldBeanWeldInjection.xhtml 2010-06-16 17:19:30 UTC (rev 106092)
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:ui="http://java.sun.com/jsf/facelets">
+ <h:head>
+ <title>
+ Greetings
+ </title>
+ </h:head>
+
+ <h:body>
+ <h:outputText value="#{simpleWeldBeanWeldInjection.result}"/>
+ </h:body>
+</html>
\ No newline at end of file
Added: trunk/weld-int/deployer-mc-int/src/test/resources/org/jboss/test/deployers/as/support/webapp/simpleWeldEjbNoInjection.xhtml
===================================================================
--- trunk/weld-int/deployer-mc-int/src/test/resources/org/jboss/test/deployers/as/support/webapp/simpleWeldEjbNoInjection.xhtml (rev 0)
+++ trunk/weld-int/deployer-mc-int/src/test/resources/org/jboss/test/deployers/as/support/webapp/simpleWeldEjbNoInjection.xhtml 2010-06-16 17:19:30 UTC (rev 106092)
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:ui="http://java.sun.com/jsf/facelets">
+ <h:head>
+ <title>
+ Greetings
+ </title>
+ </h:head>
+
+ <h:body>
+ <h:outputText value="#{simpleWeldEjbNoInjection.result}"/>
+ </h:body>
+</html>
\ No newline at end of file
Added: trunk/weld-int/deployer-mc-int/src/test/resources/org/jboss/test/deployers/as/support/webapp/simpleWeldEjbWeldInjection.xhtml
===================================================================
--- trunk/weld-int/deployer-mc-int/src/test/resources/org/jboss/test/deployers/as/support/webapp/simpleWeldEjbWeldInjection.xhtml (rev 0)
+++ trunk/weld-int/deployer-mc-int/src/test/resources/org/jboss/test/deployers/as/support/webapp/simpleWeldEjbWeldInjection.xhtml 2010-06-16 17:19:30 UTC (rev 106092)
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:ui="http://java.sun.com/jsf/facelets">
+ <h:head>
+ <title>
+ Greetings
+ </title>
+ </h:head>
+
+ <h:body>
+ <h:outputText value="#{simpleWeldEjbWeldInjection.result}"/>
+ </h:body>
+</html>
\ No newline at end of file
Added: trunk/weld-int/deployer-mc-int/src/test/resources/org/jboss/test/deployers/as/support/webapp/weldInjectedIntoMcInjectedIntoWeldBean.xhtml
===================================================================
--- trunk/weld-int/deployer-mc-int/src/test/resources/org/jboss/test/deployers/as/support/webapp/weldInjectedIntoMcInjectedIntoWeldBean.xhtml (rev 0)
+++ trunk/weld-int/deployer-mc-int/src/test/resources/org/jboss/test/deployers/as/support/webapp/weldInjectedIntoMcInjectedIntoWeldBean.xhtml 2010-06-16 17:19:30 UTC (rev 106092)
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:ui="http://java.sun.com/jsf/facelets">
+ <h:head>
+ <title>
+ Greetings
+ </title>
+ </h:head>
+
+ <h:body>
+ <h:outputText value="#{weldWithMcWithWeldBean.result}"/>
+ </h:body>
+</html>
\ No newline at end of file
Added: trunk/weld-int/deployer-mc-int/src/test/resources/org/jboss/test/deployers/as/support/webapp/weldInjectedIntoMcInjectedIntoWeldEjb.xhtml
===================================================================
--- trunk/weld-int/deployer-mc-int/src/test/resources/org/jboss/test/deployers/as/support/webapp/weldInjectedIntoMcInjectedIntoWeldEjb.xhtml (rev 0)
+++ trunk/weld-int/deployer-mc-int/src/test/resources/org/jboss/test/deployers/as/support/webapp/weldInjectedIntoMcInjectedIntoWeldEjb.xhtml 2010-06-16 17:19:30 UTC (rev 106092)
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:ui="http://java.sun.com/jsf/facelets">
+ <h:head>
+ <title>
+ Greetings
+ </title>
+ </h:head>
+
+ <h:body>
+ <h:outputText value="#{weldWithMcWithWeldEjb.result}"/>
+ </h:body>
+</html>
\ No newline at end of file
Added: trunk/weld-int/deployer-mc-int/src/test/resources/org/jboss/test/deployers/as/support/weld/META-INF/beans.xml
===================================================================
--- trunk/weld-int/deployer-mc-int/src/test/resources/org/jboss/test/deployers/as/support/weld/META-INF/beans.xml (rev 0)
+++ trunk/weld-int/deployer-mc-int/src/test/resources/org/jboss/test/deployers/as/support/weld/META-INF/beans.xml 2010-06-16 17:19:30 UTC (rev 106092)
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<beans xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="
+ http://java.sun.com/xml/ns/javaee
+ http://java.sun.com/xml/ns/javaee/beans_1_0.xsd" />
\ No newline at end of file
Added: trunk/weld-int/deployer-mc-int/src/test/resources/org/jboss/test/deployers/as/support/weldtomctoweld/META-INF/jboss-beans.xml
===================================================================
--- trunk/weld-int/deployer-mc-int/src/test/resources/org/jboss/test/deployers/as/support/weldtomctoweld/META-INF/jboss-beans.xml (rev 0)
+++ trunk/weld-int/deployer-mc-int/src/test/resources/org/jboss/test/deployers/as/support/weldtomctoweld/META-INF/jboss-beans.xml 2010-06-16 17:19:30 UTC (rev 106092)
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+ <bean name="RedMcBean" class="org.jboss.test.deployers.as.support.weldtomctoweld.mc.RedMcBeanWeldDependencies"/>
+ <bean name="BlueMcBean" class="org.jboss.test.deployers.as.support.weldtomctoweld.mc.BlueMcBeanWeldDependencies"/>
+</deployment>
Property changes on: trunk/weld-int/ejb
___________________________________________________________________
Name: svn:ignore
- target
+ target
.classpath
.project
.settings
Modified: trunk/weld-int/pom.xml
===================================================================
--- trunk/weld-int/pom.xml 2010-06-16 17:03:38 UTC (rev 106091)
+++ trunk/weld-int/pom.xml 2010-06-16 17:19:30 UTC (rev 106092)
@@ -15,6 +15,7 @@
<modules>
<module>assembly</module>
<module>deployer</module>
+ <module>deployer-mc-int</module>
<module>ejb</module>
<module>webtier</module>
</modules>
@@ -50,4 +51,4 @@
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
Property changes on: trunk/weld-int/webtier
___________________________________________________________________
Name: svn:ignore
- target
+ target
.classpath
.project
.settings
More information about the jboss-cvs-commits
mailing list