You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by bu...@apache.org on 2011/07/12 20:06:36 UTC

svn commit: r792601 [8/49] - /websites/staging/openejb/trunk/content/

Modified: websites/staging/openejb/trunk/content/configuring-persistenceunits-in-tests.html
==============================================================================
--- websites/staging/openejb/trunk/content/configuring-persistenceunits-in-tests.html (original)
+++ websites/staging/openejb/trunk/content/configuring-persistenceunits-in-tests.html Tue Jul 12 18:06:32 2011
@@ -152,50 +152,50 @@
           <P>
             <!-- $BODY -->
             <DIV id="PageContent">
-          <p><a name="ConfiguringPersistenceUnitsinTests-Overridingthepersistence.<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">ml">&lt;<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">a></p>
+          <p><a name="ConfiguringPersistenceUnitsinTests-Overridingthepersistence.xml"></a></p>
 
-<h1>Overriding the persistence.<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">ml</h1>
+<h1>Overriding the persistence.xml</h1>
 
 <p>The most common situation in EJB related testing by far is the need to
-alter your persistence.<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">ml for a test environment.</p>
+alter your persistence.xml for a test environment.</p>
 
-<p><a name="ConfiguringPersistenceUnitsinTests-Overridingthe<jta-data-source>and<non-jta-data-source>">&lt;<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">a></p>
+<p><a name="ConfiguringPersistenceUnitsinTests-Overridingthe<jta-data-source>and<non-jta-data-source>"></a></p>
 
 <h2>Overriding the <jta-data-source> and <non-jta-data-source></h2>
 
 <p>OpenEJB will automatically use the DataSources you have setup in your test
 environment, we're pretty good at guessing the right DataSources you intend
-even if the names don't match e<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">actly -- or in some cases at all.  If there
+even if the names don't match exactly -- or in some cases at all.  If there
 is only one DataSource configured, it's very easy for us to guess the
 DataSource to use.</p>
 
-<p>This allows you to keep your persistence.<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">ml configured for your production
-environment and helps eliminate the need for a "test" persistence.<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">ml
+<p>This allows you to keep your persistence.xml configured for your production
+environment and helps eliminate the need for a "test" persistence.xml
 (though we do have that functionality).  A log line will be printed saying
-if we had to adjust the DataSources of your persistence.<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">ml.</p>
+if we had to adjust the DataSources of your persistence.xml.</p>
 
-<p><a name="ConfiguringPersistenceUnitsinTests-Overridingthepersistence-unit<properties>">&lt;<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">a></p>
+<p><a name="ConfiguringPersistenceUnitsinTests-Overridingthepersistence-unit<properties>"></a></p>
 
 <h2>Overriding the persistence-unit <properties></h2>
 
 <p>You can override any property in your test setup via either system
-properties or the initial conte<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">t properties.  The format is:</p>
+properties or the initial context properties.  The format is:</p>
 
 <p><code>&lt;unit-name&gt;.&lt;property&gt;=&lt;value&gt;</code></p>
 
-<p>So for e<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">ample with the following persistence.<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">ml:</p>
+<p>So for example with the following persistence.xml:</p>
 
 <pre><code>&lt;persistence&gt;
   &lt;persistence-unit name="movie-unit"&gt;
-    &lt;provider&gt;org.hibernate.ejb.HibernatePersistence&lt;&lt;IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0"&gt;provider&gt;
-    &lt;jta-data-source&gt;movieDatabase&lt;&lt;IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0"&gt;jta-data-source&gt;
-    &lt;non-jta-data-source&gt;movieDatabaseUnmanaged&lt;&lt;IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0"&gt;non-jta-data-source&gt;
+    &lt;provider&gt;org.hibernate.ejb.HibernatePersistence&lt;/provider&gt;
+    &lt;jta-data-source&gt;movieDatabase&lt;/jta-data-source&gt;
+    &lt;non-jta-data-source&gt;movieDatabaseUnmanaged&lt;/non-jta-data-source&gt;
     &lt;properties&gt;
-      &lt;property name="hibernate.hbm2ddl.auto" value="create-drop"&lt;IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0"&gt;&gt;
-      &lt;property name="hibernate.ma&lt;IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0"&gt;_fetch_depth" value="3"&lt;IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0"&gt;&gt;
-    &lt;&lt;IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0"&gt;properties&gt;
-  &lt;&lt;IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0"&gt;persistence-unit&gt;
-&lt;&lt;IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0"&gt;persistence&gt;
+      &lt;property name="hibernate.hbm2ddl.auto" value="create-drop"/&gt;
+      &lt;property name="hibernate.max_fetch_depth" value="3"/&gt;
+    &lt;/properties&gt;
+  &lt;/persistence-unit&gt;
+&lt;/persistence&gt;
 </code></pre>
 
 <p>You can override and add persistence unit properties in your test case.
@@ -203,36 +203,36 @@ There are currently no facilities for re
 that let us know -- it hasn't really come up so far).</p>
 
 <pre><code>Properties p = new Properties();
-p.put(Conte&lt;IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0"&gt;t.INITIAL_CONTEXT_FACTORY,"org.apache.openejb.client.LocalInitialConte&lt;IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0"&gt;tFactory");
+p.put(Context.INITIAL_CONTEXT_FACTORY,"org.apache.openejb.client.LocalInitialContextFactory");
 
 p.put("movie-unit.hibernate.hbm2ddl.auto", "update");
 p.put("movie-unit.hibernate.dialect", "org.hibernate.dialect.HSQLDialect");
 
