You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by db...@apache.org on 2011/07/11 04:30:13 UTC

svn commit: r1145009 [2/3] - /openejb/site/trunk/content/

Modified: openejb/site/trunk/content/hibernate.mdtext
URL: http://svn.apache.org/viewvc/openejb/site/trunk/content/hibernate.mdtext?rev=1145009&r1=1145008&r2=1145009&view=diff
==============================================================================
--- openejb/site/trunk/content/hibernate.mdtext (original)
+++ openejb/site/trunk/content/hibernate.mdtext Mon Jul 11 02:30:12 2011
@@ -5,29 +5,27 @@ Title: Hibernate
 For a unit called "movie-unit" using two datasources called "movieDatabase"
 and "movieDatabaseUnmanaged" the following persistence.xml would work.
 
-{code:xml|title=persistence.xml}
-<persistence version="1.0"
-	     xmlns="http://java.sun.com/xml/ns/persistence"
-	     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	     xsi:schemaLocation="http://java.sun.com/xml/ns/persistence
-http://java.sun.com/xml/ns/persistence/persistence_1_0.xsd">
-
-  <persistence-unit name="movie-unit">
-    <provider>org.hibernate.ejb.HibernatePersistence</provider>
-    <jta-data-source>movieDatabase</jta-data-source>
-    <non-jta-data-source>movieDatabaseUnmanaged</non-jta-data-source>
-
-    <properties>
-      <property name="hibernate.hbm2ddl.auto" value="create-drop"/>
-      <property name="hibernate.transaction.manager_lookup_class"
-	       
-value="org.apache.openejb.hibernate.TransactionManagerLookup"/>
-    </properties>
-  </persistence-unit>
-</persistence>
+    <persistence version="1.0"
+           xmlns="http://java.sun.com/xml/ns/persistence"
+           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+           xsi:schemaLocation="http://java.sun.com/xml/ns/persistence
+           http://java.sun.com/xml/ns/persistence/persistence_1_0.xsd">
+
+      <persistence-unit name="movie-unit">
+        <provider>org.hibernate.ejb.HibernatePersistence</provider>
+        <jta-data-source>movieDatabase</jta-data-source>
+        <non-jta-data-source>movieDatabaseUnmanaged</non-jta-data-source>
+
+        <properties>
+          <property name="hibernate.hbm2ddl.auto" value="create-drop"/>
+          <property name="hibernate.transaction.manager_lookup_class"
+                    value="org.apache.openejb.hibernate.TransactionManagerLookup"/>
+        </properties>
+      </persistence-unit>
+    </persistence>
 
     
-    Note that as of OpenEJB 3.1 you do not need to set the
+Note that as of OpenEJB 3.1 you do not need to set the
 _hibernate.transaction.manager_lookup_class_ as it will be set for you
 automatically and will overwrite any "org.hibernate.transaction." strategy
 class already set while leaving any custom strategy class you may have
@@ -37,60 +35,54 @@ production environment and OpenEJB will 
 testing.  On the other hand if you have implemented a custom
 _org.hibernate.transaction.TransactionManagerLookup_ strategy it will
 always be used and never replaced by OpenEJB.
-    
-    Note that if you need more functionality in this area we are always happy
+
+Note that if you need more functionality in this area we are always happy
 to add it.
     
 # Not using OpenEJB in production?
     
-    If you're using OpenEJB 3.0 which does not support the dynamic switching of
+If you're using OpenEJB 3.0 which does not support the dynamic switching of
 the _hibernate.transaction.manager_lookup_class_ this is one way to achieve
 it.
-    
-    A custom implementation of Hibernate's *TransactionManagerLookup* strategy
+
+A custom implementation of Hibernate's *TransactionManagerLookup* strategy
 like the following will do the trick.  This
 "DynamicTransactionManagerLookup" class can be packed in your jar and
 deployed with your app.
     
-    {code:title=DynamicTransactionManagerLookup.java}
     import org.hibernate.HibernateException;
     import org.hibernate.transaction.TransactionManagerLookup;
     import javax.transaction.TransactionManager;
     import java.util.Properties;
