geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rmannibu...@apache.org
Subject svn commit: r1542191 [1/2] - in /geronimo/specs/trunk/geronimo-validation_1.1_spec: ./ src/main/java/javax/validation/ src/main/java/javax/validation/bootstrap/ src/main/java/javax/validation/constraints/ src/main/java/javax/validation/constraintvalida...
Date Fri, 15 Nov 2013 07:37:52 GMT
Author: rmannibucau
Date: Fri Nov 15 07:37:51 2013
New Revision: 1542191

URL: http://svn.apache.org/r1542191
Log:
GERONIMO-6459 JSR-349 spec jar (bean validation 1.1)

Added:
    geronimo/specs/trunk/geronimo-validation_1.1_spec/src/main/java/javax/validation/BootstrapConfiguration.java
    geronimo/specs/trunk/geronimo-validation_1.1_spec/src/main/java/javax/validation/ConstraintTarget.java
    geronimo/specs/trunk/geronimo-validation_1.1_spec/src/main/java/javax/validation/ElementKind.java
    geronimo/specs/trunk/geronimo-validation_1.1_spec/src/main/java/javax/validation/ParameterNameProvider.java
    geronimo/specs/trunk/geronimo-validation_1.1_spec/src/main/java/javax/validation/constraintvalidation/
    geronimo/specs/trunk/geronimo-validation_1.1_spec/src/main/java/javax/validation/constraintvalidation/SupportedValidationTarget.java
    geronimo/specs/trunk/geronimo-validation_1.1_spec/src/main/java/javax/validation/constraintvalidation/ValidationTarget.java
    geronimo/specs/trunk/geronimo-validation_1.1_spec/src/main/java/javax/validation/executable/
    geronimo/specs/trunk/geronimo-validation_1.1_spec/src/main/java/javax/validation/executable/ExecutableType.java
    geronimo/specs/trunk/geronimo-validation_1.1_spec/src/main/java/javax/validation/executable/ExecutableValidator.java
    geronimo/specs/trunk/geronimo-validation_1.1_spec/src/main/java/javax/validation/executable/ValidateOnExecution.java
    geronimo/specs/trunk/geronimo-validation_1.1_spec/src/main/java/javax/validation/groups/ConvertGroup.java
    geronimo/specs/trunk/geronimo-validation_1.1_spec/src/main/java/javax/validation/metadata/CascadableDescriptor.java
    geronimo/specs/trunk/geronimo-validation_1.1_spec/src/main/java/javax/validation/metadata/ConstructorDescriptor.java
    geronimo/specs/trunk/geronimo-validation_1.1_spec/src/main/java/javax/validation/metadata/CrossParameterDescriptor.java
    geronimo/specs/trunk/geronimo-validation_1.1_spec/src/main/java/javax/validation/metadata/ExecutableDescriptor.java
    geronimo/specs/trunk/geronimo-validation_1.1_spec/src/main/java/javax/validation/metadata/GroupConversionDescriptor.java
    geronimo/specs/trunk/geronimo-validation_1.1_spec/src/main/java/javax/validation/metadata/MethodDescriptor.java
    geronimo/specs/trunk/geronimo-validation_1.1_spec/src/main/java/javax/validation/metadata/MethodType.java
    geronimo/specs/trunk/geronimo-validation_1.1_spec/src/main/java/javax/validation/metadata/ParameterDescriptor.java
    geronimo/specs/trunk/geronimo-validation_1.1_spec/src/main/java/javax/validation/metadata/ReturnValueDescriptor.java
Modified:
    geronimo/specs/trunk/geronimo-validation_1.1_spec/pom.xml
    geronimo/specs/trunk/geronimo-validation_1.1_spec/src/main/java/javax/validation/Configuration.java
    geronimo/specs/trunk/geronimo-validation_1.1_spec/src/main/java/javax/validation/Constraint.java
    geronimo/specs/trunk/geronimo-validation_1.1_spec/src/main/java/javax/validation/ConstraintValidatorContext.java
    geronimo/specs/trunk/geronimo-validation_1.1_spec/src/main/java/javax/validation/ConstraintValidatorFactory.java
    geronimo/specs/trunk/geronimo-validation_1.1_spec/src/main/java/javax/validation/ConstraintViolation.java
    geronimo/specs/trunk/geronimo-validation_1.1_spec/src/main/java/javax/validation/ConstraintViolationException.java
    geronimo/specs/trunk/geronimo-validation_1.1_spec/src/main/java/javax/validation/GroupSequence.java
    geronimo/specs/trunk/geronimo-validation_1.1_spec/src/main/java/javax/validation/MessageInterpolator.java
    geronimo/specs/trunk/geronimo-validation_1.1_spec/src/main/java/javax/validation/OverridesAttribute.java
    geronimo/specs/trunk/geronimo-validation_1.1_spec/src/main/java/javax/validation/Path.java
    geronimo/specs/trunk/geronimo-validation_1.1_spec/src/main/java/javax/validation/ReportAsSingleViolation.java
    geronimo/specs/trunk/geronimo-validation_1.1_spec/src/main/java/javax/validation/Valid.java
    geronimo/specs/trunk/geronimo-validation_1.1_spec/src/main/java/javax/validation/Validation.java
    geronimo/specs/trunk/geronimo-validation_1.1_spec/src/main/java/javax/validation/ValidationProviderResolver.java
    geronimo/specs/trunk/geronimo-validation_1.1_spec/src/main/java/javax/validation/Validator.java
    geronimo/specs/trunk/geronimo-validation_1.1_spec/src/main/java/javax/validation/ValidatorContext.java
    geronimo/specs/trunk/geronimo-validation_1.1_spec/src/main/java/javax/validation/ValidatorFactory.java
    geronimo/specs/trunk/geronimo-validation_1.1_spec/src/main/java/javax/validation/bootstrap/ProviderSpecificBootstrap.java
    geronimo/specs/trunk/geronimo-validation_1.1_spec/src/main/java/javax/validation/constraints/AssertFalse.java
    geronimo/specs/trunk/geronimo-validation_1.1_spec/src/main/java/javax/validation/constraints/AssertTrue.java
    geronimo/specs/trunk/geronimo-validation_1.1_spec/src/main/java/javax/validation/constraints/DecimalMax.java
    geronimo/specs/trunk/geronimo-validation_1.1_spec/src/main/java/javax/validation/constraints/DecimalMin.java
    geronimo/specs/trunk/geronimo-validation_1.1_spec/src/main/java/javax/validation/constraints/Digits.java
    geronimo/specs/trunk/geronimo-validation_1.1_spec/src/main/java/javax/validation/constraints/Future.java
    geronimo/specs/trunk/geronimo-validation_1.1_spec/src/main/java/javax/validation/constraints/Max.java
    geronimo/specs/trunk/geronimo-validation_1.1_spec/src/main/java/javax/validation/constraints/Min.java
    geronimo/specs/trunk/geronimo-validation_1.1_spec/src/main/java/javax/validation/constraints/NotNull.java
    geronimo/specs/trunk/geronimo-validation_1.1_spec/src/main/java/javax/validation/constraints/Null.java
    geronimo/specs/trunk/geronimo-validation_1.1_spec/src/main/java/javax/validation/constraints/Past.java
    geronimo/specs/trunk/geronimo-validation_1.1_spec/src/main/java/javax/validation/constraints/Pattern.java
    geronimo/specs/trunk/geronimo-validation_1.1_spec/src/main/java/javax/validation/constraints/Size.java
    geronimo/specs/trunk/geronimo-validation_1.1_spec/src/main/java/javax/validation/metadata/BeanDescriptor.java
    geronimo/specs/trunk/geronimo-validation_1.1_spec/src/main/java/javax/validation/metadata/ConstraintDescriptor.java
    geronimo/specs/trunk/geronimo-validation_1.1_spec/src/main/java/javax/validation/metadata/PropertyDescriptor.java
    geronimo/specs/trunk/geronimo-validation_1.1_spec/src/main/java/javax/validation/spi/ConfigurationState.java

Modified: geronimo/specs/trunk/geronimo-validation_1.1_spec/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-validation_1.1_spec/pom.xml?rev=1542191&r1=1542190&r2=1542191&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-validation_1.1_spec/pom.xml (original)
+++ geronimo/specs/trunk/geronimo-validation_1.1_spec/pom.xml Fri Nov 15 07:37:51 2013
@@ -31,28 +31,28 @@
     </parent>
 
     <groupId>org.apache.geronimo.specs</groupId>
-    <artifactId>geronimo-validation_1.0_spec</artifactId>
-    <version>1.2-SNAPSHOT</version>
+    <artifactId>geronimo-validation_1.1_spec</artifactId>
+    <version>1.0-SNAPSHOT</version>
     <packaging>bundle</packaging>
-    <name>Apache Geronimo Bean Validation Spec 1.0</name>
-    <description>Apache Geronimo implementation of the JSR-303 Bean Validation Spec API</description>
+    <name>Apache Geronimo Bean Validation Spec 1.1</name>
+    <description>Apache Geronimo implementation of the JSR-349 Bean Validation Spec API</description>
 
