Author: pete.muir(a)jboss.org Date: 2009-10-16 12:52:50 -0400 (Fri, 16 Oct 2009) New Revision: 4149 Modified: cdi-tck/trunk/dist/readme.txt cdi-tck/trunk/doc/reference/en-US/configuration.xml cdi-tck/trunk/doc/reference/en-US/eclipse-running.xml cdi-tck/trunk/doc/reference/en-US/executing.xml cdi-tck/trunk/doc/reference/en-US/installation.xml cdi-tck/trunk/doc/reference/en-US/introduction.xml Log: CDITCK-40 Modified: cdi-tck/trunk/dist/readme.txt =================================================================== --- cdi-tck/trunk/dist/readme.txt 2009-10-16 15:12:28 UTC (rev 4148) +++ cdi-tck/trunk/dist/readme.txt 2009-10-16 16:52:50 UTC (rev 4149) @@ -13,15 +13,29 @@ This distribution consists of: -src/ - -- TCK sources (tests porting package API) +artifacts/ + -- TCK binaries, sources, javadoc, packaged as jars + -- specification audit (source and report) + -- TestNG suite.xml file for running the TCK +doc/ + -- Reference guide for the TCK + lib/ - -- Libraries for running the TCK including binaries of the TCK + -- Libraries dependencies for running the TCK + +weld/ + -- TCK runner for using Weld (the CDI RI) with JBoss AS + + jboss-as/ + -- configuration for running the TCK with JBoss AS -coverage.html - -- Test coverage report + jboss-tck-runner/ + -- maven based TCK runner for JBoss AS + lib/ + -- all libraries for the Weld implementation of the CDI porting package + Generating the TCK audit coverage report ---------------------------------------- Modified: cdi-tck/trunk/doc/reference/en-US/configuration.xml =================================================================== --- cdi-tck/trunk/doc/reference/en-US/configuration.xml 2009-10-16 15:12:28 UTC (rev 4148) +++ cdi-tck/trunk/doc/reference/en-US/configuration.xml 2009-10-16 16:52:50 UTC (rev 4149) @@ -104,7 +104,7 @@ To run the full TCK you must additionally implement <literal>org.jboss.testharness.spi.Containers</literal>, which handles deploying the test artifact to the container. An - implementations of this API is already available for JBoss AS 5.1. + implementations of this API is already available for JBoss AS 5.2. Therefore, you only need to implement this part of the porting package if you wish to use another container. </para> Modified: cdi-tck/trunk/doc/reference/en-US/eclipse-running.xml =================================================================== --- cdi-tck/trunk/doc/reference/en-US/eclipse-running.xml 2009-10-16 15:12:28 UTC (rev 4148) +++ cdi-tck/trunk/doc/reference/en-US/eclipse-running.xml 2009-10-16 16:52:50 UTC (rev 4149) @@ -76,7 +76,7 @@ <para> <emphasis role="bold">Weld JBoss TCK Runner</emphasis> - Groups the porting package implementation and TCK runner projects - that are configured to certify Weld deployed on JBoss AS 5.1 + that are configured to certify Weld deployed on JBoss AS 5.2 </para> </listitem> </orderedlist> @@ -238,7 +238,7 @@ <para> Let's see what has to be done to execute an integration test. This will result in the artifact being deployed to the container, which is - JBoss AS 5.1 if you are using the JBoss TCK runner. + JBoss AS 5.2 if you are using the JBoss TCK runner. </para> </section> <section id="eclipse-in-container"> @@ -275,7 +275,7 @@ - the relative path from the jboss-tck-impl project to a directory that contains a build.properties or local.build.properties file defining the location of a JBoss AS - 5.1 installation in the + 5.2 installation in the <literal>jboss.home</literal> property </para> @@ -373,7 +373,7 @@ </orderedlist> <para> When you run the test this time, it should pass. If you get a - failure that the container (e.g., JBoss AS 5.1) must be run with + failure that the container (e.g., JBoss AS 5.2) must be run with assertions enabled, you need to stop the container and start it with the -ea flag (or just leave it stopped and the test will start it appropriately). Modified: cdi-tck/trunk/doc/reference/en-US/executing.xml =================================================================== --- cdi-tck/trunk/doc/reference/en-US/executing.xml 2009-10-16 15:12:28 UTC (rev 4148) +++ cdi-tck/trunk/doc/reference/en-US/executing.xml 2009-10-16 16:52:50 UTC (rev 4149) @@ -17,7 +17,7 @@ phase of the Maven 2 life cycle. The execution happens within a TCK runner project (as opposed to the TCK project itself). Weld includes a TCK runner project that executes the CDI TCK on Weld - running inside JBoss AS 5.1. To execute the CDI TCK on your own CDI + running inside JBoss AS 5.2. To execute the CDI TCK on your own CDI implementation, you could modify the TCK runner project included with Weld to use your CDI implementation as described in <xref linkend="configuration" />. @@ -88,7 +88,7 @@ deploy the test artifact to the container and execute the test in a true Java EE life cycle. The JBoss TCK runner has a dependency on the library that provides an implementation of this interface for JBoss AS - 5.1. + 5.2. </para> <para> Since in-container tests are executed in a remote JVM, the results of Modified: cdi-tck/trunk/doc/reference/en-US/installation.xml =================================================================== --- cdi-tck/trunk/doc/reference/en-US/installation.xml 2009-10-16 15:12:28 UTC (rev 4148) +++ cdi-tck/trunk/doc/reference/en-US/installation.xml 2009-10-16 16:52:50 UTC (rev 4149) @@ -21,7 +21,7 @@ <code>/lib</code>. </para> <para> - You can also download the currnet source code from + You can also download the current source code from <ulink url="http://anonsvn.jboss.org/repos/weld/cdi-tck/trunk">JBoss SVN repository</ulink>. </para> <para> @@ -37,14 +37,14 @@ </para> <para> The JSR-299: Contexts and Dependency Injection for Java EE 1.0 - reference implementation (RI) project is named . You can + reference implementation (RI) project is named Weld. You can obtain the latest release from the <ulink url="http://seamframework.org/Download">download page</ulink> on Seam Framework website. </para> <note> <para> - is not required for running the CDI TCK, but it can be + Weld is not required for running the CDI TCK, but it can be used as a reference for familiarizing yourself with the TCK before testing your own CDI implementation. </para> @@ -72,7 +72,7 @@ </listitem> <listitem> <para> - Java EE 5 or better (e.g., JBoss AS 5.x or GlassFish V3) + Java EE 6 preview or better (e.g., JBoss AS 5.2.x or GlassFish V3) </para> </listitem> </itemizedlist> @@ -111,26 +111,25 @@ <tip id="tck-in-jboss-as"> <title> - Running the TCK against the CDI RI () and JBoss AS + Running the TCK against the CDI RI (Weld) and JBoss AS </title> <para> - is built as a modular library, and as such can be - retro-fitted to Java EE 5 products as required. JBoss AS 5.1 and - above releases bundle . JBoss AS 5.1 also allows you to - upgrade the module to the current release (though some - functionality may be disabled). + Weld is built as a modular library, and as such can be + retro-fitted to Java EE 5 products as required. JBoss AS 5.2 and + above releases bundle Weld. To run the TCK with JBoss AS, you must + use JBoss AS 5.2 or above. </para> <para> - To install JBoss AS 5.1 and update to the latest + To install JBoss AS 5.2 and update to the latest release: </para> <itemizedlist> <listitem> <para> - First, you should download JBoss AS 5.1 from the JBoss AS + First, you should download JBoss AS 5.2 from the JBoss AS <ulink url="http://jboss.org/jbossas/downloads">project page</ulink>. </para> </listitem> @@ -143,33 +142,22 @@ </listitem> <listitem> <para> - Change to the weld directory. + Change to the <literal>weld</literal> directory in the TCK. </para> </listitem> <listitem> <para> - Make sure the + Create a file called <literal>local.build.properties</literal> + in <literal>weld/jboss-as</literal> and make sure the <literal>jboss.home</literal> - property in the local.build.properties file in the jboss-as - directory references a JBoss AS 5.1 installation: + property references a JBoss AS 5.2 installation: </para> - <programlisting>jboss.home=/path/to/jboss-as-5.1</programlisting> + <programlisting>jboss.home=/path/to/jboss-as-5.2</programlisting> </listitem> - <listitem> - <para> - Then, run Ant from the jboss-as directory to install the - deployer: - </para> - <programlisting>ant update</programlisting> - <para> - The libraries needed by the deployer are fetched from the - Maven 2 repository on demand. - </para> - </listitem> </itemizedlist> <para> - includes a TCK runner that executes the TCK using Web + The CDI TCK includes a TCK runner that executes the TCK using Web Beans as the CDI implementation and JBoss AS as the Java EE runtime. To run the tck: </para> @@ -181,17 +169,14 @@ install Maven 2 in the <ulink url="http://www.sonatype.com/books/maven-book/reference/installation...: The Definitive Guide</ulink> - book published by Sonatype. bundles a copy of Maven - in the - <code>lib/maven</code> - directory. + book published by Sonatype. </para> </listitem> <listitem> <para> Next, instruct Maven to run the TCK: </para> - <programlisting><![CDATA[cd jboss-tck-runner + <programlisting><![CDATA[cd weld/jboss-tck-runner mvn test -Dincontainer]]></programlisting> </listitem> <listitem> Modified: cdi-tck/trunk/doc/reference/en-US/introduction.xml =================================================================== --- cdi-tck/trunk/doc/reference/en-US/introduction.xml 2009-10-16 15:12:28 UTC (rev 4148) +++ cdi-tck/trunk/doc/reference/en-US/introduction.xml 2009-10-16 16:52:50 UTC (rev 4149) @@ -270,14 +270,14 @@ <para> Sun Microsystems, Inc. will implement the porting package for the CDI RI and test the CDI RI on the Java EE Reference - Implementation as well as other platforms. + Implementation . </para> </note> <para>The CDI TCK has been tested run on following platforms:</para> <itemizedlist> <listitem> <para> - JBoss AS 5.1.0.GA using Sun Java SE 6 on Red Hat Enterprise + JBoss AS 5.2.0.Beta1 using Sun Java SE 6 on Red Hat Enterprise Linux 5.2 </para> </listitem>