-    
-    public class DynamicTransactionManagerLookup implements
-TransactionManagerLookup {
-    
+
+    public class DynamicTransactionManagerLookup implements TransactionManagerLookup {
+
         private TransactionManagerLookup impl;
-    
+
         public DynamicTransactionManagerLookup() {
-            String[]
- strategies = {
-    		"org.apache.openejb.hibernate.TransactionManagerLookup",
-    		"org.hibernate.transaction.JBossTransactionManagerLookup"
-    	};
-    
-    	for (String className : strategies) {
-    	    try {
-    		Class<?> clazz =
-this.getClass().getClassLoader().loadClass(className);
-    		impl = (TransactionManagerLookup) clazz.newInstance();
-    		break;
-    	    } catch (Exception e) {
-    	    }
-    	}
-    
-    	if (impl == null) throw new IllegalStateException("No
-TransactionManagerLookup available");
+            String[] strategies = {
+                    "org.apache.openejb.hibernate.TransactionManagerLookup",
+                    "org.hibernate.transaction.JBossTransactionManagerLookup"
+            };
+
+            for (String className : strategies) {
+                try {
+                    Class<?> clazz = this.getClass().getClassLoader().loadClass(className);
+                    impl = (TransactionManagerLookup) clazz.newInstance();
+                    break;
+                } catch (Exception e) {
+                }
+            }
+
+            if (impl == null) throw new IllegalStateException("No TransactionManagerLookup available");
         }
-    
-        public TransactionManager getTransactionManager(Properties properties)
-throws HibernateException {
-    	return impl.getTransactionManager(properties);
+
+        public TransactionManager getTransactionManager(Properties properties) throws HibernateException {
+            return impl.getTransactionManager(properties);
         }
-    
+
         public String getUserTransactionName() {
-    	return impl.getUserTransactionName();
+            return impl.getUserTransactionName();
         }
     }
 

Modified: openejb/site/trunk/content/jms-resources-and-mdb-container.mdtext
URL: http://svn.apache.org/viewvc/openejb/site/trunk/content/jms-resources-and-mdb-container.mdtext?rev=1145009&r1=1145008&r2=1145009&view=diff
==============================================================================
--- openejb/site/trunk/content/jms-resources-and-mdb-container.mdtext (original)
+++ openejb/site/trunk/content/jms-resources-and-mdb-container.mdtext Mon Jul 11 02:30:12 2011
@@ -2,71 +2,61 @@ Title: JMS Resources and MDB Container
 <a name="JMSResourcesandMDBContainer-ExternalActiveMQBroker"></a>
 # External ActiveMQ Broker
 
-{code:xml|title=openejb.xml}
-<openejb>
-    <Resource id="MyJmsResourceAdapter" type="ActiveMQResourceAdapter">
-1. Do not start the embedded ActiveMQ broker
-	BrokerXmlConfig 
-	ServerUrl tcp://someHostName:61616
-    </Resource>
-
-    <Resource id="MyJmsConnectionFactory"
-type="javax.jms.ConnectionFactory">
-	ResourceAdapter MyJmsResourceAdapter
-    </Resource>
-
-    <Container id="MyJmsMdbContainer" ctype="MESSAGE">
-	ResourceAdapter MyJmsResourceAdapter
-    </Container>
-
-    <Resource id="FooQueue" type="javax.jms.Queue"/>
-    <Resource id="BarTopic" type="javax.jms.Topic"/>
-</openejb>
+    <openejb>
+        <Resource id="MyJmsResourceAdapter" type="ActiveMQResourceAdapter">
+            # Do not start the embedded ActiveMQ broker
+            BrokerXmlConfig
+            ServerUrl tcp://someHostName:61616
+        </Resource>
+
+        <Resource id="MyJmsConnectionFactory" type="javax.jms.ConnectionFactory">
+            ResourceAdapter MyJmsResourceAdapter
+        </Resource>
+
+        <Container id="MyJmsMdbContainer" ctype="MESSAGE">
+            ResourceAdapter MyJmsResourceAdapter
+        </Container>
+
+        <Resource id="FooQueue" type="javax.jms.Queue"/>
+        <Resource id="BarTopic" type="javax.jms.Topic"/>
+    </openejb>
 
     
-    The {{ServerUrl}} would be changed to point to the host and port of the
+The {{ServerUrl}} would be changed to point to the host and port of the
 ActiveMQ process.  The various URL formats that ActiveMQ supports also
 work, such as 'failover:'.
-    
-    The same can be done via properties in an embedded configuration, via the
+
+The same can be done via properties in an embedded configuration, via the
 {{conf/system.properties}} file or on the command line via {{-D}} flags.
-    
 
-Properties p = new Properties();
-p.put(Context.INITIAL_CONTEXT_FACTORY,
-LocalInitialContextFactory.class.getName());
-
-p.put("MyJmsResourceAdapter",
-"new://Resource?type=ActiveMQResourceAdapter");
-p.put("MyJmsResourceAdapter.ServerUrl", "tcp://someHostName:61616");
-// Do not start the ActiveMQ broker
-p.put("MyJmsResourceAdapter.BrokerXmlConfig", "");
-
-p.put("MyJmsConnectionFactory",
-"new://Resource?type=javax.jms.ConnectionFactory");
-p.put("MyJmsConnectionFactory.ResourceAdapter", "MyJmsResourceAdapter");
 
-p.put("MyJmsMdbContainer", "new://Container?type=MESSAGE");
-p.put("MyJmsMdbContainer.ResourceAdapter", "MyJmsResourceAdapter");
+    Properties p = new Properties();
+    p.put(Context.INITIAL_CONTEXT_FACTORY, LocalInitialContextFactory.class.getName());
 
-p.put("FooQueue", "new://Resource?type=javax.jms.Queue");
-p.put("BarTopic", "new://Resource?type=javax.jms.Topic");
+    p.put("MyJmsResourceAdapter", "new://Resource?type=ActiveMQResourceAdapter");
+    p.put("MyJmsResourceAdapter.ServerUrl", "tcp://someHostName:61616");
+    // Do not start the ActiveMQ broker
+    p.put("MyJmsResourceAdapter.BrokerXmlConfig", "");
 
-InitialContext context = new InitialContext(p);
+    p.put("MyJmsConnectionFactory", "new://Resource?type=javax.jms.ConnectionFactory");
+    p.put("MyJmsConnectionFactory.ResourceAdapter", "MyJmsResourceAdapter");
 
-    
-    
-    From anywhere in the same VM as the EJB Container you could lookup the
+    p.put("MyJmsMdbContainer", "new://Container?type=MESSAGE");
+    p.put("MyJmsMdbContainer.ResourceAdapter", "MyJmsResourceAdapter");
+
+    p.put("FooQueue", "new://Resource?type=javax.jms.Queue");
+    p.put("BarTopic", "new://Resource?type=javax.jms.Topic");
+
+    InitialContext context = new InitialContext(p);
+
+From anywhere in the same VM as the EJB Container you could lookup the
 above resources like so:
     
+    javax.jms.ConnectionFactory cf = (ConnectionFactory)
+            context.lookup("openejb:Resource/MyJmsConnectionFactory");
 
-javax.jms.ConnectionFactory cf = (ConnectionFactory) 
-	context.lookup("openejb:Resource/MyJmsConnectionFactory");
-            
-javax.jms.Queue queue = (Queue)
-context.lookup("openejb:Resource/FooQueue");
-javax.jms.Topic topic = (Topic)
-context.lookup("openejb:Resource/BarTopic");
+    javax.jms.Queue queue = (Queue) context.lookup("openejb:Resource/FooQueue");
+    javax.jms.Topic topic = (Topic) context.lookup("openejb:Resource/BarTopic");
 
     
 # Internal ActiveMQ Broker

Modified: openejb/site/trunk/content/jndi-names.mdtext
URL: http://svn.apache.org/viewvc/openejb/site/trunk/content/jndi-names.mdtext?rev=1145009&r1=1145008&r2=1145009&view=diff
==============================================================================
--- openejb/site/trunk/content/jndi-names.mdtext (original)
+++ openejb/site/trunk/content/jndi-names.mdtext Mon Jul 11 02:30:12 2011
@@ -202,20 +202,19 @@ with these examples is to show the vario
 interfaces or types of interfaces to gain more specific control on how they
 are named.
 
-{code:xml|title=#1}
-<openejb-jar>
-  <ejb-deployment ejb-name="FooBean">
-    <jndi name="LocalOne" interface="org.superbiz.LocalOne"/> 
-    <jndi name="LocalTwo" interface="org.superbiz.LocalTwo"/> 
-    <jndi name="RemoteOne" interface="org.superbiz.RemoteOne"/> 
-    <jndi name="RemoteTwo" interface="org.superbiz.RemoteTwo"/> 
-    <jndi name="FooHome" interface="org.superbiz.FooHome"/> 
-    <jndi name="FooLocalHome" interface="org.superbiz.FooLocalHome"/> 
-  </ejb-deployment>
-</openejb-jar>
+    <openejb-jar>
+      <ejb-deployment ejb-name="FooBean">
+        <jndi name="LocalOne" interface="org.superbiz.LocalOne"/>
+        <jndi name="LocalTwo" interface="org.superbiz.LocalTwo"/>
+        <jndi name="RemoteOne" interface="org.superbiz.RemoteOne"/>
+        <jndi name="RemoteTwo" interface="org.superbiz.RemoteTwo"/>
+        <jndi name="FooHome" interface="org.superbiz.FooHome"/>
+        <jndi name="FooLocalHome" interface="org.superbiz.FooLocalHome"/>
+      </ejb-deployment>
+    </openejb-jar>
+
+Or
 
-    
-    {code:xml|title=#2}
     <openejb-jar>
       <ejb-deployment ejb-name="FooBean">
         <!-- applies to LocalOne and LocalTwo -->
@@ -232,32 +231,29 @@ are named.
       </ejb-deployment>
     </openejb-jar>
 
+Or
 
-{code:xml|title=#3}
-<openejb-jar>
-  <ejb-deployment ejb-name="FooBean">
-    <!-- applies to RemoteOne, RemoteTwo, FooHome, and FooLocalHome -->
-    <jndi name="{interfaceClass.simpleName}"/> 
-
-    <!-- these two would count as an override on the above format -->
-    <jndi name="LocalOne" interface="org.superbiz.LocalOne"/> 
-    <jndi name="LocalTwo" interface="org.superbiz.LocalTwo"/> 
-  </ejb-deployment>
-</openejb-jar>
+    <openejb-jar>
+      <ejb-deployment ejb-name="FooBean">
+        <!-- applies to RemoteOne, RemoteTwo, FooHome, and FooLocalHome -->
+        <jndi name="{interfaceClass.simpleName}"/>
+
+        <!-- these two would count as an override on the above format -->
+        <jndi name="LocalOne" interface="org.superbiz.LocalOne"/>
+        <jndi name="LocalTwo" interface="org.superbiz.LocalTwo"/>
+      </ejb-deployment>
+    </openejb-jar>
 
+or
     
-    {code:xml|title=#4}
     <openejb-jar>
       <ejb-deployment ejb-name="FooBean">
-        <!-- applies to LocalOne, LocalTwo, RemoteOne, RemoteTwo, FooHome, and
-FooLocalHome -->
+        <!-- applies to LocalOne, LocalTwo, RemoteOne, RemoteTwo, FooHome, and FooLocalHome -->
         <jndi name="{interfaceClass.simpleName}"/> 
       </ejb-deployment>
     </openejb-jar>
 
 
-
-
 <a name="JNDINames-ChangingtheDefaultSetting"></a>
 # Changing the Default Setting
 

Modified: openejb/site/trunk/content/jpa-concepts.mdtext
URL: http://svn.apache.org/viewvc/openejb/site/trunk/content/jpa-concepts.mdtext?rev=1145009&r1=1145008&r2=1145009&view=diff
==============================================================================
--- openejb/site/trunk/content/jpa-concepts.mdtext (original)
+++ openejb/site/trunk/content/jpa-concepts.mdtext Mon Jul 11 02:30:12 2011
@@ -129,56 +129,53 @@ Calling EntityManager.merge() will re-at
 Servlets and EJBs can use RESOURCE_LOCAL persistence units through the
 EntityManagerFactory as follows:
 
-{code:xml=persistence.xml}
-<?xml version="1.0" encoding="UTF-8" ?>
-<persistence xmlns="http://java.sun.com/xml/ns/persistence" version="1.0">
+    <?xml version="1.0" encoding="UTF-8" ?>
+    <persistence xmlns="http://java.sun.com/xml/ns/persistence" version="1.0">
 
-  <!-- Tutorial "unit" -->
-  <persistence-unit name="Tutorial" transaction-type="RESOURCE_LOCAL">
-    <non-jta-data-source>myNonJtaDataSource</non-jta-data-source>
-    <class>org.superbiz.jpa.Account</class>
-  </persistence-unit>
-	
-</persistence>
+      <!-- Tutorial "unit" -->
+      <persistence-unit name="Tutorial" transaction-type="RESOURCE_LOCAL">
+        <non-jta-data-source>myNonJtaDataSource</non-jta-data-source>
+        <class>org.superbiz.jpa.Account</class>
+      </persistence-unit>
 
-    
+    </persistence>
 
-import javax.persistence.EntityManagerFactory;
-import javax.persistence.EntityManager;
-import javax.persistence.EntityTransaction;
-import javax.persistence.PersistenceUnit;
+And referenced as follows
 
-public class MyEjbOrServlet ... {
+    import javax.persistence.EntityManagerFactory;
+    import javax.persistence.EntityManager;
+    import javax.persistence.EntityTransaction;
+    import javax.persistence.PersistenceUnit;
 
-    @PersistenceUnit(unitName="Tutorial")
-    private EntityManagerFactory factory;
+    public class MyEjbOrServlet ... {
 
-    // Proper exception handling left out for simplicity
-    public void ejbMethodOrServletServiceMethod() throws Exception {
-	EntityManager entityManager = factory.createEntityManager();
+        @PersistenceUnit(unitName="Tutorial")
+        private EntityManagerFactory factory;
 
-	EntityTransaction entityTransaction =
-entityManager.getTransaction();
-        
-	entityTransaction.begin();
+        // Proper exception handling left out for simplicity
+        public void ejbMethodOrServletServiceMethod() throws Exception {
+            EntityManager entityManager = factory.createEntityManager();
 
-	Account account = entityManager.find(Account.class, 12345);
-        
-	account.setBalance(5000);
+            EntityTransaction entityTransaction = entityManager.getTransaction();
 
-	entityTransaction.commit();
+            entityTransaction.begin();
+
+            Account account = entityManager.find(Account.class, 12345);
+
+            account.setBalance(5000);
+
+            entityTransaction.commit();
+        }
+
+        ...
     }
-    
-    ...
-}
 
     
 #  Valid TRANSACTION Unit usage
-    
-    EJBs can use TRANSACTION persistence units through the EntityManager as
+
+EJBs can use TRANSACTION persistence units through the EntityManager as
 follows:
     
-    {code:xml=persistence.xml}
     <?xml version="1.0" encoding="UTF-8" ?>
     <persistence xmlns="http://java.sun.com/xml/ns/persistence" version="1.0">
     
@@ -191,7 +188,7 @@ follows:
     	
     </persistence>
 
-
+And referenced as follows
 
     import javax.ejb.Stateless;
     import javax.ejb.TransactionAttribute;

Modified: openejb/site/trunk/content/new-in-openejb-3.0.mdtext
URL: http://svn.apache.org/viewvc/openejb/site/trunk/content/new-in-openejb-3.0.mdtext?rev=1145009&r1=1145008&r2=1145009&view=diff
==============================================================================
--- openejb/site/trunk/content/new-in-openejb-3.0.mdtext (original)
+++ openejb/site/trunk/content/new-in-openejb-3.0.mdtext Mon Jul 11 02:30:12 2011
@@ -57,7 +57,7 @@ JavaBeans PropertyEditor.  We include se
 already such as Date, InetAddress, Class, File, URL, URI, Map, List and
 more.
 
-<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>MyBean.java</B></DIV><DIV class="codeContent panelContent">
+
     import java.net.URI;
     import java.io.File;
     import java.util.Date;
@@ -89,7 +89,7 @@ are not container controlled resources (
 nature).  You can configure you ejbs via a properties file and skip the
 need for an ejb-jar.xml and it's 5 lines per property madness.
 
-<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>META-INF/env-entries.properties</B></DIV><DIV class="codeContent panelContent">
+
     blog = http://acme.org/myblog
     birthday = locale=en_US style=MEDIUM Mar 1, 1954
     homeDirectory = /home/esmith/

Modified: openejb/site/trunk/content/openejb-1.0-beta-1.mdtext
URL: http://svn.apache.org/viewvc/openejb/site/trunk/content/openejb-1.0-beta-1.mdtext?rev=1145009&r1=1145008&r2=1145009&view=diff
==============================================================================
--- openejb/site/trunk/content/openejb-1.0-beta-1.mdtext (original)
+++ openejb/site/trunk/content/openejb-1.0-beta-1.mdtext Mon Jul 11 02:30:12 2011
@@ -92,22 +92,20 @@ of the very first CMP accessed to grab a
 use on all requests into the CMP container.  This was configured with
 something like this:
 
-{code:xml|title=cmp.global_database.xml}
-   <database name="Global_TX_Database" engine="instantdb">
+    <database name="Global_TX_Database" engine="instantdb">
        <jndi name="java:comp/env/jdbc/basic/entityDatabase" />
        <mapping href="conf/default.cmp_mapping.xml" />
-   </database>
+    </database>
 
     
-    This was just wrong.  We've switched it so that the "jndi" tag of a Castor
+This was just wrong.  We've switched it so that the "jndi" tag of a Castor
 database.xml file can be set directly to the global JNDI name of a
 Connector element declared in an openejb.conf file.  
     
-    {code:xml|title=cmp.global_database.xml}
-       <database name="Global_TX_Database" engine="instantdb">
-           <jndi name="java:openejb/connector/Default JDBC Database" />
-           <mapping href="conf/default.cmp_mapping.xml" />
-       </database>
+     <database name="Global_TX_Database" engine="instantdb">
+         <jndi name="java:openejb/connector/Default JDBC Database" />
+         <mapping href="conf/default.cmp_mapping.xml" />
+     </database>
 
 
 This is still not so optimal as we do not want to people using OpenEJB's

Modified: openejb/site/trunk/content/openejb-1.0.mdtext
URL: http://svn.apache.org/viewvc/openejb/site/trunk/content/openejb-1.0.mdtext?rev=1145009&r1=1145008&r2=1145009&view=diff
==============================================================================
--- openejb/site/trunk/content/openejb-1.0.mdtext (original)
+++ openejb/site/trunk/content/openejb-1.0.mdtext Mon Jul 11 02:30:12 2011
@@ -146,22 +146,20 @@ of the very first CMP accessed to grab a
 use on all requests into the CMP container.  This was configured with
 something like this:
 
-{code:xml|title=cmp.global_database.xml}
-   <database name="Global_TX_Database" engine="instantdb">
+    <database name="Global_TX_Database" engine="instantdb">
        <jndi name="java:comp/env/jdbc/basic/entityDatabase" />
        <mapping href="conf/default.cmp_mapping.xml" />
-   </database>
+    </database>
 
-    
-    This was just wrong.  We've switched it so that the "jndi" tag of a Castor
+
+This was just wrong.  We've switched it so that the "jndi" tag of a Castor
 database.xml file can be set directly to the global JNDI name of a
 Connector element declared in an openejb.conf file.
     
-    {code:xml|title=cmp.global_database.xml}
-       <database name="Global_TX_Database" engine="instantdb">
-           <jndi name="java:openejb/connector/Default JDBC Database" />
-           <mapping href="conf/default.cmp_mapping.xml" />
-       </database>
+     <database name="Global_TX_Database" engine="instantdb">
+         <jndi name="java:openejb/connector/Default JDBC Database" />
+         <mapping href="conf/default.cmp_mapping.xml" />
+     </database>
 
 
 This is still not so optimal as we do not want to people using OpenEJB's

Modified: openejb/site/trunk/content/openejb-3.0-beta-2.mdtext
URL: http://svn.apache.org/viewvc/openejb/site/trunk/content/openejb-3.0-beta-2.mdtext?rev=1145009&r1=1145008&r2=1145009&view=diff
==============================================================================
--- openejb/site/trunk/content/openejb-3.0-beta-2.mdtext (original)
+++ openejb/site/trunk/content/openejb-3.0-beta-2.mdtext Mon Jul 11 02:30:12 2011
@@ -122,7 +122,6 @@ JavaBeans PropertyEditor.  We include se
 already such as Date, InetAddress, Class, File, URL, URI, Map, List and
 more.
 
-<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>MyBean.java</B></DIV><DIV class="codeContent panelContent">
     import java.net.URI;
     import java.io.File;
     import java.util.Date;
@@ -154,7 +153,6 @@ are not container controlled resources (
 nature).  You can configure you ejbs via a properties file and skip the
 need for an ejb-jar.xml and it's 5 lines per property madness.
 
-<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>META-INF/env-entries.properties</B></DIV><DIV class="codeContent panelContent">
     blog = http://acme.org/myblog
     birthday = locale=en_US style=MEDIUM Mar 1, 1954
     homeDirectory = /home/esmith/

Modified: openejb/site/trunk/content/openejb-3.0.mdtext
URL: http://svn.apache.org/viewvc/openejb/site/trunk/content/openejb-3.0.mdtext?rev=1145009&r1=1145008&r2=1145009&view=diff
==============================================================================
--- openejb/site/trunk/content/openejb-3.0.mdtext (original)
+++ openejb/site/trunk/content/openejb-3.0.mdtext Mon Jul 11 02:30:12 2011
@@ -202,7 +202,6 @@ JavaBeans PropertyEditor.  We include se
 already such as Date, InetAddress, Class, File, URL, URI, Map, List, any
 java.lang.Enum and more.
 
-<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>MyBean.java</B></DIV><DIV class="codeContent panelContent">
     import java.net.URI;
     import java.io.File;
     import java.util.Date;
@@ -223,7 +222,6 @@ powerful.  Declare an injectable field t
 will use that information to boost your injection to the next level.  For
 example:
 
-<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>MyBean.java</B></DIV><DIV class="codeContent panelContent">
     import java.net.URI;
     import java.io.File;
     
@@ -254,12 +252,11 @@ our Pickup enum.
         // which knows how to create this object from a string.
         // You can add any of your own Property Editors in the same way.
         static {
-    	PropertyEditorManager.registerEditor(Pickup.class,
-PickupEditor.class);
+          	PropertyEditorManager.registerEditor(Pickup.class, PickupEditor.class);
         }
     }
 
-
+Reference as follows
 
     @Stateful
     public class StratocasterImpl implements Stratocaster {
@@ -288,7 +285,6 @@ are not container controlled resources (
 nature).  You can configure you ejbs via a properties file and skip the
 need for an ejb-jar.xml and it's 5 lines per property madness.
 
-<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>META-INF/env-entries.properties</B></DIV><DIV class="codeContent panelContent">
     blog = http://acme.org/myblog
     birthday = 1954-03-01
     homeDirectory = /home/esmith/
@@ -339,30 +335,21 @@ Some example output might look like the 
 some annotations to the "Movies" bean's interface as well as use the wrong
 annotations for various types of injection:
 
-{code:none}
-FAIL ... Movies:  @Stateful cannot be applied to an interface:
-org.superbiz.injection.jpa.Movies
-FAIL ... Movies:  Missing required "type" attribute on class-level
-@Resource usage
-FAIL ... Movies:  Mistaken use of @Resource on an EntityManagerFactory
-reference.  
-		  Use @PersistenceUnit for ref
-"org.superbiz.injection.jpa.MoviesImpl/entityManagerFactory"
-FAIL ... Movies:  Mistaken use of @PersistenceUnit on an EntityManager
-reference.  
-		  Use @PersistenceContext for ref
-"org.superbiz.injection.jpa.MoviesImpl/entityManager"
-WARN ... Movies:  Inoring @RolesAllowed used on interface
-org.superbiz.injection.jpa.Movies method deleteMovie.
-		  Annotation only usable on the bean class.
-WARN ... Movies:  Ignoring @TransactionAttribute used on interface
-org.superbiz.injection.jpa.Movies method addMovie.
-		  Annotation only usable on the bean class.
+    FAIL ... Movies:  @Stateful cannot be applied to an interface: org.superbiz.injection.jpa.Movies
+    FAIL ... Movies:  Missing required "type" attribute on class-level @Resource usage
+    FAIL ... Movies:  Mistaken use of @Resource on an EntityManagerFactory reference.
+                      Use @PersistenceUnit for ref "org.superbiz.injection.jpa.MoviesImpl/entityManagerFactory"
+    FAIL ... Movies:  Mistaken use of @PersistenceUnit on an EntityManager reference.
+                      Use @PersistenceContext for ref "org.superbiz.injection.jpa.MoviesImpl/entityManager"
+    WARN ... Movies:  Inoring @RolesAllowed used on interface org.superbiz.injection.jpa.Movies method deleteMovie.
+                      Annotation only usable on the bean class.
+    WARN ... Movies:  Ignoring @TransactionAttribute used on interface org.superbiz.injection.jpa.Movies method addMovie.
+                      Annotation only usable on the bean class.
 
     
 ## JNDI Name Formatting
     
-    A complication when using EJB is that plain client applications are at the
+A complication when using EJB is that plain client applications are at the
 mercy of vendor's chosen methodology for how JNDI names should be
 constructed.  OpenEJB breaks the mold by allowing you to [specify the exact format|OPENEJBx30:JNDI Names]
  you'd like OpenEJB to use for your server or any individual application. 

Modified: openejb/site/trunk/content/openejb-3.1.1.mdtext
URL: http://svn.apache.org/viewvc/openejb/site/trunk/content/openejb-3.1.1.mdtext?rev=1145009&r1=1145008&r2=1145009&view=diff
==============================================================================
--- openejb/site/trunk/content/openejb-3.1.1.mdtext (original)
+++ openejb/site/trunk/content/openejb-3.1.1.mdtext Mon Jul 11 02:30:12 2011
@@ -128,8 +128,7 @@ you can simply:
 
 
     Properties p = new Properties();
-    p.put(Context.INITIAL_CONTEXT_FACTORY,
-"org.apache.openejb.client.LocalInitialContextFactory");
+    p.put(Context.INITIAL_CONTEXT_FACTORY, "org.apache.openejb.client.LocalInitialContextFactory");
     p.put("movieDatabase", "new://Resource?type=DataSource");
     p.put("movieDatabase.JdbcDriver", "org.hsqldb.jdbcDriver");
     p.put("movieDatabase.JdbcUrl", "jdbc:hsqldb:mem:moviedb");
@@ -178,17 +177,17 @@ as well.
         private final DataSource ds;
     
         public WidgetBean(Integer count, Foo foo, DataSource ds) {
-    	this.count = count;
-    	this.foo = foo;
-    	this.ds = ds;
+            this.count = count;
+            this.foo = foo;
+            this.ds = ds;
         }
     
         public int getCount() {
-    	return count;
+          	return count;
         }
     
         public Foo getFoo() {
-    	return foo;
+    	      return foo;
         }
     }
 
@@ -268,8 +267,7 @@ as follows:
 
 
     Properties p = new Properties();
-    p.put("java.naming.factory.initial",
-"org.apache.openejb.client.RemoteInitialContextFactory");
+    p.put("java.naming.factory.initial", "org.apache.openejb.client.RemoteInitialContextFactory");
     p.put("java.naming.provider.url", "multicast://239.255.3.2:6142");
     InitialContext ctx = new InitialContext(p);
 
@@ -309,7 +307,7 @@ a JavaBeans PropertyEditor.  We include 
 already such as Date, InetAddress, Class, File, URL, URI, Map, List, any
 java.lang.Enum and more.
 
-<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>MyBean.java</B></DIV><DIV class="codeContent panelContent">
+
     import java.net.URI;
     import java.io.File;
     import java.util.Date;
@@ -330,7 +328,6 @@ powerful.  Declare an injectable field t
 will use that information to boost your injection to the next level.  For
 example:
 
-<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>MyBean.java</B></DIV><DIV class="codeContent panelContent">
     import java.net.URI;
     import java.io.File;
     
@@ -361,12 +358,11 @@ our Pickup enum.
         // which knows how to create this object from a string.
         // You can add any of your own Property Editors in the same way.
         static {
-    	PropertyEditorManager.registerEditor(Pickup.class,
-PickupEditor.class);
+    	      PropertyEditorManager.registerEditor(Pickup.class, PickupEditor.class);
         }
     }
 
-
+And referenced as follows
 
     @Stateful
     public class StratocasterImpl implements Stratocaster {
@@ -395,7 +391,8 @@ are not container controlled resources (
 nature).  You can configure you ejbs via a properties file and skip the
 need for an ejb-jar.xml and it's 5 lines per property madness.
 
-<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>META-INF/env-entries.properties</B></DIV><DIV class="codeContent panelContent">
+META-INF/env-entries.properties
+
     blog = http://acme.org/myblog
     birthday = 1954-03-01
     homeDirectory = /home/esmith/
@@ -446,33 +443,23 @@ Some example output might look like the 
 some annotations to the "Movies" bean's interface as well as use the wrong
 annotations for various types of injection:
 
-{code:none}
-FAIL ... Movies:  @Stateful cannot be applied to an interface:
-org.superbiz.injection.jpa.Movies
-FAIL ... Movies:  Missing required "type" attribute on class-level
-@Resource usage
-FAIL ... Movies:  Mistaken use of @Resource on an EntityManagerFactory
-reference.  
-		  Use @PersistenceUnit for ref
-"org.superbiz.injection.jpa.MoviesImpl/entityManagerFactory"
-FAIL ... Movies:  Mistaken use of @PersistenceUnit on an EntityManager
-reference.  
-		  Use @PersistenceContext for ref
-"org.superbiz.injection.jpa.MoviesImpl/entityManager"
-WARN ... Movies:  Inoring @RolesAllowed used on interface
-org.superbiz.injection.jpa.Movies method deleteMovie.
-		  Annotation only usable on the bean class.
-WARN ... Movies:  Ignoring @TransactionAttribute used on interface
-org.superbiz.injection.jpa.Movies method addMovie.
-		  Annotation only usable on the bean class.
-
+    FAIL ... Movies:  @Stateful cannot be applied to an interface: org.superbiz.injection.jpa.Movies
+    FAIL ... Movies:  Missing required "type" attribute on class-level @Resource usage
+    FAIL ... Movies:  Mistaken use of @Resource on an EntityManagerFactory reference.
+                      Use @PersistenceUnit for ref "org.superbiz.injection.jpa.MoviesImpl/entityManagerFactory"
+    FAIL ... Movies:  Mistaken use of @PersistenceUnit on an EntityManager reference.
+                      Use @PersistenceContext for ref "org.superbiz.injection.jpa.MoviesImpl/entityManager"
+    WARN ... Movies:  Inoring @RolesAllowed used on interface org.superbiz.injection.jpa.Movies method deleteMovie.
+                      Annotation only usable on the bean class.
+    WARN ... Movies:  Ignoring @TransactionAttribute used on interface org.superbiz.injection.jpa.Movies method addMovie.
+                      Annotation only usable on the bean class.
     
 ## JNDI Name Formatting
     
-    A complication when using EJB is that plain client applications are at the
+A complication when using EJB is that plain client applications are at the
 mercy of vendor's chosen methodology for how JNDI names should be
 constructed.  OpenEJB breaks the mold by allowing you to [specify the exact format|OPENEJBx30:JNDI Names]
- you'd like OpenEJB to use for your server or any individual application. 
+you'd like OpenEJB to use for your server or any individual application.
 Supply us with a formatting string, such as
 "ejb/\{ejbName}/\{interfaceClass.simpleName}", to get a JNDI layout that
 best matches your needs.

Modified: openejb/site/trunk/content/openejb-3.1.mdtext
URL: http://svn.apache.org/viewvc/openejb/site/trunk/content/openejb-3.1.mdtext?rev=1145009&r1=1145008&r2=1145009&view=diff
==============================================================================
--- openejb/site/trunk/content/openejb-3.1.mdtext (original)
+++ openejb/site/trunk/content/openejb-3.1.mdtext Mon Jul 11 02:30:12 2011
@@ -314,7 +314,6 @@ JavaBeans PropertyEditor.  We include se
 already such as Date, InetAddress, Class, File, URL, URI, Map, List, any
 java.lang.Enum and more.
 
-<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>MyBean.java</B></DIV><DIV class="codeContent panelContent">
     import java.net.URI;
     import java.io.File;
     import java.util.Date;
@@ -335,7 +334,6 @@ powerful.  Declare an injectable field t
 will use that information to boost your injection to the next level.  For
 example:
 
-<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>MyBean.java</B></DIV><DIV class="codeContent panelContent">
     import java.net.URI;
     import java.io.File;
     
@@ -400,7 +398,6 @@ are not container controlled resources (
 nature).  You can configure you ejbs via a properties file and skip the
 need for an ejb-jar.xml and it's 5 lines per property madness.
 
-<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>META-INF/env-entries.properties</B></DIV><DIV class="codeContent panelContent">
     blog = http://acme.org/myblog
     birthday = 1954-03-01
     homeDirectory = /home/esmith/
@@ -451,33 +448,24 @@ Some example output might look like the 
 some annotations to the "Movies" bean's interface as well as use the wrong
 annotations for various types of injection:
 
-{code:none}
-FAIL ... Movies:  @Stateful cannot be applied to an interface:
-org.superbiz.injection.jpa.Movies
-FAIL ... Movies:  Missing required "type" attribute on class-level
-@Resource usage
-FAIL ... Movies:  Mistaken use of @Resource on an EntityManagerFactory
-reference.  
-		  Use @PersistenceUnit for ref
-"org.superbiz.injection.jpa.MoviesImpl/entityManagerFactory"
-FAIL ... Movies:  Mistaken use of @PersistenceUnit on an EntityManager
-reference.  
-		  Use @PersistenceContext for ref
-"org.superbiz.injection.jpa.MoviesImpl/entityManager"
-WARN ... Movies:  Inoring @RolesAllowed used on interface
-org.superbiz.injection.jpa.Movies method deleteMovie.
-		  Annotation only usable on the bean class.
-WARN ... Movies:  Ignoring @TransactionAttribute used on interface
-org.superbiz.injection.jpa.Movies method addMovie.
-		  Annotation only usable on the bean class.
+    FAIL ... Movies:  @Stateful cannot be applied to an interface: org.superbiz.injection.jpa.Movies
+    FAIL ... Movies:  Missing required "type" attribute on class-level @Resource usage
+    FAIL ... Movies:  Mistaken use of @Resource on an EntityManagerFactory reference.
+                      Use @PersistenceUnit for ref "org.superbiz.injection.jpa.MoviesImpl/entityManagerFactory"
+    FAIL ... Movies:  Mistaken use of @PersistenceUnit on an EntityManager reference.
+                      Use @PersistenceContext for ref "org.superbiz.injection.jpa.MoviesImpl/entityManager"
+    WARN ... Movies:  Inoring @RolesAllowed used on interface org.superbiz.injection.jpa.Movies method deleteMovie.
+                      Annotation only usable on the bean class.
+    WARN ... Movies:  Ignoring @TransactionAttribute used on interface org.superbiz.injection.jpa.Movies method addMovie.
+                      Annotation only usable on the bean class.
 
     
 ## JNDI Name Formatting
     
-    A complication when using EJB is that plain client applications are at the
+A complication when using EJB is that plain client applications are at the
 mercy of vendor's chosen methodology for how JNDI names should be
 constructed.  OpenEJB breaks the mold by allowing you to [specify the exact format|OPENEJBx30:JNDI Names]
- you'd like OpenEJB to use for your server or any individual application. 
+you'd like OpenEJB to use for your server or any individual application.
 Supply us with a formatting string, such as
 "ejb/\{ejbName}/\{interfaceClass.simpleName}", to get a JNDI layout that
 best matches your needs.

Modified: openejb/site/trunk/content/openejb-binaries.mdtext
URL: http://svn.apache.org/viewvc/openejb/site/trunk/content/openejb-binaries.mdtext?rev=1145009&r1=1145008&r2=1145009&view=diff
==============================================================================
--- openejb/site/trunk/content/openejb-binaries.mdtext (original)
+++ openejb/site/trunk/content/openejb-binaries.mdtext Mon Jul 11 02:30:12 2011
@@ -2,25 +2,23 @@ Title: OpenEJB Binaries
 Add this to your *$HOME/.m2/settings.xml* to enable publishing to the
 Apache Nexus repo.  This works for snapshots or staging final binaries.
 
-{code:xml|title=.m2/settings.xml}
-<settings>
-  <servers>
-    <server>
-      <id>apache.snapshots.https</id>
-      <username>yourapacheid</username>
-      <password>yourapachepass</password>
-    </server>
-    <server>
-      <id>apache.releases.https</id>
-      <username>yourapacheid</username>
-      <password>yourapachepass</password>
-    </server>
-  </servers>
-</settings>
+    <settings>
+      <servers>
+        <server>
+          <id>apache.snapshots.https</id>
+          <username>yourapacheid</username>
+          <password>yourapachepass</password>
+        </server>
+        <server>
+          <id>apache.releases.https</id>
+          <username>yourapacheid</username>
+          <password>yourapachepass</password>
+        </server>
+      </servers>
+    </settings>
 
     
-    Then publish via:
-    
+Then publish via:
 
-$ mvn clean deploy
+    $ mvn clean deploy
 

Modified: openejb/site/trunk/content/openjpa.mdtext
URL: http://svn.apache.org/viewvc/openejb/site/trunk/content/openjpa.mdtext?rev=1145009&r1=1145008&r2=1145009&view=diff
==============================================================================
--- openejb/site/trunk/content/openjpa.mdtext (original)
+++ openejb/site/trunk/content/openjpa.mdtext Mon Jul 11 02:30:12 2011
@@ -3,25 +3,23 @@ OpenJPA is bundled with OpenEJB as the d
 
 An example of  working persistence.xml for OpenJPA:
 
-{code:xml|title=persistence.xml}
-<persistence xmlns="http://java.sun.com/xml/ns/persistence" version="1.0">
-
-  <persistence-unit name="movie-unit">
-    <jta-data-source>movieDatabase</jta-data-source>
-    <non-jta-data-source>movieDatabaseUnmanaged</non-jta-data-source>
-    <class>org.superbiz.injection.jpa.Movie</class>
+    <persistence xmlns="http://java.sun.com/xml/ns/persistence" version="1.0">
 
-    <properties>
-      <property name="openjpa.jdbc.SynchronizeMappings"
-value="buildSchema(ForeignKeys=true)"/>
-    </properties>
-  </persistence-unit>
-</persistence>
+      <persistence-unit name="movie-unit">
+        <jta-data-source>movieDatabase</jta-data-source>
+        <non-jta-data-source>movieDatabaseUnmanaged</non-jta-data-source>
+        <class>org.superbiz.injection.jpa.Movie</class>
+
+        <properties>
+          <property name="openjpa.jdbc.SynchronizeMappings"
+    value="buildSchema(ForeignKeys=true)"/>
+        </properties>
+      </persistence-unit>
+    </persistence>
 
     
-    Where the datasources above are configured in your openejb.xml as follows:
+Where the datasources above are configured in your openejb.xml as follows:
     
-    {code:xml|title=openejb.xml}
     <Resource id="movieDatabase" type="DataSource">
       JdbcDriver = org.hsqldb.jdbcDriver
       JdbcUrl = jdbc:hsqldb:mem:moviedb
@@ -36,37 +34,34 @@ value="buildSchema(ForeignKeys=true)"/>
 
 Or in properties as follows:
 
-{code:xml|title=java.lang.System or InitialContext properties}
-p.put("movieDatabase", "new://Resource?type=DataSource");
-p.put("movieDatabase.JdbcDriver", "org.hsqldb.jdbcDriver");
-p.put("movieDatabase.JdbcUrl", "jdbc:hsqldb:mem:moviedb");
-
-p.put("movieDatabaseUnmanaged", "new://Resource?type=DataSource");
-p.put("movieDatabaseUnmanaged.JdbcDriver", "org.hsqldb.jdbcDriver");
-p.put("movieDatabaseUnmanaged.JdbcUrl", "jdbc:hsqldb:mem:moviedb");
-p.put("movieDatabaseUnmanaged.JtaManaged", "false");
+    p.put("movieDatabase", "new://Resource?type=DataSource");
+    p.put("movieDatabase.JdbcDriver", "org.hsqldb.jdbcDriver");
+    p.put("movieDatabase.JdbcUrl", "jdbc:hsqldb:mem:moviedb");
+
+    p.put("movieDatabaseUnmanaged", "new://Resource?type=DataSource");
+    p.put("movieDatabaseUnmanaged.JdbcDriver", "org.hsqldb.jdbcDriver");
+    p.put("movieDatabaseUnmanaged.JdbcUrl", "jdbc:hsqldb:mem:moviedb");
+    p.put("movieDatabaseUnmanaged.JtaManaged", "false");
 
     
 # Common exceptions
     
 ## Table not found in statement
     
-    Or as derby will report it "Table 'abc.xyz' doesn't exist"
+Or as derby will report it "Table 'abc.xyz' doesn't exist"
     
-    Someone has to create the database structure for your persistent objects. 
+Someone has to create the database structure for your persistent objects.
 If you add the *openjpa.jdbc.SynchronizeMappings* property as shown below
 OpenJPA will auto-create all your tables, all your primary keys and all
 foreign keys exactly to match your objects.
     
-    {code:xml|title=persistence.xml}
     <persistence xmlns="http://java.sun.com/xml/ns/persistence" version="1.0">
     
      <persistence-unit name="movie-unit">
        <!-- your other stuff -->
     
        <properties>
-         <property name="openjpa.jdbc.SynchronizeMappings"
-value="buildSchema(ForeignKeys=true)"/>
+         <property name="openjpa.jdbc.SynchronizeMappings" value="buildSchema(ForeignKeys=true)"/>
        </properties>
      </persistence-unit>
     </persistence>
@@ -82,22 +77,21 @@ Pending
 
 <a name="OpenJPA-Setup"></a>
 ### Setup
+
 Using a EXTENDED persistence context ...
-<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>bean code</B></DIV><DIV class="codeContent panelContent">
-    @PersistenceContext(unitName = "movie-unit", type =
-PersistenceContextType.EXTENDED)
-    EntityManager entityManager;
 
+    @PersistenceContext(unitName = "movie-unit", type = PersistenceContextType.EXTENDED)
+    EntityManager entityManager;
 
 on a persistence unit setup as RESOURCE_LOCAL ...
-{code:xml|title=persistence.xml}
-<persistence-unit name="movie-unit" transaction-type="RESOURCE_LOCAL">
-  ...
-</persistence-unit>
+
+    <persistence-unit name="movie-unit" transaction-type="RESOURCE_LOCAL">
+      ...
+    </persistence-unit>
 
     
-    inside of a transaction.
-    {code:title=bean code}
+inside of a transaction.
+
     @TransactionAttribute(TransactionAttributeType.REQUIRED)
     public void addMovie(Movie movie) throws Exception {
         entityManager.persist(movie);

Modified: openejb/site/trunk/content/persistence-context.mdtext
URL: http://svn.apache.org/viewvc/openejb/site/trunk/content/persistence-context.mdtext?rev=1145009&r1=1145008&r2=1145009&view=diff
==============================================================================
--- openejb/site/trunk/content/persistence-context.mdtext (original)
+++ openejb/site/trunk/content/persistence-context.mdtext Mon Jul 11 02:30:12 2011
@@ -3,33 +3,29 @@ Title: persistence-context
 #  Via annotation
 
 Both lookup and injection of an EntityManager can be configured via the
-@PersistenceContext annotation.
+`@PersistenceContext` annotation.
 
-<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;
-    
+
     import javax.persistence.PersistenceContext;
     import javax.persistence.EntityManager;
     import javax.ejb.Stateless;
     import javax.naming.InitialContext;
-    
+
     @Stateless
     @PersistenceContext(name = "myFooEntityManager", unitName = "foo-unit")
     public class MyBean implements MyInterface {
-    
+
         @PersistenceContext(unitName = "bar-unit")
         private EntityManager myBarEntityManager;
-    
+
         public void someBusinessMethod() throws Exception {
-    	if (myBarEntityManager == null) throw new
-NullPointerException("myBarEntityManager not injected");
-    
-    	// Both can be looked up from JNDI as well
-    	InitialContext context = new InitialContext();
-    	EntityManager fooEntityManager = (EntityManager)
-context.lookup("java:comp/env/myFooEntityManager");
-    	EntityManager barEntityManager = (EntityManager)
-context.lookup("java:comp/env/org.superbiz.MyBean/myBarEntityManager");
+            if (myBarEntityManager == null) throw new NullPointerException("myBarEntityManager not injected");
+
+            // Both can be looked up from JNDI as well
+            InitialContext context = new InitialContext();
+            EntityManager fooEntityManager = (EntityManager) context.lookup("java:comp/env/myFooEntityManager");
+            EntityManager barEntityManager = (EntityManager) context.lookup("java:comp/env/org.superbiz.MyBean/myBarEntityManager");
         }
     }
 
@@ -40,22 +36,19 @@ context.lookup("java:comp/env/org.superb
 The above @PersistenceContext annotation usage is 100% equivalent to the
 following xml.
 
-{code:xml|title=ejb-jar.xml or web.xml}
-<persistence-context-ref>
-   
-<persistence-context-ref-name>myFooEntityManager</persistence-context-ref-name>
-    <persistence-unit-name>foo-unit</persistence-unit-name>
-    <persistence-context-type>Transaction</persistence-context-type>
-</persistence-context-ref>
-<persistence-context-ref>
-   
-<persistence-context-ref-name>org.superbiz.calculator.MyBean/myBarEntityManager</persistence-context-ref-name>
-    <persistence-unit-name>bar-unit</persistence-unit-name>
-    <persistence-context-type>Transaction</persistence-context-type>
-    <injection-target>
-       
-<injection-target-class>org.superbiz.calculator.MyBean</injection-target-class>
-	<injection-target-name>myBarEntityManager</injection-target-name>
-    </injection-target>
-</persistence-context-ref>
+    <persistence-context-ref>
+        <persistence-context-ref-name>myFooEntityManager</persistence-context-ref-name>
+        <persistence-unit-name>foo-unit</persistence-unit-name>
+        <persistence-context-type>Transaction</persistence-context-type>
+    </persistence-context-ref>
+
+    <persistence-context-ref>
+        <persistence-context-ref-name>org.superbiz.calculator.MyBean/myBarEntityManager</persistence-context-ref-name>
+        <persistence-unit-name>bar-unit</persistence-unit-name>
+        <persistence-context-type>Transaction</persistence-context-type>
+        <injection-target>
+            <injection-target-class>org.superbiz.calculator.MyBean</injection-target-class>
+            <injection-target-name>myBarEntityManager</injection-target-name>
+        </injection-target>
+    </persistence-context-ref>
 

Modified: openejb/site/trunk/content/persistence-unit-ref.mdtext
URL: http://svn.apache.org/viewvc/openejb/site/trunk/content/persistence-unit-ref.mdtext?rev=1145009&r1=1145008&r2=1145009&view=diff
==============================================================================
--- openejb/site/trunk/content/persistence-unit-ref.mdtext (original)
+++ openejb/site/trunk/content/persistence-unit-ref.mdtext Mon Jul 11 02:30:12 2011
@@ -9,29 +9,25 @@ Annotations and xml have equal function 
 <a name="persistence-unit-ref-Viaannotation"></a>
 ##  Via annotation
 
-<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;
-    
+
     import javax.persistence.PersistenceUnit;
     import javax.persistence.EntityManagerFactory;
     import javax.ejb.Stateless;
     import javax.naming.InitialUnit;
-    
+
     @Stateless
     public class MyBean implements MyInterface {
-    
+
         @PersistenceUnit(unitName = "bar-unit")
         private EntityManagerFactory myBarEntityManagerFactory;
-    
+
         public void someBusinessMethod() throws Exception {
-    	if (myBarEntityManagerFactory == null) throw new
-NullPointerException("myBarEntityManagerFactory not injected");
-    
-    	// Both can be looked up from JNDI as well
-    	InitialContext unit = new InitialContext();
-    	EntityManagerFactory barEntityManagerFactory =
-(EntityManagerFactory)
-context.lookup("java:comp/env/org.superbiz.MyBean/myBarEntityManagerFactory");
+            if (myBarEntityManagerFactory == null) throw new NullPointerException("myBarEntityManagerFactory not injected");
+
+            // Both can be looked up from JNDI as well
+            InitialContext unit = new InitialContext();
+            EntityManagerFactory barEntityManagerFactory = (EntityManagerFactory) context.lookup("java:comp/env/org.superbiz.MyBean/myBarEntityManagerFactory");
         }
     }
 
@@ -42,19 +38,15 @@ context.lookup("java:comp/env/org.superb
 The above @PersistenceUnit annotation usage is 100% equivalent to the
 following xml.
 
-{code:xml|title=ejb-jar.xml or web.xml}
-<persistence-unit-ref>
-   
-<persistence-unit-ref-name>org.superbiz.calculator.MyBean/myBarEntityManagerFactory</persistence-unit-ref-name>
-    <persistence-unit-name>bar-unit</persistence-unit-name>
-    <persistence-unit-type>Transaction</persistence-unit-type>
-    <injection-target>
-       
-<injection-target-class>org.superbiz.calculator.MyBean</injection-target-class>
-       
-<injection-target-name>myBarEntityManagerFactory</injection-target-name>
-    </injection-target>
-</persistence-unit-ref>
+    <persistence-unit-ref>
+        <persistence-unit-ref-name>org.superbiz.calculator.MyBean/myBarEntityManagerFactory</persistence-unit-ref-name>
+        <persistence-unit-name>bar-unit</persistence-unit-name>
+        <persistence-unit-type>Transaction</persistence-unit-type>
+        <injection-target>
+            <injection-target-class>org.superbiz.calculator.MyBean</injection-target-class>
+            <injection-target-name>myBarEntityManagerFactory</injection-target-name>
+        </injection-target>
+    </persistence-unit-ref>
 
     
     
@@ -62,23 +54,20 @@ following xml.
     
 ##  Via annotation
     
-    {code:title=Usable by EJB, Interceptor, Servlet, Filter, or Listener}
     package org.superbiz;
-    
+
     import javax.persistence.PersistenceUnit;
     import javax.persistence.EntityManagerFactory;
     import javax.ejb.Stateless;
     import javax.naming.InitialUnit;
-    
+
     @Stateless
     @PersistenceUnit(name = "myFooEntityManagerFactory", unitName = "foo-unit")
     public class MyBean implements MyInterface {
-    
+
         public void someBusinessMethod() throws Exception {
-    	InitialContext context = new InitialContext();
-    	EntityManagerFactory fooEntityManagerFactory =
-(EntityManagerFactory)
-context.lookup("java:comp/env/myFooEntityManagerFactory");
+            InitialContext context = new InitialContext();
+            EntityManagerFactory fooEntityManagerFactory = (EntityManagerFactory) context.lookup("java:comp/env/myFooEntityManagerFactory");
         }
     }
 
@@ -89,12 +78,10 @@ context.lookup("java:comp/env/myFooEntit
 The above @PersistenceUnit annotation usage is 100% equivalent to the
 following xml.
 
-{code:xml|title=ejb-jar.xml or web.xml}
-<persistence-unit-ref>
-   
-<persistence-unit-ref-name>myFooEntityManagerFactory</persistence-unit-ref-name>
-    <persistence-unit-name>foo-unit</persistence-unit-name>
-    <persistence-unit-type>Transaction</persistence-unit-type>
-</persistence-unit-ref>
+    <persistence-unit-ref>
+        <persistence-unit-ref-name>myFooEntityManagerFactory</persistence-unit-ref-name>
+        <persistence-unit-name>foo-unit</persistence-unit-name>
+        <persistence-unit-type>Transaction</persistence-unit-type>
+    </persistence-unit-ref>
 
     

Modified: openejb/site/trunk/content/properties-tool.mdtext
URL: http://svn.apache.org/viewvc/openejb/site/trunk/content/properties-tool.mdtext?rev=1145009&r1=1145008&r2=1145009&view=diff
==============================================================================
--- openejb/site/trunk/content/properties-tool.mdtext (original)
+++ openejb/site/trunk/content/properties-tool.mdtext Mon Jul 11 02:30:12 2011
@@ -28,11 +28,11 @@ if you reapply them back into conf/opene
 Any component configured in OpenEJB via the openejb.xml (and some that
 aren't) can be overridden using system properties.  The format is:
 
-<id>.<property-name>=<property-value>
+`<id>.<property-name>=<property-value>`
 
 And this can be done on the command line as follows:
 
-./bin/openejb -D<id>.<property-name>=<property-value> ...
+`./bin/openejb -D<id>.<property-name>=<property-value> ...`
 
 Or by adding the property to the conf/system.properties file.  Note that
 command line overrides win over overrides in the
@@ -50,157 +50,163 @@ new property value before constructing t
 <a name="PropertiesTool-Exampleoutput"></a>
 # Example output
 
-{code:none}
-1. Container(id=Default CMP Container)
-1. className: org.apache.openejb.core.cmp.CmpContainer
-1. Default\ CMP\
-Container.CmpEngineFactory=org.apache.openejb.core.cmp.jpa.JpaCmpEngineFactory
-Default\ CMP\ Container.Engine=instantdb
-Default\ CMP\ Container.ConnectorName=Default JDBC Database
-
-1. Container(id=Default BMP Container)
-1. className: org.apache.openejb.core.entity.EntityContainer
-1. Default\ BMP\ Container.PoolSize=10
-
-1. Container(id=Default Stateful Container)
-1. className: org.apache.openejb.core.stateful.StatefulContainer
-1. Default\ Stateful\ Container.BulkPassivate=50
-Default\ Stateful\
-Container.Passivator=org.apache.openejb.core.stateful.SimplePassivater
-Default\ Stateful\ Container.TimeOut=20
-Default\ Stateful\ Container.PoolSize=500
-
-1. Container(id=Default Stateless Container)
-1. className: org.apache.openejb.core.stateless.StatelessContainer
-1. Default\ Stateless\ Container.PoolSize=10
-Default\ Stateless\ Container.StrictPooling=true
-Default\ Stateless\ Container.TimeOut=0
-
-1. Container(id=Default MDB Container)
-1. className: org.apache.openejb.core.mdb.MdbContainer
-1. Default\ MDB\ Container.ResourceAdapter=Default JMS Resource Adapter
-Default\ MDB\ Container.InstanceLimit=10
-Default\ MDB\ Container.MessageListenerInterface=javax.jms.MessageListener
-Default\ MDB\
-Container.ActivationSpecClass=org.apache.activemq.ra.ActiveMQActivationSpec
-
-1. ConnectionManager(id=Default Local TX ConnectionManager)
-1. className: org.apache.openejb.resource.SharedLocalConnectionManager
-1. 
-1. Resource(id=Default JMS Resource Adapter)
-1. className: org.apache.activemq.ra.ActiveMQResourceAdapter
-1. Default\ JMS\ Resource\ Adapter.ServerUrl=vm\://localhost?async\=true
-Default\ JMS\ Resource\
-Adapter.BrokerXmlConfig=broker\:(tcp\://localhost\:61616)
-Default\ JMS\ Resource\ Adapter.ThreadPoolSize=30
-
-1. Resource(id=Default JDBC Database)
-1. className: org.apache.openejb.resource.jdbc.BasicManagedDataSource
-1. Default\ JDBC\ Database.MinIdle=0
-Default\ JDBC\ Database.Password=xxxx
-Default\ JDBC\ Database.JdbcUrl=jdbc\:hsqldb\:file\:hsqldb
-Default\ JDBC\ Database.MaxIdle=20
-Default\ JDBC\ Database.ConnectionProperties=
-Default\ JDBC\ Database.MaxWait=-1
-Default\ JDBC\ Database.TimeBetweenEvictionRunsMillis=-1
-Default\ JDBC\ Database.MaxActive=20
-Default\ JDBC\ Database.DefaultAutoCommit=true
-Default\ JDBC\ Database.AccessToUnderlyingConnectionAllowed=false
-Default\ JDBC\ Database.JdbcDriver=org.hsqldb.jdbcDriver
-Default\ JDBC\ Database.TestWhileIdle=false
-Default\ JDBC\ Database.UserName=sa
-Default\ JDBC\ Database.MaxOpenPreparedStatements=0
-Default\ JDBC\ Database.TestOnBorrow=true
-Default\ JDBC\ Database.PoolPreparedStatements=false
-Default\ JDBC\ Database.ConnectionInterface=javax.sql.DataSource
-Default\ JDBC\ Database.TestOnReturn=false
-Default\ JDBC\ Database.MinEvictableIdleTimeMillis=1800000
-Default\ JDBC\ Database.NumTestsPerEvictionRun=3
-Default\ JDBC\ Database.InitialSize=0
-
-1. Resource(id=Default Unmanaged JDBC Database)
-1. className: org.apache.openejb.resource.jdbc.BasicDataSource
-1. Default\ Unmanaged\ JDBC\ Database.MaxWait=-1
-Default\ Unmanaged\ JDBC\ Database.InitialSize=0
-Default\ Unmanaged\ JDBC\ Database.DefaultAutoCommit=true
-Default\ Unmanaged\ JDBC\ Database.ConnectionProperties=
-Default\ Unmanaged\ JDBC\ Database.MaxActive=10
-Default\ Unmanaged\ JDBC\ Database.TestOnBorrow=true
-Default\ Unmanaged\ JDBC\ Database.JdbcUrl=jdbc\:hsqldb\:file\:hsqldb
-Default\ Unmanaged\ JDBC\ Database.TestOnReturn=false
-Default\ Unmanaged\ JDBC\
-Database.AccessToUnderlyingConnectionAllowed=false
-Default\ Unmanaged\ JDBC\ Database.Password=xxxx
-Default\ Unmanaged\ JDBC\ Database.MinEvictableIdleTimeMillis=1800000
-Default\ Unmanaged\ JDBC\ Database.PoolPreparedStatements=false
-Default\ Unmanaged\ JDBC\ Database.MaxOpenPreparedStatements=0
-Default\ Unmanaged\ JDBC\ Database.ConnectionInterface=javax.sql.DataSource
-Default\ Unmanaged\ JDBC\ Database.MinIdle=0
-Default\ Unmanaged\ JDBC\ Database.NumTestsPerEvictionRun=3
-Default\ Unmanaged\ JDBC\ Database.TimeBetweenEvictionRunsMillis=-1
-Default\ Unmanaged\ JDBC\ Database.JdbcDriver=org.hsqldb.jdbcDriver
-Default\ Unmanaged\ JDBC\ Database.UserName=sa
-Default\ Unmanaged\ JDBC\ Database.MaxIdle=10
-Default\ Unmanaged\ JDBC\ Database.TestWhileIdle=false
-
-1. Resource(id=Default JMS Connection Factory)
-1. className: org.apache.activemq.ra.ActiveMQManagedConnectionFactory
-1. Default\ JMS\ Connection\
-Factory.ConnectionInterface=javax.jms.ConnectionFactory, \
-javax.jms.QueueConnectionFactory, javax.jms.TopicConnectionFactory
-Default\ JMS\ Connection\ Factory.ResourceAdapter=Default JMS Resource
-Adapter
-
-1. SecurityService(id=Default Security Service)
-1. className: org.apache.openejb.core.security.SecurityServiceImpl
-1. 
-1. TransactionManager(id=Default Transaction Manager)
-1. className:
-org.apache.geronimo.transaction.manager.GeronimoTransactionManager
-1. 
-1. ServerService(id=httpejbd)
-1. className: org.apache.openejb.server.httpd.HttpEjbServer
-1. httpejbd.port=4204
-httpejbd.name=httpejbd
-httpejbd.disabled=false
-httpejbd.server=org.apache.openejb.server.httpd.HttpEjbServer
-httpejbd.threads=200
-httpejbd.bind=127.0.0.1
-
-1. ServerService(id=telnet)
-1. className: org.apache.openejb.server.telnet.TelnetServer
-1. telnet.port=4202
-telnet.name=telnet
-telnet.disabled=false
-telnet.bind=127.0.0.1
-telnet.threads=5
-telnet.server=org.apache.openejb.server.telnet.TelnetServer
-
-1. ServerService(id=ejbd)
-1. className: org.apache.openejb.server.ejbd.EjbServer
-1. ejbd.disabled=false
-ejbd.bind=127.0.0.1
-ejbd.server=org.apache.openejb.server.ejbd.EjbServer
-ejbd.port=4201
-ejbd.name=ejbd
-ejbd.threads=200
-
-1. ServerService(id=hsql)
-1. className: org.apache.openejb.server.hsql.HsqlService
-1. hsql.port=9001
-hsql.name=hsql
-hsql.disabled=false
-hsql.server=org.apache.openejb.server.hsql.HsqlService
-hsql.bind=127.0.0.1
-
-1. ServerService(id=admin)
-1. className: org.apache.openejb.server.admin.AdminDaemon
-1. admin.disabled=false
-admin.bind=127.0.0.1
-admin.only_from=localhost
-admin.port=4200
-admin.threads=1
-admin.name=admin
-admin.server=org.apache.openejb.server.admin.AdminDaemon
-
-    
+    # Container(id=Default CMP Container)
+    # className: org.apache.openejb.core.cmp.CmpContainer
+    #
+    Default\ CMP\ Container.CmpEngineFactory=org.apache.openejb.core.cmp.jpa.JpaCmpEngineFactory
+    Default\ CMP\ Container.Engine=instantdb
+    Default\ CMP\ Container.ConnectorName=Default JDBC Database
+
+    # Container(id=Default BMP Container)
+    # className: org.apache.openejb.core.entity.EntityContainer
+    #
+    Default\ BMP\ Container.PoolSize=10
+
+    # Container(id=Default Stateful Container)
+    # className: org.apache.openejb.core.stateful.StatefulContainer
+    #
+    Default\ Stateful\ Container.BulkPassivate=50
+    Default\ Stateful\ Container.Passivator=org.apache.openejb.core.stateful.SimplePassivater
+    Default\ Stateful\ Container.TimeOut=20
+    Default\ Stateful\ Container.PoolSize=500
+
+    # Container(id=Default Stateless Container)
+    # className: org.apache.openejb.core.stateless.StatelessContainer
+    #
+    Default\ Stateless\ Container.PoolSize=10
+    Default\ Stateless\ Container.StrictPooling=true
+    Default\ Stateless\ Container.TimeOut=0
+
+    # Container(id=Default MDB Container)
+    # className: org.apache.openejb.core.mdb.MdbContainer
+    #
+    Default\ MDB\ Container.ResourceAdapter=Default JMS Resource Adapter
+    Default\ MDB\ Container.InstanceLimit=10
+    Default\ MDB\ Container.MessageListenerInterface=javax.jms.MessageListener
+    Default\ MDB\ Container.ActivationSpecClass=org.apache.activemq.ra.ActiveMQActivationSpec
+
+    # ConnectionManager(id=Default Local TX ConnectionManager)
+    # className: org.apache.openejb.resource.SharedLocalConnectionManager
+    #
+
+    # Resource(id=Default JMS Resource Adapter)
+    # className: org.apache.activemq.ra.ActiveMQResourceAdapter
+    #
+    Default\ JMS\ Resource\ Adapter.ServerUrl=vm\://localhost?async\=true
+    Default\ JMS\ Resource\ Adapter.BrokerXmlConfig=broker\:(tcp\://localhost\:61616)
+    Default\ JMS\ Resource\ Adapter.ThreadPoolSize=30
+
+    # Resource(id=Default JDBC Database)
+    # className: org.apache.openejb.resource.jdbc.BasicManagedDataSource
+    #
+    Default\ JDBC\ Database.MinIdle=0
+    Default\ JDBC\ Database.Password=xxxx
+    Default\ JDBC\ Database.JdbcUrl=jdbc\:hsqldb\:file\:hsqldb
+    Default\ JDBC\ Database.MaxIdle=20
+    Default\ JDBC\ Database.ConnectionProperties=
+    Default\ JDBC\ Database.MaxWait=-1
+    Default\ JDBC\ Database.TimeBetweenEvictionRunsMillis=-1
+    Default\ JDBC\ Database.MaxActive=20
+    Default\ JDBC\ Database.DefaultAutoCommit=true
+    Default\ JDBC\ Database.AccessToUnderlyingConnectionAllowed=false
+    Default\ JDBC\ Database.JdbcDriver=org.hsqldb.jdbcDriver
+    Default\ JDBC\ Database.TestWhileIdle=false
+    Default\ JDBC\ Database.UserName=sa
+    Default\ JDBC\ Database.MaxOpenPreparedStatements=0
+    Default\ JDBC\ Database.TestOnBorrow=true
+    Default\ JDBC\ Database.PoolPreparedStatements=false
+    Default\ JDBC\ Database.ConnectionInterface=javax.sql.DataSource
+    Default\ JDBC\ Database.TestOnReturn=false
+    Default\ JDBC\ Database.MinEvictableIdleTimeMillis=1800000
+    Default\ JDBC\ Database.NumTestsPerEvictionRun=3
+    Default\ JDBC\ Database.InitialSize=0
+
+    # Resource(id=Default Unmanaged JDBC Database)
+    # className: org.apache.openejb.resource.jdbc.BasicDataSource
+    #
+    Default\ Unmanaged\ JDBC\ Database.MaxWait=-1
+    Default\ Unmanaged\ JDBC\ Database.InitialSize=0
+    Default\ Unmanaged\ JDBC\ Database.DefaultAutoCommit=true
+    Default\ Unmanaged\ JDBC\ Database.ConnectionProperties=
+    Default\ Unmanaged\ JDBC\ Database.MaxActive=10
+    Default\ Unmanaged\ JDBC\ Database.TestOnBorrow=true
+    Default\ Unmanaged\ JDBC\ Database.JdbcUrl=jdbc\:hsqldb\:file\:hsqldb
+    Default\ Unmanaged\ JDBC\ Database.TestOnReturn=false
+    Default\ Unmanaged\ JDBC\ Database.AccessToUnderlyingConnectionAllowed=false
+    Default\ Unmanaged\ JDBC\ Database.Password=xxxx
+    Default\ Unmanaged\ JDBC\ Database.MinEvictableIdleTimeMillis=1800000
+    Default\ Unmanaged\ JDBC\ Database.PoolPreparedStatements=false
+    Default\ Unmanaged\ JDBC\ Database.MaxOpenPreparedStatements=0
+    Default\ Unmanaged\ JDBC\ Database.ConnectionInterface=javax.sql.DataSource
+    Default\ Unmanaged\ JDBC\ Database.MinIdle=0
+    Default\ Unmanaged\ JDBC\ Database.NumTestsPerEvictionRun=3
+    Default\ Unmanaged\ JDBC\ Database.TimeBetweenEvictionRunsMillis=-1
+    Default\ Unmanaged\ JDBC\ Database.JdbcDriver=org.hsqldb.jdbcDriver
+    Default\ Unmanaged\ JDBC\ Database.UserName=sa
+    Default\ Unmanaged\ JDBC\ Database.MaxIdle=10
+    Default\ Unmanaged\ JDBC\ Database.TestWhileIdle=false
+
+    # Resource(id=Default JMS Connection Factory)
+    # className: org.apache.activemq.ra.ActiveMQManagedConnectionFactory
+    #
+    Default\ JMS\ Connection\ Factory.ConnectionInterface=javax.jms.ConnectionFactory, \
+    javax.jms.QueueConnectionFactory, javax.jms.TopicConnectionFactory
+    Default\ JMS\ Connection\ Factory.ResourceAdapter=Default JMS Resource Adapter
+
+    # SecurityService(id=Default Security Service)
+    # className: org.apache.openejb.core.security.SecurityServiceImpl
+    #
+
+    # TransactionManager(id=Default Transaction Manager)
+    # className: org.apache.geronimo.transaction.manager.GeronimoTransactionManager
+    #
+
+    # ServerService(id=httpejbd)
+    # className: org.apache.openejb.server.httpd.HttpEjbServer
+    #
+    httpejbd.port=4204
+    httpejbd.name=httpejbd
+    httpejbd.disabled=false
+    httpejbd.server=org.apache.openejb.server.httpd.HttpEjbServer
+    httpejbd.threads=200
+    httpejbd.bind=127.0.0.1
+
+    # ServerService(id=telnet)
+    # className: org.apache.openejb.server.telnet.TelnetServer
+    #
+    telnet.port=4202
+    telnet.name=telnet
+    telnet.disabled=false
+    telnet.bind=127.0.0.1
+    telnet.threads=5
+    telnet.server=org.apache.openejb.server.telnet.TelnetServer
+
+    # ServerService(id=ejbd)
+    # className: org.apache.openejb.server.ejbd.EjbServer
+    #
+    ejbd.disabled=false
+    ejbd.bind=127.0.0.1
+    ejbd.server=org.apache.openejb.server.ejbd.EjbServer
+    ejbd.port=4201
+    ejbd.name=ejbd
+    ejbd.threads=200
+
+    # ServerService(id=hsql)
+    # className: org.apache.openejb.server.hsql.HsqlService
+    #
+    hsql.port=9001
+    hsql.name=hsql
+    hsql.disabled=false
+    hsql.server=org.apache.openejb.server.hsql.HsqlService
+    hsql.bind=127.0.0.1
+
+    # ServerService(id=admin)
+    # className: org.apache.openejb.server.admin.AdminDaemon
+    #
+    admin.disabled=false
+    admin.bind=127.0.0.1
+    admin.only_from=localhost
+    admin.port=4200
+    admin.threads=1
+    admin.name=admin
+    admin.server=org.apache.openejb.server.admin.AdminDaemon

Modified: openejb/site/trunk/content/resource-ref-for-datasource.mdtext
URL: http://svn.apache.org/viewvc/openejb/site/trunk/content/resource-ref-for-datasource.mdtext?rev=1145009&r1=1145008&r2=1145009&view=diff
==============================================================================
--- openejb/site/trunk/content/resource-ref-for-datasource.mdtext (original)
+++ openejb/site/trunk/content/resource-ref-for-datasource.mdtext Mon Jul 11 02:30:12 2011
@@ -1,55 +1,42 @@
-Title: resource-ref for DataSource
-<a name="resource-refforDataSource-Viaannotation"></a>
 #  Via annotation
 
-<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;
-    
+
     import javax.annotation.Resource;
     import javax.ejb.Stateless;
     import javax.naming.InitialContext;
     import javax.sql.DataSource;
-    
+
     @Stateless
     @Resource(name = "myFooDataSource", type = DataSource.class)
     public class MyDataSourceRefBean implements MyBeanInterface {
-    
+
         @Resource
         private DataSource myBarDataSource;
-    
+
         public void someBusinessMethod() throws Exception {
-    	if (myBarDataSource == null) throw new
-NullPointerException("myBarDataSource not injected");
-    
-    	// Both can be looked up from JNDI as well
-    	InitialContext context = new InitialContext();
-    	DataSource fooDataSource = (DataSource)
-context.lookup("java:comp/env/myFooDataSource");
-    	DataSource barDataSource = (DataSource)
-context.lookup("java:comp/env/org.superbiz.refs.MyDataSourceRefBean/myBarDataSource");
+            if (myBarDataSource == null) throw new NullPointerException("myBarDataSource not injected");
+
+            // Both can be looked up from JNDI as well
+            InitialContext context = new InitialContext();
+            DataSource fooDataSource = (DataSource) context.lookup("java:comp/env/myFooDataSource");
+            DataSource barDataSource = (DataSource) context.lookup("java:comp/env/org.superbiz.refs.MyDataSourceRefBean/myBarDataSource");
         }
     }
 
-
-<a name="resource-refforDataSource-Viaxml"></a>
 # Via xml
 
-The above @Resource annotation usage is 100% equivalent to the following
-xml.
-
-{code:xml|title=ejb-jar.xml or web.xml}
-<resource-ref>
-    <res-ref-name>myFooDataSource</res-ref-name>
-    <res-type>javax.sql.DataSource</res-type>
-</resource-ref>
-<resource-ref>
-   
-<res-ref-name>org.superbiz.refs.MyDataSourceRefBean/myBarDataSource</res-ref-name>
-    <res-type>javax.sql.DataSource</res-type>
-    <injection-target>
-       
-<injection-target-class>org.superbiz.refs.MyDataSourceRefBean</injection-target-class>
-	<injection-target-name>myBarDataSource</injection-target-name>
-    </injection-target>
-</resource-ref>
+The above @Resource annotation usage is 100% equivalent to the following xml.
 
+    <resource-ref>
+        <res-ref-name>myFooDataSource</res-ref-name>
+        <res-type>javax.sql.DataSource</res-type>
+    </resource-ref>
+    <resource-ref>
+        <res-ref-name>org.superbiz.refs.MyDataSourceRefBean/myBarDataSource</res-ref-name>
+        <res-type>javax.sql.DataSource</res-type>
+        <injection-target>
+            <injection-target-class>org.superbiz.refs.MyDataSourceRefBean</injection-target-class>
+            <injection-target-name>myBarDataSource</injection-target-name>
+        </injection-target>
+    </resource-ref>

Modified: openejb/site/trunk/content/securing-a-web-service.mdtext
URL: http://svn.apache.org/viewvc/openejb/site/trunk/content/securing-a-web-service.mdtext?rev=1145009&r1=1145008&r2=1145009&view=diff
==============================================================================
--- openejb/site/trunk/content/securing-a-web-service.mdtext (original)
+++ openejb/site/trunk/content/securing-a-web-service.mdtext Mon Jul 11 02:30:12 2011
@@ -81,8 +81,7 @@ the same as if you would use a common ja
     <properties>
       wss4j.in.action = UsernameToken
       wss4j.in.passwordType = PasswordDigest
-     
-wss4j.in.passwordCallbackClass=org.superbiz.calculator.CustomPasswordHandler
+      wss4j.in.passwordCallbackClass=org.superbiz.calculator.CustomPasswordHandler
     </properties>
     [...]
 
@@ -112,8 +111,7 @@ For example : *wss4j.in.action = Usernam
     		<properties>
     		    wss4j.in.action = UsernameToken
     		    wss4j.in.passwordType = PasswordDigest
-    		   
-wss4j.in.passwordCallbackClass=org.superbiz.calculator.CustomPasswordHandler
+            wss4j.in.passwordCallbackClass=org.superbiz.calculator.CustomPasswordHandler
     		</properties>
     	    </web-service-security>
     	</session>
@@ -137,26 +135,19 @@ This request contains SOAP headers to ma
     Host: 127.0.0.1:8204
     Connection: keep-alive
     Transfer-Encoding: chunked
-     
+
     524
     <soap:Envelope xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/">
       <soap:Header>
-        <wsse:Security
-xmlns:wsse="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd"
-soap:mustUnderstand="1">
-          <wsse:UsernameToken
-xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd" 
-    wsu:Id="UsernameToken-22402238" 
+        <wsse:Security xmlns:wsse="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd" soap:mustUnderstand="1">
+          <wsse:UsernameToken xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd"
+    wsu:Id="UsernameToken-22402238"
     xmlns:wsse="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd">
-    	<wsse:Username
-xmlns:wsse="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd">jane</wsse:Username>
-    	<wsse:Password
-Type="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-username-token-profile-1.0#PasswordDigest" 
+            <wsse:Username xmlns:wsse="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd">jane</wsse:Username>
+            <wsse:Password Type="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-username-token-profile-1.0#PasswordDigest"
     xmlns:wsse="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd">tf7k3a4GREIt1xec/KXVmBdRNIg=</wsse:Password>
-    	<wsse:Nonce
-xmlns:wsse="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd">cKhUhmjQ1hGYPsdOLez5kA==</wsse:Nonce>
-    	<wsu:Created
-xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd">2009-04-14T20:16:26.203Z</wsu:Created>
+            <wsse:Nonce xmlns:wsse="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd">cKhUhmjQ1hGYPsdOLez5kA==</wsse:Nonce>
+            <wsu:Created xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd">2009-04-14T20:16:26.203Z</wsu:Created>
           </wsse:UsernameToken>
         </wsse:Security>
       </soap:Header>
@@ -199,54 +190,45 @@ Here is a snippet from the webservice-ws
 this:
 
 
-    
     public class CustomPasswordHandler implements CallbackHandler {
-        public void handle(Callback[]
- callbacks) throws IOException, UnsupportedCallbackException {
-            WSPasswordCallback pc = (WSPasswordCallback) callbacks[0]
-;
-            
-    	if(pc.getUsage() == WSPasswordCallback.USERNAME_TOKEN) {
-    	    // TODO get the password from the users.properties if possible
-    	    pc.setPassword("waterfall");
-                
-    	} else if(pc.getUsage() == WSPasswordCallback.DECRYPT) {
-    	    pc.setPassword("serverPassword");
-                
-    	} else if(pc.getUsage() == WSPasswordCallback.SIGNATURE) {
-    	    pc.setPassword("serverPassword");
-                
-    	}
-            
-    	if ((pc.getUsage() == WSPasswordCallback.USERNAME_TOKEN)
-    		|| (pc.getUsage() ==
-WSPasswordCallback.USERNAME_TOKEN_UNKNOWN)) {
-                
-    	    SecurityService securityService = SystemInstance.get()
-    		    .getComponent(SecurityService.class);
-    	    Object token = null;
-    	    try {
-    		securityService.disassociate();
-    
-    		token = securityService.login(pc.getIdentifer(),
-pc.getPassword());
-    		securityService.associate(token);
-    		
-    	    } catch (LoginException e) {
-    		e.printStackTrace();
-    		throw new SecurityException("wrong password");
-    	    } finally {
-    	    }
-    	}
-                
-    
+
+        public void handle(Callback[] callbacks) throws IOException, UnsupportedCallbackException {
+            WSPasswordCallback pc = (WSPasswordCallback) callbacks[0];
+
+            if (pc.getUsage() == WSPasswordCallback.USERNAME_TOKEN) {
+                // TODO get the password from the users.properties if possible
+                pc.setPassword("waterfall");
+
+            } else if (pc.getUsage() == WSPasswordCallback.DECRYPT) {
+
+                pc.setPassword("serverPassword");
+
+            } else if (pc.getUsage() == WSPasswordCallback.SIGNATURE) {
+
+                pc.setPassword("serverPassword");
+
+            }
+
+            if ((pc.getUsage() == WSPasswordCallback.USERNAME_TOKEN) || (pc.getUsage() == WSPasswordCallback.USERNAME_TOKEN_UNKNOWN)) {
+
+                SecurityService securityService = SystemInstance.get().getComponent(SecurityService.class);
+                Object token = null;
+                try {
+                    securityService.disassociate();
+
+                    token = securityService.login(pc.getIdentifer(), pc.getPassword());
+                    securityService.associate(token);
+
+                } catch (LoginException e) {
+                    e.printStackTrace();
+                    throw new SecurityException("wrong password");
+                }
+            }
         }
     }
     
 
 
-
-
 <a name="SecuringaWebService-Examples"></a>
 # Examples
 A full example (webservice-ws-security) is available with OpenEJB Examples.

Modified: openejb/site/trunk/content/service-locator.mdtext
URL: http://svn.apache.org/viewvc/openejb/site/trunk/content/service-locator.mdtext?rev=1145009&r1=1145008&r2=1145009&view=diff
==============================================================================
--- openejb/site/trunk/content/service-locator.mdtext (original)
+++ openejb/site/trunk/content/service-locator.mdtext Mon Jul 11 02:30:12 2011
@@ -15,29 +15,27 @@ start with this basic class that has a b
 common prefix to be optionally applied to the beginning of all lookup
 strings.
 
-<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>MyLocator.java</B></DIV><DIV class="codeContent panelContent">
     public class MyLocator {
         private final Context context;
-    
+
         public MyLocator() throws NamingException {
-    	this(null);
+            this(null);
         }
-    
+
         public MyLocator(String commonPrefix) throws NamingException {
-    	Properties properties = new Properties();
-    	properties.put(Context.INITIAL_CONTEXT_FACTORY,
-"org.apache.openejb.client.RemoteInitialContextFactory");
-    	properties.put(Context.PROVIDER_URL, "ejbd://localhost:4201/");
-    	this.context = new InitialContext(properties);
+            Properties properties = new Properties();
+            properties.put(Context.INITIAL_CONTEXT_FACTORY, "org.apache.openejb.client.RemoteInitialContextFactory");
+            properties.put(Context.PROVIDER_URL, "ejbd://localhost:4201/");
+            this.context = new InitialContext(properties);
         }
-    
+
         public Object lookup(String name) {
-    	try {
-    	    if (commonPrefix != null) name = commonPrefix + "/" +name;
-    	    return context.lookup(name);
-    	} catch (NamingException e) {
-    	    throw new IllegalArgumentException(e);
-    	}
+            try {
+                if (commonPrefix != null) name = commonPrefix + "/" +name;
+                return context.lookup(name);
+            } catch (NamingException e) {
+                throw new IllegalArgumentException(e);
+            }
         }
     }
 
@@ -149,11 +147,10 @@ in a JNDI tree that's a bit more human r
 
 
     public <T> T lookup(Class ejbClass, Class<T> type) {
-        return (T) lookup(ejbClass.getSimpleName() + "" +
-type.getSimpleName());
+        return (T) lookup(ejbClass.getSimpleName() + "" + type.getSimpleName());
     }
 
-
+and
 
     MyLocator locator = new MyLocator();
     Widget widget = locator.lookup(RedWidgetBean.class, Widget.class);   

Modified: openejb/site/trunk/content/singleton-beans.mdtext
URL: http://svn.apache.org/viewvc/openejb/site/trunk/content/singleton-beans.mdtext?rev=1145009&r1=1145008&r2=1145009&view=diff
==============================================================================
--- openejb/site/trunk/content/singleton-beans.mdtext (original)
+++ openejb/site/trunk/content/singleton-beans.mdtext Mon Jul 11 02:30:12 2011
@@ -68,7 +68,6 @@ put @Lock(READ) on their bean class, thu
 The locking modes of Container-Managed Concurrency map directly to the *[java.util.concurrent.ReadWriteLock](http://java.sun.com/j2se/1.5.0/docs/api/java/util/concurrent/locks/ReadWriteLock.html)
 * API which looks like this:
 
-<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>java.util.concurrent.ReadWriteLock</B></DIV><DIV class="codeContent panelContent">
     public interface ReadWriteLock {
        /**
         * Returns the lock used for reading.
@@ -110,7 +109,6 @@ to acquire the read or write lock.  This
 class or individual methods.  The annotation maps directly to the [java.util.concurrent.locks.Lock](http://java.sun.com/j2se/1.5.0/docs/api/java/util/concurrent/locks/Lock.html)
  interface.
 
-<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>java.util.concurrent.locks.Lock</B></DIV><DIV class="codeContent panelContent">
     public interface Lock {
     
         /**
@@ -208,19 +206,18 @@ annotation "just in case" and should onl
 
 Singletons can be declared in the ejb-jar.xml as follows:
 
-{code:xml|title=META-INF/ejb-jar.xml}
-<ejb-jar>
-  <enterprise-beans>
-    <session>
-      <ejb-name>MySingletonBean</ejb-name>
-      <ejb-class>org.superbiz.MySingletonBean</ejb-class>
-      <session-type>Singleton</session-type>
-      <load-on-startup/>
-      <depends-on>
-	<ejb-name>SingletonFoo</ejb-name>
-	<ejb-name>SingletonBar</ejb-name>
-      </depends-on>
-    </session>
-  </enterprise-beans>
-</ejb-jar>
+    <ejb-jar>
+      <enterprise-beans>
+        <session>
+          <ejb-name>MySingletonBean</ejb-name>
+          <ejb-class>org.superbiz.MySingletonBean</ejb-class>
+          <session-type>Singleton</session-type>
+          <load-on-startup/>
+          <depends-on>
+              <ejb-name>SingletonFoo</ejb-name>
+              <ejb-name>SingletonBar</ejb-name>
+          </depends-on>
+        </session>
+      </enterprise-beans>
+    </ejb-jar>