Hibernate SVN: r16451 - in beanvalidation/trunk/validation-tck: src/main/java/org/hibernate/jsr303/tck/tests/bootstrap/validationxml and 2 other directories.
by hibernate-commits＠lists.jboss.org
Author: hardy.ferentschik
Date: 2009-04-27 08:42:10 -0400 (Mon, 27 Apr 2009)
New Revision: 16451
Modified:
beanvalidation/trunk/validation-tck/pom.xml
beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/bootstrap/validationxml/ValidationXmlBootstrapTest.java
beanvalidation/trunk/validation-tck/src/main/resources/org/hibernate/jsr303/tck/tests/bootstrap/validationxml/validation.xml
beanvalidation/trunk/validation-tck/src/main/resources/tck-tests.xml
Log:
restructuring the tck project structure - for now we don't need the split between api/impl
Modified: beanvalidation/trunk/validation-tck/pom.xml
===================================================================
--- beanvalidation/trunk/validation-tck/pom.xml 2009-04-27 12:10:35 UTC (rev 16450)
+++ beanvalidation/trunk/validation-tck/pom.xml 2009-04-27 12:42:10 UTC (rev 16451)
@@ -6,7 +6,7 @@
<groupId>org.hibernate.jsr303.tck</groupId>
<artifactId>jsr303-tck</artifactId>
<packaging>jar</packaging>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0.Alpha1-SNAPSHOT</version>
<name>JSR-303 TCK</name>
<url>http://validator.hibernate.org</url>
@@ -36,7 +36,6 @@
</mailingList>
</mailingLists>
-
<dependencies>
<dependency>
<groupId>org.testng</groupId>
@@ -62,12 +61,12 @@
<dependency>
<groupId>org.jboss.test-harness</groupId>
<artifactId>jboss-test-harness-api</artifactId>
- <version>1.0.0.BETA2</version>
+ <version>1.0.0.Beta2</version>
</dependency>
<dependency>
<groupId>org.jboss.test-harness</groupId>
<artifactId>jboss-test-harness</artifactId>
- <version>1.0.0.BETA2</version>
+ <version>1.0.0.Beta2</version>
</dependency>
</dependencies>
@@ -201,11 +200,6 @@
<requireMavenVersion>
<version>2.0.9</version>
</requireMavenVersion>
- <requirePluginVersions>
- <unCheckedPlugins>
- <unCheckedPlugin>org.apache.maven.plugins:maven-eclipse-plugin</unCheckedPlugin>
- </unCheckedPlugins>
- </requirePluginVersions>
</rules>
</configuration>
</execution>
@@ -268,6 +262,7 @@
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>tck-utils-impl</artifactId>
+ <version>0.9.1</version>
</dependency>
</dependencies>
<build>
@@ -324,7 +319,7 @@
<classifier>audit</classifier>
</artifact>
<artifact>
- <file>../target/coverage.html</file>
+ <file>${basedir}/target/coverage.html</file>
<type>html</type>
<classifier>coverage</classifier>
</artifact>
Modified: beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/bootstrap/validationxml/ValidationXmlBootstrapTest.java
===================================================================
--- beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/bootstrap/validationxml/ValidationXmlBootstrapTest.java 2009-04-27 12:10:35 UTC (rev 16450)
+++ beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/bootstrap/validationxml/ValidationXmlBootstrapTest.java 2009-04-27 12:42:10 UTC (rev 16451)
@@ -20,6 +20,7 @@
import java.util.Set;
import javax.validation.ConstraintViolation;
import javax.validation.Validation;
+import javax.validation.ValidationException;
import javax.validation.Validator;
import javax.validation.ValidatorFactory;
@@ -28,9 +29,12 @@
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.Packaging;
+import org.jboss.testharness.impl.packaging.PackagingType;
import org.jboss.testharness.impl.packaging.IntegrationTest;
import static org.testng.Assert.assertEquals;
import static org.testng.Assert.assertNotNull;
+import static org.testng.Assert.fail;
import org.testng.annotations.Test;
import org.hibernate.jsr303.tck.tests.bootstrap.Person;
@@ -40,26 +44,19 @@
*/
@Artifact
@IntegrationTest
+(a)Packaging(PackagingType.WAR)
@Resources({
@Resource(destination = "WEB-INF/classes/META-INF/validation.xml", source = "validation.xml")
})
@Classes(Person.class)
public class ValidationXmlBootstrapTest extends AbstractTest {
@Test
- public void testGetValidatorConfiguredByValidationXml() {
- ValidatorFactory factory = Validation.buildDefaultValidatorFactory();
- Validator validator = factory.getValidator();
- assertNotNull( validator, "We should be able to get a validator." );
-
- Person person = new Person();
- person.setFirstName( "John" );
-
- Set<ConstraintViolation<Person>> constraintViolations = validator.validate( person );
- assertEquals( constraintViolations.size(), 1, "Wrong number of constraints" );
-
- person.setLastName( "Doe" );
-
- constraintViolations = validator.validate( person );
- assertEquals( constraintViolations.size(), 0, "Wrong number of constraints" );
+ public void testWrongProviderConfiguredInValidationXml() {
+ try {
+ ValidatorFactory factory = Validation.buildDefaultValidatorFactory();
+ fail();
+ } catch (ValidationException e) {
+
+ }
}
}
\ No newline at end of file
Modified: beanvalidation/trunk/validation-tck/src/main/resources/org/hibernate/jsr303/tck/tests/bootstrap/validationxml/validation.xml
===================================================================
--- beanvalidation/trunk/validation-tck/src/main/resources/org/hibernate/jsr303/tck/tests/bootstrap/validationxml/validation.xml 2009-04-27 12:10:35 UTC (rev 16450)
+++ beanvalidation/trunk/validation-tck/src/main/resources/org/hibernate/jsr303/tck/tests/bootstrap/validationxml/validation.xml 2009-04-27 12:42:10 UTC (rev 16451)
@@ -2,5 +2,5 @@
<validation-config xmlns="http://jboss.org/xml/ns/javax/validation/configuration"
xsi:schemaLocation="http://jboss.org/xml/ns/javax/validation/configuration validation-configuration-1.0.xsd"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <default-provider>org.hibernate.validation.engine.HibernateValidatorConfiguration</default-provider>
+ <default-provider>foo.bar.Provider</default-provider>
</validation-config>
\ No newline at end of file
Modified: beanvalidation/trunk/validation-tck/src/main/resources/tck-tests.xml
===================================================================
--- beanvalidation/trunk/validation-tck/src/main/resources/tck-tests.xml 2009-04-27 12:10:35 UTC (rev 16450)
+++ beanvalidation/trunk/validation-tck/src/main/resources/tck-tests.xml 2009-04-27 12:42:10 UTC (rev 16451)
@@ -2,6 +2,14 @@
<suite name="JSR-303-TCK" verbose="1">
<test name="JSR-303-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>
<packages>
<package name="org.hibernate.jsr303.tck.tests.bootstrap.defaultprovider"/>
<package name="org.hibernate.jsr303.tck.tests.bootstrap.validationxml"/>
15 years, 7 months
Hibernate SVN: r16450 - core/trunk/entitymanager/src/test/java/org/hibernate/ejb/test/ejb3configuration.
by hibernate-commits＠lists.jboss.org
Author: jcosta(a)redhat.com
Date: 2009-04-27 08:10:35 -0400 (Mon, 27 Apr 2009)
New Revision: 16450
Modified:
core/trunk/entitymanager/src/test/java/org/hibernate/ejb/test/ejb3configuration/ProgrammaticConfTest.java
Log:
EJB-433 - Added a call to getProperties, to make sure that create-drop is set.
Modified: core/trunk/entitymanager/src/test/java/org/hibernate/ejb/test/ejb3configuration/ProgrammaticConfTest.java
===================================================================
--- core/trunk/entitymanager/src/test/java/org/hibernate/ejb/test/ejb3configuration/ProgrammaticConfTest.java 2009-04-27 12:10:02 UTC (rev 16449)
+++ core/trunk/entitymanager/src/test/java/org/hibernate/ejb/test/ejb3configuration/ProgrammaticConfTest.java 2009-04-27 12:10:35 UTC (rev 16450)
@@ -24,6 +24,7 @@
Ejb3Configuration conf = new Ejb3Configuration();
conf.addAnnotatedClass( Cat.class );
conf.addAnnotatedClass( Kitten.class );
+ conf.addProperties(getProperties());
EntityManagerFactory emf = conf.buildEntityManagerFactory();
EntityManager em = emf.createEntityManager();
Cat cat = new Cat();
@@ -42,6 +43,7 @@
public void testProgrammaticCfg() throws Exception {
Ejb3Configuration conf = new Ejb3Configuration();
conf.configure( "org/hibernate/ejb/test/ejb3configuration/hibernate.cfg.xml" );
+ conf.addProperties(getProperties());
EntityManagerFactory emf = conf.buildEntityManagerFactory();
EntityManager em = emf.createEntityManager();
Cat cat = new Cat();
15 years, 7 months
Hibernate SVN: r16449 - entitymanager/branches/v3_4_0_GA_CP/src/test/org/hibernate/ejb/test/ejb3configuration.
by hibernate-commits＠lists.jboss.org
Author: jcosta(a)redhat.com
Date: 2009-04-27 08:10:02 -0400 (Mon, 27 Apr 2009)
New Revision: 16449
Modified:
entitymanager/branches/v3_4_0_GA_CP/src/test/org/hibernate/ejb/test/ejb3configuration/ProgrammaticConfTest.java
Log:
EJB-433 - Added a call to getProperties, to make sure that create-drop is set.
Modified: entitymanager/branches/v3_4_0_GA_CP/src/test/org/hibernate/ejb/test/ejb3configuration/ProgrammaticConfTest.java
===================================================================
--- entitymanager/branches/v3_4_0_GA_CP/src/test/org/hibernate/ejb/test/ejb3configuration/ProgrammaticConfTest.java 2009-04-27 12:09:49 UTC (rev 16448)
+++ entitymanager/branches/v3_4_0_GA_CP/src/test/org/hibernate/ejb/test/ejb3configuration/ProgrammaticConfTest.java 2009-04-27 12:10:02 UTC (rev 16449)
@@ -24,6 +24,7 @@
Ejb3Configuration conf = new Ejb3Configuration();
conf.addAnnotatedClass( Cat.class );
conf.addAnnotatedClass( Kitten.class );
+ conf.addProperties(getProperties());
EntityManagerFactory emf = conf.buildEntityManagerFactory();
EntityManager em = emf.createEntityManager();
Cat cat = new Cat();
@@ -42,6 +43,7 @@
public void testProgrammaticCfg() throws Exception {
Ejb3Configuration conf = new Ejb3Configuration();
conf.configure( "org/hibernate/ejb/test/ejb3configuration/hibernate.cfg.xml" );
+ conf.addProperties(getProperties());
EntityManagerFactory emf = conf.buildEntityManagerFactory();
EntityManager em = emf.createEntityManager();
Cat cat = new Cat();
15 years, 7 months
Hibernate SVN: r16448 - entitymanager/branches/v3_3_2_GA_CP/src/test/org/hibernate/ejb/test/ejb3configuration.
by hibernate-commits＠lists.jboss.org
Author: jcosta(a)redhat.com
Date: 2009-04-27 08:09:49 -0400 (Mon, 27 Apr 2009)
New Revision: 16448
Modified:
entitymanager/branches/v3_3_2_GA_CP/src/test/org/hibernate/ejb/test/ejb3configuration/ProgrammaticConfTest.java
Log:
EJB-433 - Added a call to getProperties, to make sure that create-drop is set.
Modified: entitymanager/branches/v3_3_2_GA_CP/src/test/org/hibernate/ejb/test/ejb3configuration/ProgrammaticConfTest.java
===================================================================
--- entitymanager/branches/v3_3_2_GA_CP/src/test/org/hibernate/ejb/test/ejb3configuration/ProgrammaticConfTest.java 2009-04-27 09:43:36 UTC (rev 16447)
+++ entitymanager/branches/v3_3_2_GA_CP/src/test/org/hibernate/ejb/test/ejb3configuration/ProgrammaticConfTest.java 2009-04-27 12:09:49 UTC (rev 16448)
@@ -21,6 +21,7 @@
public void testProgrammaticAPI() throws Exception {
Ejb3Configuration conf = new Ejb3Configuration();
conf.addAnnotatedClass( Cat.class );
+ conf.addProperties(getProperties());
EntityManagerFactory emf = conf.buildEntityManagerFactory();
EntityManager em = emf.createEntityManager();
Cat cat = new Cat();
@@ -39,6 +40,7 @@
public void testProgrammaticCfg() throws Exception {
Ejb3Configuration conf = new Ejb3Configuration();
conf.configure( "org/hibernate/ejb/test/ejb3configuration/hibernate.cfg.xml" );
+ conf.addProperties(getProperties());
EntityManagerFactory emf = conf.buildEntityManagerFactory();
EntityManager em = emf.createEntityManager();
Cat cat = new Cat();
15 years, 7 months
Hibernate SVN: r16447 - in validator/trunk: hibernate-validator-tck-runner and 1 other directory.
by hibernate-commits＠lists.jboss.org
Author: hardy.ferentschik
Date: 2009-04-27 05:43:36 -0400 (Mon, 27 Apr 2009)
New Revision: 16447
Modified:
validator/trunk/hibernate-validator-tck-runner/pom.xml
validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/engine/ValidatorImplTest.java
Log:
getting ready for release
Modified: validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/engine/ValidatorImplTest.java
===================================================================
--- validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/engine/ValidatorImplTest.java 2009-04-27 09:39:13 UTC (rev 16446)
+++ validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/engine/ValidatorImplTest.java 2009-04-27 09:43:36 UTC (rev 16447)
@@ -123,7 +123,7 @@
}
try {
- validator.validateValue( null, "firstName", "foobar" );
+ validator.validateValue( null, "firstName", "foobar" );
fail();
}
catch ( IllegalArgumentException e ) {
Modified: validator/trunk/hibernate-validator-tck-runner/pom.xml
===================================================================
--- validator/trunk/hibernate-validator-tck-runner/pom.xml 2009-04-27 09:39:13 UTC (rev 16446)
+++ validator/trunk/hibernate-validator-tck-runner/pom.xml 2009-04-27 09:43:36 UTC (rev 16447)
@@ -33,13 +33,13 @@
</dependency>
<dependency>
<groupId>org.hibernate.jsr303.tck</groupId>
- <artifactId>jsr303-tck-impl</artifactId>
+ <artifactId>jsr303-tck</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>
+ <version>1.0.0.BETA2</version>
</dependency>
</dependencies>
@@ -60,7 +60,7 @@
<artifactItems>
<artifactItem>
<groupId>org.hibernate.jsr303.tck</groupId>
- <artifactId>jsr303-tck-impl</artifactId>
+ <artifactId>jsr303-tck</artifactId>
<type>xml</type>
<classifier>suite</classifier>
<overWrite>true</overWrite>
@@ -94,7 +94,7 @@
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<suiteXmlFiles>
- <suiteXmlFile>${project.build.directory}/dependency/jsr303-tck-impl-suite.xml</suiteXmlFile>
+ <suiteXmlFile>${project.build.directory}/dependency/jsr303-tck-suite.xml</suiteXmlFile>
</suiteXmlFiles>
<argLine>-Xmx128m</argLine>
<forkMode>pertest</forkMode>
15 years, 7 months
Hibernate SVN: r16446 - beanvalidation/trunk/validation-tck.
by hibernate-commits＠lists.jboss.org
Author: hardy.ferentschik
Date: 2009-04-27 05:39:13 -0400 (Mon, 27 Apr 2009)
New Revision: 16446
Removed:
beanvalidation/trunk/validation-tck/impl/
Log:
restructuring the tck project structure - for now we don't need the split between api/impl
15 years, 7 months
Hibernate SVN: r16445 - beanvalidation/trunk/validation-tck/impl.
by hibernate-commits＠lists.jboss.org
Author: hardy.ferentschik
Date: 2009-04-27 05:38:50 -0400 (Mon, 27 Apr 2009)
New Revision: 16445
Removed:
beanvalidation/trunk/validation-tck/impl/pom.xml
beanvalidation/trunk/validation-tck/impl/src/
Log:
restructuring the tck project structure - for now we don't need the split between api/impl
Deleted: beanvalidation/trunk/validation-tck/impl/pom.xml
===================================================================
--- beanvalidation/trunk/validation-tck/impl/pom.xml 2009-04-27 09:35:20 UTC (rev 16444)
+++ beanvalidation/trunk/validation-tck/impl/pom.xml 2009-04-27 09:38:50 UTC (rev 16445)
@@ -1,219 +0,0 @@
-<?xml version="1.0"?>
-<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>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>jsr303-tck-impl</artifactId>
- <name>JSR-303 TCK tests and harness</name>
-
- <dependencies>
- <dependency>
- <groupId>javax.validation</groupId>
- <artifactId>validation-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.test-harness</groupId>
- <artifactId>jboss-test-harness</artifactId>
- </dependency>
- <dependency>
- <groupId>org.testng</groupId>
- <artifactId>testng</artifactId>
- <classifier>jdk15</classifier>
- </dependency>
- <dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>tck-utils-api</artifactId>
- </dependency>
- </dependencies>
-
- <build>
- <defaultGoal>install</defaultGoal>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>build-helper-maven-plugin</artifactId>
- <version>1.2</version>
- <executions>
- <execution>
- <id>attach-artifacts</id>
- <phase>package</phase>
- <goals>
- <goal>attach-artifact</goal>
- </goals>
- <configuration>
- <artifacts>
- <artifact>
- <file>${basedir}/src/main/resources/tck-tests.xml</file>
- <type>xml</type>
- <classifier>suite</classifier>
- </artifact>
- <artifact>
- <file>${basedir}/src/main/resources/tck-audit.xml</file>
- <type>xml</type>
- <classifier>audit</classifier>
- </artifact>
- </artifacts>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-dependency-plugin</artifactId>
- <executions>
- <execution>
- <id>copy-in-container-dependencies</id>
- <phase>compile</phase>
- <goals>
- <goal>copy</goal>
- </goals>
- <configuration>
- <outputDirectory>${project.build.outputDirectory}/lib</outputDirectory>
- <stripVersion>true</stripVersion>
- <artifactItems>
- <artifactItem>
- <groupId>org.jboss.test-harness</groupId>
- <artifactId>jboss-test-harness</artifactId>
- <overWrite>true</overWrite>
- </artifactItem>
- </artifactItems>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
- <profiles>
- <profile>
- <id>tck-audit</id>
- <activation>
- <property>
- <name>tck-audit</name>
- </property>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>tck-utils-impl</artifactId>
- </dependency>
- </dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- <compilerArgument>-AauditXml=${basedir}/src/main/resources/tck-audit.xml</compilerArgument>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-enforcer-plugin</artifactId>
- <executions>
- <execution>
- <id>enforce-versions</id>
- <goals>
- <goal>enforce</goal>
- </goals>
- <configuration>
- <rules>
- <requireJavaVersion>
- <version>1.6</version>
- </requireJavaVersion>
- </rules>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>build-helper-maven-plugin</artifactId>
- <version>1.2</version>
- <executions>
- <execution>
- <id>attach-artifacts</id>
- <phase>package</phase>
- <goals>
- <goal>attach-artifact</goal>
- </goals>
- <configuration>
- <artifacts>
- <artifact>
- <file>${basedir}/src/main/resources/tck-tests.xml</file>
- <type>xml</type>
- <classifier>suite</classifier>
- </artifact>
- <artifact>
- <file>${basedir}/src/main/resources/tck-audit.xml</file>
- <type>xml</type>
- <classifier>audit</classifier>
- </artifact>
- <artifact>
- <file>../target/coverage.html</file>
- <type>html</type>
- <classifier>coverage</classifier>
- </artifact>
- </artifacts>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- <defaultGoal>compile</defaultGoal>
- </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>package</phase>
- <goals>
- <goal>java</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <classpathScope>test</classpathScope>
- <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/jsr303-artifacts/dependencies</value>
- </systemProperty>
- </systemProperties>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
-</project>
15 years, 7 months
Hibernate SVN: r16444 - in beanvalidation/trunk/validation-tck: impl/src and 5 other directories.
by hibernate-commits＠lists.jboss.org
Author: hardy.ferentschik
Date: 2009-04-27 05:35:20 -0400 (Mon, 27 Apr 2009)
New Revision: 16444
Added:
beanvalidation/trunk/validation-tck/apl.txt
beanvalidation/trunk/validation-tck/src/main/java/
beanvalidation/trunk/validation-tck/src/main/resources/
beanvalidation/trunk/validation-tck/src/test/
Removed:
beanvalidation/trunk/validation-tck/impl/src/main/java/
beanvalidation/trunk/validation-tck/impl/src/main/resources/
beanvalidation/trunk/validation-tck/impl/src/test/
Modified:
beanvalidation/trunk/validation-tck/pom.xml
beanvalidation/trunk/validation-tck/src/main/assembly/assembly.xml
beanvalidation/trunk/validation-tck/src/main/resources/tck-audit.xml
Log:
restructuring the tck project structure - for now we don't need the split between api/impl
Added: beanvalidation/trunk/validation-tck/apl.txt
===================================================================
--- beanvalidation/trunk/validation-tck/apl.txt (rev 0)
+++ beanvalidation/trunk/validation-tck/apl.txt 2009-04-27 09:35:20 UTC (rev 16444)
@@ -0,0 +1,202 @@
+
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
+ APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "[]"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+ Copyright [yyyy] [name of copyright owner]
+
+ 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.
Modified: beanvalidation/trunk/validation-tck/pom.xml
===================================================================
--- beanvalidation/trunk/validation-tck/pom.xml 2009-04-27 08:37:59 UTC (rev 16443)
+++ beanvalidation/trunk/validation-tck/pom.xml 2009-04-27 09:35:20 UTC (rev 16444)
@@ -4,13 +4,13 @@
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>jsr303-tck-parent</artifactId>
- <packaging>pom</packaging>
+ <artifactId>jsr303-tck</artifactId>
+ <packaging>jar</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>
@@ -36,53 +36,41 @@
</mailingList>
</mailingLists>
- <modules>
- <!--module>api</module-->
- <module>impl</module>
- </modules>
- <dependencyManagement>
- <dependencies>
+ <dependencies>
+ <dependency>
+ <groupId>org.testng</groupId>
+ <artifactId>testng</artifactId>
+ <version>5.8</version>
+ <classifier>jdk15</classifier>
+ </dependency>
+ <dependency>
+ <groupId>javax.validation</groupId>
+ <artifactId>validation-api</artifactId>
+ <version>1.0.CR2</version>
+ </dependency>
+ <dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>tck-utils-api</artifactId>
+ <version>0.9.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>tck-utils-impl</artifactId>
+ <version>0.9.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.test-harness</groupId>
+ <artifactId>jboss-test-harness-api</artifactId>
+ <version>1.0.0.BETA2</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.test-harness</groupId>
+ <artifactId>jboss-test-harness</artifactId>
+ <version>1.0.0.BETA2</version>
+ </dependency>
+ </dependencies>
- <dependency>
- <groupId>org.testng</groupId>
- <artifactId>testng</artifactId>
- <version>5.8</version>
- <classifier>jdk15</classifier>
- </dependency>
- <dependency>
- <groupId>javax.validation</groupId>
- <artifactId>validation-api</artifactId>
- <version>1.0.CR2-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.hibernate.jsr303.tck</groupId>
- <artifactId>jsr303-tck-api</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>tck-utils-api</artifactId>
- <version>0.9.1-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>tck-utils-impl</artifactId>
- <version>0.9.1-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.test-harness</groupId>
- <artifactId>jboss-test-harness-api</artifactId>
- <version>1.0.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.test-harness</groupId>
- <artifactId>jboss-test-harness</artifactId>
- <version>1.0.0-SNAPSHOT</version>
- </dependency>
- </dependencies>
- </dependencyManagement>
-
<build>
<defaultGoal>install</defaultGoal>
<extensions>
@@ -94,7 +82,59 @@
</extensions>
<plugins>
<plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <version>1.2</version>
+ <executions>
+ <execution>
+ <id>attach-artifacts</id>
+ <phase>package</phase>
+ <goals>
+ <goal>attach-artifact</goal>
+ </goals>
+ <configuration>
+ <artifacts>
+ <artifact>
+ <file>${basedir}/src/main/resources/tck-tests.xml</file>
+ <type>xml</type>
+ <classifier>suite</classifier>
+ </artifact>
+ <artifact>
+ <file>${basedir}/src/main/resources/tck-audit.xml</file>
+ <type>xml</type>
+ <classifier>audit</classifier>
+ </artifact>
+ </artifacts>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>copy-in-container-dependencies</id>
+ <phase>compile</phase>
+ <goals>
+ <goal>copy</goal>
+ </goals>
+ <configuration>
+ <outputDirectory>${project.build.outputDirectory}/lib</outputDirectory>
+ <stripVersion>true</stripVersion>
+ <artifactItems>
+ <artifactItem>
+ <groupId>org.jboss.test-harness</groupId>
+ <artifactId>jboss-test-harness</artifactId>
+ <overWrite>true</overWrite>
+ </artifactItem>
+ </artifactItems>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<executions>
<execution>
@@ -107,19 +147,14 @@
</executions>
</plugin>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
<configuration>
- <autoVersionSubmodules>true</autoVersionSubmodules>
- <allowTimestampedSnapshots>true</allowTimestampedSnapshots>
+ <releaseProfiles>release</releaseProfiles>
+ <goals>install</goals>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-enforcer-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<configuration>
<descriptors>
@@ -153,76 +188,6 @@
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-report-plugin</artifactId>
- <version>2.4.3</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>2.4.3</version>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>properties-maven-plugin</artifactId>
- <version>1.0-alpha-1</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-clean-plugin</artifactId>
- <version>2.2</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-deploy-plugin</artifactId>
- <version>2.4</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-install-plugin</artifactId>
- <version>2.2</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-site-plugin</artifactId>
- <version>2.0-beta-6</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-source-plugin</artifactId>
- <version>2.0.4</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-resources-plugin</artifactId>
- <version>2.2</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <version>2.2</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-dependency-plugin</artifactId>
- <version>2.0</version>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>exec-maven-plugin</artifactId>
- <version>1.1</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <version>2.4</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-assembly-plugin</artifactId>
- <version>2.2-beta-2</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
<version>1.0-alpha-4</version>
<executions>
@@ -246,11 +211,6 @@
</execution>
</executions>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-release-plugin</artifactId>
- <version>2.0-beta-8</version>
- </plugin>
</plugins>
</pluginManagement>
</build>
@@ -262,7 +222,7 @@
<issueManagement>
<system>JIRA</system>
- <url>http://opensource.atlassian.com/projects/hibernate/browse/BVAL-99</url>
+ <url>http://opensource.atlassian.com/projects/hibernate/browse/BVAL</url>
</issueManagement>
<inceptionYear>2008</inceptionYear>
@@ -275,8 +235,9 @@
</licenses>
<scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/hibernate/beanvalidation</connection>
- <developerConnection> scm:svn:https://svn.jboss.org/repos/hibernate/beanvalidation </developerConnection>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/hibernate/beanvalidation/trunk/val...</connection>
+ <developerConnection>
+ scm:svn:https://svn.jboss.org/repos/hibernate/beanvalidation/trunk/valida...</developerConnection>
<url/>
</scm>
@@ -295,4 +256,135 @@
</snapshotRepository>
</distributionManagement>
+ <profiles>
+ <profile>
+ <id>tck-audit</id>
+ <activation>
+ <property>
+ <name>tck-audit</name>
+ </property>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>tck-utils-impl</artifactId>
+ </dependency>
+ </dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.5</source>
+ <target>1.5</target>
+ <compilerArgument>-AauditXml=${basedir}/src/main/resources/tck-audit.xml</compilerArgument>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-enforcer-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>enforce-versions</id>
+ <goals>
+ <goal>enforce</goal>
+ </goals>
+ <configuration>
+ <rules>
+ <requireJavaVersion>
+ <version>1.6</version>
+ </requireJavaVersion>
+ </rules>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <version>1.2</version>
+ <executions>
+ <execution>
+ <id>attach-artifacts</id>
+ <phase>package</phase>
+ <goals>
+ <goal>attach-artifact</goal>
+ </goals>
+ <configuration>
+ <artifacts>
+ <artifact>
+ <file>${basedir}/src/main/resources/tck-tests.xml</file>
+ <type>xml</type>
+ <classifier>suite</classifier>
+ </artifact>
+ <artifact>
+ <file>${basedir}/src/main/resources/tck-audit.xml</file>
+ <type>xml</type>
+ <classifier>audit</classifier>
+ </artifact>
+ <artifact>
+ <file>../target/coverage.html</file>
+ <type>html</type>
+ <classifier>coverage</classifier>
+ </artifact>
+ </artifacts>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ <defaultGoal>compile</defaultGoal>
+ </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>package</phase>
+ <goals>
+ <goal>java</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <classpathScope>test</classpathScope>
+ <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/jsr303-artifacts/dependencies</value>
+ </systemProperty>
+ </systemProperties>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ <profile>
+ <id>release</id>
+ <properties>
+ <createChecksum>true</createChecksum>
+ </properties>
+ </profile>
+ </profiles>
</project>
Modified: beanvalidation/trunk/validation-tck/src/main/assembly/assembly.xml
===================================================================
--- beanvalidation/trunk/validation-tck/src/main/assembly/assembly.xml 2009-04-27 08:37:59 UTC (rev 16443)
+++ beanvalidation/trunk/validation-tck/src/main/assembly/assembly.xml 2009-04-27 09:35:20 UTC (rev 16444)
@@ -8,6 +8,16 @@
<formats>
<format>zip</format>
</formats>
+ <dependencySets>
+ <dependencySet>
+ <useProjectArtifact>true</useProjectArtifact>
+ <outputDirectory>lib</outputDirectory>
+ <scope>runtime</scope>
+ <excludes>
+ <exclude>com.googlecode.jtype:jtype</exclude>
+ </excludes>
+ </dependencySet>
+ </dependencySets>
<fileSets>
<fileSet>
<directory>${project.basedir}</directory>
@@ -23,7 +33,7 @@
<useDefaultExcludes/>
</fileSet>
<fileSet>
- <directory>${project.basedir}/impl/src/main/resources</directory>
+ <directory>${project.basedir}/src/main/resources</directory>
<outputDirectory>lib</outputDirectory>
<includes>
<include>tck-tests.xml</include>
@@ -45,16 +55,4 @@
</includes>
</fileSet>
</fileSets>
-
- <moduleSets>
- <moduleSet>
- <includes>
- <include>org.hibernate.jsr303.tck:jsr303-tck-impl</include>
- </includes>
- <binaries>
- <outputDirectory>lib</outputDirectory>
- <unpack>false</unpack>
- </binaries>
- </moduleSet>
- </moduleSets>
</assembly>
Copied: beanvalidation/trunk/validation-tck/src/main/java (from rev 16400, beanvalidation/trunk/validation-tck/impl/src/main/java)
Copied: beanvalidation/trunk/validation-tck/src/main/resources (from rev 16400, beanvalidation/trunk/validation-tck/impl/src/main/resources)
Modified: beanvalidation/trunk/validation-tck/src/main/resources/tck-audit.xml
===================================================================
--- beanvalidation/trunk/validation-tck/impl/src/main/resources/tck-audit.xml 2009-04-22 11:12:04 UTC (rev 16400)
+++ beanvalidation/trunk/validation-tck/src/main/resources/tck-audit.xml 2009-04-27 09:35:20 UTC (rev 16444)
@@ -6,34 +6,6 @@
version="Revised Public Review Draft">
<section id="2" title="Bean definition">
-
- <assertion id="a">
- <text>A bean comprises of a (nonempty) set of bean types</text>
- </assertion>
-
- <assertion id="b">
- <text>A bean comprises of a (nonempty) set of bindings</text>
- </assertion>
-
- <assertion id="c">
- <text>A bean comprises of a scope</text>
- </assertion>
-
- <assertion id="d">
- <text>A bean comprises of a deployment type</text>
- </assertion>
-
- <assertion id="e">
- <text>A bean comprises of an optional bean name</text>
- </assertion>
-
- <assertion id="f">
- <text>A bean comprises of a set of interceptor bindings</text>
- </assertion>
-
- <assertion id="g">
- <text>A bean comprises of a bean implementation</text>
- </assertion>
</section>
</specification>
Copied: beanvalidation/trunk/validation-tck/src/test (from rev 16400, beanvalidation/trunk/validation-tck/impl/src/test)
15 years, 7 months
Hibernate SVN: r16443 - validator/trunk.
by hibernate-commits＠lists.jboss.org
Author: hardy.ferentschik
Date: 2009-04-27 04:37:59 -0400 (Mon, 27 Apr 2009)
New Revision: 16443
Modified:
validator/trunk/pom.xml
Log:
Changes BV API version.
Modified: validator/trunk/pom.xml
===================================================================
--- validator/trunk/pom.xml 2009-04-27 08:13:59 UTC (rev 16442)
+++ validator/trunk/pom.xml 2009-04-27 08:37:59 UTC (rev 16443)
@@ -49,7 +49,7 @@
<dependency>
<groupId>javax.validation</groupId>
<artifactId>validation-api</artifactId>
- <version>1.0.CR2-SNAPSHOT</version>
+ <version>1.0.CR2</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
15 years, 7 months