[jboss-cvs] JBossAS SVN: r93567 - in projects/webbeans-ri-int/trunk: assembly and 10 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Sep 15 18:42:32 EDT 2009
Author: pete.muir at jboss.org
Date: 2009-09-15 18:42:32 -0400 (Tue, 15 Sep 2009)
New Revision: 93567
Added:
projects/webbeans-ri-int/trunk/assembly/
projects/webbeans-ri-int/trunk/assembly/pom.xml
projects/webbeans-ri-int/trunk/assembly/src/
projects/webbeans-ri-int/trunk/assembly/src/main/
projects/webbeans-ri-int/trunk/assembly/src/main/assembly/
projects/webbeans-ri-int/trunk/assembly/src/main/assembly/assembly.xml
projects/webbeans-ri-int/trunk/assembly/src/main/assembly/resources/
projects/webbeans-ri-int/trunk/assembly/src/main/assembly/resources/META-INF/
projects/webbeans-ri-int/trunk/assembly/src/main/assembly/resources/META-INF/jboss-structure.xml
projects/webbeans-ri-int/trunk/assembly/src/main/assembly/resources/META-INF/webbeans-deployers-jboss-beans.xml
projects/webbeans-ri-int/trunk/assembly/src/main/assembly/resources/META-INF/webbeans-services-jboss-beans.xml
projects/webbeans-ri-int/trunk/assembly/src/main/assembly/resources/lib-int/
projects/webbeans-ri-int/trunk/assembly/src/main/assembly/resources/lib-int/faces/
projects/webbeans-ri-int/trunk/assembly/src/main/assembly/resources/lib-int/faces/META-INF/
projects/webbeans-ri-int/trunk/assembly/src/main/assembly/resources/lib-int/faces/META-INF/.faces-config.xml.jsfdia
projects/webbeans-ri-int/trunk/assembly/src/main/assembly/resources/lib-int/faces/META-INF/faces-config.xml
projects/webbeans-ri-int/trunk/assembly/src/main/java/
projects/webbeans-ri-int/trunk/assembly/src/test/
projects/webbeans-ri-int/trunk/assembly/src/test/java/
projects/webbeans-ri-int/trunk/assembly/src/test/resources/
Modified:
projects/webbeans-ri-int/trunk/deployer/pom.xml
projects/webbeans-ri-int/trunk/pom.xml
Log:
WBINT-26
Added: projects/webbeans-ri-int/trunk/assembly/pom.xml
===================================================================
--- projects/webbeans-ri-int/trunk/assembly/pom.xml (rev 0)
+++ projects/webbeans-ri-int/trunk/assembly/pom.xml 2009-09-15 22:42:32 UTC (rev 93567)
@@ -0,0 +1,89 @@
+<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.webbeans.integration</groupId>
+ <artifactId>webbeans-jboss-int</artifactId>
+ <version>5.2.0-SNAPSHOT</version>
+ </parent>
+
+ <groupId>org.jboss.webbeans.integration</groupId>
+ <artifactId>webbeans-jboss-int-deployer-assembly</artifactId>
+ <version>5.2.0-SNAPSHOT</version>
+ <packaging>jar</packaging>
+ <name>Web Beans JBoss AS Deployer Assembly</name>
+ <description>Web Beans deployer assembly for JBoss AS</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-assembly-plugin</artifactId>
+ <configuration>
+ <descriptors>
+ <descriptor>src/main/assembly/assembly.xml</descriptor>
+ </descriptors>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ <dependencies>
+
+ <!--
+ This MUST NOT export ANY dependencies- they should be marked optional.
+ -->
+
+ <dependency>
+ <groupId>org.jboss.webbeans.integration</groupId>
+ <artifactId>webbeans-jboss-int-jboss-ejb</artifactId>
+ <optional>true</optional>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.webbeans.integration</groupId>
+ <artifactId>webbeans-jboss-int-webtier</artifactId>
+ <optional>true</optional>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.webbeans.integration</groupId>
+ <artifactId>webbeans-jboss-int-deployer</artifactId>
+ <optional>true</optional>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.webbeans</groupId>
+ <artifactId>webbeans-core</artifactId>
+ <optional>true</optional>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.webbeans</groupId>
+ <artifactId>jsr299-api</artifactId>
+ <optional>true</optional>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.webbeans</groupId>
+ <artifactId>webbeans-spi</artifactId>
+ <optional>true</optional>
+ </dependency>
+
+ </dependencies>
+
+</project>
Added: projects/webbeans-ri-int/trunk/assembly/src/main/assembly/assembly.xml
===================================================================
--- projects/webbeans-ri-int/trunk/assembly/src/main/assembly/assembly.xml (rev 0)
+++ projects/webbeans-ri-int/trunk/assembly/src/main/assembly/assembly.xml 2009-09-15 22:42:32 UTC (rev 93567)
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<assembly 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/xsd/assembly-1.1.0.xsd
+ ">
+
+ <baseDirectory>webbeans.deployer</baseDirectory>
+
+ <formats>
+ <format>zip</format>
+ </formats>
+
+ <fileSets>
+ <fileSet>
+ <directory>src/main/assembly/resources</directory>
+ <outputDirectory></outputDirectory>
+ </fileSet>
+ </fileSets>
+
+ <dependencySets>
+ <dependencySet>
+ <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping>
+ <includes>
+ <include>com.google.collections:google-collections</include>
+ <include>javax.inject:inject-api</include>
+ <include>org.jboss.webbeans:jsr299-api</include>
+ <include>org.jboss.webbeans:webbeans-api</include>
+ <include>org.jboss.webbeans:webbeans-spi</include>
+ <include>org.jboss.webbeans:webbeans-logging</include>
+ <include>org.jboss.webbeans.integration:webbeans-jboss-int-jboss-ejb</include>
+ <include>org.jboss.webbeans.integration:webbeans-jboss-int-deployer</include>
+ <include>org.jboss.webbeans.integration:webbeans-jboss-int-webtier</include>
+ </includes>
+ </dependencySet>
+ <dependencySet>
+ <useProjectArtifact>false</useProjectArtifact>
+ <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping>
+ <outputDirectory>lib-int</outputDirectory>
+ <includes>
+ <include>org.jboss.webbeans:webbeans-core</include>
+ </includes>
+ </dependencySet>
+ </dependencySets>
+
+</assembly>
Added: projects/webbeans-ri-int/trunk/assembly/src/main/assembly/resources/META-INF/jboss-structure.xml
===================================================================
--- projects/webbeans-ri-int/trunk/assembly/src/main/assembly/resources/META-INF/jboss-structure.xml (rev 0)
+++ projects/webbeans-ri-int/trunk/assembly/src/main/assembly/resources/META-INF/jboss-structure.xml 2009-09-15 22:42:32 UTC (rev 93567)
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<structure>
+ <context>
+ <path name=""/>
+ <metaDataPath>
+ <path name="META-INF"/>
+ </metaDataPath>
+ <classpath>
+ <path name="" suffixes=".jar" />
+ </classpath>
+ </context>
+</structure>
Added: projects/webbeans-ri-int/trunk/assembly/src/main/assembly/resources/META-INF/webbeans-deployers-jboss-beans.xml
===================================================================
--- projects/webbeans-ri-int/trunk/assembly/src/main/assembly/resources/META-INF/webbeans-deployers-jboss-beans.xml (rev 0)
+++ projects/webbeans-ri-int/trunk/assembly/src/main/assembly/resources/META-INF/webbeans-deployers-jboss-beans.xml 2009-09-15 22:42:32 UTC (rev 93567)
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ Web Beans RI + JBossAS integration
+-->
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+
+ <!-- Web Beans deployers -->
+
+ <!-- Responsible for discovering Web Bean files -->
+ <bean name="WebBeansFilesDeployer" class="org.jboss.webbeans.integration.deployer.metadata.WebBeansFilesDeployer"/>
+
+ <!-- Responsible for discovering Web Bean classes -->
+ <bean name="WebBeansDiscoveryDeployer" class="org.jboss.webbeans.integration.deployer.env.WebBeanDiscoveryDeployer"/>
+
+ <!-- Responsible for discovering Web Bean classes -->
+ <bean name="EjbServicesDeployer" class="org.jboss.webbeans.integration.deployer.env.EjbServicesDeployer"/>
+
+ <!-- Responsible for discovering Web Bean classes -->
+ <bean name="FlatDeploymentDeployer" class="org.jboss.webbeans.integration.deployer.env.FlatDeploymentDeployer"/>
+
+ <!-- Responsible for dynamic ejb dependency creation -->
+ <bean name="DynamicDependencyCreator" class="org.jboss.webbeans.integration.deployer.env.DynamicDependencyCreator">
+ <constructor>
+ <parameter><inject bean="jboss.kernel:service=KernelController"/></parameter>
+ </constructor>
+ </bean>
+
+ <!-- Responsible for booting Web Beans -->
+ <bean name="WebBeansBootstrapDeployer" class="org.jboss.webbeans.integration.deployer.env.WebBeansBootstrapDeployer"/>
+
+ <!-- Responsible for pushing the JSF faces-config.xml onto the application classpath -->
+ <bean name="WebBeansFacesIntegrationDeployer" class="org.jboss.webbeans.integration.deployer.cl.WebBeansFacesIntegrationDeployer"/>
+
+ <!-- Responsible for pushing the webtier integration jar onto the application classpath -->
+<!-- <bean name="WebBeansWenTierIntegrationDeployer" class="org.jboss.webbeans.integration.deployer.cl.WebBeansWebTierIntegrationDeployer"/>-->
+
+ <!-- Responsible for pushing the WB RI onto the application classpath -->
+ <bean name="WebBeansCoreIntegrationDeployer" class="org.jboss.webbeans.integration.deployer.cl.WebBeansCoreIntegrationDeployer"/>
+
+ <!-- Responsible for inserting the Web Beans RI EJB interceptor -->
+ <bean name="PostEjbJarMetadataDeployer" class="org.jboss.webbeans.integration.deployer.metadata.WBEjbInterceptorMetadataDeployer"/>
+
+ <!-- Responsible for enabling classloader isolation for Web Bean jars -->
+ <bean name="PostJBossMetadataDeployer" class="org.jboss.webbeans.integration.deployer.metadata.PostJBossMetadataDeployer"/>
+
+ <!-- Responsible for enabling classloader isolation for Web Bean wars -->
+ <bean name="PostJBossWebMetadataDeployer" class="org.jboss.webbeans.integration.deployer.metadata.PostJBossWebMetadataDeployer"/>
+
+ <!-- Responsible for adding the Web Beans RI listener to the Servlet -->
+ <bean name="PostWebMetadataDeployer" class="org.jboss.webbeans.integration.deployer.metadata.PostWebMetadataDeployer"/>
+
+ <!-- Responsible for adding the Web Beans Manager object factory to JNDI -->
+ <bean name="WebBeansJndiBinder" class="org.jboss.webbeans.integration.deployer.env.WebBeansJndiBinder">
+ <start method="startService">
+ <parameter>java:app/BeanManager</parameter>
+ <parameter>org.jboss.webbeans.resources.ManagerObjectFactory</parameter>
+ </start>
+ <stop method="stopService"/>
+ </bean>
+
+</deployment>
Added: projects/webbeans-ri-int/trunk/assembly/src/main/assembly/resources/META-INF/webbeans-services-jboss-beans.xml
===================================================================
--- projects/webbeans-ri-int/trunk/assembly/src/main/assembly/resources/META-INF/webbeans-services-jboss-beans.xml (rev 0)
+++ projects/webbeans-ri-int/trunk/assembly/src/main/assembly/resources/META-INF/webbeans-services-jboss-beans.xml 2009-09-15 22:42:32 UTC (rev 93567)
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ Web Beans' Services Implementations for JBoss AS
+-->
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+
+ <!-- EJB Services Utility class -->
+ <bean name="WBJBossEjb" class="org.jboss.webbeans.integration.util.JBossEjb"/>
+
+ <!-- EJB Services: @EJB-style injection lookup -->
+ <beanfactory name="JBossEjbServices" class="org.jboss.webbeans.integration.ejb.JBossEjbServices">
+ <property name="resolver"><inject bean="WBJBossEjb" property="resolver"/></property>
+ <property name="jbossEjb"><inject bean="WBJBossEjb" /></property>
+ </beanfactory>
+
+ <!-- JPA Services: @PersistenceContext-style and @PersistenceUnit-style lookup -->
+ <beanfactory name="JBossJpaServices" class="org.jboss.webbeans.integration.persistence.JBossJpaServices">
+ <property name="persistenceUnitDependencyResolver"><inject bean="PersistenceUnitDependencyResolver" /></property>
+ <property name="jbossEjb"><inject bean="WBJBossEjb" /></property>
+ </beanfactory>
+
+ <!-- @Resource-style lookup -->
+ <bean name="JBossResourceServices" class="org.jboss.webbeans.integration.resource.JBossResourceServices" />
+
+ <!-- Access to the JTA UserTransaction, and synchronization registration -->
+ <bean name="JBossTransactionServices" class="org.jboss.webbeans.integration.transaction.JBossTransactionServices">
+ <constructor>
+ <parameter><inject bean="TransactionManager"/></parameter>
+ </constructor>
+ </bean>
+
+ <!-- Access to the caller context Principal -->
+ <bean name="JBossSecurityServices" class="org.jboss.webbeans.integration.security.JBossSecurityServices" />
+
+</deployment>
Added: projects/webbeans-ri-int/trunk/assembly/src/main/assembly/resources/lib-int/faces/META-INF/.faces-config.xml.jsfdia
===================================================================
--- projects/webbeans-ri-int/trunk/assembly/src/main/assembly/resources/lib-int/faces/META-INF/.faces-config.xml.jsfdia (rev 0)
+++ projects/webbeans-ri-int/trunk/assembly/src/main/assembly/resources/lib-int/faces/META-INF/.faces-config.xml.jsfdia 2009-09-15 22:42:32 UTC (rev 93567)
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<PROCESS model-entity="JSFProcess"/>
Added: projects/webbeans-ri-int/trunk/assembly/src/main/assembly/resources/lib-int/faces/META-INF/faces-config.xml
===================================================================
--- projects/webbeans-ri-int/trunk/assembly/src/main/assembly/resources/lib-int/faces/META-INF/faces-config.xml (rev 0)
+++ projects/webbeans-ri-int/trunk/assembly/src/main/assembly/resources/lib-int/faces/META-INF/faces-config.xml 2009-09-15 22:42:32 UTC (rev 93567)
@@ -0,0 +1,19 @@
+<?xml version="1.0"?>
+<faces-config id="webbeans" version="1.2"
+ 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_1_2.xsd">
+
+ <factory>
+ <application-factory>org.jboss.webbeans.integration.webtier.jsf.WebBeansApplicationFactory</application-factory>
+ </factory>
+
+ <application>
+ <view-handler>org.jboss.webbeans.jsf.ConversationAwareViewHandler</view-handler>
+ </application>
+
+ <lifecycle>
+ <phase-listener>org.jboss.webbeans.jsf.WebBeansPhaseListener</phase-listener>
+ </lifecycle>
+
+</faces-config>
Modified: projects/webbeans-ri-int/trunk/deployer/pom.xml
===================================================================
--- projects/webbeans-ri-int/trunk/deployer/pom.xml 2009-09-15 22:05:18 UTC (rev 93566)
+++ projects/webbeans-ri-int/trunk/deployer/pom.xml 2009-09-15 22:42:32 UTC (rev 93567)
@@ -10,8 +10,8 @@
<artifactId>webbeans-jboss-int-deployer</artifactId>
<version>5.2.0-SNAPSHOT</version>
<packaging>jar</packaging>
- <name>Web Beans JBoss AS Deployer</name>
- <description>Web Beans deployer for JBoss AS</description>
+ <name>Web Beans JBoss AS Deployers</name>
+ <description>Web Beans deployers for JBoss AS</description>
<repositories>
<repository>
@@ -28,49 +28,7 @@
</repository>
</repositories>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-assembly-plugin</artifactId>
- <configuration>
- <descriptors>
- <descriptor>src/main/assembly/assembly.xml</descriptor>
- </descriptors>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
<dependencies>
-
- <!--
- This MUST NOT export ANY dependencies.
- Provided scope should be used for any dependencies required at compilation
- time. Runtime scope should be used for any dependencies required by the
- assembly. They should be marked optional.
- -->
-
- <dependency>
- <groupId>org.jboss.webbeans.integration</groupId>
- <artifactId>webbeans-jboss-int-jboss-ejb</artifactId>
- <scope>runtime</scope>
- <optional>true</optional>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.webbeans.integration</groupId>
- <artifactId>webbeans-jboss-int-webtier</artifactId>
- <scope>runtime</scope>
- <optional>true</optional>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.webbeans</groupId>
- <artifactId>webbeans-core</artifactId>
- <scope>runtime</scope>
- <optional>true</optional>
- </dependency>
<dependency>
<groupId>org.jboss.webbeans</groupId>
Modified: projects/webbeans-ri-int/trunk/pom.xml
===================================================================
--- projects/webbeans-ri-int/trunk/pom.xml 2009-09-15 22:05:18 UTC (rev 93566)
+++ projects/webbeans-ri-int/trunk/pom.xml 2009-09-15 22:42:32 UTC (rev 93567)
@@ -20,6 +20,7 @@
<module>ejb</module>
<module>webtier</module>
<module>deployer</module>
+ <module>assembly</module>
</modules>
<properties>
@@ -353,16 +354,22 @@
</dependency>
<dependency>
- <groupId>org.jboss.webbeans.integration</groupId>
- <artifactId>webbeans-jboss-int-jboss-ejb</artifactId>
- <version>${project.version}</version>
+ <groupId>org.jboss.webbeans.integration</groupId>
+ <artifactId>webbeans-jboss-int-jboss-ejb</artifactId>
+ <version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.jboss.webbeans.integration</groupId>
- <artifactId>webbeans-jboss-int-webtier</artifactId>
- <version>${project.version}</version>
+ <groupId>org.jboss.webbeans.integration</groupId>
+ <artifactId>webbeans-jboss-int-webtier</artifactId>
+ <version>${project.version}</version>
</dependency>
+
+ <dependency>
+ <groupId>org.jboss.webbeans.integration</groupId>
+ <artifactId>webbeans-jboss-int-deployer</artifactId>
+ <version>${project.version}</version>
+ </dependency>
<dependency>
<groupId>javax.servlet</groupId>
More information about the jboss-cvs-commits
mailing list