Author: mbenson
Date: Thu Apr 7 19:45:31 2011
New Revision: 1089959
URL: http://svn.apache.org/viewvc?rev=1089959&view=rev
Log:
merge r1089957 from trunk
Modified:
incubator/bval/sandbox/lang3-work/ (props changed)
incubator/bval/sandbox/lang3-work/NOTICE
incubator/bval/sandbox/lang3-work/bval-core/src/main/java/org/apache/bval/BeanValidationContext.java
(props changed)
incubator/bval/sandbox/lang3-work/bval-core/src/main/java/org/apache/bval/model/MetaProperty.java
(props changed)
incubator/bval/sandbox/lang3-work/bval-jsr303/src/main/java/ (props
changed)
incubator/bval/sandbox/lang3-work/bval-jsr303/src/main/java/org/apache/bval/jsr303/AppendValidationToBuilder.java
(props changed)
incubator/bval/sandbox/lang3-work/bval-jsr303/src/main/java/org/apache/bval/jsr303/ConstraintValidation.java
(props changed)
incubator/bval/sandbox/lang3-work/bval-jsr303/src/main/java/org/apache/bval/jsr303/ConstraintValidationListener.java
(props changed)
incubator/bval/sandbox/lang3-work/bval-jsr303/src/main/java/org/apache/bval/jsr303/xml/ValidationMappingParser.java
(props changed)
incubator/bval/sandbox/lang3-work/bval-xstream/ (props changed)
Propchange: incubator/bval/sandbox/lang3-work/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Apr 7 19:45:31 2011
@@ -1 +1 @@
-/incubator/bval/trunk:992143,992401,992406,992412,992510,992648,993404-993438,996236,996240,997154,1002445,1031642,1035416-1036603,1069985,1073929,1073944,1073946,1073949
+/incubator/bval/trunk:992143,992401,992406,992412,992510,992648,993404-993438,996236,996240,997154,1002445,1031642,1035416-1036603,1069985,1073929,1073944,1073946,1073949,1089957
Modified: incubator/bval/sandbox/lang3-work/NOTICE
URL:
http://svn.apache.org/viewvc/incubator/bval/sandbox/lang3-work/NOTICE?rev=1089959&r1=1089958&r2=1089959&view=diff
==============================================================================
--- incubator/bval/sandbox/lang3-work/NOTICE (original)
+++ incubator/bval/sandbox/lang3-work/NOTICE Thu Apr 7 19:45:31 2011
@@ -1,6 +1,6 @@
Apache Incubator - Bean Validation project
-Copyright 2010 The Apache Software Foundation.
+Copyright 2010-2011 The Apache Software Foundation.
This product includes software developed by
The Apache Software Foundation (http://www.apache.org/).
@@ -9,6 +9,6 @@ The Apache Software Foundation (http://w
The following copyright notice(s) were affixed to portions of this code
with which this file is now or was at one time distributed.
-This product includes software developed by agimatec GmbH.
+This product includes software developed by Agimatec GmbH.
Copyright 2007-2010 Agimatec GmbH. All rights reserved.
Propchange:
incubator/bval/sandbox/lang3-work/bval-core/src/main/java/org/apache/bval/BeanValidationContext.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Apr 7 19:45:31 2011
@@ -1 +1 @@
-/incubator/bval/trunk/bval-core/src/main/java/org/apache/bval/BeanValidationContext.java:992143,992401,992406,992412,992510,992648,993404-993438,996236,996240,997154,1002445,1002497,1031642,1035416-1036603,1069985,1073929,1073944,1073946,1073949
+/incubator/bval/trunk/bval-core/src/main/java/org/apache/bval/BeanValidationContext.java:992143,992401,992406,992412,992510,992648,993404-993438,996236,996240,997154,1002445,1002497,1031642,1035416-1036603,1069985,1073929,1073944,1073946,1073949,1089957
Propchange:
incubator/bval/sandbox/lang3-work/bval-core/src/main/java/org/apache/bval/model/MetaProperty.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Apr 7 19:45:31 2011
@@ -1 +1 @@
-/incubator/bval/trunk/bval-core/src/main/java/org/apache/bval/model/MetaProperty.java:992143,992401,992406,992412,992510,992648,993404-993438,996236,996240,997154,1002445,1002497,1031642,1035416-1036603,1069985,1073929,1073944,1073946,1073949
+/incubator/bval/trunk/bval-core/src/main/java/org/apache/bval/model/MetaProperty.java:992143,992401,992406,992412,992510,992648,993404-993438,996236,996240,997154,1002445,1002497,1031642,1035416-1036603,1069985,1073929,1073944,1073946,1073949,1089957
Propchange: incubator/bval/sandbox/lang3-work/bval-jsr303/src/main/java/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Apr 7 19:45:31 2011
@@ -1 +1 @@
-/incubator/bval/trunk/bval-jsr303/src/main/java:992330-992353,992401,992406,992412,992510,992648,993404-993438,996236,996240,997154,1002445,1031642,1035416-1036603,1069985,1073929,1073944,1073946,1073949
+/incubator/bval/trunk/bval-jsr303/src/main/java:992330-992353,992401,992406,992412,992510,992648,993404-993438,996236,996240,997154,1002445,1031642,1035416-1036603,1069985,1073929,1073944,1073946,1073949,1089957
Propchange:
incubator/bval/sandbox/lang3-work/bval-jsr303/src/main/java/org/apache/bval/jsr303/AppendValidationToBuilder.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Apr 7 19:45:31 2011
@@ -1 +1 @@
-/incubator/bval/trunk/bval-jsr303/src/main/java/org/apache/bval/jsr303/AppendValidationToBuilder.java:992330-992353,992401,992406,992412,992510,992648,993404-993438,996236,996240,997154,1002445,1002497,1031642,1035416-1036603,1069985,1073929,1073944,1073946,1073949
+/incubator/bval/trunk/bval-jsr303/src/main/java/org/apache/bval/jsr303/AppendValidationToBuilder.java:992330-992353,992401,992406,992412,992510,992648,993404-993438,996236,996240,997154,1002445,1002497,1031642,1035416-1036603,1069985,1073929,1073944,1073946,1073949,1089957
Propchange:
incubator/bval/sandbox/lang3-work/bval-jsr303/src/main/java/org/apache/bval/jsr303/ConstraintValidation.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Apr 7 19:45:31 2011
@@ -1 +1 @@
-/incubator/bval/trunk/bval-jsr303/src/main/java/org/apache/bval/jsr303/ConstraintValidation.java:992330-992353,992401,992406,992412,992510,992648,993404-993438,996236,996240,997154,1002445,1002497,1031642,1035416-1036603,1069985,1073929,1073944,1073946,1073949
+/incubator/bval/trunk/bval-jsr303/src/main/java/org/apache/bval/jsr303/ConstraintValidation.java:992330-992353,992401,992406,992412,992510,992648,993404-993438,996236,996240,997154,1002445,1002497,1031642,1035416-1036603,1069985,1073929,1073944,1073946,1073949,1089957
Propchange:
incubator/bval/sandbox/lang3-work/bval-jsr303/src/main/java/org/apache/bval/jsr303/ConstraintValidationListener.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Apr 7 19:45:31 2011
@@ -1 +1 @@
-/incubator/bval/trunk/bval-jsr303/src/main/java/org/apache/bval/jsr303/ConstraintValidationListener.java:992330-992353,992401,992406,992412,992510,992648,993404-993438,996236,996240,997154,1002445,1002497,1031642,1035416-1036603,1069985,1073929,1073944,1073946,1073949
+/incubator/bval/trunk/bval-jsr303/src/main/java/org/apache/bval/jsr303/ConstraintValidationListener.java:992330-992353,992401,992406,992412,992510,992648,993404-993438,996236,996240,997154,1002445,1002497,1031642,1035416-1036603,1069985,1073929,1073944,1073946,1073949,1089957
Propchange:
incubator/bval/sandbox/lang3-work/bval-jsr303/src/main/java/org/apache/bval/jsr303/xml/ValidationMappingParser.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Apr 7 19:45:31 2011
@@ -1 +1 @@
-/incubator/bval/trunk/bval-jsr303/src/main/java/org/apache/bval/jsr303/xml/ValidationMappingParser.java:992330-992353,992401,992406,992412,992510,992648,993404-993438,996236,996240,997154,1002445,1002497,1031642,1035416-1036603,1069985,1073929,1073944,1073946,1073949
+/incubator/bval/trunk/bval-jsr303/src/main/java/org/apache/bval/jsr303/xml/ValidationMappingParser.java:992330-992353,992401,992406,992412,992510,992648,993404-993438,996236,996240,997154,1002445,1002497,1031642,1035416-1036603,1069985,1073929,1073944,1073946,1073949,1089957
Propchange: incubator/bval/sandbox/lang3-work/bval-xstream/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Apr 7 19:45:31 2011
@@ -1 +1 @@
-/incubator/bval/trunk/bval-xstream:992143,992401,992406,992412,992510,992648,993404-993438,996236,996240,997154,1002445,1002497,1031642,1035416-1036603,1069985,1073929,1073944,1073946,1073949
+/incubator/bval/trunk/bval-xstream:992143,992401,992406,992412,992510,992648,993404-993438,996236,996240,997154,1002445,1002497,1031642,1035416-1036603,1069985,1073929,1073944,1073946,1073949,1089957