[jboss-cvs] JBossAS SVN: r93549 - in branches/Branch_5_x: thirdparty and 3 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Sep 15 13:09:54 EDT 2009
Author: stan.silvert at jboss.com
Date: 2009-09-15 13:09:54 -0400 (Tue, 15 Sep 2009)
New Revision: 93549
Added:
branches/Branch_5_x/varia/src/resources/beanvalidation/
branches/Branch_5_x/varia/src/resources/beanvalidation/bv-core-jboss-beans.xml
branches/Branch_5_x/varia/src/resources/beanvalidation/bv-deployers-jboss-beans.xml
Modified:
branches/Branch_5_x/component-matrix/pom.xml
branches/Branch_5_x/thirdparty/pom.xml
branches/Branch_5_x/varia/build.xml
Log:
JBAS-7167 Add JSR-303 Bean Validation to AS 5.2 & Trunk
Modified: branches/Branch_5_x/component-matrix/pom.xml
===================================================================
--- branches/Branch_5_x/component-matrix/pom.xml 2009-09-15 16:41:58 UTC (rev 93548)
+++ branches/Branch_5_x/component-matrix/pom.xml 2009-09-15 17:09:54 UTC (rev 93549)
@@ -34,7 +34,7 @@
<version.commons.beanutils>1.8.0</version.commons.beanutils>
<version.jacorb>2.3.1jboss.patch01-brew</version.jacorb>
<version.javax.faces>2.0.0-RC</version.javax.faces>
- <version.javax.validation>1.0.CR3</version.javax.validation>
+ <version.javax.validation>1.0.CR5</version.javax.validation>
<version.jboss.jaxr>2.0.1</version.jboss.jaxr>
<version.jboss.jbossts>4.6.1.GA</version.jboss.jbossts>
<version.jboss.jbossws-common>1.2.0.GA</version.jboss.jbossws-common>
@@ -50,7 +50,7 @@
<version.org.hibernate.commons.annotations>3.1.0.GA</version.org.hibernate.commons.annotations>
<version.org.hibernate.ejb3.persistence>1.0.2.GA</version.org.hibernate.ejb3.persistence>
<version.org.hibernate.entity.manager>3.4.0.GA</version.org.hibernate.entity.manager>
- <version.org.hibernate.validator>4.0.0.Beta2</version.org.hibernate.validator>
+ <version.org.hibernate.validator>4.0.0.CR1</version.org.hibernate.validator>
<version.org.hibernate>3.3.1.GA</version.org.hibernate>
<version.org.jboss.aop>2.1.3.GA</version.org.jboss.aop>
<version.org.jboss.aspects.currentinvocation>1.0.0.GA</version.org.jboss.aspects.currentinvocation>
@@ -104,6 +104,7 @@
<version.org.springframework>2.5.5</version.org.springframework>
<version.oswego-concurrent.concurrent>1.3.4-jboss-update1</version.oswego-concurrent.concurrent>
<version.seam.integration>5.1.0.CR1</version.seam.integration>
+ <version.beanvalidation.integration>1.0.0-SNAPSHOT</version.beanvalidation.integration>
<version.staxex>2.1.1</version.staxex>
<version.streambuffer>2.1.1</version.streambuffer>
<version.suffix.org.jboss.javaee>.GA</version.suffix.org.jboss.javaee>
@@ -135,6 +136,12 @@
</dependency>
<dependency>
+ <groupId>org.jboss.beanvalidation</groupId>
+ <artifactId>beanvalidation-deployers</artifactId>
+ <version>${version.beanvalidation.integration}</version>
+ </dependency>
+
+ <dependency>
<groupId>org.jboss.seam.integration</groupId>
<artifactId>jboss-seam-int-microcontainer</artifactId>
<version>${version.seam.integration}</version>
Modified: branches/Branch_5_x/thirdparty/pom.xml
===================================================================
--- branches/Branch_5_x/thirdparty/pom.xml 2009-09-15 16:41:58 UTC (rev 93548)
+++ branches/Branch_5_x/thirdparty/pom.xml 2009-09-15 17:09:54 UTC (rev 93549)
@@ -1023,6 +1023,10 @@
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>org.jboss.beanvalidation</groupId>
+ <artifactId>beanvalidation-deployers</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.jboss.seam.integration</groupId>
<artifactId>jboss-seam-int-microcontainer</artifactId>
</dependency>
Modified: branches/Branch_5_x/varia/build.xml
===================================================================
--- branches/Branch_5_x/varia/build.xml 2009-09-15 16:41:58 UTC (rev 93548)
+++ branches/Branch_5_x/varia/build.xml 2009-09-15 17:09:54 UTC (rev 93549)
@@ -561,7 +561,24 @@
<include name="jboss-seam-int-microcontainer.jar"/>
</fileset>
</copy>
+
+ <!-- beanvalidation.deployer -->
+ <mkdir dir="${build.deployers}/beanvalidation.deployer"/>
+ <mkdir dir="${build.deployers}/beanvalidation.deployer/META-INF"/>
+
+ <copy todir="${build.deployers}/beanvalidation.deployer/META-INF">
+ <fileset dir="${source.resources}/beanvalidation">
+ <include name="*.xml"/>
+ </fileset>
+ </copy>
+
+ <copy todir="${build.deployers}/beanvalidation.deployer">
+ <fileset dir="${org.jboss.beanvalidation.lib}">
+ <include name="beanvalidation-deployers.jar"/>
+ </fileset>
+ </copy>
+
<!-- snmp-adaptor.sar containing snmp-adaptor.jar -->
<jar jarfile="${build.lib}/snmp-adaptor.jar"
manifest="${build.etc}/default.mf">
Added: branches/Branch_5_x/varia/src/resources/beanvalidation/bv-core-jboss-beans.xml
===================================================================
--- branches/Branch_5_x/varia/src/resources/beanvalidation/bv-core-jboss-beans.xml (rev 0)
+++ branches/Branch_5_x/varia/src/resources/beanvalidation/bv-core-jboss-beans.xml 2009-09-15 17:09:54 UTC (rev 93549)
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ Bean Validation (jsr303) core beans.
+-->
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+
+ <!-- ValidatorFactory factory -->
+ <beanfactory name="ValidatorFactoryFactory" class="org.hibernate.validator.util.LazyValidatorFactory"/>
+
+ <!-- JEE DU filter -->
+ <bean name="VFDUFilter" class="org.jboss.beanvalidation.util.AttachmentPresentDeploymentUnitFilter">
+ <property name="attachmentNames">
+ <set>
+ <value>org.jboss.metadata.web.jboss.JBossWebMetaData</value>
+ <value>org.jboss.metadata.ejb.jboss.JBossMetaData</value>
+ </set>
+ </property>
+ </bean>
+
+ <!-- Default JNDI name creator -->
+ <bean name="DefaultJndiBinder" class="org.jboss.beanvalidation.util.DefaultJndiBinder" />
+
+</deployment>
Added: branches/Branch_5_x/varia/src/resources/beanvalidation/bv-deployers-jboss-beans.xml
===================================================================
--- branches/Branch_5_x/varia/src/resources/beanvalidation/bv-deployers-jboss-beans.xml (rev 0)
+++ branches/Branch_5_x/varia/src/resources/beanvalidation/bv-deployers-jboss-beans.xml 2009-09-15 17:09:54 UTC (rev 93549)
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ Bean Validator (jsr303) deployers.
+-->
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+
+ <!-- ValidatorFactory creator -->
+ <bean name="VFCreator" class="org.jboss.beanvalidation.deployers.ValidatorFactoryDeployer">
+ <constructor>
+ <parameter><inject bean="ValidatorFactoryFactory" /></parameter>
+ </constructor>
+ <property name="filter"><inject bean="VFDUFilter" /></property>
+ </bean>
+
+ <!-- ValidatorFactory jndi binder -->
+ <bean name="VFJndiBinder" class="org.jboss.beanvalidation.deployers.ValidatorFactoryJndiBinderDeployer">
+ <constructor>
+ <parameter><inject bean="DefaultJndiBinder" /></parameter>
+ </constructor>
+ </bean>
+
+</deployment>
More information about the jboss-cvs-commits
mailing list