-    <url>http://geronimo.apache.org/maven/${siteId}/${version}</url>
+    <url>http://geronimo.apache.org/maven/${siteId}/${project.version}</url>
     <distributionManagement>
         <site>
             <id>apache-website</id>
-            <url>${site.deploy.url}/maven/${siteId}/${version}</url>
+            <url>${site.deploy.url}/maven/${siteId}/${project.version}</url>
         </site>
     </distributionManagement>
 
     <properties>
-        <siteId>specs/${artifactId}</siteId>
+        <siteId>specs/${project.artifactId}</siteId>
     </properties>
 
     <scm>
-        <connection>scm:svn:http://svn.apache.org/repos/asf/geronimo/specs/trunk/geronimo-validation_1.0_spec/</connection>
-        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/geronimo/specs/trunk/geronimo-validation_1.0_spec/</developerConnection>
-        <url>http://svn.apache.org/viewcvs.cgi/geronimo/specs/trunk/geronimo-validation_1.0_spec/</url>
+        <connection>scm:svn:http://svn.apache.org/repos/asf/geronimo/specs/trunk/geronimo-validation_1.1_spec/</connection>
+        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/geronimo/specs/trunk/geronimo-validation_1.1_spec/</developerConnection>
+        <url>http://svn.apache.org/viewcvs.cgi/geronimo/specs/trunk/geronimo-validation_1.1_spec/</url>
     </scm>
 
     <dependencies>
@@ -82,11 +82,11 @@
                 <artifactId>maven-bundle-plugin</artifactId>
                 <configuration>
                     <instructions>
-                        <Bundle-SymbolicName>${groupId}.${artifactId};singleton=true</Bundle-SymbolicName>
-                        <Specification-Title>JSR-303 Bean Validation API</Specification-Title>
+                        <Bundle-SymbolicName>${project.groupId}.${project.artifactId};singleton=true</Bundle-SymbolicName>
+                        <Specification-Title>JSR-349 Bean Validation API</Specification-Title>
                         <Specification-Vendor>Sun Microsystems, Inc.</Specification-Vendor>
                         <Specification-Version>1.0</Specification-Version>
-                        <Export-Package>javax.validation*;version=1.0</Export-Package>
+                        <Export-Package>javax.validation*;version=1.1</Export-Package>
                         <Import-Package>org.apache.geronimo.osgi.registry.api;resolution:=optional,*</Import-Package>
                         <Private-Package>org.apache.geronimo.osgi.locator</Private-Package>
                         <Bundle-Activator>org.apache.geronimo.osgi.locator.Activator</Bundle-Activator>

Added: geronimo/specs/trunk/geronimo-validation_1.1_spec/src/main/java/javax/validation/BootstrapConfiguration.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-validation_1.1_spec/src/main/java/javax/validation/BootstrapConfiguration.java?rev=1542191&view=auto
==============================================================================
--- geronimo/specs/trunk/geronimo-validation_1.1_spec/src/main/java/javax/validation/BootstrapConfiguration.java (added)
+++ geronimo/specs/trunk/geronimo-validation_1.1_spec/src/main/java/javax/validation/BootstrapConfiguration.java Fri Nov 15 07:37:51 2013
@@ -0,0 +1,34 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with this
+ * work for additional information regarding copyright ownership. The ASF
+ * licenses this file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package javax.validation;
+
+import javax.validation.executable.ExecutableType;
+import java.util.Map;
+import java.util.Set;
+
+/** @since 1.1 */
+public interface BootstrapConfiguration {
+	String getDefaultProviderClassName();
+	String getConstraintValidatorFactoryClassName();
+	String getMessageInterpolatorClassName();
+	String getTraversableResolverClassName();
+	String getParameterNameProviderClassName();
+	Set<String> getConstraintMappingResourcePaths();
+	boolean isExecutableValidationEnabled();
+	Set<ExecutableType> getDefaultValidatedExecutableTypes();
+	Map<String, String> getProperties();
+}

Modified: geronimo/specs/trunk/geronimo-validation_1.1_spec/src/main/java/javax/validation/Configuration.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-validation_1.1_spec/src/main/java/javax/validation/Configuration.java?rev=1542191&r1=1542190&r2=1542191&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-validation_1.1_spec/src/main/java/javax/validation/Configuration.java (original)
+++ geronimo/specs/trunk/geronimo-validation_1.1_spec/src/main/java/javax/validation/Configuration.java Fri Nov 15 07:37:51 2013
@@ -42,5 +42,12 @@ public interface Configuration<T extends
     ConstraintValidatorFactory getDefaultConstraintValidatorFactory();
 
     ValidatorFactory buildValidatorFactory();
+
+    // @since 1.1
+
+    T parameterNameProvider(ParameterNameProvider parameterNameProvider);
+    ParameterNameProvider getDefaultParameterNameProvider();
+
+    BootstrapConfiguration getBootstrapConfiguration();
 }
 

Modified: geronimo/specs/trunk/geronimo-validation_1.1_spec/src/main/java/javax/validation/Constraint.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-validation_1.1_spec/src/main/java/javax/validation/Constraint.java?rev=1542191&r1=1542190&r2=1542191&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-validation_1.1_spec/src/main/java/javax/validation/Constraint.java (original)
+++ geronimo/specs/trunk/geronimo-validation_1.1_spec/src/main/java/javax/validation/Constraint.java Fri Nov 15 07:37:51 2013
@@ -17,11 +17,11 @@
 package javax.validation;
 
 import java.lang.annotation.Documented;
-import static java.lang.annotation.ElementType.ANNOTATION_TYPE;
 import java.lang.annotation.Retention;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
 import java.lang.annotation.Target;
-import java.lang.annotation.Annotation;
+
+import static java.lang.annotation.ElementType.ANNOTATION_TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
 
 /**
  * @version $Rev$ $Date$

Added: geronimo/specs/trunk/geronimo-validation_1.1_spec/src/main/java/javax/validation/ConstraintTarget.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-validation_1.1_spec/src/main/java/javax/validation/ConstraintTarget.java?rev=1542191&view=auto
==============================================================================
--- geronimo/specs/trunk/geronimo-validation_1.1_spec/src/main/java/javax/validation/ConstraintTarget.java (added)
+++ geronimo/specs/trunk/geronimo-validation_1.1_spec/src/main/java/javax/validation/ConstraintTarget.java Fri Nov 15 07:37:51 2013
@@ -0,0 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with this
+ * work for additional information regarding copyright ownership. The ASF
+ * licenses this file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package javax.validation;
+
+/** @since 1.1 */
+public enum ConstraintTarget {
+	IMPLICIT, RETURN_VALUE, PARAMETERS
+}

Modified: geronimo/specs/trunk/geronimo-validation_1.1_spec/src/main/java/javax/validation/ConstraintValidatorContext.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-validation_1.1_spec/src/main/java/javax/validation/ConstraintValidatorContext.java?rev=1542191&r1=1542190&r2=1542191&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-validation_1.1_spec/src/main/java/javax/validation/ConstraintValidatorContext.java (original)
+++ geronimo/specs/trunk/geronimo-validation_1.1_spec/src/main/java/javax/validation/ConstraintValidatorContext.java Fri Nov 15 07:37:51 2013
@@ -5,9 +5,9 @@
  * licenses this file to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -26,16 +26,30 @@ public interface ConstraintValidatorCont
 
     ConstraintViolationBuilder buildConstraintViolationWithTemplate(String messageTemplate);
 
+    /** @since 1.1 */
+    <T> T unwrap(Class<T> type);
+
     interface ConstraintViolationBuilder {
         NodeBuilderDefinedContext addNode(String name);
 
         ConstraintValidatorContext addConstraintViolation();
 
+        // @since 1.1
+
+        NodeBuilderCustomizableContext addPropertyNode(String name);
+        LeafNodeBuilderCustomizableContext addBeanNode();
+        NodeBuilderDefinedContext addParameterNode(int index);
+
         interface NodeBuilderDefinedContext {
 
             NodeBuilderCustomizableContext addNode(String name);
 
             ConstraintValidatorContext addConstraintViolation();
+
+            // @since 1.1
+
+            NodeBuilderCustomizableContext addPropertyNode(String name);
+            LeafNodeBuilderCustomizableContext addBeanNode();
         }
 
         interface NodeBuilderCustomizableContext {
@@ -45,6 +59,11 @@ public interface ConstraintValidatorCont
             NodeBuilderCustomizableContext addNode(String name);
 
             ConstraintValidatorContext addConstraintViolation();
+
+            // @since 1.1
+
+            NodeBuilderCustomizableContext addPropertyNode(String name);
+            LeafNodeBuilderCustomizableContext addBeanNode();
         }
 
         interface NodeContextBuilder {
@@ -56,6 +75,29 @@ public interface ConstraintValidatorCont
             NodeBuilderCustomizableContext addNode(String name);
 
             ConstraintValidatorContext addConstraintViolation();
+
+            // @since 1.1
+
+            NodeBuilderCustomizableContext addPropertyNode(String name);
+            LeafNodeBuilderCustomizableContext addBeanNode();
+        }
+
+        /** @since 1.1 */
+        interface LeafNodeBuilderDefinedContext {
+            ConstraintValidatorContext addConstraintViolation();
+        }
+
+        /** @since 1.1 */
+        interface LeafNodeBuilderCustomizableContext {
+            LeafNodeContextBuilder inIterable();
+            ConstraintValidatorContext addConstraintViolation();
+        }
+
+        /** @since 1.1 */
+        interface LeafNodeContextBuilder {
+            LeafNodeBuilderDefinedContext atKey(Object key);
+            LeafNodeBuilderDefinedContext atIndex(Integer index);
+            ConstraintValidatorContext addConstraintViolation();
         }
     }
 }

