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 2018/12/02 02:20:38 UTC

[11/30] tomee git commit: Rename *.mdtext files to *.md

http://git-wip-us.apache.org/repos/asf/tomee/blob/c3f8984b/docs/deployments.mdtext
----------------------------------------------------------------------
diff --git a/docs/deployments.mdtext b/docs/deployments.mdtext
deleted file mode 100644
index 90ab0cf..0000000
--- a/docs/deployments.mdtext
+++ /dev/null
@@ -1,131 +0,0 @@
-Title: Deployments
-
-<a name="Deployments-The'Deployments'elementinopenejb.xml"></a>
-#  The 'Deployments' element in openejb.xml
-
-<a name="Deployments-Asinglejar"></a>
-##  A single jar
-
-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.
-
-    <openejb>
-    ...
-    <Deployments jar="c:\my\app\superEjbs.jar" />
-    <Deployments jar="c:\someplace\purchasing.jar" />
-    <Deployments jar="timeTrack.jar" />
-    </openejb>
-
-    
-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.
-    
-##  A directory of jars
-    
-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.
-    
-    <openejb>
-    ...
-    
-    <Deployments dir="c:\my\app\beans\" />
-    <Deployments dir="c:\crimestopper\lib" />
-    <Deployments dir="ejbs" />
-    <Deployments dir="beans" />
-    </openejb>
-
-
-The directories listed will be searched for jars containing
-'META-INF/ejb-jar.xml' files and will be added to the list of jars to load
-if they do.  Better said, it's completely safe to point to a directory
-containing a mix of ejbs and regular jar files.  OpenEJB will simply skip
-over jars that do contain the required 'META-INF/ejb-jar.xml' file.
-
-The last Deployments element declares a 'beans' directory relative to
-openejb.base for holding ejb jars.  This declaration is simply convention
-and not required.
-
-<a name="Deployments-Anunpackedjar"></a>
-##  An unpacked jar
-
-As of 1.0 beta1, OpenEJB supports unpacked ejb jars.  Simply meaning that
-you don't need to pack your ejb's into a jar file in order to use them in
-OpenEJB.  You still need to follow the ejb jar layout and include an
-"META-INF/ejb-jar.xml" in the directory that contains your ejbs.
-
-For example, if you have a directory structure like this:
-
-    > C:\myapp\
-    > C:\myapp\acmeEjbs\
-    > C:\myapp\acmeEjbs\META-INF\ejb-jar.xml
-    > C:\myapp\acmeEjbs\org\acme\Foo.class
-    > C:\myapp\acmeEjbs\org\acme\FooBean.class
-    > C:\myapp\acmeEjbs\org\acme\FooHome.class
-    > C:\myapp\acmeEjbs\org\acme\Bar.class
-    > C:\myapp\acmeEjbs\org\acme\BarBean.class
-    > C:\myapp\acmeEjbs\org\acme\BarHome.class
-
-Then you would delcare a 'Deployments' element with the 'dir' attribute set
-to 'C:\myapp\acmeEjbs' as shown below.
-
-    <openejb>
-    ...
-
-    <Deployments dir="c:\myapp\acmeEjbs" />
-    </openejb>
-
-    
-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.
-    
-#  Log file 
-    
-When trying to figure out if your ejbs were loaded, the openejb.log file is
-an incredible asset.
-    
-If your ejbs were loaded successfully you should see entries like the
-following (1.x and higher only):
-    
-    INFO :	Loaded EJBs from
-    /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
-
-If your ejbs failed to load, you will see an entry similar to the
-following.
-
-    WARN :	Jar not loaded. /usr/local/openejb-1.0-beta1/beans/helloworld.jar.
-    Jar failed validation.	Use the validation tool for more details
-
-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.
-    
-    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   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

http://git-wip-us.apache.org/repos/asf/tomee/blob/c3f8984b/docs/details-on-openejb-jar.mdtext
----------------------------------------------------------------------
diff --git a/docs/details-on-openejb-jar.mdtext b/docs/details-on-openejb-jar.mdtext
deleted file mode 100644
index 2119bf0..0000000
--- a/docs/details-on-openejb-jar.mdtext
+++ /dev/null
@@ -1,152 +0,0 @@
-Title: Details on openejb-jar
-
-<a name="Detailsonopenejb-jar-Whatisanopenejb-jar.xml?"></a>
-# What is an openejb-jar.xml?
-
-This is the file created by the Deploy Tool that maps your bean's
-deployment descriptor (ejb-jar.xml) to actual containers and resources
-declared in your OpenEJB configuration (openejb.conf). In fact, the Deploy
-tool really does nothing more than create this file and put it in your jar,
-that's it.
-
-<a name="Detailsonopenejb-jar-Whenistheopenejb-jar.xmlused?"></a>
-# When is the openejb-jar.xml used?
-
-At startup, any jar containing a openejb-jar.xml is loaded by the container
-system. The configuration tools will go looking in all the directories and
-jars you have declared in your openejb.conf with the <Deployment> element.
-For every jar file it finds, it will look inside for an openejb-jar.xml. If
-it finds one, it will attempt to load and deploy it into the container
-system.
-
-<a name="Detailsonopenejb-jar-DoIevenneedthedeploytoolthen?"></a>
-# Do I even need the deploy tool then?
-
-Nope. Typically you would only use the deploy tool to create your
-openejb-jar.xml, then just keep your openejb-jar.xml in your CVS (or other
-repository). If you learn how to maintain this openejb-jar.xml file, you'll
-never need the deploy tool again! You can do all your builds and deploys
-automatically.
-
-<a name="Detailsonopenejb-jar-WheredoIputtheopenejb-jar.xmlinmyjar?"></a>
-# Where do I put the openejb-jar.xml in my jar?
-
-The openejb-jar.xml file just goes in the META-INF directory of your jar
-next to the ejb-jar.xml file.
-
-<a name="Detailsonopenejb-jar-Isthefileformateasy?"></a>
-# Is the file format easy?
-
-If you can understand the ejb-jar.xml, the openejb-jar.xml should be a
-breeze.
-
-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.
-
-    <?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>
-
-    
-    
-The *ejb-name* attribute is the name you gave the bean in your ejb-jar.xml.
-The *deployment-id* is the name you want to use to lookup the bean in your
-client's JNDI namespace. The *container-id* is the name of the container in
-your openejb.conf file that you would like the bean to run in. There MUST
-be one *ejb-deployment* element for each EJB in your jar.
-    
-# What if my bean uses a JDBC datasource?
-    
-Then you simply add a <resource-link> element to your <ejb-deployment>
-element like this
-    
-    <?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" >
-             
-    	<resource-link res-ref-name="jdbc/basic/entityDatabase" 
-    		     res-id="Default JDBC Database"/>
-        
-        </ejb-deployment>
-    
-    </openejb-jar>
-
-
-
-The *res-ref-name* attribute refers to the <res-ref-name> element of the
-bean's <resource-ref> declaration in the ejb-jar.xml. The *res-id*
-attribute refers to the id of the <Connector> declared in your openejb.conf
-that will handle the connections and provide access to the desired
-resource.
-
-<a name="Detailsonopenejb-jar-Howmanyresource-linkelementswillIneed?"></a>
-# How many resource-link elements will I need?
-
-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
-
-    <?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>
-
-          <resource-ref>
-            <description>
-              This is a reference to a JDBC database.
-            </description>
-            <res-ref-name>jdbc/myFirstDatabase</res-ref-name>
-            <res-type>javax.sql.DataSource</res-type>
-            <res-auth>Container</res-auth>
-          </resource-ref>
-
-          <resource-ref>
-            <description>
-              This is another reference to a JDBC database.
-            </description>
-            <res-ref-name>jdbc/anotherDatabase</res-ref-name>
-            <res-type>javax.sql.DataSource</res-type>
-            <res-auth>Container</res-auth>
-          </resource-ref>
-
-        </session>
-      </enterprise-beans>
-    </ejb-jar>
-
-    
-Then you would need two <resource-link> elements for that bean in your
-openejb-jar.xml file as such.
-    
-    <?xml version="1.0"?>
-    <openejb-jar xmlns="http://www.openejb.org/openejb-jar/1.1">
-        
-        <ejb-deployment  ejb-name="MyExampleBean" 
-    		     deployment-id="MyExampleBean" 
-    		     container-id="Default Stateless Container" >
-             
-    	<resource-link res-ref-name="jdbc/myFirstDatabase" 
-    		     res-id="My Oracle JDBC Database"/>
-    
-    	<resource-link res-ref-name="jdbc/anotherDatabase" 
-    		     res-id="My PostgreSQL JDBC Database"/>
-        
-        </ejb-deployment>
-    
-    </openejb-jar>
-
-
-
-This would require two <Connector> declarations in your openejb.conf, one
-with the *id* attribute set to _"My Oracle JDBC Database"_ , and another
-with it's *id* attribute set to _"My PostgreSQL JDBC Database"_ 

