[jboss-cvs] JBossAS SVN: r92311 - in projects/jboss-jsr303/trunk: build and 13 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Aug 13 11:27:01 EDT 2009
Author: alesj
Date: 2009-08-13 11:27:00 -0400 (Thu, 13 Aug 2009)
New Revision: 92311
Added:
projects/jboss-jsr303/trunk/core/src/main/java/org/jboss/beanvalidation/
projects/jboss-jsr303/trunk/deployers/src/main/java/org/jboss/beanvalidation/
projects/jboss-jsr303/trunk/xml/src/main/java/org/jboss/beanvalidation/
Removed:
projects/jboss-jsr303/trunk/core/src/main/java/org/jboss/beanvalidation/core/plugins/BaseValidator.java
projects/jboss-jsr303/trunk/core/src/main/java/org/jboss/jsr303/
projects/jboss-jsr303/trunk/deployers/src/main/java/org/jboss/jsr303/
projects/jboss-jsr303/trunk/xml/src/main/java/org/jboss/beanvalidation/xml/core/
projects/jboss-jsr303/trunk/xml/src/main/java/org/jboss/beanvalidation/xml/metadata/
projects/jboss-jsr303/trunk/xml/src/main/java/org/jboss/beanvalidation/xml/parser/
projects/jboss-jsr303/trunk/xml/src/main/java/org/jboss/jsr303/
Modified:
projects/jboss-jsr303/trunk/build/pom.xml
projects/jboss-jsr303/trunk/core/pom.xml
projects/jboss-jsr303/trunk/deployers/pom.xml
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/java/org/jboss/beanvalidation/deployers/ValidatorFactoryDeployer.java
projects/jboss-jsr303/trunk/deployers/src/main/java/org/jboss/beanvalidation/deployers/ValidatorFactoryJndiBinderDeployer.java
projects/jboss-jsr303/trunk/deployers/src/main/java/org/jboss/beanvalidation/util/AttachmentPresentDeploymentUnitFilter.java
projects/jboss-jsr303/trunk/deployers/src/main/java/org/jboss/beanvalidation/util/DefaultJndiNameCreator.java
projects/jboss-jsr303/trunk/deployers/src/main/java/org/jboss/beanvalidation/util/JndiNameCreator.java
projects/jboss-jsr303/trunk/deployers/src/test/java/org/jboss/test/deployers/support/MockVFJndiBinderDeployer.java
projects/jboss-jsr303/trunk/deployers/src/test/resources/org/jboss/test/deployers/test/SmokeTestCase.xml
projects/jboss-jsr303/trunk/pom.xml
projects/jboss-jsr303/trunk/xml/pom.xml
Log:
Rename jsr303 --> beanvalidation.
Modified: projects/jboss-jsr303/trunk/build/pom.xml
===================================================================
--- projects/jboss-jsr303/trunk/build/pom.xml 2009-08-13 15:14:25 UTC (rev 92310)
+++ projects/jboss-jsr303/trunk/build/pom.xml 2009-08-13 15:27:00 UTC (rev 92311)
@@ -6,9 +6,9 @@
<version>4-beta-2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
- <groupId>org.jboss.jsr303</groupId>
- <artifactId>jboss-jsr303</artifactId>
- <version>0.1.0-SNAPSHOT</version>
+ <groupId>org.jboss.beanvalidation</groupId>
+ <artifactId>top</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>JBoss JSR303 Build</name>
<url>http://www.jboss.com/products/jsr303</url>
Modified: projects/jboss-jsr303/trunk/core/pom.xml
===================================================================
--- projects/jboss-jsr303/trunk/core/pom.xml 2009-08-13 15:14:25 UTC (rev 92310)
+++ projects/jboss-jsr303/trunk/core/pom.xml 2009-08-13 15:27:00 UTC (rev 92311)
@@ -1,6 +1,6 @@
<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>
+ <groupId>org.jboss.beanvalidation</groupId>
<artifactId>jsr303</artifactId>
<version>1.0.0-SNAPSHOT</version>
</parent>
Copied: projects/jboss-jsr303/trunk/core/src/main/java/org/jboss/beanvalidation (from rev 92198, projects/jboss-jsr303/trunk/core/src/main/java/org/jboss/jsr303)
Deleted: projects/jboss-jsr303/trunk/core/src/main/java/org/jboss/beanvalidation/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/beanvalidation/core/plugins/BaseValidator.java 2009-08-13 15:27:00 UTC (rev 92311)
@@ -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.
- }
-}
Modified: projects/jboss-jsr303/trunk/deployers/pom.xml
===================================================================
--- projects/jboss-jsr303/trunk/deployers/pom.xml 2009-08-13 15:14:25 UTC (rev 92310)
+++ projects/jboss-jsr303/trunk/deployers/pom.xml 2009-08-13 15:27:00 UTC (rev 92311)
@@ -1,12 +1,12 @@
<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>
+ <groupId>org.jboss.beanvalidation</groupId>
<artifactId>jsr303</artifactId>
<version>1.0.0-SNAPSHOT</version>
</parent>
- <groupId>org.jboss.jsr303</groupId>
+ <groupId>org.jboss.beanvalidation</groupId>
<artifactId>deployers</artifactId>
<packaging>jar</packaging>
<name>BeanValidator (JSR303) AS Deployer</name>
Modified: 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 2009-08-13 15:14:25 UTC (rev 92310)
+++ projects/jboss-jsr303/trunk/deployers/src/main/assembly/META-INF/bv-core-jboss-beans.xml 2009-08-13 15:27:00 UTC (rev 92311)
@@ -9,7 +9,7 @@
<beanfactory name="ValidatorFactoryFactory" class="org.hibernate.validation.util.LazyValidatorFactory"/>
<!-- JEE DU filter -->
- <bean name="VFDUFilter" class="org.jboss.jsr303.util.AttachmentPresentDeploymentUnitFilter">
+ <bean name="VFDUFilter" class="org.jboss.beanvalidation.util.AttachmentPresentDeploymentUnitFilter">
<property name="attachmentNames">
<set>
<value>org.jboss.metadata.web.jboss.JBossWebMetaData</value>
@@ -19,6 +19,6 @@
</bean>
<!-- Default JNDI name creator -->
- <bean name="DefaultJndiNameCreator" class="org.jboss.jsr303.util.DefaultJndiNameCreator" />
+ <bean name="DefaultJndiNameCreator" class="org.jboss.beanvalidation.util.DefaultJndiNameCreator" />
</deployment>
Modified: 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 2009-08-13 15:14:25 UTC (rev 92310)
+++ projects/jboss-jsr303/trunk/deployers/src/main/assembly/META-INF/bv-deployers-jboss-beans.xml 2009-08-13 15:27:00 UTC (rev 92311)
@@ -6,7 +6,7 @@
<deployment xmlns="urn:jboss:bean-deployer:2.0">
<!-- ValidatorFactory creator -->
- <bean name="VFCreator" class="org.jboss.jsr303.deployers.ValidatorFactoryDeployer">
+ <bean name="VFCreator" class="org.jboss.beanvalidation.deployers.ValidatorFactoryDeployer">
<constructor>
<parameter><inject bean="ValidatorFactoryFactory" /></parameter>
</constructor>
@@ -14,7 +14,7 @@
</bean>
<!-- ValidatorFactory jndi binder -->
- <bean name="VFJndiBinder" class="org.jboss.jsr303.deployers.ValidatorFactoryJndiBinderDeployer">
+ <bean name="VFJndiBinder" class="org.jboss.beanvalidation.deployers.ValidatorFactoryJndiBinderDeployer">
<constructor>
<parameter><inject bean="DefaultJndiNameCreator" /></parameter>
</constructor>
Copied: projects/jboss-jsr303/trunk/deployers/src/main/java/org/jboss/beanvalidation (from rev 92308, projects/jboss-jsr303/trunk/deployers/src/main/java/org/jboss/jsr303)
Modified: projects/jboss-jsr303/trunk/deployers/src/main/java/org/jboss/beanvalidation/deployers/ValidatorFactoryDeployer.java
===================================================================
--- projects/jboss-jsr303/trunk/deployers/src/main/java/org/jboss/jsr303/deployers/ValidatorFactoryDeployer.java 2009-08-13 14:08:31 UTC (rev 92308)
+++ projects/jboss-jsr303/trunk/deployers/src/main/java/org/jboss/beanvalidation/deployers/ValidatorFactoryDeployer.java 2009-08-13 15:27:00 UTC (rev 92311)
@@ -19,7 +19,7 @@
* 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.deployers;
+package org.jboss.beanvalidation.deployers;
import javax.validation.ValidatorFactory;
Modified: projects/jboss-jsr303/trunk/deployers/src/main/java/org/jboss/beanvalidation/deployers/ValidatorFactoryJndiBinderDeployer.java
===================================================================
--- projects/jboss-jsr303/trunk/deployers/src/main/java/org/jboss/jsr303/deployers/ValidatorFactoryJndiBinderDeployer.java 2009-08-13 14:08:31 UTC (rev 92308)
+++ projects/jboss-jsr303/trunk/deployers/src/main/java/org/jboss/beanvalidation/deployers/ValidatorFactoryJndiBinderDeployer.java 2009-08-13 15:27:00 UTC (rev 92311)
@@ -19,7 +19,7 @@
* 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.deployers;
+package org.jboss.beanvalidation.deployers;
import java.util.Hashtable;
import javax.naming.Context;
@@ -30,7 +30,7 @@
import org.jboss.deployers.spi.deployer.helpers.AbstractSimpleRealDeployer;
import org.jboss.deployers.spi.deployer.DeploymentStages;
import org.jboss.deployers.structure.spi.DeploymentUnit;
-import org.jboss.jsr303.util.JndiNameCreator;
+import org.jboss.beanvalidation.util.JndiNameCreator;
/**
* Bind ValidatorFactory to jndi.
Modified: projects/jboss-jsr303/trunk/deployers/src/main/java/org/jboss/beanvalidation/util/AttachmentPresentDeploymentUnitFilter.java
===================================================================
--- projects/jboss-jsr303/trunk/deployers/src/main/java/org/jboss/jsr303/util/AttachmentPresentDeploymentUnitFilter.java 2009-08-13 14:08:31 UTC (rev 92308)
+++ projects/jboss-jsr303/trunk/deployers/src/main/java/org/jboss/beanvalidation/util/AttachmentPresentDeploymentUnitFilter.java 2009-08-13 15:27:00 UTC (rev 92311)
@@ -19,7 +19,7 @@
* 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.util;
+package org.jboss.beanvalidation.util;
import java.util.Set;
Modified: projects/jboss-jsr303/trunk/deployers/src/main/java/org/jboss/beanvalidation/util/DefaultJndiNameCreator.java
===================================================================
--- projects/jboss-jsr303/trunk/deployers/src/main/java/org/jboss/jsr303/util/DefaultJndiNameCreator.java 2009-08-13 14:08:31 UTC (rev 92308)
+++ projects/jboss-jsr303/trunk/deployers/src/main/java/org/jboss/beanvalidation/util/DefaultJndiNameCreator.java 2009-08-13 15:27:00 UTC (rev 92311)
@@ -19,7 +19,7 @@
* 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.util;
+package org.jboss.beanvalidation.util;
import javax.validation.ValidatorFactory;
Modified: projects/jboss-jsr303/trunk/deployers/src/main/java/org/jboss/beanvalidation/util/JndiNameCreator.java
===================================================================
--- projects/jboss-jsr303/trunk/deployers/src/main/java/org/jboss/jsr303/util/JndiNameCreator.java 2009-08-13 14:08:31 UTC (rev 92308)
+++ projects/jboss-jsr303/trunk/deployers/src/main/java/org/jboss/beanvalidation/util/JndiNameCreator.java 2009-08-13 15:27:00 UTC (rev 92311)
@@ -19,7 +19,7 @@
* 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.util;
+package org.jboss.beanvalidation.util;
import javax.validation.ValidatorFactory;
Modified: projects/jboss-jsr303/trunk/deployers/src/test/java/org/jboss/test/deployers/support/MockVFJndiBinderDeployer.java
===================================================================
--- projects/jboss-jsr303/trunk/deployers/src/test/java/org/jboss/test/deployers/support/MockVFJndiBinderDeployer.java 2009-08-13 15:14:25 UTC (rev 92310)
+++ projects/jboss-jsr303/trunk/deployers/src/test/java/org/jboss/test/deployers/support/MockVFJndiBinderDeployer.java 2009-08-13 15:27:00 UTC (rev 92311)
@@ -32,8 +32,8 @@
import javax.naming.NamingEnumeration;
import javax.naming.NamingException;
-import org.jboss.jsr303.deployers.ValidatorFactoryJndiBinderDeployer;
-import org.jboss.jsr303.util.JndiNameCreator;
+import org.jboss.beanvalidation.deployers.ValidatorFactoryJndiBinderDeployer;
+import org.jboss.beanvalidation.util.JndiNameCreator;
/**
* @author <a href="mailto:ales.justin at jboss.org">Ales Justin</a>
Modified: projects/jboss-jsr303/trunk/deployers/src/test/resources/org/jboss/test/deployers/test/SmokeTestCase.xml
===================================================================
--- projects/jboss-jsr303/trunk/deployers/src/test/resources/org/jboss/test/deployers/test/SmokeTestCase.xml 2009-08-13 15:14:25 UTC (rev 92310)
+++ projects/jboss-jsr303/trunk/deployers/src/test/resources/org/jboss/test/deployers/test/SmokeTestCase.xml 2009-08-13 15:27:00 UTC (rev 92311)
@@ -12,10 +12,10 @@
<bean name="AllDUFilter" class="org.jboss.test.deployers.support.AllDUFilter" />
<!-- Default JNDI name creator -->
- <bean name="DefaultJndiNameCreator" class="org.jboss.jsr303.util.DefaultJndiNameCreator" />
+ <bean name="DefaultJndiNameCreator" class="org.jboss.beanvalidation.util.DefaultJndiNameCreator" />
<!-- ValidatorFactory creator -->
- <bean name="VFCreator" class="org.jboss.jsr303.deployers.ValidatorFactoryDeployer">
+ <bean name="VFCreator" class="org.jboss.beanvalidation.deployers.ValidatorFactoryDeployer">
<constructor>
<parameter><inject bean="ValidatorFactoryFactory" /></parameter>
</constructor>
Modified: projects/jboss-jsr303/trunk/pom.xml
===================================================================
--- projects/jboss-jsr303/trunk/pom.xml 2009-08-13 15:14:25 UTC (rev 92310)
+++ projects/jboss-jsr303/trunk/pom.xml 2009-08-13 15:27:00 UTC (rev 92311)
@@ -5,7 +5,7 @@
<artifactId>jboss-parent</artifactId>
<version>4</version>
</parent>
- <groupId>org.jboss.jsr303</groupId>
+ <groupId>org.jboss.beanvalidation</groupId>
<artifactId>jsr303</artifactId>
<version>1.0.0-SNAPSHOT</version>
<packaging>pom</packaging>
@@ -195,17 +195,17 @@
<dependencies>
<dependency>
- <groupId>org.jboss.jsr303</groupId>
+ <groupId>org.jboss.beanvalidation</groupId>
<artifactId>core</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.jboss.jsr303</groupId>
+ <groupId>org.jboss.beanvalidation</groupId>
<artifactId>xml</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.jboss.jsr303</groupId>
+ <groupId>org.jboss.beanvalidation</groupId>
<artifactId>deployers</artifactId>
<version>${project.version}</version>
</dependency>
Modified: projects/jboss-jsr303/trunk/xml/pom.xml
===================================================================
--- projects/jboss-jsr303/trunk/xml/pom.xml 2009-08-13 15:14:25 UTC (rev 92310)
+++ projects/jboss-jsr303/trunk/xml/pom.xml 2009-08-13 15:27:00 UTC (rev 92311)
@@ -1,6 +1,6 @@
<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>
+ <groupId>org.jboss.beanvalidation</groupId>
<artifactId>jsr303</artifactId>
<version>1.0.0-SNAPSHOT</version>
</parent>
Copied: projects/jboss-jsr303/trunk/xml/src/main/java/org/jboss/beanvalidation (from rev 92198, projects/jboss-jsr303/trunk/xml/src/main/java/org/jboss/jsr303)
More information about the jboss-cvs-commits
mailing list