geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dwo...@apache.org
Subject svn commit: r824885 - in /geronimo/specs/trunk/geronimo-validation_1.0_spec/src/main/java/javax/validation: ./ bootstrap/
Date Tue, 13 Oct 2009 19:05:40 GMT
Author: dwoods
Date: Tue Oct 13 19:05:40 2009
New Revision: 824885

URL: http://svn.apache.org/viewvc?rev=824885&view=rev
Log:
GERONIMO-4619 Merge in 1.0.0 CR5 to GA API updates

Modified:
    geronimo/specs/trunk/geronimo-validation_1.0_spec/src/main/java/javax/validation/Configuration.java
    geronimo/specs/trunk/geronimo-validation_1.0_spec/src/main/java/javax/validation/ConstraintValidator.java
    geronimo/specs/trunk/geronimo-validation_1.0_spec/src/main/java/javax/validation/ConstraintValidatorContext.java
    geronimo/specs/trunk/geronimo-validation_1.0_spec/src/main/java/javax/validation/ConstraintViolationException.java
    geronimo/specs/trunk/geronimo-validation_1.0_spec/src/main/java/javax/validation/TraversableResolver.java
    geronimo/specs/trunk/geronimo-validation_1.0_spec/src/main/java/javax/validation/ValidatorFactory.java
    geronimo/specs/trunk/geronimo-validation_1.0_spec/src/main/java/javax/validation/bootstrap/GenericBootstrap.java
    geronimo/specs/trunk/geronimo-validation_1.0_spec/src/main/java/javax/validation/bootstrap/ProviderSpecificBootstrap.java

Modified: geronimo/specs/trunk/geronimo-validation_1.0_spec/src/main/java/javax/validation/Configuration.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-validation_1.0_spec/src/main/java/javax/validation/Configuration.java?rev=824885&r1=824884&r2=824885&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-validation_1.0_spec/src/main/java/javax/validation/Configuration.java
(original)
+++ geronimo/specs/trunk/geronimo-validation_1.0_spec/src/main/java/javax/validation/Configuration.java
Tue Oct 13 19:05:40 2009
@@ -23,20 +23,24 @@
  */
 public interface Configuration<T extends Configuration<T>> {
 
-	T ignoreXmlConfiguration();
+    T ignoreXmlConfiguration();
 
-	T messageInterpolator(MessageInterpolator interpolator);
+    T messageInterpolator(MessageInterpolator interpolator);
 
-	T traversableResolver(TraversableResolver resolver);
+    T traversableResolver(TraversableResolver resolver);
 
-	T constraintValidatorFactory(ConstraintValidatorFactory constraintValidatorFactory);
+    T constraintValidatorFactory(ConstraintValidatorFactory constraintValidatorFactory);
 
-	T addMapping(InputStream stream);
+    T addMapping(InputStream stream);
 
-	T addProperty(String name, String value);
+    T addProperty(String name, String value);
 
-	MessageInterpolator getDefaultMessageInterpolator();
+    MessageInterpolator getDefaultMessageInterpolator();
 
-	ValidatorFactory buildValidatorFactory();
+    TraversableResolver getDefaultTraversableResolver();
+
+    ConstraintValidatorFactory getDefaultConstraintValidatorFactory();
+
+    ValidatorFactory buildValidatorFactory();
 }
 

Modified: geronimo/specs/trunk/geronimo-validation_1.0_spec/src/main/java/javax/validation/ConstraintValidator.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-validation_1.0_spec/src/main/java/javax/validation/ConstraintValidator.java?rev=824885&r1=824884&r2=824885&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-validation_1.0_spec/src/main/java/javax/validation/ConstraintValidator.java
(original)
+++ geronimo/specs/trunk/geronimo-validation_1.0_spec/src/main/java/javax/validation/ConstraintValidator.java
Tue Oct 13 19:05:40 2009
@@ -24,6 +24,6 @@
 public interface ConstraintValidator<A extends Annotation, T> {
     void initialize(A constraintAnnotation);
 
-    boolean isValid(T value, ConstraintValidatorContext constraintValidatorContext);
+    boolean isValid(T value, ConstraintValidatorContext context);
 }
 