Modified: geronimo/specs/trunk/geronimo-validation_1.1_spec/src/main/java/javax/validation/ConstraintValidatorFactory.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-validation_1.1_spec/src/main/java/javax/validation/ConstraintValidatorFactory.java?rev=1542191&r1=1542190&r2=1542191&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-validation_1.1_spec/src/main/java/javax/validation/ConstraintValidatorFactory.java (original)
+++ geronimo/specs/trunk/geronimo-validation_1.1_spec/src/main/java/javax/validation/ConstraintValidatorFactory.java Fri Nov 15 07:37:51 2013
@@ -22,5 +22,8 @@ package javax.validation;
 public interface ConstraintValidatorFactory {
 
     <T extends ConstraintValidator<?, ?>> T getInstance(Class<T> key);
+
+    /** @since 1.1 */
+    void releaseInstance(ConstraintValidator<?, ?> instance);
 }
 

Modified: geronimo/specs/trunk/geronimo-validation_1.1_spec/src/main/java/javax/validation/ConstraintViolation.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-validation_1.1_spec/src/main/java/javax/validation/ConstraintViolation.java?rev=1542191&r1=1542190&r2=1542191&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-validation_1.1_spec/src/main/java/javax/validation/ConstraintViolation.java (original)
+++ geronimo/specs/trunk/geronimo-validation_1.1_spec/src/main/java/javax/validation/ConstraintViolation.java Fri Nov 15 07:37:51 2013
@@ -38,5 +38,11 @@ public interface ConstraintViolation<T> 
     Object getInvalidValue();
 
     ConstraintDescriptor<?> getConstraintDescriptor();
+
+    // @since 1.1
+
+    Object[] getExecutableParameters();
+    Object getExecutableReturnValue();
+    <U> U unwrap(Class<U> type);
 }
 

Modified: geronimo/specs/trunk/geronimo-validation_1.1_spec/src/main/java/javax/validation/ConstraintViolationException.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-validation_1.1_spec/src/main/java/javax/validation/ConstraintViolationException.java?rev=1542191&r1=1542190&r2=1542191&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-validation_1.1_spec/src/main/java/javax/validation/ConstraintViolationException.java (original)
+++ geronimo/specs/trunk/geronimo-validation_1.1_spec/src/main/java/javax/validation/ConstraintViolationException.java Fri Nov 15 07:37:51 2013
@@ -31,8 +31,7 @@ public class ConstraintViolationExceptio
     }
 
     public ConstraintViolationException(Set<ConstraintViolation<?>> constraintViolations) {
-        super();
-        this.constraintViolations = constraintViolations;
+        this(null, constraintViolations);
     }
 
     public Set<ConstraintViolation<?>> getConstraintViolations() {

Added: geronimo/specs/trunk/geronimo-validation_1.1_spec/src/main/java/javax/validation/ElementKind.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-validation_1.1_spec/src/main/java/javax/validation/ElementKind.java?rev=1542191&view=auto
==============================================================================
--- geronimo/specs/trunk/geronimo-validation_1.1_spec/src/main/java/javax/validation/ElementKind.java (added)
+++ geronimo/specs/trunk/geronimo-validation_1.1_spec/src/main/java/javax/validation/ElementKind.java Fri Nov 15 07:37:51 2013
@@ -0,0 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with this
+ * work for additional information regarding copyright ownership. The ASF
+ * licenses this file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package javax.validation;
+
+/** @since 1.1 */
+public enum ElementKind {
+	BEAN, PROPERTY, METHOD, CONSTRUCTOR, PARAMETER, CROSS_PARAMETER, RETURN_VALUE
+}

Modified: geronimo/specs/trunk/geronimo-validation_1.1_spec/src/main/java/javax/validation/GroupSequence.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-validation_1.1_spec/src/main/java/javax/validation/GroupSequence.java?rev=1542191&r1=1542190&r2=1542191&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-validation_1.1_spec/src/main/java/javax/validation/GroupSequence.java (original)
+++ geronimo/specs/trunk/geronimo-validation_1.1_spec/src/main/java/javax/validation/GroupSequence.java Fri Nov 15 07:37:51 2013
@@ -16,11 +16,12 @@
  */
 package javax.validation;
 
-import static java.lang.annotation.ElementType.TYPE;
 import java.lang.annotation.Retention;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
 import java.lang.annotation.Target;
 
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
 /**
  * @version $Rev$ $Date$
  */

Modified: geronimo/specs/trunk/geronimo-validation_1.1_spec/src/main/java/javax/validation/MessageInterpolator.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-validation_1.1_spec/src/main/java/javax/validation/MessageInterpolator.java?rev=1542191&r1=1542190&r2=1542191&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-validation_1.1_spec/src/main/java/javax/validation/MessageInterpolator.java (original)
+++ geronimo/specs/trunk/geronimo-validation_1.1_spec/src/main/java/javax/validation/MessageInterpolator.java Fri Nov 15 07:37:51 2013
@@ -16,8 +16,8 @@
  */
 package javax.validation;
 
-import java.util.Locale;
 import javax.validation.metadata.ConstraintDescriptor;
+import java.util.Locale;
 
 /**
  * @version $Rev$ $Date$
@@ -31,6 +31,9 @@ public interface MessageInterpolator {
         ConstraintDescriptor<?> getConstraintDescriptor();
 
         Object getValidatedValue();
+
+        /** @since 1.1 */
+        <T> T unwrap(Class<T> type);
     }
 }
 

Modified: geronimo/specs/trunk/geronimo-validation_1.1_spec/src/main/java/javax/validation/OverridesAttribute.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-validation_1.1_spec/src/main/java/javax/validation/OverridesAttribute.java?rev=1542191&r1=1542190&r2=1542191&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-validation_1.1_spec/src/main/java/javax/validation/OverridesAttribute.java (original)
+++ geronimo/specs/trunk/geronimo-validation_1.1_spec/src/main/java/javax/validation/OverridesAttribute.java Fri Nov 15 07:37:51 2013
@@ -18,11 +18,12 @@ package javax.validation;
 
 import java.lang.annotation.Annotation;
 import java.lang.annotation.Documented;
-import static java.lang.annotation.ElementType.METHOD;
 import java.lang.annotation.Retention;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
 import java.lang.annotation.Target;
 
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
 /**
  * @version $Rev$ $Date$
  */

Added: geronimo/specs/trunk/geronimo-validation_1.1_spec/src/main/java/javax/validation/ParameterNameProvider.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-validation_1.1_spec/src/main/java/javax/validation/ParameterNameProvider.java?rev=1542191&view=auto
==============================================================================
--- geronimo/specs/trunk/geronimo-validation_1.1_spec/src/main/java/javax/validation/ParameterNameProvider.java (added)
+++ geronimo/specs/trunk/geronimo-validation_1.1_spec/src/main/java/javax/validation/ParameterNameProvider.java Fri Nov 15 07:37:51 2013
@@ -0,0 +1,27 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with this
+ * work for additional information regarding copyright ownership. The ASF
+ * licenses this file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package javax.validation;
+
+import java.lang.reflect.Constructor;
+import java.lang.reflect.Method;
+import java.util.List;
+
+/** @since 1.1 */
+public interface ParameterNameProvider {
+	List<String> getParameterNames(Constructor<?> constructor);
+	List<String> getParameterNames(Method method);
+}

Modified: geronimo/specs/trunk/geronimo-validation_1.1_spec/src/main/java/javax/validation/Path.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-validation_1.1_spec/src/main/java/javax/validation/Path.java?rev=1542191&r1=1542190&r2=1542191&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-validation_1.1_spec/src/main/java/javax/validation/Path.java (original)
+++ geronimo/specs/trunk/geronimo-validation_1.1_spec/src/main/java/javax/validation/Path.java Fri Nov 15 07:37:51 2013
@@ -16,6 +16,8 @@
  */
 package javax.validation;
 
+import java.util.List;
+
 /**
  * @version $Rev$ $Date$
  */
