Revert "TOMEE-4023 Comparison pages with wrong specs per profile (#47)"
This reverts commit 3510177715fdd4ef22f971cb7935523a013be533.
diff --git a/src/main/jbake/content/comparison.adoc b/src/main/jbake/content/comparison.adoc
index 3fa9377..48d54f7 100644
--- a/src/main/jbake/content/comparison.adoc
+++ b/src/main/jbake/content/comparison.adoc
@@ -32,22 +32,21 @@
Apache TomEE has four distributions, each supporting a slightly different set of technologies and aimed to give you a choice in what you want included out-of-the-box. When in doubt, choose Apache TomEE Plume.
-[options="header",cols="7,5*^0"]
+[options="header",cols="5,5*^1"]
|===
||Tomcat|TomEE WebProfile|TomEE MicroProfile|TomEE Plus|TomEE Plume
|*HTTP Request processing and Response:* +
-Jakarta Servlet, Server Pages (JSP), Expression Language (EL), +
-Annotations, Authentication (JASPIC), WebSocket, ... |{y}|{y}|{y}|{y}|{y}
-|*Data Persistence (ORM), Web Services and more:* +
-Enterprise Beans (EJB), Contexts and Dependency Injection (CDI),
-Data Persistence (JPA), Standard Tag Library (JSTL), Faces (JSF),
-Transactions (JTA), RESTful Web Services (JAX-RS, JSON, JAXB), ... ||{y}|{y}|{y}|{y}
+Jakarta Annotations, Servlet, JSP, JSTL, EL, WebSocket, +
+Jakarta Authentication, Security, ...|{y}|{y}|{y}|{y}|{y}
+|*Data persistence, ORM, Web Services and more:* +
+Jakarta CDI, DI, EJB, JPA, JTA, JSF, JSON, JAXB, ... +
+Jakarta RESTful Web Services (JAX-RS)||{y}|{y}|{y}|{y}
|*Microservices architecture:* +
-MicroProfile Config, Fault Tolerance, Health, Metrics, OpenAPI, OpenTracing,
-Type-safe Rest Client, ...|||{y}|{y}|{y}
+MicroProfile Config, Health, Metrics, OpenAPI, OpenTracing, ... +
+MicroProfile Type-safe Rest Client|||{y}|{y}|{y}
|*Other features:* +
-Jakarta Authorization (JACC), Batch, Concurrency, Connectors, +
-Messaging (JMS), SOAP Web Services (JAX-WS, JWS, SAAJ), ... ||||{y}|{y}
+Jakarta Authorization, Batch, Connectors, Messaging (JMS), ... +
+Jakarta SOAP Web Services (JAX-WS)||||{y}|{y}
|Jakarta Faces (JSF) implementation||MyFaces|MyFaces|MyFaces|*Mojarra*
|Jakarta Persistence (JPA) implementation(s)||OpenJPA|OpenJPA|OpenJPA|OpenJPA, *EclipseLink*
|===
@@ -60,8 +59,11 @@
// TOMCAT
|https://jakarta.ee/specifications/annotations/[Jakarta Annotations^]|{y}|{y}|{y}|{y}|{y}
|https://jakarta.ee/specifications/authentication/[Jakarta Authentication^] (JASPIC)|{y}|{y}|{y}|{y}|{y}
+|https://jakarta.ee/specifications/debugging/[Jakarta Debugging Support for Other Languages^]|{y}|{y}|{y}|{y}|{y}
+|https://jakarta.ee/specifications/security/[Jakarta Security^] (Java EE Enterprise Security)|{y}|{y}|{y}|{y}|{y}
|https://jakarta.ee/specifications/servlet/[Jakarta Servlet^]|{y}|{y}|{y}|{y}|{y}
|https://jakarta.ee/specifications/pages/[Jakarta Server Pages^] (JSP)|{y}|{y}|{y}|{y}|{y}
+|https://jakarta.ee/specifications/tags/[Jakarta Standard Tag Library^] (JSTL)|{y}|{y}|{y}|{y}|{y}
|https://jakarta.ee/specifications/expression-language/[Jakarta Expression Language^] (EL)|{y}|{y}|{y}|{y}|{y}
|https://jakarta.ee/specifications/websocket/[Jakarta WebSocket^]|{y}|{y}|{y}|{y}|{y}
// WEB PROFILE
@@ -70,7 +72,6 @@
|https://jakarta.ee/specifications/bean-validation/[Jakarta Bean Validation^]||{y}|{y}|{y}|{y}
|https://jakarta.ee/specifications/cdi/[Jakarta Contexts and Dependency Injection^] (CDI)||{y}|{y}|{y}|{y}
|https://jakarta.ee/specifications/dependency-injection/[Jakarta Dependency Injection^] (@Inject)||{y}|{y}|{y}|{y}
-|https://jakarta.ee/specifications/debugging/[Jakarta Debugging Support for Other Languages^]||{y}|{y}|{y}|{y}
|https://jakarta.ee/specifications/enterprise-beans/[Jakarta Enterprise Beans^] (EJB)||{y}|{y}|{y}|{y}
|https://jakarta.ee/specifications/faces/[Jakarta Faces^] (JSF)||{y}|{y}|{y}|{y}
|https://jakarta.ee/specifications/interceptors/[Jakarta Interceptors^]||{y}|{y}|{y}|{y}
@@ -80,8 +81,6 @@
|https://jakarta.ee/specifications/managedbeans/[Jakarta Managed Beans^]||{y}|{y}|{y}|{y}
|https://jakarta.ee/specifications/persistence/[Jakarta Persistence^] (JPA)||{y}|{y}|{y}|{y}
|https://jakarta.ee/specifications/restful-ws/[Jakarta RESTful Web Services^] (JAX-RS)||{y}|{y}|{y}|{y}
-|https://jakarta.ee/specifications/security/[Jakarta Security^] (Enterprise Security)||{y}|{y}|{y}|{y}
-|https://jakarta.ee/specifications/tags/[Jakarta Standard Tag Library^] (JSTL)||{y}|{y}|{y}|{y}
|https://jakarta.ee/specifications/transactions/[Jakarta Transactions^] (JTA)||{y}|{y}|{y}|{y}
|https://jakarta.ee/specifications/xml-binding/[Jakarta XML Binding^] (JAXB)||{y}|{y}|{y}|{y}
// MICRO PROFILE
@@ -102,42 +101,41 @@
|https://jakarta.ee/specifications/connectors/[Jakarta Connectors^]||||{y}|{y}
|https://jakarta.ee/specifications/enterprise-ws/[Jakarta Enterprise Web Services^]||||{y}|{y}
|https://jakarta.ee/specifications/messaging/[Jakarta Messaging^] (JMS)||||{y}|{y}
-|https://jakarta.ee/specifications/soap-attachments/[Jakarta SOAP with Attachments^] (SAAJ)||||{y}|{y}
-|https://jakarta.ee/specifications/web-services-metadata/[Jakarta Web Services Metadata^] (JWS)||||{y}|{y}
+|https://jakarta.ee/specifications/soap-attachments/[Jakarta SOAP with Attachments^]||||{y}|{y}
+|https://jakarta.ee/specifications/web-services-metadata/[Jakarta Web Services Metadata^]||||{y}|{y}
|https://jakarta.ee/specifications/xml-web-services/[Jakarta XML Web Services^] (JAX-WS)||||{y}|{y}
// IMPLEMENTATIONS
|Jakarta Faces (JSF) implementation||MyFaces|MyFaces|MyFaces|*Mojarra*
|Jakarta Persistence (JPA) implementation(s)||OpenJPA|OpenJPA|OpenJPA|OpenJPA, *EclipseLink*
|===
+////
+
+// implementations table moved out to version-specific documentation
+
== [[implementations]] Implementations of Jakarta EE and MicroProfile features in TomEE
[options="header",cols="1,1"]
|===
|Specifications|Implementations included by TomEE
-|Jakarta Servlet, Server Pages (JSP), Expression Language (EL), +
-Jakarta Annotations, Authentication (JASPIC), WebSocket, ... |
-https://tomcat.apache.org/[Apache Tomcat^]
+|Jakarta Annotations, Servlet, Server Pages (JSP), +
+Jakarta Expression Language (EL), WebSocket, +
+Jakarta Authentication (JASPIC), Security, ...|https://tomcat.apache.org/[Apache Tomcat^]
|Jakarta{nbsp}Standard{nbsp}Tag{nbsp}Library{nbsp}(JSTL)|https://tomcat.apache.org/taglibs.html[Apache Standard Taglib Implementation^]
-|Jakarta Faces (JSF)|
-https://myfaces.apache.org/[Apache MyFaces^] *(in all TomEE flavors except Plume)* +
+|Jakarta Faces (JSF)|https://myfaces.apache.org/[Apache MyFaces^] *(in all TomEE flavors except Plume)* +
https://projects.eclipse.org/projects/ee4j.mojarra[Eclipse Mojarra^] *(in TomEE Plume only)*
-|Jakarta Bean Validation|
-https://bval.apache.org/[Apache BVal^] *(in TomEE 8.x and earlier)* +
+|Jakarta Bean Validation|https://bval.apache.org/[Apache BVal^] *(in TomEE 8.x and earlier)* +
https://hibernate.org/validator/[Hibernate Validator^] *(in TomEE 9.x and later)*
|Jakarta Contexts and Dependency Injection (CDI)|https://openwebbeans.apache.org/[Apache OpenWebBeans^]
|Jakarta Enterprise Beans (EJB)|https://openejb.apache.org/[Apache OpenEJB^]
-|Jakarta Persistence (JPA)|
-https://openjpa.apache.org/[Apache OpenJPA^] (in all TomEE flavors) +
+|Jakarta Persistence (JPA)|https://openjpa.apache.org/[Apache OpenJPA^] (in all TomEE flavors) +
https://www.eclipse.org/eclipselink/[EclipseLink^] *(in TomEE Plume only)*
|Jakarta Transactions (JTA)|Apache{nbsp}Geronimo{nbsp}Transaction{nbsp}Manager
|Jakarta Mail (JavaMail)|Apache Geronimo JavaMail
-|MicroProfile|
-Apache Geronimo MicroProfile *(in TomEE 7.1.x and 8.x)* +
+|MicroProfile|Apache Geronimo MicroProfile *(in TomEE 7.1.x and 8.x)* +
https://smallrye.io/[SmallRye MicroProfile^] *(in TomEE 9.x and later)*
|Jakarta JSON Binding (JSON-B), +
-Jakarta JSON Processing (JSON-P)|
-https://johnzon.apache.org/[Apache Johnzon^]
+Jakarta JSON Processing (JSON-P)|https://johnzon.apache.org/[Apache Johnzon^]
|Jakarta XML Binding (JAXB)|https://projects.eclipse.org/projects/ee4j.jaxb-impl[Eclipse Implementation of JAXB^]
|Web Services|https://cxf.apache.org/[Apache CXF^]
|Jakarta Batch (JBatch)|https://geronimo.apache.org/batchee/[Apache BatchEE^]
@@ -145,3 +143,5 @@
|===
In bold : Implementations that differ between flavors or between versions
+
+////