-conte&lt;IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0"&gt;t = new InitialConte&lt;IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0"&gt;t(p);
+context = new InitialContext(p);
 </code></pre>
 
 <p>The overriding order is as follows: 1 = highest, 4 = lowest.</p>
 
-<pre><code># InitialConte&lt;IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0"&gt;t properties
+<pre><code># InitialContext properties
 # jndi.properties from the classpath
 # System properties
-# persistence.&lt;IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0"&gt;ml properties
+# persistence.xml properties
 </code></pre>
 
 <p>By default there are no overrides in 1-3, so #4 is the only source of
 information.  </p>
 
-<p>In the above e<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">ample there would be e<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">actly three properties for the "movie-unit" persistence unit:</p>
+<p>In the above example there would be exactly three properties for the "movie-unit" persistence unit:</p>
 
 <ul>
 <li>hibernate.hbm2ddl.auto = update</li>
-<li>hibernate.ma<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0"><em>fetch</em>depth = 3</li>
+<li>hibernate.max_fetch_depth = 3</li>
 <li>hibernate.dialect = org.hibernate.dialect.HSQLDialect</li>
 </ul>
 
 <p>These properties would be passed by OpenEJB directly to the persistence
-provider (in this case Hibernate).  With one e<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">ception OpenEJB does not
-understand or modify these properties.  Details on that one e<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">ception
+provider (in this case Hibernate).  With one exception OpenEJB does not
+understand or modify these properties.  Details on that one exception
 below.</p>
 
 <h3>No need to specify a "transaction lookup" property</h3>
@@ -251,7 +251,7 @@ will set for you:</p>
 will be automatically set by OpenEJB to
 <em>org.apache.openejb.hibernate.TransactionManagerLookup</em>.  If the property
 is already set in the persistence unit it will be overwritten if it starts
-with the standard "org.hibernate.transaction." prefi<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">.   </p>
+with the standard "org.hibernate.transaction." prefix.  </p>
 
 <p>Custom lookup implementations will never be overwritten.</p>
 
@@ -263,7 +263,7 @@ with the standard "org.hibernate.transac
 set by OpenEJB to <em>org.apache.openejb.toplink.JTATransactionController</em>. 
 If the property is already set in the persistence unit it will be
 overwritten if it starts with the standard "oracle.toplink.transaction."
-prefi<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">.  </p>
+prefix.  </p>
 
 <p>Custom transaction controller implementations will never be overwritten.</p>
 
@@ -275,7 +275,7 @@ prefi<IMG class="emoticon" src="https://
 automatically set by OpenEJB to
 <em>org.apache.openejb.eclipselink.JTATransactionController</em>.  If the property
 is already set in the persistence unit it will be overwritten if it starts
-with the standard "org.eclipse.persistence.transaction." prefi<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">.  </p>
+with the standard "org.eclipse.persistence.transaction." prefix.  </p>
 
 <p>Custom transaction controller implementations will never be overwritten.</p>
 

Modified: websites/staging/openejb/trunk/content/constructor-injection.html
==============================================================================
--- websites/staging/openejb/trunk/content/constructor-injection.html (original)
+++ websites/staging/openejb/trunk/content/constructor-injection.html Tue Jul 12 18:06:32 2011
@@ -188,7 +188,7 @@ public class WidgetBean implements Widge
 }
 </code></pre>
 
-<p>The @EJB, @Resource, @PersistenceUnit, and @PersistenceConte<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">t annotations
+<p>The @EJB, @Resource, @PersistenceUnit, and @PersistenceContext annotations
 can be placed at the class-level instead such as:</p>
 
 <pre><code>@Stateless