@@ -29,6 +31,38 @@ public interface Path extends Iterable<P
         Integer getIndex();
 
         Object getKey();
+
+        // @since 1.1
+
+        ElementKind getKind();
+
+        <T extends Node> T as(Class<T> nodeType);
+    }
+
+    // @since 1.1
+
+    interface MethodNode extends Node {
+        List<Class<?>> getParameterTypes();
+    }
+
+    interface ConstructorNode extends Node {
+        List<Class<?>> getParameterTypes();
+    }
+
+    interface ReturnValueNode extends Node {
+    }
+
+    interface ParameterNode extends Node {
+        int getParameterIndex();
+    }
+
+    interface CrossParameterNode extends Node {
+    }
+
+    interface BeanNode extends Node {
+    }
+
+    interface PropertyNode extends Node {
     }
 }
 

Modified: geronimo/specs/trunk/geronimo-validation_1.1_spec/src/main/java/javax/validation/ReportAsSingleViolation.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-validation_1.1_spec/src/main/java/javax/validation/ReportAsSingleViolation.java?rev=1542191&r1=1542190&r2=1542191&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-validation_1.1_spec/src/main/java/javax/validation/ReportAsSingleViolation.java (original)
+++ geronimo/specs/trunk/geronimo-validation_1.1_spec/src/main/java/javax/validation/ReportAsSingleViolation.java Fri Nov 15 07:37:51 2013
@@ -16,11 +16,12 @@
  */
 package javax.validation;
 
-import static java.lang.annotation.ElementType.ANNOTATION_TYPE;
 import java.lang.annotation.Retention;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
 import java.lang.annotation.Target;
 
+import static java.lang.annotation.ElementType.ANNOTATION_TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
 /**
  * @version $Rev$ $Date$
  */

Modified: geronimo/specs/trunk/geronimo-validation_1.1_spec/src/main/java/javax/validation/Valid.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-validation_1.1_spec/src/main/java/javax/validation/Valid.java?rev=1542191&r1=1542190&r2=1542191&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-validation_1.1_spec/src/main/java/javax/validation/Valid.java (original)
+++ geronimo/specs/trunk/geronimo-validation_1.1_spec/src/main/java/javax/validation/Valid.java Fri Nov 15 07:37:51 2013
@@ -16,13 +16,14 @@
  */
 package javax.validation;
 
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
 import static java.lang.annotation.ElementType.CONSTRUCTOR;
 import static java.lang.annotation.ElementType.FIELD;
 import static java.lang.annotation.ElementType.METHOD;
 import static java.lang.annotation.ElementType.PARAMETER;
-import java.lang.annotation.Retention;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
-import java.lang.annotation.Target;
 
 /**
  * @version $Rev$ $Date$

Modified: geronimo/specs/trunk/geronimo-validation_1.1_spec/src/main/java/javax/validation/Validation.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-validation_1.1_spec/src/main/java/javax/validation/Validation.java?rev=1542191&r1=1542190&r2=1542191&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-validation_1.1_spec/src/main/java/javax/validation/Validation.java (original)
+++ geronimo/specs/trunk/geronimo-validation_1.1_spec/src/main/java/javax/validation/Validation.java Fri Nov 15 07:37:51 2013
@@ -16,26 +16,17 @@
  */
 package javax.validation;
 
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.net.URL;
-import java.security.AccessController;
-import java.security.PrivilegedAction;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Enumeration;
-import java.util.List;
-import java.util.Map;
-import java.util.WeakHashMap;
+import org.apache.geronimo.osgi.locator.ProviderLocator;
 
 import javax.validation.bootstrap.GenericBootstrap;
 import javax.validation.bootstrap.ProviderSpecificBootstrap;
 import javax.validation.spi.BootstrapState;
 import javax.validation.spi.ValidationProvider;
-
-import org.apache.geronimo.osgi.locator.ProviderLocator;
+import java.security.AccessController;
+import java.security.PrivilegedAction;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.WeakHashMap;
 
 /**
  * Note: From Section 4.4.5 Validation of the 1.0 PFD Spec - Validation

Modified: geronimo/specs/trunk/geronimo-validation_1.1_spec/src/main/java/javax/validation/ValidationProviderResolver.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-validation_1.1_spec/src/main/java/javax/validation/ValidationProviderResolver.java?rev=1542191&r1=1542190&r2=1542191&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-validation_1.1_spec/src/main/java/javax/validation/ValidationProviderResolver.java (original)
+++ geronimo/specs/trunk/geronimo-validation_1.1_spec/src/main/java/javax/validation/ValidationProviderResolver.java Fri Nov 15 07:37:51 2013
@@ -16,8 +16,8 @@
  */
 package javax.validation;
 
-import java.util.List;
 import javax.validation.spi.ValidationProvider;
+import java.util.List;
 
 /**
  * @version $Rev$ $Date$

Modified: geronimo/specs/trunk/geronimo-validation_1.1_spec/src/main/java/javax/validation/Validator.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-validation_1.1_spec/src/main/java/javax/validation/Validator.java?rev=1542191&r1=1542190&r2=1542191&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-validation_1.1_spec/src/main/java/javax/validation/Validator.java (original)
+++ geronimo/specs/trunk/geronimo-validation_1.1_spec/src/main/java/javax/validation/Validator.java Fri Nov 15 07:37:51 2013
@@ -16,8 +16,9 @@
  */
 package javax.validation;
 
-import java.util.Set;
+import javax.validation.executable.ExecutableValidator;
 import javax.validation.metadata.BeanDescriptor;
+import java.util.Set;
 
 /**
  * @version $Rev$ $Date$
@@ -36,6 +37,9 @@ public interface Validator {
 
     BeanDescriptor getConstraintsForClass(Class<?> clazz);
 
-    public <T> T unwrap(Class<T> type);
+    <T> T unwrap(Class<T> type);
+
+    /** @since 1.1 */
+    ExecutableValidator forExecutables();
 }
 

Modified: geronimo/specs/trunk/geronimo-validation_1.1_spec/src/main/java/javax/validation/ValidatorContext.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-validation_1.1_spec/src/main/java/javax/validation/ValidatorContext.java?rev=1542191&r1=1542190&r2=1542191&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-validation_1.1_spec/src/main/java/javax/validation/ValidatorContext.java (original)
+++ geronimo/specs/trunk/geronimo-validation_1.1_spec/src/main/java/javax/validation/ValidatorContext.java Fri Nov 15 07:37:51 2013
@@ -27,5 +27,8 @@ public interface ValidatorContext {
     ValidatorContext constraintValidatorFactory(ConstraintValidatorFactory factory);
 
     Validator getValidator();
+
+    /** @since 1.1 */
+    ValidatorContext parameterNameProvider(ParameterNameProvider parameterNameProvider);
 }
 

Modified: geronimo/specs/trunk/geronimo-validation_1.1_spec/src/main/java/javax/validation/ValidatorFactory.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-validation_1.1_spec/src/main/java/javax/validation/ValidatorFactory.java?rev=1542191&r1=1542190&r2=1542191&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-validation_1.1_spec/src/main/java/javax/validation/ValidatorFactory.java (original)
+++ geronimo/specs/trunk/geronimo-validation_1.1_spec/src/main/java/javax/validation/ValidatorFactory.java Fri Nov 15 07:37:51 2013
@@ -30,6 +30,11 @@ public interface ValidatorFactory {
 
     ConstraintValidatorFactory getConstraintValidatorFactory();
 
-    public <T> T unwrap(Class<T> type);
+    <T> T unwrap(Class<T> type);
+
+    /** @since 1.1 */
+    ParameterNameProvider getParameterNameProvider();
+
+    void close();
 }
 

Modified: geronimo/specs/trunk/geronimo-validation_1.1_spec/src/main/java/javax/validation/bootstrap/ProviderSpecificBootstrap.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-validation_1.1_spec/src/main/java/javax/validation/bootstrap/ProviderSpecificBootstrap.java?rev=1542191&r1=1542190&r2=1542191&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-validation_1.1_spec/src/main/java/javax/validation/bootstrap/ProviderSpecificBootstrap.java (original)
+++ geronimo/specs/trunk/geronimo-validation_1.1_spec/src/main/java/javax/validation/bootstrap/ProviderSpecificBootstrap.java Fri Nov 15 07:37:51 2013
@@ -17,7 +17,6 @@
 package javax.validation.bootstrap;
 
 import javax.validation.Configuration;
