[jboss-cvs] JBossAS SVN: r94785 - in branches/Branch_5_x: component-matrix and 4 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Oct 13 16:03:33 EDT 2009
Author: smcgowan at redhat.com
Date: 2009-10-13 16:03:33 -0400 (Tue, 13 Oct 2009)
New Revision: 94785
Modified:
branches/Branch_5_x/build/build-distr.xml
branches/Branch_5_x/build/build.xml
branches/Branch_5_x/component-matrix/pom.xml
branches/Branch_5_x/server/build.xml
branches/Branch_5_x/server/pom.xml
branches/Branch_5_x/spring-int/build.xml
branches/Branch_5_x/spring-int/pom.xml
branches/Branch_5_x/testsuite/build.xml
branches/Branch_5_x/thirdparty/pom.xml
Log:
JBAS-7374, JBAS-7263 - add WELD APIs
Modified: branches/Branch_5_x/build/build-distr.xml
===================================================================
--- branches/Branch_5_x/build/build-distr.xml 2009-10-13 20:02:22 UTC (rev 94784)
+++ branches/Branch_5_x/build/build-distr.xml 2009-10-13 20:03:33 UTC (rev 94785)
@@ -2054,6 +2054,9 @@
<fileset dir="${apache.logging.lib}">
<include name="commons-logging.jar"/>
</fileset>
+ <fileset dir="${javax.enterprise.lib}">
+ <include name="cdi-api.jar"/>
+ </fileset>
<fileset dir="${org.apache.lib}">
<include name="xmlsec.jar"/>
</fileset>
@@ -2093,6 +2096,9 @@
<fileset dir="${jboss.jboss.javaee.lib}">
<include name="jboss-javaee.jar"/>
</fileset>
+ <fileset dir="${org.jboss.interceptor.lib}">
+ <include name="jboss-interceptor-api.jar"/>
+ </fileset>
<fileset dir="${jboss.jboss.security.spi.lib}">
<include name="jboss-security-spi.jar"/>
</fileset>
@@ -2147,6 +2153,9 @@
<fileset dir="${trove.trove.lib}">
<include name="trove.jar"/>
</fileset>
+ <fileset dir="${org.jboss.weld.lib}">
+ <include name="weld-api.jar"/>
+ </fileset>
<fileset dir="${woodstox.woodstox.lib}">
<include name="wstx.jar"/>
</fileset>
@@ -2217,6 +2226,15 @@
<fileset dir="${net.jcip.lib}">
<include name="jcip-annotations.jar"/>
</fileset>
+ <fileset dir="${javax.enterprise.lib}">
+ <include name="cdi-api.jar"/>
+ </fileset>
+ <fileset dir="${org.jboss.interceptor.lib}">
+ <include name="jboss-interceptor-api.jar"/>
+ </fileset>
+ <fileset dir="${org.jboss.weld.lib}">
+ <include name="weld-api.jar"/>
+ </fileset>
</copy>
<!-- Unpack the javaee dtds/schemas from jboss-metadata.jar -->
<mkdir dir="${install.dtd}"/>
Modified: branches/Branch_5_x/build/build.xml
===================================================================
--- branches/Branch_5_x/build/build.xml 2009-10-13 20:02:22 UTC (rev 94784)
+++ branches/Branch_5_x/build/build.xml 2009-10-13 20:03:33 UTC (rev 94785)
@@ -892,6 +892,7 @@
<fileset id="client.jar.fileset" dir="${client.jar.dir}">
<include name="*-client.jar"/>
<include name="asm.jar"/>
+ <include name="cdi-api.jar"/>
<include name="cglib-2.1.1.jar"/>
<include name="commons-logging.jar"/>
<include name="concurrent.jar"/>
@@ -905,6 +906,7 @@
<include name="jboss-appclient.jar"/>
<include name="jboss-common*.jar"/>
<include name="jboss-ejb3-ext-api.jar"/>
+ <include name="jboss-interceptor-api.jar"/>
<include name="jboss-logging*.jar"/>
<include name="slf4j-api.jar"/>
<include name="slf4j-jboss-logging.jar"/>
@@ -927,6 +929,7 @@
<include name="jbossjts.jar"/>
<include name="jbossjts-integration.jar"/>
<include name="jboss-profileservice-client.jar"/>
+ <include name="weld-api.jar"/>
<!-- client excludes -->
<exclude name="jbossws-native-client.jar"/>
<exclude name="${jbossall.client.filename}"/>
Modified: branches/Branch_5_x/component-matrix/pom.xml
===================================================================
--- branches/Branch_5_x/component-matrix/pom.xml 2009-10-13 20:02:22 UTC (rev 94784)
+++ branches/Branch_5_x/component-matrix/pom.xml 2009-10-13 20:03:33 UTC (rev 94785)
@@ -115,6 +115,7 @@
<version.sun-jaxws>2.1.3</version.sun-jaxws>
<version.sun.jaxb>2.1.9-brew</version.sun.jaxb>
<version.webbeans.integration>5.2.0.Beta2</version.webbeans.integration>
+ <version.weld.api>1.0-CR1</version.weld.api>
<version.xdoclet>1.2.3</version.xdoclet>
</properties>
@@ -1780,13 +1781,13 @@
<dependency>
<groupId>org.jboss.javaee</groupId>
<artifactId>jboss-javaee</artifactId>
- <version>5.0.1${version.suffix.org.jboss.javaee}</version>
+ <version>5.2.0.Beta1</version>
</dependency>
<dependency>
<groupId>org.jboss.javaee</groupId>
<artifactId>jboss-ejb-api</artifactId>
- <version>3.0.0${version.suffix.org.jboss.javaee}</version>
+ <version>3.0.0${version.suffix.org.jboss.javaee}_SP1</version>
</dependency>
<dependency>
@@ -1824,7 +1825,25 @@
<artifactId>jboss-transaction-api</artifactId>
<version>1.0.1${version.suffix.org.jboss.javaee}</version>
</dependency>
-
+
+ <dependency>
+ <groupId>org.jboss.interceptor</groupId>
+ <artifactId>jboss-interceptor-api</artifactId>
+ <version>3.1.0-CR1</version>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.enterprise</groupId>
+ <artifactId>cdi-api</artifactId>
+ <version>${version.weld.api}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.weld</groupId>
+ <artifactId>weld-api</artifactId>
+ <version>${version.weld.api}</version>
+ </dependency>
+
<!-- Normally comes in via EJB3, but we may need a patched one -->
<dependency>
<groupId>org.jboss.jpa</groupId>
Modified: branches/Branch_5_x/server/build.xml
===================================================================
--- branches/Branch_5_x/server/build.xml 2009-10-13 20:02:22 UTC (rev 94784)
+++ branches/Branch_5_x/server/build.xml 2009-10-13 20:03:33 UTC (rev 94785)
@@ -86,6 +86,7 @@
<path refid="jboss.jbossxb.classpath"/>
<path refid="org.jboss.ws.native.classpath"/>
<path refid="org.jboss.ws.classpath"/>
+ <path refid="org.jboss.interceptor.classpath"/>
<path refid="jboss.metadata.classpath"/>
<path refid="jboss.jboss.deployers.classpath"/>
<path refid="jboss.jboss.cl.classpath"/>
Modified: branches/Branch_5_x/server/pom.xml
===================================================================
--- branches/Branch_5_x/server/pom.xml 2009-10-13 20:02:22 UTC (rev 94784)
+++ branches/Branch_5_x/server/pom.xml 2009-10-13 20:03:33 UTC (rev 94785)
@@ -228,7 +228,14 @@
<dependency>
<groupId>org.jboss.javaee</groupId>
<artifactId>jboss-ejb-api</artifactId>
+ <version>3.0.0.GA_SP1</version>
</dependency>
+
+ <dependency>
+ <groupId>org.jboss.interceptor</groupId>
+ <artifactId>jboss-interceptor-api</artifactId>
+ <version>3.1.0-SNAPSHOT</version>
+ </dependency>
<dependency>
<groupId>junit</groupId>
Modified: branches/Branch_5_x/spring-int/build.xml
===================================================================
--- branches/Branch_5_x/spring-int/build.xml 2009-10-13 20:02:22 UTC (rev 94784)
+++ branches/Branch_5_x/spring-int/build.xml 2009-10-13 20:03:33 UTC (rev 94785)
@@ -91,6 +91,7 @@
<!-- Specify modules upon which this build depends -->
<path id="dependentmodule.classpath">
<path refid="jboss.aop.classpath"/>
+ <path refid="org.jboss.interceptor.classpath"/>
<path refid="jboss.common.core.classpath"/>
<path refid="jboss.common.logging.spi.classpath"/>
<path refid="jboss.jboss.ejb3.ext.api.classpath" />
Modified: branches/Branch_5_x/spring-int/pom.xml
===================================================================
--- branches/Branch_5_x/spring-int/pom.xml 2009-10-13 20:02:22 UTC (rev 94784)
+++ branches/Branch_5_x/spring-int/pom.xml 2009-10-13 20:03:33 UTC (rev 94785)
@@ -67,6 +67,10 @@
<artifactId>jboss-ejb-api</artifactId>
</dependency>
<dependency>
+ <groupId>org.jboss.interceptor</groupId>
+ <artifactId>jboss-interceptor-api</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.jboss.microcontainer</groupId>
<artifactId>jboss-dependency</artifactId>
</dependency>
@@ -130,4 +134,4 @@
</dependency>
</dependencies>
-</project>
\ No newline at end of file
+</project>
Modified: branches/Branch_5_x/testsuite/build.xml
===================================================================
--- branches/Branch_5_x/testsuite/build.xml 2009-10-13 20:02:22 UTC (rev 94784)
+++ branches/Branch_5_x/testsuite/build.xml 2009-10-13 20:03:33 UTC (rev 94785)
@@ -236,6 +236,7 @@
<path refid="jboss.jboss.jaspi.api.classpath"/>
<path refid="jboss.jboss.javaee.classpath"/>
<path refid="org.jboss.javaee.classpath"/>
+ <path refid="org.jboss.interceptor.classpath"/>
<path refid="jboss.jboss.vfs.classpath"/>
<path refid="jboss.jca.classpath"/>
<path refid="jboss.jmx.classpath"/>
Modified: branches/Branch_5_x/thirdparty/pom.xml
===================================================================
--- branches/Branch_5_x/thirdparty/pom.xml 2009-10-13 20:02:22 UTC (rev 94784)
+++ branches/Branch_5_x/thirdparty/pom.xml 2009-10-13 20:03:33 UTC (rev 94785)
@@ -1315,6 +1315,18 @@
<artifactId>hibernate-jbosscache2</artifactId>
</dependency>
<dependency>
+ <groupId>org.jboss.interceptor</groupId>
+ <artifactId>jboss-interceptor-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>javax.enterprise</groupId>
+ <artifactId>cdi-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.weld</groupId>
+ <artifactId>weld-api</artifactId>
+ </dependency>
+ <dependency>
<groupId>javax.validation</groupId>
<artifactId>validation-api</artifactId>
</dependency>
More information about the jboss-cvs-commits
mailing list