BVTCK-10 Making the TCK a reactor build.

Renaming packages and files to get rid of explicit jsr303 references. Using beanvalidation instead.
jakartaee · Oct 1, 2012 · 9c65cc3 · 9c65cc3
1 parent 37e4cb9
commit 9c65cc3
Show file tree

Hide file tree

Showing 345 changed files with 3,112 additions and 2,429 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,4 @@
 # Typically *NIX text editors, by default, append '~' to files on saving to make backups
 *~
+.#*
 
diff --git a/distribution/pom.xml b/distribution/pom.xml
@@ -0,0 +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>
+        <groupId>org.hibernate.beanvalidation.tck</groupId>
+        <artifactId>tck-parent</artifactId>
+        <version>1.1.0-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <artifactId>beanvalidation-tck-distribution</artifactId>
+
+    <name>JSR-349 TCK Distribution</name>
+    <description>JSR-349 TCK Distribution</description>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.hibernate.beanvalidation.tck</groupId>
+            <artifactId>beanvalidation-tck</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-assembly-plugin</artifactId>
+                <configuration>
+                    <descriptors>
+                        <descriptor>${basedir}/src/main/assembly/dist.xml</descriptor>
+                    </descriptors>
+                    <finalName>beanvalidation-tck-dist-${project.version}</finalName>
+                    <tarLongFileMode>gnu</tarLongFileMode>
+                </configuration>
+                <executions>
+                    <execution>
+                        <id>make-assembly</id>
+                        <phase>install</phase>
+                        <goals>
+                            <goal>single</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+</project>
diff --git a/src/main/assembly/assembly.xml → distribution/src/main/assembly/dist.xml b/src/main/assembly/assembly.xml → distribution/src/main/assembly/dist.xml
@@ -4,49 +4,43 @@
           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
           xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
     <id>dist</id>
-    <baseDirectory>jsr303-tck-${project.version}</baseDirectory>
+    <baseDirectory>beanvalidation-tck-dist-${project.version}</baseDirectory>
     <formats>
+        <format>tar.gz</format>
         <format>zip</format>
     </formats>
     <dependencySets>
         <dependencySet>
-            <useProjectArtifact>false</useProjectArtifact>
+            <outputDirectory>artifacts</outputDirectory>
+            <useTransitiveDependencies>false</useTransitiveDependencies>
+            <includes>
+                <include>org.hibernate.beanvalidation.tck:beanvalidation-tck</include>
+            </includes>
+        </dependencySet>
+
+        <dependencySet>
             <outputDirectory>lib</outputDirectory>
-            <scope>runtime</scope>
+            <useTransitiveDependencies>true</useTransitiveDependencies>
+            <excludes>
+                <exclude>org.hibernate.beanvalidation.tck:beanvalidation-tck</exclude>
+            </excludes>
         </dependencySet>
     </dependencySets>
     <fileSets>
         <fileSet>
-            <directory>target</directory>
-            <outputDirectory>artifacts</outputDirectory>
-            <excludes>
-                <exclude>*-javadoc.jar</exclude>
-                <exclude>*-sources.jar</exclude>
-            </excludes>
-            <includes>
-                <include>jsr303-tck-*.jar</include>
-            </includes>
-        </fileSet>
-        <fileSet>
-            <directory>target/docbook/publish/en-US</directory>
+            <directory>../documentation/target/docbook/publish/en-US</directory>
             <outputDirectory>docs/manual</outputDirectory>
         </fileSet>
         <fileSet>
