This is an automated email from the ASF dual-hosted git repository. dblevins pushed a commit to branch markdown-to-asciidoc in repository https://gitbox.apache.org/repos/asf/tomee-site-generator.git
commit 5ebcc4623ea4c3bd90e3b77ce57ba5f4af2a1a6f Author: David Jencks <[email protected]> AuthorDate: Thu Mar 5 10:17:39 2020 -0800 adoc corrections --- tomee/modules/ROOT/pages/articles.adoc | 18 +++------ tomee/modules/ROOT/pages/dev/april2008.adoc | 2 +- tomee/modules/ROOT/pages/dev/april2009.adoc | 2 +- tomee/modules/ROOT/pages/dev/asf.adoc | 2 +- tomee/modules/ROOT/pages/dev/august2007.adoc | 2 +- tomee/modules/ROOT/pages/dev/git.adoc | 40 +++++++++---------- tomee/modules/ROOT/pages/dev/january2008.adoc | 2 +- tomee/modules/ROOT/pages/dev/january2010.adoc | 2 +- tomee/modules/ROOT/pages/dev/july2007.adoc | 2 +- tomee/modules/ROOT/pages/dev/july2008.adoc | 2 +- tomee/modules/ROOT/pages/dev/july2009.adoc | 2 +- tomee/modules/ROOT/pages/dev/july2010.adoc | 2 +- tomee/modules/ROOT/pages/dev/june2007.adoc | 2 +- tomee/modules/ROOT/pages/dev/logging.adoc | 4 +- tomee/modules/ROOT/pages/dev/october2007.adoc | 2 +- tomee/modules/ROOT/pages/dev/october2008.adoc | 2 +- tomee/modules/ROOT/pages/dev/october2009.adoc | 2 +- tomee/modules/ROOT/pages/dev/source-code.adoc | 32 +++++++-------- tomee/modules/ROOT/pages/enterprise-tomcat.adoc | 4 +- tomee/modules/ROOT/pages/features.adoc | 2 +- tomee/modules/ROOT/pages/geronimo.adoc | 2 +- tomee/modules/ROOT/pages/privacy-policy.adoc | 2 +- tomee/modules/ROOT/pages/support.adoc | 2 +- tomee/modules/ROOT/pages/team.adoc | 2 +- .../pages/testcase-with-testbean-inner-class.adoc | 2 +- tomee/modules/ROOT/pages/tomcat-activemq.adoc | 5 +-- tomee/modules/ROOT/pages/tomcat-cdi.adoc | 4 +- tomee/modules/ROOT/pages/tomcat-ejb.adoc | 2 +- tomee/modules/ROOT/pages/tomcat-java-ee.adoc | 2 +- tomee/modules/ROOT/pages/tomcat-javaee.adoc | 2 +- tomee/modules/ROOT/pages/tomcat-jaxrs.adoc | 2 +- tomee/modules/ROOT/pages/tomcat-jaxws.adoc | 2 +- tomee/modules/ROOT/pages/tomcat-jms.adoc | 2 +- tomee/modules/ROOT/pages/tomcat-jpa.adoc | 4 +- tomee/modules/ROOT/pages/tomcat-jsf.adoc | 2 +- tomee/modules/ROOT/pages/tomee-1.0.0-beta-1.adoc | 30 ++++++-------- .../ROOT/pages/tomee-1.5.0-release-notes.adoc | 2 +- .../ROOT/pages/tomee-1.5.1-release-notes.adoc | 2 +- tomee/modules/ROOT/pages/tomee-1.5.1.adoc | 4 +- .../ROOT/pages/tomee-1.6.0.1-release-notes.adoc | 2 +- .../ROOT/pages/tomee-1.6.0.2-release-notes.adoc | 2 +- .../ROOT/pages/unit-testing-transactions.adoc | 46 +++++++++------------- 42 files changed, 112 insertions(+), 141 deletions(-) diff --git a/tomee/modules/ROOT/pages/articles.adoc b/tomee/modules/ROOT/pages/articles.adoc index 26495d6..9108b0b 100644 --- a/tomee/modules/ROOT/pages/articles.adoc +++ b/tomee/modules/ROOT/pages/articles.adoc @@ -1,35 +1,29 @@ -:doctype: book += Articles -Title: Articles +++<a name="Articles-OpenEJBArticles">++++++</a>+++ +== OpenEJB Articles -= OpenEJB Articles -+++<a name="Articles-3.0">++++++</a>+++ - -== 3.0 +=== 3.0 * http://java.sys-con.com/read/487561_2.htm[Developing EJB 3 Applications in Apache Tomcat Using Apache OpenEJB] , by Dario Laverde, java.sys-con.com * http://javanotebook.com/2007/09/28/openejb_3_and_tomcat_6.html[OpenEJB 3 and Tomcat 6] , by Dario Laverde, javanotebook.com -+++<a name="Articles-1.0">++++++</a>+++ -== 1.0 +=== 1.0 * http://theserverside.com/articles/article.tss?l=ContainerDrivenTestingSeries[Containter Driven Testing with OpenEJB] , by N. Alex Rupp, theserverside.com * http://www.galatea.com/flashguides/tomcat-openejb1-unix[Using OpenEJB 1.0 with Tomcat on Linux] , by Lajos Moczar, galatea.com -+++<a name="Articles-0.9.2">++++++</a>+++ -== 0.9.2 +=== 0.9.2 * http://ideoplex.com/id/768/getting-started-with-openejb[Getting Started With OpenEJB] , by Dwight Shih, ideoplex.com * http://ideoplex.com/id/828/a-simple-entity-bean-with-openejb[A Simple Entity Bean with OpenEJB] , by Dwight Shih, ideoplex.com * http://javaboutique.internet.com/reviews/openEJB/[OpenEJB: Modular, Configurable, and Customizable] , by Benoy Jose, javaboutique.internet.com * http://www.javaworld.com/javaworld/jw-06-2005/jw-0613-ejb.html[Build, deploy, and test EJB components in just a few seconds] , by Nader Aeinehchi, javaworld.com -+++<a name="Articles-0.9.0">++++++</a>+++ -== 0.9.0 +=== 0.9.0 * http://www.onjava.com/pub/a/onjava/2003/02/12/ejb_tomcat.html[OpenEJB: EJB for Tomcat] , by Jacek Laskowski, onjava.com diff --git a/tomee/modules/ROOT/pages/dev/april2008.adoc b/tomee/modules/ROOT/pages/dev/april2008.adoc index eebf63b..1e4f82b 100644 --- a/tomee/modules/ROOT/pages/dev/april2008.adoc +++ b/tomee/modules/ROOT/pages/dev/april2008.adoc @@ -1,4 +1,4 @@ -Title: April2008 The highlight of early February was the release of OpenEJB 3.0 beta 2 which was very well received and triggered another small increase in overall [email protected] traffic. += April2008 The highlight of early February was the release of OpenEJB 3.0 beta 2 which was very well received and triggered another small increase in overall [email protected] traffic. We've also seen some encouraging growth signs we haven't seen for quite a while: users answering each other's questions; first time posters saying "we've added this feature, do you want it?"; more questions answerable with documentation links; diff --git a/tomee/modules/ROOT/pages/dev/april2009.adoc b/tomee/modules/ROOT/pages/dev/april2009.adoc index 36a5861..7445c8e 100644 --- a/tomee/modules/ROOT/pages/dev/april2009.adoc +++ b/tomee/modules/ROOT/pages/dev/april2009.adoc @@ -1,4 +1,4 @@ -Title: April2009 A patch release of OpenEJB 3.0 (3.0.1) was released with fixes aimed to support the Geronimo 2.1.4 release. += April2009 A patch release of OpenEJB 3.0 (3.0.1) was released with fixes aimed to support the Geronimo 2.1.4 release. Talk has started on a release of the current 3.1 branch (to be OpenEJB 3.1.1), which already contains several fixes and improvements over the 3.1 version released in November. List traffic has continued to increase. diff --git a/tomee/modules/ROOT/pages/dev/asf.adoc b/tomee/modules/ROOT/pages/dev/asf.adoc index 13cdd49..803cb48 100644 --- a/tomee/modules/ROOT/pages/dev/asf.adoc +++ b/tomee/modules/ROOT/pages/dev/asf.adoc @@ -1,4 +1,4 @@ -Title: ASF ASF Board meetings are the third Wednesday of each month: += ASF ASF Board meetings are the third Wednesday of each month: Reports must be filed monthly for the first three months after Incubation: diff --git a/tomee/modules/ROOT/pages/dev/august2007.adoc b/tomee/modules/ROOT/pages/dev/august2007.adoc index 40745b9..283b894 100644 --- a/tomee/modules/ROOT/pages/dev/august2007.adoc +++ b/tomee/modules/ROOT/pages/dev/august2007.adoc @@ -1,4 +1,4 @@ -Title: August2007 Work on the OpenEJB 3.0 release is coming to a close. += August2007 Work on the OpenEJB 3.0 release is coming to a close. Documentation remains the largest outstanding item. A complete audit of all documentation was completed and concrete steps to improve it were detailed. Progress on updating the out-of-date documentation has already been made. diff --git a/tomee/modules/ROOT/pages/dev/git.adoc b/tomee/modules/ROOT/pages/dev/git.adoc index c9548a3..d6526ae 100644 --- a/tomee/modules/ROOT/pages/dev/git.adoc +++ b/tomee/modules/ROOT/pages/dev/git.adoc @@ -17,67 +17,67 @@ Run commands in the directory of the project you are working on, for example 'to Always create a feature branch from _develop_ using an '_extremely_' descriptive name, this should usually be the https://issues.apache.org/jira/browse/TOMEE[JIRA] id or task name you want to work on: -____ +---- git checkout -b TOMEE-007 develop Switched to a new branch 'TOMEE-007' -____ +---- -____ +---- git status nothing to commit, working directory clean -____ +---- Immediately push the new branch to the repository so everyone can see it remotely (and possibly collaborate): -____ +---- git push -u origin TOMEE-007 Branch TOMEE-007 set up to track remote branch TOMEE-007 from origin. -____ +---- Once that is done then you just need the simple push for subsequent calls on this branch: -____ +---- git push -____ +---- Work like mad on the JIRA issue calling commit and add as often as you like... If others are working on your branch also remember to pull their changes (Or just as good practice): -____ +---- git pull git commit git push -____ +---- Finally, to push the completed (or significant non-breaking progress on the) feature to _develop_ at any time (ensuring _develop_ is up to date first): -____ +---- git pull origin develop -____ +---- -____ +---- git checkout develop -____ +---- -____ +---- git merge --no-ff TOMEE-007 -____ +---- Once the completed feature is merged and the JIRA resolved then the branch can and 'should' be deleted before pushing: -____ +---- git branch -d TOMEE-007 -____ +---- -____ +---- git push origin develop -____ +---- +++<a name="git-gui">++++++</a>+++ *** The GUI Way diff --git a/tomee/modules/ROOT/pages/dev/january2008.adoc b/tomee/modules/ROOT/pages/dev/january2008.adoc index 3583f5d..3d5bd95 100644 --- a/tomee/modules/ROOT/pages/dev/january2008.adoc +++ b/tomee/modules/ROOT/pages/dev/january2008.adoc @@ -1,4 +1,4 @@ -Title: January2008 The release of OpenEJB 3.0 beta 1 at the end of September showed an mild but noticeable increase in user traffic which has continued since. += January2008 The release of OpenEJB 3.0 beta 1 at the end of September showed an mild but noticeable increase in user traffic which has continued since. Several usability improvements and related new features have been added, particularly around a returning user from years ago Alex St. Croix. Alex has already written some blog entries, created a couple video tutorials, and has a downloadable PDF of using OpenEJB embedded in Tomcat which is a dozen pages and growing. diff --git a/tomee/modules/ROOT/pages/dev/january2010.adoc b/tomee/modules/ROOT/pages/dev/january2010.adoc index 184aeee..804d587 100644 --- a/tomee/modules/ROOT/pages/dev/january2010.adoc +++ b/tomee/modules/ROOT/pages/dev/january2010.adoc @@ -1,4 +1,4 @@ -Title: January2010 Main areas of development activity include OSGi support, upgrading JAX-WS and potential support for JAX-RS, and Java EE 6 @ManagedBean support. += January2010 Main areas of development activity include OSGi support, upgrading JAX-WS and potential support for JAX-RS, and Java EE 6 @ManagedBean support. More detailed planning has also begun for the remaining EJB 3.1 work. Overall user list activity continues to increase with October and November both being record months in terms of volume. diff --git a/tomee/modules/ROOT/pages/dev/july2007.adoc b/tomee/modules/ROOT/pages/dev/july2007.adoc index aee3710..c900706 100644 --- a/tomee/modules/ROOT/pages/dev/july2007.adoc +++ b/tomee/modules/ROOT/pages/dev/july2007.adoc @@ -1,4 +1,4 @@ -Title: July2007 CURRENT FOCUS += July2007 CURRENT FOCUS Primary activities in the project are around polishing up features, user-facing code, reducing dependencies, documentation, and taking care of legal in preparation for the coming 3.0 release. No real issues stand in the way at this point, builds and voting should start soon. diff --git a/tomee/modules/ROOT/pages/dev/july2008.adoc b/tomee/modules/ROOT/pages/dev/july2008.adoc index 24707ca..9191a50 100644 --- a/tomee/modules/ROOT/pages/dev/july2008.adoc +++ b/tomee/modules/ROOT/pages/dev/july2008.adoc @@ -1,4 +1,4 @@ -Title: July2008 The OpenEJB 3.0 Final release in mid April brought some good attention to the project and more new users. += July2008 The OpenEJB 3.0 Final release in mid April brought some good attention to the project and more new users. User list traffic showed a small increase in April and May and a sharp spike in June. July looks to be a slow month so far. Many users are content and anxiously awaiting the next release. diff --git a/tomee/modules/ROOT/pages/dev/july2009.adoc b/tomee/modules/ROOT/pages/dev/july2009.adoc index fe09dc9..a152565 100644 --- a/tomee/modules/ROOT/pages/dev/july2009.adoc +++ b/tomee/modules/ROOT/pages/dev/july2009.adoc @@ -1,4 +1,4 @@ -Title: July2009 OpenEJB 3.1.1 was released in June. += July2009 OpenEJB 3.1.1 was released in June. The release contained a mix of improvements and fixes. Overall it was very well received and very anticipated as the last trunk release was in October 2008. More frequent dot releases are planned and a 3.1.2 will hopefully be not too far behind. diff --git a/tomee/modules/ROOT/pages/dev/july2010.adoc b/tomee/modules/ROOT/pages/dev/july2010.adoc index bf9b51f..f59fdfc 100644 --- a/tomee/modules/ROOT/pages/dev/july2010.adoc +++ b/tomee/modules/ROOT/pages/dev/july2010.adoc @@ -1,4 +1,4 @@ -Title: July2010 Work on the 3.1.next development has slowed and a release of that codebase (3.1.3) is likely to come out soon. += July2010 Work on the 3.1.next development has slowed and a release of that codebase (3.1.3) is likely to come out soon. Activity on the 3.2 codebase is going strong with significant progress on EJB 3.1 features, specifically; @AccessTimeout, @AfterBegin, @BeforeCompletion, @AfterCompletion and some support for the @Asynchronous method invocations. diff --git a/tomee/modules/ROOT/pages/dev/june2007.adoc b/tomee/modules/ROOT/pages/dev/june2007.adoc index 7839b91..9a5889e 100644 --- a/tomee/modules/ROOT/pages/dev/june2007.adoc +++ b/tomee/modules/ROOT/pages/dev/june2007.adoc @@ -1,4 +1,4 @@ -Title: June2007 All Incubator Infrastructure has been migrated over to tomee.apache.org as well as removal of any miscellaneous Incubator related disclaimers in code and website. += June2007 All Incubator Infrastructure has been migrated over to tomee.apache.org as well as removal of any miscellaneous Incubator related disclaimers in code and website. The project is excited to have implementation of EJB 3.0 complete and to see our sister project, Geronimo, announced JavaEE 5 Certification. Community short term goals are a release of OpenEJB 3.0 along with regular published snapshots. diff --git a/tomee/modules/ROOT/pages/dev/logging.adoc b/tomee/modules/ROOT/pages/dev/logging.adoc index 0551cb2..2a0b365 100644 --- a/tomee/modules/ROOT/pages/dev/logging.adoc +++ b/tomee/modules/ROOT/pages/dev/logging.adoc @@ -1,6 +1,4 @@ -:doctype: book - -Title: Logging +++<a name="Logging-LoggingforUsers">++++++</a>+++ += Logging +++<a name="Logging-LoggingforUsers">++++++</a>+++ == Logging for Users diff --git a/tomee/modules/ROOT/pages/dev/october2007.adoc b/tomee/modules/ROOT/pages/dev/october2007.adoc index 57129b0..9d1c9f8 100644 --- a/tomee/modules/ROOT/pages/dev/october2007.adoc +++ b/tomee/modules/ROOT/pages/dev/october2007.adoc @@ -1,4 +1,4 @@ -Title: October2007 OpenEJB 3.0 beta 1 released. += October2007 OpenEJB 3.0 beta 1 released. First contribution from Jonathan Gallimore. (was anything checked in, if not yank this line) Completed Export Control (Cryptography) process. Completed integration with Tomcat 6. diff --git a/tomee/modules/ROOT/pages/dev/october2008.adoc b/tomee/modules/ROOT/pages/dev/october2008.adoc index abfbba5..0c04a36 100644 --- a/tomee/modules/ROOT/pages/dev/october2008.adoc +++ b/tomee/modules/ROOT/pages/dev/october2008.adoc @@ -1,4 +1,4 @@ -Title: October2008 The user base has grown significantly. += October2008 The user base has grown significantly. The primary areas seem to be people replacing the JBoss Embedded platform with OpenEJB as an embedded container for either testing or Swing/GUI work and people using OpenEJB in Tomcat for web work. There have also been some reports of very large applications getting ported to OpenEJB. External signs of adoption have increased as well with some OpenEJB users popping up in other communities such as Maven asking for OpenEJB focused improvements in their tools, a half dozen or so very favorable blog entries from people outside the project and a recent thread on TheServerSide where many users expressed they were considering leaving Spring for OpenEJB/Tomcat or Glassfish. diff --git a/tomee/modules/ROOT/pages/dev/october2009.adoc b/tomee/modules/ROOT/pages/dev/october2009.adoc index be9e28a..23a3afa 100644 --- a/tomee/modules/ROOT/pages/dev/october2009.adoc +++ b/tomee/modules/ROOT/pages/dev/october2009.adoc @@ -1 +1 @@ -Title: October2009 Release 3.1.2 Eclipse Plugin 1.0.0 alpha release More EJB 3.1 activity += October2009 Release 3.1.2 Eclipse Plugin 1.0.0 alpha release More EJB 3.1 activity diff --git a/tomee/modules/ROOT/pages/dev/source-code.adoc b/tomee/modules/ROOT/pages/dev/source-code.adoc index d9a6f06..5e4570b 100644 --- a/tomee/modules/ROOT/pages/dev/source-code.adoc +++ b/tomee/modules/ROOT/pages/dev/source-code.adoc @@ -18,21 +18,21 @@ If you just want to build the source version then you can download (aka clone) t Performing the checkout from a command line using the GIT client (recommended) is as easy as executing the following command: -____ +---- git clone https://gitbox.apache.org/repos/asf/tomee.git tomee -____ +---- If you want to checkout a specific branch then you can just change that in the command: -____ +---- git clone -b tomee-1.7.x https://gitbox.apache.org/repos/asf/tomee.git tomee-1.7.x -____ +---- Or alternatively with Apache Maven 3.0.5 or later: -____ +---- mvn scm:checkout -DconnectionUrl=scm:git:https://gitbox.apache.org/repos/asf/tomee.git -DcheckoutDirectory=tomee -____ +---- NOTE: This method does not require the GIT client. @@ -66,15 +66,15 @@ To build the code, you'll need to grab a copy of http://maven.apache.org[Apache It is pretty much guaranteed that you will need to give Maven an increase on the available memory. + Depending on the OS you are working on the fix can be as easy as (Note: _-XX:MaxPermSize=256M_ is ignored by Java 8): -____ +---- export MAVEN_OPTS="-Xmx768m -XX:MaxPermSize=256M -XX:ReservedCodeCacheSize=64m -Xss2048k" -____ +---- on MacOS and Unices or -____ +---- set "MAVEN_OPTS=-Xmx768m -XX:MaxPermSize=256M -XX:ReservedCodeCacheSize=64m -Xss2048k" -____ +---- on MS Windows. @@ -82,15 +82,15 @@ on MS Windows. A fast build that skips all tests, generates no reports and creates full distribution archives is as follows: -____ +---- mvn -Dsurefire.useFile=false -DdisableXmlReport=true -DuniqueVersion=false -ff -Dassemble -DskipTests -DfailIfNoTests=false clean install -____ +---- The full build with tests takes around 2 hours: -____ +---- mvn -Dassemble clean install -____ +---- The output of those commands should end with "BUILD SUCCESSFUL" @@ -101,9 +101,9 @@ Just change to the module directory and run the same commands as above. If you are in real a hurry (and let's face it most of us are) you can run a quick build without the examples using the _quick_ profile: -____ +---- mvn -Pquick -Dsurefire.useFile=false -DdisableXmlReport=true -DuniqueVersion=false -ff -Dassemble -DskipTests -DfailIfNoTests=false clean install -____ +---- == Binary locations diff --git a/tomee/modules/ROOT/pages/enterprise-tomcat.adoc b/tomee/modules/ROOT/pages/enterprise-tomcat.adoc index 4b617a8..3d19489 100644 --- a/tomee/modules/ROOT/pages/enterprise-tomcat.adoc +++ b/tomee/modules/ROOT/pages/enterprise-tomcat.adoc @@ -1,5 +1,5 @@ -Title: Enterprise Tomcat += Enterprise Tomcat Tomcat + Java EE = TomEE, the Java Enterprise Edition of Tomcat. -{include:apache-tomee.mdtext} +include::apache-tomee.adoc[leveloffset=+1] diff --git a/tomee/modules/ROOT/pages/features.adoc b/tomee/modules/ROOT/pages/features.adoc index 72b8e33..6268eb7 100644 --- a/tomee/modules/ROOT/pages/features.adoc +++ b/tomee/modules/ROOT/pages/features.adoc @@ -1 +1 @@ -Title: Features += Features diff --git a/tomee/modules/ROOT/pages/geronimo.adoc b/tomee/modules/ROOT/pages/geronimo.adoc index 1e6886c..93b9f49 100644 --- a/tomee/modules/ROOT/pages/geronimo.adoc +++ b/tomee/modules/ROOT/pages/geronimo.adoc @@ -1,4 +1,4 @@ -Title: Geronimo OpenEJB is the EJB Container implementation for http://geronimo.apache.org[Apache Geronimo] . That integration is quite a bit different than what OpenEJB users are familiar with. += Geronimo OpenEJB is the EJB Container implementation for http://geronimo.apache.org[Apache Geronimo] . That integration is quite a bit different than what OpenEJB users are familiar with. The best source of documentation on Geronimo and it's usage of OpenEJB is here: * http://geronimo.apache.org/documentation.html diff --git a/tomee/modules/ROOT/pages/privacy-policy.adoc b/tomee/modules/ROOT/pages/privacy-policy.adoc index f8e07e8..8662c8e 100644 --- a/tomee/modules/ROOT/pages/privacy-policy.adoc +++ b/tomee/modules/ROOT/pages/privacy-policy.adoc @@ -1,4 +1,4 @@ -Title: Privacy Policy Information about your use of this website is collected using server access logs and a tracking cookie. += Privacy Policy Information about your use of this website is collected using server access logs and a tracking cookie. The collected information consists of the following: . The IP address from which you access the website; diff --git a/tomee/modules/ROOT/pages/support.adoc b/tomee/modules/ROOT/pages/support.adoc index e8a048f..86fb3ae 100644 --- a/tomee/modules/ROOT/pages/support.adoc +++ b/tomee/modules/ROOT/pages/support.adoc @@ -1,4 +1,4 @@ -Title: Getting Support += Getting Support {row diff --git a/tomee/modules/ROOT/pages/team.adoc b/tomee/modules/ROOT/pages/team.adoc index 6041ec1..d5ae4b9 100644 --- a/tomee/modules/ROOT/pages/team.adoc +++ b/tomee/modules/ROOT/pages/team.adoc @@ -1,4 +1,4 @@ -Title: Team += Team [cols=6*] |=== diff --git a/tomee/modules/ROOT/pages/testcase-with-testbean-inner-class.adoc b/tomee/modules/ROOT/pages/testcase-with-testbean-inner-class.adoc index c9c1cca..c21e0de 100644 --- a/tomee/modules/ROOT/pages/testcase-with-testbean-inner-class.adoc +++ b/tomee/modules/ROOT/pages/testcase-with-testbean-inner-class.adoc @@ -1,4 +1,4 @@ -Title: TestCase with TestBean inner-class The use of an inner-class annotated as an EJB can get you all the resources you may need to run your test case such as a UserTransaction, EntityManager, JMS Topic or Queue, DataSource, references to other EJBs, etc. += TestCase with TestBean inner-class The use of an inner-class annotated as an EJB can get you all the resources you may need to run your test case such as a UserTransaction, EntityManager, JMS Topic or Queue, DataSource, references to other EJBs, etc. Simply add a _META-INF/ejb-jar.xml_ to your _test_ _sources_ and start annotating your inner class as needed. diff --git a/tomee/modules/ROOT/pages/tomcat-activemq.adoc b/tomee/modules/ROOT/pages/tomcat-activemq.adoc index 683135e..5369677 100644 --- a/tomee/modules/ROOT/pages/tomcat-activemq.adoc +++ b/tomee/modules/ROOT/pages/tomcat-activemq.adoc @@ -55,7 +55,4 @@ In the above scenario even the "foo" Topic and the "bar" Queue would be automati xref:download-ng.adoc[Download] TomEE and you're minutes away from a functioning JMS application on Tomcat. - -TODO what? - -include::apache-tomee.adoc +include::apache-tomee.adoc[leveloffset=+1] diff --git a/tomee/modules/ROOT/pages/tomcat-cdi.adoc b/tomee/modules/ROOT/pages/tomcat-cdi.adoc index 81ec9a4..d619b8c 100644 --- a/tomee/modules/ROOT/pages/tomcat-cdi.adoc +++ b/tomee/modules/ROOT/pages/tomcat-cdi.adoc @@ -64,6 +64,4 @@ Spend your time learning and having fun and writing your app, don't spend it cha xref:download-ng.adoc[Download] TomEE and you're minutes away from having fun with CDI on Tomcat. -TODO what? - -include::apache-tomee.adoc +include::apache-tomee.adoc[leveloffset=+1] diff --git a/tomee/modules/ROOT/pages/tomcat-ejb.adoc b/tomee/modules/ROOT/pages/tomcat-ejb.adoc index 78a3df9..77af002 100644 --- a/tomee/modules/ROOT/pages/tomcat-ejb.adoc +++ b/tomee/modules/ROOT/pages/tomcat-ejb.adoc @@ -3,4 +3,4 @@ Tomcat + Java EE = TomEE, the Java Enterprise Edition of Tomcat. With TomEE you get Tomcat with EJB added and integrated and ready to go! -{include:apache-tomee.mdtext} +include::apache-tomee.adoc[leveloffset=+1] diff --git a/tomee/modules/ROOT/pages/tomcat-java-ee.adoc b/tomee/modules/ROOT/pages/tomcat-java-ee.adoc index 5cf8f76..b1df4c6 100644 --- a/tomee/modules/ROOT/pages/tomcat-java-ee.adoc +++ b/tomee/modules/ROOT/pages/tomcat-java-ee.adoc @@ -2,4 +2,4 @@ Tomcat + Java EE = TomEE, the Java Enterprise Edition of Tomcat. -{include:apache-tomee.mdtext} +include::apache-tomee.adoc[leveloffset=+1] diff --git a/tomee/modules/ROOT/pages/tomcat-javaee.adoc b/tomee/modules/ROOT/pages/tomcat-javaee.adoc index 9acd903..47f0dab 100644 --- a/tomee/modules/ROOT/pages/tomcat-javaee.adoc +++ b/tomee/modules/ROOT/pages/tomcat-javaee.adoc @@ -2,4 +2,4 @@ Tomcat + Java EE = TomEE, the Java Enterprise Edition of Tomcat. -{include:apache-tomee.mdtext} +include::apache-tomee.adoc[leveloffset=+1] diff --git a/tomee/modules/ROOT/pages/tomcat-jaxrs.adoc b/tomee/modules/ROOT/pages/tomcat-jaxrs.adoc index fb91e14..21fb7c6 100644 --- a/tomee/modules/ROOT/pages/tomcat-jaxrs.adoc +++ b/tomee/modules/ROOT/pages/tomcat-jaxrs.adoc @@ -3,4 +3,4 @@ Tomcat + Java EE = TomEE, the Java Enterprise Edition of Tomcat. With TomEE you get Tomcat with JAX-RS added and integrated and ready to go! -{include:apache-tomee.mdtext} +include::apache-tomee.adoc[leveloffset=+1] diff --git a/tomee/modules/ROOT/pages/tomcat-jaxws.adoc b/tomee/modules/ROOT/pages/tomcat-jaxws.adoc index 3e68e11..53c1b6a 100644 --- a/tomee/modules/ROOT/pages/tomcat-jaxws.adoc +++ b/tomee/modules/ROOT/pages/tomcat-jaxws.adoc @@ -3,4 +3,4 @@ Tomcat + Java EE = TomEE, the Java Enterprise Edition of Tomcat. With TomEE you get Tomcat with JAX-WS added and integrated and ready to go! -{include:apache-tomee.mdtext} +include::apache-tomee.adoc[leveloffset=+1] diff --git a/tomee/modules/ROOT/pages/tomcat-jms.adoc b/tomee/modules/ROOT/pages/tomcat-jms.adoc index 37c84b7..4fb4dcc 100644 --- a/tomee/modules/ROOT/pages/tomcat-jms.adoc +++ b/tomee/modules/ROOT/pages/tomcat-jms.adoc @@ -54,4 +54,4 @@ In the above scenario even the "foo" Topic and the "bar" Queue would be automati xref:download-ng.adoc[Download] TomEE and you're minutes away from a functioning JMS application on Tomcat. -{include:apache-tomee.mdtext} +include::apache-tomee.adoc[leveloffset=+1] diff --git a/tomee/modules/ROOT/pages/tomcat-jpa.adoc b/tomee/modules/ROOT/pages/tomcat-jpa.adoc index a2050ec..2bc1b52 100644 --- a/tomee/modules/ROOT/pages/tomcat-jpa.adoc +++ b/tomee/modules/ROOT/pages/tomcat-jpa.adoc @@ -1,4 +1,4 @@ -=Tomcat JPA += Tomcat JPA Tomcat + Java EE = TomEE, the Java Enterprise Edition of Tomcat. With TomEE you get Tomcat with JPA added and integrated and ready to go! @@ -62,4 +62,4 @@ DataSources will automatically be created if they haven't be configured explicit xref:download-ng.adoc[Download] TomEE and you're minutes away from a functioning JPA application on Tomcat. -{include:apache-tomee.mdtext} +include::apache-tomee.adoc[leveloffset=+1] diff --git a/tomee/modules/ROOT/pages/tomcat-jsf.adoc b/tomee/modules/ROOT/pages/tomcat-jsf.adoc index 1cc96f4..b71c6f9 100644 --- a/tomee/modules/ROOT/pages/tomcat-jsf.adoc +++ b/tomee/modules/ROOT/pages/tomcat-jsf.adoc @@ -3,4 +3,4 @@ Tomcat + Java EE = TomEE, the Java Enterprise Edition of Tomcat. With TomEE you get Tomcat with JSF added and integrated and ready to go! -{include:apache-tomee.mdtext} +include::apache-tomee.adoc[leveloffset=+1] diff --git a/tomee/modules/ROOT/pages/tomee-1.0.0-beta-1.adoc b/tomee/modules/ROOT/pages/tomee-1.0.0-beta-1.adoc index 65ef7d1..c76636a 100644 --- a/tomee/modules/ROOT/pages/tomee-1.0.0-beta-1.adoc +++ b/tomee/modules/ROOT/pages/tomee-1.0.0-beta-1.adoc @@ -1,54 +1,48 @@ -:doctype: book - -Title: Downloads += Downloads * Release Date: October 6th, 2011 -{page-header - -= +++<small>+++Java EE6 Certified+++</small>+++ - -} +== Java EE6 Certified -== Apache TomEE Web Profile +=== Apache TomEE Web Profile * 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] (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] 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]) * 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] (http://www.apache.org/dyn/closer.cgi/openejb/4.0.0-beta-1/apache-tomee-1.0.0-beta-1-webprofile.zip.asc[asc] http://www.apache.org/dyn/closer.cgi/openejb/4.0.0-beta-1/apache-tomee-1.0.0-beta-1-webprofile.zip.md5[md5]) -{page-header -= +++<small>+++NOT Java EE6 Certified+++</small>+++ -} +== NOT Java EE6 Certified + + -== Apache TomEE Plus +=== Apache TomEE Plus * 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] (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] 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]) * 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] (http://www.apache.org/dyn/closer.cgi/openejb/4.0.0-beta-1/apache-tomee-1.0.0-beta-1-plus.zip.asc[asc] http://www.apache.org/dyn/closer.cgi/openejb/4.0.0-beta-1/apache-tomee-1.0.0-beta-1-plus.zip.md5[md5]) -== Apache Tomcat Drop-in wars +=== Apache Tomcat Drop-in wars * 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] (http://www.apache.org/dyn/closer.cgi/openejb/4.0.0-beta-1/openejb-tomcat-webapp-4.0.0-beta-1.war.asc[asc] http://www.apache.org/dyn/closer.cgi/openejb/4.0.0-beta-1/openejb-tomcat-webapp-4.0.0-beta-1.war.md5[md5]) * 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] (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] 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]) -== Apache OpenEJB Standalone Server +=== Apache OpenEJB Standalone Server * 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] (http://www.apache.org/dyn/closer.cgi/openejb/4.0.0-beta-1/openejb-standalone-4.0.0-beta-1.tar.gz.asc[asc] http://www.apache.org/dyn/closer.cgi/openejb/4.0.0-beta-1/openejb-standalone-4.0.0-beta-1.tar.gz.md5[md5]) * 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] (http://www.apache.org/dyn/closer.cgi/openejb/4.0.0-beta-1/openejb-standalone-4.0.0-beta-1.zip.asc[asc] http://www.apache.org/dyn/closer.cgi/openejb/4.0.0-beta-1/openejb-standalone-4.0.0-beta-1.zip.md5[md5]) -== Source and Examples +=== Source and Examples * 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] (http://www.apache.org/dyn/closer.cgi/openejb/4.0.0-beta-1/openejb-4.0.0-beta-1-source-release.zip.asc[asc] http://www.apache.org/dyn/closer.cgi/openejb/4.0.0-beta-1/openejb-4.0.0-beta-1-source-release.zip.md5[md5]) * 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] (http://www.apache.org/dyn/closer.cgi/openejb/4.0.0-beta-1/examples-4.0.0-beta-1-src.tar.gz.asc[asc] http://www.apache.org/dyn/closer.cgi/openejb/4.0.0-beta-1/examples-4.0.0-beta-1-src.tar.gz.md5[md5]) * 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] (http://www.apache.org/dyn/closer.cgi/openejb/4.0.0-beta-1/examples-4.0.0-beta-1-src.zip.asc[asc] http://www.apache.org/dyn/closer.cgi/openejb/4.0.0-beta-1/examples-4.0.0-beta-1-src.zip.md5[md5]) -== Previous Release +=== Previous Release * http://www.apache.org/dyn/closer.cgi/openejb/3.1.4/openejb-3.1.4.zip[openejb-3.1.4.zip] * http://www.apache.org/dyn/closer.cgi/openejb/3.1.4/openejb-3.1.4.tar.gz[openejb-3.1.4.tar.gz] * 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] * http://www.apache.org/dyn/closer.cgi/openejb/3.1.4/openejb-3.1.4-src.zip[openejb-3.1.4-src.zip] -== Old releases archive +=== Old releases archive http://archive.apache.org/dist/openejb/[OpenEJB releases archive] diff --git a/tomee/modules/ROOT/pages/tomee-1.5.0-release-notes.adoc b/tomee/modules/ROOT/pages/tomee-1.5.0-release-notes.adoc index 12341ff..ff1e83f 100644 --- a/tomee/modules/ROOT/pages/tomee-1.5.0-release-notes.adoc +++ b/tomee/modules/ROOT/pages/tomee-1.5.0-release-notes.adoc @@ -1,4 +1,4 @@ -Title: Apache TomEE 1.5.0 Release Notes += Apache TomEE 1.5.0 Release Notes == Upgrades diff --git a/tomee/modules/ROOT/pages/tomee-1.5.1-release-notes.adoc b/tomee/modules/ROOT/pages/tomee-1.5.1-release-notes.adoc index 1c60b64..aefb30c 100644 --- a/tomee/modules/ROOT/pages/tomee-1.5.1-release-notes.adoc +++ b/tomee/modules/ROOT/pages/tomee-1.5.1-release-notes.adoc @@ -1,4 +1,4 @@ -Title: Apache TomEE 1.5.1 Release Notes += Apache TomEE 1.5.1 Release Notes == Upgrades diff --git a/tomee/modules/ROOT/pages/tomee-1.5.1.adoc b/tomee/modules/ROOT/pages/tomee-1.5.1.adoc index bdeffc1..1cf5dd5 100644 --- a/tomee/modules/ROOT/pages/tomee-1.5.1.adoc +++ b/tomee/modules/ROOT/pages/tomee-1.5.1.adoc @@ -1,8 +1,8 @@ = Apache TomEE 1.5.1 Released! -____ +---- We are excited to announce the release of http://tomee.apache.org/downloads.html[Apache TomEE 1.5.1]. The volume of feedback on the 1.5.1 Final drove such an impressive number of fixes and improvements into TomEE xref:tomee-1.5.1-release-notes.adoc[the changes]. -____ +---- We'd like to thank everyone who gave feedback and contributed to improve Apache TomEE on a daily basis! diff --git a/tomee/modules/ROOT/pages/tomee-1.6.0.1-release-notes.adoc b/tomee/modules/ROOT/pages/tomee-1.6.0.1-release-notes.adoc index 5dff756..b32807e 100644 --- a/tomee/modules/ROOT/pages/tomee-1.6.0.1-release-notes.adoc +++ b/tomee/modules/ROOT/pages/tomee-1.6.0.1-release-notes.adoc @@ -1,4 +1,4 @@ -Title: Apache TomEE 1.6.0.1 Release Notes += Apache TomEE 1.6.0.1 Release Notes == Upgrades diff --git a/tomee/modules/ROOT/pages/tomee-1.6.0.2-release-notes.adoc b/tomee/modules/ROOT/pages/tomee-1.6.0.2-release-notes.adoc index 61a5240..97d4325 100644 --- a/tomee/modules/ROOT/pages/tomee-1.6.0.2-release-notes.adoc +++ b/tomee/modules/ROOT/pages/tomee-1.6.0.2-release-notes.adoc @@ -1,4 +1,4 @@ -Title: Apache TomEE 1.6.0.2 Release Notes += Apache TomEE 1.6.0.2 Release Notes == Upgrades diff --git a/tomee/modules/ROOT/pages/unit-testing-transactions.adoc b/tomee/modules/ROOT/pages/unit-testing-transactions.adoc index d3e7ba3..6c2c82c 100644 --- a/tomee/modules/ROOT/pages/unit-testing-transactions.adoc +++ b/tomee/modules/ROOT/pages/unit-testing-transactions.adoc @@ -1,24 +1,19 @@ -:doctype: book += Unit Testing Transactions -Title: Unit Testing Transactions -+++<a name="UnitTestingTransactions-Basicsetup">++++++</a>+++ - -= Basic setup +== Basic setup Add the following interface and bean to your test sources (they could even be inner classes of a test case): -+++<a name="UnitTestingTransactions-Businessinterface">++++++</a>+++ -== Business interface +=== Business interface public interface Caller { public <V> V call(Callable<V> callable) throws Exception; } -+++<a name="UnitTestingTransactions-BeanImplementation(s)">++++++</a>+++ -== Bean Implementation(s) +=== Bean Implementation(s) .... import java.util.concurrent.Callable; @@ -32,15 +27,13 @@ public class TransactionBean implements Caller { } .... -+++<a name="UnitTestingTransactions-Havethemdiscovered">++++++</a>+++ -== Have them discovered +=== Have them discovered In src/test/resources/ (or related) create an META-INF/ejb-jar.xml containing the text "+++<ejb-jar>++++++</ejb-jar>+++" -+++<a name="UnitTestingTransactions-Whatweaccomplished">++++++</a>+++ -== What we accomplished +=== What we accomplished Essentially what we've done is added an ejb that will be picked up as part of your test code and deployed. You can then look it up and use it to execute test code with any particular transaction or security constraints that you want. @@ -53,9 +46,8 @@ You can have as many of these test beans in your test code as you like, each wit You do not need to use java.util.concurrent.Callable, any similar interface of your creation could work just as well. You may want something with return type void, for example, to eliminate useless 'return null' statements. -+++<a name="UnitTestingTransactions-Usage">++++++</a>+++ -= Usage +== Usage There are a number of style choices for using the above bean, specifically around the creation of the Callable object you pass in, and it all really depends on what looks nice to you. @@ -71,11 +63,11 @@ import javax.persistence.PersistenceContextType; import javax.persistence.Query; import java.util.List; -@Stateful(name = "Movies") +@Stateful(name == "Movies") @TransactionAttribute(MANDATORY) public class MoviesImpl implements Movies { - @PersistenceContext(unitName = "movie-unit", type = PersistenceContextType.TRANSACTION) + @PersistenceContext(unitName == "movie-unit", type == PersistenceContextType.TRANSACTION) private EntityManager entityManager; public void addMovie(Movie movie) throws Exception { @@ -87,7 +79,7 @@ public class MoviesImpl implements Movies { } public List<Movie> getMovies() throws Exception { - Query query = entityManager.createQuery("SELECT m from Movie asm"); + Query query == entityManager.createQuery("SELECT m from Movie asm"); return query.getResultList(); } } @@ -95,9 +87,8 @@ public class MoviesImpl implements Movies { Test code below. -+++<a name="UnitTestingTransactions-Pureinlined">++++++</a>+++ -== Pure inlined +=== Pure inlined The Callable can be created right in the test method itself. @@ -110,18 +101,18 @@ public class MoviesTest extends TestCase { } public void test() throws Exception { - Caller transactionBean = (Caller) + Caller transactionBean == (Caller) context.lookup("TransactionBeanLocal"); transactionBean.call(new Callable() { public Object call() throws Exception { - Movies movies = (Movies) context.lookup("MoviesLocal"); + Movies movies == (Movies) context.lookup("MoviesLocal"); movies.addMovie(new Movie("Quentin Tarantino", "Reservoir Dogs", 1992)); movies.addMovie(new Movie("Joel Coen", "Fargo", 1996)); movies.addMovie(new Movie("Joel Coen", "The Big Lebowski",1998)); - List<Movie> list = movies.getMovies(); + List<Movie> list == movies.getMovies(); assertEquals("List.size()", 3, list.size()); for (Movie movie : list) { @@ -137,9 +128,8 @@ public class MoviesTest extends TestCase { } .... -+++<a name="UnitTestingTransactions-Sametestcode,differenttransactionscenarios">++++++</a>+++ -== Same test code, different transaction scenarios +=== Same test code, different transaction scenarios Maybe you'd like to test how things behave with and without a transaction to guarantee everyone is doing the right thing in all situations. Negative testing is often a very good way to stomp out dangerous bugs. @@ -153,13 +143,13 @@ public class MoviesTest extends TestCase { } private void doWork() throws Exception { - Movies movies = (Movies) context.lookup("MoviesLocal"); + Movies movies == (Movies) context.lookup("MoviesLocal"); movies.addMovie(new Movie("Quentin Tarantino", "Reservoir Dogs",1992)); movies.addMovie(new Movie("Joel Coen", "Fargo", 1996)); movies.addMovie(new Movie("Joel Coen", "The Big Lebowski", 1998)); - List<Movie> list = movies.getMovies(); + List<Movie> list == movies.getMovies(); assertEquals("List.size()", 3, list.size()); for (Movie movie : list) { @@ -170,7 +160,7 @@ public class MoviesTest extends TestCase { } public void testWithTransaction() throws Exception { - Caller transactionBean = (Caller)context.lookup("TransactionBeanLocal"); + Caller transactionBean == (Caller)context.lookup("TransactionBeanLocal"); transactionBean.call(new Callable(){ public Object call() throws Exception {
