tomee-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From build...@apache.org
Subject svn commit: r792512 [1/3] - /websites/staging/openejb/trunk/content/
Date Mon, 11 Jul 2011 02:31:38 GMT
Author: buildbot
Date: Mon Jul 11 02:31:36 2011
New Revision: 792512

Log:
Staging update by buildbot

Modified:
    websites/staging/openejb/trunk/content/application-discovery-via-the-classpath.html
    websites/staging/openejb/trunk/content/built-in-type-converters.html
    websites/staging/openejb/trunk/content/configuration-and-assembly.html
    websites/staging/openejb/trunk/content/configuration.html
    websites/staging/openejb/trunk/content/configuring-datasources.html
    websites/staging/openejb/trunk/content/configuring-javamail.html
    websites/staging/openejb/trunk/content/constructor-injection.html
    websites/staging/openejb/trunk/content/containers.html
    websites/staging/openejb/trunk/content/contribution-tips.html
    websites/staging/openejb/trunk/content/datasource-password-encryption.html
    websites/staging/openejb/trunk/content/deployment-id.html
    websites/staging/openejb/trunk/content/deployments.html
    websites/staging/openejb/trunk/content/details-on-openejb-jar.html
    websites/staging/openejb/trunk/content/dynamic-datasource.html
    websites/staging/openejb/trunk/content/ejb-local-ref.html
    websites/staging/openejb/trunk/content/ejb-ref.html
    websites/staging/openejb/trunk/content/embedded-configuration.html
    websites/staging/openejb/trunk/content/embedding-openejb.html
    websites/staging/openejb/trunk/content/failover.html
    websites/staging/openejb/trunk/content/hibernate.html
    websites/staging/openejb/trunk/content/jms-resources-and-mdb-container.html
    websites/staging/openejb/trunk/content/jndi-names.html
    websites/staging/openejb/trunk/content/jpa-concepts.html
    websites/staging/openejb/trunk/content/new-in-openejb-3.0.html
    websites/staging/openejb/trunk/content/openejb-1.0-beta-1.html
    websites/staging/openejb/trunk/content/openejb-1.0.html
    websites/staging/openejb/trunk/content/openejb-3.0-beta-2.html
    websites/staging/openejb/trunk/content/openejb-3.0.html
    websites/staging/openejb/trunk/content/openejb-3.1.1.html
    websites/staging/openejb/trunk/content/openejb-3.1.html
    websites/staging/openejb/trunk/content/openejb-binaries.html
    websites/staging/openejb/trunk/content/openjpa.html
    websites/staging/openejb/trunk/content/persistence-context.html
    websites/staging/openejb/trunk/content/persistence-unit-ref.html
    websites/staging/openejb/trunk/content/properties-tool.html
    websites/staging/openejb/trunk/content/resource-ref-for-datasource.html
    websites/staging/openejb/trunk/content/securing-a-web-service.html
    websites/staging/openejb/trunk/content/service-locator.html
    websites/staging/openejb/trunk/content/singleton-beans.html
    websites/staging/openejb/trunk/content/spring-and-openejb-3.0.html
    websites/staging/openejb/trunk/content/webadmin.html

Modified: websites/staging/openejb/trunk/content/application-discovery-via-the-classpath.html
==============================================================================
--- websites/staging/openejb/trunk/content/application-discovery-via-the-classpath.html (original)
+++ websites/staging/openejb/trunk/content/application-discovery-via-the-classpath.html Mon Jul 11 02:31:36 2011
@@ -162,49 +162,37 @@ applications you'd like deployed while i
 <p>Simplify the issue of searching for annotated applications by adding an
 ejb-jar.xml like this to your app:</p>
 