http://git-wip-us.apache.org/repos/asf/tomee/blob/c3f8984b/docs/documentation.mdtext
----------------------------------------------------------------------
diff --git a/docs/documentation.mdtext b/docs/documentation.mdtext
deleted file mode 100644
index b0f4238..0000000
--- a/docs/documentation.mdtext
+++ /dev/null
@@ -1,102 +0,0 @@
-Title: Documentation
-
-See also the [examples page](examples-trunk/index.html) for downloadable, executable and code-focused view of Java EE and TomEE.
-You can also find us on IRC freenode.org #openejb and #tomee
-
-{row
-
-{span-one-third
-###IDE
-[Get started with Intellij](tomee-and-intellij.html), [Debugging in Intellij](contrib/debug/debug-intellij.html)  
-[Get started with Eclipse (WTP)](tomee-and-eclipse.html)  
-[Get started with Eclipse (m2e-Webby)](getting-started-with-eclipse-and-webby.html)  
-[Get started with Netbeans](tomee-and-netbeans.html)  
-
-###General Informations
-[Comparison: OpenEJB, TomEE, TomEE+](comparison.html)  
-[TomEE Directory structure](tomee-directory-structure.html)  
-[Deploying in TomEE](deploying-in-tomee.html)  
-[The 'tomee' webapp](tomee-webapp.html)  
-[TomEE Reference Card](refcard/refcard.html)  
-[ApplicationComposer](application-composer/index.html)  
-}
-{span-one-third
-###Configuration
-[System Properties](system-properties.html)  
-[Deployments](deployments.html)  
-[Configuring Resources](Configuring-in-tomee.html)  
-[Configuring DataSources](configuring-datasources.html)  
-[Containers and Resources](containers-and-resources.html)  
-[JMS Resources and MDB Container](jms-resources-and-mdb-container.html)  
-[Configuring JavaMail](configuring-javamail.html)  
-[TomEE Security](tomee-and-security.html)  
-[Security How To](security.html)  
-[EJB Clients](clients.html)  
-[EJB over SSL](ejb-over-ssl.html)  
-[JNDI Names](jndi-names.html)  
-[Changing JMS implementations](changing-jms-implementations.html)  
-[Changing JPA to Hibernate](tomee-and-hibernate.html)  
-}
-{span-one-third
-###Testing Techniques
-[Application discovery via the classpath](application-discovery-via-the-classpath.html)  
-[Embedded Configuration](embedded-configuration.html)  
-[Configuring DataSources in Tests](configuring-datasources-in-tests.html)  
-[Configuring PersistenceUnits in Tests](configuring-persistenceunits-in-tests.html)  
-[Configuring Containers in Tests](configuring-containers-in-tests.html)  
-[Configuring Logging in Tests](configuring-logging-in-tests.html)  
-[Alternate Descriptors](alternate-descriptors.html)  
-[Unit Testing Transactions](unit-testing-transactions.html)  
-[TestCase with TestBean inner-class](testcase-with-testbean-inner-class.html)  
-[TestCase Injection (@LocalClient)](local-client-injection.html)  
-}
-}
-{row
-
-{span-one-third
-###Discovery and Failover
-[Overview](ejb-failover.html)  
-[Multicast Discovery (UDP)](multicast-discovery.html)  
-[Multipulse Discovery (UDP)](multipulse-discovery.html)  
-[Multipoint Discovery (TCP)](multipoint-discovery.html)  
-[Multipoint Considerations](multipoint-considerations.html)  
-[Multipoint Recommendations](multipoint-recommendations.html)  
-[Logging Events](failover-logging.html)  
-}
-{span-one-third
-
-###OpenEJB Standalone Server
-[Understanding the Directory Layout](understanding-the-directory-layout.html)  
-[Startup](startup.html)  
-[Deploy Tool](deploy-tool.html)  
-[Properties Tool](properties-tool.html)  
-}
-{span-one-third
-###Spring
-[Spring and OpenEJB 3.0](spring-and-openejb-3.0.html)  
-[Spring and OpenEJB 3.1 and later](spring.html)  
-[Spring, EJB and JPA example](spring-ejb-and-jpa.html)  
-}
-}
-{row
-
-{span-one-third
-###Arquillian
-[Arquillian Primer - What you need to know](arquillian-getting-started.html)  
-[Using the TomEE Arquillian adapters](arquillian-available-adapters.html)  
-}
-{span-one-third
-###TomEE Maven Plugin
-[Getting started](tomee-mp-getting-started.html)  
-[tomee-maven-plugin reference documentation](maven/index.html)  
-[tomee-embedded-maven-plugin reference documentation](tomee-embedded-maven-plugin.html)  
-[TomEE simple webapp archetype documentation](tomee-mp-getting-started.html)  
-}
-{span-one-third
-###Tips and Tricks
-[Install TomEE using the drop-in WAR](installation-drop-in-war.html)  
-[Global Concurrency Management](tip-concurrency.html)  
-[WebLogic Lookup](tip-weblogic.html)  
-[Jersey Client](tip-jersey-client.html)  
-}
-}

http://git-wip-us.apache.org/repos/asf/tomee/blob/c3f8984b/docs/documentation.old.mdtext
----------------------------------------------------------------------
diff --git a/docs/documentation.old.mdtext b/docs/documentation.old.mdtext
deleted file mode 100644
index b0f4238..0000000
--- a/docs/documentation.old.mdtext
+++ /dev/null
@@ -1,102 +0,0 @@
-Title: Documentation
-
-See also the [examples page](examples-trunk/index.html) for downloadable, executable and code-focused view of Java EE and TomEE.
-You can also find us on IRC freenode.org #openejb and #tomee
-
-{row
-
-{span-one-third
-###IDE
-[Get started with Intellij](tomee-and-intellij.html), [Debugging in Intellij](contrib/debug/debug-intellij.html)  
-[Get started with Eclipse (WTP)](tomee-and-eclipse.html)  
-[Get started with Eclipse (m2e-Webby)](getting-started-with-eclipse-and-webby.html)  
-[Get started with Netbeans](tomee-and-netbeans.html)  
-
-###General Informations
-[Comparison: OpenEJB, TomEE, TomEE+](comparison.html)  
-[TomEE Directory structure](tomee-directory-structure.html)  
-[Deploying in TomEE](deploying-in-tomee.html)  
-[The 'tomee' webapp](tomee-webapp.html)  
-[TomEE Reference Card](refcard/refcard.html)  
-[ApplicationComposer](application-composer/index.html)  
-}
-{span-one-third
-###Configuration
-[System Properties](system-properties.html)  
-[Deployments](deployments.html)  
-[Configuring Resources](Configuring-in-tomee.html)  
-[Configuring DataSources](configuring-datasources.html)  
-[Containers and Resources](containers-and-resources.html)  
-[JMS Resources and MDB Container](jms-resources-and-mdb-container.html)  
-[Configuring JavaMail](configuring-javamail.html)  
-[TomEE Security](tomee-and-security.html)  
-[Security How To](security.html)  
-[EJB Clients](clients.html)  
-[EJB over SSL](ejb-over-ssl.html)  
-[JNDI Names](jndi-names.html)  
-[Changing JMS implementations](changing-jms-implementations.html)  
-[Changing JPA to Hibernate](tomee-and-hibernate.html)  
-}
-{span-one-third
-###Testing Techniques
-[Application discovery via the classpath](application-discovery-via-the-classpath.html)  
-[Embedded Configuration](embedded-configuration.html)  
-[Configuring DataSources in Tests](configuring-datasources-in-tests.html)  
-[Configuring PersistenceUnits in Tests](configuring-persistenceunits-in-tests.html)  
-[Configuring Containers in Tests](configuring-containers-in-tests.html)  
-[Configuring Logging in Tests](configuring-logging-in-tests.html)  
-[Alternate Descriptors](alternate-descriptors.html)  
-[Unit Testing Transactions](unit-testing-transactions.html)  
-[TestCase with TestBean inner-class](testcase-with-testbean-inner-class.html)  
-[TestCase Injection (@LocalClient)](local-client-injection.html)  
-}
-}
-{row
-
-{span-one-third
-###Discovery and Failover
-[Overview](ejb-failover.html)  
-[Multicast Discovery (UDP)](multicast-discovery.html)  
-[Multipulse Discovery (UDP)](multipulse-discovery.html)  
-[Multipoint Discovery (TCP)](multipoint-discovery.html)  
-[Multipoint Considerations](multipoint-considerations.html)  
-[Multipoint Recommendations](multipoint-recommendations.html)  
-[Logging Events](failover-logging.html)  
-}
-{span-one-third
-
-###OpenEJB Standalone Server
-[Understanding the Directory Layout](understanding-the-directory-layout.html)  
-[Startup](startup.html)  
-[Deploy Tool](deploy-tool.html)  
-[Properties Tool](properties-tool.html)  
-}
-{span-one-third
-###Spring
-[Spring and OpenEJB 3.0](spring-and-openejb-3.0.html)  
-[Spring and OpenEJB 3.1 and later](spring.html)  
-[Spring, EJB and JPA example](spring-ejb-and-jpa.html)  
-}
-}
-{row
-
-{span-one-third
-###Arquillian
-[Arquillian Primer - What you need to know](arquillian-getting-started.html)  
-[Using the TomEE Arquillian adapters](arquillian-available-adapters.html)  
-}
-{span-one-third
-###TomEE Maven Plugin
-[Getting started](tomee-mp-getting-started.html)  
-[tomee-maven-plugin reference documentation](maven/index.html)  
-[tomee-embedded-maven-plugin reference documentation](tomee-embedded-maven-plugin.html)  
-[TomEE simple webapp archetype documentation](tomee-mp-getting-started.html)  
-}
-{span-one-third
-###Tips and Tricks
-[Install TomEE using the drop-in WAR](installation-drop-in-war.html)  
-[Global Concurrency Management](tip-concurrency.html)  
-[WebLogic Lookup](tip-weblogic.html)  
-[Jersey Client](tip-jersey-client.html)  
-}
-}

