[jboss-svn-commits] JBoss Common SVN: r4661 - arquillian/trunk/doc/reference/src/main/docbook/en-US.

jboss-svn-commits at lists.jboss.org jboss-svn-commits at lists.jboss.org
Thu Jul 1 13:51:15 EDT 2010


Author: aslak
Date: 2010-07-01 13:51:14 -0400 (Thu, 01 Jul 2010)
New Revision: 4661

Added:
   arquillian/trunk/doc/reference/src/main/docbook/en-US/container_jbossas-embedded-6.xml
   arquillian/trunk/doc/reference/src/main/docbook/en-US/container_jbossas-managed-5.1.xml
   arquillian/trunk/doc/reference/src/main/docbook/en-US/container_jbossas-managed-6.xml
   arquillian/trunk/doc/reference/src/main/docbook/en-US/container_jbossas-remote-5.1.xml
   arquillian/trunk/doc/reference/src/main/docbook/en-US/container_jbossas-remote-5.xml
   arquillian/trunk/doc/reference/src/main/docbook/en-US/container_jbossas-remote-6.xml
   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_openejb-embedded-3.1.xml
   arquillian/trunk/doc/reference/src/main/docbook/en-US/container_openwebbeans-embedded-1.xml
   arquillian/trunk/doc/reference/src/main/docbook/en-US/container_reloaded-embedded-1.xml
   arquillian/trunk/doc/reference/src/main/docbook/en-US/container_weld-ee-embedded-1.1.xml
   arquillian/trunk/doc/reference/src/main/docbook/en-US/container_weld-se-embedded-1.xml
Removed:
   arquillian/trunk/doc/reference/src/main/docbook/en-US/container_jbossas-embedded-60.xml
   arquillian/trunk/doc/reference/src/main/docbook/en-US/container_jbossas-local-51.xml
   arquillian/trunk/doc/reference/src/main/docbook/en-US/container_jbossas-local-60.xml
   arquillian/trunk/doc/reference/src/main/docbook/en-US/container_jbossas-remote-51.xml
   arquillian/trunk/doc/reference/src/main/docbook/en-US/container_jbossas-remote-60.xml
   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_openejb-embedded.xml
   arquillian/trunk/doc/reference/src/main/docbook/en-US/container_openwebbeans-embedded.xml
   arquillian/trunk/doc/reference/src/main/docbook/en-US/container_reloaded.xml
   arquillian/trunk/doc/reference/src/main/docbook/en-US/container_weld-embedded.xml
Modified:
   arquillian/trunk/doc/reference/src/main/docbook/en-US/book_info.xml
   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
   arquillian/trunk/doc/reference/src/main/docbook/en-US/container_jetty-embedded-7.xml
   arquillian/trunk/doc/reference/src/main/docbook/en-US/container_reference.xml
   arquillian/trunk/doc/reference/src/main/docbook/en-US/container_tomcat-embedded-6.xml
   arquillian/trunk/doc/reference/src/main/docbook/en-US/containers.xml
   arquillian/trunk/doc/reference/src/main/docbook/en-US/gettingstarted.xml
Log:
ARQ-200 ARQ-202 ARQ-174 Updated Reference Guide to reflect new package / contianer naming / version scheme


Modified: arquillian/trunk/doc/reference/src/main/docbook/en-US/book_info.xml
===================================================================
--- arquillian/trunk/doc/reference/src/main/docbook/en-US/book_info.xml	2010-07-01 11:47:42 UTC (rev 4660)
+++ arquillian/trunk/doc/reference/src/main/docbook/en-US/book_info.xml	2010-07-01 17:51:14 UTC (rev 4661)
@@ -6,7 +6,7 @@
    <title>Arquillian: An integration testing framework for Containers</title>
    <subtitle>Reference Guide</subtitle>
    <!-- is there any way to pass a variable w/ the maven-jdocbook-plugin? -->
-   <releaseinfo>1.0.0-Alpha2</releaseinfo>
+   <releaseinfo>1.0.0-Alpha3</releaseinfo>
 
    <xi:include href="author_group.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
 

Modified: 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-embedded-3.xml	2010-07-01 11:47:42 UTC (rev 4660)
+++ arquillian/trunk/doc/reference/src/main/docbook/en-US/container_glassfish-embedded-3.xml	2010-07-01 17:51:14 UTC (rev 4661)
@@ -4,13 +4,13 @@
 
 <section id="container.glassfish-embedded-3">
 
-	<title>GlassFish 3 - Embedded</title>
+	<title>GlassFish 3.0 - 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. 
+		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-3.injection" frame="all">
@@ -57,14 +57,7 @@
 						</mediaobject>
 					</entry>
 					<entry></entry>
-					<entry>
-						<mediaobject>
-							<imageobject>
-								<imagedata fileref="images/fact_good.png" format="PNG"
-									align="center" scalefit="0" />
-							</imageobject>
-						</mediaobject>
-               </entry>
+					<entry></entry>
 				</row>
 			</tbody>
 		</tgroup>
@@ -74,7 +67,7 @@
 		<title>Configuration</title>
 
 		<para>
-			Namespace: urn:arq:org.jboss.arquillian.glassfish.embedded_3
+			Namespace: urn:arq:org.jboss.arquillian.container.glassfish.embedded_3
 		</para>
 		<table frame="all">
 			<title>Container Configuration Options</title>
@@ -114,7 +107,7 @@
 						<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>
+						<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>
@@ -139,7 +132,7 @@
 		<dependency>
 			<groupId>org.glassfish.extras</groupId>
 			<artifactId>glassfish-embedded-all</artifactId>
-			<version>3.0.1-b19</version>
+			<version>3.0.1-b02</version>
 		</dependency>
 	</dependencies>
 </profile>]]></programlisting>

Modified: 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	2010-07-01 11:47:42 UTC (rev 4660)
+++ arquillian/trunk/doc/reference/src/main/docbook/en-US/container_glassfish-remote-3.xml	2010-07-01 17:51:14 UTC (rev 4661)
@@ -156,4 +156,4 @@
 	</dependencies>
 </profile>]]></programlisting>
 
-</section>
+</section>
\ No newline at end of file

Added: arquillian/trunk/doc/reference/src/main/docbook/en-US/container_jbossas-embedded-6.xml
===================================================================
--- arquillian/trunk/doc/reference/src/main/docbook/en-US/container_jbossas-embedded-6.xml	                        (rev 0)
+++ arquillian/trunk/doc/reference/src/main/docbook/en-US/container_jbossas-embedded-6.xml	2010-07-01 17:51:14 UTC (rev 4661)
@@ -0,0 +1,169 @@
+<?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.jbossas-embedded-6">
+
+	<title>JBoss AS 6.0 - Embedded</title>
+
+	<para id="container.jbossas-embedded-6.description">
+		A DeployableContainer implementation that can run and connect to a embedded(same JVM) 
+		JBoss AS 6.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.jbossas-embedded-6.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.jbossas-embedded-6.configuration">
+		<title>Configuration</title>
+
+		<para>
+			Namespace: urn:arq:org.jboss.arquillian.container.jbossas.embedded_6
+		</para>
+		<table frame="all">
+			<title>Container Configuration Options</title>
+			<tgroup cols="4">
+				<colspec colnum="1" colname="name" colwidth="3*" />
+				<colspec colnum="2" colname="type" colwidth="1*" />
+				<colspec colnum="3" colname="default" colwidth="1*" />
+				<colspec colnum="4" colname="description" colwidth="5*" />
+				<thead>
+					<row>
+						<entry>Name</entry>
+						<entry>Type</entry>
+						<entry>Default</entry>
+						<entry>Description</entry>
+					</row>
+				</thead>
+				<tbody>
+					<row>
+						<entry>profileName</entry>
+						<entry>String</entry>
+						<entry>default</entry>
+						<entry>ProfileService profileKey. Used to load the correct profile into the DeploymentManager.</entry>
+					</row>
+					<row>
+						<entry>bindAddress</entry>
+						<entry>String</entry>
+						<entry>localhost</entry>
+						<entry>The Address the server should bind to.</entry>
+					</row>
+					<row>
+						<entry>httpPort</entry>
+						<entry>int</entry>
+						<entry>8080</entry>
+						<entry>Used by Servlet Protocol to connect to the server.</entry>
+					</row>
+				</tbody>
+			</tgroup>
+		</table>
+	</section>
+
+	<para>Example of Maven profile setup</para>
+	<programlisting role="XML"><![CDATA[<profile>
+	<id>jbossas-embedded-6</id>
+	<dependencies>
+		<dependency>
+			<groupId>org.jboss.arquillian.container</groupId>
+			<artifactId>arquillian-jbossas-embedded-6</artifactId>
+			<version>1.0.0.Alpha3</version>
+		</dependency>
+		<dependency>
+			<groupId>org.jboss.jbossas</groupId>
+			<artifactId>jboss-as-depchain</artifactId>
+			<version>6.0.0.20100429-M3</version>
+			<type>pom</type>
+		</dependency>
+	</dependencies>
+	<dependencyManagement>
+		<dependencies>
+			<dependency>
+				<groupId>org.jboss.jbossas</groupId>
+				<artifactId>jboss-as-depchain</artifactId>
+				<version>6.0.0.20100429-M3</version>
+				<type>pom</type>
+				<scope>import</scope>
+			</dependency>
+		</dependencies>
+	</dependencyManagement>
+	<build>
+		<plugins>
+			<plugin>
+				<artifactId>maven-surefire-plugin</artifactId>
+				<configuration>
+					<additionalClasspathElements>
+						<additionalClasspathElement>${env.JBOSS_HOME}/client/jbossws-native-client.jar</additionalClasspathElement>
+						<!--
+							Because jbossweb.sar contains shared web.xml, which must be
+							visible from same CL as TomcatDeployer.class.getClassLoader
+						-->
+						<additionalClasspathElement>${env.JBOSS_HOME}/server/default/deploy/jbossweb.sar</additionalClasspathElement>
+					</additionalClasspathElements>
+
+					<redirectTestOutputToFile>true</redirectTestOutputToFile>
+					<trimStackTrace>false</trimStackTrace>
+					<printSummary>true</printSummary>
+					<forkMode>once</forkMode>
+
+					<!--
+						MaxPermSize Required to bump the space for relective data like
+						classes, methods, etc. EMB-41. Endorsed required for things like
+						WS support (EMB-61)
+					-->
+					<argLine>-Xmx512m -XX:MaxPermSize=256m -Djava.net.preferIPv4Stack=true -Djava.util.logging.manager=org.jboss.logmanager.LogManager -Djava.endorsed.dirs=${env.JBOSS_HOME}/lib/endorsed -Djboss.home=${env.JBOSS_HOME} -Djboss.boot.server.log.dir=${env.JBOSS_HOME}</argLine>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
+</profile>]]></programlisting>
+
+</section>
\ No newline at end of file

