[tomee-site-generator] 27/44: reconcile files

[db...@apache.org]

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 c7ccec762478c1536b16fccc3b2cd4f4a5a37d02
Author: David Jencks <dj...@apache.org>
AuthorDate: Wed Mar 4 12:38:06 2020 -0800

    reconcile files
---
 tomee/modules/ROOT/pages/comparison.adoc           | 305 +++++++++++----------
 tomee/modules/ROOT/pages/concepts.adoc             |  13 +-
 .../modules/ROOT/pages/tomcat-object-factory.adoc  |   8 +-
 3 files changed, 172 insertions(+), 154 deletions(-)

diff --git a/tomee/modules/ROOT/pages/comparison.adoc b/tomee/modules/ROOT/pages/comparison.adoc
index f726000..31bb862 100644
--- a/tomee/modules/ROOT/pages/comparison.adoc
+++ b/tomee/modules/ROOT/pages/comparison.adoc
@@ -1,158 +1,165 @@
-Title: Comparison
+= Comparison
+:index-group: General Information
+:jbake-date: 2018-12-05
+:jbake-type: page
+:jbake-status: published
+:icons: font
+:y: icon:check[role="green"]
+:n: icon:times[role="red"]
+:c: icon:file-text-o[role="blue"
+
+//in site-generator
 
 Apache OpenEJB and Apache TomEE are born from the same project and community.
 They differ in two major ways, only one of them technical:
 
-* TomEE incorporates two additional projects;
-Tomcat and MyFaces
+* TomEE incorporates two additional projects; Tomcat and MyFaces
 * TomEE, as a name, more easily implies the breadth of technologies included
 
-Effectively, TomEE is a superset of OpenEJB.
-They share the same code and TomEE grew out of OpenEJB.
-
-NOTE: this table is for TomEE 1.x, TomEE 7 comments are under it.+++<table>++++++<tr>++++++<th>++++++</th>+++
-+++<th>+++Tomcat+++</th>+++
-+++<th>+++TomEE+++</th>+++
-+++<th>+++TomEE JAX-RS (~ Microprofile)+++</th>+++
-+++<th>+++TomEE++++</th>+++
-+++<th>+++TomEE PluME+++</th>+++
-+++<th>+++OpenEJB+++</th>++++++</tr>+++
-
-+++<tr>++++++<td>+++Java Servlets+++</td>+++
-+++<td>+++(/)+++</td>+++
-+++<td>+++(/)+++</td>+++
-+++<td>+++(/)+++</td>+++
-+++<td>+++(/)+++</td>+++
-+++<td>+++(/)+++</td>+++
-+++<td>++++++</td>++++++</tr>+++
-
-+++<tr>++++++<td>+++Java ServerPages (JSP)+++</td>+++
-+++<td>+++(/)+++</td>+++
-+++<td>+++(/)+++</td>+++
-+++<td>+++(/)+++</td>+++
-+++<td>+++(/)+++</td>+++
-+++<td>+++(/)+++</td>+++
-+++<td>++++++</td>++++++</tr>+++
-
-+++<tr>++++++<td>+++Java ServerFaces (JSF)+++</td>+++
-+++<td>++++++</td>+++
-+++<td>+++(/)+++</td>+++
-+++<td>+++(/)+++</td>+++
-+++<td>+++(/)+++</td>+++
-+++<td>+++(/)+++</td>+++
-+++<td>++++++</td>++++++</tr>+++
-
-+++<tr>++++++<td>+++Java Transaction API (JTA)+++</td>+++
-+++<td>++++++</td>+++
-+++<td>+++(/)+++</td>+++
-+++<td>+++(/)+++</td>+++
-+++<td>+++(/)+++</td>+++
-+++<td>+++(/)+++</td>+++
-+++<td>+++(/)+++</td>++++++</tr>+++
-
-+++<tr>++++++<td>+++Java Persistence API (JPA)+++</td>+++
-+++<td>++++++</td>+++
-+++<td>+++(/)+++</td>+++
-+++<td>+++(/)+++</td>+++
-+++<td>+++(/)+++</td>+++
-+++<td>+++(/)+++</td>+++
-+++<td>+++(/)+++</td>++++++</tr>+++
-
-+++<tr>++++++<td>+++Java Contexts and Dependency Injection (CDI)+++</td>+++
-+++<td>++++++</td>+++
-+++<td>+++(/)+++</td>+++
-+++<td>+++(/)+++</td>+++
-+++<td>+++(/)+++</td>+++
-+++<td>+++(/)+++</td>+++
-+++<td>+++(/)+++</td>++++++</tr>+++
-
-+++<tr>++++++<td>+++Java Authentication and Authorization Service (JAAS)+++</td>+++
-+++<td>++++++</td>+++
-+++<td>+++(/)+++</td>+++
-+++<td>+++(/)+++</td>+++
-+++<td>+++(/)+++</td>+++
-+++<td>+++(/)+++</td>+++
-+++<td>+++(/)+++</td>++++++</tr>+++
-
-+++<tr>++++++<td>+++Java Authorization Contract for Containers (JACC)+++</td>+++
-+++<td>++++++</td>+++
-+++<td>+++(/)+++</td>+++
-+++<td>+++(/)+++</td>+++
-+++<td>+++(/)+++</td>+++
-+++<td>+++(/)+++</td>+++
-+++<td>+++(/)+++</td>++++++</tr>+++
-
-+++<tr>++++++<td>+++JavaMail API+++</td>+++
-+++<td>++++++</td>+++
-+++<td>+++(/)+++</td>+++
-+++<td>+++(/)+++</td>+++
-+++<td>+++(/)+++</td>+++
-+++<td>+++(/)+++</td>+++
-+++<td>+++(/)+++</td>++++++</tr>+++
-
-+++<tr>++++++<td>+++Bean Validation+++</td>+++
-+++<td>++++++</td>+++
-+++<td>+++(/)+++</td>+++
-+++<td>+++(/)+++</td>+++
-+++<td>+++(/)+++</td>+++
-+++<td>+++(/)+++</td>+++
-+++<td>+++(/)+++</td>++++++</tr>+++
-
-+++<tr>++++++<td>+++Enterprise JavaBeans+++</td>+++
-+++<td>++++++</td>+++
-+++<td>+++(/)+++</td>+++
-+++<td>+++(/)+++</td>+++
-+++<td>+++(/)+++</td>+++
-+++<td>+++(/)+++</td>+++
-+++<td>+++(/)+++</td>++++++</tr>+++
-
-+++<tr>++++++<td>+++Java API for RESTful Web Services (JAX-RS)+++</td>+++
-+++<td>++++++</td>+++
-+++<td>++++++</td>+++
-+++<td>+++(/)+++</td>+++
-+++<td>+++(/)+++</td>+++
-+++<td>+++(/)+++</td>+++
-+++<td>+++(/)+++</td>++++++</tr>+++
-
-+++<tr>++++++<td>+++Java API for XML Web Services (JAX-WS)+++</td>+++
-+++<td>++++++</td>+++
-+++<td>++++++</td>+++
-+++<td>++++++</td>+++
-+++<td>+++(/)+++</td>+++
-+++<td>+++(/)+++</td>+++
-+++<td>+++(/)+++</td>++++++</tr>+++
-
-+++<tr>++++++<td>+++Java EE Connector Architecture+++</td>+++
-+++<td>++++++</td>+++
-+++<td>++++++</td>+++
-+++<td>++++++</td>+++
-+++<td>+++(/)+++</td>+++
-+++<td>+++(/)+++</td>+++
-+++<td>+++(/)+++</td>++++++</tr>+++
-
-+++<tr>++++++<td>+++Java Messaging Service (JMS)+++</td>+++
-+++<td>++++++</td>+++
-+++<td>++++++</td>+++
-+++<td>++++++</td>+++
-+++<td>+++(/)+++</td>+++
-+++<td>+++(/)+++</td>+++
-+++<td>+++(/)+++</td>++++++</tr>+++
-
-+++<tr>++++++<td>+++EclipseLink+++</td>+++
-+++<td>++++++</td>+++
-+++<td>++++++</td>+++
-+++<td>++++++</td>+++
-+++<td>++++++</td>+++
-+++<td>+++(/)+++</td>+++
-+++<td>++++++</td>++++++</tr>+++
-
-+++<tr>++++++<td>+++Mojarra+++</td>+++
-+++<td>++++++</td>+++
-+++<td>++++++</td>+++
-+++<td>++++++</td>+++
-+++<td>++++++</td>+++
-+++<td>+++(/)+++</td>+++
-+++<td>++++++</td>++++++</tr>++++++</table>+++
+Effectively, TomEE is a superset of OpenEJB. They share the same code and TomEE grew out of OpenEJB.
+
+Note: this table is for TomEE 1.x, TomEE 7 comments are under it.
+
+[cols="4,6*^1"]
+|===
+| |Tomcat |TomEE |TomEE JAX-RS (~ Microprofile) |TomEE+ |TomEE PluME |OpenEJB
+
+|Java Servlets
+| {y}
+| {y}
+| {y}
+| {y}
+| {y}
+|
+
+|Java ServerPages (JSP)
+| {y}
+| {y}
+| {y}
+| {y}
+| {y}
+|
+
+|Java ServerFaces (JSF)
+|
+| {y}
+| {y}
+| {y}
+| {y}
+|
+
+|Java Transaction API (JTA)
+|
+| {y}
+| {y}
+| {y}
+| {y}
+| {y}
+
+|Java Persistence API (JPA)
+|
+| {y}
+| {y}
+| {y}
+| {y}
+| {y}
+
+|Java Contexts and Dependency Injection (CDI)
+|
+| {y}
+| {y}
+| {y}
+| {y}
+| {y}
+
+|Java Authentication and Authorization Service (JAAS)
+|
+| {y}
+| {y}
+| {y}
+| {y}
+| {y}
+
+|Java Authorization Contract for Containers (JACC)
+|
+| {y}
+| {y}
+| {y}
+| {y}
+| {y}
+
+|JavaMail API
+|
+| {y}
+| {y}
+| {y}
+| {y}
+| {y}
+
+|Bean Validation
+|
+| {y}
+| {y}
+| {y}
+| {y}
+| {y}
+
+|Enterprise JavaBeans
+|
+| {y}
+| {y}
+| {y}
+| {y}
+| {y}
+
+|Java API for RESTful Web Services (JAX-RS)
+|
+|
+| {y}
+| {y}
+| {y}
+| {y}
+
+|Java API for XML Web Services (JAX-WS)
+|
+|
+|
+| {y}
+| {y}
+| {y}
+
+|Java EE Connector Architecture
+|
+|
+|
+| {y}
+| {y}
+| {y}
+
+|Java Messaging Service (JMS)
+|
+|
+|
+| {y}
+| {y}
+| {y}
+
+|EclipseLink
+|
+|
+|
+| {y}
+|
+|
+
+|Mojarra
+|
+|
+|
+| {y}
+|
+|
+|===
 
 TomEE 7 targets JavaEE 7 and implements these specifications (in parenthesis the distibution(s) containing it if not part of the basic packages):
 
diff --git a/tomee/modules/ROOT/pages/concepts.adoc b/tomee/modules/ROOT/pages/concepts.adoc
index a6c08b7..7948d29 100644
--- a/tomee/modules/ROOT/pages/concepts.adoc
+++ b/tomee/modules/ROOT/pages/concepts.adoc
@@ -1,4 +1,12 @@
-Title: Concepts OpenEJB was founded on the idea that it would be embedded into third-party environments whom would likely already have three things:
+= Concepts
+:index-group: Unrevised
+:jbake-date: 2018-12-05
+:jbake-type: page
+:jbake-status: published
+
+//in site-generator
+
+OpenEJB was founded on the idea that it would be embedded into third-party environments whom would likely already have three things:
 
 * their one "server" platform with existing clients and protocols
 * their own way to configure their platform
@@ -26,8 +34,7 @@ The same implementation of a service can be declared several times in a service-
 This allows for you to setup several several different profiles or pre-configured versions of the services you provide each with a different name and different set of default values for its properties.
 
 In your openejb.conf file when you declare Containers and Connectors, we are actually hooking you up with Service Providers automatically.
-You get what is in the org/apache/openejb/service-jar.xml by default, but you are able to point specifically to a specific Service Provider by the 'provider' attribute on the Container, Connector, TransactionManager, SecurityService, etc.
-elements of the openejb.conf file.
+You get what is in the org/apache/openejb/service-jar.xml by default, but you are able to point specifically to a specific Service Provider by the 'provider' attribute on the Container, Connector, TransactionManager, SecurityService, etc. elements of the openejb.conf file.
 When you declare a service (Container, Connector, etc.) in your openejb.conf file the properties you supply override the properties supplied by the Service Provider, thus you only need to specify the properties you'd like to change and can have your openejb.conf file as large or as small as you would like it.
 The act of doing this can be thought of as essentially instantiating the Service Provider and configuring that instance for inclusion in the runtime system.
 
diff --git a/tomee/modules/ROOT/pages/tomcat-object-factory.adoc b/tomee/modules/ROOT/pages/tomcat-object-factory.adoc
index 2825ad1..2ef673c 100644
--- a/tomee/modules/ROOT/pages/tomcat-object-factory.adoc
+++ b/tomee/modules/ROOT/pages/tomcat-object-factory.adoc
@@ -1,6 +1,10 @@
 = Tomcat Object Factory
+:index-group: Unrevised
+:jbake-date: 2018-12-05
+:jbake-type: page
+:jbake-status: published
 
-_The TomcatEjbFactory as discussed in the http://www.onjava.com/pub/a/onjava/2003/02/12/ejb_tomcat.html[OnJava article "OpenEJB: EJB for Tomcat"]  is no longer required._
+_The TomcatEjbFactory as discussed in the link:http://www.onjava.com/pub/a/onjava/2003/02/12/ejb_tomcat.html[OnJava article "OpenEJB: EJB for Tomcat"]  is no longer required._
 
-As of OpenEJB 3.0 references from Servlets to EJBs happen automatically with usage of the xref:openejbx30:injection-of-other-ejbs-example.adoc[@EJB annotation]  in the Servlet, Filter or Listener or with the ejb-ref or ejb-local-ref declared in the web.xml.
+As of OpenEJB 3.0 references from Servlets to EJBs happen automatically with usage of the xref:{examples-vc}:injection-of-other-ejbs-example.adoc[@EJB annotation]  in the Servlet, Filter or Listener or with the ejb-ref or ejb-local-ref declared in the web.xml.
 See the xref:tomcat.adoc[Tomcat Integration] page for the most up-to-date details on using OpenEJB inside Tomcat.