[jboss-svn-commits] JBoss Common SVN: r4657 - arquillian/trunk/doc/reference/src/main/docbook/en-US.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Wed Jun 30 16:37:42 EDT 2010
Author: dan.j.allen
Date: 2010-06-30 16:37:42 -0400 (Wed, 30 Jun 2010)
New Revision: 4657
Added:
arquillian/trunk/doc/reference/src/main/docbook/en-US/container_jetty-embedded-6_1.xml
arquillian/trunk/doc/reference/src/main/docbook/en-US/container_jetty-embedded-7.xml
arquillian/trunk/doc/reference/src/main/docbook/en-US/container_tomcat-embedded-6.xml
Modified:
arquillian/trunk/doc/reference/src/main/docbook/en-US/container_reference.xml
arquillian/trunk/doc/reference/src/main/docbook/en-US/containers.xml
Log:
add jetty and tomcat
Added: arquillian/trunk/doc/reference/src/main/docbook/en-US/container_jetty-embedded-6_1.xml
===================================================================
--- arquillian/trunk/doc/reference/src/main/docbook/en-US/container_jetty-embedded-6_1.xml (rev 0)
+++ arquillian/trunk/doc/reference/src/main/docbook/en-US/container_jetty-embedded-6_1.xml 2010-06-30 20:37:42 UTC (rev 4657)
@@ -0,0 +1,164 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+ "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" []>
+
+<section id="container.jetty-embedded-6_1">
+
+ <title>Jetty Embedded 6.1</title>
+
+ <para id="container.jetty-embedded-6_1.description">
+ A DeployableContainer implementation that can run and connect to a
+ embedded (same JVM) Jetty 6.1 Servlet Container. The minimum recommended
+ version is Jetty 6.1.12, though you can use an earlier 6.1 version if you
+ aren't using JNDI resources. Only select EE APIs are available, such as
+ JNDI and Servlet 2.5. This implementation has lifecycle support, so the
+ container will be started and stopped as part of the test run.
+ </para>
+
+ <table id="container.jetty-embedded-6_1.injection" frame="all">
+ <title>Container Injection Support Matrix</title>
+ <tgroup cols="6">
+ <colspec colnum="1" colname="resource" colwidth="1*" />
+ <colspec colnum="2" colname="ejb" colwidth="1*" />
+ <colspec colnum="3" colname="ejb_local" colwidth="2*" />
+ <colspec colnum="4" colname="inject_cdi" colwidth="2*" />
+ <colspec colnum="5" colname="inject_mc" colwidth="2*" />
+ <colspec colnum="6" colname="persistence" colwidth="3*" />
+ <thead>
+ <row>
+ <entry>@Resource</entry>
+ <entry>@EJB</entry>
+ <entry>@EJB (no-interface)</entry>
+ <entry>@Inject (CDI)</entry>
+ <entry>@Inject (MC)</entry>
+ <entry>@PersistenceContext @PersistenceUnit</entry>
+ </row>
+ </thead>
+ <tbody>
+ <row>
+ <entry>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/fact_good.png" format="PNG"
+ align="center" scalefit="0" />
+ </imageobject>
+ </mediaobject>
+ </entry>
+ <entry></entry>
+ <entry></entry>
+ <entry>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/fact_good.png" format="PNG"
+ align="center" scalefit="0" />
+ </imageobject>
+ </mediaobject>
+ </entry>
+ <entry></entry>
+ <entry></entry>
+ </row>
+ </tbody>
+ </tgroup>
+ </table>
+
+ <warning>
+ CDI support requires use of Weld Servlet.
+ </warning>
+
+ <section id="container.jetty-embedded-6_1.configuration">
+ <title>Configuration</title>
+
+ <para>
+ Namespace: urn:arq:org.jboss.arquillian.jetty.embedded_6_1
+ </para>
+ <table frame="all">
+ <title>Container Configuration Options</title>
+ <tgroup cols="4">
+ <colspec colnum="1" colname="name" colwidth="2*" />
+ <colspec colnum="2" colname="type" colwidth="1*" />
+ <colspec colnum="3" colname="default" colwidth="3*" />
+ <colspec colnum="4" colname="description" colwidth="4*" />
+ <thead>
+ <row>
+ <entry>Name</entry>
+ <entry>Type</entry>
+ <entry>Default</entry>
+ <entry>Description</entry>
+ </row>
+ </thead>
+ <tbody>
+ <row>
+ <entry>bindHttpPort</entry>
+ <entry>int</entry>
+ <entry>9090</entry>
+ <entry>The HTTP port the server should bind to.</entry>
+ </row>
+ <row>
+ <entry>bindAddress</entry>
+ <entry>String</entry>
+ <entry>localhost</entry>
+ <entry>The host the server should be run on.</entry>
+ </row>
+ <row>
+ <entry>jettyPlus</entry>
+ <entry>boolean</entry>
+ <entry>true</entry>
+ <entry>Activates the Jetty plus configuration to support JNDI resources (requires jetty-plus and jetty-naming artifacts on the classpath).</entry>
+ </row>
+ </tbody>
+ </tgroup>
+ </table>
+ </section>
+
+ <para>Example of Maven profile setup</para>
+
+ <programlisting role="XML"><![CDATA[<profile>
+ <id>jetty-embedded</id>
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss.arquillian.container</groupId>
+ <artifactId>arquillian-jetty-embedded-6.1</artifactId>
+ <version>1.0.0.Alpha3</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jetty</artifactId>
+ <version>6.1.12</version>
+ <scope>test</scope>
+ </dependency>
+ <!-- plus and naming requires for using JNDI -->
+ <dependency>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jetty-plus</artifactId>
+ <version>6.1.12</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jetty-naming</artifactId>
+ <version>6.1.12</version>
+ <scope>test</scope>
+ </dependency>
+ <!-- Weld servlet, EL and JSP required for testing CDI injections -->
+ <dependency>
+ <groupId>org.jboss.weld.servlet</groupId>
+ <artifactId>weld-servlet</artifactId>
+ <version>1.0.1-Final</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.glassfish.web</groupId>
+ <artifactId>el-impl</artifactId>
+ <version>2.2</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet.jsp</groupId>
+ <artifactId>jsp-api</artifactId>
+ <version>2.2</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+</profile>]]></programlisting>
+</section>
Added: arquillian/trunk/doc/reference/src/main/docbook/en-US/container_jetty-embedded-7.xml
===================================================================
--- arquillian/trunk/doc/reference/src/main/docbook/en-US/container_jetty-embedded-7.xml (rev 0)
+++ arquillian/trunk/doc/reference/src/main/docbook/en-US/container_jetty-embedded-7.xml 2010-06-30 20:37:42 UTC (rev 4657)
@@ -0,0 +1,158 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+ "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" []>
+
+<section id="container.jetty-embedded-7">
+
+ <title>Jetty Embedded 7</title>
+
+ <para id="container.jetty-embedded-7.description">
+ A DeployableContainer implementation that can run and connect to a
+ embedded (same JVM) Jetty 7 Servlet Container. Only select EE APIs are
+ available, such as JNDI and parts of Servlet (support for
+ web-fragement.xml is the important bit). This implementation has
+ lifecycle support, so the container will be started and stopped as part
+ of the test run.
+ </para>
+
+ <table id="container.jetty-embedded-7.injection" frame="all">
+ <title>Container Injection Support Matrix</title>
+ <tgroup cols="6">
+ <colspec colnum="1" colname="resource" colwidth="1*" />
+ <colspec colnum="2" colname="ejb" colwidth="1*" />
+ <colspec colnum="3" colname="ejb_local" colwidth="2*" />
+ <colspec colnum="4" colname="inject_cdi" colwidth="2*" />
+ <colspec colnum="5" colname="inject_mc" colwidth="2*" />
+ <colspec colnum="6" colname="persistence" colwidth="3*" />
+ <thead>
+ <row>
+ <entry>@Resource</entry>
+ <entry>@EJB</entry>
+ <entry>@EJB (no-interface)</entry>
+ <entry>@Inject (CDI)</entry>
+ <entry>@Inject (MC)</entry>
+ <entry>@PersistenceContext @PersistenceUnit</entry>
+ </row>
+ </thead>
+ <tbody>
+ <row>
+ <entry>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/fact_good.png" format="PNG"
+ align="center" scalefit="0" />
+ </imageobject>
+ </mediaobject>
+ </entry>
+ <entry></entry>
+ <entry></entry>
+ <entry>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/fact_good.png" format="PNG"
+ align="center" scalefit="0" />
+ </imageobject>
+ </mediaobject>
+ </entry>
+ <entry></entry>
+ <entry></entry>
+ </row>
+ </tbody>
+ </tgroup>
+ </table>
+
+ <warning>
+ CDI support requires use of Weld Servlet.
+ </warning>
+
+ <section id="container.jetty-embedded-7.configuration">
+ <title>Configuration</title>
+
+ <para>
+ Namespace: urn:arq:org.jboss.arquillian.jetty.embedded_7
+ </para>
+ <table frame="all">
+ <title>Container Configuration Options</title>
+ <tgroup cols="4">
+ <colspec colnum="1" colname="name" colwidth="2*" />
+ <colspec colnum="2" colname="type" colwidth="1*" />
+ <colspec colnum="3" colname="default" colwidth="3*" />
+ <colspec colnum="4" colname="description" colwidth="4*" />
+ <thead>
+ <row>
+ <entry>Name</entry>
+ <entry>Type</entry>
+ <entry>Default</entry>
+ <entry>Description</entry>
+ </row>
+ </thead>
+ <tbody>
+ <row>
+ <entry>bindHttpPort</entry>
+ <entry>int</entry>
+ <entry>9090</entry>
+ <entry>The HTTP port the server should bind to.</entry>
+ </row>
+ <row>
+ <entry>bindAddress</entry>
+ <entry>String</entry>
+ <entry>localhost</entry>
+ <entry>The host the server should be run on.</entry>
+ </row>
+ <row>
+ <entry>jettyPlus</entry>
+ <entry>boolean</entry>
+ <entry>true</entry>
+ <entry>Activates the Jetty plus configuration to support JNDI resources (requires jetty-plus and jetty-naming artifacts on the classpath).</entry>
+ </row>
+ </tbody>
+ </tgroup>
+ </table>
+ </section>
+
+ <para>Example of Maven profile setup</para>
+
+ <programlisting role="XML"><![CDATA[<profile>
+ <id>jetty-embedded</id>
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss.arquillian.container</groupId>
+ <artifactId>arquillian-jetty-embedded-7</artifactId>
+ <version>1.0.0.Alpha3</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-webapp</artifactId>
+ <version>7.0.2.v20100331</version>
+ <scope>test</scope>
+ </dependency>
+ <!-- plus and naming requires for using JNDI -->
+ <dependency>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jetty-plus</artifactId>
+ <version>7.0.2.v20100331</version>
+ <scope>test</scope>
+ </dependency>
+ <!-- Weld servlet, EL and JSP required for testing CDI injections -->
+ <dependency>
+ <groupId>org.jboss.weld.servlet</groupId>
+ <artifactId>weld-servlet</artifactId>
+ <version>1.0.1-Final</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.glassfish.web</groupId>
+ <artifactId>el-impl</artifactId>
+ <version>2.2</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet.jsp</groupId>
+ <artifactId>jsp-api</artifactId>
+ <version>2.2</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+</profile>]]></programlisting>
+</section>
Modified: arquillian/trunk/doc/reference/src/main/docbook/en-US/container_reference.xml
===================================================================
--- arquillian/trunk/doc/reference/src/main/docbook/en-US/container_reference.xml 2010-06-30 20:06:08 UTC (rev 4656)
+++ arquillian/trunk/doc/reference/src/main/docbook/en-US/container_reference.xml 2010-06-30 20:37:42 UTC (rev 4657)
@@ -16,5 +16,8 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="container_weld-embedded.xml" />
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="container_openwebbeans-embedded.xml" />
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="container_openejb-embedded.xml" />
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="container_jetty-embedded-6_1.xml" />
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="container_jetty-embedded-7.xml" />
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="container_tomcat-embedded-6.xml" />
</chapter>
Added: arquillian/trunk/doc/reference/src/main/docbook/en-US/container_tomcat-embedded-6.xml
===================================================================
--- arquillian/trunk/doc/reference/src/main/docbook/en-US/container_tomcat-embedded-6.xml (rev 0)
+++ arquillian/trunk/doc/reference/src/main/docbook/en-US/container_tomcat-embedded-6.xml 2010-06-30 20:37:42 UTC (rev 4657)
@@ -0,0 +1,186 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+ "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" []>
+
+<section id="container.tomcat-embedded-6">
+
+ <title>Tomcat Embedded 6</title>
+
+ <para id="container.tomcat-embedded-6.description">
+ A DeployableContainer implementation that can run and connect to a
+ embedded (same JVM) Tomcat 6 Servlet Container. Only select EE APIs are
+ available, such as JNDI and Servlet 2.5. This implementation has
+ lifecycle support, so the container will be started and stopped as part
+ of the test run.
+ </para>
+
+ <table id="container.tomcat-embedded-6.injection" frame="all">
+ <title>Container Injection Support Matrix</title>
+ <tgroup cols="6">
+ <colspec colnum="1" colname="resource" colwidth="1*" />
+ <colspec colnum="2" colname="ejb" colwidth="1*" />
+ <colspec colnum="3" colname="ejb_local" colwidth="2*" />
+ <colspec colnum="4" colname="inject_cdi" colwidth="2*" />
+ <colspec colnum="5" colname="inject_mc" colwidth="2*" />
+ <colspec colnum="6" colname="persistence" colwidth="3*" />
+ <thead>
+ <row>
+ <entry>@Resource</entry>
+ <entry>@EJB</entry>
+ <entry>@EJB (no-interface)</entry>
+ <entry>@Inject (CDI)</entry>
+ <entry>@Inject (MC)</entry>
+ <entry>@PersistenceContext @PersistenceUnit</entry>
+ </row>
+ </thead>
+ <tbody>
+ <row>
+ <entry>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/fact_good.png" format="PNG"
+ align="center" scalefit="0" />
+ </imageobject>
+ </mediaobject>
+ </entry>
+ <entry></entry>
+ <entry></entry>
+ <entry>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/fact_good.png" format="PNG"
+ align="center" scalefit="0" />
+ </imageobject>
+ </mediaobject>
+ </entry>
+ <entry></entry>
+ <entry></entry>
+ </row>
+ </tbody>
+ </tgroup>
+ </table>
+
+ <warning>
+ CDI support requires use of Weld Servlet.
+ </warning>
+
+ <warning>
+ In-container testing requires manually adding the Arquillian Protocol Servlet to the test
+ archive's web.xml. See the in-container test in the Tomcat Embedded 6 container source
+ for an example.
+ </warning>
+
+ <section id="container.tomcat-embedded-6.configuration">
+ <title>Configuration</title>
+
+ <para>
+ Namespace: urn:arq:org.jboss.arquillian.tomcat.embedded_6
+ </para>
+ <table frame="all">
+ <title>Container Configuration Options</title>
+ <tgroup cols="4">
+ <colspec colnum="1" colname="name" colwidth="2*" />
+ <colspec colnum="2" colname="type" colwidth="1*" />
+ <colspec colnum="3" colname="default" colwidth="3*" />
+ <colspec colnum="4" colname="description" colwidth="4*" />
+ <thead>
+ <row>
+ <entry>Name</entry>
+ <entry>Type</entry>
+ <entry>Default</entry>
+ <entry>Description</entry>
+ </row>
+ </thead>
+ <tbody>
+ <row>
+ <entry>bindHttpPort</entry>
+ <entry>int</entry>
+ <entry>9090</entry>
+ <entry>The HTTP port the server should bind to.</entry>
+ </row>
+ <row>
+ <entry>bindAddress</entry>
+ <entry>String</entry>
+ <entry>localhost</entry>
+ <entry>The host the server should be run on.</entry>
+ </row>
+ <row>
+ <entry>tomcatHome</entry>
+ <entry>String</entry>
+ <entry></entry>
+ <entry>Optional location of a Tomcat installation to link against.</entry>
+ </row>
+ <row>
+ <entry>serverName</entry>
+ <entry>String</entry>
+ <entry></entry>
+ <entry>Optional name of the server</entry>
+ </row>
+ <row>
+ <entry>appBase</entry>
+ <entry>String</entry>
+ <entry></entry>
+ <entry>Optional relative or absolute path to the directory where applications are deployed (e.g., webapps).</entry>
+ </row>
+ <row>
+ <entry>workDir</entry>
+ <entry>String</entry>
+ <entry></entry>
+ <entry>Optional relative or absolute path to the directory where applications are expanded and session serialization data is stored (e.g., work).</entry>
+ </row>
+ </tbody>
+ </tgroup>
+ </table>
+ </section>
+
+ <para>Example of Maven profile setup</para>
+
+ <programlisting role="XML"><![CDATA[<profile>
+ <id>tomcat-embedded</id>
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss.arquillian.container</groupId>
+ <artifactId>arquillian-tomcat-embedded-6</artifactId>
+ <version>1.0.0.Alpha3</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>catalina</artifactId>
+ <version>6.0.26</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>coyote</artifactId>
+ <version>6.0.26</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>jasper</artifactId>
+ <version>6.0.26</version>
+ <scope>provided</scope>
+ </dependency>
+ <!-- Weld servlet, EL and JSP required for testing CDI injections -->
+ <dependency>
+ <groupId>org.jboss.weld.servlet</groupId>
+ <artifactId>weld-servlet</artifactId>
+ <version>1.0.1-Final</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.glassfish.web</groupId>
+ <artifactId>el-impl</artifactId>
+ <version>2.2</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet.jsp</groupId>
+ <artifactId>jsp-api</artifactId>
+ <version>2.2</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+</profile>]]></programlisting>
+</section>
Modified: arquillian/trunk/doc/reference/src/main/docbook/en-US/containers.xml
===================================================================
--- arquillian/trunk/doc/reference/src/main/docbook/en-US/containers.xml 2010-06-30 20:06:08 UTC (rev 4656)
+++ arquillian/trunk/doc/reference/src/main/docbook/en-US/containers.xml 2010-06-30 20:37:42 UTC (rev 4657)
@@ -163,13 +163,31 @@
<entry>EJB 3.0</entry>
<entry>arquillian-openejb</entry>
</row>
+ <row>
+ <entry><link linkend="container.jetty-embedded-6_1">Jetty Embedded 6.1</link></entry>
+ <entry>embedded</entry>
+ <entry>Servlet 2.5</entry>
+ <entry>arquillian-jetty-embedded-6.1</entry>
+ </row>
+ <row>
+ <entry><link linkend="container.jetty-embedded-7">Jetty Embedded 7</link></entry>
+ <entry>embedded</entry>
+ <entry>Servlet ~3.0</entry>
+ <entry>arquillian-jetty-embedded-7</entry>
+ </row>
+ <row>
+ <entry><link linkend="container.tomcat-embedded-6">Tomcat Embedded 6</link></entry>
+ <entry>embedded</entry>
+ <entry>Servlet 2.5</entry>
+ <entry>arquillian-tomcat-embedded-6</entry>
+ </row>
</tbody>
</tgroup>
</table>
<para>
- Support for other containers is planned, including GlassFish V3(remote), Weblogic(remote), OSGI,
- Tomcat, Jetty, Hibernate and JBoss JCA Embedded.
+ Support for other containers is planned, including Weblogic (remote), WebSphere (remote), Hibernate and JBoss
+ JCA Embedded.
</para>
</section>
More information about the jboss-svn-commits
mailing list