[jboss-cvs] JBossAS SVN: r83703 - in projects/webbeans-ri-int/trunk: deployer and 8 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Fri Jan 30 14:57:27 EST 2009
Author: petemuir
Date: 2009-01-30 14:57:27 -0500 (Fri, 30 Jan 2009)
New Revision: 83703
Added:
projects/webbeans-ri-int/trunk/deployer/
projects/webbeans-ri-int/trunk/deployer/pom.xml
projects/webbeans-ri-int/trunk/deployer/src/
projects/webbeans-ri-int/trunk/deployer/src/main/
projects/webbeans-ri-int/trunk/deployer/src/main/assembly/
projects/webbeans-ri-int/trunk/deployer/src/main/assembly/assembly.xml
projects/webbeans-ri-int/trunk/deployer/src/main/resources/
projects/webbeans-ri-int/trunk/deployer/src/main/resources/META-INF/
projects/webbeans-ri-int/trunk/deployer/src/main/resources/META-INF/jboss-structure.xml
projects/webbeans-ri-int/trunk/deployer/src/main/resources/META-INF/webbeans-deployers-jboss-beans.xml
projects/webbeans-ri-int/trunk/deployer/src/main/resources/META-INF/webbeans-ejb-jboss-beans.xml
Modified:
projects/webbeans-ri-int/trunk/
projects/webbeans-ri-int/trunk/ejb/pom.xml
projects/webbeans-ri-int/trunk/jbossas/pom.xml
projects/webbeans-ri-int/trunk/microcontainer/pom.xml
projects/webbeans-ri-int/trunk/pom.xml
Log:
move deployer into -int projects
Property changes on: projects/webbeans-ri-int/trunk
___________________________________________________________________
Name: svn:ignore
+ .settings
.project
.classpath
Property changes on: projects/webbeans-ri-int/trunk/deployer
___________________________________________________________________
Name: svn:ignore
+ .settings
.project
.classpath
Added: projects/webbeans-ri-int/trunk/deployer/pom.xml
===================================================================
--- projects/webbeans-ri-int/trunk/deployer/pom.xml (rev 0)
+++ projects/webbeans-ri-int/trunk/deployer/pom.xml 2009-01-30 19:57:27 UTC (rev 83703)
@@ -0,0 +1,59 @@
+<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-ri-int</artifactId>
+ <version>5.2.0-SNAPSHOT</version>
+ </parent>
+
+ <groupId>org.jboss.webbeans.integration</groupId>
+ <artifactId>webbeans-ri-int-deployer</artifactId>
+ <version>5.2.0-SNAPSHOT</version>
+ <packaging>pom</packaging>
+ <name>Web Beans JBoss AS Deployer</name>
+ <description>Web Beans deployer 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>
+ <dependency>
+ <groupId>org.jboss.webbeans.integration</groupId>
+ <artifactId>webbeans-ri-int-jbossas</artifactId>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.webbeans</groupId>
+ <artifactId>webbeans-ri</artifactId>
+
+ </dependency>
+ </dependencies>
+
+</project>
Added: projects/webbeans-ri-int/trunk/deployer/src/main/assembly/assembly.xml
===================================================================
--- projects/webbeans-ri-int/trunk/deployer/src/main/assembly/assembly.xml (rev 0)
+++ projects/webbeans-ri-int/trunk/deployer/src/main/assembly/assembly.xml 2009-01-30 19:57:27 UTC (rev 83703)
@@ -0,0 +1,45 @@
+<?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/resources</directory>
+ <outputDirectory></outputDirectory>
+ </fileSet>
+ </fileSets>
+
+ <dependencySets>
+ <dependencySet>
+ <useProjectArtifact>false</useProjectArtifact>
+ <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping>
+ <includes>
+ <include>org.jboss.webbeans:webbeans-api</include>
+ <include>org.jboss.webbeans:webbeans-ri-spi</include>
+ <include>org.jboss.webbeans.integration:webbeans-ri-int-jboss-ejb</include>
+ <include>org.jboss.webbeans.integration:webbeans-ri-int-microcontainer</include>
+ <include>com.google.collections:google-collections</include>
+ </includes>
+ </dependencySet>
+ <dependencySet>
+ <useProjectArtifact>false</useProjectArtifact>
+ <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping>
+ <outputDirectory>lib-int</outputDirectory>
+ <includes>
+ <include>org.jboss.webbeans:webbeans-ri</include>
+ <include>org.jboss.webbeans.integration:webbeans-ri-int-jbossas</include>
+ </includes>
+ </dependencySet>
+ </dependencySets>
+
+</assembly>
\ No newline at end of file
Added: projects/webbeans-ri-int/trunk/deployer/src/main/resources/META-INF/jboss-structure.xml
===================================================================
--- projects/webbeans-ri-int/trunk/deployer/src/main/resources/META-INF/jboss-structure.xml (rev 0)
+++ projects/webbeans-ri-int/trunk/deployer/src/main/resources/META-INF/jboss-structure.xml 2009-01-30 19:57:27 UTC (rev 83703)
@@ -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/deployer/src/main/resources/META-INF/webbeans-deployers-jboss-beans.xml
===================================================================
--- projects/webbeans-ri-int/trunk/deployer/src/main/resources/META-INF/webbeans-deployers-jboss-beans.xml (rev 0)
+++ projects/webbeans-ri-int/trunk/deployer/src/main/resources/META-INF/webbeans-deployers-jboss-beans.xml 2009-01-30 19:57:27 UTC (rev 83703)
@@ -0,0 +1,31 @@
+<?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.microcontainer.deployer.metadata.WebBeansFilesDeployer"/>
+
+ <!-- Responsible for discovering Web Bean classes -->
+ <bean name="WebBeansDiscoveryDeployer" class="org.jboss.webbeans.integration.microcontainer.deployer.env.WebBeanDiscoveryDeployer"/>
+
+ <!-- Responsible for pushing the Web Beans RI onto the application classpath -->
+ <bean name="WebBeansWebUrlIntegrationDeployer" class="org.jboss.webbeans.integration.microcontainer.deployer.cl.WebBeansWebUrlIntegrationDeployer"/>
+
+ <!-- Responsible for inserting the Web Beans RI EJB interceptor -->
+ <bean name="PostEjbJarMetadataDeployer" class="org.jboss.webbeans.integration.microcontainer.deployer.metadata.WBEjbInterceptorMetadataDeployer"/>
+
+ <!-- Responsible for enabling classloader isolation for Web Bean jars -->
+ <bean name="PostJBossMetadataDeployer" class="org.jboss.webbeans.integration.microcontainer.deployer.metadata.PostJBossMetadataDeployer"/>
+
+ <!-- Responsible for enabling classloader isolation for Web Bean wars -->
+ <bean name="PostJBossWebMetadataDeployer" class="org.jboss.webbeans.integration.microcontainer.deployer.metadata.PostJBossWebMetadataDeployer"/>
+
+ <!-- Responsible for adding the Web Beans RI listener to the Servlet -->
+ <bean name="PostWebMetadataDeployer" class="org.jboss.webbeans.integration.microcontainer.deployer.metadata.PostWebMetadataDeployer"/>
+
+</deployment>
Added: projects/webbeans-ri-int/trunk/deployer/src/main/resources/META-INF/webbeans-ejb-jboss-beans.xml
===================================================================
--- projects/webbeans-ri-int/trunk/deployer/src/main/resources/META-INF/webbeans-ejb-jboss-beans.xml (rev 0)
+++ projects/webbeans-ri-int/trunk/deployer/src/main/resources/META-INF/webbeans-ejb-jboss-beans.xml 2009-01-30 19:57:27 UTC (rev 83703)
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ Web Beans RI + JBossEJB
+-->
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+
+ <bean name="WBJBossEjb" class="org.jboss.webbeans.integration.ejb.util.JBossEjb"/>
+
+ <beanfactory name="JBossEjbResolver" class="org.jboss.webbeans.integration.ejb.JBossEjbResolver">
+ <property name="controller"><inject bean="jboss.kernel:service=KernelController" /></property>
+ <property name="resolver"><inject bean="WBJBossEjb" property="resolver"/></property>
+ <property name="persistenceUnitDependencyResolver"><inject bean="PersistenceUnitDependencyResolver" /></property>
+ <property name="jbossEjb"><inject bean="WBJBossEjb" /></property>
+ </beanfactory>
+
+ <beanfactory name="JBossEjbDiscovery" class="org.jboss.webbeans.integration.ejb.JBossEjbDiscovery">
+ <property name="resolver"><inject bean="WBJBossEjb" property="resolver"/></property>
+ </beanfactory>
+
+</deployment>
Modified: projects/webbeans-ri-int/trunk/ejb/pom.xml
===================================================================
--- projects/webbeans-ri-int/trunk/ejb/pom.xml 2009-01-30 19:51:58 UTC (rev 83702)
+++ projects/webbeans-ri-int/trunk/ejb/pom.xml 2009-01-30 19:57:27 UTC (rev 83703)
@@ -8,7 +8,7 @@
<artifactId>webbeans-ri-int-jboss-ejb</artifactId>
<version>5.2.0-SNAPSHOT</version>
<packaging>jar</packaging>
- <name>Web Beans RI Int JBoss EJB3</name>
+ <name>Web Beans JBoss EJB3 Integration</name>
<description>Web Beans RI Int JBoss EJB3</description>
<!-- Do not add version information here, use ../pom.xml instead -->
Modified: projects/webbeans-ri-int/trunk/jbossas/pom.xml
===================================================================
--- projects/webbeans-ri-int/trunk/jbossas/pom.xml 2009-01-30 19:51:58 UTC (rev 83702)
+++ projects/webbeans-ri-int/trunk/jbossas/pom.xml 2009-01-30 19:57:27 UTC (rev 83703)
@@ -8,7 +8,7 @@
<artifactId>webbeans-ri-int-jbossas</artifactId>
<version>5.2.0-SNAPSHOT</version>
<packaging>jar</packaging>
- <name>Web Beans RI Int JBossAS</name>
+ <name>Web Beans JBoss AS Integration</name>
<description>Web Beans RI Int JBossAS</description>
<!-- Do not add version information here, use ../pom.xml instead -->
Modified: projects/webbeans-ri-int/trunk/microcontainer/pom.xml
===================================================================
--- projects/webbeans-ri-int/trunk/microcontainer/pom.xml 2009-01-30 19:51:58 UTC (rev 83702)
+++ projects/webbeans-ri-int/trunk/microcontainer/pom.xml 2009-01-30 19:57:27 UTC (rev 83703)
@@ -8,7 +8,7 @@
<artifactId>webbeans-ri-int-microcontainer</artifactId>
<version>5.2.0-SNAPSHOT</version>
<packaging>jar</packaging>
- <name>Web Beans Int Microcontainer</name>
+ <name>Web Beans JBoss Microcontainer Integration</name>
<description>Web Beans Int Microcontainer</description>
<build>
<plugins>
Modified: projects/webbeans-ri-int/trunk/pom.xml
===================================================================
--- projects/webbeans-ri-int/trunk/pom.xml 2009-01-30 19:51:58 UTC (rev 83702)
+++ projects/webbeans-ri-int/trunk/pom.xml 2009-01-30 19:57:27 UTC (rev 83703)
@@ -9,7 +9,7 @@
<artifactId>webbeans-ri-int</artifactId>
<version>5.2.0-SNAPSHOT</version>
<packaging>pom</packaging>
- <name>WebBeans RI Int Aggregator</name>
+ <name>Web Beans JBoss AS Integration Aggregator</name>
<scm>
<connection>scm:svn:http://anonsvn.jboss.org/repos/jbossas/projects/webbeans-ri-int/trunk/</connection>
<developerConnection>scm:svn:https://svn.jboss.org/repos/jbossas/projects/webbeans-ri-int/trunk/</developerConnection>
@@ -21,10 +21,11 @@
<module>jbossas</module>
<module>microcontainer</module>
<module>ejb</module>
+ <module>deployer</module>
</modules>
<properties>
- <version.webbeans-ri>1.0.0.ALPHA2</version.webbeans-ri>
+ <version.webbeans-ri>1.0.0-SNAPSHOT</version.webbeans-ri>
<version.jboss.vfs>2.0.0.GA</version.jboss.vfs>
<version.jboss.man>2.0.0.GA</version.jboss.man>
<version.jboss.microcontainer>2.0.2.GA</version.jboss.microcontainer>
@@ -371,6 +372,11 @@
<version>${version.junit}</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.jboss.webbeans</groupId>
+ <artifactId>webbeans-ri</artifactId>
+ <version>${version.webbeans-ri}</version>
+ </dependency>
</dependencies>
</dependencyManagement>
More information about the jboss-cvs-commits
mailing list