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 2021/05/18 01:06:13 UTC
[tomee-site-generator] 33/44: fixes from manual review
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 0f13865599f53c33e1f3c8433d3214b5060ab301
Author: David Jencks <dj...@apache.org>
AuthorDate: Fri Mar 6 07:49:04 2020 -0800
fixes from manual review
---
tomee/modules/ROOT/pages/comparison.adoc | 2 +-
.../modules/ROOT/pages/dev/contribution-tips.adoc | 32 ++---
.../pages/dev/design-application-serverlinks.adoc | 2 +
tomee/modules/ROOT/pages/dev/design-container.adoc | 2 +-
.../ROOT/pages/dev/design-local-serverlinks.adoc | 2 +-
.../ROOT/pages/dev/design-remote-serverlinks.adoc | 2 +-
tomee/modules/ROOT/pages/dev/git.adoc | 7 +-
tomee/modules/ROOT/pages/evolution-of-ejb.adoc | 155 +++++++++++----------
8 files changed, 106 insertions(+), 98 deletions(-)
diff --git a/tomee/modules/ROOT/pages/comparison.adoc b/tomee/modules/ROOT/pages/comparison.adoc
index 31bb862..5981cf7 100644
--- a/tomee/modules/ROOT/pages/comparison.adoc
+++ b/tomee/modules/ROOT/pages/comparison.adoc
@@ -6,7 +6,7 @@
:icons: font
:y: icon:check[role="green"]
:n: icon:times[role="red"]
-:c: icon:file-text-o[role="blue"
+:c: icon:file-text-o[role="blue"]
//in site-generator
diff --git a/tomee/modules/ROOT/pages/dev/contribution-tips.adoc b/tomee/modules/ROOT/pages/dev/contribution-tips.adoc
index 2f7ec10..88a69e0 100644
--- a/tomee/modules/ROOT/pages/dev/contribution-tips.adoc
+++ b/tomee/modules/ROOT/pages/dev/contribution-tips.adoc
@@ -11,22 +11,22 @@
Play around with the examples under the examples/ directory.
Some of the neater ones are (ordered simple to complex):
-* http://tomee.apache.org/examples-trunk/simple-stateless/README.html[simple-stateless]
-* http://tomee.apache.org/examples-trunk/simple-stateful/README.html[simple-stateful]
-* http://tomee.apache.org/examples-trunk/simple-singleton/README.html[simple-singleton]
-* http://tomee.apache.org/examples-trunk/simple-mdb/README.html[simple-mdb]
-* http://tomee.apache.org/examples-trunk/async-methods/README.html[async-methods]
-* http://tomee.apache.org/examples-trunk/schedule-methods/README.html[schedule-methods]
-* http://tomee.apache.org/examples-trunk/injection-of/README.html[injection-of-env-entry]
-* http://tomee.apache.org/examples-trunk/injection-of/README.html[injection-of-ejbs]
-* http://tomee.apache.org/examples-trunk/injection-of-datasource/README.html[injection-of-datasource]
-* http://tomee.apache.org/examples-trunk/injection-of-entitymanager/README.html[injection-of-entitymanager]
-* http://tomee.apache.org/examples-trunk/testcase-injection/README.html[testcase-injection]
-* http://tomee.apache.org/examples-trunk/testing-transactions/README.html[testing-transactions]
-* http://tomee.apache.org/examples-trunk/transaction-rollback/README.html[transaction-rollback]
-* http://tomee.apache.org/examples-trunk/testing-security/README.html[testing-security]
-* http://tomee.apache.org/examples-trunk/testing-security-2/README.html[testing-security-2]
-* http://tomee.apache.org/examples-trunk/simple-webservice/README.html[simple-webservice]
+* xref:{examples-vc}::simple-stateless.adoc[simple-stateless]
+* xref:{examples-vc}::simple-stateful.adoc[simple-stateful]
+* xref:{examples-vc}::simple-singleton.adoc[simple-singleton]
+* xref:{examples-vc}::simple-mdb.adoc[simple-mdb]
+* xref:{examples-vc}::async-methods.adoc[async-methods]
+* xref:{examples-vc}::schedule-methods.adoc[schedule-methods]
+* xref:{examples-vc}::injection-of-env-entry.adoc[injection-of-env-entry]
+* xref:{examples-vc}::injection-of-ejbs.adoc[injection-of-ejbs]
+* xref:{examples-vc}::injection-of-datasource.adoc[injection-of-datasource]
+* xref:{examples-vc}::injection-of-entitymanager.adoc[injection-of-entitymanager]
+* xref:{examples-vc}::testcase-injection.adoc[testcase-injection]
+* xref:{examples-vc}::testing-transactions.adoc[testing-transactions]
+* xref:{examples-vc}::transaction-rollback.adoc[transaction-rollback]
+* xref:{examples-vc}::testing-security.adoc[testing-security]
+* xref:{examples-vc}::testing-security-2.adoc[testing-security-2]
+* xref:{examples-vc}::simple-webservice.adoc[simple-webservice]
== What is the process?
diff --git a/tomee/modules/ROOT/pages/dev/design-application-serverlinks.adoc b/tomee/modules/ROOT/pages/dev/design-application-serverlinks.adoc
index 67bbd7b..10b9cad 100644
--- a/tomee/modules/ROOT/pages/dev/design-application-serverlinks.adoc
+++ b/tomee/modules/ROOT/pages/dev/design-application-serverlinks.adoc
@@ -1,3 +1,5 @@
= Design - Application ServerLinks
+NOTE: this image is not present in source nor on the current site
+
!http://tomee.apache.org/images/figure-appserver.gif!
diff --git a/tomee/modules/ROOT/pages/dev/design-container.adoc b/tomee/modules/ROOT/pages/dev/design-container.adoc
index 5fc1fd2..e5797c2 100644
--- a/tomee/modules/ROOT/pages/dev/design-container.adoc
+++ b/tomee/modules/ROOT/pages/dev/design-container.adoc
@@ -2,7 +2,7 @@
== Container
-Sub-component of xref:-design.adoc[OpenEJB]
+Sub-component of xref:dev/design.adoc[OpenEJB]
== Definition
diff --git a/tomee/modules/ROOT/pages/dev/design-local-serverlinks.adoc b/tomee/modules/ROOT/pages/dev/design-local-serverlinks.adoc
index e0e3179..6430fea 100644
--- a/tomee/modules/ROOT/pages/dev/design-local-serverlinks.adoc
+++ b/tomee/modules/ROOT/pages/dev/design-local-serverlinks.adoc
@@ -1,3 +1,3 @@
= Design - Local ServerLinks
-include:design-application-serverlinks.adoc[leveloffset=+1]
+include::design-application-serverlinks.adoc[leveloffset=+1]
diff --git a/tomee/modules/ROOT/pages/dev/design-remote-serverlinks.adoc b/tomee/modules/ROOT/pages/dev/design-remote-serverlinks.adoc
index 922e789..55ae14f 100644
--- a/tomee/modules/ROOT/pages/dev/design-remote-serverlinks.adoc
+++ b/tomee/modules/ROOT/pages/dev/design-remote-serverlinks.adoc
@@ -1,3 +1,3 @@
= Design - Remote ServerLinks
-include:design-application-serverlinks.adoc[leveloffset=+1]
+include::design-application-serverlinks.adoc[leveloffset=+1]
diff --git a/tomee/modules/ROOT/pages/dev/git.adoc b/tomee/modules/ROOT/pages/dev/git.adoc
index d6526ae..fb75632 100644
--- a/tomee/modules/ROOT/pages/dev/git.adoc
+++ b/tomee/modules/ROOT/pages/dev/git.adoc
@@ -79,7 +79,7 @@ git branch -d TOMEE-007
git push origin develop
----
-+++<a name="git-gui">++++++</a>+++ *** The GUI Way
+== The GUI Way
Now we have learned to do it the hard way, time to look at the simplified version.
The GitHub native tools!
@@ -97,11 +97,10 @@ The steps are and remain as described above:
. Work on the branch and commit regularly
. Synchronize (pull and push) changes in the the branch when stable
. Switch to _develop_ and synchronize (pull)
-. Merge the branch into _develop_, i.e.
-'TOMEE-007' + 'develop' = 'develop' *See note below
+. Merge the branch into _develop_, i.e. 'TOMEE-007' + 'develop' = 'develop' *See note below
. Commit _develop_
. Synchronize _develop_ (pull and push)
. Delete the branch TOMEE-007
-_Note</span>: You can actually merge the current *develop_ (or any other 'synchronized' branch) into your branch first to make sure it is stable,i.e.
+NOTE: You can actually merge the current *develop_ (or any other 'synchronized' branch) into your branch first to make sure it is stable,i.e.
'develop' + 'TOMEE-007' = 'TOMEE-007' - This is really cool!
diff --git a/tomee/modules/ROOT/pages/evolution-of-ejb.adoc b/tomee/modules/ROOT/pages/evolution-of-ejb.adoc
index 6025c84..9be62ca 100644
--- a/tomee/modules/ROOT/pages/evolution-of-ejb.adoc
+++ b/tomee/modules/ROOT/pages/evolution-of-ejb.adoc
@@ -1,90 +1,97 @@
= Evolution of EJB
+:icons: font
+:y: icon:check[role="green"]
+:n: icon:times[role="red"]
+:c: icon:file-text-o[role="blue"]
The following is a view of how EJB has evolved strictly in terms of the other specifications EJB incorporates.
Despite how people think of EJB, EJB is the union of all of the following APIs.
-Commonly misunderstood or oversimplified, it really is the integration of many things into one place that drives EJB.+++<table>++++++<tr>++++++<th>++++++</th>+++
-+++<th>+++1.1+++</th>+++
-+++<th>+++2.0+++</th>+++
-+++<th>+++2.1+++</th>+++
-+++<th>+++3.0+++</th>+++
-+++<th>+++3.1+++</th>++++++</tr>+++
+Commonly misunderstood or oversimplified, it really is the integration of many things into one place that drives EJB.
-+++<td>+++Java Transaction API (JTA)+++</td>+++
-+++<td>+++(/)+++</td>+++
-+++<td>+++(/)+++</td>+++
-+++<td>+++(/)+++</td>+++
-+++<td>+++(/)+++</td>+++
-+++<td>+++(/)+++</td>+++
-</tr>
+[cols="8,5*1",options="header"]
+|===
+|
+|1.1
+|2.0
+|2.1
+|3.0
+|3.1
-+++<tr>++++++<td>+++JavaMail API+++</td>+++
-+++<td>+++(/)+++</td>+++
-+++<td>+++(/)+++</td>+++
-+++<td>+++(/)+++</td>+++
-+++<td>+++(/)+++</td>+++
-+++<td>+++(/)+++</td>++++++</tr>+++
+|Java Transaction API (JTA)
+|{y}
+|{y}
+|{y}
+|{y}
+|{y}
-+++<tr>++++++<td>+++Java EE Connector Architecture+++</td>+++
-+++<td>++++++</td>+++
-+++<td>+++(/)+++</td>+++
-+++<td>+++(/)+++</td>+++
-+++<td>+++(/)+++</td>+++
-+++<td>+++(/)+++</td>++++++</tr>+++
+|JavaMail API
+|{y}
+|{y}
+|{y}
+|{y}
+|{y}
-+++<tr>++++++<td>+++Java Messaging Service (JMS)+++</td>+++
-+++<td>++++++</td>+++
-+++<td>+++(/)+++</td>+++
-+++<td>+++(/)+++</td>+++
-+++<td>+++(/)+++</td>+++
-+++<td>+++(/)+++</td>++++++</tr>+++
+|Java EE Connector Architecture
+|
+|{y}
+|{y}
+|{y}
+|{y}
-+++<tr>++++++<td>+++Java Authentication and Authorization Service (JAAS)+++</td>+++
-+++<td>++++++</td>+++
-+++<td>+++(/)+++</td>+++
-+++<td>+++(/)+++</td>+++
-+++<td>+++(/)+++</td>+++
-+++<td>+++(/)+++</td>++++++</tr>+++
+|Java Messaging Service (JMS)
+|
+|{y}
+|{y}
+|{y}
+|{y}
-+++<tr>++++++<td>+++Java Authorization Contract for Containers (JACC)+++</td>+++
-+++<td>++++++</td>+++
-+++<td>++++++</td>+++
-+++<td>+++(/)+++</td>+++
-+++<td>+++(/)+++</td>+++
-+++<td>+++(/)+++</td>++++++</tr>+++
+|Java Authentication and Authorization Service (JAAS)
+|
+|{y}
+|{y}
+|{y}
+|{y}
-+++<tr>++++++<td>+++Java Persistence API (JPA)+++</td>+++
-+++<td>++++++</td>+++
-+++<td>++++++</td>+++
-+++<td>++++++</td>+++
-+++<td>+++(/)+++</td>+++
-+++<td>+++(/)+++</td>++++++</tr>+++
+|Java Authorization Contract for Containers (JACC)
+|
+|
+|{y}
+|{y}
+|{y}
-+++<td>+++Java API for XML Web Services (JAX-WS)+++</td>+++
-+++<td>++++++</td>+++
-+++<td>++++++</td>+++
-+++<td>++++++</td>+++
-+++<td>+++(/)+++</td>+++
-+++<td>+++(/)+++</td>+++
-</tr>
+|Java Persistence API (JPA)
+|
+|
+|
+|{y}
+|{y}
-+++<tr>++++++<td>+++Java API for RESTful Web Services (JAX-RS)+++</td>+++
-+++<td>++++++</td>+++
-+++<td>++++++</td>+++
-+++<td>++++++</td>+++
-+++<td>++++++</td>+++
-+++<td>+++(/)+++</td>++++++</tr>+++
+|Java API for XML Web Services (JAX-WS)
+|
+|
+|
+|{y}
+|{y}
-+++<tr>++++++<td>+++Java Contexts and Dependency Injection (CDI)+++</td>+++
-+++<td>++++++</td>+++
-+++<td>++++++</td>+++
-+++<td>++++++</td>+++
-+++<td>++++++</td>+++
-+++<td>+++(/)+++</td>++++++</tr>+++
+|Java API for RESTful Web Services (JAX-RS)
+|
+|
+|
+|
+|{y}
-+++<tr>++++++<td>+++Bean Validation+++</td>+++
-+++<td>++++++</td>+++
-+++<td>++++++</td>+++
-+++<td>++++++</td>+++
-+++<td>++++++</td>+++
-+++<td>+++(/)+++</td>++++++</tr>++++++</table>+++
+|Java Contexts and Dependency Injection (CDI)
+|
+|
+|
+|
+|{y}
+
+|Bean Validation
+|
+|
+|
+|
+|{y}
+|===
\ No newline at end of file