-<p>{code:xml|title="META-INF/ejb-jar.xml}
-<ejb-jar/></p>
-
-<pre><code>OpenEJB will find the app in the classpath and deploy it along with any
+<pre><code>&lt;ejb-jar/&gt;
 </code></pre>
 
-<p>annotated beans it may contain.</p>
-
-<pre><code>The ejb-jar.xml can contain more than just "&lt;ejb-jar/&gt;" as usual.
+<p>OpenEJB will find the app in the classpath and deploy it along with any
+annotated beans it may contain.</p>
 
-This is the recommended approach for people using OpenEJB for unit testing
-</code></pre>
+<p>The ejb-jar.xml can contain more than just "<ejb-jar/>" as usual.</p>
 
-<p>as it allows OpenEJB to find your application in the classpath without the
+<p>This is the recommended approach for people using OpenEJB for unit testing
+as it allows OpenEJB to find your application in the classpath without the
 need for you to specify any path information which tends to complicate
 builds.</p>
 
 <h1>Including/Excluding paths (advanced)</h1>
 
-<pre><code>If you do not like the idea of having the ejb-jar.xml in your app or an
-</code></pre>
-
-<p>openejb.xml, we can search the classpath for annotated beans (@Stateless,
+<p>If you do not like the idea of having the ejb-jar.xml in your app or an
+openejb.xml, we can search the classpath for annotated beans (@Stateless,
 @Stateful, @MessageDriven) and load them automatically just as if they
 contained an ejb-jar.xml.</p>
 
-<pre><code>This form of searching, however, is very expensive as it involves iterating
-</code></pre>
-
-<p>over every path in the classpath and reading in each class definition
+<p>This form of searching, however, is very expensive as it involves iterating
+over every path in the classpath and reading in each class definition
 contained thereunder and checking it for annotations.</p>
 
-<pre><code>This approach can only be made faster by helping us trim down or pinpoint
-</code></pre>
-
-<p>the paths we should search via the <em>openejb.deployments.classpath.include</em>
+<p>This approach can only be made faster by helping us trim down or pinpoint
+the paths we should search via the <em>openejb.deployments.classpath.include</em>
 property which can be specified as a <em>system property</em> or a property passed
 into the <em>InitialContext</em>.  </p>
 
-<pre><code>The value of this property is a regular expression and therefore can be
-</code></pre>
-
-<p>absolute or relative.  For example the path
+<p>The value of this property is a regular expression and therefore can be
+absolute or relative.  For example the path
 "/Users/dblevins/work/swizzle/swizzle-stream/target/classes" which contains
 the class files of an application you wish to test could be included in any
 of the following values to the "openejb.deployments.classpath.include"
@@ -221,24 +209,19 @@ property:</p>
       - ".*(swizzle-stream|swizzle-jira|acme-rocket-app).*" <br />
 <em>(including several paths)</em></p>
 
-<pre><code>Note the filtering is done on URLs in the classpath, so forward slashes
-</code></pre>
-
-<p>should always be used even on OSs using backslash ("\").</p>
-
-<pre><code>There is an *openejb.deployments.classpath.exclude* property if you wish to
-</code></pre>
+<p>Note the filtering is done on URLs in the classpath, so forward slashes
+should always be used even on OSs using backslash ("\").</p>
 
-<p>work in the opposite direction.  The default values for both properties are
+<p>There is an <em>openejb.deployments.classpath.exclude</em> property if you wish to
+work in the opposite direction.  The default values for both properties are
 as follows:</p>
 
 <pre><code>  openejb.deployments.classpath.include=""  _//include nothing_
   openejb.deployments.classpath.exclude=".*"  _//exclude everything_
-
-The exclude and the include is applied separately and the results of each
 </code></pre>
 
-<p>are combined together to create the list of paths OpenEJB will scrape for
+<p>The exclude and the include is applied separately and the results of each
+are combined together to create the list of paths OpenEJB will scrape for
 annotations.</p>
 
 <pre><code>*Note* by default these settings will only affect which jars OpenEJB will
@@ -251,18 +234,17 @@ property to <em>true</em>.  The default 
 
 <h1>Troubleshooting</h1>
 
-<pre><code>If you're having trouble determining if the META-INF/ejb-jar.xml file for
-</code></pre>
-
-<p>your ejb module is in the classpath, a little debug code like this in your
+<p>If you're having trouble determining if the META-INF/ejb-jar.xml file for
+your ejb module is in the classpath, a little debug code like this in your
 test setup will help you see what OpenEJB sees (which may be nothing):</p>
 
-<p>Enumeration<URL> ejbJars =
+<pre><code>Enumeration&lt;URL&gt; ejbJars =
 this.getClass().getClassLoader().getResources("META-INF/ejb-jar.xml");
 while (ejbJars.hasMoreElements()) {
     URL url = ejbJars.nextElement();
     System.out.println("app = " + url);
-}</p>
+}
+</code></pre>
 
             </DIV>
           </P>

Modified: websites/staging/openejb/trunk/content/built-in-type-converters.html
==============================================================================
--- websites/staging/openejb/trunk/content/built-in-type-converters.html (original)
+++ websites/staging/openejb/trunk/content/built-in-type-converters.html Mon Jul 11 02:31:36 2011
@@ -226,25 +226,22 @@ public class MyBean {
 
 <p>Works with an ejb-jar.xml as follows:</p>
 
-<p>{code:xml|title=META-INF/ejb-jar.xml}
-<ejb-jar xmlns="http://java.sun.com/xml/ns/javaee" version="3.0"
-metadata-complete="false">
-  <enterprise-beans>
-    <session>
-      <ejb-name>MyBean</ejb-name>
-      <env-entry>
+<p><ejb-jar xmlns="http://java.sun.com/xml/ns/javaee" version="3.0"
+  metadata-complete="false">
+    <enterprise-beans>
+      <session>
+        <ejb-name>MyBean</ejb-name>
+        <env-entry>
     <env-entry-name>org.superbiz.foo.MyBean/myDate</env-entry-name>
     <env-entry-value>2008-04-19</env-entry-value>
     <env-entry-type>java.lang.String</env-entry-type>
-      </env-entry>
-    </session>
-  </enterprise-beans>
-</ejb-jar></p>
-
-<pre><code>Or with an env-entries.properties file as follows:
-{code:none|title=META-INF/env-entries.properties}
-org.superbiz.foo.MyBean/myDate = 2008-04-19
-</code></pre>
+        </env-entry>
+      </session>
+    </enterprise-beans>
+  </ejb-jar></p>
+
+<p>Or with an env-entries.properties file as follows:
+    org.superbiz.foo.MyBean/myDate = 2008-04-19</p>
 
             </DIV>
           </P>

Modified: websites/staging/openejb/trunk/content/configuration-and-assembly.html
==============================================================================
--- websites/staging/openejb/trunk/content/configuration-and-assembly.html (original)
+++ websites/staging/openejb/trunk/content/configuration-and-assembly.html Mon Jul 11 02:31:36 2011
@@ -172,34 +172,25 @@ this.</p>
 give it to OpenEJB, OpenEJB doesn't know about it.  This is OpenEJB with
 all the magic stripped away.  At a high level:</p>
 
-<ol>
-<li>You build your app in code using the JAXB tree in code and hand it to
-the <em>ConfigurationFactory</em>.</li>
-<li># The <em>org.apache.openejb.jee</em> package contains JAXB trees for
-ejb-jar.xml, beans.xml and all the Java EE deployment descriptors.</li>
-<li>The <em>ConfigurationFactory</em> will produce a fully canonical version of
-the app called the <em>Info</em> tree by:</li>
-<li># Merging all sources of meta-data -- xml and annotations</li>
-<li># Resolving all ejb, persistence unit, datasource and other references</li>
-<li># Validating the app and looking for mistakes</li>
-<li>The <em>Info</em> tree is</li>
-<li># The singular source of information about the application from this
-point forward.</li>
-<li># Pure data with no smarts or logic of any kind.</li>
-<li># The instruction set of what would be built by the assembler.</li>
-<li>The <em>Assembler</em> will build and start the application exactly as
-described in the <em>Info</em> tree.</li>
-<li># When this step completes, you have a running application.</li>
-<li># Any failures prior to this point require no cleanup.  Only the
-assembler builds "live" objects.</li>
-</ol>
-
-<p><DIV class="code panel" style="border-style: solid;border-width: 1px;"><DIV class="codeHeader panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;"><B>StatefulTest.java</B></DIV><DIV class="codeContent panelContent">
-    import javax.ejb.LocalBean;
-    import javax.ejb.Stateful;
-    import javax.naming.InitialContext;</p>
+<p># You build your app in code using the JAXB tree in code and hand it to the {{ConfigurationFactory}}.
+  ## The {{org.apache.openejb.jee}} package contains JAXB trees for ejb-jar.xml, beans.xml and all the Java EE deployment descriptors.
+  # The {{ConfigurationFactory}} will produce a fully canonical version of the app called the {{Info}} tree by:
+  ## Merging all sources of meta-data -- xml and annotations
+  ## Resolving all ejb, persistence unit, datasource and other references
+  ## Validating the app and looking for mistakes
+  # The {{Info}} tree is
+  ## The singular source of information about the application from this point forward.
+  ## Pure data with no smarts or logic of any kind.
+  ## The instruction set of what would be built by the assembler.
+  # The {{Assembler}} will build and start the application exactly as described in the {{Info}} tree.
+  ## When this step completes, you have a running application.
+  ## Any failures prior to this point require no cleanup.  Only the assembler builds "live" objects.</p>
+
+<pre><code>import javax.ejb.LocalBean;
+import javax.ejb.Stateful;
+import javax.naming.InitialContext;
 
-<pre><code>import junit.framework.TestCase;
+import junit.framework.TestCase;
 import org.apache.openejb.assembler.classic.Assembler;
 import org.apache.openejb.assembler.classic.SecurityServiceInfo;
 import org.apache.openejb.assembler.classic.TransactionServiceInfo;
@@ -213,40 +204,35 @@ public class StatefulTest extends TestCa
     @Override
     protected void setUp() throws Exception {
 
-    System.setProperty(javax.naming.Context.INITIAL_CONTEXT_FACTORY,
-</code></pre>
+        System.setProperty(javax.naming.Context.INITIAL_CONTEXT_FACTORY, LocalInitialContextFactory.class.getName());
 
-<p>LocalInitialContextFactory.class.getName());</p>
+        ConfigurationFactory config = new ConfigurationFactory();
+        Assembler assembler = new Assembler();
 
-<pre><code>    ConfigurationFactory config = new ConfigurationFactory();
-    Assembler assembler = new Assembler();
-</code></pre>
+        assembler.createTransactionManager(config.configureService(TransactionServiceInfo.class));
+        assembler.createSecurityService(config.configureService(SecurityServiceInfo.class));
 
-<p>assembler.createTransactionManager(config.configureService(TransactionServiceInfo.class));</p>
+        EjbJar ejbJar = new EjbJar();
+        ejbJar.addEnterpriseBean(new StatefulBean(MyBean.class));
 
-<p>assembler.createSecurityService(config.configureService(SecurityServiceInfo.class));</p>
-
-<pre><code>    EjbJar ejbJar = new EjbJar();
-    ejbJar.addEnterpriseBean(new StatefulBean(MyBean.class));
-
-    assembler.createApplication(config.configureApplication(ejbJar));
+        assembler.createApplication(config.configureApplication(ejbJar));
     }
 
     public void test() throws Exception {
-    InitialContext context = new InitialContext();
-    MyBean myBean = (MyBean) context.lookup("MyBeanLocalBean");
+        InitialContext context = new InitialContext();
+        MyBean myBean = (MyBean) context.lookup("MyBeanLocalBean");
 
-    assertEquals("pan", myBean.echo("nap"));
+        assertEquals("pan", myBean.echo("nap"));
     }
 
     @Stateful
     @LocalBean
     public static class MyBean {
 
-    public String echo(String string) {
-        StringBuilder sb = new StringBuilder(string);
-        return sb.reverse().toString();
-    }
+        public String echo(String string) {
+            StringBuilder sb = new StringBuilder(string);
+            return sb.reverse().toString();
+        }
     }
 }
 </code></pre>
@@ -259,8 +245,7 @@ public class StatefulTest extends TestCa
 is broken into two phases:</p>
 
 <ol>
-<li><p>configuration (app.jar -> AppInfo)  we build up a fully normalized and
-validated tree.  Some of the steps are</p>
+<li><p>configuration (app.jar -> AppInfo)  we build up a fully normalized and validated tree.  Some of the steps are</p>
 
 <ul>
 <li>read in descriptors</li>
@@ -271,8 +256,7 @@ validated tree.  Some of the steps are</
 <li>turning the descriptor tree into Info objects for final assembly</li>
 <li>final validation check</li>
 </ul></li>
-<li><p>assembly (AppInfo -> actual running app)  we assemble a running app as
-detailed by the AppInfo</p>
+<li><p>assembly (AppInfo -> actual running app)  we assemble a running app as detailed by the AppInfo</p>
 
 <ul>
 <li>creating classloaders for the application</li>
@@ -280,12 +264,10 @@ detailed by the AppInfo</p>
 <li>creating live objects associated with resource-env-refs</li>
 <li>creating deployment (CoreDeploymentInfo) objects for each ejb</li>
 <li>creating the jndi enc of each ejb</li>
-<li>adding method permission objects into the security system (JACC
-Provider)</li>
+<li>adding method permission objects into the security system (JACC Provider)</li>
 <li>creating transaction policy objects for each ejb</li>
-<li>creating interceptor stacks and bindings for each ejb      </li>
-<li>adding ejbs to containers (which may also do things like create
-pools)</li>
+<li>creating interceptor stacks and bindings for each ejb</li>
+<li>adding ejbs to containers (which may also do things like create pools)</li>
 <li>adding ejbs to the live ContainerSystem registry of ejbs</li>
 <li>adding global jndi entries for each ejb</li>
 </ul></li>
@@ -320,8 +302,10 @@ tree and check that everything is compli
 <p>All of the aforementioned configuration phase sits behind this info object
 tree and an interface that produces it:</p>
 
-<p>org.apache.openejb.assembler.classic.OpenEjbConfiguration
-  org.apache.openejb.assembler.classic.OpenEjbConfigurationFactory</p>
+<ul>
+<li>org.apache.openejb.assembler.classic.OpenEjbConfiguration</li>
+<li>org.apache.openejb.assembler.classic.OpenEjbConfigurationFactory</li>
+</ul>
 
 <p>The job of the OpenEjbConfigurationFactory is simply to produce an 
 OpenEjbConfiguration tree.  With this simple decoupling when the time comes

Modified: websites/staging/openejb/trunk/content/configuration.html
==============================================================================
--- websites/staging/openejb/trunk/content/configuration.html (original)
+++ websites/staging/openejb/trunk/content/configuration.html Mon Jul 11 02:31:36 2011
@@ -188,24 +188,24 @@ OpenEJB saves deployment descriptors - e
 
 <p>Show a config file with the elements hyperlinked.</p>
 
-<p>{code:xml|title=openejb.conf}
-<?xml version="1.0"?>
-<openejb>
-  <Container id="Default CMP Container" ctype="CMP_ENTITY">
+<pre><code>&lt;?xml version="1.0"?&gt;
+&lt;openejb&gt;
+  &lt;Container id="Default CMP Container" ctype="CMP_ENTITY"&gt;
     Global_TX_Database  c:/my/app/conf/postgresql.cmp_global_database.xml
     Local_TX_Database   c:/my/app/conf/postgresql.cmp_local_database.xml
-  </Container>
-  <Connector id="Default JDBC Database">
+  &lt;/Container&gt;
+  &lt;Connector id="Default JDBC Database"&gt;
     JdbcDriver org.postgresql.Driver
     JdbcUrl jdbc:postgresql://localhost/mydb
     UserName username
     Password password
-  </Connector>
-  <SecurityService id="Default Security Service"/>
-  <TransactionService id="Default Transaction Manager"/>
-  <Deployments jar="c:/my/app/employee.jar"/>
-  <Deployments dir="beans/" />
-</openejb></p>
+  &lt;/Connector&gt;
+  &lt;SecurityService id="Default Security Service"/&gt;
+  &lt;TransactionService id="Default Transaction Manager"/&gt;
+  &lt;Deployments jar="c:/my/app/employee.jar"/&gt;
+  &lt;Deployments dir="beans/" /&gt;
+&lt;/openejb&gt;
+</code></pre>
 
 <h1>Basic Layout</h1>
 

Modified: websites/staging/openejb/trunk/content/configuring-datasources.html
==============================================================================
--- websites/staging/openejb/trunk/content/configuring-datasources.html (original)
+++ websites/staging/openejb/trunk/content/configuring-datasources.html Mon Jul 11 02:31:36 2011
@@ -248,50 +248,46 @@ example of Derby.</p>
 
 <p><em>BY matching variable name to resource name</em></p>
 
-<p>{code:java}
-@Stateless
+<pre><code>@Stateless
 public class FooBean {
     @Resource DataSource myDerbyDatabase;
-}</p>
+}
+</code></pre>
 
-<pre><code>*OR BY matching name*
+<p><em>OR BY matching name</em></p>
 
-{code:java}
-@Stateless
+<pre><code>@Stateless
 public class FooBean {
     @Resource(name="myDerbyDatabase")
     DataSource dataSource;
 }
 </code></pre>
 
-<p><em>OR BY JNDI lookup</em>
-{code:java}
-@Resource(name="myDerbyDatabase", type=javax.sql.DataSource.class)
-@Stateless
-public class FooBean {</p>
+<p><em>OR BY JNDI lookup</em></p>
 
-<pre><code>public void setSessionContext(SessionContext sessionContext) {
-DataSource dataSource = (DataSource)
-</code></pre>
+<pre><code>@Resource(name="myDerbyDatabase", type=javax.sql.DataSource.class)
+@Stateless
+public class FooBean {
 
-<p>sessionContext.lookup("myDerbyDatabase");
-    }</p>
+    public void setSessionContext(SessionContext sessionContext) {
+        DataSource dataSource = (DataSource)
+        sessionContext.lookup("myDerbyDatabase");
+    }
 
-<pre><code>public void someOtherMethod() throws Exception {
-InitialContext initialContext = new InitialContext();
-DataSource dataSource = (DataSource)
+    public void someOtherMethod() throws Exception {
+        InitialContext initialContext = new InitialContext();
+        DataSource dataSource = (DataSource)
+        initialContext.lookup("java:comp/env/myDerbyDatabase");
+    }
+}
 </code></pre>
 
-<p>initialContext.lookup("java:comp/env/myDerbyDatabase");
-    }
-}</p>
+<p><em>OR</em></p>
 
-<pre><code>*OR*
-{code:xml}
-&lt;resource-ref&gt;
-   &lt;res-ref-name&gt;myDerbyDatabase&lt;/res-ref-name&gt;
-   &lt;res-type&gt;javax.sql.DataSource&lt;/res-type&gt;
- &lt;/resource-ref&gt;
+<pre><code>&lt;resource-ref&gt;
+  &lt;res-ref-name&gt;myDerbyDatabase&lt;/res-ref-name&gt;
+  &lt;res-type&gt;javax.sql.DataSource&lt;/res-type&gt;
+&lt;/resource-ref&gt;
 </code></pre>
 
 <p><em>OR</em></p>
@@ -299,7 +295,7 @@ DataSource dataSource = (DataSource)
 <pre><code>&lt;resource-ref&gt;
    &lt;res-ref-name&gt;jdbc/myDerbyDatabase&lt;/res-ref-name&gt;
    &lt;res-type&gt;javax.sql.DataSource&lt;/res-type&gt;
- &lt;/resource-ref&gt;
+&lt;/resource-ref&gt;
 </code></pre>
 
 <p><em>OR</em></p>
@@ -308,7 +304,7 @@ DataSource dataSource = (DataSource)
    &lt;res-ref-name&gt;someOtherName&lt;/res-ref-name&gt;
    &lt;res-type&gt;javax.sql.DataSource&lt;/res-type&gt;
    &lt;mapped-name&gt;myDerbyDatabase&lt;/mapped-name&gt;
- &lt;/resource-ref&gt;
+&lt;/resource-ref&gt;
 </code></pre>
 
             </DIV>

Modified: websites/staging/openejb/trunk/content/configuring-javamail.html
==============================================================================
--- websites/staging/openejb/trunk/content/configuring-javamail.html (original)
+++ websites/staging/openejb/trunk/content/configuring-javamail.html Mon Jul 11 02:31:36 2011
@@ -162,37 +162,31 @@ javax.mail.Session.getDefaultInstance(Pr
 
 <p>Here might be some example properties.</p>
 
-<p>{code:xml|title=openejb.xml}
-<Resource id="SuperbizMail" type="javax.mail.Session">
+<pre><code>&lt;Resource id="SuperbizMail" type="javax.mail.Session"&gt;
    mail.smtp.host=mail.superbiz.org
    mail.smtp.port=25
    mail.transport.protocol=smtp
    mail.smtp.auth=true
    mail.smtp.user=someuser
    password=mypassword
-</Resource></p>
-
-<pre><code>You can create as many &lt;Resource&gt; entries like this as you wish, they just
+&lt;/Resource&gt;
 </code></pre>
 
-<p>have to have a unique 'id'.</p>
+<p>You can create as many <Resource> entries like this as you wish, they just
+have to have a unique 'id'.</p>
 
-<pre><code>{note:whitespace}
+<p>{note:whitespace}
 Careful not to add whitespace at the end of your property values.  A
-</code></pre>
-
-<p>java.util.Properties object will leave those in the property values and
+java.util.Properties object will leave those in the property values and
 they will be passed to the JavaMail provider with the whitespace on the end
 which may cause issues if the provider does not actively trim the values
 before attempting to use them.
-    {note}</p>
+{note}</p>
 
 <h1>Overriding</h1>
 
-<pre><code>If you wanted to do a System property or InitialContext property override
-</code></pre>
-
-<p>of the above example mail session, you could do so like this:</p>
+<p>If you wanted to do a System property or InitialContext property override
+of the above example mail session, you could do so like this:</p>
 
 <pre><code>java ... -DSuperbizMail.mail.smtp.host=localhost
 </code></pre>

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 Mon Jul 11 02:31:36 2011
@@ -223,24 +223,22 @@ annotation classes do not permit usage o
 that change as much as we do, definitely voice your support by sending note
 to <a href="mailto:jsr-316-comments@jcp.org.html">jsr-316-comments@jcp.org</a></p>
 
-<p><DIV class="code panel" style="border-style: solid;border-width: 1px;"><DIV class="codeHeader panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;"><B>Not yet possible</B></DIV><DIV class="codeContent panelContent">
-    @Stateless</p>
+<p>Not yet possible</p>
 
-<pre><code>public class WidgetBean implements Widget {
+<pre><code>@Stateless
 
-    public WidgetBean(@Resource(name = "count") Integer count, @EJB Foo
-</code></pre>
+public class WidgetBean implements Widget {
 
-<p>foo, @Resource DataSource ds) {
-           // do something
-        }</p>
+    public WidgetBean(@Resource(name = "count") Integer count, @EJB Foo foo, @Resource DataSource ds) {
+       // do something
+    }
 
-<pre><code>    public int getCount() {
-    return count;
+    public int getCount() {
+        return count;
     }
 
     public Foo getFoo() {
-    return foo;
+        return foo;
     }
 }
 </code></pre>

Modified: websites/staging/openejb/trunk/content/containers.html
==============================================================================
--- websites/staging/openejb/trunk/content/containers.html (original)
+++ websites/staging/openejb/trunk/content/containers.html Mon Jul 11 02:31:36 2011
@@ -162,25 +162,22 @@ defined in the container system. The par
 container is the ctype attribute, specifially, a ctype attribute set to
 CMP_ENTITY as such...</p>
 
-<p>{code:xml|title=example_01.conf}
-<?xml version="1.0"?>
-<openejb></p>
-
-<p><Container id="Default CMP Container" ctype="CMP_ENTITY"/></p>
+<pre><code>&lt;?xml version="1.0"?&gt;
+&lt;openejb&gt;
 
-<p></openejb></p>
+&lt;Container id="Default CMP Container" ctype="CMP_ENTITY"/&gt;
 
-<pre><code>The really fun part is that the above configuration file is completely
+&lt;/openejb&gt;
 </code></pre>
 
-<p>legal! If you started the server and pointed to this file...</p>
+<p>The really fun part is that the above configuration file is completely
+legal! If you started the server and pointed to this file...</p>
 
-<pre><code>bq. ./openejb.sh start -conf example_01.conf
-
-...you would end up with a running server that contained only one
+<pre><code>./openejb.sh start -conf example_01.conf
 </code></pre>
 
-<p>container, called "Default CMP Container". You could then deploy beans into
+<p>...you would end up with a running server that contained only one
+container, called "Default CMP Container". You could then deploy beans into
 it and everything. There would be no other containers running in the server
 at all. If you telnet'd into the server and typed the 'system' command, you
 could see for yourself that there is nothing else in the system.</p>
@@ -208,20 +205,15 @@ Escape character is '^]
   <p>$</p>
 </blockquote>
 
-<pre><code>You see that. No beans, no JDBC resources, nothing but one CMP container
-</code></pre>
-
-<p>called "Default CMP Container".</p>
+<p>You see that. No beans, no JDBC resources, nothing but one CMP container
+called "Default CMP Container".</p>
 
 <h1>Naming your Container</h1>
 
-<pre><code>You can call the container anything you want, just change the value of the
-</code></pre>
-
-<p>id attribute. Here is a container called "My PostgreSQL Contianer"</p>
+<p>You can call the container anything you want, just change the value of the
+id attribute. Here is a container called "My PostgreSQL Contianer"</p>
 
-<pre><code>{code:xml|title=example_02.conf}
-&lt;?xml version="1.0"?&gt;
+<pre><code>&lt;?xml version="1.0"?&gt;
 &lt;openejb&gt;
 
 &lt;Container id="My PostgreSQL Container" ctype="CMP_ENTITY"/&gt;
@@ -256,20 +248,18 @@ be the only container in the list.</p>
 
 <p>After deployment, you would end up with a configuration like this one</p>
 
-<p>{code:xml|title=example_02.conf}
-<?xml version="1.0"?>
-<openejb></p>
-
-<p><Container id="My PostgreSQL Container" ctype="CMP_ENTITY"/></p>
+<pre><code>&lt;?xml version="1.0"?&gt;
+&lt;openejb&gt;
 
-<p><Deployments jar="myCMPBean.jar" /></p>
+&lt;Container id="My PostgreSQL Container" ctype="CMP_ENTITY"/&gt;
 
-<p></openejb></p>
+&lt;Deployments jar="myCMPBean.jar" /&gt;
 
-<pre><code>Most important, that bean will now be mapped directly to the container id
+&lt;/openejb&gt;
 </code></pre>
 
-<p>"My PostgreSQL Container". So if you change the name of the container and
+<p>Most important, that bean will now be mapped directly to the container id
+"My PostgreSQL Container". So if you change the name of the container and
 do not redeploy the myCMPBean.jar to point to the new container id, you
 will have big problems!</p>
 
@@ -284,10 +274,9 @@ will have big problems!</p>
         * STATELESS
         * STATEFUL</p>
 
-<pre><code>The containers can all be of the same type, or a mix of the types.
+<p>The containers can all be of the same type, or a mix of the types.</p>
 
-{code:xml|title=example_03.conf}
-&lt;?xml version="1.0"?&gt;
+<pre><code>&lt;?xml version="1.0"?&gt;
 &lt;openejb&gt;
 
 &lt;Container id="My PostgreSQL Container" ctype="CMP_ENTITY"/&gt;
@@ -312,41 +301,38 @@ container declaration. So it's possible 
 the same type, but configure each one differently. Let's use our CMP_ENTITY
 containers above as an example.</p>
 
-<p>{code:xml|title=example_03.conf}
-<?xml version="1.0"?>
-<openejb></p>
+<pre><code>&lt;?xml version="1.0"?&gt;
+&lt;openejb&gt;
 
-<p><Container id="My PostgreSQL Container" ctype="CMP_ENTITY">
+&lt;Container id="My PostgreSQL Container" ctype="CMP_ENTITY"&gt;
     Global_TX_Database    conf/postgresql.cmp.global-database.xml
     Local_TX_Database     conf/postgresql.cmp.local-database.xml
-</Container></p>
+&lt;/Container&gt;
 
-<p><Container id="My MySQL Container" ctype="CMP_ENTITY">
+&lt;Container id="My MySQL Container" ctype="CMP_ENTITY"&gt;
     Global_TX_Database  conf/mysql.cmp.global-database.xml
     Local_TX_Database   conf/mysql.cmp.local-database.xml
-</Container></p>
+&lt;/Container&gt;
 
-<p><Container id="My InstantDB Container" ctype="CMP_ENTITY">
+&lt;Container id="My InstantDB Container" ctype="CMP_ENTITY"&gt;
     Global_TX_Database  conf/instantdb.cmp.global-database.xml
     Local_TX_Database   conf/instantdb.cmp.local-database.xml
-</Container></p>
-
-<p><Container id="My Stateful Session Container" ctype="STATEFUL"/>
-<Container id="My Stateless Session Container" ctype="STATELESS"/></p>
+&lt;/Container&gt;
 
-<p></openejb></p>
+&lt;Container id="My Stateful Session Container" ctype="STATEFUL"/&gt;
+&lt;Container id="My Stateless Session Container" ctype="STATELESS"/&gt;
 
-<pre><code>The format of the configuration parameters is actually just regular old
+&lt;/openejb&gt;
 </code></pre>
 
-<p>java.util.Properties file format. It keeps things simple and doesn't
+<p>The format of the configuration parameters is actually just regular old
+java.util.Properties file format. It keeps things simple and doesn't
 require you to type endless amounts of tags that are just name/value pairs
 anyway. The java.util.Properties file format allows for spaces, tabs,
 colons, or equals signs to separate the name value pairs, so this would
 also be acceptable..</p>
 
-<pre><code>{code:xml|title=example_03.conf}
-&lt;?xml version="1.0"?&gt;
+<pre><code>&lt;?xml version="1.0"?&gt;
 &lt;openejb&gt;
 
 &lt;Container id="My PostgreSQL Container" ctype="CMP_ENTITY"&gt;

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 Mon Jul 11 02:31:36 2011
@@ -192,52 +192,51 @@ neater ones are (ordered simple to compl
 
 <h1>What is the process?</h1>
 
-<p><DIV class="code panel" style="border-style: solid;border-width: 1px;"><DIV class="codeHeader panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;"><B>Contributor.java</B></DIV><DIV class="codeContent panelContent">
-    public void contributeToOpenSource() {</p>
+<pre><code>public void contributeToOpenSource() {
 
-<pre><code>    boolean stillInterestedAndHavingFun = true;
+    boolean stillInterestedAndHavingFun = true;
     int taskSize = 1; // start small!
 
     contributing:
     while (stillInterestedAndHavingFun) {
 
-    Task task = findSomethingInteresting(taskSize++);
+        Task task = findSomethingInteresting(taskSize++);
 
-    if (!task.hasJira()) {
-        createJira(task);
-    } else {
-        requestToBeAssignedToJira(task.jiraId());
-    }
+        if (!task.hasJira()) {
+            createJira(task);
+        } else {
+            requestToBeAssignedToJira(task.jiraId());
+        }
 
-    while (task.inProgress()) {
+        while (task.inProgress()) {
 
-        chatOnListALittleGetCleverIdeas(task, new Ideas(task));
-        hackALittle(task);
+            chatOnListALittleGetCleverIdeas(task, new Ideas(task));
+            hackALittle(task);
 
-        if (task.tooHard() || task.notFun()) {
-        // no big deal, try again with something else
-        taskSize--;
-        continue contributing;
+            if (task.tooHard() || task.notFun()) {
+                // no big deal, try again with something else
+                taskSize--;
+                continue contributing;
+            }
         }
-    }
 
-    File patchFile = createSvnOrGitPatch(task);
-    attachToJira(task.jiraId(), patchFile);
-    askForReviewOnList(task.jiraId());
-
-    while (!committed(patchFile)) {
-
-        try {
-        pokeAtSometingElse();
-        helpOnUserList();
-        dayDream();
-        } catch (MoreThanAWeekException e) {
-        // Assume it fell off the radar -- happens.
-        // Evidence we need more committers.
-        bumpThreadOnList(task);
+        File patchFile = createSvnOrGitPatch(task);
+        attachToJira(task.jiraId(), patchFile);
+        askForReviewOnList(task.jiraId());
+
+        while (!committed(patchFile)) {
+
+            try {
+                pokeAtSometingElse();
+                helpOnUserList();
+                dayDream();
+            } catch (MoreThanAWeekException e) {
+                // Assume it fell off the radar -- happens.
+                // Evidence we need more committers.
+                bumpThreadOnList(task);
+            }
         }
     }
-    }
 
 }
 </code></pre>

Modified: websites/staging/openejb/trunk/content/datasource-password-encryption.html
==============================================================================
--- websites/staging/openejb/trunk/content/datasource-password-encryption.html (original)
+++ websites/staging/openejb/trunk/content/datasource-password-encryption.html Mon Jul 11 02:31:36 2011
@@ -197,12 +197,12 @@ UserName    test
 
 
 # ciphered value for Passw0rd using Static3DES codec is
+xMH5uM1V9vQzVUv5LG7YLA==
+Password    xMH5uM1V9vQzVUv5LG7YLA==
+PasswordCipher Static3DES
 </code></pre>
 
-<p>xMH5uM1V9vQzVUv5LG7YLA==
-    Password    xMH5uM1V9vQzVUv5LG7YLA==
-    PasswordCipher Static3DES
-</Resource></p></li>
+<p></Resource></p></li>
 </ul>
 
 <p>{tip:title=Hint}
@@ -288,22 +288,19 @@ shorthand as show below.</p>
 <h3>OPTIONS</h3>
 
 <pre><code>|-h, --_help_ |Lists these options and exit.|
-|-c, --_cipher_ |Specifies the password cipher implementation to use
+|-c, --_cipher_ |Specifies the password cipher implementation to use (default is Static3DES).|
+|-d, --_decrypt_ |Switches command line tool to decrypt.|
+|-e, --_encrypt_ |Switches command line tool to encrypt (default).|
 </code></pre>
 
-<p>(default is Static3DES).|
-    |-d, --<em>decrypt</em> |Switches command line tool to decrypt.|
-    |-e, --<em>encrypt</em> |Switches command line tool to encrypt (default).|</p>
-
 <h3>EXAMPLES</h3>
 
-<pre><code>Encrypt a plain password using the default algorithm. 
-{{openejb cipher Passw0rd}}
+<p>Encrypt a plain password using the default algorithm.
+{{openejb cipher Passw0rd}}</p>
 
-Output
-{code}
-xMH5uM1V9vQzVUv5LG7YLA==
-{code}
+<p>Output</p>
+
+<pre><code>xMH5uM1V9vQzVUv5LG7YLA==
 </code></pre>
 
             </DIV>

Modified: websites/staging/openejb/trunk/content/deployment-id.html
==============================================================================
--- websites/staging/openejb/trunk/content/deployment-id.html (original)
+++ websites/staging/openejb/trunk/content/deployment-id.html Mon Jul 11 02:31:36 2011
@@ -262,10 +262,10 @@ resources in the container system. name.
 as its JNDI lookup. For example, if a bean had a deployment-id of
 "/my/bean/foo", a non-bean client could lookup that bean as follows.</p>
 
-<p><DIV class="code panel" style="border-style: solid;border-width: 1px;"><DIV class="codeHeader panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;"><B>MyAppClient.java</B></DIV><DIV class="codeContent panelContent">
-    ...
-    Object bean = initialContext.lookup("/my/bean/Foo");
-    ...</p>
+<pre><code>...
+Object bean = initialContext.lookup("/my/bean/Foo");
+...
+</code></pre>
 
 <p>If a bean in the container system made the above JNDI call, the Local
 Server would see the bean's identity (deployment id) hidden in the Thread,
@@ -302,10 +302,10 @@ deployment ids of the beans in the conta
 bean's deployment id. For example, if a bean had a deployment-id of
 "/my/bean/foo", a client could lookup that bean as follows.</p>
 
-<p><DIV class="code panel" style="border-style: solid;border-width: 1px;"><DIV class="codeHeader panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;"><B>MyAppClient.java</B></DIV><DIV class="codeContent panelContent">
-    ...
-    Object bean = initialContext.lookup("/my/bean/Foo");
-    ...</p>
+<pre><code>...
+Object bean = initialContext.lookup("/my/bean/Foo");
+...
+</code></pre>
 
 <p><a name="DeploymentID-IntheCORBAAdapter"></a></p>
 
@@ -322,51 +322,31 @@ just as with the Local Server and Remote
 using the bean's deployment id. OpenORB has a JNDI implementation of their
 naming service, so lookups can be done just as before.</p>
 
-<p><DIV class="code panel" style="border-style: solid;border-width: 1px;"><DIV class="codeHeader panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;"><B>MyAppClient.java</B></DIV><DIV class="codeContent panelContent">
-    ...
-    Object bean = initialContext.lookup("/my/bean/Foo");
-    ...
-    {}</p>
-
-<pre><code>CORBA clients can also access beans in OpenEJB as CORBA objects. These can
-</code></pre>
-
-<p>be looked up from OpenORB's naming service (CosNaming) as follows.</p>
+<pre><code>...
+String[] args = ...
 
-<pre><code>{code:title=MyCorbaAppClient.java}
-...
-String[]
-</code></pre>
-
-<p>args = ...</p>
-
-<pre><code>// The ORB and Object
+// The ORB and Object
 org.omg.CORBA.ORB    orb  = null;
 org.omg.CORBA.Object bean = null.
 
 // The Naming Service and Object Name
 org.omg.CosNaming.NamingContext   context = null;
-org.omg.CosNaming.NameComponent[]
-name = null;
+org.omg.CosNaming.NameComponent[]    name = null;
 
 // Get the ORB
-orb = org.omg.CORBA.ORB.init( args, null );          
+orb = org.omg.CORBA.ORB.init( args, null );
 
-// Get the Naming Service 
+// Get the Naming Service
 org.omg.CORBA.Object ref = null;
 ref = orb.resolve_initial_references("NameService");
 context = org.omg.CosNaming.NamingContextHelper.narrow( ref );
 
 // Get the Name as a component
-// Note: the string is the bean's deployment id 
-name    = new org.omg.CosNaming.NameComponent[ 1 ]
-</code></pre>
-
-<p>;
-    name[0]
- = new org.omg.CosNaming.NameComponent("/my/bean/foo","");</p>
+// Note: the string is the bean's deployment id
+name    = new org.omg.CosNaming.NameComponent[ 1 ];
+name[0] = new org.omg.CosNaming.NameComponent("/my/bean/foo","");
 
-<pre><code>// Finally, get the bean as a CORBA object
+// Finally, get the bean as a CORBA object
 // Equvalent to an InitialContext.lookup("/my/bean/foo");
 bean = context.resolve( name );
 ...

Modified: websites/staging/openejb/trunk/content/deployments.html
==============================================================================
--- websites/staging/openejb/trunk/content/deployments.html (original)
+++ websites/staging/openejb/trunk/content/deployments.html Mon Jul 11 02:31:36 2011
@@ -163,32 +163,27 @@
 <p>To include a single jar by name, just declare a 'Deployments' element with
 a 'jar' attribute pointing to the jar file on the file system.</p>
 
-<p>{code:xml|title=openejb.conf}
-<openejb>
+<pre><code>&lt;openejb&gt;
 ...
-<Deployments jar="c:\my\app\superEjbs.jar" />
-<Deployments jar="c:\someplace\purchasing.jar" />
-<Deployments jar="timeTrack.jar" />
-</openejb></p>
-
-<pre><code>The last element in the example uses a relative path to point to the ejb
+&lt;Deployments jar="c:\my\app\superEjbs.jar" /&gt;
+&lt;Deployments jar="c:\someplace\purchasing.jar" /&gt;
+&lt;Deployments jar="timeTrack.jar" /&gt;
+&lt;/openejb&gt;
 </code></pre>
 
-<p>jar.  This path will be resolved relative to the openejb.base property. 
+<p>The last element in the example uses a relative path to point to the ejb
+jar.  This path will be resolved relative to the openejb.base property. 
 So, for example, of the value of openejb.base was 'c:\timeapp\' then
 OpenEJB would look for the jar 'c:\timeapp\timeTrack.jar'.  See the [OPENEJB:Configuration]
  guide for more details.</p>
 
 <h2>A directory of jars</h2>
 
-<pre><code>To point to a directory that contains several jar files that OpenEJB should
-</code></pre>
-
-<p>load, simply declare a 'Deployments' element with a 'dir' attribute
+<p>To point to a directory that contains several jar files that OpenEJB should
+load, simply declare a 'Deployments' element with a 'dir' attribute
 pointing to the directory containing the jar files.</p>
 
-<pre><code>{code:xml|title=openejb.conf}
-&lt;openejb&gt;
+<pre><code>&lt;openejb&gt;
 ...
 
 &lt;Deployments dir="c:\my\app\beans\" /&gt;
@@ -234,90 +229,67 @@ OpenEJB.  You still need to follow the e
 <p>Then you would delcare a 'Deployments' element with the 'dir' attribute set
 to 'C:\myapp\acmeEjbs' as shown below.</p>
 
-<p>{code:xml|title=openejb.conf}
-<openejb>
-...</p>
-
-<p><Deployments dir="c:\myapp\acmeEjbs" />
-</openejb></p>
+<pre><code>&lt;openejb&gt;
+...
 
-<pre><code>Note that this syntax is the same as the directory syntax above.  If
+&lt;Deployments dir="c:\myapp\acmeEjbs" /&gt;
+&lt;/openejb&gt;
 </code></pre>
 
-<p>OpenEJB finds a META-INF directory with an 'ejb-jar.xml' fine inside, then
+<p>Note that this syntax is the same as the directory syntax above.  If
+OpenEJB finds a META-INF directory with an 'ejb-jar.xml' fine inside, then
 OpenEJB will treat the directory as an unpacked ejb jar.  Otherwise OpenEJB
 will look for ejb jar files to load as detailed in the above section.</p>
 
 <h1>Log file</h1>
 
-<pre><code>When trying to figure out if your ejbs were loaded, the openejb.log file is
-</code></pre>
-
-<p>an incredible asset.</p>
+<p>When trying to figure out if your ejbs were loaded, the openejb.log file is
+an incredible asset.</p>
 
-<pre><code>If your ejbs were loaded successfully you should see entries like the
-</code></pre>
-
-<p>following (1.x and higher only):</p>
+<p>If your ejbs were loaded successfully you should see entries like the
+following (1.x and higher only):</p>
 
-<pre><code>{panel:title=openejb.log}
+<pre><code>INFO :  Loaded EJBs from
+/usr/local/openejb-1.0-beta1/beans/openejb-itests-beans.jar
 INFO :  Loaded EJBs from
-</code></pre>
-
-<p>/usr/local/openejb-1.0-beta1/beans/openejb-itests-beans.jar
-    INFO :  Loaded EJBs from
 /usr/local/openejb-1.0-beta1/beans/openejb-webadmin-clienttools.jar
-    {panel}</p>
-
-<pre><code>If your ejbs failed to load, you will see an entry similar to the
 </code></pre>
 
-<p>following.</p>
+<p>If your ejbs failed to load, you will see an entry similar to the
+following.</p>
 
-<pre><code>{panel:title=openejb.log}
-WARN :  Jar not loaded. /usr/local/openejb-1.0-beta1/beans/helloworld.jar. 
+<pre><code>WARN :  Jar not loaded. /usr/local/openejb-1.0-beta1/beans/helloworld.jar.
+Jar failed validation.  Use the validation tool for more details
 </code></pre>
 
-<p>Jar failed validation.  Use the validation tool for more details
-    {panel}</p>
-
-<pre><code>Additionally, all the successfully loaded ejbs are individually listed in
-</code></pre>
-
-<p>the log file at startup.  The Deployment ID listed is the JNDI name used to
+<p>Additionally, all the successfully loaded ejbs are individually listed in
+the log file at startup.  The Deployment ID listed is the JNDI name used to
 lookup the ejb from a client of the Local or Remote Servers.  The beans
 listed below are from our test suite.</p>
 
-<pre><code>{noformat}
-DEBUG:  Deployments   : 19
+<pre><code>DEBUG:  Deployments   : 19
 DEBUG:  Type        Deployment ID
 DEBUG:     CMP_ENTITY  client/tests/entity/cmp/RMI-over-IIOP/EJBHome
 DEBUG:     STATEFUL    client/tests/stateful/EncBean
 DEBUG:     STATELESS   client/tests/stateless/BeanManagedBasicStatelessHome
 DEBUG:     STATEFUL    client/tests/stateful/BasicStatefulHome
 DEBUG:     STATELESS   client/tests/stateless/EncBean
-DEBUG:     STATEFUL   
+DEBUG:     STATEFUL   client/tests/stateful/BeanManagedTransactionTests/EJBHome
+DEBUG:     BMP_ENTITY  client/tests/entity/bmp/RMI-over-IIOP/EJBHome
+DEBUG:     STATEFUL    client/tests/stateful/RMI-over-IIOP/EJBHome
+DEBUG:     STATELESS  client/tests/stateless/BeanManagedTransactionTests/EJBHome
+DEBUG:     BMP_ENTITY client/tests/entity/bmp/allowed_operations/EntityHome
+DEBUG:     CMP_ENTITY  client/tests/entity/cmp/EncBean
+DEBUG:     STATEFUL    client/tests/stateful/BeanManagedBasicStatefulHome
+DEBUG:     BMP_ENTITY  client/tests/entity/bmp/BasicBmpHome
+DEBUG:     STATELESS   client/tests/stateless/BasicStatelessHome
+DEBUG:     CMP_ENTITY  client/tests/entity/cmp/BasicCmpHome
+DEBUG:     STATELESS   client/tools/DatabaseHome
+DEBUG:     CMP_ENTITY client/tests/entity/cmp/allowed_operations/EntityHome
+DEBUG:     BMP_ENTITY  client/tests/entity/bmp/EncBean
+DEBUG:     STATELESS   client/tests/stateless/RMI-over-IIOP/EJBHome
 </code></pre>
 
-<p>client/tests/stateful/BeanManagedTransactionTests/EJBHome
-    DEBUG:     BMP_ENTITY  client/tests/entity/bmp/RMI-over-IIOP/EJBHome
-    DEBUG:     STATEFUL    client/tests/stateful/RMI-over-IIOP/EJBHome
-    DEBUG:     STATELESS <br />
-client/tests/stateless/BeanManagedTransactionTests/EJBHome
-    DEBUG:     BMP_ENTITY 
-client/tests/entity/bmp/allowed_operations/EntityHome
-    DEBUG:     CMP_ENTITY  client/tests/entity/cmp/EncBean
-    DEBUG:     STATEFUL    client/tests/stateful/BeanManagedBasicStatefulHome
-    DEBUG:     BMP_ENTITY  client/tests/entity/bmp/BasicBmpHome
-    DEBUG:     STATELESS   client/tests/stateless/BasicStatelessHome
-    DEBUG:     CMP_ENTITY  client/tests/entity/cmp/BasicCmpHome
-    DEBUG:     STATELESS   client/tools/DatabaseHome
-    DEBUG:     CMP_ENTITY 
-client/tests/entity/cmp/allowed_operations/EntityHome
-    DEBUG:     BMP_ENTITY  client/tests/entity/bmp/EncBean
-    DEBUG:     STATELESS   client/tests/stateless/RMI-over-IIOP/EJBHome
-    {noformat}</p>
-
             </DIV>
           </P>
         </TD>

Modified: websites/staging/openejb/trunk/content/details-on-openejb-jar.html
==============================================================================
--- websites/staging/openejb/trunk/content/details-on-openejb-jar.html (original)
+++ websites/staging/openejb/trunk/content/details-on-openejb-jar.html Mon Jul 11 02:31:36 2011
@@ -200,31 +200,26 @@ breeze.</p>
 <p>This is the openejb-jar.xml that is created by the Deploy tool in the Hello
 World example. As you can see, the file format is extremely simple.</p>
 
-<p>{code:xml|title=openejb-jar.xml}
-<?xml version="1.0"?>
-<openejb-jar xmlns="http://www.openejb.org/openejb-jar/1.1">
-    <ejb-deployment  ejb-name="Hello" 
-             deployment-id="Hello" 
-             container-id="Default Stateless Container"/>
-</openejb-jar></p>
-
-<pre><code>The *ejb-name* attribute is the name you gave the bean in your ejb-jar.xml.
+<pre><code>&lt;?xml version="1.0"?&gt;
+&lt;openejb-jar xmlns="http://www.openejb.org/openejb-jar/1.1"&gt;
+    &lt;ejb-deployment  ejb-name="Hello"
+         deployment-id="Hello"
+         container-id="Default Stateless Container"/&gt;
+&lt;/openejb-jar&gt;
 </code></pre>
 
-<p>The <em>deployment-id</em> is the name you want to use to lookup the bean in your
+<p>The <em>ejb-name</em> attribute is the name you gave the bean in your ejb-jar.xml.
+The <em>deployment-id</em> is the name you want to use to lookup the bean in your
 client's JNDI namespace. The <em>container-id</em> is the name of the container in
 your openejb.conf file that you would like the bean to run in. There MUST
 be one <em>ejb-deployment</em> element for each EJB in your jar.</p>
 
 <h1>What if my bean uses a JDBC datasource?</h1>
 
-<pre><code>Then you simply add a &lt;resource-link&gt; element to your &lt;ejb-deployment&gt;
-</code></pre>
-
-<p>element like this</p>
+<p>Then you simply add a <resource-link> element to your <ejb-deployment>
+element like this</p>
 
-<pre><code>{code:xml|title=openejb-jar.xml}
-&lt;?xml version="1.0"?&gt;
+<pre><code>&lt;?xml version="1.0"?&gt;
 &lt;openejb-jar xmlns="http://www.openejb.org/openejb-jar/1.1"&gt;
 
     &lt;ejb-deployment  ejb-name="Hello" 
@@ -252,49 +247,44 @@ resource.</p>
 <p>You will need one <resource-link> element for every <resource-ref> element
 in your ejb-jar.xml. So if you had an ejb-jar.xml like the following</p>
 
-<p>{code:xml|title=ejb-jar.xml}
-<?xml version="1.0"?>
-<ejb-jar>
-    <enterprise-beans>
-    <session>
-        <ejb-name>MyExampleBean</ejb-name>
-        <home>com.widget.ExampleHome</home>
-        <remote>com.widget.ExampleObject</remote>
-        <ejb-class>com.widget.ExampleBean</ejb-class>
-        <session-type>Stateless</session-type>
-        <transaction-type>Container</transaction-type></p>
-
-<pre><code>    &lt;resource-ref&gt;
-    &lt;description&gt;
-    This is a reference to a JDBC database.
-    &lt;/description&gt;
-    &lt;res-ref-name&gt;jdbc/myFirstDatabase&lt;/res-ref-name&gt;
-    &lt;res-type&gt;javax.sql.DataSource&lt;/res-type&gt;
-    &lt;res-auth&gt;Container&lt;/res-auth&gt;
-    &lt;/resource-ref&gt;
-
-    &lt;resource-ref&gt;
-    &lt;description&gt;
-    This is another reference to a JDBC database.
-    &lt;/description&gt;
-    &lt;res-ref-name&gt;jdbc/anotherDatabase&lt;/res-ref-name&gt;
-    &lt;res-type&gt;javax.sql.DataSource&lt;/res-type&gt;
-    &lt;res-auth&gt;Container&lt;/res-auth&gt;
-    &lt;/resource-ref&gt;
-
-&lt;/session&gt;
-&lt;/enterprise-beans&gt;
-</code></pre>
-
-<p></ejb-jar></p>
-
-<pre><code>Then you would need two &lt;resource-link&gt; elements for that bean in your
+<pre><code>&lt;?xml version="1.0"?&gt;
+&lt;ejb-jar&gt;
+  &lt;enterprise-beans&gt;
+    &lt;session&gt;
+      &lt;ejb-name&gt;MyExampleBean&lt;/ejb-name&gt;
+      &lt;home&gt;com.widget.ExampleHome&lt;/home&gt;
+      &lt;remote&gt;com.widget.ExampleObject&lt;/remote&gt;
+      &lt;ejb-class&gt;com.widget.ExampleBean&lt;/ejb-class&gt;
+      &lt;session-type&gt;Stateless&lt;/session-type&gt;
+      &lt;transaction-type&gt;Container&lt;/transaction-type&gt;
+
+      &lt;resource-ref&gt;
+        &lt;description&gt;
+          This is a reference to a JDBC database.
+        &lt;/description&gt;
+        &lt;res-ref-name&gt;jdbc/myFirstDatabase&lt;/res-ref-name&gt;
+        &lt;res-type&gt;javax.sql.DataSource&lt;/res-type&gt;
+        &lt;res-auth&gt;Container&lt;/res-auth&gt;
+      &lt;/resource-ref&gt;
+
+      &lt;resource-ref&gt;
+        &lt;description&gt;
+          This is another reference to a JDBC database.
+        &lt;/description&gt;
+        &lt;res-ref-name&gt;jdbc/anotherDatabase&lt;/res-ref-name&gt;
+        &lt;res-type&gt;javax.sql.DataSource&lt;/res-type&gt;
+        &lt;res-auth&gt;Container&lt;/res-auth&gt;
+      &lt;/resource-ref&gt;
+
+    &lt;/session&gt;
+  &lt;/enterprise-beans&gt;
+&lt;/ejb-jar&gt;
 </code></pre>
 
-<p>openejb-jar.xml file as such.</p>
+<p>Then you would need two <resource-link> elements for that bean in your
+openejb-jar.xml file as such.</p>
 
-<pre><code>{code:xml|title=openejb-jar.xml}
-&lt;?xml version="1.0"?&gt;
+<pre><code>&lt;?xml version="1.0"?&gt;
 &lt;openejb-jar xmlns="http://www.openejb.org/openejb-jar/1.1"&gt;
 
     &lt;ejb-deployment  ejb-name="MyExampleBean" 

Modified: websites/staging/openejb/trunk/content/dynamic-datasource.html
==============================================================================
--- websites/staging/openejb/trunk/content/dynamic-datasource.html (original)
+++ websites/staging/openejb/trunk/content/dynamic-datasource.html Mon Jul 11 02:31:36 2011
@@ -173,7 +173,8 @@ functionnal reasons (filtering, aggregat
 <p>The interface Router (<em>org.apache.openejb.resource.jdbc.Router</em>) have
 only one method to get the datasource to use:</p>
 
-<p>{code:java}Router.getDataSource(){code}</p>
+<pre><code>Router.getDataSource()
+</code></pre>
 
 <p>The <em>org.apache.openejb.resource.jdbc.RoutedDataSource</em> wraps a classical
 data source. It has to be used to declare your datasource.</p>
@@ -223,25 +224,22 @@ set to choose the real database to use b
 
 <p>So in your code you want something like:</p>
 
-<p>{code:java}@Stateless
-public class RoutedEJBBean {
+<pre><code>public class RoutedEJBBean {
     @PersistenceContext(unitName = "router")
-    private EntityManager em;</p>
-
-<pre><code>@Resource(name = "My Router", type = DeterminedRouter.class)
-private DeterminedRouter router; // this router is not automatic, we
-</code></pre>
+    private EntityManager em;
 
-<p>need it to select the database to use</p>
-
-<pre><code>public void persist(int id, String name, String clientDatasource) {
-router.setDataSource(clientDatasource);
-em.persist(new Person(id, name));
+    // this router is not automatic, we
+    // need it to select the database to use
+    @Resource(name = "My Router")
+    private DeterminedRouter router;
+
+    public void persist(int id, String name, String clientDatasource) {
+        router.setDataSource(clientDatasource);
+        em.persist(new Person(id, name));
+    }
 }
 </code></pre>
 
-<p>}{code}</p>
-
 <p><a name="DynamicDatasource-Therouterimplementation"></a></p>
 
 <h2>The router implementation</h2>
@@ -249,98 +247,85 @@ em.persist(new Person(id, name));
 <p>The router will simply manage a map to store proxied datasources and a
 field to store the datasource used in the current thread (ThreadLocal).</p>
 
-<p>{code:java}public class DeterminedRouter implements Router {
-    private String dataSourceNames; // used to store configuration
-(openejb.xml)
+<pre><code>public class DeterminedRouter implements Router {
+    private String dataSourceNames; // used to store configuration (openejb.xml)
     private String defaultDataSourceName; // defautl data source name
-    private Map<String, DataSource> dataSources = null; // proxied data
-sources
-    private ThreadLocal<DataSource> currentDataSource = new
-ThreadLocal<DataSource>(); // the datasource to use or null</p>
-
-<pre><code>/**
- * @param datasourceList datasource resource name, separator is a space
- */
-public void setDataSourceNames(String datasourceList) {
-dataSourceNames = datasourceList;
-}
-
-/**
- * lookup datasource in openejb resources
- */
-private void init() { // looking up datasources declared as proxied
-dataSources = new ConcurrentHashMap&lt;String, DataSource&gt;();
-for (String ds : dataSourceNames.split(" ")) {
-    ContainerSystem containerSystem =
-</code></pre>
+    private Map&lt;String, DataSource&gt; dataSources = null; // proxied data sources
+    private ThreadLocal&lt;DataSource&gt; currentDataSource = new ThreadLocal&lt;DataSource&gt;(); // the datasource to use or null
 
-<p>SystemInstance.get().getComponent(ContainerSystem.class);</p>
-
-<pre><code>    Object o = null;
-    Context ctx = containerSystem.getJNDIContext();
-    try {
-    o = ctx.lookup("openejb:Resource/" + ds);
-    if (o instanceof DataSource) {
-        dataSources.put(ds, (DataSource) o);
-    }
-    } catch (NamingException ignore) {
+    /**
+     * @param datasourceList datasource resource name, separator is a space
+     */
+    public void setDataSourceNames(String datasourceList) {
+        dataSourceNames = datasourceList;
     }
-}
-}
 
-/**
- * @return the user selected data source if it is set
- *         or the default one
- *  @throws IllegalArgumentException if the data source is not found
- */
-public DataSource getDataSource() {
-// lazy init of routed datasources
-if (dataSources == null) {
-    init();
-}
-
-// if no datasource is selected use the default one
-if (currentDataSource.get() == null) {
-    if (dataSources.containsKey(defaultDataSourceName)) {
-    return dataSources.get(defaultDataSourceName);
-
-    } else {
-    throw new IllegalArgumentException("you have to specify at
-</code></pre>
+    /**
+     * lookup datasource in openejb resources
+     */
+    private void init() { // looking up datasources declared as proxied
+        dataSources = new ConcurrentHashMap&lt;String, DataSource&gt;();
+        for (String ds : dataSourceNames.split(" ")) {
+            ContainerSystem containerSystem = SystemInstance.get().getComponent(ContainerSystem.class);
+
+            Object o = null;
+            Context ctx = containerSystem.getJNDIContext();
+            try {
+                o = ctx.lookup("openejb:Resource/" + ds);
+                if (o instanceof DataSource) {
+                    dataSources.put(ds, (DataSource) o);
+                }
+            } catch (NamingException ignore) {
+            }
+        }
+    }
 
-<p>least one datasource");
+    /**
+     * @return the user selected data source if it is set
+     *         or the default one
+     *  @throws IllegalArgumentException if the data source is not found
+     */
+    public DataSource getDataSource() {
+        // lazy init of routed datasources
+        if (dataSources == null) {
+            init();
         }
-    }</p>
 
-<pre><code>// the developper set the datasource to use
-return currentDataSource.get();
-}
+        // if no datasource is selected use the default one
+        if (currentDataSource.get() == null) {
+            if (dataSources.containsKey(defaultDataSourceName)) {
+                return dataSources.get(defaultDataSourceName);
+
+            } else {
+                throw new IllegalArgumentException("you have to specify at least one datasource");
+            }
+        }
 
-/**
- *
- * @param datasourceName data source name
- */
-public void setDataSource(String datasourceName) {
-if (dataSources == null) {
-    init();
-}
-if (!dataSources.containsKey(datasourceName)) {
-    throw new IllegalArgumentException("data source called " +
-</code></pre>
+        // the developper set the datasource to use
+        return currentDataSource.get();
+    }
 
-<p>datasourceName + " can't be found.");
+    /**
+     *
+     * @param datasourceName data source name
+     */
+    public void setDataSource(String datasourceName) {
+        if (dataSources == null) {
+            init();
+        }
+        if (!dataSources.containsKey(datasourceName)) {
+            throw new IllegalArgumentException("data source called " + datasourceName + " can't be found.");
+        }
+        DataSource ds = dataSources.get(datasourceName);
+        currentDataSource.set(ds);
     }
-    DataSource ds = dataSources.get(datasourceName);
-    currentDataSource.set(ds);
-    }</p>
 
-<pre><code>public void setDefaultDataSourceName(String name) {
-this.defaultDataSourceName = name;
+    public void setDefaultDataSourceName(String name) {
+        this.defaultDataSourceName = name;
+    }
 }
 </code></pre>
 
-<p>}{code}</p>
-
 <p><a name="DynamicDatasource-Creationoftheserviceproviderfortherouter"></a></p>
 
 <h2>Creation of the service provider for the router</h2>
@@ -352,33 +337,27 @@ META-INF/<package>. For example META-INF
 
 <pre><code>&lt;ServiceJar&gt;
   &lt;ServiceProvider id="DeterminedRouter" service="Resource"
-           type="org.apache.openejb.resource.jdbc.Router"
+           type="org.apache.openejb.resource.jdbc.Router" class-name="implementation class"&gt;
+    Param defaultValue
+    ParamWithNoDefaultValue
+  &lt;/ServiceProvider&gt;
+&lt;/ServiceJar&gt;
 </code></pre>
 
-<p>class-name="implementation class">
-        Param defaultValue
-        ParamWithNoDefaultValue
-      </ServiceProvider>
-    </ServiceJar>{code}</p>
-
 <h2>openejb.xml</h2>
 
-<pre><code>In the openejb.xml file, you have to declare your dynamic database and in
-</code></pre>
-
-<p>our example it needs the proxied datasources too:</p>
+<p>In the openejb.xml file, you have to declare your dynamic database and in
+our example it needs the proxied datasources too:</p>
 
-<pre><code>{code:xml}&lt;Resource id="router" type="&lt;your implementation&gt;"
-</code></pre>
+<pre><code>&lt;Resource id="router" type="&lt;your implementation&gt;" provider="&lt;your provider&gt;"&gt;
+  Param value
+&lt;/Resource&gt;
 
-<p>provider="<your provider>">
-      Param value
-    </Resource>
-    <Resource id="route db" type="DataSource" provider="RoutedDataSource">
-      Router router
-    </Resource></p>
+&lt;Resource id="route db" type="DataSource" provider="RoutedDataSource"&gt;
+  Router router
+&lt;/Resource&gt;
 
-<pre><code>&lt;!–- real databases – for our example --&gt;
+&lt;!–- real databases – for our example --&gt;
 &lt;Resource id="db1" type="DataSource"&gt;
   JdbcDriver org.hsqldb.jdbcDriver
   JdbcUrl jdbc:hsqldb:mem:db1
@@ -399,7 +378,7 @@ META-INF/<package>. For example META-INF
   UserName sa
   Password
   JtaManaged true
-&lt;/Resource&gt;{code}
+&lt;/Resource&gt;
 </code></pre>
 
             </DIV>

Modified: websites/staging/openejb/trunk/content/ejb-local-ref.html
==============================================================================
--- websites/staging/openejb/trunk/content/ejb-local-ref.html (original)
+++ websites/staging/openejb/trunk/content/ejb-local-ref.html Mon Jul 11 02:31:36 2011
@@ -156,10 +156,11 @@
 
 <h1>Via annotation</h1>
 
-<p><DIV class="code panel" style="border-style: solid;border-width: 1px;"><DIV class="codeHeader panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;"><B>Usable by EJB, Interceptor, Servlet, Filter, or Listener</B></DIV><DIV class="codeContent panelContent">
-    package org.superbiz.refs;</p>
+<p>Usable by EJB, Interceptor, Servlet, Filter, or Listener</p>
 
-<pre><code>import javax.ejb.EJB;
+<pre><code>package org.superbiz.refs;
+
+import javax.ejb.EJB;
 import javax.ejb.Stateless;
 import javax.naming.InitialContext;
 
@@ -171,43 +172,36 @@ public class MyEjbLocalRefBean implement
     private BarLocal myBarEjb;
 
     public void someBusinessMethod() throws Exception {
-    if (myBarEjb == null) throw new NullPointerException("myBarEjb not
-</code></pre>
-
-<p>injected");</p>
+        if (myBarEjb == null) throw new NullPointerException("myBarEjb not injected");
 
-<pre><code>    // Both can be looked up from JNDI as well
-    InitialContext context = new InitialContext();
-    FooLocal fooLocal = (FooLocal)
+        // Both can be looked up from JNDI as well
+        InitialContext context = new InitialContext();
+        FooLocal fooLocal = (FooLocal) context.lookup("java:comp/env/myFooEjb");
+        BarLocal barLocal = (BarLocal) context.lookup("java:comp/env/org.superbiz.refs.MyEjbLocalRefBean/myBarEjb");
+    }
+}
 </code></pre>
 
-<p>context.lookup("java:comp/env/myFooEjb");
-        BarLocal barLocal = (BarLocal)
-context.lookup("java:comp/env/org.superbiz.refs.MyEjbLocalRefBean/myBarEjb");
-        }
-    }</p>
-
 <p><a name="ejb-local-ref-Viaxml"></a></p>
 
 <h1>Via xml</h1>
 
 <p>The above @EJB annotation usage is 100% equivalent to the following xml.</p>
 
-<p>{code:xml|title=ejb-jar.xml or web.xml}
-<ejb-local-ref>
-    <ejb-ref-name>myFooEjb</ejb-ref-name>
-    <local>org.superbiz.refs.FooLocal</local>
-</ejb-local-ref>
-<ejb-local-ref></p>
-
-<p><ejb-ref-name>org.superbiz.refs.MyEjbLocalRefBean/myBarEjb</ejb-ref-name>
-    <local>org.superbiz.refs.BarLocal</local>
-    <injection-target></p>
-
-<p><injection-target-class>org.superbiz.refs.MyEjbLocalRefBean</injection-target-class>
-    <injection-target-name>myBarEjb</injection-target-name>
-    </injection-target>
-</ejb-local-ref></p>
+<pre><code>&lt;ejb-local-ref&gt;
+  &lt;ejb-ref-name&gt;myFooEjb&lt;/ejb-ref-name&gt;
+  &lt;local&gt;org.superbiz.refs.FooLocal&lt;/local&gt;
+&lt;/ejb-local-ref&gt;
+
+&lt;ejb-local-ref&gt;
+  &lt;ejb-ref-name&gt;org.superbiz.refs.MyEjbLocalRefBean/myBarEjb&lt;/ejb-ref-name&gt;
+  &lt;local&gt;org.superbiz.refs.BarLocal&lt;/local&gt;
+  &lt;injection-target&gt;
+    &lt;injection-target-class&gt;org.superbiz.refs.MyEjbLocalRefBean&lt;/injection-target-class&gt;
+    &lt;injection-target-name&gt;myBarEjb&lt;/injection-target-name&gt;
+  &lt;/injection-target&gt;
+&lt;/ejb-local-ref&gt;
+</code></pre>
 
             </DIV>
           </P>

Modified: websites/staging/openejb/trunk/content/ejb-ref.html
==============================================================================
--- websites/staging/openejb/trunk/content/ejb-ref.html (original)
+++ websites/staging/openejb/trunk/content/ejb-ref.html Mon Jul 11 02:31:36 2011
@@ -156,10 +156,9 @@
 
 <h1>Via annotation</h1>
 
-<p><DIV class="code panel" style="border-style: solid;border-width: 1px;"><DIV class="codeHeader panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;"><B>Usable by EJB, Interceptor, Servlet, Filter, or Listener</B></DIV><DIV class="codeContent panelContent">
-    package org.superbiz.refs;</p>
+<pre><code>package org.superbiz.refs;
 
-<pre><code>import javax.ejb.EJB;
+import javax.ejb.EJB;
 import javax.ejb.Stateless;
 import javax.naming.InitialContext;
 
@@ -171,43 +170,36 @@ public class MyEjbRemoteRefBean implemen
     private BarRemote myBarEjb;
 
     public void someBusinessMethod() throws Exception {
-    if (myBarEjb == null) throw new NullPointerException("myBarEjb not
-</code></pre>
-
-<p>injected");</p>
+        if (myBarEjb == null) throw new NullPointerException("myBarEjb not injected");
 
-<pre><code>    // Both can be looked up from JNDI as well
-    InitialContext context = new InitialContext();
-    FooRemote fooRemote = (FooRemote)
+        // Both can be looked up from JNDI as well
+        InitialContext context = new InitialContext();
+        FooRemote fooRemote = (FooRemote) context.lookup("java:comp/env/myFooEjb");
+        BarRemote barRemote = (BarRemote) context.lookup("java:comp/env/org.superbiz.refs.MyEjbRemoteRefBean/myBarEjb");
+    }
+}
 </code></pre>
 
-<p>context.lookup("java:comp/env/myFooEjb");
-        BarRemote barRemote = (BarRemote)
-context.lookup("java:comp/env/org.superbiz.refs.MyEjbRemoteRefBean/myBarEjb");
-        }
-    }</p>
-
 <p><a name="ejb-ref-Viaxml"></a></p>
 
 <h1>Via xml</h1>
 
 <p>The above @EJB annotation usage is 100% equivalent to the following xml.</p>
 
-<p>{code:xml|title=ejb-jar.xml or web.xml}
-<ejb-ref>
-    <ejb-ref-name>myFooEjb</ejb-ref-name>
-    <remote>org.superbiz.refs.FooRemote</remote>
-</ejb-ref>
-<ejb-ref></p>
-
-<p><ejb-ref-name>org.superbiz.refs.MyEjbRemoteRefBean/myBarEjb</ejb-ref-name>
-    <remote>org.superbiz.refs.BarRemote</remote>
-    <injection-target></p>
-
-<p><injection-target-class>org.superbiz.refs.MyEjbRemoteRefBean</injection-target-class>
-    <injection-target-name>myBarEjb</injection-target-name>
-    </injection-target>
-</ejb-ref></p>
+<pre><code>&lt;ejb-ref&gt;
+    &lt;ejb-ref-name&gt;myFooEjb&lt;/ejb-ref-name&gt;
+    &lt;remote&gt;org.superbiz.refs.FooRemote&lt;/remote&gt;
+&lt;/ejb-ref&gt;
+&lt;ejb-ref&gt;
+
+&lt;ejb-ref-name&gt;org.superbiz.refs.MyEjbRemoteRefBean/myBarEjb&lt;/ejb-ref-name&gt;
+    &lt;remote&gt;org.superbiz.refs.BarRemote&lt;/remote&gt;
+    &lt;injection-target&gt;
+      &lt;injection-target-class&gt;org.superbiz.refs.MyEjbRemoteRefBean&lt;/injection-target-class&gt;
+      &lt;injection-target-name&gt;myBarEjb&lt;/injection-target-name&gt;
+    &lt;/injection-target&gt;
+&lt;/ejb-ref&gt;
+</code></pre>
 
             </DIV>
           </P>

Modified: websites/staging/openejb/trunk/content/embedded-configuration.html
==============================================================================
--- websites/staging/openejb/trunk/content/embedded-configuration.html (original)
+++ websites/staging/openejb/trunk/content/embedded-configuration.html Mon Jul 11 02:31:36 2011
@@ -245,16 +245,14 @@ InitialContext initialContext = new Init
 <h1>Example of using jndi.properties</h1>
 
 <p>Here's an example of the same properties being specified via a
-jndi.properties file.  This file just needs to be placed in the classpath,
+<code>jndi.properties file</code>.  This file just needs to be placed in the classpath,
 not in a subdirectory of a path in the classpath such as META-INF, but at
 the root of any of the paths in the classpath.</p>
 
-<p><DIV class="code panel" style="border-style: solid;border-width: 1px;"><DIV class="codeHeader panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;"><B>jndi.properties</B></DIV><DIV class="codeContent panelContent">
-    # set the initial context factory
-    java.naming.factory.initial =
-org.apache.openejb.client.LocalInitialContextFactory</p>
+<pre><code># set the initial context factory
+java.naming.factory.initial = org.apache.openejb.client.LocalInitialContextFactory
 
-<pre><code># change some logging
+# change some logging
 log4j.category.OpenEJB.options = debug
 log4j.category.OpenEJB.startup = debug
 log4j.category.OpenEJB.startup.config = debug

Modified: websites/staging/openejb/trunk/content/embedding-openejb.html
==============================================================================
--- websites/staging/openejb/trunk/content/embedding-openejb.html (original)
+++ websites/staging/openejb/trunk/content/embedding-openejb.html Mon Jul 11 02:31:36 2011
@@ -200,62 +200,53 @@ debugging, developing, etc.</p>
 
 <p>Try something like this for a simple IntraVM (Local) Client:</p>
 
-<p><DIV class="code panel" style="border-style: solid;border-width: 1px;"><DIV class="codeHeader panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;"><B>c:\my\app\MyEjbApplication.java</B></DIV><DIV class="codeContent panelContent">
-    import java.util.Properties;
-    import javax.naming.Context;
-    import javax.naming.InitialContext;
-    import javax.rmi.PortableRemoteObject;
-    import FooHome;</p>
+<pre><code>import FooHome;
 
-<pre><code>public class MyEjbApplication {
+import javax.naming.Context;
+import javax.naming.InitialContext;
+import javax.rmi.PortableRemoteObject;
+import java.util.Properties;
 
-public static void main( String args[]
-</code></pre>
+public class MyEjbApplication {
 
-<p>) {
-      try{</p>
+    public static void main(String args[]) {
+        try {
 
-<pre><code>    Properties properties = new Properties();
+            Properties properties = new Properties();
 
-    properties.put(Context.INITIAL_CONTEXT_FACTORY, 
-    "org.openejb.client.LocalInitialContextFactory");
+            properties.put(Context.INITIAL_CONTEXT_FACTORY, "org.openejb.client.LocalInitialContextFactory");
 
-    InitialContext ctx = new InitialContext(properties);
+            InitialContext ctx = new InitialContext(properties);
 
-    Object obj = ctx.lookup("my/bean/Foo");
+            Object obj = ctx.lookup("my/bean/Foo");
 
-    FooHome ejbHome = (FooHome)
-    PortableRemoteObject.narrow(obj, FooHome.class);
+            FooHome ejbHome = (FooHome) PortableRemoteObject.narrow(obj, FooHome.class);
 
-  } catch (Exception e){
-    e.printStackTRace();
-  }
-}
+        } catch (Exception e) {
+            e.printStackTRace();
+        }
+    }
 }
 </code></pre>
 
 <p>That would be the simplest spec compliant client you could create. If you
 don't care about spec compliance and just want to "cheat", you can do this:</p>
 
-<p><DIV class="code panel" style="border-style: solid;border-width: 1px;"><DIV class="codeHeader panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;"><B>c:\my\app\MyEjbApplication.java</B></DIV><DIV class="codeContent panelContent">
-    import javax.naming.InitialContext;
-    import FooHome;</p>
+<pre><code>import FooHome;
 
-<pre><code>public class MyEjbApplication {
+import javax.naming.InitialContext;
 
-public static void main( String args[]
-</code></pre>
+public class MyEjbApplication {
 
-<p>) {
-      try{</p>
+    public static void main(String args[]) {
+        try {
 
-<pre><code>    FooHome ejbHome = (FooHome)new InitialContext().lookup(
-                "java:openejb/ejb/my/bean/Foo");
+            FooHome ejbHome = (FooHome) new InitialContext().lookup("java:openejb/ejb/my/bean/Foo");
 
-  } catch (Exception e){
-    e.printStackTRace();
-  }
-}
+        } catch (Exception e) {
+            e.printStackTRace();
+        }
+    }
 }
 </code></pre>
 
@@ -417,25 +408,20 @@ to as OPENEJB_HOME, is set to "c:\dir\op
 in your openejb.conf file will be resolved assuming OPENEJB_HOME as the
 base path.</p>
 
-<p>{code:xml|title=openejb.conf}
-<openejb>
-...</p>
-
-<p><Deployments dir="beans\" />
-</openejb></p>
+<pre><code>&lt;openejb&gt;
+...
 
-<pre><code>The above deployment path, "beans\", would automatically be expanded to
+&lt;Deployments dir="beans\" /&gt;
+&lt;/openejb&gt;
 </code></pre>
 
-<p>"c:\dir\openejb\beans".</p>
-
-<pre><code>If you want tell OpenEJB to look outside the OPENEJB_HOME, then use an
-</code></pre>
+<p>The above deployment path, "beans\", would automatically be expanded to
+"c:\dir\openejb\beans".</p>
 
-<p>absolute file path as shown below.</p>
+<p>If you want tell OpenEJB to look outside the OPENEJB_HOME, then use an
+absolute file path as shown below.</p>
 
-<pre><code>{code:xml|title=openejb.conf}
-&lt;openejb&gt;
+<pre><code>&lt;openejb&gt;
 ...
 
 &lt;Deployments dir="beans\" /&gt;&lt;/openejb&gt;
@@ -444,20 +430,17 @@ base path.</p>
 <p>OpenEJB can look in any number of directories for beans, just add those
 directories to your openejb.conf file as such.</p>
 
-<p>{code:xml|title=openejb.conf}
-<openejb>
-...</p>
-
-<p><Deployments dir="beans\" />
-<Deployments dir="c:\my\app\my\beans\" /></openejb></p>
+<pre><code>&lt;openejb&gt;
+...
 
-<pre><code>Furthermore, you can add jars individually to OpenEJB's deployment path by
+&lt;Deployments dir="beans\" /&gt;
+&lt;Deployments dir="c:\my\app\my\beans\" /&gt;&lt;/openejb&gt;
 </code></pre>
 
-<p>naming the jar directly.</p>
+<p>Furthermore, you can add jars individually to OpenEJB's deployment path by
+naming the jar directly.</p>
 
-<pre><code>{code:xml|title=openejb.conf}
-&lt;openejb&gt;
+<pre><code>&lt;openejb&gt;
 ...
 
 &lt;Deployments dir="beans\" /&gt;



Mime
View raw message