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 2012/01/24 05:19:26 UTC

svn commit: r803145 - in /websites/production/openejb: ./ content/ content/examples-trunk/cdi-events/ content/examples-trunk/dynamic-datasource-routing/src/test/java/org/superbiz/dynamicdatasourcerouting/ content/examples-trunk/reload-persistence-unit-...

Author: dblevins
Date: Tue Jan 24 04:19:25 2012
New Revision: 803145

Log:
Publishing merge to openejb site by dblevins

Added:
    websites/production/openejb/content/release-notes.txt
      - copied unchanged from r803144, websites/staging/openejb/trunk/content/release-notes.txt
    websites/production/openejb/content/tomee-1.0.0-beta-1.html
      - copied unchanged from r803144, websites/staging/openejb/trunk/content/tomee-1.0.0-beta-1.html
Modified:
    websites/production/openejb/   (props changed)
    websites/production/openejb/content/downloads.html
    websites/production/openejb/content/examples-trunk/cdi-events/pom.xml
    websites/production/openejb/content/examples-trunk/dynamic-datasource-routing/src/test/java/org/superbiz/dynamicdatasourcerouting/DynamicDataSourceTest.java
    websites/production/openejb/content/examples-trunk/reload-persistence-unit-properties/pom.xml
    websites/production/openejb/content/examples-trunk/reload-persistence-unit-properties/src/test/java/org/superbiz/reloadable/pu/CacheActivationTest.java
    websites/production/openejb/content/examples-trunk/spring-integration/pom.xml
    websites/production/openejb/content/examples-trunk/troubleshooting/README.html
    websites/production/openejb/content/examples-trunk/troubleshooting/src/test/java/org/superbiz/troubleshooting/MoviesTest.java
    websites/production/openejb/content/examples-trunk/webapps/ejb-examples/README.html
    websites/production/openejb/content/examples-trunk/webapps/moviefun/monitor/pom.xml
    websites/production/openejb/content/examples-trunk/webapps/resources-declared-in-webapp/pom.xml
    websites/production/openejb/content/examples-trunk/webapps/rest-example-with-application/pom.xml
    websites/production/openejb/content/examples-trunk/webapps/rest-example/pom.xml
    websites/production/openejb/content/properties-listing.html
    websites/production/openejb/content/sitemap.html

Propchange: websites/production/openejb/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 24 04:19:25 2012
@@ -1 +1 @@
-/websites/staging/openejb/trunk:790824-802991
+/websites/staging/openejb/trunk:790824-803144

Modified: websites/production/openejb/content/downloads.html
==============================================================================
--- websites/production/openejb/content/downloads.html (original)
+++ websites/production/openejb/content/downloads.html Tue Jan 24 04:19:25 2012
@@ -3,7 +3,7 @@
   <head>
 
     <meta charset="utf-8">
-      <title>Downloads</title>
+      <title>Apache TomEE & OpenEJB</title>
     <meta name="description" content="">
     <meta name="author" content="">
 
@@ -13,9 +13,9 @@
     <![endif]-->
 
     <!-- Le styles -->
