[jboss-cvs] JBossAS SVN: r78325 - in trunk: component-matrix and 4 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Sep 10 05:53:07 EDT 2008
Author: alesj
Date: 2008-09-10 05:53:07 -0400 (Wed, 10 Sep 2008)
New Revision: 78325
Added:
trunk/varia/src/resources/seam/
trunk/varia/src/resources/seam/seam-deployers-jboss-beans.xml
Modified:
trunk/build/build-distr.xml
trunk/component-matrix/pom.xml
trunk/thirdparty/pom.xml
trunk/varia/build.xml
Log:
Include Seam deployer in default config.
Modified: trunk/build/build-distr.xml
===================================================================
--- trunk/build/build-distr.xml 2008-09-10 09:45:57 UTC (rev 78324)
+++ trunk/build/build-distr.xml 2008-09-10 09:53:07 UTC (rev 78325)
@@ -1200,6 +1200,14 @@
</fileset>
</copy>
+ <!-- Create optional libs; e.g. seam-integration -->
+ <mkdir dir="${install.server}/all/lib-opt"/>
+ <copy todir="${install.server}/all/lib-opt" filtering="no">
+ <fileset dir="${org.jboss.seam.integration.lib}">
+ <include name="jboss-seam-int-jbossas.jar"/>
+ </fileset>
+ </copy>
+
<!-- copy the jboss-monitoring JAR -->
<copy file="${project.root}/varia/output/lib/jboss-monitoring.jar" todir="${install.server}/all/lib"/>
Modified: trunk/component-matrix/pom.xml
===================================================================
--- trunk/component-matrix/pom.xml 2008-09-10 09:45:57 UTC (rev 78324)
+++ trunk/component-matrix/pom.xml 2008-09-10 09:53:07 UTC (rev 78325)
@@ -75,6 +75,7 @@
<version.sun-jaxws>2.1.1</version.sun-jaxws>
<version.sun.jaxb>2.1.4</version.sun.jaxb>
<version.xdoclet>1.2.3</version.xdoclet>
+ <version.seam.integration>5.0.0.Beta2</version.seam.integration>
</properties>
<!-- Build Configuration -->
@@ -138,11 +139,23 @@
<dependencies>
<dependency>
+ <groupId>org.jboss.seam.integration</groupId>
+ <artifactId>jboss-seam-int-microcontainer</artifactId>
+ <version>${version.seam.integration}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.seam.integration</groupId>
+ <artifactId>jboss-seam-int-jbossas</artifactId>
+ <version>${version.seam.integration}</version>
+ </dependency>
+
+ <dependency>
<groupId>ant</groupId>
<artifactId>ant</artifactId>
<version>1.6.5</version>
</dependency>
-
+
<dependency>
<groupId>antlr</groupId>
<artifactId>antlr</artifactId>
@@ -1602,6 +1615,12 @@
<dependency>
<groupId>org.jboss.javaee</groupId>
+ <artifactId>jboss-persistence-api</artifactId>
+ <version>3.0.0.CR1</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.javaee</groupId>
<artifactId>jboss-servlet-api</artifactId>
<version>2.5.0${version.suffix.org.jboss.javaee}</version>
</dependency>
Modified: trunk/thirdparty/pom.xml
===================================================================
--- trunk/thirdparty/pom.xml 2008-09-10 09:45:57 UTC (rev 78324)
+++ trunk/thirdparty/pom.xml 2008-09-10 09:53:07 UTC (rev 78325)
@@ -906,6 +906,14 @@
<dependencies>
<dependency>
+ <groupId>org.jboss.seam.integration</groupId>
+ <artifactId>jboss-seam-int-microcontainer</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.seam.integration</groupId>
+ <artifactId>jboss-seam-int-jbossas</artifactId>
+ </dependency>
+ <dependency>
<groupId>antlr</groupId>
<artifactId>antlr</artifactId>
</dependency>
Modified: trunk/varia/build.xml
===================================================================
--- trunk/varia/build.xml 2008-09-10 09:45:57 UTC (rev 78324)
+++ trunk/varia/build.xml 2008-09-10 09:53:07 UTC (rev 78325)
@@ -531,10 +531,11 @@
</classes>
</war>
+ <!-- bsh-deployer.jar -->
+
<mkdir dir="${build.deployers}/bsh.deployer"/>
- <mkdir dir="${build.deployers}/bsh.deployer/META-INF"/>
+ <mkdir dir="${build.deployers}/bsh.deployer/META-INF"/>
- <!-- bsh-deployer.jar -->
<jar jarfile="${build.deployers}/bsh.deployer/bsh-deployer.jar">
<fileset dir="${build.classes}">
<include name="org/jboss/varia/deployment/BeanShell**"/>
@@ -548,16 +549,20 @@
<fileset file="${source.resources}/beanshell/bsh-deployers-jboss-beans.xml"/>
</copy>
- <!-- bsh-deployer.jar
- <jar jarfile="${build.lib}/bsh-deployer.jar">
- <fileset dir="${build.classes}">
- <include name="org/jboss/varia/deployment/BeanShell**"/>
- <include name="org/jboss/varia/deployment/Script**"/>
- <include name="org/jboss/varia/deployment/Test**"/>
- <include name="org/jboss/varia/deployment/Legacy**"/>
+ <!-- seam.deployer -->
+
+ <mkdir dir="${build.deployers}/seam.deployer"/>
+ <mkdir dir="${build.deployers}/seam.deployer/META-INF"/>
+
+ <copy todir="${build.deployers}/seam.deployer/META-INF">
+ <fileset file="${source.resources}/seam/seam-deployers-jboss-beans.xml"/>
+ </copy>
+
+ <copy todir="${build.deployers}/seam.deployer">
+ <fileset dir="${org.jboss.seam.integration.lib}">
+ <include name="jboss-seam-int-microcontainer.jar"/>
</fileset>
- </jar>
- -->
+ </copy>
<!-- snmp-adaptor.sar containing snmp-adaptor.jar -->
<jar jarfile="${build.lib}/snmp-adaptor.jar"
Copied: trunk/varia/src/resources/seam/seam-deployers-jboss-beans.xml (from rev 78246, trunk/server/src/etc/deployers/metadata-deployer-jboss-beans.xml)
===================================================================
--- trunk/varia/src/resources/seam/seam-deployers-jboss-beans.xml (rev 0)
+++ trunk/varia/src/resources/seam/seam-deployers-jboss-beans.xml 2008-09-10 09:53:07 UTC (rev 78325)
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ JBoss Seam + JBossAS integration
+-->
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+
+ <!-- Seam deployer -->
+ <bean name="SeamDeployer" class="org.jboss.seam.integration.microcontainer.deployers.SeamWebUrlIntegrationDeployer">
+ <property name="integrationURL">${jboss.server.lib.url}/lib-opt/jboss-seam-int-jbossas.jar</property>
+ </bean>
+
+</deployment>
Property changes on: trunk/varia/src/resources/seam/seam-deployers-jboss-beans.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ native
More information about the jboss-cvs-commits
mailing list