Author: alexsmirnov Date: 2009-11-13 20:26:31 -0500 (Fri, 13 Nov 2009) New Revision: 15882 Added: branches/community/3.3.X/samples/beanValidatorSample/src/main/webapp/jsr303src/ Removed: branches/community/3.3.X/samples/beanValidatorSample/src/main/webapp/jsr299src/ Modified: branches/community/3.3.X/samples/beanValidatorSample/pom.xml branches/community/3.3.X/samples/beanValidatorSample/src/main/webapp/jsr303src/org/richfaces/example/Bean.java branches/community/3.3.X/samples/beanValidatorSample/src/main/webapp/jsr303src/org/richfaces/example/LengthBean.java branches/community/3.3.X/samples/beanValidatorSample/src/main/webapp/jsr303src/org/richfaces/example/NotEmptyBean.java branches/community/3.3.X/ui/beanValidator/pom.xml branches/community/3.3.X/ui/beanValidator/src/test/java/org/richfaces/validator/MockValidationProvider.java Log: https://jira.jboss.org/jira/browse/RF-8049 Modified: branches/community/3.3.X/samples/beanValidatorSample/pom.xml =================================================================== --- branches/community/3.3.X/samples/beanValidatorSample/pom.xml 2009-11-13 22:52:40 UTC (rev 15881) +++ branches/community/3.3.X/samples/beanValidatorSample/pom.xml 2009-11-14 01:26:31 UTC (rev 15882) @@ -98,7 +98,7 @@ </dependencies> </profile> <profile> - <id>jsr299</id> + <id>jsr303</id> <build> <plugins> <plugin> @@ -114,7 +114,7 @@ </goals> <configuration> <sources> - <source>src/main/webapp/jsr299src</source> + <source>src/main/webapp/jsr303src</source> </sources> </configuration> </execution> @@ -126,12 +126,12 @@ <dependency> <groupId>javax.validation</groupId> <artifactId>validation-api</artifactId> - <version>1.0.CR3</version> + <version>1.0.0.GA</version> </dependency> <dependency> <groupId>org.hibernate</groupId> <artifactId>hibernate-validator</artifactId> - <version>4.0.0.Beta2</version> + <version>4.0.1.GA</version> </dependency> </dependencies> </profile> Copied: branches/community/3.3.X/samples/beanValidatorSample/src/main/webapp/jsr303src (from rev 15877, branches/community/3.3.X/samples/beanValidatorSample/src/main/webapp/jsr299src) Modified: branches/community/3.3.X/samples/beanValidatorSample/src/main/webapp/jsr303src/org/richfaces/example/Bean.java =================================================================== --- branches/community/3.3.X/samples/beanValidatorSample/src/main/webapp/jsr299src/org/richfaces/example/Bean.java 2009-11-13 13:54:53 UTC (rev 15877) +++ branches/community/3.3.X/samples/beanValidatorSample/src/main/webapp/jsr303src/org/richfaces/example/Bean.java 2009-11-14 01:26:31 UTC (rev 15882) @@ -23,9 +23,10 @@ import javax.validation.constraints.Pattern; -import org.hibernate.validation.constraints.NotEmpty; +import org.hibernate.validator.constraints.NotEmpty; + /** * JSF bean with text property validation. */ Modified: branches/community/3.3.X/samples/beanValidatorSample/src/main/webapp/jsr303src/org/richfaces/example/LengthBean.java =================================================================== --- branches/community/3.3.X/samples/beanValidatorSample/src/main/webapp/jsr299src/org/richfaces/example/LengthBean.java 2009-11-13 13:54:53 UTC (rev 15877) +++ branches/community/3.3.X/samples/beanValidatorSample/src/main/webapp/jsr303src/org/richfaces/example/LengthBean.java 2009-11-14 01:26:31 UTC (rev 15882) @@ -3,7 +3,7 @@ */ package org.richfaces.example; -import org.hibernate.validation.constraints.Length; +import org.hibernate.validator.constraints.Length; import org.richfaces.Validable; /** Modified: branches/community/3.3.X/samples/beanValidatorSample/src/main/webapp/jsr303src/org/richfaces/example/NotEmptyBean.java =================================================================== --- branches/community/3.3.X/samples/beanValidatorSample/src/main/webapp/jsr299src/org/richfaces/example/NotEmptyBean.java 2009-11-13 13:54:53 UTC (rev 15877) +++ branches/community/3.3.X/samples/beanValidatorSample/src/main/webapp/jsr303src/org/richfaces/example/NotEmptyBean.java 2009-11-14 01:26:31 UTC (rev 15882) @@ -3,7 +3,7 @@ */ package org.richfaces.example; -import org.hibernate.validation.constraints.NotEmpty; +import org.hibernate.validator.constraints.NotEmpty; import org.richfaces.Validable; /** Modified: branches/community/3.3.X/ui/beanValidator/pom.xml =================================================================== --- branches/community/3.3.X/ui/beanValidator/pom.xml 2009-11-13 22:52:40 UTC (rev 15881) +++ branches/community/3.3.X/ui/beanValidator/pom.xml 2009-11-14 01:26:31 UTC (rev 15882) @@ -70,7 +70,7 @@ <dependency> <groupId>javax.validation</groupId> <artifactId>validation-api</artifactId> - <version>1.0.CR3</version> + <version>1.0.0.GA</version> </dependency> <dependency> <groupId>org.slf4j</groupId> Modified: branches/community/3.3.X/ui/beanValidator/src/test/java/org/richfaces/validator/MockValidationProvider.java =================================================================== --- branches/community/3.3.X/ui/beanValidator/src/test/java/org/richfaces/validator/MockValidationProvider.java 2009-11-13 22:52:40 UTC (rev 15881) +++ branches/community/3.3.X/ui/beanValidator/src/test/java/org/richfaces/validator/MockValidationProvider.java 2009-11-14 01:26:31 UTC (rev 15882) @@ -148,6 +148,12 @@ // TODO Auto-generated method stub return this; } + + public ValidatorContext constraintValidatorFactory( + ConstraintValidatorFactory factory) { + // TODO Auto-generated method stub + return null; + } }; } @@ -156,6 +162,16 @@ // TODO Auto-generated method stub return null; } + + public ConstraintValidatorFactory getConstraintValidatorFactory() { + // TODO Auto-generated method stub + return null; + } + + public TraversableResolver getTraversableResolver() { + // TODO Auto-generated method stub + return null; + } }; } @@ -211,6 +227,16 @@ // TODO Auto-generated method stub return this; } + + public ConstraintValidatorFactory getDefaultConstraintValidatorFactory() { + // TODO Auto-generated method stub + return null; + } + + public TraversableResolver getDefaultTraversableResolver() { + // TODO Auto-generated method stub + return null; + } }; }