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 9d1bc3de2c79203717625990eb36cd1a7f3aae24 Author: David Jencks <[email protected]> AuthorDate: Mon Feb 17 16:11:15 2020 -0800 page fixes --- tomee/modules/ROOT/pages/docs.adoc | 38 ++++++++++++---------- tomee/modules/ROOT/pages/tomee-1.5.0.adoc | 2 +- .../ROOT/pages/tomee-1.7.0-release-notes.adoc | 2 +- tomee/modules/ROOT/pages/tomee-1.7.1.adoc | 7 +--- tomee/modules/ROOT/pages/tomee-1.7.2.adoc | 7 +--- tomee/modules/ROOT/pages/tomee-1.7.3.adoc | 7 +--- tomee/modules/ROOT/pages/tomee-1.7.4.adoc | 14 ++------ tomee/modules/ROOT/pages/tomee-7.0.0-M1.adoc | 7 +--- tomee/modules/ROOT/pages/tomee-7.0.0-M2.adoc | 7 +--- tomee/modules/ROOT/pages/tomee-7.0.0-M3.adoc | 7 +--- tomee/modules/ROOT/pages/tomee-7.0.1.adoc | 7 +--- 11 files changed, 31 insertions(+), 74 deletions(-) diff --git a/tomee/modules/ROOT/pages/docs.adoc b/tomee/modules/ROOT/pages/docs.adoc index c58321e..7346d62 100644 --- a/tomee/modules/ROOT/pages/docs.adoc +++ b/tomee/modules/ROOT/pages/docs.adoc @@ -4,23 +4,25 @@ :jbake-status: published :jbake-tomeepdf: -=== Administration -- xref:admin/configuration/index.adoc[Server Configuration] -- xref:admin/file-layout.adoc[Directory Structure] -- xref:admin/cluster/index.adoc[Clustering and High Availability (HA)] +NOTE: TODO: This page should be generated or replaced by the contents of the jbake docs.html (generated by Docs.java) -=== Developers -- xref:developer/ide/index.adoc[IDEs - Eclipse, Intellij Idea and Netbeans] -- xref:developer/testing/index.adoc[Unit Testing - Arquillian, OpenEJB JUnit, TomEE Embedded and ApplicationComposer] -- xref:developer/tools/index.adoc[Build Tools and Plugins] -- xref:developer/migration/tomee-1-to-7.adoc[Migrating From TomEE 1.x to 7.x] -- xref:developer/json/index.adoc[TomEE and Apache Johnzon - JAX-RS JSON Provider] -- xref:developer/configuration/cxf.adoc[Apache CXF Configuration - JAX-RS (RESTful Services) and JAX-WS (Web Services)] -- xref:developer/classloading/index.adoc[Understanding the TomEE ClassLoader] +== Administration +* xref:{tomee-latest-vc}::admin/configuration/index.adoc[Server Configuration] +* xref:{tomee-latest-vc}::admin/file-layout.adoc[Directory Structure] +* xref:{tomee-latest-vc}::admin/cluster/index.adoc[Clustering and High Availability (HA)] -=== Advanced -- xref:advanced/applicationcomposer/index.adoc[`ApplicationComposer` with JBatch] -- xref:advanced/setup/index.adoc[How to Setup TomEE in Production] -- xref:advanced/shading/index.adoc[Fat / Uber Jar Deployment using the Maven Shade Plugin] -- xref:advanced/client/jndi.adoc[Java Naming and Directory Interface (JNDI)] -- xref:advanced/jms/jms-configuration.adoc[Why is my ActiveMQ/JMS MDB not scaling as expected?] +== Developers +* xref:{tomee-latest-vc}::developer/ide/index.adoc[IDEs - Eclipse, Intellij Idea and Netbeans] +* xref:{tomee-latest-vc}::developer/testing/index.adoc[Unit Testing - Arquillian, OpenEJB JUnit, TomEE Embedded and ApplicationComposer] +* xref:{tomee-latest-vc}::developer/tools/index.adoc[Build Tools and Plugins] +* xref:{tomee-latest-vc}::developer/migration/tomee-1-to-7.adoc[Migrating From TomEE 1.x to 7.x] +* xref:{tomee-latest-vc}::developer/json/index.adoc[TomEE and Apache Johnzon - JAX-RS JSON Provider] +* xref:{tomee-latest-vc}::developer/configuration/cxf.adoc[Apache CXF Configuration - JAX-RS (RESTful Services) and JAX-WS (Web Services)] +* xref:{tomee-latest-vc}::developer/classloading/index.adoc[Understanding the TomEE ClassLoader] + +== Advanced +* xref:{tomee-latest-vc}::advanced/applicationcomposer/index.adoc[`ApplicationComposer` with JBatch] +* xref:{tomee-latest-vc}::advanced/setup/index.adoc[How to Setup TomEE in Production] +* xref:{tomee-latest-vc}::advanced/shading/index.adoc[Fat / Uber Jar Deployment using the Maven Shade Plugin] +* xref:{tomee-latest-vc}::advanced/client/jndi.adoc[Java Naming and Directory Interface (JNDI)] +* xref:{tomee-latest-vc}::advanced/jms/jms-configuration.adoc[Why is my ActiveMQ/JMS MDB not scaling as expected?] diff --git a/tomee/modules/ROOT/pages/tomee-1.5.0.adoc b/tomee/modules/ROOT/pages/tomee-1.5.0.adoc index fa01c08..26661f3 100644 --- a/tomee/modules/ROOT/pages/tomee-1.5.0.adoc +++ b/tomee/modules/ROOT/pages/tomee-1.5.0.adoc @@ -12,6 +12,6 @@ In addition to the previously supported Apache Commons-DBCP, the 1.5 release add The two additional pools offer great alternatives to applications under heavy load. JMX instrumentation and statistics have also been added generically to all pools and provide a great level of monitoring and management. -Other major features include deploy-time enhancement for JPA Entities via Apache OpenJPA, support including JPA providers in webapps, ability to mock and inject mocks in unit tests and a powerful new xref:maven/index.adoc[TomEE Maven Plugin] which can provision servers, install libraries, deploy webapps and more. +Other major features include deploy-time enhancement for JPA Entities via Apache OpenJPA, support including JPA providers in webapps, ability to mock and inject mocks in unit tests and a powerful new xref:{tomee-latest-vc}::maven/index.adoc[TomEE Maven Plugin] which can provision servers, install libraries, deploy webapps and more. We'd like to thank everyone who gave feedback and contibuted to improve Apache TomEE on a daily basis! diff --git a/tomee/modules/ROOT/pages/tomee-1.7.0-release-notes.adoc b/tomee/modules/ROOT/pages/tomee-1.7.0-release-notes.adoc index f1456c5..c2ecb60 100644 --- a/tomee/modules/ROOT/pages/tomee-1.7.0-release-notes.adoc +++ b/tomee/modules/ROOT/pages/tomee-1.7.0-release-notes.adoc @@ -144,7 +144,7 @@ property (configurable in application.properties) to deactivate timers * [https://issues.apache.org/jira/browse/TOMEE-1114[TOMEE-1114]] - TomEE Maven Plugin should support OpenEJB standalone * [https://issues.apache.org/jira/browse/TOMEE-1121[TOMEE-1121]] - add openejb.cxf-rs.wadl-generator.ignoreRequests to configure and not force ignoreRequests on wadlgenerator * [https://issues.apache.org/jira/browse/TOMEE-1127[TOMEE-1127]] - New Event: @Observes LifecycleEvent -* [https://issues.apache.org/jira/browse/TOMEE-1132[TOMEE-1132]] - add javaagents parameter to xref:maven/index.adoc[tomee-maven-plugin] +* [https://issues.apache.org/jira/browse/TOMEE-1132[TOMEE-1132]] - add javaagents parameter to xref:{tomee-latest-vc}::maven/index.adoc[tomee-maven-plugin] * [https://issues.apache.org/jira/browse/TOMEE-1133[TOMEE-1133]] - support @CdiExtensions on test class for ApplicationComposer * [https://issues.apache.org/jira/browse/TOMEE-1140[TOMEE-1140]] - Support CDI LoginModule * [https://issues.apache.org/jira/browse/TOMEE-1144[TOMEE-1144]] - provide an exec war goal to tomee plugin diff --git a/tomee/modules/ROOT/pages/tomee-1.7.1.adoc b/tomee/modules/ROOT/pages/tomee-1.7.1.adoc index 4c9212b..b142120 100644 --- a/tomee/modules/ROOT/pages/tomee-1.7.1.adoc +++ b/tomee/modules/ROOT/pages/tomee-1.7.1.adoc @@ -53,12 +53,7 @@ A complete xref:tomee-1.7.1-release-notes.adoc[Changelog] can be viewed here: xref:tomee-1.7.1-release-notes.adoc[tomee-1.7.1-release-notes.html] -Please feel free to jump in feet first and -//FIXME CHOOSE ONE -xref:documentation.adoc[] -xref:7.0@tomee::documentation.adoc[] -xref:7.1@tomee::documentation.adoc[] -xref:8.0@tomee::documentation.adoc[get started with TomEE]. +Please feel free to jump in feet first and xref:docs.adoc[get started with TomEE]. You will nearly always find someone to help you on one of our xref:support.adoc[support channels]. *** Java EE7 and Beyond diff --git a/tomee/modules/ROOT/pages/tomee-1.7.2.adoc b/tomee/modules/ROOT/pages/tomee-1.7.2.adoc index d6570a5..d1ccda6 100644 --- a/tomee/modules/ROOT/pages/tomee-1.7.2.adoc +++ b/tomee/modules/ROOT/pages/tomee-1.7.2.adoc @@ -38,12 +38,7 @@ A complete xref:tomee-1.7.2-release-notes.adoc[Changelog] can be viewed here: xref:tomee-1.7.2-release-notes.adoc[tomee-1.7.2-release-notes.html] -Please feel free to jump in feet first and -//FIXME CHOOSE ONE -xref:documentation.adoc[] -xref:7.0@tomee::documentation.adoc[] -xref:7.1@tomee::documentation.adoc[] -xref:8.0@tomee::documentation.adoc[get started with TomEE]. +Please feel free to jump in feet first and xref:docs.adoc[get started with TomEE]. You will nearly always find someone to help you on one of our xref:support.adoc[support channels]. *** Java EE7 and Beyond diff --git a/tomee/modules/ROOT/pages/tomee-1.7.3.adoc b/tomee/modules/ROOT/pages/tomee-1.7.3.adoc index 7a745c6..a127887 100644 --- a/tomee/modules/ROOT/pages/tomee-1.7.3.adoc +++ b/tomee/modules/ROOT/pages/tomee-1.7.3.adoc @@ -39,12 +39,7 @@ A complete xref:tomee-1.7.3-release-notes.adoc[Changelog] can be viewed here: xref:tomee-1.7.3-release-notes.adoc[tomee-1.7.3-release-notes.html] -Please feel free to jump in feet first and -//FIXME CHOOSE ONE -xref:documentation.adoc[] -xref:7.0@tomee::documentation.adoc[] -xref:7.1@tomee::documentation.adoc[] -xref:8.0@tomee::documentation.adoc[get started with TomEE]. +Please feel free to jump in feet first and xref:docs.adoc[get started with TomEE]. You will nearly always find someone to help you on one of our xref:support.adoc[support channels]. *** Java EE7 and Beyond diff --git a/tomee/modules/ROOT/pages/tomee-1.7.4.adoc b/tomee/modules/ROOT/pages/tomee-1.7.4.adoc index a907910..62e4546 100644 --- a/tomee/modules/ROOT/pages/tomee-1.7.4.adoc +++ b/tomee/modules/ROOT/pages/tomee-1.7.4.adoc @@ -2,12 +2,7 @@ The Apache TomEE community is pleased to announce the release of http://tomee.apache.org/downloads.html[Apache TomEE 1.7.4], which is based on http://tomcat.apache.org/tomcat-7.0-doc/index.html[Apache Tomcat 7.0.68], including numerous fixes and updates. Part of this release an important security fix is included if EJBd is active on your instance (true by default). -More on -//FIXME CHOOSE ONE -xref:security/tomee.adoc[] -xref:7.0@tomee::developer/tools/maven/tomee.adoc[] -xref:7.1@tomee::developer/tools/maven/tomee.adoc[] -xref:8.0@tomee::developer/tools/maven/tomee.adoc[CVE-2016-0779]. +More on xref:security/tomee.adoc[CVE-2016-0779]. Please note that the TomEE 1.7.4 drop in WAR file will not work on Apache Tomcat 8. If you are interested in a Tomcat 8.x version then please feel free to check out and xref:contribute.adoc[contribute to the developer branch] - We are always interested in any help from the community that we can get. @@ -45,12 +40,7 @@ A complete xref:tomee-1.7.4-release-notes.adoc[Changelog] can be viewed here: xref:tomee-1.7.4-release-notes.adoc[tomee-1.7.4-release-notes.html] -Please feel free to jump in feet first and -//FIXME CHOOSE ONE -xref:documentation.adoc[] -xref:7.0@tomee::documentation.adoc[] -xref:7.1@tomee::documentation.adoc[] -xref:8.0@tomee::documentation.adoc[get started with TomEE]. +Please feel free to jump in feet first and xref:docs.adoc[get started with TomEE]. You will nearly always find someone to help you on one of our xref:support.adoc[support channels]. *** Java EE7 and Beyond diff --git a/tomee/modules/ROOT/pages/tomee-7.0.0-M1.adoc b/tomee/modules/ROOT/pages/tomee-7.0.0-M1.adoc index dc83332..c21bef6 100644 --- a/tomee/modules/ROOT/pages/tomee-7.0.0-M1.adoc +++ b/tomee/modules/ROOT/pages/tomee-7.0.0-M1.adoc @@ -45,10 +45,5 @@ A complete xref:tomee-7.0.0-M1-release-notes.adoc[Changelog] can be viewed here: xref:tomee-7.0.0-M1-release-notes.adoc[tomee-7.0.0-M1-release-notes.html] -Please feel free to jump in feet first and -//FIXME CHOOSE ONE -xref:documentation.adoc[] -xref:7.0@tomee::documentation.adoc[] -xref:7.1@tomee::documentation.adoc[] -xref:8.0@tomee::documentation.adoc[get started with TomEE]. +Please feel free to jump in feet first and xref:docs.adoc[get started with TomEE]. You will nearly always find someone to help you on one of our xref:support.adoc[support channels]. diff --git a/tomee/modules/ROOT/pages/tomee-7.0.0-M2.adoc b/tomee/modules/ROOT/pages/tomee-7.0.0-M2.adoc index 0c3e900..00608ed 100644 --- a/tomee/modules/ROOT/pages/tomee-7.0.0-M2.adoc +++ b/tomee/modules/ROOT/pages/tomee-7.0.0-M2.adoc @@ -45,10 +45,5 @@ A complete xref:tomee-7.0.0-M2-release-notes.adoc[Changelog] can be viewed here: xref:tomee-7.0.0-M2-release-notes.adoc[tomee-7.0.0-M2-release-notes.html] -Please feel free to jump in feet first and -//FIXME CHOOSE ONE -xref:documentation.adoc[] -xref:7.0@tomee::documentation.adoc[] -xref:7.1@tomee::documentation.adoc[] -xref:8.0@tomee::documentation.adoc[get started with TomEE]. +Please feel free to jump in feet first and xref:docs.adoc[get started with TomEE]. You will nearly always find someone to help you on one of our xref:support.adoc[support channels]. diff --git a/tomee/modules/ROOT/pages/tomee-7.0.0-M3.adoc b/tomee/modules/ROOT/pages/tomee-7.0.0-M3.adoc index a59f5cb..0216e91 100644 --- a/tomee/modules/ROOT/pages/tomee-7.0.0-M3.adoc +++ b/tomee/modules/ROOT/pages/tomee-7.0.0-M3.adoc @@ -51,10 +51,5 @@ A complete xref:tomee-7.0.0-M3-release-notes.adoc[Changelog] can be viewed here: xref:tomee-7.0.0-M3-release-notes.adoc[tomee-7.0.0-M3-release-notes.html] -Please feel free to jump in feet first and -//FIXME CHOOSE ONE -xref:documentation.adoc[] -xref:7.0@tomee::documentation.adoc[] -xref:7.1@tomee::documentation.adoc[] -xref:8.0@tomee::documentation.adoc[get started with TomEE]. +Please feel free to jump in feet first and xref:docs.adoc[get started with TomEE]. You will nearly always find someone to help you on one of our xref:support.adoc[support channels]. diff --git a/tomee/modules/ROOT/pages/tomee-7.0.1.adoc b/tomee/modules/ROOT/pages/tomee-7.0.1.adoc index b44959d..5585f04 100644 --- a/tomee/modules/ROOT/pages/tomee-7.0.1.adoc +++ b/tomee/modules/ROOT/pages/tomee-7.0.1.adoc @@ -44,10 +44,5 @@ A complete xref:tomee-7.0.1-release-notes.adoc[Changelog] can be viewed here: xref:tomee-7.0.1-release-notes.adoc[tomee-7.0.1-release-notes.html] -Please feel free to jump in feet first and -//FIXME CHOOSE ONE -xref:documentation.adoc[] -xref:7.0@tomee::documentation.adoc[] -xref:7.1@tomee::documentation.adoc[] -xref:8.0@tomee::documentation.adoc[get started with TomEE]. +Please feel free to jump in feet first and xref:docs.adoc[get started with TomEE]. You will nearly always find someone to help you on one of our xref:support.adoc[support channels].
