Author: hardy.ferentschik Date: 2009-08-18 13:08:59 -0400 (Tue, 18 Aug 2009) New Revision: 17352 Added: beanvalidation/trunk/validation-tck/src/main/resources/org/hibernate/jsr303/tck/tests/xmlconfiguration/user-constraints-MultipleFieldDefinitionTest.xml beanvalidation/trunk/validation-tck/src/main/resources/org/hibernate/jsr303/tck/tests/xmlconfiguration/user-constraints-MultipleGetterDefinitionTest.xml beanvalidation/trunk/validation-tck/src/main/resources/org/hibernate/jsr303/tck/tests/xmlconfiguration/validation-EmptyXmlConfigurationTest.xml beanvalidation/trunk/validation-tck/src/main/resources/org/hibernate/jsr303/tck/tests/xmlconfiguration/validation-InvalidXmlConfigurationTest.xml beanvalidation/trunk/validation-tck/src/main/resources/org/hibernate/jsr303/tck/tests/xmlconfiguration/validation-MultipleBeanDefinitionTest.xml beanvalidation/trunk/validation-tck/src/main/resources/org/hibernate/jsr303/tck/tests/xmlconfiguration/validation-MultipleFieldDefinitionTest.xml beanvalidation/trunk/validation-tck/src/main/resources/org/hibernate/jsr303/tck/tests/xmlconfiguration/validation-MultipleGetterDefinitionTest.xml beanvalidation/trunk/validation-tck/src/main/resources/org/hibernate/jsr303/tck/tests/xmlconfiguration/validation-XmlConfigurationTest.xml Removed: beanvalidation/trunk/validation-tck/src/main/resources/org/hibernate/jsr303/tck/tests/xmlconfiguration/user-constraints-multiple-field-definitions.xml beanvalidation/trunk/validation-tck/src/main/resources/org/hibernate/jsr303/tck/tests/xmlconfiguration/user-constraints-multiple-getter-definitions.xml beanvalidation/trunk/validation-tck/src/main/resources/org/hibernate/jsr303/tck/tests/xmlconfiguration/validation-invalid-xml.xml beanvalidation/trunk/validation-tck/src/main/resources/org/hibernate/jsr303/tck/tests/xmlconfiguration/validation-multiple-bean-definitions.xml beanvalidation/trunk/validation-tck/src/main/resources/org/hibernate/jsr303/tck/tests/xmlconfiguration/validation-multiple-field-definitions.xml beanvalidation/trunk/validation-tck/src/main/resources/org/hibernate/jsr303/tck/tests/xmlconfiguration/validation-multiple-getter-definitions.xml beanvalidation/trunk/validation-tck/src/main/resources/org/hibernate/jsr303/tck/tests/xmlconfiguration/validation-no-additional-config.xml beanvalidation/trunk/validation-tck/src/main/resources/org/hibernate/jsr303/tck/tests/xmlconfiguration/validation.xml Modified: beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/EmptyXmlConfigurationTest.java beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/InvalidXmlConfigurationTest.java beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/MultipleBeanDefinitionTest.java beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/MultipleFieldDefinitionTest.java beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/MultipleGetterDefinitionTest.java beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/XmlConfigurationTest.java beanvalidation/trunk/validation-tck/src/main/resources/tck-audit.xml Log: started cleaning up the xml test Modified: beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/EmptyXmlConfigurationTest.java =================================================================== --- beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/EmptyXmlConfigurationTest.java 2009-08-18 15:22:46 UTC (rev 17351) +++ beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/EmptyXmlConfigurationTest.java 2009-08-18 17:08:59 UTC (rev 17352) @@ -35,17 +35,17 @@ * @author Hardy Ferentschik */ @Artifact(artifactType = ArtifactType.JSR303) -(a)Classes({TestUtil.class, TestUtil.PathImpl.class, TestUtil.NodeImpl.class}) -@ValidationXml(value = "validation-no-additional-config.xml") +@Classes({ TestUtil.class, TestUtil.PathImpl.class, TestUtil.NodeImpl.class }) +@ValidationXml(value = "validation-EmptyXmlConfigurationTest.xml") @Resource(source = "order-constraints-no-additional-config.xml", - destination = "WEB-INF/classes/org/hibernate/jsr303/tck/tests/xmlconfiguration/order-constraints-no-additional-config.xml") + destination = "WEB-INF/classes/org/hibernate/jsr303/tck/tests/xmlconfiguration/order-constraints-no-additional-config.xml") public class EmptyXmlConfigurationTest extends AbstractTest { @Test public void testNoDefinedConstraints() { Validator validator = TestUtil.getValidatorUnderTest(); assertFalse( - validator.getConstraintsForClass( Order.class ).isBeanConstrained(), "Bean should be unsonstrained" + validator.getConstraintsForClass( Order.class ).isBeanConstrained(), "Bean should be unconstrained" ); } } \ No newline at end of file Modified: beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/InvalidXmlConfigurationTest.java =================================================================== --- beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/InvalidXmlConfigurationTest.java 2009-08-18 15:22:46 UTC (rev 17351) +++ beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/InvalidXmlConfigurationTest.java 2009-08-18 17:08:59 UTC (rev 17352) @@ -36,7 +36,7 @@ */ @Artifact(artifactType = ArtifactType.JSR303) @Classes({ TestUtil.class, TestUtil.PathImpl.class, TestUtil.NodeImpl.class }) -@ValidationXml(value = "validation-invalid-xml.xml") +@ValidationXml(value = "validation-InvalidXmlConfigurationTest.xml") public class InvalidXmlConfigurationTest extends AbstractTest { @Test Modified: beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/MultipleBeanDefinitionTest.java =================================================================== --- beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/MultipleBeanDefinitionTest.java 2009-08-18 15:22:46 UTC (rev 17351) +++ beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/MultipleBeanDefinitionTest.java 2009-08-18 17:08:59 UTC (rev 17352) @@ -26,8 +26,6 @@ import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.testharness.impl.packaging.ArtifactType; import org.jboss.testharness.impl.packaging.Classes; -import org.jboss.testharness.impl.packaging.Resource; -import org.jboss.testharness.impl.packaging.Resources; import org.jboss.testharness.impl.packaging.jsr303.ValidationXml; import static org.testng.Assert.fail; import org.testng.annotations.Test; @@ -39,15 +37,7 @@ */ @Artifact(artifactType = ArtifactType.JSR303) @Classes({ TestUtil.class, TestUtil.PathImpl.class, TestUtil.NodeImpl.class }) -@ValidationXml(value = "validation-multiple-bean-definitions.xml") -@Resources( - { - @Resource(source = "user-constraints.xml", - destination = "WEB-INF/classes/org/hibernate/jsr303/tck/tests/xmlconfiguration/user-constraints.xml"), - @Resource(source = "user-constraints-copy.xml", - destination = "WEB-INF/classes/org/hibernate/jsr303/tck/tests/xmlconfiguration/user-constraints-copy.xml") - } -) +@ValidationXml(value = "validation-MultipleBeanDefinitionTest.xml") public class MultipleBeanDefinitionTest extends AbstractTest { @Test Modified: beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/MultipleFieldDefinitionTest.java =================================================================== --- beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/MultipleFieldDefinitionTest.java 2009-08-18 15:22:46 UTC (rev 17351) +++ beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/MultipleFieldDefinitionTest.java 2009-08-18 17:08:59 UTC (rev 17352) @@ -26,7 +26,6 @@ import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.testharness.impl.packaging.ArtifactType; import org.jboss.testharness.impl.packaging.Classes; -import org.jboss.testharness.impl.packaging.Resource; import org.jboss.testharness.impl.packaging.jsr303.ValidationXml; import static org.testng.Assert.fail; import org.testng.annotations.Test; @@ -38,10 +37,7 @@ */ @Artifact(artifactType = ArtifactType.JSR303) @Classes({ TestUtil.class, TestUtil.PathImpl.class, TestUtil.NodeImpl.class }) -@ValidationXml(value = "user-constraints-multiple-field-definitions.xml") -@Resource(source = "user-constraints-multiple-field-definitions.xml", - destination = "WEB-INF/classes/org/hibernate/jsr303/tck/tests/xmlconfiguration/user-constraints-multiple-field-definitions.xml") - +@ValidationXml(value = "validation-MultipleFieldDefinitionTest.xml") public class MultipleFieldDefinitionTest extends AbstractTest { @Test @@ -49,10 +45,10 @@ @SpecAssertion(section = "7.1", id = "c"), @SpecAssertion(section = "7.1", id = "e") }) - public void testFieldMappingCanotOccurMoreThanOnce() { + public void testFieldMappingCannotOccurMoreThanOnce() { try { TestUtil.getValidatorUnderTest(); - fail(); + fail("You should not be able to define multiple field mappings per entity"); } catch ( ValidationException e ) { // success Modified: beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/MultipleGetterDefinitionTest.java =================================================================== --- beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/MultipleGetterDefinitionTest.java 2009-08-18 15:22:46 UTC (rev 17351) +++ beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/MultipleGetterDefinitionTest.java 2009-08-18 17:08:59 UTC (rev 17352) @@ -26,7 +26,6 @@ import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.testharness.impl.packaging.ArtifactType; import org.jboss.testharness.impl.packaging.Classes; -import org.jboss.testharness.impl.packaging.Resource; import org.jboss.testharness.impl.packaging.jsr303.ValidationXml; import static org.testng.Assert.fail; import org.testng.annotations.Test; @@ -38,10 +37,7 @@ */ @Artifact(artifactType = ArtifactType.JSR303) @Classes({ TestUtil.class, TestUtil.PathImpl.class, TestUtil.NodeImpl.class }) -@ValidationXml(value = "user-constraints-multiple-getter-definitions.xml") -@Resource(source = "user-constraints-multiple-getter-definitions.xml", - destination = "WEB-INF/classes/org/hibernate/jsr303/tck/tests/xmlconfiguration/user-constraints-multiple-getter-definitions.xml") - +@ValidationXml(value = "validation-MultipleGetterDefinitionTest.xml") public class MultipleGetterDefinitionTest extends AbstractTest { @Test @@ -49,10 +45,10 @@ @SpecAssertion(section = "7.1", id = "d"), @SpecAssertion(section = "7.1", id = "e") }) - public void testGetterMappingCanotOccurMoreThanOnce() { + public void testGetterMappingCannotOccurMoreThanOnce() { try { TestUtil.getValidatorUnderTest(); - fail(); + fail("You should not be able to define multiple getter mappings per entity"); } catch ( ValidationException e ) { // success Modified: beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/XmlConfigurationTest.java =================================================================== --- beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/XmlConfigurationTest.java 2009-08-18 15:22:46 UTC (rev 17351) +++ beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/XmlConfigurationTest.java 2009-08-18 17:08:59 UTC (rev 17352) @@ -39,7 +39,7 @@ */ @Artifact(artifactType = ArtifactType.JSR303) @Classes({ TestUtil.class, TestUtil.PathImpl.class, TestUtil.NodeImpl.class }) -@ValidationXml(value = "validation.xml") +@ValidationXml(value = "validation-XmlConfigurationTest.xml") @Resources( { @Resource(source = "user-constraints.xml", Copied: beanvalidation/trunk/validation-tck/src/main/resources/org/hibernate/jsr303/tck/tests/xmlconfiguration/user-constraints-MultipleFieldDefinitionTest.xml (from rev 17345, beanvalidation/trunk/validation-tck/src/main/resources/org/hibernate/jsr303/tck/tests/xmlconfiguration/user-constraints-multiple-field-definitions.xml) =================================================================== --- beanvalidation/trunk/validation-tck/src/main/resources/org/hibernate/jsr303/tck/tests/xmlconfiguration/user-constraints-MultipleFieldDefinitionTest.xml (rev 0) +++ beanvalidation/trunk/validation-tck/src/main/resources/org/hibernate/jsr303/tck/tests/xmlconfiguration/user-constraints-MultipleFieldDefinitionTest.xml 2009-08-18 17:08:59 UTC (rev 17352) @@ -0,0 +1,19 @@ +<constraint-mappings xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://jboss.org/xml/ns/javax/validation/mapping validation-mapping-1.0.xsd" + xmlns="http://jboss.org/xml/ns/javax/validation/mapping"> + <default-package>org.hibernate.jsr303.tck.tests.xmlconfiguration</default-package> + <bean class="User" ignore-annotations="false"> + + <field name="lastname"> + <constraint annotation="javax.validation.constraints.Pattern"> + <message>Last name has to start with with a capital letter.</message> + <element name="regexp">^[A-Z][a-z]+</element> + </constraint> + </field> + <field name="lastname"> + <constraint annotation="javax.validation.constraints.NotNull"> + </constraint> + </field> + + </bean> +</constraint-mappings> Property changes on: beanvalidation/trunk/validation-tck/src/main/resources/org/hibernate/jsr303/tck/tests/xmlconfiguration/user-constraints-MultipleFieldDefinitionTest.xml ___________________________________________________________________ Name: svn:keywords + Id Name: svn:eol-style + native Copied: beanvalidation/trunk/validation-tck/src/main/resources/org/hibernate/jsr303/tck/tests/xmlconfiguration/user-constraints-MultipleGetterDefinitionTest.xml (from rev 17345, beanvalidation/trunk/validation-tck/src/main/resources/org/hibernate/jsr303/tck/tests/xmlconfiguration/user-constraints-multiple-getter-definitions.xml) =================================================================== --- beanvalidation/trunk/validation-tck/src/main/resources/org/hibernate/jsr303/tck/tests/xmlconfiguration/user-constraints-MultipleGetterDefinitionTest.xml (rev 0) +++ beanvalidation/trunk/validation-tck/src/main/resources/org/hibernate/jsr303/tck/tests/xmlconfiguration/user-constraints-MultipleGetterDefinitionTest.xml 2009-08-18 17:08:59 UTC (rev 17352) @@ -0,0 +1,22 @@ +<constraint-mappings xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://jboss.org/xml/ns/javax/validation/mapping validation-mapping-1.0.xsd" + xmlns="http://jboss.org/xml/ns/javax/validation/mapping"> + <default-package>org.hibernate.jsr303.tck.tests.xmlconfiguration</default-package> + <bean class="User" ignore-annotations="false"> + <getter name="firstname" ignore-annotations="true"> + <constraint annotation="javax.validation.constraints.Size"> + <message>Size is limited!</message> + <groups> + <value>org.hibernate.jsr303.tck.tests.xmlconfiguration.TestGroup</value> + <value>javax.validation.groups.Default</value> + </groups> + <element name="max">10</element> + </constraint> + </getter> + <getter name="firstname" ignore-annotations="true"> + <constraint annotation="javax.validation.constraints.NotNull"> + <message>Cannot be null</message> + </constraint> + </getter> + </bean> +</constraint-mappings> Deleted: beanvalidation/trunk/validation-tck/src/main/resources/org/hibernate/jsr303/tck/tests/xmlconfiguration/user-constraints-multiple-field-definitions.xml =================================================================== --- beanvalidation/trunk/validation-tck/src/main/resources/org/hibernate/jsr303/tck/tests/xmlconfiguration/user-constraints-multiple-field-definitions.xml 2009-08-18 15:22:46 UTC (rev 17351) +++ beanvalidation/trunk/validation-tck/src/main/resources/org/hibernate/jsr303/tck/tests/xmlconfiguration/user-constraints-multiple-field-definitions.xml 2009-08-18 17:08:59 UTC (rev 17352) @@ -1,19 +0,0 @@ -<constraint-mappings xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://jboss.org/xml/ns/javax/validation/mapping validation-mapping-1.0.xsd" - xmlns="http://jboss.org/xml/ns/javax/validation/mapping"> - <default-package>org.hibernate.jsr303.tck.tests.xmlconfiguration</default-package> - <bean class="User" ignore-annotations="false"> - - <field name="lastname"> - <constraint annotation="javax.validation.constraints.Pattern"> - <message>Last name has to start with with a capital letter.</message> - <element name="regexp">^[A-Z][a-z]+</element> - </constraint> - </field> - <field name="lastname"> - <constraint annotation="javax.validation.constraints.NotNull"> - </constraint> - </field> - - </bean> -</constraint-mappings> Deleted: beanvalidation/trunk/validation-tck/src/main/resources/org/hibernate/jsr303/tck/tests/xmlconfiguration/user-constraints-multiple-getter-definitions.xml =================================================================== --- beanvalidation/trunk/validation-tck/src/main/resources/org/hibernate/jsr303/tck/tests/xmlconfiguration/user-constraints-multiple-getter-definitions.xml 2009-08-18 15:22:46 UTC (rev 17351) +++ beanvalidation/trunk/validation-tck/src/main/resources/org/hibernate/jsr303/tck/tests/xmlconfiguration/user-constraints-multiple-getter-definitions.xml 2009-08-18 17:08:59 UTC (rev 17352) @@ -1,22 +0,0 @@ -<constraint-mappings xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://jboss.org/xml/ns/javax/validation/mapping validation-mapping-1.0.xsd" - xmlns="http://jboss.org/xml/ns/javax/validation/mapping"> - <default-package>org.hibernate.jsr303.tck.tests.xmlconfiguration</default-package> - <bean class="User" ignore-annotations="false"> - <getter name="firstname" ignore-annotations="true"> - <constraint annotation="javax.validation.constraints.Size"> - <message>Size is limited!</message> - <groups> - <value>org.hibernate.jsr303.tck.tests.xmlconfiguration.TestGroup</value> - <value>javax.validation.groups.Default</value> - </groups> - <element name="max">10</element> - </constraint> - </getter> - <getter name="firstname" ignore-annotations="true"> - <constraint annotation="javax.validation.constraints.NotNull"> - <message>Cannot be null</message> - </constraint> - </getter> - </bean> -</constraint-mappings> Copied: beanvalidation/trunk/validation-tck/src/main/resources/org/hibernate/jsr303/tck/tests/xmlconfiguration/validation-EmptyXmlConfigurationTest.xml (from rev 17345, beanvalidation/trunk/validation-tck/src/main/resources/org/hibernate/jsr303/tck/tests/xmlconfiguration/validation-no-additional-config.xml) =================================================================== --- beanvalidation/trunk/validation-tck/src/main/resources/org/hibernate/jsr303/tck/tests/xmlconfiguration/validation-EmptyXmlConfigurationTest.xml (rev 0) +++ beanvalidation/trunk/validation-tck/src/main/resources/org/hibernate/jsr303/tck/tests/xmlconfiguration/validation-EmptyXmlConfigurationTest.xml 2009-08-18 17:08:59 UTC (rev 17352) @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="UTF-8"?> +<validation-config + xmlns="http://jboss.org/xml/ns/javax/validation/configuration" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://jboss.org/xml/ns/javax/validation/configu... validation-configuration-1.0.xsd"> + + <constraint-mapping>org/hibernate/jsr303/tck/tests/xmlconfiguration/order-constraints-no-additional-config.xml</constraint-mapping> +</validation-config> \ No newline at end of file Property changes on: beanvalidation/trunk/validation-tck/src/main/resources/org/hibernate/jsr303/tck/tests/xmlconfiguration/validation-EmptyXmlConfigurationTest.xml ___________________________________________________________________ Name: svn:executable + * Name: svn:keywords + Id Name: svn:eol-style + native Copied: beanvalidation/trunk/validation-tck/src/main/resources/org/hibernate/jsr303/tck/tests/xmlconfiguration/validation-InvalidXmlConfigurationTest.xml (from rev 17345, beanvalidation/trunk/validation-tck/src/main/resources/org/hibernate/jsr303/tck/tests/xmlconfiguration/validation-invalid-xml.xml) =================================================================== --- beanvalidation/trunk/validation-tck/src/main/resources/org/hibernate/jsr303/tck/tests/xmlconfiguration/validation-InvalidXmlConfigurationTest.xml (rev 0) +++ beanvalidation/trunk/validation-tck/src/main/resources/org/hibernate/jsr303/tck/tests/xmlconfiguration/validation-InvalidXmlConfigurationTest.xml 2009-08-18 17:08:59 UTC (rev 17352) @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="UTF-8"?> +<validation-config xmlns="http://jboss.org/xml/ns/javax/validation/configuration" + xsi:schemaLocation="http://jboss.org/xml/ns/javax/validation/configu... validation-configuration-1.0.xsd" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> +</validation-confi> \ No newline at end of file Property changes on: beanvalidation/trunk/validation-tck/src/main/resources/org/hibernate/jsr303/tck/tests/xmlconfiguration/validation-InvalidXmlConfigurationTest.xml ___________________________________________________________________ Name: svn:keywords + Id Name: svn:eol-style + native Copied: beanvalidation/trunk/validation-tck/src/main/resources/org/hibernate/jsr303/tck/tests/xmlconfiguration/validation-MultipleBeanDefinitionTest.xml (from rev 17345, beanvalidation/trunk/validation-tck/src/main/resources/org/hibernate/jsr303/tck/tests/xmlconfiguration/validation-multiple-bean-definitions.xml) =================================================================== --- beanvalidation/trunk/validation-tck/src/main/resources/org/hibernate/jsr303/tck/tests/xmlconfiguration/validation-MultipleBeanDefinitionTest.xml (rev 0) +++ beanvalidation/trunk/validation-tck/src/main/resources/org/hibernate/jsr303/tck/tests/xmlconfiguration/validation-MultipleBeanDefinitionTest.xml 2009-08-18 17:08:59 UTC (rev 17352) @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="UTF-8"?> +<validation-config xmlns="http://jboss.org/xml/ns/javax/validation/configuration" + xsi:schemaLocation="http://jboss.org/xml/ns/javax/validation/configu... validation-configuration-1.0.xsd" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <constraint-mapping>org/hibernate/jsr303/tck/tests/xmlconfiguration/user-constraints.xml</constraint-mapping> + <constraint-mapping>org/hibernate/jsr303/tck/tests/xmlconfiguration/user-constraints-copy.xml</constraint-mapping> +</validation-config> \ No newline at end of file Property changes on: beanvalidation/trunk/validation-tck/src/main/resources/org/hibernate/jsr303/tck/tests/xmlconfiguration/validation-MultipleBeanDefinitionTest.xml ___________________________________________________________________ Name: svn:keywords + Id Name: svn:eol-style + native Copied: beanvalidation/trunk/validation-tck/src/main/resources/org/hibernate/jsr303/tck/tests/xmlconfiguration/validation-MultipleFieldDefinitionTest.xml (from rev 17345, beanvalidation/trunk/validation-tck/src/main/resources/org/hibernate/jsr303/tck/tests/xmlconfiguration/validation-multiple-field-definitions.xml) =================================================================== --- beanvalidation/trunk/validation-tck/src/main/resources/org/hibernate/jsr303/tck/tests/xmlconfiguration/validation-MultipleFieldDefinitionTest.xml (rev 0) +++ beanvalidation/trunk/validation-tck/src/main/resources/org/hibernate/jsr303/tck/tests/xmlconfiguration/validation-MultipleFieldDefinitionTest.xml 2009-08-18 17:08:59 UTC (rev 17352) @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="UTF-8"?> +<validation-config xmlns="http://jboss.org/xml/ns/javax/validation/configuration" + xsi:schemaLocation="http://jboss.org/xml/ns/javax/validation/configu... validation-configuration-1.0.xsd" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <constraint-mapping> + org/hibernate/jsr303/tck/tests/xmlconfiguration/user-constraints-MultipleFieldDefinitionTest.xml + </constraint-mapping> +</validation-config> \ No newline at end of file Copied: beanvalidation/trunk/validation-tck/src/main/resources/org/hibernate/jsr303/tck/tests/xmlconfiguration/validation-MultipleGetterDefinitionTest.xml (from rev 17345, beanvalidation/trunk/validation-tck/src/main/resources/org/hibernate/jsr303/tck/tests/xmlconfiguration/validation-multiple-getter-definitions.xml) =================================================================== --- beanvalidation/trunk/validation-tck/src/main/resources/org/hibernate/jsr303/tck/tests/xmlconfiguration/validation-MultipleGetterDefinitionTest.xml (rev 0) +++ beanvalidation/trunk/validation-tck/src/main/resources/org/hibernate/jsr303/tck/tests/xmlconfiguration/validation-MultipleGetterDefinitionTest.xml 2009-08-18 17:08:59 UTC (rev 17352) @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="UTF-8"?> +<validation-config xmlns="http://jboss.org/xml/ns/javax/validation/configuration" + xsi:schemaLocation="http://jboss.org/xml/ns/javax/validation/configu... validation-configuration-1.0.xsd" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <constraint-mapping> + org/hibernate/jsr303/tck/tests/xmlconfiguration/user-constraints-MultipleGetterDefinitionTest.xml + </constraint-mapping> +</validation-config> \ No newline at end of file Copied: beanvalidation/trunk/validation-tck/src/main/resources/org/hibernate/jsr303/tck/tests/xmlconfiguration/validation-XmlConfigurationTest.xml (from rev 17345, beanvalidation/trunk/validation-tck/src/main/resources/org/hibernate/jsr303/tck/tests/xmlconfiguration/validation.xml) =================================================================== --- beanvalidation/trunk/validation-tck/src/main/resources/org/hibernate/jsr303/tck/tests/xmlconfiguration/validation-XmlConfigurationTest.xml (rev 0) +++ beanvalidation/trunk/validation-tck/src/main/resources/org/hibernate/jsr303/tck/tests/xmlconfiguration/validation-XmlConfigurationTest.xml 2009-08-18 17:08:59 UTC (rev 17352) @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="UTF-8"?> +<validation-config xmlns="http://jboss.org/xml/ns/javax/validation/configuration" + xsi:schemaLocation="http://jboss.org/xml/ns/javax/validation/configu... validation-configuration-1.0.xsd" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <constraint-mapping>org/hibernate/jsr303/tck/tests/xmlconfiguration/order-constraints.xml</constraint-mapping> + <constraint-mapping>org/hibernate/jsr303/tck/tests/xmlconfiguration/user-constraints.xml</constraint-mapping> + <property name="javax.validation.test">foobar</property> +</validation-config> \ No newline at end of file Property changes on: beanvalidation/trunk/validation-tck/src/main/resources/org/hibernate/jsr303/tck/tests/xmlconfiguration/validation-XmlConfigurationTest.xml ___________________________________________________________________ Name: svn:keywords + Id Name: svn:eol-style + native Deleted: beanvalidation/trunk/validation-tck/src/main/resources/org/hibernate/jsr303/tck/tests/xmlconfiguration/validation-invalid-xml.xml =================================================================== --- beanvalidation/trunk/validation-tck/src/main/resources/org/hibernate/jsr303/tck/tests/xmlconfiguration/validation-invalid-xml.xml 2009-08-18 15:22:46 UTC (rev 17351) +++ beanvalidation/trunk/validation-tck/src/main/resources/org/hibernate/jsr303/tck/tests/xmlconfiguration/validation-invalid-xml.xml 2009-08-18 17:08:59 UTC (rev 17352) @@ -1,5 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<validation-config xmlns="http://jboss.org/xml/ns/javax/validation/configuration" - xsi:schemaLocation="http://jboss.org/xml/ns/javax/validation/configu... validation-configuration-1.0.xsd" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> -</validation-confi> \ No newline at end of file Deleted: beanvalidation/trunk/validation-tck/src/main/resources/org/hibernate/jsr303/tck/tests/xmlconfiguration/validation-multiple-bean-definitions.xml =================================================================== --- beanvalidation/trunk/validation-tck/src/main/resources/org/hibernate/jsr303/tck/tests/xmlconfiguration/validation-multiple-bean-definitions.xml 2009-08-18 15:22:46 UTC (rev 17351) +++ beanvalidation/trunk/validation-tck/src/main/resources/org/hibernate/jsr303/tck/tests/xmlconfiguration/validation-multiple-bean-definitions.xml 2009-08-18 17:08:59 UTC (rev 17352) @@ -1,7 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<validation-config xmlns="http://jboss.org/xml/ns/javax/validation/configuration" - xsi:schemaLocation="http://jboss.org/xml/ns/javax/validation/configu... validation-configuration-1.0.xsd" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - <constraint-mapping>org/hibernate/jsr303/tck/tests/xmlconfiguration/user-constraints.xml</constraint-mapping> - <constraint-mapping>org/hibernate/jsr303/tck/tests/xmlconfiguration/user-constraints-copy.xml</constraint-mapping> -</validation-config> \ No newline at end of file Deleted: beanvalidation/trunk/validation-tck/src/main/resources/org/hibernate/jsr303/tck/tests/xmlconfiguration/validation-multiple-field-definitions.xml =================================================================== --- beanvalidation/trunk/validation-tck/src/main/resources/org/hibernate/jsr303/tck/tests/xmlconfiguration/validation-multiple-field-definitions.xml 2009-08-18 15:22:46 UTC (rev 17351) +++ beanvalidation/trunk/validation-tck/src/main/resources/org/hibernate/jsr303/tck/tests/xmlconfiguration/validation-multiple-field-definitions.xml 2009-08-18 17:08:59 UTC (rev 17352) @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<validation-config xmlns="http://jboss.org/xml/ns/javax/validation/configuration" - xsi:schemaLocation="http://jboss.org/xml/ns/javax/validation/configu... validation-configuration-1.0.xsd" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - <constraint-mapping> - org/hibernate/jsr303/tck/tests/xmlconfiguration/user-constraints-multiple-field-definitions.xml - </constraint-mapping> -</validation-config> \ No newline at end of file Deleted: beanvalidation/trunk/validation-tck/src/main/resources/org/hibernate/jsr303/tck/tests/xmlconfiguration/validation-multiple-getter-definitions.xml =================================================================== --- beanvalidation/trunk/validation-tck/src/main/resources/org/hibernate/jsr303/tck/tests/xmlconfiguration/validation-multiple-getter-definitions.xml 2009-08-18 15:22:46 UTC (rev 17351) +++ beanvalidation/trunk/validation-tck/src/main/resources/org/hibernate/jsr303/tck/tests/xmlconfiguration/validation-multiple-getter-definitions.xml 2009-08-18 17:08:59 UTC (rev 17352) @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<validation-config xmlns="http://jboss.org/xml/ns/javax/validation/configuration" - xsi:schemaLocation="http://jboss.org/xml/ns/javax/validation/configu... validation-configuration-1.0.xsd" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - <constraint-mapping> - org/hibernate/jsr303/tck/tests/xmlconfiguration/user-constraints-multiple-getter-definitions.xml - </constraint-mapping> -</validation-config> \ No newline at end of file Deleted: beanvalidation/trunk/validation-tck/src/main/resources/org/hibernate/jsr303/tck/tests/xmlconfiguration/validation-no-additional-config.xml =================================================================== --- beanvalidation/trunk/validation-tck/src/main/resources/org/hibernate/jsr303/tck/tests/xmlconfiguration/validation-no-additional-config.xml 2009-08-18 15:22:46 UTC (rev 17351) +++ beanvalidation/trunk/validation-tck/src/main/resources/org/hibernate/jsr303/tck/tests/xmlconfiguration/validation-no-additional-config.xml 2009-08-18 17:08:59 UTC (rev 17352) @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<validation-config - xmlns="http://jboss.org/xml/ns/javax/validation/configuration" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://jboss.org/xml/ns/javax/validation/configu... validation-configuration-1.0.xsd"> - - <constraint-mapping>org/hibernate/jsr303/tck/tests/xmlconfiguration/order-constraints-no-additional-config.xml</constraint-mapping> -</validation-config> \ No newline at end of file Deleted: beanvalidation/trunk/validation-tck/src/main/resources/org/hibernate/jsr303/tck/tests/xmlconfiguration/validation.xml =================================================================== --- beanvalidation/trunk/validation-tck/src/main/resources/org/hibernate/jsr303/tck/tests/xmlconfiguration/validation.xml 2009-08-18 15:22:46 UTC (rev 17351) +++ beanvalidation/trunk/validation-tck/src/main/resources/org/hibernate/jsr303/tck/tests/xmlconfiguration/validation.xml 2009-08-18 17:08:59 UTC (rev 17352) @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<validation-config xmlns="http://jboss.org/xml/ns/javax/validation/configuration" - xsi:schemaLocation="http://jboss.org/xml/ns/javax/validation/configu... validation-configuration-1.0.xsd" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - <constraint-mapping>org/hibernate/jsr303/tck/tests/xmlconfiguration/order-constraints.xml</constraint-mapping> - <constraint-mapping>org/hibernate/jsr303/tck/tests/xmlconfiguration/user-constraints.xml</constraint-mapping> - <property name="javax.validation.test">foobar</property> -</validation-config> \ No newline at end of file Modified: beanvalidation/trunk/validation-tck/src/main/resources/tck-audit.xml =================================================================== --- beanvalidation/trunk/validation-tck/src/main/resources/tck-audit.xml 2009-08-18 15:22:46 UTC (rev 17351) +++ beanvalidation/trunk/validation-tck/src/main/resources/tck-audit.xml 2009-08-18 17:08:59 UTC (rev 17352) @@ -831,12 +831,11 @@ META-INF/validation.xml</text> </assertion> <assertion id="b"> - <text>This configuration file is optional but can be used by application to refine some - of the Bean Validation behavior</text> + <text>This configuration file is optional.</text> </assertion> <assertion id="c"> - <text>If more than one META-INF/validation.xml file is found in the classpath, a is - raised</text> + <text>If more than one META-INF/validation.xml file is found in the classpath, a + ValidationException is raised. </text> </assertion> <assertion id="d"> <text>Unless stated otherwise, XML based configuration settings are overridden by values