From 3215a6adba389373a152473cd6f69b550a2758d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Guillermo=20Gonz=C3=A1lez=20de=20Ag=C3=BCero?= Date: Sun, 26 Apr 2020 16:52:32 +0200 Subject: [PATCH 1/5] Guides POC MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Guillermo González de Agüero --- pom.xml | 38 ++++++++++++------- .../asciidoc/_guides/batch-processing.adoc | 3 ++ .../asciidoc/_guides/bean-validation.adoc | 5 +++ src/main/asciidoc/_guides/concurrency.adoc | 3 ++ src/main/asciidoc/_guides/connectors.adoc | 3 ++ .../_guides/dependency-injection.adoc | 13 +++++++ src/main/asciidoc/_guides/dukes.adoc | 7 ++++ src/main/asciidoc/_guides/ejb.adoc | 7 ++++ src/main/asciidoc/_guides/index.adoc | 33 ++++++++++++++++ src/main/asciidoc/_guides/interceptors.adoc | 3 ++ src/main/asciidoc/_guides/jaxws.adoc | 3 ++ src/main/asciidoc/_guides/jms.adoc | 5 +++ src/main/asciidoc/_guides/jsf.adoc | 25 ++++++++++++ src/main/asciidoc/_guides/json.adoc | 5 +++ src/main/asciidoc/_guides/overview.adoc | 9 +++++ src/main/asciidoc/_guides/persistence.adoc | 17 +++++++++ .../asciidoc/_guides/resource-adapters.adoc | 5 +++ .../asciidoc/_guides/resource-creation.adoc | 3 ++ src/main/asciidoc/_guides/security.adoc | 11 ++++++ src/main/asciidoc/_guides/servlets.adoc | 3 ++ src/main/asciidoc/_guides/transactions.adoc | 3 ++ src/main/asciidoc/_guides/webapp.adoc | 3 ++ src/main/asciidoc/_guides/webservices.adoc | 9 +++++ src/main/asciidoc/_guides/websocket.adoc | 3 ++ 24 files changed, 206 insertions(+), 13 deletions(-) create mode 100644 src/main/asciidoc/_guides/batch-processing.adoc create mode 100644 src/main/asciidoc/_guides/bean-validation.adoc create mode 100644 src/main/asciidoc/_guides/concurrency.adoc create mode 100644 src/main/asciidoc/_guides/connectors.adoc create mode 100644 src/main/asciidoc/_guides/dependency-injection.adoc create mode 100644 src/main/asciidoc/_guides/dukes.adoc create mode 100644 src/main/asciidoc/_guides/ejb.adoc create mode 100644 src/main/asciidoc/_guides/index.adoc create mode 100644 src/main/asciidoc/_guides/interceptors.adoc create mode 100644 src/main/asciidoc/_guides/jaxws.adoc create mode 100644 src/main/asciidoc/_guides/jms.adoc create mode 100644 src/main/asciidoc/_guides/jsf.adoc create mode 100644 src/main/asciidoc/_guides/json.adoc create mode 100644 src/main/asciidoc/_guides/overview.adoc create mode 100644 src/main/asciidoc/_guides/persistence.adoc create mode 100644 src/main/asciidoc/_guides/resource-adapters.adoc create mode 100644 src/main/asciidoc/_guides/resource-creation.adoc create mode 100644 src/main/asciidoc/_guides/security.adoc create mode 100644 src/main/asciidoc/_guides/servlets.adoc create mode 100644 src/main/asciidoc/_guides/transactions.adoc create mode 100644 src/main/asciidoc/_guides/webapp.adoc create mode 100644 src/main/asciidoc/_guides/webservices.adoc create mode 100644 src/main/asciidoc/_guides/websocket.adoc diff --git a/pom.xml b/pom.xml index 0f9e6aad..a1ec763e 100644 --- a/pom.xml +++ b/pom.xml @@ -59,25 +59,37 @@ process-asciidoc + index.adoc + html5 + + + + asciidoc-guides-to-html + generate-resources + + process-asciidoc + + + ${basedir}/src/main/asciidoc/_guides + ${project.build.directory}/generated-docs/guides html5 - - book - ${status} - - font - left - font - true - - - - true - - index.adoc coderay + + book + ${status} + + font + left + font + true + + - + true + diff --git a/src/main/asciidoc/_guides/batch-processing.adoc b/src/main/asciidoc/_guides/batch-processing.adoc new file mode 100644 index 00000000..2f7ae32f --- /dev/null +++ b/src/main/asciidoc/_guides/batch-processing.adoc @@ -0,0 +1,3 @@ += Batch Processing + +include::../batch-processing/batch-processing.adoc[] diff --git a/src/main/asciidoc/_guides/bean-validation.adoc b/src/main/asciidoc/_guides/bean-validation.adoc new file mode 100644 index 00000000..133eeda9 --- /dev/null +++ b/src/main/asciidoc/_guides/bean-validation.adoc @@ -0,0 +1,5 @@ += Bean Validation + +include::../bean-validation/bean-validation.adoc[] + +include::../bean-validation-advanced/bean-validation-advanced.adoc[] diff --git a/src/main/asciidoc/_guides/concurrency.adoc b/src/main/asciidoc/_guides/concurrency.adoc new file mode 100644 index 00000000..7ef2c70b --- /dev/null +++ b/src/main/asciidoc/_guides/concurrency.adoc @@ -0,0 +1,3 @@ += Concurrency + +include::../concurrency-utilities/concurrency-utilities.adoc[] diff --git a/src/main/asciidoc/_guides/connectors.adoc b/src/main/asciidoc/_guides/connectors.adoc new file mode 100644 index 00000000..6d4a9a03 --- /dev/null +++ b/src/main/asciidoc/_guides/connectors.adoc @@ -0,0 +1,3 @@ += Connectors + +include::../connectorexample/connectorexample.adoc[] diff --git a/src/main/asciidoc/_guides/dependency-injection.adoc b/src/main/asciidoc/_guides/dependency-injection.adoc new file mode 100644 index 00000000..780bb000 --- /dev/null +++ b/src/main/asciidoc/_guides/dependency-injection.adoc @@ -0,0 +1,13 @@ += Dependency Injection + +include::../injection/injection.adoc[] + +include::../cdi-basic/cdi-basic.adoc[] + +include::../cdi-basicexamples/cdi-basicexamples.adoc[] + +include::../cdi-adv/cdi-adv.adoc[] + +include::../cdi-bootstrap-se8/cdi-bootstrap-se8.adoc[] + +include::../cdi-adv-examples/cdi-adv-examples.adoc[] diff --git a/src/main/asciidoc/_guides/dukes.adoc b/src/main/asciidoc/_guides/dukes.adoc new file mode 100644 index 00000000..71e8db11 --- /dev/null +++ b/src/main/asciidoc/_guides/dukes.adoc @@ -0,0 +1,7 @@ += Dukes + +include::../dukes-bookstore/dukes-bookstore.adoc[] + +include::../dukes-tutoring/dukes-tutoring.adoc[] + +include::../dukes-forest/dukes-forest.adoc[] diff --git a/src/main/asciidoc/_guides/ejb.adoc b/src/main/asciidoc/_guides/ejb.adoc new file mode 100644 index 00000000..0377c742 --- /dev/null +++ b/src/main/asciidoc/_guides/ejb.adoc @@ -0,0 +1,7 @@ += Jakarta Enterprise Beans + +include::../ejb-intro/ejb-intro.adoc[] +include::../ejb-gettingstarted/ejb-gettingstarted.adoc[] +include::../ejb-basicexamples/ejb-basicexamples.adoc[] +include::../ejb-embedded/ejb-embedded.adoc[] +include::../ejb-async/ejb-async.adoc[] diff --git a/src/main/asciidoc/_guides/index.adoc b/src/main/asciidoc/_guides/index.adoc new file mode 100644 index 00000000..c29b6599 --- /dev/null +++ b/src/main/asciidoc/_guides/index.adoc @@ -0,0 +1,33 @@ += Jakarta EE Tutorial + +== Introduction + +* link:overview.html[Overview] + +== Core Jakarta EE + +* link:webapp.html[Web Application concepts] +* link:websocket.html[WebSocket] +* link:json.html[JSON Support] +* link:bean-validation.html[Bean Validation] +* link:dependency-injection.html[Dependency Injection] +* link:webservices.html[Web Services] +* link:persistence.html[Persistence] +* link:jms.html[Messaging] +* link:security.html[Security] +* link:transactions.html[Transactions] +* link:interceptors.html[Interceptors] + +== Advanced concepts + +* link:servlets.html[Servlets] +* link:batch-processig.html[Batch Processing] +* link:resource-adapters.html[Resource Adapters] +* link:concurrency.html[Concurrency] +* link:dukes.html[Case studies] + +== Traditional Jakarta EE Architecture + +* link:jsf.html[Jakarta Server Faces] +* link:ejb.html[Enterprise Beans] +* link:jaxws.html[SOAP Web Services] diff --git a/src/main/asciidoc/_guides/interceptors.adoc b/src/main/asciidoc/_guides/interceptors.adoc new file mode 100644 index 00000000..a9dc3823 --- /dev/null +++ b/src/main/asciidoc/_guides/interceptors.adoc @@ -0,0 +1,3 @@ += Interceptors + +include::../interceptors/interceptors.adoc[] diff --git a/src/main/asciidoc/_guides/jaxws.adoc b/src/main/asciidoc/_guides/jaxws.adoc new file mode 100644 index 00000000..afce494f --- /dev/null +++ b/src/main/asciidoc/_guides/jaxws.adoc @@ -0,0 +1,3 @@ += SOAP Web Services + +include::../jaxws/jaxws.adoc[] diff --git a/src/main/asciidoc/_guides/jms.adoc b/src/main/asciidoc/_guides/jms.adoc new file mode 100644 index 00000000..8834f4e3 --- /dev/null +++ b/src/main/asciidoc/_guides/jms.adoc @@ -0,0 +1,5 @@ += Messaging + +include::../jms-concepts/jms-concepts.adoc[] + +include::../jms-examples/jms-examples.adoc[] diff --git a/src/main/asciidoc/_guides/jsf.adoc b/src/main/asciidoc/_guides/jsf.adoc new file mode 100644 index 00000000..f63c4537 --- /dev/null +++ b/src/main/asciidoc/_guides/jsf.adoc @@ -0,0 +1,25 @@ += Jakarta Server Faces + +include::../jsf-intro/jsf-intro.adoc[] + +include::../jsf-facelets/jsf-facelets.adoc[] + +include::../jsf-el/jsf-el.adoc[] + +include::../jsf-page/jsf-page.adoc[] + +include::../jsf-page-core/jsf-page-core.adoc[] + +include::../jsf-develop/jsf-develop.adoc[] + +include::../jsf-ajax/jsf-ajax.adoc[] + +include::../jsf-advanced-cc/jsf-advanced-cc.adoc[] + +include::../jsf-custom/jsf-custom.adoc[] + +include::../jsf-configure/jsf-configure.adoc[] + +include::../jsf-ws/jsf-ws.adoc[] + +include::../webi18n/webi18n.adoc[] diff --git a/src/main/asciidoc/_guides/json.adoc b/src/main/asciidoc/_guides/json.adoc new file mode 100644 index 00000000..a1744444 --- /dev/null +++ b/src/main/asciidoc/_guides/json.adoc @@ -0,0 +1,5 @@ += JSON Support + +include::../jsonp/jsonp.adoc[] + +include::../jsonb/jsonb.adoc[] diff --git a/src/main/asciidoc/_guides/overview.adoc b/src/main/asciidoc/_guides/overview.adoc new file mode 100644 index 00000000..9370d38b --- /dev/null +++ b/src/main/asciidoc/_guides/overview.adoc @@ -0,0 +1,9 @@ += Overview + +include::../overview/overview.adoc[] + +include::../usingexamples/usingexamples.adoc[] + +include::../resource-creation/resource-creation.adoc[] + +include::../packaging/packaging.adoc[] diff --git a/src/main/asciidoc/_guides/persistence.adoc b/src/main/asciidoc/_guides/persistence.adoc new file mode 100644 index 00000000..c8456e32 --- /dev/null +++ b/src/main/asciidoc/_guides/persistence.adoc @@ -0,0 +1,17 @@ += Persistence + +include::../persistence-intro/persistence-intro.adoc[] + +include::../persistence-basicexamples/persistence-basicexamples.adoc[] + +include::../persistence-querylanguage/persistence-querylanguage.adoc[] + +include::../persistence-criteria/persistence-criteria.adoc[] + +include::../persistence-string-queries/persistence-string-queries.adoc[] + +include::../persistence-locking/persistence-locking.adoc[] + +include::../persistence-entitygraphs/persistence-entitygraphs.adoc[] + +include::../persistence-cache/persistence-cache.adoc[] diff --git a/src/main/asciidoc/_guides/resource-adapters.adoc b/src/main/asciidoc/_guides/resource-adapters.adoc new file mode 100644 index 00000000..6af1a0bb --- /dev/null +++ b/src/main/asciidoc/_guides/resource-adapters.adoc @@ -0,0 +1,5 @@ += Resource Adapters + +include::../resources/resources.adoc[] + +include::../connectorexample/connectorexample.adoc[] diff --git a/src/main/asciidoc/_guides/resource-creation.adoc b/src/main/asciidoc/_guides/resource-creation.adoc new file mode 100644 index 00000000..cc8a282d --- /dev/null +++ b/src/main/asciidoc/_guides/resource-creation.adoc @@ -0,0 +1,3 @@ += Resource creation + +include::../resource-creation/resource-creation.adoc[] diff --git a/src/main/asciidoc/_guides/security.adoc b/src/main/asciidoc/_guides/security.adoc new file mode 100644 index 00000000..378e74bd --- /dev/null +++ b/src/main/asciidoc/_guides/security.adoc @@ -0,0 +1,11 @@ += Security + +include::../security-intro/security-intro.adoc[] + +include::../security-webtier/security-webtier.adoc[] + +include::../security-jakartaee/security-jakartaee.adoc[] + +include::../security-api/security-api.adoc[] + +include::../security-advanced/security-advanced.adoc[] diff --git a/src/main/asciidoc/_guides/servlets.adoc b/src/main/asciidoc/_guides/servlets.adoc new file mode 100644 index 00000000..ffd5e0eb --- /dev/null +++ b/src/main/asciidoc/_guides/servlets.adoc @@ -0,0 +1,3 @@ += Servlets + +include::../servlets/servlets.adoc[] diff --git a/src/main/asciidoc/_guides/transactions.adoc b/src/main/asciidoc/_guides/transactions.adoc new file mode 100644 index 00000000..79d78d7a --- /dev/null +++ b/src/main/asciidoc/_guides/transactions.adoc @@ -0,0 +1,3 @@ += Transactions + +include::../transactions/transactions.adoc[] diff --git a/src/main/asciidoc/_guides/webapp.adoc b/src/main/asciidoc/_guides/webapp.adoc new file mode 100644 index 00000000..fd2a8e31 --- /dev/null +++ b/src/main/asciidoc/_guides/webapp.adoc @@ -0,0 +1,3 @@ += Web Application + +include::../webapp/webapp.adoc[] diff --git a/src/main/asciidoc/_guides/webservices.adoc b/src/main/asciidoc/_guides/webservices.adoc new file mode 100644 index 00000000..e6c6e7f0 --- /dev/null +++ b/src/main/asciidoc/_guides/webservices.adoc @@ -0,0 +1,9 @@ += REST Web Services + +include::../webservices-intro/webservices-intro.adoc[] + +include::../jaxrs/jaxrs.adoc[] + +include::../jaxrs-client/jaxrs-client.adoc[] + +include::../jaxrs-advanced/jaxrs-advanced.adoc[] diff --git a/src/main/asciidoc/_guides/websocket.adoc b/src/main/asciidoc/_guides/websocket.adoc new file mode 100644 index 00000000..e1f478fa --- /dev/null +++ b/src/main/asciidoc/_guides/websocket.adoc @@ -0,0 +1,3 @@ += WebSocket + +include::../websocket/websocket.adoc[] From 7231c426af7241f3c8582800bc2583ef256687ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Guillermo=20Gonz=C3=A1lez=20de=20Ag=C3=BCero?= Date: Sun, 26 Apr 2020 20:28:47 +0200 Subject: [PATCH 2/5] Fixed headings and images on guides MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Guillermo González de Agüero --- src/main/asciidoc/_guides/batch-processing.adoc | 4 ++++ src/main/asciidoc/_guides/bean-validation.adoc | 4 ++++ src/main/asciidoc/_guides/concurrency.adoc | 4 ++++ src/main/asciidoc/_guides/connectors.adoc | 4 ++++ src/main/asciidoc/_guides/dependency-injection.adoc | 4 ++++ src/main/asciidoc/_guides/dukes.adoc | 4 ++++ src/main/asciidoc/_guides/ejb.adoc | 4 ++++ src/main/asciidoc/_guides/index.adoc | 4 ++++ src/main/asciidoc/_guides/interceptors.adoc | 4 ++++ src/main/asciidoc/_guides/jaxws.adoc | 4 ++++ src/main/asciidoc/_guides/jms.adoc | 4 ++++ src/main/asciidoc/_guides/jsf.adoc | 4 ++++ src/main/asciidoc/_guides/json.adoc | 4 ++++ src/main/asciidoc/_guides/overview.adoc | 4 ++++ src/main/asciidoc/_guides/persistence.adoc | 4 ++++ src/main/asciidoc/_guides/resource-adapters.adoc | 4 ++++ src/main/asciidoc/_guides/resource-creation.adoc | 4 ++++ src/main/asciidoc/_guides/security.adoc | 4 ++++ src/main/asciidoc/_guides/servlets.adoc | 4 ++++ src/main/asciidoc/_guides/transactions.adoc | 4 ++++ src/main/asciidoc/_guides/webapp.adoc | 4 ++++ src/main/asciidoc/_guides/webservices.adoc | 4 ++++ src/main/asciidoc/_guides/websocket.adoc | 4 ++++ 23 files changed, 92 insertions(+) diff --git a/src/main/asciidoc/_guides/batch-processing.adoc b/src/main/asciidoc/_guides/batch-processing.adoc index 2f7ae32f..14ca1f37 100644 --- a/src/main/asciidoc/_guides/batch-processing.adoc +++ b/src/main/asciidoc/_guides/batch-processing.adoc @@ -1,3 +1,7 @@ +:leveloffset: +1 +:imagesdir: ../images +:toc: left + = Batch Processing include::../batch-processing/batch-processing.adoc[] diff --git a/src/main/asciidoc/_guides/bean-validation.adoc b/src/main/asciidoc/_guides/bean-validation.adoc index 133eeda9..9d2eb853 100644 --- a/src/main/asciidoc/_guides/bean-validation.adoc +++ b/src/main/asciidoc/_guides/bean-validation.adoc @@ -1,3 +1,7 @@ +:leveloffset: +1 +:imagesdir: ../images +:toc: left + = Bean Validation include::../bean-validation/bean-validation.adoc[] diff --git a/src/main/asciidoc/_guides/concurrency.adoc b/src/main/asciidoc/_guides/concurrency.adoc index 7ef2c70b..2c54b071 100644 --- a/src/main/asciidoc/_guides/concurrency.adoc +++ b/src/main/asciidoc/_guides/concurrency.adoc @@ -1,3 +1,7 @@ +:leveloffset: +1 +:imagesdir: ../images +:toc: left + = Concurrency include::../concurrency-utilities/concurrency-utilities.adoc[] diff --git a/src/main/asciidoc/_guides/connectors.adoc b/src/main/asciidoc/_guides/connectors.adoc index 6d4a9a03..0af80134 100644 --- a/src/main/asciidoc/_guides/connectors.adoc +++ b/src/main/asciidoc/_guides/connectors.adoc @@ -1,3 +1,7 @@ +:leveloffset: +1 +:imagesdir: ../images +:toc: left + = Connectors include::../connectorexample/connectorexample.adoc[] diff --git a/src/main/asciidoc/_guides/dependency-injection.adoc b/src/main/asciidoc/_guides/dependency-injection.adoc index 780bb000..62e510b9 100644 --- a/src/main/asciidoc/_guides/dependency-injection.adoc +++ b/src/main/asciidoc/_guides/dependency-injection.adoc @@ -1,3 +1,7 @@ +:leveloffset: +1 +:imagesdir: ../images +:toc: left + = Dependency Injection include::../injection/injection.adoc[] diff --git a/src/main/asciidoc/_guides/dukes.adoc b/src/main/asciidoc/_guides/dukes.adoc index 71e8db11..b0b289c7 100644 --- a/src/main/asciidoc/_guides/dukes.adoc +++ b/src/main/asciidoc/_guides/dukes.adoc @@ -1,3 +1,7 @@ +:leveloffset: +1 +:imagesdir: ../images +:toc: left + = Dukes include::../dukes-bookstore/dukes-bookstore.adoc[] diff --git a/src/main/asciidoc/_guides/ejb.adoc b/src/main/asciidoc/_guides/ejb.adoc index 0377c742..1a7ecd30 100644 --- a/src/main/asciidoc/_guides/ejb.adoc +++ b/src/main/asciidoc/_guides/ejb.adoc @@ -1,3 +1,7 @@ +:leveloffset: +1 +:imagesdir: ../images +:toc: left + = Jakarta Enterprise Beans include::../ejb-intro/ejb-intro.adoc[] diff --git a/src/main/asciidoc/_guides/index.adoc b/src/main/asciidoc/_guides/index.adoc index c29b6599..8b83f6c0 100644 --- a/src/main/asciidoc/_guides/index.adoc +++ b/src/main/asciidoc/_guides/index.adoc @@ -1,3 +1,7 @@ +:leveloffset: +1 +:imagesdir: ../images +:toc: left + = Jakarta EE Tutorial == Introduction diff --git a/src/main/asciidoc/_guides/interceptors.adoc b/src/main/asciidoc/_guides/interceptors.adoc index a9dc3823..3f440ae0 100644 --- a/src/main/asciidoc/_guides/interceptors.adoc +++ b/src/main/asciidoc/_guides/interceptors.adoc @@ -1,3 +1,7 @@ +:leveloffset: +1 +:imagesdir: ../images +:toc: left + = Interceptors include::../interceptors/interceptors.adoc[] diff --git a/src/main/asciidoc/_guides/jaxws.adoc b/src/main/asciidoc/_guides/jaxws.adoc index afce494f..f197e185 100644 --- a/src/main/asciidoc/_guides/jaxws.adoc +++ b/src/main/asciidoc/_guides/jaxws.adoc @@ -1,3 +1,7 @@ +:leveloffset: +1 +:imagesdir: ../images +:toc: left + = SOAP Web Services include::../jaxws/jaxws.adoc[] diff --git a/src/main/asciidoc/_guides/jms.adoc b/src/main/asciidoc/_guides/jms.adoc index 8834f4e3..8e6c0c80 100644 --- a/src/main/asciidoc/_guides/jms.adoc +++ b/src/main/asciidoc/_guides/jms.adoc @@ -1,3 +1,7 @@ +:leveloffset: +1 +:imagesdir: ../images +:toc: left + = Messaging include::../jms-concepts/jms-concepts.adoc[] diff --git a/src/main/asciidoc/_guides/jsf.adoc b/src/main/asciidoc/_guides/jsf.adoc index f63c4537..daba4bbf 100644 --- a/src/main/asciidoc/_guides/jsf.adoc +++ b/src/main/asciidoc/_guides/jsf.adoc @@ -1,3 +1,7 @@ +:leveloffset: +1 +:imagesdir: ../images +:toc: left + = Jakarta Server Faces include::../jsf-intro/jsf-intro.adoc[] diff --git a/src/main/asciidoc/_guides/json.adoc b/src/main/asciidoc/_guides/json.adoc index a1744444..6075830f 100644 --- a/src/main/asciidoc/_guides/json.adoc +++ b/src/main/asciidoc/_guides/json.adoc @@ -1,3 +1,7 @@ +:leveloffset: +1 +:imagesdir: ../images +:toc: left + = JSON Support include::../jsonp/jsonp.adoc[] diff --git a/src/main/asciidoc/_guides/overview.adoc b/src/main/asciidoc/_guides/overview.adoc index 9370d38b..f2278710 100644 --- a/src/main/asciidoc/_guides/overview.adoc +++ b/src/main/asciidoc/_guides/overview.adoc @@ -1,3 +1,7 @@ +:leveloffset: +1 +:imagesdir: ../images +:toc: left + = Overview include::../overview/overview.adoc[] diff --git a/src/main/asciidoc/_guides/persistence.adoc b/src/main/asciidoc/_guides/persistence.adoc index c8456e32..c5502067 100644 --- a/src/main/asciidoc/_guides/persistence.adoc +++ b/src/main/asciidoc/_guides/persistence.adoc @@ -1,3 +1,7 @@ +:leveloffset: +1 +:imagesdir: ../images +:toc: left + = Persistence include::../persistence-intro/persistence-intro.adoc[] diff --git a/src/main/asciidoc/_guides/resource-adapters.adoc b/src/main/asciidoc/_guides/resource-adapters.adoc index 6af1a0bb..ea7b8e6a 100644 --- a/src/main/asciidoc/_guides/resource-adapters.adoc +++ b/src/main/asciidoc/_guides/resource-adapters.adoc @@ -1,3 +1,7 @@ +:leveloffset: +1 +:imagesdir: ../images +:toc: left + = Resource Adapters include::../resources/resources.adoc[] diff --git a/src/main/asciidoc/_guides/resource-creation.adoc b/src/main/asciidoc/_guides/resource-creation.adoc index cc8a282d..f6467894 100644 --- a/src/main/asciidoc/_guides/resource-creation.adoc +++ b/src/main/asciidoc/_guides/resource-creation.adoc @@ -1,3 +1,7 @@ +:leveloffset: +1 +:imagesdir: ../images +:toc: left + = Resource creation include::../resource-creation/resource-creation.adoc[] diff --git a/src/main/asciidoc/_guides/security.adoc b/src/main/asciidoc/_guides/security.adoc index 378e74bd..c55bc8b1 100644 --- a/src/main/asciidoc/_guides/security.adoc +++ b/src/main/asciidoc/_guides/security.adoc @@ -1,3 +1,7 @@ +:leveloffset: +1 +:imagesdir: ../images +:toc: left + = Security include::../security-intro/security-intro.adoc[] diff --git a/src/main/asciidoc/_guides/servlets.adoc b/src/main/asciidoc/_guides/servlets.adoc index ffd5e0eb..e88d0ede 100644 --- a/src/main/asciidoc/_guides/servlets.adoc +++ b/src/main/asciidoc/_guides/servlets.adoc @@ -1,3 +1,7 @@ +:leveloffset: +1 +:imagesdir: ../images +:toc: left + = Servlets include::../servlets/servlets.adoc[] diff --git a/src/main/asciidoc/_guides/transactions.adoc b/src/main/asciidoc/_guides/transactions.adoc index 79d78d7a..4a006331 100644 --- a/src/main/asciidoc/_guides/transactions.adoc +++ b/src/main/asciidoc/_guides/transactions.adoc @@ -1,3 +1,7 @@ +:leveloffset: +1 +:imagesdir: ../images +:toc: left + = Transactions include::../transactions/transactions.adoc[] diff --git a/src/main/asciidoc/_guides/webapp.adoc b/src/main/asciidoc/_guides/webapp.adoc index fd2a8e31..141ef5eb 100644 --- a/src/main/asciidoc/_guides/webapp.adoc +++ b/src/main/asciidoc/_guides/webapp.adoc @@ -1,3 +1,7 @@ +:leveloffset: +1 +:imagesdir: ../images +:toc: left + = Web Application include::../webapp/webapp.adoc[] diff --git a/src/main/asciidoc/_guides/webservices.adoc b/src/main/asciidoc/_guides/webservices.adoc index e6c6e7f0..9e7b1c3a 100644 --- a/src/main/asciidoc/_guides/webservices.adoc +++ b/src/main/asciidoc/_guides/webservices.adoc @@ -1,3 +1,7 @@ +:leveloffset: +1 +:imagesdir: ../images +:toc: left + = REST Web Services include::../webservices-intro/webservices-intro.adoc[] diff --git a/src/main/asciidoc/_guides/websocket.adoc b/src/main/asciidoc/_guides/websocket.adoc index e1f478fa..e35c3104 100644 --- a/src/main/asciidoc/_guides/websocket.adoc +++ b/src/main/asciidoc/_guides/websocket.adoc @@ -1,3 +1,7 @@ +:leveloffset: +1 +:imagesdir: ../images +:toc: left + = WebSocket include::../websocket/websocket.adoc[] From aaae48fb64c8120f9d116a9eafe495360ad03430 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Guillermo=20Gonz=C3=A1lez=20de=20Ag=C3=BCero?= Date: Sun, 26 Apr 2020 20:38:23 +0200 Subject: [PATCH 3/5] Exclude TOC from index MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Guillermo González de Agüero --- src/main/asciidoc/_guides/index.adoc | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main/asciidoc/_guides/index.adoc b/src/main/asciidoc/_guides/index.adoc index 8b83f6c0..2bee64be 100644 --- a/src/main/asciidoc/_guides/index.adoc +++ b/src/main/asciidoc/_guides/index.adoc @@ -1,6 +1,5 @@ :leveloffset: +1 :imagesdir: ../images -:toc: left = Jakarta EE Tutorial From 65402243dd48ba4f55466ab23211396bb5946b20 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Guillermo=20Gonz=C3=A1lez=20de=20Ag=C3=BCero?= Date: Sun, 26 Apr 2020 21:18:47 +0200 Subject: [PATCH 4/5] TOC adjustments MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Guillermo González de Agüero --- pom.xml | 28 +++++++++++-------- .../asciidoc/_guides/batch-processing.adoc | 4 +-- .../asciidoc/_guides/bean-validation.adoc | 4 +-- src/main/asciidoc/_guides/concurrency.adoc | 4 +-- src/main/asciidoc/_guides/connectors.adoc | 4 +-- .../_guides/dependency-injection.adoc | 4 +-- src/main/asciidoc/_guides/dukes.adoc | 4 +-- src/main/asciidoc/_guides/ejb.adoc | 4 +-- src/main/asciidoc/_guides/index.adoc | 3 -- src/main/asciidoc/_guides/interceptors.adoc | 4 +-- src/main/asciidoc/_guides/jaxws.adoc | 4 +-- src/main/asciidoc/_guides/jms.adoc | 4 +-- src/main/asciidoc/_guides/jsf.adoc | 4 +-- src/main/asciidoc/_guides/json.adoc | 4 +-- src/main/asciidoc/_guides/overview.adoc | 4 +-- src/main/asciidoc/_guides/persistence.adoc | 4 +-- .../asciidoc/_guides/resource-adapters.adoc | 4 +-- .../asciidoc/_guides/resource-creation.adoc | 4 +-- src/main/asciidoc/_guides/security.adoc | 4 +-- src/main/asciidoc/_guides/servlets.adoc | 4 +-- src/main/asciidoc/_guides/transactions.adoc | 4 +-- src/main/asciidoc/_guides/webapp.adoc | 4 +-- src/main/asciidoc/_guides/webservices.adoc | 4 +-- src/main/asciidoc/_guides/websocket.adoc | 4 +-- 24 files changed, 60 insertions(+), 59 deletions(-) diff --git a/pom.xml b/pom.xml index a1ec763e..ca5e07a1 100644 --- a/pom.xml +++ b/pom.xml @@ -61,6 +61,18 @@ index.adoc html5 + + book + ${status} + + font + left + font + true + + - + true + @@ -73,23 +85,15 @@ ${basedir}/src/main/asciidoc/_guides ${project.build.directory}/generated-docs/guides html5 + + ../images + true + coderay - - book - ${status} - - font - left - font - true - - - - true - diff --git a/src/main/asciidoc/_guides/batch-processing.adoc b/src/main/asciidoc/_guides/batch-processing.adoc index 14ca1f37..2939d728 100644 --- a/src/main/asciidoc/_guides/batch-processing.adoc +++ b/src/main/asciidoc/_guides/batch-processing.adoc @@ -1,7 +1,7 @@ -:leveloffset: +1 -:imagesdir: ../images :toc: left = Batch Processing +:leveloffset: +1 + include::../batch-processing/batch-processing.adoc[] diff --git a/src/main/asciidoc/_guides/bean-validation.adoc b/src/main/asciidoc/_guides/bean-validation.adoc index 9d2eb853..516b70fb 100644 --- a/src/main/asciidoc/_guides/bean-validation.adoc +++ b/src/main/asciidoc/_guides/bean-validation.adoc @@ -1,9 +1,9 @@ -:leveloffset: +1 -:imagesdir: ../images :toc: left = Bean Validation +:leveloffset: +1 + include::../bean-validation/bean-validation.adoc[] include::../bean-validation-advanced/bean-validation-advanced.adoc[] diff --git a/src/main/asciidoc/_guides/concurrency.adoc b/src/main/asciidoc/_guides/concurrency.adoc index 2c54b071..9639e780 100644 --- a/src/main/asciidoc/_guides/concurrency.adoc +++ b/src/main/asciidoc/_guides/concurrency.adoc @@ -1,7 +1,7 @@ -:leveloffset: +1 -:imagesdir: ../images :toc: left = Concurrency +:leveloffset: +1 + include::../concurrency-utilities/concurrency-utilities.adoc[] diff --git a/src/main/asciidoc/_guides/connectors.adoc b/src/main/asciidoc/_guides/connectors.adoc index 0af80134..1230e74e 100644 --- a/src/main/asciidoc/_guides/connectors.adoc +++ b/src/main/asciidoc/_guides/connectors.adoc @@ -1,7 +1,7 @@ -:leveloffset: +1 -:imagesdir: ../images :toc: left = Connectors +:leveloffset: +1 + include::../connectorexample/connectorexample.adoc[] diff --git a/src/main/asciidoc/_guides/dependency-injection.adoc b/src/main/asciidoc/_guides/dependency-injection.adoc index 62e510b9..0bb3918a 100644 --- a/src/main/asciidoc/_guides/dependency-injection.adoc +++ b/src/main/asciidoc/_guides/dependency-injection.adoc @@ -1,9 +1,9 @@ -:leveloffset: +1 -:imagesdir: ../images :toc: left = Dependency Injection +:leveloffset: +1 + include::../injection/injection.adoc[] include::../cdi-basic/cdi-basic.adoc[] diff --git a/src/main/asciidoc/_guides/dukes.adoc b/src/main/asciidoc/_guides/dukes.adoc index b0b289c7..cb05b1f4 100644 --- a/src/main/asciidoc/_guides/dukes.adoc +++ b/src/main/asciidoc/_guides/dukes.adoc @@ -1,9 +1,9 @@ -:leveloffset: +1 -:imagesdir: ../images :toc: left = Dukes +:leveloffset: +1 + include::../dukes-bookstore/dukes-bookstore.adoc[] include::../dukes-tutoring/dukes-tutoring.adoc[] diff --git a/src/main/asciidoc/_guides/ejb.adoc b/src/main/asciidoc/_guides/ejb.adoc index 1a7ecd30..25b47a8e 100644 --- a/src/main/asciidoc/_guides/ejb.adoc +++ b/src/main/asciidoc/_guides/ejb.adoc @@ -1,9 +1,9 @@ -:leveloffset: +1 -:imagesdir: ../images :toc: left = Jakarta Enterprise Beans +:leveloffset: +1 + include::../ejb-intro/ejb-intro.adoc[] include::../ejb-gettingstarted/ejb-gettingstarted.adoc[] include::../ejb-basicexamples/ejb-basicexamples.adoc[] diff --git a/src/main/asciidoc/_guides/index.adoc b/src/main/asciidoc/_guides/index.adoc index 2bee64be..c29b6599 100644 --- a/src/main/asciidoc/_guides/index.adoc +++ b/src/main/asciidoc/_guides/index.adoc @@ -1,6 +1,3 @@ -:leveloffset: +1 -:imagesdir: ../images - = Jakarta EE Tutorial == Introduction diff --git a/src/main/asciidoc/_guides/interceptors.adoc b/src/main/asciidoc/_guides/interceptors.adoc index 3f440ae0..956ca0a8 100644 --- a/src/main/asciidoc/_guides/interceptors.adoc +++ b/src/main/asciidoc/_guides/interceptors.adoc @@ -1,7 +1,7 @@ -:leveloffset: +1 -:imagesdir: ../images :toc: left = Interceptors +:leveloffset: +1 + include::../interceptors/interceptors.adoc[] diff --git a/src/main/asciidoc/_guides/jaxws.adoc b/src/main/asciidoc/_guides/jaxws.adoc index f197e185..15f1336d 100644 --- a/src/main/asciidoc/_guides/jaxws.adoc +++ b/src/main/asciidoc/_guides/jaxws.adoc @@ -1,7 +1,7 @@ -:leveloffset: +1 -:imagesdir: ../images :toc: left = SOAP Web Services +:leveloffset: +1 + include::../jaxws/jaxws.adoc[] diff --git a/src/main/asciidoc/_guides/jms.adoc b/src/main/asciidoc/_guides/jms.adoc index 8e6c0c80..e60e24b8 100644 --- a/src/main/asciidoc/_guides/jms.adoc +++ b/src/main/asciidoc/_guides/jms.adoc @@ -1,9 +1,9 @@ -:leveloffset: +1 -:imagesdir: ../images :toc: left = Messaging +:leveloffset: +1 + include::../jms-concepts/jms-concepts.adoc[] include::../jms-examples/jms-examples.adoc[] diff --git a/src/main/asciidoc/_guides/jsf.adoc b/src/main/asciidoc/_guides/jsf.adoc index daba4bbf..4f3fea23 100644 --- a/src/main/asciidoc/_guides/jsf.adoc +++ b/src/main/asciidoc/_guides/jsf.adoc @@ -1,9 +1,9 @@ -:leveloffset: +1 -:imagesdir: ../images :toc: left = Jakarta Server Faces +:leveloffset: +1 + include::../jsf-intro/jsf-intro.adoc[] include::../jsf-facelets/jsf-facelets.adoc[] diff --git a/src/main/asciidoc/_guides/json.adoc b/src/main/asciidoc/_guides/json.adoc index 6075830f..0581740f 100644 --- a/src/main/asciidoc/_guides/json.adoc +++ b/src/main/asciidoc/_guides/json.adoc @@ -1,9 +1,9 @@ -:leveloffset: +1 -:imagesdir: ../images :toc: left = JSON Support +:leveloffset: +1 + include::../jsonp/jsonp.adoc[] include::../jsonb/jsonb.adoc[] diff --git a/src/main/asciidoc/_guides/overview.adoc b/src/main/asciidoc/_guides/overview.adoc index f2278710..b946cc16 100644 --- a/src/main/asciidoc/_guides/overview.adoc +++ b/src/main/asciidoc/_guides/overview.adoc @@ -1,9 +1,9 @@ -:leveloffset: +1 -:imagesdir: ../images :toc: left = Overview +:leveloffset: +1 + include::../overview/overview.adoc[] include::../usingexamples/usingexamples.adoc[] diff --git a/src/main/asciidoc/_guides/persistence.adoc b/src/main/asciidoc/_guides/persistence.adoc index c5502067..fca9b91c 100644 --- a/src/main/asciidoc/_guides/persistence.adoc +++ b/src/main/asciidoc/_guides/persistence.adoc @@ -1,9 +1,9 @@ -:leveloffset: +1 -:imagesdir: ../images :toc: left = Persistence +:leveloffset: +1 + include::../persistence-intro/persistence-intro.adoc[] include::../persistence-basicexamples/persistence-basicexamples.adoc[] diff --git a/src/main/asciidoc/_guides/resource-adapters.adoc b/src/main/asciidoc/_guides/resource-adapters.adoc index ea7b8e6a..cb4a67d2 100644 --- a/src/main/asciidoc/_guides/resource-adapters.adoc +++ b/src/main/asciidoc/_guides/resource-adapters.adoc @@ -1,9 +1,9 @@ -:leveloffset: +1 -:imagesdir: ../images :toc: left = Resource Adapters +:leveloffset: +1 + include::../resources/resources.adoc[] include::../connectorexample/connectorexample.adoc[] diff --git a/src/main/asciidoc/_guides/resource-creation.adoc b/src/main/asciidoc/_guides/resource-creation.adoc index f6467894..c3f2820b 100644 --- a/src/main/asciidoc/_guides/resource-creation.adoc +++ b/src/main/asciidoc/_guides/resource-creation.adoc @@ -1,7 +1,7 @@ -:leveloffset: +1 -:imagesdir: ../images :toc: left = Resource creation +:leveloffset: +1 + include::../resource-creation/resource-creation.adoc[] diff --git a/src/main/asciidoc/_guides/security.adoc b/src/main/asciidoc/_guides/security.adoc index c55bc8b1..dface5df 100644 --- a/src/main/asciidoc/_guides/security.adoc +++ b/src/main/asciidoc/_guides/security.adoc @@ -1,9 +1,9 @@ -:leveloffset: +1 -:imagesdir: ../images :toc: left = Security +:leveloffset: +1 + include::../security-intro/security-intro.adoc[] include::../security-webtier/security-webtier.adoc[] diff --git a/src/main/asciidoc/_guides/servlets.adoc b/src/main/asciidoc/_guides/servlets.adoc index e88d0ede..1e967ee5 100644 --- a/src/main/asciidoc/_guides/servlets.adoc +++ b/src/main/asciidoc/_guides/servlets.adoc @@ -1,7 +1,7 @@ -:leveloffset: +1 -:imagesdir: ../images :toc: left = Servlets +:leveloffset: +1 + include::../servlets/servlets.adoc[] diff --git a/src/main/asciidoc/_guides/transactions.adoc b/src/main/asciidoc/_guides/transactions.adoc index 4a006331..cb97388e 100644 --- a/src/main/asciidoc/_guides/transactions.adoc +++ b/src/main/asciidoc/_guides/transactions.adoc @@ -1,7 +1,7 @@ -:leveloffset: +1 -:imagesdir: ../images :toc: left = Transactions +:leveloffset: +1 + include::../transactions/transactions.adoc[] diff --git a/src/main/asciidoc/_guides/webapp.adoc b/src/main/asciidoc/_guides/webapp.adoc index 141ef5eb..df13f834 100644 --- a/src/main/asciidoc/_guides/webapp.adoc +++ b/src/main/asciidoc/_guides/webapp.adoc @@ -1,7 +1,7 @@ -:leveloffset: +1 -:imagesdir: ../images :toc: left = Web Application +:leveloffset: +1 + include::../webapp/webapp.adoc[] diff --git a/src/main/asciidoc/_guides/webservices.adoc b/src/main/asciidoc/_guides/webservices.adoc index 9e7b1c3a..865a8609 100644 --- a/src/main/asciidoc/_guides/webservices.adoc +++ b/src/main/asciidoc/_guides/webservices.adoc @@ -1,9 +1,9 @@ -:leveloffset: +1 -:imagesdir: ../images :toc: left = REST Web Services +:leveloffset: +1 + include::../webservices-intro/webservices-intro.adoc[] include::../jaxrs/jaxrs.adoc[] diff --git a/src/main/asciidoc/_guides/websocket.adoc b/src/main/asciidoc/_guides/websocket.adoc index e35c3104..b05955ab 100644 --- a/src/main/asciidoc/_guides/websocket.adoc +++ b/src/main/asciidoc/_guides/websocket.adoc @@ -1,7 +1,7 @@ -:leveloffset: +1 -:imagesdir: ../images :toc: left = WebSocket +:leveloffset: +1 + include::../websocket/websocket.adoc[] From c1e53f277b9689b723804e296e7cbb39ea8113d3 Mon Sep 17 00:00:00 2001 From: Arjan Tijms Date: Mon, 13 Dec 2021 16:16:35 +0100 Subject: [PATCH 5/5] Update pom.xml --- pom.xml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/pom.xml b/pom.xml index 53489548..b2c1603e 100644 --- a/pom.xml +++ b/pom.xml @@ -101,12 +101,6 @@ - - - coderay - - - org.apache.maven.plugins