Deleted: arquillian/trunk/doc/reference/src/main/docbook/en-US/container_jbossas-embedded-60.xml
===================================================================
--- arquillian/trunk/doc/reference/src/main/docbook/en-US/container_jbossas-embedded-60.xml	2010-07-01 11:47:42 UTC (rev 4660)
+++ arquillian/trunk/doc/reference/src/main/docbook/en-US/container_jbossas-embedded-60.xml	2010-07-01 17:51:14 UTC (rev 4661)
@@ -1,169 +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.jbossas-embedded-60">
-
-	<title>JBoss Embedded AS 6.0 - Embedded</title>
-
-	<para id="container.jbossas-embedded-60.description">
-		A DeployableContainer implementation that can run and connect to a embedded(same JVM) 
-		JBoss AS 6.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.jbossas-embedded-60.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.jbossas-embedded-60.configuration">
-		<title>Configuration</title>
-
-		<para>
-			Namespace: urn:arq:org.jboss.arquillian.jbossas.embedded60
-		</para>
-		<table frame="all">
-			<title>Container Configuration Options</title>
-			<tgroup cols="4">
-				<colspec colnum="1" colname="name" colwidth="4*" />
-				<colspec colnum="2" colname="type" colwidth="1*" />
-				<colspec colnum="3" colname="default" colwidth="1*" />
-				<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>profileName</entry>
-						<entry>String</entry>
-						<entry>default</entry>
-						<entry>ProfileService profileKey. Used to load the correct profile into the DeploymentManager.</entry>
-					</row>
-					<row>
-						<entry>bindAddress</entry>
-						<entry>String</entry>
-						<entry>localhost</entry>
-						<entry>The Address the server should bind to.</entry>
-					</row>
-					<row>
-						<entry>httpPort</entry>
-						<entry>int</entry>
-						<entry>8080</entry>
-						<entry>Used by Servlet Protocol to connect to the server.</entry>
-					</row>
-				</tbody>
-			</tgroup>
-		</table>
-	</section>
-
-	<para>Example of Maven profile setup</para>
-	<programlisting role="XML"><![CDATA[<profile>
-	<id>jbossas-embedded-60</id>
-	<dependencies>
-		<dependency>
-			<groupId>org.jboss.arquillian.container</groupId>
-			<artifactId>arquillian-jbossas-embedded-60</artifactId>
-			<version>${project.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.jboss.jbossas</groupId>
-			<artifactId>jboss-as-depchain</artifactId>
-			<version>6.0.0.20100429-M3</version>
-			<type>pom</type>
-		</dependency>
-	</dependencies>
-	<dependencyManagement>
-		<dependencies>
-			<dependency>
-				<groupId>org.jboss.jbossas</groupId>
-				<artifactId>jboss-as-depchain</artifactId>
-				<version>6.0.0.20100429-M3</version>
-				<type>pom</type>
-				<scope>import</scope>
-			</dependency>
-		</dependencies>
-	</dependencyManagement>
-	<build>
-		<plugins>
-			<plugin>
-				<artifactId>maven-surefire-plugin</artifactId>
-				<configuration>
-					<additionalClasspathElements>
-						<additionalClasspathElement>${env.JBOSS_HOME}/client/jbossws-native-client.jar</additionalClasspathElement>
-						<!--
-							Because jbossweb.sar contains shared web.xml, which must be
-							visible from same CL as TomcatDeployer.class.getClassLoader
-						-->
-						<additionalClasspathElement>${env.JBOSS_HOME}/server/default/deploy/jbossweb.sar</additionalClasspathElement>
-					</additionalClasspathElements>
-
-					<redirectTestOutputToFile>true</redirectTestOutputToFile>
-					<trimStackTrace>false</trimStackTrace>
-					<printSummary>true</printSummary>
-					<forkMode>once</forkMode>
-
-					<!--
-						MaxPermSize Required to bump the space for relective data like
-						classes, methods, etc. EMB-41. Endorsed required for things like
-						WS support (EMB-61)
-					-->
-					<argLine>-Xmx512m -XX:MaxPermSize=256m -Djava.net.preferIPv4Stack=true -Djava.util.logging.manager=org.jboss.logmanager.LogManager -Djava.endorsed.dirs=${env.JBOSS_HOME}/lib/endorsed -Djboss.home=${env.JBOSS_HOME} -Djboss.boot.server.log.dir=${env.JBOSS_HOME}</argLine>
-				</configuration>
-			</plugin>
-		</plugins>
-	</build>
-</profile>]]></programlisting>
-
-</section>
\ No newline at end of file

Deleted: arquillian/trunk/doc/reference/src/main/docbook/en-US/container_jbossas-local-51.xml
===================================================================
--- arquillian/trunk/doc/reference/src/main/docbook/en-US/container_jbossas-local-51.xml	2010-07-01 11:47:42 UTC (rev 4660)
+++ arquillian/trunk/doc/reference/src/main/docbook/en-US/container_jbossas-local-51.xml	2010-07-01 17:51:14 UTC (rev 4661)
@@ -1,132 +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.jbossas-local-51">
-
-	<title>JBoss AS 5.1 - Remote + Lifecycle</title>
-
-	<para id="container.jbossas-local-51.description">
-		A DeployableContainer implementation that can run and connect to a remote(different JVM, same machine) 
-		JBoss AS 5.1 instance. 
-		This implementation has lifecycle support, so the container will be started and stopped as part of
-		the test run. 
-	</para>
-
-	<table id="container.jbossas-local-51.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></entry>
-					<entry></entry>
-					<entry></entry>
-					<entry></entry>
-				</row>
-			</tbody>
-		</tgroup>
-	</table>
-
-	<section id="container.jbossas-local-51.configuration">
-		<title>Configuration</title>
-
-		<para>
-			Namespace: urn:arq:org.jboss.arquillian.jbossas.local51
-		</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>profileName</entry>
-						<entry>String</entry>
-						<entry>default</entry>
-						<entry>ProfileService profileKey. Used to load the correct profile into the DeploymentManager.</entry>
-					</row>
-					<row>
-						<entry>bindAddress</entry>
-						<entry>String</entry>
-						<entry>localhost</entry>
-						<entry>The Address the server should bind to.</entry>
-					</row>
-					<row>
-						<entry>httpPort</entry>
-						<entry>int</entry>
-						<entry>8080</entry>
-						<entry>Used by Servlet Protocol to connect to the server.</entry>
-					</row>
-					<row>
-						<entry>jbossHome</entry>
-						<entry>String</entry>
-						<entry>$JBOSS_HOME</entry>
-						<entry>The JBoss configuration to start.</entry>
-					</row>
-					<row>
-						<entry>javaHome</entry>
-						<entry>String</entry>
-						<entry>$JAVA_HOME</entry>
-						<entry>The Java runtime to use to start the server.</entry>
-					</row>
-				</tbody>
-			</tgroup>
-		</table>
-	</section>
-
-	<para>Example of Maven profile setup</para>
-	<programlisting role="XML"><![CDATA[<profile>
-	<id>jbossas-local-51</id>
-	<dependencies>
-		<dependency>
-			<groupId>org.jboss.arquillian.container</groupId>
-			<artifactId>arquillian-jbossas-local-51</artifactId>
-			<version>1.0.0.Alpha2</version>
-		</dependency>
-        <dependency>
-            <groupId>org.jboss.jbossas</groupId>
-            <artifactId>jboss-server-manager</artifactId>
-            <version>1.0.3.GA</version>
-        </dependency>
-		<dependency>
-			<groupId>org.jboss.jbossas</groupId>
-			<artifactId>jboss-as-client</artifactId>
-			<version>5.1.0.GA</version>
-			<type>pom</type>
-		</dependency>
-	</dependencies>
-</profile>]]></programlisting>
-
-</section>
\ No newline at end of file

Deleted: arquillian/trunk/doc/reference/src/main/docbook/en-US/container_jbossas-local-60.xml
===================================================================
--- arquillian/trunk/doc/reference/src/main/docbook/en-US/container_jbossas-local-60.xml	2010-07-01 11:47:42 UTC (rev 4660)
+++ arquillian/trunk/doc/reference/src/main/docbook/en-US/container_jbossas-local-60.xml	2010-07-01 17:51:14 UTC (rev 4661)
@@ -1,146 +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.jbossas-local-60">
-
-	<title>JBoss AS 6.0 - Remote + Lifecycle</title>
-
-	<para id="container.jbossas-local-60.description">
-		A DeployableContainer implementation that can run and connect to a remote(different JVM, same machine) 
-		JBoss AS 6.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.jbossas-local-60.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.jbossas-local-60.configuration">
-		<title>Configuration</title>
-
-		<para>
-			Namespace: urn:arq:org.jboss.arquillian.jbossas.local60
-		</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>profileName</entry>
-						<entry>String</entry>
-						<entry>default</entry>
-						<entry>ProfileService profileKey. Used to load the correct profile into the DeploymentManager.</entry>
-					</row>
-					<row>
-						<entry>bindAddress</entry>
-						<entry>String</entry>
-						<entry>localhost</entry>
-						<entry>The Address the server should bind to.</entry>
-					</row>
-					<row>
-						<entry>httpPort</entry>
-						<entry>int</entry>
-						<entry>8080</entry>
-						<entry>Used by Servlet Protocol to connect to the server.</entry>
-					</row>
-					<row>
-						<entry>jbossHome</entry>
-						<entry>String</entry>
-						<entry>$JBOSS_HOME</entry>
-						<entry>The JBoss configuration to start.</entry>
-					</row>
-					<row>
-						<entry>javaHome</entry>
-						<entry>String</entry>
-						<entry>$JAVA_HOME</entry>
-						<entry>The Java runtime to use to start the server.</entry>
-					</row>
-				</tbody>
-			</tgroup>
-		</table>
-	</section>
-
-	<para>Example of Maven profile setup</para>
-	<programlisting role="XML"><![CDATA[<profile>
-	<id>jbossas-local-60</id>
-	<dependencies>
-		<dependency>
-			<groupId>org.jboss.arquillian.container</groupId>
-			<artifactId>arquillian-jbossas-local-60</artifactId>
-			<version>1.0.0.Alpha2</version>
-		</dependency>
-        <dependency>
-            <groupId>org.jboss.jbossas</groupId>
-            <artifactId>jboss-server-manager</artifactId>
-            <version>1.0.3.GA</version>
-        </dependency>
-		<dependency>
-			<groupId>org.jboss.jbossas</groupId>
-			<artifactId>jboss-as-client</artifactId>
-			<version>6.0.0.20100429-M3</version>
-			<type>pom</type>
-		</dependency>
-	</dependencies>
-</profile>]]></programlisting>
-
-</section>
\ No newline at end of file

Added: arquillian/trunk/doc/reference/src/main/docbook/en-US/container_jbossas-managed-5.1.xml
===================================================================
--- arquillian/trunk/doc/reference/src/main/docbook/en-US/container_jbossas-managed-5.1.xml	                        (rev 0)
+++ arquillian/trunk/doc/reference/src/main/docbook/en-US/container_jbossas-managed-5.1.xml	2010-07-01 17:51:14 UTC (rev 4661)
@@ -0,0 +1,132 @@
+<?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.jbossas-managed-51">
+
+	<title>JBoss AS 5.1 - Managed</title>
+
+	<para id="container.jbossas-managed-51.description">
+		A DeployableContainer implementation that can run and connect to a remote(different JVM, same machine) 
+		JBoss AS 5.1 instance. 
+		This implementation has lifecycle support, so the container will be started and stopped as part of
+		the test run. 
+	</para>
+
+	<table id="container.jbossas-managed-51.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></entry>
+					<entry></entry>
+					<entry></entry>
+					<entry></entry>
+				</row>
+			</tbody>
+		</tgroup>
+	</table>
+
+	<section id="container.jbossas-managed-51.configuration">
+		<title>Configuration</title>
+
+		<para>
+			Namespace: urn:arq:org.jboss.arquillian.container.jbossas.managed_5_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>profileName</entry>
+						<entry>String</entry>
+						<entry>default</entry>
+						<entry>ProfileService profileKey. Used to load the correct profile into the DeploymentManager.</entry>
+					</row>
+					<row>
+						<entry>bindAddress</entry>
+						<entry>String</entry>
+						<entry>localhost</entry>
+						<entry>The Address the server should bind to.</entry>
+					</row>
+					<row>
+						<entry>httpPort</entry>
+						<entry>int</entry>
+						<entry>8080</entry>
+						<entry>Used by Servlet Protocol to connect to the server.</entry>
+					</row>
+					<row>
+						<entry>jbossHome</entry>
+						<entry>String</entry>
+						<entry>$JBOSS_HOME</entry>
+						<entry>The JBoss configuration to start.</entry>
+					</row>
+					<row>
+						<entry>javaHome</entry>
+						<entry>String</entry>
+						<entry>$JAVA_HOME</entry>
+						<entry>The Java runtime to use to start the server.</entry>
+					</row>
+				</tbody>
+			</tgroup>
+		</table>
+	</section>
+
+	<para>Example of Maven profile setup</para>
+	<programlisting role="XML"><![CDATA[<profile>
+	<id>jbossas-managed-5.1</id>
+	<dependencies>
+		<dependency>
+			<groupId>org.jboss.arquillian.container</groupId>
+			<artifactId>arquillian-jbossas-managed-5.1</artifactId>
+			<version>1.0.0.Alpha3</version>
+		</dependency>
+        <dependency>
+            <groupId>org.jboss.jbossas</groupId>
+            <artifactId>jboss-server-manager</artifactId>
+            <version>1.0.3.GA</version>
+        </dependency>
+		<dependency>
+			<groupId>org.jboss.jbossas</groupId>
+			<artifactId>jboss-as-client</artifactId>
+			<version>5.1.0.GA</version>
+			<type>pom</type>
+		</dependency>
+	</dependencies>
+</profile>]]></programlisting>
+
+</section>
\ No newline at end of file

Added: arquillian/trunk/doc/reference/src/main/docbook/en-US/container_jbossas-managed-6.xml
===================================================================
--- arquillian/trunk/doc/reference/src/main/docbook/en-US/container_jbossas-managed-6.xml	                        (rev 0)
+++ arquillian/trunk/doc/reference/src/main/docbook/en-US/container_jbossas-managed-6.xml	2010-07-01 17:51:14 UTC (rev 4661)
@@ -0,0 +1,146 @@
+<?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.jbossas-managed-6">
+
+	<title>JBoss AS 6.0 - Managed</title>
+
+	<para id="container.jbossas-managed-6.description">
+		A DeployableContainer implementation that can run and connect to a remote(different JVM, same machine) 
+		JBoss AS 6.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.jbossas-managed-6.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.jbossas-managed-6.configuration">
+		<title>Configuration</title>
+
+		<para>
+			Namespace: urn:arq:org.jboss.arquillian.container.jbossas.managed_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>profileName</entry>
+						<entry>String</entry>
+						<entry>default</entry>
+						<entry>ProfileService profileKey. Used to load the correct profile into the DeploymentManager.</entry>
+					</row>
+					<row>
+						<entry>bindAddress</entry>
+						<entry>String</entry>
+						<entry>localhost</entry>
+						<entry>The Address the server should bind to.</entry>
+					</row>
+					<row>
+						<entry>httpPort</entry>
+						<entry>int</entry>
+						<entry>8080</entry>
+						<entry>Used by Servlet Protocol to connect to the server.</entry>
+					</row>
+					<row>
+						<entry>jbossHome</entry>
+						<entry>String</entry>
+						<entry>$JBOSS_HOME</entry>
+						<entry>The JBoss configuration to start.</entry>
+					</row>
+					<row>
+						<entry>javaHome</entry>
+						<entry>String</entry>
+						<entry>$JAVA_HOME</entry>
+						<entry>The Java runtime to use to start the server.</entry>
+					</row>
+				</tbody>
+			</tgroup>
+		</table>
+	</section>
+
+	<para>Example of Maven profile setup</para>
+	<programlisting role="XML"><![CDATA[<profile>
+	<id>jbossas-managed-6</id>
+	<dependencies>
+		<dependency>
+			<groupId>org.jboss.arquillian.container</groupId>
+			<artifactId>arquillian-jbossas-managed-6</artifactId>
+			<version>1.0.0.Alpha3</version>
+		</dependency>
+        <dependency>
+            <groupId>org.jboss.jbossas</groupId>
+            <artifactId>jboss-server-manager</artifactId>
+            <version>1.0.3.GA</version>
+        </dependency>
+		<dependency>
+			<groupId>org.jboss.jbossas</groupId>
+			<artifactId>jboss-as-client</artifactId>
+			<version>6.0.0.20100429-M3</version>
+			<type>pom</type>
+		</dependency>
+	</dependencies>
+</profile>]]></programlisting>
+
+</section>
\ No newline at end of file

Added: arquillian/trunk/doc/reference/src/main/docbook/en-US/container_jbossas-remote-5.1.xml
===================================================================
--- arquillian/trunk/doc/reference/src/main/docbook/en-US/container_jbossas-remote-5.1.xml	                        (rev 0)
+++ arquillian/trunk/doc/reference/src/main/docbook/en-US/container_jbossas-remote-5.1.xml	2010-07-01 17:51:14 UTC (rev 4661)
@@ -0,0 +1,128 @@
+<?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.jbossas-remote-51">
+
+	<title>JBoss AS 5.1 - Remote</title>
+
+	<para id="container.jbossas-remote-51.description">
+		A DeployableContainer implementation that can connect and run against a remote(different JVM, different machine) running 
+		JBoss AS 5.1 instance. 
+		This implementation has no lifecycle support, so it can not be started or stopped. 
+	</para>
+
+	<warning>This container needs a jndi.properties file on classpath to be able to connect to the remote running instance.</warning>
+
+	<table id="container.jbossas-remote-51.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></entry>
+					<entry></entry>
+					<entry></entry>
+					<entry></entry>
+				</row>
+			</tbody>
+		</tgroup>
+	</table>
+
+	<section id="container.jbossas-remote-51.configuration">
+		<title>Configuration</title>
+
+		<para>
+			Namespace: urn:arq:org.jboss.arquillian.container.jbossas.remote_5_1
+		</para>
+		<table frame="all">
+			<title>Container Configuration Options</title>
+			<tgroup cols="4">
+				<colspec colnum="1" colname="name" colwidth="4*" />
+				<colspec colnum="2" colname="type" colwidth="1*" />
+				<colspec colnum="3" colname="default" colwidth="1*" />
+				<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>profileName</entry>
+						<entry>String</entry>
+						<entry>default</entry>
+						<entry>ProfileService profileKey. Used to load the correct profile into the DeploymentManager.</entry>
+					</row>
+					<row>
+						<entry>remoteServerAddress</entry>
+						<entry>String</entry>
+						<entry>localhost</entry>
+						<entry>Used by Servlet Protocol to connect to the remote server.</entry>
+					</row>
+					<row>
+						<entry>remoteServerHttpPort</entry>
+						<entry>int</entry>
+						<entry>8080</entry>
+						<entry>Used by Servlet Protocol to connect to the remote server.</entry>
+					</row>
+					<row>
+						<entry>localDeploymentBindAddress</entry>
+						<entry>String</entry>
+						<entry>localhost</entry>
+						<entry>Bind Address for the HTTP server serving deployments to the remote server. Address must be reachable from remote server.</entry>
+					</row>
+					<row>
+						<entry>localDeploymentBindPort</entry>
+						<entry>int</entry>
+						<entry>9999</entry>
+						<entry>Bind Port for the HTTP server serving deployments to the remote server. Port must be reachable from remote server.</entry>
+					</row>
+				</tbody>
+			</tgroup>
+		</table>
+	</section>
+
+	<para>Example of Maven profile setup</para>
+	<programlisting role="XML"><![CDATA[<profile>
+	<id>jbossas-remote-5.1</id>
+	<dependencies>
+		<dependency>
+			<groupId>org.jboss.arquillian.container</groupId>
+			<artifactId>arquillian-jbossas-remote-5.1</artifactId>
+			<version>1.0.0.Alpha3</version>
+		</dependency>
+		<dependency>
+			<groupId>org.jboss.jbossas</groupId>
+			<artifactId>jboss-as-client</artifactId>
+			<version>5.1.0.GA</version>
+			<type>pom</type>
+		</dependency>
+	</dependencies>
+</profile>]]></programlisting>
+
+</section>
\ No newline at end of file

Added: arquillian/trunk/doc/reference/src/main/docbook/en-US/container_jbossas-remote-5.xml
===================================================================
--- arquillian/trunk/doc/reference/src/main/docbook/en-US/container_jbossas-remote-5.xml	                        (rev 0)
+++ arquillian/trunk/doc/reference/src/main/docbook/en-US/container_jbossas-remote-5.xml	2010-07-01 17:51:14 UTC (rev 4661)
@@ -0,0 +1,128 @@
+<?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.jbossas-remote-5">
+
+	<title>JBoss AS 5 - Remote</title>
+
+	<para id="container.jbossas-remote-5.description">
+		A DeployableContainer implementation that can connect and run against a remote(different JVM, different machine) running 
+		JBoss AS 5 instance. 
+		This implementation has no lifecycle support, so it can not be started or stopped. 
+	</para>
+
+	<warning>This container needs a jndi.properties file on classpath to be able to connect to the remote running instance.</warning>
+
+	<table id="container.jbossas-remote-5.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></entry>
+					<entry></entry>
+					<entry></entry>
+					<entry></entry>
+				</row>
+			</tbody>
+		</tgroup>
+	</table>
+
+	<section id="container.jbossas-remote-5.configuration">
+		<title>Configuration</title>
+
+		<para>
+			Namespace: urn:arq:org.jboss.arquillian.container.jbossas.remote_5
+		</para>
+		<table frame="all">
+			<title>Container Configuration Options</title>
+			<tgroup cols="4">
+				<colspec colnum="1" colname="name" colwidth="4*" />
+				<colspec colnum="2" colname="type" colwidth="1*" />
+				<colspec colnum="3" colname="default" colwidth="1*" />
+				<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>profileName</entry>
+						<entry>String</entry>
+						<entry>default</entry>
+						<entry>ProfileService profileKey. Used to load the correct profile into the DeploymentManager.</entry>
+					</row>
+					<row>
+						<entry>remoteServerAddress</entry>
+						<entry>String</entry>
+						<entry>localhost</entry>
+						<entry>Used by Servlet Protocol to connect to the remote server.</entry>
+					</row>
+					<row>
+						<entry>remoteServerHttpPort</entry>
+						<entry>int</entry>
+						<entry>8080</entry>
+						<entry>Used by Servlet Protocol to connect to the remote server.</entry>
+					</row>
+					<row>
+						<entry>localDeploymentBindAddress</entry>
+						<entry>String</entry>
+						<entry>localhost</entry>
+						<entry>Bind Address for the HTTP server serving deployments to the remote server. Address must be reachable from remote server.</entry>
+					</row>
+					<row>
+						<entry>localDeploymentBindPort</entry>
+						<entry>int</entry>
+						<entry>9999</entry>
+						<entry>Bind Port for the HTTP server serving deployments to the remote server. Port must be reachable from remote server.</entry>
+					</row>
+				</tbody>
+			</tgroup>
+		</table>
+	</section>
+
+	<para>Example of Maven profile setup</para>
+	<programlisting role="XML"><![CDATA[<profile>
+	<id>jbossas-remote-5</id>
+	<dependencies>
+		<dependency>
+			<groupId>org.jboss.arquillian.container</groupId>
+			<artifactId>arquillian-jbossas-remote-5</artifactId>
+			<version>1.0.0.Alpha3</version>
+		</dependency>
+		<dependency>
+			<groupId>org.jboss.jbossas</groupId>
+			<artifactId>jboss-as-client</artifactId>
+			<version>5.0.1.GA</version>
+			<type>pom</type>
+		</dependency>
+	</dependencies>
+</profile>]]></programlisting>
+
+</section>
\ No newline at end of file

Deleted: arquillian/trunk/doc/reference/src/main/docbook/en-US/container_jbossas-remote-51.xml
===================================================================
--- arquillian/trunk/doc/reference/src/main/docbook/en-US/container_jbossas-remote-51.xml	2010-07-01 11:47:42 UTC (rev 4660)
+++ arquillian/trunk/doc/reference/src/main/docbook/en-US/container_jbossas-remote-51.xml	2010-07-01 17:51:14 UTC (rev 4661)
@@ -1,128 +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.jbossas-remote-51">
-
-	<title>JBoss AS 5.1 - Remote</title>
-
-	<para id="container.jbossas-remote-51.description">
-		A DeployableContainer implementation that can connect and run against a remote(different JVM, different machine) running 
-		JBoss AS 5.1 instance. 
-		This implementation has no lifecycle support, so it can not be started or stopped. 
-	</para>
-
-	<warning>This container needs a jndi.properties file on classpath to be able to connect to the remote running instance.</warning>
-
-	<table id="container.jbossas-remote-51.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></entry>
-					<entry></entry>
-					<entry></entry>
-					<entry></entry>
-				</row>
-			</tbody>
-		</tgroup>
-	</table>
-
-	<section id="container.jbossas-remote-51.configuration">
-		<title>Configuration</title>
-
-		<para>
-			Namespace: urn:arq:org.jboss.arquillian.jbossas.remote51
-		</para>
-		<table frame="all">
-			<title>Container Configuration Options</title>
-			<tgroup cols="4">
-				<colspec colnum="1" colname="name" colwidth="4*" />
-				<colspec colnum="2" colname="type" colwidth="1*" />
-				<colspec colnum="3" colname="default" colwidth="1*" />
-				<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>profileName</entry>
-						<entry>String</entry>
-						<entry>default</entry>
-						<entry>ProfileService profileKey. Used to load the correct profile into the DeploymentManager.</entry>
-					</row>
-					<row>
-						<entry>remoteServerAddress</entry>
-						<entry>String</entry>
-						<entry>localhost</entry>
-						<entry>Used by Servlet Protocol to connect to the remote server.</entry>
-					</row>
-					<row>
-						<entry>remoteServerHttpPort</entry>
-						<entry>int</entry>
-						<entry>8080</entry>
-						<entry>Used by Servlet Protocol to connect to the remote server.</entry>
-					</row>
-					<row>
-						<entry>localDeploymentBindAddress</entry>
-						<entry>String</entry>
-						<entry>localhost</entry>
-						<entry>Bind Address for the HTTP server serving deployments to the remote server. Address must be reachable from remote server.</entry>
-					</row>
-					<row>
-						<entry>localDeploymentBindPort</entry>
-						<entry>int</entry>
-						<entry>9999</entry>
-						<entry>Bind Port for the HTTP server serving deployments to the remote server. Port must be reachable from remote server.</entry>
-					</row>
-				</tbody>
-			</tgroup>
-		</table>
-	</section>
-
-	<para>Example of Maven profile setup</para>
-	<programlisting role="XML"><![CDATA[<profile>
-	<id>jbossas-remote-51</id>
-	<dependencies>
-		<dependency>
-			<groupId>org.jboss.arquillian.container</groupId>
-			<artifactId>arquillian-jbossas-remote-51</artifactId>
-			<version>1.0.0.Alpha2</version>
-		</dependency>
-		<dependency>
-			<groupId>org.jboss.jbossas</groupId>
-			<artifactId>jboss-as-client</artifactId>
-			<version>5.1.0.GA</version>
-			<type>pom</type>
-		</dependency>
-	</dependencies>
-</profile>]]></programlisting>
-
-</section>
\ No newline at end of file

Added: arquillian/trunk/doc/reference/src/main/docbook/en-US/container_jbossas-remote-6.xml
===================================================================
--- arquillian/trunk/doc/reference/src/main/docbook/en-US/container_jbossas-remote-6.xml	                        (rev 0)
+++ arquillian/trunk/doc/reference/src/main/docbook/en-US/container_jbossas-remote-6.xml	2010-07-01 17:51:14 UTC (rev 4661)
@@ -0,0 +1,142 @@
+<?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.jbossas-remote-6">
+
+	<title>JBoss AS 6.0 - Remote</title>
+
+	<para id="container.jbossas-remote-6.description">
+		A DeployableContainer implementation that can connect and run against a remote(different JVM, different machine) running 
+		JBoss AS 6.0 instance. 
+		This implementation has no lifecycle support, so it can not be started or stopped. 
+	</para>
+
+	<warning>This container needs a jndi.properties file on classpath to be able to connect to the remote running instance.</warning>
+
+	<table id="container.jbossas-remote-6.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.jbossas-remote-6.configuration">
+		<title>Configuration</title>
+
+		<para>
+			Namespace: urn:arq:org.jboss.arquillian.container.jbossas.remote_6_0
+		</para>
+		<table frame="all">
+			<title>Container Configuration Options</title>
+			<tgroup cols="4">
+				<colspec colnum="1" colname="name" colwidth="4*" />
+				<colspec colnum="2" colname="type" colwidth="1*" />
+				<colspec colnum="3" colname="default" colwidth="1*" />
+				<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>profileName</entry>
+						<entry>String</entry>
+						<entry>default</entry>
+						<entry>ProfileService profileKey. Used to load the correct profile into the DeploymentManager.</entry>
+					</row>
+					<row>
+						<entry>remoteServerAddress</entry>
+						<entry>String</entry>
+						<entry>localhost</entry>
+						<entry>Used by Servlet Protocol to connect to the remote server.</entry>
+					</row>
+					<row>
+						<entry>remoteServerHttpPort</entry>
+						<entry>int</entry>
+						<entry>8080</entry>
+						<entry>Used by Servlet Protocol to connect to the remote server.</entry>
+					</row>
+					<row>
+						<entry>localDeploymentBindAddress</entry>
+						<entry>String</entry>
+						<entry>localhost</entry>
+						<entry>Bind Address for the HTTP server serving deployments to the remote server. Address must be reachable from remote server.</entry>
+					</row>
+					<row>
+						<entry>localDeploymentBindPort</entry>
+						<entry>int</entry>
+						<entry>9999</entry>
+						<entry>Bind Port for the HTTP server serving deployments to the remote server. Port must be reachable from remote server.</entry>
+					</row>
+				</tbody>
+			</tgroup>
+		</table>
+	</section>
+
+	<para>Example of Maven profile setup</para>
+	<programlisting role="XML"><![CDATA[<profile>
+	<id>jbossas-remote-6</id>
+	<dependencies>
+		<dependency>
+			<groupId>org.jboss.arquillian.container</groupId>
+			<artifactId>arquillian-jbossas-remote-6</artifactId>
+			<version>1.0.0.Alpha3</version>
+		</dependency>
+		<dependency>
+			<groupId>org.jboss.jbossas</groupId>
+			<artifactId>jboss-as-client</artifactId>
+			<version>6.0.0.20100429-M3</version>
+			<type>pom</type>
+		</dependency>
+	</dependencies>
+</profile>]]></programlisting>
+
+</section>
\ No newline at end of file

Deleted: arquillian/trunk/doc/reference/src/main/docbook/en-US/container_jbossas-remote-60.xml
===================================================================
--- arquillian/trunk/doc/reference/src/main/docbook/en-US/container_jbossas-remote-60.xml	2010-07-01 11:47:42 UTC (rev 4660)
+++ arquillian/trunk/doc/reference/src/main/docbook/en-US/container_jbossas-remote-60.xml	2010-07-01 17:51:14 UTC (rev 4661)
@@ -1,142 +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.jbossas-remote-60">
-
-	<title>JBoss AS 6.0 - Remote</title>
-
-	<para id="container.jbossas-remote-60.description">
-		A DeployableContainer implementation that can connect and run against a remote(different JVM, different machine) running 
-		JBoss AS 6.0 instance. 
-		This implementation has no lifecycle support, so it can not be started or stopped. 
-	</para>
-
-	<warning>This container needs a jndi.properties file on classpath to be able to connect to the remote running instance.</warning>
-
-	<table id="container.jbossas-remote-60.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.jbossas-remote-60.configuration">
-		<title>Configuration</title>
-
-		<para>
-			Namespace: urn:arq:org.jboss.arquillian.jbossas.remote60
-		</para>
-		<table frame="all">
-			<title>Container Configuration Options</title>
-			<tgroup cols="4">
-				<colspec colnum="1" colname="name" colwidth="4*" />
-				<colspec colnum="2" colname="type" colwidth="1*" />
-				<colspec colnum="3" colname="default" colwidth="1*" />
-				<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>profileName</entry>
-						<entry>String</entry>
-						<entry>default</entry>
-						<entry>ProfileService profileKey. Used to load the correct profile into the DeploymentManager.</entry>
-					</row>
-					<row>
-						<entry>remoteServerAddress</entry>
-						<entry>String</entry>
-						<entry>localhost</entry>
-						<entry>Used by Servlet Protocol to connect to the remote server.</entry>
-					</row>
-					<row>
-						<entry>remoteServerHttpPort</entry>
-						<entry>int</entry>
-						<entry>8080</entry>
-						<entry>Used by Servlet Protocol to connect to the remote server.</entry>
-					</row>
-					<row>
-						<entry>localDeploymentBindAddress</entry>
-						<entry>String</entry>
-						<entry>localhost</entry>
-						<entry>Bind Address for the HTTP server serving deployments to the remote server. Address must be reachable from remote server.</entry>
-					</row>
-					<row>
-						<entry>localDeploymentBindPort</entry>
-						<entry>int</entry>
-						<entry>9999</entry>
-						<entry>Bind Port for the HTTP server serving deployments to the remote server. Port must be reachable from remote server.</entry>
-					</row>
-				</tbody>
-			</tgroup>
-		</table>
-	</section>
-
-	<para>Example of Maven profile setup</para>
-	<programlisting role="XML"><![CDATA[<profile>
-	<id>jbossas-remote-60</id>
-	<dependencies>
-		<dependency>
-			<groupId>org.jboss.arquillian.container</groupId>
-			<artifactId>arquillian-jbossas-remote-60</artifactId>
-			<version>1.0.0.Alpha2</version>
-		</dependency>
-		<dependency>
-			<groupId>org.jboss.jbossas</groupId>
-			<artifactId>jboss-as-client</artifactId>
-			<version>6.0.0.20100429-M3</version>
-			<type>pom</type>
-		</dependency>
-	</dependencies>
-</profile>]]></programlisting>
-
-</section>
\ No newline at end of file

Copied: arquillian/trunk/doc/reference/src/main/docbook/en-US/container_jetty-embedded-6.1.xml (from rev 4660, 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-07-01 17:51:14 UTC (rev 4661)
@@ -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 6.1 - Embedded</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>

Deleted: 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	2010-07-01 11:47:42 UTC (rev 4660)
+++ arquillian/trunk/doc/reference/src/main/docbook/en-US/container_jetty-embedded-6_1.xml	2010-07-01 17:51:14 UTC (rev 4661)
@@ -1,164 +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.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>

Modified: 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	2010-07-01 11:47:42 UTC (rev 4660)
+++ arquillian/trunk/doc/reference/src/main/docbook/en-US/container_jetty-embedded-7.xml	2010-07-01 17:51:14 UTC (rev 4661)
@@ -4,7 +4,7 @@
 
 <section id="container.jetty-embedded-7">
 
-	<title>Jetty Embedded 7</title>
+	<title>Jetty 7.0 - Embedded</title>
 
 	<para id="container.jetty-embedded-7.description">
       A DeployableContainer implementation that can run and connect to a

Added: arquillian/trunk/doc/reference/src/main/docbook/en-US/container_openejb-embedded-3.1.xml
===================================================================
--- arquillian/trunk/doc/reference/src/main/docbook/en-US/container_openejb-embedded-3.1.xml	                        (rev 0)
+++ arquillian/trunk/doc/reference/src/main/docbook/en-US/container_openejb-embedded-3.1.xml	2010-07-01 17:51:14 UTC (rev 4661)
@@ -0,0 +1,69 @@
+<?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.openejb-embedded-31">
+
+	<title>Apache OpenEJB 3.1 - Embedded</title>
+
+	<para id="container.openejb-embedded-31.description">
+		A DeployableContainer implementation that can run and connect to a embedded(same JVM) 
+		Apache OpenEJB instance. EJB 3.0 APIs are available, but no JMS.
+		This implementation has lifecycle support, so the container will be started and stopped as part of
+		the test run.   
+	</para>
+
+	<table id="container.openejb-embedded-31.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></entry>
+					<entry></entry>
+					<entry></entry>
+					<entry></entry>
+				</row>
+			</tbody>
+		</tgroup>
+	</table>
+
+	<para>Example of Maven profile setup</para>
+	<programlisting role="XML"><![CDATA[<profile>
+	<id>openejb-embedded-3.1</id>
+	<dependencies>
+		<dependency>
+			<groupId>org.jboss.arquillian.container</groupId>
+			<artifactId>arquillian-openejb-3.1</artifactId>
+			<version>1.0.0.Alpha3</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.openejb</groupId>
+			<artifactId>openejb-core</artifactId>
+			<version>3.1.2</version>
+		</dependency>
+	</dependencies>
+</profile>]]></programlisting>
+
+</section>
\ No newline at end of file

Deleted: arquillian/trunk/doc/reference/src/main/docbook/en-US/container_openejb-embedded.xml
===================================================================
--- arquillian/trunk/doc/reference/src/main/docbook/en-US/container_openejb-embedded.xml	2010-07-01 11:47:42 UTC (rev 4660)
+++ arquillian/trunk/doc/reference/src/main/docbook/en-US/container_openejb-embedded.xml	2010-07-01 17:51:14 UTC (rev 4661)
@@ -1,69 +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.openejb-embedded">
-
-	<title>Apache OpenEJB - Embedded</title>
-
-	<para id="container.openejb-embedded.description">
-		A DeployableContainer implementation that can run and connect to a embedded(same JVM) 
-		Apache OpenEJB instance. EJB 3.0 APIs are available, but no JMS.
-		This implementation has lifecycle support, so the container will be started and stopped as part of
-		the test run.   
-	</para>
-
-	<table id="container.openejb-embedded.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></entry>
-					<entry></entry>
-					<entry></entry>
-					<entry></entry>
-				</row>
-			</tbody>
-		</tgroup>
-	</table>
-
-	<para>Example of Maven profile setup</para>
-	<programlisting role="XML"><![CDATA[<profile>
-	<id>openejb</id>
-	<dependencies>
-		<dependency>
-			<groupId>org.jboss.arquillian.container</groupId>
-			<artifactId>arquillian-openejb</artifactId>
-			<version>1.0.0.Alpha2</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.openejb</groupId>
-			<artifactId>openejb-core</artifactId>
-			<version>3.1.2</version>
-		</dependency>
-	</dependencies>
-</profile>]]></programlisting>
-
-</section>
\ No newline at end of file

Added: arquillian/trunk/doc/reference/src/main/docbook/en-US/container_openwebbeans-embedded-1.xml
===================================================================
--- arquillian/trunk/doc/reference/src/main/docbook/en-US/container_openwebbeans-embedded-1.xml	                        (rev 0)
+++ arquillian/trunk/doc/reference/src/main/docbook/en-US/container_openwebbeans-embedded-1.xml	2010-07-01 17:51:14 UTC (rev 4661)
@@ -0,0 +1,129 @@
+<?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.openwebbeans-embedded-1">
+
+	<title>Apache OpenWebBeans 1.0 - Embedded</title>
+
+	<para id="container.openwebbeans-embedded-1.description">
+		A DeployableContainer implementation that can run and connect to a embedded(same JVM) 
+		WeldApache OpenWebBeans(CDI) instance. No EE APIs are available.
+		This implementation has lifecycle support, so the container will be started and stopped as part of
+		the test run.   
+	</para>
+
+	<table id="container.openwebbeans-embedded-1.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>
+	
+	<warning>
+		Local EJBs only, which get treated as managed beans. Transactions, security and EJB context injection are not applied.
+	</warning>
+
+	<para>Example of Maven profile setup</para>
+	<programlisting role="XML"><![CDATA[<profile>
+	<id>openwebbeans-embedded-1</id>
+	<dependencies>
+		<dependency>
+			<groupId>org.jboss.arquillian.container</groupId>
+			<artifactId>arquillian-openwebbeans-embedded-1</artifactId>
+			<version>1.0.0.Alpha3</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.openwebbeans</groupId>
+			<artifactId>openwebbeans-spi</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.openwebbeans</groupId>
+			<artifactId>openwebbeans-impl</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.geronimo.specs</groupId>
+			<artifactId>geronimo-el_2.2_spec</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.geronimo.specs</groupId>
+			<artifactId>geronimo-jta_1.1_spec</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.geronimo.specs</groupId>
+			<artifactId>geronimo-validation_1.0_spec</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.geronimo.specs</groupId>
+			<artifactId>geronimo-interceptor_1.1_spec</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.geronimo.specs</groupId>
+			<artifactId>geronimo-jcdi_1.0_spec</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.geronimo.specs</groupId>
+			<artifactId>geronimo-atinject_1.0_spec</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.geronimo.specs</groupId>
+			<artifactId>geronimo-servlet_2.5_spec</artifactId>
+		</dependency>
+	</dependencies>
+	<dependencyManagement>
+		<dependencies>
+			<dependency>
+				<groupId>org.apache.openwebbeans</groupId>
+				<artifactId>openwebbeans</artifactId>	
+				<version>1.0.0-M4</version>
+				<type>pom</type>
+				<scope>import</scope>
+			</dependency>
+		</dependencies>
+	</dependencyManagement>
+</profile>]]></programlisting>
+
+</section>
\ No newline at end of file

Deleted: arquillian/trunk/doc/reference/src/main/docbook/en-US/container_openwebbeans-embedded.xml
===================================================================
--- arquillian/trunk/doc/reference/src/main/docbook/en-US/container_openwebbeans-embedded.xml	2010-07-01 11:47:42 UTC (rev 4660)
+++ arquillian/trunk/doc/reference/src/main/docbook/en-US/container_openwebbeans-embedded.xml	2010-07-01 17:51:14 UTC (rev 4661)
@@ -1,129 +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.openwebbeans-embedded">
-
-	<title>Apache OpenWebBeans - Embedded</title>
-
-	<para id="container.openwebbeans-embedded.description">
-		A DeployableContainer implementation that can run and connect to a embedded(same JVM) 
-		WeldApache OpenWebBeans(CDI) instance. No EE APIs are available.
-		This implementation has lifecycle support, so the container will be started and stopped as part of
-		the test run.   
-	</para>
-
-	<table id="container.openwebbeans-embedded.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>
-	
-	<warning>
-		Local EJBs only, which get treated as managed beans. Transactions, security and EJB context injection are not applied.
-	</warning>
-
-	<para>Example of Maven profile setup</para>
-	<programlisting role="XML"><![CDATA[<profile>
-	<id>openwebbeans-embedded</id>
-	<dependencies>
-		<dependency>
-			<groupId>org.jboss.arquillian.container</groupId>
-			<artifactId>arquillian-openwebbeans-embedded</artifactId>
-			<version>1.0.0.Alpha2</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.openwebbeans</groupId>
-			<artifactId>openwebbeans-spi</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.openwebbeans</groupId>
-			<artifactId>openwebbeans-impl</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.geronimo.specs</groupId>
-			<artifactId>geronimo-el_2.2_spec</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.geronimo.specs</groupId>
-			<artifactId>geronimo-jta_1.1_spec</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.geronimo.specs</groupId>
-			<artifactId>geronimo-validation_1.0_spec</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.geronimo.specs</groupId>
-			<artifactId>geronimo-interceptor_1.1_spec</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.geronimo.specs</groupId>
-			<artifactId>geronimo-jcdi_1.0_spec</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.geronimo.specs</groupId>
-			<artifactId>geronimo-atinject_1.0_spec</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.geronimo.specs</groupId>
-			<artifactId>geronimo-servlet_2.5_spec</artifactId>
-		</dependency>
-	</dependencies>
-	<dependencyManagement>
-		<dependencies>
-			<dependency>
-				<groupId>org.apache.openwebbeans</groupId>
-				<artifactId>openwebbeans</artifactId>	
-				<version>1.0.0-M4</version>
-				<type>pom</type>
-				<scope>import</scope>
-			</dependency>
-		</dependencies>
-	</dependencyManagement>
-</profile>]]></programlisting>
-
-</section>
\ No newline at end of file

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-07-01 11:47:42 UTC (rev 4660)
+++ arquillian/trunk/doc/reference/src/main/docbook/en-US/container_reference.xml	2010-07-01 17:51:14 UTC (rev 4661)
@@ -5,19 +5,21 @@
 <chapter id="container.reference">
 	<title>Complete Container Reference</title>
 
-   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="container_jbossas-remote-51.xml" />
-   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="container_jbossas-local-51.xml" />
-   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="container_jbossas-remote-60.xml" />
-   <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_jbossas-remote-5.xml" />
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="container_jbossas-remote-5.1.xml" />
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="container_jbossas-managed-5.1.xml" />
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="container_jbossas-remote-6.xml" />
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="container_jbossas-managed-6.xml" />
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="container_jbossas-embedded-6.xml" />
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="container_reloaded-embedded-1.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_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" />
-   <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_tomcat-embedded-6.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" />
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="container_weld-se-embedded-1.xml" />
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="container_weld-ee-embedded-1.1.xml" />
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="container_openwebbeans-embedded-1.xml" />
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="container_openejb-embedded-3.1.xml" />
  
 </chapter>

Added: arquillian/trunk/doc/reference/src/main/docbook/en-US/container_reloaded-embedded-1.xml
===================================================================
--- arquillian/trunk/doc/reference/src/main/docbook/en-US/container_reloaded-embedded-1.xml	                        (rev 0)
+++ arquillian/trunk/doc/reference/src/main/docbook/en-US/container_reloaded-embedded-1.xml	2010-07-01 17:51:14 UTC (rev 4661)
@@ -0,0 +1,52 @@
+<?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.reloaded-embedded-1">
+
+	<title>JBoss Reloaded 1.0 - Embedded</title>
+
+	<para id="container.reloaded-embedded-1.description">
+		A DeployableContainer implementation that can run and connect to a embedded(same JVM) 
+		JBoss Reloaded(MicroContainer + VirtualDeploymentFramework) instance. 
+		This implementation has lifecycle support, so the container will be started and stopped as part of
+		the test run. 	
+	</para>
+
+	<table id="container.reloaded-embedded-1.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></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>
+				</row>
+			</tbody>
+		</tgroup>
+	</table>
+
+</section>
\ No newline at end of file

Deleted: arquillian/trunk/doc/reference/src/main/docbook/en-US/container_reloaded.xml
===================================================================
--- arquillian/trunk/doc/reference/src/main/docbook/en-US/container_reloaded.xml	2010-07-01 11:47:42 UTC (rev 4660)
+++ arquillian/trunk/doc/reference/src/main/docbook/en-US/container_reloaded.xml	2010-07-01 17:51:14 UTC (rev 4661)
@@ -1,52 +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.reloaded">
-
-	<title>JBoss Reloaded - Embedded</title>
-
-	<para id="container.reloaded.description">
-		A DeployableContainer implementation that can run and connect to a embedded(same JVM) 
-		JBoss Reloaded(MicroContainer + VirtualDeploymentFramework) instance. 
-		This implementation has lifecycle support, so the container will be started and stopped as part of
-		the test run. 	
-	</para>
-
-	<table id="container.reloaded.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></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>
-				</row>
-			</tbody>
-		</tgroup>
-	</table>
-
-</section>
\ No newline at end of file

Modified: 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	2010-07-01 11:47:42 UTC (rev 4660)
+++ arquillian/trunk/doc/reference/src/main/docbook/en-US/container_tomcat-embedded-6.xml	2010-07-01 17:51:14 UTC (rev 4661)
@@ -4,7 +4,7 @@
 
 <section id="container.tomcat-embedded-6">
 
-	<title>Tomcat Embedded 6</title>
+	<title>Tomcat 6.0 - Embedded</title>
 
 	<para id="container.tomcat-embedded-6.description">
       A DeployableContainer implementation that can run and connect to a

Added: arquillian/trunk/doc/reference/src/main/docbook/en-US/container_weld-ee-embedded-1.1.xml
===================================================================
--- arquillian/trunk/doc/reference/src/main/docbook/en-US/container_weld-ee-embedded-1.1.xml	                        (rev 0)
+++ arquillian/trunk/doc/reference/src/main/docbook/en-US/container_weld-ee-embedded-1.1.xml	2010-07-01 17:51:14 UTC (rev 4661)
@@ -0,0 +1,103 @@
+<?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.weld-ee-embedded-11">
+
+	<title>Weld EE 1.1 - Embedded</title>
+
+	<para id="container.weld-ee-embedded-11.description">
+		A DeployableContainer implementation that can run and connect to a embedded(same JVM) 
+		Weld(CDI reference implementation) EE version. Mock EE APIs are available.
+		This implementation has lifecycle support, so the container will be started and stopped as part of
+		the test run.   
+	</para>
+
+	<table id="container.weld-ee-embedded-11.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>
+	
+	<warning>
+		Local EJBs only, which get treated as managed beans. Transactions, security and EJB context injection are not applied.
+	</warning>
+
+	<programlisting role="XML"><![CDATA[<profile>
+	<id>weld-ee-embedded-1.1</id>
+	<dependencies>
+		<dependency>
+			<groupId>org.jboss.arquillian.container</groupId>
+			<artifactId>arquillian-weld-ee-embedded-1.1</artifactId>
+			<version>1.0.0.Alpha3</version>
+		</dependency>
+		<dependency>
+			<groupId>org.jboss.weld</groupId>
+			<artifactId>weld-core</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.jboss.weld</groupId>
+			<artifactId>weld-api</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.slf4j</groupId>
+			<artifactId>slf4j-simple</artifactId>
+		</dependency>
+	</dependencies>
+	<dependencyManagement>
+		<dependencies>
+			<dependency>
+				<groupId>org.jboss.weld</groupId>
+				<artifactId>weld-core-bom</artifactId>
+				<version>1.0.1-SP1</version>
+				<type>pom</type>
+				<scope>import</scope>
+			</dependency>
+		</dependencies>
+	</dependencyManagement>
+</profile>]]></programlisting>
+</section>
\ No newline at end of file

Deleted: arquillian/trunk/doc/reference/src/main/docbook/en-US/container_weld-embedded.xml
===================================================================
--- arquillian/trunk/doc/reference/src/main/docbook/en-US/container_weld-embedded.xml	2010-07-01 11:47:42 UTC (rev 4660)
+++ arquillian/trunk/doc/reference/src/main/docbook/en-US/container_weld-embedded.xml	2010-07-01 17:51:14 UTC (rev 4661)
@@ -1,103 +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.weld-embedded">
-
-	<title>Weld SE - Embedded</title>
-
-	<para id="container.weld-embedded.description">
-		A DeployableContainer implementation that can run and connect to a embedded(same JVM) 
-		Weld(CDI reference implementation) SE edition. No EE APIs are available.
-		This implementation has lifecycle support, so the container will be started and stopped as part of
-		the test run.   
-	</para>
-
-	<table id="container.weld-embedded.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>
-	
-	<warning>
-		Local EJBs only, which get treated as managed beans. Transactions, security and EJB context injection are not applied.
-	</warning>
-
-	<programlisting role="XML"><![CDATA[<profile>
-	<id>weld-embedded</id>
-	<dependencies>
-		<dependency>
-			<groupId>org.jboss.arquillian.container</groupId>
-			<artifactId>arquillian-weld-embedded</artifactId>
-			<version>1.0.0.Alpha2</version>
-		</dependency>
-		<dependency>
-			<groupId>org.jboss.weld</groupId>
-			<artifactId>weld-core</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.jboss.weld</groupId>
-			<artifactId>weld-api</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.slf4j</groupId>
-			<artifactId>slf4j-simple</artifactId>
-		</dependency>
-	</dependencies>
-	<dependencyManagement>
-		<dependencies>
-			<dependency>
-				<groupId>org.jboss.weld</groupId>
-				<artifactId>weld-core-bom</artifactId>
-				<version>1.0.1-SP1</version>
-				<type>pom</type>
-				<scope>import</scope>
-			</dependency>
-		</dependencies>
-	</dependencyManagement>
-</profile>]]></programlisting>
-</section>
\ No newline at end of file

Added: arquillian/trunk/doc/reference/src/main/docbook/en-US/container_weld-se-embedded-1.xml
===================================================================
--- arquillian/trunk/doc/reference/src/main/docbook/en-US/container_weld-se-embedded-1.xml	                        (rev 0)
+++ arquillian/trunk/doc/reference/src/main/docbook/en-US/container_weld-se-embedded-1.xml	2010-07-01 17:51:14 UTC (rev 4661)
@@ -0,0 +1,103 @@
+<?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.weld-se-embedded-1">
+
+	<title>Weld SE 1.0 - Embedded</title>
+
+	<para id="container.weld-se-embedded-1.description">
+		A DeployableContainer implementation that can run and connect to a embedded(same JVM) 
+		Weld(CDI reference implementation) SE edition. No EE APIs are available.
+		This implementation has lifecycle support, so the container will be started and stopped as part of
+		the test run.   
+	</para>
+
+	<table id="container.weld-se-embedded-1.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>
+	
+	<warning>
+		Local EJBs only, which get treated as managed beans. Transactions, security and EJB context injection are not applied.
+	</warning>
+
+	<programlisting role="XML"><![CDATA[<profile>
+	<id>weld-se-embedded-1</id>
+	<dependencies>
+		<dependency>
+			<groupId>org.jboss.arquillian.container</groupId>
+			<artifactId>arquillian-weld-se-embedded-1</artifactId>
+			<version>1.0.0.Alpha3</version>
+		</dependency>
+		<dependency>
+			<groupId>org.jboss.weld</groupId>
+			<artifactId>weld-core</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.jboss.weld</groupId>
+			<artifactId>weld-api</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.slf4j</groupId>
+			<artifactId>slf4j-simple</artifactId>
+		</dependency>
+	</dependencies>
+	<dependencyManagement>
+		<dependencies>
+			<dependency>
+				<groupId>org.jboss.weld</groupId>
+				<artifactId>weld-core-bom</artifactId>
+				<version>1.0.1-SP1</version>
+				<type>pom</type>
+				<scope>import</scope>
+			</dependency>
+		</dependencies>
+	</dependencyManagement>
+</profile>]]></programlisting>
+</section>
\ No newline at end of file

Modified: arquillian/trunk/doc/reference/src/main/docbook/en-US/containers.xml
===================================================================
--- arquillian/trunk/doc/reference/src/main/docbook/en-US/containers.xml	2010-07-01 11:47:42 UTC (rev 4660)
+++ arquillian/trunk/doc/reference/src/main/docbook/en-US/containers.xml	2010-07-01 17:51:14 UTC (rev 4661)
@@ -98,96 +98,107 @@
             </thead>
             <tbody>
                <row>
+                 <entry><link linkend="container.jbossas-remote-5">JBoss AS 5</link></entry>
+                 <entry>remote</entry>
+                 <entry>Java EE 5</entry>
+                 <entry>arquillian-jbossas-remote-5</entry>
+               </row>
+               <row>
                  <entry><link linkend="container.jbossas-remote-51">JBoss AS 5.1</link></entry>
                  <entry>remote</entry>
                  <entry>Java EE 5</entry>
-                 <entry>arquillian-jbossas-remote-51</entry>
+                 <entry>arquillian-jbossas-remote-5.1</entry>
                </row>
                <row>
-                 <entry><link linkend="container.jbossas-local-51">JBoss AS 5.1</link></entry>
-                 <entry>remote + lifecycle</entry>
+                 <entry><link linkend="container.jbossas-managed-51">JBoss AS 5.1</link></entry>
+                 <entry>managed</entry>
                  <entry>Java EE 5</entry>
-                 <entry>arquillian-jbossas-local-51</entry>
+                 <entry>arquillian-jbossas-managed-5.1</entry>
                </row>
                <row>
-                 <entry><link linkend="container.jbossas-remote-60">JBoss AS 6.0 M3</link></entry>
+                 <entry><link linkend="container.jbossas-remote-6">JBoss AS 6.0 M3</link></entry>
                  <entry>remote</entry>
                  <entry>Java EE 6</entry>
-                 <entry>arquillian-jbossas-remote-60</entry>
+                 <entry>arquillian-jbossas-remote-6</entry>
                </row>
                <row>
-                 <entry><link linkend="container.jbossas-local-60">JBoss AS 6.0 M3</link></entry>
-                 <entry>remote + lifecycle</entry>
+                 <entry><link linkend="container.jbossas-managed-6">JBoss AS 6.0 M3</link></entry>
+                 <entry>managed</entry>
                  <entry>Java EE 6</entry>
-                 <entry>arquillian-jbossas-local-60</entry>
+                 <entry>arquillian-jbossas-managed-6</entry>
                </row>
                <row>
-                 <entry><link linkend="container.jbossas-embedded-60">JBoss Embedded AS 6.0 M3</link></entry>
+                 <entry><link linkend="container.jbossas-embedded-6">JBoss AS 6.0 M3</link></entry>
                  <entry>embedded</entry>
                  <entry>Java EE 6</entry>
-                 <entry>arquillian-jbossas-embedded-60</entry>
+                 <entry>arquillian-jbossas-embedded-6</entry>
                </row>
                <row>
-                 <entry><link linkend="container.reloaded">JBoss Reloaded</link></entry>
+                 <entry><link linkend="container.reloaded-embedded-1">JBoss Reloaded 1.0</link></entry>
                  <entry>embedded</entry>
                  <entry>JBoss MC</entry>
-                 <entry>arquillian-reloaded</entry>
+                 <entry>arquillian-reloaded-embedded-1</entry>
                </row>
                <row>
-                 <entry><link linkend="container.glassfish-remote-3">GlassFish Remote 3</link></entry>
+                 <entry><link linkend="container.glassfish-embedded-3">GlassFish 3.0</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><link linkend="container.glassfish-embedded-3">GlassFish 3.0</link></entry>
                  <entry>embedded</entry>
                  <entry>Java EE 6</entry>
                  <entry>arquillian-glassfish-embedded-3</entry>
                </row>
                <row>
-                 <entry><link linkend="container.weld-embedded">Weld SE</link></entry>
+                 <entry><link linkend="container.tomcat-embedded-6">Tomcat 6.0</link></entry>
                  <entry>embedded</entry>
-                 <entry>CDI</entry>
-                 <entry>arquillian-weld-embedded</entry>
+                 <entry>Servlet 2.5</entry>
+                 <entry>arquillian-tomcat-embedded-6</entry>
                </row>
                <row>
-                 <entry><link linkend="container.openwebbeans-embedded">Apache OpenWebBeans</link></entry>
+                 <entry><link linkend="container.tomcat-embedded-6">Jetty 6.1</link></entry>
                  <entry>embedded</entry>
-                 <entry>CDI</entry>
-                 <entry>arquillian-openwebbeans-embedded</entry>
+                 <entry>Servlet 2.5</entry>
+                 <entry>arquillian-jetty-embedded-6.1</entry>
                </row>
                <row>
-                 <entry><link linkend="container.openejb-embedded">Apache OpenEJB</link></entry>
+                 <entry><link linkend="container.jetty-embedded-7">Jetty 7.0</link></entry>
                  <entry>embedded</entry>
-                 <entry>EJB 3.0</entry>
-                 <entry>arquillian-openejb</entry>
+                 <entry>Servlet ~3.0</entry>
+                 <entry>arquillian-jetty-embedded-7</entry>
                </row>
                <row>
-                 <entry><link linkend="container.jetty-embedded-6_1">Jetty Embedded 6.1</link></entry>
+                 <entry><link linkend="container.weld-se-embedded-1">Weld SE 1.0</link></entry>
                  <entry>embedded</entry>
-                 <entry>Servlet 2.5</entry>
-                 <entry>arquillian-jetty-embedded-6.1</entry>
+                 <entry>CDI</entry>
+                 <entry>arquillian-weld-se-embedded-1</entry>
                </row>
                <row>
-                 <entry><link linkend="container.jetty-embedded-7">Jetty Embedded 7</link></entry>
+                 <entry><link linkend="container.weld-ee-embedded-11">Weld EE 1.1</link></entry>
                  <entry>embedded</entry>
-                 <entry>Servlet ~3.0</entry>
-                 <entry>arquillian-jetty-embedded-7</entry>
+                 <entry>CDI</entry>
+                 <entry>arquillian-weld-ee-embedded-1.1</entry>
                </row>
                <row>
-                 <entry><link linkend="container.tomcat-embedded-6">Tomcat Embedded 6</link></entry>
+                 <entry><link linkend="container.openwebbeans-embedded">Apache OpenWebBeans 1.0</link></entry>
                  <entry>embedded</entry>
-                 <entry>Servlet 2.5</entry>
-                 <entry>arquillian-tomcat-embedded-6</entry>
+                 <entry>CDI</entry>
+                 <entry>arquillian-openwebbeans-embedded-1</entry>
                </row>
+               <row>
+                 <entry><link linkend="container.openejb-embedded">Apache OpenEJB 3.1</link></entry>
+                 <entry>embedded</entry>
+                 <entry>EJB 3.0</entry>
+                 <entry>arquillian-openejb-embedded-3.1</entry>
+               </row>
             </tbody>
          </tgroup>
       </table>
 
       <para>
-         Support for other containers is planned, including Weblogic (remote), WebSphere (remote), Hibernate and JBoss
-         JCA Embedded.
+         Support for other containers is planned, including Weblogic (remote), WebSphere (remote) and Hibernate.
       </para>
 
    </section>

Modified: arquillian/trunk/doc/reference/src/main/docbook/en-US/gettingstarted.xml
===================================================================
--- arquillian/trunk/doc/reference/src/main/docbook/en-US/gettingstarted.xml	2010-07-01 11:47:42 UTC (rev 4660)
+++ arquillian/trunk/doc/reference/src/main/docbook/en-US/gettingstarted.xml	2010-07-01 17:51:14 UTC (rev 4661)
@@ -29,7 +29,7 @@
       </para>
 
       <programlisting role="XML"><![CDATA[<properties>
-   <arquillian.version>1.0.0.Alpha2</arquillian.version>
+   <arquillian.version>1.0.0.Alpha3</arquillian.version>
 </properties>]]></programlisting>
 
       <para>
@@ -288,11 +288,11 @@
 
       <programlisting role="XML"><![CDATA[<profiles>
    <profile>
-      <id>jbossas-remote-60</id>
+      <id>jbossas-remote-6</id>
       <dependencies>
          <dependency>
             <groupId>org.jboss.arquillian.container</groupId>
-            <artifactId>arquillian-jbossas-remote-60</artifactId>
+            <artifactId>arquillian-jbossas-remote-6</artifactId>
             <version>${arquillian.version}</version>
          </dependency>
       </dependencies>
@@ -306,10 +306,10 @@
 
       <para>
          All that's left is to execute the tests. In Maven, that's easy. Simply run the Maven test goal with the
-         <literal>jbossas-remote-60</literal> profile activated:
+         <literal>jbossas-remote-6</literal> profile activated:
       </para>
 
-      <programlisting><![CDATA[mvn test -Pjbossas-remote-60]]></programlisting>
+      <programlisting><![CDATA[mvn test -Pjbossas-remote-6]]></programlisting>
 
       <para>
         You should see that the two tests pass.



More information about the jboss-svn-commits mailing list