-            <directory>${project.basedir}</directory>
-            <outputDirectory>.</outputDirectory>
-            <includes>
-                <include>**/pom.xml</include>
-                <include>**/src/**</include>
-            </includes>
+            <directory>..</directory>
+            <outputDirectory>src</outputDirectory>
             <excludes>
-                <exclude>**/src/main/assembly/**</exclude>
-                <exclude>**/bin/**</exclude>
                 <exclude>**/target/**</exclude>
             </excludes>
             <useDefaultExcludes/>
         </fileSet>
         <fileSet>
-            <directory>${project.basedir}/src/main/resources</directory>
+            <directory>../tck/src/main/resources</directory>
             <outputDirectory>/artifacts</outputDirectory>
             <includes>
                 <include>tck-audit.xml</include>
@@ -58,14 +52,14 @@
             </includes>
         </fileSet>
         <fileSet>
-            <directory>${project.basedir}/target</directory>
+            <directory>../tck/target</directory>
             <outputDirectory>/artifacts</outputDirectory>
             <includes>
                 <include>coverage.html</include>
             </includes>
         </fileSet>
         <fileSet>
-            <directory>${project.basedir}</directory>
+            <directory>..</directory>
             <outputDirectory>/</outputDirectory>
             <includes>
                 <include>license.txt</include>

diff --git a/documentation/pom.xml b/documentation/pom.xml
@@ -0,0 +1,90 @@
+<?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>
+        <groupId>org.hibernate.beanvalidation.tck</groupId>
+        <artifactId>tck-parent</artifactId>
+        <version>1.1.0-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <artifactId>beanvalidation-tck-documentation</artifactId>
+    <packaging>jdocbook</packaging>
+
+    <name>JSR-349 TCK Documentation</name>
+    <description>>Bean Validation TCK Documentation</description>
+
+    <properties>
+        <jdocbookSourceDirectory>${basedir}/src/main/docbook</jdocbookSourceDirectory>
+        <jdocbook.ignoreTranslations>true</jdocbook.ignoreTranslations>
+        <!-- Skip artifact deployment -->
+        <maven.deploy.skip>true</maven.deploy.skip>
+    </properties>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.jboss.maven.plugins</groupId>
+                <artifactId>maven-jdocbook-plugin</artifactId>
+                <configuration>
+                    <sourceDirectory>${jdocbookSourceDirectory}</sourceDirectory>
+                    <sourceDocumentName>master.xml</sourceDocumentName>
+                    <masterTranslation>en-US</masterTranslation>
+                    <!--
+                    The jdookbook plug-in doesn't define an expression for this property, therefore
+                    it can't be passed on the command line. To address this issue the value is retrieved
+                    from a custom property, which itself can be set using -DignoreTranslations=...
+                    -->
+                    <ignoreTranslations>${jdocbook.ignoreTranslations}</ignoreTranslations>
+                    <formats>
+                        <format>
+                            <formatName>pdf</formatName>
+                            <stylesheetResource>classpath:/xslt/org/hibernate/jdocbook/xslt/pdf.xsl
+                            </stylesheetResource>
+                            <finalName>beanvalidation-tck-documentation.pdf</finalName>
+                        </format>
+                        <format>
+                            <formatName>html_single</formatName>
+                            <stylesheetResource>classpath:/xslt/org/hibernate/jdocbook/xslt/xhtml-single.xsl
+                            </stylesheetResource>
+                            <finalName>index.html</finalName>
+                        </format>
+                        <format>
+                            <formatName>html</formatName>
+                            <stylesheetResource>classpath:/xslt/org/hibernate/jdocbook/xslt/xhtml.xsl
+                            </stylesheetResource>
+                            <finalName>index.html</finalName>
+                        </format>
+                    </formats>
+                    <options>
+                        <xincludeSupported>true</xincludeSupported>
+                        <xmlTransformerType>saxon</xmlTransformerType>
+                        <!-- needed for uri-resolvers; can be ommitted if using 'current' uri scheme -->
+                        <!--     could also locate the docbook dependency and inspect its version... -->
+                        <docbookVersion>1.72.0</docbookVersion>
+                        <localeSeparator>-</localeSeparator>
+                        <injectionDateFormat>yyyy-MM-dd</injectionDateFormat>
+                    </options>
+                    <profiling>
+                        <enabled>false</enabled>
+                    </profiling>
+                </configuration>
+                <executions>
+                    <execution>
+                        <!--
+                            here we are attaching the translate goal so that the translations are processed
+                            before compilation so that the translated XML is also transformed during
+                            generation
+                        -->
+                        <phase>process-resources</phase>
+                        <goals>
+                            <goal>translate</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+</project>
diff --git a/...book/en-US/background/appeals-process.xml → ...book/en-US/background/appeals-process.xml b/...book/en-US/background/appeals-process.xml → ...book/en-US/background/appeals-process.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
 "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-<!ENTITY % BOOK_ENTITIES SYSTEM "../jsr303-tck.ent">
+<!ENTITY % BOOK_ENTITIES SYSTEM "../tck.ent">
 %BOOK_ENTITIES;
 ]>
 <chapter id="appeals-process">

diff --git a/...ocbook/en-US/background/configuration.xml → ...ocbook/en-US/background/configuration.xml b/...ocbook/en-US/background/configuration.xml → ...ocbook/en-US/background/configuration.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
 "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-<!ENTITY % BOOK_ENTITIES SYSTEM "../jsr303-tck.ent">
+<!ENTITY % BOOK_ENTITIES SYSTEM "../tck.ent">
 %BOOK_ENTITIES;
 ]>
 <chapter id="configuration">
@@ -37,19 +37,19 @@
     for an implementation to pass the TCK. This file also allows tests to be
     excluded from a run:</para>
 
-    <programlisting>&lt;suite name="JSR-303 TCK" verbose="2"&gt;
+    <programlisting><![CDATA[&lt;suite name="JSR-303 TCK" verbose="2"&gt;
    &lt;test name="JSR-303 TCK"&gt;
       ...
       &lt;classes&gt;
-         &lt;class name="org.hibernate.jsr303.tck.tests.bootstrap.ValidationProviderTest"&gt;
+         &lt;class name="org.hibernate.beanvalidation.tck.tests.bootstrap.ValidationProviderTest"&gt;
             &lt;methods&gt;
                &lt;exclude name="testFirstMatchingValidationProviderResolverIsReturned"/&gt;
             &lt;/methods&gt;
          &lt;/class&gt;
       &lt;/classes&gt;
       ...
    &lt;/test&gt;
-&lt;/suite&gt;</programlisting>
+&lt;/suite&gt;]]></programlisting>
 
     <para>TestNG provides extensive reporting information. Depending on the
     build tool or IDE you use, the reporting will take a different format.

diff --git a/...docbook/en-US/background/installation.xml → ...docbook/en-US/background/installation.xml b/...docbook/en-US/background/installation.xml → ...docbook/en-US/background/installation.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
 "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-<!ENTITY % BOOK_ENTITIES SYSTEM "../jsr303-tck.ent">
+<!ENTITY % BOOK_ENTITIES SYSTEM "../tck.ent">
 %BOOK_ENTITIES;
 ]>
 <chapter id="installation">
@@ -27,7 +27,7 @@
     url="https://github.com/beanvalidation/beanvalidation-tck">https://github.com/beanvalidation/beanvalidation-tck</ulink>.</para>
 
     <para>The TCK project is available in the JBoss Maven repository as
-    <filename>org.hibernate.jsr303.tck<code>:</code>org.hibernate.jsr303.tck</filename>
+    <filename>org.hibernate.beanvalidation.tck<code>:</code>beanvalidation-tck</filename>
     the POM defines all dependencies required to run the TCK.</para>
 
     <para>Executing the TCK requires a Java EE 6 or better runtime environment

diff --git a/...docbook/en-US/background/introduction.xml → ...docbook/en-US/background/introduction.xml b/...docbook/en-US/background/introduction.xml → ...docbook/en-US/background/introduction.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
 "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-<!ENTITY % BOOK_ENTITIES SYSTEM "../jsr303-tck.ent">
+<!ENTITY % BOOK_ENTITIES SYSTEM "../tck.ent">
 %BOOK_ENTITIES;
 ]>
 <chapter id="introduction">

diff --git a/...in/docbook/en-US/background/reporting.xml → ...in/docbook/en-US/background/reporting.xml b/...in/docbook/en-US/background/reporting.xml → ...in/docbook/en-US/background/reporting.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
 "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-<!ENTITY % BOOK_ENTITIES SYSTEM "../jsr303-tck.ent">
+<!ENTITY % BOOK_ENTITIES SYSTEM "../tck.ent">
 %BOOK_ENTITIES;
 ]>
 <chapter id="reporting">

diff --git a/src/main/docbook/en-US/bookinfo.xml → ...ation/src/main/docbook/en-US/bookinfo.xml b/src/main/docbook/en-US/bookinfo.xml → ...ation/src/main/docbook/en-US/bookinfo.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
 "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-<!ENTITY % BOOK_ENTITIES SYSTEM "jsr303-tck.ent">
+<!ENTITY % BOOK_ENTITIES SYSTEM "tck.ent">
 %BOOK_ENTITIES;
 ]>
 <bookinfo>

diff --git a/...docbook/en-US/execution/executing-tmp.xml → ...docbook/en-US/execution/executing-tmp.xml b/...docbook/en-US/execution/executing-tmp.xml → ...docbook/en-US/execution/executing-tmp.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
 "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-<!ENTITY % BOOK_ENTITIES SYSTEM "../jsr303-tck.ent">
+<!ENTITY % BOOK_ENTITIES SYSTEM "../tck.ent">
 %BOOK_ENTITIES;
 ]>
 <chapter id="executing-test-harness">
@@ -67,7 +67,7 @@
           </row>
 
           <row>
-            <entry>org.hibernate.jsr303.tck</entry>
+            <entry>org.hibernate.beanvalidation.tck</entry>
 
             <entry>jsr303-tck</entry>
 

diff --git a/...ain/docbook/en-US/execution/executing.xml → ...ain/docbook/en-US/execution/executing.xml b/...ain/docbook/en-US/execution/executing.xml → ...ain/docbook/en-US/execution/executing.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-<!ENTITY % BOOK_ENTITIES SYSTEM "../jsr303-tck.ent">
+<!ENTITY % BOOK_ENTITIES SYSTEM "../tck.ent">
 %BOOK_ENTITIES;
 ]>
 <chapter id="executing">

diff --git a/src/main/docbook/en-US/execution/sigtest.xml → .../main/docbook/en-US/execution/sigtest.xml b/src/main/docbook/en-US/execution/sigtest.xml → .../main/docbook/en-US/execution/sigtest.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
 "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-<!ENTITY % BOOK_ENTITIES SYSTEM "../jsr303-tck.ent">
+<!ENTITY % BOOK_ENTITIES SYSTEM "../tck.ent">
 %BOOK_ENTITIES;
 ]>
 <chapter id="sigtest">

diff --git a/src/main/docbook/en-US/master.xml → ...ntation/src/main/docbook/en-US/master.xml b/src/main/docbook/en-US/master.xml → ...ntation/src/main/docbook/en-US/master.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
 "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-<!ENTITY % BOOK_ENTITIES SYSTEM "jsr303-tck.ent">
+<!ENTITY % BOOK_ENTITIES SYSTEM "tck.ent">
 %BOOK_ENTITIES;
 ]>
 <book lang="en">

diff --git a/src/main/docbook/en-US/preface.xml → ...tation/src/main/docbook/en-US/preface.xml b/src/main/docbook/en-US/preface.xml → ...tation/src/main/docbook/en-US/preface.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
 "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-<!ENTITY % BOOK_ENTITIES SYSTEM "jsr303-tck.ent">
+<!ENTITY % BOOK_ENTITIES SYSTEM "tck.ent">
 %BOOK_ENTITIES;
 ]>
 <preface id="book-preface">
@@ -78,24 +78,15 @@
         <para><xref linkend="reporting"/> explains the test reports that are
         generated by the TCK test suite and introduces the TCK audit report as
         a tool for measuring the completeness of the TCK in testing the
-        JSR-303 specification and in understanding how test cases relate to the
-        specification.</para>
+        JSR-303 specification and in understanding how test cases relate to
+        the specification.</para>
       </listitem>
 
       <listitem>
         <para><xref linkend="executing"/> documents how the TCK test suite is
         executed. It covers both modes supported by the TCK, standalone and
         in-container, and shows how to dump the generated test artifacts to
-        disk.</para>
-      </listitem>
-
-      <listitem>
-        <para><xref linkend="test-harness"/> includes excerpts from the JBoss
-        Test Harness Reference Guide. How to configure the JBoss Test Harness
-        as it relates to the Bean Validation TCK is presented in <xref
-        linkend="configuration"/>. However, to aid in debugging or configuring
-        the TCK in your environment, you may want to read in more detail how
-        to use the JBoss Test Harness.</para>
+        disk</para>
       </listitem>
     </itemizedlist>
   </section>

diff --git a/src/main/docbook/en-US/jsr303-tck.ent → documentation/src/main/docbook/en-US/tck.ent b/src/main/docbook/en-US/jsr303-tck.ent → documentation/src/main/docbook/en-US/tck.ent