@@ -198,7 +198,7 @@ can be placed at the class-level instead
 public class WidgetBean implements Widget {
 
     public WidgetBean(Integer count, Foo foo, DataSource ds) {
-       &lt;IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0"&gt;&lt;IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0"&gt; do something
+       // do something
     }
 
     public int getCount() {
@@ -230,7 +230,7 @@ to <a href="mailto:jsr-316-comments@jcp.
 public class WidgetBean implements Widget {
 
     public WidgetBean(@Resource(name = "count") Integer count, @EJB Foo foo, @Resource DataSource ds) {
-       &lt;IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0"&gt;&lt;IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0"&gt; do something
+       // do something
     }
 
     public int getCount() {

Modified: websites/staging/openejb/trunk/content/containers-and-resources.html
==============================================================================
--- websites/staging/openejb/trunk/content/containers-and-resources.html (original)
+++ websites/staging/openejb/trunk/content/containers-and-resources.html Tue Jul 12 18:06:32 2011
@@ -153,24 +153,24 @@
             <!-- $BODY -->
             <DIV id="PageContent">
           <p>{anchor: containers}
-<a name="ContainersandResources-Containers">&lt;<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">a></p>
+<a name="ContainersandResources-Containers"></a></p>
 
 <h1>Containers</h1>
 
 <p>{anchor:Default CMP Container-container}
-<a name="ContainersandResources-CMP_ENTITY">&lt;<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">a></p>
+<a name="ContainersandResources-CMP_ENTITY"></a></p>
 
 <h2>CMP_ENTITY</h2>
 
-<p>Declarable in openejb.<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">ml via</p>
+<p>Declarable in openejb.xml via</p>
 
 <pre><code>&lt;Container id="Foo" type="CMP_ENTITY"&gt;
-&lt;&lt;IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0"&gt;Container&gt;
+&lt;/Container&gt;
 </code></pre>
 
 <p>Declarable in properties via
 {panel}
-Foo = new:<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0"><IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">Container?type=CMP_ENTITY
+Foo = new://Container?type=CMP_ENTITY
 {panel}
 Supports the following properties
     || Property Name || Description ||
@@ -178,96 +178,96 @@ Supports the following properties
 <em>org.apache.openejb.core.cmp.jpa.JpaCmpEngineFactory</em>.||</p>
 
 <p>{anchor:Default BMP Container-container}
-<a name="ContainersandResources-BMP_ENTITY">&lt;<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">a></p>
+<a name="ContainersandResources-BMP_ENTITY"></a></p>
 
 <h2>BMP_ENTITY</h2>
 
-<p>Declarable in openejb.<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">ml via</p>
+<p>Declarable in openejb.xml via</p>
 
 <pre><code>&lt;Container id="Foo" type="BMP_ENTITY"&gt;
-&lt;&lt;IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0"&gt;Container&gt;
+&lt;/Container&gt;
 </code></pre>
 
 <p>Declarable in properties via
 {panel}
-Foo = new:<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0"><IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">Container?type=BMP_ENTITY
+Foo = new://Container?type=BMP_ENTITY
 {panel}
 Supports the following properties
     || Property Name || Description ||</p>
 
 <p>{anchor:Default Stateless Container-container}
-<a name="ContainersandResources-STATELESS">&lt;<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">a></p>
+<a name="ContainersandResources-STATELESS"></a></p>
 
 <h2>STATELESS</h2>
 
-<p>Declarable in openejb.<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">ml via</p>
+<p>Declarable in openejb.xml via</p>
 
 <pre><code>&lt;Container id="Foo" type="STATELESS"&gt;
-&lt;&lt;IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0"&gt;Container&gt;
+&lt;/Container&gt;
 </code></pre>
 
 <p>Declarable in properties via
 {panel}
-Foo = new:<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0"><IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">Container?type=STATELESS
+Foo = new://Container?type=STATELESS
 {panel}
 Supports the following properties
     || Property Name || Description ||</p>
 
 <p>{anchor:Default Stateful Container-container}
-<a name="ContainersandResources-STATEFUL">&lt;<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">a></p>
+<a name="ContainersandResources-STATEFUL"></a></p>
 
 <h2>STATEFUL</h2>
 
-<p>Declarable in openejb.<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">ml via</p>
+<p>Declarable in openejb.xml via</p>
 
 <pre><code>&lt;Container id="Foo" type="STATEFUL"&gt;
-&lt;&lt;IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0"&gt;Container&gt;
+&lt;/Container&gt;
 </code></pre>
 
 <p>Declarable in properties via
 {panel}
-Foo = new:<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0"><IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">Container?type=STATEFUL
+Foo = new://Container?type=STATEFUL
 {panel}
 Supports the following properties
     || Property Name || Description ||</p>
 
 <p>{anchor:Default MDB Container-container}
-<a name="ContainersandResources-MESSAGE">&lt;<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">a></p>
+<a name="ContainersandResources-MESSAGE"></a></p>
 
 <h2>MESSAGE</h2>
 
-<p>Declarable in openejb.<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">ml via</p>
+<p>Declarable in openejb.xml via</p>
 
 <pre><code>&lt;Container id="Foo" type="MESSAGE"&gt;
-&lt;&lt;IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0"&gt;Container&gt;
+&lt;/Container&gt;
 </code></pre>
 
 <p>Declarable in properties via
 {panel}
-Foo = new:<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0"><IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">Container?type=MESSAGE
+Foo = new://Container?type=MESSAGE
 {panel}
 Supports the following properties
     || Property Name || Description ||</p>
 
 <p>{anchor: resources}
-<a name="ContainersandResources-Resources">&lt;<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">a></p>
+<a name="ContainersandResources-Resources"></a></p>
 
 <h1>Resources</h1>
 
 <p>{anchor:Default JDBC Database-resource}
-<a name="ContainersandResources-java<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">.sql.DataSource">&lt;<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">a></p>
+<a name="ContainersandResources-javax.sql.DataSource"></a></p>
 
-<h2>java<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">.sql.DataSource</h2>
+<h2>javax.sql.DataSource</h2>
 
-<p>Declarable in openejb.<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">ml via</p>
+<p>Declarable in openejb.xml via</p>
 
-<pre><code>&lt;Resource id="Foo" type="java&lt;IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0"&gt;.sql.DataSource"&gt;
-&lt;&lt;IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0"&gt;Resource&gt;
+<pre><code>&lt;Resource id="Foo" type="javax.sql.DataSource"&gt;
+&lt;/Resource&gt;
 </code></pre>
 
 <p>Declarable in properties via
 {panel}
-Foo = new:<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0"><IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">Resource?type=java<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">.sql.DataSource
+Foo = new://Resource?type=javax.sql.DataSource
 {panel}
 Supports the following properties
     || Property Name || Description ||</p>
@@ -276,111 +276,111 @@ Supports the following properties
 </code></pre>
 
 <p>{anchor:Default JMS Resource Adapter-resource}
-<a name="ContainersandResources-ActiveMQResourceAdapter">&lt;<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">a></p>
+<a name="ContainersandResources-ActiveMQResourceAdapter"></a></p>
 
 <h2>ActiveMQResourceAdapter</h2>
 
-<p>Declarable in openejb.<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">ml via</p>
+<p>Declarable in openejb.xml via</p>
 
 <pre><code>&lt;Resource id="Foo" type="ActiveMQResourceAdapter"&gt;
-&lt;&lt;IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0"&gt;Resource&gt;
+&lt;/Resource&gt;
 </code></pre>
 
 <p>Declarable in properties via
 {panel}
-Foo = new:<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0"><IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">Resource?type=ActiveMQResourceAdapter
+Foo = new://Resource?type=ActiveMQResourceAdapter
 {panel}
 Supports the following properties
     || Property Name || Description ||</p>
 
 <p>{anchor:Default JMS Connection Factory-resource}
-<a name="ContainersandResources-java<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">.jms.ConnectionFactory">&lt;<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">a></p>
+<a name="ContainersandResources-javax.jms.ConnectionFactory"></a></p>
 
-<h2>java<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">.jms.ConnectionFactory</h2>
+<h2>javax.jms.ConnectionFactory</h2>
 
-<p>Declarable in openejb.<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">ml via</p>
+<p>Declarable in openejb.xml via</p>
 
-<pre><code>&lt;Resource id="Foo" type="java&lt;IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0"&gt;.jms.ConnectionFactory"&gt;
-&lt;&lt;IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0"&gt;Resource&gt;
+<pre><code>&lt;Resource id="Foo" type="javax.jms.ConnectionFactory"&gt;
+&lt;/Resource&gt;
 </code></pre>
 
 <p>Declarable in properties via
 {panel}
-Foo = new:<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0"><IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">Resource?type=java<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">.jms.ConnectionFactory
+Foo = new://Resource?type=javax.jms.ConnectionFactory
 {panel}
 Supports the following properties
     || Property Name || Description ||
     | ResourceAdapter | Default value is <em>Default JMS Resource Adapter</em>.||</p>
 
 <p>{anchor:Default Queue-resource}
-<a name="ContainersandResources-java<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">.jms.Queue">&lt;<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">a></p>
+<a name="ContainersandResources-javax.jms.Queue"></a></p>
 
-<h2>java<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">.jms.Queue</h2>
+<h2>javax.jms.Queue</h2>
 
-<p>Declarable in openejb.<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">ml via</p>
+<p>Declarable in openejb.xml via</p>
 
-<pre><code>&lt;Resource id="Foo" type="java&lt;IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0"&gt;.jms.Queue"&gt;
-&lt;&lt;IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0"&gt;Resource&gt;
+<pre><code>&lt;Resource id="Foo" type="javax.jms.Queue"&gt;
+&lt;/Resource&gt;
 </code></pre>
 
 <p>Declarable in properties via
 {panel}
-Foo = new:<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0"><IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">Resource?type=java<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">.jms.Queue
+Foo = new://Resource?type=javax.jms.Queue
 {panel}
 Supports the following properties
     || Property Name || Description ||
     | destination | Specifies the name of the queue|</p>
 
 <p>{anchor:Default Topic-resource}
-<a name="ContainersandResources-java<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">.jms.Topic">&lt;<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">a></p>
+<a name="ContainersandResources-javax.jms.Topic"></a></p>
 
-<h2>java<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">.jms.Topic</h2>
+<h2>javax.jms.Topic</h2>
 
-<p>Declarable in openejb.<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">ml via</p>
+<p>Declarable in openejb.xml via</p>
 
-<pre><code>&lt;Resource id="Foo" type="java&lt;IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0"&gt;.jms.Topic"&gt;
-&lt;&lt;IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0"&gt;Resource&gt;
+<pre><code>&lt;Resource id="Foo" type="javax.jms.Topic"&gt;
+&lt;/Resource&gt;
 </code></pre>
 
 <p>Declarable in properties via
 {panel}
-Foo = new:<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0"><IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">Resource?type=java<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">.jms.Topic
+Foo = new://Resource?type=javax.jms.Topic
 {panel}
 Supports the following properties
     || Property Name || Description ||
     | destination | Specifies the name of the topic|</p>
 
 <p>{anchor:Default ORB-resource}
-<a name="ContainersandResources-org.omg.CORBA.ORB">&lt;<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">a></p>
+<a name="ContainersandResources-org.omg.CORBA.ORB"></a></p>
 
 <h2>org.omg.CORBA.ORB</h2>
 
-<p>Declarable in openejb.<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">ml via</p>
+<p>Declarable in openejb.xml via</p>
 
 <pre><code>&lt;Resource id="Foo" type="org.omg.CORBA.ORB"&gt;
-&lt;&lt;IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0"&gt;Resource&gt;
+&lt;/Resource&gt;
 </code></pre>
 
 <p>Declarable in properties via
 {panel}
-Foo = new:<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0"><IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">Resource?type=org.omg.CORBA.ORB
+Foo = new://Resource?type=org.omg.CORBA.ORB
 {panel}
 No properties.</p>
 
 <p>{anchor:Default Mail Session-resource}
-<a name="ContainersandResources-java<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">.mail.Session">&lt;<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">a></p>
+<a name="ContainersandResources-javax.mail.Session"></a></p>
 
-<h2>java<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">.mail.Session</h2>
+<h2>javax.mail.Session</h2>
 
-<p>Declarable in openejb.<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">ml via</p>
+<p>Declarable in openejb.xml via</p>
 
-<pre><code>&lt;Resource id="Foo" type="java&lt;IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0"&gt;.mail.Session"&gt;
-&lt;&lt;IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0"&gt;Resource&gt;
+<pre><code>&lt;Resource id="Foo" type="javax.mail.Session"&gt;
+&lt;/Resource&gt;
 </code></pre>
 
 <p>Declarable in properties via
 {panel}
-Foo = new:<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0"><IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">Resource?type=java<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">.mail.Session
+Foo = new://Resource?type=javax.mail.Session
 {panel}
 No properties.</p>
 

Modified: websites/staging/openejb/trunk/content/contribution-tips.html
==============================================================================
--- websites/staging/openejb/trunk/content/contribution-tips.html (original)
+++ websites/staging/openejb/trunk/content/contribution-tips.html Tue Jul 12 18:06:32 2011
@@ -152,7 +152,7 @@
           <P>
             <!-- $BODY -->
             <DIV id="PageContent">
-          <p><a name="ContributionTips-Firststeps">&lt;<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">a></p>
+          <p><a name="ContributionTips-Firststeps"></a></p>
 
 <h1>First steps</h1>
 
@@ -160,16 +160,16 @@
 <li>Subscribe to the <a href="mailto:dev-subscribe@openejb.apche.org.html">dev list</a>
 and say Hi</li>
 <li>Get the source code with svn or git
-** svn co https:<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0"><IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">svn.apache.org<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">repos<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">asf<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">openejb<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">trunk<IM
 G class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">openejb3</li>
+** svn co https://svn.apache.org/repos/asf/openejb/trunk/openejb3</li>
 <li>Build the code (maven 2.2.1 or higher recommended)
 ** mvn clean install</li>
 </ol>
 
-<p>Play around with the e<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">amples under the e<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">amples<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0"> directory.  Some of the
-neater ones are (ordered simple to comple<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">):</p>
+<p>Play around with the examples under the examples/ directory.  Some of the
+neater ones are (ordered simple to complex):</p>
 
 <ul>
-<li>simple-stateless ([see video](-http:<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0"><IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">vimeo.com<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">6149008.html)
+<li>simple-stateless (<a href="-http://vimeo.com/6149008.html">see video</a>
 )</li>
 <li>simple-stateful</li>
 <li>simple-singleton</li>
@@ -188,14 +188,14 @@ neater ones are (ordered simple to compl
 <li>simple-webservice</li>
 </ul>
 
-<p><a name="ContributionTips-Whatistheprocess?">&lt;<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">a></p>
+<p><a name="ContributionTips-Whatistheprocess?"></a></p>
 
 <h1>What is the process?</h1>
 
 <pre><code>public void contributeToOpenSource() {
 
     boolean stillInterestedAndHavingFun = true;
-    int taskSize = 1; &lt;IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0"&gt;&lt;IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0"&gt; start small!
+    int taskSize = 1; // start small!
 
     contributing:
     while (stillInterestedAndHavingFun) {
@@ -214,7 +214,7 @@ neater ones are (ordered simple to compl
             hackALittle(task);
 
             if (task.tooHard() || task.notFun()) {
-                &lt;IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0"&gt;&lt;IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0"&gt; no big deal, try again with something else
+                // no big deal, try again with something else
                 taskSize--;
                 continue contributing;
             }
@@ -230,9 +230,9 @@ neater ones are (ordered simple to compl
                 pokeAtSometingElse();
                 helpOnUserList();
                 dayDream();
-            } catch (MoreThanAWeekE&lt;IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0"&gt;ception e) {
-                &lt;IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0"&gt;&lt;IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0"&gt; Assume it fell off the radar -- happens.
-                &lt;IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0"&gt;&lt;IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0"&gt; Evidence we need more committers.
+            } catch (MoreThanAWeekException e) {
+                // Assume it fell off the radar -- happens.
+                // Evidence we need more committers.
                 bumpThreadOnList(task);
             }
         }
@@ -252,7 +252,7 @@ never stop learning these things and you
 time.</p>
 
 <p>No one cares how much code you can write or how fast you can write it.  We
-all just contribute what we can when we can and there are no e<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">pectations
+all just contribute what we can when we can and there are no expectations
 on how much, how often, or where.</p>
 
 <p>It's very much about the journey and there is no real end as long as you're
@@ -261,7 +261,7 @@ having fun and learning.</p>
 <p>Probably finding something to do when you do have time is the hardest part
 ... that never changes.</p>
 
-<p><a name="ContributionTips-BeBrave">&lt;<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">a></p>
+<p><a name="ContributionTips-BeBrave"></a></p>
 
 <h1>Be Brave</h1>
 
@@ -287,7 +287,7 @@ get another 1 or 2 new faces who suddenl
 sing, there are better odds you might get up and sign too. Seeing people
 like yourself do the things you want to do is inspiring.</p>
 
-<p><a name="ContributionTips-StartSmall">&lt;<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">a></p>
+<p><a name="ContributionTips-StartSmall"></a></p>
 
 <h1>Start Small</h1>
 
@@ -311,7 +311,7 @@ isolation.</p>
 
 <p>Start small, get it checked in (or patch submitted) and work iteratively.</p>
 
-<p><a name="ContributionTips-Thingsthatalwaysneeddoing">&lt;<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">a></p>
+<p><a name="ContributionTips-Thingsthatalwaysneeddoing"></a></p>
 
 <h1>Things that always need doing</h1>
 
@@ -328,20 +328,20 @@ javadoc it.</li>
 <li>Add @Override where applicable</li>
 <li>Intellij has an 'Inspect Code' feature.  Yikes does it produce a lot of
 output.</li>
-<li>No doubt there is some e<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">ception handling that can be greatly improved.</li>
+<li>No doubt there is some exception handling that can be greatly improved.</li>
 </ul>
 
 <p>Obviously, one could get quite bored doing just the above.  But sometimes
-the above tasks can lead to more fun and e<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">citing things.  Anything that
+the above tasks can lead to more fun and exciting things.  Anything that
 gets you in and looking at code and actually touching and changing it
 usually results in questions, discussions and ideas... then little passions
 and late nights and lack of sleep and caffeine abuse.</p>
 
-<p><a name="ContributionTips-Thingstoavoid">&lt;<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">a></p>
+<p><a name="ContributionTips-Thingstoavoid"></a></p>
 
 <h1>Things to avoid</h1>
 
-<p><a name="ContributionTips-Hugepatches">&lt;<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">a></p>
+<p><a name="ContributionTips-Hugepatches"></a></p>
 
 <h4>Huge patches</h4>
 
@@ -350,11 +350,11 @@ step forward is a good one.  Small steps
 headed and give input.  That's true regardless if you are a committer or
 contributor.</p>
 
-<p><a name="ContributionTips-Becarefulwithreformatting">&lt;<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">a></p>
+<p><a name="ContributionTips-Becarefulwithreformatting"></a></p>
 
 <h4>Be careful with reformatting</h4>
 
-<p>Try to never mi<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0"> logic changes with code reformatting.   It makes it nearly
+<p>Try to never mix logic changes with code reformatting.  It makes it nearly
 impossible for others to see what the actual change was.</p>
 
 <ul>

Modified: websites/staging/openejb/trunk/content/creating-itests.html
==============================================================================
--- websites/staging/openejb/trunk/content/creating-itests.html (original)
+++ websites/staging/openejb/trunk/content/creating-itests.html Tue Jul 12 18:06:32 2011
@@ -152,7 +152,7 @@
           <P>
             <!-- $BODY -->
             <DIV id="PageContent">
-          <p><a name="Creatingitests-OpenEJBitests">&lt;<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">a></p>
+          <p><a name="Creatingitests-OpenEJBitests"></a></p>
 
 <h1>OpenEJB itests</h1>
 
@@ -163,29 +163,29 @@ in JUnit.</p>
 
 <p>This page describes the steps to create EJB test cases.</p>
 
-<p><a name="Creatingitests-Howitestswork">&lt;<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">a></p>
+<p><a name="Creatingitests-Howitestswork"></a></p>
 
 <h2>How itests work</h2>
 
-<p>The itests module lives in OpenEJB's repository in the <em>modules\itests</em> directory. Setting up the test environment to e<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">ecute the itests is based on ([maven-itest-plugin-1.0 plugin](http:<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0"><IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">svn.apache.org<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">repos<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" borde
 r="0">asf<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">maven<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">maven-1<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">plugins-sandbo<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0"><IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">trunk<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">itest<IMG cla
 ss="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">)
+<p>The itests module lives in OpenEJB's repository in the <em>modules\itests</em> directory. Setting up the test environment to execute the itests is based on (<a href="http://svn.apache.org/repos/asf/maven/maven-1/plugins-sandbox/trunk/itest/">maven-itest-plugin-1.0 plugin</a>
 ). </p>
 
-<p>Take a look at maven.<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">ml in modules\itests directory. There you'll see that
-the default goal is <em>ejb:install</em>, which in turn e<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">ecutes <em>itest</em>. When the
+<p>Take a look at maven.xml in modules\itests directory. There you'll see that
+the default goal is <em>ejb:install</em>, which in turn executes <em>itest</em>. When the
 EJBs (todo: describe it a bit more) are done, the <em>itest:setup</em> goal is
-e<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">ecuted, which starts the real game. First, <em>org<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">openejb<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">Security</em>
-configuration is started. Once it's done, <em>openejb-itests-<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0"><IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0"><IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">.jar</em> is
-deployed, which is <em>org<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">openejb<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">Itests</em> configuration to be started,
+executed, which starts the real game. First, <em>org/openejb/Security</em>
+configuration is started. Once it's done, <em>openejb-itests-xxx.jar</em> is
+deployed, which is <em>org/openejb/Itests</em> configuration to be started,
 afterwards. When the configurations are deployed and started, the
-maven-itest-plugin e<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">ecutes junit (see [Ant JUnit task documentation](http:<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0"><IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">ant.apache.org<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">manual<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">OptionalTasks<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" heigh
 t="16" width="16" align="absmiddle" alt="" border="0">junit.html)
+maven-itest-plugin executes junit (see <a href="http://ant.apache.org/manual/OptionalTasks/junit.html">Ant JUnit task documentation</a>
  and project.properties of the itests module). The project.properties file
 configures which itests are run and some other stuff.</p>
 
 <p>The first itest test case is <em>org.openejb.test.entity.cmp.CmpTestSuite</em>.
 Consult this for more information. Then the others defined in
-<em>maven.itest.includes</em> property are e<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">ecuted.</p>
+<em>maven.itest.includes</em> property are executed.</p>
 
-<p>The order in which the itests are e<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">ecuted is important, so the first order
+<p>The order in which the itests are executed is important, so the first order
 is set up via the maven.itest.includes property, then the test suites add
 their tests in some order, and finally the method names in the test classes
 put yet another order. So, be careful what name your test method name will
@@ -199,25 +199,25 @@ property setting approaches (-D on the c
 build.properties in your home directory or the project you work in).</p>
 
 <p>So, the last important information is how the junit tests access the server
-resources - EJBs. It's done via e<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">ecuting session beans that in turn get at
+resources - EJBs. It's done via executing session beans that in turn get at
 the test EJBs, mostly CMPs. It's also possible that the CMP itests will be
 accessed directly without having to pass on the call through a session
 bean.</p>
 
-<p>If itests are part of a larger project structure you can disable e<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">ecuting
+<p>If itests are part of a larger project structure you can disable executing
 it using the <em>maven.itest.skip</em> property. Set it to <em>true</em> and Maven won't
 run the itests.</p>
 
-<p><a name="Creatingitests-SimpleCMP2.1itest">&lt;<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">a></p>
+<p><a name="Creatingitests-SimpleCMP2.1itest"></a></p>
 
 <h2>Simple CMP 2.1 itest</h2>
 
-<p><a name="Creatingitests-Databasesetup">&lt;<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">a></p>
+<p><a name="Creatingitests-Databasesetup"></a></p>
 
 <h3>Database setup</h3>
 
 <p>The itests default database is Derby. The class -
-<em>org.openejb.test.DerbyTestDatabase</em> - is instantiated upon e<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">ecuting
+<em>org.openejb.test.DerbyTestDatabase</em> - is instantiated upon executing
 <em>org.openejb.testTestManager.getDatabase()</em> in each test case's <em>setUp()</em>
 method. Remember, you can define any other database using the
 <em>openejb.test.database</em> property or do initialization of your own database
@@ -227,75 +227,75 @@ choice in the setUp() method.</p>
 DerbyTestDatabse methods: <em>createCMP2Model()</em> and <em>dropCMP2Model()</em> that
 create and drop database structure, accordingly.</p>
 
-<p><a name="Creatingitests-CMP2.1deployment">&lt;<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">a></p>
+<p><a name="Creatingitests-CMP2.1deployment"></a></p>
 
 <h3>CMP 2.1 deployment</h3>
 
 <p>{info:title=Information}
-Unless specified, all directories are relative to <em>modules<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">itests</em>
-directory and commands are e<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">ecuted in it.
+Unless specified, all directories are relative to <em>modules/itests</em>
+directory and commands are executed in it.
 {info}</p>
 
 <p>A Maven project can produce one build artefact. It's very important to keep
 in mind whenever your tests are to be based on a EJB that's not built by
 default. The default EJBs are defined in
-<em>modules<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">itests<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">src<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">ejb<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">META-INF<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">ejb-jar.<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">ml</em>. The c
 orresponding deployment
-plan - the <em>openejb-jar.<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">ml</em> file is in
-<em>modules<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">itests<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">src<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">ejb<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">META-INF<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">openejb-jar.<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">ml</em>.</
 p>
+<em>modules/itests/src/ejb/META-INF/ejb-jar.xml</em>. The corresponding deployment
+plan - the <em>openejb-jar.xml</em> file is in
+<em>modules/itests/src/ejb/META-INF/openejb-jar.xml</em>.</p>
 
 <p>If you want to test your own EJB, you need to build it yourself, i.e.
-describe the build and deployment in <em>modules<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">itests<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">maven.<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">ml</em> in the
+describe the build and deployment in <em>modules/itests/maven.xml</em> in the
 pregoal of <em>itest:setup</em>.</p>
 
-<p>In the following e<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">ample, Ant's jar builds openejb-cmp2-petstore.jar file,
+<p>In the following example, Ant's jar builds openejb-cmp2-petstore.jar file,
 which in turn is distributed and started in Geronimo. The <em>id</em> attribute of
-<em>deploy:start</em> is as specified in the module's deployment plan. See [Geronimo Deployment](http:<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0"><IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">wiki.apache.org<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">geronimo<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">Deployment)
+<em>deploy:start</em> is as specified in the module's deployment plan. See <a href="http://wiki.apache.org/geronimo/Deployment">Geronimo Deployment</a>
  for more information about Geronimo deployment plans.</p>
 
-<pre><code>&lt;ant:jar destfile="${basedir}&lt;IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0"&gt;target&lt;IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0"&gt;openejb-cmp2-petstore.jar"&gt;
-  &lt;fileset dir="${basedir}&lt;IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0"&gt;target&lt;IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0"&gt;classes"&gt;
-    &lt;include name="**&lt;IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0"&gt;cmp2&lt;IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0"&gt;petstore&lt;IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0"&gt;*.class"&lt;IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0"&gt;&gt;
-    &lt;include name="**&lt;IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0"&gt;TestFailureE&lt;IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0"&gt;ception.class"&lt;IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0"&gt;&gt;
-  &lt;&lt;IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0"&gt;fileset&gt;
-  &lt;metainf dir="${basedir}&lt;IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0"&gt;src&lt;IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0"&gt;cmp2&lt;IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0"&gt;petstore" includes="*.&lt;IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0"&gt;ml"&lt;IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0"&gt;&gt;
-&lt;&lt;IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0"&gt;ant:jar&gt;
+<pre><code>&lt;ant:jar destfile="${basedir}/target/openejb-cmp2-petstore.jar"&gt;
+  &lt;fileset dir="${basedir}/target/classes"&gt;
+    &lt;include name="**/cmp2/petstore/*.class"/&gt;
+    &lt;include name="**/TestFailureException.class"/&gt;
+  &lt;/fileset&gt;
+  &lt;metainf dir="${basedir}/src/cmp2/petstore" includes="*.xml"/&gt;
+&lt;/ant:jar&gt;
 &lt;deploy:distribute
-  uri="deployer:geronimo:jm&lt;IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0"&gt;:rmi:&lt;IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0"&gt;&lt;IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0"&gt;localhost&lt;IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0"&gt;jndi&lt;IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0"&gt;rmi:&lt;IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="
 absmiddle" alt="" border="0"&gt;JMXConnector"
+  uri="deployer:geronimo:jmx:rmi://localhost/jndi/rmi:/JMXConnector"
   username="system"
   password="manager"
-  module="${basedir}&lt;IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0"&gt;target&lt;IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0"&gt;openejb-cmp2-petstore.jar"
-&lt;IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0"&gt;&gt;
+  module="${basedir}/target/openejb-cmp2-petstore.jar"
+/&gt;
 &lt;deploy:start
-  uri="deployer:geronimo:jm&lt;IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0"&gt;:rmi:&lt;IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0"&gt;&lt;IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0"&gt;localhost&lt;IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0"&gt;jndi&lt;IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0"&gt;rmi:&lt;IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="
 absmiddle" alt="" border="0"&gt;JMXConnector"
+  uri="deployer:geronimo:jmx:rmi://localhost/jndi/rmi:/JMXConnector"
   username="system"
   password="manager"
-  id="org&lt;IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0"&gt;openejb&lt;IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0"&gt;cmp2&lt;IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0"&gt;petstore"&lt;IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0"&gt;&gt;
+  id="org/openejb/cmp2/petstore"/&gt;
 </code></pre>
 
-<p><a name="Creatingitests-E<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">ecution">&lt;<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">a></p>
+<p><a name="Creatingitests-Execution"></a></p>
 
-<h3>E<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">ecution</h3>
+<h3>Execution</h3>
 
-<p>When EJB classes, deployment descriptor and plan, maven.<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">ml are all set up,
-it's time to e<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">ecute your tests. In order to run itests you will run Maven
-in <em>modules<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">itests</em> directory.</p>
+<p>When EJB classes, deployment descriptor and plan, maven.xml are all set up,
+it's time to execute your tests. In order to run itests you will run Maven
+in <em>modules/itests</em> directory.</p>
 
-<pre><code>~&lt;IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0"&gt;openejb&lt;IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0"&gt;modules&lt;IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0"&gt;itests
+<pre><code>~/openejb/modules/itests
 $ maven
 </code></pre>
 
 <p>It's also possible to override project properties and run only some test
 cases.</p>
 
-<pre><code>~&lt;IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0"&gt;openejb&lt;IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0"&gt;modules&lt;IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0"&gt;itests
-$ maven -Dmaven.itest.includes=**&lt;IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0"&gt;Cmp2TestSuite.java
+<pre><code>~/openejb/modules/itests
+$ maven -Dmaven.itest.includes=**/Cmp2TestSuite.java
 </code></pre>
 
 <p>When a failure occurs, you should take a look at the result file of the
-failed test suite in <em>target<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">itest-reports</em>, e.g.</p>
+failed test suite in <em>target/itest-reports</em>, e.g.</p>
 
-<pre><code>~&lt;IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0"&gt;openejb&lt;IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0"&gt;modules&lt;IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0"&gt;itests
-$ maven -Dmaven.itest.includes=**&lt;IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0"&gt;Cmp2TestSuite.java -o
+<pre><code>~/openejb/modules/itests
+$ maven -Dmaven.itest.includes=**/Cmp2TestSuite.java -o
 ...
  [junit]
 </code></pre>
@@ -318,16 +318,16 @@ Settings\root.maven\cache\maven-itest-pl
 <pre><code>$ more
 </code></pre>
 
-<p>target<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">itest-reports<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">TEST-org.openejb.test.entity.cmp2.Cmp2TestSuite.t<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">t
+<p>target/itest-reports/TEST-org.openejb.test.entity.cmp2.Cmp2TestSuite.txt
     Testsuite: org.openejb.test.entity.cmp2.Cmp2TestSuite
     Tests run: 113, Failures: 1, Errors: 0, Time elapsed: 22,132 sec</p>
 
 <pre><code>Testcase: PetstoreTests.create: FAILED
-Received E&lt;IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0"&gt;ception class java.lang.NullPointerE&lt;IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0"&gt;ception : null
-junit.framework.AssertionFailedError: Received E&lt;IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0"&gt;ception class
+Received Exception class java.lang.NullPointerException : null
+junit.framework.AssertionFailedError: Received Exception class
 </code></pre>
 
-<p>java.lang.NullPointerE<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">ception : null
+<p>java.lang.NullPointerException : null
         at
 org.openejb.test.entity.cmp2.PetstoreTests.test01_create(PetstoreTests.java:84)
         at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
@@ -344,10 +344,10 @@ org.openejb.test.NumberedTestCase$3.prot
         at org.openejb.test.TestSuite.run(TestSuite.java:71)
     ...</p>
 
-<p>Complete e<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">ecution log is in <em>target<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">openejb<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">var<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">log<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">openejb.log</em> of the
+<p>Complete execution log is in <em>target/openejb/var/log/openejb.log</em> of the
 itests module.</p>
 
-<p><a name="Creatingitests-RunningtheTestsinEclipse.">&lt;<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">a></p>
+<p><a name="Creatingitests-RunningtheTestsinEclipse."></a></p>
 
 <h4>Running the Tests in Eclipse.</h4>
 
@@ -359,7 +359,7 @@ are</p>
 2) For Remote Interface Tests, the class to be run is
 <em>org.apache.openejb.RemoteiTest</em>.</p>
 
-<p>In both the cases you need to give <em>'-Dopenejb.home=target<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">test-classes<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">'</em>
+<p>In both the cases you need to give <em>'-Dopenejb.home=target/test-classes/'</em>
 as a vm argument 
 for the tests to run. </p>