[jboss-cvs] JBossAS SVN: r92199 - in projects/jboss-jsr303/trunk: build and 10 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon Aug 10 11:23:48 EDT 2009
Author: alesj
Date: 2009-08-10 11:23:48 -0400 (Mon, 10 Aug 2009)
New Revision: 92199
Added:
projects/jboss-jsr303/trunk/deployers/
projects/jboss-jsr303/trunk/deployers/pom.xml
projects/jboss-jsr303/trunk/deployers/src/
projects/jboss-jsr303/trunk/deployers/src/main/
projects/jboss-jsr303/trunk/deployers/src/main/assembly/
projects/jboss-jsr303/trunk/deployers/src/main/assembly/META-INF/
projects/jboss-jsr303/trunk/deployers/src/main/assembly/META-INF/bv-core-jboss-beans.xml
projects/jboss-jsr303/trunk/deployers/src/main/assembly/META-INF/bv-deployers-jboss-beans.xml
projects/jboss-jsr303/trunk/deployers/src/main/assembly/assembly.xml
projects/jboss-jsr303/trunk/deployers/src/main/java/
projects/jboss-jsr303/trunk/deployers/src/test/
projects/jboss-jsr303/trunk/deployers/src/test/java/
projects/jboss-jsr303/trunk/deployers/src/test/resources/
Removed:
projects/jboss-jsr303/trunk/core/src/main/java/org/jboss/jsr303/core/plugins/BaseValidator.java
projects/jboss-jsr303/trunk/spec/
projects/jboss-jsr303/trunk/xml/src/main/java/org/jboss/jsr303/xml/core/
projects/jboss-jsr303/trunk/xml/src/main/java/org/jboss/jsr303/xml/metadata/
projects/jboss-jsr303/trunk/xml/src/main/java/org/jboss/jsr303/xml/parser/
Modified:
projects/jboss-jsr303/trunk/build/pom.xml
projects/jboss-jsr303/trunk/core/pom.xml
projects/jboss-jsr303/trunk/pom.xml
projects/jboss-jsr303/trunk/xml/pom.xml
Log:
Update poms + project.
Prepare for BV deployers.
Modified: projects/jboss-jsr303/trunk/build/pom.xml
===================================================================
--- projects/jboss-jsr303/trunk/build/pom.xml 2009-08-10 14:30:43 UTC (rev 92198)
+++ projects/jboss-jsr303/trunk/build/pom.xml 2009-08-10 15:23:48 UTC (rev 92199)
@@ -1,53 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--
- This pom functions as a default configuration. The subproject
- poms each inherit configuration from this one.
-
- When adding version information for an artifact please do the following
- - add a version property for the specific version
- - add a dependency in the dependencyManagement section which refers to
- the property
--->
<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">
<parent>
- <groupId>org.jboss.jsr303</groupId>
- <artifactId>jboss-jsr303</artifactId>
- <version>0.1.0-SNAPSHOT</version>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-parent</artifactId>
+ <version>4-beta-2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.jsr303</groupId>
- <artifactId>jboss-jsr303-dist</artifactId>
+ <artifactId>jboss-jsr303</artifactId>
<version>0.1.0-SNAPSHOT</version>
<packaging>pom</packaging>
- <name>JBoss JSR303 Distribution Build</name>
+ <name>JBoss JSR303 Build</name>
<url>http://www.jboss.com/products/jsr303</url>
<description>
The JBoss JSR303 provides Bean validation implementation.
</description>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-assembly-plugin</artifactId>
- <executions>
- <execution>
- <id>make-assembly</id>
- <phase>package</phase>
- <goals>
- <goal>attached</goal>
- </goals>
- <configuration>
- <finalName>jboss-jsr303-${project.version}</finalName>
- <descriptors>
- <descriptor>src/assembly/dist.xml</descriptor>
- <descriptor>src/assembly/src.xml</descriptor>
- </descriptors>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
</project>
Modified: projects/jboss-jsr303/trunk/core/pom.xml
===================================================================
--- projects/jboss-jsr303/trunk/core/pom.xml 2009-08-10 14:30:43 UTC (rev 92198)
+++ projects/jboss-jsr303/trunk/core/pom.xml 2009-08-10 15:23:48 UTC (rev 92199)
@@ -1,11 +1,11 @@
<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">
<parent>
<groupId>org.jboss.jsr303</groupId>
- <artifactId>jboss-jsr303</artifactId>
- <version>0.1.0-SNAPSHOT</version>
+ <artifactId>jsr303</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
- <artifactId>jboss-core</artifactId>
+ <artifactId>core</artifactId>
<packaging>jar</packaging>
<name>JBoss JSR303 Core</name>
<url>http://www.jboss.com/products/jsr303</url>
@@ -14,18 +14,14 @@
<!-- Do not add version information here, use ../pom.xml instead -->
<dependencies>
<!-- Global dependencies -->
- <dependency>
- <groupId>org.jboss.jsr303</groupId>
- <artifactId>jboss-spec</artifactId>
- </dependency>
<dependency>
<groupId>org.jboss</groupId>
<artifactId>jboss-mdr</artifactId>
</dependency>
<!-- Test dependencies -->
<dependency>
- <groupId>jboss</groupId>
- <artifactId>jboss-common-logging-log4j</artifactId>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-log4j</artifactId>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -39,7 +35,7 @@
</exclusions>
</dependency>
<dependency>
- <groupId>org.jboss</groupId>
+ <groupId>org.jboss.test</groupId>
<artifactId>jboss-test</artifactId>
<scope>test</scope>
<exclusions>
Deleted: projects/jboss-jsr303/trunk/core/src/main/java/org/jboss/jsr303/core/plugins/BaseValidator.java
===================================================================
--- projects/jboss-jsr303/trunk/core/src/main/java/org/jboss/jsr303/core/plugins/BaseValidator.java 2009-08-10 14:30:43 UTC (rev 92198)
+++ projects/jboss-jsr303/trunk/core/src/main/java/org/jboss/jsr303/core/plugins/BaseValidator.java 2009-08-10 15:23:48 UTC (rev 92199)
@@ -1,135 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2006, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-package org.jboss.jsr303.core.plugins;
-
-import java.lang.annotation.Annotation;
-import java.util.HashSet;
-import java.util.Set;
-import javax.validation.Constraint;
-import javax.validation.ConstraintValidator;
-import javax.validation.ElementDescriptor;
-import javax.validation.InvalidConstraint;
-import javax.validation.Validator;
-
-import org.jboss.beans.info.spi.BeanInfo;
-import org.jboss.beans.info.spi.PropertyInfo;
-import org.jboss.config.plugins.property.PropertyConfiguration;
-import org.jboss.config.spi.Configuration;
-import org.jboss.metadata.plugins.repository.basic.BasicMetaDataRepository;
-import org.jboss.metadata.spi.MetaData;
-import org.jboss.metadata.spi.repository.MetaDataRepository;
-import org.jboss.metadata.spi.scope.CommonLevels;
-import org.jboss.metadata.spi.scope.ScopeKey;
-import org.jboss.metadata.spi.signature.Signature;
-import org.jboss.metadata.spi.signature.FieldSignature;
-import org.jboss.metadata.spi.signature.MethodSignature;
-import org.jboss.reflect.spi.FieldInfo;
-
-/**
- * @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
- */
-public class BaseValidator<T> implements Validator<T>
-{
- MetaDataRepository repository = new BasicMetaDataRepository();
- Configuration configuration = new PropertyConfiguration();
-
- public Set<InvalidConstraint<T>> validate(T object, String... groups)
- {
- Set<InvalidConstraint<T>> invalid = new HashSet<InvalidConstraint<T>>();
- try
- {
- ScopeKey key = new ScopeKey(CommonLevels.INSTANCE, object.getClass());
- MetaData metaData = repository.getMetaData(key);
- BeanInfo beanInfo = configuration.getBeanInfo(object.getClass());
-
- checkForConstraints(object, invalid, metaData);
-
- Set<PropertyInfo> properties = beanInfo.getProperties();
- for (PropertyInfo pi : properties)
- {
- FieldInfo fi = pi.getFieldInfo();
- Signature signature;
- if (fi != null)
- signature = new FieldSignature(fi.getName());
- else
- signature = new MethodSignature(pi.getGetter());
-
- MetaData componentMetaData = metaData.getComponentMetaData(signature);
- checkForConstraints(pi.get(object), invalid, componentMetaData);
- }
-
- return null; //To change body of implemented methods use File | Settings | File Templates.
- }
- catch (Throwable t)
- {
- }
- return null;
- }
-
- private void checkForConstraints(Object object, Set<InvalidConstraint<T>> invalid, MetaData metaData)
- throws InstantiationException, IllegalAccessException
- {
- Annotation[] annotations = metaData.getAnnotations();
- for(Annotation annotation : annotations)
- {
- ConstraintValidator cv = annotation.annotationType().getAnnotation(ConstraintValidator.class);
- if (cv != null)
- {
- Class<? extends Constraint> constraintClass = cv.value();
- Constraint constraint = constraintClass.newInstance();
- boolean isValid = constraint.isValid(object);
- if (isValid == false)
- invalid.add(null);
- }
- }
- }
-
- public Set<InvalidConstraint<T>> validateProperty(T object, String propertyName, String... groups)
- {
- return null; //To change body of implemented methods use File | Settings | File Templates.
- }
-
- public Set<InvalidConstraint<T>> validateValue(String propertyName, Object value, String... groups)
- {
- return null; //To change body of implemented methods use File | Settings | File Templates.
- }
-
- public boolean hasConstraints()
- {
- return false; //To change body of implemented methods use File | Settings | File Templates.
- }
-
- public ElementDescriptor getBeanConstraints()
- {
- return null; //To change body of implemented methods use File | Settings | File Templates.
- }
-
- public ElementDescriptor getConstraintsForProperty(String propertyName)
- {
- return null; //To change body of implemented methods use File | Settings | File Templates.
- }
-
- public Set<String> getValidatedProperties()
- {
- return null; //To change body of implemented methods use File | Settings | File Templates.
- }
-}
Added: projects/jboss-jsr303/trunk/deployers/pom.xml
===================================================================
--- projects/jboss-jsr303/trunk/deployers/pom.xml (rev 0)
+++ projects/jboss-jsr303/trunk/deployers/pom.xml 2009-08-10 15:23:48 UTC (rev 92199)
@@ -0,0 +1,230 @@
+<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.jsr303</groupId>
+ <artifactId>jsr303</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ </parent>
+
+ <groupId>org.jboss.jsr303</groupId>
+ <artifactId>deployers</artifactId>
+ <packaging>jar</packaging>
+ <name>BeanValidator (JSR303) AS Deployer</name>
+ <description>BeanValidator Deployers for JBoss AS</description>
+
+ <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>javax.validation</groupId>
+ <artifactId>validation-api</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-validator</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-common-core</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-spi</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.cl</groupId>
+ <artifactId>jboss-classloader</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.deployers</groupId>
+ <artifactId>jboss-deployers-vfs</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.metadata</groupId>
+ <artifactId>jboss-metadata</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.microcontainer</groupId>
+ <artifactId>jboss-dependency</artifactId>
+ <scope>provided</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-common-core</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-spi</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.microcontainer</groupId>
+ <artifactId>jboss-kernel</artifactId>
+ <optional>true</optional>
+ <scope>provided</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jboss.microcontainer</groupId>
+ <artifactId>jboss-dependency</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-common-core</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-spi</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss</groupId>
+ <artifactId>jbossxb</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>jbossxb</artifactId>
+ <optional>true</optional>
+ <scope>provided</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-reflect</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-common-core</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-spi</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.man</groupId>
+ <artifactId>jboss-managed</artifactId>
+ <optional>true</optional>
+ <scope>provided</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-reflect</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-common-core</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-spi</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <!-- Test dependencies -->
+
+ <!-- dependency>
+ <groupId>org.jboss.deployers</groupId>
+ <artifactId>jboss-deployers-vfs</artifactId>
+ <type>test-jar</type>
+ <scope>test</scope -->
+ <!--
+ <exclusions>
+ <exclusion>
+ <groupId>org.jboss.deployers</groupId>
+ <artifactId>jboss-deployers-impl</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.deployers</groupId>
+ <artifactId>jboss-deployers-spi</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.microcontainer</groupId>
+ <artifactId>jboss-kernel</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.cl</groupId>
+ <artifactId>jboss-classloading</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency -->
+
+ <dependency>
+ <groupId>org.jboss.test</groupId>
+ <artifactId>jboss-test</artifactId>
+ <scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-common-core</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-spi</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-log4j</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>jboss.profiler.jvmti</groupId>
+ <artifactId>jboss-profiler-jvmti</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.ant</groupId>
+ <artifactId>ant</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.ant</groupId>
+ <artifactId>ant-junit</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ </dependencies>
+
+</project>
Added: projects/jboss-jsr303/trunk/deployers/src/main/assembly/META-INF/bv-core-jboss-beans.xml
===================================================================
--- projects/jboss-jsr303/trunk/deployers/src/main/assembly/META-INF/bv-core-jboss-beans.xml (rev 0)
+++ projects/jboss-jsr303/trunk/deployers/src/main/assembly/META-INF/bv-core-jboss-beans.xml 2009-08-10 15:23:48 UTC (rev 92199)
@@ -0,0 +1,59 @@
+<?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 onto the application classpath -->
+ <bean name="WebBeansFacesIntegrationDeployer" class="org.jboss.webbeans.integration.deployer.cl.WebBeansFacesIntegrationDeployer"/>
+
+ <!-- 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/jboss-jsr303/trunk/deployers/src/main/assembly/META-INF/bv-deployers-jboss-beans.xml
===================================================================
--- projects/jboss-jsr303/trunk/deployers/src/main/assembly/META-INF/bv-deployers-jboss-beans.xml (rev 0)
+++ projects/jboss-jsr303/trunk/deployers/src/main/assembly/META-INF/bv-deployers-jboss-beans.xml 2009-08-10 15:23:48 UTC (rev 92199)
@@ -0,0 +1,59 @@
+<?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 onto the application classpath -->
+ <bean name="WebBeansFacesIntegrationDeployer" class="org.jboss.webbeans.integration.deployer.cl.WebBeansFacesIntegrationDeployer"/>
+
+ <!-- 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/jboss-jsr303/trunk/deployers/src/main/assembly/assembly.xml
===================================================================
--- projects/jboss-jsr303/trunk/deployers/src/main/assembly/assembly.xml (rev 0)
+++ projects/jboss-jsr303/trunk/deployers/src/main/assembly/assembly.xml 2009-08-10 15:23:48 UTC (rev 92199)
@@ -0,0 +1,41 @@
+<?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>jsr303.deployer</baseDirectory>
+
+ <formats>
+ <format>zip</format>
+ </formats>
+
+ <fileSets>
+ <fileSet>
+ <directory>src/main/assembly/resources</directory>
+ <outputDirectory></outputDirectory>
+ </fileSet>
+ </fileSets>
+
+ <dependencySets>
+ <dependencySet>
+ <useProjectArtifact>true</useProjectArtifact>
+ <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping>
+ <includes>
+ <include>javax.validation:validation-api</include>
+ <include>org.hibernate:hibernate-validator</include>
+ </includes>
+ </dependencySet>
+ <dependencySet>
+ <useProjectArtifact>false</useProjectArtifact>
+ <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping>
+ <outputDirectory>lib-int</outputDirectory>
+ <includes>
+ <include>org.jboss.jsr303:deployers</include>
+ </includes>
+ </dependencySet>
+ </dependencySets>
+
+</assembly>
Modified: projects/jboss-jsr303/trunk/pom.xml
===================================================================
--- projects/jboss-jsr303/trunk/pom.xml 2009-08-10 14:30:43 UTC (rev 92198)
+++ projects/jboss-jsr303/trunk/pom.xml 2009-08-10 15:23:48 UTC (rev 92199)
@@ -6,13 +6,13 @@
<version>4</version>
</parent>
<groupId>org.jboss.jsr303</groupId>
- <artifactId>jboss-jsr303</artifactId>
- <version>0.1.0-SNAPSHOT</version>
+ <artifactId>jsr303</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
<packaging>pom</packaging>
- <name>JBoss JSR303 Parent POM</name>
- <url>http://www.jboss.com/products/jsr303</url>
+ <name>JBoss Bean Validation</name>
+ <url>http://www.jboss.org/jbossmc/</url>
<description>
- The JBoss JSR303 provides a Bean validation spec implementation.
+ JBoss Bean Validation
</description>
<scm>
<connection>scm:svn:http://anonsvn.jboss.org/repos/jbossas/projects/jsr303/trunk/</connection>
@@ -21,24 +21,36 @@
</scm>
<modules>
- <module>spec</module>
+ <module>build</module>
<module>core</module>
<module>xml</module>
- <module>build</module>
+ <module>deployers</module>
</modules>
-
+
<properties>
- <version.org.jboss.mdr>2.0.0.Beta14</version.org.jboss.mdr>
- <version.jbossxb>2.0.0.CR8</version.jbossxb>
- <version.jboss.common.core>2.2.4.GA</version.jboss.common.core>
- <version.jboss.common.logging.spi>2.0.4.GA</version.jboss.common.logging.spi>
- <version.jboss.common.logging.log4j>2.0.4.GA</version.jboss.common.logging.log4j>
- <version.org.jboss.test>1.0.5.GA</version.org.jboss.test>
+ <version.javax.bv>1.0.CR3</version.javax.bv>
+ <version.hibernate.validator>4.0.0.Beta2</version.hibernate.validator>
+ <version.jboss.vfs>2.1.2.GA</version.jboss.vfs>
+ <version.jboss.mdr>2.0.2.GA</version.jboss.mdr>
+ <version.jboss.man>2.1.0.GA</version.jboss.man>
+ <version.jboss.microcontainer>2.0.8.GA</version.jboss.microcontainer>
+ <version.jboss.cl>2.0.6.SP1</version.jboss.cl>
+ <version.jboss.deployers>2.0.8.GA</version.jboss.deployers>
+ <version.jboss.common.core>2.2.14.GA</version.jboss.common.core>
+ <version.jboss.logging.spi>2.0.5.GA</version.jboss.logging.spi>
+ <version.jboss.logging.log4j>2.0.5.GA</version.jboss.logging.log4j>
+ <version.jboss.classloading.spi>5.0.3.GA</version.jboss.classloading.spi>
+ <version.jboss.metadata>1.0.0.GA</version.jboss.metadata>
+ <version.jbossxb>2.0.1.GA</version.jbossxb>
+ <version.servlet.api>2.5</version.servlet.api>
+ <version.org.jboss.test>1.1.1.GA</version.org.jboss.test>
<version.junit>4.4</version.junit>
- <version.ant.junit>1.6.5</version.ant.junit>
</properties>
<build>
+ <outputDirectory>${microcontainer.outputDirectory}</outputDirectory>
+ <testOutputDirectory>${microcontainer.testOutputDirectory}</testOutputDirectory>
+ <finalName>${artifactId}</finalName>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -54,9 +66,8 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
- <version>2.0-beta-7</version>
+ <version>2.0-beta-9</version>
<configuration>
- <generateReleasePoms>true</generateReleasePoms>
<tagBase>https://svn.jboss.org/repos/jbossas/projects/jsr303/tags</tagBase>
<autoVersionSubmodules>true</autoVersionSubmodules>
</configuration>
@@ -65,6 +76,19 @@
<pluginManagement>
<plugins>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>make-assembly</id>
+ <phase>package</phase>
+ <goals>
+ <goal>attached</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
<artifactId>maven-idea-plugin</artifactId>
<configuration>
<downloadSources>true</downloadSources>
@@ -78,7 +102,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.4.1</version>
+ <version>2.4.3</version>
<configuration>
<redirectTestOutputToFile>true</redirectTestOutputToFile>
<includes>
@@ -86,6 +110,20 @@
</includes>
</configuration>
</plugin>
+ <plugin>
+ <!-- Configure javadoc plugin with APIviz -->
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <configuration>
+ <doclet>net.gleamynode.apiviz.APIviz</doclet>
+ <docletArtifact>
+ <groupId>net.gleamynode.apiviz</groupId>
+ <artifactId>apiviz</artifactId>
+ <version>1.1.0</version>
+ </docletArtifact>
+ <encoding>UTF-8</encoding>
+ </configuration>
+ </plugin>
</plugins>
</pluginManagement>
</build>
@@ -112,6 +150,19 @@
<enabled>false</enabled>
</releases>
</repository>
+ <!-- APIviz repository -->
+ <repository>
+ <id>apiviz.release</id>
+ <name>APIviz releases</name>
+ <url>http://apiviz.googlecode.com/svn/site/repo/mvn/release</url>
+ <releases>
+
+ <enabled>true</enabled>
+ </releases>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </repository>
</repositories>
<reporting>
@@ -141,71 +192,235 @@
<dependencyManagement>
<!-- The parent pom manages the inter-dependencies of the modules. -->
<dependencies>
+
<dependency>
<groupId>org.jboss.jsr303</groupId>
- <artifactId>jboss-spec</artifactId>
+ <artifactId>core</artifactId>
<version>${project.version}</version>
- </dependency>
+ </dependency>
<dependency>
<groupId>org.jboss.jsr303</groupId>
- <artifactId>jboss-core</artifactId>
+ <artifactId>xml</artifactId>
<version>${project.version}</version>
- </dependency>
+ </dependency>
<dependency>
<groupId>org.jboss.jsr303</groupId>
- <artifactId>jboss-xml</artifactId>
+ <artifactId>deployers</artifactId>
<version>${project.version}</version>
- </dependency>
+ </dependency>
<dependency>
- <groupId>org.jboss</groupId>
- <artifactId>jboss-mdr</artifactId>
- <version>${version.org.jboss.mdr}</version>
+ <groupId>org.jboss.deployers</groupId>
+ <artifactId>jboss-deployers-client</artifactId>
+ <version>${version.jboss.deployers}</version>
</dependency>
<dependency>
- <groupId>org.jboss</groupId>
- <artifactId>jbossxb</artifactId>
- <version>${version.jbossxb}</version>
+ <groupId>org.jboss.deployers</groupId>
+ <artifactId>jboss-deployers-client-spi</artifactId>
+ <version>${version.jboss.deployers}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.deployers</groupId>
+ <artifactId>jboss-deployers-core-spi</artifactId>
+ <version>${version.jboss.deployers}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.deployers</groupId>
+ <artifactId>jboss-deployers-impl</artifactId>
+ <version>${version.jboss.deployers}</version>
<exclusions>
<exclusion>
<groupId>org.jboss</groupId>
- <artifactId>jboss-reflect</artifactId>
+ <artifactId>javassist</artifactId>
</exclusion>
</exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.deployers</groupId>
+ <artifactId>jboss-deployers-spi</artifactId>
+ <version>${version.jboss.deployers}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.deployers</groupId>
+ <artifactId>jboss-deployers-structure-spi</artifactId>
+ <version>${version.jboss.deployers}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.deployers</groupId>
+ <artifactId>jboss-deployers-vfs</artifactId>
+ <version>${version.jboss.deployers}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.deployers</groupId>
+ <artifactId>jboss-deployers-vfs-spi</artifactId>
+ <version>${version.jboss.deployers}</version>
</dependency>
+
<dependency>
+ <groupId>org.jboss.cl</groupId>
+ <artifactId>jboss-classloader</artifactId>
+ <version>${version.jboss.cl}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.cl</groupId>
+ <artifactId>jboss-classloading</artifactId>
+ <version>${version.jboss.cl}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.cl</groupId>
+ <artifactId>jboss-classloading-vfs</artifactId>
+ <version>${version.jboss.cl}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.man</groupId>
+ <artifactId>jboss-managed</artifactId>
+ <version>${version.jboss.man}</version>
+ </dependency>
+
+ <dependency>
<groupId>org.jboss</groupId>
+ <artifactId>jboss-mdr</artifactId>
+ <version>${version.jboss.mdr}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.microcontainer</groupId>
+ <artifactId>jboss-dependency</artifactId>
+ <version>${version.jboss.microcontainer}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.microcontainer</groupId>
+ <artifactId>jboss-kernel</artifactId>
+ <version>${version.jboss.microcontainer}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss</groupId>
<artifactId>jboss-common-core</artifactId>
<version>${version.jboss.common.core}</version>
</dependency>
+
<dependency>
- <groupId>jboss</groupId>
- <artifactId>jboss-common-logging-spi</artifactId>
- <version>${version.jboss.common.logging.spi}</version>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-spi</artifactId>
+ <version>${version.jboss.logging.spi}</version>
</dependency>
+
<dependency>
- <groupId>jboss</groupId>
- <artifactId>jboss-common-logging-log4j</artifactId>
- <version>${version.jboss.common.logging.log4j}</version>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-log4j</artifactId>
+ <version>${version.jboss.logging.log4j}</version>
</dependency>
+
<dependency>
- <groupId>ant</groupId>
- <artifactId>ant-junit</artifactId>
- <version>${version.ant.junit}</version>
+ <groupId>org.jboss.integration</groupId>
+ <artifactId>jboss-classloading-spi</artifactId>
+ <version>${version.jboss.classloading.spi}</version>
</dependency>
+
+ <dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>jbossxb</artifactId>
+ <version>${version.jbossxb}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-vfs</artifactId>
+ <version>${version.jboss.vfs}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.metadata</groupId>
+ <artifactId>jboss-metadata</artifactId>
+ <version>${version.jboss.metadata}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.validation</groupId>
+ <artifactId>validation-api</artifactId>
+ <version>${version.javax.bv}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-validator</artifactId>
+ <version>${version.hibernate.validator}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>${version.servlet.api}</version>
+ </dependency>
+
<!-- test dependencies -->
+
<dependency>
- <groupId>org.jboss</groupId>
+ <groupId>org.jboss.test</groupId>
<artifactId>jboss-test</artifactId>
<version>${version.org.jboss.test}</version>
<scope>test</scope>
</dependency>
+
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>${version.junit}</version>
<scope>test</scope>
</dependency>
+
</dependencies>
</dependencyManagement>
-
+
+ <profiles>
+ <profile>
+ <id>default</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ <properties>
+ <microcontainer.outputDirectory>target/classes</microcontainer.outputDirectory>
+ <microcontainer.testOutputDirectory>target/test-classes</microcontainer.testOutputDirectory>
+ </properties>
+ </profile>
+ <profile>
+ <id>eclipse</id>
+ <build>
+ <defaultGoal>process-test-resources</defaultGoal>
+ <plugins>
+ <plugin>
+ <artifactId>maven-eclipse-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>eclipse</id>
+ <phase>process-test-resources</phase>
+ <goals>
+ <goal>eclipse</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <downloadSources>true</downloadSources>
+ <buildOutputDirectory>${microcontainer.outputDirectory}</buildOutputDirectory>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ <properties>
+ <microcontainer.outputDirectory>eclipse-target/classes</microcontainer.outputDirectory>
+ <microcontainer.testOutputDirectory>eclipse-target/test-classes</microcontainer.testOutputDirectory>
+ </properties>
+ </profile>
+ </profiles>
+
</project>
\ No newline at end of file
Modified: projects/jboss-jsr303/trunk/xml/pom.xml
===================================================================
--- projects/jboss-jsr303/trunk/xml/pom.xml 2009-08-10 14:30:43 UTC (rev 92198)
+++ projects/jboss-jsr303/trunk/xml/pom.xml 2009-08-10 15:23:48 UTC (rev 92199)
@@ -1,45 +1,26 @@
<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">
<parent>
<groupId>org.jboss.jsr303</groupId>
- <artifactId>jboss-jsr303</artifactId>
- <version>0.1.0-SNAPSHOT</version>
+ <artifactId>jsr303</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
- <artifactId>jboss-xml</artifactId>
+ <artifactId>xml</artifactId>
<packaging>jar</packaging>
<name>JBoss JSR303 XML</name>
<url>http://www.jboss.com/products/jsr303</url>
<description>JBoss JSR303 XML</description>
-
- <!-- Do not add version information here, use ../pom.xml instead -->
+
<dependencies>
<!-- Global dependencies -->
- <dependency>
- <groupId>org.jboss.jsr303</groupId>
- <artifactId>jboss-spec</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.jsr303</groupId>
- <artifactId>jboss-core</artifactId>
- </dependency>
<dependency>
<groupId>org.jboss</groupId>
<artifactId>jboss-mdr</artifactId>
</dependency>
- <dependency>
- <groupId>org.jboss</groupId>
- <artifactId>jbossxb</artifactId>
- <exclusions>
- <exclusion>
- <groupId>org.jboss</groupId>
- <artifactId>jboss-reflect</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
<!-- Test dependencies -->
<dependency>
- <groupId>jboss</groupId>
- <artifactId>jboss-common-logging-log4j</artifactId>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-log4j</artifactId>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -53,7 +34,7 @@
</exclusions>
</dependency>
<dependency>
- <groupId>org.jboss</groupId>
+ <groupId>org.jboss.test</groupId>
<artifactId>jboss-test</artifactId>
<scope>test</scope>
<exclusions>
More information about the jboss-cvs-commits
mailing list