Modified: incubator/bval/sandbox/lang3-work/bval-jsr303/src/test/java/org/apache/bval/jsr303/groups/redefining/Address.java URL: http://svn.apache.org/viewvc/incubator/bval/sandbox/lang3-work/bval-jsr303/src/test/java/org/apache/bval/jsr303/groups/redefining/Address.java?rev=1165923&r1=1165922&r2=1165923&view=diff ============================================================================== --- incubator/bval/sandbox/lang3-work/bval-jsr303/src/test/java/org/apache/bval/jsr303/groups/redefining/Address.java (original) +++ incubator/bval/sandbox/lang3-work/bval-jsr303/src/test/java/org/apache/bval/jsr303/groups/redefining/Address.java Tue Sep 6 23:07:53 2011 @@ -19,13 +19,13 @@ package org.apache.bval.jsr303.groups.redefining; +import org.apache.bval.constraints.ZipCodeCityCoherence; +import org.apache.bval.jsr303.example.ZipCodeCityCarrier; + import javax.validation.GroupSequence; import javax.validation.constraints.NotNull; import javax.validation.constraints.Size; -import org.apache.bval.constraints.ZipCodeCityCoherence; -import org.apache.bval.jsr303.example.ZipCodeCityCarrier; - /** * Example 3.6. Redefining Default group for Address: * To redefine Default for a class, place a @GroupSequence annotation on the class ;
Modified: incubator/bval/sandbox/lang3-work/bval-jsr303/src/test/java/org/apache/bval/jsr303/groups/redefining/RedefiningDefaultGroupTest.java URL: http://svn.apache.org/viewvc/incubator/bval/sandbox/lang3-work/bval-jsr303/src/test/java/org/apache/bval/jsr303/groups/redefining/RedefiningDefaultGroupTest.java?rev=1165923&r1=1165922&r2=1165923&view=diff ============================================================================== --- incubator/bval/sandbox/lang3-work/bval-jsr303/src/test/java/org/apache/bval/jsr303/groups/redefining/RedefiningDefaultGroupTest.java (original) +++ incubator/bval/sandbox/lang3-work/bval-jsr303/src/test/java/org/apache/bval/jsr303/groups/redefining/RedefiningDefaultGroupTest.java Tue Sep 6 23:07:53 2011 @@ -19,14 +19,12 @@ package org.apache.bval.jsr303.groups.redefining; import junit.framework.TestCase; +import org.apache.bval.jsr303.ApacheValidatorFactory; +import org.apache.bval.jsr303.util.TestUtils; import javax.validation.ConstraintViolation; import javax.validation.GroupDefinitionException; import javax.validation.Validator; - -import org.apache.bval.jsr303.ApacheValidatorFactory; -import org.apache.bval.jsr303.util.TestUtils; - import java.util.Set; /** Modified: incubator/bval/sandbox/lang3-work/bval-jsr303/src/test/java/org/apache/bval/jsr303/util/EnumerationConverterTestCase.java URL: http://svn.apache.org/viewvc/incubator/bval/sandbox/lang3-work/bval-jsr303/src/test/java/org/apache/bval/jsr303/util/EnumerationConverterTestCase.java?rev=1165923&r1=1165922&r2=1165923&view=diff ============================================================================== --- incubator/bval/sandbox/lang3-work/bval-jsr303/src/test/java/org/apache/bval/jsr303/util/EnumerationConverterTestCase.java (original) +++ incubator/bval/sandbox/lang3-work/bval-jsr303/src/test/java/org/apache/bval/jsr303/util/EnumerationConverterTestCase.java Tue Sep 6 23:07:53 2011 @@ -21,7 +21,6 @@ package org.apache.bval.jsr303.util; import junit.framework.Test; import junit.framework.TestCase; import junit.framework.TestSuite; - import org.apache.commons.beanutils.Converter; /** Modified: incubator/bval/sandbox/lang3-work/bval-jsr303/src/test/java/org/apache/bval/jsr303/util/PathImplTest.java URL: http://svn.apache.org/viewvc/incubator/bval/sandbox/lang3-work/bval-jsr303/src/test/java/org/apache/bval/jsr303/util/PathImplTest.java?rev=1165923&r1=1165922&r2=1165923&view=diff ============================================================================== --- incubator/bval/sandbox/lang3-work/bval-jsr303/src/test/java/org/apache/bval/jsr303/util/PathImplTest.java (original) +++ incubator/bval/sandbox/lang3-work/bval-jsr303/src/test/java/org/apache/bval/jsr303/util/PathImplTest.java Tue Sep 6 23:07:53 2011 @@ -18,17 +18,14 @@ */ package org.apache.bval.jsr303.util; -import junit.framework.Test; -import junit.framework.TestCase; -import junit.framework.TestSuite; +import java.util.Iterator; import javax.validation.Path; import javax.validation.ValidationException; -import org.apache.bval.jsr303.util.NodeImpl; -import org.apache.bval.jsr303.util.PathImpl; - -import java.util.Iterator; +import junit.framework.Test; +import junit.framework.TestCase; +import junit.framework.TestSuite; /** * PathImpl Tester. Modified: incubator/bval/sandbox/lang3-work/bval-jsr303/src/test/java/org/apache/bval/jsr303/xml/ValidationParserTest.java URL: http://svn.apache.org/viewvc/incubator/bval/sandbox/lang3-work/bval-jsr303/src/test/java/org/apache/bval/jsr303/xml/ValidationParserTest.java?rev=1165923&r1=1165922&r2=1165923&view=diff ============================================================================== --- incubator/bval/sandbox/lang3-work/bval-jsr303/src/test/java/org/apache/bval/jsr303/xml/ValidationParserTest.java (original) +++ incubator/bval/sandbox/lang3-work/bval-jsr303/src/test/java/org/apache/bval/jsr303/xml/ValidationParserTest.java Tue Sep 6 23:07:53 2011 @@ -27,10 +27,8 @@ import org.apache.bval.jsr303.Configurat import org.apache.bval.jsr303.example.XmlEntitySampleBean; import org.apache.bval.jsr303.resolver.SimpleTraversableResolver; -import javax.validation.ConstraintViolation; -import javax.validation.Validation; -import javax.validation.Validator; -import javax.validation.ValidatorFactory; +import javax.validation.*; +import java.io.IOException; import java.util.Set; /** @@ -46,6 +44,18 @@ public class ValidationParserTest extend super(name); } + public void testGetInputStream() throws IOException { + ValidationParser vp = new ValidationParser("sample-validation.xml"); + assertNotNull(vp.getInputStream("sample-validation.xml")); + + try { + vp.getInputStream("META-INF/MANIFEST.MF"); // this is available in multiple jars hopefully + fail("exception not thrown"); + } catch(ValidationException vex) { + assertTrue(vex.getMessage().startsWith("More than ")); + } + } + public void testParse() { ValidationParser vp = new ValidationParser("sample-validation.xml"); ConfigurationImpl config = Propchange: incubator/bval/sandbox/lang3-work/bval-xstream/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Sep 6 23:07:53 2011 @@ -1 +1 @@ -/incubator/bval/trunk/bval-xstream:992143,992401,992406,992412,992510,992648,993404-993438,996236,996240,997154,1002445,1002497,1031642,1035416-1036603,1069985,1073929,1073944,1073946,1073949,1089957 +/incubator/bval/trunk/bval-xstream:992143,992401,992406,992412,992510,992648,993404-993438,996236,996240,997154,1002445,1002497,1031642,1035416-1036603,1069985,1073929,1073944,1073946,1073949,1089957,1145260-1165833 Modified: incubator/bval/sandbox/lang3-work/pom.xml URL: http://svn.apache.org/viewvc/incubator/bval/sandbox/lang3-work/pom.xml?rev=1165923&r1=1165922&r2=1165923&view=diff ============================================================================== --- incubator/bval/sandbox/lang3-work/pom.xml (original) +++ incubator/bval/sandbox/lang3-work/pom.xml Tue Sep 6 23:07:53 2011 @@ -263,6 +263,7 @@ <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>findbugs-maven-plugin</artifactId> + <version>2.3.2</version> </plugin> </plugins> </reporting> @@ -500,7 +501,7 @@ <plugin> <groupId>org.apache.rat</groupId> <artifactId>apache-rat-plugin</artifactId> - <version>0.6</version> + <version>0.7</version> <executions> <execution> <phase>verify</phase> @@ -525,6 +526,8 @@ <exclude>**/rat.txt</exclude> <exclude>**/target/**/*</exclude> <exclude>**/*.iml</exclude> + <exclude>**/*.ipr</exclude> + <exclude>**/*.iws</exclude> </excludes> </configuration> </plugin> @@ -609,6 +612,7 @@ <plugin> <groupId>org.apache.rat</groupId> <artifactId>apache-rat-plugin</artifactId> + <version>0.7</version> </plugin> <plugin> <groupId>org.codehaus.mojo</groupId>