Modified: geronimo/specs/trunk/geronimo-validation_1.0_spec/src/main/java/javax/validation/ConstraintValidatorContext.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-validation_1.0_spec/src/main/java/javax/validation/ConstraintValidatorContext.java?rev=824885&r1=824884&r2=824885&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-validation_1.0_spec/src/main/java/javax/validation/ConstraintValidatorContext.java
(original)
+++ geronimo/specs/trunk/geronimo-validation_1.0_spec/src/main/java/javax/validation/ConstraintValidatorContext.java
Tue Oct 13 19:05:40 2009
@@ -20,31 +20,31 @@
  * @version $Rev$ $Date$
  */
 public interface ConstraintValidatorContext {
-    void disableDefaultError();
+    void disableDefaultConstraintViolation();
 
-    String getDefaultErrorMessageTemplate();
+    String getDefaultConstraintMessageTemplate();
 
-    ErrorBuilder buildErrorWithMessageTemplate(String messageTemplate);
+    ConstraintViolationBuilder buildConstraintViolationWithTemplate(String messageTemplate);
 
-    interface ErrorBuilder {
-        NodeBuilderDefinedContext addSubNode(String name);
+    interface ConstraintViolationBuilder {
+        NodeBuilderDefinedContext addNode(String name);
 
-        ConstraintValidatorContext addError();
+        ConstraintValidatorContext addConstraintViolation();
 
         interface NodeBuilderDefinedContext {
 
-            NodeBuilderCustomizableContext addSubNode(String name);
+            NodeBuilderCustomizableContext addNode(String name);
 
-            ConstraintValidatorContext addError();
+            ConstraintValidatorContext addConstraintViolation();
         }
 
         interface NodeBuilderCustomizableContext {
 
             NodeContextBuilder inIterable();
 
-            NodeBuilderCustomizableContext addSubNode(String name);
+            NodeBuilderCustomizableContext addNode(String name);
 
-            ConstraintValidatorContext addError();
+            ConstraintValidatorContext addConstraintViolation();
         }
 
         interface NodeContextBuilder {
@@ -53,9 +53,9 @@
 
             NodeBuilderDefinedContext atIndex(Integer index);
 
-            NodeBuilderCustomizableContext addSubNode(String name);
+            NodeBuilderCustomizableContext addNode(String name);
 
-            ConstraintValidatorContext addError();
+            ConstraintValidatorContext addConstraintViolation();
         }
     }
 }

Modified: geronimo/specs/trunk/geronimo-validation_1.0_spec/src/main/java/javax/validation/ConstraintViolationException.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-validation_1.0_spec/src/main/java/javax/validation/ConstraintViolationException.java?rev=824885&r1=824884&r2=824885&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-validation_1.0_spec/src/main/java/javax/validation/ConstraintViolationException.java
(original)
+++ geronimo/specs/trunk/geronimo-validation_1.0_spec/src/main/java/javax/validation/ConstraintViolationException.java
Tue Oct 13 19:05:40 2009
@@ -24,13 +24,13 @@
 public class ConstraintViolationException extends ValidationException {
     private final Set<ConstraintViolation<?>> constraintViolations;
 
-    public <T> ConstraintViolationException(String message,
+    public ConstraintViolationException(String message,
             Set<ConstraintViolation<?>> constraintViolations) {
         super(message);
         this.constraintViolations = constraintViolations;
     }
 
-    public <T> ConstraintViolationException(Set<ConstraintViolation<?>>
constraintViolations) {
+    public ConstraintViolationException(Set<ConstraintViolation<?>> constraintViolations)
{
         super();
         this.constraintViolations = constraintViolations;
     }

Modified: geronimo/specs/trunk/geronimo-validation_1.0_spec/src/main/java/javax/validation/TraversableResolver.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-validation_1.0_spec/src/main/java/javax/validation/TraversableResolver.java?rev=824885&r1=824884&r2=824885&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-validation_1.0_spec/src/main/java/javax/validation/TraversableResolver.java
(original)
+++ geronimo/specs/trunk/geronimo-validation_1.0_spec/src/main/java/javax/validation/TraversableResolver.java
Tue Oct 13 19:05:40 2009
@@ -17,7 +17,6 @@
 package javax.validation;
 
 import java.lang.annotation.ElementType;
-import javax.validation.Path;
 
 /**
  * @version $Rev$ $Date$

Modified: geronimo/specs/trunk/geronimo-validation_1.0_spec/src/main/java/javax/validation/ValidatorFactory.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-validation_1.0_spec/src/main/java/javax/validation/ValidatorFactory.java?rev=824885&r1=824884&r2=824885&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-validation_1.0_spec/src/main/java/javax/validation/ValidatorFactory.java
(original)
+++ geronimo/specs/trunk/geronimo-validation_1.0_spec/src/main/java/javax/validation/ValidatorFactory.java
Tue Oct 13 19:05:40 2009
@@ -26,6 +26,10 @@
 
     MessageInterpolator getMessageInterpolator();
 
+    TraversableResolver getTraversableResolver();
+
+    ConstraintValidatorFactory getConstraintValidatorFactory();
+
     public <T> T unwrap(Class<T> type);
 }
 

Modified: geronimo/specs/trunk/geronimo-validation_1.0_spec/src/main/java/javax/validation/bootstrap/GenericBootstrap.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-validation_1.0_spec/src/main/java/javax/validation/bootstrap/GenericBootstrap.java?rev=824885&r1=824884&r2=824885&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-validation_1.0_spec/src/main/java/javax/validation/bootstrap/GenericBootstrap.java
(original)
+++ geronimo/specs/trunk/geronimo-validation_1.0_spec/src/main/java/javax/validation/bootstrap/GenericBootstrap.java
Tue Oct 13 19:05:40 2009
@@ -27,3 +27,4 @@
 
     Configuration<?> configure();
 }
+

Modified: geronimo/specs/trunk/geronimo-validation_1.0_spec/src/main/java/javax/validation/bootstrap/ProviderSpecificBootstrap.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-validation_1.0_spec/src/main/java/javax/validation/bootstrap/ProviderSpecificBootstrap.java?rev=824885&r1=824884&r2=824885&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-validation_1.0_spec/src/main/java/javax/validation/bootstrap/ProviderSpecificBootstrap.java
(original)
+++ geronimo/specs/trunk/geronimo-validation_1.0_spec/src/main/java/javax/validation/bootstrap/ProviderSpecificBootstrap.java
Tue Oct 13 19:05:40 2009
@@ -26,3 +26,4 @@
 
     public T configure();
 }
+



Mime
View raw message