-    <link href="./bootstrap.css" rel="stylesheet">
-    <link href="./prettify.css" rel="stylesheet">
-    <link href="./bootstrap-mods.css" rel="stylesheet">
+    <link href="bootstrap.css" rel="stylesheet">
+    <link href="prettify.css" rel="stylesheet">
+    <link href="bootstrap-mods.css" rel="stylesheet">
 
     <style type="text/css">
       body {
@@ -25,16 +25,16 @@
 
 
     <!-- Le fav and touch icons -->
-    <link rel="shortcut icon" href="./images/favicon.ico">
-    <link rel="apple-touch-icon" href="./images/apple-touch-icon.png">
-    <link rel="apple-touch-icon" sizes="72x72" href="./images/apple-touch-icon-72x72.png">
-    <link rel="apple-touch-icon" sizes="114x114" href="./images/apple-touch-icon-114x114.png">
+    <link rel="shortcut icon" href="images/favicon.ico">
+    <link rel="apple-touch-icon" href="images/apple-touch-icon.png">
+    <link rel="apple-touch-icon" sizes="72x72" href="images/apple-touch-icon-72x72.png">
+    <link rel="apple-touch-icon" sizes="114x114" href="images/apple-touch-icon-114x114.png">
 
-    <script src="./javascript/prettify.js" type="text/javascript"></script>
-    <script src="./javascript/jquery-latest.js"></script>
+    <script src="javascript/prettify.js" type="text/javascript"></script>
+    <script src="javascript/jquery-latest.js"></script>
     <script src="http://platform.twitter.com/widgets.js" type="text/javascript"></script>
-    <script src="./javascript/common.js"></script>
-    <script src="./javascript/prettyprint.js"></script>
+    <script src="javascript/common.js"></script>
+    <script src="javascript/prettyprint.js"></script>
 
   </head>
 
@@ -43,12 +43,12 @@
     <div class="topbar">
       <div class="fill">
         <div class="container">
-          <a class="brand" href="./index.html">Apache TomEE</a>
+          <a class="brand" href="index.html">Apache TomEE</a>
           <ul class="nav">
-            <li><a href="./index.html">Home</a></li>
-            <li><a href="./downloads.html">Downloads</a></li>
-            <li><a href="./documentation.html">Documentation</a></li>
-            <li><a href="./support.html">Support</a></li>
+            <li><a href="index.html">Home</a></li>
+            <li><a href="downloads.html">Downloads</a></li>
+            <li><a href="documentation.html">Documentation</a></li>
+            <li><a href="support.html">Support</a></li>
           </ul>
 
             <!-- Google CSE Search Box Begins  -->
@@ -66,74 +66,360 @@
     <div class="container">
 
     
+<section>
+    <div class="page-header">
+        <h1>Apache TomEE 1.0.0-beta-2
+            <small>January 23rd, 2012</small>
+        </h1>
+    </div>
 
-<div class="page-header">
-<small><a href=".//index.html">Home</a></small><br>
-<h1>Downloads</h1>
-</div>
-
-<ul>
-<li>Release Date: October 6th, 2011</li>
-</ul>
-
-<p><div class="page-header"></p>
+    <div class="row">
+        <div class="span4">
+            <h2>Web Profile</h2>
 
-<h1><small>Java EE6 Certified</small></div></h1>
+            <p>Apache TomEE Web Profile delivers Servlets, JSP, JSF, JTA, JPA, CDI, Bean Validation and EJB Lite</p>
 
-<h2>Apache TomEE Web Profile</h2>
+            <p><a href="comparison.html">Comparison &raquo;</a></p>
+        </div>
+        <div class="span12">
+            <h2>
+                <small>Java EE6 Certified</small>
+            </h2>
+            <ul>
+                <li><a href="http://www.apache.org/dyn/closer.cgi/openejb/4.0.0-beta-2/apache-tomee-1.0.0-beta-2-webprofile.tar.gz">apache-tomee-1.0.0-beta-2-webprofile.tar.gz</a>
+                    (<a href="http://www.apache.org/dyn/closer.cgi/openejb/4.0.0-beta-2/apache-tomee-1.0.0-beta-2-webprofile.tar.gz.asc">asc</a> <a
+                            href="http://www.apache.org/dyn/closer.cgi/openejb/4.0.0-beta-2/apache-tomee-1.0.0-beta-2-webprofile.tar.gz.md5">md5</a>)
+                </li>
+                <li><a href="http://www.apache.org/dyn/closer.cgi/openejb/4.0.0-beta-2/apache-tomee-1.0.0-beta-2-webprofile.zip">apache-tomee-1.0.0-beta-2-webprofile.zip</a> (<a
+                        href="http://www.apache.org/dyn/closer.cgi/openejb/4.0.0-beta-2/apache-tomee-1.0.0-beta-2-webprofile.zip.asc">asc</a> <a
+                        href="http://www.apache.org/dyn/closer.cgi/openejb/4.0.0-beta-2/apache-tomee-1.0.0-beta-2-webprofile.zip.md5">md5</a>)
+                </li>
+            </ul>
 
-<ul>
-<li><a href="http://www.apache.org/dyn/closer.cgi/openejb/4.0.0-beta-1/apache-tomee-1.0.0-beta-1-webprofile.tar.gz">apache-tomee-1.0.0-beta-1-webprofile.tar.gz</a> (<a href="http://www.apache.org/dyn/closer.cgi/openejb/4.0.0-beta-1/apache-tomee-1.0.0-beta-1-webprofile.tar.gz.asc">asc</a> <a href="http://www.apache.org/dyn/closer.cgi/openejb/4.0.0-beta-1/apache-tomee-1.0.0-beta-1-webprofile.tar.gz.md5">md5</a>)</li>
-<li><a href="http://www.apache.org/dyn/closer.cgi/openejb/4.0.0-beta-1/apache-tomee-1.0.0-beta-1-webprofile.zip">apache-tomee-1.0.0-beta-1-webprofile.zip</a> (<a href="http://www.apache.org/dyn/closer.cgi/openejb/4.0.0-beta-1/apache-tomee-1.0.0-beta-1-webprofile.zip.asc">asc</a> <a href="http://www.apache.org/dyn/closer.cgi/openejb/4.0.0-beta-1/apache-tomee-1.0.0-beta-1-webprofile.zip.md5">md5</a>)</li>
-</ul>
+        </div>
+    </div>
+    <div class="row">
+        <div class="span4">
+            <h2>Plus</h2>
 
-<p><div class="page-header"></p>
+            <p>Apache TomEE Plus delivers all that is in the Web Profile, plus EJB Full, Java EE Connector Architecture, JMS, JAX-WS and and JAX-RS.</p>
 
-<h1><small>NOT Java EE6 Certified</small></div></h1>
+            <p><a href="comparison.html">Comparison &raquo;</a></p>
+        </div>
+        <div class="span12">
+            <h2>
+                <small>NOT Java EE6 Certified</small>
+            </h2>
+            <ul>
+                <li><a href="http://www.apache.org/dyn/closer.cgi/openejb/4.0.0-beta-2/apache-tomee-1.0.0-beta-2-plus.tar.gz">apache-tomee-1.0.0-beta-2-plus.tar.gz</a> (<a
+                        href="http://www.apache.org/dyn/closer.cgi/openejb/4.0.0-beta-2/apache-tomee-1.0.0-beta-2-plus.tar.gz.asc">asc</a> <a
+                        href="http://www.apache.org/dyn/closer.cgi/openejb/4.0.0-beta-2/apache-tomee-1.0.0-beta-2-plus.tar.gz.md5">md5</a>)
+                </li>
+                <li><a href="http://www.apache.org/dyn/closer.cgi/openejb/4.0.0-beta-2/apache-tomee-1.0.0-beta-2-plus.zip">apache-tomee-1.0.0-beta-2-plus.zip</a> (<a
+                        href="http://www.apache.org/dyn/closer.cgi/openejb/4.0.0-beta-2/apache-tomee-1.0.0-beta-2-plus.zip.asc">asc</a> <a
+                        href="http://www.apache.org/dyn/closer.cgi/openejb/4.0.0-beta-2/apache-tomee-1.0.0-beta-2-plus.zip.md5">md5</a>)
+                </li>
+            </ul>
 
-<h2>Apache TomEE Plus</h2>
+        </div>
+    </div>
+</section>
+<div class="row">
+    <div class="span24">&nbsp;</div>
+</div>
+<section>
+    <div class="page-header">
+        <h2>Apache OpenEJB 4.0.0-beta-2
+            <small>January 23rd, 2012</small>
+        </h2>
+    </div>
 
-<ul>
-<li><a href="http://www.apache.org/dyn/closer.cgi/openejb/4.0.0-beta-1/apache-tomee-1.0.0-beta-1-plus.tar.gz">apache-tomee-1.0.0-beta-1-plus.tar.gz</a> (<a href="http://www.apache.org/dyn/closer.cgi/openejb/4.0.0-beta-1/apache-tomee-1.0.0-beta-1-plus.tar.gz.asc">asc</a> <a href="http://www.apache.org/dyn/closer.cgi/openejb/4.0.0-beta-1/apache-tomee-1.0.0-beta-1-plus.tar.gz.md5">md5</a>)</li>
-<li><a href="http://www.apache.org/dyn/closer.cgi/openejb/4.0.0-beta-1/apache-tomee-1.0.0-beta-1-plus.zip">apache-tomee-1.0.0-beta-1-plus.zip</a> (<a href="http://www.apache.org/dyn/closer.cgi/openejb/4.0.0-beta-1/apache-tomee-1.0.0-beta-1-plus.zip.asc">asc</a> <a href="http://www.apache.org/dyn/closer.cgi/openejb/4.0.0-beta-1/apache-tomee-1.0.0-beta-1-plus.zip.md5">md5</a>)</li>
-</ul>
+    <div class="row">
+        <div class="span4">
+            <h3>Standalone</h3>
 
-<h2>Apache Tomcat Drop-in wars</h2>
+            <p>An "EJB" Server that can be run as a separate, standalone, server process. Contains EJB Full, CDI, JPA, JMS, JAX-WS, JAX-RS</p>
 
-<ul>
-<li><a href="http://www.apache.org/dyn/closer.cgi/openejb/4.0.0-beta-1/openejb-tomcat-webapp-4.0.0-beta-1.war">openejb-tomcat-webapp-4.0.0-beta-1.war</a> (<a href="http://www.apache.org/dyn/closer.cgi/openejb/4.0.0-beta-1/openejb-tomcat-webapp-4.0.0-beta-1.war.asc">asc</a> <a href="http://www.apache.org/dyn/closer.cgi/openejb/4.0.0-beta-1/openejb-tomcat-webapp-4.0.0-beta-1.war.md5">md5</a>)</li>
-<li><a href="http://www.apache.org/dyn/closer.cgi/openejb/4.0.0-beta-1/openejb-tomcat-plus-webapp-4.0.0-beta-1.war">openejb-tomcat-plus-webapp-4.0.0-beta-1.war</a> (<a href="http://www.apache.org/dyn/closer.cgi/openejb/4.0.0-beta-1/openejb-tomcat-plus-webapp-4.0.0-beta-1.war.asc">asc</a> <a href="http://www.apache.org/dyn/closer.cgi/openejb/4.0.0-beta-1/openejb-tomcat-plus-webapp-4.0.0-beta-1.war.md5">md5</a>)</li>
-</ul>
+            <p><a href="comparison.html">Comparison &raquo;</a></p>
+        </div>
+        <div class="span12">
+            <h3>&nbsp;</h3>
+            <ul>
+                <li><a href="http://www.apache.org/dyn/closer.cgi/openejb/4.0.0-beta-2/openejb-standalone-4.0.0-beta-2.tar.gz">openejb-standalone-4.0.0-beta-2.tar.gz</a> (<a
+                        href="http://www.apache.org/dyn/closer.cgi/openejb/4.0.0-beta-2/openejb-standalone-4.0.0-beta-2.tar.gz.asc">asc</a> <a
+                        href="http://www.apache.org/dyn/closer.cgi/openejb/4.0.0-beta-2/openejb-standalone-4.0.0-beta-2.tar.gz.md5">md5</a>)
+                </li>
+                <li><a href="http://www.apache.org/dyn/closer.cgi/openejb/4.0.0-beta-2/openejb-standalone-4.0.0-beta-2.zip">openejb-standalone-4.0.0-beta-2.zip</a> (<a
+                        href="http://www.apache.org/dyn/closer.cgi/openejb/4.0.0-beta-2/openejb-standalone-4.0.0-beta-2.zip.asc">asc</a> <a
+                        href="http://www.apache.org/dyn/closer.cgi/openejb/4.0.0-beta-2/openejb-standalone-4.0.0-beta-2.zip.md5">md5</a>)
+                </li>
+            </ul>
+        </div>
+    </div>
 
-<h2>Apache OpenEJB Standalone Server</h2>
+    <div class="row">
+        <div class="span4">
+            <h3>Drop-in WARs</h3>
 
-<ul>
-<li><a href="http://www.apache.org/dyn/closer.cgi/openejb/4.0.0-beta-1/openejb-standalone-4.0.0-beta-1.tar.gz">openejb-standalone-4.0.0-beta-1.tar.gz</a> (<a href="http://www.apache.org/dyn/closer.cgi/openejb/4.0.0-beta-1/openejb-standalone-4.0.0-beta-1.tar.gz.asc">asc</a> <a href="http://www.apache.org/dyn/closer.cgi/openejb/4.0.0-beta-1/openejb-standalone-4.0.0-beta-1.tar.gz.md5">md5</a>)</li>
-<li><a href="http://www.apache.org/dyn/closer.cgi/openejb/4.0.0-beta-1/openejb-standalone-4.0.0-beta-1.zip">openejb-standalone-4.0.0-beta-1.zip</a> (<a href="http://www.apache.org/dyn/closer.cgi/openejb/4.0.0-beta-1/openejb-standalone-4.0.0-beta-1.zip.asc">asc</a> <a href="http://www.apache.org/dyn/closer.cgi/openejb/4.0.0-beta-1/openejb-standalone-4.0.0-beta-1.zip.md5">md5</a>)</li>
-</ul>
+            <p>A version of Apache OpenEJB that can be dropped into any Tomcat 7.x install effectively creating your own Apache TomEE Web Profile or Apache TomEE Plus.</p>
+        </div>
+        <div class="span12">
+            <h3>&nbsp;</h3>
+            <ul>
+                <li><a href="http://www.apache.org/dyn/closer.cgi/openejb/4.0.0-beta-2/openejb-tomcat-webapp-4.0.0-beta-2.war">openejb-tomcat-webapp-4.0.0-beta-2.war</a> (<a
+                        href="http://www.apache.org/dyn/closer.cgi/openejb/4.0.0-beta-2/openejb-tomcat-webapp-4.0.0-beta-2.war.asc">asc</a> <a
+                        href="http://www.apache.org/dyn/closer.cgi/openejb/4.0.0-beta-2/openejb-tomcat-webapp-4.0.0-beta-2.war.md5">md5</a>)
+                </li>
+                <li><a href="http://www.apache.org/dyn/closer.cgi/openejb/4.0.0-beta-2/openejb-tomcat-plus-webapp-4.0.0-beta-2.war">openejb-tomcat-plus-webapp-4.0.0-beta-2.war</a>
+                    (<a href="http://www.apache.org/dyn/closer.cgi/openejb/4.0.0-beta-2/openejb-tomcat-plus-webapp-4.0.0-beta-2.war.asc">asc</a> <a
+                            href="http://www.apache.org/dyn/closer.cgi/openejb/4.0.0-beta-2/openejb-tomcat-plus-webapp-4.0.0-beta-2.war.md5">md5</a>)
+                </li>
+            </ul>
+        </div>
+    </div>
+</section>
+<div class="row">
+    <div class="span24">&nbsp;</div>
+</div>
+<section>
+    <div class="page-header">
+        <h2>Other</h2>
+    </div>
 
-<h2>Source and Examples</h2>
+    <div class="row">
+        <div class="span4">
+            <h3>Source</h3>
 
-<ul>
-<li><a href="http://www.apache.org/dyn/closer.cgi/openejb/4.0.0-beta-1/openejb-4.0.0-beta-1-source-release.zip">openejb-4.0.0-beta-1-source-release.zip</a> (<a href="http://www.apache.org/dyn/closer.cgi/openejb/4.0.0-beta-1/openejb-4.0.0-beta-1-source-release.zip.asc">asc</a> <a href="http://www.apache.org/dyn/closer.cgi/openejb/4.0.0-beta-1/openejb-4.0.0-beta-1-source-release.zip.md5">md5</a>)</li>
-<li><a href="http://www.apache.org/dyn/closer.cgi/openejb/4.0.0-beta-1/examples-4.0.0-beta-1-src.tar.gz">examples-4.0.0-beta-1-src.tar.gz</a> (<a href="http://www.apache.org/dyn/closer.cgi/openejb/4.0.0-beta-1/examples-4.0.0-beta-1-src.tar.gz.asc">asc</a> <a href="http://www.apache.org/dyn/closer.cgi/openejb/4.0.0-beta-1/examples-4.0.0-beta-1-src.tar.gz.md5">md5</a>)</li>
-<li><a href="http://www.apache.org/dyn/closer.cgi/openejb/4.0.0-beta-1/examples-4.0.0-beta-1-src.zip">examples-4.0.0-beta-1-src.zip</a> (<a href="http://www.apache.org/dyn/closer.cgi/openejb/4.0.0-beta-1/examples-4.0.0-beta-1-src.zip.asc">asc</a> <a href="http://www.apache.org/dyn/closer.cgi/openejb/4.0.0-beta-1/examples-4.0.0-beta-1-src.zip.md5">md5</a>)</li>
-</ul>
+            <p>Should you want to build any of the above binaries, this source bundle is the right one covers them all.</p>
 
-<h2>Previous Release</h2>
+        </div>
+        <div class="span12">
+            <h3>&nbsp;</h3>
+            <ul>
+                <li><a href="http://www.apache.org/dyn/closer.cgi/openejb/4.0.0-beta-2/openejb-4.0.0-beta-2-source-release.zip">openejb-4.0.0-beta-2-source-release.zip</a> (<a
+                        href="http://www.apache.org/dyn/closer.cgi/openejb/4.0.0-beta-2/openejb-4.0.0-beta-2-source-release.zip.asc">asc</a> <a
+                        href="http://www.apache.org/dyn/closer.cgi/openejb/4.0.0-beta-2/openejb-4.0.0-beta-2-source-release.zip.md5">md5</a>)
+                </li>
+            </ul>
+        </div>
+    </div>
+    <div class="row">
+        <div class="span4">
+            <h3>Examples</h3>
 
-<ul>
-<li><a href="http://www.apache.org/dyn/closer.cgi/openejb/3.1.4/openejb-3.1.4.zip">openejb-3.1.4.zip</a></li>
-<li><a href="http://www.apache.org/dyn/closer.cgi/openejb/3.1.4/openejb-3.1.4.tar.gz">openejb-3.1.4.tar.gz</a></li>
-<li><a href="http://www.apache.org/dyn/closer.cgi/openejb/3.1.4/openejb-3.1.4-src.tar.gz">openejb-3.1.4-src.tar.gz</a></li>
-<li><a href="http://www.apache.org/dyn/closer.cgi/openejb/3.1.4/openejb-3.1.4-src.zip">openejb-3.1.4-src.zip</a></li>
-</ul>
+            <p>Currently, we have over 50 examples of various aspects of Java EE 6 ranging from EJB, CDI, JAX-RS and more.  If you're learning Java EE, this is your secret weapon.</p>
+        </div>
+        <div class="span12">
+            <h3>&nbsp;</h3>
+            <ul>
+                <li><a href="examples-trunk">Browse Online</a></li>
+                <li><a href="http://www.apache.org/dyn/closer.cgi/openejb/4.0.0-beta-2/examples-4.0.0-beta-2-src.tar.gz">examples-4.0.0-beta-2-src.tar.gz</a> (<a
+                        href="http://www.apache.org/dyn/closer.cgi/openejb/4.0.0-beta-2/examples-4.0.0-beta-2-src.tar.gz.asc">asc</a> <a
+                        href="http://www.apache.org/dyn/closer.cgi/openejb/4.0.0-beta-2/examples-4.0.0-beta-2-src.tar.gz.md5">md5</a>)
+                </li>
+                <li><a href="http://www.apache.org/dyn/closer.cgi/openejb/4.0.0-beta-2/examples-4.0.0-beta-2-src.zip">examples-4.0.0-beta-2-src.zip</a> (<a
+                        href="http://www.apache.org/dyn/closer.cgi/openejb/4.0.0-beta-2/examples-4.0.0-beta-2-src.zip.asc">asc</a> <a
+                        href="http://www.apache.org/dyn/closer.cgi/openejb/4.0.0-beta-2/examples-4.0.0-beta-2-src.zip.md5">md5</a>)
+                </li>
+            </ul>
+        </div>
+    </div>
+</section>
+<div class="row">
+    <div class="span24">&nbsp;</div>
+</div>
+<section>
+    <div class="page-header">
+        <h1>Changelog</h1>
+    </div>
 
-<h2>Old releases archive</h2>
+    <div class="row">
+        <div class="span24">
 
-<p><a href="http://archive.apache.org/dist/openejb/">OpenEJB releases archive</a></p>
+    <h2>Upgrades</h2>
 
+    <ul>
+        <li><a href="https://issues.apache.org/jira/browse/TOMEE-81">TOMEE-81</a> Upgrade HSQLDB to 2.2.4</li>
+        <li><a href="https://issues.apache.org/jira/browse/TOMEE-109">TOMEE-109</a> Upgrade to XBean 3.9</li>
+        <li><a href="https://issues.apache.org/jira/browse/TOMEE-112">TOMEE-112</a> Upgrade wss4j to 1.6.3</li>
+        <li><a href="https://issues.apache.org/jira/browse/TOMEE-117">TOMEE-117</a> Upgrade OpenWebBeans to 1.1.3</li>
+        <li><a href="https://issues.apache.org/jira/browse/TOMEE-118">TOMEE-118</a> Upgrade CXF to 2.5.1</li>
+        <li><a href="https://issues.apache.org/jira/browse/TOMEE-119">TOMEE-119</a> Upgrade ActiveMQ to 5.5.1</li>
+        <li><a href="https://issues.apache.org/jira/browse/TOMEE-113">TOMEE-113</a> Upgrade Commons Fileupload to 1.2.2</li>
+        <li><a href="https://issues.apache.org/jira/browse/TOMEE-114">TOMEE-114</a> Upgrade Commons Discovery to 0.5</li>
+        <li><a href="https://issues.apache.org/jira/browse/TOMEE-116">TOMEE-116</a> Upgrade Commons Pool to 1.5.7</li>
+    </ul>
+
+    <h2>New Features</h2>
+
+    <ul>
+        <li><a href="https://issues.apache.org/jira/browse/TOMEE-6">TOMEE-6</a> Arquillian adapter</li>
+        <li><a href="https://issues.apache.org/jira/browse/TOMEE-84">TOMEE-84</a> TomEE Embedded Container</li>
+        <li><a href="https://issues.apache.org/jira/browse/TOMEE-86">TOMEE-86</a> Implementation of EJBContainer.createEJBContainer for TomEE Embedded</li>
+        <li><a href="https://issues.apache.org/jira/browse/TOMEE-96">TOMEE-96</a> All-in-one TomEE Embedded jar</li>
+        <li><a href="https://issues.apache.org/jira/browse/TOMEE-95">TOMEE-95</a> Command line 'java -jar tomee-embedded.jar myAwesome.war' launching</li>
+        <li><a href="https://issues.apache.org/jira/browse/TOMEE-58">TOMEE-58</a> New concept of persistence-fragment.xml file</li>
+        <li><a href="https://issues.apache.org/jira/browse/TOMEE-71">TOMEE-71</a> Ability to reload Persistence units via JMX</li>
+        <li><a href="https://issues.apache.org/jira/browse/TOMEE-72">TOMEE-72</a> Example: Reloading Persistence unit properties dynamically</li>
+        <li><a href="https://issues.apache.org/jira/browse/TOMEE-104">TOMEE-104</a> Allow custom JAX-RS providers to be used</li>
+        <li><a href="https://issues.apache.org/jira/browse/TOMEE-99">TOMEE-99</a> Example: CDI @Alternative and @Stereotype</li>
+        <li><a href="https://issues.apache.org/jira/browse/TOMEE-101">TOMEE-101</a> Example: CDI Events and @Observes</li>
+        <li><a href="https://issues.apache.org/jira/browse/TOMEE-97">TOMEE-97</a> Beginning documentation for Meta-Annotation support</li>
+        <li><a href="https://issues.apache.org/jira/browse/TOMEE-37">TOMEE-37</a> TomEE webapps based Deployer implementation</li>
+        <li><a href="https://issues.apache.org/jira/browse/OPENEJB-1454">OPENEJB-1454</a> Meta Annotation Support</li>
+        <li><a href="https://issues.apache.org/jira/browse/OPENEJB-1691">OPENEJB-1691</a> Dynamic @Proxy beans</li>
+        <li><a href="https://issues.apache.org/jira/browse/OPENEJB-1430">OPENEJB-1430</a> Scanning an JMX Registration of @ObjectName mbeans in applications</li>
+        <li><a href="https://issues.apache.org/jira/browse/OPENEJB-1737">OPENEJB-1737</a> Example: Dynamic JMX MBean example</li>
+        <li><a href="https://issues.apache.org/jira/browse/OPENEJB-1517">OPENEJB-1517</a> EJBContainer.createEJBContainer MODULES supports various org.apache.openejb.jee.* types
+        </li>
+        <li><a href="https://issues.apache.org/jira/browse/OPENEJB-1571">OPENEJB-1571</a> CDI Injection for clients of EJBContainer and tests using ApplicationComposer</li>
+        <li><a href="https://issues.apache.org/jira/browse/OPENEJB-1706">OPENEJB-1706</a> CDI Injection support for MDBs</li>
+        <li><a href="https://issues.apache.org/jira/browse/OPENEJB-1744">OPENEJB-1744</a> Example: MDBs as CDI beans</li>
+        <li><a href="https://issues.apache.org/jira/browse/OPENEJB-1705">OPENEJB-1705</a> Example: Simple CDI Interceptor</li>
+        <li><a href="https://issues.apache.org/jira/browse/OPENEJB-1654">OPENEJB-1654</a> System property overrides for MDB ActivationConfig</li>
+        <li><a href="https://issues.apache.org/jira/browse/OPENEJB-1690">OPENEJB-1690</a> Ability to define DataSources, Topics, Queues and other resources in applications with a
+            META-INF/resources.xml file
+        </li>
+        <li><a href="https://issues.apache.org/jira/browse/OPENEJB-1453">OPENEJB-1453</a> Metatyping for EJB and Dependency Injection Annotations</li>
+        <li><a href="https://issues.apache.org/jira/browse/OWB-621">OWB-621</a> Alternative configuration method for buggy container or pre servlet api 2.5 container</li>
+    </ul>
+
+    <h2>Improvements</h2>
+
+    <ul>
+        <li><a href="https://issues.apache.org/jira/browse/TOMEE-102">TOMEE-102</a> Cleaned up error handling of closed jars at shutdown</li>
+        <li><a href="https://issues.apache.org/jira/browse/TOMEE-107">TOMEE-107</a> Reduced logging of harmless "Could not install our singleton service" message</li>
+        <li><a href="https://issues.apache.org/jira/browse/TOMEE-106">TOMEE-106</a> Better handling of DataSource "maxWait" property, supports ints</li>
+        <li><a href="https://issues.apache.org/jira/browse/TOMEE-108">TOMEE-108</a> Smarter default of Log4j, Slf4j and JULI logging implementation selection</li>
+        <li><a href="https://issues.apache.org/jira/browse/TOMEE-100">TOMEE-100</a> Trim internal objects from logging</li>
+        <li><a href="https://issues.apache.org/jira/browse/TOMEE-93">TOMEE-93</a> Ensure JAX-RS @HeaderParam matching is case insensitive</li>
+        <li><a href="https://issues.apache.org/jira/browse/TOMEE-91">TOMEE-91</a> Improved error handling and resolving of REST @Path URLs</li>
+        <li><a href="https://issues.apache.org/jira/browse/TOMEE-82">TOMEE-82</a> SQLLoginModule support for HSQLDB 2.x</li>
+        <li><a href="https://issues.apache.org/jira/browse/TOMEE-83">TOMEE-83</a> Improved ability to imply type of
+            <env-entry>
+        </li>
+        <li><a href="https://issues.apache.org/jira/browse/TOMEE-87">TOMEE-87</a> Expanded scope of Global JNDI</li>
+        <li><a href="https://issues.apache.org/jira/browse/TOMEE-123">TOMEE-123</a> Eliminate webapp lib scanning from known libs</li>
+        <li><a href="https://issues.apache.org/jira/browse/TOMEE-73">TOMEE-73</a> Example: JAX-RS example with Application</li>
+        <li><a href="https://issues.apache.org/jira/browse/TOMEE-60">TOMEE-60</a> More Optimization in scanning of webapp libs</li>
+        <li><a href="https://issues.apache.org/jira/browse/TOMEE-122">TOMEE-122</a> WebService subcontext mapping adjustable with tomee.jaxws.subcontext property</li>
+        <li><a href="https://issues.apache.org/jira/browse/TOMEE-121">TOMEE-121</a> WebServices mapped into /
+            <webappcontext>/webservices/
+                <name>
+        </li>
+        <li><a href="https://issues.apache.org/jira/browse/TOMEE-75">TOMEE-75</a> Resolve default persistence provider before Assembly</li>
+        <li><a href="https://issues.apache.org/jira/browse/OPENEJB-1755">OPENEJB-1755</a> Repackaging LocalInitialContextFactory into org.apache.openejb.core</li>
+        <li><a href="https://issues.apache.org/jira/browse/OPENEJB-1746">OPENEJB-1746</a> More helpful information on ConcurrentAccessTimeoutException</li>
+        <li><a href="https://issues.apache.org/jira/browse/OPENEJB-48">OPENEJB-48</a> Log the location of the openejb.conf file being used</li>
+        <li><a href="https://issues.apache.org/jira/browse/OPENEJB-1747">OPENEJB-1747</a> Avoid NPE when a custom mdb container uses badly defined activation properties</li>
+        <li><a href="https://issues.apache.org/jira/browse/OPENEJB-1749">OPENEJB-1749</a> Better logging of @Stateful @PreDestroy exceptions</li>
+        <li><a href="https://issues.apache.org/jira/browse/OPENEJB-1701">OPENEJB-1701</a> Improved Multipoint and Multicast discovery logging</li>
+        <li><a href="https://issues.apache.org/jira/browse/OPENEJB-1750">OPENEJB-1750</a> Improved documentation on Windows Service installer</li>
+        <li><a href="https://issues.apache.org/jira/browse/OPENEJB-1700">OPENEJB-1700</a> deploying rest ejb as ejb when it is returned by Application.getClasses()/getSingletons()
+        </li>
+        <li><a href="https://issues.apache.org/jira/browse/OPENEJB-1754">OPENEJB-1754</a> Reduce logging of failed security checks due to being unauthorized</li>
+        <li><a href="https://issues.apache.org/jira/browse/OPENEJB-1753">OPENEJB-1753</a> New 'openejb.descriptors.output.folder' property for location of generated descriptors
+        </li>
+        <li><a href="https://issues.apache.org/jira/browse/OPENEJB-1722">OPENEJB-1722</a> manage JtaPlatform instead of TransactionManagerLookup when hibernate 4 as JPA provider
+        </li>
+        <li><a href="https://issues.apache.org/jira/browse/OPENEJB-1752">OPENEJB-1752</a> Tolerate toString() issues with ejb method return values when logging on DEBUG</li>
+        <li><a href="https://issues.apache.org/jira/browse/OPENEJB-1751">OPENEJB-1751</a> Ability to deactivate all internal JMX MBeans</li>
+        <li><a href="https://issues.apache.org/jira/browse/OPENEJB-1742">OPENEJB-1742</a> Respect 'openjpa.Specification' persistence.xml property</li>
+        <li><a href="https://issues.apache.org/jira/browse/OPENEJB-1743">OPENEJB-1743</a> Better MDB/CDI support</li>
+        <li><a href="https://issues.apache.org/jira/browse/OPENEJB-1741">OPENEJB-1741</a> Faster jar scanning at deploy</li>
+        <li><a href="https://issues.apache.org/jira/browse/OPENEJB-1699">OPENEJB-1699</a> managing @ApplicationPath for rest</li>
+        <li><a href="https://issues.apache.org/jira/browse/OPENEJB-1738">OPENEJB-1738</a> MDB Queue/Topic name defaults to MappedName</li>
+        <li><a href="https://issues.apache.org/jira/browse/OPENEJB-1715">OPENEJB-1715</a> Add ServiceTracker in Activator class to wait till we find the ServiceManagerProxy</li>
+        <li><a href="https://issues.apache.org/jira/browse/OWB-623">OWB-623</a> Relax check on @AroundInvoke Interceptors 'throws Exception'</li>
+        <li><a href="https://issues.apache.org/jira/browse/OWB-627">OWB-627</a> Automatically destroy @Dependent contextual instances created with Instance
+            <T>
+        </li>
+        <li><a href="https://issues.apache.org/jira/browse/OWB-475">OWB-475</a> support for optional beans</li>
+    </ul>
+
+    <h2>Bugs</h2>
+
+    <ul>
+        <li><a href="https://issues.apache.org/jira/browse/TOMEE-56">TOMEE-56</a> jsp group properties order not respected</li>
+        <li><a href="https://issues.apache.org/jira/browse/TOMEE-103">TOMEE-103</a> Further reduction of possible LinkageError in log files</li>
+        <li><a href="https://issues.apache.org/jira/browse/TOMEE-105">TOMEE-105</a> fixing contextroot in TomcatWebAppBuilder for windows</li>
+        <li><a href="https://issues.apache.org/jira/browse/TOMEE-51">TOMEE-51</a> Deployment without web.xml not possible. With web.xml, tests do not run.</li>
+        <li><a href="https://issues.apache.org/jira/browse/TOMEE-11">TOMEE-11</a> conf/logging.properties conflicts with juli configuration for Tomcat</li>
+        <li><a href="https://issues.apache.org/jira/browse/TOMEE-10">TOMEE-10</a> JNDI Browser in the openejb.war does not show @LocalBean views as EJBs</li>
+        <li><a href="https://issues.apache.org/jira/browse/TOMEE-94">TOMEE-94</a> context.xml ignored in internally created Tomcat StandardContexts</li>
+        <li><a href="https://issues.apache.org/jira/browse/TOMEE-90">TOMEE-90</a> Fixed REST Service undeployment issue</li>
+        <li><a href="https://issues.apache.org/jira/browse/TOMEE-98">TOMEE-98</a> Possible name conflict with internal "Comp" bean</li>
+        <li><a href="https://issues.apache.org/jira/browse/TOMEE-47">TOMEE-47</a> ServletContext.getResource(path).getInputStream() fails</li>
+        <li><a href="https://issues.apache.org/jira/browse/TOMEE-43">TOMEE-43</a> library-directory ignored</li>
+        <li><a href="https://issues.apache.org/jira/browse/TOMEE-42">TOMEE-42</a> TCCL.getResources() returns duplicated when deploying with OpenEJB deployer</li>
+        <li><a href="https://issues.apache.org/jira/browse/TOMEE-80">TOMEE-80</a> Avoid hibernate HHH015010 at startup</li>
+        <li><a href="https://issues.apache.org/jira/browse/TOMEE-89">TOMEE-89</a> Fixed lifecycle issue in CDI BeforeBeanDiscovery</li>
+        <li><a href="https://issues.apache.org/jira/browse/TOMEE-85">TOMEE-85</a> Fixed issues with rootUrl in persistence units of webapps</li>
+        <li><a href="https://issues.apache.org/jira/browse/TOMEE-39">TOMEE-39</a> context.xml of WAR not loaded</li>
+        <li><a href="https://issues.apache.org/jira/browse/TOMEE-88">TOMEE-88</a> Possible EL related issue prevents startup</li>
+        <li><a href="https://issues.apache.org/jira/browse/TOMEE-30">TOMEE-30</a> OpenEJBLifecycle.startApplication brutly cast Object in StartupObject</li>
+        <li><a href="https://issues.apache.org/jira/browse/TOMEE-33">TOMEE-33</a> seam-international-timeanddate fails to deploy</li>
+        <li><a href="https://issues.apache.org/jira/browse/TOMEE-34">TOMEE-34</a> seam-remoting-helloworld fails to deploy</li>
+        <li><a href="https://issues.apache.org/jira/browse/TOMEE-35">TOMEE-35</a> Unable to lookup BeanManager from JNDI</li>
+        <li><a href="https://issues.apache.org/jira/browse/TOMEE-36">TOMEE-36</a> NullPointerException when Missing required persistence.xml for @PersistenceUnit</li>
+        <li><a href="https://issues.apache.org/jira/browse/TOMEE-120">TOMEE-120</a> Fixed issue preventing serveral Web Service applications from being deployed simultaneously</li>
+        <li><a href="https://issues.apache.org/jira/browse/TOMEE-77">TOMEE-77</a> Ignore REST Applications without default constructor</li>
+        <li><a href="https://issues.apache.org/jira/browse/TOMEE-1">TOMEE-1</a> TomEE Beta 1.0.0 doesn't start with MyFaces CODI</li>
+        <li><a href="https://issues.apache.org/jira/browse/TOMEE-27">TOMEE-27</a> UnknownModuleTypeException thrown when no-web.xml webapp deployed</li>
+        <li><a href="https://issues.apache.org/jira/browse/TOMEE-76">TOMEE-76</a> Avoid NullPointerException in no-web.xml applications</li>
+        <li><a href="https://issues.apache.org/jira/browse/TOMEE-29">TOMEE-29</a> Applications always seem to be refreshed/redployed</li>
+        <li><a href="https://issues.apache.org/jira/browse/TOMEE-74">TOMEE-74</a> Fixed serialization issue with ValidationFactory references</li>
+        <li><a href="https://issues.apache.org/jira/browse/TOMEE-79">TOMEE-79</a> Fixed "no root logger" warning</li>
+        <li><a href="https://issues.apache.org/jira/browse/TOMEE-78">TOMEE-78</a> Issue finding openejb.war in Tomcat</li>
+        <li><a href="https://issues.apache.org/jira/browse/TOMEE-110">TOMEE-110</a> Fixed Tomcat issue with JSF code/prelude ordering</li>
+        <li><a href="https://issues.apache.org/jira/browse/TOMEE-111">TOMEE-111</a> Avoid overriting files in Tomcat installer if already installed</li>
+        <li><a href="https://issues.apache.org/jira/browse/TOMEE-61">TOMEE-61</a> allow ROOT to contain rest service</li>
+        <li><a href="https://issues.apache.org/jira/browse/TOMEE-115">TOMEE-115</a> Issue in OWB preventing CDI Extensions from adding Interceptors to EJBs</li>
+        <li><a href="https://issues.apache.org/jira/browse/OPENEJB-1523">OPENEJB-1523</a> TomEE 6.0.26 / 3.1.4: NPE in org.apache.catalina.startup.HostConfig.manageApp</li>
+        <li><a href="https://issues.apache.org/jira/browse/OPENEJB-1730">OPENEJB-1730</a> Reliability of multipoint discovery heartrates less than 1 second</li>
+        <li><a href="https://issues.apache.org/jira/browse/OPENEJB-1745">OPENEJB-1745</a> Fix null pointer in discardInstance when releaseInstance has already been called</li>
+        <li><a href="https://issues.apache.org/jira/browse/OPENEJB-1748">OPENEJB-1748</a> Fixed undeploy race condition</li>
+        <li><a href="https://issues.apache.org/jira/browse/OPENEJB-1710">OPENEJB-1710</a> ClassCastException when deploying ear files containing persistence.xml</li>
+        <li><a href="https://issues.apache.org/jira/browse/OPENEJB-1709">OPENEJB-1709</a> TomEE webapps (See rest-example) doesn't work under Windows (Path - Problem with backslash
+            "\")
+        </li>
+        <li><a href="https://issues.apache.org/jira/browse/OPENEJB-1708">OPENEJB-1708</a> Servlet Injection</li>
+        <li><a href="https://issues.apache.org/jira/browse/OPENEJB-1443">OPENEJB-1443</a> EntityManager in non-transactional business methods using queries can be used only once
+        </li>
+        <li><a href="https://issues.apache.org/jira/browse/OPENEJB-1729">OPENEJB-1729</a> Reliability of Multipoint remove event when last peer disappears</li>
+        <li><a href="https://issues.apache.org/jira/browse/OPENEJB-1702">OPENEJB-1702</a> Multicast and Multipoint 'heart_rate' property ignored</li>
+        <li><a href="https://issues.apache.org/jira/browse/OPENEJB-1704">OPENEJB-1704</a> undeploy or shutdown call ejbCreate() on stateless session beans</li>
+        <li><a href="https://issues.apache.org/jira/browse/OPENEJB-1711">OPENEJB-1711</a> Multithreaded filling of @Stateless pools to PoolMin at bean startup</li>
+        <li><a href="https://issues.apache.org/jira/browse/OPENEJB-1733">OPENEJB-1733</a> Parameters are not always available in custom interceptor when the bean is a webservice
+        </li>
+        <li><a href="https://issues.apache.org/jira/browse/OWB-620">OWB-620</a> any disabled bean of passivating scope will wrongly be detected as 'not passivatable'</li>
+        <li><a href="https://issues.apache.org/jira/browse/OWB-622">OWB-622</a> beanmanager injection in afterBeanDiscovery method parameter</li>
+        <li><a href="https://issues.apache.org/jira/browse/OWB-624">OWB-624</a> AnnotatedTypes registered in BeforeBeanDiscovery might get processed twice</li>
+        <li><a href="https://issues.apache.org/jira/browse/OWB-615">OWB-615</a> remove @Overrides for interfaces to be java5 compatible</li>
+        <li><a href="https://issues.apache.org/jira/browse/OWB-597">OWB-597</a> StackOverFlow when injecting product in same bean where @Produces is placed</li>
+        <li><a href="https://issues.apache.org/jira/browse/OWB-589">OWB-589</a> " ... requires a passivation capable dependency ..." for producer method with return type String and
+            non serializable injected dependency
+        </li>
+        <li><a href="https://issues.apache.org/jira/browse/OWB-616">OWB-616</a> javax.el.ExpressionFactory has final methods! CDI doesn't allow that. - Test on final <strong>PRIVATE</strong>
+            methods too?
+        </li>
+        <li><a href="https://issues.apache.org/jira/browse/OWB-619">OWB-619</a> @New beans must only exist if there is at least one injection point for them</li>
+        <li><a href="https://issues.apache.org/jira/browse/OWB-618">OWB-618</a> we sometimes invoke a dispose method without having created the bean upfront</li>
+        <li><a href="https://issues.apache.org/jira/browse/OWB-562">OWB-562</a> non-enabled alternative beans with passivating scope fail validation during deployment</li>
+        <li><a href="https://issues.apache.org/jira/browse/OWB-630">OWB-630</a> AmbiguousResolutionException thrown for Decorators that Decorate multiple beans where any of those
+            beans are passivation capable.
+        </li>
+        <li><a href="https://issues.apache.org/jira/browse/OWB-631">OWB-631</a> openwebbeans-resource misses openwebbeans.properties</li>
+        <li><a href="https://issues.apache.org/jira/browse/OWB-565">OWB-565</a> missing check for producer methods</li>
+        <li><a href="https://issues.apache.org/jira/browse/OWB-625">OWB-625</a> BeanManager.resolve throw java.util.NoSuchElementException with an empty set parameter</li>
+        <li><a href="https://issues.apache.org/jira/browse/OWB-629">OWB-629</a> NoClassDefFoundError for optional dependencies</li>
+        <li><a href="https://issues.apache.org/jira/browse/OWB-515">OWB-515</a> interceptors don't support inheritance without an overridden method annotated with @AroundInvoke
+        </li>
+    </ul>
+    </div>
+    </div>
 
+</section>
 
 
       <footer>

Modified: websites/production/openejb/content/examples-trunk/cdi-events/pom.xml
==============================================================================
--- websites/production/openejb/content/examples-trunk/cdi-events/pom.xml (original)
+++ websites/production/openejb/content/examples-trunk/cdi-events/pom.xml Tue Jan 24 04:19:25 2012
@@ -76,7 +76,7 @@
     <!-- to show events we log them in the test -->
     <dependency>
       <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-log4j12</artifactId>
+      <artifactId>slf4j-jdk14</artifactId>
       <version>1.6.1</version>
       <scope>test</scope>
     </dependency>
@@ -86,12 +86,6 @@
       <version>1.6.1</version>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>log4j</groupId>
-      <artifactId>log4j</artifactId>
-      <version>1.2.16</version>
-      <scope>test</scope>
-    </dependency>
   </dependencies>
   <!--
   This section allows you to configure where to publish libraries for sharing.

Modified: websites/production/openejb/content/examples-trunk/dynamic-datasource-routing/src/test/java/org/superbiz/dynamicdatasourcerouting/DynamicDataSourceTest.java
==============================================================================
--- websites/production/openejb/content/examples-trunk/dynamic-datasource-routing/src/test/java/org/superbiz/dynamicdatasourcerouting/DynamicDataSourceTest.java (original)
+++ websites/production/openejb/content/examples-trunk/dynamic-datasource-routing/src/test/java/org/superbiz/dynamicdatasourcerouting/DynamicDataSourceTest.java Tue Jan 24 04:19:25 2012
@@ -17,11 +17,11 @@
 package org.superbiz.dynamicdatasourcerouting;
 
 import org.apache.openejb.core.LocalInitialContextFactory;
-import org.apache.openejb.resource.jdbc.Router;
 import org.junit.Test;
 
 import javax.ejb.embeddable.EJBContainer;
 import javax.naming.Context;
+import javax.sql.DataSource;
 import java.sql.Connection;
 import java.sql.DriverManager;
 import java.sql.ResultSet;
@@ -93,7 +93,7 @@ public class DynamicDataSourceTest {
         properties.setProperty("My Router.DefaultDataSourceName", "database1");
 
         // routed datasource
-        properties.setProperty("Routed Datasource", "new://Resource?provider=RoutedDataSource&type=" + Router.class.getName());
+        properties.setProperty("Routed Datasource", "new://Resource?provider=RoutedDataSource&type=" + DataSource.class.getName());
         properties.setProperty("Routed Datasource.Router", "My Router");
 
         Context ctx = EJBContainer.createEJBContainer(properties).getContext();

Modified: websites/production/openejb/content/examples-trunk/reload-persistence-unit-properties/pom.xml
==============================================================================
--- websites/production/openejb/content/examples-trunk/reload-persistence-unit-properties/pom.xml (original)
+++ websites/production/openejb/content/examples-trunk/reload-persistence-unit-properties/pom.xml Tue Jan 24 04:19:25 2012
@@ -74,6 +74,12 @@
       <version>4.0.0-beta-2-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>log4j</groupId>
+      <artifactId>log4j</artifactId>
+      <version>1.2.16</version>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
   <!--
   This section allows you to configure where to publish libraries for sharing.

Modified: websites/production/openejb/content/examples-trunk/reload-persistence-unit-properties/src/test/java/org/superbiz/reloadable/pu/CacheActivationTest.java
==============================================================================
--- websites/production/openejb/content/examples-trunk/reload-persistence-unit-properties/src/test/java/org/superbiz/reloadable/pu/CacheActivationTest.java (original)
+++ websites/production/openejb/content/examples-trunk/reload-persistence-unit-properties/src/test/java/org/superbiz/reloadable/pu/CacheActivationTest.java Tue Jan 24 04:19:25 2012
@@ -17,9 +17,6 @@
 
 package org.superbiz.reloadable.pu;
 
-import org.apache.log4j.ConsoleAppender;
-import org.apache.log4j.SimpleLayout;
-import org.apache.log4j.varia.NullAppender;
 import org.apache.openjpa.persistence.StoreCacheImpl;
 import org.junit.AfterClass;
 import org.junit.Before;
@@ -36,7 +33,6 @@ import javax.naming.NamingException;
 import javax.persistence.EntityManagerFactory;
 import javax.persistence.PersistenceUnit;
 import java.lang.management.ManagementFactory;
-import java.util.Properties;
 
 import static junit.framework.Assert.assertEquals;
 import static junit.framework.Assert.assertNotNull;
@@ -55,25 +51,7 @@ public class CacheActivationTest {
 
     @BeforeClass
     public static void start() {
-        // customizing logs to print mainly sql queries
-        Properties p = new Properties();
-        p.put("openejb.nobanner", "false");
-        p.put("log4j.rootLogger", "error, N");
-        p.put("log4j.category.OpenEJB.options", "error");
-        p.put("log4j.category.OpenEJB.options", "error");
-        p.put("log4j.category.OpenEJB.server", "error");
-        p.put("log4j.category.OpenEJB.startup", "error");
-        p.put("log4j.category.OpenEJB.startup.service", "error");
-        p.put("log4j.category.OpenEJB.startup.config", "error");
-        p.put("log4j.category.openjpa.jdbc.SQL", "debug, C"); // we want sql queries
-        p.put("log4j.category.openjpa.Enhance", "error");
-        p.put("log4j.category.org.superbiz", "info, C"); // we want our own logs
-        p.put("log4j.appender.N", NullAppender.class.getName());
-        p.put("log4j.appender.C", ConsoleAppender.class.getName());
-        p.put("log4j.appender.C.layout", SimpleLayout.class.getName());
-
-        // finally starting the container
-        container = EJBContainer.createEJBContainer(p);
+        container = EJBContainer.createEJBContainer();
     }
 
     @Before

Modified: websites/production/openejb/content/examples-trunk/spring-integration/pom.xml
==============================================================================
--- websites/production/openejb/content/examples-trunk/spring-integration/pom.xml (original)
+++ websites/production/openejb/content/examples-trunk/spring-integration/pom.xml Tue Jan 24 04:19:25 2012
@@ -17,7 +17,7 @@
     limitations under the License.
 -->
 
-<!-- $Rev: 1180962 $ $Date: 2011-10-10 13:47:49 +0000 (Mon, 10 Oct 2011) $ -->
+<!-- $Rev: 1234582 $ $Date: 2012-01-22 19:47:26 +0000 (Sun, 22 Jan 2012) $ -->
 
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
@@ -78,12 +78,6 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>log4j</groupId>
-      <artifactId>log4j</artifactId>
-      <version>1.2.16</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
       <groupId>org.apache.openejb</groupId>
       <artifactId>openejb-core-hibernate</artifactId>
       <version>4.0.0-beta-2-SNAPSHOT</version>

Modified: websites/production/openejb/content/examples-trunk/troubleshooting/README.html
==============================================================================
--- websites/production/openejb/content/examples-trunk/troubleshooting/README.html (original)
+++ websites/production/openejb/content/examples-trunk/troubleshooting/README.html Tue Jan 24 04:19:25 2012
@@ -236,10 +236,6 @@ public class MoviesTest extends TestCase
         // overriding has been applied.
         p.put("log4j.category.OpenEJB.startup.service", "debug");
 
-        // Want timestamps in the log output?
-        p.put("log4j.appender.C.layout", "org.apache.log4j.PatternLayout");
-        p.put("log4j.appender.C.layout.ConversionPattern", "%d - %-5p - %m%n");
-
         // Will output a generated ejb-jar.xml file that represents
         // 100% of the annotations used in the code.  This is a great
         // way to figure out how to do something in xml for overriding

Modified: websites/production/openejb/content/examples-trunk/troubleshooting/src/test/java/org/superbiz/troubleshooting/MoviesTest.java
==============================================================================
--- websites/production/openejb/content/examples-trunk/troubleshooting/src/test/java/org/superbiz/troubleshooting/MoviesTest.java (original)
+++ websites/production/openejb/content/examples-trunk/troubleshooting/src/test/java/org/superbiz/troubleshooting/MoviesTest.java Tue Jan 24 04:19:25 2012
@@ -59,10 +59,6 @@ public class MoviesTest extends TestCase
         // overriding has been applied.
         p.put("log4j.category.OpenEJB.startup.service", "debug");
 
-        // Want timestamps in the log output?
-        p.put("log4j.appender.C.layout", "org.apache.log4j.PatternLayout");
-        p.put("log4j.appender.C.layout.ConversionPattern", "%d - %-5p - %m%n");
-
         // Will output a generated ejb-jar.xml file that represents
         // 100% of the annotations used in the code.  This is a great
         // way to figure out how to do something in xml for overriding

Modified: websites/production/openejb/content/examples-trunk/webapps/ejb-examples/README.html
==============================================================================
--- websites/production/openejb/content/examples-trunk/webapps/ejb-examples/README.html (original)
+++ websites/production/openejb/content/examples-trunk/webapps/ejb-examples/README.html Tue Jan 24 04:19:25 2012
@@ -895,23 +895,6 @@ public class WebserviceServlet extends H
 }
 </code></pre>
 
-<h2>log4j.xml</h2>
-
-<pre><code>&lt;log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/"&gt;
-  &lt;appender name="console" class="org.apache.log4j.ConsoleAppender"&gt;
-    &lt;param name="Target" value="System.out"/&gt;
-    &lt;layout class="org.apache.log4j.PatternLayout"&gt;
-      &lt;param name="ConversionPattern" value="%-5p %c{1} - %m%n"/&gt;
-    &lt;/layout&gt;
-  &lt;/appender&gt;
-
-  &lt;root&gt;
-    &lt;priority value="debug"/&gt;
-    &lt;appender-ref ref="console"/&gt;
-  &lt;/root&gt;
-&lt;/log4j:configuration&gt;
-</code></pre>
-
 <h2>persistence.xml</h2>
 
 <pre><code>&lt;persistence xmlns="http://java.sun.com/xml/ns/persistence" version="1.0"&gt;

Modified: websites/production/openejb/content/examples-trunk/webapps/moviefun/monitor/pom.xml
==============================================================================
--- websites/production/openejb/content/examples-trunk/webapps/moviefun/monitor/pom.xml (original)
+++ websites/production/openejb/content/examples-trunk/webapps/moviefun/monitor/pom.xml Tue Jan 24 04:19:25 2012
@@ -128,10 +128,6 @@
           <artifactId>apacheds-core</artifactId>
         </exclusion>
         <exclusion>
-          <groupId>org.slf4j</groupId>
-          <artifactId>nlog4j</artifactId>
-        </exclusion>
-        <exclusion>
           <groupId>org.springframework</groupId>
           <artifactId>spring</artifactId>
         </exclusion>

Modified: websites/production/openejb/content/examples-trunk/webapps/resources-declared-in-webapp/pom.xml
==============================================================================
--- websites/production/openejb/content/examples-trunk/webapps/resources-declared-in-webapp/pom.xml (original)
+++ websites/production/openejb/content/examples-trunk/webapps/resources-declared-in-webapp/pom.xml Tue Jan 24 04:19:25 2012
@@ -76,13 +76,6 @@
           <tomcatHttpPort>1234</tomcatHttpPort>
           <tomcatShutdownPort>13245</tomcatShutdownPort>
           <tomcatVersion>7.0.21</tomcatVersion>
-          <libs>
-            <jarArtifact>
-              <groupId>org.apache.openejb</groupId>
-              <artifactId>openejb-logging</artifactId>
-              <version>${openejb.version}</version>
-            </jarArtifact>
-          </libs>
           <webapps>
             <webappArtifact>
               <groupId>org.apache.openejb</groupId>

Modified: websites/production/openejb/content/examples-trunk/webapps/rest-example-with-application/pom.xml
==============================================================================
--- websites/production/openejb/content/examples-trunk/webapps/rest-example-with-application/pom.xml (original)
+++ websites/production/openejb/content/examples-trunk/webapps/rest-example-with-application/pom.xml Tue Jan 24 04:19:25 2012
@@ -73,13 +73,6 @@
           <tomcatHttpPort>1234</tomcatHttpPort>
           <tomcatShutdownPort>13245</tomcatShutdownPort>
           <tomcatVersion>7.0.21</tomcatVersion>
-          <libs>
-            <jarArtifact>
-              <groupId>org.apache.openejb</groupId>
-              <artifactId>openejb-logging</artifactId>
-              <version>${openejb.version}</version>
-            </jarArtifact>
-          </libs>
           <webapps>
             <webappArtifact>
               <groupId>org.apache.openejb</groupId>

Modified: websites/production/openejb/content/examples-trunk/webapps/rest-example/pom.xml
==============================================================================
--- websites/production/openejb/content/examples-trunk/webapps/rest-example/pom.xml (original)
+++ websites/production/openejb/content/examples-trunk/webapps/rest-example/pom.xml Tue Jan 24 04:19:25 2012
@@ -67,6 +67,14 @@
         </configuration>
       </plugin>
       <plugin>
+        <groupId>org.apache.openejb</groupId>
+        <artifactId>tomee-maven-plugin</artifactId>
+        <version>0.0.1-SNAPSHOT</version>
+        <configuration>
+          <tomeeVersion>1.0.0-beta-2-SNAPSHOT</tomeeVersion>
+        </configuration>
+      </plugin>
+      <plugin>
         <groupId>com.googlecode.t7mp</groupId>
         <artifactId>maven-t7-plugin</artifactId>
         <version>0.9.7</version>
@@ -74,13 +82,6 @@
           <tomcatHttpPort>1234</tomcatHttpPort>
           <tomcatShutdownPort>13245</tomcatShutdownPort>
           <tomcatVersion>7.0.21</tomcatVersion>
-          <libs>
-            <jarArtifact>
-              <groupId>org.apache.openejb</groupId>
-              <artifactId>openejb-logging</artifactId>
-              <version>${openejb.version}</version>
-            </jarArtifact>
-          </libs>
           <webapps>
             <webappArtifact>
               <groupId>org.apache.openejb</groupId>
@@ -172,4 +173,4 @@
       <url>file://${project.build.outputDirectory}/repo/</url>
     </snapshotRepository>
   </distributionManagement>
-</project>
\ No newline at end of file
+</project>

Modified: websites/production/openejb/content/properties-listing.html
==============================================================================
--- websites/production/openejb/content/properties-listing.html (original)
+++ websites/production/openejb/content/properties-listing.html Tue Jan 24 04:19:25 2012
@@ -116,7 +116,6 @@
 |openejb.deployments.classpath.include and openejb.deployments.classpath.exclude | regex | regex to filter the scanned classpath (when you are in this case)|
 |openejb.deployments.package.include and openejb.deployments.package.exclude | regex | regex to filter scanned packages|
 |openejb.autocreate.jta-datasource-from-non-jta-one | bool | whether or not auto create the jta datasource if it doesn't exist but a non jta datasource exists. Useful when using hibernate to be able to get a real non jta datasource.|
-|openejb.read-all.persistence.xml | bool | allow to scan persistence.xml in lib of the deployed webapp|
 |openejb.altdd.prefix | string | prefix use for altDD (example test to use a test.ejb-jar.xml).|
 |org.apache.openejb.default.system.interceptors | list of interceptor (qualified names) separated by a comma or a space | add these interceptor on all beans|
 |openejb.jndiname.strategy.class | class name | an implementation of org.apache.openejb.assembler.classic.JndiBuilder.JndiNameStrategy|
@@ -130,7 +129,6 @@
 |[<uppercase service name>.]<service id>.<name> or [<uppercase service name>.]<service id>|<name> | whatever is supported (generally string, int ...) | set this value to the corresponding service. example: [EnterpriseBean.]<ejb-name>.activation.<property>, [PERSISTENCEUNIT.]<persistence unit name>.<property>, [RESOURCE.]<name>|<property> ...|
 | log4j.category.OpenEJB.options | DEBUG, INFO, ... | active one OpenEJB log level
 | openejb.jmx.active | bool | activate (by default) or not the OpenEJB JMX MBeans |
-| openejb.logger.external | bool | use another log configuration(log4j for instance) |
 | openejb.nobanner | bool | activate or not the OpenEJB banner (activated by default)
 | openejb.check.classloader | bool | if true print some information about duplicated classes | 
 | openejb.check.classloader.verbose | bool | if true print classes intersections | </p>

Modified: websites/production/openejb/content/sitemap.html
==============================================================================
--- websites/production/openejb/content/sitemap.html (original)
+++ websites/production/openejb/content/sitemap.html Tue Jan 24 04:19:25 2012
@@ -105,7 +105,6 @@
 <li><a href="deployments.html">Deployments</a></li>
 <li><a href="details-on-openejb-jar.html">Details on openejb-jar</a></li>
 <li><a href="documentation.html">Index</a></li>
-<li><a href="downloads.html">Downloads</a></li>
 <li><a href="dynamic-datasource.html">Dynamic Datasource</a></li>
 <li><a href="eclipse-plugin.html">Eclipse Plugin</a></li>
 <li><a href="ejb-+-jpa-+-jsf-+-jax-rs.html">EJB + JPA + JSF + JAX-RS</a></li>
@@ -233,6 +232,7 @@
 <li><a href="tomcat-installation.html">Tomcat Installation</a></li>
 <li><a href="tomcat-object-factory.html">Tomcat Object Factory</a></li>
 <li><a href="tomcat.html">Tomcat</a></li>
+<li><a href="tomee-1.0.0-beta-1.html">Downloads</a></li>
 <li><a href="tomee-jaas.html">JAAS and TomEE</a></li>
 <li><a href="transaction-annotations.html">Transaction Annotations</a></li>
 <li><a href="understanding-callbacks.html">Understanding Callbacks</a></li>