Author: pete.muir(a)jboss.org Date: 2009-10-14 12:12:45 -0400 (Wed, 14 Oct 2009) New Revision: 4063 Added: cdi-tck/trunk/dist/release-notes.txt Modified: cdi-tck/trunk/dist/src/main/assembly/assembly.xml cdi-tck/trunk/doc/reference/en-US/configuration.xml cdi-tck/trunk/doc/reference/en-US/eclipse-debugging.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/part-execution.xml cdi-tck/trunk/doc/reference/pom.xml cdi-tck/trunk/pom.xml Log: update ref doc, add release notes Added: cdi-tck/trunk/dist/release-notes.txt =================================================================== --- cdi-tck/trunk/dist/release-notes.txt (rev 0) +++ cdi-tck/trunk/dist/release-notes.txt 2009-10-14 16:12:45 UTC (rev 4063) @@ -0,0 +1,12 @@ +------------- +* 1.0.0.CR1 * +------------- + +Known Issues +------------- + +These known issues will be fixed for 1.0.0.CR2 + +* CDITCK-34: log4j-1.2.14.jar must be included on the server classpath +* CDITCK-37: harness tries to load classes from WEB-INF/classes, which the servlet spec doesn't require to be supported +* CDITCK-38: coverage for 11.4, 11.5.6, 11.5.8 and 12.3 is low Modified: cdi-tck/trunk/dist/src/main/assembly/assembly.xml =================================================================== --- cdi-tck/trunk/dist/src/main/assembly/assembly.xml 2009-10-14 15:38:19 UTC (rev 4062) +++ cdi-tck/trunk/dist/src/main/assembly/assembly.xml 2009-10-14 16:12:45 UTC (rev 4063) @@ -17,6 +17,7 @@ <includes> <include>readme.txt</include> <include>apl.txt</include> + <include>release-notes.txt</include> </includes> </fileSet> </fileSets> Modified: cdi-tck/trunk/doc/reference/en-US/configuration.xml =================================================================== --- cdi-tck/trunk/doc/reference/en-US/configuration.xml 2009-10-14 15:38:19 UTC (rev 4062) +++ cdi-tck/trunk/doc/reference/en-US/configuration.xml 2009-10-14 16:12:45 UTC (rev 4063) @@ -212,7 +212,7 @@ <para> It's beyond the scope of this guide to describe in how to set up your build environment to run the TCK. The JBoss Test Harness guide - describes how Web Beans uses Maven 2 to execute the CDI TCK. See + describes how Weld uses Maven 2 to execute the CDI TCK. See <xref linkend="test-suite-runner" />. The TestNG documentation provides extensive information on launching TestNG using the Java, Ant, Eclipse or IntellJ IDEA. Modified: cdi-tck/trunk/doc/reference/en-US/eclipse-debugging.xml =================================================================== --- cdi-tck/trunk/doc/reference/en-US/eclipse-debugging.xml 2009-10-14 15:38:19 UTC (rev 4062) +++ cdi-tck/trunk/doc/reference/en-US/eclipse-debugging.xml 2009-10-14 16:12:45 UTC (rev 4063) @@ -13,14 +13,13 @@ There is almost no difference in how you debug a standalone test from how you run it. With the test class open in the Eclipse editor, simply right click in the editor view and select Debug As &gt; TestNG - Test. Eclipse will stop at any breakpoints you set just like it would - with any other local debug process. + Test. Eclipse will stop at any breakpoints you set just like it would with any other local debug process. </para> <para> - If you plan to step into a class in a Web Beans implementation (or any + If you plan to step into a class in the Weld implementation (or any other dependent library), you must ensure that the source is properly associated with the library. Below are the steps to follow to associate - the source of Web Beans with the TestNG debug configuration: + the source of Weld with the TestNG debug configuration: </para> <orderedlist> <listitem> Modified: cdi-tck/trunk/doc/reference/en-US/eclipse-running.xml =================================================================== --- cdi-tck/trunk/doc/reference/en-US/eclipse-running.xml 2009-10-14 15:38:19 UTC (rev 4062) +++ cdi-tck/trunk/doc/reference/en-US/eclipse-running.xml 2009-10-14 16:12:45 UTC (rev 4063) @@ -36,9 +36,9 @@ <para> With the m2eclipse plugin installed, Eclipse should recognize the - CDI TCK projects as valid Eclipse projects (or any Web Beans project + CDI TCK projects as valid Eclipse projects (or any Weld project for that matter). Import them into the Eclipse workspace at this time. - You should also import the Web Beans projects if you want to debug into + You should also import the Weld projects if you want to debug into that code, which is covered later. </para> <tip> @@ -62,8 +62,8 @@ <orderedlist> <listitem> <para> - <emphasis role="bold">Web Beans</emphasis> - Groups the CDI API - and the CDI RI (i.e., Web Beans) projects + <emphasis role="bold">Weld</emphasis> - Groups the CDI API + and the CDI RI (i.e., Weld) projects </para> </listitem> <listitem> @@ -74,9 +74,9 @@ </listitem> <listitem> <para> - <emphasis role="bold">Web Beans JBoss TCK Runner</emphasis> - + <emphasis role="bold">Weld JBoss TCK Runner</emphasis> - Groups the porting package implementation and TCK runner projects - that are configured to certify Web Beans deployed on JBoss AS 5.1 + that are configured to certify Weld deployed on JBoss AS 5.1 </para> </listitem> </orderedlist> @@ -102,7 +102,7 @@ jsr299-tck-api jsr299-tck-impl jsr299-tck-parent -Web Beans JBoss TCK Runner +Weld JBoss TCK Runner weld-jboss-tck-runner weld-porting-package]]></programlisting> <para> @@ -436,7 +436,7 @@ Eclipse classpath. </para> <para> - You have now mastered running the CDI TCK against Web Beans using + You have now mastered running the CDI TCK against Weld using both Maven 2 and within Eclipse. Now you're likely interested in how to debug a test so that you can efficiently investigate test failures. </para> Modified: cdi-tck/trunk/doc/reference/en-US/executing.xml =================================================================== --- cdi-tck/trunk/doc/reference/en-US/executing.xml 2009-10-14 15:38:19 UTC (rev 4062) +++ cdi-tck/trunk/doc/reference/en-US/executing.xml 2009-10-14 16:12:45 UTC (rev 4063) @@ -3,7 +3,7 @@ <chapter id="executing"> <title>Executing the Test Suite</title> <para> - This chapter explains how to run the TCK on Web Beans as well as your own + This chapter explains how to run the TCK on Weld as well as your own implementation. The CDI TCK uses the Maven 2 TestNG plugin and the JBoss Test Harness to execute the test suite. Learning to execute the test suite from Maven 2 is prerequisite knowlege for running the tests in an IDE, @@ -15,11 +15,11 @@ <para> The test suite is executed by the Maven 2 TestNG plugin during the test phase of the Maven 2 life cycle. The execution happens within a TCK - runner project (as opposed to the TCK project itself). Web Beans - includes a TCK runner project that executes the CDI TCK on Web Beans + 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 implementation, you could modify the TCK runner project included with - Web Beans to use your CDI implementation as described in <xref + Weld to use your CDI implementation as described in <xref linkend="configuration" />. </para> </section> @@ -27,8 +27,8 @@ <section> <title>Running the Tests In Standalone Mode</title> <para> - To execute the TCK test suite against Web Beans, first switch to the - jboss-tck-runner directory in the extracted Web Beans distribution: + To execute the TCK test suite against Weld, first switch to the + jboss-tck-runner directory in the extracted Weld distribution: </para> <programlisting>cd weld/jboss-tck-runner</programlisting> Modified: cdi-tck/trunk/doc/reference/en-US/installation.xml =================================================================== --- cdi-tck/trunk/doc/reference/en-US/installation.xml 2009-10-14 15:38:19 UTC (rev 4062) +++ cdi-tck/trunk/doc/reference/en-US/installation.xml 2009-10-14 16:12:45 UTC (rev 4063) @@ -37,14 +37,14 @@ </para> <para> The JSR-299: Contexts and Dependency Injection for Java EE 1.0 - reference implementation (RI) project is named Web Beans. You can - obtain the latest Web Beans release from the + reference implementation (RI) project is named . You can + obtain the latest release from the <ulink url="http://seamframework.org/Download">download page</ulink> on Seam Framework website. </para> <note> <para> - Web Beans is not required for running the CDI TCK, but it can be + 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> @@ -111,19 +111,19 @@ <tip id="tck-in-jboss-as"> <title> - Running the TCK against the CDI RI (Web Beans) and JBoss AS + Running the TCK against the CDI RI () and JBoss AS </title> <para> - Web Beans is built as a modular library, and as such can be + 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 Web Beans. JBoss AS 5.1 also allows you to - upgrade the Web Beans module to the current release (though some + above releases bundle . JBoss AS 5.1 also allows you to + upgrade the module to the current release (though some functionality may be disabled). </para> <para> - To install JBoss AS 5.1 and update to the latest Web Beans + To install JBoss AS 5.1 and update to the latest release: </para> @@ -169,7 +169,7 @@ </itemizedlist> <para> - Web Beans includes a TCK runner that executes the TCK using Web + 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,7 +181,7 @@ install Maven 2 in the <ulink url="http://www.sonatype.com/books/maven-book/reference/installation...: The Definitive Guide</ulink> - book published by Sonatype. Web Beans bundles a copy of Maven + book published by Sonatype. bundles a copy of Maven in the <code>lib/maven</code> directory. @@ -231,7 +231,7 @@ <section id="m2eclipse-plugin"> <title>Maven 2 Plugin (m2eclipse)</title> <para> - Another useful plugin is m2eclipse. Both the TCK project and Web Beans + Another useful plugin is m2eclipse. Both the TCK project and are use Maven 2. Therefore, to work with these projects in Eclipse, you may wish to have native support for Maven 2 projects, which the m2eclipse plugin provides. Instructions for using the m2eclipse update site to @@ -255,7 +255,7 @@ <para> Again, the Eclipse plugins are not required to execute the TCK, but can be very helpful when validating an implementation against the TCK - test suite and especially when using the modules from the Web Beans + test suite and especially when using the modules from the project. </para> </section> Modified: cdi-tck/trunk/doc/reference/en-US/part-execution.xml =================================================================== --- cdi-tck/trunk/doc/reference/en-US/part-execution.xml 2009-10-14 15:38:19 UTC (rev 4062) +++ cdi-tck/trunk/doc/reference/en-US/part-execution.xml 2009-10-14 16:12:45 UTC (rev 4063) @@ -5,8 +5,8 @@ <partintro> <para> In this part you learn how to execute the CDI TCK on the CDI - reference implementation (Web Beans). First, you are walked through - the steps necessary to execute the test suite on Web Beans. Then you + reference implementation (Weld). First, you are walked through + the steps necessary to execute the test suite on Weld. Then you discover how to modify the TCK runner to execute the test suite on your own implementation. Finally, you learn how to debug tests from the test suite in Eclipse. Modified: cdi-tck/trunk/doc/reference/pom.xml =================================================================== --- cdi-tck/trunk/doc/reference/pom.xml 2009-10-14 15:38:19 UTC (rev 4062) +++ cdi-tck/trunk/doc/reference/pom.xml 2009-10-14 16:12:45 UTC (rev 4063) @@ -22,6 +22,12 @@ <version>1.0.0-SNAPSHOT</version> <packaging>jdocbook</packaging> <name>JSR-299 TCK Reference Guide</name> + + <parent> + <groupId>org.jboss.weld</groupId> + <artifactId>weld-parent</artifactId> + <version>2</version> + </parent> <pluginRepositories> <pluginRepository> @@ -52,8 +58,8 @@ <extensions>true</extensions> <dependencies> <dependency> - <groupId>org.jboss.weld</groupId> - <artifactId>weld-docbook-xslt</artifactId> + <groupId>org.jboss.webbeans</groupId> + <artifactId>webbeans-docbook-xslt</artifactId> <version>1.1.1.BETA2</version> <exclusions> <exclusion> @@ -83,15 +89,6 @@ <sourceDirectory>${pom.basedir}</sourceDirectory> <sourceDocumentName>master.xml</sourceDocumentName> <masterTranslation>en-US</masterTranslation> - <!-- - <translations> <translation>it-IT</translation> - <translation>zh-CN</translation> - <translation>zh-TW</translation> - <translation>es-ES</translation> - <translation>ko-KR</translation> - <translation>de-DE</translation> - <translation>pt-BR</translation> </translations> - --> <imageResource> <directory>${pom.basedir}/en-US</directory> <includes> @@ -102,21 +99,21 @@ <format> <formatName>pdf</formatName> <stylesheetResource> - classpath:/xslt/org/jboss/weld/pdf.xsl + classpath:/xslt/org/jboss/webbeans/pdf.xsl </stylesheetResource> <finalName>jsr299-tck-reference.pdf</finalName> </format> <format> <formatName>html</formatName> <stylesheetResource> - classpath:/xslt/org/jboss/weld/xhtml.xsl + classpath:/xslt/org/jboss/webbeans/xhtml.xsl </stylesheetResource> <finalName>index.html</finalName> </format> <format> <formatName>html_single</formatName> <stylesheetResource> - classpath:/xslt/org/jboss/weld/xhtml-single.xsl + classpath:/xslt/org/jboss/webbeans/xhtml-single.xsl </stylesheetResource> <finalName>index.html</finalName> </format> @@ -132,17 +129,6 @@ </configuration> </plugin> <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-enforcer-plugin</artifactId> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-release-plugin</artifactId> - <configuration> - <arguments>-Dbuild.translations</arguments> - </configuration> - </plugin> - <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>build-helper-maven-plugin</artifactId> <executions> @@ -164,157 +150,8 @@ </executions> </plugin> </plugins> - <pluginManagement> - <plugins> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>build-helper-maven-plugin</artifactId> - <version>1.4</version> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-dependency-plugin</artifactId> - <version>2.0</version> - </plugin> - <plugin> - <groupId>org.jboss.maven.plugins</groupId> - <artifactId>maven-jdocbook-plugin</artifactId> - <version>${mpjdocbook.version}</version> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-jar-plugin</artifactId> - <configuration> - <archive> - <manifest> - <addDefaultImplementationEntries> - true - </addDefaultImplementationEntries> - <addDefaultSpecificationEntries> - true - </addDefaultSpecificationEntries> - </manifest> - </archive> - </configuration> - </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.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-javadoc-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-jar-plugin</artifactId> - <version>2.2</version> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-antrun-plugin</artifactId> - <version>1.1</version> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-release-plugin</artifactId> - <version>2.0-beta-7</version> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-enforcer-plugin</artifactId> - <version>1.0-alpha-4</version> - <executions> - <execution> - <id>enforce</id> - <goals> - <goal>enforce</goal> - </goals> - <configuration> - <rules> - <requireMavenVersion> - <version>2.0.9</version> - </requireMavenVersion> - <requirePluginVersions> - <unCheckedPlugins> - <unCheckedPlugin>org.apache.maven.plugins:maven-eclipse-plugin - </unCheckedPlugin> - </unCheckedPlugins> - </requirePluginVersions> - </rules> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </pluginManagement> - <extensions> - <extension> - <groupId>org.apache.maven.wagon</groupId> - <artifactId>wagon-webdav</artifactId> - <version>1.0-beta-2</version> - </extension> - </extensions> </build> - <profiles> - <profile> - <activation> - <property> - <name>build.translations</name> - </property> - </activation> - <build> - <plugins> - <plugin> - <groupId>org.jboss.maven.plugins</groupId> - <artifactId>maven-jdocbook-plugin</artifactId> - <executions> - <execution> - <phase>process-resources</phase> - <goals> - <goal>translate</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> - </profiles> - <ciManagement> <system>Hudson</system> <url /> @@ -337,16 +174,4 @@ <url>http://fisheye.jboss.org/browse/Weld/cdi-tck</url> </scm> - <distributionManagement> - <repository> - <id>repository.jboss.org</id> - <name>JBoss Releases Repository</name> - <url>dav:https://svn.jboss.org/repos/repository.jboss.org/maven2</ur... - </repository> - <snapshotRepository> - <id>snapshots.jboss.org</id> - <name>JBoss Snapshot Repository</name> - <url>dav:https://snapshots.jboss.org/maven2</url> - </snapshotRepository> - </distributionManagement> </project> Modified: cdi-tck/trunk/pom.xml =================================================================== --- cdi-tck/trunk/pom.xml 2009-10-14 15:38:19 UTC (rev 4062) +++ cdi-tck/trunk/pom.xml 2009-10-14 16:12:45 UTC (rev 4063) @@ -301,6 +301,7 @@ <artifactId>maven-release-plugin</artifactId> <configuration> <tagBase>https://svn.jboss.org/repos/weld/cdi-tck/tags</tagBase> + <arguments>-Pdocs</arguments> </configuration> </plugin> </plugins> @@ -315,4 +316,16 @@ <url>http://fisheye.jboss.org/browse/Weld</url> </scm> + <profiles> + <profile> + <id>docs</id> + <modules> + <module>api</module> + <module>impl</module> + <module>doc/reference</module> + </modules> + </profile> + + </profiles> + </project>