[jboss-svn-commits] JBoss Common SVN: r4656 - 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:06:08 EDT 2010
Author: dan.j.allen
Date: 2010-06-30 16:06:08 -0400 (Wed, 30 Jun 2010)
New Revision: 4656
Added:
arquillian/trunk/doc/reference/src/main/docbook/en-US/container_glassfish-embedded-3.xml
arquillian/trunk/doc/reference/src/main/docbook/en-US/container_glassfish-remote-3.xml
Removed:
arquillian/trunk/doc/reference/src/main/docbook/en-US/container_glassfish-embedded-30.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 glassfish remote
updates to glassfish embedded
Copied: arquillian/trunk/doc/reference/src/main/docbook/en-US/container_glassfish-embedded-3.xml (from rev 4655, arquillian/trunk/doc/reference/src/main/docbook/en-US/container_glassfish-embedded-30.xml)
===================================================================
--- arquillian/trunk/doc/reference/src/main/docbook/en-US/container_glassfish-embedded-3.xml (rev 0)
+++ arquillian/trunk/doc/reference/src/main/docbook/en-US/container_glassfish-embedded-3.xml 2010-06-30 20:06:08 UTC (rev 4656)
@@ -0,0 +1,147 @@
+<?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.glassfish-embedded-3">
+
+ <title>GlassFish 3 - Embedded</title>
+
+ <para id="container.glassfish-embedded-3.description">
+ A DeployableContainer implementation that can run and connect to a
+ embedded (same JVM) GlassFish 3 instance. This implementation has
+ lifecycle support, so the container will be started and stopped as part
+ of the test run.
+ </para>
+
+ <table id="container.glassfish-embedded-3.injection" frame="all">
+ <title>Container Injection Support Matrix</title>
+ <tgroup cols="5">
+ <colspec colnum="1" colname="ejb" colwidth="1*" />
+ <colspec colnum="2" colname="ejb_local" colwidth="2*" />
+ <colspec colnum="3" colname="inject_cdi" colwidth="2*" />
+ <colspec colnum="4" colname="inject_mc" colwidth="2*" />
+ <colspec colnum="5" colname="persistence" colwidth="3*" />
+ <thead>
+ <row>
+ <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>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/fact_good.png" format="PNG"
+ align="center" scalefit="0" />
+ </imageobject>
+ </mediaobject>
+ </entry>
+ <entry>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/fact_good.png" format="PNG"
+ align="center" scalefit="0" />
+ </imageobject>
+ </mediaobject>
+ </entry>
+ <entry></entry>
+ <entry>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/fact_good.png" format="PNG"
+ align="center" scalefit="0" />
+ </imageobject>
+ </mediaobject>
+ </entry>
+ </row>
+ </tbody>
+ </tgroup>
+ </table>
+
+ <section id="container.glassfish-embedded-3.configuration">
+ <title>Configuration</title>
+
+ <para>
+ Namespace: urn:arq:org.jboss.arquillian.glassfish.embedded_3
+ </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>8181</entry>
+ <entry>The HTTP port the server should bind to.</entry>
+ </row>
+ <row>
+ <entry>instanceRoot</entry>
+ <entry>String</entry>
+ <entry>target/glassfish_(RANDOM)</entry>
+ <entry>The instanceRoot to use for booting the server. If it does not exist, a default structure will be created.</entry>
+ </row>
+ <row>
+ <entry>domainXml</entry>
+ <entry>String</entry>
+ <entry></entry>
+ <entry>The relative or absolute path to the domain.xml file that will be used to configure the instance. If absent, the default domain.xml configuration will be used.</entry>
+ </row>
+ <row>
+ <entry>sunResourcesXml</entry>
+ <entry>String</entry>
+ <entry></entry>
+ <entry>The relative or absolute path to the sun-resources.xml file that will be used to add resources to the instance using the asadmin add-resources command.</entry>
+ </row>
+ <row>
+ <entry>autoDelete</entry>
+ <entry>boolean</entry>
+ <entry>true</entry>
+ <entry>Should the deployments be deleted on shutdown.</entry>
+ </row>
+ </tbody>
+ </tgroup>
+ </table>
+ </section>
+
+ <para>Example of Maven profile setup</para>
+ <programlisting role="XML"><![CDATA[<profile>
+ <id>glassfish-embedded-3</id>
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss.arquillian.container</groupId>
+ <artifactId>arquillian-glassfish-embedded-3</artifactId>
+ <version>1.0.0.Alpha3</version>
+ </dependency>
+ <dependency>
+ <groupId>org.glassfish.extras</groupId>
+ <artifactId>glassfish-embedded-all</artifactId>
+ <version>3.0.1-b19</version>
+ </dependency>
+ </dependencies>
+</profile>]]></programlisting>
+
+</section>
Deleted: arquillian/trunk/doc/reference/src/main/docbook/en-US/container_glassfish-embedded-30.xml
===================================================================
--- arquillian/trunk/doc/reference/src/main/docbook/en-US/container_glassfish-embedded-30.xml 2010-06-30 19:01:54 UTC (rev 4655)
+++ arquillian/trunk/doc/reference/src/main/docbook/en-US/container_glassfish-embedded-30.xml 2010-06-30 20:06:08 UTC (rev 4656)
@@ -1,140 +0,0 @@
-<?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.glassfish-embedded-30">
-
- <title>GlassFish 3.0 - Embedded</title>
-
- <para id="container.glassfish-embedded-30.description">
- A DeployableContainer implementation that can run and connect to a embedded(same JVM)
- GlassFish 3.0 instance.
- This implementation has lifecycle support, so the container will be started and stopped as part of
- the test run.
- </para>
-
- <table id="container.glassfish-embedded-30.injection" frame="all">
- <title>Container Injection Support Matrix</title>
- <tgroup cols="5">
- <colspec colnum="1" colname="ejb" colwidth="1*" />
- <colspec colnum="2" colname="ejb_local" colwidth="2*" />
- <colspec colnum="3" colname="inject_cdi" colwidth="2*" />
- <colspec colnum="4" colname="inject_mc" colwidth="2*" />
- <colspec colnum="5" colname="persistence" colwidth="3*" />
- <thead>
- <row>
- <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>
- <mediaobject>
- <imageobject>
- <imagedata fileref="images/fact_good.png" format="PNG"
- align="center" scalefit="0" />
- </imageobject>
- </mediaobject>
- </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>
-
- <section id="container.glassfish-embedded-30.configuration">
- <title>Configuration</title>
-
- <para>
- Namespace: urn:arq:org.jboss.arquillian.glassfish.embedded60
- </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>8181</entry>
- <entry>The HTTP port the server should bind to.</entry>
- </row>
- <row>
- <entry>instanceRoot</entry>
- <entry>String</entry>
- <entry>target/glassfish_(RANDOM)</entry>
- <entry>The instanceRoot to use for booting the server. If it does not exist, a default structure will be created.</entry>
- </row>
- <row>
- <entry>domainXml</entry>
- <entry>String</entry>
- <entry></entry>
- <entry>The relative or absolute path to the domain.xml file that will be used to configure the instance. If absent, the default domain.xml configuration will be used.</entry>
- </row>
- <row>
- <entry>sunResourcesXml</entry>
- <entry>String</entry>
- <entry></entry>
- <entry>The relative or absolute path to the sun-resources.xml file that will be used to add resources to the instance using the add-resources asadmin command.</entry>
- </row>
- <row>
- <entry>autoDelete</entry>
- <entry>boolean</entry>
- <entry>true</entry>
- <entry>Should the deployments be deleted on shutdown.</entry>
- </row>
- </tbody>
- </tgroup>
- </table>
- </section>
-
- <para>Example of Maven profile setup</para>
- <programlisting role="XML"><![CDATA[<profile>
- <id>glassfish-embedded-30</id>
- <dependencies>
- <dependency>
- <groupId>org.jboss.arquillian.container</groupId>
- <artifactId>arquillian-glassfish-embedded-30</artifactId>
- <version>1.0.0.Alpha2</version>
- </dependency>
- <dependency>
- <groupId>org.glassfish.extras</groupId>
- <artifactId>glassfish-embedded-all</artifactId>
- <version>3.0.1-b02</version>
- </dependency>
- </dependencies>
-</profile>]]></programlisting>
-
-</section>
Added: arquillian/trunk/doc/reference/src/main/docbook/en-US/container_glassfish-remote-3.xml
===================================================================
--- arquillian/trunk/doc/reference/src/main/docbook/en-US/container_glassfish-remote-3.xml (rev 0)
+++ arquillian/trunk/doc/reference/src/main/docbook/en-US/container_glassfish-remote-3.xml 2010-06-30 20:06:08 UTC (rev 4656)
@@ -0,0 +1,159 @@
+<?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.glassfish-remote-3">
+
+ <title>GlassFish 3 - Remote</title>
+
+ <para id="container.glassfish-remote-3.description">
+ A DeployableContainer implementation that connects to a remote GlassFish
+ 3 instance and deploys the test archive using <ulink src="jcp.org/en/jsr/detail?id=88">JSR-88</ulink>.
+ </para>
+
+ <table id="container.glassfish-remote-3.injection" frame="all">
+ <title>Container Injection Support Matrix</title>
+ <tgroup cols="5">
+ <colspec colnum="1" colname="ejb" colwidth="1*" />
+ <colspec colnum="2" colname="ejb_local" colwidth="2*" />
+ <colspec colnum="3" colname="inject_cdi" colwidth="2*" />
+ <colspec colnum="4" colname="inject_mc" colwidth="2*" />
+ <colspec colnum="5" colname="persistence" colwidth="3*" />
+ <thead>
+ <row>
+ <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>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/fact_good.png" format="PNG"
+ align="center" scalefit="0" />
+ </imageobject>
+ </mediaobject>
+ </entry>
+ <entry>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/fact_good.png" format="PNG"
+ align="center" scalefit="0" />
+ </imageobject>
+ </mediaobject>
+ </entry>
+ <entry></entry>
+ <entry>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/fact_good.png" format="PNG"
+ align="center" scalefit="0" />
+ </imageobject>
+ </mediaobject>
+ </entry>
+ </row>
+ </tbody>
+ </tgroup>
+ </table>
+
+ <section id="container.glassfish-remote-3.configuration">
+ <title>Configuration</title>
+
+ <para>
+ Namespace: urn:arq:org.jboss.arquillian.glassfish.remote_3
+ </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>deploymentUri</entry>
+ <entry>String</entry>
+ <entry>deployer:Sun:AppServer::localhost:4848</entry>
+ <entry>The administrative port and host the JSR-88 client should connect to.</entry>
+ </row>
+ <row>
+ <entry>deploymentFactoryClass</entry>
+ <entry>String</entry>
+ <entry>org.glassfish.deployapi.SunDeploymentFactory</entry>
+ <entry>The JSR-88 implementation factory class.</entry>
+ </row>
+ <row>
+ <entry>deploymentUsername</entry>
+ <entry>String</entry>
+ <entry></entry>
+ <entry>The admin username for performing JSR-88 deployments.</entry>
+ </row>
+ <row>
+ <entry>deploymentPassword</entry>
+ <entry>String</entry>
+ <entry></entry>
+ <entry>The admin password for performing JSR-88 deployments.</entry>
+ </row>
+ <row>
+ <entry>deploymentTimeoutSeconds</entry>
+ <entry>int</entry>
+ <entry>5</entry>
+ <entry>The number of seconds to wait for the deployment to complete.</entry>
+ </row>
+ <row>
+ <entry>remoteServerHttpPort</entry>
+ <entry>int</entry>
+ <entry>8080</entry>
+ <entry>The HTTP port of the remote server.</entry>
+ </row>
+ <row>
+ <entry>remoteServerAddress</entry>
+ <entry>String</entry>
+ <entry>localhost</entry>
+ <entry>The host of the remote server.</entry>
+ </row>
+ </tbody>
+ </tgroup>
+ </table>
+ </section>
+
+ <para>Example of Maven profile setup</para>
+ <programlisting role="XML"><![CDATA[<profile>
+ <id>glassfish-remote-3</id>
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss.arquillian.container</groupId>
+ <artifactId>arquillian-glassfish-remote-3</artifactId>
+ <version>1.0.0.Alpha3</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.glassfish.deployment</groupId>
+ <artifactId>deployment-client</artifactId>
+ <version>3.0.1-b19</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 19:01:54 UTC (rev 4655)
+++ arquillian/trunk/doc/reference/src/main/docbook/en-US/container_reference.xml 2010-06-30 20:06:08 UTC (rev 4656)
@@ -11,7 +11,8 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="container_jbossas-local-60.xml" />
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="container_jbossas-embedded-60.xml" />
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="container_reloaded.xml" />
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="container_glassfish-embedded-30.xml" />
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="container_glassfish-remote-3.xml" />
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="container_glassfish-embedded-3.xml" />
<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" />
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 19:01:54 UTC (rev 4655)
+++ arquillian/trunk/doc/reference/src/main/docbook/en-US/containers.xml 2010-06-30 20:06:08 UTC (rev 4656)
@@ -134,10 +134,16 @@
<entry>arquillian-reloaded</entry>
</row>
<row>
- <entry><link linkend="container.glassfish-embedded30">GlassFish Embedded 3.0</link></entry>
+ <entry><link linkend="container.glassfish-remote-3">GlassFish Remote 3</link></entry>
+ <entry>remote</entry>
+ <entry>Java EE 6</entry>
+ <entry>arquillian-glassfish-remote-3</entry>
+ </row>
+ <row>
+ <entry><link linkend="container.glassfish-embedded-3">GlassFish Embedded 3</link></entry>
<entry>embedded</entry>
<entry>Java EE 6</entry>
- <entry>arquillian-glassfish-embedded-30</entry>
+ <entry>arquillian-glassfish-embedded-3</entry>
</row>
<row>
<entry><link linkend="container.weld-embedded">Weld SE</link></entry>
More information about the jboss-svn-commits
mailing list