-import javax.validation.spi.ValidationProvider;
 import javax.validation.ValidationProviderResolver;
 
 public interface ProviderSpecificBootstrap<T extends Configuration<T>> {

Modified: geronimo/specs/trunk/geronimo-validation_1.1_spec/src/main/java/javax/validation/constraints/AssertFalse.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-validation_1.1_spec/src/main/java/javax/validation/constraints/AssertFalse.java?rev=1542191&r1=1542190&r2=1542191&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-validation_1.1_spec/src/main/java/javax/validation/constraints/AssertFalse.java (original)
+++ geronimo/specs/trunk/geronimo-validation_1.1_spec/src/main/java/javax/validation/constraints/AssertFalse.java Fri Nov 15 07:37:51 2013
@@ -16,18 +16,18 @@
  */
 package javax.validation.constraints;
 
+import javax.validation.Constraint;
+import javax.validation.Payload;
 import java.lang.annotation.Documented;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
 import static java.lang.annotation.ElementType.ANNOTATION_TYPE;
 import static java.lang.annotation.ElementType.CONSTRUCTOR;
 import static java.lang.annotation.ElementType.FIELD;
 import static java.lang.annotation.ElementType.METHOD;
 import static java.lang.annotation.ElementType.PARAMETER;
-import java.lang.annotation.Retention;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
-import java.lang.annotation.Target;
-
-import javax.validation.Constraint;
-import javax.validation.Payload;
 
 /**
  * @version $Rev$ $Date$

Modified: geronimo/specs/trunk/geronimo-validation_1.1_spec/src/main/java/javax/validation/constraints/AssertTrue.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-validation_1.1_spec/src/main/java/javax/validation/constraints/AssertTrue.java?rev=1542191&r1=1542190&r2=1542191&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-validation_1.1_spec/src/main/java/javax/validation/constraints/AssertTrue.java (original)
+++ geronimo/specs/trunk/geronimo-validation_1.1_spec/src/main/java/javax/validation/constraints/AssertTrue.java Fri Nov 15 07:37:51 2013
@@ -16,17 +16,18 @@
  */
 package javax.validation.constraints;
 
+import javax.validation.Constraint;
+import javax.validation.Payload;
 import java.lang.annotation.Documented;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
 import static java.lang.annotation.ElementType.ANNOTATION_TYPE;
+import static java.lang.annotation.ElementType.CONSTRUCTOR;
 import static java.lang.annotation.ElementType.FIELD;
 import static java.lang.annotation.ElementType.METHOD;
-import static java.lang.annotation.ElementType.CONSTRUCTOR;
 import static java.lang.annotation.ElementType.PARAMETER;
-import java.lang.annotation.Retention;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
-import java.lang.annotation.Target;
-import javax.validation.Constraint;
-import javax.validation.Payload;
 
 /**
  * @version $Rev$ $Date$

Modified: geronimo/specs/trunk/geronimo-validation_1.1_spec/src/main/java/javax/validation/constraints/DecimalMax.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-validation_1.1_spec/src/main/java/javax/validation/constraints/DecimalMax.java?rev=1542191&r1=1542190&r2=1542191&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-validation_1.1_spec/src/main/java/javax/validation/constraints/DecimalMax.java (original)
+++ geronimo/specs/trunk/geronimo-validation_1.1_spec/src/main/java/javax/validation/constraints/DecimalMax.java Fri Nov 15 07:37:51 2013
@@ -16,18 +16,18 @@
  */
 package javax.validation.constraints;
 
+import javax.validation.Constraint;
+import javax.validation.Payload;
 import java.lang.annotation.Documented;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
 import static java.lang.annotation.ElementType.ANNOTATION_TYPE;
 import static java.lang.annotation.ElementType.CONSTRUCTOR;
 import static java.lang.annotation.ElementType.FIELD;
 import static java.lang.annotation.ElementType.METHOD;
 import static java.lang.annotation.ElementType.PARAMETER;
-import java.lang.annotation.Retention;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
-import java.lang.annotation.Target;
-
-import javax.validation.Constraint;
-import javax.validation.Payload;
 
 /**
  * @version $Rev$ $Date$
@@ -45,6 +45,9 @@ public @interface DecimalMax {
 
     String value();
 
+    /** @since 1.1 */
+    boolean inclusive() default true;
+
     @Target({ METHOD, FIELD, ANNOTATION_TYPE, CONSTRUCTOR, PARAMETER })
     @Retention(RUNTIME)
     @Documented

Modified: geronimo/specs/trunk/geronimo-validation_1.1_spec/src/main/java/javax/validation/constraints/DecimalMin.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-validation_1.1_spec/src/main/java/javax/validation/constraints/DecimalMin.java?rev=1542191&r1=1542190&r2=1542191&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-validation_1.1_spec/src/main/java/javax/validation/constraints/DecimalMin.java (original)
+++ geronimo/specs/trunk/geronimo-validation_1.1_spec/src/main/java/javax/validation/constraints/DecimalMin.java Fri Nov 15 07:37:51 2013
@@ -16,18 +16,18 @@
  */
 package javax.validation.constraints;
 
+import javax.validation.Constraint;
+import javax.validation.Payload;
 import java.lang.annotation.Documented;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
 import static java.lang.annotation.ElementType.ANNOTATION_TYPE;
 import static java.lang.annotation.ElementType.CONSTRUCTOR;
 import static java.lang.annotation.ElementType.FIELD;
 import static java.lang.annotation.ElementType.METHOD;
 import static java.lang.annotation.ElementType.PARAMETER;
-import java.lang.annotation.Retention;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
-import java.lang.annotation.Target;
-
-import javax.validation.Constraint;
-import javax.validation.Payload;
 
 /**
  * @version $Rev$ $Date$
@@ -45,6 +45,9 @@ public @interface DecimalMin {
 
     String value();
 
+    /** @since 1.1 */
+    boolean inclusive() default true;
+
     @Target({ METHOD, FIELD, ANNOTATION_TYPE, CONSTRUCTOR, PARAMETER })
     @Retention(RUNTIME)
     @Documented

Modified: geronimo/specs/trunk/geronimo-validation_1.1_spec/src/main/java/javax/validation/constraints/Digits.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-validation_1.1_spec/src/main/java/javax/validation/constraints/Digits.java?rev=1542191&r1=1542190&r2=1542191&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-validation_1.1_spec/src/main/java/javax/validation/constraints/Digits.java (original)
+++ geronimo/specs/trunk/geronimo-validation_1.1_spec/src/main/java/javax/validation/constraints/Digits.java Fri Nov 15 07:37:51 2013
@@ -16,18 +16,18 @@
  */
 package javax.validation.constraints;
 
+import javax.validation.Constraint;
+import javax.validation.Payload;
 import java.lang.annotation.Documented;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
 import static java.lang.annotation.ElementType.ANNOTATION_TYPE;
 import static java.lang.annotation.ElementType.CONSTRUCTOR;
 import static java.lang.annotation.ElementType.FIELD;
 import static java.lang.annotation.ElementType.METHOD;
 import static java.lang.annotation.ElementType.PARAMETER;
-import java.lang.annotation.Retention;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
-import java.lang.annotation.Target;
-
-import javax.validation.Constraint;
-import javax.validation.Payload;
 
 /**
  * @version $Rev$ $Date$

Modified: geronimo/specs/trunk/geronimo-validation_1.1_spec/src/main/java/javax/validation/constraints/Future.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-validation_1.1_spec/src/main/java/javax/validation/constraints/Future.java?rev=1542191&r1=1542190&r2=1542191&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-validation_1.1_spec/src/main/java/javax/validation/constraints/Future.java (original)
+++ geronimo/specs/trunk/geronimo-validation_1.1_spec/src/main/java/javax/validation/constraints/Future.java Fri Nov 15 07:37:51 2013
@@ -16,18 +16,18 @@
  */
 package javax.validation.constraints;
 
+import javax.validation.Constraint;
+import javax.validation.Payload;
 import java.lang.annotation.Documented;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
 import static java.lang.annotation.ElementType.ANNOTATION_TYPE;
 import static java.lang.annotation.ElementType.CONSTRUCTOR;
 import static java.lang.annotation.ElementType.FIELD;
 import static java.lang.annotation.ElementType.METHOD;
 import static java.lang.annotation.ElementType.PARAMETER;
-import java.lang.annotation.Retention;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
-import java.lang.annotation.Target;
-
-import javax.validation.Constraint;
-import javax.validation.Payload;
 
 /**
  * @version $Rev$ $Date$

Modified: geronimo/specs/trunk/geronimo-validation_1.1_spec/src/main/java/javax/validation/constraints/Max.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-validation_1.1_spec/src/main/java/javax/validation/constraints/Max.java?rev=1542191&r1=1542190&r2=1542191&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-validation_1.1_spec/src/main/java/javax/validation/constraints/Max.java (original)
+++ geronimo/specs/trunk/geronimo-validation_1.1_spec/src/main/java/javax/validation/constraints/Max.java Fri Nov 15 07:37:51 2013
@@ -16,18 +16,18 @@
  */
 package javax.validation.constraints;
 
+import javax.validation.Constraint;
+import javax.validation.Payload;
 import java.lang.annotation.Documented;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
 import static java.lang.annotation.ElementType.ANNOTATION_TYPE;
 import static java.lang.annotation.ElementType.CONSTRUCTOR;
 import static java.lang.annotation.ElementType.FIELD;
 import static java.lang.annotation.ElementType.METHOD;
 import static java.lang.annotation.ElementType.PARAMETER;
-import java.lang.annotation.Retention;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
-import java.lang.annotation.Target;
-
-import javax.validation.Constraint;
-import javax.validation.Payload;
 
 /**
  * @version $Rev$ $Date$

Modified: geronimo/specs/trunk/geronimo-validation_1.1_spec/src/main/java/javax/validation/constraints/Min.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-validation_1.1_spec/src/main/java/javax/validation/constraints/Min.java?rev=1542191&r1=1542190&r2=1542191&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-validation_1.1_spec/src/main/java/javax/validation/constraints/Min.java (original)
+++ geronimo/specs/trunk/geronimo-validation_1.1_spec/src/main/java/javax/validation/constraints/Min.java Fri Nov 15 07:37:51 2013
@@ -16,18 +16,18 @@
  */
 package javax.validation.constraints;
 
+import javax.validation.Constraint;
+import javax.validation.Payload;
 import java.lang.annotation.Documented;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
 import static java.lang.annotation.ElementType.ANNOTATION_TYPE;
 import static java.lang.annotation.ElementType.CONSTRUCTOR;
 import static java.lang.annotation.ElementType.FIELD;
 import static java.lang.annotation.ElementType.METHOD;
 import static java.lang.annotation.ElementType.PARAMETER;
-import java.lang.annotation.Retention;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
-import java.lang.annotation.Target;
-
-import javax.validation.Constraint;
-import javax.validation.Payload;
 
 /**
  * @version $Rev$ $Date$

Modified: geronimo/specs/trunk/geronimo-validation_1.1_spec/src/main/java/javax/validation/constraints/NotNull.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-validation_1.1_spec/src/main/java/javax/validation/constraints/NotNull.java?rev=1542191&r1=1542190&r2=1542191&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-validation_1.1_spec/src/main/java/javax/validation/constraints/NotNull.java (original)
+++ geronimo/specs/trunk/geronimo-validation_1.1_spec/src/main/java/javax/validation/constraints/NotNull.java Fri Nov 15 07:37:51 2013
@@ -16,18 +16,18 @@
  */
 package javax.validation.constraints;
 
+import javax.validation.Constraint;
+import javax.validation.Payload;
 import java.lang.annotation.Documented;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
 import static java.lang.annotation.ElementType.ANNOTATION_TYPE;
 import static java.lang.annotation.ElementType.CONSTRUCTOR;
 import static java.lang.annotation.ElementType.FIELD;
 import static java.lang.annotation.ElementType.METHOD;
 import static java.lang.annotation.ElementType.PARAMETER;
-import java.lang.annotation.Retention;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
-import java.lang.annotation.Target;
-
-import javax.validation.Constraint;
-import javax.validation.Payload;
 
 /**
  * @version $Rev$ $Date$

Modified: geronimo/specs/trunk/geronimo-validation_1.1_spec/src/main/java/javax/validation/constraints/Null.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-validation_1.1_spec/src/main/java/javax/validation/constraints/Null.java?rev=1542191&r1=1542190&r2=1542191&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-validation_1.1_spec/src/main/java/javax/validation/constraints/Null.java (original)
+++ geronimo/specs/trunk/geronimo-validation_1.1_spec/src/main/java/javax/validation/constraints/Null.java Fri Nov 15 07:37:51 2013
@@ -16,18 +16,18 @@
  */
 package javax.validation.constraints;
 
+import javax.validation.Constraint;
+import javax.validation.Payload;
 import java.lang.annotation.Documented;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
 import static java.lang.annotation.ElementType.ANNOTATION_TYPE;
 import static java.lang.annotation.ElementType.CONSTRUCTOR;
 import static java.lang.annotation.ElementType.FIELD;
 import static java.lang.annotation.ElementType.METHOD;
 import static java.lang.annotation.ElementType.PARAMETER;
-import java.lang.annotation.Retention;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
-import java.lang.annotation.Target;
-
-import javax.validation.Constraint;
-import javax.validation.Payload;
 
 /**
  * @version $Rev$ $Date$

Modified: geronimo/specs/trunk/geronimo-validation_1.1_spec/src/main/java/javax/validation/constraints/Past.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-validation_1.1_spec/src/main/java/javax/validation/constraints/Past.java?rev=1542191&r1=1542190&r2=1542191&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-validation_1.1_spec/src/main/java/javax/validation/constraints/Past.java (original)
+++ geronimo/specs/trunk/geronimo-validation_1.1_spec/src/main/java/javax/validation/constraints/Past.java Fri Nov 15 07:37:51 2013
@@ -16,18 +16,18 @@
  */
 package javax.validation.constraints;
 
+import javax.validation.Constraint;
+import javax.validation.Payload;
 import java.lang.annotation.Documented;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
 import static java.lang.annotation.ElementType.ANNOTATION_TYPE;
 import static java.lang.annotation.ElementType.CONSTRUCTOR;
 import static java.lang.annotation.ElementType.FIELD;
 import static java.lang.annotation.ElementType.METHOD;
 import static java.lang.annotation.ElementType.PARAMETER;
-import java.lang.annotation.Retention;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
-import java.lang.annotation.Target;
-
-import javax.validation.Constraint;
-import javax.validation.Payload;
 
 /**
  * @version $Rev$ $Date$

Modified: geronimo/specs/trunk/geronimo-validation_1.1_spec/src/main/java/javax/validation/constraints/Pattern.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-validation_1.1_spec/src/main/java/javax/validation/constraints/Pattern.java?rev=1542191&r1=1542190&r2=1542191&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-validation_1.1_spec/src/main/java/javax/validation/constraints/Pattern.java (original)
+++ geronimo/specs/trunk/geronimo-validation_1.1_spec/src/main/java/javax/validation/constraints/Pattern.java Fri Nov 15 07:37:51 2013
@@ -16,18 +16,18 @@
  */
 package javax.validation.constraints;
 
+import javax.validation.Constraint;
+import javax.validation.Payload;
 import java.lang.annotation.Documented;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
 import static java.lang.annotation.ElementType.ANNOTATION_TYPE;
 import static java.lang.annotation.ElementType.CONSTRUCTOR;
 import static java.lang.annotation.ElementType.FIELD;
 import static java.lang.annotation.ElementType.METHOD;
 import static java.lang.annotation.ElementType.PARAMETER;
-import java.lang.annotation.Retention;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
-import java.lang.annotation.Target;
-
-import javax.validation.Constraint;
-import javax.validation.Payload;
 
 /**
  * @version $Rev$ $Date$

Modified: geronimo/specs/trunk/geronimo-validation_1.1_spec/src/main/java/javax/validation/constraints/Size.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-validation_1.1_spec/src/main/java/javax/validation/constraints/Size.java?rev=1542191&r1=1542190&r2=1542191&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-validation_1.1_spec/src/main/java/javax/validation/constraints/Size.java (original)
+++ geronimo/specs/trunk/geronimo-validation_1.1_spec/src/main/java/javax/validation/constraints/Size.java Fri Nov 15 07:37:51 2013
@@ -16,18 +16,18 @@
  */
 package javax.validation.constraints;
 
+import javax.validation.Constraint;
+import javax.validation.Payload;
 import java.lang.annotation.Documented;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
 import static java.lang.annotation.ElementType.ANNOTATION_TYPE;
 import static java.lang.annotation.ElementType.CONSTRUCTOR;
 import static java.lang.annotation.ElementType.FIELD;
 import static java.lang.annotation.ElementType.METHOD;
 import static java.lang.annotation.ElementType.PARAMETER;
-import java.lang.annotation.Retention;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
-import java.lang.annotation.Target;
-
-import javax.validation.Constraint;
-import javax.validation.Payload;
 
 /**
  * @version $Rev$ $Date$

Added: geronimo/specs/trunk/geronimo-validation_1.1_spec/src/main/java/javax/validation/constraintvalidation/SupportedValidationTarget.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-validation_1.1_spec/src/main/java/javax/validation/constraintvalidation/SupportedValidationTarget.java?rev=1542191&view=auto
==============================================================================
--- geronimo/specs/trunk/geronimo-validation_1.1_spec/src/main/java/javax/validation/constraintvalidation/SupportedValidationTarget.java (added)
+++ geronimo/specs/trunk/geronimo-validation_1.1_spec/src/main/java/javax/validation/constraintvalidation/SupportedValidationTarget.java Fri Nov 15 07:37:51 2013
@@ -0,0 +1,32 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with this
+ * work for additional information regarding copyright ownership. The ASF
+ * licenses this file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package javax.validation.constraintvalidation;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+/** @since 1.1 */
+@Target(TYPE)
+@Retention(RUNTIME)
+@Documented
+public @interface SupportedValidationTarget {
+    ValidationTarget[] value();
+}

Added: geronimo/specs/trunk/geronimo-validation_1.1_spec/src/main/java/javax/validation/constraintvalidation/ValidationTarget.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-validation_1.1_spec/src/main/java/javax/validation/constraintvalidation/ValidationTarget.java?rev=1542191&view=auto
==============================================================================
--- geronimo/specs/trunk/geronimo-validation_1.1_spec/src/main/java/javax/validation/constraintvalidation/ValidationTarget.java (added)
+++ geronimo/specs/trunk/geronimo-validation_1.1_spec/src/main/java/javax/validation/constraintvalidation/ValidationTarget.java Fri Nov 15 07:37:51 2013
@@ -0,0 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with this
+ * work for additional information regarding copyright ownership. The ASF
+ * licenses this file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package javax.validation.constraintvalidation;
+
+/** @since 1.1 */
+public enum ValidationTarget {
+    ANNOTATED_ELEMENT, PARAMETERS
+}

Added: geronimo/specs/trunk/geronimo-validation_1.1_spec/src/main/java/javax/validation/executable/ExecutableType.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-validation_1.1_spec/src/main/java/javax/validation/executable/ExecutableType.java?rev=1542191&view=auto
==============================================================================
--- geronimo/specs/trunk/geronimo-validation_1.1_spec/src/main/java/javax/validation/executable/ExecutableType.java (added)
+++ geronimo/specs/trunk/geronimo-validation_1.1_spec/src/main/java/javax/validation/executable/ExecutableType.java Fri Nov 15 07:37:51 2013
@@ -0,0 +1,23 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with this
+ * work for additional information regarding copyright ownership. The ASF
+ * licenses this file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package javax.validation.executable;
+
+/** @since 1.1 */
+public enum ExecutableType {
+    IMPLICIT, NONE, CONSTRUCTORS, NON_GETTER_METHODS, GETTER_METHODS, ALL
+}
+

Added: geronimo/specs/trunk/geronimo-validation_1.1_spec/src/main/java/javax/validation/executable/ExecutableValidator.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-validation_1.1_spec/src/main/java/javax/validation/executable/ExecutableValidator.java?rev=1542191&view=auto
==============================================================================
--- geronimo/specs/trunk/geronimo-validation_1.1_spec/src/main/java/javax/validation/executable/ExecutableValidator.java (added)
+++ geronimo/specs/trunk/geronimo-validation_1.1_spec/src/main/java/javax/validation/executable/ExecutableValidator.java Fri Nov 15 07:37:51 2013
@@ -0,0 +1,39 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with this
+ * work for additional information regarding copyright ownership. The ASF
+ * licenses this file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package javax.validation.executable;
+
+import javax.validation.ConstraintViolation;
+import java.lang.reflect.Constructor;
+import java.lang.reflect.Method;
+import java.util.Set;
+
+/** @since 1.1 */
+public interface ExecutableValidator {
+    <T> Set<ConstraintViolation<T>> validateParameters(T object, Method method,
+                                                       Object[] parameterValues,
+                                                       Class<?>... groups);
+    <T> Set<ConstraintViolation<T>> validateReturnValue(T object, Method method,
+                                                        Object returnValue,
+                                                        Class<?>... groups);
+    <T> Set<ConstraintViolation<T>> validateConstructorParameters(Constructor<? extends T> constructor,
+                                                                  Object[] parameterValues,
+                                                                  Class<?>... groups);
+    <T> Set<ConstraintViolation<T>> validateConstructorReturnValue(Constructor<? extends T> constructor,
+                                                                   T createdObject,
+                                                                   Class<?>... groups);
+}
+

Added: geronimo/specs/trunk/geronimo-validation_1.1_spec/src/main/java/javax/validation/executable/ValidateOnExecution.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-validation_1.1_spec/src/main/java/javax/validation/executable/ValidateOnExecution.java?rev=1542191&view=auto
==============================================================================
--- geronimo/specs/trunk/geronimo-validation_1.1_spec/src/main/java/javax/validation/executable/ValidateOnExecution.java (added)
+++ geronimo/specs/trunk/geronimo-validation_1.1_spec/src/main/java/javax/validation/executable/ValidateOnExecution.java Fri Nov 15 07:37:51 2013
@@ -0,0 +1,34 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with this
+ * work for additional information regarding copyright ownership. The ASF
+ * licenses this file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package javax.validation.executable;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+import static java.lang.annotation.ElementType.CONSTRUCTOR;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.PACKAGE;
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+/** @since 1.1 */
+@Target({ CONSTRUCTOR, METHOD, TYPE, PACKAGE })
+@Retention(RUNTIME)
+public @interface ValidateOnExecution {
+    ExecutableType[] type() default { ExecutableType.IMPLICIT };
+}
+

Added: geronimo/specs/trunk/geronimo-validation_1.1_spec/src/main/java/javax/validation/groups/ConvertGroup.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-validation_1.1_spec/src/main/java/javax/validation/groups/ConvertGroup.java?rev=1542191&view=auto
==============================================================================
--- geronimo/specs/trunk/geronimo-validation_1.1_spec/src/main/java/javax/validation/groups/ConvertGroup.java (added)
+++ geronimo/specs/trunk/geronimo-validation_1.1_spec/src/main/java/javax/validation/groups/ConvertGroup.java Fri Nov 15 07:37:51 2013
@@ -0,0 +1,44 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with this
+ * work for additional information regarding copyright ownership. The ASF
+ * licenses this file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package javax.validation.groups;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+import static java.lang.annotation.ElementType.CONSTRUCTOR;
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.PARAMETER;
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+/** @since 1.1 */
+@Target({ TYPE, METHOD, FIELD, CONSTRUCTOR, PARAMETER })
+@Retention(RUNTIME)
+@Documented
+public @interface ConvertGroup {
+    Class<?> from();
+    Class<?> to();
+
+    @Target({ TYPE, METHOD, FIELD, CONSTRUCTOR, PARAMETER })
+    @Retention(RUNTIME)
+    @Documented
+    public @interface List {
+        ConvertGroup[] value();
+    }
+}

Modified: geronimo/specs/trunk/geronimo-validation_1.1_spec/src/main/java/javax/validation/metadata/BeanDescriptor.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-validation_1.1_spec/src/main/java/javax/validation/metadata/BeanDescriptor.java?rev=1542191&r1=1542190&r2=1542191&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-validation_1.1_spec/src/main/java/javax/validation/metadata/BeanDescriptor.java (original)
+++ geronimo/specs/trunk/geronimo-validation_1.1_spec/src/main/java/javax/validation/metadata/BeanDescriptor.java Fri Nov 15 07:37:51 2013
@@ -23,9 +23,14 @@ import java.util.Set;
  */
 public interface BeanDescriptor extends ElementDescriptor {
     boolean isBeanConstrained();
-
     PropertyDescriptor getConstraintsForProperty(String propertyName);
-
     Set<PropertyDescriptor> getConstrainedProperties();
+
+    // @since 1.1
+
+    MethodDescriptor getConstraintsForMethod(String methodName, Class<?>... parameterTypes);
+    Set<MethodDescriptor> getConstrainedMethods(MethodType methodType, MethodType... methodTypes);
+    ConstructorDescriptor getConstraintsForConstructor(Class<?>... parameterTypes);
+    Set<ConstructorDescriptor> getConstrainedConstructors();
 }
 

Added: geronimo/specs/trunk/geronimo-validation_1.1_spec/src/main/java/javax/validation/metadata/CascadableDescriptor.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-validation_1.1_spec/src/main/java/javax/validation/metadata/CascadableDescriptor.java?rev=1542191&view=auto
==============================================================================
--- geronimo/specs/trunk/geronimo-validation_1.1_spec/src/main/java/javax/validation/metadata/CascadableDescriptor.java (added)
+++ geronimo/specs/trunk/geronimo-validation_1.1_spec/src/main/java/javax/validation/metadata/CascadableDescriptor.java Fri Nov 15 07:37:51 2013
@@ -0,0 +1,25 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with this
+ * work for additional information regarding copyright ownership. The ASF
+ * licenses this file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package javax.validation.metadata;
+
+import java.util.Set;
+
+/** @since 1.1 */
+public interface CascadableDescriptor {
+    boolean isCascaded();
+    Set<GroupConversionDescriptor> getGroupConversions();
+}

Modified: geronimo/specs/trunk/geronimo-validation_1.1_spec/src/main/java/javax/validation/metadata/ConstraintDescriptor.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-validation_1.1_spec/src/main/java/javax/validation/metadata/ConstraintDescriptor.java?rev=1542191&r1=1542190&r2=1542191&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-validation_1.1_spec/src/main/java/javax/validation/metadata/ConstraintDescriptor.java (original)
+++ geronimo/specs/trunk/geronimo-validation_1.1_spec/src/main/java/javax/validation/metadata/ConstraintDescriptor.java Fri Nov 15 07:37:51 2013
@@ -16,12 +16,13 @@
  */
 package javax.validation.metadata;
 
+import javax.validation.ConstraintTarget;
+import javax.validation.ConstraintValidator;
+import javax.validation.Payload;
 import java.lang.annotation.Annotation;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-import javax.validation.ConstraintValidator;
-import javax.validation.Payload;
 
 /**
  * @version $Rev$ $Date$
@@ -41,5 +42,10 @@ public interface ConstraintDescriptor<T 
     Set<ConstraintDescriptor<?>> getComposingConstraints();
 
     boolean isReportAsSingleViolation();
+
+    // @since 1.1
+
+    String getMessageTemplate();
+    ConstraintTarget getValidationAppliesTo();
 }
 

Added: geronimo/specs/trunk/geronimo-validation_1.1_spec/src/main/java/javax/validation/metadata/ConstructorDescriptor.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-validation_1.1_spec/src/main/java/javax/validation/metadata/ConstructorDescriptor.java?rev=1542191&view=auto
==============================================================================
--- geronimo/specs/trunk/geronimo-validation_1.1_spec/src/main/java/javax/validation/metadata/ConstructorDescriptor.java (added)
+++ geronimo/specs/trunk/geronimo-validation_1.1_spec/src/main/java/javax/validation/metadata/ConstructorDescriptor.java Fri Nov 15 07:37:51 2013
@@ -0,0 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with this
+ * work for additional information regarding copyright ownership. The ASF
+ * licenses this file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package javax.validation.metadata;
+
+/** @since 1.1 */
+public interface ConstructorDescriptor extends ExecutableDescriptor {
+}

Added: geronimo/specs/trunk/geronimo-validation_1.1_spec/src/main/java/javax/validation/metadata/CrossParameterDescriptor.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-validation_1.1_spec/src/main/java/javax/validation/metadata/CrossParameterDescriptor.java?rev=1542191&view=auto
==============================================================================
--- geronimo/specs/trunk/geronimo-validation_1.1_spec/src/main/java/javax/validation/metadata/CrossParameterDescriptor.java (added)
+++ geronimo/specs/trunk/geronimo-validation_1.1_spec/src/main/java/javax/validation/metadata/CrossParameterDescriptor.java Fri Nov 15 07:37:51 2013
@@ -0,0 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with this
+ * work for additional information regarding copyright ownership. The ASF
+ * licenses this file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package javax.validation.metadata;
+
+/** @since 1.1 */
+public interface CrossParameterDescriptor extends ElementDescriptor {
+}

Added: geronimo/specs/trunk/geronimo-validation_1.1_spec/src/main/java/javax/validation/metadata/ExecutableDescriptor.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-validation_1.1_spec/src/main/java/javax/validation/metadata/ExecutableDescriptor.java?rev=1542191&view=auto
==============================================================================
--- geronimo/specs/trunk/geronimo-validation_1.1_spec/src/main/java/javax/validation/metadata/ExecutableDescriptor.java (added)
+++ geronimo/specs/trunk/geronimo-validation_1.1_spec/src/main/java/javax/validation/metadata/ExecutableDescriptor.java Fri Nov 15 07:37:51 2013
@@ -0,0 +1,30 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with this
+ * work for additional information regarding copyright ownership. The ASF
+ * licenses this file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package javax.validation.metadata;
+
+import java.util.List;
+
+/** @since 1.1 */
+public interface ExecutableDescriptor extends ElementDescriptor {
+    String getName();
+    List<ParameterDescriptor> getParameterDescriptors();
+    CrossParameterDescriptor getCrossParameterDescriptor();
+    ReturnValueDescriptor getReturnValueDescriptor();
+    boolean hasConstrainedParameters();
+    boolean hasConstrainedReturnValue();
+}
+

Added: geronimo/specs/trunk/geronimo-validation_1.1_spec/src/main/java/javax/validation/metadata/GroupConversionDescriptor.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-validation_1.1_spec/src/main/java/javax/validation/metadata/GroupConversionDescriptor.java?rev=1542191&view=auto
==============================================================================
--- geronimo/specs/trunk/geronimo-validation_1.1_spec/src/main/java/javax/validation/metadata/GroupConversionDescriptor.java (added)
+++ geronimo/specs/trunk/geronimo-validation_1.1_spec/src/main/java/javax/validation/metadata/GroupConversionDescriptor.java Fri Nov 15 07:37:51 2013
@@ -0,0 +1,23 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with this
+ * work for additional information regarding copyright ownership. The ASF
+ * licenses this file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package javax.validation.metadata;
+
+/** @since 1.1 */
+public interface GroupConversionDescriptor {
+    Class<?> getFrom();
+    Class<?> getTo();
+}

Added: geronimo/specs/trunk/geronimo-validation_1.1_spec/src/main/java/javax/validation/metadata/MethodDescriptor.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-validation_1.1_spec/src/main/java/javax/validation/metadata/MethodDescriptor.java?rev=1542191&view=auto
==============================================================================
--- geronimo/specs/trunk/geronimo-validation_1.1_spec/src/main/java/javax/validation/metadata/MethodDescriptor.java (added)
+++ geronimo/specs/trunk/geronimo-validation_1.1_spec/src/main/java/javax/validation/metadata/MethodDescriptor.java Fri Nov 15 07:37:51 2013
@@ -0,0 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with this
+ * work for additional information regarding copyright ownership. The ASF
+ * licenses this file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package javax.validation.metadata;
+
+/** @since 1.1 */
+public interface MethodDescriptor extends ExecutableDescriptor {
+}

Added: geronimo/specs/trunk/geronimo-validation_1.1_spec/src/main/java/javax/validation/metadata/MethodType.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-validation_1.1_spec/src/main/java/javax/validation/metadata/MethodType.java?rev=1542191&view=auto
==============================================================================
--- geronimo/specs/trunk/geronimo-validation_1.1_spec/src/main/java/javax/validation/metadata/MethodType.java (added)
+++ geronimo/specs/trunk/geronimo-validation_1.1_spec/src/main/java/javax/validation/metadata/MethodType.java Fri Nov 15 07:37:51 2013
@@ -0,0 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with this
+ * work for additional information regarding copyright ownership. The ASF
+ * licenses this file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package javax.validation.metadata;
+
+/** @since 1.1 */
+public enum MethodType {
+    GETTER, NON_GETTER
+}

Added: geronimo/specs/trunk/geronimo-validation_1.1_spec/src/main/java/javax/validation/metadata/ParameterDescriptor.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-validation_1.1_spec/src/main/java/javax/validation/metadata/ParameterDescriptor.java?rev=1542191&view=auto
==============================================================================
--- geronimo/specs/trunk/geronimo-validation_1.1_spec/src/main/java/javax/validation/metadata/ParameterDescriptor.java (added)
+++ geronimo/specs/trunk/geronimo-validation_1.1_spec/src/main/java/javax/validation/metadata/ParameterDescriptor.java Fri Nov 15 07:37:51 2013
@@ -0,0 +1,23 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with this
+ * work for additional information regarding copyright ownership. The ASF
+ * licenses this file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package javax.validation.metadata;
+
+/** @since 1.1 */
+public interface ParameterDescriptor extends ElementDescriptor, CascadableDescriptor {
+    int getIndex();
+    String getName();
+}

Modified: geronimo/specs/trunk/geronimo-validation_1.1_spec/src/main/java/javax/validation/metadata/PropertyDescriptor.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-validation_1.1_spec/src/main/java/javax/validation/metadata/PropertyDescriptor.java?rev=1542191&r1=1542190&r2=1542191&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-validation_1.1_spec/src/main/java/javax/validation/metadata/PropertyDescriptor.java (original)
+++ geronimo/specs/trunk/geronimo-validation_1.1_spec/src/main/java/javax/validation/metadata/PropertyDescriptor.java Fri Nov 15 07:37:51 2013
@@ -19,9 +19,7 @@ package javax.validation.metadata;
 /**
  * @version $Rev$ $Date$
  */
-public interface PropertyDescriptor extends ElementDescriptor {
-    boolean isCascaded();
-
+public interface PropertyDescriptor extends ElementDescriptor, CascadableDescriptor {
     String getPropertyName();
 }
 

Added: geronimo/specs/trunk/geronimo-validation_1.1_spec/src/main/java/javax/validation/metadata/ReturnValueDescriptor.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-validation_1.1_spec/src/main/java/javax/validation/metadata/ReturnValueDescriptor.java?rev=1542191&view=auto
==============================================================================
--- geronimo/specs/trunk/geronimo-validation_1.1_spec/src/main/java/javax/validation/metadata/ReturnValueDescriptor.java (added)
+++ geronimo/specs/trunk/geronimo-validation_1.1_spec/src/main/java/javax/validation/metadata/ReturnValueDescriptor.java Fri Nov 15 07:37:51 2013
@@ -0,0 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with this
+ * work for additional information regarding copyright ownership. The ASF
+ * licenses this file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package javax.validation.metadata;
+
+/** @since 1.1 */
+public interface ReturnValueDescriptor extends ElementDescriptor, CascadableDescriptor {
+}



Mime
View raw message