http://git-wip-us.apache.org/repos/asf/tomee/blob/c3f8984b/docs/dynamic-datasource.mdtext
----------------------------------------------------------------------
diff --git a/docs/dynamic-datasource.mdtext b/docs/dynamic-datasource.mdtext
deleted file mode 100644
index 1b23333..0000000
--- a/docs/dynamic-datasource.mdtext
+++ /dev/null
@@ -1,216 +0,0 @@
-Title: Dynamic Datasource
-<a name="DynamicDatasource-OpenEJBdynamicdatasource"></a>
-# OpenEJB dynamic datasource
-
-<a name="DynamicDatasource-Goal"></a>
-## Goal
-
-The openejb dynamic datasource api aims to allow to use multiple data
-sources as one.
-
-It can be useful for technical reasons (load balancing for example) or
-functionnal reasons (filtering, aggregation, enriching...).
-
-<a name="DynamicDatasource-TheAPI"></a>
-## The API
-
-The interface Router (*org.apache.openejb.resource.jdbc.Router*) have
-only one method to get the datasource to use:
-
-    Router.getDataSource()
-
-The *org.apache.openejb.resource.jdbc.RoutedDataSource* wraps a classical
-data source. It has to be used to declare your datasource.
-
-You can implement all the policy you want in your Router implementation.
-
-A class called *org.apache.openejb.resource.jdbc.AbstractRouter* is
-available to ease router development.
-
-<a name="DynamicDatasource-Knownlimitation(s)"></a>
-## Known limitation(s)
-
-You have to use the same kind of databases (same version, same
-configuration...).
-
-All database have to be created when you use the router. The way to do it
-automatically can depend of your JPA provider.
-
-<a name="DynamicDatasource-OpenJPA"></a>
-### OpenJPA
-
-OpenJPA initializes its database when the entitymanager is called for the
-first time so you need to initialize all your proxied datasource before
-using the other one. It can be done using an Init EJB doing a find() on
-each proxied datasource.
-
-<a name="DynamicDatasource-Hibernate"></a>
-### Hibernate
-
-Hibernate initializes the database when it starts so if you declare a
-persistence unit by database all databases will be initialized at the start
-up.
-
-<a name="DynamicDatasource-Example"></a>
-## Example 
-
-<a name="DynamicDatasource-Thestory(theunittestexample)"></a>
-### The story (the unit test example)
-
-You want to use only one datasource in the code but you have a criteria to
-set to choose the real database to use between three.
-
-So in your code you want something like:
-
-    public class RoutedEJBBean {
-        @PersistenceContext(unitName = "router")
-        private EntityManager em;
-
-        // 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));
-        }
-    }
-
-
-<a name="DynamicDatasource-Therouterimplementation"></a>
-## The router implementation
-
-The router will simply manage a map to store proxied datasources and a
-field to store the datasource used in the current thread (ThreadLocal).
-
-    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
-
-        /**
-         * @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<String, DataSource>();
-            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) {
-                }
-            }
-        }
-
-        /**
-         * @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 least one datasource");
-                }
-            }
-
-            // the developper set the datasource to use
-            return currentDataSource.get();
-        }
-
-        /**
-         *
-         * @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);
-        }
-
-        public void setDefaultDataSourceName(String name) {
-            this.defaultDataSourceName = name;
-        }
-    }
-
-
-<a name="DynamicDatasource-Creationoftheserviceproviderfortherouter"></a>
-## Creation of the service provider for the router
-
-To be able to use your router add a file called service-jar.xml under
-META-INF/<package>. For example META-INF/org.router.
-
-This file will contain something like:
-
-    <ServiceJar>
-      <ServiceProvider id="DeterminedRouter" service="Resource"
-    		   type="org.apache.openejb.resource.jdbc.Router" class-name="implementation class">
-        Param defaultValue
-        ParamWithNoDefaultValue
-      </ServiceProvider>
-    </ServiceJar>
-    
-## openejb.xml
-    
-In the openejb.xml file, you have to declare your dynamic database and in
-our example it needs the proxied datasources too:
-    
-    <Resource id="router" type="<your implementation>" provider="<your provider>">
-      Param value
-    </Resource>
-
-    <Resource id="route db" type="DataSource" provider="RoutedDataSource">
-      Router router
-    </Resource>
-
-    <!–- real databases – for our example -->
-    <Resource id="db1" type="DataSource">
-      JdbcDriver org.hsqldb.jdbcDriver
-      JdbcUrl jdbc:hsqldb:mem:db1
-      UserName sa
-      Password
-      JtaManaged true
-    </Resource>
-    <Resource id="db2" type="DataSource">
-      JdbcDriver org.hsqldb.jdbcDriver
-      JdbcUrl jdbc:hsqldb:mem:db2
-      UserName sa
-      Password
-      JtaManaged true
-    </Resource>
-    <Resource id="db3" type="DataSource">
-      JdbcDriver org.hsqldb.jdbcDriver
-      JdbcUrl jdbc:hsqldb:mem:db3
-      UserName sa
-      Password
-      JtaManaged true
-    </Resource>

http://git-wip-us.apache.org/repos/asf/tomee/blob/c3f8984b/docs/eclipse-plugin.mdtext
----------------------------------------------------------------------
diff --git a/docs/eclipse-plugin.mdtext b/docs/eclipse-plugin.mdtext
deleted file mode 100644
index fb2386d..0000000
--- a/docs/eclipse-plugin.mdtext
+++ /dev/null
@@ -1,38 +0,0 @@
-Title: Eclipse Plugin
-<a name="EclipsePlugin-Whatisit?"></a>
-#  What is it?
-
-The *OpenEJB Eclipse Plugin* will be a suite of tools made available via
-Eclipse to make EJB development with OpenEJB easier.  The initial offering
-will probably provide basic functionality by taking advantage of [WebTools](http://www.eclipse.org/webtools)
- to allow for OpenEJB to be an available container/runtime within Eclipse. 
-This means full debugging and Eclipse project integration.  From there, the
-sky is the limit so feel free to suggest features on the [OpenEJB Dev list|Mailing Lists#MailingLists-DeveloperMailingList]
-.
-
-<a name="EclipsePlugin-Howtogetinvolved?"></a>
-#  How to get involved?
-
-Just the same as getting involved with any part of OpenEJB -- send a mail
-to the [OpenEJB Dev list](mailing-lists#mailinglists-developermailinglist.html)
- and say "Hi!"	We're a very relaxed group so no need to be perfect or
-overly prepared.  Just dive right in, we're always happy to have more.
-
-<a name="EclipsePlugin-WheredoIgetit?"></a>
-#  Where do I get it?
-
-The initiative is just launching, but you can grab what we have right here
-and start hacking.
-
-  http://svn.apache.org/repos/asf/tomee/openejb-eclipse-plugin/trunk/
-
-<a name="EclipsePlugin-WhatdoIneedtohelp?"></a>
-#  What do I need to help?
-
- [Eclipse](http://www.eclipse.org)
- [Eclipse Web Tools](http://www.eclipse.org/webtools)
-
-<a name="EclipsePlugin-Resources"></a>
-#  Resources
-
- [EclipseCon Presentation for Extending WTP](http://eclipsezilla.eclipsecon.org/show_bug.cgi?id=3581)

http://git-wip-us.apache.org/repos/asf/tomee/blob/c3f8984b/docs/ejb-failover.mdtext
----------------------------------------------------------------------
diff --git a/docs/ejb-failover.mdtext b/docs/ejb-failover.mdtext
deleted file mode 100644
index 924f869..0000000
--- a/docs/ejb-failover.mdtext
+++ /dev/null
@@ -1,88 +0,0 @@
-Title: EJB Client/Server Failover
-
-OpenEJB supports stateless failover.  Specifically, the ability for an EJB
-client to failover from one server to the next if a request cannot be
-completed.  No application state information is communicated between the
-servers, so this functionality should be used only with applications that
-are inherently stateless.  A common term for this sort of setup is a server
-farm.
-
-The basic design assumption is that all servers in the same group have the
-same applications deployed and are capable of doing the same job.  Servers
-can be brought online and offline while clients are running.  As members
-join/leave this information is sent to the client as part of normal EJB
-request/response communication so active clients always have the most
-current information on servers that can process their request should
-communication with a particular server fail.
-
-# Client Behavior
-
-On each request to the server, the client will send the version number
-associated with the list of servers in the cluster it is aware of. 
-Initially this version will be zero and the list will be empty.  Only when
-the server sees the client has an old list will the server send the updated
-list.  This is an important distinction as the list is not transmitted back
-and forth on every request, only on change.  If the membership of the
-cluster is stable there is essentially no clustering overhead to the
-protocol -- 8 byte overhead to each request and 1 byte on each response --
-so you will *not* see an exponential slowdown in response times the more
-members are added to the cluster.  This new list takes affect for all
-proxies that share the same connection.
-
-When a server shuts down, more connections are refused, existing
-connections not in mid-request are closed, any remaining connections are
-closed immediately after completion of the request in progress and clients
-can failover gracefully to the next server in the list.  If a server
-crashes requests are retried on the next server in the list (or depending
-on the `ConnectionStrategy`).  This failover pattern is followed until there
-are no more servers in the list at which point the client attempts a final
-multicast search (if it was created with a `PROVIDER_URL` starting with
-`multicast://`) before abandoning the request and throwing an exception to
-the caller.
-
-By default, the failover is ordered but random selection is supported.	The
-multicast discovery aspect of the client adds a nice randomness to the
-selection of the first server.
-
-# Discovery
-
-Each discoverable service has a URI which is broadcast as a heartbeat to
-other servers in the cluster.  This URI advertises the service's type, its
-cluster group, and its location in the format of 'group:type:location'. 
-Say for example "cluster1:ejb:ejbd://thehost:4201".  The URI is sent out
-repeatedly in a pulse and its presence on the network indicates its
-availability and its absence indicates the service is no longer available.
-
-The sending of this pulse (the heartbeat) can be done via UDP or TCP:
-multicast and "multipoint" respectively.  More on that in the following
-section.  The rate at which the heartbeat is pulsed to the network can be
-specified via the 'heart_rate' property.  The default is 500 milliseconds. 
-This rate is also used when listening for services on the network.  If a
-service goes missing for the duration of 'heart_rate' multiplied by
-'max_missed_heartbeats', then the service is considered dead.
-
-The 'group' property, cluster1 in the example, is used to dissect the
-servers on the network into smaller logical clusters.  A given server will
-broadcast all it's services with the group prefixed in the URI, as well it
-will ignore any services it sees broadcast if they do not share the same
-group name.
-
-#Details
-
-Multicast
-
- - [Multicast UDP Discovery](multicast-discovery.html)
- - [Multipulse UDP Discovery](multipulse-discovery.html)
-
-Multipoint
-
- - [Multipoint TCP Discovery](multipoint-discovery.html)
- - [Considerations](multipoint-considerations.html)
- - [Recommendations](multipoint-recommendations.html)
-
-Logging
-
- - [Failover Logging Events](failover-logging.html)
-
-
-

http://git-wip-us.apache.org/repos/asf/tomee/blob/c3f8984b/docs/ejb-local-ref.mdtext
----------------------------------------------------------------------
diff --git a/docs/ejb-local-ref.mdtext b/docs/ejb-local-ref.mdtext
deleted file mode 100644
index 986cb78..0000000
--- a/docs/ejb-local-ref.mdtext
+++ /dev/null
@@ -1,49 +0,0 @@
-Title: ejb-local-ref
-<a name="ejb-local-ref-Viaannotation"></a>
-#  Via annotation
-
-Usable by EJB, Interceptor, Servlet, Filter, or Listener
-
-    package org.superbiz.refs;
-
-    import javax.ejb.EJB;
-    import javax.ejb.Stateless;
-    import javax.naming.InitialContext;
-
-    @Stateless
-    @EJB(name = "myFooEjb", beanInterface = FooLocal.class)
-    public class MyEjbLocalRefBean implements MyBeanInterface {
-
-        @EJB
-        private BarLocal myBarEjb;
-
-        public void someBusinessMethod() throws Exception {
-            if (myBarEjb == null) throw new NullPointerException("myBarEjb not injected");
-
-            // 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");
-        }
-    }
-
-
-<a name="ejb-local-ref-Viaxml"></a>
-# Via xml
-
-The above @EJB annotation usage is 100% equivalent to the following xml.
-
-    <ejb-local-ref>
-      <ejb-ref-name>myFooEjb</ejb-ref-name>
-      <local>org.superbiz.refs.FooLocal</local>
-    </ejb-local-ref>
-
-    <ejb-local-ref>
-      <ejb-ref-name>org.superbiz.refs.MyEjbLocalRefBean/myBarEjb</ejb-ref-name>
-      <local>org.superbiz.refs.BarLocal</local>
-      <injection-target>
-        <injection-target-class>org.superbiz.refs.MyEjbLocalRefBean</injection-target-class>
-        <injection-target-name>myBarEjb</injection-target-name>
-      </injection-target>
-    </ejb-local-ref>
-

http://git-wip-us.apache.org/repos/asf/tomee/blob/c3f8984b/docs/ejb-over-ssl.mdtext
----------------------------------------------------------------------
diff --git a/docs/ejb-over-ssl.mdtext b/docs/ejb-over-ssl.mdtext
deleted file mode 100644
index 8dd5cb9..0000000
--- a/docs/ejb-over-ssl.mdtext
+++ /dev/null
@@ -1,96 +0,0 @@
-Title: EJB over SSL
-
-It is possible to setup client/server requests over SSL.  EJB requests from a remote client can happen two different ways:
-
- - **https** for when an EJB is running in TomEE
- - **ejbds** for when an EJB is running in OpenEJB Standalone
-
-Note, TomEE can be setup to support **ejbds**.
-
-# https
-
-First, you'll need to setup Tomcat (TomEE) with SSL as described here:
-
-  [http://tomcat.apache.org/tomcat-7.0-doc/ssl-howto.html](http://tomcat.apache.org/tomcat-7.0-doc/ssl-howto.html)
-
-Once that is done and the `tomee` webapp can be accessed with `https`, an EJB client can invoke over `https` using the following
-`InitialContext` setup:
-
-
-    Properties p = new Properties();
-    p.put("java.naming.factory.initial", "org.apache.openejb.client.RemoteInitialContextFactory");
-    p.put("java.naming.provider.url", "https://127.0.0.1:8443/tomee/ejb");
-    // user and pass optional
-    p.put("java.naming.security.principal", "myuser");
-    p.put("java.naming.security.credentials", "mypass");
-
-    InitialContext ctx = new InitialContext(p);
-
-    MyBean myBean = (MyBean) ctx.lookup("MyBeanRemote");
-
-If you setup Tomcat (TomEE) to use the APR (Apache Portable Runitme) implementation of SSL on the server side, and you have connection issues like connection reset, you'll have to set 'https.protocols' system property.
-'https.protocols' property must be set according to the SSLProtocol parameter of the HTTPS connector configuration :
-
-[http://tomcat.apache.org/tomcat-7.0-doc/config/http.html][1]
-
-You can also have a look a this : 
-
-[http://docs.oracle.com/javase/1.4.2/docs/guide/plugin/developer_guide/faq/troubleshooting.html][2]
-
-# ejbds
-
-The SSL version of the `ejbd` protocol is called `ejbds` and is enabled and setup in OpenEJB Standalone by default.
-
-Its configuration `conf/ejbds.properties` looks like this:
-
-    server      = org.apache.openejb.server.ejbd.EjbServer
-    bind        = 127.0.0.1
-    port        = 4203
-    disabled    = false
-    threads     = 200
-    backlog     = 200
-    secure      = true
-    discovery   = ejb:ejbds://{bind}:{port}
-
-To access this service from a remote client, the `InitialContext` would be setup like the following:
-
-    Properties p = new Properties();
-    p.put("java.naming.factory.initial", "org.apache.openejb.client.RemoteInitialContextFactory");
-    p.put("java.naming.provider.url", "ejbd://localhost:4201");
-    // user and pass optional
-    p.put("java.naming.security.principal", "myuser");
-    p.put("java.naming.security.credentials", "mypass");
-
-    InitialContext ctx = new InitialContext(p);
-
-    MyBean myBean = (MyBean) ctx.lookup("MyBeanRemote");
-
-## Changing the Cipher Suite
-[This is a pending feature](https://issues.apache.org/jira/browse/OPENEJB-1856)
-By default, the ejbds protocol connects with SSL_DH_anon_WITH_RC4_128_MD5. That means your connection is encrypted and the integrity of the transmission is verified. However, this only protects your from eavesdroppers, it offers absolutely zero protection from Man in the Middle attacks. This sort of attack could be pulled off without your knowledge and the attacker has the ability to intercept, monitor, and even modify your messages. If the attacker could control a router on your connection path, this attack could be trivially pulled off with nothing more but the OpenEJB server and client.
-
-To secure your connections against this sort of attack, your client can cryptographically prove it's talking to the correct server before sending any data. To do this, simply select one or more secure cipher suites that your J2SE provider supports from [this listing](http://docs.oracle.com/cd/E19728-01/820-2550/cipher_suites.html).
-
-You must now instruct the client and server to use that suite.
-
-On the server:
-
-    server      = org.apache.openejb.server.ejbd.EjbServer
-    bind        = 127.0.0.1
-    port        = 4203
-    disabled    = false
-    threads     = 200
-    backlog     = 200
-    secure      = true
-    enabledCipherSuites = TLS_RSA_WITH_AES_256_CBC_SHA,TLS_RSA_WITH_AES_128_CBC_SHA
-    discovery   = ejb:ejbds://{bind}:{port}
-
-On the client, you must supply a property:
-
-    -Dopenejb.client.enabledCipherSuites=TLS_RSA_WITH_AES_256_CBC_SHA,TLS_RSA_WITH_AES_128_CBC_SHA
-
-The final piece is to make sure your server has available a private certificate that the the client can trust. This can be certificate from an authority or a self signed certificate. The javax.net.ssl.trustStore and javax.net.ssl.keyStore JVM properties [are used to set this up.](http://fusesource.com/docs/broker/5.3/security/SSL-SysProps.html)
-
-
-  [1]: http://tomcat.apache.org/tomcat-7.0-doc/config/http.html
-  [2]: http://docs.oracle.com/javase/1.4.2/docs/guide/plugin/developer_guide/faq/troubleshooting.html
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/tomee/blob/c3f8984b/docs/ejb-ref.mdtext
----------------------------------------------------------------------
diff --git a/docs/ejb-ref.mdtext b/docs/ejb-ref.mdtext
deleted file mode 100644
index 01b9c3b..0000000
--- a/docs/ejb-ref.mdtext
+++ /dev/null
@@ -1,47 +0,0 @@
-Title: ejb-ref
-<a name="ejb-ref-Viaannotation"></a>
-#  Via annotation
-
-    package org.superbiz.refs;
-
-    import javax.ejb.EJB;
-    import javax.ejb.Stateless;
-    import javax.naming.InitialContext;
-
-    @Stateless
-    @EJB(name = "myFooEjb", beanInterface = FooRemote.class)
-    public class MyEjbRemoteRefBean implements MyBeanInterface {
-
-        @EJB
-        private BarRemote myBarEjb;
-
-        public void someBusinessMethod() throws Exception {
-            if (myBarEjb == null) throw new NullPointerException("myBarEjb not injected");
-
-            // 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");
-        }
-    }
-
-
-<a name="ejb-ref-Viaxml"></a>
-# Via xml
-
-The above @EJB annotation usage is 100% equivalent to the following xml.
-
-    <ejb-ref>
-        <ejb-ref-name>myFooEjb</ejb-ref-name>
-        <remote>org.superbiz.refs.FooRemote</remote>
-    </ejb-ref>
-    <ejb-ref>
-
-    <ejb-ref-name>org.superbiz.refs.MyEjbRemoteRefBean/myBarEjb</ejb-ref-name>
-        <remote>org.superbiz.refs.BarRemote</remote>
-        <injection-target>
-          <injection-target-class>org.superbiz.refs.MyEjbRemoteRefBean</injection-target-class>
-          <injection-target-name>myBarEjb</injection-target-name>
-        </injection-target>
-    </ejb-ref>
-

http://git-wip-us.apache.org/repos/asf/tomee/blob/c3f8984b/docs/ejb-refs.mdtext
----------------------------------------------------------------------
diff --git a/docs/ejb-refs.mdtext b/docs/ejb-refs.mdtext
deleted file mode 100644
index c60c634..0000000
--- a/docs/ejb-refs.mdtext
+++ /dev/null
@@ -1,174 +0,0 @@
-Title: EJB Refs
-
-TomEE complains it doesn't know the container type, so I added type="javax.naming.InitialContext" and it worked (mostly).
-<a name="EJBRefs-Referencingabeaninanotherjar(withannotations)"></a>
-## Referencing a bean in another jar (with annotations)
-
-When using annotations to reference a bean from another ejb in your ear you
-have to supplement the @EJB reference with a small chunk of xml in the
-ejb-jar.xml of the referring bean.
-
-So in ejb app A colorsApp.jar you have this bean:
-
-
-    package com.foo.colors;
-    
-    import javax.ejb.Stateless;
-    
-    @Stateless
-    public class OrangeBean implements OrangeRemote {
-    }
-
-
-Then in ejb app B shapesApp.jar you have this bean with a reference to
-OrangeRemote:
-
-
-    package com.foo.shapes;
-    
-    import javax.ejb.Stateless;
-    import com.foo.colors.OrangeRemote;
-    
-    @Stateless
-    public class SquareBean implements SquareRemote {
-        @EJB OrangeRemote orangeRemote;
-    }
-
-
-To hook this reference up you need to override this ref and add more info
-in the ejb-jar.xml of shapesApp.jar as follows:
-
-
-    <ejb-jar>
-      <enterprise-beans>
-    
-        <session>
-          <ejb-name>SquareBean</ejb-name>
-          <ejb-ref>
-    	<ejb-ref-name>com.foo.shapes.SquareBean/orangeRemote</ejb-ref-name>
-    	<ejb-link>colorsApp.jar#OrangeBean</ejb-link>
-          </ejb-ref>
-        </session>
-    
-      </enterprise-beans>
-    </ejb-jar>
-
-
-<a name="EJBRefs-Referencingabeaninanotherjar(xmlonly,noannotations)"></a>
-## Referencing a bean in another jar (xml only, no annotations)
-
-The same basic approach applies and dependency injection is still possible,
-however more information must be described in the xml.
-
-
-In ejb app A colorsApp.jar you have this bean:
-
-
-    package com.foo.colors;
-    
-    import javax.ejb.Stateless;
-    
-    @Stateless
-    public class OrangeBean implements OrangeRemote {
-    }
-
-
-Then in ejb app B shapesApp.jar -- note there is no @EJB annotation:
-
-
-    package com.foo.shapes;
-    
-    import javax.ejb.Stateless;
-    import com.foo.colors.OrangeRemote;
-    
-    @Stateless
-    public class SquareBean implements SquareRemote {
-        OrangeRemote orangeRemote;
-    }
-
-
-Here's how you would hook this reference up, injection and all, with just
-xml.  The following would be added to the ejb-jar.xml of shapesApp.jar:
-
-
-    <ejb-jar>
-      <enterprise-beans>
-
-        <session>
-          <ejb-name>SquareBean</ejb-name>
-          <ejb-ref>
-            <ejb-ref-name>com.foo.shapes.SquareBean/orangeRemote</ejb-ref-name>
-            <ejb-ref-type>Session</ejb-ref-type>
-            <remote>com.foo.colors.OrangeRemote</remote>
-            <ejb-link>colorsApp.jar#OrangeBean</ejb-link>
-            <injection-target>
-              <injection-target-class>com.foo.shapes.SquareBean</injection-target-class>
-              <injection-target-name>orangeRemote</injection-target-name>
-            </injection-target>
-          </ejb-ref>
-        </session>
-
-      </enterprise-beans>
-    </ejb-jar>
-
-
-Note that the value of <ejb-ref-name> could actually be anything and the
-above example would still work as there is no annotation that needs to
-match the <ejb-ref-name> and no one will likely be looking up the EJB as
-it's injected.
-
-# Referencing a bean in another server
-
-As of OpenEJB 4.0.0-beta-3, server to server references work.
-
-First we need to configure and name the InitialContext that will be used to satisfy the lookup to the other server.
-
-In this example we are calling our InitialContext `shoe` for fun.
-
-    <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-    <openejb>
-
-      <JndiProvider id="shoe" type="javax.naming.InitialContext">
-        java.naming.provider.url = ejbd://localhost:4201
-        java.naming.factory.initial = org.apache.openejb.client.RemoteInitialContextFactory
-      </JndiProvider>
-
-    </openejb>
-
-Declaring the `@EJB` reference is then done using a `mappedName`  that references the named `InitialContext`
-
-    public class BlueBean implements BlueRemote {
-
-        @EJB(mappedName = "jndi:ext://shoe/OrangeBeanRemote")
-        private OrangeRemote orangeRemote;
-
-        public void hasOrangeRemote() {
-            Assert.assertNotNull("orangeRemote is null", orangeRemote);
-            assertEquals("olleh", orangeRemote.echo("hello"));
-        }
-    }
-
-Specifically, the `mappedName` syntax is as follows:
-
- - jndi:ext://`<contextId>`/`<jndiName>`
-
-
-## Referencing a bean in "many" servers
-
-Note the above also works with the various forms of failover that TomEE supports.
-
-If say, there are two servers that have the `OrangeBeanRemote` bean, you could expand the `<JndiProvider>` delcaration like so:
-
-      <JndiProvider id="shoe" type="javax.naming.InitialContext">
-        java.naming.provider.url = failover:ejbd://192.168.1.20:4201,ejbd://192.168.1.30:4201
-        java.naming.factory.initial = org.apache.openejb.client.RemoteInitialContextFactory
-      </JndiProvider>
-
-In the event that the `ejbd://192.168.1.20:4201` server cannot be contacted, the second server will be tried.
-
-This sort of arangement can also happen dynamicall against a list of servers that continuously grows and shrinks.  The server list is maintained behind
-the scenes using server discovery logic that can function on either UDP or TCP.  See these docs for more details on Failover and Discovery:
-
- - [Multicast Discovery (UDP)](multicast-discovery.html)
- - [Multipulse Discovery (TCP)](multipulse-discovery.html)
- - [Multipoint Discovery (TCP)](multipoint-discovery.html)

http://git-wip-us.apache.org/repos/asf/tomee/blob/c3f8984b/docs/ejb-request-logging.mdtext
----------------------------------------------------------------------
diff --git a/docs/ejb-request-logging.mdtext b/docs/ejb-request-logging.mdtext
deleted file mode 100644
index 76e8695..0000000
--- a/docs/ejb-request-logging.mdtext
+++ /dev/null
@@ -1,94 +0,0 @@
-Title: EJB Request Logging
-Notice:    Licensed to the Apache Software Foundation (ASF) under one
-           or more contributor license agreements.  See the NOTICE file
-           distributed with this work for additional information
-           regarding copyright ownership.  The ASF licenses this file
-           to you under the Apache License, Version 2.0 (the
-           "License"); you may not use this file except in compliance
-           with the License.  You may obtain a copy of the License at
-           .
-             http://www.apache.org/licenses/LICENSE-2.0
-           .
-           Unless required by applicable law or agreed to in writing,
-           software distributed under the License is distributed on an
-           "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-           KIND, either express or implied.  See the License for the
-           specific language governing permissions and limitations
-           under the License.
-
-Both client-side and server-side request logging is supported and includes various invocation times aimed at helping to identify where time
-is going in a request.
-
-## Client-side
-
-On the client requests/responses are logged on java.util.logging `FINEST` level in category `OpenEJB.client`.  The code is similar to the following:
-
-    final long time = System.nanoTime() - start;
-    final String message = String.format("Invocation %sns - %s - Request(%s) - Response(%s)", time, conn.getURI(), req, res);
-    logger.log(Level.FINEST, message);
-
-Note that the check to see if FINEST is enabled is cached for performance reasons, so it must be set at VM startup.
-
-## Server-side
-
-On the server requests/responses are logged in java.util.logging `FINE` in category`"OpenEJB.server.remote.ejb`.  The code for that
-is similar to this:
-
-    logger.fine("EJB REQUEST: " + req + " -- RESPONSE: " + res);
-
-## Request times
-
-Three times are tracked per request and logged in the above statements as part of the formatting of the EJB Response.  They're best understood in reverse:
-
- - **Container time** -- this is the raw time of invoking the bean including its 
-interceptors and any transaction begin/commit time.  This time is effectively "business logic".
- - **Server time** -- this timer starts the (nano)second the request is seen by the server and
- the (nano)second the response is actually written.  The serverTime minus the containerTime will 
-effectively show you how long serialization and deserialization is taking pre request.
- - **Client time** -- entire begin to end including attempting to contact the server and fully reading the response.  The clientTime minus the serverTime will show network latency for the most part.
-
-The container time and server time are written in the EJB response and visible to the client.  The client will log all three times, the server will log the first two.  All log statements are on a single line.
-
-## Bean-time and JMX Statistics
-
-The above information applies purely to remote EJB calls made over a network.  Calls on `@Remote` or `@Local` interfaces between two components in the same server are not logged.
-
-However, **all** EJB invocations to business methods *or* callbacks like `@PostConstruct` are tracked for statistical analysis.
-By default a floating window of 2000 samples are kept.  The time tracked is purely **bean time** which includes 
-interceptors, decorators and the bean itself, but does not include other container services like transactions or security.  
-
-This information is available in JMX.  A sample JMX ObjectName for a `CounterBean` will look like this:
-
-    openejb.management:J2EEServer=openejb,J2EEApplication=null,EJBModule=StatsModule,StatelessSessionBean=CounterBean,j2eeType=Invocations,name=CounterBean
-
-All beans have the following MBean attributes, listed here in shorthand:
-
- * javax.management.MBeanAttributeInfo[description=, name=InvocationCount, type=long, read-only, descriptor={}]
- * javax.management.MBeanAttributeInfo[description=, name=InvocationTime, type=long, read-only, descriptor={}]
- * javax.management.MBeanAttributeInfo[description=, name=MonitoredMethods, type=long, read-only, descriptor={}]
- * javax.management.MBeanOperationInfo[description=, name=FilterAttributes, returnType=void, signature=[javax.management.MBeanParameterInfo[description="", name=excludeRegex, type=java.lang.String, descriptor={}], javax.management.MBeanParameterInfo[description="", name=includeRegex, type=java.lang.String, descriptor={}]], impact=unknown, descriptor={}]
-
-Then for every method there will be these attributes and operations:
-
- * javax.management.MBeanAttributeInfo[description=, name=someMethod().Count, type=long, read-only, descriptor={}]
- * javax.management.MBeanAttributeInfo[description=, name=someMethod().GeometricMean, type=double, read-only, descriptor={}]
- * javax.management.MBeanAttributeInfo[description=, name=someMethod().Kurtosis, type=double, read-only, descriptor={}]
- * javax.management.MBeanAttributeInfo[description=, name=someMethod().Max, type=double, read-only, descriptor={}]
- * javax.management.MBeanAttributeInfo[description=, name=someMethod().Mean, type=double, read-only, descriptor={}]
- * javax.management.MBeanAttributeInfo[description=, name=someMethod().Min, type=double, read-only, descriptor={}]
- * javax.management.MBeanAttributeInfo[description=, name=someMethod().Percentile01, type=double, read-only, descriptor={}]
- * javax.management.MBeanAttributeInfo[description=, name=someMethod().Percentile10, type=double, read-only, descriptor={}]
- * javax.management.MBeanAttributeInfo[description=, name=someMethod().Percentile25, type=double, read-only, descriptor={}]
- * javax.management.MBeanAttributeInfo[description=, name=someMethod().Percentile50, type=double, read-only, descriptor={}]
- * javax.management.MBeanAttributeInfo[description=, name=someMethod().Percentile75, type=double, read-only, descriptor={}]
- * javax.management.MBeanAttributeInfo[description=, name=someMethod().Percentile90, type=double, read-only, descriptor={}]
- * javax.management.MBeanAttributeInfo[description=, name=someMethod().Percentile99, type=double, read-only, descriptor={}]
- * javax.management.MBeanAttributeInfo[description=, name=someMethod().SampleSize, type=int, read-only, descriptor={}]
- * javax.management.MBeanAttributeInfo[description=, name=someMethod().Skewness, type=double, read-only, descriptor={}]
- * javax.management.MBeanAttributeInfo[description=, name=someMethod().StandardDeviation, type=double, read-only, descriptor={}]
- * javax.management.MBeanAttributeInfo[description=, name=someMethod().Sum, type=double, read-only, descriptor={}]
- * javax.management.MBeanAttributeInfo[description=, name=someMethod().Sumsq, type=double, read-only, descriptor={}]
- * javax.management.MBeanAttributeInfo[description=, name=someMethod().Variance, type=double, read-only, descriptor={}]
- * javax.management.MBeanOperationInfo[description=, name=someMethod().setSampleSize, returnType=void, signature=[javax.management.MBeanParameterInfo[description=, name=p1, type=int, descriptor={}]], impact=unknown, descriptor={}]
- * javax.management.MBeanOperationInfo[description=, name=someMethod().sortedValues, returnType=[D, signature=[], impact=unknown, descriptor={}]
- * javax.management.MBeanOperationInfo[description=, name=someMethod().values, returnType=[D, signature=[], impact=unknown, descriptor={}]

http://git-wip-us.apache.org/repos/asf/tomee/blob/c3f8984b/docs/ejbd-transport.mdtext
----------------------------------------------------------------------
diff --git a/docs/ejbd-transport.mdtext b/docs/ejbd-transport.mdtext
deleted file mode 100644
index f6eedb5..0000000
--- a/docs/ejbd-transport.mdtext
+++ /dev/null
@@ -1,132 +0,0 @@
-Title: Ejbd Transport
-
-The Ejbd Transport allows to remotely access EJBs that have a remote interface.
-Nevertheless it is not based on IIOP.
-
-Ejbd Transport is different using TomEE or OpenEJB.
-
-In OpenEJB it uses openejb http layer and ejbd is configured through ejbd service (same for ejbds).
-So to activate/deactivate them use conf/ejbd(s).properties files. You can set property disabled to true
-if you don't want them to be started.
-
-In TomEE the transport is the Tomcat one. It uses a servlet brought by TomEE webapp.
-Here is the servlet as defined in TomEE webapp:
-
-    <servlet>
-        <servlet-name>ServerServlet</servlet-name>
-        <servlet-class>org.apache.openejb.server.httpd.ServerServlet</servlet-class>
-    </servlet>
-
-    <servlet-mapping>
-        <servlet-name>ServerServlet</servlet-name>
-        <url-pattern>/ejb/*</url-pattern>
-    </servlet-mapping>
-
-
-You can easily remove it if you don't use remote EJBs. Another way is to deactivate the servlet
-using the "activated" init parameter of the servlet.
-
-Finally you can move this servlet in your own webapp if you want to use a provider url
-containing your webapp context. Simply copy paste the servlet definition in your web.xml
-and set the url mapping to what you want (let say /foo/*). Then use the provider url
-http://&lt;host&gt;:&lt;port&gt;/&lt;webapp context name&gt;/foo
-
-### Remote communication and serialization
-
-Remotely calling EJBs, independent of using Ejbd or other RMI/IIOP based protocols, involves serialization and deserialization of objects.
-Deserializing unknown content coming from an untrusted source imposes a security risk as the stream could be manipulated.
-A much publicized [vulnerability](http://www.kb.cert.org/vuls/id/576313) was found in the commons-collections library which allowed to remotely execute arbitrary code simply by deserializing instances of the class `InvokerTransformer`.
-
-To prevent this risk TomEE and the OpenEJB client since 1.7.4 before deserializing every object checks its class against a configurable blacklist and a whitelist.
-The default black list is defined as `*`, meaning that requests cannot be deserialized at all and the Ejbd transport in fact cannot be used.
-
-The blacklist and whitelist is configured via the system properties:
-
-- `tomee.serialization.class.whitelist`
-- `tomee.serialization.class.blacklist`
-
-You will also find these properties in [System Properties Listing](properties-listing.html)
-
-These rules apply for the whitelist:
-
-- The whitelist has a lower priority than the blacklist. That means a class that is part of the blacklist cannot be whitelisted and will always be refused.
-- If a whitelist is not defined, either by not defining the property at all or defining it with an empty value, every class is on the whitelist. In this case only the blacklist applies.
-- If a whitelist is defined it must be a comma separated list of prefixes of fully qualified class names. Then deserialization of an object fails if its class is not part of this whitelist. A class is on the whitelist if its fully qualified classname is prefixed by one of the values in the whitelist.
-
-These rules apply for the blacklist:
-
-- If the blacklist should be deactivated it must be configured to the value `-`. This will open your system to the serialization vulnerability if you don't configure a whitelist!
-- If the blacklist is not configured its default value is `org.codehaus.groovy.runtime.,org.apache.commons.collections.functors.,org.apache.xalan,java.lang.Process` so that for example the class `org.apache.commons.collections.functors.InvokerTransformer` cannot be deserialized.
-- If the blacklist is configured with an empty value the blacklist is effectively `*`, therefore preventing any Ejbd communication.
-- If you want to blacklist certain classes the property must be configured to a comma separated list of prefixes of fully qualified class names. A class is on the blacklist if its fully qualified classname is prefixed by one of the values in the blacklist.
-
-The default for `tomee.serialization.class.whitelist` is empty, the default for `tomee.serialization.class.blacklist` is `*` since TomEE 1.7.4.
-
-If an EJB request fails because a class is not whitelisted you will find this log entry:
-
-    WARN - "null OEJP/4.7" FAIL "Security error - foo.Bar is not whitelisted as deserializable, prevented before loading it." - Debug for StackTrace
-
-If you trust this class and want to support serialization in remote communication you have to configure these properties appropriately both on server side as well as on client side.
-
-If you only want to support serialization of the classes `foo.Bar` and `foo.Baz` you can configure the properties like this:
-
-    tomee.serialization.class.whitelist = foo.Bar,foo.Baz
-    tomee.serialization.class.blacklist = -
-
-If you trust all classes in the package `foo` define the properties like this:
-
-    tomee.serialization.class.whitelist = foo.
-    tomee.serialization.class.blacklist = -
-
-(Don't forget the trailing `.` after foo, as it will also whitelist all classes in the package `foo2` otherwise.)
-
-If you trust all classes in the package `foo` except the class `foo.Bar` you have to configure the properties like this:
-
-    tomee.serialization.class.whitelist = foo.
-    tomee.serialization.class.blacklist = foo.Bar
-
-
-
-#### Revert to behavior of TomEE 1.7.3
-
-TomEE 1.7.3 already contained a fixed blacklist that was not configurable and contained the packages org.codehaus.groovy.runtime, org.apache.commons.collections.functors and org.apache.xalan including subpackages and the class java.lang.Process.
-If you know that your applications runs on TomEE 1.7.3 but does not on TomEE 1.7.4 showing the aforementioned log message, you can define the configuration so that the serialization will work in the same way as it did with TomEE 1.7.3:
-
-    tomee.serialization.class.whitelist = 
-    tomee.serialization.class.blacklist = org.codehaus.groovy.runtime.,org.apache.commons.collections.functors.,org.apache.xalan,java.lang.Process
-
-Please note that with this configuration your server may be vulnerable to Java serialization attacks not yet identified by the Zero Day initiative. 
-Also note that the following versions of the affected libraries have been patched and approved by the Zero Day initiative and *may* be safe to deserialize.
-
-- Groovy 2.4.4
-- Commons Collections 3.2.2
-- Xalan 2.7.2
-
-As Ejbd transport is tunneled over HTTP please make sure that the `ServerServlet` is not publicly accessible.
-When the applications running on TomEE do not package the `ServerServlet` themselves ensure that the URL http://&lt;host&gt;:&lt;port&gt;/tomee/ejb is not accessible from untrusted sources.
-
-If your applications package declare it in their own web.xml make sure that the respective URL is not accessible from untrusted sources.
-
-#### Revert to behavior of TomEE 1.7.2
-
-TomEE 1.7.2 did not have any kind of blacklist when deserializing objects over Ejbd.
-If you want to revert to this behavior you can simply deactivate the blacklist with this configuration:
-
-    tomee.serialization.class.whitelist =
-    tomee.serialization.class.blacklist = -
-
-Note that this configuration makes your system highly vulnerable to serialization attacks!
-Consider your system as unsafe!
-
-#### Remote communication and Arquillian tests
-
-The mechanism described above principally also works when running Arquillian tests.
-As the Ejbd transport is already used for deploying applications all Arquillian tests would fail with the default settings.
-
-Therefore the TomEE Arquillian adapter automatically starts the container so that all classes except for a set of well-know dangerous classes are whitelisted.
-
-As Ejbd is by default disabled since TomEE 7.0.0, the TomEE Arquillian adapter automatically activates it when starting a remote container.
-
-#### Remote communication and the TomEE Maven Plugin
-
-The same mentioned above on Arquillian and TomEE is also valid when using the TomEE Maven Plugin.
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/tomee/blob/c3f8984b/docs/embedded-and-remotable.mdtext
----------------------------------------------------------------------
diff --git a/docs/embedded-and-remotable.mdtext b/docs/embedded-and-remotable.mdtext
deleted file mode 100644
index 916432c..0000000
--- a/docs/embedded-and-remotable.mdtext
+++ /dev/null
@@ -1,179 +0,0 @@
-Title: Embedded and Remotable
-<a name="EmbeddedandRemotable-Overview"></a>
-# Overview
-
-This example shows how to use OpenEJB3's remoting capabilities in an
-embedded scenario.  By remoting we mean that you wish to allow *clients in
-other vms* access your ejbs.  _Note, you do not need to go to this extreme
-to unit test ejbs with remote interfaces._
-
-The basic recipe is the same for a standard embedded scenario but with
-these added ingreditents:
-
-  * *openejb.embedded.remotable* property
-  * *openejb-ejbd* jar
-
-While creating the InitialContext, pass in the openejb.embedded.remotable
-property with the value of "true".  When this is seen by the
-LocalInitialContextFactory, it will boot up the Server ServiceManager in
-the VM which will in turn look for ServerServices in the classpath.
-
-Provided you have the openejb-ejbd jar in your classpath along with it's
-dependencies (openejb-server, openejb-client, openejb-core), then those
-services will be brought online and remote clients will be able to connect
-into your vm and invoke beans.
-
-If you want to add more ServerServices such as the http version of the ejbd
-protocol you'd simply add the openejb-httpejbd jar to your classpath.  A
-number of ServerServices are available currently:
-
-  * openejb-ejbd
-  * openejb-http
-  * openejb-telnet
-  * openejb-derbynet
-  * openejb-hsql
-  * openejb-activemq
-
-_The source for this example is in the "telephone-stateful" directory
-located in the [openejb-examples.zip](openejb:download.html)
- available on the [download page](http://tomee.apache.org/downloads.html)._
-
-{note}
-If your goal is simply to unit test beans with remote interfaces, this is
-*not* the right example for you.  The LocalInitialContextFactory completely
-supports remote interfaces and all spec required pass-by-value
-(serialization) semantics without the need for network sockets.  This
-example shows the use of OpenEJB in an embedded environment where
-connection *outside* the 
-vm is required.{note}
-
-<a name="EmbeddedandRemotable-TheCode"></a>
-# The Code
-
-For this example we have a simple Stateful bean called TelephoneBean as
-defined below.	As a simple way of demonstrating the state we have to
-methods: speak and listen.  You call _speak_ and pass in some text, then
-you call _listen_ to get your answer.
-
-<a name="EmbeddedandRemotable-bean"></a>
-## bean
-
-{snippet:id=code|url=openejb3/examples/telephone-stateful/src/main/java/org/superbiz/telephone/TelephoneBean.java|lang=java}
-
-<a name="EmbeddedandRemotable-businessinterface"></a>
-## business interface
-
-{snippet:id=code|url=openejb3/examples/telephone-stateful/src/main/java/org/superbiz/telephone/Telephone.java|lang=java}
-
-{tip:title=EJB3 Notes}
-The bean class uses the annotation *@Remote* but does not specify a list of
-interfaces as is normally required.  Per EJB3 rules, if the bean implements
-exactly *one business interface* it may use @Remote with no other values
-and that business interface is then implied to be a remote business
-interface.  The same rule applies to identical usage of @Local.
-
-The critical thing to know is that if you add another interface the rules
-change and require that you specify both interfaces in the @Remote
-annotation as in @Remote(\{Telephone.class, SecondInterface.class\}).
-{tip}
-
-<a name="EmbeddedandRemotable-Embedding"></a>
-# Embedding
-
-We're going to embed OpenEJB3 into a plain JUnit TestCase as a simple means
-of demonstrating the remote capabilities.  We'll do the embedding in our
-test setUp method, then will make two test methods: 
- - one for invoking the bean's remote interface via the
-*LocalInitialContextFactory* which goes straight against the embedded
-container system
- - one for invoking the bean's remote interface via the
-*RemoteInitialContextFactory* which connects to a Socket and communicates
-to the embedded container system over the ejbd protocol.
-
-<a name="EmbeddedandRemotable-setUp"></a>
-## setUp
-
-{snippet:id=setup|url=openejb3/examples/telephone-stateful/src/test/java/org/superbiz/telephone/TelephoneTest.java|lang=java}
-
-## LocalInitialContextFactory: making in-vm calls to a remote business
-interface
-
-{snippet:id=localcontext|url=openejb3/examples/telephone-stateful/src/test/java/org/superbiz/telephone/TelephoneTest.java|lang=java}
-
-## RemoteInitialContextFactory: making networked calls to a remote
-business interface
-
-This is the part you would want to do in apps that are running a different
-VM than the one in which the ejb container is embedded.  These "client" VMs
-need only have the the *openejb-client jar* in their classpath and connect
-to OpenEJB via the RemoteInitialContextFactory like any other remote EJB
-client.
-
-{snippet:id=remotecontext|url=openejb3/examples/telephone-stateful/src/test/java/org/superbiz/telephone/TelephoneTest.java|lang=java}
-
-<a name="EmbeddedandRemotable-Mavensetup"></a>
-#  Maven setup
-
-{snippet:id=desc|url=openejb3/examples/telephone-stateful/pom.xml}
-
-{snippet:id=openejbdep|url=openejb3/examples/telephone-stateful/pom.xml|lang=xml}
-
-
-<a name="EmbeddedandRemotable-Running"></a>
-#  Running
-
-Running the example is fairly simple.  In the "telephone-stateful"
-directory of the [examples zip](openejb:download.html)
-, just run:
-
-$ mvn clean install
-
-Which should create output like the following.
-
-
-    -------------------------------------------------------
-     T E S T S
-    -------------------------------------------------------
-    Running org.superbiz.telephone.TelephoneTest
-    Apache OpenEJB 3.0    build: 20080408-04:13
-    http://tomee.apache.org/
-    INFO - openejb.home =
-/Users/dblevins/work/openejb-3.0/examples/telephone-stateful
-    INFO - openejb.base =
-/Users/dblevins/work/openejb-3.0/examples/telephone-stateful
-    INFO - Configuring Service(id=Default Security Service,
-type=SecurityService, provider-id=Default Security Service)
-    INFO - Configuring Service(id=Default Transaction Manager,
-type=TransactionManager, provider-id=Default Transaction Manager)
-    INFO - Configuring Service(id=Default JDK 1.3 ProxyFactory,
-type=ProxyFactory, provider-id=Default JDK 1.3 ProxyFactory)
-    INFO - Found EjbModule in classpath:
-/Users/dblevins/work/openejb-3.0/examples/telephone-stateful/target/classes
-    INFO - Configuring app:
-/Users/dblevins/work/openejb-3.0/examples/telephone-stateful/target/classes
-    INFO - Configuring Service(id=Default Stateful Container, type=Container,
-provider-id=Default Stateful Container)
-    INFO - Auto-creating a container for bean TelephoneBean:
-Container(type=STATEFUL, id=Default Stateful Container)
-    INFO - Loaded Module:
-/Users/dblevins/work/openejb-3.0/examples/telephone-stateful/target/classes
-    INFO - Assembling app:
-/Users/dblevins/work/openejb-3.0/examples/telephone-stateful/target/classes
-    INFO - Jndi(name=TelephoneBeanRemote) --> Ejb(deployment-id=TelephoneBean)
-    INFO - Created Ejb(deployment-id=TelephoneBean, ejb-name=TelephoneBean,
-container=Default Stateful Container)
-    INFO - Deployed
-Application(path=/Users/dblevins/work/openejb-3.0/examples/telephone-stateful/target/classes)
-      ** Starting Services **
-      NAME		       IP	       PORT  
-      ejbd		       127.0.0.1       4201  
-      admin thread	       127.0.0.1       4200  
-    -------
-    Ready!
-    Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.89 sec
-    
-    Results :
-    
-    Tests run: 2, Failures: 0, Errors: 0, Skipped: 0
-
-

http://git-wip-us.apache.org/repos/asf/tomee/blob/c3f8984b/docs/embedded-configuration.mdtext
----------------------------------------------------------------------
diff --git a/docs/embedded-configuration.mdtext b/docs/embedded-configuration.mdtext
deleted file mode 100644
index 601719d..0000000
--- a/docs/embedded-configuration.mdtext
+++ /dev/null
@@ -1,132 +0,0 @@
-Title: Embedded Configuration
-
-<a name="EmbeddedConfiguration-Defaults,OverridesandOrder"></a>
-#  Defaults, Overrides and Order
-
-When booting up OpenEJB for testing via the `LocalInitialContextFactory`
-or the newer `EJBContainer.createEJBContainer()` API part of EJB 3.1 there
-is quite a bit of flexibility to how things are configured.
-
-OpenEJB will function fine with no configuration at all and will happily
-create things as needed and select defaults for everything.  So in a real
-sense configuration is all about overriding those defaults.  There are
-several places to put your overrides and an a specific order how they are
-applied.  Here they are in order of preference; 1 = highest, 5 = lowest.
-
-{row
-{span8
-**InitialContext**
-
-1. InitialContext properties
-1. jndi.properties from the classpath
-1. System properties
-1. openejb.xml declarations/properties
-1. service-jar.xml declarations/properties (internal concept)
-}
-
-{span8
-**EJBContainer API**
-1. EJBContainer.createEJBContainer(Map) entries
-1. System properties
-1. openejb.xml declarations/properties
-1. service-jar.xml declarations/properties (internal concept)
-
-}
-}
-
-It opens up some interesting possibilities in how you configure your
-environment.  You could do 100% of your configuration in your test case via
-InitialContext propertes, or you could do say 80% in a jndi.properties file
-or openejb.xml file and 20% in your test case via InitialContext
-properties.  You can put 100% of your configuration in a `jndi.properties` or
-`openejb.xml` file and override them via `InitialContext` properties.
-
-You can manage the properties how you wish and there is no need for
-redundant definitions if you do not want them.
-
-<a name="EmbeddedConfiguration-Whatisconfigurable?"></a>
-#  What is configurable?
-
-Everything you can configure via an openejb.xml (minus the <Deployment>
-element) can be configured/overridden via properties. See [Configuring Containers in Tests](configuring-containers-in-tests.html)
- and [Configuring DataSources in Tests](configuring-datasources-in-tests.html).
-
-Everything in your logging.properties can be configured/overridden via
-properties.  See [Configuring Logging in Tests](configuring-logging-in-tests.html).
-
-The properties of persistence units declared in a persistence.xml can be
-configured/overridden via properties.  See [Configuring PersistenceUnits in Tests](configuring-persistenceunits-in-tests.html).
-
-OpenEJB has many flags that can also be set as properties.  See [OpenEJB Properties](properties-listing.html)
- for details on those.
-
-<a name="EmbeddedConfiguration-ExampleofusingInitialContextproperties"></a>
-# Example of using InitialContext properties
-
-
-    Properties p = new Properties();
-    
-    // set the initial context factory
-    p.put("java.naming.factory.initial ", "org.apache.openejb.client.LocalInitialContextFactory");
-    
-    // change some logging
-    p.put("log4j.category.OpenEJB.options ", " debug");
-    p.put("log4j.category.OpenEJB.startup ", " debug");
-    p.put("log4j.category.OpenEJB.startup.config ", " debug");
-    
-    // create some resources
-    p.put("movieDatabase", "new://Resource?type=DataSource");
-    p.put("movieDatabase.JdbcDriver ", " org.hsqldb.jdbcDriver");
-    p.put("movieDatabase.JdbcUrl ", " jdbc:hsqldb:mem:moviedb");
-    
-    // override properties on your "movie-unit" persistence unit
-    p.put("movie-unit.hibernate.dialect ", "org.hibernate.dialect.HSQLDialect");
-    
-    // set some openejb flags
-    p.put("openejb.jndiname.format ", " {ejbName}/{interfaceClass}");
-    p.put("openejb.descriptors.output ", " true");
-    p.put("openejb.validation.output.level ", " verbose");
-    
-    InitialContext initialContext = new InitialContext(p);
-
-
-<a name="EmbeddedConfiguration-Exampleofusingjndi.properties"></a>
-# Example of using jndi.properties
-
-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,
-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.
-
-    # set the initial context factory
-    java.naming.factory.initial = org.apache.openejb.client.LocalInitialContextFactory
-    
-    # change some logging
-    log4j.category.OpenEJB.options = debug
-    log4j.category.OpenEJB.startup = debug
-    log4j.category.OpenEJB.startup.config = debug
-    
-    # create some resources
-    movieDatabase = new://Resource?type=DataSource
-    movieDatabase.JdbcDriver = org.hsqldb.jdbcDriver
-    movieDatabase.JdbcUrl = jdbc:hsqldb:mem:moviedb
-    
-    # override properties on your "movie-unit" persistence unit
-    movie-unit.hibernate.dialect = org.hibernate.dialect.HSQLDialect
-    
-    # set some openejb flags
-    openejb.jndiname.format = {ejbName}/{interfaceClass}
-    openejb.descriptors.output = true
-    openejb.validation.output.level = verbose
-
-
-Then OpenEJB can be booted via the `InitialContext` as normal.  Properties
-can still be used to override any of the above properties:
-
-
-    Properties p = new Properties();
-    
-    p.put("openejb.validation.output.level ", " medium");
-    
-    InitialContext initialContext = new InitialContext(p);
-

http://git-wip-us.apache.org/repos/asf/tomee/blob/c3f8984b/docs/embedding.mdtext
----------------------------------------------------------------------
diff --git a/docs/embedding.mdtext b/docs/embedding.mdtext
deleted file mode 100644
index d6f26e2..0000000
--- a/docs/embedding.mdtext
+++ /dev/null
@@ -1,26 +0,0 @@
-Title: Embedding
-The basic process for embedding OpenEJB:
-
-1. Add the OpenEJB libraries to your classpath
-1. Ensure your EJB modules are discoverable
-1. Use the LocalInitialContextFactory to boot OpenEJB
-
-
-<a name="Embedding-Importantdocs"></a>
-## Important docs
-
-- [Application discovery via the classpath](application-discovery-via-the-classpath.html)
-- [Embedded Configuration](embedded-configuration.html)
-- [Configuring DataSources in Tests](configuring-datasources-in-tests.html)
-- [Configuring PersistenceUnits in Tests](configuring-persistenceunits-in-tests.html)
-- [Configuring Containers in Tests](configuring-containers-in-tests.html)
-- [Configuring Logging in Tests](configuring-logging-in-tests.html)
-- [Alternate Descriptors](alternate-descriptors.html)
-- [Unit Testing Transactions](unit-testing-transactions.html)
-- [TestCase with TestBean inner-class](testcase-with-testbean-inner-class.html)
-- [TestCase Injection (@LocalClient)](local-client-injection.html)
-
-<a name="Embedding-Examples"></a>
-## Examples
-
-{include:Examples Table}

http://git-wip-us.apache.org/repos/asf/tomee/blob/c3f8984b/docs/failover-logging.mdtext
----------------------------------------------------------------------
diff --git a/docs/failover-logging.mdtext b/docs/failover-logging.mdtext
deleted file mode 100644
index 160069c..0000000
--- a/docs/failover-logging.mdtext
+++ /dev/null
@@ -1,38 +0,0 @@
-Setting the following logging category to "debug" will open up some new logging information.
-
-    log4j.category.OpenEJB.server.discovery = debug
-
-Or more specifically as:
-
-    log4j.category.OpenEJB.server.discovery.multipoint = debug
-    log4j.category.OpenEJB.server.discovery.multicast = debug
-
-The nature of the debug output is to display all configuration information at startup:
-
-    DEBUG - Using default 'heart_rate=500'
-    DEBUG - Using default 'max_missed_heartbeats=10'
-    DEBUG - Using default 'max_reconnect_delay=30000'
-    DEBUG - Using default 'reconnect_delay=5000'
-    DEBUG - Using default 'exponential_backoff=0'
-    DEBUG - Using default 'max_reconnect_attempts=10'
-    INFO - Created Tracker{group='default', groupPrefix='default:', heartRate=500, maxMissedHeartbeats=10, reconnectDelay=5000, maxReconnectDelay=30000, maxReconnectAttempts=10, exponentialBackoff=0, useExponentialBackOff=false, registeredServices=0, discoveredServices=0}
-
-Changing the configuration should reflect in the logging as follows:
-
-    INFO - Using 'heart_rate=200'
-    INFO - Using 'max_missed_heartbeats=2'
-    DEBUG - Using default 'max_reconnect_delay=30000'
-    DEBUG - Using default 'reconnect_delay=5000'
-    DEBUG - Using default 'exponential_backoff=0'
-    DEBUG - Using default 'max_reconnect_attempts=10'
-    INFO - Created Tracker{group='default', groupPrefix='default:', heartRate=200, maxMissedHeartbeats=2, reconnectDelay=5000, maxReconnectDelay=30000, maxReconnectAttempts=10, exponentialBackoff=0, useExponentialBackOff=false, registeredServices=0, discoveredServices=0}
-
-As well as any events at runtime:
-
-    DEBUG - Expired Service{uri=green://localhost:0, broadcastString='default:green://localhost:0&#39;} Timeout{lastSeen=-5005, threshold=5000}
-
-    DEBUG - Added Service{uri=green://localhost:0}
-
-    DEBUG - Removed Service{uri=green://localhost:0}
-
-

http://git-wip-us.apache.org/repos/asf/tomee/blob/c3f8984b/docs/faq.mdtext
----------------------------------------------------------------------
diff --git a/docs/faq.mdtext b/docs/faq.mdtext
deleted file mode 100644
index dea9cf5..0000000
--- a/docs/faq.mdtext
+++ /dev/null
@@ -1,96 +0,0 @@
-Title: FAQ
-<a name="FAQ-&nbsp;General"></a>
-## &nbsp;General
-
-&nbsp;
-
-<a name="FAQ-WhatspecversiondoesOpenEJBsupport?"></a>
-### What spec version does OpenEJB support?
-
-OpenEJB supports the Enterprise JavaBeans 3.0 specification and previous
-versions 2.1, 2.0 and 1.1.
-
-<a name="FAQ-Idon'tplantouseEJBs,sowhywouldIembedOpenEJBintoTomcat."></a>
-###  I don't plan to use EJBs, so why would I embed OpenEJB into Tomcat.
-
-Adding OpenEJB to Tomcat gives servlets several new Java EE 5 capabilities
-such as JPA, JAX-WS, JMS, J2EE Connectors, transactions, and more as well
-as enhancing the injection features of Tomcat 6 to now support injection of
-JavaEE objects like Topics, Queues, EntityManagers, JMS
-ConnectionFactories, JavaMail Sessions, as well as simpler data types such
-as Dates, Classes, URI, URL, List, Map, Set, Properties, and more.  In the
-case of Tomcat 5.5 which doesn't support dependency injection at all, even
-more is gained.
-
-<a name="FAQ-CanIrunOpenEJBwithaJVMforanyvendor?"></a>
-### Can I run OpenEJB with a JVM for any vendor?
-
-The Sun, Mac, and IBM vms are regularly tested, however any vm should work.
-
-<a name="FAQ-WhichversionofJavaisrequiredtorunOpenEJB?"></a>
-### Which version of Java is required to run OpenEJB?
-
-Java versions 5 or 6, aka Java 1.5 or 1.6.
-
-<a name="FAQ-DoIneedApacheMaventoworkwithOpenEJB?"></a>
-### Do I need Apache Maven to work with OpenEJB?
-
-Definitely not. Most of the examples include both Maven and Ant build
-files.	OpenEJB is usable as a plain library, much like an embedded
-database like Derby, so it is usable in any application regardless if that
-application is run via Maven, Ant, Intellij, Eclipse, NetBeans, JUnit,
-TestNG, etc.
-
-### Can I start and stop OpenEJB from an IDE? If yes, which IDE is
-supported by OpenEJB?
-
-The short answer is yes.  The basic approach for all embedding scenarios is
-to 1) add OpenEJB to your classpath, and 2) construct your InitialContext
-using org.apache.openejb.client.LocalInitialContextFactory.  The
-LocalInitialContextFactory will boot OpenEJB in your vm and all ejb
-applications visible in the classpath will be deployed. See
-http://tomee.apache.org/embedding-openejb.html for details on how to
-embed openejb in your application and IDE.  See [Application discovery via the classpath](openejbx30:application-discovery-via-the-classpath.html)
- for various ways to have your applications discovered. 
-
-
-###  During embedded testing, how can I externalize all my DataSource
-configuration? 
-
-Create an openejb.xml file in any directory that gets added to your test
-classpath. For maven, something that winds up directly under
-"target/classes/" or "target/test-classes/" will work just fine.  Then in
-your test case do this:
-
-       protected void setUp() throws Exception {
-           Properties properties = new Properties();
-           properties.setProperty(Context.INITIAL_CONTEXT_FACTORY, 
-"org.apache.openejb.client.LocalInitialContextFactory");
-    
-           URL config =
-this.getClass().getClassLoader().getResource("openejb.xml");
-           properties.setProperty("openejb.configuration",
-config.toExternalForm());
-    
-           initialContext = new InitialContext(properties);
-       }
-
-The file itself doesn't have to be called "openejb.xml", you could have a
-few different files like that for different testing scenarios each with a
-name that describes the basic setup.
-
-<a name="FAQ-Container-ManagedPersistence"></a>
-## Container-Managed Persistence
-
-<a name="FAQ-WhatenginedoesOpenEJBuseforCMP?"></a>
-### What engine does OpenEJB use for CMP?
-
-The CMP engine is written as a layer over JPA with OpenJPA doing the
-persistence work.
-
-<a name="FAQ-WhatistheformatfortheCMPmappingfiles?"></a>
-### What is the format for the CMP mapping files?
-
-The standard JPA mapping file and annotations are also used for CMP
-mappings.
-

http://git-wip-us.apache.org/repos/asf/tomee/blob/c3f8984b/docs/features.mdtext
----------------------------------------------------------------------
diff --git a/docs/features.mdtext b/docs/features.mdtext
deleted file mode 100644
index 72b8e33..0000000
--- a/docs/features.mdtext
+++ /dev/null
@@ -1 +0,0 @@
-Title: Features

http://git-wip-us.apache.org/repos/asf/tomee/blob/c3f8984b/docs/from-glassfish-to-tomee.mdtext
----------------------------------------------------------------------
diff --git a/docs/from-glassfish-to-tomee.mdtext b/docs/from-glassfish-to-tomee.mdtext
deleted file mode 100644
index b6aa58d..0000000
--- a/docs/from-glassfish-to-tomee.mdtext
+++ /dev/null
@@ -1,3 +0,0 @@
-# From Glassfish Application Server to TomEE (plus)
-
-This page aims at reporting feedback from users while migrating from Glassfish to Apache TomEE.