[jboss-cvs] JBossAS SVN: r106117 - in projects/demos/microcontainer/trunk: bootstrap/src/main/resources/META-INF and 12 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Jun 17 08:58:10 EDT 2010
Author: alesj
Date: 2010-06-17 08:58:09 -0400 (Thu, 17 Jun 2010)
New Revision: 106117
Added:
projects/demos/microcontainer/trunk/weld/
projects/demos/microcontainer/trunk/weld/pom.xml
projects/demos/microcontainer/trunk/weld/src/
projects/demos/microcontainer/trunk/weld/src/main/
projects/demos/microcontainer/trunk/weld/src/main/java/
projects/demos/microcontainer/trunk/weld/src/main/java/org/
projects/demos/microcontainer/trunk/weld/src/main/java/org/jboss/
projects/demos/microcontainer/trunk/weld/src/main/java/org/jboss/demos/
projects/demos/microcontainer/trunk/weld/src/main/java/org/jboss/demos/bootstrap/
projects/demos/microcontainer/trunk/weld/src/main/java/org/jboss/demos/bootstrap/weld/
projects/demos/microcontainer/trunk/weld/src/main/java/org/jboss/demos/bootstrap/weld/WeldMain.java
projects/demos/microcontainer/trunk/weld/src/main/resources/
projects/demos/microcontainer/trunk/weld/src/main/resources/META-INF/
projects/demos/microcontainer/trunk/weld/src/main/resources/META-INF/weld-beans.xml
projects/demos/microcontainer/trunk/weld/src/main/resources/log4j.properties
Modified:
projects/demos/microcontainer/trunk/bootstrap/src/main/resources/META-INF/bootstrap-beans.xml
projects/demos/microcontainer/trunk/opojo/pom.xml
projects/demos/microcontainer/trunk/pom.xml
Log:
Add Weld support.
Modified: projects/demos/microcontainer/trunk/bootstrap/src/main/resources/META-INF/bootstrap-beans.xml
===================================================================
--- projects/demos/microcontainer/trunk/bootstrap/src/main/resources/META-INF/bootstrap-beans.xml 2010-06-17 12:19:48 UTC (rev 106116)
+++ projects/demos/microcontainer/trunk/bootstrap/src/main/resources/META-INF/bootstrap-beans.xml 2010-06-17 12:58:09 UTC (rev 106117)
@@ -79,7 +79,12 @@
<bean name="BeanDeployer" class="org.jboss.deployers.vfs.deployer.kernel.BeanDeployer"/>
<bean name="KernelDeploymentDeployer" class="org.jboss.deployers.vfs.deployer.kernel.KernelDeploymentDeployer"/>
<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>
+ <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>
<!-- VFS ClassLoader -->
Modified: projects/demos/microcontainer/trunk/opojo/pom.xml
===================================================================
--- projects/demos/microcontainer/trunk/opojo/pom.xml 2010-06-17 12:19:48 UTC (rev 106116)
+++ projects/demos/microcontainer/trunk/opojo/pom.xml 2010-06-17 12:58:09 UTC (rev 106117)
@@ -8,9 +8,9 @@
<groupId>org.jboss.demos</groupId>
<artifactId>jboss-demos-opojo</artifactId>
<packaging>jar</packaging>
- <name>JBoss MC Demos Bundle</name>
+ <name>JBoss MC Demos OPojo</name>
<url>http://www.jboss.org/jbossmc</url>
- <description>JBoss MC Demos</description>
+ <description>JBoss MC Demos OPojo</description>
<dependencies>
<!-- Compile (global dependencies) -->
Modified: projects/demos/microcontainer/trunk/pom.xml
===================================================================
--- projects/demos/microcontainer/trunk/pom.xml 2010-06-17 12:19:48 UTC (rev 106116)
+++ projects/demos/microcontainer/trunk/pom.xml 2010-06-17 12:58:09 UTC (rev 106117)
@@ -37,11 +37,13 @@
<module>infinispan</module>
<module>gfs</module>
<module>opojo</module>
+ <module>weld</module>
<!-- <module>osgi</module> -->
<module>build</module>
</modules>
<properties>
+ <version.org.jboss.as>6.0.0-SNAPSHOT</version.org.jboss.as>
<version.org.jboss.mx>6.0.0.Beta5</version.org.jboss.mx>
<version.org.jboss.vfs>3.0.0.CR5</version.org.jboss.vfs>
<version.org.jboss.man>2.1.1.SP2</version.org.jboss.man>
@@ -61,9 +63,13 @@
<version.javassist>3.12.1.GA</version.javassist>
<version.xerces>2.9.1</version.xerces>
<version.spring>2.5.6</version.spring>
+ <version.aopalliance>1.0</version.aopalliance>
<!-- OSGi Facade-->
<version.org.jboss.osgi>1.0.0.Alpha5-SNAPSHOT</version.org.jboss.osgi>
<version.osgi>4.2.0</version.osgi>
+ <!-- Weld -->
+ <version.cdi>1.0-SP1</version.cdi>
+ <version.weld>1.0.1-Final</version.weld>
</properties>
<build>
@@ -237,6 +243,49 @@
<version>${version.org.jboss.kernel}</version>
</dependency>
<dependency>
+ <groupId>org.jboss.kernel</groupId>
+ <artifactId>jboss-weld-int</artifactId>
+ <version>${version.org.jboss.kernel}</version>
+ <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.deployers</groupId>
<artifactId>jboss-deployers-client</artifactId>
<version>${version.org.jboss.deployers}</version>
@@ -457,13 +506,12 @@
</exclusions>
</dependency>
- <dependency>
- <groupId>org.infinispan</groupId>
- <artifactId>infinispan-core</artifactId>
- <version>${version.org.infinispan}</version>
- </dependency>
-
<dependency>
+ <groupId>org.infinispan</groupId>
+ <artifactId>infinispan-core</artifactId>
+ <version>${version.org.infinispan}</version>
+ </dependency>
+ <dependency>
<groupId>org.jboss.mx</groupId>
<artifactId>jboss-j2se</artifactId>
<version>${version.org.jboss.mx}</version>
@@ -516,7 +564,7 @@
<dependency>
<groupId>aopalliance</groupId>
<artifactId>aopalliance</artifactId>
- <version>1.0</version>
+ <version>${version.aopalliance}</version>
</dependency>
<!-- OSGi Dependencies -->
<dependency>
@@ -529,6 +577,44 @@
<artifactId>jboss-osgi-framework-core</artifactId>
<version>${version.org.jboss.osgi}</version>
</dependency>
+ <!-- Weld int -->
+ <dependency>
+ <groupId>javax.enterprise</groupId>
+ <artifactId>cdi-api</artifactId>
+ <version>${version.cdi}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.weld</groupId>
+ <artifactId>weld-spi</artifactId>
+ <version>${version.cdi}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>weld-int-ejb</artifactId>
+ <version>${version.org.jboss.as}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-mdr</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>weld-int-deployer</artifactId>
+ <version>${version.org.jboss.as}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-reflect</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>weld-int-deployer-mc-int</artifactId>
+ <version>${version.org.jboss.as}</version>
+ </dependency>
<!-- test dependencies -->
<dependency>
<groupId>org.jboss</groupId>
Added: projects/demos/microcontainer/trunk/weld/pom.xml
===================================================================
--- projects/demos/microcontainer/trunk/weld/pom.xml (rev 0)
+++ projects/demos/microcontainer/trunk/weld/pom.xml 2010-06-17 12:58:09 UTC (rev 106117)
@@ -0,0 +1,43 @@
+<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">
+ <parent>
+ <groupId>org.jboss.demos</groupId>
+ <artifactId>jboss-demos</artifactId>
+ <version>2.0.0-SNAPSHOT</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.jboss.demos</groupId>
+ <artifactId>jboss-demos-weld</artifactId>
+ <packaging>jar</packaging>
+ <name>JBoss MC Demos Weld</name>
+ <url>http://www.jboss.org/jbossmc</url>
+ <description>JBoss MC Demos Weld</description>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss.demos</groupId>
+ <artifactId>jboss-demos-bootstrap</artifactId>
+ </dependency>
+ <!-- Compile (global dependencies) -->
+ <dependency>
+ <groupId>javax.enterprise</groupId>
+ <artifactId>cdi-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.weld</groupId>
+ <artifactId>weld-spi</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>weld-int-ejb</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>weld-int-deployer</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>weld-int-deployer-mc-int</artifactId>
+ </dependency>
+ </dependencies>
+
+</project>
\ No newline at end of file
Added: projects/demos/microcontainer/trunk/weld/src/main/java/org/jboss/demos/bootstrap/weld/WeldMain.java
===================================================================
--- projects/demos/microcontainer/trunk/weld/src/main/java/org/jboss/demos/bootstrap/weld/WeldMain.java (rev 0)
+++ projects/demos/microcontainer/trunk/weld/src/main/java/org/jboss/demos/bootstrap/weld/WeldMain.java 2010-06-17 12:58:09 UTC (rev 106117)
@@ -0,0 +1,46 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2010, 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.demos.bootstrap.weld;
+
+import org.jboss.demos.bootstrap.Main;
+
+/**
+ * @author <a href="mailto:ales.justin at jboss.org">Ales Justin</a>
+ */
+public class WeldMain
+{
+ public static void main(String[] args)
+ {
+ Main.main(args);
+
+ try
+ {
+ Main.deploy("${demos.home}/weld/src/main/resources/META-INF/weld-beans.xml");
+ Main.validate();
+ }
+ catch (Throwable t)
+ {
+ t.printStackTrace();
+ }
+ }
+}
Added: projects/demos/microcontainer/trunk/weld/src/main/resources/META-INF/weld-beans.xml
===================================================================
--- projects/demos/microcontainer/trunk/weld/src/main/resources/META-INF/weld-beans.xml (rev 0)
+++ projects/demos/microcontainer/trunk/weld/src/main/resources/META-INF/weld-beans.xml 2010-06-17 12:58:09 UTC (rev 106117)
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ Weld integration
+-->
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+
+ <!-- Weld deployers -->
+
+ <!-- Responsible for discovering Weld files -->
+ <bean name="WeldFilesDeployer" class="org.jboss.weld.integration.deployer.metadata.WeldFilesDeployer"/>
+
+ <!-- Responsible for discovering Weld classes -->
+ <bean name="WeldDiscoveryDeployer" class="org.jboss.weld.integration.deployer.env.WeldDiscoveryDeployer"/>
+
+ <!-- Responsible for discovering Weld classes -->
+ <bean name="EjbServicesDeployer" class="org.jboss.weld.integration.deployer.env.EjbServicesDeployer"/>
+
+ <!-- Responsible for discovering Weld classes -->
+ <bean name="FlatDeploymentDeployer" class="org.jboss.weld.integration.deployer.env.FlatDeploymentDeployer"/>
+
+ <!-- Responsible for dynamic ejb dependency creation -->
+ <bean name="DynamicDependencyCreator" class="org.jboss.weld.integration.deployer.env.DynamicDependencyCreator">
+ <constructor>
+ <parameter><inject bean="jboss.kernel:service=KernelController"/></parameter>
+ </constructor>
+ </bean>
+
+ <!-- Responsible for booting Weld -->
+ <bean name="WeldBootstrapDeployer" class="org.jboss.weld.integration.deployer.env.WeldBootstrapDeployer"/>
+
+ <!-- Responsible for making sure that the CDI container is started before the web application(s)-->
+ <bean name="WebContainerDependencyDeployer" class="org.jboss.weld.integration.deployer.env.WebContainerDependencyDeployer"/>
+
+ <!-- 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"/>
+
+</deployment>
Added: projects/demos/microcontainer/trunk/weld/src/main/resources/log4j.properties
===================================================================
--- projects/demos/microcontainer/trunk/weld/src/main/resources/log4j.properties (rev 0)
+++ projects/demos/microcontainer/trunk/weld/src/main/resources/log4j.properties 2010-06-17 12:58:09 UTC (rev 106117)
@@ -0,0 +1,6 @@
+log4j.rootLogger=DEBUG, stdout
+
+log4j.appender.stdout=org.apache.log4j.ConsoleAppender
+log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
+# Pattern to output the caller's file name and line number.
+log4j.appender.stdout.layout.ConversionPattern=JBoss-MC-Demo %5p [%d{dd-MM-yyyy HH:mm:ss}] %c{1} - %m%n
More information about the jboss-cvs-commits
mailing list