[hibernate-commits] Hibernate SVN: r16353 - beanvalidation/trunk/validation-tck/impl and 33 other directories.

Author: hardy.ferentschik Date: 2009-04-17 11:00:35 -0400 (Fri, 17 Apr 2009) New Revision: 16353 Added: beanvalidation/trunk/validation-tck/impl/src/main/java/org/ beanvalidation/trunk/validation-tck/impl/src/main/java/org/hibernate/ beanvalidation/trunk/validation-tck/impl/src/main/java/org/hibernate/jsr303/ beanvalidation/trunk/validation-tck/impl/src/main/java/org/hibernate/jsr303/tck/ beanvalidation/trunk/validation-tck/impl/src/main/java/org/hibernate/jsr303/tck/tests/ beanvalidation/trunk/validation-tck/impl/src/main/java/org/hibernate/jsr303/tck/tests/BootstrapTest.java validator/trunk/hibernate-validator-archetype/src/main/resources/ validator/trunk/hibernate-validator-archetype/src/main/resources/log4j.properties validator/trunk/hibernate-validator-tck-runner/ validator/trunk/hibernate-validator-tck-runner/pom.xml validator/trunk/hibernate-validator-tck-runner/src/ validator/trunk/hibernate-validator-tck-runner/src/main/ validator/trunk/hibernate-validator-tck-runner/src/main/java/ validator/trunk/hibernate-validator-tck-runner/src/main/java/org/ validator/trunk/hibernate-validator-tck-runner/src/main/java/org/hibernate/ validator/trunk/hibernate-validator-tck-runner/src/main/java/org/hibernate/validation/ validator/trunk/hibernate-validator-tck-runner/src/main/java/org/hibernate/validation/test/ validator/trunk/hibernate-validator-tck-runner/src/main/java/org/hibernate/validation/test/StandaloneContainersImpl.java validator/trunk/hibernate-validator-tck-runner/src/main/resources/ validator/trunk/hibernate-validator-tck-runner/src/main/resources/META-INF/ validator/trunk/hibernate-validator-tck-runner/src/main/resources/META-INF/jboss-test-harness.properties validator/trunk/hibernate-validator-tck-runner/src/test/ validator/trunk/hibernate-validator-tck-runner/src/test/java/ validator/trunk/hibernate-validator-tck-runner/src/test/resources/ validator/trunk/hibernate-validator-tck-runner/src/test/resources/log4j.xml validator/trunk/hibernate-validator-tck-runner/src/test/resources/org/ validator/trunk/hibernate-validator-tck-runner/src/test/resources/org/jboss/ validator/trunk/hibernate-validator-tck-runner/src/test/resources/org/jboss/testharness/ validator/trunk/hibernate-validator-tck-runner/src/test/resources/org/jboss/testharness/impl/ validator/trunk/hibernate-validator-tck-runner/src/test/resources/org/jboss/testharness/impl/packaging/ validator/trunk/hibernate-validator-tck-runner/src/test/resources/org/jboss/testharness/impl/packaging/jsr299/ validator/trunk/hibernate-validator-tck-runner/src/test/resources/org/jboss/testharness/impl/packaging/jsr299/default/ validator/trunk/hibernate-validator-tck-runner/src/test/resources/org/jboss/testharness/impl/packaging/jsr299/default/beans.xml Removed: beanvalidation/trunk/validation-tck/api/ validator/trunk/tck-runner/ Modified: beanvalidation/trunk/validation-tck/impl/pom.xml beanvalidation/trunk/validation-tck/impl/src/main/resources/tck-tests.xml beanvalidation/trunk/validation-tck/pom.xml validator/trunk/hibernate-validator-archetype/pom.xml validator/trunk/hibernate-validator/pom.xml validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/engine/ConfigurationImpl.java validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/util/Version.java validator/trunk/pom.xml Log: Setting up the framework for the TCK Modified: beanvalidation/trunk/validation-tck/impl/pom.xml =================================================================== --- beanvalidation/trunk/validation-tck/impl/pom.xml 2009-04-16 02:06:20 UTC (rev 16352) +++ beanvalidation/trunk/validation-tck/impl/pom.xml 2009-04-17 15:00:35 UTC (rev 16353) @@ -3,12 +3,13 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <parent> - <artifactId>parent</artifactId> + <artifactId>jsr-303-tck-parent</artifactId> <groupId>org.hibernate.jsr303.tck</groupId> <version>1.0.0-SNAPSHOT</version> + <relativePath>../pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> - <artifactId>jsr299-tck-impl</artifactId> + <artifactId>jsr303-tck-impl</artifactId> <name>JSR-303 TCK tests and harness</name> <dependencies> @@ -17,10 +18,6 @@ <artifactId>validation-api</artifactId> </dependency> <dependency> - <groupId>org.hibernate.jsr303.tck</groupId> - <artifactId>jsr303-tck-api</artifactId> - </dependency> - <dependency> <groupId>org.jboss.test-harness</groupId> <artifactId>jboss-test-harness</artifactId> </dependency> @@ -197,14 +194,14 @@ </execution> </executions> <configuration> - <mainClass>org.jboss.jsr299.tck.api.TCK</mainClass> + <mainClass>org.hibernate.jsr303.tck.api.TCK</mainClass> <systemProperties> <systemProperty> <key>dumpArtifacts</key> <value>true</value> </systemProperty> <systemProperty> - <key>org.jboss.jsr299.tck.outputDirectory</key> + <key>org.hibernate.jsr299.tck.outputDirectory</key> <value>target/jsr299-artifacts</value> </systemProperty> <systemProperty> Added: beanvalidation/trunk/validation-tck/impl/src/main/java/org/hibernate/jsr303/tck/tests/BootstrapTest.java =================================================================== --- beanvalidation/trunk/validation-tck/impl/src/main/java/org/hibernate/jsr303/tck/tests/BootstrapTest.java (rev 0) +++ beanvalidation/trunk/validation-tck/impl/src/main/java/org/hibernate/jsr303/tck/tests/BootstrapTest.java 2009-04-17 15:00:35 UTC (rev 16353) @@ -0,0 +1,41 @@ +// $Id:$ +/* +* JBoss, Home of Professional Open Source +* Copyright 2008, Red Hat Middleware LLC, and individual contributors +* by the @authors tag. See the copyright.txt in the distribution for a +* full listing of individual contributors. +* +* Licensed 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 org.hibernate.jsr303.tck.tests; + +import javax.validation.Validation; +import javax.validation.Validator; +import javax.validation.ValidatorFactory; + +import org.jboss.testharness.impl.packaging.Artifact; +import org.jboss.testharness.AbstractTest; +import static org.testng.Assert.assertNotNull; +import org.testng.annotations.Test; + +/** + * @author Hardy Ferentschik + */ +@Artifact +public class BootstrapTest extends AbstractTest +{ + @Test + public void testGetDefaultValidator() { + ValidatorFactory factory = Validation.buildDefaultValidatorFactory(); + Validator validator = factory.getValidator(); + assertNotNull(validator, "We should be able to get a validator."); + } +} Modified: beanvalidation/trunk/validation-tck/impl/src/main/resources/tck-tests.xml =================================================================== --- beanvalidation/trunk/validation-tck/impl/src/main/resources/tck-tests.xml 2009-04-16 02:06:20 UTC (rev 16352) +++ beanvalidation/trunk/validation-tck/impl/src/main/resources/tck-tests.xml 2009-04-17 15:00:35 UTC (rev 16353) @@ -1,26 +1,9 @@ <!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd" > -<suite name="JSR-299 TCK" verbose="2" > - <test name="JSR-299 TCK" > - <method-selectors> - <method-selector> - <selector-class name="org.jboss.testharness.impl.testng.DisableIntegrationTestsMethodSelector" /> - </method-selector> - <method-selector> - <selector-class name="org.jboss.testharness.impl.testng.ExcludeIncontainerUnderInvestigationMethodSelector" /> - </method-selector> - </method-selectors> - <groups> - <run> - <exclude name="stub" /> - <exclude name="ri-broken" /> - <exclude name="underInvestigation" /> - <exclude name="broken" /> - </run> - </groups> - <packages> - <package name="org.jboss.jsr299.tck.tests" /> +<suite name="JSR-303-TCK" verbose="1" > + <test name="JSR-303-TCK" > + <packages> + <package name="org.hibernate.jsr303.tck.tests" /> </packages> - </test> - + </test> </suite> \ No newline at end of file Modified: beanvalidation/trunk/validation-tck/pom.xml =================================================================== --- beanvalidation/trunk/validation-tck/pom.xml 2009-04-16 02:06:20 UTC (rev 16352) +++ beanvalidation/trunk/validation-tck/pom.xml 2009-04-17 15:00:35 UTC (rev 16353) @@ -1,17 +1,17 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <groupId>org.hibernate.jsr303.tck</groupId> - <artifactId>parent</artifactId> + <artifactId>jsr303-tck-parent</artifactId> <packaging>pom</packaging> <version>1.0.0-SNAPSHOT</version> <name>JSR-303 TCK</name> <url>http://validator.hibernate.org</url> - - <description> - JSR-303 TCK - </description> - + + <description> JSR-303 TCK </description> + <developers> <developer> <id>epbernard</id> @@ -28,7 +28,7 @@ <url>http://in.relation.to/Bloggers/Hardy</url> </developer> </developers> - + <mailingLists> <mailingList> <name>hibernate-dev</name> @@ -37,7 +37,7 @@ </mailingLists> <modules> - <module>api</module> + <!--module>api</module--> <module>impl</module> </modules> @@ -107,17 +107,17 @@ </executions> </plugin> <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-release-plugin</artifactId> - <configuration> - <autoVersionSubmodules>true</autoVersionSubmodules> - <allowTimestampedSnapshots>true</allowTimestampedSnapshots> - </configuration> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-release-plugin</artifactId> + <configuration> + <autoVersionSubmodules>true</autoVersionSubmodules> + <allowTimestampedSnapshots>true</allowTimestampedSnapshots> + </configuration> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-enforcer-plugin</artifactId> - </plugin> + </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-assembly-plugin</artifactId> @@ -145,12 +145,8 @@ <configuration> <archive> <manifest> - <addDefaultImplementationEntries> - true - </addDefaultImplementationEntries> - <addDefaultSpecificationEntries> - true - </addDefaultSpecificationEntries> + <addDefaultImplementationEntries> true </addDefaultImplementationEntries> + <addDefaultSpecificationEntries> true </addDefaultSpecificationEntries> </manifest> </archive> </configuration> @@ -224,7 +220,7 @@ <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-assembly-plugin</artifactId> <version>2.2-beta-2</version> - </plugin> + </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-enforcer-plugin</artifactId> @@ -250,18 +246,18 @@ </execution> </executions> </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-release-plugin</artifactId> - <version>2.0-beta-8</version> - </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-release-plugin</artifactId> + <version>2.0-beta-8</version> + </plugin> </plugins> </pluginManagement> </build> - + <ciManagement> <system>Hudson</system> - <url /> + <url/> </ciManagement> <issueManagement> @@ -280,10 +276,8 @@ <scm> <connection>scm:svn:http://anonsvn.jboss.org/repos/hibernate/beanvalida... - <developerConnection> - scm:svn:https://svn.jboss.org/repos/hibernate/beanvalidation - </developerConnection> - <url></url> + <developerConnection> scm:svn:https://svn.jboss.org/repos/hibernate/beanvalidation </developerConnection> + <url/> </scm> <distributionManagement> @@ -300,5 +294,5 @@ <url>dav:https://snapshots.jboss.org/maven2</url> </snapshotRepository> </distributionManagement> - + </project> Modified: validator/trunk/hibernate-validator/pom.xml =================================================================== --- validator/trunk/hibernate-validator/pom.xml 2009-04-16 02:06:20 UTC (rev 16352) +++ validator/trunk/hibernate-validator/pom.xml 2009-04-17 15:00:35 UTC (rev 16353) @@ -18,6 +18,9 @@ </site> </distributionManagement> <dependencies> + <!-- + Compile time dependencies + --> <dependency> <groupId>javax.validation</groupId> <artifactId>validation-api</artifactId> @@ -32,43 +35,37 @@ <artifactId>jtype</artifactId> <version>0.1.0</version> </dependency> + + <!-- + Runtime dependencies + --> <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-log4j12</artifactId> <scope>runtime</scope> <optional>true</optional> </dependency> + <!-- - This is a temporary dependency. Do not use this dependecy in production. + Optional dependencies --> <dependency> + <!-- This is a temporary dependency. Do not use this dependecy in production. --> <groupId>org.hibernate.java-persistence</groupId> <artifactId>jpa-api</artifactId> <version>2.0.Beta1</version> <optional>true</optional> </dependency> + <!-- + Test dependencies + --> <dependency> <groupId>org.testng</groupId> <artifactId>testng</artifactId> - <version>5.8</version> <scope>test</scope> <classifier>jdk15</classifier> - <exclusions> - <exclusion> - <artifactId>junit</artifactId> - <groupId>junit</groupId> - </exclusion> - </exclusions> </dependency> - - <dependency> - <groupId>org.jboss.test-harness</groupId> - <artifactId>jboss-test-harness</artifactId> - <version>1.0.0-SNAPSHOT</version> - <scope>test</scope> - </dependency> - </dependencies> <build> <defaultGoal>test</defaultGoal> Modified: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/engine/ConfigurationImpl.java =================================================================== --- validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/engine/ConfigurationImpl.java 2009-04-16 02:06:20 UTC (rev 16352) +++ validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/engine/ConfigurationImpl.java 2009-04-17 15:00:35 UTC (rev 16353) @@ -389,6 +389,8 @@ return null; } + log.info( "{} found.", VALIDATION_XML_FILE ); + ValidationConfigType validationConfig = null; Schema schema = getValidationConfigurationSchema(); try { Modified: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/util/Version.java =================================================================== --- validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/util/Version.java 2009-04-16 02:06:20 UTC (rev 16352) +++ validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/util/Version.java 2009-04-17 15:00:35 UTC (rev 16353) @@ -53,7 +53,7 @@ else { version = manifest.getMainAttributes().getValue( Attributes.Name.IMPLEMENTATION_VERSION ); } - log.info( "Hibernate Commons Annotations {}", version ); + log.info( "Hibernate Validator {}", version ); } public static void touch() { Modified: validator/trunk/hibernate-validator-archetype/pom.xml =================================================================== --- validator/trunk/hibernate-validator-archetype/pom.xml 2009-04-16 02:06:20 UTC (rev 16352) +++ validator/trunk/hibernate-validator-archetype/pom.xml 2009-04-17 15:00:35 UTC (rev 16353) @@ -1,55 +1,51 @@ <?xml version="1.0" encoding="UTF-8"?> <project xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - <modelVersion>4.0.0</modelVersion> - <parent> - <artifactId>hibernate-validator-parent</artifactId> - <groupId>org.hibernate</groupId> - <version>4.0.0.Beta1-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> - </parent> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-validator-quickstart</artifactId> - <name>Hibernate Validator Quickstart</name> - <dependencies> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>4.5</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - <version>1.4.2</version> - <scope>runtime</scope> - </dependency> - <dependency> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-validator</artifactId> - <version>4.0.0.Beta1-SNAPSHOT</version> - </dependency> - </dependencies> - <build> - <plugins> - <plugin> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <source>1.5</source> - <target>1.5</target> - </configuration> - </plugin> - </plugins> - </build> - <repositories> - <repository> - <id>jboss</id> - <url>http://repository.jboss.com/maven2</url> - <releases> </releases> - <snapshots> - <enabled>false</enabled> - </snapshots> - </repository> - </repositories> + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <modelVersion>4.0.0</modelVersion> + <parent> + <artifactId>hibernate-validator-parent</artifactId> + <groupId>org.hibernate</groupId> + <version>4.0.0.Beta1-SNAPSHOT</version> + <relativePath>../pom.xml</relativePath> + </parent> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-validator-quickstart</artifactId> + <name>Hibernate Validator Quickstart</name> + <dependencies> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>4.5</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + <scope>runtime</scope> + </dependency> + <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-validator</artifactId> + <version>${version}</version> + </dependency> + </dependencies> + <build> + <defaultGoal>test</defaultGoal> + <plugins> + <plugin> + <artifactId>maven-compiler-plugin</artifactId> + <configuration> + <source>1.5</source> + <target>1.5</target> + </configuration> + </plugin> + </plugins> + </build> + <repositories> + <repository> + <id>jboss</id> + <url>http://repository.jboss.com/maven2</url> + </repository> + </repositories> </project> Added: validator/trunk/hibernate-validator-archetype/src/main/resources/log4j.properties =================================================================== --- validator/trunk/hibernate-validator-archetype/src/main/resources/log4j.properties (rev 0) +++ validator/trunk/hibernate-validator-archetype/src/main/resources/log4j.properties 2009-04-17 15:00:35 UTC (rev 16353) @@ -0,0 +1,22 @@ +### direct log messages to stdout ### +log4j.appender.stdout=org.apache.log4j.ConsoleAppender +log4j.appender.stdout.Target=System.out +log4j.appender.stdout.layout=org.apache.log4j.PatternLayout +log4j.appender.stdout.layout.ConversionPattern=%d{ABSOLUTE} %5p %c{1}:%L - %m%n + +### direct messages to file hibernate.log ### +log4j.appender.file=org.apache.log4j.FileAppender +log4j.appender.file.File=hibernate.log +log4j.appender.file.layout=org.apache.log4j.PatternLayout +log4j.appender.file.layout.ConversionPattern=%d{ABSOLUTE} %5p %c{1}:%L - %m%n + +### direct messages to socket - chainsaw ### +log4j.appender.socket=org.apache.log4j.net.SocketAppender +log4j.appender.socket.remoteHost=localhost +log4j.appender.socket.port=4560 +log4j.appender.socket.locationInfo=true + + +### set log levels - for more verbose logging change 'info' to 'debug' ### +log4j.rootLogger=debug, stdout + Copied: validator/trunk/hibernate-validator-tck-runner (from rev 16334, validator/trunk/tck-runner) Property changes on: validator/trunk/hibernate-validator-tck-runner ___________________________________________________________________ Name: svn:mergeinfo + Added: validator/trunk/hibernate-validator-tck-runner/pom.xml =================================================================== --- validator/trunk/hibernate-validator-tck-runner/pom.xml (rev 0) +++ validator/trunk/hibernate-validator-tck-runner/pom.xml 2009-04-17 15:00:35 UTC (rev 16353) @@ -0,0 +1,237 @@ +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <parent> + <artifactId>hibernate-validator-parent</artifactId> + <groupId>org.hibernate</groupId> + <version>4.0.0.Beta1-SNAPSHOT</version> + </parent> + <modelVersion>4.0.0</modelVersion> + <artifactId>hibernate-validator-tck-runner</artifactId> + <name>Hibernate Validator TCK Runner</name> + <description>Aggregates dependencies and run's the JSR-303 TCK</description> + + <dependencies> + <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-validator</artifactId> + <version>${version}</version> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + <scope>runtime</scope> + </dependency> + <dependency> + <groupId>org.testng</groupId> + <artifactId>testng</artifactId> + <classifier>jdk15</classifier> + </dependency> + <dependency> + <groupId>org.hibernate.jsr303.tck</groupId> + <artifactId>jsr303-tck-impl</artifactId> + <version>1.0.0-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>org.jboss.test-harness</groupId> + <artifactId>jboss-test-harness-jboss-as-50</artifactId> + <version>1.0.0-SNAPSHOT</version> + </dependency> + </dependencies> + + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + <executions> + <execution> + <id>copy</id> + <phase>generate-test-sources</phase> + <goals> + <goal>copy</goal> + </goals> + <configuration> + <stripVersion>true</stripVersion> + <artifactItems> + <artifactItem> + <groupId>org.hibernate.jsr303.tck</groupId> + <artifactId>jsr303-tck-impl</artifactId> + <type>xml</type> + <classifier>suite</classifier> + <overWrite>true</overWrite> + </artifactItem> + </artifactItems> + </configuration> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <suiteXmlFiles> + <suiteXmlFile>${project.build.directory}/dependency/jsr303-tck-impl-suite.xml</suiteXmlFile> + </suiteXmlFiles> + <argLine>-Xmx128m</argLine> + <forkMode>once</forkMode> + <redirectTestOutputToFile>true</redirectTestOutputToFile> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-report-plugin</artifactId> + <executions> + <execution> + <id>generate-test-report</id> + <phase>test</phase> + <goals> + <goal>report-only</goal> + </goals> + </execution> + </executions> + <configuration> + <outputDirectory>${project.build.directory}/surefire-reports</outputDirectory> + <outputName>test-report</outputName> + </configuration> + </plugin> + </plugins> + </build> + + <profiles> + <profile> + <id>incontainer-debug</id> + <activation> + <property> + <name>incontainer-debug</name> + </property> + </activation> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <suiteXmlFiles> + <suiteXmlFile>${project.build.directory}/dependency/jsr303-tck-impl-suite.xml + </suiteXmlFile> + </suiteXmlFiles> + <systemProperties> + <property> + <name>org.jboss.testharness.standalone</name> + <value>false</value> + </property> + <property> + <name>org.jboss.testharness.container.extraConfigurationDir</name> + <value>../jboss-as</value> + </property> + <property> + <name>org.jboss.testharness.container.forceRestart</name> + <value>false</value> + </property> + <property> + <name>org.jboss.testharness.libraryDirectory</name> + <value>target/dependency/lib</value> + </property> + <property> + <name>org.jboss.testharness.runIntegrationTests</name> + <value>true</value> + </property> + </systemProperties> + </configuration> + </plugin> + </plugins> + </build> + </profile> + <profile> + <id>incontainer</id> + <activation> + <property> + <name>incontainer</name> + </property> + </activation> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <suiteXmlFiles> + <suiteXmlFile>${project.build.directory}/dependency/jsr303-tck-impl-suite.xml + </suiteXmlFile> + </suiteXmlFiles> + <systemProperties> + <property> + <name>org.jboss.testharness.standalone</name> + <value>false</value> + </property> + <property> + <name>org.jboss.testharness.container.extraConfigurationDir</name> + <value>../jboss-as</value> + </property> + <property> + <name>org.jboss.testharness.container.forceRestart</name> + <value>true</value> + </property> + <property> + <name>org.jboss.testharness.runIntegrationTests</name> + <value>true</value> + </property> + <property> + <name>org.jboss.testharness.libraryDirectory</name> + <value>target/dependency/lib</value> + </property> + <property> + <name>org.jboss.testharness.outputDirectory</name> + <value>target</value> + </property> + </systemProperties> + </configuration> + </plugin> + </plugins> + </build> + </profile> + <profile> + <id>write-artifacts-to-disk</id> + <activation> + <property> + <name>dumpArtifacts</name> + </property> + </activation> + <build> + <plugins> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>exec-maven-plugin</artifactId> + <executions> + <execution> + <id>generate-jsr-303-artifacts</id> + <phase>generate-test-sources</phase> + <goals> + <goal>java</goal> + </goals> + </execution> + </executions> + <configuration> + <mainClass>org.jboss.testharness.api.TCK</mainClass> + <systemProperties> + <systemProperty> + <key>dumpArtifacts</key> + <value>true</value> + </systemProperty> + <systemProperty> + <key>org.jboss.testharness.outputDirectory</key> + <value>target/jsr303-artifacts</value> + </systemProperty> + <systemProperty> + <key>org.jboss.testharness.libraryDirectory</key> + <value>target/dependency/lib</value> + </systemProperty> + </systemProperties> + </configuration> + </plugin> + </plugins> + </build> + </profile> + </profiles> +</project> Added: validator/trunk/hibernate-validator-tck-runner/src/main/java/org/hibernate/validation/test/StandaloneContainersImpl.java =================================================================== --- validator/trunk/hibernate-validator-tck-runner/src/main/java/org/hibernate/validation/test/StandaloneContainersImpl.java (rev 0) +++ validator/trunk/hibernate-validator-tck-runner/src/main/java/org/hibernate/validation/test/StandaloneContainersImpl.java 2009-04-17 15:00:35 UTC (rev 16353) @@ -0,0 +1,28 @@ +package org.hibernate.validation.test; + +import java.net.URL; + +import org.jboss.testharness.api.DeploymentException; +import org.jboss.testharness.spi.StandaloneContainers; + +public class StandaloneContainersImpl implements StandaloneContainers { + public void deploy(Iterable<Class<?>> classes) throws DeploymentException { + //To change body of implemented methods use File | Settings | File Templates. + } + + public void undeploy() { + //To change body of implemented methods use File | Settings | File Templates. + } + + public void setup() { + //To change body of implemented methods use File | Settings | File Templates. + } + + public void cleanup() { + //To change body of implemented methods use File | Settings | File Templates. + } + + public void deploy(Iterable<Class<?>> classes, Iterable<URL> beansXmls) throws DeploymentException { + //To change body of implemented methods use File | Settings | File Templates. + } +} Added: validator/trunk/hibernate-validator-tck-runner/src/main/resources/META-INF/jboss-test-harness.properties =================================================================== --- validator/trunk/hibernate-validator-tck-runner/src/main/resources/META-INF/jboss-test-harness.properties (rev 0) +++ validator/trunk/hibernate-validator-tck-runner/src/main/resources/META-INF/jboss-test-harness.properties 2009-04-17 15:00:35 UTC (rev 16353) @@ -0,0 +1,3 @@ +org.jboss.testharness.spi.StandaloneContainers=org.hibernate.validation.test.StandaloneContainersImpl +org.jboss.testharness.api.TestLauncher=org.jboss.testharness.impl.runner.servlet.ServletTestLauncher +org.jboss.testharness.testPackage=org.hibernate.validation.tests \ No newline at end of file Added: validator/trunk/hibernate-validator-tck-runner/src/test/resources/log4j.xml =================================================================== --- validator/trunk/hibernate-validator-tck-runner/src/test/resources/log4j.xml (rev 0) +++ validator/trunk/hibernate-validator-tck-runner/src/test/resources/log4j.xml 2009-04-17 15:00:35 UTC (rev 16353) @@ -0,0 +1,36 @@ +<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE log4j:configuration SYSTEM "log4j.dtd"> + +<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false"> + + <appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender"> + <param name="Target" value="System.out"/> + <layout class="org.apache.log4j.PatternLayout"> + <!-- The default pattern: Date Priority [Category] Message\n --> + <param name="ConversionPattern" value="%d{ABSOLUTE} %-5p [%c{2}] %m%n"/> + </layout> + <filter class="org.apache.log4j.varia.StringMatchFilter"> + <param name="AcceptOnMatch" value="false"/> + <param name="StringToMatch" value="Failure while notifying an observer of event [a]"/> + </filter> + <filter class="org.apache.log4j.varia.StringMatchFilter"> + <param name="AcceptOnMatch" value="false"/> + <param name="StringToMatch" + value="Error destroying Request scoped unnamed simple bean org.jboss.jsr299.tck.tests.implementation.simple.lifecycle.Cod"/> + </filter> + </appender> + + <!-- ############### Categories ################# --> + <category name="org.hibernate"> + <priority value="DEBUG"/> + </category> + + <category name="org.jboss.testharness"> + <priority value="INFO"/> + </category> + + <root> + <priority value="INFO"/> + <appender-ref ref="CONSOLE"/> + </root> + +</log4j:configuration> Added: validator/trunk/hibernate-validator-tck-runner/src/test/resources/org/jboss/testharness/impl/packaging/jsr299/default/beans.xml =================================================================== Modified: validator/trunk/pom.xml =================================================================== --- validator/trunk/pom.xml 2009-04-16 02:06:20 UTC (rev 16352) +++ validator/trunk/pom.xml 2009-04-17 15:00:35 UTC (rev 16353) @@ -1,4 +1,6 @@ -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <groupId>org.hibernate</groupId> <artifactId>hibernate-validator-parent</artifactId> @@ -27,18 +29,19 @@ <url>http://in.relation.to/Bloggers/Hardy</url> </developer> </developers> - + <mailingLists> <mailingList> <name>hibernate-dev</name> <post&gt;hibernate-dev(a)lists.jboss.org&lt;/post&gt; </mailingList> </mailingLists> - + <modules> <module>hibernate-validator</module> <module>hibernate-validator-archetype</module> <module>hibernate-validator-legacy</module> + <module>hibernate-validator-tck-runner</module> </modules> <dependencyManagement> @@ -52,7 +55,13 @@ <groupId>org.slf4j</groupId> <artifactId>slf4j-log4j12</artifactId> <version>1.5.6</version> - </dependency> + </dependency> + <dependency> + <groupId>org.testng</groupId> + <artifactId>testng</artifactId> + <version>5.8</version> + <classifier>jdk15</classifier> + </dependency> </dependencies> </dependencyManagement> @@ -122,16 +131,16 @@ </descriptorRefs> </configuration> </plugin> - <plugin> - <artifactId>maven-release-plugin</artifactId> - <configuration> - <!-- - During release:perform, enable the "release" profile - --> - <releaseProfiles>release</releaseProfiles> - <goals>package site assembly:assembly</goals> - </configuration> - </plugin> + <plugin> + <artifactId>maven-release-plugin</artifactId> + <configuration> + <!-- + During release:perform, enable the "release" profile + --> + <releaseProfiles>release</releaseProfiles> + <goals>package site assembly:assembly</goals> + </configuration> + </plugin> </plugins> </pluginManagement> </build> @@ -217,7 +226,7 @@ <artifactId>maven-pmd-plugin</artifactId> <configuration> <targetJdk>1.5</targetJdk> - </configuration> + </configuration> </plugin> <plugin> <groupId>org.codehaus.mojo</groupId>