You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by gp...@apache.org on 2010/03/18 00:37:16 UTC
svn commit: r924555 - in
/myfaces/extensions/validator/branches/branch_for_jsf_1_1: assembly/
assembly/src/main/resources/
component-support/generic-support/src/main/resources/
component-support/trinidad-support/src/main/resources/
core/src/main/resour...
Author: gpetracek
Date: Wed Mar 17 23:37:15 2010
New Revision: 924555
URL: http://svn.apache.org/viewvc?rev=924555&view=rev
Log:
merge back changes
Modified:
myfaces/extensions/validator/branches/branch_for_jsf_1_1/assembly/pom.xml
myfaces/extensions/validator/branches/branch_for_jsf_1_1/assembly/src/main/resources/NOTICE.txt
myfaces/extensions/validator/branches/branch_for_jsf_1_1/component-support/generic-support/src/main/resources/NOTICE.txt
myfaces/extensions/validator/branches/branch_for_jsf_1_1/component-support/trinidad-support/src/main/resources/NOTICE.txt
myfaces/extensions/validator/branches/branch_for_jsf_1_1/core/src/main/resources/NOTICE.txt
myfaces/extensions/validator/branches/branch_for_jsf_1_1/examples/assembly/src/main/resources/NOTICE.txt
myfaces/extensions/validator/branches/branch_for_jsf_1_1/examples/feature-set_01/src/main/webapp/WEB-INF/NOTICE.txt
myfaces/extensions/validator/branches/branch_for_jsf_1_1/examples/feature-set_02/src/main/webapp/WEB-INF/NOTICE.txt
myfaces/extensions/validator/branches/branch_for_jsf_1_1/parent/NOTICE.txt
myfaces/extensions/validator/branches/branch_for_jsf_1_1/validation-modules/bean-validation/src/main/java/org/apache/myfaces/extensions/validator/beanval/ExtValBeanValidationContext.java
myfaces/extensions/validator/branches/branch_for_jsf_1_1/validation-modules/bean-validation/src/main/resources/NOTICE.txt
myfaces/extensions/validator/branches/branch_for_jsf_1_1/validation-modules/property-validation/src/main/resources/NOTICE.txt
Modified: myfaces/extensions/validator/branches/branch_for_jsf_1_1/assembly/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/branch_for_jsf_1_1/assembly/pom.xml?rev=924555&r1=924554&r2=924555&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/branch_for_jsf_1_1/assembly/pom.xml (original)
+++ myfaces/extensions/validator/branches/branch_for_jsf_1_1/assembly/pom.xml Wed Mar 17 23:37:15 2010
@@ -165,6 +165,12 @@
<artifactId>myfaces-extval-property-validation</artifactId>
<version>${property-validation.version}</version>
<scope>compile</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>javax.persistence</groupId>
+ <artifactId>persistence-api</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
@@ -172,6 +178,12 @@
<artifactId>myfaces-extval-bean-validation</artifactId>
<version>${bean-validation.version}</version>
<scope>compile</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>javax.validation</groupId>
+ <artifactId>validation-api</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
@@ -186,6 +198,12 @@
<artifactId>myfaces-extval-generic-support</artifactId>
<version>${generic-support.version}</version>
<scope>compile</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>cglib</groupId>
+ <artifactId>cglib</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
</dependencies>
Modified: myfaces/extensions/validator/branches/branch_for_jsf_1_1/assembly/src/main/resources/NOTICE.txt
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/branch_for_jsf_1_1/assembly/src/main/resources/NOTICE.txt?rev=924555&r1=924554&r2=924555&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/branch_for_jsf_1_1/assembly/src/main/resources/NOTICE.txt (original)
+++ myfaces/extensions/validator/branches/branch_for_jsf_1_1/assembly/src/main/resources/NOTICE.txt Wed Mar 17 23:37:15 2010
@@ -1,5 +1,5 @@
Apache MyFaces Extensions Validator
-Copyright 2007-2008 The Apache Software Foundation
+Copyright 2007-2010 The Apache Software Foundation
This product includes software developed by
The Apache Software Foundation (http://www.apache.org/).
Modified: myfaces/extensions/validator/branches/branch_for_jsf_1_1/component-support/generic-support/src/main/resources/NOTICE.txt
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/branch_for_jsf_1_1/component-support/generic-support/src/main/resources/NOTICE.txt?rev=924555&r1=924554&r2=924555&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/branch_for_jsf_1_1/component-support/generic-support/src/main/resources/NOTICE.txt (original)
+++ myfaces/extensions/validator/branches/branch_for_jsf_1_1/component-support/generic-support/src/main/resources/NOTICE.txt Wed Mar 17 23:37:15 2010
@@ -1,5 +1,5 @@
Apache MyFaces Extensions Validator
-Copyright 2007-2008 The Apache Software Foundation
+Copyright 2007-2010 The Apache Software Foundation
This product includes software developed by
The Apache Software Foundation (http://www.apache.org/).
Modified: myfaces/extensions/validator/branches/branch_for_jsf_1_1/component-support/trinidad-support/src/main/resources/NOTICE.txt
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/branch_for_jsf_1_1/component-support/trinidad-support/src/main/resources/NOTICE.txt?rev=924555&r1=924554&r2=924555&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/branch_for_jsf_1_1/component-support/trinidad-support/src/main/resources/NOTICE.txt (original)
+++ myfaces/extensions/validator/branches/branch_for_jsf_1_1/component-support/trinidad-support/src/main/resources/NOTICE.txt Wed Mar 17 23:37:15 2010
@@ -1,5 +1,5 @@
Apache MyFaces Extensions Validator
-Copyright 2007-2008 The Apache Software Foundation
+Copyright 2007-2010 The Apache Software Foundation
This product includes software developed by
The Apache Software Foundation (http://www.apache.org/).
Modified: myfaces/extensions/validator/branches/branch_for_jsf_1_1/core/src/main/resources/NOTICE.txt
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/branch_for_jsf_1_1/core/src/main/resources/NOTICE.txt?rev=924555&r1=924554&r2=924555&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/branch_for_jsf_1_1/core/src/main/resources/NOTICE.txt (original)
+++ myfaces/extensions/validator/branches/branch_for_jsf_1_1/core/src/main/resources/NOTICE.txt Wed Mar 17 23:37:15 2010
@@ -1,5 +1,5 @@
Apache MyFaces Extensions Validator
-Copyright 2007-2008 The Apache Software Foundation
+Copyright 2007-2010 The Apache Software Foundation
This product includes software developed by
The Apache Software Foundation (http://www.apache.org/).
Modified: myfaces/extensions/validator/branches/branch_for_jsf_1_1/examples/assembly/src/main/resources/NOTICE.txt
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/branch_for_jsf_1_1/examples/assembly/src/main/resources/NOTICE.txt?rev=924555&r1=924554&r2=924555&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/branch_for_jsf_1_1/examples/assembly/src/main/resources/NOTICE.txt (original)
+++ myfaces/extensions/validator/branches/branch_for_jsf_1_1/examples/assembly/src/main/resources/NOTICE.txt Wed Mar 17 23:37:15 2010
@@ -1,5 +1,5 @@
Apache MyFaces Extensions Validator
-Copyright 2007-2008 The Apache Software Foundation
+Copyright 2007-2010 The Apache Software Foundation
This product includes software developed by
The Apache Software Foundation (http://www.apache.org/).
Modified: myfaces/extensions/validator/branches/branch_for_jsf_1_1/examples/feature-set_01/src/main/webapp/WEB-INF/NOTICE.txt
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/branch_for_jsf_1_1/examples/feature-set_01/src/main/webapp/WEB-INF/NOTICE.txt?rev=924555&r1=924554&r2=924555&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/branch_for_jsf_1_1/examples/feature-set_01/src/main/webapp/WEB-INF/NOTICE.txt (original)
+++ myfaces/extensions/validator/branches/branch_for_jsf_1_1/examples/feature-set_01/src/main/webapp/WEB-INF/NOTICE.txt Wed Mar 17 23:37:15 2010
@@ -1,5 +1,5 @@
Apache MyFaces Extensions Validator
-Copyright 2007-2008 The Apache Software Foundation
+Copyright 2007-2010 The Apache Software Foundation
This product includes software developed by
The Apache Software Foundation (http://www.apache.org/).
Modified: myfaces/extensions/validator/branches/branch_for_jsf_1_1/examples/feature-set_02/src/main/webapp/WEB-INF/NOTICE.txt
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/branch_for_jsf_1_1/examples/feature-set_02/src/main/webapp/WEB-INF/NOTICE.txt?rev=924555&r1=924554&r2=924555&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/branch_for_jsf_1_1/examples/feature-set_02/src/main/webapp/WEB-INF/NOTICE.txt (original)
+++ myfaces/extensions/validator/branches/branch_for_jsf_1_1/examples/feature-set_02/src/main/webapp/WEB-INF/NOTICE.txt Wed Mar 17 23:37:15 2010
@@ -1,5 +1,5 @@
Apache MyFaces Extensions Validator
-Copyright 2007-2008 The Apache Software Foundation
+Copyright 2007-2010 The Apache Software Foundation
This product includes software developed by
The Apache Software Foundation (http://www.apache.org/).
Modified: myfaces/extensions/validator/branches/branch_for_jsf_1_1/parent/NOTICE.txt
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/branch_for_jsf_1_1/parent/NOTICE.txt?rev=924555&r1=924554&r2=924555&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/branch_for_jsf_1_1/parent/NOTICE.txt (original)
+++ myfaces/extensions/validator/branches/branch_for_jsf_1_1/parent/NOTICE.txt Wed Mar 17 23:37:15 2010
@@ -1,5 +1,5 @@
Apache MyFaces Extensions Validator
-Copyright 2007-2008 The Apache Software Foundation
+Copyright 2007-2010 The Apache Software Foundation
This product includes software developed by
The Apache Software Foundation (http://www.apache.org/).
Modified: myfaces/extensions/validator/branches/branch_for_jsf_1_1/validation-modules/bean-validation/src/main/java/org/apache/myfaces/extensions/validator/beanval/ExtValBeanValidationContext.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/branch_for_jsf_1_1/validation-modules/bean-validation/src/main/java/org/apache/myfaces/extensions/validator/beanval/ExtValBeanValidationContext.java?rev=924555&r1=924554&r2=924555&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/branch_for_jsf_1_1/validation-modules/bean-validation/src/main/java/org/apache/myfaces/extensions/validator/beanval/ExtValBeanValidationContext.java (original)
+++ myfaces/extensions/validator/branches/branch_for_jsf_1_1/validation-modules/bean-validation/src/main/java/org/apache/myfaces/extensions/validator/beanval/ExtValBeanValidationContext.java Wed Mar 17 23:37:15 2010
@@ -31,8 +31,6 @@ import org.apache.myfaces.extensions.val
import org.apache.myfaces.extensions.validator.core.storage.GroupStorage;
import org.apache.myfaces.extensions.validator.core.ExtValContext;
import org.apache.myfaces.extensions.validator.util.ExtValUtils;
-import org.apache.myfaces.extensions.validator.internal.ToDo;
-import org.apache.myfaces.extensions.validator.internal.Priority;
import org.apache.myfaces.extensions.validator.internal.UsageInformation;
import org.apache.myfaces.extensions.validator.internal.UsageCategory;
import org.apache.commons.logging.Log;
@@ -153,7 +151,6 @@ public class ExtValBeanValidationContext
getStorage(ModelValidationStorage.class, ModelValidation.class.getName());
}
- @ToDo(Priority.HIGH)
private void initMessageInterpolator()
{
Object foundBean = ExtValUtils.getELHelper().getBean(MessageInterpolator.class.getName().replace(".", "_"));
Modified: myfaces/extensions/validator/branches/branch_for_jsf_1_1/validation-modules/bean-validation/src/main/resources/NOTICE.txt
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/branch_for_jsf_1_1/validation-modules/bean-validation/src/main/resources/NOTICE.txt?rev=924555&r1=924554&r2=924555&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/branch_for_jsf_1_1/validation-modules/bean-validation/src/main/resources/NOTICE.txt (original)
+++ myfaces/extensions/validator/branches/branch_for_jsf_1_1/validation-modules/bean-validation/src/main/resources/NOTICE.txt Wed Mar 17 23:37:15 2010
@@ -1,5 +1,5 @@
Apache MyFaces Extensions Validator
-Copyright 2007-2008 The Apache Software Foundation
+Copyright 2007-2010 The Apache Software Foundation
This product includes software developed by
The Apache Software Foundation (http://www.apache.org/).
Modified: myfaces/extensions/validator/branches/branch_for_jsf_1_1/validation-modules/property-validation/src/main/resources/NOTICE.txt
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/branch_for_jsf_1_1/validation-modules/property-validation/src/main/resources/NOTICE.txt?rev=924555&r1=924554&r2=924555&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/branch_for_jsf_1_1/validation-modules/property-validation/src/main/resources/NOTICE.txt (original)
+++ myfaces/extensions/validator/branches/branch_for_jsf_1_1/validation-modules/property-validation/src/main/resources/NOTICE.txt Wed Mar 17 23:37:15 2010
@@ -1,5 +1,5 @@
Apache MyFaces Extensions Validator
-Copyright 2007-2008 The Apache Software Foundation
+Copyright 2007-2010 The Apache Software Foundation
This product includes software developed by
The Apache Software Foundation (http://www.apache.org/).