diff --git a/docs/add-on-component-development-guide/README.md b/docs/add-on-component-development-guide/README.md
deleted file mode 100644
index a3ec2b6..0000000
--- a/docs/add-on-component-development-guide/README.md
+++ /dev/null
@@ -1,77 +0,0 @@
-# A JBake project template
-
-## About JBake
-
-JBake is a static site generator, it's inspired from jekyll and written
-in java.  The basic idea is to have templates for the structure of the
-page, and the body generated from asciidoc content.
-
-## Pre requisites
-
-- Maven
-- JDK8+
-
-Deploying to Github will require password less authentication.
-
-This is done by exporting your SSH public key into your Github account.
-
-## Build the site locally
-
-The site is generated under target/staging.
-
-Open file:///PATH_TO_PROJECT_DIR/target/staging in a browser to view the site.
-
-```
-mvn generate-resources
-```
-
-Or you can invoke the JBake plugin directly.
-
-```
-mvn jbake:build
-```
-
-### Rebuild the site on changes
-
-```
-mvn jbake:watch
-```
-
-If you keep this command running, changes to the sources will be
-detected and the site will be rendered incrementally.
-
-This is convenient when writing content.
-
-### Serve the site locally
-
-```
-mvn jbake:serve
-```
-
-If a webserver is required (e.g. absolute path are used), this command
-will start a webserver (jetty) at http://localhost:8820.  It will also
-watch for changes and rebuild incrementally.
-
-## Deploy the site to Github Pages
-
-```
-mvn deploy
-```
-
-## Produce a zip file for download
-
-To produce a zip file containing the generated html files, use:
-
-```
-mvn package
-```
-
-When making a release on GitHub, this zip file should be added to the release.
-
-## Links
-
-- [JBake maven plugin documentation](https://github.com/Blazebit/jbake-maven-plugin)
-- [JBake documentation](http://jbake.org/docs/2.5.1)
-- [Freemarker documentation](http://freemarker.org/docs)
-- [AsciiDoc User Guide](http://asciidoc.org/userguide.html)
-- [Asciidoctor quick reference](http://asciidoctor.org/docs/asciidoc-syntax-quick-reference)
diff --git a/docs/add-on-component-development-guide/pom.xml b/docs/add-on-component-development-guide/pom.xml
index 777e0fb..7dc7027 100644
--- a/docs/add-on-component-development-guide/pom.xml
+++ b/docs/add-on-component-development-guide/pom.xml
@@ -25,7 +25,6 @@
         <version>7.0.0-SNAPSHOT</version>
         <relativePath>../parent</relativePath>
     </parent>
-    <groupId>org.glassfish.docs</groupId>
     <artifactId>add-on-component-development-guide</artifactId>
     <packaging>jar</packaging>
     <name>Eclipse GlassFish Server Add-On Component Development Guide, Release 7</name>
diff --git a/docs/add-on-component-development-guide/src/main/jbake/content/adding-configuration-data.adoc b/docs/add-on-component-development-guide/src/main/asciidoc/adding-configuration-data.adoc
similarity index 100%
rename from docs/add-on-component-development-guide/src/main/jbake/content/adding-configuration-data.adoc
rename to docs/add-on-component-development-guide/src/main/asciidoc/adding-configuration-data.adoc
diff --git a/docs/add-on-component-development-guide/src/main/jbake/content/adding-container-capabilities.adoc b/docs/add-on-component-development-guide/src/main/asciidoc/adding-container-capabilities.adoc
similarity index 100%
rename from docs/add-on-component-development-guide/src/main/jbake/content/adding-container-capabilities.adoc
rename to docs/add-on-component-development-guide/src/main/asciidoc/adding-container-capabilities.adoc
diff --git a/docs/add-on-component-development-guide/src/main/jbake/content/adding-monitoring-capabilities.adoc b/docs/add-on-component-development-guide/src/main/asciidoc/adding-monitoring-capabilities.adoc
similarity index 100%
rename from docs/add-on-component-development-guide/src/main/jbake/content/adding-monitoring-capabilities.adoc
rename to docs/add-on-component-development-guide/src/main/asciidoc/adding-monitoring-capabilities.adoc
diff --git a/docs/add-on-component-development-guide/src/main/jbake/content/extending-asadmin.adoc b/docs/add-on-component-development-guide/src/main/asciidoc/extending-asadmin.adoc
similarity index 100%
rename from docs/add-on-component-development-guide/src/main/jbake/content/extending-asadmin.adoc
rename to docs/add-on-component-development-guide/src/main/asciidoc/extending-asadmin.adoc
diff --git a/docs/add-on-component-development-guide/src/main/jbake/content/extending-the-admin-console.adoc b/docs/add-on-component-development-guide/src/main/asciidoc/extending-the-admin-console.adoc
similarity index 100%
rename from docs/add-on-component-development-guide/src/main/jbake/content/extending-the-admin-console.adoc
rename to docs/add-on-component-development-guide/src/main/asciidoc/extending-the-admin-console.adoc
diff --git a/docs/add-on-component-development-guide/src/main/jbake/assets/img/eclipse_foundation_logo_tiny.png b/docs/add-on-component-development-guide/src/main/asciidoc/img/eclipse_foundation_logo_tiny.png
similarity index 100%
rename from docs/add-on-component-development-guide/src/main/jbake/assets/img/eclipse_foundation_logo_tiny.png
rename to docs/add-on-component-development-guide/src/main/asciidoc/img/eclipse_foundation_logo_tiny.png
Binary files differ
diff --git a/docs/add-on-component-development-guide/src/main/jbake/content/integration-point-reference.adoc b/docs/add-on-component-development-guide/src/main/asciidoc/integration-point-reference.adoc
similarity index 100%
rename from docs/add-on-component-development-guide/src/main/jbake/content/integration-point-reference.adoc
rename to docs/add-on-component-development-guide/src/main/asciidoc/integration-point-reference.adoc
diff --git a/docs/add-on-component-development-guide/src/main/jbake/content/introduction.adoc b/docs/add-on-component-development-guide/src/main/asciidoc/introduction.adoc
similarity index 100%
rename from docs/add-on-component-development-guide/src/main/jbake/content/introduction.adoc
rename to docs/add-on-component-development-guide/src/main/asciidoc/introduction.adoc
diff --git a/docs/add-on-component-development-guide/src/main/jbake/content/loe.adoc b/docs/add-on-component-development-guide/src/main/asciidoc/loe.adoc
similarity index 100%
rename from docs/add-on-component-development-guide/src/main/jbake/content/loe.adoc
rename to docs/add-on-component-development-guide/src/main/asciidoc/loe.adoc
diff --git a/docs/add-on-component-development-guide/src/main/jbake/content/lot.adoc b/docs/add-on-component-development-guide/src/main/asciidoc/lot.adoc
similarity index 100%
rename from docs/add-on-component-development-guide/src/main/jbake/content/lot.adoc
rename to docs/add-on-component-development-guide/src/main/asciidoc/lot.adoc
diff --git a/docs/add-on-component-development-guide/src/main/jbake/content/packaging-integrating-delivering.adoc b/docs/add-on-component-development-guide/src/main/asciidoc/packaging-integrating-delivering.adoc
similarity index 100%
rename from docs/add-on-component-development-guide/src/main/jbake/content/packaging-integrating-delivering.adoc
rename to docs/add-on-component-development-guide/src/main/asciidoc/packaging-integrating-delivering.adoc
diff --git a/docs/add-on-component-development-guide/src/main/jbake/content/preface.adoc b/docs/add-on-component-development-guide/src/main/asciidoc/preface.adoc
similarity index 100%
rename from docs/add-on-component-development-guide/src/main/jbake/content/preface.adoc
rename to docs/add-on-component-development-guide/src/main/asciidoc/preface.adoc
diff --git a/docs/add-on-component-development-guide/src/main/jbake/content/session-persistence-modules.adoc b/docs/add-on-component-development-guide/src/main/asciidoc/session-persistence-modules.adoc
similarity index 100%
rename from docs/add-on-component-development-guide/src/main/jbake/content/session-persistence-modules.adoc
rename to docs/add-on-component-development-guide/src/main/asciidoc/session-persistence-modules.adoc
diff --git a/docs/add-on-component-development-guide/src/main/jbake/content/title.adoc b/docs/add-on-component-development-guide/src/main/asciidoc/title.adoc
similarity index 96%
rename from docs/add-on-component-development-guide/src/main/jbake/content/title.adoc
rename to docs/add-on-component-development-guide/src/main/asciidoc/title.adoc
index c43b937..b82aec7 100644
--- a/docs/add-on-component-development-guide/src/main/jbake/content/title.adoc
+++ b/docs/add-on-component-development-guide/src/main/asciidoc/title.adoc
@@ -54,3 +54,4 @@
 registered trademarks of Advanced Micro Devices. UNIX is a registered
 trademark of The Open Group.
 
+image:img/eclipse_foundation_logo_tiny.png["Eclipse Logo"]
diff --git a/docs/add-on-component-development-guide/src/main/jbake/content/writing-hk2-components.adoc b/docs/add-on-component-development-guide/src/main/asciidoc/writing-hk2-components.adoc
similarity index 100%
rename from docs/add-on-component-development-guide/src/main/jbake/content/writing-hk2-components.adoc
rename to docs/add-on-component-development-guide/src/main/asciidoc/writing-hk2-components.adoc
diff --git a/docs/add-on-component-development-guide/src/main/jbake/assets/css/style.css b/docs/add-on-component-development-guide/src/main/jbake/assets/css/style.css
deleted file mode 100644
index 25a16e4..0000000
--- a/docs/add-on-component-development-guide/src/main/jbake/assets/css/style.css
+++ /dev/null
@@ -1,315 +0,0 @@
-/* CSS */
-/*! normalize.css v3.0.2 | MIT License | git.io/normalize */
-/** 1. Set default font family to sans-serif. 2. Prevent iOS text size adjust after orientation change, without disabling user zoom. */
-html { font-family: sans-serif; /* 1 */ -ms-text-size-adjust: 100%; /* 2 */ -webkit-text-size-adjust: 100%; /* 2 */ }
-
-/* HTML5 display definitions ========================================================================== */
-/** Correct `block` display not defined for any HTML5 element in IE 8/9. Correct `block` display not defined for `details` or `summary` in IE 10/11 and Firefox. Correct `block` display not defined for `main` in IE 11. */
-article, aside, details, figcaption, figure, footer, header, hgroup, main, menu, nav, section, summary { display: block; }
-
-/** 1. Correct `inline-block` display not defined in IE 8/9. 2. Normalize vertical alignment of `progress` in Chrome, Firefox, and Opera. */
-audio, canvas, progress, video { display: inline-block; /* 1 */ vertical-align: baseline; /* 2 */ }
-
-/** Prevent modern browsers from displaying `audio` without controls. Remove excess height in iOS 5 devices. */
-audio:not([controls]) { display: none; height: 0; }
-
-/** Address `[hidden]` styling not present in IE 8/9/10. Hide the `template` element in IE 8/9/11, Safari, and Firefox < 22. */
-[hidden], template { display: none; }
-
-/* Links ========================================================================== */
-/** Remove the gray background color from active links in IE 10. */
-a { background-color: transparent; }
-
-/** Improve readability when focused and also mouse hovered in all browsers. */
-a:active, a:hover { outline: 0; }
-
-/* Text-level semantics ========================================================================== */
-/** Address styling not present in IE 8/9/10/11, Safari, and Chrome. */
-abbr[title] { border-bottom: 1px dotted; }
-
-/** Address style set to `bolder` in Firefox 4+, Safari, and Chrome. */
-b, strong { font-weight: bold; }
-
-/** Address styling not present in Safari and Chrome. */
-dfn { font-style: italic; }
-
-/** Address variable `h1` font-size and margin within `section` and `article` contexts in Firefox 4+, Safari, and Chrome. */
-h1 { font-size: 2em; margin: 0.67em 0; }
-
-/** Address styling not present in IE 8/9. */
-mark { background: #ff0; color: #000; }
-
-/** Address inconsistent and variable font size in all browsers. */
-small { font-size: 80%; }
-
-/** Prevent `sub` and `sup` affecting `line-height` in all browsers. */
-sub, sup { font-size: 75%; line-height: 0; position: relative; vertical-align: baseline; }
-
-sup { top: -0.5em; }
-
-sub { bottom: -0.25em; }
-
-/* Embedded content ========================================================================== */
-/** Remove border when inside `a` element in IE 8/9/10. */
-img { border: 0; }
-
-/** Correct overflow not hidden in IE 9/10/11. */
-svg:not(:root) { overflow: hidden; }
-
-/* Grouping content ========================================================================== */
-/** Address margin not present in IE 8/9 and Safari. */
-figure { margin: 1em 40px; }
-
-/** Address differences between Firefox and other browsers. */
-hr { box-sizing: content-box; height: 0; }
-
-/** Contain overflow in all browsers. */
-pre { overflow: auto; }
-
-/** Address odd `em`-unit font size rendering in all browsers. */
-code, kbd, pre, samp { font-family: monospace, monospace; font-size: 1em; }
-
-/* Forms ========================================================================== */
-/** Known limitation: by default, Chrome and Safari on OS X allow very limited styling of `select`, unless a `border` property is set. */
-/** 1. Correct color not being inherited. Known issue: affects color of disabled elements. 2. Correct font properties not being inherited. 3. Address margins set differently in Firefox 4+, Safari, and Chrome. */
-button, input, optgroup, select, textarea { color: inherit; /* 1 */ font: inherit; /* 2 */ margin: 0; /* 3 */ }
-
-/** Address `overflow` set to `hidden` in IE 8/9/10/11. */
-button { overflow: visible; }
-
-/** Address inconsistent `text-transform` inheritance for `button` and `select`. All other form control elements do not inherit `text-transform` values. Correct `button` style inheritance in Firefox, IE 8/9/10/11, and Opera. Correct `select` style inheritance in Firefox. */
-button, select { text-transform: none; }
-
-/** 1. Avoid the WebKit bug in Android 4.0.* where (2) destroys native `audio` and `video` controls. 2. Correct inability to style clickable `input` types in iOS. 3. Improve usability and consistency of cursor style between image-type `input` and others. */
-button, html input[type="button"], input[type="reset"], input[type="submit"] { -webkit-appearance: button; /* 2 */ cursor: pointer; /* 3 */ }
-
-/** Re-set default cursor for disabled elements. */
-button[disabled], html input[disabled] { cursor: default; }
-
-/** Remove inner padding and border in Firefox 4+. */
-button::-moz-focus-inner, input::-moz-focus-inner { border: 0; padding: 0; }
-
-/** Address Firefox 4+ setting `line-height` on `input` using `!important` in the UA stylesheet. */
-input { line-height: normal; }
-
-/** It's recommended that you don't attempt to style these elements. Firefox's implementation doesn't respect box-sizing, padding, or width.  1. Address box sizing set to `content-box` in IE 8/9/10. 2. Remove excess padding in IE 8/9/10. */
-input[type="checkbox"], input[type="radio"] { box-sizing: border-box; /* 1 */ padding: 0; /* 2 */ }
-
-/** Fix the cursor style for Chrome's increment/decrement buttons. For certain `font-size` values of the `input`, it causes the cursor style of the decrement button to change from `default` to `text`. */
-input[type="number"]::-webkit-inner-spin-button, input[type="number"]::-webkit-outer-spin-button { height: auto; }
-
-/** 1. Address `appearance` set to `searchfield` in Safari and Chrome. 2. Address `box-sizing` set to `border-box` in Safari and Chrome (include `-moz` to future-proof). */
-input[type="search"] { -webkit-appearance: textfield; /* 1 */ /* 2 */ box-sizing: content-box; }
-
-/** Remove inner padding and search cancel button in Safari and Chrome on OS X. Safari (but not Chrome) clips the cancel button when the search input has padding (and `textfield` appearance). */
-input[type="search"]::-webkit-search-cancel-button, input[type="search"]::-webkit-search-decoration { -webkit-appearance: none; }
-
-/** Define consistent border, margin, and padding. */
-fieldset { border: 1px solid #c0c0c0; margin: 0 2px; padding: 0.35em 0.625em 0.75em; }
-
-/** 1. Correct `color` not being inherited in IE 8/9/10/11. 2. Remove padding so people aren't caught out if they zero out fieldsets. */
-legend { border: 0; /* 1 */ padding: 0; /* 2 */ }
-
-/** Remove default vertical scrollbar in IE 8/9/10/11. */
-textarea { overflow: auto; }
-
-/** Don't inherit the `font-weight` (applied by a rule above). NOTE: the default cannot safely be changed in Chrome and Safari on OS X. */
-optgroup { font-weight: bold; }
-
-/* Tables ========================================================================== */
-/** Remove most spacing between table cells. */
-table { border-collapse: collapse; border-spacing: 0; }
-
-td, th { padding: 0; }
-
-/* LAYOUT STYLES */
-
-p { margin-top: 0; }
-
-code, pre { margin-bottom: 30px; font-family: Monaco, "Bitstream Vera Sans Mono", "Lucida Console", Terminal, monospace; font-size: 13px; color: #222; }
-
-code { padding: 0 3px; background-color: #f2f8fc; border: solid 1px #dbe7f3; }
-
-pre { padding: 20px; overflow: auto; text-shadow: none; background: #fff; border: solid 1px #f2f2f2; }
-
-pre code { padding: 0; color: #2879d0; background-color: #fff; border: none; }
-
-ul, ol, dl { margin-bottom: 20px; }
-
-/* COMMON STYLES */
-
-td.halign-right { text-align: right; } 
-
-td.halign-center { text-align: center; } 
-
-form { padding: 20px; background: #f2f2f2; }
-
-h2 { 
-   font-size: 2em;
-   line-height: 1.2em;
-   font-weight: 200;
-   letter-spacing: 0;
-}
-
-h3 { 
-   font-size: 1.4em;
-   line-height: 1.2em;
-   font-weight: normal;
-   letter-spacing: 0;
-}
-
-.sect1 {
-   margin-left: 4%;
-   margin-right: 4%;
-   font: 13px/20px Arial, Helvetica, sans-serif  
-}
-
-a:link {
-   text-decoration: none;
-   color: #09569d;
-}
-
-#preamble hr{
-   margin-left: 0%;
-   margin-right: 0%;
-}
-
-#preamble .sectionbody table  {
-   font-weight: 200;
-   margin-left: 4%;
-   margin-right: 4%;
-}
-
-hr {
-   margin-bottom: 12px;
-}
-
-table.tableblock.frame-all.grid-all.spread {
-   font-size: 12px;
-}
-
-code {
-   font-size:.9em;
-   border: 1px solid #eaeaea;
-   background-color: #f6f6f6;
-   border-radius: 3px;
-   padding: 1px;
-   padding-left:2px;
-   padding-right:2px;
-}
-
-pre.prettyprint.highlight {
-   border: 1px solid #eaeaea;
-   background-color: #f6f6f6;
-   border-radius: 4px;
-   padding: 8px;
-   padding-top:4px;
-   padding-bottom:4px;
-}
-
-.language-oac_no_warn {
-   font-size:.9em;
-   color:#222;
-   background-color: transparent;
-}
-
-#doc-title {
-   margin-left: 4%;
-}
-
-#top-nav {
-   margin-left: 4%;
-   font-size: 12px;
-}
-
-#bottom-nav {
-   margin-left: 4%;
-   font-size: 12px;
-}
-
-.vector-font {
-   color:grey; 
-   font-size: 20px;
-}
-
-#copyright {
-   padding-top: 10px;
-   padding-bottom: 4px;
-   display: table;
-   margin:0 auto;
-   color: grey;
-   font-size: 12px;
-   vertical-align: middle;
-}
-
-.beta {color: #FF0000}
-
-/* GENERAL ELEMENT TYPE STYLES */
-
-/* #Media Queries
-================================================== */
-/* Smaller than standard 960 (devices and browsers) */
-/* Tablet Portrait size to standard 960 (devices and browsers) */
-@media only screen and (min-width: 768px) and (max-width: 959px) { .inner { width: 740px; }
-  header h1, header h2 { width: 340px; }
-  header h1 { font-size: 60px; }
-  header h2 { font-size: 30px; }
-}
-/* All Mobile Sizes (devices and browser) */
-@media only screen and (max-width: 767px) { .inner { width: 93%; }
-  header { padding: 20px 0; }
-  header .inner { position: relative; }
-  header h1, header h2 { width: 100%; }
-  header h1 { font-size: 48px; }
-  header h2 { font-size: 24px; }
-  header a.button { position: relative; display: inline-block; width: auto; height: auto; padding: 5px 10px; margin-top: 15px; font-size: 13px; line-height: 1; color: #2879d0; text-align: center; background-color: #9ddcff; background-image: none; border-radius: 5px; -moz-border-radius: 5px; -webkit-border-radius: 5px; }
-  header a.button small { display: inline; font-size: 13px; }
-}
-/* Mobile Landscape Size to Tablet Portrait (devices and browsers) */
-/* Mobile Portrait Size to Mobile Landscape Size (devices and browsers) */
-
-header h1 { padding-top: 14px; font-size: 2em; font-weight: 200; line-height: 1.4; color: #FFFFFF; letter-spacing: 0px; border-bottom: 0px; }
-
-header h2 { font-size: 1.2em; margin-top: 0; margin-bottom: 0; font-weight: 200; line-height: .8; color: #ec7D11; letter-spacing: 0; }
-
-/*
-header a.button { background: transparent url(../images/logo.png) 0 0 no-repeat; padding-left: 32px; }
-*/
-
-header a:hover { text-decoration: none; }
-
-/* Admonition (Note) block */
-.admonitionblock > table {
-  border: 0;
-  background: none;
-  width: 100%;
-  table-layout: auto;
-  margin-bottom: 10.5px;
-}
-.admonitionblock > table td.icon {
-  text-align: center;
-  width: 60px;
-}
-.admonitionblock > table td.icon img {
-  max-width: none;
-}
-.admonitionblock > table td.icon .title {
-  text-transform: uppercase;
-}
-.admonitionblock > table td.content {
-  padding-left: 1em;
-  padding-right: 1em;
-  border-left: 3px solid #ddd;
-}
-.admonitionblock > table td.content > :last-child > :last-child {
-  margin-bottom: 0;
-}
-.admonitionblock td.icon [class^="fa icon-"]:before {
-  font-size: 2.5em;
-  text-shadow: 1px 1px 2px rgba(0, 0, 0, 0.5);
-  cursor: default;
-}
-.admonitionblock td.icon .icon-note:before {
-  content: "\f05a";
-  color: #5bc0de;
-}
diff --git a/docs/add-on-component-development-guide/src/main/jbake/jbake.properties b/docs/add-on-component-development-guide/src/main/jbake/jbake.properties
deleted file mode 100644
index 546d09c..0000000
--- a/docs/add-on-component-development-guide/src/main/jbake/jbake.properties
+++ /dev/null
@@ -1,7 +0,0 @@
-site.host=http://jbake.org
-render.tags=false
-render.sitemap=false
-render.archive=false
-render.feed=false
-asciidoctor.option.safe=0
-asciidoctor.attributes.export=true
diff --git a/docs/add-on-component-development-guide/src/main/jbake/templates/footer.ftl b/docs/add-on-component-development-guide/src/main/jbake/templates/footer.ftl
deleted file mode 100644
index 697f005..0000000
--- a/docs/add-on-component-development-guide/src/main/jbake/templates/footer.ftl
+++ /dev/null
@@ -1,46 +0,0 @@
-<#-- a footer template fragment included in the page template -->
-<hr />
-
-<table width="90%" id="bottom-nav" cellspacing="0" cellpadding="0">
-	<colgroup>
-		<col width="12%"/>
-		<col width="12%"/>
-		<col width="*"/>
-	</colgroup>
-	<tr>		
-	    <#if content.prev??>
-		<td align="left">
-		<a href="${content.prev}">
-			<span class=" vector-font"><i class="fa fa-arrow-circle-left" aria-hidden="true"></i></span>
-			<span style="position:relative;top:-2px;">Previous</span>
-		</a>
-		</td>
-		</#if>
-
-		<#if content.next??>
-		<td align="left">
-		<a href="${content.next}">
-			<span class="vector-font"><i class="fa fa-arrow-circle-right vector-font" aria-hidden="true"></i></span>
-			<span style="position:relative;top:-2px;">Next</span>
-		</a>
-		</td>
-		</#if>
-
-		<td align="right">
-		<a href="toc.html">
-			<span class="vector-font"><i class="fa fa-list vector-font" aria-hidden="true"></i></span>
-			<span style="position:relative;top:-2px;">Contents</span>
-		</a>
-		</td>
-	</tr>
-</table>
-
-<span id="copyright">
-        <img src="img/eclipse_foundation_logo_tiny.png" height="20px" alt="Eclipse Foundation Logo" align="top"/>&nbsp;            
-        <span >Copyright&nbsp;&copy;&nbsp;2020,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</span>
-</span>
-
-<p align="center" class="beta">${config.status!}</p>
-
-</body>
-</html>
diff --git a/docs/add-on-component-development-guide/src/main/jbake/templates/header.ftl b/docs/add-on-component-development-guide/src/main/jbake/templates/header.ftl
deleted file mode 100644
index 82ebb36..0000000
--- a/docs/add-on-component-development-guide/src/main/jbake/templates/header.ftl
+++ /dev/null
@@ -1,55 +0,0 @@
-<!DOCTYPE html>
-<#-- a header template fragment included in the page template -->
-<html lang="en">
-  <head>
-    <meta charset="utf-8"/>
-    <title><#if (content.title)??><#escape x as x?xml>${content.title}</#escape></#if></title>
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <link href="<#if (content.rootpath)??>${content.rootpath}<#else></#if>css/style.css" rel="stylesheet">
-    <script src="https://use.fontawesome.com/96c4d89611.js"></script>
-  </head>
-  <body>
-<table id="doc-title" cellspacing="0" cellpadding="0">
-  <tr>
-  <td align="left" valign="top">
-  <b>${content.title}</b><br />
-      <p class="beta">${config.status!}</p>
-  </td>
-  </tr>
-</table>
-<hr />
-
-<table width="90%" id="top-nav" cellspacing="0" cellpadding="0">
-	<colgroup>
-		<col width="12%"/>
-		<col width="12%"/>
-		<col width="*"/>
-	</colgroup>
-	<tr>
-	    <#if content.prev??>
-		<td align="left">
-		<a href="${content.prev}">
-			<span class="vector-font"><i class="fa fa-arrow-circle-left" aria-hidden="true"></i></span>
-			<span style="position:relative;top:-2px;">Previous</span>
-		</a>
-		</td>
-	    </#if>
-
-	    <#if content.next??>
-		<td align="left">
-		<a href="${content.next}">
-			<span class=" vector-font"><i class="fa fa-arrow-circle-right vector-font" aria-hidden="true"></i></span>
-			<span style="position:relative;top:-2px;">Next</span>
-		</a>
-		</td>
-	    </#if>
-
-		<td align="right">
-		<a href="toc.html">
-			<span class=" vector-font"><i class="fa fa-list vector-font" aria-hidden="true"></i></span>
-			<span style="position:relative;top:-2px;">Contents</span>
-		</a>
-		</td>
-	</tr>
-</table>
-
diff --git a/docs/add-on-component-development-guide/src/main/jbake/templates/menu.ftl b/docs/add-on-component-development-guide/src/main/jbake/templates/menu.ftl
deleted file mode 100644
index 888c03d..0000000
--- a/docs/add-on-component-development-guide/src/main/jbake/templates/menu.ftl
+++ /dev/null
@@ -1 +0,0 @@
-<#-- a menu bar template fragment included in the page template -->
\ No newline at end of file
diff --git a/docs/add-on-component-development-guide/src/main/jbake/templates/page.ftl b/docs/add-on-component-development-guide/src/main/jbake/templates/page.ftl
deleted file mode 100644
index eca51db..0000000
--- a/docs/add-on-component-development-guide/src/main/jbake/templates/page.ftl
+++ /dev/null
@@ -1,8 +0,0 @@
-<#-- a top level page layout template -->
-
-<#include "header.ftl">
-<#include "menu.ftl">
-
-${content.body}
-
-<#include "footer.ftl">
\ No newline at end of file
diff --git a/docs/administration-guide/README.md b/docs/administration-guide/README.md
deleted file mode 100644
index a3ec2b6..0000000
--- a/docs/administration-guide/README.md
+++ /dev/null
@@ -1,77 +0,0 @@
-# A JBake project template
-
-## About JBake
-
-JBake is a static site generator, it's inspired from jekyll and written
-in java.  The basic idea is to have templates for the structure of the
-page, and the body generated from asciidoc content.
-
-## Pre requisites
-
-- Maven
-- JDK8+
-
-Deploying to Github will require password less authentication.
-
-This is done by exporting your SSH public key into your Github account.
-
-## Build the site locally
-
-The site is generated under target/staging.
-
-Open file:///PATH_TO_PROJECT_DIR/target/staging in a browser to view the site.
-
-```
-mvn generate-resources
-```
-
-Or you can invoke the JBake plugin directly.
-
-```
-mvn jbake:build
-```
-
-### Rebuild the site on changes
-
-```
-mvn jbake:watch
-```
-
-If you keep this command running, changes to the sources will be
-detected and the site will be rendered incrementally.
-
-This is convenient when writing content.
-
-### Serve the site locally
-
-```
-mvn jbake:serve
-```
-
-If a webserver is required (e.g. absolute path are used), this command
-will start a webserver (jetty) at http://localhost:8820.  It will also
-watch for changes and rebuild incrementally.
-
-## Deploy the site to Github Pages
-
-```
-mvn deploy
-```
-
-## Produce a zip file for download
-
-To produce a zip file containing the generated html files, use:
-
-```
-mvn package
-```
-
-When making a release on GitHub, this zip file should be added to the release.
-
-## Links
-
-- [JBake maven plugin documentation](https://github.com/Blazebit/jbake-maven-plugin)
-- [JBake documentation](http://jbake.org/docs/2.5.1)
-- [Freemarker documentation](http://freemarker.org/docs)
-- [AsciiDoc User Guide](http://asciidoc.org/userguide.html)
-- [Asciidoctor quick reference](http://asciidoctor.org/docs/asciidoc-syntax-quick-reference)
diff --git a/docs/administration-guide/pom.xml b/docs/administration-guide/pom.xml
index 2ffc80d..c4a2f34 100644
--- a/docs/administration-guide/pom.xml
+++ b/docs/administration-guide/pom.xml
@@ -25,7 +25,6 @@
         <version>7.0.0-SNAPSHOT</version>
         <relativePath>../parent</relativePath>
     </parent>
-    <groupId>org.glassfish.docs</groupId>
     <artifactId>administration-guide</artifactId>
     <packaging>jar</packaging>
     <name>Eclipse GlassFish Server Administration Guide, Release 7</name>
diff --git a/docs/administration-guide/src/main/jbake/content/asadmin-subcommands.adoc b/docs/administration-guide/src/main/asciidoc/asadmin-subcommands.adoc
similarity index 100%
rename from docs/administration-guide/src/main/jbake/content/asadmin-subcommands.adoc
rename to docs/administration-guide/src/main/asciidoc/asadmin-subcommands.adoc
diff --git a/docs/administration-guide/src/main/jbake/content/batch.adoc b/docs/administration-guide/src/main/asciidoc/batch.adoc
similarity index 100%
rename from docs/administration-guide/src/main/jbake/content/batch.adoc
rename to docs/administration-guide/src/main/asciidoc/batch.adoc
diff --git a/docs/administration-guide/src/main/jbake/content/concurrent.adoc b/docs/administration-guide/src/main/asciidoc/concurrent.adoc
similarity index 100%
rename from docs/administration-guide/src/main/jbake/content/concurrent.adoc
rename to docs/administration-guide/src/main/asciidoc/concurrent.adoc
diff --git a/docs/administration-guide/src/main/jbake/content/connectors.adoc b/docs/administration-guide/src/main/asciidoc/connectors.adoc
similarity index 100%
rename from docs/administration-guide/src/main/jbake/content/connectors.adoc
rename to docs/administration-guide/src/main/asciidoc/connectors.adoc
diff --git a/docs/administration-guide/src/main/jbake/content/domains.adoc b/docs/administration-guide/src/main/asciidoc/domains.adoc
similarity index 100%
rename from docs/administration-guide/src/main/jbake/content/domains.adoc
rename to docs/administration-guide/src/main/asciidoc/domains.adoc
diff --git a/docs/administration-guide/src/main/jbake/content/general-administration.adoc b/docs/administration-guide/src/main/asciidoc/general-administration.adoc
similarity index 100%
rename from docs/administration-guide/src/main/jbake/content/general-administration.adoc
rename to docs/administration-guide/src/main/asciidoc/general-administration.adoc
diff --git a/docs/administration-guide/src/main/jbake/content/http_https.adoc b/docs/administration-guide/src/main/asciidoc/http_https.adoc
similarity index 100%
rename from docs/administration-guide/src/main/jbake/content/http_https.adoc
rename to docs/administration-guide/src/main/asciidoc/http_https.adoc
diff --git a/docs/administration-guide/src/main/jbake/assets/img/eclipse_foundation_logo_tiny.png b/docs/administration-guide/src/main/asciidoc/img/eclipse_foundation_logo_tiny.png
similarity index 100%
rename from docs/administration-guide/src/main/jbake/assets/img/eclipse_foundation_logo_tiny.png
rename to docs/administration-guide/src/main/asciidoc/img/eclipse_foundation_logo_tiny.png
Binary files differ
diff --git a/docs/administration-guide/src/main/jbake/assets/img/rest-management.png b/docs/administration-guide/src/main/asciidoc/img/rest-management.png
similarity index 100%
rename from docs/administration-guide/src/main/jbake/assets/img/rest-management.png
rename to docs/administration-guide/src/main/asciidoc/img/rest-management.png
Binary files differ
diff --git a/docs/administration-guide/src/main/jbake/assets/img/rest-monitoring.png b/docs/administration-guide/src/main/asciidoc/img/rest-monitoring.png
similarity index 100%
rename from docs/administration-guide/src/main/jbake/assets/img/rest-monitoring.png
rename to docs/administration-guide/src/main/asciidoc/img/rest-monitoring.png
Binary files differ
diff --git a/docs/administration-guide/src/main/jbake/assets/img/websphere-mq.png b/docs/administration-guide/src/main/asciidoc/img/websphere-mq.png
similarity index 100%
rename from docs/administration-guide/src/main/jbake/assets/img/websphere-mq.png
rename to docs/administration-guide/src/main/asciidoc/img/websphere-mq.png
Binary files differ
diff --git a/docs/administration-guide/src/main/jbake/content/javamail.adoc b/docs/administration-guide/src/main/asciidoc/javamail.adoc
similarity index 100%
rename from docs/administration-guide/src/main/jbake/content/javamail.adoc
rename to docs/administration-guide/src/main/asciidoc/javamail.adoc
diff --git a/docs/administration-guide/src/main/jbake/content/jdbc.adoc b/docs/administration-guide/src/main/asciidoc/jdbc.adoc
similarity index 100%
rename from docs/administration-guide/src/main/jbake/content/jdbc.adoc
rename to docs/administration-guide/src/main/asciidoc/jdbc.adoc
diff --git a/docs/administration-guide/src/main/jbake/content/jms.adoc b/docs/administration-guide/src/main/asciidoc/jms.adoc
similarity index 100%
rename from docs/administration-guide/src/main/jbake/content/jms.adoc
rename to docs/administration-guide/src/main/asciidoc/jms.adoc
diff --git a/docs/administration-guide/src/main/jbake/content/jndi.adoc b/docs/administration-guide/src/main/asciidoc/jndi.adoc
similarity index 100%
rename from docs/administration-guide/src/main/jbake/content/jndi.adoc
rename to docs/administration-guide/src/main/asciidoc/jndi.adoc
diff --git a/docs/administration-guide/src/main/jbake/content/jvm.adoc b/docs/administration-guide/src/main/asciidoc/jvm.adoc
similarity index 100%
rename from docs/administration-guide/src/main/jbake/content/jvm.adoc
rename to docs/administration-guide/src/main/asciidoc/jvm.adoc
diff --git a/docs/administration-guide/src/main/jbake/content/lifecycle-modules.adoc b/docs/administration-guide/src/main/asciidoc/lifecycle-modules.adoc
similarity index 100%
rename from docs/administration-guide/src/main/jbake/content/lifecycle-modules.adoc
rename to docs/administration-guide/src/main/asciidoc/lifecycle-modules.adoc
diff --git a/docs/administration-guide/src/main/jbake/content/loe.adoc b/docs/administration-guide/src/main/asciidoc/loe.adoc
similarity index 100%
rename from docs/administration-guide/src/main/jbake/content/loe.adoc
rename to docs/administration-guide/src/main/asciidoc/loe.adoc
diff --git a/docs/administration-guide/src/main/jbake/content/lof.adoc b/docs/administration-guide/src/main/asciidoc/lof.adoc
similarity index 100%
rename from docs/administration-guide/src/main/jbake/content/lof.adoc
rename to docs/administration-guide/src/main/asciidoc/lof.adoc
diff --git a/docs/administration-guide/src/main/jbake/content/logging.adoc b/docs/administration-guide/src/main/asciidoc/logging.adoc
similarity index 100%
rename from docs/administration-guide/src/main/jbake/content/logging.adoc
rename to docs/administration-guide/src/main/asciidoc/logging.adoc
diff --git a/docs/administration-guide/src/main/jbake/content/lot.adoc b/docs/administration-guide/src/main/asciidoc/lot.adoc
similarity index 100%
rename from docs/administration-guide/src/main/jbake/content/lot.adoc
rename to docs/administration-guide/src/main/asciidoc/lot.adoc
diff --git a/docs/administration-guide/src/main/jbake/content/monitoring.adoc b/docs/administration-guide/src/main/asciidoc/monitoring.adoc
similarity index 100%
rename from docs/administration-guide/src/main/jbake/content/monitoring.adoc
rename to docs/administration-guide/src/main/asciidoc/monitoring.adoc
diff --git a/docs/administration-guide/src/main/jbake/content/orb.adoc b/docs/administration-guide/src/main/asciidoc/orb.adoc
similarity index 100%
rename from docs/administration-guide/src/main/jbake/content/orb.adoc
rename to docs/administration-guide/src/main/asciidoc/orb.adoc
diff --git a/docs/administration-guide/src/main/jbake/content/overview.adoc b/docs/administration-guide/src/main/asciidoc/overview.adoc
similarity index 100%
rename from docs/administration-guide/src/main/jbake/content/overview.adoc
rename to docs/administration-guide/src/main/asciidoc/overview.adoc
diff --git a/docs/administration-guide/src/main/jbake/content/part-appendixes.adoc b/docs/administration-guide/src/main/asciidoc/part-appendixes.adoc
similarity index 100%
rename from docs/administration-guide/src/main/jbake/content/part-appendixes.adoc
rename to docs/administration-guide/src/main/asciidoc/part-appendixes.adoc
diff --git a/docs/administration-guide/src/main/jbake/content/part-res-and-svcs-admin.adoc b/docs/administration-guide/src/main/asciidoc/part-res-and-svcs-admin.adoc
similarity index 100%
rename from docs/administration-guide/src/main/jbake/content/part-res-and-svcs-admin.adoc
rename to docs/administration-guide/src/main/asciidoc/part-res-and-svcs-admin.adoc
diff --git a/docs/administration-guide/src/main/jbake/content/part-runtime-admin.adoc b/docs/administration-guide/src/main/asciidoc/part-runtime-admin.adoc
similarity index 100%
rename from docs/administration-guide/src/main/jbake/content/part-runtime-admin.adoc
rename to docs/administration-guide/src/main/asciidoc/part-runtime-admin.adoc
diff --git a/docs/administration-guide/src/main/jbake/content/preface.adoc b/docs/administration-guide/src/main/asciidoc/preface.adoc
similarity index 100%
rename from docs/administration-guide/src/main/jbake/content/preface.adoc
rename to docs/administration-guide/src/main/asciidoc/preface.adoc
diff --git a/docs/administration-guide/src/main/jbake/content/threadpools.adoc b/docs/administration-guide/src/main/asciidoc/threadpools.adoc
similarity index 100%
rename from docs/administration-guide/src/main/jbake/content/threadpools.adoc
rename to docs/administration-guide/src/main/asciidoc/threadpools.adoc
diff --git a/docs/administration-guide/src/main/jbake/content/title.adoc b/docs/administration-guide/src/main/asciidoc/title.adoc
similarity index 95%
rename from docs/administration-guide/src/main/jbake/content/title.adoc
rename to docs/administration-guide/src/main/asciidoc/title.adoc
index f94ef8e..c8037d2 100644
--- a/docs/administration-guide/src/main/jbake/content/title.adoc
+++ b/docs/administration-guide/src/main/asciidoc/title.adoc
@@ -45,3 +45,5 @@
 Opteron, the AMD logo, and the AMD Opteron logo are trademarks or
 registered trademarks of Advanced Micro Devices. UNIX is a registered
 trademark of The Open Group.
+
+image:img/eclipse_foundation_logo_tiny.png["Eclipse Logo"]
diff --git a/docs/administration-guide/src/main/jbake/content/transactions.adoc b/docs/administration-guide/src/main/asciidoc/transactions.adoc
similarity index 100%
rename from docs/administration-guide/src/main/jbake/content/transactions.adoc
rename to docs/administration-guide/src/main/asciidoc/transactions.adoc
diff --git a/docs/administration-guide/src/main/jbake/content/webapps.adoc b/docs/administration-guide/src/main/asciidoc/webapps.adoc
similarity index 100%
rename from docs/administration-guide/src/main/jbake/content/webapps.adoc
rename to docs/administration-guide/src/main/asciidoc/webapps.adoc
diff --git a/docs/administration-guide/src/main/jbake/assets/css/style.css b/docs/administration-guide/src/main/jbake/assets/css/style.css
deleted file mode 100644
index 25a16e4..0000000
--- a/docs/administration-guide/src/main/jbake/assets/css/style.css
+++ /dev/null
@@ -1,315 +0,0 @@
-/* CSS */
-/*! normalize.css v3.0.2 | MIT License | git.io/normalize */
-/** 1. Set default font family to sans-serif. 2. Prevent iOS text size adjust after orientation change, without disabling user zoom. */
-html { font-family: sans-serif; /* 1 */ -ms-text-size-adjust: 100%; /* 2 */ -webkit-text-size-adjust: 100%; /* 2 */ }
-
-/* HTML5 display definitions ========================================================================== */
-/** Correct `block` display not defined for any HTML5 element in IE 8/9. Correct `block` display not defined for `details` or `summary` in IE 10/11 and Firefox. Correct `block` display not defined for `main` in IE 11. */
-article, aside, details, figcaption, figure, footer, header, hgroup, main, menu, nav, section, summary { display: block; }
-
-/** 1. Correct `inline-block` display not defined in IE 8/9. 2. Normalize vertical alignment of `progress` in Chrome, Firefox, and Opera. */
-audio, canvas, progress, video { display: inline-block; /* 1 */ vertical-align: baseline; /* 2 */ }
-
-/** Prevent modern browsers from displaying `audio` without controls. Remove excess height in iOS 5 devices. */
-audio:not([controls]) { display: none; height: 0; }
-
-/** Address `[hidden]` styling not present in IE 8/9/10. Hide the `template` element in IE 8/9/11, Safari, and Firefox < 22. */
-[hidden], template { display: none; }
-
-/* Links ========================================================================== */
-/** Remove the gray background color from active links in IE 10. */
-a { background-color: transparent; }
-
-/** Improve readability when focused and also mouse hovered in all browsers. */
-a:active, a:hover { outline: 0; }
-
-/* Text-level semantics ========================================================================== */
-/** Address styling not present in IE 8/9/10/11, Safari, and Chrome. */
-abbr[title] { border-bottom: 1px dotted; }
-
-/** Address style set to `bolder` in Firefox 4+, Safari, and Chrome. */
-b, strong { font-weight: bold; }
-
-/** Address styling not present in Safari and Chrome. */
-dfn { font-style: italic; }
-
-/** Address variable `h1` font-size and margin within `section` and `article` contexts in Firefox 4+, Safari, and Chrome. */
-h1 { font-size: 2em; margin: 0.67em 0; }
-
-/** Address styling not present in IE 8/9. */
-mark { background: #ff0; color: #000; }
-
-/** Address inconsistent and variable font size in all browsers. */
-small { font-size: 80%; }
-
-/** Prevent `sub` and `sup` affecting `line-height` in all browsers. */
-sub, sup { font-size: 75%; line-height: 0; position: relative; vertical-align: baseline; }
-
-sup { top: -0.5em; }
-
-sub { bottom: -0.25em; }
-
-/* Embedded content ========================================================================== */
-/** Remove border when inside `a` element in IE 8/9/10. */
-img { border: 0; }
-
-/** Correct overflow not hidden in IE 9/10/11. */
-svg:not(:root) { overflow: hidden; }
-
-/* Grouping content ========================================================================== */
-/** Address margin not present in IE 8/9 and Safari. */
-figure { margin: 1em 40px; }
-
-/** Address differences between Firefox and other browsers. */
-hr { box-sizing: content-box; height: 0; }
-
-/** Contain overflow in all browsers. */
-pre { overflow: auto; }
-
-/** Address odd `em`-unit font size rendering in all browsers. */
-code, kbd, pre, samp { font-family: monospace, monospace; font-size: 1em; }
-
-/* Forms ========================================================================== */
-/** Known limitation: by default, Chrome and Safari on OS X allow very limited styling of `select`, unless a `border` property is set. */
-/** 1. Correct color not being inherited. Known issue: affects color of disabled elements. 2. Correct font properties not being inherited. 3. Address margins set differently in Firefox 4+, Safari, and Chrome. */
-button, input, optgroup, select, textarea { color: inherit; /* 1 */ font: inherit; /* 2 */ margin: 0; /* 3 */ }
-
-/** Address `overflow` set to `hidden` in IE 8/9/10/11. */
-button { overflow: visible; }
-
-/** Address inconsistent `text-transform` inheritance for `button` and `select`. All other form control elements do not inherit `text-transform` values. Correct `button` style inheritance in Firefox, IE 8/9/10/11, and Opera. Correct `select` style inheritance in Firefox. */
-button, select { text-transform: none; }
-
-/** 1. Avoid the WebKit bug in Android 4.0.* where (2) destroys native `audio` and `video` controls. 2. Correct inability to style clickable `input` types in iOS. 3. Improve usability and consistency of cursor style between image-type `input` and others. */
-button, html input[type="button"], input[type="reset"], input[type="submit"] { -webkit-appearance: button; /* 2 */ cursor: pointer; /* 3 */ }
-
-/** Re-set default cursor for disabled elements. */
-button[disabled], html input[disabled] { cursor: default; }
-
-/** Remove inner padding and border in Firefox 4+. */
-button::-moz-focus-inner, input::-moz-focus-inner { border: 0; padding: 0; }
-
-/** Address Firefox 4+ setting `line-height` on `input` using `!important` in the UA stylesheet. */
-input { line-height: normal; }
-
-/** It's recommended that you don't attempt to style these elements. Firefox's implementation doesn't respect box-sizing, padding, or width.  1. Address box sizing set to `content-box` in IE 8/9/10. 2. Remove excess padding in IE 8/9/10. */
-input[type="checkbox"], input[type="radio"] { box-sizing: border-box; /* 1 */ padding: 0; /* 2 */ }
-
-/** Fix the cursor style for Chrome's increment/decrement buttons. For certain `font-size` values of the `input`, it causes the cursor style of the decrement button to change from `default` to `text`. */
-input[type="number"]::-webkit-inner-spin-button, input[type="number"]::-webkit-outer-spin-button { height: auto; }
-
-/** 1. Address `appearance` set to `searchfield` in Safari and Chrome. 2. Address `box-sizing` set to `border-box` in Safari and Chrome (include `-moz` to future-proof). */
-input[type="search"] { -webkit-appearance: textfield; /* 1 */ /* 2 */ box-sizing: content-box; }
-
-/** Remove inner padding and search cancel button in Safari and Chrome on OS X. Safari (but not Chrome) clips the cancel button when the search input has padding (and `textfield` appearance). */
-input[type="search"]::-webkit-search-cancel-button, input[type="search"]::-webkit-search-decoration { -webkit-appearance: none; }
-
-/** Define consistent border, margin, and padding. */
-fieldset { border: 1px solid #c0c0c0; margin: 0 2px; padding: 0.35em 0.625em 0.75em; }
-
-/** 1. Correct `color` not being inherited in IE 8/9/10/11. 2. Remove padding so people aren't caught out if they zero out fieldsets. */
-legend { border: 0; /* 1 */ padding: 0; /* 2 */ }
-
-/** Remove default vertical scrollbar in IE 8/9/10/11. */
-textarea { overflow: auto; }
-
-/** Don't inherit the `font-weight` (applied by a rule above). NOTE: the default cannot safely be changed in Chrome and Safari on OS X. */
-optgroup { font-weight: bold; }
-
-/* Tables ========================================================================== */
-/** Remove most spacing between table cells. */
-table { border-collapse: collapse; border-spacing: 0; }
-
-td, th { padding: 0; }
-
-/* LAYOUT STYLES */
-
-p { margin-top: 0; }
-
-code, pre { margin-bottom: 30px; font-family: Monaco, "Bitstream Vera Sans Mono", "Lucida Console", Terminal, monospace; font-size: 13px; color: #222; }
-
-code { padding: 0 3px; background-color: #f2f8fc; border: solid 1px #dbe7f3; }
-
-pre { padding: 20px; overflow: auto; text-shadow: none; background: #fff; border: solid 1px #f2f2f2; }
-
-pre code { padding: 0; color: #2879d0; background-color: #fff; border: none; }
-
-ul, ol, dl { margin-bottom: 20px; }
-
-/* COMMON STYLES */
-
-td.halign-right { text-align: right; } 
-
-td.halign-center { text-align: center; } 
-
-form { padding: 20px; background: #f2f2f2; }
-
-h2 { 
-   font-size: 2em;
-   line-height: 1.2em;
-   font-weight: 200;
-   letter-spacing: 0;
-}
-
-h3 { 
-   font-size: 1.4em;
-   line-height: 1.2em;
-   font-weight: normal;
-   letter-spacing: 0;
-}
-
-.sect1 {
-   margin-left: 4%;
-   margin-right: 4%;
-   font: 13px/20px Arial, Helvetica, sans-serif  
-}
-
-a:link {
-   text-decoration: none;
-   color: #09569d;
-}
-
-#preamble hr{
-   margin-left: 0%;
-   margin-right: 0%;
-}
-
-#preamble .sectionbody table  {
-   font-weight: 200;
-   margin-left: 4%;
-   margin-right: 4%;
-}
-
-hr {
-   margin-bottom: 12px;
-}
-
-table.tableblock.frame-all.grid-all.spread {
-   font-size: 12px;
-}
-
-code {
-   font-size:.9em;
-   border: 1px solid #eaeaea;
-   background-color: #f6f6f6;
-   border-radius: 3px;
-   padding: 1px;
-   padding-left:2px;
-   padding-right:2px;
-}
-
-pre.prettyprint.highlight {
-   border: 1px solid #eaeaea;
-   background-color: #f6f6f6;
-   border-radius: 4px;
-   padding: 8px;
-   padding-top:4px;
-   padding-bottom:4px;
-}
-
-.language-oac_no_warn {
-   font-size:.9em;
-   color:#222;
-   background-color: transparent;
-}
-
-#doc-title {
-   margin-left: 4%;
-}
-
-#top-nav {
-   margin-left: 4%;
-   font-size: 12px;
-}
-
-#bottom-nav {
-   margin-left: 4%;
-   font-size: 12px;
-}
-
-.vector-font {
-   color:grey; 
-   font-size: 20px;
-}
-
-#copyright {
-   padding-top: 10px;
-   padding-bottom: 4px;
-   display: table;
-   margin:0 auto;
-   color: grey;
-   font-size: 12px;
-   vertical-align: middle;
-}
-
-.beta {color: #FF0000}
-
-/* GENERAL ELEMENT TYPE STYLES */
-
-/* #Media Queries
-================================================== */
-/* Smaller than standard 960 (devices and browsers) */
-/* Tablet Portrait size to standard 960 (devices and browsers) */
-@media only screen and (min-width: 768px) and (max-width: 959px) { .inner { width: 740px; }
-  header h1, header h2 { width: 340px; }
-  header h1 { font-size: 60px; }
-  header h2 { font-size: 30px; }
-}
-/* All Mobile Sizes (devices and browser) */
-@media only screen and (max-width: 767px) { .inner { width: 93%; }
-  header { padding: 20px 0; }
-  header .inner { position: relative; }
-  header h1, header h2 { width: 100%; }
-  header h1 { font-size: 48px; }
-  header h2 { font-size: 24px; }
-  header a.button { position: relative; display: inline-block; width: auto; height: auto; padding: 5px 10px; margin-top: 15px; font-size: 13px; line-height: 1; color: #2879d0; text-align: center; background-color: #9ddcff; background-image: none; border-radius: 5px; -moz-border-radius: 5px; -webkit-border-radius: 5px; }
-  header a.button small { display: inline; font-size: 13px; }
-}
-/* Mobile Landscape Size to Tablet Portrait (devices and browsers) */
-/* Mobile Portrait Size to Mobile Landscape Size (devices and browsers) */
-
-header h1 { padding-top: 14px; font-size: 2em; font-weight: 200; line-height: 1.4; color: #FFFFFF; letter-spacing: 0px; border-bottom: 0px; }
-
-header h2 { font-size: 1.2em; margin-top: 0; margin-bottom: 0; font-weight: 200; line-height: .8; color: #ec7D11; letter-spacing: 0; }
-
-/*
-header a.button { background: transparent url(../images/logo.png) 0 0 no-repeat; padding-left: 32px; }
-*/
-
-header a:hover { text-decoration: none; }
-
-/* Admonition (Note) block */
-.admonitionblock > table {
-  border: 0;
-  background: none;
-  width: 100%;
-  table-layout: auto;
-  margin-bottom: 10.5px;
-}
-.admonitionblock > table td.icon {
-  text-align: center;
-  width: 60px;
-}
-.admonitionblock > table td.icon img {
-  max-width: none;
-}
-.admonitionblock > table td.icon .title {
-  text-transform: uppercase;
-}
-.admonitionblock > table td.content {
-  padding-left: 1em;
-  padding-right: 1em;
-  border-left: 3px solid #ddd;
-}
-.admonitionblock > table td.content > :last-child > :last-child {
-  margin-bottom: 0;
-}
-.admonitionblock td.icon [class^="fa icon-"]:before {
-  font-size: 2.5em;
-  text-shadow: 1px 1px 2px rgba(0, 0, 0, 0.5);
-  cursor: default;
-}
-.admonitionblock td.icon .icon-note:before {
-  content: "\f05a";
-  color: #5bc0de;
-}
diff --git a/docs/administration-guide/src/main/jbake/jbake.properties b/docs/administration-guide/src/main/jbake/jbake.properties
deleted file mode 100644
index 546d09c..0000000
--- a/docs/administration-guide/src/main/jbake/jbake.properties
+++ /dev/null
@@ -1,7 +0,0 @@
-site.host=http://jbake.org
-render.tags=false
-render.sitemap=false
-render.archive=false
-render.feed=false
-asciidoctor.option.safe=0
-asciidoctor.attributes.export=true
diff --git a/docs/administration-guide/src/main/jbake/templates/footer.ftl b/docs/administration-guide/src/main/jbake/templates/footer.ftl
deleted file mode 100644
index 6f2b09e..0000000
--- a/docs/administration-guide/src/main/jbake/templates/footer.ftl
+++ /dev/null
@@ -1,46 +0,0 @@
-<#-- a footer template fragment included in the page template -->
-<hr />
-
-<table width="90%" id="bottom-nav" cellspacing="0" cellpadding="0">
-	<colgroup>
-		<col width="12%"/>
-		<col width="12%"/>
-		<col width="*"/>
-	</colgroup>
-	<tr>		
-	    <#if content.prev??>
-		<td align="left">
-		<a href="${content.prev}">
-			<span class=" vector-font"><i class="fa fa-arrow-circle-left" aria-hidden="true"></i></span>
-			<span style="position:relative;top:-2px;">Previous</span>
-		</a>
-		</td>
-		</#if>
-
-		<#if content.next??>
-		<td align="left">
-		<a href="${content.next}">
-			<span class="vector-font"><i class="fa fa-arrow-circle-right vector-font" aria-hidden="true"></i></span>
-			<span style="position:relative;top:-2px;">Next</span>
-		</a>
-		</td>
-		</#if>
-
-		<td align="right">
-		<a href="toc.html">
-			<span class="vector-font"><i class="fa fa-list vector-font" aria-hidden="true"></i></span>
-			<span style="position:relative;top:-2px;">Contents</span>
-		</a>
-		</td>
-	</tr>
-</table>
-
-<span id="copyright">
-        <img src="img/eclipse_foundation_logo_tiny.png" height="20px" alt="Eclipse Foundation Logo" align="top"/>&nbsp;            
-        <span >Copyright&nbsp;&copy;&nbsp;2019,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</span>
-</span>
-
-<p align="center" class="beta">${config.status!}</p>
-
-</body>
-</html>
diff --git a/docs/administration-guide/src/main/jbake/templates/header.ftl b/docs/administration-guide/src/main/jbake/templates/header.ftl
deleted file mode 100644
index 82ebb36..0000000
--- a/docs/administration-guide/src/main/jbake/templates/header.ftl
+++ /dev/null
@@ -1,55 +0,0 @@
-<!DOCTYPE html>
-<#-- a header template fragment included in the page template -->
-<html lang="en">
-  <head>
-    <meta charset="utf-8"/>
-    <title><#if (content.title)??><#escape x as x?xml>${content.title}</#escape></#if></title>
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <link href="<#if (content.rootpath)??>${content.rootpath}<#else></#if>css/style.css" rel="stylesheet">
-    <script src="https://use.fontawesome.com/96c4d89611.js"></script>
-  </head>
-  <body>
-<table id="doc-title" cellspacing="0" cellpadding="0">
-  <tr>
-  <td align="left" valign="top">
-  <b>${content.title}</b><br />
-      <p class="beta">${config.status!}</p>
-  </td>
-  </tr>
-</table>
-<hr />
-
-<table width="90%" id="top-nav" cellspacing="0" cellpadding="0">
-	<colgroup>
-		<col width="12%"/>
-		<col width="12%"/>
-		<col width="*"/>
-	</colgroup>
-	<tr>
-	    <#if content.prev??>
-		<td align="left">
-		<a href="${content.prev}">
-			<span class="vector-font"><i class="fa fa-arrow-circle-left" aria-hidden="true"></i></span>
-			<span style="position:relative;top:-2px;">Previous</span>
-		</a>
-		</td>
-	    </#if>
-
-	    <#if content.next??>
-		<td align="left">
-		<a href="${content.next}">
-			<span class=" vector-font"><i class="fa fa-arrow-circle-right vector-font" aria-hidden="true"></i></span>
-			<span style="position:relative;top:-2px;">Next</span>
-		</a>
-		</td>
-	    </#if>
-
-		<td align="right">
-		<a href="toc.html">
-			<span class=" vector-font"><i class="fa fa-list vector-font" aria-hidden="true"></i></span>
-			<span style="position:relative;top:-2px;">Contents</span>
-		</a>
-		</td>
-	</tr>
-</table>
-
diff --git a/docs/administration-guide/src/main/jbake/templates/menu.ftl b/docs/administration-guide/src/main/jbake/templates/menu.ftl
deleted file mode 100644
index 888c03d..0000000
--- a/docs/administration-guide/src/main/jbake/templates/menu.ftl
+++ /dev/null
@@ -1 +0,0 @@
-<#-- a menu bar template fragment included in the page template -->
\ No newline at end of file
diff --git a/docs/administration-guide/src/main/jbake/templates/page.ftl b/docs/administration-guide/src/main/jbake/templates/page.ftl
deleted file mode 100644
index eca51db..0000000
--- a/docs/administration-guide/src/main/jbake/templates/page.ftl
+++ /dev/null
@@ -1,8 +0,0 @@
-<#-- a top level page layout template -->
-
-<#include "header.ftl">
-<#include "menu.ftl">
-
-${content.body}
-
-<#include "footer.ftl">
\ No newline at end of file
diff --git a/docs/application-deployment-guide/README.md b/docs/application-deployment-guide/README.md
deleted file mode 100644
index a3ec2b6..0000000
--- a/docs/application-deployment-guide/README.md
+++ /dev/null
@@ -1,77 +0,0 @@
-# A JBake project template
-
-## About JBake
-
-JBake is a static site generator, it's inspired from jekyll and written
-in java.  The basic idea is to have templates for the structure of the
-page, and the body generated from asciidoc content.
-
-## Pre requisites
-
-- Maven
-- JDK8+
-
-Deploying to Github will require password less authentication.
-
-This is done by exporting your SSH public key into your Github account.
-
-## Build the site locally
-
-The site is generated under target/staging.
-
-Open file:///PATH_TO_PROJECT_DIR/target/staging in a browser to view the site.
-
-```
-mvn generate-resources
-```
-
-Or you can invoke the JBake plugin directly.
-
-```
-mvn jbake:build
-```
-
-### Rebuild the site on changes
-
-```
-mvn jbake:watch
-```
-
-If you keep this command running, changes to the sources will be
-detected and the site will be rendered incrementally.
-
-This is convenient when writing content.
-
-### Serve the site locally
-
-```
-mvn jbake:serve
-```
-
-If a webserver is required (e.g. absolute path are used), this command
-will start a webserver (jetty) at http://localhost:8820.  It will also
-watch for changes and rebuild incrementally.
-
-## Deploy the site to Github Pages
-
-```
-mvn deploy
-```
-
-## Produce a zip file for download
-
-To produce a zip file containing the generated html files, use:
-
-```
-mvn package
-```
-
-When making a release on GitHub, this zip file should be added to the release.
-
-## Links
-
-- [JBake maven plugin documentation](https://github.com/Blazebit/jbake-maven-plugin)
-- [JBake documentation](http://jbake.org/docs/2.5.1)
-- [Freemarker documentation](http://freemarker.org/docs)
-- [AsciiDoc User Guide](http://asciidoc.org/userguide.html)
-- [Asciidoctor quick reference](http://asciidoctor.org/docs/asciidoc-syntax-quick-reference)
diff --git a/docs/application-deployment-guide/src/main/jbake/content/asadmin-deployment-subcommands.adoc b/docs/application-deployment-guide/src/main/asciidoc/asadmin-deployment-subcommands.adoc
similarity index 100%
rename from docs/application-deployment-guide/src/main/jbake/content/asadmin-deployment-subcommands.adoc
rename to docs/application-deployment-guide/src/main/asciidoc/asadmin-deployment-subcommands.adoc
diff --git a/docs/application-deployment-guide/src/main/jbake/content/dd-elements.adoc b/docs/application-deployment-guide/src/main/asciidoc/dd-elements.adoc
similarity index 100%
rename from docs/application-deployment-guide/src/main/jbake/content/dd-elements.adoc
rename to docs/application-deployment-guide/src/main/asciidoc/dd-elements.adoc
diff --git a/docs/application-deployment-guide/src/main/jbake/content/dd-files.adoc b/docs/application-deployment-guide/src/main/asciidoc/dd-files.adoc
similarity index 100%
rename from docs/application-deployment-guide/src/main/jbake/content/dd-files.adoc
rename to docs/application-deployment-guide/src/main/asciidoc/dd-files.adoc
diff --git a/docs/application-deployment-guide/src/main/jbake/content/deploying-applications.adoc b/docs/application-deployment-guide/src/main/asciidoc/deploying-applications.adoc
similarity index 100%
rename from docs/application-deployment-guide/src/main/jbake/content/deploying-applications.adoc
rename to docs/application-deployment-guide/src/main/asciidoc/deploying-applications.adoc
diff --git a/docs/application-deployment-guide/src/main/jbake/assets/img/dgdeploy3.png b/docs/application-deployment-guide/src/main/asciidoc/img/dgdeploy3.png
similarity index 100%
rename from docs/application-deployment-guide/src/main/jbake/assets/img/dgdeploy3.png
rename to docs/application-deployment-guide/src/main/asciidoc/img/dgdeploy3.png
Binary files differ
diff --git a/docs/application-deployment-guide/src/main/jbake/assets/img/dgdeploya.png b/docs/application-deployment-guide/src/main/asciidoc/img/dgdeploya.png
similarity index 100%
rename from docs/application-deployment-guide/src/main/jbake/assets/img/dgdeploya.png
rename to docs/application-deployment-guide/src/main/asciidoc/img/dgdeploya.png
Binary files differ
diff --git a/docs/application-deployment-guide/src/main/jbake/assets/img/eclipse_foundation_logo_tiny.png b/docs/application-deployment-guide/src/main/asciidoc/img/eclipse_foundation_logo_tiny.png
similarity index 100%
rename from docs/application-deployment-guide/src/main/jbake/assets/img/eclipse_foundation_logo_tiny.png
rename to docs/application-deployment-guide/src/main/asciidoc/img/eclipse_foundation_logo_tiny.png
Binary files differ
diff --git a/docs/application-deployment-guide/src/main/jbake/content/loe.adoc b/docs/application-deployment-guide/src/main/asciidoc/loe.adoc
similarity index 100%
rename from docs/application-deployment-guide/src/main/jbake/content/loe.adoc
rename to docs/application-deployment-guide/src/main/asciidoc/loe.adoc
diff --git a/docs/application-deployment-guide/src/main/jbake/content/lof.adoc b/docs/application-deployment-guide/src/main/asciidoc/lof.adoc
similarity index 100%
rename from docs/application-deployment-guide/src/main/jbake/content/lof.adoc
rename to docs/application-deployment-guide/src/main/asciidoc/lof.adoc
diff --git a/docs/application-deployment-guide/src/main/jbake/content/lot.adoc b/docs/application-deployment-guide/src/main/asciidoc/lot.adoc
similarity index 100%
rename from docs/application-deployment-guide/src/main/jbake/content/lot.adoc
rename to docs/application-deployment-guide/src/main/asciidoc/lot.adoc
diff --git a/docs/application-deployment-guide/src/main/jbake/content/overview.adoc b/docs/application-deployment-guide/src/main/asciidoc/overview.adoc
similarity index 100%
rename from docs/application-deployment-guide/src/main/jbake/content/overview.adoc
rename to docs/application-deployment-guide/src/main/asciidoc/overview.adoc
diff --git a/docs/application-deployment-guide/src/main/jbake/content/preface.adoc b/docs/application-deployment-guide/src/main/asciidoc/preface.adoc
similarity index 100%
rename from docs/application-deployment-guide/src/main/jbake/content/preface.adoc
rename to docs/application-deployment-guide/src/main/asciidoc/preface.adoc
diff --git a/docs/application-deployment-guide/src/main/jbake/content/title.adoc b/docs/application-deployment-guide/src/main/asciidoc/title.adoc
similarity index 95%
rename from docs/application-deployment-guide/src/main/jbake/content/title.adoc
rename to docs/application-deployment-guide/src/main/asciidoc/title.adoc
index 0991f83..7b8f6ad 100644
--- a/docs/application-deployment-guide/src/main/jbake/content/title.adoc
+++ b/docs/application-deployment-guide/src/main/asciidoc/title.adoc
@@ -44,3 +44,5 @@
 Opteron, the AMD logo, and the AMD Opteron logo are trademarks or
 registered trademarks of Advanced Micro Devices. UNIX is a registered
 trademark of The Open Group.
+
+image:img/eclipse_foundation_logo_tiny.png["Eclipse Logo"]
diff --git a/docs/application-deployment-guide/src/main/jbake/assets/css/style.css b/docs/application-deployment-guide/src/main/jbake/assets/css/style.css
deleted file mode 100644
index 25a16e4..0000000
--- a/docs/application-deployment-guide/src/main/jbake/assets/css/style.css
+++ /dev/null
@@ -1,315 +0,0 @@
-/* CSS */
-/*! normalize.css v3.0.2 | MIT License | git.io/normalize */
-/** 1. Set default font family to sans-serif. 2. Prevent iOS text size adjust after orientation change, without disabling user zoom. */
-html { font-family: sans-serif; /* 1 */ -ms-text-size-adjust: 100%; /* 2 */ -webkit-text-size-adjust: 100%; /* 2 */ }
-
-/* HTML5 display definitions ========================================================================== */
-/** Correct `block` display not defined for any HTML5 element in IE 8/9. Correct `block` display not defined for `details` or `summary` in IE 10/11 and Firefox. Correct `block` display not defined for `main` in IE 11. */
-article, aside, details, figcaption, figure, footer, header, hgroup, main, menu, nav, section, summary { display: block; }
-
-/** 1. Correct `inline-block` display not defined in IE 8/9. 2. Normalize vertical alignment of `progress` in Chrome, Firefox, and Opera. */
-audio, canvas, progress, video { display: inline-block; /* 1 */ vertical-align: baseline; /* 2 */ }
-
-/** Prevent modern browsers from displaying `audio` without controls. Remove excess height in iOS 5 devices. */
-audio:not([controls]) { display: none; height: 0; }
-
-/** Address `[hidden]` styling not present in IE 8/9/10. Hide the `template` element in IE 8/9/11, Safari, and Firefox < 22. */
-[hidden], template { display: none; }
-
-/* Links ========================================================================== */
-/** Remove the gray background color from active links in IE 10. */
-a { background-color: transparent; }
-
-/** Improve readability when focused and also mouse hovered in all browsers. */
-a:active, a:hover { outline: 0; }
-
-/* Text-level semantics ========================================================================== */
-/** Address styling not present in IE 8/9/10/11, Safari, and Chrome. */
-abbr[title] { border-bottom: 1px dotted; }
-
-/** Address style set to `bolder` in Firefox 4+, Safari, and Chrome. */
-b, strong { font-weight: bold; }
-
-/** Address styling not present in Safari and Chrome. */
-dfn { font-style: italic; }
-
-/** Address variable `h1` font-size and margin within `section` and `article` contexts in Firefox 4+, Safari, and Chrome. */
-h1 { font-size: 2em; margin: 0.67em 0; }
-
-/** Address styling not present in IE 8/9. */
-mark { background: #ff0; color: #000; }
-
-/** Address inconsistent and variable font size in all browsers. */
-small { font-size: 80%; }
-
-/** Prevent `sub` and `sup` affecting `line-height` in all browsers. */
-sub, sup { font-size: 75%; line-height: 0; position: relative; vertical-align: baseline; }
-
-sup { top: -0.5em; }
-
-sub { bottom: -0.25em; }
-
-/* Embedded content ========================================================================== */
-/** Remove border when inside `a` element in IE 8/9/10. */
-img { border: 0; }
-
-/** Correct overflow not hidden in IE 9/10/11. */
-svg:not(:root) { overflow: hidden; }
-
-/* Grouping content ========================================================================== */
-/** Address margin not present in IE 8/9 and Safari. */
-figure { margin: 1em 40px; }
-
-/** Address differences between Firefox and other browsers. */
-hr { box-sizing: content-box; height: 0; }
-
-/** Contain overflow in all browsers. */
-pre { overflow: auto; }
-
-/** Address odd `em`-unit font size rendering in all browsers. */
-code, kbd, pre, samp { font-family: monospace, monospace; font-size: 1em; }
-
-/* Forms ========================================================================== */
-/** Known limitation: by default, Chrome and Safari on OS X allow very limited styling of `select`, unless a `border` property is set. */
-/** 1. Correct color not being inherited. Known issue: affects color of disabled elements. 2. Correct font properties not being inherited. 3. Address margins set differently in Firefox 4+, Safari, and Chrome. */
-button, input, optgroup, select, textarea { color: inherit; /* 1 */ font: inherit; /* 2 */ margin: 0; /* 3 */ }
-
-/** Address `overflow` set to `hidden` in IE 8/9/10/11. */
-button { overflow: visible; }
-
-/** Address inconsistent `text-transform` inheritance for `button` and `select`. All other form control elements do not inherit `text-transform` values. Correct `button` style inheritance in Firefox, IE 8/9/10/11, and Opera. Correct `select` style inheritance in Firefox. */
-button, select { text-transform: none; }
-
-/** 1. Avoid the WebKit bug in Android 4.0.* where (2) destroys native `audio` and `video` controls. 2. Correct inability to style clickable `input` types in iOS. 3. Improve usability and consistency of cursor style between image-type `input` and others. */
-button, html input[type="button"], input[type="reset"], input[type="submit"] { -webkit-appearance: button; /* 2 */ cursor: pointer; /* 3 */ }
-
-/** Re-set default cursor for disabled elements. */
-button[disabled], html input[disabled] { cursor: default; }
-
-/** Remove inner padding and border in Firefox 4+. */
-button::-moz-focus-inner, input::-moz-focus-inner { border: 0; padding: 0; }
-
-/** Address Firefox 4+ setting `line-height` on `input` using `!important` in the UA stylesheet. */
-input { line-height: normal; }
-
-/** It's recommended that you don't attempt to style these elements. Firefox's implementation doesn't respect box-sizing, padding, or width.  1. Address box sizing set to `content-box` in IE 8/9/10. 2. Remove excess padding in IE 8/9/10. */
-input[type="checkbox"], input[type="radio"] { box-sizing: border-box; /* 1 */ padding: 0; /* 2 */ }
-
-/** Fix the cursor style for Chrome's increment/decrement buttons. For certain `font-size` values of the `input`, it causes the cursor style of the decrement button to change from `default` to `text`. */
-input[type="number"]::-webkit-inner-spin-button, input[type="number"]::-webkit-outer-spin-button { height: auto; }
-
-/** 1. Address `appearance` set to `searchfield` in Safari and Chrome. 2. Address `box-sizing` set to `border-box` in Safari and Chrome (include `-moz` to future-proof). */
-input[type="search"] { -webkit-appearance: textfield; /* 1 */ /* 2 */ box-sizing: content-box; }
-
-/** Remove inner padding and search cancel button in Safari and Chrome on OS X. Safari (but not Chrome) clips the cancel button when the search input has padding (and `textfield` appearance). */
-input[type="search"]::-webkit-search-cancel-button, input[type="search"]::-webkit-search-decoration { -webkit-appearance: none; }
-
-/** Define consistent border, margin, and padding. */
-fieldset { border: 1px solid #c0c0c0; margin: 0 2px; padding: 0.35em 0.625em 0.75em; }
-
-/** 1. Correct `color` not being inherited in IE 8/9/10/11. 2. Remove padding so people aren't caught out if they zero out fieldsets. */
-legend { border: 0; /* 1 */ padding: 0; /* 2 */ }
-
-/** Remove default vertical scrollbar in IE 8/9/10/11. */
-textarea { overflow: auto; }
-
-/** Don't inherit the `font-weight` (applied by a rule above). NOTE: the default cannot safely be changed in Chrome and Safari on OS X. */
-optgroup { font-weight: bold; }
-
-/* Tables ========================================================================== */
-/** Remove most spacing between table cells. */
-table { border-collapse: collapse; border-spacing: 0; }
-
-td, th { padding: 0; }
-
-/* LAYOUT STYLES */
-
-p { margin-top: 0; }
-
-code, pre { margin-bottom: 30px; font-family: Monaco, "Bitstream Vera Sans Mono", "Lucida Console", Terminal, monospace; font-size: 13px; color: #222; }
-
-code { padding: 0 3px; background-color: #f2f8fc; border: solid 1px #dbe7f3; }
-
-pre { padding: 20px; overflow: auto; text-shadow: none; background: #fff; border: solid 1px #f2f2f2; }
-
-pre code { padding: 0; color: #2879d0; background-color: #fff; border: none; }
-
-ul, ol, dl { margin-bottom: 20px; }
-
-/* COMMON STYLES */
-
-td.halign-right { text-align: right; } 
-
-td.halign-center { text-align: center; } 
-
-form { padding: 20px; background: #f2f2f2; }
-
-h2 { 
-   font-size: 2em;
-   line-height: 1.2em;
-   font-weight: 200;
-   letter-spacing: 0;
-}
-
-h3 { 
-   font-size: 1.4em;
-   line-height: 1.2em;
-   font-weight: normal;
-   letter-spacing: 0;
-}
-
-.sect1 {
-   margin-left: 4%;
-   margin-right: 4%;
-   font: 13px/20px Arial, Helvetica, sans-serif  
-}
-
-a:link {
-   text-decoration: none;
-   color: #09569d;
-}
-
-#preamble hr{
-   margin-left: 0%;
-   margin-right: 0%;
-}
-
-#preamble .sectionbody table  {
-   font-weight: 200;
-   margin-left: 4%;
-   margin-right: 4%;
-}
-
-hr {
-   margin-bottom: 12px;
-}
-
-table.tableblock.frame-all.grid-all.spread {
-   font-size: 12px;
-}
-
-code {
-   font-size:.9em;
-   border: 1px solid #eaeaea;
-   background-color: #f6f6f6;
-   border-radius: 3px;
-   padding: 1px;
-   padding-left:2px;
-   padding-right:2px;
-}
-
-pre.prettyprint.highlight {
-   border: 1px solid #eaeaea;
-   background-color: #f6f6f6;
-   border-radius: 4px;
-   padding: 8px;
-   padding-top:4px;
-   padding-bottom:4px;
-}
-
-.language-oac_no_warn {
-   font-size:.9em;
-   color:#222;
-   background-color: transparent;
-}
-
-#doc-title {
-   margin-left: 4%;
-}
-
-#top-nav {
-   margin-left: 4%;
-   font-size: 12px;
-}
-
-#bottom-nav {
-   margin-left: 4%;
-   font-size: 12px;
-}
-
-.vector-font {
-   color:grey; 
-   font-size: 20px;
-}
-
-#copyright {
-   padding-top: 10px;
-   padding-bottom: 4px;
-   display: table;
-   margin:0 auto;
-   color: grey;
-   font-size: 12px;
-   vertical-align: middle;
-}
-
-.beta {color: #FF0000}
-
-/* GENERAL ELEMENT TYPE STYLES */
-
-/* #Media Queries
-================================================== */
-/* Smaller than standard 960 (devices and browsers) */
-/* Tablet Portrait size to standard 960 (devices and browsers) */
-@media only screen and (min-width: 768px) and (max-width: 959px) { .inner { width: 740px; }
-  header h1, header h2 { width: 340px; }
-  header h1 { font-size: 60px; }
-  header h2 { font-size: 30px; }
-}
-/* All Mobile Sizes (devices and browser) */
-@media only screen and (max-width: 767px) { .inner { width: 93%; }
-  header { padding: 20px 0; }
-  header .inner { position: relative; }
-  header h1, header h2 { width: 100%; }
-  header h1 { font-size: 48px; }
-  header h2 { font-size: 24px; }
-  header a.button { position: relative; display: inline-block; width: auto; height: auto; padding: 5px 10px; margin-top: 15px; font-size: 13px; line-height: 1; color: #2879d0; text-align: center; background-color: #9ddcff; background-image: none; border-radius: 5px; -moz-border-radius: 5px; -webkit-border-radius: 5px; }
-  header a.button small { display: inline; font-size: 13px; }
-}
-/* Mobile Landscape Size to Tablet Portrait (devices and browsers) */
-/* Mobile Portrait Size to Mobile Landscape Size (devices and browsers) */
-
-header h1 { padding-top: 14px; font-size: 2em; font-weight: 200; line-height: 1.4; color: #FFFFFF; letter-spacing: 0px; border-bottom: 0px; }
-
-header h2 { font-size: 1.2em; margin-top: 0; margin-bottom: 0; font-weight: 200; line-height: .8; color: #ec7D11; letter-spacing: 0; }
-
-/*
-header a.button { background: transparent url(../images/logo.png) 0 0 no-repeat; padding-left: 32px; }
-*/
-
-header a:hover { text-decoration: none; }
-
-/* Admonition (Note) block */
-.admonitionblock > table {
-  border: 0;
-  background: none;
-  width: 100%;
-  table-layout: auto;
-  margin-bottom: 10.5px;
-}
-.admonitionblock > table td.icon {
-  text-align: center;
-  width: 60px;
-}
-.admonitionblock > table td.icon img {
-  max-width: none;
-}
-.admonitionblock > table td.icon .title {
-  text-transform: uppercase;
-}
-.admonitionblock > table td.content {
-  padding-left: 1em;
-  padding-right: 1em;
-  border-left: 3px solid #ddd;
-}
-.admonitionblock > table td.content > :last-child > :last-child {
-  margin-bottom: 0;
-}
-.admonitionblock td.icon [class^="fa icon-"]:before {
-  font-size: 2.5em;
-  text-shadow: 1px 1px 2px rgba(0, 0, 0, 0.5);
-  cursor: default;
-}
-.admonitionblock td.icon .icon-note:before {
-  content: "\f05a";
-  color: #5bc0de;
-}
diff --git a/docs/application-deployment-guide/src/main/jbake/jbake.properties b/docs/application-deployment-guide/src/main/jbake/jbake.properties
deleted file mode 100644
index 546d09c..0000000
--- a/docs/application-deployment-guide/src/main/jbake/jbake.properties
+++ /dev/null
@@ -1,7 +0,0 @@
-site.host=http://jbake.org
-render.tags=false
-render.sitemap=false
-render.archive=false
-render.feed=false
-asciidoctor.option.safe=0
-asciidoctor.attributes.export=true
diff --git a/docs/application-deployment-guide/src/main/jbake/templates/footer.ftl b/docs/application-deployment-guide/src/main/jbake/templates/footer.ftl
deleted file mode 100644
index 6f2b09e..0000000
--- a/docs/application-deployment-guide/src/main/jbake/templates/footer.ftl
+++ /dev/null
@@ -1,46 +0,0 @@
-<#-- a footer template fragment included in the page template -->
-<hr />
-
-<table width="90%" id="bottom-nav" cellspacing="0" cellpadding="0">
-	<colgroup>
-		<col width="12%"/>
-		<col width="12%"/>
-		<col width="*"/>
-	</colgroup>
-	<tr>		
-	    <#if content.prev??>
-		<td align="left">
-		<a href="${content.prev}">
-			<span class=" vector-font"><i class="fa fa-arrow-circle-left" aria-hidden="true"></i></span>
-			<span style="position:relative;top:-2px;">Previous</span>
-		</a>
-		</td>
-		</#if>
-
-		<#if content.next??>
-		<td align="left">
-		<a href="${content.next}">
-			<span class="vector-font"><i class="fa fa-arrow-circle-right vector-font" aria-hidden="true"></i></span>
-			<span style="position:relative;top:-2px;">Next</span>
-		</a>
-		</td>
-		</#if>
-
-		<td align="right">
-		<a href="toc.html">
-			<span class="vector-font"><i class="fa fa-list vector-font" aria-hidden="true"></i></span>
-			<span style="position:relative;top:-2px;">Contents</span>
-		</a>
-		</td>
-	</tr>
-</table>
-
-<span id="copyright">
-        <img src="img/eclipse_foundation_logo_tiny.png" height="20px" alt="Eclipse Foundation Logo" align="top"/>&nbsp;            
-        <span >Copyright&nbsp;&copy;&nbsp;2019,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</span>
-</span>
-
-<p align="center" class="beta">${config.status!}</p>
-
-</body>
-</html>
diff --git a/docs/application-deployment-guide/src/main/jbake/templates/header.ftl b/docs/application-deployment-guide/src/main/jbake/templates/header.ftl
deleted file mode 100644
index 82ebb36..0000000
--- a/docs/application-deployment-guide/src/main/jbake/templates/header.ftl
+++ /dev/null
@@ -1,55 +0,0 @@
-<!DOCTYPE html>
-<#-- a header template fragment included in the page template -->
-<html lang="en">
-  <head>
-    <meta charset="utf-8"/>
-    <title><#if (content.title)??><#escape x as x?xml>${content.title}</#escape></#if></title>
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <link href="<#if (content.rootpath)??>${content.rootpath}<#else></#if>css/style.css" rel="stylesheet">
-    <script src="https://use.fontawesome.com/96c4d89611.js"></script>
-  </head>
-  <body>
-<table id="doc-title" cellspacing="0" cellpadding="0">
-  <tr>
-  <td align="left" valign="top">
-  <b>${content.title}</b><br />
-      <p class="beta">${config.status!}</p>
-  </td>
-  </tr>
-</table>
-<hr />
-
-<table width="90%" id="top-nav" cellspacing="0" cellpadding="0">
-	<colgroup>
-		<col width="12%"/>
-		<col width="12%"/>
-		<col width="*"/>
-	</colgroup>
-	<tr>
-	    <#if content.prev??>
-		<td align="left">
-		<a href="${content.prev}">
-			<span class="vector-font"><i class="fa fa-arrow-circle-left" aria-hidden="true"></i></span>
-			<span style="position:relative;top:-2px;">Previous</span>
-		</a>
-		</td>
-	    </#if>
-
-	    <#if content.next??>
-		<td align="left">
-		<a href="${content.next}">
-			<span class=" vector-font"><i class="fa fa-arrow-circle-right vector-font" aria-hidden="true"></i></span>
-			<span style="position:relative;top:-2px;">Next</span>
-		</a>
-		</td>
-	    </#if>
-
-		<td align="right">
-		<a href="toc.html">
-			<span class=" vector-font"><i class="fa fa-list vector-font" aria-hidden="true"></i></span>
-			<span style="position:relative;top:-2px;">Contents</span>
-		</a>
-		</td>
-	</tr>
-</table>
-
diff --git a/docs/application-deployment-guide/src/main/jbake/templates/menu.ftl b/docs/application-deployment-guide/src/main/jbake/templates/menu.ftl
deleted file mode 100644
index 888c03d..0000000
--- a/docs/application-deployment-guide/src/main/jbake/templates/menu.ftl
+++ /dev/null
@@ -1 +0,0 @@
-<#-- a menu bar template fragment included in the page template -->
\ No newline at end of file
diff --git a/docs/application-deployment-guide/src/main/jbake/templates/page.ftl b/docs/application-deployment-guide/src/main/jbake/templates/page.ftl
deleted file mode 100644
index eca51db..0000000
--- a/docs/application-deployment-guide/src/main/jbake/templates/page.ftl
+++ /dev/null
@@ -1,8 +0,0 @@
-<#-- a top level page layout template -->
-
-<#include "header.ftl">
-<#include "menu.ftl">
-
-${content.body}
-
-<#include "footer.ftl">
\ No newline at end of file
diff --git a/docs/application-development-guide/README.md b/docs/application-development-guide/README.md
deleted file mode 100644
index a3ec2b6..0000000
--- a/docs/application-development-guide/README.md
+++ /dev/null
@@ -1,77 +0,0 @@
-# A JBake project template
-
-## About JBake
-
-JBake is a static site generator, it's inspired from jekyll and written
-in java.  The basic idea is to have templates for the structure of the
-page, and the body generated from asciidoc content.
-
-## Pre requisites
-
-- Maven
-- JDK8+
-
-Deploying to Github will require password less authentication.
-
-This is done by exporting your SSH public key into your Github account.
-
-## Build the site locally
-
-The site is generated under target/staging.
-
-Open file:///PATH_TO_PROJECT_DIR/target/staging in a browser to view the site.
-
-```
-mvn generate-resources
-```
-
-Or you can invoke the JBake plugin directly.
-
-```
-mvn jbake:build
-```
-
-### Rebuild the site on changes
-
-```
-mvn jbake:watch
-```
-
-If you keep this command running, changes to the sources will be
-detected and the site will be rendered incrementally.
-
-This is convenient when writing content.
-
-### Serve the site locally
-
-```
-mvn jbake:serve
-```
-
-If a webserver is required (e.g. absolute path are used), this command
-will start a webserver (jetty) at http://localhost:8820.  It will also
-watch for changes and rebuild incrementally.
-
-## Deploy the site to Github Pages
-
-```
-mvn deploy
-```
-
-## Produce a zip file for download
-
-To produce a zip file containing the generated html files, use:
-
-```
-mvn package
-```
-
-When making a release on GitHub, this zip file should be added to the release.
-
-## Links
-
-- [JBake maven plugin documentation](https://github.com/Blazebit/jbake-maven-plugin)
-- [JBake documentation](http://jbake.org/docs/2.5.1)
-- [Freemarker documentation](http://freemarker.org/docs)
-- [AsciiDoc User Guide](http://asciidoc.org/userguide.html)
-- [Asciidoctor quick reference](http://asciidoctor.org/docs/asciidoc-syntax-quick-reference)
diff --git a/docs/application-development-guide/pom.xml b/docs/application-development-guide/pom.xml
index ff6f419..579d2ae 100644
--- a/docs/application-development-guide/pom.xml
+++ b/docs/application-development-guide/pom.xml
@@ -25,7 +25,6 @@
         <version>7.0.0-SNAPSHOT</version>
         <relativePath>../parent</relativePath>
     </parent>
-    <groupId>org.glassfish.docs</groupId>
     <artifactId>application-development-guide</artifactId>
     <packaging>jar</packaging>
     <name>Eclipse GlassFish Server Application Development Guide, Release 7</name>
diff --git a/docs/application-development-guide/src/main/jbake/content/class-loaders.adoc b/docs/application-development-guide/src/main/asciidoc/class-loaders.adoc
similarity index 100%
rename from docs/application-development-guide/src/main/jbake/content/class-loaders.adoc
rename to docs/application-development-guide/src/main/asciidoc/class-loaders.adoc
diff --git a/docs/application-development-guide/src/main/jbake/content/connectors.adoc b/docs/application-development-guide/src/main/asciidoc/connectors.adoc
similarity index 100%
rename from docs/application-development-guide/src/main/jbake/content/connectors.adoc
rename to docs/application-development-guide/src/main/asciidoc/connectors.adoc
diff --git a/docs/application-development-guide/src/main/jbake/content/container_managed-persistence.adoc b/docs/application-development-guide/src/main/asciidoc/container_managed-persistence.adoc
similarity index 100%
rename from docs/application-development-guide/src/main/jbake/content/container_managed-persistence.adoc
rename to docs/application-development-guide/src/main/asciidoc/container_managed-persistence.adoc
diff --git a/docs/application-development-guide/src/main/jbake/content/debugging-apps.adoc b/docs/application-development-guide/src/main/asciidoc/debugging-apps.adoc
similarity index 100%
rename from docs/application-development-guide/src/main/jbake/content/debugging-apps.adoc
rename to docs/application-development-guide/src/main/asciidoc/debugging-apps.adoc
diff --git a/docs/application-development-guide/src/main/jbake/content/ejb.adoc b/docs/application-development-guide/src/main/asciidoc/ejb.adoc
similarity index 100%
rename from docs/application-development-guide/src/main/jbake/content/ejb.adoc
rename to docs/application-development-guide/src/main/asciidoc/ejb.adoc
diff --git a/docs/application-development-guide/src/main/jbake/assets/img/eclipse_foundation_logo_tiny.png b/docs/application-development-guide/src/main/asciidoc/img/eclipse_foundation_logo_tiny.png
similarity index 100%
rename from docs/application-development-guide/src/main/jbake/assets/img/eclipse_foundation_logo_tiny.png
rename to docs/application-development-guide/src/main/asciidoc/img/eclipse_foundation_logo_tiny.png
Binary files differ
diff --git a/docs/application-development-guide/src/main/jbake/content/java-clients.adoc b/docs/application-development-guide/src/main/asciidoc/java-clients.adoc
similarity index 100%
rename from docs/application-development-guide/src/main/jbake/content/java-clients.adoc
rename to docs/application-development-guide/src/main/asciidoc/java-clients.adoc
diff --git a/docs/application-development-guide/src/main/jbake/content/jdbc.adoc b/docs/application-development-guide/src/main/asciidoc/jdbc.adoc
similarity index 100%
rename from docs/application-development-guide/src/main/jbake/content/jdbc.adoc
rename to docs/application-development-guide/src/main/asciidoc/jdbc.adoc
diff --git a/docs/application-development-guide/src/main/jbake/content/jms.adoc b/docs/application-development-guide/src/main/asciidoc/jms.adoc
similarity index 100%
rename from docs/application-development-guide/src/main/jbake/content/jms.adoc
rename to docs/application-development-guide/src/main/asciidoc/jms.adoc
diff --git a/docs/application-development-guide/src/main/jbake/content/jndi.adoc b/docs/application-development-guide/src/main/asciidoc/jndi.adoc
similarity index 100%
rename from docs/application-development-guide/src/main/jbake/content/jndi.adoc
rename to docs/application-development-guide/src/main/asciidoc/jndi.adoc
diff --git a/docs/application-development-guide/src/main/jbake/content/jpa.adoc b/docs/application-development-guide/src/main/asciidoc/jpa.adoc
similarity index 100%
rename from docs/application-development-guide/src/main/jbake/content/jpa.adoc
rename to docs/application-development-guide/src/main/asciidoc/jpa.adoc
diff --git a/docs/application-development-guide/src/main/jbake/content/lifecycle-listeners.adoc b/docs/application-development-guide/src/main/asciidoc/lifecycle-listeners.adoc
similarity index 100%
rename from docs/application-development-guide/src/main/jbake/content/lifecycle-listeners.adoc
rename to docs/application-development-guide/src/main/asciidoc/lifecycle-listeners.adoc
diff --git a/docs/application-development-guide/src/main/jbake/content/loe.adoc b/docs/application-development-guide/src/main/asciidoc/loe.adoc
similarity index 100%
rename from docs/application-development-guide/src/main/jbake/content/loe.adoc
rename to docs/application-development-guide/src/main/asciidoc/loe.adoc
diff --git a/docs/application-development-guide/src/main/jbake/content/lot.adoc b/docs/application-development-guide/src/main/asciidoc/lot.adoc
similarity index 100%
rename from docs/application-development-guide/src/main/jbake/content/lot.adoc
rename to docs/application-development-guide/src/main/asciidoc/lot.adoc
diff --git a/docs/application-development-guide/src/main/jbake/content/mail.adoc b/docs/application-development-guide/src/main/asciidoc/mail.adoc
similarity index 100%
rename from docs/application-development-guide/src/main/jbake/content/mail.adoc
rename to docs/application-development-guide/src/main/asciidoc/mail.adoc
diff --git a/docs/application-development-guide/src/main/jbake/content/osgi.adoc b/docs/application-development-guide/src/main/asciidoc/osgi.adoc
similarity index 100%
rename from docs/application-development-guide/src/main/jbake/content/osgi.adoc
rename to docs/application-development-guide/src/main/asciidoc/osgi.adoc
diff --git a/docs/application-development-guide/src/main/jbake/content/part-apps-and-app-comps.adoc b/docs/application-development-guide/src/main/asciidoc/part-apps-and-app-comps.adoc
similarity index 100%
rename from docs/application-development-guide/src/main/jbake/content/part-apps-and-app-comps.adoc
rename to docs/application-development-guide/src/main/asciidoc/part-apps-and-app-comps.adoc
diff --git a/docs/application-development-guide/src/main/jbake/content/part-services-and-apis.adoc b/docs/application-development-guide/src/main/asciidoc/part-services-and-apis.adoc
similarity index 100%
rename from docs/application-development-guide/src/main/jbake/content/part-services-and-apis.adoc
rename to docs/application-development-guide/src/main/asciidoc/part-services-and-apis.adoc
diff --git a/docs/application-development-guide/src/main/jbake/content/part-tasks-and-tools.adoc b/docs/application-development-guide/src/main/asciidoc/part-tasks-and-tools.adoc
similarity index 100%
rename from docs/application-development-guide/src/main/jbake/content/part-tasks-and-tools.adoc
rename to docs/application-development-guide/src/main/asciidoc/part-tasks-and-tools.adoc
diff --git a/docs/application-development-guide/src/main/jbake/content/preface.adoc b/docs/application-development-guide/src/main/asciidoc/preface.adoc
similarity index 100%
rename from docs/application-development-guide/src/main/jbake/content/preface.adoc
rename to docs/application-development-guide/src/main/asciidoc/preface.adoc
diff --git a/docs/application-development-guide/src/main/jbake/content/securing-apps.adoc b/docs/application-development-guide/src/main/asciidoc/securing-apps.adoc
similarity index 100%
rename from docs/application-development-guide/src/main/jbake/content/securing-apps.adoc
rename to docs/application-development-guide/src/main/asciidoc/securing-apps.adoc
diff --git a/docs/application-development-guide/src/main/jbake/content/setting-up-dev-env.adoc b/docs/application-development-guide/src/main/asciidoc/setting-up-dev-env.adoc
similarity index 100%
rename from docs/application-development-guide/src/main/jbake/content/setting-up-dev-env.adoc
rename to docs/application-development-guide/src/main/asciidoc/setting-up-dev-env.adoc
diff --git a/docs/application-development-guide/src/main/jbake/content/title.adoc b/docs/application-development-guide/src/main/asciidoc/title.adoc
similarity index 96%
rename from docs/application-development-guide/src/main/jbake/content/title.adoc
rename to docs/application-development-guide/src/main/asciidoc/title.adoc
index cc4a9e9..8d48278 100644
--- a/docs/application-development-guide/src/main/jbake/content/title.adoc
+++ b/docs/application-development-guide/src/main/asciidoc/title.adoc
@@ -48,3 +48,5 @@
 Opteron, the AMD logo, and the AMD Opteron logo are trademarks or
 registered trademarks of Advanced Micro Devices. UNIX is a registered
 trademark of The Open Group.
+
+image:img/eclipse_foundation_logo_tiny.png["Eclipse Logo"]
diff --git a/docs/application-development-guide/src/main/jbake/content/transaction-service.adoc b/docs/application-development-guide/src/main/asciidoc/transaction-service.adoc
similarity index 100%
rename from docs/application-development-guide/src/main/jbake/content/transaction-service.adoc
rename to docs/application-development-guide/src/main/asciidoc/transaction-service.adoc
diff --git a/docs/application-development-guide/src/main/jbake/content/webapps.adoc b/docs/application-development-guide/src/main/asciidoc/webapps.adoc
similarity index 100%
rename from docs/application-development-guide/src/main/jbake/content/webapps.adoc
rename to docs/application-development-guide/src/main/asciidoc/webapps.adoc
diff --git a/docs/application-development-guide/src/main/jbake/content/webservices.adoc b/docs/application-development-guide/src/main/asciidoc/webservices.adoc
similarity index 100%
rename from docs/application-development-guide/src/main/jbake/content/webservices.adoc
rename to docs/application-development-guide/src/main/asciidoc/webservices.adoc
diff --git a/docs/application-development-guide/src/main/jbake/assets/css/style.css b/docs/application-development-guide/src/main/jbake/assets/css/style.css
deleted file mode 100644
index 25a16e4..0000000
--- a/docs/application-development-guide/src/main/jbake/assets/css/style.css
+++ /dev/null
@@ -1,315 +0,0 @@
-/* CSS */
-/*! normalize.css v3.0.2 | MIT License | git.io/normalize */
-/** 1. Set default font family to sans-serif. 2. Prevent iOS text size adjust after orientation change, without disabling user zoom. */
-html { font-family: sans-serif; /* 1 */ -ms-text-size-adjust: 100%; /* 2 */ -webkit-text-size-adjust: 100%; /* 2 */ }
-
-/* HTML5 display definitions ========================================================================== */
-/** Correct `block` display not defined for any HTML5 element in IE 8/9. Correct `block` display not defined for `details` or `summary` in IE 10/11 and Firefox. Correct `block` display not defined for `main` in IE 11. */
-article, aside, details, figcaption, figure, footer, header, hgroup, main, menu, nav, section, summary { display: block; }
-
-/** 1. Correct `inline-block` display not defined in IE 8/9. 2. Normalize vertical alignment of `progress` in Chrome, Firefox, and Opera. */
-audio, canvas, progress, video { display: inline-block; /* 1 */ vertical-align: baseline; /* 2 */ }
-
-/** Prevent modern browsers from displaying `audio` without controls. Remove excess height in iOS 5 devices. */
-audio:not([controls]) { display: none; height: 0; }
-
-/** Address `[hidden]` styling not present in IE 8/9/10. Hide the `template` element in IE 8/9/11, Safari, and Firefox < 22. */
-[hidden], template { display: none; }
-
-/* Links ========================================================================== */
-/** Remove the gray background color from active links in IE 10. */
-a { background-color: transparent; }
-
-/** Improve readability when focused and also mouse hovered in all browsers. */
-a:active, a:hover { outline: 0; }
-
-/* Text-level semantics ========================================================================== */
-/** Address styling not present in IE 8/9/10/11, Safari, and Chrome. */
-abbr[title] { border-bottom: 1px dotted; }
-
-/** Address style set to `bolder` in Firefox 4+, Safari, and Chrome. */
-b, strong { font-weight: bold; }
-
-/** Address styling not present in Safari and Chrome. */
-dfn { font-style: italic; }
-
-/** Address variable `h1` font-size and margin within `section` and `article` contexts in Firefox 4+, Safari, and Chrome. */
-h1 { font-size: 2em; margin: 0.67em 0; }
-
-/** Address styling not present in IE 8/9. */
-mark { background: #ff0; color: #000; }
-
-/** Address inconsistent and variable font size in all browsers. */
-small { font-size: 80%; }
-
-/** Prevent `sub` and `sup` affecting `line-height` in all browsers. */
-sub, sup { font-size: 75%; line-height: 0; position: relative; vertical-align: baseline; }
-
-sup { top: -0.5em; }
-
-sub { bottom: -0.25em; }
-
-/* Embedded content ========================================================================== */
-/** Remove border when inside `a` element in IE 8/9/10. */
-img { border: 0; }
-
-/** Correct overflow not hidden in IE 9/10/11. */
-svg:not(:root) { overflow: hidden; }
-
-/* Grouping content ========================================================================== */
-/** Address margin not present in IE 8/9 and Safari. */
-figure { margin: 1em 40px; }
-
-/** Address differences between Firefox and other browsers. */
-hr { box-sizing: content-box; height: 0; }
-
-/** Contain overflow in all browsers. */
-pre { overflow: auto; }
-
-/** Address odd `em`-unit font size rendering in all browsers. */
-code, kbd, pre, samp { font-family: monospace, monospace; font-size: 1em; }
-
-/* Forms ========================================================================== */
-/** Known limitation: by default, Chrome and Safari on OS X allow very limited styling of `select`, unless a `border` property is set. */
-/** 1. Correct color not being inherited. Known issue: affects color of disabled elements. 2. Correct font properties not being inherited. 3. Address margins set differently in Firefox 4+, Safari, and Chrome. */
-button, input, optgroup, select, textarea { color: inherit; /* 1 */ font: inherit; /* 2 */ margin: 0; /* 3 */ }
-
-/** Address `overflow` set to `hidden` in IE 8/9/10/11. */
-button { overflow: visible; }
-
-/** Address inconsistent `text-transform` inheritance for `button` and `select`. All other form control elements do not inherit `text-transform` values. Correct `button` style inheritance in Firefox, IE 8/9/10/11, and Opera. Correct `select` style inheritance in Firefox. */
-button, select { text-transform: none; }
-
-/** 1. Avoid the WebKit bug in Android 4.0.* where (2) destroys native `audio` and `video` controls. 2. Correct inability to style clickable `input` types in iOS. 3. Improve usability and consistency of cursor style between image-type `input` and others. */
-button, html input[type="button"], input[type="reset"], input[type="submit"] { -webkit-appearance: button; /* 2 */ cursor: pointer; /* 3 */ }
-
-/** Re-set default cursor for disabled elements. */
-button[disabled], html input[disabled] { cursor: default; }
-
-/** Remove inner padding and border in Firefox 4+. */
-button::-moz-focus-inner, input::-moz-focus-inner { border: 0; padding: 0; }
-
-/** Address Firefox 4+ setting `line-height` on `input` using `!important` in the UA stylesheet. */
-input { line-height: normal; }
-
-/** It's recommended that you don't attempt to style these elements. Firefox's implementation doesn't respect box-sizing, padding, or width.  1. Address box sizing set to `content-box` in IE 8/9/10. 2. Remove excess padding in IE 8/9/10. */
-input[type="checkbox"], input[type="radio"] { box-sizing: border-box; /* 1 */ padding: 0; /* 2 */ }
-
-/** Fix the cursor style for Chrome's increment/decrement buttons. For certain `font-size` values of the `input`, it causes the cursor style of the decrement button to change from `default` to `text`. */
-input[type="number"]::-webkit-inner-spin-button, input[type="number"]::-webkit-outer-spin-button { height: auto; }
-
-/** 1. Address `appearance` set to `searchfield` in Safari and Chrome. 2. Address `box-sizing` set to `border-box` in Safari and Chrome (include `-moz` to future-proof). */
-input[type="search"] { -webkit-appearance: textfield; /* 1 */ /* 2 */ box-sizing: content-box; }
-
-/** Remove inner padding and search cancel button in Safari and Chrome on OS X. Safari (but not Chrome) clips the cancel button when the search input has padding (and `textfield` appearance). */
-input[type="search"]::-webkit-search-cancel-button, input[type="search"]::-webkit-search-decoration { -webkit-appearance: none; }
-
-/** Define consistent border, margin, and padding. */
-fieldset { border: 1px solid #c0c0c0; margin: 0 2px; padding: 0.35em 0.625em 0.75em; }
-
-/** 1. Correct `color` not being inherited in IE 8/9/10/11. 2. Remove padding so people aren't caught out if they zero out fieldsets. */
-legend { border: 0; /* 1 */ padding: 0; /* 2 */ }
-
-/** Remove default vertical scrollbar in IE 8/9/10/11. */
-textarea { overflow: auto; }
-
-/** Don't inherit the `font-weight` (applied by a rule above). NOTE: the default cannot safely be changed in Chrome and Safari on OS X. */
-optgroup { font-weight: bold; }
-
-/* Tables ========================================================================== */
-/** Remove most spacing between table cells. */
-table { border-collapse: collapse; border-spacing: 0; }
-
-td, th { padding: 0; }
-
-/* LAYOUT STYLES */
-
-p { margin-top: 0; }
-
-code, pre { margin-bottom: 30px; font-family: Monaco, "Bitstream Vera Sans Mono", "Lucida Console", Terminal, monospace; font-size: 13px; color: #222; }
-
-code { padding: 0 3px; background-color: #f2f8fc; border: solid 1px #dbe7f3; }
-
-pre { padding: 20px; overflow: auto; text-shadow: none; background: #fff; border: solid 1px #f2f2f2; }
-
-pre code { padding: 0; color: #2879d0; background-color: #fff; border: none; }
-
-ul, ol, dl { margin-bottom: 20px; }
-
-/* COMMON STYLES */
-
-td.halign-right { text-align: right; } 
-
-td.halign-center { text-align: center; } 
-
-form { padding: 20px; background: #f2f2f2; }
-
-h2 { 
-   font-size: 2em;
-   line-height: 1.2em;
-   font-weight: 200;
-   letter-spacing: 0;
-}
-
-h3 { 
-   font-size: 1.4em;
-   line-height: 1.2em;
-   font-weight: normal;
-   letter-spacing: 0;
-}
-
-.sect1 {
-   margin-left: 4%;
-   margin-right: 4%;
-   font: 13px/20px Arial, Helvetica, sans-serif  
-}
-
-a:link {
-   text-decoration: none;
-   color: #09569d;
-}
-
-#preamble hr{
-   margin-left: 0%;
-   margin-right: 0%;
-}
-
-#preamble .sectionbody table  {
-   font-weight: 200;
-   margin-left: 4%;
-   margin-right: 4%;
-}
-
-hr {
-   margin-bottom: 12px;
-}
-
-table.tableblock.frame-all.grid-all.spread {
-   font-size: 12px;
-}
-
-code {
-   font-size:.9em;
-   border: 1px solid #eaeaea;
-   background-color: #f6f6f6;
-   border-radius: 3px;
-   padding: 1px;
-   padding-left:2px;
-   padding-right:2px;
-}
-
-pre.prettyprint.highlight {
-   border: 1px solid #eaeaea;
-   background-color: #f6f6f6;
-   border-radius: 4px;
-   padding: 8px;
-   padding-top:4px;
-   padding-bottom:4px;
-}
-
-.language-oac_no_warn {
-   font-size:.9em;
-   color:#222;
-   background-color: transparent;
-}
-
-#doc-title {
-   margin-left: 4%;
-}
-
-#top-nav {
-   margin-left: 4%;
-   font-size: 12px;
-}
-
-#bottom-nav {
-   margin-left: 4%;
-   font-size: 12px;
-}
-
-.vector-font {
-   color:grey; 
-   font-size: 20px;
-}
-
-#copyright {
-   padding-top: 10px;
-   padding-bottom: 4px;
-   display: table;
-   margin:0 auto;
-   color: grey;
-   font-size: 12px;
-   vertical-align: middle;
-}
-
-.beta {color: #FF0000}
-
-/* GENERAL ELEMENT TYPE STYLES */
-
-/* #Media Queries
-================================================== */
-/* Smaller than standard 960 (devices and browsers) */
-/* Tablet Portrait size to standard 960 (devices and browsers) */
-@media only screen and (min-width: 768px) and (max-width: 959px) { .inner { width: 740px; }
-  header h1, header h2 { width: 340px; }
-  header h1 { font-size: 60px; }
-  header h2 { font-size: 30px; }
-}
-/* All Mobile Sizes (devices and browser) */
-@media only screen and (max-width: 767px) { .inner { width: 93%; }
-  header { padding: 20px 0; }
-  header .inner { position: relative; }
-  header h1, header h2 { width: 100%; }
-  header h1 { font-size: 48px; }
-  header h2 { font-size: 24px; }
-  header a.button { position: relative; display: inline-block; width: auto; height: auto; padding: 5px 10px; margin-top: 15px; font-size: 13px; line-height: 1; color: #2879d0; text-align: center; background-color: #9ddcff; background-image: none; border-radius: 5px; -moz-border-radius: 5px; -webkit-border-radius: 5px; }
-  header a.button small { display: inline; font-size: 13px; }
-}
-/* Mobile Landscape Size to Tablet Portrait (devices and browsers) */
-/* Mobile Portrait Size to Mobile Landscape Size (devices and browsers) */
-
-header h1 { padding-top: 14px; font-size: 2em; font-weight: 200; line-height: 1.4; color: #FFFFFF; letter-spacing: 0px; border-bottom: 0px; }
-
-header h2 { font-size: 1.2em; margin-top: 0; margin-bottom: 0; font-weight: 200; line-height: .8; color: #ec7D11; letter-spacing: 0; }
-
-/*
-header a.button { background: transparent url(../images/logo.png) 0 0 no-repeat; padding-left: 32px; }
-*/
-
-header a:hover { text-decoration: none; }
-
-/* Admonition (Note) block */
-.admonitionblock > table {
-  border: 0;
-  background: none;
-  width: 100%;
-  table-layout: auto;
-  margin-bottom: 10.5px;
-}
-.admonitionblock > table td.icon {
-  text-align: center;
-  width: 60px;
-}
-.admonitionblock > table td.icon img {
-  max-width: none;
-}
-.admonitionblock > table td.icon .title {
-  text-transform: uppercase;
-}
-.admonitionblock > table td.content {
-  padding-left: 1em;
-  padding-right: 1em;
-  border-left: 3px solid #ddd;
-}
-.admonitionblock > table td.content > :last-child > :last-child {
-  margin-bottom: 0;
-}
-.admonitionblock td.icon [class^="fa icon-"]:before {
-  font-size: 2.5em;
-  text-shadow: 1px 1px 2px rgba(0, 0, 0, 0.5);
-  cursor: default;
-}
-.admonitionblock td.icon .icon-note:before {
-  content: "\f05a";
-  color: #5bc0de;
-}
diff --git a/docs/application-development-guide/src/main/jbake/jbake.properties b/docs/application-development-guide/src/main/jbake/jbake.properties
deleted file mode 100644
index 546d09c..0000000
--- a/docs/application-development-guide/src/main/jbake/jbake.properties
+++ /dev/null
@@ -1,7 +0,0 @@
-site.host=http://jbake.org
-render.tags=false
-render.sitemap=false
-render.archive=false
-render.feed=false
-asciidoctor.option.safe=0
-asciidoctor.attributes.export=true
diff --git a/docs/application-development-guide/src/main/jbake/templates/footer.ftl b/docs/application-development-guide/src/main/jbake/templates/footer.ftl
deleted file mode 100644
index 6f2b09e..0000000
--- a/docs/application-development-guide/src/main/jbake/templates/footer.ftl
+++ /dev/null
@@ -1,46 +0,0 @@
-<#-- a footer template fragment included in the page template -->
-<hr />
-
-<table width="90%" id="bottom-nav" cellspacing="0" cellpadding="0">
-	<colgroup>
-		<col width="12%"/>
-		<col width="12%"/>
-		<col width="*"/>
-	</colgroup>
-	<tr>		
-	    <#if content.prev??>
-		<td align="left">
-		<a href="${content.prev}">
-			<span class=" vector-font"><i class="fa fa-arrow-circle-left" aria-hidden="true"></i></span>
-			<span style="position:relative;top:-2px;">Previous</span>
-		</a>
-		</td>
-		</#if>
-
-		<#if content.next??>
-		<td align="left">
-		<a href="${content.next}">
-			<span class="vector-font"><i class="fa fa-arrow-circle-right vector-font" aria-hidden="true"></i></span>
-			<span style="position:relative;top:-2px;">Next</span>
-		</a>
-		</td>
-		</#if>
-
-		<td align="right">
-		<a href="toc.html">
-			<span class="vector-font"><i class="fa fa-list vector-font" aria-hidden="true"></i></span>
-			<span style="position:relative;top:-2px;">Contents</span>
-		</a>
-		</td>
-	</tr>
-</table>
-
-<span id="copyright">
-        <img src="img/eclipse_foundation_logo_tiny.png" height="20px" alt="Eclipse Foundation Logo" align="top"/>&nbsp;            
-        <span >Copyright&nbsp;&copy;&nbsp;2019,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</span>
-</span>
-
-<p align="center" class="beta">${config.status!}</p>
-
-</body>
-</html>
diff --git a/docs/application-development-guide/src/main/jbake/templates/header.ftl b/docs/application-development-guide/src/main/jbake/templates/header.ftl
deleted file mode 100644
index 82ebb36..0000000
--- a/docs/application-development-guide/src/main/jbake/templates/header.ftl
+++ /dev/null
@@ -1,55 +0,0 @@
-<!DOCTYPE html>
-<#-- a header template fragment included in the page template -->
-<html lang="en">
-  <head>
-    <meta charset="utf-8"/>
-    <title><#if (content.title)??><#escape x as x?xml>${content.title}</#escape></#if></title>
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <link href="<#if (content.rootpath)??>${content.rootpath}<#else></#if>css/style.css" rel="stylesheet">
-    <script src="https://use.fontawesome.com/96c4d89611.js"></script>
-  </head>
-  <body>
-<table id="doc-title" cellspacing="0" cellpadding="0">
-  <tr>
-  <td align="left" valign="top">
-  <b>${content.title}</b><br />
-      <p class="beta">${config.status!}</p>
-  </td>
-  </tr>
-</table>
-<hr />
-
-<table width="90%" id="top-nav" cellspacing="0" cellpadding="0">
-	<colgroup>
-		<col width="12%"/>
-		<col width="12%"/>
-		<col width="*"/>
-	</colgroup>
-	<tr>
-	    <#if content.prev??>
-		<td align="left">
-		<a href="${content.prev}">
-			<span class="vector-font"><i class="fa fa-arrow-circle-left" aria-hidden="true"></i></span>
-			<span style="position:relative;top:-2px;">Previous</span>
-		</a>
-		</td>
-	    </#if>
-
-	    <#if content.next??>
-		<td align="left">
-		<a href="${content.next}">
-			<span class=" vector-font"><i class="fa fa-arrow-circle-right vector-font" aria-hidden="true"></i></span>
-			<span style="position:relative;top:-2px;">Next</span>
-		</a>
-		</td>
-	    </#if>
-
-		<td align="right">
-		<a href="toc.html">
-			<span class=" vector-font"><i class="fa fa-list vector-font" aria-hidden="true"></i></span>
-			<span style="position:relative;top:-2px;">Contents</span>
-		</a>
-		</td>
-	</tr>
-</table>
-
diff --git a/docs/application-development-guide/src/main/jbake/templates/menu.ftl b/docs/application-development-guide/src/main/jbake/templates/menu.ftl
deleted file mode 100644
index 888c03d..0000000
--- a/docs/application-development-guide/src/main/jbake/templates/menu.ftl
+++ /dev/null
@@ -1 +0,0 @@
-<#-- a menu bar template fragment included in the page template -->
\ No newline at end of file
diff --git a/docs/application-development-guide/src/main/jbake/templates/page.ftl b/docs/application-development-guide/src/main/jbake/templates/page.ftl
deleted file mode 100644
index eca51db..0000000
--- a/docs/application-development-guide/src/main/jbake/templates/page.ftl
+++ /dev/null
@@ -1,8 +0,0 @@
-<#-- a top level page layout template -->
-
-<#include "header.ftl">
-<#include "menu.ftl">
-
-${content.body}
-
-<#include "footer.ftl">
\ No newline at end of file
diff --git a/docs/deployment-planning-guide/README.md b/docs/deployment-planning-guide/README.md
deleted file mode 100644
index a3ec2b6..0000000
--- a/docs/deployment-planning-guide/README.md
+++ /dev/null
@@ -1,77 +0,0 @@
-# A JBake project template
-
-## About JBake
-
-JBake is a static site generator, it's inspired from jekyll and written
-in java.  The basic idea is to have templates for the structure of the
-page, and the body generated from asciidoc content.
-
-## Pre requisites
-
-- Maven
-- JDK8+
-
-Deploying to Github will require password less authentication.
-
-This is done by exporting your SSH public key into your Github account.
-
-## Build the site locally
-
-The site is generated under target/staging.
-
-Open file:///PATH_TO_PROJECT_DIR/target/staging in a browser to view the site.
-
-```
-mvn generate-resources
-```
-
-Or you can invoke the JBake plugin directly.
-
-```
-mvn jbake:build
-```
-
-### Rebuild the site on changes
-
-```
-mvn jbake:watch
-```
-
-If you keep this command running, changes to the sources will be
-detected and the site will be rendered incrementally.
-
-This is convenient when writing content.
-
-### Serve the site locally
-
-```
-mvn jbake:serve
-```
-
-If a webserver is required (e.g. absolute path are used), this command
-will start a webserver (jetty) at http://localhost:8820.  It will also
-watch for changes and rebuild incrementally.
-
-## Deploy the site to Github Pages
-
-```
-mvn deploy
-```
-
-## Produce a zip file for download
-
-To produce a zip file containing the generated html files, use:
-
-```
-mvn package
-```
-
-When making a release on GitHub, this zip file should be added to the release.
-
-## Links
-
-- [JBake maven plugin documentation](https://github.com/Blazebit/jbake-maven-plugin)
-- [JBake documentation](http://jbake.org/docs/2.5.1)
-- [Freemarker documentation](http://freemarker.org/docs)
-- [AsciiDoc User Guide](http://asciidoc.org/userguide.html)
-- [Asciidoctor quick reference](http://asciidoctor.org/docs/asciidoc-syntax-quick-reference)
diff --git a/docs/deployment-planning-guide/pom.xml b/docs/deployment-planning-guide/pom.xml
index 076c2c8..375e4a6 100644
--- a/docs/deployment-planning-guide/pom.xml
+++ b/docs/deployment-planning-guide/pom.xml
@@ -25,7 +25,6 @@
         <version>7.0.0-SNAPSHOT</version>
         <relativePath>../parent</relativePath>
     </parent>
-    <groupId>org.glassfish.docs</groupId>
     <artifactId>deployment-planning-guide</artifactId>
     <packaging>jar</packaging>
     <name>Eclipse GlassFish Server Deployment Planning Guide, Release 7</name>
diff --git a/docs/deployment-planning-guide/src/main/jbake/content/checklist.adoc b/docs/deployment-planning-guide/src/main/asciidoc/checklist.adoc
similarity index 100%
rename from docs/deployment-planning-guide/src/main/jbake/content/checklist.adoc
rename to docs/deployment-planning-guide/src/main/asciidoc/checklist.adoc
diff --git a/docs/deployment-planning-guide/src/main/jbake/content/concepts.adoc b/docs/deployment-planning-guide/src/main/asciidoc/concepts.adoc
similarity index 100%
rename from docs/deployment-planning-guide/src/main/jbake/content/concepts.adoc
rename to docs/deployment-planning-guide/src/main/asciidoc/concepts.adoc
diff --git a/docs/deployment-planning-guide/src/main/jbake/assets/img/eclipse_foundation_logo_tiny.png b/docs/deployment-planning-guide/src/main/asciidoc/img/eclipse_foundation_logo_tiny.png
similarity index 100%
rename from docs/deployment-planning-guide/src/main/jbake/assets/img/eclipse_foundation_logo_tiny.png
rename to docs/deployment-planning-guide/src/main/asciidoc/img/eclipse_foundation_logo_tiny.png
Binary files differ
diff --git a/docs/deployment-planning-guide/src/main/jbake/content/loe.adoc b/docs/deployment-planning-guide/src/main/asciidoc/loe.adoc
similarity index 100%
rename from docs/deployment-planning-guide/src/main/jbake/content/loe.adoc
rename to docs/deployment-planning-guide/src/main/asciidoc/loe.adoc
diff --git a/docs/deployment-planning-guide/src/main/jbake/content/lot.adoc b/docs/deployment-planning-guide/src/main/asciidoc/lot.adoc
similarity index 100%
rename from docs/deployment-planning-guide/src/main/jbake/content/lot.adoc
rename to docs/deployment-planning-guide/src/main/asciidoc/lot.adoc
diff --git a/docs/deployment-planning-guide/src/main/jbake/content/planning.adoc b/docs/deployment-planning-guide/src/main/asciidoc/planning.adoc
similarity index 100%
rename from docs/deployment-planning-guide/src/main/jbake/content/planning.adoc
rename to docs/deployment-planning-guide/src/main/asciidoc/planning.adoc
diff --git a/docs/deployment-planning-guide/src/main/jbake/content/preface.adoc b/docs/deployment-planning-guide/src/main/asciidoc/preface.adoc
similarity index 100%
rename from docs/deployment-planning-guide/src/main/jbake/content/preface.adoc
rename to docs/deployment-planning-guide/src/main/asciidoc/preface.adoc
diff --git a/docs/deployment-planning-guide/src/main/jbake/content/title.adoc b/docs/deployment-planning-guide/src/main/asciidoc/title.adoc
similarity index 95%
rename from docs/deployment-planning-guide/src/main/jbake/content/title.adoc
rename to docs/deployment-planning-guide/src/main/asciidoc/title.adoc
index 46936a1..e1bef7d 100644
--- a/docs/deployment-planning-guide/src/main/jbake/content/title.adoc
+++ b/docs/deployment-planning-guide/src/main/asciidoc/title.adoc
@@ -42,3 +42,5 @@
 Opteron, the AMD logo, and the AMD Opteron logo are trademarks or
 registered trademarks of Advanced Micro Devices. UNIX is a registered
 trademark of The Open Group.
+
+image:img/eclipse_foundation_logo_tiny.png["Eclipse Logo"]
diff --git a/docs/deployment-planning-guide/src/main/jbake/assets/css/style.css b/docs/deployment-planning-guide/src/main/jbake/assets/css/style.css
deleted file mode 100644
index 25a16e4..0000000
--- a/docs/deployment-planning-guide/src/main/jbake/assets/css/style.css
+++ /dev/null
@@ -1,315 +0,0 @@
-/* CSS */
-/*! normalize.css v3.0.2 | MIT License | git.io/normalize */
-/** 1. Set default font family to sans-serif. 2. Prevent iOS text size adjust after orientation change, without disabling user zoom. */
-html { font-family: sans-serif; /* 1 */ -ms-text-size-adjust: 100%; /* 2 */ -webkit-text-size-adjust: 100%; /* 2 */ }
-
-/* HTML5 display definitions ========================================================================== */
-/** Correct `block` display not defined for any HTML5 element in IE 8/9. Correct `block` display not defined for `details` or `summary` in IE 10/11 and Firefox. Correct `block` display not defined for `main` in IE 11. */
-article, aside, details, figcaption, figure, footer, header, hgroup, main, menu, nav, section, summary { display: block; }
-
-/** 1. Correct `inline-block` display not defined in IE 8/9. 2. Normalize vertical alignment of `progress` in Chrome, Firefox, and Opera. */
-audio, canvas, progress, video { display: inline-block; /* 1 */ vertical-align: baseline; /* 2 */ }
-
-/** Prevent modern browsers from displaying `audio` without controls. Remove excess height in iOS 5 devices. */
-audio:not([controls]) { display: none; height: 0; }
-
-/** Address `[hidden]` styling not present in IE 8/9/10. Hide the `template` element in IE 8/9/11, Safari, and Firefox < 22. */
-[hidden], template { display: none; }
-
-/* Links ========================================================================== */
-/** Remove the gray background color from active links in IE 10. */
-a { background-color: transparent; }
-
-/** Improve readability when focused and also mouse hovered in all browsers. */
-a:active, a:hover { outline: 0; }
-
-/* Text-level semantics ========================================================================== */
-/** Address styling not present in IE 8/9/10/11, Safari, and Chrome. */
-abbr[title] { border-bottom: 1px dotted; }
-
-/** Address style set to `bolder` in Firefox 4+, Safari, and Chrome. */
-b, strong { font-weight: bold; }
-
-/** Address styling not present in Safari and Chrome. */
-dfn { font-style: italic; }
-
-/** Address variable `h1` font-size and margin within `section` and `article` contexts in Firefox 4+, Safari, and Chrome. */
-h1 { font-size: 2em; margin: 0.67em 0; }
-
-/** Address styling not present in IE 8/9. */
-mark { background: #ff0; color: #000; }
-
-/** Address inconsistent and variable font size in all browsers. */
-small { font-size: 80%; }
-
-/** Prevent `sub` and `sup` affecting `line-height` in all browsers. */
-sub, sup { font-size: 75%; line-height: 0; position: relative; vertical-align: baseline; }
-
-sup { top: -0.5em; }
-
-sub { bottom: -0.25em; }
-
-/* Embedded content ========================================================================== */
-/** Remove border when inside `a` element in IE 8/9/10. */
-img { border: 0; }
-
-/** Correct overflow not hidden in IE 9/10/11. */
-svg:not(:root) { overflow: hidden; }
-
-/* Grouping content ========================================================================== */
-/** Address margin not present in IE 8/9 and Safari. */
-figure { margin: 1em 40px; }
-
-/** Address differences between Firefox and other browsers. */
-hr { box-sizing: content-box; height: 0; }
-
-/** Contain overflow in all browsers. */
-pre { overflow: auto; }
-
-/** Address odd `em`-unit font size rendering in all browsers. */
-code, kbd, pre, samp { font-family: monospace, monospace; font-size: 1em; }
-
-/* Forms ========================================================================== */
-/** Known limitation: by default, Chrome and Safari on OS X allow very limited styling of `select`, unless a `border` property is set. */
-/** 1. Correct color not being inherited. Known issue: affects color of disabled elements. 2. Correct font properties not being inherited. 3. Address margins set differently in Firefox 4+, Safari, and Chrome. */
-button, input, optgroup, select, textarea { color: inherit; /* 1 */ font: inherit; /* 2 */ margin: 0; /* 3 */ }
-
-/** Address `overflow` set to `hidden` in IE 8/9/10/11. */
-button { overflow: visible; }
-
-/** Address inconsistent `text-transform` inheritance for `button` and `select`. All other form control elements do not inherit `text-transform` values. Correct `button` style inheritance in Firefox, IE 8/9/10/11, and Opera. Correct `select` style inheritance in Firefox. */
-button, select { text-transform: none; }
-
-/** 1. Avoid the WebKit bug in Android 4.0.* where (2) destroys native `audio` and `video` controls. 2. Correct inability to style clickable `input` types in iOS. 3. Improve usability and consistency of cursor style between image-type `input` and others. */
-button, html input[type="button"], input[type="reset"], input[type="submit"] { -webkit-appearance: button; /* 2 */ cursor: pointer; /* 3 */ }
-
-/** Re-set default cursor for disabled elements. */
-button[disabled], html input[disabled] { cursor: default; }
-
-/** Remove inner padding and border in Firefox 4+. */
-button::-moz-focus-inner, input::-moz-focus-inner { border: 0; padding: 0; }
-
-/** Address Firefox 4+ setting `line-height` on `input` using `!important` in the UA stylesheet. */
-input { line-height: normal; }
-
-/** It's recommended that you don't attempt to style these elements. Firefox's implementation doesn't respect box-sizing, padding, or width.  1. Address box sizing set to `content-box` in IE 8/9/10. 2. Remove excess padding in IE 8/9/10. */
-input[type="checkbox"], input[type="radio"] { box-sizing: border-box; /* 1 */ padding: 0; /* 2 */ }
-
-/** Fix the cursor style for Chrome's increment/decrement buttons. For certain `font-size` values of the `input`, it causes the cursor style of the decrement button to change from `default` to `text`. */
-input[type="number"]::-webkit-inner-spin-button, input[type="number"]::-webkit-outer-spin-button { height: auto; }
-
-/** 1. Address `appearance` set to `searchfield` in Safari and Chrome. 2. Address `box-sizing` set to `border-box` in Safari and Chrome (include `-moz` to future-proof). */
-input[type="search"] { -webkit-appearance: textfield; /* 1 */ /* 2 */ box-sizing: content-box; }
-
-/** Remove inner padding and search cancel button in Safari and Chrome on OS X. Safari (but not Chrome) clips the cancel button when the search input has padding (and `textfield` appearance). */
-input[type="search"]::-webkit-search-cancel-button, input[type="search"]::-webkit-search-decoration { -webkit-appearance: none; }
-
-/** Define consistent border, margin, and padding. */
-fieldset { border: 1px solid #c0c0c0; margin: 0 2px; padding: 0.35em 0.625em 0.75em; }
-
-/** 1. Correct `color` not being inherited in IE 8/9/10/11. 2. Remove padding so people aren't caught out if they zero out fieldsets. */
-legend { border: 0; /* 1 */ padding: 0; /* 2 */ }
-
-/** Remove default vertical scrollbar in IE 8/9/10/11. */
-textarea { overflow: auto; }
-
-/** Don't inherit the `font-weight` (applied by a rule above). NOTE: the default cannot safely be changed in Chrome and Safari on OS X. */
-optgroup { font-weight: bold; }
-
-/* Tables ========================================================================== */
-/** Remove most spacing between table cells. */
-table { border-collapse: collapse; border-spacing: 0; }
-
-td, th { padding: 0; }
-
-/* LAYOUT STYLES */
-
-p { margin-top: 0; }
-
-code, pre { margin-bottom: 30px; font-family: Monaco, "Bitstream Vera Sans Mono", "Lucida Console", Terminal, monospace; font-size: 13px; color: #222; }
-
-code { padding: 0 3px; background-color: #f2f8fc; border: solid 1px #dbe7f3; }
-
-pre { padding: 20px; overflow: auto; text-shadow: none; background: #fff; border: solid 1px #f2f2f2; }
-
-pre code { padding: 0; color: #2879d0; background-color: #fff; border: none; }
-
-ul, ol, dl { margin-bottom: 20px; }
-
-/* COMMON STYLES */
-
-td.halign-right { text-align: right; } 
-
-td.halign-center { text-align: center; } 
-
-form { padding: 20px; background: #f2f2f2; }
-
-h2 { 
-   font-size: 2em;
-   line-height: 1.2em;
-   font-weight: 200;
-   letter-spacing: 0;
-}
-
-h3 { 
-   font-size: 1.4em;
-   line-height: 1.2em;
-   font-weight: normal;
-   letter-spacing: 0;
-}
-
-.sect1 {
-   margin-left: 4%;
-   margin-right: 4%;
-   font: 13px/20px Arial, Helvetica, sans-serif  
-}
-
-a:link {
-   text-decoration: none;
-   color: #09569d;
-}
-
-#preamble hr{
-   margin-left: 0%;
-   margin-right: 0%;
-}
-
-#preamble .sectionbody table  {
-   font-weight: 200;
-   margin-left: 4%;
-   margin-right: 4%;
-}
-
-hr {
-   margin-bottom: 12px;
-}
-
-table.tableblock.frame-all.grid-all.spread {
-   font-size: 12px;
-}
-
-code {
-   font-size:.9em;
-   border: 1px solid #eaeaea;
-   background-color: #f6f6f6;
-   border-radius: 3px;
-   padding: 1px;
-   padding-left:2px;
-   padding-right:2px;
-}
-
-pre.prettyprint.highlight {
-   border: 1px solid #eaeaea;
-   background-color: #f6f6f6;
-   border-radius: 4px;
-   padding: 8px;
-   padding-top:4px;
-   padding-bottom:4px;
-}
-
-.language-oac_no_warn {
-   font-size:.9em;
-   color:#222;
-   background-color: transparent;
-}
-
-#doc-title {
-   margin-left: 4%;
-}
-
-#top-nav {
-   margin-left: 4%;
-   font-size: 12px;
-}
-
-#bottom-nav {
-   margin-left: 4%;
-   font-size: 12px;
-}
-
-.vector-font {
-   color:grey; 
-   font-size: 20px;
-}
-
-#copyright {
-   padding-top: 10px;
-   padding-bottom: 4px;
-   display: table;
-   margin:0 auto;
-   color: grey;
-   font-size: 12px;
-   vertical-align: middle;
-}
-
-.beta {color: #FF0000}
-
-/* GENERAL ELEMENT TYPE STYLES */
-
-/* #Media Queries
-================================================== */
-/* Smaller than standard 960 (devices and browsers) */
-/* Tablet Portrait size to standard 960 (devices and browsers) */
-@media only screen and (min-width: 768px) and (max-width: 959px) { .inner { width: 740px; }
-  header h1, header h2 { width: 340px; }
-  header h1 { font-size: 60px; }
-  header h2 { font-size: 30px; }
-}
-/* All Mobile Sizes (devices and browser) */
-@media only screen and (max-width: 767px) { .inner { width: 93%; }
-  header { padding: 20px 0; }
-  header .inner { position: relative; }
-  header h1, header h2 { width: 100%; }
-  header h1 { font-size: 48px; }
-  header h2 { font-size: 24px; }
-  header a.button { position: relative; display: inline-block; width: auto; height: auto; padding: 5px 10px; margin-top: 15px; font-size: 13px; line-height: 1; color: #2879d0; text-align: center; background-color: #9ddcff; background-image: none; border-radius: 5px; -moz-border-radius: 5px; -webkit-border-radius: 5px; }
-  header a.button small { display: inline; font-size: 13px; }
-}
-/* Mobile Landscape Size to Tablet Portrait (devices and browsers) */
-/* Mobile Portrait Size to Mobile Landscape Size (devices and browsers) */
-
-header h1 { padding-top: 14px; font-size: 2em; font-weight: 200; line-height: 1.4; color: #FFFFFF; letter-spacing: 0px; border-bottom: 0px; }
-
-header h2 { font-size: 1.2em; margin-top: 0; margin-bottom: 0; font-weight: 200; line-height: .8; color: #ec7D11; letter-spacing: 0; }
-
-/*
-header a.button { background: transparent url(../images/logo.png) 0 0 no-repeat; padding-left: 32px; }
-*/
-
-header a:hover { text-decoration: none; }
-
-/* Admonition (Note) block */
-.admonitionblock > table {
-  border: 0;
-  background: none;
-  width: 100%;
-  table-layout: auto;
-  margin-bottom: 10.5px;
-}
-.admonitionblock > table td.icon {
-  text-align: center;
-  width: 60px;
-}
-.admonitionblock > table td.icon img {
-  max-width: none;
-}
-.admonitionblock > table td.icon .title {
-  text-transform: uppercase;
-}
-.admonitionblock > table td.content {
-  padding-left: 1em;
-  padding-right: 1em;
-  border-left: 3px solid #ddd;
-}
-.admonitionblock > table td.content > :last-child > :last-child {
-  margin-bottom: 0;
-}
-.admonitionblock td.icon [class^="fa icon-"]:before {
-  font-size: 2.5em;
-  text-shadow: 1px 1px 2px rgba(0, 0, 0, 0.5);
-  cursor: default;
-}
-.admonitionblock td.icon .icon-note:before {
-  content: "\f05a";
-  color: #5bc0de;
-}
diff --git a/docs/deployment-planning-guide/src/main/jbake/jbake.properties b/docs/deployment-planning-guide/src/main/jbake/jbake.properties
deleted file mode 100644
index 546d09c..0000000
--- a/docs/deployment-planning-guide/src/main/jbake/jbake.properties
+++ /dev/null
@@ -1,7 +0,0 @@
-site.host=http://jbake.org
-render.tags=false
-render.sitemap=false
-render.archive=false
-render.feed=false
-asciidoctor.option.safe=0
-asciidoctor.attributes.export=true
diff --git a/docs/deployment-planning-guide/src/main/jbake/templates/footer.ftl b/docs/deployment-planning-guide/src/main/jbake/templates/footer.ftl
deleted file mode 100644
index 6f2b09e..0000000
--- a/docs/deployment-planning-guide/src/main/jbake/templates/footer.ftl
+++ /dev/null
@@ -1,46 +0,0 @@
-<#-- a footer template fragment included in the page template -->
-<hr />
-
-<table width="90%" id="bottom-nav" cellspacing="0" cellpadding="0">
-	<colgroup>
-		<col width="12%"/>
-		<col width="12%"/>
-		<col width="*"/>
-	</colgroup>
-	<tr>		
-	    <#if content.prev??>
-		<td align="left">
-		<a href="${content.prev}">
-			<span class=" vector-font"><i class="fa fa-arrow-circle-left" aria-hidden="true"></i></span>
-			<span style="position:relative;top:-2px;">Previous</span>
-		</a>
-		</td>
-		</#if>
-
-		<#if content.next??>
-		<td align="left">
-		<a href="${content.next}">
-			<span class="vector-font"><i class="fa fa-arrow-circle-right vector-font" aria-hidden="true"></i></span>
-			<span style="position:relative;top:-2px;">Next</span>
-		</a>
-		</td>
-		</#if>
-
-		<td align="right">
-		<a href="toc.html">
-			<span class="vector-font"><i class="fa fa-list vector-font" aria-hidden="true"></i></span>
-			<span style="position:relative;top:-2px;">Contents</span>
-		</a>
-		</td>
-	</tr>
-</table>
-
-<span id="copyright">
-        <img src="img/eclipse_foundation_logo_tiny.png" height="20px" alt="Eclipse Foundation Logo" align="top"/>&nbsp;            
-        <span >Copyright&nbsp;&copy;&nbsp;2019,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</span>
-</span>
-
-<p align="center" class="beta">${config.status!}</p>
-
-</body>
-</html>
diff --git a/docs/deployment-planning-guide/src/main/jbake/templates/header.ftl b/docs/deployment-planning-guide/src/main/jbake/templates/header.ftl
deleted file mode 100644
index 82ebb36..0000000
--- a/docs/deployment-planning-guide/src/main/jbake/templates/header.ftl
+++ /dev/null
@@ -1,55 +0,0 @@
-<!DOCTYPE html>
-<#-- a header template fragment included in the page template -->
-<html lang="en">
-  <head>
-    <meta charset="utf-8"/>
-    <title><#if (content.title)??><#escape x as x?xml>${content.title}</#escape></#if></title>
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <link href="<#if (content.rootpath)??>${content.rootpath}<#else></#if>css/style.css" rel="stylesheet">
-    <script src="https://use.fontawesome.com/96c4d89611.js"></script>
-  </head>
-  <body>
-<table id="doc-title" cellspacing="0" cellpadding="0">
-  <tr>
-  <td align="left" valign="top">
-  <b>${content.title}</b><br />
-      <p class="beta">${config.status!}</p>
-  </td>
-  </tr>
-</table>
-<hr />
-
-<table width="90%" id="top-nav" cellspacing="0" cellpadding="0">
-	<colgroup>
-		<col width="12%"/>
-		<col width="12%"/>
-		<col width="*"/>
-	</colgroup>
-	<tr>
-	    <#if content.prev??>
-		<td align="left">
-		<a href="${content.prev}">
-			<span class="vector-font"><i class="fa fa-arrow-circle-left" aria-hidden="true"></i></span>
-			<span style="position:relative;top:-2px;">Previous</span>
-		</a>
-		</td>
-	    </#if>
-
-	    <#if content.next??>
-		<td align="left">
-		<a href="${content.next}">
-			<span class=" vector-font"><i class="fa fa-arrow-circle-right vector-font" aria-hidden="true"></i></span>
-			<span style="position:relative;top:-2px;">Next</span>
-		</a>
-		</td>
-	    </#if>
-
-		<td align="right">
-		<a href="toc.html">
-			<span class=" vector-font"><i class="fa fa-list vector-font" aria-hidden="true"></i></span>
-			<span style="position:relative;top:-2px;">Contents</span>
-		</a>
-		</td>
-	</tr>
-</table>
-
diff --git a/docs/deployment-planning-guide/src/main/jbake/templates/menu.ftl b/docs/deployment-planning-guide/src/main/jbake/templates/menu.ftl
deleted file mode 100644
index 888c03d..0000000
--- a/docs/deployment-planning-guide/src/main/jbake/templates/menu.ftl
+++ /dev/null
@@ -1 +0,0 @@
-<#-- a menu bar template fragment included in the page template -->
\ No newline at end of file
diff --git a/docs/deployment-planning-guide/src/main/jbake/templates/page.ftl b/docs/deployment-planning-guide/src/main/jbake/templates/page.ftl
deleted file mode 100644
index eca51db..0000000
--- a/docs/deployment-planning-guide/src/main/jbake/templates/page.ftl
+++ /dev/null
@@ -1,8 +0,0 @@
-<#-- a top level page layout template -->
-
-<#include "header.ftl">
-<#include "menu.ftl">
-
-${content.body}
-
-<#include "footer.ftl">
\ No newline at end of file
diff --git a/docs/distribution/pom.xml b/docs/distribution/pom.xml
index 258eda3..6cc42a8 100644
--- a/docs/distribution/pom.xml
+++ b/docs/distribution/pom.xml
@@ -24,7 +24,6 @@
         <artifactId>docs</artifactId>
         <version>7.0.0-SNAPSHOT</version>
     </parent>
-    <groupId>org.glassfish.docs</groupId>
     <artifactId>distribution</artifactId>
     <packaging>jar</packaging>
     <name>Eclipse GlassFish Documentation Distribution</name>
@@ -49,14 +48,10 @@
                             <goal>unpack-dependencies</goal>
                         </goals>
                         <configuration>
-                            <includeGroupIds>
-                                org.glassfish.docs
-                            </includeGroupIds>
+                            <includeGroupIds>org.glassfish.docs</includeGroupIds>
                             <includeTypes>jar</includeTypes>
                             <excludes>META-INF/**</excludes>
-                            <outputDirectory>
-                                ${project.build.directory}/classes
-                            </outputDirectory>
+                            <outputDirectory>${project.build.directory}/classes</outputDirectory>
                         </configuration>
                     </execution>
                     <execution>
@@ -66,13 +61,9 @@
                             <goal>copy-dependencies</goal>
                         </goals>
                         <configuration>
-                            <includeGroupIds>
-                                org.glassfish.docs
-                            </includeGroupIds>
+                            <includeGroupIds>org.glassfish.docs</includeGroupIds>
                             <includeTypes>pdf</includeTypes>
-                            <outputDirectory>
-                                ${project.build.directory}/classes
-                            </outputDirectory>
+                            <outputDirectory>${project.build.directory}/classes</outputDirectory>
                             <stripVersion>true</stripVersion>
                         </configuration>
                     </execution>
diff --git a/docs/embedded-server-guide/README.md b/docs/embedded-server-guide/README.md
deleted file mode 100644
index a3ec2b6..0000000
--- a/docs/embedded-server-guide/README.md
+++ /dev/null
@@ -1,77 +0,0 @@
-# A JBake project template
-
-## About JBake
-
-JBake is a static site generator, it's inspired from jekyll and written
-in java.  The basic idea is to have templates for the structure of the
-page, and the body generated from asciidoc content.
-
-## Pre requisites
-
-- Maven
-- JDK8+
-
-Deploying to Github will require password less authentication.
-
-This is done by exporting your SSH public key into your Github account.
-
-## Build the site locally
-
-The site is generated under target/staging.
-
-Open file:///PATH_TO_PROJECT_DIR/target/staging in a browser to view the site.
-
-```
-mvn generate-resources
-```
-
-Or you can invoke the JBake plugin directly.
-
-```
-mvn jbake:build
-```
-
-### Rebuild the site on changes
-
-```
-mvn jbake:watch
-```
-
-If you keep this command running, changes to the sources will be
-detected and the site will be rendered incrementally.
-
-This is convenient when writing content.
-
-### Serve the site locally
-
-```
-mvn jbake:serve
-```
-
-If a webserver is required (e.g. absolute path are used), this command
-will start a webserver (jetty) at http://localhost:8820.  It will also
-watch for changes and rebuild incrementally.
-
-## Deploy the site to Github Pages
-
-```
-mvn deploy
-```
-
-## Produce a zip file for download
-
-To produce a zip file containing the generated html files, use:
-
-```
-mvn package
-```
-
-When making a release on GitHub, this zip file should be added to the release.
-
-## Links
-
-- [JBake maven plugin documentation](https://github.com/Blazebit/jbake-maven-plugin)
-- [JBake documentation](http://jbake.org/docs/2.5.1)
-- [Freemarker documentation](http://freemarker.org/docs)
-- [AsciiDoc User Guide](http://asciidoc.org/userguide.html)
-- [Asciidoctor quick reference](http://asciidoctor.org/docs/asciidoc-syntax-quick-reference)
diff --git a/docs/embedded-server-guide/pom.xml b/docs/embedded-server-guide/pom.xml
index 64e4f62..7132bcf 100644
--- a/docs/embedded-server-guide/pom.xml
+++ b/docs/embedded-server-guide/pom.xml
@@ -25,7 +25,6 @@
         <version>7.0.0-SNAPSHOT</version>
         <relativePath>../parent</relativePath>
     </parent>
-    <groupId>org.glassfish.docs</groupId>
     <artifactId>embedded-server-guide</artifactId>
     <packaging>jar</packaging>
     <name>Eclipse GlassFish Server Embedded Server Guide, Release 7</name>
diff --git a/docs/embedded-server-guide/src/main/jbake/content/embedded-server-guide.adoc b/docs/embedded-server-guide/src/main/asciidoc/embedded-server-guide.adoc
similarity index 100%
rename from docs/embedded-server-guide/src/main/jbake/content/embedded-server-guide.adoc
rename to docs/embedded-server-guide/src/main/asciidoc/embedded-server-guide.adoc
diff --git a/docs/embedded-server-guide/src/main/jbake/assets/img/eclipse_foundation_logo_tiny.png b/docs/embedded-server-guide/src/main/asciidoc/img/eclipse_foundation_logo_tiny.png
similarity index 100%
rename from docs/embedded-server-guide/src/main/jbake/assets/img/eclipse_foundation_logo_tiny.png
rename to docs/embedded-server-guide/src/main/asciidoc/img/eclipse_foundation_logo_tiny.png
Binary files differ
diff --git a/docs/embedded-server-guide/src/main/jbake/content/loe.adoc b/docs/embedded-server-guide/src/main/asciidoc/loe.adoc
similarity index 100%
rename from docs/embedded-server-guide/src/main/jbake/content/loe.adoc
rename to docs/embedded-server-guide/src/main/asciidoc/loe.adoc
diff --git a/docs/embedded-server-guide/src/main/jbake/content/lot.adoc b/docs/embedded-server-guide/src/main/asciidoc/lot.adoc
similarity index 100%
rename from docs/embedded-server-guide/src/main/jbake/content/lot.adoc
rename to docs/embedded-server-guide/src/main/asciidoc/lot.adoc
diff --git a/docs/embedded-server-guide/src/main/jbake/content/preface.adoc b/docs/embedded-server-guide/src/main/asciidoc/preface.adoc
similarity index 100%
rename from docs/embedded-server-guide/src/main/jbake/content/preface.adoc
rename to docs/embedded-server-guide/src/main/asciidoc/preface.adoc
diff --git a/docs/embedded-server-guide/src/main/jbake/content/title.adoc b/docs/embedded-server-guide/src/main/asciidoc/title.adoc
similarity index 96%
rename from docs/embedded-server-guide/src/main/jbake/content/title.adoc
rename to docs/embedded-server-guide/src/main/asciidoc/title.adoc
index 48ddb23..1e7ece2 100644
--- a/docs/embedded-server-guide/src/main/jbake/content/title.adoc
+++ b/docs/embedded-server-guide/src/main/asciidoc/title.adoc
@@ -53,3 +53,5 @@
 Opteron, the AMD logo, and the AMD Opteron logo are trademarks or
 registered trademarks of Advanced Micro Devices. UNIX is a registered
 trademark of The Open Group.
+
+image:img/eclipse_foundation_logo_tiny.png["Eclipse Logo"]
diff --git a/docs/embedded-server-guide/src/main/jbake/assets/css/style.css b/docs/embedded-server-guide/src/main/jbake/assets/css/style.css
deleted file mode 100644
index 25a16e4..0000000
--- a/docs/embedded-server-guide/src/main/jbake/assets/css/style.css
+++ /dev/null
@@ -1,315 +0,0 @@
-/* CSS */
-/*! normalize.css v3.0.2 | MIT License | git.io/normalize */
-/** 1. Set default font family to sans-serif. 2. Prevent iOS text size adjust after orientation change, without disabling user zoom. */
-html { font-family: sans-serif; /* 1 */ -ms-text-size-adjust: 100%; /* 2 */ -webkit-text-size-adjust: 100%; /* 2 */ }
-
-/* HTML5 display definitions ========================================================================== */
-/** Correct `block` display not defined for any HTML5 element in IE 8/9. Correct `block` display not defined for `details` or `summary` in IE 10/11 and Firefox. Correct `block` display not defined for `main` in IE 11. */
-article, aside, details, figcaption, figure, footer, header, hgroup, main, menu, nav, section, summary { display: block; }
-
-/** 1. Correct `inline-block` display not defined in IE 8/9. 2. Normalize vertical alignment of `progress` in Chrome, Firefox, and Opera. */
-audio, canvas, progress, video { display: inline-block; /* 1 */ vertical-align: baseline; /* 2 */ }
-
-/** Prevent modern browsers from displaying `audio` without controls. Remove excess height in iOS 5 devices. */
-audio:not([controls]) { display: none; height: 0; }
-
-/** Address `[hidden]` styling not present in IE 8/9/10. Hide the `template` element in IE 8/9/11, Safari, and Firefox < 22. */
-[hidden], template { display: none; }
-
-/* Links ========================================================================== */
-/** Remove the gray background color from active links in IE 10. */
-a { background-color: transparent; }
-
-/** Improve readability when focused and also mouse hovered in all browsers. */
-a:active, a:hover { outline: 0; }
-
-/* Text-level semantics ========================================================================== */
-/** Address styling not present in IE 8/9/10/11, Safari, and Chrome. */
-abbr[title] { border-bottom: 1px dotted; }
-
-/** Address style set to `bolder` in Firefox 4+, Safari, and Chrome. */
-b, strong { font-weight: bold; }
-
-/** Address styling not present in Safari and Chrome. */
-dfn { font-style: italic; }
-
-/** Address variable `h1` font-size and margin within `section` and `article` contexts in Firefox 4+, Safari, and Chrome. */
-h1 { font-size: 2em; margin: 0.67em 0; }
-
-/** Address styling not present in IE 8/9. */
-mark { background: #ff0; color: #000; }
-
-/** Address inconsistent and variable font size in all browsers. */
-small { font-size: 80%; }
-
-/** Prevent `sub` and `sup` affecting `line-height` in all browsers. */
-sub, sup { font-size: 75%; line-height: 0; position: relative; vertical-align: baseline; }
-
-sup { top: -0.5em; }
-
-sub { bottom: -0.25em; }
-
-/* Embedded content ========================================================================== */
-/** Remove border when inside `a` element in IE 8/9/10. */
-img { border: 0; }
-
-/** Correct overflow not hidden in IE 9/10/11. */
-svg:not(:root) { overflow: hidden; }
-
-/* Grouping content ========================================================================== */
-/** Address margin not present in IE 8/9 and Safari. */
-figure { margin: 1em 40px; }
-
-/** Address differences between Firefox and other browsers. */
-hr { box-sizing: content-box; height: 0; }
-
-/** Contain overflow in all browsers. */
-pre { overflow: auto; }
-
-/** Address odd `em`-unit font size rendering in all browsers. */
-code, kbd, pre, samp { font-family: monospace, monospace; font-size: 1em; }
-
-/* Forms ========================================================================== */
-/** Known limitation: by default, Chrome and Safari on OS X allow very limited styling of `select`, unless a `border` property is set. */
-/** 1. Correct color not being inherited. Known issue: affects color of disabled elements. 2. Correct font properties not being inherited. 3. Address margins set differently in Firefox 4+, Safari, and Chrome. */
-button, input, optgroup, select, textarea { color: inherit; /* 1 */ font: inherit; /* 2 */ margin: 0; /* 3 */ }
-
-/** Address `overflow` set to `hidden` in IE 8/9/10/11. */
-button { overflow: visible; }
-
-/** Address inconsistent `text-transform` inheritance for `button` and `select`. All other form control elements do not inherit `text-transform` values. Correct `button` style inheritance in Firefox, IE 8/9/10/11, and Opera. Correct `select` style inheritance in Firefox. */
-button, select { text-transform: none; }
-
-/** 1. Avoid the WebKit bug in Android 4.0.* where (2) destroys native `audio` and `video` controls. 2. Correct inability to style clickable `input` types in iOS. 3. Improve usability and consistency of cursor style between image-type `input` and others. */
-button, html input[type="button"], input[type="reset"], input[type="submit"] { -webkit-appearance: button; /* 2 */ cursor: pointer; /* 3 */ }
-
-/** Re-set default cursor for disabled elements. */
-button[disabled], html input[disabled] { cursor: default; }
-
-/** Remove inner padding and border in Firefox 4+. */
-button::-moz-focus-inner, input::-moz-focus-inner { border: 0; padding: 0; }
-
-/** Address Firefox 4+ setting `line-height` on `input` using `!important` in the UA stylesheet. */
-input { line-height: normal; }
-
-/** It's recommended that you don't attempt to style these elements. Firefox's implementation doesn't respect box-sizing, padding, or width.  1. Address box sizing set to `content-box` in IE 8/9/10. 2. Remove excess padding in IE 8/9/10. */
-input[type="checkbox"], input[type="radio"] { box-sizing: border-box; /* 1 */ padding: 0; /* 2 */ }
-
-/** Fix the cursor style for Chrome's increment/decrement buttons. For certain `font-size` values of the `input`, it causes the cursor style of the decrement button to change from `default` to `text`. */
-input[type="number"]::-webkit-inner-spin-button, input[type="number"]::-webkit-outer-spin-button { height: auto; }
-
-/** 1. Address `appearance` set to `searchfield` in Safari and Chrome. 2. Address `box-sizing` set to `border-box` in Safari and Chrome (include `-moz` to future-proof). */
-input[type="search"] { -webkit-appearance: textfield; /* 1 */ /* 2 */ box-sizing: content-box; }
-
-/** Remove inner padding and search cancel button in Safari and Chrome on OS X. Safari (but not Chrome) clips the cancel button when the search input has padding (and `textfield` appearance). */
-input[type="search"]::-webkit-search-cancel-button, input[type="search"]::-webkit-search-decoration { -webkit-appearance: none; }
-
-/** Define consistent border, margin, and padding. */
-fieldset { border: 1px solid #c0c0c0; margin: 0 2px; padding: 0.35em 0.625em 0.75em; }
-
-/** 1. Correct `color` not being inherited in IE 8/9/10/11. 2. Remove padding so people aren't caught out if they zero out fieldsets. */
-legend { border: 0; /* 1 */ padding: 0; /* 2 */ }
-
-/** Remove default vertical scrollbar in IE 8/9/10/11. */
-textarea { overflow: auto; }
-
-/** Don't inherit the `font-weight` (applied by a rule above). NOTE: the default cannot safely be changed in Chrome and Safari on OS X. */
-optgroup { font-weight: bold; }
-
-/* Tables ========================================================================== */
-/** Remove most spacing between table cells. */
-table { border-collapse: collapse; border-spacing: 0; }
-
-td, th { padding: 0; }
-
-/* LAYOUT STYLES */
-
-p { margin-top: 0; }
-
-code, pre { margin-bottom: 30px; font-family: Monaco, "Bitstream Vera Sans Mono", "Lucida Console", Terminal, monospace; font-size: 13px; color: #222; }
-
-code { padding: 0 3px; background-color: #f2f8fc; border: solid 1px #dbe7f3; }
-
-pre { padding: 20px; overflow: auto; text-shadow: none; background: #fff; border: solid 1px #f2f2f2; }
-
-pre code { padding: 0; color: #2879d0; background-color: #fff; border: none; }
-
-ul, ol, dl { margin-bottom: 20px; }
-
-/* COMMON STYLES */
-
-td.halign-right { text-align: right; } 
-
-td.halign-center { text-align: center; } 
-
-form { padding: 20px; background: #f2f2f2; }
-
-h2 { 
-   font-size: 2em;
-   line-height: 1.2em;
-   font-weight: 200;
-   letter-spacing: 0;
-}
-
-h3 { 
-   font-size: 1.4em;
-   line-height: 1.2em;
-   font-weight: normal;
-   letter-spacing: 0;
-}
-
-.sect1 {
-   margin-left: 4%;
-   margin-right: 4%;
-   font: 13px/20px Arial, Helvetica, sans-serif  
-}
-
-a:link {
-   text-decoration: none;
-   color: #09569d;
-}
-
-#preamble hr{
-   margin-left: 0%;
-   margin-right: 0%;
-}
-
-#preamble .sectionbody table  {
-   font-weight: 200;
-   margin-left: 4%;
-   margin-right: 4%;
-}
-
-hr {
-   margin-bottom: 12px;
-}
-
-table.tableblock.frame-all.grid-all.spread {
-   font-size: 12px;
-}
-
-code {
-   font-size:.9em;
-   border: 1px solid #eaeaea;
-   background-color: #f6f6f6;
-   border-radius: 3px;
-   padding: 1px;
-   padding-left:2px;
-   padding-right:2px;
-}
-
-pre.prettyprint.highlight {
-   border: 1px solid #eaeaea;
-   background-color: #f6f6f6;
-   border-radius: 4px;
-   padding: 8px;
-   padding-top:4px;
-   padding-bottom:4px;
-}
-
-.language-oac_no_warn {
-   font-size:.9em;
-   color:#222;
-   background-color: transparent;
-}
-
-#doc-title {
-   margin-left: 4%;
-}
-
-#top-nav {
-   margin-left: 4%;
-   font-size: 12px;
-}
-
-#bottom-nav {
-   margin-left: 4%;
-   font-size: 12px;
-}
-
-.vector-font {
-   color:grey; 
-   font-size: 20px;
-}
-
-#copyright {
-   padding-top: 10px;
-   padding-bottom: 4px;
-   display: table;
-   margin:0 auto;
-   color: grey;
-   font-size: 12px;
-   vertical-align: middle;
-}
-
-.beta {color: #FF0000}
-
-/* GENERAL ELEMENT TYPE STYLES */
-
-/* #Media Queries
-================================================== */
-/* Smaller than standard 960 (devices and browsers) */
-/* Tablet Portrait size to standard 960 (devices and browsers) */
-@media only screen and (min-width: 768px) and (max-width: 959px) { .inner { width: 740px; }
-  header h1, header h2 { width: 340px; }
-  header h1 { font-size: 60px; }
-  header h2 { font-size: 30px; }
-}
-/* All Mobile Sizes (devices and browser) */
-@media only screen and (max-width: 767px) { .inner { width: 93%; }
-  header { padding: 20px 0; }
-  header .inner { position: relative; }
-  header h1, header h2 { width: 100%; }
-  header h1 { font-size: 48px; }
-  header h2 { font-size: 24px; }
-  header a.button { position: relative; display: inline-block; width: auto; height: auto; padding: 5px 10px; margin-top: 15px; font-size: 13px; line-height: 1; color: #2879d0; text-align: center; background-color: #9ddcff; background-image: none; border-radius: 5px; -moz-border-radius: 5px; -webkit-border-radius: 5px; }
-  header a.button small { display: inline; font-size: 13px; }
-}
-/* Mobile Landscape Size to Tablet Portrait (devices and browsers) */
-/* Mobile Portrait Size to Mobile Landscape Size (devices and browsers) */
-
-header h1 { padding-top: 14px; font-size: 2em; font-weight: 200; line-height: 1.4; color: #FFFFFF; letter-spacing: 0px; border-bottom: 0px; }
-
-header h2 { font-size: 1.2em; margin-top: 0; margin-bottom: 0; font-weight: 200; line-height: .8; color: #ec7D11; letter-spacing: 0; }
-
-/*
-header a.button { background: transparent url(../images/logo.png) 0 0 no-repeat; padding-left: 32px; }
-*/
-
-header a:hover { text-decoration: none; }
-
-/* Admonition (Note) block */
-.admonitionblock > table {
-  border: 0;
-  background: none;
-  width: 100%;
-  table-layout: auto;
-  margin-bottom: 10.5px;
-}
-.admonitionblock > table td.icon {
-  text-align: center;
-  width: 60px;
-}
-.admonitionblock > table td.icon img {
-  max-width: none;
-}
-.admonitionblock > table td.icon .title {
-  text-transform: uppercase;
-}
-.admonitionblock > table td.content {
-  padding-left: 1em;
-  padding-right: 1em;
-  border-left: 3px solid #ddd;
-}
-.admonitionblock > table td.content > :last-child > :last-child {
-  margin-bottom: 0;
-}
-.admonitionblock td.icon [class^="fa icon-"]:before {
-  font-size: 2.5em;
-  text-shadow: 1px 1px 2px rgba(0, 0, 0, 0.5);
-  cursor: default;
-}
-.admonitionblock td.icon .icon-note:before {
-  content: "\f05a";
-  color: #5bc0de;
-}
diff --git a/docs/embedded-server-guide/src/main/jbake/jbake.properties b/docs/embedded-server-guide/src/main/jbake/jbake.properties
deleted file mode 100644
index 546d09c..0000000
--- a/docs/embedded-server-guide/src/main/jbake/jbake.properties
+++ /dev/null
@@ -1,7 +0,0 @@
-site.host=http://jbake.org
-render.tags=false
-render.sitemap=false
-render.archive=false
-render.feed=false
-asciidoctor.option.safe=0
-asciidoctor.attributes.export=true
diff --git a/docs/embedded-server-guide/src/main/jbake/templates/footer.ftl b/docs/embedded-server-guide/src/main/jbake/templates/footer.ftl
deleted file mode 100644
index 6f2b09e..0000000
--- a/docs/embedded-server-guide/src/main/jbake/templates/footer.ftl
+++ /dev/null
@@ -1,46 +0,0 @@
-<#-- a footer template fragment included in the page template -->
-<hr />
-
-<table width="90%" id="bottom-nav" cellspacing="0" cellpadding="0">
-	<colgroup>
-		<col width="12%"/>
-		<col width="12%"/>
-		<col width="*"/>
-	</colgroup>
-	<tr>		
-	    <#if content.prev??>
-		<td align="left">
-		<a href="${content.prev}">
-			<span class=" vector-font"><i class="fa fa-arrow-circle-left" aria-hidden="true"></i></span>
-			<span style="position:relative;top:-2px;">Previous</span>
-		</a>
-		</td>
-		</#if>
-
-		<#if content.next??>
-		<td align="left">
-		<a href="${content.next}">
-			<span class="vector-font"><i class="fa fa-arrow-circle-right vector-font" aria-hidden="true"></i></span>
-			<span style="position:relative;top:-2px;">Next</span>
-		</a>
-		</td>
-		</#if>
-
-		<td align="right">
-		<a href="toc.html">
-			<span class="vector-font"><i class="fa fa-list vector-font" aria-hidden="true"></i></span>
-			<span style="position:relative;top:-2px;">Contents</span>
-		</a>
-		</td>
-	</tr>
-</table>
-
-<span id="copyright">
-        <img src="img/eclipse_foundation_logo_tiny.png" height="20px" alt="Eclipse Foundation Logo" align="top"/>&nbsp;            
-        <span >Copyright&nbsp;&copy;&nbsp;2019,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</span>
-</span>
-
-<p align="center" class="beta">${config.status!}</p>
-
-</body>
-</html>
diff --git a/docs/embedded-server-guide/src/main/jbake/templates/header.ftl b/docs/embedded-server-guide/src/main/jbake/templates/header.ftl
deleted file mode 100644
index 82ebb36..0000000
--- a/docs/embedded-server-guide/src/main/jbake/templates/header.ftl
+++ /dev/null
@@ -1,55 +0,0 @@
-<!DOCTYPE html>
-<#-- a header template fragment included in the page template -->
-<html lang="en">
-  <head>
-    <meta charset="utf-8"/>
-    <title><#if (content.title)??><#escape x as x?xml>${content.title}</#escape></#if></title>
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <link href="<#if (content.rootpath)??>${content.rootpath}<#else></#if>css/style.css" rel="stylesheet">
-    <script src="https://use.fontawesome.com/96c4d89611.js"></script>
-  </head>
-  <body>
-<table id="doc-title" cellspacing="0" cellpadding="0">
-  <tr>
-  <td align="left" valign="top">
-  <b>${content.title}</b><br />
-      <p class="beta">${config.status!}</p>
-  </td>
-  </tr>
-</table>
-<hr />
-
-<table width="90%" id="top-nav" cellspacing="0" cellpadding="0">
-	<colgroup>
-		<col width="12%"/>
-		<col width="12%"/>
-		<col width="*"/>
-	</colgroup>
-	<tr>
-	    <#if content.prev??>
-		<td align="left">
-		<a href="${content.prev}">
-			<span class="vector-font"><i class="fa fa-arrow-circle-left" aria-hidden="true"></i></span>
-			<span style="position:relative;top:-2px;">Previous</span>
-		</a>
-		</td>
-	    </#if>
-
-	    <#if content.next??>
-		<td align="left">
-		<a href="${content.next}">
-			<span class=" vector-font"><i class="fa fa-arrow-circle-right vector-font" aria-hidden="true"></i></span>
-			<span style="position:relative;top:-2px;">Next</span>
-		</a>
-		</td>
-	    </#if>
-
-		<td align="right">
-		<a href="toc.html">
-			<span class=" vector-font"><i class="fa fa-list vector-font" aria-hidden="true"></i></span>
-			<span style="position:relative;top:-2px;">Contents</span>
-		</a>
-		</td>
-	</tr>
-</table>
-
diff --git a/docs/embedded-server-guide/src/main/jbake/templates/menu.ftl b/docs/embedded-server-guide/src/main/jbake/templates/menu.ftl
deleted file mode 100644
index 888c03d..0000000
--- a/docs/embedded-server-guide/src/main/jbake/templates/menu.ftl
+++ /dev/null
@@ -1 +0,0 @@
-<#-- a menu bar template fragment included in the page template -->
\ No newline at end of file
diff --git a/docs/embedded-server-guide/src/main/jbake/templates/page.ftl b/docs/embedded-server-guide/src/main/jbake/templates/page.ftl
deleted file mode 100644
index eca51db..0000000
--- a/docs/embedded-server-guide/src/main/jbake/templates/page.ftl
+++ /dev/null
@@ -1,8 +0,0 @@
-<#-- a top level page layout template -->
-
-<#include "header.ftl">
-<#include "menu.ftl">
-
-${content.body}
-
-<#include "footer.ftl">
\ No newline at end of file
diff --git a/docs/error-messages-reference/README.md b/docs/error-messages-reference/README.md
deleted file mode 100644
index a3ec2b6..0000000
--- a/docs/error-messages-reference/README.md
+++ /dev/null
@@ -1,77 +0,0 @@
-# A JBake project template
-
-## About JBake
-
-JBake is a static site generator, it's inspired from jekyll and written
-in java.  The basic idea is to have templates for the structure of the
-page, and the body generated from asciidoc content.
-
-## Pre requisites
-
-- Maven
-- JDK8+
-
-Deploying to Github will require password less authentication.
-
-This is done by exporting your SSH public key into your Github account.
-
-## Build the site locally
-
-The site is generated under target/staging.
-
-Open file:///PATH_TO_PROJECT_DIR/target/staging in a browser to view the site.
-
-```
-mvn generate-resources
-```
-
-Or you can invoke the JBake plugin directly.
-
-```
-mvn jbake:build
-```
-
-### Rebuild the site on changes
-
-```
-mvn jbake:watch
-```
-
-If you keep this command running, changes to the sources will be
-detected and the site will be rendered incrementally.
-
-This is convenient when writing content.
-
-### Serve the site locally
-
-```
-mvn jbake:serve
-```
-
-If a webserver is required (e.g. absolute path are used), this command
-will start a webserver (jetty) at http://localhost:8820.  It will also
-watch for changes and rebuild incrementally.
-
-## Deploy the site to Github Pages
-
-```
-mvn deploy
-```
-
-## Produce a zip file for download
-
-To produce a zip file containing the generated html files, use:
-
-```
-mvn package
-```
-
-When making a release on GitHub, this zip file should be added to the release.
-
-## Links
-
-- [JBake maven plugin documentation](https://github.com/Blazebit/jbake-maven-plugin)
-- [JBake documentation](http://jbake.org/docs/2.5.1)
-- [Freemarker documentation](http://freemarker.org/docs)
-- [AsciiDoc User Guide](http://asciidoc.org/userguide.html)
-- [Asciidoctor quick reference](http://asciidoctor.org/docs/asciidoc-syntax-quick-reference)
diff --git a/docs/error-messages-reference/pom.xml b/docs/error-messages-reference/pom.xml
index 02a8292..2d0a349 100644
--- a/docs/error-messages-reference/pom.xml
+++ b/docs/error-messages-reference/pom.xml
@@ -25,7 +25,6 @@
         <version>7.0.0-SNAPSHOT</version>
         <relativePath>../parent</relativePath>
     </parent>
-    <groupId>org.glassfish.docs</groupId>
     <artifactId>error-messages-reference</artifactId>
     <packaging>jar</packaging>
     <name>Eclipse GlassFish Server Error Message Reference, Release 7</name>
diff --git a/docs/error-messages-reference/src/main/jbake/content/error-messages.adoc b/docs/error-messages-reference/src/main/asciidoc/error-messages.adoc
similarity index 100%
rename from docs/error-messages-reference/src/main/jbake/content/error-messages.adoc
rename to docs/error-messages-reference/src/main/asciidoc/error-messages.adoc
diff --git a/docs/error-messages-reference/src/main/jbake/assets/img/eclipse_foundation_logo_tiny.png b/docs/error-messages-reference/src/main/asciidoc/img/eclipse_foundation_logo_tiny.png
similarity index 100%
rename from docs/error-messages-reference/src/main/jbake/assets/img/eclipse_foundation_logo_tiny.png
rename to docs/error-messages-reference/src/main/asciidoc/img/eclipse_foundation_logo_tiny.png
Binary files differ
diff --git a/docs/error-messages-reference/src/main/jbake/content/preface.adoc b/docs/error-messages-reference/src/main/asciidoc/preface.adoc
similarity index 100%
rename from docs/error-messages-reference/src/main/jbake/content/preface.adoc
rename to docs/error-messages-reference/src/main/asciidoc/preface.adoc
diff --git a/docs/error-messages-reference/src/main/jbake/content/title.adoc b/docs/error-messages-reference/src/main/asciidoc/title.adoc
similarity index 95%
rename from docs/error-messages-reference/src/main/jbake/content/title.adoc
rename to docs/error-messages-reference/src/main/asciidoc/title.adoc
index 65f4e0b..c7bf099 100644
--- a/docs/error-messages-reference/src/main/jbake/content/title.adoc
+++ b/docs/error-messages-reference/src/main/asciidoc/title.adoc
@@ -42,3 +42,5 @@
 Opteron, the AMD logo, and the AMD Opteron logo are trademarks or
 registered trademarks of Advanced Micro Devices. UNIX is a registered
 trademark of The Open Group.
+
+image:img/eclipse_foundation_logo_tiny.png["Eclipse Logo"]
diff --git a/docs/error-messages-reference/src/main/jbake/assets/css/style.css b/docs/error-messages-reference/src/main/jbake/assets/css/style.css
deleted file mode 100644
index 25a16e4..0000000
--- a/docs/error-messages-reference/src/main/jbake/assets/css/style.css
+++ /dev/null
@@ -1,315 +0,0 @@
-/* CSS */
-/*! normalize.css v3.0.2 | MIT License | git.io/normalize */
-/** 1. Set default font family to sans-serif. 2. Prevent iOS text size adjust after orientation change, without disabling user zoom. */
-html { font-family: sans-serif; /* 1 */ -ms-text-size-adjust: 100%; /* 2 */ -webkit-text-size-adjust: 100%; /* 2 */ }
-
-/* HTML5 display definitions ========================================================================== */
-/** Correct `block` display not defined for any HTML5 element in IE 8/9. Correct `block` display not defined for `details` or `summary` in IE 10/11 and Firefox. Correct `block` display not defined for `main` in IE 11. */
-article, aside, details, figcaption, figure, footer, header, hgroup, main, menu, nav, section, summary { display: block; }
-
-/** 1. Correct `inline-block` display not defined in IE 8/9. 2. Normalize vertical alignment of `progress` in Chrome, Firefox, and Opera. */
-audio, canvas, progress, video { display: inline-block; /* 1 */ vertical-align: baseline; /* 2 */ }
-
-/** Prevent modern browsers from displaying `audio` without controls. Remove excess height in iOS 5 devices. */
-audio:not([controls]) { display: none; height: 0; }
-
-/** Address `[hidden]` styling not present in IE 8/9/10. Hide the `template` element in IE 8/9/11, Safari, and Firefox < 22. */
-[hidden], template { display: none; }
-
-/* Links ========================================================================== */
-/** Remove the gray background color from active links in IE 10. */
-a { background-color: transparent; }
-
-/** Improve readability when focused and also mouse hovered in all browsers. */
-a:active, a:hover { outline: 0; }
-
-/* Text-level semantics ========================================================================== */
-/** Address styling not present in IE 8/9/10/11, Safari, and Chrome. */
-abbr[title] { border-bottom: 1px dotted; }
-
-/** Address style set to `bolder` in Firefox 4+, Safari, and Chrome. */
-b, strong { font-weight: bold; }
-
-/** Address styling not present in Safari and Chrome. */
-dfn { font-style: italic; }
-
-/** Address variable `h1` font-size and margin within `section` and `article` contexts in Firefox 4+, Safari, and Chrome. */
-h1 { font-size: 2em; margin: 0.67em 0; }
-
-/** Address styling not present in IE 8/9. */
-mark { background: #ff0; color: #000; }
-
-/** Address inconsistent and variable font size in all browsers. */
-small { font-size: 80%; }
-
-/** Prevent `sub` and `sup` affecting `line-height` in all browsers. */
-sub, sup { font-size: 75%; line-height: 0; position: relative; vertical-align: baseline; }
-
-sup { top: -0.5em; }
-
-sub { bottom: -0.25em; }
-
-/* Embedded content ========================================================================== */
-/** Remove border when inside `a` element in IE 8/9/10. */
-img { border: 0; }
-
-/** Correct overflow not hidden in IE 9/10/11. */
-svg:not(:root) { overflow: hidden; }
-
-/* Grouping content ========================================================================== */
-/** Address margin not present in IE 8/9 and Safari. */
-figure { margin: 1em 40px; }
-
-/** Address differences between Firefox and other browsers. */
-hr { box-sizing: content-box; height: 0; }
-
-/** Contain overflow in all browsers. */
-pre { overflow: auto; }
-
-/** Address odd `em`-unit font size rendering in all browsers. */
-code, kbd, pre, samp { font-family: monospace, monospace; font-size: 1em; }
-
-/* Forms ========================================================================== */
-/** Known limitation: by default, Chrome and Safari on OS X allow very limited styling of `select`, unless a `border` property is set. */
-/** 1. Correct color not being inherited. Known issue: affects color of disabled elements. 2. Correct font properties not being inherited. 3. Address margins set differently in Firefox 4+, Safari, and Chrome. */
-button, input, optgroup, select, textarea { color: inherit; /* 1 */ font: inherit; /* 2 */ margin: 0; /* 3 */ }
-
-/** Address `overflow` set to `hidden` in IE 8/9/10/11. */
-button { overflow: visible; }
-
-/** Address inconsistent `text-transform` inheritance for `button` and `select`. All other form control elements do not inherit `text-transform` values. Correct `button` style inheritance in Firefox, IE 8/9/10/11, and Opera. Correct `select` style inheritance in Firefox. */
-button, select { text-transform: none; }
-
-/** 1. Avoid the WebKit bug in Android 4.0.* where (2) destroys native `audio` and `video` controls. 2. Correct inability to style clickable `input` types in iOS. 3. Improve usability and consistency of cursor style between image-type `input` and others. */
-button, html input[type="button"], input[type="reset"], input[type="submit"] { -webkit-appearance: button; /* 2 */ cursor: pointer; /* 3 */ }
-
-/** Re-set default cursor for disabled elements. */
-button[disabled], html input[disabled] { cursor: default; }
-
-/** Remove inner padding and border in Firefox 4+. */
-button::-moz-focus-inner, input::-moz-focus-inner { border: 0; padding: 0; }
-
-/** Address Firefox 4+ setting `line-height` on `input` using `!important` in the UA stylesheet. */
-input { line-height: normal; }
-
-/** It's recommended that you don't attempt to style these elements. Firefox's implementation doesn't respect box-sizing, padding, or width.  1. Address box sizing set to `content-box` in IE 8/9/10. 2. Remove excess padding in IE 8/9/10. */
-input[type="checkbox"], input[type="radio"] { box-sizing: border-box; /* 1 */ padding: 0; /* 2 */ }
-
-/** Fix the cursor style for Chrome's increment/decrement buttons. For certain `font-size` values of the `input`, it causes the cursor style of the decrement button to change from `default` to `text`. */
-input[type="number"]::-webkit-inner-spin-button, input[type="number"]::-webkit-outer-spin-button { height: auto; }
-
-/** 1. Address `appearance` set to `searchfield` in Safari and Chrome. 2. Address `box-sizing` set to `border-box` in Safari and Chrome (include `-moz` to future-proof). */
-input[type="search"] { -webkit-appearance: textfield; /* 1 */ /* 2 */ box-sizing: content-box; }
-
-/** Remove inner padding and search cancel button in Safari and Chrome on OS X. Safari (but not Chrome) clips the cancel button when the search input has padding (and `textfield` appearance). */
-input[type="search"]::-webkit-search-cancel-button, input[type="search"]::-webkit-search-decoration { -webkit-appearance: none; }
-
-/** Define consistent border, margin, and padding. */
-fieldset { border: 1px solid #c0c0c0; margin: 0 2px; padding: 0.35em 0.625em 0.75em; }
-
-/** 1. Correct `color` not being inherited in IE 8/9/10/11. 2. Remove padding so people aren't caught out if they zero out fieldsets. */
-legend { border: 0; /* 1 */ padding: 0; /* 2 */ }
-
-/** Remove default vertical scrollbar in IE 8/9/10/11. */
-textarea { overflow: auto; }
-
-/** Don't inherit the `font-weight` (applied by a rule above). NOTE: the default cannot safely be changed in Chrome and Safari on OS X. */
-optgroup { font-weight: bold; }
-
-/* Tables ========================================================================== */
-/** Remove most spacing between table cells. */
-table { border-collapse: collapse; border-spacing: 0; }
-
-td, th { padding: 0; }
-
-/* LAYOUT STYLES */
-
-p { margin-top: 0; }
-
-code, pre { margin-bottom: 30px; font-family: Monaco, "Bitstream Vera Sans Mono", "Lucida Console", Terminal, monospace; font-size: 13px; color: #222; }
-
-code { padding: 0 3px; background-color: #f2f8fc; border: solid 1px #dbe7f3; }
-
-pre { padding: 20px; overflow: auto; text-shadow: none; background: #fff; border: solid 1px #f2f2f2; }
-
-pre code { padding: 0; color: #2879d0; background-color: #fff; border: none; }
-
-ul, ol, dl { margin-bottom: 20px; }
-
-/* COMMON STYLES */
-
-td.halign-right { text-align: right; } 
-
-td.halign-center { text-align: center; } 
-
-form { padding: 20px; background: #f2f2f2; }
-
-h2 { 
-   font-size: 2em;
-   line-height: 1.2em;
-   font-weight: 200;
-   letter-spacing: 0;
-}
-
-h3 { 
-   font-size: 1.4em;
-   line-height: 1.2em;
-   font-weight: normal;
-   letter-spacing: 0;
-}
-
-.sect1 {
-   margin-left: 4%;
-   margin-right: 4%;
-   font: 13px/20px Arial, Helvetica, sans-serif  
-}
-
-a:link {
-   text-decoration: none;
-   color: #09569d;
-}
-
-#preamble hr{
-   margin-left: 0%;
-   margin-right: 0%;
-}
-
-#preamble .sectionbody table  {
-   font-weight: 200;
-   margin-left: 4%;
-   margin-right: 4%;
-}
-
-hr {
-   margin-bottom: 12px;
-}
-
-table.tableblock.frame-all.grid-all.spread {
-   font-size: 12px;
-}
-
-code {
-   font-size:.9em;
-   border: 1px solid #eaeaea;
-   background-color: #f6f6f6;
-   border-radius: 3px;
-   padding: 1px;
-   padding-left:2px;
-   padding-right:2px;
-}
-
-pre.prettyprint.highlight {
-   border: 1px solid #eaeaea;
-   background-color: #f6f6f6;
-   border-radius: 4px;
-   padding: 8px;
-   padding-top:4px;
-   padding-bottom:4px;
-}
-
-.language-oac_no_warn {
-   font-size:.9em;
-   color:#222;
-   background-color: transparent;
-}
-
-#doc-title {
-   margin-left: 4%;
-}
-
-#top-nav {
-   margin-left: 4%;
-   font-size: 12px;
-}
-
-#bottom-nav {
-   margin-left: 4%;
-   font-size: 12px;
-}
-
-.vector-font {
-   color:grey; 
-   font-size: 20px;
-}
-
-#copyright {
-   padding-top: 10px;
-   padding-bottom: 4px;
-   display: table;
-   margin:0 auto;
-   color: grey;
-   font-size: 12px;
-   vertical-align: middle;
-}
-
-.beta {color: #FF0000}
-
-/* GENERAL ELEMENT TYPE STYLES */
-
-/* #Media Queries
-================================================== */
-/* Smaller than standard 960 (devices and browsers) */
-/* Tablet Portrait size to standard 960 (devices and browsers) */
-@media only screen and (min-width: 768px) and (max-width: 959px) { .inner { width: 740px; }
-  header h1, header h2 { width: 340px; }
-  header h1 { font-size: 60px; }
-  header h2 { font-size: 30px; }
-}
-/* All Mobile Sizes (devices and browser) */
-@media only screen and (max-width: 767px) { .inner { width: 93%; }
-  header { padding: 20px 0; }
-  header .inner { position: relative; }
-  header h1, header h2 { width: 100%; }
-  header h1 { font-size: 48px; }
-  header h2 { font-size: 24px; }
-  header a.button { position: relative; display: inline-block; width: auto; height: auto; padding: 5px 10px; margin-top: 15px; font-size: 13px; line-height: 1; color: #2879d0; text-align: center; background-color: #9ddcff; background-image: none; border-radius: 5px; -moz-border-radius: 5px; -webkit-border-radius: 5px; }
-  header a.button small { display: inline; font-size: 13px; }
-}
-/* Mobile Landscape Size to Tablet Portrait (devices and browsers) */
-/* Mobile Portrait Size to Mobile Landscape Size (devices and browsers) */
-
-header h1 { padding-top: 14px; font-size: 2em; font-weight: 200; line-height: 1.4; color: #FFFFFF; letter-spacing: 0px; border-bottom: 0px; }
-
-header h2 { font-size: 1.2em; margin-top: 0; margin-bottom: 0; font-weight: 200; line-height: .8; color: #ec7D11; letter-spacing: 0; }
-
-/*
-header a.button { background: transparent url(../images/logo.png) 0 0 no-repeat; padding-left: 32px; }
-*/
-
-header a:hover { text-decoration: none; }
-
-/* Admonition (Note) block */
-.admonitionblock > table {
-  border: 0;
-  background: none;
-  width: 100%;
-  table-layout: auto;
-  margin-bottom: 10.5px;
-}
-.admonitionblock > table td.icon {
-  text-align: center;
-  width: 60px;
-}
-.admonitionblock > table td.icon img {
-  max-width: none;
-}
-.admonitionblock > table td.icon .title {
-  text-transform: uppercase;
-}
-.admonitionblock > table td.content {
-  padding-left: 1em;
-  padding-right: 1em;
-  border-left: 3px solid #ddd;
-}
-.admonitionblock > table td.content > :last-child > :last-child {
-  margin-bottom: 0;
-}
-.admonitionblock td.icon [class^="fa icon-"]:before {
-  font-size: 2.5em;
-  text-shadow: 1px 1px 2px rgba(0, 0, 0, 0.5);
-  cursor: default;
-}
-.admonitionblock td.icon .icon-note:before {
-  content: "\f05a";
-  color: #5bc0de;
-}
diff --git a/docs/error-messages-reference/src/main/jbake/jbake.properties b/docs/error-messages-reference/src/main/jbake/jbake.properties
deleted file mode 100644
index 546d09c..0000000
--- a/docs/error-messages-reference/src/main/jbake/jbake.properties
+++ /dev/null
@@ -1,7 +0,0 @@
-site.host=http://jbake.org
-render.tags=false
-render.sitemap=false
-render.archive=false
-render.feed=false
-asciidoctor.option.safe=0
-asciidoctor.attributes.export=true
diff --git a/docs/error-messages-reference/src/main/jbake/templates/footer.ftl b/docs/error-messages-reference/src/main/jbake/templates/footer.ftl
deleted file mode 100644
index 6f2b09e..0000000
--- a/docs/error-messages-reference/src/main/jbake/templates/footer.ftl
+++ /dev/null
@@ -1,46 +0,0 @@
-<#-- a footer template fragment included in the page template -->
-<hr />
-
-<table width="90%" id="bottom-nav" cellspacing="0" cellpadding="0">
-	<colgroup>
-		<col width="12%"/>
-		<col width="12%"/>
-		<col width="*"/>
-	</colgroup>
-	<tr>		
-	    <#if content.prev??>
-		<td align="left">
-		<a href="${content.prev}">
-			<span class=" vector-font"><i class="fa fa-arrow-circle-left" aria-hidden="true"></i></span>
-			<span style="position:relative;top:-2px;">Previous</span>
-		</a>
-		</td>
-		</#if>
-
-		<#if content.next??>
-		<td align="left">
-		<a href="${content.next}">
-			<span class="vector-font"><i class="fa fa-arrow-circle-right vector-font" aria-hidden="true"></i></span>
-			<span style="position:relative;top:-2px;">Next</span>
-		</a>
-		</td>
-		</#if>
-
-		<td align="right">
-		<a href="toc.html">
-			<span class="vector-font"><i class="fa fa-list vector-font" aria-hidden="true"></i></span>
-			<span style="position:relative;top:-2px;">Contents</span>
-		</a>
-		</td>
-	</tr>
-</table>
-
-<span id="copyright">
-        <img src="img/eclipse_foundation_logo_tiny.png" height="20px" alt="Eclipse Foundation Logo" align="top"/>&nbsp;            
-        <span >Copyright&nbsp;&copy;&nbsp;2019,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</span>
-</span>
-
-<p align="center" class="beta">${config.status!}</p>
-
-</body>
-</html>
diff --git a/docs/error-messages-reference/src/main/jbake/templates/header.ftl b/docs/error-messages-reference/src/main/jbake/templates/header.ftl
deleted file mode 100644
index 82ebb36..0000000
--- a/docs/error-messages-reference/src/main/jbake/templates/header.ftl
+++ /dev/null
@@ -1,55 +0,0 @@
-<!DOCTYPE html>
-<#-- a header template fragment included in the page template -->
-<html lang="en">
-  <head>
-    <meta charset="utf-8"/>
-    <title><#if (content.title)??><#escape x as x?xml>${content.title}</#escape></#if></title>
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <link href="<#if (content.rootpath)??>${content.rootpath}<#else></#if>css/style.css" rel="stylesheet">
-    <script src="https://use.fontawesome.com/96c4d89611.js"></script>
-  </head>
-  <body>
-<table id="doc-title" cellspacing="0" cellpadding="0">
-  <tr>
-  <td align="left" valign="top">
-  <b>${content.title}</b><br />
-      <p class="beta">${config.status!}</p>
-  </td>
-  </tr>
-</table>
-<hr />
-
-<table width="90%" id="top-nav" cellspacing="0" cellpadding="0">
-	<colgroup>
-		<col width="12%"/>
-		<col width="12%"/>
-		<col width="*"/>
-	</colgroup>
-	<tr>
-	    <#if content.prev??>
-		<td align="left">
-		<a href="${content.prev}">
-			<span class="vector-font"><i class="fa fa-arrow-circle-left" aria-hidden="true"></i></span>
-			<span style="position:relative;top:-2px;">Previous</span>
-		</a>
-		</td>
-	    </#if>
-
-	    <#if content.next??>
-		<td align="left">
-		<a href="${content.next}">
-			<span class=" vector-font"><i class="fa fa-arrow-circle-right vector-font" aria-hidden="true"></i></span>
-			<span style="position:relative;top:-2px;">Next</span>
-		</a>
-		</td>
-	    </#if>
-
-		<td align="right">
-		<a href="toc.html">
-			<span class=" vector-font"><i class="fa fa-list vector-font" aria-hidden="true"></i></span>
-			<span style="position:relative;top:-2px;">Contents</span>
-		</a>
-		</td>
-	</tr>
-</table>
-
diff --git a/docs/error-messages-reference/src/main/jbake/templates/menu.ftl b/docs/error-messages-reference/src/main/jbake/templates/menu.ftl
deleted file mode 100644
index 888c03d..0000000
--- a/docs/error-messages-reference/src/main/jbake/templates/menu.ftl
+++ /dev/null
@@ -1 +0,0 @@
-<#-- a menu bar template fragment included in the page template -->
\ No newline at end of file
diff --git a/docs/error-messages-reference/src/main/jbake/templates/page.ftl b/docs/error-messages-reference/src/main/jbake/templates/page.ftl
deleted file mode 100644
index eca51db..0000000
--- a/docs/error-messages-reference/src/main/jbake/templates/page.ftl
+++ /dev/null
@@ -1,8 +0,0 @@
-<#-- a top level page layout template -->
-
-<#include "header.ftl">
-<#include "menu.ftl">
-
-${content.body}
-
-<#include "footer.ftl">
\ No newline at end of file
diff --git a/docs/ha-administration-guide/README.md b/docs/ha-administration-guide/README.md
deleted file mode 100644
index a3ec2b6..0000000
--- a/docs/ha-administration-guide/README.md
+++ /dev/null
@@ -1,77 +0,0 @@
-# A JBake project template
-
-## About JBake
-
-JBake is a static site generator, it's inspired from jekyll and written
-in java.  The basic idea is to have templates for the structure of the
-page, and the body generated from asciidoc content.
-
-## Pre requisites
-
-- Maven
-- JDK8+
-
-Deploying to Github will require password less authentication.
-
-This is done by exporting your SSH public key into your Github account.
-
-## Build the site locally
-
-The site is generated under target/staging.
-
-Open file:///PATH_TO_PROJECT_DIR/target/staging in a browser to view the site.
-
-```
-mvn generate-resources
-```
-
-Or you can invoke the JBake plugin directly.
-
-```
-mvn jbake:build
-```
-
-### Rebuild the site on changes
-
-```
-mvn jbake:watch
-```
-
-If you keep this command running, changes to the sources will be
-detected and the site will be rendered incrementally.
-
-This is convenient when writing content.
-
-### Serve the site locally
-
-```
-mvn jbake:serve
-```
-
-If a webserver is required (e.g. absolute path are used), this command
-will start a webserver (jetty) at http://localhost:8820.  It will also
-watch for changes and rebuild incrementally.
-
-## Deploy the site to Github Pages
-
-```
-mvn deploy
-```
-
-## Produce a zip file for download
-
-To produce a zip file containing the generated html files, use:
-
-```
-mvn package
-```
-
-When making a release on GitHub, this zip file should be added to the release.
-
-## Links
-
-- [JBake maven plugin documentation](https://github.com/Blazebit/jbake-maven-plugin)
-- [JBake documentation](http://jbake.org/docs/2.5.1)
-- [Freemarker documentation](http://freemarker.org/docs)
-- [AsciiDoc User Guide](http://asciidoc.org/userguide.html)
-- [Asciidoctor quick reference](http://asciidoctor.org/docs/asciidoc-syntax-quick-reference)
diff --git a/docs/ha-administration-guide/pom.xml b/docs/ha-administration-guide/pom.xml
index 165a39a..245aceb 100644
--- a/docs/ha-administration-guide/pom.xml
+++ b/docs/ha-administration-guide/pom.xml
@@ -25,7 +25,6 @@
         <version>7.0.0-SNAPSHOT</version>
         <relativePath>../parent</relativePath>
     </parent>
-    <groupId>org.glassfish.docs</groupId>
     <artifactId>ha-administration-guide</artifactId>
     <packaging>jar</packaging>
     <name>Eclipse GlassFish Server High Availability Administration Guide, Release 7</name>
diff --git a/docs/ha-administration-guide/src/main/jbake/content/clusters.adoc b/docs/ha-administration-guide/src/main/asciidoc/clusters.adoc
similarity index 100%
rename from docs/ha-administration-guide/src/main/jbake/content/clusters.adoc
rename to docs/ha-administration-guide/src/main/asciidoc/clusters.adoc
diff --git a/docs/ha-administration-guide/src/main/jbake/content/http-load-balancing.adoc b/docs/ha-administration-guide/src/main/asciidoc/http-load-balancing.adoc
similarity index 100%
rename from docs/ha-administration-guide/src/main/jbake/content/http-load-balancing.adoc
rename to docs/ha-administration-guide/src/main/asciidoc/http-load-balancing.adoc
diff --git a/docs/ha-administration-guide/src/main/jbake/assets/img/eclipse_foundation_logo_tiny.png b/docs/ha-administration-guide/src/main/asciidoc/img/eclipse_foundation_logo_tiny.png
similarity index 100%
rename from docs/ha-administration-guide/src/main/jbake/assets/img/eclipse_foundation_logo_tiny.png
rename to docs/ha-administration-guide/src/main/asciidoc/img/eclipse_foundation_logo_tiny.png
Binary files differ
diff --git a/docs/ha-administration-guide/src/main/jbake/content/instances.adoc b/docs/ha-administration-guide/src/main/asciidoc/instances.adoc
similarity index 100%
rename from docs/ha-administration-guide/src/main/jbake/content/instances.adoc
rename to docs/ha-administration-guide/src/main/asciidoc/instances.adoc
diff --git a/docs/ha-administration-guide/src/main/jbake/content/jms.adoc b/docs/ha-administration-guide/src/main/asciidoc/jms.adoc
similarity index 100%
rename from docs/ha-administration-guide/src/main/jbake/content/jms.adoc
rename to docs/ha-administration-guide/src/main/asciidoc/jms.adoc
diff --git a/docs/ha-administration-guide/src/main/jbake/content/loe.adoc b/docs/ha-administration-guide/src/main/asciidoc/loe.adoc
similarity index 100%
rename from docs/ha-administration-guide/src/main/jbake/content/loe.adoc
rename to docs/ha-administration-guide/src/main/asciidoc/loe.adoc
diff --git a/docs/ha-administration-guide/src/main/jbake/content/named-configurations.adoc b/docs/ha-administration-guide/src/main/asciidoc/named-configurations.adoc
similarity index 100%
rename from docs/ha-administration-guide/src/main/jbake/content/named-configurations.adoc
rename to docs/ha-administration-guide/src/main/asciidoc/named-configurations.adoc
diff --git a/docs/ha-administration-guide/src/main/jbake/content/nodes.adoc b/docs/ha-administration-guide/src/main/asciidoc/nodes.adoc
similarity index 100%
rename from docs/ha-administration-guide/src/main/jbake/content/nodes.adoc
rename to docs/ha-administration-guide/src/main/asciidoc/nodes.adoc
diff --git a/docs/ha-administration-guide/src/main/jbake/content/overview.adoc b/docs/ha-administration-guide/src/main/asciidoc/overview.adoc
similarity index 100%
rename from docs/ha-administration-guide/src/main/jbake/content/overview.adoc
rename to docs/ha-administration-guide/src/main/asciidoc/overview.adoc
diff --git a/docs/ha-administration-guide/src/main/jbake/content/preface.adoc b/docs/ha-administration-guide/src/main/asciidoc/preface.adoc
similarity index 100%
rename from docs/ha-administration-guide/src/main/jbake/content/preface.adoc
rename to docs/ha-administration-guide/src/main/asciidoc/preface.adoc
diff --git a/docs/ha-administration-guide/src/main/jbake/content/rmi-iiop.adoc b/docs/ha-administration-guide/src/main/asciidoc/rmi-iiop.adoc
similarity index 100%
rename from docs/ha-administration-guide/src/main/jbake/content/rmi-iiop.adoc
rename to docs/ha-administration-guide/src/main/asciidoc/rmi-iiop.adoc
diff --git a/docs/ha-administration-guide/src/main/jbake/content/rolling-upgrade.adoc b/docs/ha-administration-guide/src/main/asciidoc/rolling-upgrade.adoc
similarity index 100%
rename from docs/ha-administration-guide/src/main/jbake/content/rolling-upgrade.adoc
rename to docs/ha-administration-guide/src/main/asciidoc/rolling-upgrade.adoc
diff --git a/docs/ha-administration-guide/src/main/jbake/content/session-persistence-and-failover.adoc b/docs/ha-administration-guide/src/main/asciidoc/session-persistence-and-failover.adoc
similarity index 100%
rename from docs/ha-administration-guide/src/main/jbake/content/session-persistence-and-failover.adoc
rename to docs/ha-administration-guide/src/main/asciidoc/session-persistence-and-failover.adoc
diff --git a/docs/ha-administration-guide/src/main/jbake/content/ssh-setup.adoc b/docs/ha-administration-guide/src/main/asciidoc/ssh-setup.adoc
similarity index 100%
rename from docs/ha-administration-guide/src/main/jbake/content/ssh-setup.adoc
rename to docs/ha-administration-guide/src/main/asciidoc/ssh-setup.adoc
diff --git a/docs/ha-administration-guide/src/main/jbake/content/title.adoc b/docs/ha-administration-guide/src/main/asciidoc/title.adoc
similarity index 96%
rename from docs/ha-administration-guide/src/main/jbake/content/title.adoc
rename to docs/ha-administration-guide/src/main/asciidoc/title.adoc
index 935d06a..330ab57 100644
--- a/docs/ha-administration-guide/src/main/jbake/content/title.adoc
+++ b/docs/ha-administration-guide/src/main/asciidoc/title.adoc
@@ -53,3 +53,5 @@
 Opteron, the AMD logo, and the AMD Opteron logo are trademarks or
 registered trademarks of Advanced Micro Devices. UNIX is a registered
 trademark of The Open Group.
+
+image:img/eclipse_foundation_logo_tiny.png["Eclipse Logo"]
diff --git a/docs/ha-administration-guide/src/main/jbake/assets/css/style.css b/docs/ha-administration-guide/src/main/jbake/assets/css/style.css
deleted file mode 100644
index 25a16e4..0000000
--- a/docs/ha-administration-guide/src/main/jbake/assets/css/style.css
+++ /dev/null
@@ -1,315 +0,0 @@
-/* CSS */
-/*! normalize.css v3.0.2 | MIT License | git.io/normalize */
-/** 1. Set default font family to sans-serif. 2. Prevent iOS text size adjust after orientation change, without disabling user zoom. */
-html { font-family: sans-serif; /* 1 */ -ms-text-size-adjust: 100%; /* 2 */ -webkit-text-size-adjust: 100%; /* 2 */ }
-
-/* HTML5 display definitions ========================================================================== */
-/** Correct `block` display not defined for any HTML5 element in IE 8/9. Correct `block` display not defined for `details` or `summary` in IE 10/11 and Firefox. Correct `block` display not defined for `main` in IE 11. */
-article, aside, details, figcaption, figure, footer, header, hgroup, main, menu, nav, section, summary { display: block; }
-
-/** 1. Correct `inline-block` display not defined in IE 8/9. 2. Normalize vertical alignment of `progress` in Chrome, Firefox, and Opera. */
-audio, canvas, progress, video { display: inline-block; /* 1 */ vertical-align: baseline; /* 2 */ }
-
-/** Prevent modern browsers from displaying `audio` without controls. Remove excess height in iOS 5 devices. */
-audio:not([controls]) { display: none; height: 0; }
-
-/** Address `[hidden]` styling not present in IE 8/9/10. Hide the `template` element in IE 8/9/11, Safari, and Firefox < 22. */
-[hidden], template { display: none; }
-
-/* Links ========================================================================== */
-/** Remove the gray background color from active links in IE 10. */
-a { background-color: transparent; }
-
-/** Improve readability when focused and also mouse hovered in all browsers. */
-a:active, a:hover { outline: 0; }
-
-/* Text-level semantics ========================================================================== */
-/** Address styling not present in IE 8/9/10/11, Safari, and Chrome. */
-abbr[title] { border-bottom: 1px dotted; }
-
-/** Address style set to `bolder` in Firefox 4+, Safari, and Chrome. */
-b, strong { font-weight: bold; }
-
-/** Address styling not present in Safari and Chrome. */
-dfn { font-style: italic; }
-
-/** Address variable `h1` font-size and margin within `section` and `article` contexts in Firefox 4+, Safari, and Chrome. */
-h1 { font-size: 2em; margin: 0.67em 0; }
-
-/** Address styling not present in IE 8/9. */
-mark { background: #ff0; color: #000; }
-
-/** Address inconsistent and variable font size in all browsers. */
-small { font-size: 80%; }
-
-/** Prevent `sub` and `sup` affecting `line-height` in all browsers. */
-sub, sup { font-size: 75%; line-height: 0; position: relative; vertical-align: baseline; }
-
-sup { top: -0.5em; }
-
-sub { bottom: -0.25em; }
-
-/* Embedded content ========================================================================== */
-/** Remove border when inside `a` element in IE 8/9/10. */
-img { border: 0; }
-
-/** Correct overflow not hidden in IE 9/10/11. */
-svg:not(:root) { overflow: hidden; }
-
-/* Grouping content ========================================================================== */
-/** Address margin not present in IE 8/9 and Safari. */
-figure { margin: 1em 40px; }
-
-/** Address differences between Firefox and other browsers. */
-hr { box-sizing: content-box; height: 0; }
-
-/** Contain overflow in all browsers. */
-pre { overflow: auto; }
-
-/** Address odd `em`-unit font size rendering in all browsers. */
-code, kbd, pre, samp { font-family: monospace, monospace; font-size: 1em; }
-
-/* Forms ========================================================================== */
-/** Known limitation: by default, Chrome and Safari on OS X allow very limited styling of `select`, unless a `border` property is set. */
-/** 1. Correct color not being inherited. Known issue: affects color of disabled elements. 2. Correct font properties not being inherited. 3. Address margins set differently in Firefox 4+, Safari, and Chrome. */
-button, input, optgroup, select, textarea { color: inherit; /* 1 */ font: inherit; /* 2 */ margin: 0; /* 3 */ }
-
-/** Address `overflow` set to `hidden` in IE 8/9/10/11. */
-button { overflow: visible; }
-
-/** Address inconsistent `text-transform` inheritance for `button` and `select`. All other form control elements do not inherit `text-transform` values. Correct `button` style inheritance in Firefox, IE 8/9/10/11, and Opera. Correct `select` style inheritance in Firefox. */
-button, select { text-transform: none; }
-
-/** 1. Avoid the WebKit bug in Android 4.0.* where (2) destroys native `audio` and `video` controls. 2. Correct inability to style clickable `input` types in iOS. 3. Improve usability and consistency of cursor style between image-type `input` and others. */
-button, html input[type="button"], input[type="reset"], input[type="submit"] { -webkit-appearance: button; /* 2 */ cursor: pointer; /* 3 */ }
-
-/** Re-set default cursor for disabled elements. */
-button[disabled], html input[disabled] { cursor: default; }
-
-/** Remove inner padding and border in Firefox 4+. */
-button::-moz-focus-inner, input::-moz-focus-inner { border: 0; padding: 0; }
-
-/** Address Firefox 4+ setting `line-height` on `input` using `!important` in the UA stylesheet. */
-input { line-height: normal; }
-
-/** It's recommended that you don't attempt to style these elements. Firefox's implementation doesn't respect box-sizing, padding, or width.  1. Address box sizing set to `content-box` in IE 8/9/10. 2. Remove excess padding in IE 8/9/10. */
-input[type="checkbox"], input[type="radio"] { box-sizing: border-box; /* 1 */ padding: 0; /* 2 */ }
-
-/** Fix the cursor style for Chrome's increment/decrement buttons. For certain `font-size` values of the `input`, it causes the cursor style of the decrement button to change from `default` to `text`. */
-input[type="number"]::-webkit-inner-spin-button, input[type="number"]::-webkit-outer-spin-button { height: auto; }
-
-/** 1. Address `appearance` set to `searchfield` in Safari and Chrome. 2. Address `box-sizing` set to `border-box` in Safari and Chrome (include `-moz` to future-proof). */
-input[type="search"] { -webkit-appearance: textfield; /* 1 */ /* 2 */ box-sizing: content-box; }
-
-/** Remove inner padding and search cancel button in Safari and Chrome on OS X. Safari (but not Chrome) clips the cancel button when the search input has padding (and `textfield` appearance). */
-input[type="search"]::-webkit-search-cancel-button, input[type="search"]::-webkit-search-decoration { -webkit-appearance: none; }
-
-/** Define consistent border, margin, and padding. */
-fieldset { border: 1px solid #c0c0c0; margin: 0 2px; padding: 0.35em 0.625em 0.75em; }
-
-/** 1. Correct `color` not being inherited in IE 8/9/10/11. 2. Remove padding so people aren't caught out if they zero out fieldsets. */
-legend { border: 0; /* 1 */ padding: 0; /* 2 */ }
-
-/** Remove default vertical scrollbar in IE 8/9/10/11. */
-textarea { overflow: auto; }
-
-/** Don't inherit the `font-weight` (applied by a rule above). NOTE: the default cannot safely be changed in Chrome and Safari on OS X. */
-optgroup { font-weight: bold; }
-
-/* Tables ========================================================================== */
-/** Remove most spacing between table cells. */
-table { border-collapse: collapse; border-spacing: 0; }
-
-td, th { padding: 0; }
-
-/* LAYOUT STYLES */
-
-p { margin-top: 0; }
-
-code, pre { margin-bottom: 30px; font-family: Monaco, "Bitstream Vera Sans Mono", "Lucida Console", Terminal, monospace; font-size: 13px; color: #222; }
-
-code { padding: 0 3px; background-color: #f2f8fc; border: solid 1px #dbe7f3; }
-
-pre { padding: 20px; overflow: auto; text-shadow: none; background: #fff; border: solid 1px #f2f2f2; }
-
-pre code { padding: 0; color: #2879d0; background-color: #fff; border: none; }
-
-ul, ol, dl { margin-bottom: 20px; }
-
-/* COMMON STYLES */
-
-td.halign-right { text-align: right; } 
-
-td.halign-center { text-align: center; } 
-
-form { padding: 20px; background: #f2f2f2; }
-
-h2 { 
-   font-size: 2em;
-   line-height: 1.2em;
-   font-weight: 200;
-   letter-spacing: 0;
-}
-
-h3 { 
-   font-size: 1.4em;
-   line-height: 1.2em;
-   font-weight: normal;
-   letter-spacing: 0;
-}
-
-.sect1 {
-   margin-left: 4%;
-   margin-right: 4%;
-   font: 13px/20px Arial, Helvetica, sans-serif  
-}
-
-a:link {
-   text-decoration: none;
-   color: #09569d;
-}
-
-#preamble hr{
-   margin-left: 0%;
-   margin-right: 0%;
-}
-
-#preamble .sectionbody table  {
-   font-weight: 200;
-   margin-left: 4%;
-   margin-right: 4%;
-}
-
-hr {
-   margin-bottom: 12px;
-}
-
-table.tableblock.frame-all.grid-all.spread {
-   font-size: 12px;
-}
-
-code {
-   font-size:.9em;
-   border: 1px solid #eaeaea;
-   background-color: #f6f6f6;
-   border-radius: 3px;
-   padding: 1px;
-   padding-left:2px;
-   padding-right:2px;
-}
-
-pre.prettyprint.highlight {
-   border: 1px solid #eaeaea;
-   background-color: #f6f6f6;
-   border-radius: 4px;
-   padding: 8px;
-   padding-top:4px;
-   padding-bottom:4px;
-}
-
-.language-oac_no_warn {
-   font-size:.9em;
-   color:#222;
-   background-color: transparent;
-}
-
-#doc-title {
-   margin-left: 4%;
-}
-
-#top-nav {
-   margin-left: 4%;
-   font-size: 12px;
-}
-
-#bottom-nav {
-   margin-left: 4%;
-   font-size: 12px;
-}
-
-.vector-font {
-   color:grey; 
-   font-size: 20px;
-}
-
-#copyright {
-   padding-top: 10px;
-   padding-bottom: 4px;
-   display: table;
-   margin:0 auto;
-   color: grey;
-   font-size: 12px;
-   vertical-align: middle;
-}
-
-.beta {color: #FF0000}
-
-/* GENERAL ELEMENT TYPE STYLES */
-
-/* #Media Queries
-================================================== */
-/* Smaller than standard 960 (devices and browsers) */
-/* Tablet Portrait size to standard 960 (devices and browsers) */
-@media only screen and (min-width: 768px) and (max-width: 959px) { .inner { width: 740px; }
-  header h1, header h2 { width: 340px; }
-  header h1 { font-size: 60px; }
-  header h2 { font-size: 30px; }
-}
-/* All Mobile Sizes (devices and browser) */
-@media only screen and (max-width: 767px) { .inner { width: 93%; }
-  header { padding: 20px 0; }
-  header .inner { position: relative; }
-  header h1, header h2 { width: 100%; }
-  header h1 { font-size: 48px; }
-  header h2 { font-size: 24px; }
-  header a.button { position: relative; display: inline-block; width: auto; height: auto; padding: 5px 10px; margin-top: 15px; font-size: 13px; line-height: 1; color: #2879d0; text-align: center; background-color: #9ddcff; background-image: none; border-radius: 5px; -moz-border-radius: 5px; -webkit-border-radius: 5px; }
-  header a.button small { display: inline; font-size: 13px; }
-}
-/* Mobile Landscape Size to Tablet Portrait (devices and browsers) */
-/* Mobile Portrait Size to Mobile Landscape Size (devices and browsers) */
-
-header h1 { padding-top: 14px; font-size: 2em; font-weight: 200; line-height: 1.4; color: #FFFFFF; letter-spacing: 0px; border-bottom: 0px; }
-
-header h2 { font-size: 1.2em; margin-top: 0; margin-bottom: 0; font-weight: 200; line-height: .8; color: #ec7D11; letter-spacing: 0; }
-
-/*
-header a.button { background: transparent url(../images/logo.png) 0 0 no-repeat; padding-left: 32px; }
-*/
-
-header a:hover { text-decoration: none; }
-
-/* Admonition (Note) block */
-.admonitionblock > table {
-  border: 0;
-  background: none;
-  width: 100%;
-  table-layout: auto;
-  margin-bottom: 10.5px;
-}
-.admonitionblock > table td.icon {
-  text-align: center;
-  width: 60px;
-}
-.admonitionblock > table td.icon img {
-  max-width: none;
-}
-.admonitionblock > table td.icon .title {
-  text-transform: uppercase;
-}
-.admonitionblock > table td.content {
-  padding-left: 1em;
-  padding-right: 1em;
-  border-left: 3px solid #ddd;
-}
-.admonitionblock > table td.content > :last-child > :last-child {
-  margin-bottom: 0;
-}
-.admonitionblock td.icon [class^="fa icon-"]:before {
-  font-size: 2.5em;
-  text-shadow: 1px 1px 2px rgba(0, 0, 0, 0.5);
-  cursor: default;
-}
-.admonitionblock td.icon .icon-note:before {
-  content: "\f05a";
-  color: #5bc0de;
-}
diff --git a/docs/ha-administration-guide/src/main/jbake/jbake.properties b/docs/ha-administration-guide/src/main/jbake/jbake.properties
deleted file mode 100644
index 546d09c..0000000
--- a/docs/ha-administration-guide/src/main/jbake/jbake.properties
+++ /dev/null
@@ -1,7 +0,0 @@
-site.host=http://jbake.org
-render.tags=false
-render.sitemap=false
-render.archive=false
-render.feed=false
-asciidoctor.option.safe=0
-asciidoctor.attributes.export=true
diff --git a/docs/ha-administration-guide/src/main/jbake/templates/footer.ftl b/docs/ha-administration-guide/src/main/jbake/templates/footer.ftl
deleted file mode 100644
index 6f2b09e..0000000
--- a/docs/ha-administration-guide/src/main/jbake/templates/footer.ftl
+++ /dev/null
@@ -1,46 +0,0 @@
-<#-- a footer template fragment included in the page template -->
-<hr />
-
-<table width="90%" id="bottom-nav" cellspacing="0" cellpadding="0">
-	<colgroup>
-		<col width="12%"/>
-		<col width="12%"/>
-		<col width="*"/>
-	</colgroup>
-	<tr>		
-	    <#if content.prev??>
-		<td align="left">
-		<a href="${content.prev}">
-			<span class=" vector-font"><i class="fa fa-arrow-circle-left" aria-hidden="true"></i></span>
-			<span style="position:relative;top:-2px;">Previous</span>
-		</a>
-		</td>
-		</#if>
-
-		<#if content.next??>
-		<td align="left">
-		<a href="${content.next}">
-			<span class="vector-font"><i class="fa fa-arrow-circle-right vector-font" aria-hidden="true"></i></span>
-			<span style="position:relative;top:-2px;">Next</span>
-		</a>
-		</td>
-		</#if>
-
-		<td align="right">
-		<a href="toc.html">
-			<span class="vector-font"><i class="fa fa-list vector-font" aria-hidden="true"></i></span>
-			<span style="position:relative;top:-2px;">Contents</span>
-		</a>
-		</td>
-	</tr>
-</table>
-
-<span id="copyright">
-        <img src="img/eclipse_foundation_logo_tiny.png" height="20px" alt="Eclipse Foundation Logo" align="top"/>&nbsp;            
-        <span >Copyright&nbsp;&copy;&nbsp;2019,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</span>
-</span>
-
-<p align="center" class="beta">${config.status!}</p>
-
-</body>
-</html>
diff --git a/docs/ha-administration-guide/src/main/jbake/templates/header.ftl b/docs/ha-administration-guide/src/main/jbake/templates/header.ftl
deleted file mode 100644
index 82ebb36..0000000
--- a/docs/ha-administration-guide/src/main/jbake/templates/header.ftl
+++ /dev/null
@@ -1,55 +0,0 @@
-<!DOCTYPE html>
-<#-- a header template fragment included in the page template -->
-<html lang="en">
-  <head>
-    <meta charset="utf-8"/>
-    <title><#if (content.title)??><#escape x as x?xml>${content.title}</#escape></#if></title>
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <link href="<#if (content.rootpath)??>${content.rootpath}<#else></#if>css/style.css" rel="stylesheet">
-    <script src="https://use.fontawesome.com/96c4d89611.js"></script>
-  </head>
-  <body>
-<table id="doc-title" cellspacing="0" cellpadding="0">
-  <tr>
-  <td align="left" valign="top">
-  <b>${content.title}</b><br />
-      <p class="beta">${config.status!}</p>
-  </td>
-  </tr>
-</table>
-<hr />
-
-<table width="90%" id="top-nav" cellspacing="0" cellpadding="0">
-	<colgroup>
-		<col width="12%"/>
-		<col width="12%"/>
-		<col width="*"/>
-	</colgroup>
-	<tr>
-	    <#if content.prev??>
-		<td align="left">
-		<a href="${content.prev}">
-			<span class="vector-font"><i class="fa fa-arrow-circle-left" aria-hidden="true"></i></span>
-			<span style="position:relative;top:-2px;">Previous</span>
-		</a>
-		</td>
-	    </#if>
-
-	    <#if content.next??>
-		<td align="left">
-		<a href="${content.next}">
-			<span class=" vector-font"><i class="fa fa-arrow-circle-right vector-font" aria-hidden="true"></i></span>
-			<span style="position:relative;top:-2px;">Next</span>
-		</a>
-		</td>
-	    </#if>
-
-		<td align="right">
-		<a href="toc.html">
-			<span class=" vector-font"><i class="fa fa-list vector-font" aria-hidden="true"></i></span>
-			<span style="position:relative;top:-2px;">Contents</span>
-		</a>
-		</td>
-	</tr>
-</table>
-
diff --git a/docs/ha-administration-guide/src/main/jbake/templates/menu.ftl b/docs/ha-administration-guide/src/main/jbake/templates/menu.ftl
deleted file mode 100644
index 888c03d..0000000
--- a/docs/ha-administration-guide/src/main/jbake/templates/menu.ftl
+++ /dev/null
@@ -1 +0,0 @@
-<#-- a menu bar template fragment included in the page template -->
\ No newline at end of file
diff --git a/docs/ha-administration-guide/src/main/jbake/templates/page.ftl b/docs/ha-administration-guide/src/main/jbake/templates/page.ftl
deleted file mode 100644
index eca51db..0000000
--- a/docs/ha-administration-guide/src/main/jbake/templates/page.ftl
+++ /dev/null
@@ -1,8 +0,0 @@
-<#-- a top level page layout template -->
-
-<#include "header.ftl">
-<#include "menu.ftl">
-
-${content.body}
-
-<#include "footer.ftl">
\ No newline at end of file
diff --git a/docs/installation-guide/README.md b/docs/installation-guide/README.md
deleted file mode 100644
index a3ec2b6..0000000
--- a/docs/installation-guide/README.md
+++ /dev/null
@@ -1,77 +0,0 @@
-# A JBake project template
-
-## About JBake
-
-JBake is a static site generator, it's inspired from jekyll and written
-in java.  The basic idea is to have templates for the structure of the
-page, and the body generated from asciidoc content.
-
-## Pre requisites
-
-- Maven
-- JDK8+
-
-Deploying to Github will require password less authentication.
-
-This is done by exporting your SSH public key into your Github account.
-
-## Build the site locally
-
-The site is generated under target/staging.
-
-Open file:///PATH_TO_PROJECT_DIR/target/staging in a browser to view the site.
-
-```
-mvn generate-resources
-```
-
-Or you can invoke the JBake plugin directly.
-
-```
-mvn jbake:build
-```
-
-### Rebuild the site on changes
-
-```
-mvn jbake:watch
-```
-
-If you keep this command running, changes to the sources will be
-detected and the site will be rendered incrementally.
-
-This is convenient when writing content.
-
-### Serve the site locally
-
-```
-mvn jbake:serve
-```
-
-If a webserver is required (e.g. absolute path are used), this command
-will start a webserver (jetty) at http://localhost:8820.  It will also
-watch for changes and rebuild incrementally.
-
-## Deploy the site to Github Pages
-
-```
-mvn deploy
-```
-
-## Produce a zip file for download
-
-To produce a zip file containing the generated html files, use:
-
-```
-mvn package
-```
-
-When making a release on GitHub, this zip file should be added to the release.
-
-## Links
-
-- [JBake maven plugin documentation](https://github.com/Blazebit/jbake-maven-plugin)
-- [JBake documentation](http://jbake.org/docs/2.5.1)
-- [Freemarker documentation](http://freemarker.org/docs)
-- [AsciiDoc User Guide](http://asciidoc.org/userguide.html)
-- [Asciidoctor quick reference](http://asciidoctor.org/docs/asciidoc-syntax-quick-reference)
diff --git a/docs/installation-guide/pom.xml b/docs/installation-guide/pom.xml
index 0912514..8827aa1 100644
--- a/docs/installation-guide/pom.xml
+++ b/docs/installation-guide/pom.xml
@@ -25,7 +25,6 @@
         <version>7.0.0-SNAPSHOT</version>
         <relativePath>../parent</relativePath>
     </parent>
-    <groupId>org.glassfish.docs</groupId>
     <artifactId>installation-guide</artifactId>
     <packaging>jar</packaging>
     <name>Eclipse GlassFish Server Installation Guide, Release 7</name>
diff --git a/docs/quick-start-guide/src/main/jbake/assets/img/eclipse_foundation_logo_tiny.png b/docs/installation-guide/src/main/asciidoc/img/eclipse_foundation_logo_tiny.png
similarity index 100%
copy from docs/quick-start-guide/src/main/jbake/assets/img/eclipse_foundation_logo_tiny.png
copy to docs/installation-guide/src/main/asciidoc/img/eclipse_foundation_logo_tiny.png
Binary files differ
diff --git a/docs/installation-guide/src/main/jbake/content/installing.adoc b/docs/installation-guide/src/main/asciidoc/installing.adoc
similarity index 100%
rename from docs/installation-guide/src/main/jbake/content/installing.adoc
rename to docs/installation-guide/src/main/asciidoc/installing.adoc
diff --git a/docs/installation-guide/src/main/jbake/content/lot.adoc b/docs/installation-guide/src/main/asciidoc/lot.adoc
similarity index 100%
rename from docs/installation-guide/src/main/jbake/content/lot.adoc
rename to docs/installation-guide/src/main/asciidoc/lot.adoc
diff --git a/docs/installation-guide/src/main/jbake/content/preface.adoc b/docs/installation-guide/src/main/asciidoc/preface.adoc
similarity index 100%
rename from docs/installation-guide/src/main/jbake/content/preface.adoc
rename to docs/installation-guide/src/main/asciidoc/preface.adoc
diff --git a/docs/installation-guide/src/main/jbake/content/title.adoc b/docs/installation-guide/src/main/asciidoc/title.adoc
similarity index 95%
rename from docs/installation-guide/src/main/jbake/content/title.adoc
rename to docs/installation-guide/src/main/asciidoc/title.adoc
index e729cb4..3fdb155 100644
--- a/docs/installation-guide/src/main/jbake/content/title.adoc
+++ b/docs/installation-guide/src/main/asciidoc/title.adoc
@@ -42,3 +42,5 @@
 Opteron, the AMD logo, and the AMD Opteron logo are trademarks or
 registered trademarks of Advanced Micro Devices. UNIX is a registered
 trademark of The Open Group.
+
+image:img/eclipse_foundation_logo_tiny.png["Eclipse Logo"]
diff --git a/docs/installation-guide/src/main/jbake/content/uninstalling.adoc b/docs/installation-guide/src/main/asciidoc/uninstalling.adoc
similarity index 100%
rename from docs/installation-guide/src/main/jbake/content/uninstalling.adoc
rename to docs/installation-guide/src/main/asciidoc/uninstalling.adoc
diff --git a/docs/installation-guide/src/main/jbake/assets/css/style.css b/docs/installation-guide/src/main/jbake/assets/css/style.css
deleted file mode 100644
index 25a16e4..0000000
--- a/docs/installation-guide/src/main/jbake/assets/css/style.css
+++ /dev/null
@@ -1,315 +0,0 @@
-/* CSS */
-/*! normalize.css v3.0.2 | MIT License | git.io/normalize */
-/** 1. Set default font family to sans-serif. 2. Prevent iOS text size adjust after orientation change, without disabling user zoom. */
-html { font-family: sans-serif; /* 1 */ -ms-text-size-adjust: 100%; /* 2 */ -webkit-text-size-adjust: 100%; /* 2 */ }
-
-/* HTML5 display definitions ========================================================================== */
-/** Correct `block` display not defined for any HTML5 element in IE 8/9. Correct `block` display not defined for `details` or `summary` in IE 10/11 and Firefox. Correct `block` display not defined for `main` in IE 11. */
-article, aside, details, figcaption, figure, footer, header, hgroup, main, menu, nav, section, summary { display: block; }
-
-/** 1. Correct `inline-block` display not defined in IE 8/9. 2. Normalize vertical alignment of `progress` in Chrome, Firefox, and Opera. */
-audio, canvas, progress, video { display: inline-block; /* 1 */ vertical-align: baseline; /* 2 */ }
-
-/** Prevent modern browsers from displaying `audio` without controls. Remove excess height in iOS 5 devices. */
-audio:not([controls]) { display: none; height: 0; }
-
-/** Address `[hidden]` styling not present in IE 8/9/10. Hide the `template` element in IE 8/9/11, Safari, and Firefox < 22. */
-[hidden], template { display: none; }
-
-/* Links ========================================================================== */
-/** Remove the gray background color from active links in IE 10. */
-a { background-color: transparent; }
-
-/** Improve readability when focused and also mouse hovered in all browsers. */
-a:active, a:hover { outline: 0; }
-
-/* Text-level semantics ========================================================================== */
-/** Address styling not present in IE 8/9/10/11, Safari, and Chrome. */
-abbr[title] { border-bottom: 1px dotted; }
-
-/** Address style set to `bolder` in Firefox 4+, Safari, and Chrome. */
-b, strong { font-weight: bold; }
-
-/** Address styling not present in Safari and Chrome. */
-dfn { font-style: italic; }
-
-/** Address variable `h1` font-size and margin within `section` and `article` contexts in Firefox 4+, Safari, and Chrome. */
-h1 { font-size: 2em; margin: 0.67em 0; }
-
-/** Address styling not present in IE 8/9. */
-mark { background: #ff0; color: #000; }
-
-/** Address inconsistent and variable font size in all browsers. */
-small { font-size: 80%; }
-
-/** Prevent `sub` and `sup` affecting `line-height` in all browsers. */
-sub, sup { font-size: 75%; line-height: 0; position: relative; vertical-align: baseline; }
-
-sup { top: -0.5em; }
-
-sub { bottom: -0.25em; }
-
-/* Embedded content ========================================================================== */
-/** Remove border when inside `a` element in IE 8/9/10. */
-img { border: 0; }
-
-/** Correct overflow not hidden in IE 9/10/11. */
-svg:not(:root) { overflow: hidden; }
-
-/* Grouping content ========================================================================== */
-/** Address margin not present in IE 8/9 and Safari. */
-figure { margin: 1em 40px; }
-
-/** Address differences between Firefox and other browsers. */
-hr { box-sizing: content-box; height: 0; }
-
-/** Contain overflow in all browsers. */
-pre { overflow: auto; }
-
-/** Address odd `em`-unit font size rendering in all browsers. */
-code, kbd, pre, samp { font-family: monospace, monospace; font-size: 1em; }
-
-/* Forms ========================================================================== */
-/** Known limitation: by default, Chrome and Safari on OS X allow very limited styling of `select`, unless a `border` property is set. */
-/** 1. Correct color not being inherited. Known issue: affects color of disabled elements. 2. Correct font properties not being inherited. 3. Address margins set differently in Firefox 4+, Safari, and Chrome. */
-button, input, optgroup, select, textarea { color: inherit; /* 1 */ font: inherit; /* 2 */ margin: 0; /* 3 */ }
-
-/** Address `overflow` set to `hidden` in IE 8/9/10/11. */
-button { overflow: visible; }
-
-/** Address inconsistent `text-transform` inheritance for `button` and `select`. All other form control elements do not inherit `text-transform` values. Correct `button` style inheritance in Firefox, IE 8/9/10/11, and Opera. Correct `select` style inheritance in Firefox. */
-button, select { text-transform: none; }
-
-/** 1. Avoid the WebKit bug in Android 4.0.* where (2) destroys native `audio` and `video` controls. 2. Correct inability to style clickable `input` types in iOS. 3. Improve usability and consistency of cursor style between image-type `input` and others. */
-button, html input[type="button"], input[type="reset"], input[type="submit"] { -webkit-appearance: button; /* 2 */ cursor: pointer; /* 3 */ }
-
-/** Re-set default cursor for disabled elements. */
-button[disabled], html input[disabled] { cursor: default; }
-
-/** Remove inner padding and border in Firefox 4+. */
-button::-moz-focus-inner, input::-moz-focus-inner { border: 0; padding: 0; }
-
-/** Address Firefox 4+ setting `line-height` on `input` using `!important` in the UA stylesheet. */
-input { line-height: normal; }
-
-/** It's recommended that you don't attempt to style these elements. Firefox's implementation doesn't respect box-sizing, padding, or width.  1. Address box sizing set to `content-box` in IE 8/9/10. 2. Remove excess padding in IE 8/9/10. */
-input[type="checkbox"], input[type="radio"] { box-sizing: border-box; /* 1 */ padding: 0; /* 2 */ }
-
-/** Fix the cursor style for Chrome's increment/decrement buttons. For certain `font-size` values of the `input`, it causes the cursor style of the decrement button to change from `default` to `text`. */
-input[type="number"]::-webkit-inner-spin-button, input[type="number"]::-webkit-outer-spin-button { height: auto; }
-
-/** 1. Address `appearance` set to `searchfield` in Safari and Chrome. 2. Address `box-sizing` set to `border-box` in Safari and Chrome (include `-moz` to future-proof). */
-input[type="search"] { -webkit-appearance: textfield; /* 1 */ /* 2 */ box-sizing: content-box; }
-
-/** Remove inner padding and search cancel button in Safari and Chrome on OS X. Safari (but not Chrome) clips the cancel button when the search input has padding (and `textfield` appearance). */
-input[type="search"]::-webkit-search-cancel-button, input[type="search"]::-webkit-search-decoration { -webkit-appearance: none; }
-
-/** Define consistent border, margin, and padding. */
-fieldset { border: 1px solid #c0c0c0; margin: 0 2px; padding: 0.35em 0.625em 0.75em; }
-
-/** 1. Correct `color` not being inherited in IE 8/9/10/11. 2. Remove padding so people aren't caught out if they zero out fieldsets. */
-legend { border: 0; /* 1 */ padding: 0; /* 2 */ }
-
-/** Remove default vertical scrollbar in IE 8/9/10/11. */
-textarea { overflow: auto; }
-
-/** Don't inherit the `font-weight` (applied by a rule above). NOTE: the default cannot safely be changed in Chrome and Safari on OS X. */
-optgroup { font-weight: bold; }
-
-/* Tables ========================================================================== */
-/** Remove most spacing between table cells. */
-table { border-collapse: collapse; border-spacing: 0; }
-
-td, th { padding: 0; }
-
-/* LAYOUT STYLES */
-
-p { margin-top: 0; }
-
-code, pre { margin-bottom: 30px; font-family: Monaco, "Bitstream Vera Sans Mono", "Lucida Console", Terminal, monospace; font-size: 13px; color: #222; }
-
-code { padding: 0 3px; background-color: #f2f8fc; border: solid 1px #dbe7f3; }
-
-pre { padding: 20px; overflow: auto; text-shadow: none; background: #fff; border: solid 1px #f2f2f2; }
-
-pre code { padding: 0; color: #2879d0; background-color: #fff; border: none; }
-
-ul, ol, dl { margin-bottom: 20px; }
-
-/* COMMON STYLES */
-
-td.halign-right { text-align: right; } 
-
-td.halign-center { text-align: center; } 
-
-form { padding: 20px; background: #f2f2f2; }
-
-h2 { 
-   font-size: 2em;
-   line-height: 1.2em;
-   font-weight: 200;
-   letter-spacing: 0;
-}
-
-h3 { 
-   font-size: 1.4em;
-   line-height: 1.2em;
-   font-weight: normal;
-   letter-spacing: 0;
-}
-
-.sect1 {
-   margin-left: 4%;
-   margin-right: 4%;
-   font: 13px/20px Arial, Helvetica, sans-serif  
-}
-
-a:link {
-   text-decoration: none;
-   color: #09569d;
-}
-
-#preamble hr{
-   margin-left: 0%;
-   margin-right: 0%;
-}
-
-#preamble .sectionbody table  {
-   font-weight: 200;
-   margin-left: 4%;
-   margin-right: 4%;
-}
-
-hr {
-   margin-bottom: 12px;
-}
-
-table.tableblock.frame-all.grid-all.spread {
-   font-size: 12px;
-}
-
-code {
-   font-size:.9em;
-   border: 1px solid #eaeaea;
-   background-color: #f6f6f6;
-   border-radius: 3px;
-   padding: 1px;
-   padding-left:2px;
-   padding-right:2px;
-}
-
-pre.prettyprint.highlight {
-   border: 1px solid #eaeaea;
-   background-color: #f6f6f6;
-   border-radius: 4px;
-   padding: 8px;
-   padding-top:4px;
-   padding-bottom:4px;
-}
-
-.language-oac_no_warn {
-   font-size:.9em;
-   color:#222;
-   background-color: transparent;
-}
-
-#doc-title {
-   margin-left: 4%;
-}
-
-#top-nav {
-   margin-left: 4%;
-   font-size: 12px;
-}
-
-#bottom-nav {
-   margin-left: 4%;
-   font-size: 12px;
-}
-
-.vector-font {
-   color:grey; 
-   font-size: 20px;
-}
-
-#copyright {
-   padding-top: 10px;
-   padding-bottom: 4px;
-   display: table;
-   margin:0 auto;
-   color: grey;
-   font-size: 12px;
-   vertical-align: middle;
-}
-
-.beta {color: #FF0000}
-
-/* GENERAL ELEMENT TYPE STYLES */
-
-/* #Media Queries
-================================================== */
-/* Smaller than standard 960 (devices and browsers) */
-/* Tablet Portrait size to standard 960 (devices and browsers) */
-@media only screen and (min-width: 768px) and (max-width: 959px) { .inner { width: 740px; }
-  header h1, header h2 { width: 340px; }
-  header h1 { font-size: 60px; }
-  header h2 { font-size: 30px; }
-}
-/* All Mobile Sizes (devices and browser) */
-@media only screen and (max-width: 767px) { .inner { width: 93%; }
-  header { padding: 20px 0; }
-  header .inner { position: relative; }
-  header h1, header h2 { width: 100%; }
-  header h1 { font-size: 48px; }
-  header h2 { font-size: 24px; }
-  header a.button { position: relative; display: inline-block; width: auto; height: auto; padding: 5px 10px; margin-top: 15px; font-size: 13px; line-height: 1; color: #2879d0; text-align: center; background-color: #9ddcff; background-image: none; border-radius: 5px; -moz-border-radius: 5px; -webkit-border-radius: 5px; }
-  header a.button small { display: inline; font-size: 13px; }
-}
-/* Mobile Landscape Size to Tablet Portrait (devices and browsers) */
-/* Mobile Portrait Size to Mobile Landscape Size (devices and browsers) */
-
-header h1 { padding-top: 14px; font-size: 2em; font-weight: 200; line-height: 1.4; color: #FFFFFF; letter-spacing: 0px; border-bottom: 0px; }
-
-header h2 { font-size: 1.2em; margin-top: 0; margin-bottom: 0; font-weight: 200; line-height: .8; color: #ec7D11; letter-spacing: 0; }
-
-/*
-header a.button { background: transparent url(../images/logo.png) 0 0 no-repeat; padding-left: 32px; }
-*/
-
-header a:hover { text-decoration: none; }
-
-/* Admonition (Note) block */
-.admonitionblock > table {
-  border: 0;
-  background: none;
-  width: 100%;
-  table-layout: auto;
-  margin-bottom: 10.5px;
-}
-.admonitionblock > table td.icon {
-  text-align: center;
-  width: 60px;
-}
-.admonitionblock > table td.icon img {
-  max-width: none;
-}
-.admonitionblock > table td.icon .title {
-  text-transform: uppercase;
-}
-.admonitionblock > table td.content {
-  padding-left: 1em;
-  padding-right: 1em;
-  border-left: 3px solid #ddd;
-}
-.admonitionblock > table td.content > :last-child > :last-child {
-  margin-bottom: 0;
-}
-.admonitionblock td.icon [class^="fa icon-"]:before {
-  font-size: 2.5em;
-  text-shadow: 1px 1px 2px rgba(0, 0, 0, 0.5);
-  cursor: default;
-}
-.admonitionblock td.icon .icon-note:before {
-  content: "\f05a";
-  color: #5bc0de;
-}
diff --git a/docs/installation-guide/src/main/jbake/jbake.properties b/docs/installation-guide/src/main/jbake/jbake.properties
deleted file mode 100644
index 546d09c..0000000
--- a/docs/installation-guide/src/main/jbake/jbake.properties
+++ /dev/null
@@ -1,7 +0,0 @@
-site.host=http://jbake.org
-render.tags=false
-render.sitemap=false
-render.archive=false
-render.feed=false
-asciidoctor.option.safe=0
-asciidoctor.attributes.export=true
diff --git a/docs/installation-guide/src/main/jbake/templates/footer.ftl b/docs/installation-guide/src/main/jbake/templates/footer.ftl
deleted file mode 100644
index 6f2b09e..0000000
--- a/docs/installation-guide/src/main/jbake/templates/footer.ftl
+++ /dev/null
@@ -1,46 +0,0 @@
-<#-- a footer template fragment included in the page template -->
-<hr />
-
-<table width="90%" id="bottom-nav" cellspacing="0" cellpadding="0">
-	<colgroup>
-		<col width="12%"/>
-		<col width="12%"/>
-		<col width="*"/>
-	</colgroup>
-	<tr>		
-	    <#if content.prev??>
-		<td align="left">
-		<a href="${content.prev}">
-			<span class=" vector-font"><i class="fa fa-arrow-circle-left" aria-hidden="true"></i></span>
-			<span style="position:relative;top:-2px;">Previous</span>
-		</a>
-		</td>
-		</#if>
-
-		<#if content.next??>
-		<td align="left">
-		<a href="${content.next}">
-			<span class="vector-font"><i class="fa fa-arrow-circle-right vector-font" aria-hidden="true"></i></span>
-			<span style="position:relative;top:-2px;">Next</span>
-		</a>
-		</td>
-		</#if>
-
-		<td align="right">
-		<a href="toc.html">
-			<span class="vector-font"><i class="fa fa-list vector-font" aria-hidden="true"></i></span>
-			<span style="position:relative;top:-2px;">Contents</span>
-		</a>
-		</td>
-	</tr>
-</table>
-
-<span id="copyright">
-        <img src="img/eclipse_foundation_logo_tiny.png" height="20px" alt="Eclipse Foundation Logo" align="top"/>&nbsp;            
-        <span >Copyright&nbsp;&copy;&nbsp;2019,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</span>
-</span>
-
-<p align="center" class="beta">${config.status!}</p>
-
-</body>
-</html>
diff --git a/docs/installation-guide/src/main/jbake/templates/header.ftl b/docs/installation-guide/src/main/jbake/templates/header.ftl
deleted file mode 100644
index 82ebb36..0000000
--- a/docs/installation-guide/src/main/jbake/templates/header.ftl
+++ /dev/null
@@ -1,55 +0,0 @@
-<!DOCTYPE html>
-<#-- a header template fragment included in the page template -->
-<html lang="en">
-  <head>
-    <meta charset="utf-8"/>
-    <title><#if (content.title)??><#escape x as x?xml>${content.title}</#escape></#if></title>
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <link href="<#if (content.rootpath)??>${content.rootpath}<#else></#if>css/style.css" rel="stylesheet">
-    <script src="https://use.fontawesome.com/96c4d89611.js"></script>
-  </head>
-  <body>
-<table id="doc-title" cellspacing="0" cellpadding="0">
-  <tr>
-  <td align="left" valign="top">
-  <b>${content.title}</b><br />
-      <p class="beta">${config.status!}</p>
-  </td>
-  </tr>
-</table>
-<hr />
-
-<table width="90%" id="top-nav" cellspacing="0" cellpadding="0">
-	<colgroup>
-		<col width="12%"/>
-		<col width="12%"/>
-		<col width="*"/>
-	</colgroup>
-	<tr>
-	    <#if content.prev??>
-		<td align="left">
-		<a href="${content.prev}">
-			<span class="vector-font"><i class="fa fa-arrow-circle-left" aria-hidden="true"></i></span>
-			<span style="position:relative;top:-2px;">Previous</span>
-		</a>
-		</td>
-	    </#if>
-
-	    <#if content.next??>
-		<td align="left">
-		<a href="${content.next}">
-			<span class=" vector-font"><i class="fa fa-arrow-circle-right vector-font" aria-hidden="true"></i></span>
-			<span style="position:relative;top:-2px;">Next</span>
-		</a>
-		</td>
-	    </#if>
-
-		<td align="right">
-		<a href="toc.html">
-			<span class=" vector-font"><i class="fa fa-list vector-font" aria-hidden="true"></i></span>
-			<span style="position:relative;top:-2px;">Contents</span>
-		</a>
-		</td>
-	</tr>
-</table>
-
diff --git a/docs/installation-guide/src/main/jbake/templates/menu.ftl b/docs/installation-guide/src/main/jbake/templates/menu.ftl
deleted file mode 100644
index 888c03d..0000000
--- a/docs/installation-guide/src/main/jbake/templates/menu.ftl
+++ /dev/null
@@ -1 +0,0 @@
-<#-- a menu bar template fragment included in the page template -->
\ No newline at end of file
diff --git a/docs/installation-guide/src/main/jbake/templates/page.ftl b/docs/installation-guide/src/main/jbake/templates/page.ftl
deleted file mode 100644
index eca51db..0000000
--- a/docs/installation-guide/src/main/jbake/templates/page.ftl
+++ /dev/null
@@ -1,8 +0,0 @@
-<#-- a top level page layout template -->
-
-<#include "header.ftl">
-<#include "menu.ftl">
-
-${content.body}
-
-<#include "footer.ftl">
\ No newline at end of file
diff --git a/docs/parent/pom.xml b/docs/parent/pom.xml
index 357ebf4..261b917 100644
--- a/docs/parent/pom.xml
+++ b/docs/parent/pom.xml
@@ -30,11 +30,9 @@
     <name>Eclipse GlassFish Documentation parent pom</name>
 
     <properties>
-        <site.output.dir>${project.build.directory}/staging/${project.artifactId}</site.output.dir>
         <maven.site.skip>true</maven.site.skip>
         <maven.deploy.skip>true</maven.deploy.skip>
         <asciidoctor.maven.plugin.version>2.2.1</asciidoctor.maven.plugin.version>
-        <!-- XXX - jbake needs an older version than this -->
         <asciidoctorj.version>2.5.2</asciidoctorj.version>
         <asciidoctorj.pdf.version>1.6.0</asciidoctorj.pdf.version>
         <jruby.version>9.3.2.0</jruby.version>
@@ -43,6 +41,7 @@
         <pdf.fileName>${project.artifactId}.pdf</pdf.fileName>
         <pdf.toclevels>2</pdf.toclevels>
         <productName>Eclipse GlassFish</productName>
+        <bookDirectory>${project.build.directory}/book</bookDirectory>
     </properties>
 
     <build>
@@ -50,6 +49,9 @@
             <plugin>
                 <groupId>org.glassfish.doc</groupId>
                 <artifactId>glassfish-doc-maven-plugin</artifactId>
+                <configuration>
+                    <sourceDirectory>src/main/asciidoc</sourceDirectory>
+                </configuration>
                 <executions>
                     <!-- Filtering - uses properties directly -->
                     <execution>
@@ -61,6 +63,7 @@
                     </execution>
                 </executions>
             </plugin>
+
             <plugin>
                 <groupId>org.asciidoctor</groupId>
                 <artifactId>asciidoctor-maven-plugin</artifactId>
@@ -93,21 +96,22 @@
                         <idprefix />
                         <idseparator>-</idseparator>
                         <docinfo1>true</docinfo1>
-                        <imagesDir>${basedir}/src/main/jbake/assets</imagesDir>
+                        <imagesDir>${basedir}/src/main/asciidoc</imagesDir>
                         <productName>${productName}</productName>
                     </attributes>
                 </configuration>
                 <executions>
                     <execution>
                         <id>generate-html-doc</id>
-                        <phase>generate-resources</phase>
+                        <phase>compile</phase>
                         <goals>
                             <goal>process-asciidoc</goal>
                         </goals>
                         <configuration>
                             <backend>html</backend>
-                            <sourceDirectory>${project.build.directory}/book</sourceDirectory>
+                            <sourceDirectory>${bookDirectory}</sourceDirectory>
                             <sourceDocumentName>book.adoc</sourceDocumentName>
+                            <outputDirectory>${project.build.directory}/html</outputDirectory>
                             <attributes>
                                 <linkcss>true</linkcss>
                                 <toc>left</toc>
@@ -118,17 +122,18 @@
                     </execution>
                     <execution>
                         <id>generate-pdf-doc</id>
-                        <phase>generate-resources</phase>
+                        <phase>compile</phase>
                         <goals>
                             <goal>process-asciidoc</goal>
                         </goals>
                         <configuration>
                             <backend>pdf</backend>
-                            <sourceDirectory>${project.build.directory}/book</sourceDirectory>
+                            <sourceDirectory>${bookDirectory}</sourceDirectory>
                             <sourceDocumentName>book.adoc</sourceDocumentName>
+                            <outputDirectory>${project.build.directory}/pdf</outputDirectory>
                             <outputFile>${pdf.fileName}</outputFile>
                             <attributes>
-                                 <!-- XXX - a kludge to allow theme to be shared -->
+                                 <!-- TODO - sharing themes and other files should be done as a dependency -->
                                 <pdf-stylesdir>${project.basedir}/../parent/src/theme</pdf-stylesdir>
                                 <pdf-style>glassfish</pdf-style>
                                 <doctype>book</doctype>
@@ -140,6 +145,7 @@
                     </execution>
                 </executions>
             </plugin>
+
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>build-helper-maven-plugin</artifactId>
@@ -153,7 +159,7 @@
                         <configuration>
                             <artifacts>
                                 <artifact>
-                                    <file>${project.build.directory}/generated-docs/${pdf.fileName}</file>
+                                    <file>${project.build.directory}/pdf/${pdf.fileName}</file>
                                     <type>pdf</type>
                                 </artifact>
                             </artifacts>
@@ -164,8 +170,7 @@
             <plugin>
                 <artifactId>maven-jar-plugin</artifactId>
                 <configuration>
-                    <finalName>${project.artifactId}</finalName>
-                    <classesDirectory>${project.build.directory}/staging</classesDirectory>
+                    <classesDirectory>${project.build.directory}/html</classesDirectory>
                 </configuration>
             </plugin>
         </plugins>
diff --git a/docs/parent/src/main/jbake/content/title.adoc b/docs/parent/src/main/asciidoc/title.adoc
similarity index 100%
rename from docs/parent/src/main/jbake/content/title.adoc
rename to docs/parent/src/main/asciidoc/title.adoc
diff --git a/docs/parent/src/main/jbake/jbake.properties b/docs/parent/src/main/jbake/jbake.properties
deleted file mode 100644
index 04823fb..0000000
--- a/docs/parent/src/main/jbake/jbake.properties
+++ /dev/null
@@ -1,7 +0,0 @@
-site.host=http://jbake.org
-render.tags=false
-render.sitemap=false
-render.archive=false
-render.feed=false
-asciidoctor.option.safe=0
-asciidoctor.attributes.export=true
\ No newline at end of file
diff --git a/docs/parent/src/main/jbake/templates/page.ftl b/docs/parent/src/main/jbake/templates/page.ftl
deleted file mode 100644
index e69de29..0000000
--- a/docs/parent/src/main/jbake/templates/page.ftl
+++ /dev/null
diff --git a/docs/performance-tuning-guide/README.md b/docs/performance-tuning-guide/README.md
deleted file mode 100644
index a3ec2b6..0000000
--- a/docs/performance-tuning-guide/README.md
+++ /dev/null
@@ -1,77 +0,0 @@
-# A JBake project template
-
-## About JBake
-
-JBake is a static site generator, it's inspired from jekyll and written
-in java.  The basic idea is to have templates for the structure of the
-page, and the body generated from asciidoc content.
-
-## Pre requisites
-
-- Maven
-- JDK8+
-
-Deploying to Github will require password less authentication.
-
-This is done by exporting your SSH public key into your Github account.
-
-## Build the site locally
-
-The site is generated under target/staging.
-
-Open file:///PATH_TO_PROJECT_DIR/target/staging in a browser to view the site.
-
-```
-mvn generate-resources
-```
-
-Or you can invoke the JBake plugin directly.
-
-```
-mvn jbake:build
-```
-
-### Rebuild the site on changes
-
-```
-mvn jbake:watch
-```
-
-If you keep this command running, changes to the sources will be
-detected and the site will be rendered incrementally.
-
-This is convenient when writing content.
-
-### Serve the site locally
-
-```
-mvn jbake:serve
-```
-
-If a webserver is required (e.g. absolute path are used), this command
-will start a webserver (jetty) at http://localhost:8820.  It will also
-watch for changes and rebuild incrementally.
-
-## Deploy the site to Github Pages
-
-```
-mvn deploy
-```
-
-## Produce a zip file for download
-
-To produce a zip file containing the generated html files, use:
-
-```
-mvn package
-```
-
-When making a release on GitHub, this zip file should be added to the release.
-
-## Links
-
-- [JBake maven plugin documentation](https://github.com/Blazebit/jbake-maven-plugin)
-- [JBake documentation](http://jbake.org/docs/2.5.1)
-- [Freemarker documentation](http://freemarker.org/docs)
-- [AsciiDoc User Guide](http://asciidoc.org/userguide.html)
-- [Asciidoctor quick reference](http://asciidoctor.org/docs/asciidoc-syntax-quick-reference)
diff --git a/docs/performance-tuning-guide/pom.xml b/docs/performance-tuning-guide/pom.xml
index ddbdf27..63e0c92 100644
--- a/docs/performance-tuning-guide/pom.xml
+++ b/docs/performance-tuning-guide/pom.xml
@@ -25,7 +25,6 @@
         <version>7.0.0-SNAPSHOT</version>
         <relativePath>../parent</relativePath>
     </parent>
-    <groupId>org.glassfish.docs</groupId>
     <artifactId>performance-tuning-guide</artifactId>
     <packaging>jar</packaging>
     <name>Eclipse GlassFish Server Performance Tuning Guide, Release 7</name>
diff --git a/docs/performance-tuning-guide/src/main/jbake/assets/img/appmodel.png b/docs/performance-tuning-guide/src/main/asciidoc/img/appmodel.png
similarity index 100%
rename from docs/performance-tuning-guide/src/main/jbake/assets/img/appmodel.png
rename to docs/performance-tuning-guide/src/main/asciidoc/img/appmodel.png
Binary files differ
diff --git a/docs/performance-tuning-guide/src/main/jbake/assets/img/eclipse_foundation_logo_tiny.png b/docs/performance-tuning-guide/src/main/asciidoc/img/eclipse_foundation_logo_tiny.png
similarity index 100%
rename from docs/performance-tuning-guide/src/main/jbake/assets/img/eclipse_foundation_logo_tiny.png
rename to docs/performance-tuning-guide/src/main/asciidoc/img/eclipse_foundation_logo_tiny.png
Binary files differ
diff --git a/docs/performance-tuning-guide/src/main/jbake/content/loe.adoc b/docs/performance-tuning-guide/src/main/asciidoc/loe.adoc
similarity index 100%
rename from docs/performance-tuning-guide/src/main/jbake/content/loe.adoc
rename to docs/performance-tuning-guide/src/main/asciidoc/loe.adoc
diff --git a/docs/performance-tuning-guide/src/main/jbake/content/lof.adoc b/docs/performance-tuning-guide/src/main/asciidoc/lof.adoc
similarity index 100%
rename from docs/performance-tuning-guide/src/main/jbake/content/lof.adoc
rename to docs/performance-tuning-guide/src/main/asciidoc/lof.adoc
diff --git a/docs/performance-tuning-guide/src/main/jbake/content/lot.adoc b/docs/performance-tuning-guide/src/main/asciidoc/lot.adoc
similarity index 100%
rename from docs/performance-tuning-guide/src/main/jbake/content/lot.adoc
rename to docs/performance-tuning-guide/src/main/asciidoc/lot.adoc
diff --git a/docs/performance-tuning-guide/src/main/jbake/content/overview.adoc b/docs/performance-tuning-guide/src/main/asciidoc/overview.adoc
similarity index 100%
rename from docs/performance-tuning-guide/src/main/jbake/content/overview.adoc
rename to docs/performance-tuning-guide/src/main/asciidoc/overview.adoc
diff --git a/docs/performance-tuning-guide/src/main/jbake/content/preface.adoc b/docs/performance-tuning-guide/src/main/asciidoc/preface.adoc
similarity index 100%
rename from docs/performance-tuning-guide/src/main/jbake/content/preface.adoc
rename to docs/performance-tuning-guide/src/main/asciidoc/preface.adoc
diff --git a/docs/performance-tuning-guide/src/main/jbake/content/title.adoc b/docs/performance-tuning-guide/src/main/asciidoc/title.adoc
similarity index 95%
rename from docs/performance-tuning-guide/src/main/jbake/content/title.adoc
rename to docs/performance-tuning-guide/src/main/asciidoc/title.adoc
index d224d72..e2b306c 100644
--- a/docs/performance-tuning-guide/src/main/jbake/content/title.adoc
+++ b/docs/performance-tuning-guide/src/main/asciidoc/title.adoc
@@ -41,3 +41,5 @@
 Opteron, the AMD logo, and the AMD Opteron logo are trademarks or
 registered trademarks of Advanced Micro Devices. UNIX is a registered
 trademark of The Open Group.
+
+image:img/eclipse_foundation_logo_tiny.png["Eclipse Logo"]
diff --git a/docs/performance-tuning-guide/src/main/jbake/content/tuning-apps.adoc b/docs/performance-tuning-guide/src/main/asciidoc/tuning-apps.adoc
similarity index 100%
rename from docs/performance-tuning-guide/src/main/jbake/content/tuning-apps.adoc
rename to docs/performance-tuning-guide/src/main/asciidoc/tuning-apps.adoc
diff --git a/docs/performance-tuning-guide/src/main/jbake/content/tuning-glassfish.adoc b/docs/performance-tuning-guide/src/main/asciidoc/tuning-glassfish.adoc
similarity index 100%
rename from docs/performance-tuning-guide/src/main/jbake/content/tuning-glassfish.adoc
rename to docs/performance-tuning-guide/src/main/asciidoc/tuning-glassfish.adoc
diff --git a/docs/performance-tuning-guide/src/main/jbake/content/tuning-java.adoc b/docs/performance-tuning-guide/src/main/asciidoc/tuning-java.adoc
similarity index 100%
rename from docs/performance-tuning-guide/src/main/jbake/content/tuning-java.adoc
rename to docs/performance-tuning-guide/src/main/asciidoc/tuning-java.adoc
diff --git a/docs/performance-tuning-guide/src/main/jbake/content/tuning-os.adoc b/docs/performance-tuning-guide/src/main/asciidoc/tuning-os.adoc
similarity index 100%
rename from docs/performance-tuning-guide/src/main/jbake/content/tuning-os.adoc
rename to docs/performance-tuning-guide/src/main/asciidoc/tuning-os.adoc
diff --git a/docs/performance-tuning-guide/src/main/jbake/assets/css/style.css b/docs/performance-tuning-guide/src/main/jbake/assets/css/style.css
deleted file mode 100644
index 25a16e4..0000000
--- a/docs/performance-tuning-guide/src/main/jbake/assets/css/style.css
+++ /dev/null
@@ -1,315 +0,0 @@
-/* CSS */
-/*! normalize.css v3.0.2 | MIT License | git.io/normalize */
-/** 1. Set default font family to sans-serif. 2. Prevent iOS text size adjust after orientation change, without disabling user zoom. */
-html { font-family: sans-serif; /* 1 */ -ms-text-size-adjust: 100%; /* 2 */ -webkit-text-size-adjust: 100%; /* 2 */ }
-
-/* HTML5 display definitions ========================================================================== */
-/** Correct `block` display not defined for any HTML5 element in IE 8/9. Correct `block` display not defined for `details` or `summary` in IE 10/11 and Firefox. Correct `block` display not defined for `main` in IE 11. */
-article, aside, details, figcaption, figure, footer, header, hgroup, main, menu, nav, section, summary { display: block; }
-
-/** 1. Correct `inline-block` display not defined in IE 8/9. 2. Normalize vertical alignment of `progress` in Chrome, Firefox, and Opera. */
-audio, canvas, progress, video { display: inline-block; /* 1 */ vertical-align: baseline; /* 2 */ }
-
-/** Prevent modern browsers from displaying `audio` without controls. Remove excess height in iOS 5 devices. */
-audio:not([controls]) { display: none; height: 0; }
-
-/** Address `[hidden]` styling not present in IE 8/9/10. Hide the `template` element in IE 8/9/11, Safari, and Firefox < 22. */
-[hidden], template { display: none; }
-
-/* Links ========================================================================== */
-/** Remove the gray background color from active links in IE 10. */
-a { background-color: transparent; }
-
-/** Improve readability when focused and also mouse hovered in all browsers. */
-a:active, a:hover { outline: 0; }
-
-/* Text-level semantics ========================================================================== */
-/** Address styling not present in IE 8/9/10/11, Safari, and Chrome. */
-abbr[title] { border-bottom: 1px dotted; }
-
-/** Address style set to `bolder` in Firefox 4+, Safari, and Chrome. */
-b, strong { font-weight: bold; }
-
-/** Address styling not present in Safari and Chrome. */
-dfn { font-style: italic; }
-
-/** Address variable `h1` font-size and margin within `section` and `article` contexts in Firefox 4+, Safari, and Chrome. */
-h1 { font-size: 2em; margin: 0.67em 0; }
-
-/** Address styling not present in IE 8/9. */
-mark { background: #ff0; color: #000; }
-
-/** Address inconsistent and variable font size in all browsers. */
-small { font-size: 80%; }
-
-/** Prevent `sub` and `sup` affecting `line-height` in all browsers. */
-sub, sup { font-size: 75%; line-height: 0; position: relative; vertical-align: baseline; }
-
-sup { top: -0.5em; }
-
-sub { bottom: -0.25em; }
-
-/* Embedded content ========================================================================== */
-/** Remove border when inside `a` element in IE 8/9/10. */
-img { border: 0; }
-
-/** Correct overflow not hidden in IE 9/10/11. */
-svg:not(:root) { overflow: hidden; }
-
-/* Grouping content ========================================================================== */
-/** Address margin not present in IE 8/9 and Safari. */
-figure { margin: 1em 40px; }
-
-/** Address differences between Firefox and other browsers. */
-hr { box-sizing: content-box; height: 0; }
-
-/** Contain overflow in all browsers. */
-pre { overflow: auto; }
-
-/** Address odd `em`-unit font size rendering in all browsers. */
-code, kbd, pre, samp { font-family: monospace, monospace; font-size: 1em; }
-
-/* Forms ========================================================================== */
-/** Known limitation: by default, Chrome and Safari on OS X allow very limited styling of `select`, unless a `border` property is set. */
-/** 1. Correct color not being inherited. Known issue: affects color of disabled elements. 2. Correct font properties not being inherited. 3. Address margins set differently in Firefox 4+, Safari, and Chrome. */
-button, input, optgroup, select, textarea { color: inherit; /* 1 */ font: inherit; /* 2 */ margin: 0; /* 3 */ }
-
-/** Address `overflow` set to `hidden` in IE 8/9/10/11. */
-button { overflow: visible; }
-
-/** Address inconsistent `text-transform` inheritance for `button` and `select`. All other form control elements do not inherit `text-transform` values. Correct `button` style inheritance in Firefox, IE 8/9/10/11, and Opera. Correct `select` style inheritance in Firefox. */
-button, select { text-transform: none; }
-
-/** 1. Avoid the WebKit bug in Android 4.0.* where (2) destroys native `audio` and `video` controls. 2. Correct inability to style clickable `input` types in iOS. 3. Improve usability and consistency of cursor style between image-type `input` and others. */
-button, html input[type="button"], input[type="reset"], input[type="submit"] { -webkit-appearance: button; /* 2 */ cursor: pointer; /* 3 */ }
-
-/** Re-set default cursor for disabled elements. */
-button[disabled], html input[disabled] { cursor: default; }
-
-/** Remove inner padding and border in Firefox 4+. */
-button::-moz-focus-inner, input::-moz-focus-inner { border: 0; padding: 0; }
-
-/** Address Firefox 4+ setting `line-height` on `input` using `!important` in the UA stylesheet. */
-input { line-height: normal; }
-
-/** It's recommended that you don't attempt to style these elements. Firefox's implementation doesn't respect box-sizing, padding, or width.  1. Address box sizing set to `content-box` in IE 8/9/10. 2. Remove excess padding in IE 8/9/10. */
-input[type="checkbox"], input[type="radio"] { box-sizing: border-box; /* 1 */ padding: 0; /* 2 */ }
-
-/** Fix the cursor style for Chrome's increment/decrement buttons. For certain `font-size` values of the `input`, it causes the cursor style of the decrement button to change from `default` to `text`. */
-input[type="number"]::-webkit-inner-spin-button, input[type="number"]::-webkit-outer-spin-button { height: auto; }
-
-/** 1. Address `appearance` set to `searchfield` in Safari and Chrome. 2. Address `box-sizing` set to `border-box` in Safari and Chrome (include `-moz` to future-proof). */
-input[type="search"] { -webkit-appearance: textfield; /* 1 */ /* 2 */ box-sizing: content-box; }
-
-/** Remove inner padding and search cancel button in Safari and Chrome on OS X. Safari (but not Chrome) clips the cancel button when the search input has padding (and `textfield` appearance). */
-input[type="search"]::-webkit-search-cancel-button, input[type="search"]::-webkit-search-decoration { -webkit-appearance: none; }
-
-/** Define consistent border, margin, and padding. */
-fieldset { border: 1px solid #c0c0c0; margin: 0 2px; padding: 0.35em 0.625em 0.75em; }
-
-/** 1. Correct `color` not being inherited in IE 8/9/10/11. 2. Remove padding so people aren't caught out if they zero out fieldsets. */
-legend { border: 0; /* 1 */ padding: 0; /* 2 */ }
-
-/** Remove default vertical scrollbar in IE 8/9/10/11. */
-textarea { overflow: auto; }
-
-/** Don't inherit the `font-weight` (applied by a rule above). NOTE: the default cannot safely be changed in Chrome and Safari on OS X. */
-optgroup { font-weight: bold; }
-
-/* Tables ========================================================================== */
-/** Remove most spacing between table cells. */
-table { border-collapse: collapse; border-spacing: 0; }
-
-td, th { padding: 0; }
-
-/* LAYOUT STYLES */
-
-p { margin-top: 0; }
-
-code, pre { margin-bottom: 30px; font-family: Monaco, "Bitstream Vera Sans Mono", "Lucida Console", Terminal, monospace; font-size: 13px; color: #222; }
-
-code { padding: 0 3px; background-color: #f2f8fc; border: solid 1px #dbe7f3; }
-
-pre { padding: 20px; overflow: auto; text-shadow: none; background: #fff; border: solid 1px #f2f2f2; }
-
-pre code { padding: 0; color: #2879d0; background-color: #fff; border: none; }
-
-ul, ol, dl { margin-bottom: 20px; }
-
-/* COMMON STYLES */
-
-td.halign-right { text-align: right; } 
-
-td.halign-center { text-align: center; } 
-
-form { padding: 20px; background: #f2f2f2; }
-
-h2 { 
-   font-size: 2em;
-   line-height: 1.2em;
-   font-weight: 200;
-   letter-spacing: 0;
-}
-
-h3 { 
-   font-size: 1.4em;
-   line-height: 1.2em;
-   font-weight: normal;
-   letter-spacing: 0;
-}
-
-.sect1 {
-   margin-left: 4%;
-   margin-right: 4%;
-   font: 13px/20px Arial, Helvetica, sans-serif  
-}
-
-a:link {
-   text-decoration: none;
-   color: #09569d;
-}
-
-#preamble hr{
-   margin-left: 0%;
-   margin-right: 0%;
-}
-
-#preamble .sectionbody table  {
-   font-weight: 200;
-   margin-left: 4%;
-   margin-right: 4%;
-}
-
-hr {
-   margin-bottom: 12px;
-}
-
-table.tableblock.frame-all.grid-all.spread {
-   font-size: 12px;
-}
-
-code {
-   font-size:.9em;
-   border: 1px solid #eaeaea;
-   background-color: #f6f6f6;
-   border-radius: 3px;
-   padding: 1px;
-   padding-left:2px;
-   padding-right:2px;
-}
-
-pre.prettyprint.highlight {
-   border: 1px solid #eaeaea;
-   background-color: #f6f6f6;
-   border-radius: 4px;
-   padding: 8px;
-   padding-top:4px;
-   padding-bottom:4px;
-}
-
-.language-oac_no_warn {
-   font-size:.9em;
-   color:#222;
-   background-color: transparent;
-}
-
-#doc-title {
-   margin-left: 4%;
-}
-
-#top-nav {
-   margin-left: 4%;
-   font-size: 12px;
-}
-
-#bottom-nav {
-   margin-left: 4%;
-   font-size: 12px;
-}
-
-.vector-font {
-   color:grey; 
-   font-size: 20px;
-}
-
-#copyright {
-   padding-top: 10px;
-   padding-bottom: 4px;
-   display: table;
-   margin:0 auto;
-   color: grey;
-   font-size: 12px;
-   vertical-align: middle;
-}
-
-.beta {color: #FF0000}
-
-/* GENERAL ELEMENT TYPE STYLES */
-
-/* #Media Queries
-================================================== */
-/* Smaller than standard 960 (devices and browsers) */
-/* Tablet Portrait size to standard 960 (devices and browsers) */
-@media only screen and (min-width: 768px) and (max-width: 959px) { .inner { width: 740px; }
-  header h1, header h2 { width: 340px; }
-  header h1 { font-size: 60px; }
-  header h2 { font-size: 30px; }
-}
-/* All Mobile Sizes (devices and browser) */
-@media only screen and (max-width: 767px) { .inner { width: 93%; }
-  header { padding: 20px 0; }
-  header .inner { position: relative; }
-  header h1, header h2 { width: 100%; }
-  header h1 { font-size: 48px; }
-  header h2 { font-size: 24px; }
-  header a.button { position: relative; display: inline-block; width: auto; height: auto; padding: 5px 10px; margin-top: 15px; font-size: 13px; line-height: 1; color: #2879d0; text-align: center; background-color: #9ddcff; background-image: none; border-radius: 5px; -moz-border-radius: 5px; -webkit-border-radius: 5px; }
-  header a.button small { display: inline; font-size: 13px; }
-}
-/* Mobile Landscape Size to Tablet Portrait (devices and browsers) */
-/* Mobile Portrait Size to Mobile Landscape Size (devices and browsers) */
-
-header h1 { padding-top: 14px; font-size: 2em; font-weight: 200; line-height: 1.4; color: #FFFFFF; letter-spacing: 0px; border-bottom: 0px; }
-
-header h2 { font-size: 1.2em; margin-top: 0; margin-bottom: 0; font-weight: 200; line-height: .8; color: #ec7D11; letter-spacing: 0; }
-
-/*
-header a.button { background: transparent url(../images/logo.png) 0 0 no-repeat; padding-left: 32px; }
-*/
-
-header a:hover { text-decoration: none; }
-
-/* Admonition (Note) block */
-.admonitionblock > table {
-  border: 0;
-  background: none;
-  width: 100%;
-  table-layout: auto;
-  margin-bottom: 10.5px;
-}
-.admonitionblock > table td.icon {
-  text-align: center;
-  width: 60px;
-}
-.admonitionblock > table td.icon img {
-  max-width: none;
-}
-.admonitionblock > table td.icon .title {
-  text-transform: uppercase;
-}
-.admonitionblock > table td.content {
-  padding-left: 1em;
-  padding-right: 1em;
-  border-left: 3px solid #ddd;
-}
-.admonitionblock > table td.content > :last-child > :last-child {
-  margin-bottom: 0;
-}
-.admonitionblock td.icon [class^="fa icon-"]:before {
-  font-size: 2.5em;
-  text-shadow: 1px 1px 2px rgba(0, 0, 0, 0.5);
-  cursor: default;
-}
-.admonitionblock td.icon .icon-note:before {
-  content: "\f05a";
-  color: #5bc0de;
-}
diff --git a/docs/performance-tuning-guide/src/main/jbake/jbake.properties b/docs/performance-tuning-guide/src/main/jbake/jbake.properties
deleted file mode 100644
index 546d09c..0000000
--- a/docs/performance-tuning-guide/src/main/jbake/jbake.properties
+++ /dev/null
@@ -1,7 +0,0 @@
-site.host=http://jbake.org
-render.tags=false
-render.sitemap=false
-render.archive=false
-render.feed=false
-asciidoctor.option.safe=0
-asciidoctor.attributes.export=true
diff --git a/docs/performance-tuning-guide/src/main/jbake/templates/footer.ftl b/docs/performance-tuning-guide/src/main/jbake/templates/footer.ftl
deleted file mode 100644
index 6f2b09e..0000000
--- a/docs/performance-tuning-guide/src/main/jbake/templates/footer.ftl
+++ /dev/null
@@ -1,46 +0,0 @@
-<#-- a footer template fragment included in the page template -->
-<hr />
-
-<table width="90%" id="bottom-nav" cellspacing="0" cellpadding="0">
-	<colgroup>
-		<col width="12%"/>
-		<col width="12%"/>
-		<col width="*"/>
-	</colgroup>
-	<tr>		
-	    <#if content.prev??>
-		<td align="left">
-		<a href="${content.prev}">
-			<span class=" vector-font"><i class="fa fa-arrow-circle-left" aria-hidden="true"></i></span>
-			<span style="position:relative;top:-2px;">Previous</span>
-		</a>
-		</td>
-		</#if>
-
-		<#if content.next??>
-		<td align="left">
-		<a href="${content.next}">
-			<span class="vector-font"><i class="fa fa-arrow-circle-right vector-font" aria-hidden="true"></i></span>
-			<span style="position:relative;top:-2px;">Next</span>
-		</a>
-		</td>
-		</#if>
-
-		<td align="right">
-		<a href="toc.html">
-			<span class="vector-font"><i class="fa fa-list vector-font" aria-hidden="true"></i></span>
-			<span style="position:relative;top:-2px;">Contents</span>
-		</a>
-		</td>
-	</tr>
-</table>
-
-<span id="copyright">
-        <img src="img/eclipse_foundation_logo_tiny.png" height="20px" alt="Eclipse Foundation Logo" align="top"/>&nbsp;            
-        <span >Copyright&nbsp;&copy;&nbsp;2019,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</span>
-</span>
-
-<p align="center" class="beta">${config.status!}</p>
-
-</body>
-</html>
diff --git a/docs/performance-tuning-guide/src/main/jbake/templates/header.ftl b/docs/performance-tuning-guide/src/main/jbake/templates/header.ftl
deleted file mode 100644
index 82ebb36..0000000
--- a/docs/performance-tuning-guide/src/main/jbake/templates/header.ftl
+++ /dev/null
@@ -1,55 +0,0 @@
-<!DOCTYPE html>
-<#-- a header template fragment included in the page template -->
-<html lang="en">
-  <head>
-    <meta charset="utf-8"/>
-    <title><#if (content.title)??><#escape x as x?xml>${content.title}</#escape></#if></title>
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <link href="<#if (content.rootpath)??>${content.rootpath}<#else></#if>css/style.css" rel="stylesheet">
-    <script src="https://use.fontawesome.com/96c4d89611.js"></script>
-  </head>
-  <body>
-<table id="doc-title" cellspacing="0" cellpadding="0">
-  <tr>
-  <td align="left" valign="top">
-  <b>${content.title}</b><br />
-      <p class="beta">${config.status!}</p>
-  </td>
-  </tr>
-</table>
-<hr />
-
-<table width="90%" id="top-nav" cellspacing="0" cellpadding="0">
-	<colgroup>
-		<col width="12%"/>
-		<col width="12%"/>
-		<col width="*"/>
-	</colgroup>
-	<tr>
-	    <#if content.prev??>
-		<td align="left">
-		<a href="${content.prev}">
-			<span class="vector-font"><i class="fa fa-arrow-circle-left" aria-hidden="true"></i></span>
-			<span style="position:relative;top:-2px;">Previous</span>
-		</a>
-		</td>
-	    </#if>
-
-	    <#if content.next??>
-		<td align="left">
-		<a href="${content.next}">
-			<span class=" vector-font"><i class="fa fa-arrow-circle-right vector-font" aria-hidden="true"></i></span>
-			<span style="position:relative;top:-2px;">Next</span>
-		</a>
-		</td>
-	    </#if>
-
-		<td align="right">
-		<a href="toc.html">
-			<span class=" vector-font"><i class="fa fa-list vector-font" aria-hidden="true"></i></span>
-			<span style="position:relative;top:-2px;">Contents</span>
-		</a>
-		</td>
-	</tr>
-</table>
-
diff --git a/docs/performance-tuning-guide/src/main/jbake/templates/menu.ftl b/docs/performance-tuning-guide/src/main/jbake/templates/menu.ftl
deleted file mode 100644
index 888c03d..0000000
--- a/docs/performance-tuning-guide/src/main/jbake/templates/menu.ftl
+++ /dev/null
@@ -1 +0,0 @@
-<#-- a menu bar template fragment included in the page template -->
\ No newline at end of file
diff --git a/docs/performance-tuning-guide/src/main/jbake/templates/page.ftl b/docs/performance-tuning-guide/src/main/jbake/templates/page.ftl
deleted file mode 100644
index eca51db..0000000
--- a/docs/performance-tuning-guide/src/main/jbake/templates/page.ftl
+++ /dev/null
@@ -1,8 +0,0 @@
-<#-- a top level page layout template -->
-
-<#include "header.ftl">
-<#include "menu.ftl">
-
-${content.body}
-
-<#include "footer.ftl">
\ No newline at end of file
diff --git a/docs/publish/pom.xml b/docs/publish/pom.xml
index 04061b9..8949c61 100644
--- a/docs/publish/pom.xml
+++ b/docs/publish/pom.xml
@@ -24,7 +24,6 @@
         <artifactId>docs</artifactId>
         <version>7.0.0-SNAPSHOT</version>
     </parent>
-    <groupId>org.glassfish.docs</groupId>
     <artifactId>publish</artifactId>
     <packaging>jar</packaging>
     <name>Publish the Eclipse GlassFish Website</name>
diff --git a/docs/quick-start-guide/README.md b/docs/quick-start-guide/README.md
deleted file mode 100644
index a3ec2b6..0000000
--- a/docs/quick-start-guide/README.md
+++ /dev/null
@@ -1,77 +0,0 @@
-# A JBake project template
-
-## About JBake
-
-JBake is a static site generator, it's inspired from jekyll and written
-in java.  The basic idea is to have templates for the structure of the
-page, and the body generated from asciidoc content.
-
-## Pre requisites
-
-- Maven
-- JDK8+
-
-Deploying to Github will require password less authentication.
-
-This is done by exporting your SSH public key into your Github account.
-
-## Build the site locally
-
-The site is generated under target/staging.
-
-Open file:///PATH_TO_PROJECT_DIR/target/staging in a browser to view the site.
-
-```
-mvn generate-resources
-```
-
-Or you can invoke the JBake plugin directly.
-
-```
-mvn jbake:build
-```
-
-### Rebuild the site on changes
-
-```
-mvn jbake:watch
-```
-
-If you keep this command running, changes to the sources will be
-detected and the site will be rendered incrementally.
-
-This is convenient when writing content.
-
-### Serve the site locally
-
-```
-mvn jbake:serve
-```
-
-If a webserver is required (e.g. absolute path are used), this command
-will start a webserver (jetty) at http://localhost:8820.  It will also
-watch for changes and rebuild incrementally.
-
-## Deploy the site to Github Pages
-
-```
-mvn deploy
-```
-
-## Produce a zip file for download
-
-To produce a zip file containing the generated html files, use:
-
-```
-mvn package
-```
-
-When making a release on GitHub, this zip file should be added to the release.
-
-## Links
-
-- [JBake maven plugin documentation](https://github.com/Blazebit/jbake-maven-plugin)
-- [JBake documentation](http://jbake.org/docs/2.5.1)
-- [Freemarker documentation](http://freemarker.org/docs)
-- [AsciiDoc User Guide](http://asciidoc.org/userguide.html)
-- [Asciidoctor quick reference](http://asciidoctor.org/docs/asciidoc-syntax-quick-reference)
diff --git a/docs/quick-start-guide/pom.xml b/docs/quick-start-guide/pom.xml
index 7d08efd..116ae4b 100644
--- a/docs/quick-start-guide/pom.xml
+++ b/docs/quick-start-guide/pom.xml
@@ -25,7 +25,6 @@
         <version>7.0.0-SNAPSHOT</version>
         <relativePath>../parent</relativePath>
     </parent>
-    <groupId>org.glassfish.docs</groupId>
     <artifactId>quick-start-guide</artifactId>
     <packaging>jar</packaging>
     <name>Eclipse GlassFish Server Quick Start Guide, Release 7</name>
diff --git a/docs/quick-start-guide/src/main/jbake/content/basic-features.adoc b/docs/quick-start-guide/src/main/asciidoc/basic-features.adoc
similarity index 100%
rename from docs/quick-start-guide/src/main/jbake/content/basic-features.adoc
rename to docs/quick-start-guide/src/main/asciidoc/basic-features.adoc
diff --git a/docs/quick-start-guide/src/main/jbake/assets/img/eclipse_foundation_logo_tiny.png b/docs/quick-start-guide/src/main/asciidoc/img/eclipse_foundation_logo_tiny.png
similarity index 100%
rename from docs/quick-start-guide/src/main/jbake/assets/img/eclipse_foundation_logo_tiny.png
rename to docs/quick-start-guide/src/main/asciidoc/img/eclipse_foundation_logo_tiny.png
Binary files differ
diff --git a/docs/quick-start-guide/src/main/jbake/assets/img/oracle-db-config.png b/docs/quick-start-guide/src/main/asciidoc/img/oracle-db-config.png
similarity index 100%
rename from docs/quick-start-guide/src/main/jbake/assets/img/oracle-db-config.png
rename to docs/quick-start-guide/src/main/asciidoc/img/oracle-db-config.png
Binary files differ
diff --git a/docs/quick-start-guide/src/main/jbake/assets/img/two-instance-cluster-config.png b/docs/quick-start-guide/src/main/asciidoc/img/two-instance-cluster-config.png
similarity index 100%
rename from docs/quick-start-guide/src/main/jbake/assets/img/two-instance-cluster-config.png
rename to docs/quick-start-guide/src/main/asciidoc/img/two-instance-cluster-config.png
Binary files differ
diff --git a/docs/quick-start-guide/src/main/jbake/content/preface.adoc b/docs/quick-start-guide/src/main/asciidoc/preface.adoc
similarity index 100%
rename from docs/quick-start-guide/src/main/jbake/content/preface.adoc
rename to docs/quick-start-guide/src/main/asciidoc/preface.adoc
diff --git a/docs/quick-start-guide/src/main/jbake/content/title.adoc b/docs/quick-start-guide/src/main/asciidoc/title.adoc
similarity index 95%
rename from docs/quick-start-guide/src/main/jbake/content/title.adoc
rename to docs/quick-start-guide/src/main/asciidoc/title.adoc
index a5423a4..ada2a62 100644
--- a/docs/quick-start-guide/src/main/jbake/content/title.adoc
+++ b/docs/quick-start-guide/src/main/asciidoc/title.adoc
@@ -45,3 +45,5 @@
 Opteron, the AMD logo, and the AMD Opteron logo are trademarks or
 registered trademarks of Advanced Micro Devices. UNIX is a registered
 trademark of The Open Group.
+
+image:img/eclipse_foundation_logo_tiny.png["Eclipse Logo"]
diff --git a/docs/quick-start-guide/src/main/jbake/assets/css/style.css b/docs/quick-start-guide/src/main/jbake/assets/css/style.css
deleted file mode 100644
index 29b6b1d..0000000
--- a/docs/quick-start-guide/src/main/jbake/assets/css/style.css
+++ /dev/null
@@ -1,314 +0,0 @@
-/* CSS */
-/*! normalize.css v3.0.2 | MIT License | git.io/normalize */
-/** 1. Set default font family to sans-serif. 2. Prevent iOS text size adjust after orientation change, without disabling user zoom. */
-html { font-family: sans-serif; /* 1 */ -ms-text-size-adjust: 100%; /* 2 */ -webkit-text-size-adjust: 100%; /* 2 */ }
-
-/* HTML5 display definitions ========================================================================== */
-/** Correct `block` display not defined for any HTML5 element in IE 8/9. Correct `block` display not defined for `details` or `summary` in IE 10/11 and Firefox. Correct `block` display not defined for `main` in IE 11. */
-article, aside, details, figcaption, figure, footer, header, hgroup, main, menu, nav, section, summary { display: block; }
-
-/** 1. Correct `inline-block` display not defined in IE 8/9. 2. Normalize vertical alignment of `progress` in Chrome, Firefox, and Opera. */
-audio, canvas, progress, video { display: inline-block; /* 1 */ vertical-align: baseline; /* 2 */ }
-
-/** Prevent modern browsers from displaying `audio` without controls. Remove excess height in iOS 5 devices. */
-audio:not([controls]) { display: none; height: 0; }
-
-/** Address `[hidden]` styling not present in IE 8/9/10. Hide the `template` element in IE 8/9/11, Safari, and Firefox < 22. */
-[hidden], template { display: none; }
-
-/* Links ========================================================================== */
-/** Remove the gray background color from active links in IE 10. */
-a { background-color: transparent; }
-
-/** Improve readability when focused and also mouse hovered in all browsers. */
-a:active, a:hover { outline: 0; }
-
-/* Text-level semantics ========================================================================== */
-/** Address styling not present in IE 8/9/10/11, Safari, and Chrome. */
-abbr[title] { border-bottom: 1px dotted; }
-
-/** Address style set to `bolder` in Firefox 4+, Safari, and Chrome. */
-b, strong { font-weight: bold; }
-
-/** Address styling not present in Safari and Chrome. */
-dfn { font-style: italic; }
-
-/** Address variable `h1` font-size and margin within `section` and `article` contexts in Firefox 4+, Safari, and Chrome. */
-h1 { font-size: 2em; margin: 0.67em 0; }
-
-/** Address styling not present in IE 8/9. */
-mark { background: #ff0; color: #000; }
-
-/** Address inconsistent and variable font size in all browsers. */
-small { font-size: 80%; }
-
-/** Prevent `sub` and `sup` affecting `line-height` in all browsers. */
-sub, sup { font-size: 75%; line-height: 0; position: relative; vertical-align: baseline; }
-
-sup { top: -0.5em; }
-
-sub { bottom: -0.25em; }
-
-/* Embedded content ========================================================================== */
-/** Remove border when inside `a` element in IE 8/9/10. */
-img { border: 0; }
-
-/** Correct overflow not hidden in IE 9/10/11. */
-svg:not(:root) { overflow: hidden; }
-
-/* Grouping content ========================================================================== */
-/** Address margin not present in IE 8/9 and Safari. */
-figure { margin: 1em 40px; }
-
-/** Address differences between Firefox and other browsers. */
-hr { box-sizing: content-box; height: 0; }
-
-/** Contain overflow in all browsers. */
-pre { overflow: auto; }
-
-/** Address odd `em`-unit font size rendering in all browsers. */
-code, kbd, pre, samp { font-family: monospace, monospace; font-size: 1em; }
-
-/* Forms ========================================================================== */
-/** Known limitation: by default, Chrome and Safari on OS X allow very limited styling of `select`, unless a `border` property is set. */
-/** 1. Correct color not being inherited. Known issue: affects color of disabled elements. 2. Correct font properties not being inherited. 3. Address margins set differently in Firefox 4+, Safari, and Chrome. */
-button, input, optgroup, select, textarea { color: inherit; /* 1 */ font: inherit; /* 2 */ margin: 0; /* 3 */ }
-
-/** Address `overflow` set to `hidden` in IE 8/9/10/11. */
-button { overflow: visible; }
-
-/** Address inconsistent `text-transform` inheritance for `button` and `select`. All other form control elements do not inherit `text-transform` values. Correct `button` style inheritance in Firefox, IE 8/9/10/11, and Opera. Correct `select` style inheritance in Firefox. */
-button, select { text-transform: none; }
-
-/** 1. Avoid the WebKit bug in Android 4.0.* where (2) destroys native `audio` and `video` controls. 2. Correct inability to style clickable `input` types in iOS. 3. Improve usability and consistency of cursor style between image-type `input` and others. */
-button, html input[type="button"], input[type="reset"], input[type="submit"] { -webkit-appearance: button; /* 2 */ cursor: pointer; /* 3 */ }
-
-/** Re-set default cursor for disabled elements. */
-button[disabled], html input[disabled] { cursor: default; }
-
-/** Remove inner padding and border in Firefox 4+. */
-button::-moz-focus-inner, input::-moz-focus-inner { border: 0; padding: 0; }
-
-/** Address Firefox 4+ setting `line-height` on `input` using `!important` in the UA stylesheet. */
-input { line-height: normal; }
-
-/** It's recommended that you don't attempt to style these elements. Firefox's implementation doesn't respect box-sizing, padding, or width.  1. Address box sizing set to `content-box` in IE 8/9/10. 2. Remove excess padding in IE 8/9/10. */
-input[type="checkbox"], input[type="radio"] { box-sizing: border-box; /* 1 */ padding: 0; /* 2 */ }
-
-/** Fix the cursor style for Chrome's increment/decrement buttons. For certain `font-size` values of the `input`, it causes the cursor style of the decrement button to change from `default` to `text`. */
-input[type="number"]::-webkit-inner-spin-button, input[type="number"]::-webkit-outer-spin-button { height: auto; }
-
-/** 1. Address `appearance` set to `searchfield` in Safari and Chrome. 2. Address `box-sizing` set to `border-box` in Safari and Chrome (include `-moz` to future-proof). */
-input[type="search"] { -webkit-appearance: textfield; /* 1 */ /* 2 */ box-sizing: content-box; }
-
-/** Remove inner padding and search cancel button in Safari and Chrome on OS X. Safari (but not Chrome) clips the cancel button when the search input has padding (and `textfield` appearance). */
-input[type="search"]::-webkit-search-cancel-button, input[type="search"]::-webkit-search-decoration { -webkit-appearance: none; }
-
-/** Define consistent border, margin, and padding. */
-fieldset { border: 1px solid #c0c0c0; margin: 0 2px; padding: 0.35em 0.625em 0.75em; }
-
-/** 1. Correct `color` not being inherited in IE 8/9/10/11. 2. Remove padding so people aren't caught out if they zero out fieldsets. */
-legend { border: 0; /* 1 */ padding: 0; /* 2 */ }
-
-/** Remove default vertical scrollbar in IE 8/9/10/11. */
-textarea { overflow: auto; }
-
-/** Don't inherit the `font-weight` (applied by a rule above). NOTE: the default cannot safely be changed in Chrome and Safari on OS X. */
-optgroup { font-weight: bold; }
-
-/* Tables ========================================================================== */
-/** Remove most spacing between table cells. */
-table { border-collapse: collapse; border-spacing: 0; }
-
-td, th { padding: 0; }
-
-/* LAYOUT STYLES */
-
-p { margin-top: 0; }
-
-code, pre { margin-bottom: 30px; font-family: Monaco, "Bitstream Vera Sans Mono", "Lucida Console", Terminal, monospace; font-size: 13px; color: #222; }
-
-code { padding: 0 3px; background-color: #f2f8fc; border: solid 1px #dbe7f3; }
-
-pre { padding: 20px; overflow: auto; text-shadow: none; background: #fff; border: solid 1px #f2f2f2; }
-
-pre code { padding: 0; color: #2879d0; background-color: #fff; border: none; }
-
-ul, ol, dl { margin-bottom: 20px; }
-
-/* COMMON STYLES */
-
-td.halign-right { text-align: right; } 
-
-td.halign-center { text-align: center; } 
-
-form { padding: 20px; background: #f2f2f2; }
-
-h2 { 
-   font-size: 2em;
-   line-height: 1.2em;
-   font-weight: 200;
-   letter-spacing: 0;
-}
-
-h3 { 
-   font-size: 1.4em;
-   line-height: 1.2em;
-   font-weight: normal;
-   letter-spacing: 0;
-}
-
-.sect1 {
-   margin-left: 4%;
-   margin-right: 4%;
-   font: 13px/20px Arial, Helvetica, sans-serif  
-}
-
-a:link {
-   text-decoration: none;
-   color: #09569d;
-}
-
-#preamble hr{
-   margin-left: 0%;
-   margin-right: 0%;
-}
-
-#preamble .sectionbody table  {
-   font-weight: 200;
-   margin-left: 4%;
-   margin-right: 4%;
-}
-
-hr {
-   margin-bottom: 12px;
-}
-
-table.tableblock.frame-all.grid-all.spread {
-   font-size: 12px;
-}
-
-code {
-   font-size:.9em;
-   border: 1px solid #eaeaea;
-   background-color: #f6f6f6;
-   border-radius: 3px;
-   padding: 1px;
-   padding-left:2px;
-   padding-right:2px;
-}
-
-pre.prettyprint.highlight {
-   border: 1px solid #eaeaea;
-   background-color: #f6f6f6;
-   border-radius: 4px;
-   padding: 8px;
-   padding-top:4px;
-   padding-bottom:4px;
-}
-
-.language-oac_no_warn {
-   font-size:.9em;
-   color:#222;
-   background-color: transparent;
-}
-
-#doc-title {
-   margin-left: 4%;
-}
-
-#top-nav {
-   margin-left: 4%;
-   font-size: 12px;
-}
-
-#bottom-nav {
-   margin-left: 4%;
-   font-size: 12px;
-}
-
-.vector-font {
-   color:grey; 
-   font-size: 20px;
-}
-
-#copyright {
-   padding-top: 10px;
-   padding-bottom: 4px;
-   display: table;
-   margin:0 auto;
-   color: grey;
-   font-size: 12px;
-}
-
-.beta {color: #FF0000}
-
-/* GENERAL ELEMENT TYPE STYLES */
-
-/* #Media Queries
-================================================== */
-/* Smaller than standard 960 (devices and browsers) */
-/* Tablet Portrait size to standard 960 (devices and browsers) */
-@media only screen and (min-width: 768px) and (max-width: 959px) { .inner { width: 740px; }
-  header h1, header h2 { width: 340px; }
-  header h1 { font-size: 60px; }
-  header h2 { font-size: 30px; }
-}
-/* All Mobile Sizes (devices and browser) */
-@media only screen and (max-width: 767px) { .inner { width: 93%; }
-  header { padding: 20px 0; }
-  header .inner { position: relative; }
-  header h1, header h2 { width: 100%; }
-  header h1 { font-size: 48px; }
-  header h2 { font-size: 24px; }
-  header a.button { position: relative; display: inline-block; width: auto; height: auto; padding: 5px 10px; margin-top: 15px; font-size: 13px; line-height: 1; color: #2879d0; text-align: center; background-color: #9ddcff; background-image: none; border-radius: 5px; -moz-border-radius: 5px; -webkit-border-radius: 5px; }
-  header a.button small { display: inline; font-size: 13px; }
-}
-/* Mobile Landscape Size to Tablet Portrait (devices and browsers) */
-/* Mobile Portrait Size to Mobile Landscape Size (devices and browsers) */
-
-header h1 { padding-top: 14px; font-size: 2em; font-weight: 200; line-height: 1.4; color: #FFFFFF; letter-spacing: 0px; border-bottom: 0px; }
-
-header h2 { font-size: 1.2em; margin-top: 0; margin-bottom: 0; font-weight: 200; line-height: .8; color: #ec7D11; letter-spacing: 0; }
-
-/*
-header a.button { background: transparent url(../images/logo.png) 0 0 no-repeat; padding-left: 32px; }
-*/
-
-header a:hover { text-decoration: none; }
-
-/* Admonition (Note) block */
-.admonitionblock > table {
-  border: 0;
-  background: none;
-  width: 100%;
-  table-layout: auto;
-  margin-bottom: 10.5px;
-}
-.admonitionblock > table td.icon {
-  text-align: center;
-  width: 60px;
-}
-.admonitionblock > table td.icon img {
-  max-width: none;
-}
-.admonitionblock > table td.icon .title {
-  text-transform: uppercase;
-}
-.admonitionblock > table td.content {
-  padding-left: 1em;
-  padding-right: 1em;
-  border-left: 3px solid #ddd;
-}
-.admonitionblock > table td.content > :last-child > :last-child {
-  margin-bottom: 0;
-}
-.admonitionblock td.icon [class^="fa icon-"]:before {
-  font-size: 2.5em;
-  text-shadow: 1px 1px 2px rgba(0, 0, 0, 0.5);
-  cursor: default;
-}
-.admonitionblock td.icon .icon-note:before {
-  content: "\f05a";
-  color: #5bc0de;
-}
diff --git a/docs/quick-start-guide/src/main/jbake/jbake.properties b/docs/quick-start-guide/src/main/jbake/jbake.properties
deleted file mode 100644
index 546d09c..0000000
--- a/docs/quick-start-guide/src/main/jbake/jbake.properties
+++ /dev/null
@@ -1,7 +0,0 @@
-site.host=http://jbake.org
-render.tags=false
-render.sitemap=false
-render.archive=false
-render.feed=false
-asciidoctor.option.safe=0
-asciidoctor.attributes.export=true
diff --git a/docs/quick-start-guide/src/main/jbake/templates/footer.ftl b/docs/quick-start-guide/src/main/jbake/templates/footer.ftl
deleted file mode 100644
index 6f2b09e..0000000
--- a/docs/quick-start-guide/src/main/jbake/templates/footer.ftl
+++ /dev/null
@@ -1,46 +0,0 @@
-<#-- a footer template fragment included in the page template -->
-<hr />
-
-<table width="90%" id="bottom-nav" cellspacing="0" cellpadding="0">
-	<colgroup>
-		<col width="12%"/>
-		<col width="12%"/>
-		<col width="*"/>
-	</colgroup>
-	<tr>		
-	    <#if content.prev??>
-		<td align="left">
-		<a href="${content.prev}">
-			<span class=" vector-font"><i class="fa fa-arrow-circle-left" aria-hidden="true"></i></span>
-			<span style="position:relative;top:-2px;">Previous</span>
-		</a>
-		</td>
-		</#if>
-
-		<#if content.next??>
-		<td align="left">
-		<a href="${content.next}">
-			<span class="vector-font"><i class="fa fa-arrow-circle-right vector-font" aria-hidden="true"></i></span>
-			<span style="position:relative;top:-2px;">Next</span>
-		</a>
-		</td>
-		</#if>
-
-		<td align="right">
-		<a href="toc.html">
-			<span class="vector-font"><i class="fa fa-list vector-font" aria-hidden="true"></i></span>
-			<span style="position:relative;top:-2px;">Contents</span>
-		</a>
-		</td>
-	</tr>
-</table>
-
-<span id="copyright">
-        <img src="img/eclipse_foundation_logo_tiny.png" height="20px" alt="Eclipse Foundation Logo" align="top"/>&nbsp;            
-        <span >Copyright&nbsp;&copy;&nbsp;2019,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</span>
-</span>
-
-<p align="center" class="beta">${config.status!}</p>
-
-</body>
-</html>
diff --git a/docs/quick-start-guide/src/main/jbake/templates/header.ftl b/docs/quick-start-guide/src/main/jbake/templates/header.ftl
deleted file mode 100644
index 82ebb36..0000000
--- a/docs/quick-start-guide/src/main/jbake/templates/header.ftl
+++ /dev/null
@@ -1,55 +0,0 @@
-<!DOCTYPE html>
-<#-- a header template fragment included in the page template -->
-<html lang="en">
-  <head>
-    <meta charset="utf-8"/>
-    <title><#if (content.title)??><#escape x as x?xml>${content.title}</#escape></#if></title>
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <link href="<#if (content.rootpath)??>${content.rootpath}<#else></#if>css/style.css" rel="stylesheet">
-    <script src="https://use.fontawesome.com/96c4d89611.js"></script>
-  </head>
-  <body>
-<table id="doc-title" cellspacing="0" cellpadding="0">
-  <tr>
-  <td align="left" valign="top">
-  <b>${content.title}</b><br />
-      <p class="beta">${config.status!}</p>
-  </td>
-  </tr>
-</table>
-<hr />
-
-<table width="90%" id="top-nav" cellspacing="0" cellpadding="0">
-	<colgroup>
-		<col width="12%"/>
-		<col width="12%"/>
-		<col width="*"/>
-	</colgroup>
-	<tr>
-	    <#if content.prev??>
-		<td align="left">
-		<a href="${content.prev}">
-			<span class="vector-font"><i class="fa fa-arrow-circle-left" aria-hidden="true"></i></span>
-			<span style="position:relative;top:-2px;">Previous</span>
-		</a>
-		</td>
-	    </#if>
-
-	    <#if content.next??>
-		<td align="left">
-		<a href="${content.next}">
-			<span class=" vector-font"><i class="fa fa-arrow-circle-right vector-font" aria-hidden="true"></i></span>
-			<span style="position:relative;top:-2px;">Next</span>
-		</a>
-		</td>
-	    </#if>
-
-		<td align="right">
-		<a href="toc.html">
-			<span class=" vector-font"><i class="fa fa-list vector-font" aria-hidden="true"></i></span>
-			<span style="position:relative;top:-2px;">Contents</span>
-		</a>
-		</td>
-	</tr>
-</table>
-
diff --git a/docs/quick-start-guide/src/main/jbake/templates/menu.ftl b/docs/quick-start-guide/src/main/jbake/templates/menu.ftl
deleted file mode 100644
index 888c03d..0000000
--- a/docs/quick-start-guide/src/main/jbake/templates/menu.ftl
+++ /dev/null
@@ -1 +0,0 @@
-<#-- a menu bar template fragment included in the page template -->
\ No newline at end of file
diff --git a/docs/quick-start-guide/src/main/jbake/templates/page.ftl b/docs/quick-start-guide/src/main/jbake/templates/page.ftl
deleted file mode 100644
index eca51db..0000000
--- a/docs/quick-start-guide/src/main/jbake/templates/page.ftl
+++ /dev/null
@@ -1,8 +0,0 @@
-<#-- a top level page layout template -->
-
-<#include "header.ftl">
-<#include "menu.ftl">
-
-${content.body}
-
-<#include "footer.ftl">
\ No newline at end of file
diff --git a/docs/reference-manual/README.md b/docs/reference-manual/README.md
deleted file mode 100644
index a3ec2b6..0000000
--- a/docs/reference-manual/README.md
+++ /dev/null
@@ -1,77 +0,0 @@
-# A JBake project template
-
-## About JBake
-
-JBake is a static site generator, it's inspired from jekyll and written
-in java.  The basic idea is to have templates for the structure of the
-page, and the body generated from asciidoc content.
-
-## Pre requisites
-
-- Maven
-- JDK8+
-
-Deploying to Github will require password less authentication.
-
-This is done by exporting your SSH public key into your Github account.
-
-## Build the site locally
-
-The site is generated under target/staging.
-
-Open file:///PATH_TO_PROJECT_DIR/target/staging in a browser to view the site.
-
-```
-mvn generate-resources
-```
-
-Or you can invoke the JBake plugin directly.
-
-```
-mvn jbake:build
-```
-
-### Rebuild the site on changes
-
-```
-mvn jbake:watch
-```
-
-If you keep this command running, changes to the sources will be
-detected and the site will be rendered incrementally.
-
-This is convenient when writing content.
-
-### Serve the site locally
-
-```
-mvn jbake:serve
-```
-
-If a webserver is required (e.g. absolute path are used), this command
-will start a webserver (jetty) at http://localhost:8820.  It will also
-watch for changes and rebuild incrementally.
-
-## Deploy the site to Github Pages
-
-```
-mvn deploy
-```
-
-## Produce a zip file for download
-
-To produce a zip file containing the generated html files, use:
-
-```
-mvn package
-```
-
-When making a release on GitHub, this zip file should be added to the release.
-
-## Links
-
-- [JBake maven plugin documentation](https://github.com/Blazebit/jbake-maven-plugin)
-- [JBake documentation](http://jbake.org/docs/2.5.1)
-- [Freemarker documentation](http://freemarker.org/docs)
-- [AsciiDoc User Guide](http://asciidoc.org/userguide.html)
-- [Asciidoctor quick reference](http://asciidoctor.org/docs/asciidoc-syntax-quick-reference)
diff --git a/docs/reference-manual/pom.xml b/docs/reference-manual/pom.xml
index 5422ec3..6b2eb45 100644
--- a/docs/reference-manual/pom.xml
+++ b/docs/reference-manual/pom.xml
@@ -25,7 +25,6 @@
         <version>7.0.0-SNAPSHOT</version>
         <relativePath>../parent</relativePath>
     </parent>
-    <groupId>org.glassfish.docs</groupId>
     <artifactId>reference-manual</artifactId>
     <packaging>jar</packaging>
     <name>Eclipse GlassFish Server Reference Manual, Release 7</name>
diff --git a/docs/reference-manual/src/main/jbake/content/add-library.adoc b/docs/reference-manual/src/main/asciidoc/add-library.adoc
similarity index 100%
rename from docs/reference-manual/src/main/jbake/content/add-library.adoc
rename to docs/reference-manual/src/main/asciidoc/add-library.adoc
diff --git a/docs/reference-manual/src/main/jbake/content/add-resources.adoc b/docs/reference-manual/src/main/asciidoc/add-resources.adoc
similarity index 100%
rename from docs/reference-manual/src/main/jbake/content/add-resources.adoc
rename to docs/reference-manual/src/main/asciidoc/add-resources.adoc
diff --git a/docs/reference-manual/src/main/jbake/content/appclient.adoc b/docs/reference-manual/src/main/asciidoc/appclient.adoc
similarity index 100%
rename from docs/reference-manual/src/main/jbake/content/appclient.adoc
rename to docs/reference-manual/src/main/asciidoc/appclient.adoc
diff --git a/docs/reference-manual/src/main/jbake/content/application.adoc b/docs/reference-manual/src/main/asciidoc/application.adoc
similarity index 100%
rename from docs/reference-manual/src/main/jbake/content/application.adoc
rename to docs/reference-manual/src/main/asciidoc/application.adoc
diff --git a/docs/reference-manual/src/main/jbake/content/apply-http-lb-changes.adoc b/docs/reference-manual/src/main/asciidoc/apply-http-lb-changes.adoc
similarity index 100%
rename from docs/reference-manual/src/main/jbake/content/apply-http-lb-changes.adoc
rename to docs/reference-manual/src/main/asciidoc/apply-http-lb-changes.adoc
diff --git a/docs/reference-manual/src/main/jbake/content/asadmin.adoc b/docs/reference-manual/src/main/asciidoc/asadmin.adoc
similarity index 100%
rename from docs/reference-manual/src/main/jbake/content/asadmin.adoc
rename to docs/reference-manual/src/main/asciidoc/asadmin.adoc
diff --git a/docs/reference-manual/src/main/jbake/content/attach.adoc b/docs/reference-manual/src/main/asciidoc/attach.adoc
similarity index 100%
rename from docs/reference-manual/src/main/jbake/content/attach.adoc
rename to docs/reference-manual/src/main/asciidoc/attach.adoc
diff --git a/docs/reference-manual/src/main/jbake/content/backup-domain.adoc b/docs/reference-manual/src/main/asciidoc/backup-domain.adoc
similarity index 100%
rename from docs/reference-manual/src/main/jbake/content/backup-domain.adoc
rename to docs/reference-manual/src/main/asciidoc/backup-domain.adoc
diff --git a/docs/reference-manual/src/main/jbake/content/capture-schema.adoc b/docs/reference-manual/src/main/asciidoc/capture-schema.adoc
similarity index 100%
rename from docs/reference-manual/src/main/jbake/content/capture-schema.adoc
rename to docs/reference-manual/src/main/asciidoc/capture-schema.adoc
diff --git a/docs/reference-manual/src/main/jbake/content/change-admin-password.adoc b/docs/reference-manual/src/main/asciidoc/change-admin-password.adoc
similarity index 100%
rename from docs/reference-manual/src/main/jbake/content/change-admin-password.adoc
rename to docs/reference-manual/src/main/asciidoc/change-admin-password.adoc
diff --git a/docs/reference-manual/src/main/jbake/content/change-master-broker.adoc b/docs/reference-manual/src/main/asciidoc/change-master-broker.adoc
similarity index 100%
rename from docs/reference-manual/src/main/jbake/content/change-master-broker.adoc
rename to docs/reference-manual/src/main/asciidoc/change-master-broker.adoc
diff --git a/docs/reference-manual/src/main/jbake/content/change-master-password.adoc b/docs/reference-manual/src/main/asciidoc/change-master-password.adoc
similarity index 100%
rename from docs/reference-manual/src/main/jbake/content/change-master-password.adoc
rename to docs/reference-manual/src/main/asciidoc/change-master-password.adoc
diff --git a/docs/reference-manual/src/main/jbake/content/collect-log-files.adoc b/docs/reference-manual/src/main/asciidoc/collect-log-files.adoc
similarity index 100%
rename from docs/reference-manual/src/main/jbake/content/collect-log-files.adoc
rename to docs/reference-manual/src/main/asciidoc/collect-log-files.adoc
diff --git a/docs/reference-manual/src/main/jbake/content/configuration.adoc b/docs/reference-manual/src/main/asciidoc/configuration.adoc
similarity index 100%
rename from docs/reference-manual/src/main/jbake/content/configuration.adoc
rename to docs/reference-manual/src/main/asciidoc/configuration.adoc
diff --git a/docs/reference-manual/src/main/jbake/content/configure-jms-cluster.adoc b/docs/reference-manual/src/main/asciidoc/configure-jms-cluster.adoc
similarity index 100%
rename from docs/reference-manual/src/main/jbake/content/configure-jms-cluster.adoc
rename to docs/reference-manual/src/main/asciidoc/configure-jms-cluster.adoc
diff --git a/docs/reference-manual/src/main/jbake/content/configure-lb-weight.adoc b/docs/reference-manual/src/main/asciidoc/configure-lb-weight.adoc
similarity index 100%
rename from docs/reference-manual/src/main/jbake/content/configure-lb-weight.adoc
rename to docs/reference-manual/src/main/asciidoc/configure-lb-weight.adoc
diff --git a/docs/reference-manual/src/main/jbake/content/configure-ldap-for-admin.adoc b/docs/reference-manual/src/main/asciidoc/configure-ldap-for-admin.adoc
similarity index 100%
rename from docs/reference-manual/src/main/jbake/content/configure-ldap-for-admin.adoc
rename to docs/reference-manual/src/main/asciidoc/configure-ldap-for-admin.adoc
diff --git a/docs/reference-manual/src/main/jbake/content/configure-managed-jobs.adoc b/docs/reference-manual/src/main/asciidoc/configure-managed-jobs.adoc
similarity index 100%
rename from docs/reference-manual/src/main/jbake/content/configure-managed-jobs.adoc
rename to docs/reference-manual/src/main/asciidoc/configure-managed-jobs.adoc
diff --git a/docs/reference-manual/src/main/jbake/content/copy-config.adoc b/docs/reference-manual/src/main/asciidoc/copy-config.adoc
similarity index 100%
rename from docs/reference-manual/src/main/jbake/content/copy-config.adoc
rename to docs/reference-manual/src/main/asciidoc/copy-config.adoc
diff --git a/docs/reference-manual/src/main/jbake/content/create-admin-object.adoc b/docs/reference-manual/src/main/asciidoc/create-admin-object.adoc
similarity index 100%
rename from docs/reference-manual/src/main/jbake/content/create-admin-object.adoc
rename to docs/reference-manual/src/main/asciidoc/create-admin-object.adoc
diff --git a/docs/reference-manual/src/main/jbake/content/create-application-ref.adoc b/docs/reference-manual/src/main/asciidoc/create-application-ref.adoc
similarity index 100%
rename from docs/reference-manual/src/main/jbake/content/create-application-ref.adoc
rename to docs/reference-manual/src/main/asciidoc/create-application-ref.adoc
diff --git a/docs/reference-manual/src/main/jbake/content/create-audit-module.adoc b/docs/reference-manual/src/main/asciidoc/create-audit-module.adoc
similarity index 100%
rename from docs/reference-manual/src/main/jbake/content/create-audit-module.adoc
rename to docs/reference-manual/src/main/asciidoc/create-audit-module.adoc
diff --git a/docs/reference-manual/src/main/jbake/content/create-auth-realm.adoc b/docs/reference-manual/src/main/asciidoc/create-auth-realm.adoc
similarity index 100%
rename from docs/reference-manual/src/main/jbake/content/create-auth-realm.adoc
rename to docs/reference-manual/src/main/asciidoc/create-auth-realm.adoc
diff --git a/docs/reference-manual/src/main/jbake/content/create-cluster.adoc b/docs/reference-manual/src/main/asciidoc/create-cluster.adoc
similarity index 100%
rename from docs/reference-manual/src/main/jbake/content/create-cluster.adoc
rename to docs/reference-manual/src/main/asciidoc/create-cluster.adoc
diff --git a/docs/reference-manual/src/main/jbake/content/create-connector-connection-pool.adoc b/docs/reference-manual/src/main/asciidoc/create-connector-connection-pool.adoc
similarity index 100%
rename from docs/reference-manual/src/main/jbake/content/create-connector-connection-pool.adoc
rename to docs/reference-manual/src/main/asciidoc/create-connector-connection-pool.adoc
diff --git a/docs/reference-manual/src/main/jbake/content/create-connector-resource.adoc b/docs/reference-manual/src/main/asciidoc/create-connector-resource.adoc
similarity index 100%
rename from docs/reference-manual/src/main/jbake/content/create-connector-resource.adoc
rename to docs/reference-manual/src/main/asciidoc/create-connector-resource.adoc
diff --git a/docs/reference-manual/src/main/jbake/content/create-connector-security-map.adoc b/docs/reference-manual/src/main/asciidoc/create-connector-security-map.adoc
similarity index 100%
rename from docs/reference-manual/src/main/jbake/content/create-connector-security-map.adoc
rename to docs/reference-manual/src/main/asciidoc/create-connector-security-map.adoc
diff --git a/docs/reference-manual/src/main/jbake/content/create-connector-work-security-map.adoc b/docs/reference-manual/src/main/asciidoc/create-connector-work-security-map.adoc
similarity index 100%
rename from docs/reference-manual/src/main/jbake/content/create-connector-work-security-map.adoc
rename to docs/reference-manual/src/main/asciidoc/create-connector-work-security-map.adoc
diff --git a/docs/reference-manual/src/main/jbake/content/create-context-service.adoc b/docs/reference-manual/src/main/asciidoc/create-context-service.adoc
similarity index 100%
rename from docs/reference-manual/src/main/jbake/content/create-context-service.adoc
rename to docs/reference-manual/src/main/asciidoc/create-context-service.adoc
diff --git a/docs/reference-manual/src/main/jbake/content/create-custom-resource.adoc b/docs/reference-manual/src/main/asciidoc/create-custom-resource.adoc
similarity index 100%
rename from docs/reference-manual/src/main/jbake/content/create-custom-resource.adoc
rename to docs/reference-manual/src/main/asciidoc/create-custom-resource.adoc
diff --git a/docs/reference-manual/src/main/jbake/content/create-domain.adoc b/docs/reference-manual/src/main/asciidoc/create-domain.adoc
similarity index 100%
rename from docs/reference-manual/src/main/jbake/content/create-domain.adoc
rename to docs/reference-manual/src/main/asciidoc/create-domain.adoc
diff --git a/docs/reference-manual/src/main/jbake/content/create-file-user.adoc b/docs/reference-manual/src/main/asciidoc/create-file-user.adoc
similarity index 100%
rename from docs/reference-manual/src/main/jbake/content/create-file-user.adoc
rename to docs/reference-manual/src/main/asciidoc/create-file-user.adoc
diff --git a/docs/reference-manual/src/main/jbake/content/create-http-health-checker.adoc b/docs/reference-manual/src/main/asciidoc/create-http-health-checker.adoc
similarity index 100%
rename from docs/reference-manual/src/main/jbake/content/create-http-health-checker.adoc
rename to docs/reference-manual/src/main/asciidoc/create-http-health-checker.adoc
diff --git a/docs/reference-manual/src/main/jbake/content/create-http-lb-config.adoc b/docs/reference-manual/src/main/asciidoc/create-http-lb-config.adoc
similarity index 100%
rename from docs/reference-manual/src/main/jbake/content/create-http-lb-config.adoc
rename to docs/reference-manual/src/main/asciidoc/create-http-lb-config.adoc
diff --git a/docs/reference-manual/src/main/jbake/content/create-http-lb-ref.adoc b/docs/reference-manual/src/main/asciidoc/create-http-lb-ref.adoc
similarity index 100%
rename from docs/reference-manual/src/main/jbake/content/create-http-lb-ref.adoc
rename to docs/reference-manual/src/main/asciidoc/create-http-lb-ref.adoc
diff --git a/docs/reference-manual/src/main/jbake/content/create-http-lb.adoc b/docs/reference-manual/src/main/asciidoc/create-http-lb.adoc
similarity index 100%
rename from docs/reference-manual/src/main/jbake/content/create-http-lb.adoc
rename to docs/reference-manual/src/main/asciidoc/create-http-lb.adoc
diff --git a/docs/reference-manual/src/main/jbake/content/create-http-listener.adoc b/docs/reference-manual/src/main/asciidoc/create-http-listener.adoc
similarity index 100%
rename from docs/reference-manual/src/main/jbake/content/create-http-listener.adoc
rename to docs/reference-manual/src/main/asciidoc/create-http-listener.adoc
diff --git a/docs/reference-manual/src/main/jbake/content/create-http-redirect.adoc b/docs/reference-manual/src/main/asciidoc/create-http-redirect.adoc
similarity index 100%
rename from docs/reference-manual/src/main/jbake/content/create-http-redirect.adoc
rename to docs/reference-manual/src/main/asciidoc/create-http-redirect.adoc
diff --git a/docs/reference-manual/src/main/jbake/content/create-http.adoc b/docs/reference-manual/src/main/asciidoc/create-http.adoc
similarity index 100%
rename from docs/reference-manual/src/main/jbake/content/create-http.adoc
rename to docs/reference-manual/src/main/asciidoc/create-http.adoc
diff --git a/docs/reference-manual/src/main/jbake/content/create-iiop-listener.adoc b/docs/reference-manual/src/main/asciidoc/create-iiop-listener.adoc
similarity index 100%
rename from docs/reference-manual/src/main/jbake/content/create-iiop-listener.adoc
rename to docs/reference-manual/src/main/asciidoc/create-iiop-listener.adoc
diff --git a/docs/reference-manual/src/main/jbake/content/create-instance.adoc b/docs/reference-manual/src/main/asciidoc/create-instance.adoc
similarity index 100%
rename from docs/reference-manual/src/main/jbake/content/create-instance.adoc
rename to docs/reference-manual/src/main/asciidoc/create-instance.adoc
diff --git a/docs/reference-manual/src/main/jbake/content/create-jacc-provider.adoc b/docs/reference-manual/src/main/asciidoc/create-jacc-provider.adoc
similarity index 100%
rename from docs/reference-manual/src/main/jbake/content/create-jacc-provider.adoc
rename to docs/reference-manual/src/main/asciidoc/create-jacc-provider.adoc
diff --git a/docs/reference-manual/src/main/jbake/content/create-javamail-resource.adoc b/docs/reference-manual/src/main/asciidoc/create-javamail-resource.adoc
similarity index 100%
rename from docs/reference-manual/src/main/jbake/content/create-javamail-resource.adoc
rename to docs/reference-manual/src/main/asciidoc/create-javamail-resource.adoc
diff --git a/docs/reference-manual/src/main/jbake/content/create-jdbc-connection-pool.adoc b/docs/reference-manual/src/main/asciidoc/create-jdbc-connection-pool.adoc
similarity index 100%
rename from docs/reference-manual/src/main/jbake/content/create-jdbc-connection-pool.adoc
rename to docs/reference-manual/src/main/asciidoc/create-jdbc-connection-pool.adoc
diff --git a/docs/reference-manual/src/main/jbake/content/create-jdbc-resource.adoc b/docs/reference-manual/src/main/asciidoc/create-jdbc-resource.adoc
similarity index 100%
rename from docs/reference-manual/src/main/jbake/content/create-jdbc-resource.adoc
rename to docs/reference-manual/src/main/asciidoc/create-jdbc-resource.adoc
diff --git a/docs/reference-manual/src/main/jbake/content/create-jms-host.adoc b/docs/reference-manual/src/main/asciidoc/create-jms-host.adoc
similarity index 100%
rename from docs/reference-manual/src/main/jbake/content/create-jms-host.adoc
rename to docs/reference-manual/src/main/asciidoc/create-jms-host.adoc
diff --git a/docs/reference-manual/src/main/jbake/content/create-jms-resource.adoc b/docs/reference-manual/src/main/asciidoc/create-jms-resource.adoc
similarity index 100%
rename from docs/reference-manual/src/main/jbake/content/create-jms-resource.adoc
rename to docs/reference-manual/src/main/asciidoc/create-jms-resource.adoc
diff --git a/docs/reference-manual/src/main/jbake/content/create-jmsdest.adoc b/docs/reference-manual/src/main/asciidoc/create-jmsdest.adoc
similarity index 100%
rename from docs/reference-manual/src/main/jbake/content/create-jmsdest.adoc
rename to docs/reference-manual/src/main/asciidoc/create-jmsdest.adoc
diff --git a/docs/reference-manual/src/main/jbake/content/create-jndi-resource.adoc b/docs/reference-manual/src/main/asciidoc/create-jndi-resource.adoc
similarity index 100%
rename from docs/reference-manual/src/main/jbake/content/create-jndi-resource.adoc
rename to docs/reference-manual/src/main/asciidoc/create-jndi-resource.adoc
diff --git a/docs/reference-manual/src/main/jbake/content/create-jvm-options.adoc b/docs/reference-manual/src/main/asciidoc/create-jvm-options.adoc
similarity index 100%
rename from docs/reference-manual/src/main/jbake/content/create-jvm-options.adoc
rename to docs/reference-manual/src/main/asciidoc/create-jvm-options.adoc
diff --git a/docs/reference-manual/src/main/jbake/content/create-lifecycle-module.adoc b/docs/reference-manual/src/main/asciidoc/create-lifecycle-module.adoc
similarity index 100%
rename from docs/reference-manual/src/main/jbake/content/create-lifecycle-module.adoc
rename to docs/reference-manual/src/main/asciidoc/create-lifecycle-module.adoc
diff --git a/docs/reference-manual/src/main/jbake/content/create-local-instance.adoc b/docs/reference-manual/src/main/asciidoc/create-local-instance.adoc
similarity index 100%
rename from docs/reference-manual/src/main/jbake/content/create-local-instance.adoc
rename to docs/reference-manual/src/main/asciidoc/create-local-instance.adoc
diff --git a/docs/reference-manual/src/main/jbake/content/create-managed-executor-service.adoc b/docs/reference-manual/src/main/asciidoc/create-managed-executor-service.adoc
similarity index 100%
rename from docs/reference-manual/src/main/jbake/content/create-managed-executor-service.adoc
rename to docs/reference-manual/src/main/asciidoc/create-managed-executor-service.adoc
diff --git a/docs/reference-manual/src/main/jbake/content/create-managed-scheduled-executor-service.adoc b/docs/reference-manual/src/main/asciidoc/create-managed-scheduled-executor-service.adoc
similarity index 100%
rename from docs/reference-manual/src/main/jbake/content/create-managed-scheduled-executor-service.adoc
rename to docs/reference-manual/src/main/asciidoc/create-managed-scheduled-executor-service.adoc
diff --git a/docs/reference-manual/src/main/jbake/content/create-managed-thread-factory.adoc b/docs/reference-manual/src/main/asciidoc/create-managed-thread-factory.adoc
similarity index 100%
rename from docs/reference-manual/src/main/jbake/content/create-managed-thread-factory.adoc
rename to docs/reference-manual/src/main/asciidoc/create-managed-thread-factory.adoc
diff --git a/docs/reference-manual/src/main/jbake/content/create-message-security-provider.adoc b/docs/reference-manual/src/main/asciidoc/create-message-security-provider.adoc
similarity index 100%
rename from docs/reference-manual/src/main/jbake/content/create-message-security-provider.adoc
rename to docs/reference-manual/src/main/asciidoc/create-message-security-provider.adoc
diff --git a/docs/reference-manual/src/main/jbake/content/create-module-config.adoc b/docs/reference-manual/src/main/asciidoc/create-module-config.adoc
similarity index 100%
rename from docs/reference-manual/src/main/jbake/content/create-module-config.adoc
rename to docs/reference-manual/src/main/asciidoc/create-module-config.adoc
diff --git a/docs/reference-manual/src/main/jbake/content/create-network-listener.adoc b/docs/reference-manual/src/main/asciidoc/create-network-listener.adoc
similarity index 100%
rename from docs/reference-manual/src/main/jbake/content/create-network-listener.adoc
rename to docs/reference-manual/src/main/asciidoc/create-network-listener.adoc
diff --git a/docs/reference-manual/src/main/jbake/content/create-node-config.adoc b/docs/reference-manual/src/main/asciidoc/create-node-config.adoc
similarity index 100%
rename from docs/reference-manual/src/main/jbake/content/create-node-config.adoc
rename to docs/reference-manual/src/main/asciidoc/create-node-config.adoc
diff --git a/docs/reference-manual/src/main/jbake/content/create-node-dcom.adoc b/docs/reference-manual/src/main/asciidoc/create-node-dcom.adoc
similarity index 100%
rename from docs/reference-manual/src/main/jbake/content/create-node-dcom.adoc
rename to docs/reference-manual/src/main/asciidoc/create-node-dcom.adoc
diff --git a/docs/reference-manual/src/main/jbake/content/create-node-ssh.adoc b/docs/reference-manual/src/main/asciidoc/create-node-ssh.adoc
similarity index 100%
rename from docs/reference-manual/src/main/jbake/content/create-node-ssh.adoc
rename to docs/reference-manual/src/main/asciidoc/create-node-ssh.adoc
diff --git a/docs/reference-manual/src/main/jbake/content/create-password-alias.adoc b/docs/reference-manual/src/main/asciidoc/create-password-alias.adoc
similarity index 100%
rename from docs/reference-manual/src/main/jbake/content/create-password-alias.adoc
rename to docs/reference-manual/src/main/asciidoc/create-password-alias.adoc
diff --git a/docs/reference-manual/src/main/jbake/content/create-profiler.adoc b/docs/reference-manual/src/main/asciidoc/create-profiler.adoc
similarity index 100%
rename from docs/reference-manual/src/main/jbake/content/create-profiler.adoc
rename to docs/reference-manual/src/main/asciidoc/create-profiler.adoc
diff --git a/docs/reference-manual/src/main/jbake/content/create-protocol-filter.adoc b/docs/reference-manual/src/main/asciidoc/create-protocol-filter.adoc
similarity index 100%
rename from docs/reference-manual/src/main/jbake/content/create-protocol-filter.adoc
rename to docs/reference-manual/src/main/asciidoc/create-protocol-filter.adoc
diff --git a/docs/reference-manual/src/main/jbake/content/create-protocol-finder.adoc b/docs/reference-manual/src/main/asciidoc/create-protocol-finder.adoc
similarity index 100%
rename from docs/reference-manual/src/main/jbake/content/create-protocol-finder.adoc
rename to docs/reference-manual/src/main/asciidoc/create-protocol-finder.adoc
diff --git a/docs/reference-manual/src/main/jbake/content/create-protocol.adoc b/docs/reference-manual/src/main/asciidoc/create-protocol.adoc
similarity index 100%
rename from docs/reference-manual/src/main/jbake/content/create-protocol.adoc
rename to docs/reference-manual/src/main/asciidoc/create-protocol.adoc
diff --git a/docs/reference-manual/src/main/jbake/content/create-resource-adapter-config.adoc b/docs/reference-manual/src/main/asciidoc/create-resource-adapter-config.adoc
similarity index 100%
rename from docs/reference-manual/src/main/jbake/content/create-resource-adapter-config.adoc
rename to docs/reference-manual/src/main/asciidoc/create-resource-adapter-config.adoc
diff --git a/docs/reference-manual/src/main/jbake/content/create-resource-ref.adoc b/docs/reference-manual/src/main/asciidoc/create-resource-ref.adoc
similarity index 100%
rename from docs/reference-manual/src/main/jbake/content/create-resource-ref.adoc
rename to docs/reference-manual/src/main/asciidoc/create-resource-ref.adoc
diff --git a/docs/reference-manual/src/main/jbake/content/create-service.adoc b/docs/reference-manual/src/main/asciidoc/create-service.adoc
similarity index 100%
rename from docs/reference-manual/src/main/jbake/content/create-service.adoc
rename to docs/reference-manual/src/main/asciidoc/create-service.adoc
diff --git a/docs/reference-manual/src/main/jbake/content/create-ssl.adoc b/docs/reference-manual/src/main/asciidoc/create-ssl.adoc
similarity index 100%
rename from docs/reference-manual/src/main/jbake/content/create-ssl.adoc
rename to docs/reference-manual/src/main/asciidoc/create-ssl.adoc
diff --git a/docs/reference-manual/src/main/jbake/content/create-system-properties.adoc b/docs/reference-manual/src/main/asciidoc/create-system-properties.adoc
similarity index 100%
rename from docs/reference-manual/src/main/jbake/content/create-system-properties.adoc
rename to docs/reference-manual/src/main/asciidoc/create-system-properties.adoc
diff --git a/docs/reference-manual/src/main/jbake/content/create-threadpool.adoc b/docs/reference-manual/src/main/asciidoc/create-threadpool.adoc
similarity index 100%
rename from docs/reference-manual/src/main/jbake/content/create-threadpool.adoc
rename to docs/reference-manual/src/main/asciidoc/create-threadpool.adoc
diff --git a/docs/reference-manual/src/main/jbake/content/create-transport.adoc b/docs/reference-manual/src/main/asciidoc/create-transport.adoc
similarity index 100%
rename from docs/reference-manual/src/main/jbake/content/create-transport.adoc
rename to docs/reference-manual/src/main/asciidoc/create-transport.adoc
diff --git a/docs/reference-manual/src/main/jbake/content/create-virtual-server.adoc b/docs/reference-manual/src/main/asciidoc/create-virtual-server.adoc
similarity index 100%
rename from docs/reference-manual/src/main/jbake/content/create-virtual-server.adoc
rename to docs/reference-manual/src/main/asciidoc/create-virtual-server.adoc
diff --git a/docs/reference-manual/src/main/jbake/content/debug-asadmin.adoc b/docs/reference-manual/src/main/asciidoc/debug-asadmin.adoc
similarity index 100%
rename from docs/reference-manual/src/main/jbake/content/debug-asadmin.adoc
rename to docs/reference-manual/src/main/asciidoc/debug-asadmin.adoc
diff --git a/docs/reference-manual/src/main/jbake/content/delete-admin-object.adoc b/docs/reference-manual/src/main/asciidoc/delete-admin-object.adoc
similarity index 100%
rename from docs/reference-manual/src/main/jbake/content/delete-admin-object.adoc
rename to docs/reference-manual/src/main/asciidoc/delete-admin-object.adoc
diff --git a/docs/reference-manual/src/main/jbake/content/delete-application-ref.adoc b/docs/reference-manual/src/main/asciidoc/delete-application-ref.adoc
similarity index 100%
rename from docs/reference-manual/src/main/jbake/content/delete-application-ref.adoc
rename to docs/reference-manual/src/main/asciidoc/delete-application-ref.adoc
diff --git a/docs/reference-manual/src/main/jbake/content/delete-audit-module.adoc b/docs/reference-manual/src/main/asciidoc/delete-audit-module.adoc
similarity index 100%
rename from docs/reference-manual/src/main/jbake/content/delete-audit-module.adoc
rename to docs/reference-manual/src/main/asciidoc/delete-audit-module.adoc
diff --git a/docs/reference-manual/src/main/jbake/content/delete-auth-realm.adoc b/docs/reference-manual/src/main/asciidoc/delete-auth-realm.adoc
similarity index 100%
rename from docs/reference-manual/src/main/jbake/content/delete-auth-realm.adoc
rename to docs/reference-manual/src/main/asciidoc/delete-auth-realm.adoc
diff --git a/docs/reference-manual/src/main/jbake/content/delete-cluster.adoc b/docs/reference-manual/src/main/asciidoc/delete-cluster.adoc
similarity index 100%
rename from docs/reference-manual/src/main/jbake/content/delete-cluster.adoc
rename to docs/reference-manual/src/main/asciidoc/delete-cluster.adoc
diff --git a/docs/reference-manual/src/main/jbake/content/delete-config.adoc b/docs/reference-manual/src/main/asciidoc/delete-config.adoc
similarity index 100%
rename from docs/reference-manual/src/main/jbake/content/delete-config.adoc
rename to docs/reference-manual/src/main/asciidoc/delete-config.adoc
diff --git a/docs/reference-manual/src/main/jbake/content/delete-connector-connection-pool.adoc b/docs/reference-manual/src/main/asciidoc/delete-connector-connection-pool.adoc
similarity index 100%
rename from docs/reference-manual/src/main/jbake/content/delete-connector-connection-pool.adoc
rename to docs/reference-manual/src/main/asciidoc/delete-connector-connection-pool.adoc
diff --git a/docs/reference-manual/src/main/jbake/content/delete-connector-resource.adoc b/docs/reference-manual/src/main/asciidoc/delete-connector-resource.adoc
similarity index 100%
rename from docs/reference-manual/src/main/jbake/content/delete-connector-resource.adoc
rename to docs/reference-manual/src/main/asciidoc/delete-connector-resource.adoc
diff --git a/docs/reference-manual/src/main/jbake/content/delete-connector-security-map.adoc b/docs/reference-manual/src/main/asciidoc/delete-connector-security-map.adoc
similarity index 100%
rename from docs/reference-manual/src/main/jbake/content/delete-connector-security-map.adoc
rename to docs/reference-manual/src/main/asciidoc/delete-connector-security-map.adoc
diff --git a/docs/reference-manual/src/main/jbake/content/delete-connector-work-security-map.adoc b/docs/reference-manual/src/main/asciidoc/delete-connector-work-security-map.adoc
similarity index 100%
rename from docs/reference-manual/src/main/jbake/content/delete-connector-work-security-map.adoc
rename to docs/reference-manual/src/main/asciidoc/delete-connector-work-security-map.adoc
diff --git a/docs/reference-manual/src/main/jbake/content/delete-context-service.adoc b/docs/reference-manual/src/main/asciidoc/delete-context-service.adoc
similarity index 100%
rename from docs/reference-manual/src/main/jbake/content/delete-context-service.adoc
rename to docs/reference-manual/src/main/asciidoc/delete-context-service.adoc
diff --git a/docs/reference-manual/src/main/jbake/content/delete-custom-resource.adoc b/docs/reference-manual/src/main/asciidoc/delete-custom-resource.adoc
similarity index 100%
rename from docs/reference-manual/src/main/jbake/content/delete-custom-resource.adoc
rename to docs/reference-manual/src/main/asciidoc/delete-custom-resource.adoc
diff --git a/docs/reference-manual/src/main/jbake/content/delete-domain.adoc b/docs/reference-manual/src/main/asciidoc/delete-domain.adoc
similarity index 100%
rename from docs/reference-manual/src/main/jbake/content/delete-domain.adoc
rename to docs/reference-manual/src/main/asciidoc/delete-domain.adoc
diff --git a/docs/reference-manual/src/main/jbake/content/delete-file-user.adoc b/docs/reference-manual/src/main/asciidoc/delete-file-user.adoc
similarity index 100%
rename from docs/reference-manual/src/main/jbake/content/delete-file-user.adoc
rename to docs/reference-manual/src/main/asciidoc/delete-file-user.adoc
diff --git a/docs/reference-manual/src/main/jbake/content/delete-http-health-checker.adoc b/docs/reference-manual/src/main/asciidoc/delete-http-health-checker.adoc
similarity index 100%
rename from docs/reference-manual/src/main/jbake/content/delete-http-health-checker.adoc
rename to docs/reference-manual/src/main/asciidoc/delete-http-health-checker.adoc
diff --git a/docs/reference-manual/src/main/jbake/content/delete-http-lb-config.adoc b/docs/reference-manual/src/main/asciidoc/delete-http-lb-config.adoc
similarity index 100%
rename from docs/reference-manual/src/main/jbake/content/delete-http-lb-config.adoc
rename to docs/reference-manual/src/main/asciidoc/delete-http-lb-config.adoc
diff --git a/docs/reference-manual/src/main/jbake/content/delete-http-lb-ref.adoc b/docs/reference-manual/src/main/asciidoc/delete-http-lb-ref.adoc
similarity index 100%
rename from docs/reference-manual/src/main/jbake/content/delete-http-lb-ref.adoc
rename to docs/reference-manual/src/main/asciidoc/delete-http-lb-ref.adoc
diff --git a/docs/reference-manual/src/main/jbake/content/delete-http-lb.adoc b/docs/reference-manual/src/main/asciidoc/delete-http-lb.adoc
similarity index 100%
rename from docs/reference-manual/src/main/jbake/content/delete-http-lb.adoc
rename to docs/reference-manual/src/main/asciidoc/delete-http-lb.adoc
diff --git a/docs/reference-manual/src/main/jbake/content/delete-http-listener.adoc b/docs/reference-manual/src/main/asciidoc/delete-http-listener.adoc
similarity index 100%
rename from docs/reference-manual/src/main/jbake/content/delete-http-listener.adoc
rename to docs/reference-manual/src/main/asciidoc/delete-http-listener.adoc
diff --git a/docs/reference-manual/src/main/jbake/content/delete-http-redirect.adoc b/docs/reference-manual/src/main/asciidoc/delete-http-redirect.adoc
similarity index 100%
rename from docs/reference-manual/src/main/jbake/content/delete-http-redirect.adoc
rename to docs/reference-manual/src/main/asciidoc/delete-http-redirect.adoc
diff --git a/docs/reference-manual/src/main/jbake/content/delete-http.adoc b/docs/reference-manual/src/main/asciidoc/delete-http.adoc
similarity index 100%
rename from docs/reference-manual/src/main/jbake/content/delete-http.adoc
rename to docs/reference-manual/src/main/asciidoc/delete-http.adoc
diff --git a/docs/reference-manual/src/main/jbake/content/delete-iiop-listener.adoc b/docs/reference-manual/src/main/asciidoc/delete-iiop-listener.adoc
similarity index 100%
rename from docs/reference-manual/src/main/jbake/content/delete-iiop-listener.adoc
rename to docs/reference-manual/src/main/asciidoc/delete-iiop-listener.adoc
diff --git a/docs/reference-manual/src/main/jbake/content/delete-instance.adoc b/docs/reference-manual/src/main/asciidoc/delete-instance.adoc
similarity index 100%
rename from docs/reference-manual/src/main/jbake/content/delete-instance.adoc
rename to docs/reference-manual/src/main/asciidoc/delete-instance.adoc
diff --git a/docs/reference-manual/src/main/jbake/content/delete-jacc-provider.adoc b/docs/reference-manual/src/main/asciidoc/delete-jacc-provider.adoc
similarity index 100%
rename from docs/reference-manual/src/main/jbake/content/delete-jacc-provider.adoc
rename to docs/reference-manual/src/main/asciidoc/delete-jacc-provider.adoc
diff --git a/docs/reference-manual/src/main/jbake/content/delete-javamail-resource.adoc b/docs/reference-manual/src/main/asciidoc/delete-javamail-resource.adoc
similarity index 100%
rename from docs/reference-manual/src/main/jbake/content/delete-javamail-resource.adoc
rename to docs/reference-manual/src/main/asciidoc/delete-javamail-resource.adoc
diff --git a/docs/reference-manual/src/main/jbake/content/delete-jdbc-connection-pool.adoc b/docs/reference-manual/src/main/asciidoc/delete-jdbc-connection-pool.adoc
similarity index 100%
rename from docs/reference-manual/src/main/jbake/content/delete-jdbc-connection-pool.adoc
rename to docs/reference-manual/src/main/asciidoc/delete-jdbc-connection-pool.adoc
diff --git a/docs/reference-manual/src/main/jbake/content/delete-jdbc-resource.adoc b/docs/reference-manual/src/main/asciidoc/delete-jdbc-resource.adoc
similarity index 100%
rename from docs/reference-manual/src/main/jbake/content/delete-jdbc-resource.adoc
rename to docs/reference-manual/src/main/asciidoc/delete-jdbc-resource.adoc
diff --git a/docs/reference-manual/src/main/jbake/content/delete-jms-host.adoc b/docs/reference-manual/src/main/asciidoc/delete-jms-host.adoc
similarity index 100%
rename from docs/reference-manual/src/main/jbake/content/delete-jms-host.adoc
rename to docs/reference-manual/src/main/asciidoc/delete-jms-host.adoc
diff --git a/docs/reference-manual/src/main/jbake/content/delete-jms-resource.adoc b/docs/reference-manual/src/main/asciidoc/delete-jms-resource.adoc
similarity index 100%
rename from docs/reference-manual/src/main/jbake/content/delete-jms-resource.adoc
rename to docs/reference-manual/src/main/asciidoc/delete-jms-resource.adoc
diff --git a/docs/reference-manual/src/main/jbake/content/delete-jmsdest.adoc b/docs/reference-manual/src/main/asciidoc/delete-jmsdest.adoc
similarity index 100%
rename from docs/reference-manual/src/main/jbake/content/delete-jmsdest.adoc
rename to docs/reference-manual/src/main/asciidoc/delete-jmsdest.adoc
diff --git a/docs/reference-manual/src/main/jbake/content/delete-jndi-resource.adoc b/docs/reference-manual/src/main/asciidoc/delete-jndi-resource.adoc
similarity index 100%
rename from docs/reference-manual/src/main/jbake/content/delete-jndi-resource.adoc
rename to docs/reference-manual/src/main/asciidoc/delete-jndi-resource.adoc
diff --git a/docs/reference-manual/src/main/jbake/content/delete-jvm-options.adoc b/docs/reference-manual/src/main/asciidoc/delete-jvm-options.adoc
similarity index 100%
rename from docs/reference-manual/src/main/jbake/content/delete-jvm-options.adoc
rename to docs/reference-manual/src/main/asciidoc/delete-jvm-options.adoc
diff --git a/docs/reference-manual/src/main/jbake/content/delete-lifecycle-module.adoc b/docs/reference-manual/src/main/asciidoc/delete-lifecycle-module.adoc
similarity index 100%
rename from docs/reference-manual/src/main/jbake/content/delete-lifecycle-module.adoc
rename to docs/reference-manual/src/main/asciidoc/delete-lifecycle-module.adoc
diff --git a/docs/reference-manual/src/main/jbake/content/delete-local-instance.adoc b/docs/reference-manual/src/main/asciidoc/delete-local-instance.adoc
similarity index 100%
rename from docs/reference-manual/src/main/jbake/content/delete-local-instance.adoc
rename to docs/reference-manual/src/main/asciidoc/delete-local-instance.adoc
diff --git a/docs/reference-manual/src/main/jbake/content/delete-managed-executor-service.adoc b/docs/reference-manual/src/main/asciidoc/delete-managed-executor-service.adoc
similarity index 100%
rename from docs/reference-manual/src/main/jbake/content/delete-managed-executor-service.adoc
rename to docs/reference-manual/src/main/asciidoc/delete-managed-executor-service.adoc
diff --git a/docs/reference-manual/src/main/jbake/content/delete-managed-scheduled-executor-service.adoc b/docs/reference-manual/src/main/asciidoc/delete-managed-scheduled-executor-service.adoc
similarity index 100%
rename from docs/reference-manual/src/main/jbake/content/delete-managed-scheduled-executor-service.adoc
rename to docs/reference-manual/src/main/asciidoc/delete-managed-scheduled-executor-service.adoc
diff --git a/docs/reference-manual/src/main/jbake/content/delete-managed-thread-factory.adoc b/docs/reference-manual/src/main/asciidoc/delete-managed-thread-factory.adoc
similarity index 100%
rename from docs/reference-manual/src/main/jbake/content/delete-managed-thread-factory.adoc
rename to docs/reference-manual/src/main/asciidoc/delete-managed-thread-factory.adoc
diff --git a/docs/reference-manual/src/main/jbake/content/delete-message-security-provider.adoc b/docs/reference-manual/src/main/asciidoc/delete-message-security-provider.adoc
similarity index 100%
rename from docs/reference-manual/src/main/jbake/content/delete-message-security-provider.adoc
rename to docs/reference-manual/src/main/asciidoc/delete-message-security-provider.adoc
diff --git a/docs/reference-manual/src/main/jbake/content/delete-module-config.adoc b/docs/reference-manual/src/main/asciidoc/delete-module-config.adoc
similarity index 100%
rename from docs/reference-manual/src/main/jbake/content/delete-module-config.adoc
rename to docs/reference-manual/src/main/asciidoc/delete-module-config.adoc
diff --git a/docs/reference-manual/src/main/jbake/content/delete-network-listener.adoc b/docs/reference-manual/src/main/asciidoc/delete-network-listener.adoc
similarity index 100%
rename from docs/reference-manual/src/main/jbake/content/delete-network-listener.adoc
rename to docs/reference-manual/src/main/asciidoc/delete-network-listener.adoc
diff --git a/docs/reference-manual/src/main/jbake/content/delete-node-config.adoc b/docs/reference-manual/src/main/asciidoc/delete-node-config.adoc
similarity index 100%
rename from docs/reference-manual/src/main/jbake/content/delete-node-config.adoc
rename to docs/reference-manual/src/main/asciidoc/delete-node-config.adoc
diff --git a/docs/reference-manual/src/main/jbake/content/delete-node-dcom.adoc b/docs/reference-manual/src/main/asciidoc/delete-node-dcom.adoc
similarity index 100%
rename from docs/reference-manual/src/main/jbake/content/delete-node-dcom.adoc
rename to docs/reference-manual/src/main/asciidoc/delete-node-dcom.adoc
diff --git a/docs/reference-manual/src/main/jbake/content/delete-node-ssh.adoc b/docs/reference-manual/src/main/asciidoc/delete-node-ssh.adoc
similarity index 100%
rename from docs/reference-manual/src/main/jbake/content/delete-node-ssh.adoc
rename to docs/reference-manual/src/main/asciidoc/delete-node-ssh.adoc
diff --git a/docs/reference-manual/src/main/jbake/content/delete-password-alias.adoc b/docs/reference-manual/src/main/asciidoc/delete-password-alias.adoc
similarity index 100%
rename from docs/reference-manual/src/main/jbake/content/delete-password-alias.adoc
rename to docs/reference-manual/src/main/asciidoc/delete-password-alias.adoc
diff --git a/docs/reference-manual/src/main/jbake/content/delete-profiler.adoc b/docs/reference-manual/src/main/asciidoc/delete-profiler.adoc
similarity index 100%
rename from docs/reference-manual/src/main/jbake/content/delete-profiler.adoc
rename to docs/reference-manual/src/main/asciidoc/delete-profiler.adoc
diff --git a/docs/reference-manual/src/main/jbake/content/delete-protocol-filter.adoc b/docs/reference-manual/src/main/asciidoc/delete-protocol-filter.adoc
similarity index 100%
rename from docs/reference-manual/src/main/jbake/content/delete-protocol-filter.adoc
rename to docs/reference-manual/src/main/asciidoc/delete-protocol-filter.adoc
diff --git a/docs/reference-manual/src/main/jbake/content/delete-protocol-finder.adoc b/docs/reference-manual/src/main/asciidoc/delete-protocol-finder.adoc
similarity index 100%
rename from docs/reference-manual/src/main/jbake/content/delete-protocol-finder.adoc
rename to docs/reference-manual/src/main/asciidoc/delete-protocol-finder.adoc
diff --git a/docs/reference-manual/src/main/jbake/content/delete-protocol.adoc b/docs/reference-manual/src/main/asciidoc/delete-protocol.adoc
similarity index 100%
rename from docs/reference-manual/src/main/jbake/content/delete-protocol.adoc
rename to docs/reference-manual/src/main/asciidoc/delete-protocol.adoc
diff --git a/docs/reference-manual/src/main/jbake/content/delete-resource-adapter-config.adoc b/docs/reference-manual/src/main/asciidoc/delete-resource-adapter-config.adoc
similarity index 100%
rename from docs/reference-manual/src/main/jbake/content/delete-resource-adapter-config.adoc
rename to docs/reference-manual/src/main/asciidoc/delete-resource-adapter-config.adoc
diff --git a/docs/reference-manual/src/main/jbake/content/delete-resource-ref.adoc b/docs/reference-manual/src/main/asciidoc/delete-resource-ref.adoc
similarity index 100%
rename from docs/reference-manual/src/main/jbake/content/delete-resource-ref.adoc
rename to docs/reference-manual/src/main/asciidoc/delete-resource-ref.adoc
diff --git a/docs/reference-manual/src/main/jbake/content/delete-ssl.adoc b/docs/reference-manual/src/main/asciidoc/delete-ssl.adoc
similarity index 100%
rename from docs/reference-manual/src/main/jbake/content/delete-ssl.adoc
rename to docs/reference-manual/src/main/asciidoc/delete-ssl.adoc
diff --git a/docs/reference-manual/src/main/jbake/content/delete-system-property.adoc b/docs/reference-manual/src/main/asciidoc/delete-system-property.adoc
similarity index 100%
rename from docs/reference-manual/src/main/jbake/content/delete-system-property.adoc
rename to docs/reference-manual/src/main/asciidoc/delete-system-property.adoc
diff --git a/docs/reference-manual/src/main/jbake/content/delete-threadpool.adoc b/docs/reference-manual/src/main/asciidoc/delete-threadpool.adoc
similarity index 100%
rename from docs/reference-manual/src/main/jbake/content/delete-threadpool.adoc
rename to docs/reference-manual/src/main/asciidoc/delete-threadpool.adoc
diff --git a/docs/reference-manual/src/main/jbake/content/delete-transport.adoc b/docs/reference-manual/src/main/asciidoc/delete-transport.adoc
similarity index 100%
rename from docs/reference-manual/src/main/jbake/content/delete-transport.adoc
rename to docs/reference-manual/src/main/asciidoc/delete-transport.adoc
diff --git a/docs/reference-manual/src/main/jbake/content/delete-virtual-server.adoc b/docs/reference-manual/src/main/asciidoc/delete-virtual-server.adoc
similarity index 100%
rename from docs/reference-manual/src/main/jbake/content/delete-virtual-server.adoc
rename to docs/reference-manual/src/main/asciidoc/delete-virtual-server.adoc
diff --git a/docs/reference-manual/src/main/jbake/content/deploy.adoc b/docs/reference-manual/src/main/asciidoc/deploy.adoc
similarity index 100%
rename from docs/reference-manual/src/main/jbake/content/deploy.adoc
rename to docs/reference-manual/src/main/asciidoc/deploy.adoc
diff --git a/docs/reference-manual/src/main/jbake/content/deploydir.adoc b/docs/reference-manual/src/main/asciidoc/deploydir.adoc
similarity index 100%
rename from docs/reference-manual/src/main/jbake/content/deploydir.adoc
rename to docs/reference-manual/src/main/asciidoc/deploydir.adoc
diff --git a/docs/reference-manual/src/main/jbake/content/disable-http-lb-application.adoc b/docs/reference-manual/src/main/asciidoc/disable-http-lb-application.adoc
similarity index 100%
rename from docs/reference-manual/src/main/jbake/content/disable-http-lb-application.adoc
rename to docs/reference-manual/src/main/asciidoc/disable-http-lb-application.adoc
diff --git a/docs/reference-manual/src/main/jbake/content/disable-http-lb-server.adoc b/docs/reference-manual/src/main/asciidoc/disable-http-lb-server.adoc
similarity index 100%
rename from docs/reference-manual/src/main/jbake/content/disable-http-lb-server.adoc
rename to docs/reference-manual/src/main/asciidoc/disable-http-lb-server.adoc
diff --git a/docs/reference-manual/src/main/jbake/content/disable-monitoring.adoc b/docs/reference-manual/src/main/asciidoc/disable-monitoring.adoc
similarity index 100%
rename from docs/reference-manual/src/main/jbake/content/disable-monitoring.adoc
rename to docs/reference-manual/src/main/asciidoc/disable-monitoring.adoc
diff --git a/docs/reference-manual/src/main/jbake/content/disable-secure-admin-internal-user.adoc b/docs/reference-manual/src/main/asciidoc/disable-secure-admin-internal-user.adoc
similarity index 100%
rename from docs/reference-manual/src/main/jbake/content/disable-secure-admin-internal-user.adoc
rename to docs/reference-manual/src/main/asciidoc/disable-secure-admin-internal-user.adoc
diff --git a/docs/reference-manual/src/main/jbake/content/disable-secure-admin-principal.adoc b/docs/reference-manual/src/main/asciidoc/disable-secure-admin-principal.adoc
similarity index 100%
rename from docs/reference-manual/src/main/jbake/content/disable-secure-admin-principal.adoc
rename to docs/reference-manual/src/main/asciidoc/disable-secure-admin-principal.adoc
diff --git a/docs/reference-manual/src/main/jbake/content/disable-secure-admin.adoc b/docs/reference-manual/src/main/asciidoc/disable-secure-admin.adoc
similarity index 100%
rename from docs/reference-manual/src/main/jbake/content/disable-secure-admin.adoc
rename to docs/reference-manual/src/main/asciidoc/disable-secure-admin.adoc
diff --git a/docs/reference-manual/src/main/jbake/content/disable.adoc b/docs/reference-manual/src/main/asciidoc/disable.adoc
similarity index 100%
rename from docs/reference-manual/src/main/jbake/content/disable.adoc
rename to docs/reference-manual/src/main/asciidoc/disable.adoc
diff --git a/docs/reference-manual/src/main/jbake/content/domain.adoc b/docs/reference-manual/src/main/asciidoc/domain.adoc
similarity index 100%
rename from docs/reference-manual/src/main/jbake/content/domain.adoc
rename to docs/reference-manual/src/main/asciidoc/domain.adoc
diff --git a/docs/reference-manual/src/main/jbake/content/dotted-names.adoc b/docs/reference-manual/src/main/asciidoc/dotted-names.adoc
similarity index 100%
rename from docs/reference-manual/src/main/jbake/content/dotted-names.adoc
rename to docs/reference-manual/src/main/asciidoc/dotted-names.adoc
diff --git a/docs/reference-manual/src/main/jbake/content/enable-http-lb-application.adoc b/docs/reference-manual/src/main/asciidoc/enable-http-lb-application.adoc
similarity index 100%
rename from docs/reference-manual/src/main/jbake/content/enable-http-lb-application.adoc
rename to docs/reference-manual/src/main/asciidoc/enable-http-lb-application.adoc
diff --git a/docs/reference-manual/src/main/jbake/content/enable-http-lb-server.adoc b/docs/reference-manual/src/main/asciidoc/enable-http-lb-server.adoc
similarity index 100%
rename from docs/reference-manual/src/main/jbake/content/enable-http-lb-server.adoc
rename to docs/reference-manual/src/main/asciidoc/enable-http-lb-server.adoc
diff --git a/docs/reference-manual/src/main/jbake/content/enable-monitoring.adoc b/docs/reference-manual/src/main/asciidoc/enable-monitoring.adoc
similarity index 100%
rename from docs/reference-manual/src/main/jbake/content/enable-monitoring.adoc
rename to docs/reference-manual/src/main/asciidoc/enable-monitoring.adoc
diff --git a/docs/reference-manual/src/main/jbake/content/enable-secure-admin-internal-user.adoc b/docs/reference-manual/src/main/asciidoc/enable-secure-admin-internal-user.adoc
similarity index 100%
rename from docs/reference-manual/src/main/jbake/content/enable-secure-admin-internal-user.adoc
rename to docs/reference-manual/src/main/asciidoc/enable-secure-admin-internal-user.adoc
diff --git a/docs/reference-manual/src/main/jbake/content/enable-secure-admin-principal.adoc b/docs/reference-manual/src/main/asciidoc/enable-secure-admin-principal.adoc
similarity index 100%
rename from docs/reference-manual/src/main/jbake/content/enable-secure-admin-principal.adoc
rename to docs/reference-manual/src/main/asciidoc/enable-secure-admin-principal.adoc
diff --git a/docs/reference-manual/src/main/jbake/content/enable-secure-admin.adoc b/docs/reference-manual/src/main/asciidoc/enable-secure-admin.adoc
similarity index 100%
rename from docs/reference-manual/src/main/jbake/content/enable-secure-admin.adoc
rename to docs/reference-manual/src/main/asciidoc/enable-secure-admin.adoc
diff --git a/docs/reference-manual/src/main/jbake/content/enable.adoc b/docs/reference-manual/src/main/asciidoc/enable.adoc
similarity index 100%
rename from docs/reference-manual/src/main/jbake/content/enable.adoc
rename to docs/reference-manual/src/main/asciidoc/enable.adoc
diff --git a/docs/reference-manual/src/main/jbake/content/export-http-lb-config.adoc b/docs/reference-manual/src/main/asciidoc/export-http-lb-config.adoc
similarity index 100%
rename from docs/reference-manual/src/main/jbake/content/export-http-lb-config.adoc
rename to docs/reference-manual/src/main/asciidoc/export-http-lb-config.adoc
diff --git a/docs/reference-manual/src/main/jbake/content/export-sync-bundle.adoc b/docs/reference-manual/src/main/asciidoc/export-sync-bundle.adoc
similarity index 100%
rename from docs/reference-manual/src/main/jbake/content/export-sync-bundle.adoc
rename to docs/reference-manual/src/main/asciidoc/export-sync-bundle.adoc
diff --git a/docs/reference-manual/src/main/jbake/content/export.adoc b/docs/reference-manual/src/main/asciidoc/export.adoc
similarity index 100%
rename from docs/reference-manual/src/main/jbake/content/export.adoc
rename to docs/reference-manual/src/main/asciidoc/export.adoc
diff --git a/docs/reference-manual/src/main/jbake/content/flush-connection-pool.adoc b/docs/reference-manual/src/main/asciidoc/flush-connection-pool.adoc
similarity index 100%
rename from docs/reference-manual/src/main/jbake/content/flush-connection-pool.adoc
rename to docs/reference-manual/src/main/asciidoc/flush-connection-pool.adoc
diff --git a/docs/reference-manual/src/main/jbake/content/flush-jmsdest.adoc b/docs/reference-manual/src/main/asciidoc/flush-jmsdest.adoc
similarity index 100%
rename from docs/reference-manual/src/main/jbake/content/flush-jmsdest.adoc
rename to docs/reference-manual/src/main/asciidoc/flush-jmsdest.adoc
diff --git a/docs/reference-manual/src/main/jbake/content/freeze-transaction-service.adoc b/docs/reference-manual/src/main/asciidoc/freeze-transaction-service.adoc
similarity index 100%
rename from docs/reference-manual/src/main/jbake/content/freeze-transaction-service.adoc
rename to docs/reference-manual/src/main/asciidoc/freeze-transaction-service.adoc
diff --git a/docs/reference-manual/src/main/jbake/content/generate-jvm-report.adoc b/docs/reference-manual/src/main/asciidoc/generate-jvm-report.adoc
similarity index 100%
rename from docs/reference-manual/src/main/jbake/content/generate-jvm-report.adoc
rename to docs/reference-manual/src/main/asciidoc/generate-jvm-report.adoc
diff --git a/docs/reference-manual/src/main/jbake/content/get-active-module-config.adoc b/docs/reference-manual/src/main/asciidoc/get-active-module-config.adoc
similarity index 100%
rename from docs/reference-manual/src/main/jbake/content/get-active-module-config.adoc
rename to docs/reference-manual/src/main/asciidoc/get-active-module-config.adoc
diff --git a/docs/reference-manual/src/main/jbake/content/get-client-stubs.adoc b/docs/reference-manual/src/main/asciidoc/get-client-stubs.adoc
similarity index 100%
rename from docs/reference-manual/src/main/jbake/content/get-client-stubs.adoc
rename to docs/reference-manual/src/main/asciidoc/get-client-stubs.adoc
diff --git a/docs/reference-manual/src/main/jbake/content/get-health.adoc b/docs/reference-manual/src/main/asciidoc/get-health.adoc
similarity index 100%
rename from docs/reference-manual/src/main/jbake/content/get-health.adoc
rename to docs/reference-manual/src/main/asciidoc/get-health.adoc
diff --git a/docs/reference-manual/src/main/jbake/content/get.adoc b/docs/reference-manual/src/main/asciidoc/get.adoc
similarity index 100%
rename from docs/reference-manual/src/main/jbake/content/get.adoc
rename to docs/reference-manual/src/main/asciidoc/get.adoc
diff --git a/docs/reference-manual/src/main/jbake/assets/img/eclipse_foundation_logo_tiny.png b/docs/reference-manual/src/main/asciidoc/img/eclipse_foundation_logo_tiny.png
similarity index 100%
rename from docs/reference-manual/src/main/jbake/assets/img/eclipse_foundation_logo_tiny.png
rename to docs/reference-manual/src/main/asciidoc/img/eclipse_foundation_logo_tiny.png
Binary files differ
diff --git a/docs/reference-manual/src/main/jbake/content/import-sync-bundle.adoc b/docs/reference-manual/src/main/asciidoc/import-sync-bundle.adoc
similarity index 100%
rename from docs/reference-manual/src/main/jbake/content/import-sync-bundle.adoc
rename to docs/reference-manual/src/main/asciidoc/import-sync-bundle.adoc
diff --git a/docs/reference-manual/src/main/jbake/content/install-node-dcom.adoc b/docs/reference-manual/src/main/asciidoc/install-node-dcom.adoc
similarity index 100%
rename from docs/reference-manual/src/main/jbake/content/install-node-dcom.adoc
rename to docs/reference-manual/src/main/asciidoc/install-node-dcom.adoc
diff --git a/docs/reference-manual/src/main/jbake/content/install-node-ssh.adoc b/docs/reference-manual/src/main/asciidoc/install-node-ssh.adoc
similarity index 100%
rename from docs/reference-manual/src/main/jbake/content/install-node-ssh.adoc
rename to docs/reference-manual/src/main/asciidoc/install-node-ssh.adoc
diff --git a/docs/reference-manual/src/main/jbake/content/install-node.adoc b/docs/reference-manual/src/main/asciidoc/install-node.adoc
similarity index 100%
rename from docs/reference-manual/src/main/jbake/content/install-node.adoc
rename to docs/reference-manual/src/main/asciidoc/install-node.adoc
diff --git a/docs/reference-manual/src/main/jbake/content/instance.adoc b/docs/reference-manual/src/main/asciidoc/instance.adoc
similarity index 100%
rename from docs/reference-manual/src/main/jbake/content/instance.adoc
rename to docs/reference-manual/src/main/asciidoc/instance.adoc
diff --git a/docs/reference-manual/src/main/jbake/content/jms-ping.adoc b/docs/reference-manual/src/main/asciidoc/jms-ping.adoc
similarity index 100%
rename from docs/reference-manual/src/main/jbake/content/jms-ping.adoc
rename to docs/reference-manual/src/main/asciidoc/jms-ping.adoc
diff --git a/docs/reference-manual/src/main/jbake/content/list-admin-objects.adoc b/docs/reference-manual/src/main/asciidoc/list-admin-objects.adoc
similarity index 100%
rename from docs/reference-manual/src/main/jbake/content/list-admin-objects.adoc
rename to docs/reference-manual/src/main/asciidoc/list-admin-objects.adoc
diff --git a/docs/reference-manual/src/main/jbake/content/list-application-refs.adoc b/docs/reference-manual/src/main/asciidoc/list-application-refs.adoc
similarity index 100%
rename from docs/reference-manual/src/main/jbake/content/list-application-refs.adoc
rename to docs/reference-manual/src/main/asciidoc/list-application-refs.adoc
diff --git a/docs/reference-manual/src/main/jbake/content/list-applications.adoc b/docs/reference-manual/src/main/asciidoc/list-applications.adoc
similarity index 100%
rename from docs/reference-manual/src/main/jbake/content/list-applications.adoc
rename to docs/reference-manual/src/main/asciidoc/list-applications.adoc
diff --git a/docs/reference-manual/src/main/jbake/content/list-audit-modules.adoc b/docs/reference-manual/src/main/asciidoc/list-audit-modules.adoc
similarity index 100%
rename from docs/reference-manual/src/main/jbake/content/list-audit-modules.adoc
rename to docs/reference-manual/src/main/asciidoc/list-audit-modules.adoc
diff --git a/docs/reference-manual/src/main/jbake/content/list-auth-realms.adoc b/docs/reference-manual/src/main/asciidoc/list-auth-realms.adoc
similarity index 100%
rename from docs/reference-manual/src/main/jbake/content/list-auth-realms.adoc
rename to docs/reference-manual/src/main/asciidoc/list-auth-realms.adoc
diff --git a/docs/reference-manual/src/main/jbake/content/list-backups.adoc b/docs/reference-manual/src/main/asciidoc/list-backups.adoc
similarity index 100%
rename from docs/reference-manual/src/main/jbake/content/list-backups.adoc
rename to docs/reference-manual/src/main/asciidoc/list-backups.adoc
diff --git a/docs/reference-manual/src/main/jbake/content/list-batch-job-executions.adoc b/docs/reference-manual/src/main/asciidoc/list-batch-job-executions.adoc
similarity index 100%
rename from docs/reference-manual/src/main/jbake/content/list-batch-job-executions.adoc
rename to docs/reference-manual/src/main/asciidoc/list-batch-job-executions.adoc
diff --git a/docs/reference-manual/src/main/jbake/content/list-batch-job-steps.adoc b/docs/reference-manual/src/main/asciidoc/list-batch-job-steps.adoc
similarity index 100%
rename from docs/reference-manual/src/main/jbake/content/list-batch-job-steps.adoc
rename to docs/reference-manual/src/main/asciidoc/list-batch-job-steps.adoc
diff --git a/docs/reference-manual/src/main/jbake/content/list-batch-jobs.adoc b/docs/reference-manual/src/main/asciidoc/list-batch-jobs.adoc
similarity index 100%
rename from docs/reference-manual/src/main/jbake/content/list-batch-jobs.adoc
rename to docs/reference-manual/src/main/asciidoc/list-batch-jobs.adoc
diff --git a/docs/reference-manual/src/main/jbake/content/list-batch-runtime-configuration.adoc b/docs/reference-manual/src/main/asciidoc/list-batch-runtime-configuration.adoc
similarity index 100%
rename from docs/reference-manual/src/main/jbake/content/list-batch-runtime-configuration.adoc
rename to docs/reference-manual/src/main/asciidoc/list-batch-runtime-configuration.adoc
diff --git a/docs/reference-manual/src/main/jbake/content/list-clusters.adoc b/docs/reference-manual/src/main/asciidoc/list-clusters.adoc
similarity index 100%
rename from docs/reference-manual/src/main/jbake/content/list-clusters.adoc
rename to docs/reference-manual/src/main/asciidoc/list-clusters.adoc
diff --git a/docs/reference-manual/src/main/jbake/content/list-commands.adoc b/docs/reference-manual/src/main/asciidoc/list-commands.adoc
similarity index 100%
rename from docs/reference-manual/src/main/jbake/content/list-commands.adoc
rename to docs/reference-manual/src/main/asciidoc/list-commands.adoc
diff --git a/docs/reference-manual/src/main/jbake/content/list-components.adoc b/docs/reference-manual/src/main/asciidoc/list-components.adoc
similarity index 100%
rename from docs/reference-manual/src/main/jbake/content/list-components.adoc
rename to docs/reference-manual/src/main/asciidoc/list-components.adoc
diff --git a/docs/reference-manual/src/main/jbake/content/list-configs.adoc b/docs/reference-manual/src/main/asciidoc/list-configs.adoc
similarity index 100%
rename from docs/reference-manual/src/main/jbake/content/list-configs.adoc
rename to docs/reference-manual/src/main/asciidoc/list-configs.adoc
diff --git a/docs/reference-manual/src/main/jbake/content/list-connector-connection-pools.adoc b/docs/reference-manual/src/main/asciidoc/list-connector-connection-pools.adoc
similarity index 100%
rename from docs/reference-manual/src/main/jbake/content/list-connector-connection-pools.adoc
rename to docs/reference-manual/src/main/asciidoc/list-connector-connection-pools.adoc
diff --git a/docs/reference-manual/src/main/jbake/content/list-connector-resources.adoc b/docs/reference-manual/src/main/asciidoc/list-connector-resources.adoc
similarity index 100%
rename from docs/reference-manual/src/main/jbake/content/list-connector-resources.adoc
rename to docs/reference-manual/src/main/asciidoc/list-connector-resources.adoc
diff --git a/docs/reference-manual/src/main/jbake/content/list-connector-security-maps.adoc b/docs/reference-manual/src/main/asciidoc/list-connector-security-maps.adoc
similarity index 100%
rename from docs/reference-manual/src/main/jbake/content/list-connector-security-maps.adoc
rename to docs/reference-manual/src/main/asciidoc/list-connector-security-maps.adoc
diff --git a/docs/reference-manual/src/main/jbake/content/list-connector-work-security-maps.adoc b/docs/reference-manual/src/main/asciidoc/list-connector-work-security-maps.adoc
similarity index 100%
rename from docs/reference-manual/src/main/jbake/content/list-connector-work-security-maps.adoc
rename to docs/reference-manual/src/main/asciidoc/list-connector-work-security-maps.adoc
diff --git a/docs/reference-manual/src/main/jbake/content/list-containers.adoc b/docs/reference-manual/src/main/asciidoc/list-containers.adoc
similarity index 100%
rename from docs/reference-manual/src/main/jbake/content/list-containers.adoc
rename to docs/reference-manual/src/main/asciidoc/list-containers.adoc
diff --git a/docs/reference-manual/src/main/jbake/content/list-context-services.adoc b/docs/reference-manual/src/main/asciidoc/list-context-services.adoc
similarity index 100%
rename from docs/reference-manual/src/main/jbake/content/list-context-services.adoc
rename to docs/reference-manual/src/main/asciidoc/list-context-services.adoc
diff --git a/docs/reference-manual/src/main/jbake/content/list-custom-resources.adoc b/docs/reference-manual/src/main/asciidoc/list-custom-resources.adoc
similarity index 100%
rename from docs/reference-manual/src/main/jbake/content/list-custom-resources.adoc
rename to docs/reference-manual/src/main/asciidoc/list-custom-resources.adoc
diff --git a/docs/reference-manual/src/main/jbake/content/list-domains.adoc b/docs/reference-manual/src/main/asciidoc/list-domains.adoc
similarity index 100%
rename from docs/reference-manual/src/main/jbake/content/list-domains.adoc
rename to docs/reference-manual/src/main/asciidoc/list-domains.adoc
diff --git a/docs/reference-manual/src/main/jbake/content/list-file-groups.adoc b/docs/reference-manual/src/main/asciidoc/list-file-groups.adoc
similarity index 100%
rename from docs/reference-manual/src/main/jbake/content/list-file-groups.adoc
rename to docs/reference-manual/src/main/asciidoc/list-file-groups.adoc
diff --git a/docs/reference-manual/src/main/jbake/content/list-file-users.adoc b/docs/reference-manual/src/main/asciidoc/list-file-users.adoc
similarity index 100%
rename from docs/reference-manual/src/main/jbake/content/list-file-users.adoc
rename to docs/reference-manual/src/main/asciidoc/list-file-users.adoc
diff --git a/docs/reference-manual/src/main/jbake/content/list-http-lb-configs.adoc b/docs/reference-manual/src/main/asciidoc/list-http-lb-configs.adoc
similarity index 100%
rename from docs/reference-manual/src/main/jbake/content/list-http-lb-configs.adoc
rename to docs/reference-manual/src/main/asciidoc/list-http-lb-configs.adoc
diff --git a/docs/reference-manual/src/main/jbake/content/list-http-lbs.adoc b/docs/reference-manual/src/main/asciidoc/list-http-lbs.adoc
similarity index 100%
rename from docs/reference-manual/src/main/jbake/content/list-http-lbs.adoc
rename to docs/reference-manual/src/main/asciidoc/list-http-lbs.adoc
diff --git a/docs/reference-manual/src/main/jbake/content/list-http-listeners.adoc b/docs/reference-manual/src/main/asciidoc/list-http-listeners.adoc
similarity index 100%
rename from docs/reference-manual/src/main/jbake/content/list-http-listeners.adoc
rename to docs/reference-manual/src/main/asciidoc/list-http-listeners.adoc
diff --git a/docs/reference-manual/src/main/jbake/content/list-iiop-listeners.adoc b/docs/reference-manual/src/main/asciidoc/list-iiop-listeners.adoc
similarity index 100%
rename from docs/reference-manual/src/main/jbake/content/list-iiop-listeners.adoc
rename to docs/reference-manual/src/main/asciidoc/list-iiop-listeners.adoc
diff --git a/docs/reference-manual/src/main/jbake/content/list-instances.adoc b/docs/reference-manual/src/main/asciidoc/list-instances.adoc
similarity index 100%
rename from docs/reference-manual/src/main/jbake/content/list-instances.adoc
rename to docs/reference-manual/src/main/asciidoc/list-instances.adoc
diff --git a/docs/reference-manual/src/main/jbake/content/list-jacc-providers.adoc b/docs/reference-manual/src/main/asciidoc/list-jacc-providers.adoc
similarity index 100%
rename from docs/reference-manual/src/main/jbake/content/list-jacc-providers.adoc
rename to docs/reference-manual/src/main/asciidoc/list-jacc-providers.adoc
diff --git a/docs/reference-manual/src/main/jbake/content/list-javamail-resources.adoc b/docs/reference-manual/src/main/asciidoc/list-javamail-resources.adoc
similarity index 100%
rename from docs/reference-manual/src/main/jbake/content/list-javamail-resources.adoc
rename to docs/reference-manual/src/main/asciidoc/list-javamail-resources.adoc
diff --git a/docs/reference-manual/src/main/jbake/content/list-jdbc-connection-pools.adoc b/docs/reference-manual/src/main/asciidoc/list-jdbc-connection-pools.adoc
similarity index 100%
rename from docs/reference-manual/src/main/jbake/content/list-jdbc-connection-pools.adoc
rename to docs/reference-manual/src/main/asciidoc/list-jdbc-connection-pools.adoc
diff --git a/docs/reference-manual/src/main/jbake/content/list-jdbc-resources.adoc b/docs/reference-manual/src/main/asciidoc/list-jdbc-resources.adoc
similarity index 100%
rename from docs/reference-manual/src/main/jbake/content/list-jdbc-resources.adoc
rename to docs/reference-manual/src/main/asciidoc/list-jdbc-resources.adoc
diff --git a/docs/reference-manual/src/main/jbake/content/list-jms-hosts.adoc b/docs/reference-manual/src/main/asciidoc/list-jms-hosts.adoc
similarity index 100%
rename from docs/reference-manual/src/main/jbake/content/list-jms-hosts.adoc
rename to docs/reference-manual/src/main/asciidoc/list-jms-hosts.adoc
diff --git a/docs/reference-manual/src/main/jbake/content/list-jms-resources.adoc b/docs/reference-manual/src/main/asciidoc/list-jms-resources.adoc
similarity index 100%
rename from docs/reference-manual/src/main/jbake/content/list-jms-resources.adoc
rename to docs/reference-manual/src/main/asciidoc/list-jms-resources.adoc
diff --git a/docs/reference-manual/src/main/jbake/content/list-jmsdest.adoc b/docs/reference-manual/src/main/asciidoc/list-jmsdest.adoc
similarity index 100%
rename from docs/reference-manual/src/main/jbake/content/list-jmsdest.adoc
rename to docs/reference-manual/src/main/asciidoc/list-jmsdest.adoc
diff --git a/docs/reference-manual/src/main/jbake/content/list-jndi-entries.adoc b/docs/reference-manual/src/main/asciidoc/list-jndi-entries.adoc
similarity index 100%
rename from docs/reference-manual/src/main/jbake/content/list-jndi-entries.adoc
rename to docs/reference-manual/src/main/asciidoc/list-jndi-entries.adoc
diff --git a/docs/reference-manual/src/main/jbake/content/list-jndi-resources.adoc b/docs/reference-manual/src/main/asciidoc/list-jndi-resources.adoc
similarity index 100%
rename from docs/reference-manual/src/main/jbake/content/list-jndi-resources.adoc
rename to docs/reference-manual/src/main/asciidoc/list-jndi-resources.adoc
diff --git a/docs/reference-manual/src/main/jbake/content/list-jobs.adoc b/docs/reference-manual/src/main/asciidoc/list-jobs.adoc
similarity index 100%
rename from docs/reference-manual/src/main/jbake/content/list-jobs.adoc
rename to docs/reference-manual/src/main/asciidoc/list-jobs.adoc
diff --git a/docs/reference-manual/src/main/jbake/content/list-jvm-options.adoc b/docs/reference-manual/src/main/asciidoc/list-jvm-options.adoc
similarity index 100%
rename from docs/reference-manual/src/main/jbake/content/list-jvm-options.adoc
rename to docs/reference-manual/src/main/asciidoc/list-jvm-options.adoc
diff --git a/docs/reference-manual/src/main/jbake/content/list-libraries.adoc b/docs/reference-manual/src/main/asciidoc/list-libraries.adoc
similarity index 100%
rename from docs/reference-manual/src/main/jbake/content/list-libraries.adoc
rename to docs/reference-manual/src/main/asciidoc/list-libraries.adoc
diff --git a/docs/reference-manual/src/main/jbake/content/list-lifecycle-modules.adoc b/docs/reference-manual/src/main/asciidoc/list-lifecycle-modules.adoc
similarity index 100%
rename from docs/reference-manual/src/main/jbake/content/list-lifecycle-modules.adoc
rename to docs/reference-manual/src/main/asciidoc/list-lifecycle-modules.adoc
diff --git a/docs/reference-manual/src/main/jbake/content/list-log-attributes.adoc b/docs/reference-manual/src/main/asciidoc/list-log-attributes.adoc
similarity index 100%
rename from docs/reference-manual/src/main/jbake/content/list-log-attributes.adoc
rename to docs/reference-manual/src/main/asciidoc/list-log-attributes.adoc
diff --git a/docs/reference-manual/src/main/jbake/content/list-log-levels.adoc b/docs/reference-manual/src/main/asciidoc/list-log-levels.adoc
similarity index 100%
rename from docs/reference-manual/src/main/jbake/content/list-log-levels.adoc
rename to docs/reference-manual/src/main/asciidoc/list-log-levels.adoc
diff --git a/docs/reference-manual/src/main/jbake/content/list-loggers.adoc b/docs/reference-manual/src/main/asciidoc/list-loggers.adoc
similarity index 100%
rename from docs/reference-manual/src/main/jbake/content/list-loggers.adoc
rename to docs/reference-manual/src/main/asciidoc/list-loggers.adoc
diff --git a/docs/reference-manual/src/main/jbake/content/list-managed-executor-services.adoc b/docs/reference-manual/src/main/asciidoc/list-managed-executor-services.adoc
similarity index 100%
rename from docs/reference-manual/src/main/jbake/content/list-managed-executor-services.adoc
rename to docs/reference-manual/src/main/asciidoc/list-managed-executor-services.adoc
diff --git a/docs/reference-manual/src/main/jbake/content/list-managed-scheduled-executor-services.adoc b/docs/reference-manual/src/main/asciidoc/list-managed-scheduled-executor-services.adoc
similarity index 100%
rename from docs/reference-manual/src/main/jbake/content/list-managed-scheduled-executor-services.adoc
rename to docs/reference-manual/src/main/asciidoc/list-managed-scheduled-executor-services.adoc
diff --git a/docs/reference-manual/src/main/jbake/content/list-managed-thread-factories.adoc b/docs/reference-manual/src/main/asciidoc/list-managed-thread-factories.adoc
similarity index 100%
rename from docs/reference-manual/src/main/jbake/content/list-managed-thread-factories.adoc
rename to docs/reference-manual/src/main/asciidoc/list-managed-thread-factories.adoc
diff --git a/docs/reference-manual/src/main/jbake/content/list-message-security-providers.adoc b/docs/reference-manual/src/main/asciidoc/list-message-security-providers.adoc
similarity index 100%
rename from docs/reference-manual/src/main/jbake/content/list-message-security-providers.adoc
rename to docs/reference-manual/src/main/asciidoc/list-message-security-providers.adoc
diff --git a/docs/reference-manual/src/main/jbake/content/list-modules.adoc b/docs/reference-manual/src/main/asciidoc/list-modules.adoc
similarity index 100%
rename from docs/reference-manual/src/main/jbake/content/list-modules.adoc
rename to docs/reference-manual/src/main/asciidoc/list-modules.adoc
diff --git a/docs/reference-manual/src/main/jbake/content/list-network-listeners.adoc b/docs/reference-manual/src/main/asciidoc/list-network-listeners.adoc
similarity index 100%
rename from docs/reference-manual/src/main/jbake/content/list-network-listeners.adoc
rename to docs/reference-manual/src/main/asciidoc/list-network-listeners.adoc
diff --git a/docs/reference-manual/src/main/jbake/content/list-nodes-config.adoc b/docs/reference-manual/src/main/asciidoc/list-nodes-config.adoc
similarity index 100%
rename from docs/reference-manual/src/main/jbake/content/list-nodes-config.adoc
rename to docs/reference-manual/src/main/asciidoc/list-nodes-config.adoc
diff --git a/docs/reference-manual/src/main/jbake/content/list-nodes-dcom.adoc b/docs/reference-manual/src/main/asciidoc/list-nodes-dcom.adoc
similarity index 100%
rename from docs/reference-manual/src/main/jbake/content/list-nodes-dcom.adoc
rename to docs/reference-manual/src/main/asciidoc/list-nodes-dcom.adoc
diff --git a/docs/reference-manual/src/main/jbake/content/list-nodes-ssh.adoc b/docs/reference-manual/src/main/asciidoc/list-nodes-ssh.adoc
similarity index 100%
rename from docs/reference-manual/src/main/jbake/content/list-nodes-ssh.adoc
rename to docs/reference-manual/src/main/asciidoc/list-nodes-ssh.adoc
diff --git a/docs/reference-manual/src/main/jbake/content/list-nodes.adoc b/docs/reference-manual/src/main/asciidoc/list-nodes.adoc
similarity index 100%
rename from docs/reference-manual/src/main/jbake/content/list-nodes.adoc
rename to docs/reference-manual/src/main/asciidoc/list-nodes.adoc
diff --git a/docs/reference-manual/src/main/jbake/content/list-password-aliases.adoc b/docs/reference-manual/src/main/asciidoc/list-password-aliases.adoc
similarity index 100%
rename from docs/reference-manual/src/main/jbake/content/list-password-aliases.adoc
rename to docs/reference-manual/src/main/asciidoc/list-password-aliases.adoc
diff --git a/docs/reference-manual/src/main/jbake/content/list-persistence-types.adoc b/docs/reference-manual/src/main/asciidoc/list-persistence-types.adoc
similarity index 100%
rename from docs/reference-manual/src/main/jbake/content/list-persistence-types.adoc
rename to docs/reference-manual/src/main/asciidoc/list-persistence-types.adoc
diff --git a/docs/reference-manual/src/main/jbake/content/list-protocol-filters.adoc b/docs/reference-manual/src/main/asciidoc/list-protocol-filters.adoc
similarity index 100%
rename from docs/reference-manual/src/main/jbake/content/list-protocol-filters.adoc
rename to docs/reference-manual/src/main/asciidoc/list-protocol-filters.adoc
diff --git a/docs/reference-manual/src/main/jbake/content/list-protocol-finders.adoc b/docs/reference-manual/src/main/asciidoc/list-protocol-finders.adoc
similarity index 100%
rename from docs/reference-manual/src/main/jbake/content/list-protocol-finders.adoc
rename to docs/reference-manual/src/main/asciidoc/list-protocol-finders.adoc
diff --git a/docs/reference-manual/src/main/jbake/content/list-protocols.adoc b/docs/reference-manual/src/main/asciidoc/list-protocols.adoc
similarity index 100%
rename from docs/reference-manual/src/main/jbake/content/list-protocols.adoc
rename to docs/reference-manual/src/main/asciidoc/list-protocols.adoc
diff --git a/docs/reference-manual/src/main/jbake/content/list-resource-adapter-configs.adoc b/docs/reference-manual/src/main/asciidoc/list-resource-adapter-configs.adoc
similarity index 100%
rename from docs/reference-manual/src/main/jbake/content/list-resource-adapter-configs.adoc
rename to docs/reference-manual/src/main/asciidoc/list-resource-adapter-configs.adoc
diff --git a/docs/reference-manual/src/main/jbake/content/list-resource-refs.adoc b/docs/reference-manual/src/main/asciidoc/list-resource-refs.adoc
similarity index 100%
rename from docs/reference-manual/src/main/jbake/content/list-resource-refs.adoc
rename to docs/reference-manual/src/main/asciidoc/list-resource-refs.adoc
diff --git a/docs/reference-manual/src/main/jbake/content/list-secure-admin-internal-users.adoc b/docs/reference-manual/src/main/asciidoc/list-secure-admin-internal-users.adoc
similarity index 100%
rename from docs/reference-manual/src/main/jbake/content/list-secure-admin-internal-users.adoc
rename to docs/reference-manual/src/main/asciidoc/list-secure-admin-internal-users.adoc
diff --git a/docs/reference-manual/src/main/jbake/content/list-secure-admin-principals.adoc b/docs/reference-manual/src/main/asciidoc/list-secure-admin-principals.adoc
similarity index 100%
rename from docs/reference-manual/src/main/jbake/content/list-secure-admin-principals.adoc
rename to docs/reference-manual/src/main/asciidoc/list-secure-admin-principals.adoc
diff --git a/docs/reference-manual/src/main/jbake/content/list-sub-components.adoc b/docs/reference-manual/src/main/asciidoc/list-sub-components.adoc
similarity index 100%
rename from docs/reference-manual/src/main/jbake/content/list-sub-components.adoc
rename to docs/reference-manual/src/main/asciidoc/list-sub-components.adoc
diff --git a/docs/reference-manual/src/main/jbake/content/list-supported-cipher-suites.adoc b/docs/reference-manual/src/main/asciidoc/list-supported-cipher-suites.adoc
similarity index 100%
rename from docs/reference-manual/src/main/jbake/content/list-supported-cipher-suites.adoc
rename to docs/reference-manual/src/main/asciidoc/list-supported-cipher-suites.adoc
diff --git a/docs/reference-manual/src/main/jbake/content/list-system-properties.adoc b/docs/reference-manual/src/main/asciidoc/list-system-properties.adoc
similarity index 100%
rename from docs/reference-manual/src/main/jbake/content/list-system-properties.adoc
rename to docs/reference-manual/src/main/asciidoc/list-system-properties.adoc
diff --git a/docs/reference-manual/src/main/jbake/content/list-threadpools.adoc b/docs/reference-manual/src/main/asciidoc/list-threadpools.adoc
similarity index 100%
rename from docs/reference-manual/src/main/jbake/content/list-threadpools.adoc
rename to docs/reference-manual/src/main/asciidoc/list-threadpools.adoc
diff --git a/docs/reference-manual/src/main/jbake/content/list-timers.adoc b/docs/reference-manual/src/main/asciidoc/list-timers.adoc
similarity index 100%
rename from docs/reference-manual/src/main/jbake/content/list-timers.adoc
rename to docs/reference-manual/src/main/asciidoc/list-timers.adoc
diff --git a/docs/reference-manual/src/main/jbake/content/list-transports.adoc b/docs/reference-manual/src/main/asciidoc/list-transports.adoc
similarity index 100%
rename from docs/reference-manual/src/main/jbake/content/list-transports.adoc
rename to docs/reference-manual/src/main/asciidoc/list-transports.adoc
diff --git a/docs/reference-manual/src/main/jbake/content/list-virtual-servers.adoc b/docs/reference-manual/src/main/asciidoc/list-virtual-servers.adoc
similarity index 100%
rename from docs/reference-manual/src/main/jbake/content/list-virtual-servers.adoc
rename to docs/reference-manual/src/main/asciidoc/list-virtual-servers.adoc
diff --git a/docs/reference-manual/src/main/jbake/content/list-web-context-param.adoc b/docs/reference-manual/src/main/asciidoc/list-web-context-param.adoc
similarity index 100%
rename from docs/reference-manual/src/main/jbake/content/list-web-context-param.adoc
rename to docs/reference-manual/src/main/asciidoc/list-web-context-param.adoc
diff --git a/docs/reference-manual/src/main/jbake/content/list-web-env-entry.adoc b/docs/reference-manual/src/main/asciidoc/list-web-env-entry.adoc
similarity index 100%
rename from docs/reference-manual/src/main/jbake/content/list-web-env-entry.adoc
rename to docs/reference-manual/src/main/asciidoc/list-web-env-entry.adoc
diff --git a/docs/reference-manual/src/main/jbake/content/list.adoc b/docs/reference-manual/src/main/asciidoc/list.adoc
similarity index 100%
rename from docs/reference-manual/src/main/jbake/content/list.adoc
rename to docs/reference-manual/src/main/asciidoc/list.adoc
diff --git a/docs/reference-manual/src/main/jbake/content/logging.adoc b/docs/reference-manual/src/main/asciidoc/logging.adoc
similarity index 100%
rename from docs/reference-manual/src/main/jbake/content/logging.adoc
rename to docs/reference-manual/src/main/asciidoc/logging.adoc
diff --git a/docs/reference-manual/src/main/jbake/content/login.adoc b/docs/reference-manual/src/main/asciidoc/login.adoc
similarity index 100%
rename from docs/reference-manual/src/main/jbake/content/login.adoc
rename to docs/reference-manual/src/main/asciidoc/login.adoc
diff --git a/docs/reference-manual/src/main/jbake/content/manvol1.adoc b/docs/reference-manual/src/main/asciidoc/manvol1.adoc
similarity index 100%
rename from docs/reference-manual/src/main/jbake/content/manvol1.adoc
rename to docs/reference-manual/src/main/asciidoc/manvol1.adoc
diff --git a/docs/reference-manual/src/main/jbake/content/manvol1m.adoc b/docs/reference-manual/src/main/asciidoc/manvol1m.adoc
similarity index 100%
rename from docs/reference-manual/src/main/jbake/content/manvol1m.adoc
rename to docs/reference-manual/src/main/asciidoc/manvol1m.adoc
diff --git a/docs/reference-manual/src/main/jbake/content/manvol5asc.adoc b/docs/reference-manual/src/main/asciidoc/manvol5asc.adoc
similarity index 100%
rename from docs/reference-manual/src/main/jbake/content/manvol5asc.adoc
rename to docs/reference-manual/src/main/asciidoc/manvol5asc.adoc
diff --git a/docs/reference-manual/src/main/jbake/content/migrate-timers.adoc b/docs/reference-manual/src/main/asciidoc/migrate-timers.adoc
similarity index 100%
rename from docs/reference-manual/src/main/jbake/content/migrate-timers.adoc
rename to docs/reference-manual/src/main/asciidoc/migrate-timers.adoc
diff --git a/docs/reference-manual/src/main/jbake/content/monitor.adoc b/docs/reference-manual/src/main/asciidoc/monitor.adoc
similarity index 100%
rename from docs/reference-manual/src/main/jbake/content/monitor.adoc
rename to docs/reference-manual/src/main/asciidoc/monitor.adoc
diff --git a/docs/reference-manual/src/main/jbake/content/monitoring.adoc b/docs/reference-manual/src/main/asciidoc/monitoring.adoc
similarity index 100%
rename from docs/reference-manual/src/main/jbake/content/monitoring.adoc
rename to docs/reference-manual/src/main/asciidoc/monitoring.adoc
diff --git a/docs/reference-manual/src/main/jbake/content/multimode.adoc b/docs/reference-manual/src/main/asciidoc/multimode.adoc
similarity index 100%
rename from docs/reference-manual/src/main/jbake/content/multimode.adoc
rename to docs/reference-manual/src/main/asciidoc/multimode.adoc
diff --git a/docs/reference-manual/src/main/jbake/content/osgi-shell.adoc b/docs/reference-manual/src/main/asciidoc/osgi-shell.adoc
similarity index 100%
rename from docs/reference-manual/src/main/jbake/content/osgi-shell.adoc
rename to docs/reference-manual/src/main/asciidoc/osgi-shell.adoc
diff --git a/docs/reference-manual/src/main/jbake/content/osgi.adoc b/docs/reference-manual/src/main/asciidoc/osgi.adoc
similarity index 100%
rename from docs/reference-manual/src/main/jbake/content/osgi.adoc
rename to docs/reference-manual/src/main/asciidoc/osgi.adoc
diff --git a/docs/reference-manual/src/main/jbake/content/package-appclient.adoc b/docs/reference-manual/src/main/asciidoc/package-appclient.adoc
similarity index 100%
rename from docs/reference-manual/src/main/jbake/content/package-appclient.adoc
rename to docs/reference-manual/src/main/asciidoc/package-appclient.adoc
diff --git a/docs/reference-manual/src/main/jbake/content/passwords.adoc b/docs/reference-manual/src/main/asciidoc/passwords.adoc
similarity index 100%
rename from docs/reference-manual/src/main/jbake/content/passwords.adoc
rename to docs/reference-manual/src/main/asciidoc/passwords.adoc
diff --git a/docs/reference-manual/src/main/jbake/content/ping-connection-pool.adoc b/docs/reference-manual/src/main/asciidoc/ping-connection-pool.adoc
similarity index 100%
rename from docs/reference-manual/src/main/jbake/content/ping-connection-pool.adoc
rename to docs/reference-manual/src/main/asciidoc/ping-connection-pool.adoc
diff --git a/docs/reference-manual/src/main/jbake/content/ping-node-dcom.adoc b/docs/reference-manual/src/main/asciidoc/ping-node-dcom.adoc
similarity index 100%
rename from docs/reference-manual/src/main/jbake/content/ping-node-dcom.adoc
rename to docs/reference-manual/src/main/asciidoc/ping-node-dcom.adoc
diff --git a/docs/reference-manual/src/main/jbake/content/ping-node-ssh.adoc b/docs/reference-manual/src/main/asciidoc/ping-node-ssh.adoc
similarity index 100%
rename from docs/reference-manual/src/main/jbake/content/ping-node-ssh.adoc
rename to docs/reference-manual/src/main/asciidoc/ping-node-ssh.adoc
diff --git a/docs/reference-manual/src/main/jbake/content/preface.adoc b/docs/reference-manual/src/main/asciidoc/preface.adoc
similarity index 100%
rename from docs/reference-manual/src/main/jbake/content/preface.adoc
rename to docs/reference-manual/src/main/asciidoc/preface.adoc
diff --git a/docs/reference-manual/src/main/jbake/content/recover-transactions.adoc b/docs/reference-manual/src/main/asciidoc/recover-transactions.adoc
similarity index 100%
rename from docs/reference-manual/src/main/jbake/content/recover-transactions.adoc
rename to docs/reference-manual/src/main/asciidoc/recover-transactions.adoc
diff --git a/docs/reference-manual/src/main/jbake/content/redeploy.adoc b/docs/reference-manual/src/main/asciidoc/redeploy.adoc
similarity index 100%
rename from docs/reference-manual/src/main/jbake/content/redeploy.adoc
rename to docs/reference-manual/src/main/asciidoc/redeploy.adoc
diff --git a/docs/reference-manual/src/main/jbake/content/remove-library.adoc b/docs/reference-manual/src/main/asciidoc/remove-library.adoc
similarity index 100%
rename from docs/reference-manual/src/main/jbake/content/remove-library.adoc
rename to docs/reference-manual/src/main/asciidoc/remove-library.adoc
diff --git a/docs/reference-manual/src/main/jbake/content/resource.adoc b/docs/reference-manual/src/main/asciidoc/resource.adoc
similarity index 100%
rename from docs/reference-manual/src/main/jbake/content/resource.adoc
rename to docs/reference-manual/src/main/asciidoc/resource.adoc
diff --git a/docs/reference-manual/src/main/jbake/content/restart-domain.adoc b/docs/reference-manual/src/main/asciidoc/restart-domain.adoc
similarity index 100%
rename from docs/reference-manual/src/main/jbake/content/restart-domain.adoc
rename to docs/reference-manual/src/main/asciidoc/restart-domain.adoc
diff --git a/docs/reference-manual/src/main/jbake/content/restart-instance.adoc b/docs/reference-manual/src/main/asciidoc/restart-instance.adoc
similarity index 100%
rename from docs/reference-manual/src/main/jbake/content/restart-instance.adoc
rename to docs/reference-manual/src/main/asciidoc/restart-instance.adoc
diff --git a/docs/reference-manual/src/main/jbake/content/restart-local-instance.adoc b/docs/reference-manual/src/main/asciidoc/restart-local-instance.adoc
similarity index 100%
rename from docs/reference-manual/src/main/jbake/content/restart-local-instance.adoc
rename to docs/reference-manual/src/main/asciidoc/restart-local-instance.adoc
diff --git a/docs/reference-manual/src/main/jbake/content/restore-domain.adoc b/docs/reference-manual/src/main/asciidoc/restore-domain.adoc
similarity index 100%
rename from docs/reference-manual/src/main/jbake/content/restore-domain.adoc
rename to docs/reference-manual/src/main/asciidoc/restore-domain.adoc
diff --git a/docs/reference-manual/src/main/jbake/content/rollback-transaction.adoc b/docs/reference-manual/src/main/asciidoc/rollback-transaction.adoc
similarity index 100%
rename from docs/reference-manual/src/main/jbake/content/rollback-transaction.adoc
rename to docs/reference-manual/src/main/asciidoc/rollback-transaction.adoc
diff --git a/docs/reference-manual/src/main/jbake/content/rotate-log.adoc b/docs/reference-manual/src/main/asciidoc/rotate-log.adoc
similarity index 100%
rename from docs/reference-manual/src/main/jbake/content/rotate-log.adoc
rename to docs/reference-manual/src/main/asciidoc/rotate-log.adoc
diff --git a/docs/reference-manual/src/main/jbake/content/security.adoc b/docs/reference-manual/src/main/asciidoc/security.adoc
similarity index 100%
rename from docs/reference-manual/src/main/jbake/content/security.adoc
rename to docs/reference-manual/src/main/asciidoc/security.adoc
diff --git a/docs/reference-manual/src/main/jbake/content/set-batch-runtime-configuration.adoc b/docs/reference-manual/src/main/asciidoc/set-batch-runtime-configuration.adoc
similarity index 100%
rename from docs/reference-manual/src/main/jbake/content/set-batch-runtime-configuration.adoc
rename to docs/reference-manual/src/main/asciidoc/set-batch-runtime-configuration.adoc
diff --git a/docs/reference-manual/src/main/jbake/content/set-log-attributes.adoc b/docs/reference-manual/src/main/asciidoc/set-log-attributes.adoc
similarity index 100%
rename from docs/reference-manual/src/main/jbake/content/set-log-attributes.adoc
rename to docs/reference-manual/src/main/asciidoc/set-log-attributes.adoc
diff --git a/docs/reference-manual/src/main/jbake/content/set-log-file-format.adoc b/docs/reference-manual/src/main/asciidoc/set-log-file-format.adoc
similarity index 100%
rename from docs/reference-manual/src/main/jbake/content/set-log-file-format.adoc
rename to docs/reference-manual/src/main/asciidoc/set-log-file-format.adoc
diff --git a/docs/reference-manual/src/main/jbake/content/set-log-levels.adoc b/docs/reference-manual/src/main/asciidoc/set-log-levels.adoc
similarity index 100%
rename from docs/reference-manual/src/main/jbake/content/set-log-levels.adoc
rename to docs/reference-manual/src/main/asciidoc/set-log-levels.adoc
diff --git a/docs/reference-manual/src/main/jbake/content/set-web-context-param.adoc b/docs/reference-manual/src/main/asciidoc/set-web-context-param.adoc
similarity index 100%
rename from docs/reference-manual/src/main/jbake/content/set-web-context-param.adoc
rename to docs/reference-manual/src/main/asciidoc/set-web-context-param.adoc
diff --git a/docs/reference-manual/src/main/jbake/content/set-web-env-entry.adoc b/docs/reference-manual/src/main/asciidoc/set-web-env-entry.adoc
similarity index 100%
rename from docs/reference-manual/src/main/jbake/content/set-web-env-entry.adoc
rename to docs/reference-manual/src/main/asciidoc/set-web-env-entry.adoc
diff --git a/docs/reference-manual/src/main/jbake/content/set.adoc b/docs/reference-manual/src/main/asciidoc/set.adoc
similarity index 100%
rename from docs/reference-manual/src/main/jbake/content/set.adoc
rename to docs/reference-manual/src/main/asciidoc/set.adoc
diff --git a/docs/reference-manual/src/main/jbake/content/setup-local-dcom.adoc b/docs/reference-manual/src/main/asciidoc/setup-local-dcom.adoc
similarity index 100%
rename from docs/reference-manual/src/main/jbake/content/setup-local-dcom.adoc
rename to docs/reference-manual/src/main/asciidoc/setup-local-dcom.adoc
diff --git a/docs/reference-manual/src/main/jbake/content/setup-ssh.adoc b/docs/reference-manual/src/main/asciidoc/setup-ssh.adoc
similarity index 100%
rename from docs/reference-manual/src/main/jbake/content/setup-ssh.adoc
rename to docs/reference-manual/src/main/asciidoc/setup-ssh.adoc
diff --git a/docs/reference-manual/src/main/jbake/content/show-component-status.adoc b/docs/reference-manual/src/main/asciidoc/show-component-status.adoc
similarity index 100%
rename from docs/reference-manual/src/main/jbake/content/show-component-status.adoc
rename to docs/reference-manual/src/main/asciidoc/show-component-status.adoc
diff --git a/docs/reference-manual/src/main/jbake/content/start-cluster.adoc b/docs/reference-manual/src/main/asciidoc/start-cluster.adoc
similarity index 100%
rename from docs/reference-manual/src/main/jbake/content/start-cluster.adoc
rename to docs/reference-manual/src/main/asciidoc/start-cluster.adoc
diff --git a/docs/reference-manual/src/main/jbake/content/start-database.adoc b/docs/reference-manual/src/main/asciidoc/start-database.adoc
similarity index 100%
rename from docs/reference-manual/src/main/jbake/content/start-database.adoc
rename to docs/reference-manual/src/main/asciidoc/start-database.adoc
diff --git a/docs/reference-manual/src/main/jbake/content/start-domain.adoc b/docs/reference-manual/src/main/asciidoc/start-domain.adoc
similarity index 100%
rename from docs/reference-manual/src/main/jbake/content/start-domain.adoc
rename to docs/reference-manual/src/main/asciidoc/start-domain.adoc
diff --git a/docs/reference-manual/src/main/jbake/content/start-instance.adoc b/docs/reference-manual/src/main/asciidoc/start-instance.adoc
similarity index 100%
rename from docs/reference-manual/src/main/jbake/content/start-instance.adoc
rename to docs/reference-manual/src/main/asciidoc/start-instance.adoc
diff --git a/docs/reference-manual/src/main/jbake/content/start-local-instance.adoc b/docs/reference-manual/src/main/asciidoc/start-local-instance.adoc
similarity index 100%
rename from docs/reference-manual/src/main/jbake/content/start-local-instance.adoc
rename to docs/reference-manual/src/main/asciidoc/start-local-instance.adoc
diff --git a/docs/reference-manual/src/main/jbake/content/stop-cluster.adoc b/docs/reference-manual/src/main/asciidoc/stop-cluster.adoc
similarity index 100%
rename from docs/reference-manual/src/main/jbake/content/stop-cluster.adoc
rename to docs/reference-manual/src/main/asciidoc/stop-cluster.adoc
diff --git a/docs/reference-manual/src/main/jbake/content/stop-database.adoc b/docs/reference-manual/src/main/asciidoc/stop-database.adoc
similarity index 100%
rename from docs/reference-manual/src/main/jbake/content/stop-database.adoc
rename to docs/reference-manual/src/main/asciidoc/stop-database.adoc
diff --git a/docs/reference-manual/src/main/jbake/content/stop-domain.adoc b/docs/reference-manual/src/main/asciidoc/stop-domain.adoc
similarity index 100%
rename from docs/reference-manual/src/main/jbake/content/stop-domain.adoc
rename to docs/reference-manual/src/main/asciidoc/stop-domain.adoc
diff --git a/docs/reference-manual/src/main/jbake/content/stop-instance.adoc b/docs/reference-manual/src/main/asciidoc/stop-instance.adoc
similarity index 100%
rename from docs/reference-manual/src/main/jbake/content/stop-instance.adoc
rename to docs/reference-manual/src/main/asciidoc/stop-instance.adoc
diff --git a/docs/reference-manual/src/main/jbake/content/stop-local-instance.adoc b/docs/reference-manual/src/main/asciidoc/stop-local-instance.adoc
similarity index 100%
rename from docs/reference-manual/src/main/jbake/content/stop-local-instance.adoc
rename to docs/reference-manual/src/main/asciidoc/stop-local-instance.adoc
diff --git a/docs/reference-manual/src/main/jbake/content/title.adoc b/docs/reference-manual/src/main/asciidoc/title.adoc
similarity index 96%
rename from docs/reference-manual/src/main/jbake/content/title.adoc
rename to docs/reference-manual/src/main/asciidoc/title.adoc
index dee42e2..d54e81d 100644
--- a/docs/reference-manual/src/main/jbake/content/title.adoc
+++ b/docs/reference-manual/src/main/asciidoc/title.adoc
@@ -52,3 +52,5 @@
 Opteron, the AMD logo, and the AMD Opteron logo are trademarks or
 registered trademarks of Advanced Micro Devices. UNIX is a registered
 trademark of The Open Group.
+
+image:img/eclipse_foundation_logo_tiny.png["Eclipse Logo"]
diff --git a/docs/reference-manual/src/main/jbake/content/undeploy.adoc b/docs/reference-manual/src/main/asciidoc/undeploy.adoc
similarity index 100%
rename from docs/reference-manual/src/main/jbake/content/undeploy.adoc
rename to docs/reference-manual/src/main/asciidoc/undeploy.adoc
diff --git a/docs/reference-manual/src/main/jbake/content/unfreeze-transaction-service.adoc b/docs/reference-manual/src/main/asciidoc/unfreeze-transaction-service.adoc
similarity index 100%
rename from docs/reference-manual/src/main/jbake/content/unfreeze-transaction-service.adoc
rename to docs/reference-manual/src/main/asciidoc/unfreeze-transaction-service.adoc
diff --git a/docs/reference-manual/src/main/jbake/content/uninstall-node-dcom.adoc b/docs/reference-manual/src/main/asciidoc/uninstall-node-dcom.adoc
similarity index 100%
rename from docs/reference-manual/src/main/jbake/content/uninstall-node-dcom.adoc
rename to docs/reference-manual/src/main/asciidoc/uninstall-node-dcom.adoc
diff --git a/docs/reference-manual/src/main/jbake/content/uninstall-node-ssh.adoc b/docs/reference-manual/src/main/asciidoc/uninstall-node-ssh.adoc
similarity index 100%
rename from docs/reference-manual/src/main/jbake/content/uninstall-node-ssh.adoc
rename to docs/reference-manual/src/main/asciidoc/uninstall-node-ssh.adoc
diff --git a/docs/reference-manual/src/main/jbake/content/uninstall-node.adoc b/docs/reference-manual/src/main/asciidoc/uninstall-node.adoc
similarity index 100%
rename from docs/reference-manual/src/main/jbake/content/uninstall-node.adoc
rename to docs/reference-manual/src/main/asciidoc/uninstall-node.adoc
diff --git a/docs/reference-manual/src/main/jbake/content/unset-web-context-param.adoc b/docs/reference-manual/src/main/asciidoc/unset-web-context-param.adoc
similarity index 100%
rename from docs/reference-manual/src/main/jbake/content/unset-web-context-param.adoc
rename to docs/reference-manual/src/main/asciidoc/unset-web-context-param.adoc
diff --git a/docs/reference-manual/src/main/jbake/content/unset-web-env-entry.adoc b/docs/reference-manual/src/main/asciidoc/unset-web-env-entry.adoc
similarity index 100%
rename from docs/reference-manual/src/main/jbake/content/unset-web-env-entry.adoc
rename to docs/reference-manual/src/main/asciidoc/unset-web-env-entry.adoc
diff --git a/docs/reference-manual/src/main/jbake/content/unset.adoc b/docs/reference-manual/src/main/asciidoc/unset.adoc
similarity index 100%
rename from docs/reference-manual/src/main/jbake/content/unset.adoc
rename to docs/reference-manual/src/main/asciidoc/unset.adoc
diff --git a/docs/reference-manual/src/main/jbake/content/update-connector-security-map.adoc b/docs/reference-manual/src/main/asciidoc/update-connector-security-map.adoc
similarity index 100%
rename from docs/reference-manual/src/main/jbake/content/update-connector-security-map.adoc
rename to docs/reference-manual/src/main/asciidoc/update-connector-security-map.adoc
diff --git a/docs/reference-manual/src/main/jbake/content/update-connector-work-security-map.adoc b/docs/reference-manual/src/main/asciidoc/update-connector-work-security-map.adoc
similarity index 100%
rename from docs/reference-manual/src/main/jbake/content/update-connector-work-security-map.adoc
rename to docs/reference-manual/src/main/asciidoc/update-connector-work-security-map.adoc
diff --git a/docs/reference-manual/src/main/jbake/content/update-file-user.adoc b/docs/reference-manual/src/main/asciidoc/update-file-user.adoc
similarity index 100%
rename from docs/reference-manual/src/main/jbake/content/update-file-user.adoc
rename to docs/reference-manual/src/main/asciidoc/update-file-user.adoc
diff --git a/docs/reference-manual/src/main/jbake/content/update-node-config.adoc b/docs/reference-manual/src/main/asciidoc/update-node-config.adoc
similarity index 100%
rename from docs/reference-manual/src/main/jbake/content/update-node-config.adoc
rename to docs/reference-manual/src/main/asciidoc/update-node-config.adoc
diff --git a/docs/reference-manual/src/main/jbake/content/update-node-dcom.adoc b/docs/reference-manual/src/main/asciidoc/update-node-dcom.adoc
similarity index 100%
rename from docs/reference-manual/src/main/jbake/content/update-node-dcom.adoc
rename to docs/reference-manual/src/main/asciidoc/update-node-dcom.adoc
diff --git a/docs/reference-manual/src/main/jbake/content/update-node-ssh.adoc b/docs/reference-manual/src/main/asciidoc/update-node-ssh.adoc
similarity index 100%
rename from docs/reference-manual/src/main/jbake/content/update-node-ssh.adoc
rename to docs/reference-manual/src/main/asciidoc/update-node-ssh.adoc
diff --git a/docs/reference-manual/src/main/jbake/content/update-password-alias.adoc b/docs/reference-manual/src/main/asciidoc/update-password-alias.adoc
similarity index 100%
rename from docs/reference-manual/src/main/jbake/content/update-password-alias.adoc
rename to docs/reference-manual/src/main/asciidoc/update-password-alias.adoc
diff --git a/docs/reference-manual/src/main/jbake/content/uptime.adoc b/docs/reference-manual/src/main/asciidoc/uptime.adoc
similarity index 100%
rename from docs/reference-manual/src/main/jbake/content/uptime.adoc
rename to docs/reference-manual/src/main/asciidoc/uptime.adoc
diff --git a/docs/reference-manual/src/main/jbake/content/validate-dcom.adoc b/docs/reference-manual/src/main/asciidoc/validate-dcom.adoc
similarity index 100%
rename from docs/reference-manual/src/main/jbake/content/validate-dcom.adoc
rename to docs/reference-manual/src/main/asciidoc/validate-dcom.adoc
diff --git a/docs/reference-manual/src/main/jbake/content/validate-multicast.adoc b/docs/reference-manual/src/main/asciidoc/validate-multicast.adoc
similarity index 100%
rename from docs/reference-manual/src/main/jbake/content/validate-multicast.adoc
rename to docs/reference-manual/src/main/asciidoc/validate-multicast.adoc
diff --git a/docs/reference-manual/src/main/jbake/content/verify-domain-xml.adoc b/docs/reference-manual/src/main/asciidoc/verify-domain-xml.adoc
similarity index 100%
rename from docs/reference-manual/src/main/jbake/content/verify-domain-xml.adoc
rename to docs/reference-manual/src/main/asciidoc/verify-domain-xml.adoc
diff --git a/docs/reference-manual/src/main/jbake/content/version.adoc b/docs/reference-manual/src/main/asciidoc/version.adoc
similarity index 100%
rename from docs/reference-manual/src/main/jbake/content/version.adoc
rename to docs/reference-manual/src/main/asciidoc/version.adoc
diff --git a/docs/reference-manual/src/main/jbake/assets/css/style.css b/docs/reference-manual/src/main/jbake/assets/css/style.css
deleted file mode 100644
index 25a16e4..0000000
--- a/docs/reference-manual/src/main/jbake/assets/css/style.css
+++ /dev/null
@@ -1,315 +0,0 @@
-/* CSS */
-/*! normalize.css v3.0.2 | MIT License | git.io/normalize */
-/** 1. Set default font family to sans-serif. 2. Prevent iOS text size adjust after orientation change, without disabling user zoom. */
-html { font-family: sans-serif; /* 1 */ -ms-text-size-adjust: 100%; /* 2 */ -webkit-text-size-adjust: 100%; /* 2 */ }
-
-/* HTML5 display definitions ========================================================================== */
-/** Correct `block` display not defined for any HTML5 element in IE 8/9. Correct `block` display not defined for `details` or `summary` in IE 10/11 and Firefox. Correct `block` display not defined for `main` in IE 11. */
-article, aside, details, figcaption, figure, footer, header, hgroup, main, menu, nav, section, summary { display: block; }
-
-/** 1. Correct `inline-block` display not defined in IE 8/9. 2. Normalize vertical alignment of `progress` in Chrome, Firefox, and Opera. */
-audio, canvas, progress, video { display: inline-block; /* 1 */ vertical-align: baseline; /* 2 */ }
-
-/** Prevent modern browsers from displaying `audio` without controls. Remove excess height in iOS 5 devices. */
-audio:not([controls]) { display: none; height: 0; }
-
-/** Address `[hidden]` styling not present in IE 8/9/10. Hide the `template` element in IE 8/9/11, Safari, and Firefox < 22. */
-[hidden], template { display: none; }
-
-/* Links ========================================================================== */
-/** Remove the gray background color from active links in IE 10. */
-a { background-color: transparent; }
-
-/** Improve readability when focused and also mouse hovered in all browsers. */
-a:active, a:hover { outline: 0; }
-
-/* Text-level semantics ========================================================================== */
-/** Address styling not present in IE 8/9/10/11, Safari, and Chrome. */
-abbr[title] { border-bottom: 1px dotted; }
-
-/** Address style set to `bolder` in Firefox 4+, Safari, and Chrome. */
-b, strong { font-weight: bold; }
-
-/** Address styling not present in Safari and Chrome. */
-dfn { font-style: italic; }
-
-/** Address variable `h1` font-size and margin within `section` and `article` contexts in Firefox 4+, Safari, and Chrome. */
-h1 { font-size: 2em; margin: 0.67em 0; }
-
-/** Address styling not present in IE 8/9. */
-mark { background: #ff0; color: #000; }
-
-/** Address inconsistent and variable font size in all browsers. */
-small { font-size: 80%; }
-
-/** Prevent `sub` and `sup` affecting `line-height` in all browsers. */
-sub, sup { font-size: 75%; line-height: 0; position: relative; vertical-align: baseline; }
-
-sup { top: -0.5em; }
-
-sub { bottom: -0.25em; }
-
-/* Embedded content ========================================================================== */
-/** Remove border when inside `a` element in IE 8/9/10. */
-img { border: 0; }
-
-/** Correct overflow not hidden in IE 9/10/11. */
-svg:not(:root) { overflow: hidden; }
-
-/* Grouping content ========================================================================== */
-/** Address margin not present in IE 8/9 and Safari. */
-figure { margin: 1em 40px; }
-
-/** Address differences between Firefox and other browsers. */
-hr { box-sizing: content-box; height: 0; }
-
-/** Contain overflow in all browsers. */
-pre { overflow: auto; }
-
-/** Address odd `em`-unit font size rendering in all browsers. */
-code, kbd, pre, samp { font-family: monospace, monospace; font-size: 1em; }
-
-/* Forms ========================================================================== */
-/** Known limitation: by default, Chrome and Safari on OS X allow very limited styling of `select`, unless a `border` property is set. */
-/** 1. Correct color not being inherited. Known issue: affects color of disabled elements. 2. Correct font properties not being inherited. 3. Address margins set differently in Firefox 4+, Safari, and Chrome. */
-button, input, optgroup, select, textarea { color: inherit; /* 1 */ font: inherit; /* 2 */ margin: 0; /* 3 */ }
-
-/** Address `overflow` set to `hidden` in IE 8/9/10/11. */
-button { overflow: visible; }
-
-/** Address inconsistent `text-transform` inheritance for `button` and `select`. All other form control elements do not inherit `text-transform` values. Correct `button` style inheritance in Firefox, IE 8/9/10/11, and Opera. Correct `select` style inheritance in Firefox. */
-button, select { text-transform: none; }
-
-/** 1. Avoid the WebKit bug in Android 4.0.* where (2) destroys native `audio` and `video` controls. 2. Correct inability to style clickable `input` types in iOS. 3. Improve usability and consistency of cursor style between image-type `input` and others. */
-button, html input[type="button"], input[type="reset"], input[type="submit"] { -webkit-appearance: button; /* 2 */ cursor: pointer; /* 3 */ }
-
-/** Re-set default cursor for disabled elements. */
-button[disabled], html input[disabled] { cursor: default; }
-
-/** Remove inner padding and border in Firefox 4+. */
-button::-moz-focus-inner, input::-moz-focus-inner { border: 0; padding: 0; }
-
-/** Address Firefox 4+ setting `line-height` on `input` using `!important` in the UA stylesheet. */
-input { line-height: normal; }
-
-/** It's recommended that you don't attempt to style these elements. Firefox's implementation doesn't respect box-sizing, padding, or width.  1. Address box sizing set to `content-box` in IE 8/9/10. 2. Remove excess padding in IE 8/9/10. */
-input[type="checkbox"], input[type="radio"] { box-sizing: border-box; /* 1 */ padding: 0; /* 2 */ }
-
-/** Fix the cursor style for Chrome's increment/decrement buttons. For certain `font-size` values of the `input`, it causes the cursor style of the decrement button to change from `default` to `text`. */
-input[type="number"]::-webkit-inner-spin-button, input[type="number"]::-webkit-outer-spin-button { height: auto; }
-
-/** 1. Address `appearance` set to `searchfield` in Safari and Chrome. 2. Address `box-sizing` set to `border-box` in Safari and Chrome (include `-moz` to future-proof). */
-input[type="search"] { -webkit-appearance: textfield; /* 1 */ /* 2 */ box-sizing: content-box; }
-
-/** Remove inner padding and search cancel button in Safari and Chrome on OS X. Safari (but not Chrome) clips the cancel button when the search input has padding (and `textfield` appearance). */
-input[type="search"]::-webkit-search-cancel-button, input[type="search"]::-webkit-search-decoration { -webkit-appearance: none; }
-
-/** Define consistent border, margin, and padding. */
-fieldset { border: 1px solid #c0c0c0; margin: 0 2px; padding: 0.35em 0.625em 0.75em; }
-
-/** 1. Correct `color` not being inherited in IE 8/9/10/11. 2. Remove padding so people aren't caught out if they zero out fieldsets. */
-legend { border: 0; /* 1 */ padding: 0; /* 2 */ }
-
-/** Remove default vertical scrollbar in IE 8/9/10/11. */
-textarea { overflow: auto; }
-
-/** Don't inherit the `font-weight` (applied by a rule above). NOTE: the default cannot safely be changed in Chrome and Safari on OS X. */
-optgroup { font-weight: bold; }
-
-/* Tables ========================================================================== */
-/** Remove most spacing between table cells. */
-table { border-collapse: collapse; border-spacing: 0; }
-
-td, th { padding: 0; }
-
-/* LAYOUT STYLES */
-
-p { margin-top: 0; }
-
-code, pre { margin-bottom: 30px; font-family: Monaco, "Bitstream Vera Sans Mono", "Lucida Console", Terminal, monospace; font-size: 13px; color: #222; }
-
-code { padding: 0 3px; background-color: #f2f8fc; border: solid 1px #dbe7f3; }
-
-pre { padding: 20px; overflow: auto; text-shadow: none; background: #fff; border: solid 1px #f2f2f2; }
-
-pre code { padding: 0; color: #2879d0; background-color: #fff; border: none; }
-
-ul, ol, dl { margin-bottom: 20px; }
-
-/* COMMON STYLES */
-
-td.halign-right { text-align: right; } 
-
-td.halign-center { text-align: center; } 
-
-form { padding: 20px; background: #f2f2f2; }
-
-h2 { 
-   font-size: 2em;
-   line-height: 1.2em;
-   font-weight: 200;
-   letter-spacing: 0;
-}
-
-h3 { 
-   font-size: 1.4em;
-   line-height: 1.2em;
-   font-weight: normal;
-   letter-spacing: 0;
-}
-
-.sect1 {
-   margin-left: 4%;
-   margin-right: 4%;
-   font: 13px/20px Arial, Helvetica, sans-serif  
-}
-
-a:link {
-   text-decoration: none;
-   color: #09569d;
-}
-
-#preamble hr{
-   margin-left: 0%;
-   margin-right: 0%;
-}
-
-#preamble .sectionbody table  {
-   font-weight: 200;
-   margin-left: 4%;
-   margin-right: 4%;
-}
-
-hr {
-   margin-bottom: 12px;
-}
-
-table.tableblock.frame-all.grid-all.spread {
-   font-size: 12px;
-}
-
-code {
-   font-size:.9em;
-   border: 1px solid #eaeaea;
-   background-color: #f6f6f6;
-   border-radius: 3px;
-   padding: 1px;
-   padding-left:2px;
-   padding-right:2px;
-}
-
-pre.prettyprint.highlight {
-   border: 1px solid #eaeaea;
-   background-color: #f6f6f6;
-   border-radius: 4px;
-   padding: 8px;
-   padding-top:4px;
-   padding-bottom:4px;
-}
-
-.language-oac_no_warn {
-   font-size:.9em;
-   color:#222;
-   background-color: transparent;
-}
-
-#doc-title {
-   margin-left: 4%;
-}
-
-#top-nav {
-   margin-left: 4%;
-   font-size: 12px;
-}
-
-#bottom-nav {
-   margin-left: 4%;
-   font-size: 12px;
-}
-
-.vector-font {
-   color:grey; 
-   font-size: 20px;
-}
-
-#copyright {
-   padding-top: 10px;
-   padding-bottom: 4px;
-   display: table;
-   margin:0 auto;
-   color: grey;
-   font-size: 12px;
-   vertical-align: middle;
-}
-
-.beta {color: #FF0000}
-
-/* GENERAL ELEMENT TYPE STYLES */
-
-/* #Media Queries
-================================================== */
-/* Smaller than standard 960 (devices and browsers) */
-/* Tablet Portrait size to standard 960 (devices and browsers) */
-@media only screen and (min-width: 768px) and (max-width: 959px) { .inner { width: 740px; }
-  header h1, header h2 { width: 340px; }
-  header h1 { font-size: 60px; }
-  header h2 { font-size: 30px; }
-}
-/* All Mobile Sizes (devices and browser) */
-@media only screen and (max-width: 767px) { .inner { width: 93%; }
-  header { padding: 20px 0; }
-  header .inner { position: relative; }
-  header h1, header h2 { width: 100%; }
-  header h1 { font-size: 48px; }
-  header h2 { font-size: 24px; }
-  header a.button { position: relative; display: inline-block; width: auto; height: auto; padding: 5px 10px; margin-top: 15px; font-size: 13px; line-height: 1; color: #2879d0; text-align: center; background-color: #9ddcff; background-image: none; border-radius: 5px; -moz-border-radius: 5px; -webkit-border-radius: 5px; }
-  header a.button small { display: inline; font-size: 13px; }
-}
-/* Mobile Landscape Size to Tablet Portrait (devices and browsers) */
-/* Mobile Portrait Size to Mobile Landscape Size (devices and browsers) */
-
-header h1 { padding-top: 14px; font-size: 2em; font-weight: 200; line-height: 1.4; color: #FFFFFF; letter-spacing: 0px; border-bottom: 0px; }
-
-header h2 { font-size: 1.2em; margin-top: 0; margin-bottom: 0; font-weight: 200; line-height: .8; color: #ec7D11; letter-spacing: 0; }
-
-/*
-header a.button { background: transparent url(../images/logo.png) 0 0 no-repeat; padding-left: 32px; }
-*/
-
-header a:hover { text-decoration: none; }
-
-/* Admonition (Note) block */
-.admonitionblock > table {
-  border: 0;
-  background: none;
-  width: 100%;
-  table-layout: auto;
-  margin-bottom: 10.5px;
-}
-.admonitionblock > table td.icon {
-  text-align: center;
-  width: 60px;
-}
-.admonitionblock > table td.icon img {
-  max-width: none;
-}
-.admonitionblock > table td.icon .title {
-  text-transform: uppercase;
-}
-.admonitionblock > table td.content {
-  padding-left: 1em;
-  padding-right: 1em;
-  border-left: 3px solid #ddd;
-}
-.admonitionblock > table td.content > :last-child > :last-child {
-  margin-bottom: 0;
-}
-.admonitionblock td.icon [class^="fa icon-"]:before {
-  font-size: 2.5em;
-  text-shadow: 1px 1px 2px rgba(0, 0, 0, 0.5);
-  cursor: default;
-}
-.admonitionblock td.icon .icon-note:before {
-  content: "\f05a";
-  color: #5bc0de;
-}
diff --git a/docs/reference-manual/src/main/jbake/jbake.properties b/docs/reference-manual/src/main/jbake/jbake.properties
deleted file mode 100644
index 546d09c..0000000
--- a/docs/reference-manual/src/main/jbake/jbake.properties
+++ /dev/null
@@ -1,7 +0,0 @@
-site.host=http://jbake.org
-render.tags=false
-render.sitemap=false
-render.archive=false
-render.feed=false
-asciidoctor.option.safe=0
-asciidoctor.attributes.export=true
diff --git a/docs/reference-manual/src/main/jbake/templates/footer.ftl b/docs/reference-manual/src/main/jbake/templates/footer.ftl
deleted file mode 100644
index 6f2b09e..0000000
--- a/docs/reference-manual/src/main/jbake/templates/footer.ftl
+++ /dev/null
@@ -1,46 +0,0 @@
-<#-- a footer template fragment included in the page template -->
-<hr />
-
-<table width="90%" id="bottom-nav" cellspacing="0" cellpadding="0">
-	<colgroup>
-		<col width="12%"/>
-		<col width="12%"/>
-		<col width="*"/>
-	</colgroup>
-	<tr>		
-	    <#if content.prev??>
-		<td align="left">
-		<a href="${content.prev}">
-			<span class=" vector-font"><i class="fa fa-arrow-circle-left" aria-hidden="true"></i></span>
-			<span style="position:relative;top:-2px;">Previous</span>
-		</a>
-		</td>
-		</#if>
-
-		<#if content.next??>
-		<td align="left">
-		<a href="${content.next}">
-			<span class="vector-font"><i class="fa fa-arrow-circle-right vector-font" aria-hidden="true"></i></span>
-			<span style="position:relative;top:-2px;">Next</span>
-		</a>
-		</td>
-		</#if>
-
-		<td align="right">
-		<a href="toc.html">
-			<span class="vector-font"><i class="fa fa-list vector-font" aria-hidden="true"></i></span>
-			<span style="position:relative;top:-2px;">Contents</span>
-		</a>
-		</td>
-	</tr>
-</table>
-
-<span id="copyright">
-        <img src="img/eclipse_foundation_logo_tiny.png" height="20px" alt="Eclipse Foundation Logo" align="top"/>&nbsp;            
-        <span >Copyright&nbsp;&copy;&nbsp;2019,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</span>
-</span>
-
-<p align="center" class="beta">${config.status!}</p>
-
-</body>
-</html>
diff --git a/docs/reference-manual/src/main/jbake/templates/header.ftl b/docs/reference-manual/src/main/jbake/templates/header.ftl
deleted file mode 100644
index 82ebb36..0000000
--- a/docs/reference-manual/src/main/jbake/templates/header.ftl
+++ /dev/null
@@ -1,55 +0,0 @@
-<!DOCTYPE html>
-<#-- a header template fragment included in the page template -->
-<html lang="en">
-  <head>
-    <meta charset="utf-8"/>
-    <title><#if (content.title)??><#escape x as x?xml>${content.title}</#escape></#if></title>
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <link href="<#if (content.rootpath)??>${content.rootpath}<#else></#if>css/style.css" rel="stylesheet">
-    <script src="https://use.fontawesome.com/96c4d89611.js"></script>
-  </head>
-  <body>
-<table id="doc-title" cellspacing="0" cellpadding="0">
-  <tr>
-  <td align="left" valign="top">
-  <b>${content.title}</b><br />
-      <p class="beta">${config.status!}</p>
-  </td>
-  </tr>
-</table>
-<hr />
-
-<table width="90%" id="top-nav" cellspacing="0" cellpadding="0">
-	<colgroup>
-		<col width="12%"/>
-		<col width="12%"/>
-		<col width="*"/>
-	</colgroup>
-	<tr>
-	    <#if content.prev??>
-		<td align="left">
-		<a href="${content.prev}">
-			<span class="vector-font"><i class="fa fa-arrow-circle-left" aria-hidden="true"></i></span>
-			<span style="position:relative;top:-2px;">Previous</span>
-		</a>
-		</td>
-	    </#if>
-
-	    <#if content.next??>
-		<td align="left">
-		<a href="${content.next}">
-			<span class=" vector-font"><i class="fa fa-arrow-circle-right vector-font" aria-hidden="true"></i></span>
-			<span style="position:relative;top:-2px;">Next</span>
-		</a>
-		</td>
-	    </#if>
-
-		<td align="right">
-		<a href="toc.html">
-			<span class=" vector-font"><i class="fa fa-list vector-font" aria-hidden="true"></i></span>
-			<span style="position:relative;top:-2px;">Contents</span>
-		</a>
-		</td>
-	</tr>
-</table>
-
diff --git a/docs/reference-manual/src/main/jbake/templates/menu.ftl b/docs/reference-manual/src/main/jbake/templates/menu.ftl
deleted file mode 100644
index 888c03d..0000000
--- a/docs/reference-manual/src/main/jbake/templates/menu.ftl
+++ /dev/null
@@ -1 +0,0 @@
-<#-- a menu bar template fragment included in the page template -->
\ No newline at end of file
diff --git a/docs/reference-manual/src/main/jbake/templates/page.ftl b/docs/reference-manual/src/main/jbake/templates/page.ftl
deleted file mode 100644
index eca51db..0000000
--- a/docs/reference-manual/src/main/jbake/templates/page.ftl
+++ /dev/null
@@ -1,8 +0,0 @@
-<#-- a top level page layout template -->
-
-<#include "header.ftl">
-<#include "menu.ftl">
-
-${content.body}
-
-<#include "footer.ftl">
\ No newline at end of file
diff --git a/docs/release-notes/README.md b/docs/release-notes/README.md
deleted file mode 100644
index a3ec2b6..0000000
--- a/docs/release-notes/README.md
+++ /dev/null
@@ -1,77 +0,0 @@
-# A JBake project template
-
-## About JBake
-
-JBake is a static site generator, it's inspired from jekyll and written
-in java.  The basic idea is to have templates for the structure of the
-page, and the body generated from asciidoc content.
-
-## Pre requisites
-
-- Maven
-- JDK8+
-
-Deploying to Github will require password less authentication.
-
-This is done by exporting your SSH public key into your Github account.
-
-## Build the site locally
-
-The site is generated under target/staging.
-
-Open file:///PATH_TO_PROJECT_DIR/target/staging in a browser to view the site.
-
-```
-mvn generate-resources
-```
-
-Or you can invoke the JBake plugin directly.
-
-```
-mvn jbake:build
-```
-
-### Rebuild the site on changes
-
-```
-mvn jbake:watch
-```
-
-If you keep this command running, changes to the sources will be
-detected and the site will be rendered incrementally.
-
-This is convenient when writing content.
-
-### Serve the site locally
-
-```
-mvn jbake:serve
-```
-
-If a webserver is required (e.g. absolute path are used), this command
-will start a webserver (jetty) at http://localhost:8820.  It will also
-watch for changes and rebuild incrementally.
-
-## Deploy the site to Github Pages
-
-```
-mvn deploy
-```
-
-## Produce a zip file for download
-
-To produce a zip file containing the generated html files, use:
-
-```
-mvn package
-```
-
-When making a release on GitHub, this zip file should be added to the release.
-
-## Links
-
-- [JBake maven plugin documentation](https://github.com/Blazebit/jbake-maven-plugin)
-- [JBake documentation](http://jbake.org/docs/2.5.1)
-- [Freemarker documentation](http://freemarker.org/docs)
-- [AsciiDoc User Guide](http://asciidoc.org/userguide.html)
-- [Asciidoctor quick reference](http://asciidoctor.org/docs/asciidoc-syntax-quick-reference)
diff --git a/docs/release-notes/pom.xml b/docs/release-notes/pom.xml
index 477b0ca..b80bfea 100644
--- a/docs/release-notes/pom.xml
+++ b/docs/release-notes/pom.xml
@@ -25,7 +25,6 @@
         <version>7.0.0-SNAPSHOT</version>
         <relativePath>../parent</relativePath>
     </parent>
-    <groupId>org.glassfish.docs</groupId>
     <artifactId>release-notes</artifactId>
     <packaging>jar</packaging>
     <name>Eclipse GlassFish Server Release Notes, Release 7</name>
diff --git a/docs/release-notes/src/main/jbake/assets/img/eclipse_foundation_logo_tiny.png b/docs/release-notes/src/main/asciidoc/img/eclipse_foundation_logo_tiny.png
similarity index 100%
rename from docs/release-notes/src/main/jbake/assets/img/eclipse_foundation_logo_tiny.png
rename to docs/release-notes/src/main/asciidoc/img/eclipse_foundation_logo_tiny.png
Binary files differ
diff --git a/docs/release-notes/src/main/jbake/content/preface.adoc b/docs/release-notes/src/main/asciidoc/preface.adoc
similarity index 100%
rename from docs/release-notes/src/main/jbake/content/preface.adoc
rename to docs/release-notes/src/main/asciidoc/preface.adoc
diff --git a/docs/release-notes/src/main/jbake/content/release-notes.adoc b/docs/release-notes/src/main/asciidoc/release-notes.adoc
similarity index 100%
rename from docs/release-notes/src/main/jbake/content/release-notes.adoc
rename to docs/release-notes/src/main/asciidoc/release-notes.adoc
diff --git a/docs/release-notes/src/main/jbake/content/title.adoc b/docs/release-notes/src/main/asciidoc/title.adoc
similarity index 95%
rename from docs/release-notes/src/main/jbake/content/title.adoc
rename to docs/release-notes/src/main/asciidoc/title.adoc
index 7acaeb4..5be840e 100644
--- a/docs/release-notes/src/main/jbake/content/title.adoc
+++ b/docs/release-notes/src/main/asciidoc/title.adoc
@@ -44,3 +44,5 @@
 Opteron, the AMD logo, and the AMD Opteron logo are trademarks or
 registered trademarks of Advanced Micro Devices. UNIX is a registered
 trademark of The Open Group.
+
+image:img/eclipse_foundation_logo_tiny.png["Eclipse Logo"]
diff --git a/docs/release-notes/src/main/jbake/assets/css/style.css b/docs/release-notes/src/main/jbake/assets/css/style.css
deleted file mode 100644
index 25a16e4..0000000
--- a/docs/release-notes/src/main/jbake/assets/css/style.css
+++ /dev/null
@@ -1,315 +0,0 @@
-/* CSS */
-/*! normalize.css v3.0.2 | MIT License | git.io/normalize */
-/** 1. Set default font family to sans-serif. 2. Prevent iOS text size adjust after orientation change, without disabling user zoom. */
-html { font-family: sans-serif; /* 1 */ -ms-text-size-adjust: 100%; /* 2 */ -webkit-text-size-adjust: 100%; /* 2 */ }
-
-/* HTML5 display definitions ========================================================================== */
-/** Correct `block` display not defined for any HTML5 element in IE 8/9. Correct `block` display not defined for `details` or `summary` in IE 10/11 and Firefox. Correct `block` display not defined for `main` in IE 11. */
-article, aside, details, figcaption, figure, footer, header, hgroup, main, menu, nav, section, summary { display: block; }
-
-/** 1. Correct `inline-block` display not defined in IE 8/9. 2. Normalize vertical alignment of `progress` in Chrome, Firefox, and Opera. */
-audio, canvas, progress, video { display: inline-block; /* 1 */ vertical-align: baseline; /* 2 */ }
-
-/** Prevent modern browsers from displaying `audio` without controls. Remove excess height in iOS 5 devices. */
-audio:not([controls]) { display: none; height: 0; }
-
-/** Address `[hidden]` styling not present in IE 8/9/10. Hide the `template` element in IE 8/9/11, Safari, and Firefox < 22. */
-[hidden], template { display: none; }
-
-/* Links ========================================================================== */
-/** Remove the gray background color from active links in IE 10. */
-a { background-color: transparent; }
-
-/** Improve readability when focused and also mouse hovered in all browsers. */
-a:active, a:hover { outline: 0; }
-
-/* Text-level semantics ========================================================================== */
-/** Address styling not present in IE 8/9/10/11, Safari, and Chrome. */
-abbr[title] { border-bottom: 1px dotted; }
-
-/** Address style set to `bolder` in Firefox 4+, Safari, and Chrome. */
-b, strong { font-weight: bold; }
-
-/** Address styling not present in Safari and Chrome. */
-dfn { font-style: italic; }
-
-/** Address variable `h1` font-size and margin within `section` and `article` contexts in Firefox 4+, Safari, and Chrome. */
-h1 { font-size: 2em; margin: 0.67em 0; }
-
-/** Address styling not present in IE 8/9. */
-mark { background: #ff0; color: #000; }
-
-/** Address inconsistent and variable font size in all browsers. */
-small { font-size: 80%; }
-
-/** Prevent `sub` and `sup` affecting `line-height` in all browsers. */
-sub, sup { font-size: 75%; line-height: 0; position: relative; vertical-align: baseline; }
-
-sup { top: -0.5em; }
-
-sub { bottom: -0.25em; }
-
-/* Embedded content ========================================================================== */
-/** Remove border when inside `a` element in IE 8/9/10. */
-img { border: 0; }
-
-/** Correct overflow not hidden in IE 9/10/11. */
-svg:not(:root) { overflow: hidden; }
-
-/* Grouping content ========================================================================== */
-/** Address margin not present in IE 8/9 and Safari. */
-figure { margin: 1em 40px; }
-
-/** Address differences between Firefox and other browsers. */
-hr { box-sizing: content-box; height: 0; }
-
-/** Contain overflow in all browsers. */
-pre { overflow: auto; }
-
-/** Address odd `em`-unit font size rendering in all browsers. */
-code, kbd, pre, samp { font-family: monospace, monospace; font-size: 1em; }
-
-/* Forms ========================================================================== */
-/** Known limitation: by default, Chrome and Safari on OS X allow very limited styling of `select`, unless a `border` property is set. */
-/** 1. Correct color not being inherited. Known issue: affects color of disabled elements. 2. Correct font properties not being inherited. 3. Address margins set differently in Firefox 4+, Safari, and Chrome. */
-button, input, optgroup, select, textarea { color: inherit; /* 1 */ font: inherit; /* 2 */ margin: 0; /* 3 */ }
-
-/** Address `overflow` set to `hidden` in IE 8/9/10/11. */
-button { overflow: visible; }
-
-/** Address inconsistent `text-transform` inheritance for `button` and `select`. All other form control elements do not inherit `text-transform` values. Correct `button` style inheritance in Firefox, IE 8/9/10/11, and Opera. Correct `select` style inheritance in Firefox. */
-button, select { text-transform: none; }
-
-/** 1. Avoid the WebKit bug in Android 4.0.* where (2) destroys native `audio` and `video` controls. 2. Correct inability to style clickable `input` types in iOS. 3. Improve usability and consistency of cursor style between image-type `input` and others. */
-button, html input[type="button"], input[type="reset"], input[type="submit"] { -webkit-appearance: button; /* 2 */ cursor: pointer; /* 3 */ }
-
-/** Re-set default cursor for disabled elements. */
-button[disabled], html input[disabled] { cursor: default; }
-
-/** Remove inner padding and border in Firefox 4+. */
-button::-moz-focus-inner, input::-moz-focus-inner { border: 0; padding: 0; }
-
-/** Address Firefox 4+ setting `line-height` on `input` using `!important` in the UA stylesheet. */
-input { line-height: normal; }
-
-/** It's recommended that you don't attempt to style these elements. Firefox's implementation doesn't respect box-sizing, padding, or width.  1. Address box sizing set to `content-box` in IE 8/9/10. 2. Remove excess padding in IE 8/9/10. */
-input[type="checkbox"], input[type="radio"] { box-sizing: border-box; /* 1 */ padding: 0; /* 2 */ }
-
-/** Fix the cursor style for Chrome's increment/decrement buttons. For certain `font-size` values of the `input`, it causes the cursor style of the decrement button to change from `default` to `text`. */
-input[type="number"]::-webkit-inner-spin-button, input[type="number"]::-webkit-outer-spin-button { height: auto; }
-
-/** 1. Address `appearance` set to `searchfield` in Safari and Chrome. 2. Address `box-sizing` set to `border-box` in Safari and Chrome (include `-moz` to future-proof). */
-input[type="search"] { -webkit-appearance: textfield; /* 1 */ /* 2 */ box-sizing: content-box; }
-
-/** Remove inner padding and search cancel button in Safari and Chrome on OS X. Safari (but not Chrome) clips the cancel button when the search input has padding (and `textfield` appearance). */
-input[type="search"]::-webkit-search-cancel-button, input[type="search"]::-webkit-search-decoration { -webkit-appearance: none; }
-
-/** Define consistent border, margin, and padding. */
-fieldset { border: 1px solid #c0c0c0; margin: 0 2px; padding: 0.35em 0.625em 0.75em; }
-
-/** 1. Correct `color` not being inherited in IE 8/9/10/11. 2. Remove padding so people aren't caught out if they zero out fieldsets. */
-legend { border: 0; /* 1 */ padding: 0; /* 2 */ }
-
-/** Remove default vertical scrollbar in IE 8/9/10/11. */
-textarea { overflow: auto; }
-
-/** Don't inherit the `font-weight` (applied by a rule above). NOTE: the default cannot safely be changed in Chrome and Safari on OS X. */
-optgroup { font-weight: bold; }
-
-/* Tables ========================================================================== */
-/** Remove most spacing between table cells. */
-table { border-collapse: collapse; border-spacing: 0; }
-
-td, th { padding: 0; }
-
-/* LAYOUT STYLES */
-
-p { margin-top: 0; }
-
-code, pre { margin-bottom: 30px; font-family: Monaco, "Bitstream Vera Sans Mono", "Lucida Console", Terminal, monospace; font-size: 13px; color: #222; }
-
-code { padding: 0 3px; background-color: #f2f8fc; border: solid 1px #dbe7f3; }
-
-pre { padding: 20px; overflow: auto; text-shadow: none; background: #fff; border: solid 1px #f2f2f2; }
-
-pre code { padding: 0; color: #2879d0; background-color: #fff; border: none; }
-
-ul, ol, dl { margin-bottom: 20px; }
-
-/* COMMON STYLES */
-
-td.halign-right { text-align: right; } 
-
-td.halign-center { text-align: center; } 
-
-form { padding: 20px; background: #f2f2f2; }
-
-h2 { 
-   font-size: 2em;
-   line-height: 1.2em;
-   font-weight: 200;
-   letter-spacing: 0;
-}
-
-h3 { 
-   font-size: 1.4em;
-   line-height: 1.2em;
-   font-weight: normal;
-   letter-spacing: 0;
-}
-
-.sect1 {
-   margin-left: 4%;
-   margin-right: 4%;
-   font: 13px/20px Arial, Helvetica, sans-serif  
-}
-
-a:link {
-   text-decoration: none;
-   color: #09569d;
-}
-
-#preamble hr{
-   margin-left: 0%;
-   margin-right: 0%;
-}
-
-#preamble .sectionbody table  {
-   font-weight: 200;
-   margin-left: 4%;
-   margin-right: 4%;
-}
-
-hr {
-   margin-bottom: 12px;
-}
-
-table.tableblock.frame-all.grid-all.spread {
-   font-size: 12px;
-}
-
-code {
-   font-size:.9em;
-   border: 1px solid #eaeaea;
-   background-color: #f6f6f6;
-   border-radius: 3px;
-   padding: 1px;
-   padding-left:2px;
-   padding-right:2px;
-}
-
-pre.prettyprint.highlight {
-   border: 1px solid #eaeaea;
-   background-color: #f6f6f6;
-   border-radius: 4px;
-   padding: 8px;
-   padding-top:4px;
-   padding-bottom:4px;
-}
-
-.language-oac_no_warn {
-   font-size:.9em;
-   color:#222;
-   background-color: transparent;
-}
-
-#doc-title {
-   margin-left: 4%;
-}
-
-#top-nav {
-   margin-left: 4%;
-   font-size: 12px;
-}
-
-#bottom-nav {
-   margin-left: 4%;
-   font-size: 12px;
-}
-
-.vector-font {
-   color:grey; 
-   font-size: 20px;
-}
-
-#copyright {
-   padding-top: 10px;
-   padding-bottom: 4px;
-   display: table;
-   margin:0 auto;
-   color: grey;
-   font-size: 12px;
-   vertical-align: middle;
-}
-
-.beta {color: #FF0000}
-
-/* GENERAL ELEMENT TYPE STYLES */
-
-/* #Media Queries
-================================================== */
-/* Smaller than standard 960 (devices and browsers) */
-/* Tablet Portrait size to standard 960 (devices and browsers) */
-@media only screen and (min-width: 768px) and (max-width: 959px) { .inner { width: 740px; }
-  header h1, header h2 { width: 340px; }
-  header h1 { font-size: 60px; }
-  header h2 { font-size: 30px; }
-}
-/* All Mobile Sizes (devices and browser) */
-@media only screen and (max-width: 767px) { .inner { width: 93%; }
-  header { padding: 20px 0; }
-  header .inner { position: relative; }
-  header h1, header h2 { width: 100%; }
-  header h1 { font-size: 48px; }
-  header h2 { font-size: 24px; }
-  header a.button { position: relative; display: inline-block; width: auto; height: auto; padding: 5px 10px; margin-top: 15px; font-size: 13px; line-height: 1; color: #2879d0; text-align: center; background-color: #9ddcff; background-image: none; border-radius: 5px; -moz-border-radius: 5px; -webkit-border-radius: 5px; }
-  header a.button small { display: inline; font-size: 13px; }
-}
-/* Mobile Landscape Size to Tablet Portrait (devices and browsers) */
-/* Mobile Portrait Size to Mobile Landscape Size (devices and browsers) */
-
-header h1 { padding-top: 14px; font-size: 2em; font-weight: 200; line-height: 1.4; color: #FFFFFF; letter-spacing: 0px; border-bottom: 0px; }
-
-header h2 { font-size: 1.2em; margin-top: 0; margin-bottom: 0; font-weight: 200; line-height: .8; color: #ec7D11; letter-spacing: 0; }
-
-/*
-header a.button { background: transparent url(../images/logo.png) 0 0 no-repeat; padding-left: 32px; }
-*/
-
-header a:hover { text-decoration: none; }
-
-/* Admonition (Note) block */
-.admonitionblock > table {
-  border: 0;
-  background: none;
-  width: 100%;
-  table-layout: auto;
-  margin-bottom: 10.5px;
-}
-.admonitionblock > table td.icon {
-  text-align: center;
-  width: 60px;
-}
-.admonitionblock > table td.icon img {
-  max-width: none;
-}
-.admonitionblock > table td.icon .title {
-  text-transform: uppercase;
-}
-.admonitionblock > table td.content {
-  padding-left: 1em;
-  padding-right: 1em;
-  border-left: 3px solid #ddd;
-}
-.admonitionblock > table td.content > :last-child > :last-child {
-  margin-bottom: 0;
-}
-.admonitionblock td.icon [class^="fa icon-"]:before {
-  font-size: 2.5em;
-  text-shadow: 1px 1px 2px rgba(0, 0, 0, 0.5);
-  cursor: default;
-}
-.admonitionblock td.icon .icon-note:before {
-  content: "\f05a";
-  color: #5bc0de;
-}
diff --git a/docs/release-notes/src/main/jbake/jbake.properties b/docs/release-notes/src/main/jbake/jbake.properties
deleted file mode 100644
index 546d09c..0000000
--- a/docs/release-notes/src/main/jbake/jbake.properties
+++ /dev/null
@@ -1,7 +0,0 @@
-site.host=http://jbake.org
-render.tags=false
-render.sitemap=false
-render.archive=false
-render.feed=false
-asciidoctor.option.safe=0
-asciidoctor.attributes.export=true
diff --git a/docs/release-notes/src/main/jbake/templates/footer.ftl b/docs/release-notes/src/main/jbake/templates/footer.ftl
deleted file mode 100644
index 6f2b09e..0000000
--- a/docs/release-notes/src/main/jbake/templates/footer.ftl
+++ /dev/null
@@ -1,46 +0,0 @@
-<#-- a footer template fragment included in the page template -->
-<hr />
-
-<table width="90%" id="bottom-nav" cellspacing="0" cellpadding="0">
-	<colgroup>
-		<col width="12%"/>
-		<col width="12%"/>
-		<col width="*"/>
-	</colgroup>
-	<tr>		
-	    <#if content.prev??>
-		<td align="left">
-		<a href="${content.prev}">
-			<span class=" vector-font"><i class="fa fa-arrow-circle-left" aria-hidden="true"></i></span>
-			<span style="position:relative;top:-2px;">Previous</span>
-		</a>
-		</td>
-		</#if>
-
-		<#if content.next??>
-		<td align="left">
-		<a href="${content.next}">
-			<span class="vector-font"><i class="fa fa-arrow-circle-right vector-font" aria-hidden="true"></i></span>
-			<span style="position:relative;top:-2px;">Next</span>
-		</a>
-		</td>
-		</#if>
-
-		<td align="right">
-		<a href="toc.html">
-			<span class="vector-font"><i class="fa fa-list vector-font" aria-hidden="true"></i></span>
-			<span style="position:relative;top:-2px;">Contents</span>
-		</a>
-		</td>
-	</tr>
-</table>
-
-<span id="copyright">
-        <img src="img/eclipse_foundation_logo_tiny.png" height="20px" alt="Eclipse Foundation Logo" align="top"/>&nbsp;            
-        <span >Copyright&nbsp;&copy;&nbsp;2019,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</span>
-</span>
-
-<p align="center" class="beta">${config.status!}</p>
-
-</body>
-</html>
diff --git a/docs/release-notes/src/main/jbake/templates/header.ftl b/docs/release-notes/src/main/jbake/templates/header.ftl
deleted file mode 100644
index 82ebb36..0000000
--- a/docs/release-notes/src/main/jbake/templates/header.ftl
+++ /dev/null
@@ -1,55 +0,0 @@
-<!DOCTYPE html>
-<#-- a header template fragment included in the page template -->
-<html lang="en">
-  <head>
-    <meta charset="utf-8"/>
-    <title><#if (content.title)??><#escape x as x?xml>${content.title}</#escape></#if></title>
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <link href="<#if (content.rootpath)??>${content.rootpath}<#else></#if>css/style.css" rel="stylesheet">
-    <script src="https://use.fontawesome.com/96c4d89611.js"></script>
-  </head>
-  <body>
-<table id="doc-title" cellspacing="0" cellpadding="0">
-  <tr>
-  <td align="left" valign="top">
-  <b>${content.title}</b><br />
-      <p class="beta">${config.status!}</p>
-  </td>
-  </tr>
-</table>
-<hr />
-
-<table width="90%" id="top-nav" cellspacing="0" cellpadding="0">
-	<colgroup>
-		<col width="12%"/>
-		<col width="12%"/>
-		<col width="*"/>
-	</colgroup>
-	<tr>
-	    <#if content.prev??>
-		<td align="left">
-		<a href="${content.prev}">
-			<span class="vector-font"><i class="fa fa-arrow-circle-left" aria-hidden="true"></i></span>
-			<span style="position:relative;top:-2px;">Previous</span>
-		</a>
-		</td>
-	    </#if>
-
-	    <#if content.next??>
-		<td align="left">
-		<a href="${content.next}">
-			<span class=" vector-font"><i class="fa fa-arrow-circle-right vector-font" aria-hidden="true"></i></span>
-			<span style="position:relative;top:-2px;">Next</span>
-		</a>
-		</td>
-	    </#if>
-
-		<td align="right">
-		<a href="toc.html">
-			<span class=" vector-font"><i class="fa fa-list vector-font" aria-hidden="true"></i></span>
-			<span style="position:relative;top:-2px;">Contents</span>
-		</a>
-		</td>
-	</tr>
-</table>
-
diff --git a/docs/release-notes/src/main/jbake/templates/menu.ftl b/docs/release-notes/src/main/jbake/templates/menu.ftl
deleted file mode 100644
index 888c03d..0000000
--- a/docs/release-notes/src/main/jbake/templates/menu.ftl
+++ /dev/null
@@ -1 +0,0 @@
-<#-- a menu bar template fragment included in the page template -->
\ No newline at end of file
diff --git a/docs/release-notes/src/main/jbake/templates/page.ftl b/docs/release-notes/src/main/jbake/templates/page.ftl
deleted file mode 100644
index eca51db..0000000
--- a/docs/release-notes/src/main/jbake/templates/page.ftl
+++ /dev/null
@@ -1,8 +0,0 @@
-<#-- a top level page layout template -->
-
-<#include "header.ftl">
-<#include "menu.ftl">
-
-${content.body}
-
-<#include "footer.ftl">
\ No newline at end of file
diff --git a/docs/security-guide/README.md b/docs/security-guide/README.md
deleted file mode 100644
index a3ec2b6..0000000
--- a/docs/security-guide/README.md
+++ /dev/null
@@ -1,77 +0,0 @@
-# A JBake project template
-
-## About JBake
-
-JBake is a static site generator, it's inspired from jekyll and written
-in java.  The basic idea is to have templates for the structure of the
-page, and the body generated from asciidoc content.
-
-## Pre requisites
-
-- Maven
-- JDK8+
-
-Deploying to Github will require password less authentication.
-
-This is done by exporting your SSH public key into your Github account.
-
-## Build the site locally
-
-The site is generated under target/staging.
-
-Open file:///PATH_TO_PROJECT_DIR/target/staging in a browser to view the site.
-
-```
-mvn generate-resources
-```
-
-Or you can invoke the JBake plugin directly.
-
-```
-mvn jbake:build
-```
-
-### Rebuild the site on changes
-
-```
-mvn jbake:watch
-```
-
-If you keep this command running, changes to the sources will be
-detected and the site will be rendered incrementally.
-
-This is convenient when writing content.
-
-### Serve the site locally
-
-```
-mvn jbake:serve
-```
-
-If a webserver is required (e.g. absolute path are used), this command
-will start a webserver (jetty) at http://localhost:8820.  It will also
-watch for changes and rebuild incrementally.
-
-## Deploy the site to Github Pages
-
-```
-mvn deploy
-```
-
-## Produce a zip file for download
-
-To produce a zip file containing the generated html files, use:
-
-```
-mvn package
-```
-
-When making a release on GitHub, this zip file should be added to the release.
-
-## Links
-
-- [JBake maven plugin documentation](https://github.com/Blazebit/jbake-maven-plugin)
-- [JBake documentation](http://jbake.org/docs/2.5.1)
-- [Freemarker documentation](http://freemarker.org/docs)
-- [AsciiDoc User Guide](http://asciidoc.org/userguide.html)
-- [Asciidoctor quick reference](http://asciidoctor.org/docs/asciidoc-syntax-quick-reference)
diff --git a/docs/security-guide/pom.xml b/docs/security-guide/pom.xml
index c32672d..fd9442f 100644
--- a/docs/security-guide/pom.xml
+++ b/docs/security-guide/pom.xml
@@ -25,7 +25,6 @@
         <version>7.0.0-SNAPSHOT</version>
         <relativePath>../parent</relativePath>
     </parent>
-    <groupId>org.glassfish.docs</groupId>
     <artifactId>security-guide</artifactId>
     <packaging>jar</packaging>
     <name>Eclipse GlassFish Server Security Guide, Release 7</name>
diff --git a/docs/security-guide/src/main/jbake/content/administrative-security.adoc b/docs/security-guide/src/main/asciidoc/administrative-security.adoc
similarity index 100%
rename from docs/security-guide/src/main/jbake/content/administrative-security.adoc
rename to docs/security-guide/src/main/asciidoc/administrative-security.adoc
diff --git a/docs/security-guide/src/main/jbake/assets/img/accept-certif.png b/docs/security-guide/src/main/asciidoc/img/accept-certif.png
similarity index 100%
rename from docs/security-guide/src/main/jbake/assets/img/accept-certif.png
rename to docs/security-guide/src/main/asciidoc/img/accept-certif.png
Binary files differ
diff --git a/docs/security-guide/src/main/jbake/assets/img/eclipse_foundation_logo_tiny.png b/docs/security-guide/src/main/asciidoc/img/eclipse_foundation_logo_tiny.png
similarity index 100%
rename from docs/security-guide/src/main/jbake/assets/img/eclipse_foundation_logo_tiny.png
rename to docs/security-guide/src/main/asciidoc/img/eclipse_foundation_logo_tiny.png
Binary files differ
diff --git a/docs/security-guide/src/main/jbake/assets/img/jacc-providers.png b/docs/security-guide/src/main/asciidoc/img/jacc-providers.png
similarity index 100%
rename from docs/security-guide/src/main/jbake/assets/img/jacc-providers.png
rename to docs/security-guide/src/main/asciidoc/img/jacc-providers.png
Binary files differ
diff --git a/docs/security-guide/src/main/jbake/assets/img/securityrolemapping.png b/docs/security-guide/src/main/asciidoc/img/securityrolemapping.png
similarity index 100%
rename from docs/security-guide/src/main/jbake/assets/img/securityrolemapping.png
rename to docs/security-guide/src/main/asciidoc/img/securityrolemapping.png
Binary files differ
diff --git a/docs/security-guide/src/main/jbake/content/loe.adoc b/docs/security-guide/src/main/asciidoc/loe.adoc
similarity index 100%
rename from docs/security-guide/src/main/jbake/content/loe.adoc
rename to docs/security-guide/src/main/asciidoc/loe.adoc
diff --git a/docs/security-guide/src/main/jbake/content/lof.adoc b/docs/security-guide/src/main/asciidoc/lof.adoc
similarity index 100%
rename from docs/security-guide/src/main/jbake/content/lof.adoc
rename to docs/security-guide/src/main/asciidoc/lof.adoc
diff --git a/docs/security-guide/src/main/jbake/content/lot.adoc b/docs/security-guide/src/main/asciidoc/lot.adoc
similarity index 100%
rename from docs/security-guide/src/main/jbake/content/lot.adoc
rename to docs/security-guide/src/main/asciidoc/lot.adoc
diff --git a/docs/security-guide/src/main/jbake/content/message-security.adoc b/docs/security-guide/src/main/asciidoc/message-security.adoc
similarity index 100%
rename from docs/security-guide/src/main/jbake/content/message-security.adoc
rename to docs/security-guide/src/main/asciidoc/message-security.adoc
diff --git a/docs/security-guide/src/main/jbake/content/preface.adoc b/docs/security-guide/src/main/asciidoc/preface.adoc
similarity index 100%
rename from docs/security-guide/src/main/jbake/content/preface.adoc
rename to docs/security-guide/src/main/asciidoc/preface.adoc
diff --git a/docs/security-guide/src/main/jbake/content/running-in-secure-environment.adoc b/docs/security-guide/src/main/asciidoc/running-in-secure-environment.adoc
similarity index 100%
rename from docs/security-guide/src/main/jbake/content/running-in-secure-environment.adoc
rename to docs/security-guide/src/main/asciidoc/running-in-secure-environment.adoc
diff --git a/docs/security-guide/src/main/jbake/content/security-in-cluster-mode.adoc b/docs/security-guide/src/main/asciidoc/security-in-cluster-mode.adoc
similarity index 100%
rename from docs/security-guide/src/main/jbake/content/security-in-cluster-mode.adoc
rename to docs/security-guide/src/main/asciidoc/security-in-cluster-mode.adoc
diff --git a/docs/security-guide/src/main/jbake/content/system-security.adoc b/docs/security-guide/src/main/asciidoc/system-security.adoc
similarity index 100%
rename from docs/security-guide/src/main/jbake/content/system-security.adoc
rename to docs/security-guide/src/main/asciidoc/system-security.adoc
diff --git a/docs/security-guide/src/main/jbake/content/title.adoc b/docs/security-guide/src/main/asciidoc/title.adoc
similarity index 95%
rename from docs/security-guide/src/main/jbake/content/title.adoc
rename to docs/security-guide/src/main/asciidoc/title.adoc
index fef6718..775495f 100644
--- a/docs/security-guide/src/main/jbake/content/title.adoc
+++ b/docs/security-guide/src/main/asciidoc/title.adoc
@@ -42,3 +42,5 @@
 Opteron, the AMD logo, and the AMD Opteron logo are trademarks or
 registered trademarks of Advanced Micro Devices. UNIX is a registered
 trademark of The Open Group.
+
+image:img/eclipse_foundation_logo_tiny.png["Eclipse Logo"]
diff --git a/docs/security-guide/src/main/jbake/content/user-security.adoc b/docs/security-guide/src/main/asciidoc/user-security.adoc
similarity index 100%
rename from docs/security-guide/src/main/jbake/content/user-security.adoc
rename to docs/security-guide/src/main/asciidoc/user-security.adoc
diff --git a/docs/security-guide/src/main/jbake/assets/css/style.css b/docs/security-guide/src/main/jbake/assets/css/style.css
deleted file mode 100644
index 25a16e4..0000000
--- a/docs/security-guide/src/main/jbake/assets/css/style.css
+++ /dev/null
@@ -1,315 +0,0 @@
-/* CSS */
-/*! normalize.css v3.0.2 | MIT License | git.io/normalize */
-/** 1. Set default font family to sans-serif. 2. Prevent iOS text size adjust after orientation change, without disabling user zoom. */
-html { font-family: sans-serif; /* 1 */ -ms-text-size-adjust: 100%; /* 2 */ -webkit-text-size-adjust: 100%; /* 2 */ }
-
-/* HTML5 display definitions ========================================================================== */
-/** Correct `block` display not defined for any HTML5 element in IE 8/9. Correct `block` display not defined for `details` or `summary` in IE 10/11 and Firefox. Correct `block` display not defined for `main` in IE 11. */
-article, aside, details, figcaption, figure, footer, header, hgroup, main, menu, nav, section, summary { display: block; }
-
-/** 1. Correct `inline-block` display not defined in IE 8/9. 2. Normalize vertical alignment of `progress` in Chrome, Firefox, and Opera. */
-audio, canvas, progress, video { display: inline-block; /* 1 */ vertical-align: baseline; /* 2 */ }
-
-/** Prevent modern browsers from displaying `audio` without controls. Remove excess height in iOS 5 devices. */
-audio:not([controls]) { display: none; height: 0; }
-
-/** Address `[hidden]` styling not present in IE 8/9/10. Hide the `template` element in IE 8/9/11, Safari, and Firefox < 22. */
-[hidden], template { display: none; }
-
-/* Links ========================================================================== */
-/** Remove the gray background color from active links in IE 10. */
-a { background-color: transparent; }
-
-/** Improve readability when focused and also mouse hovered in all browsers. */
-a:active, a:hover { outline: 0; }
-
-/* Text-level semantics ========================================================================== */
-/** Address styling not present in IE 8/9/10/11, Safari, and Chrome. */
-abbr[title] { border-bottom: 1px dotted; }
-
-/** Address style set to `bolder` in Firefox 4+, Safari, and Chrome. */
-b, strong { font-weight: bold; }
-
-/** Address styling not present in Safari and Chrome. */
-dfn { font-style: italic; }
-
-/** Address variable `h1` font-size and margin within `section` and `article` contexts in Firefox 4+, Safari, and Chrome. */
-h1 { font-size: 2em; margin: 0.67em 0; }
-
-/** Address styling not present in IE 8/9. */
-mark { background: #ff0; color: #000; }
-
-/** Address inconsistent and variable font size in all browsers. */
-small { font-size: 80%; }
-
-/** Prevent `sub` and `sup` affecting `line-height` in all browsers. */
-sub, sup { font-size: 75%; line-height: 0; position: relative; vertical-align: baseline; }
-
-sup { top: -0.5em; }
-
-sub { bottom: -0.25em; }
-
-/* Embedded content ========================================================================== */
-/** Remove border when inside `a` element in IE 8/9/10. */
-img { border: 0; }
-
-/** Correct overflow not hidden in IE 9/10/11. */
-svg:not(:root) { overflow: hidden; }
-
-/* Grouping content ========================================================================== */
-/** Address margin not present in IE 8/9 and Safari. */
-figure { margin: 1em 40px; }
-
-/** Address differences between Firefox and other browsers. */
-hr { box-sizing: content-box; height: 0; }
-
-/** Contain overflow in all browsers. */
-pre { overflow: auto; }
-
-/** Address odd `em`-unit font size rendering in all browsers. */
-code, kbd, pre, samp { font-family: monospace, monospace; font-size: 1em; }
-
-/* Forms ========================================================================== */
-/** Known limitation: by default, Chrome and Safari on OS X allow very limited styling of `select`, unless a `border` property is set. */
-/** 1. Correct color not being inherited. Known issue: affects color of disabled elements. 2. Correct font properties not being inherited. 3. Address margins set differently in Firefox 4+, Safari, and Chrome. */
-button, input, optgroup, select, textarea { color: inherit; /* 1 */ font: inherit; /* 2 */ margin: 0; /* 3 */ }
-
-/** Address `overflow` set to `hidden` in IE 8/9/10/11. */
-button { overflow: visible; }
-
-/** Address inconsistent `text-transform` inheritance for `button` and `select`. All other form control elements do not inherit `text-transform` values. Correct `button` style inheritance in Firefox, IE 8/9/10/11, and Opera. Correct `select` style inheritance in Firefox. */
-button, select { text-transform: none; }
-
-/** 1. Avoid the WebKit bug in Android 4.0.* where (2) destroys native `audio` and `video` controls. 2. Correct inability to style clickable `input` types in iOS. 3. Improve usability and consistency of cursor style between image-type `input` and others. */
-button, html input[type="button"], input[type="reset"], input[type="submit"] { -webkit-appearance: button; /* 2 */ cursor: pointer; /* 3 */ }
-
-/** Re-set default cursor for disabled elements. */
-button[disabled], html input[disabled] { cursor: default; }
-
-/** Remove inner padding and border in Firefox 4+. */
-button::-moz-focus-inner, input::-moz-focus-inner { border: 0; padding: 0; }
-
-/** Address Firefox 4+ setting `line-height` on `input` using `!important` in the UA stylesheet. */
-input { line-height: normal; }
-
-/** It's recommended that you don't attempt to style these elements. Firefox's implementation doesn't respect box-sizing, padding, or width.  1. Address box sizing set to `content-box` in IE 8/9/10. 2. Remove excess padding in IE 8/9/10. */
-input[type="checkbox"], input[type="radio"] { box-sizing: border-box; /* 1 */ padding: 0; /* 2 */ }
-
-/** Fix the cursor style for Chrome's increment/decrement buttons. For certain `font-size` values of the `input`, it causes the cursor style of the decrement button to change from `default` to `text`. */
-input[type="number"]::-webkit-inner-spin-button, input[type="number"]::-webkit-outer-spin-button { height: auto; }
-
-/** 1. Address `appearance` set to `searchfield` in Safari and Chrome. 2. Address `box-sizing` set to `border-box` in Safari and Chrome (include `-moz` to future-proof). */
-input[type="search"] { -webkit-appearance: textfield; /* 1 */ /* 2 */ box-sizing: content-box; }
-
-/** Remove inner padding and search cancel button in Safari and Chrome on OS X. Safari (but not Chrome) clips the cancel button when the search input has padding (and `textfield` appearance). */
-input[type="search"]::-webkit-search-cancel-button, input[type="search"]::-webkit-search-decoration { -webkit-appearance: none; }
-
-/** Define consistent border, margin, and padding. */
-fieldset { border: 1px solid #c0c0c0; margin: 0 2px; padding: 0.35em 0.625em 0.75em; }
-
-/** 1. Correct `color` not being inherited in IE 8/9/10/11. 2. Remove padding so people aren't caught out if they zero out fieldsets. */
-legend { border: 0; /* 1 */ padding: 0; /* 2 */ }
-
-/** Remove default vertical scrollbar in IE 8/9/10/11. */
-textarea { overflow: auto; }
-
-/** Don't inherit the `font-weight` (applied by a rule above). NOTE: the default cannot safely be changed in Chrome and Safari on OS X. */
-optgroup { font-weight: bold; }
-
-/* Tables ========================================================================== */
-/** Remove most spacing between table cells. */
-table { border-collapse: collapse; border-spacing: 0; }
-
-td, th { padding: 0; }
-
-/* LAYOUT STYLES */
-
-p { margin-top: 0; }
-
-code, pre { margin-bottom: 30px; font-family: Monaco, "Bitstream Vera Sans Mono", "Lucida Console", Terminal, monospace; font-size: 13px; color: #222; }
-
-code { padding: 0 3px; background-color: #f2f8fc; border: solid 1px #dbe7f3; }
-
-pre { padding: 20px; overflow: auto; text-shadow: none; background: #fff; border: solid 1px #f2f2f2; }
-
-pre code { padding: 0; color: #2879d0; background-color: #fff; border: none; }
-
-ul, ol, dl { margin-bottom: 20px; }
-
-/* COMMON STYLES */
-
-td.halign-right { text-align: right; } 
-
-td.halign-center { text-align: center; } 
-
-form { padding: 20px; background: #f2f2f2; }
-
-h2 { 
-   font-size: 2em;
-   line-height: 1.2em;
-   font-weight: 200;
-   letter-spacing: 0;
-}
-
-h3 { 
-   font-size: 1.4em;
-   line-height: 1.2em;
-   font-weight: normal;
-   letter-spacing: 0;
-}
-
-.sect1 {
-   margin-left: 4%;
-   margin-right: 4%;
-   font: 13px/20px Arial, Helvetica, sans-serif  
-}
-
-a:link {
-   text-decoration: none;
-   color: #09569d;
-}
-
-#preamble hr{
-   margin-left: 0%;
-   margin-right: 0%;
-}
-
-#preamble .sectionbody table  {
-   font-weight: 200;
-   margin-left: 4%;
-   margin-right: 4%;
-}
-
-hr {
-   margin-bottom: 12px;
-}
-
-table.tableblock.frame-all.grid-all.spread {
-   font-size: 12px;
-}
-
-code {
-   font-size:.9em;
-   border: 1px solid #eaeaea;
-   background-color: #f6f6f6;
-   border-radius: 3px;
-   padding: 1px;
-   padding-left:2px;
-   padding-right:2px;
-}
-
-pre.prettyprint.highlight {
-   border: 1px solid #eaeaea;
-   background-color: #f6f6f6;
-   border-radius: 4px;
-   padding: 8px;
-   padding-top:4px;
-   padding-bottom:4px;
-}
-
-.language-oac_no_warn {
-   font-size:.9em;
-   color:#222;
-   background-color: transparent;
-}
-
-#doc-title {
-   margin-left: 4%;
-}
-
-#top-nav {
-   margin-left: 4%;
-   font-size: 12px;
-}
-
-#bottom-nav {
-   margin-left: 4%;
-   font-size: 12px;
-}
-
-.vector-font {
-   color:grey; 
-   font-size: 20px;
-}
-
-#copyright {
-   padding-top: 10px;
-   padding-bottom: 4px;
-   display: table;
-   margin:0 auto;
-   color: grey;
-   font-size: 12px;
-   vertical-align: middle;
-}
-
-.beta {color: #FF0000}
-
-/* GENERAL ELEMENT TYPE STYLES */
-
-/* #Media Queries
-================================================== */
-/* Smaller than standard 960 (devices and browsers) */
-/* Tablet Portrait size to standard 960 (devices and browsers) */
-@media only screen and (min-width: 768px) and (max-width: 959px) { .inner { width: 740px; }
-  header h1, header h2 { width: 340px; }
-  header h1 { font-size: 60px; }
-  header h2 { font-size: 30px; }
-}
-/* All Mobile Sizes (devices and browser) */
-@media only screen and (max-width: 767px) { .inner { width: 93%; }
-  header { padding: 20px 0; }
-  header .inner { position: relative; }
-  header h1, header h2 { width: 100%; }
-  header h1 { font-size: 48px; }
-  header h2 { font-size: 24px; }
-  header a.button { position: relative; display: inline-block; width: auto; height: auto; padding: 5px 10px; margin-top: 15px; font-size: 13px; line-height: 1; color: #2879d0; text-align: center; background-color: #9ddcff; background-image: none; border-radius: 5px; -moz-border-radius: 5px; -webkit-border-radius: 5px; }
-  header a.button small { display: inline; font-size: 13px; }
-}
-/* Mobile Landscape Size to Tablet Portrait (devices and browsers) */
-/* Mobile Portrait Size to Mobile Landscape Size (devices and browsers) */
-
-header h1 { padding-top: 14px; font-size: 2em; font-weight: 200; line-height: 1.4; color: #FFFFFF; letter-spacing: 0px; border-bottom: 0px; }
-
-header h2 { font-size: 1.2em; margin-top: 0; margin-bottom: 0; font-weight: 200; line-height: .8; color: #ec7D11; letter-spacing: 0; }
-
-/*
-header a.button { background: transparent url(../images/logo.png) 0 0 no-repeat; padding-left: 32px; }
-*/
-
-header a:hover { text-decoration: none; }
-
-/* Admonition (Note) block */
-.admonitionblock > table {
-  border: 0;
-  background: none;
-  width: 100%;
-  table-layout: auto;
-  margin-bottom: 10.5px;
-}
-.admonitionblock > table td.icon {
-  text-align: center;
-  width: 60px;
-}
-.admonitionblock > table td.icon img {
-  max-width: none;
-}
-.admonitionblock > table td.icon .title {
-  text-transform: uppercase;
-}
-.admonitionblock > table td.content {
-  padding-left: 1em;
-  padding-right: 1em;
-  border-left: 3px solid #ddd;
-}
-.admonitionblock > table td.content > :last-child > :last-child {
-  margin-bottom: 0;
-}
-.admonitionblock td.icon [class^="fa icon-"]:before {
-  font-size: 2.5em;
-  text-shadow: 1px 1px 2px rgba(0, 0, 0, 0.5);
-  cursor: default;
-}
-.admonitionblock td.icon .icon-note:before {
-  content: "\f05a";
-  color: #5bc0de;
-}
diff --git a/docs/security-guide/src/main/jbake/jbake.properties b/docs/security-guide/src/main/jbake/jbake.properties
deleted file mode 100644
index 546d09c..0000000
--- a/docs/security-guide/src/main/jbake/jbake.properties
+++ /dev/null
@@ -1,7 +0,0 @@
-site.host=http://jbake.org
-render.tags=false
-render.sitemap=false
-render.archive=false
-render.feed=false
-asciidoctor.option.safe=0
-asciidoctor.attributes.export=true
diff --git a/docs/security-guide/src/main/jbake/templates/footer.ftl b/docs/security-guide/src/main/jbake/templates/footer.ftl
deleted file mode 100644
index 6f2b09e..0000000
--- a/docs/security-guide/src/main/jbake/templates/footer.ftl
+++ /dev/null
@@ -1,46 +0,0 @@
-<#-- a footer template fragment included in the page template -->
-<hr />
-
-<table width="90%" id="bottom-nav" cellspacing="0" cellpadding="0">
-	<colgroup>
-		<col width="12%"/>
-		<col width="12%"/>
-		<col width="*"/>
-	</colgroup>
-	<tr>		
-	    <#if content.prev??>
-		<td align="left">
-		<a href="${content.prev}">
-			<span class=" vector-font"><i class="fa fa-arrow-circle-left" aria-hidden="true"></i></span>
-			<span style="position:relative;top:-2px;">Previous</span>
-		</a>
-		</td>
-		</#if>
-
-		<#if content.next??>
-		<td align="left">
-		<a href="${content.next}">
-			<span class="vector-font"><i class="fa fa-arrow-circle-right vector-font" aria-hidden="true"></i></span>
-			<span style="position:relative;top:-2px;">Next</span>
-		</a>
-		</td>
-		</#if>
-
-		<td align="right">
-		<a href="toc.html">
-			<span class="vector-font"><i class="fa fa-list vector-font" aria-hidden="true"></i></span>
-			<span style="position:relative;top:-2px;">Contents</span>
-		</a>
-		</td>
-	</tr>
-</table>
-
-<span id="copyright">
-        <img src="img/eclipse_foundation_logo_tiny.png" height="20px" alt="Eclipse Foundation Logo" align="top"/>&nbsp;            
-        <span >Copyright&nbsp;&copy;&nbsp;2019,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</span>
-</span>
-
-<p align="center" class="beta">${config.status!}</p>
-
-</body>
-</html>
diff --git a/docs/security-guide/src/main/jbake/templates/header.ftl b/docs/security-guide/src/main/jbake/templates/header.ftl
deleted file mode 100644
index 82ebb36..0000000
--- a/docs/security-guide/src/main/jbake/templates/header.ftl
+++ /dev/null
@@ -1,55 +0,0 @@
-<!DOCTYPE html>
-<#-- a header template fragment included in the page template -->
-<html lang="en">
-  <head>
-    <meta charset="utf-8"/>
-    <title><#if (content.title)??><#escape x as x?xml>${content.title}</#escape></#if></title>
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <link href="<#if (content.rootpath)??>${content.rootpath}<#else></#if>css/style.css" rel="stylesheet">
-    <script src="https://use.fontawesome.com/96c4d89611.js"></script>
-  </head>
-  <body>
-<table id="doc-title" cellspacing="0" cellpadding="0">
-  <tr>
-  <td align="left" valign="top">
-  <b>${content.title}</b><br />
-      <p class="beta">${config.status!}</p>
-  </td>
-  </tr>
-</table>
-<hr />
-
-<table width="90%" id="top-nav" cellspacing="0" cellpadding="0">
-	<colgroup>
-		<col width="12%"/>
-		<col width="12%"/>
-		<col width="*"/>
-	</colgroup>
-	<tr>
-	    <#if content.prev??>
-		<td align="left">
-		<a href="${content.prev}">
-			<span class="vector-font"><i class="fa fa-arrow-circle-left" aria-hidden="true"></i></span>
-			<span style="position:relative;top:-2px;">Previous</span>
-		</a>
-		</td>
-	    </#if>
-
-	    <#if content.next??>
-		<td align="left">
-		<a href="${content.next}">
-			<span class=" vector-font"><i class="fa fa-arrow-circle-right vector-font" aria-hidden="true"></i></span>
-			<span style="position:relative;top:-2px;">Next</span>
-		</a>
-		</td>
-	    </#if>
-
-		<td align="right">
-		<a href="toc.html">
-			<span class=" vector-font"><i class="fa fa-list vector-font" aria-hidden="true"></i></span>
-			<span style="position:relative;top:-2px;">Contents</span>
-		</a>
-		</td>
-	</tr>
-</table>
-
diff --git a/docs/security-guide/src/main/jbake/templates/menu.ftl b/docs/security-guide/src/main/jbake/templates/menu.ftl
deleted file mode 100644
index 888c03d..0000000
--- a/docs/security-guide/src/main/jbake/templates/menu.ftl
+++ /dev/null
@@ -1 +0,0 @@
-<#-- a menu bar template fragment included in the page template -->
\ No newline at end of file
diff --git a/docs/security-guide/src/main/jbake/templates/page.ftl b/docs/security-guide/src/main/jbake/templates/page.ftl
deleted file mode 100644
index eca51db..0000000
--- a/docs/security-guide/src/main/jbake/templates/page.ftl
+++ /dev/null
@@ -1,8 +0,0 @@
-<#-- a top level page layout template -->
-
-<#include "header.ftl">
-<#include "menu.ftl">
-
-${content.body}
-
-<#include "footer.ftl">
\ No newline at end of file
diff --git a/docs/troubleshooting-guide/README.md b/docs/troubleshooting-guide/README.md
deleted file mode 100644
index a3ec2b6..0000000
--- a/docs/troubleshooting-guide/README.md
+++ /dev/null
@@ -1,77 +0,0 @@
-# A JBake project template
-
-## About JBake
-
-JBake is a static site generator, it's inspired from jekyll and written
-in java.  The basic idea is to have templates for the structure of the
-page, and the body generated from asciidoc content.
-
-## Pre requisites
-
-- Maven
-- JDK8+
-
-Deploying to Github will require password less authentication.
-
-This is done by exporting your SSH public key into your Github account.
-
-## Build the site locally
-
-The site is generated under target/staging.
-
-Open file:///PATH_TO_PROJECT_DIR/target/staging in a browser to view the site.
-
-```
-mvn generate-resources
-```
-
-Or you can invoke the JBake plugin directly.
-
-```
-mvn jbake:build
-```
-
-### Rebuild the site on changes
-
-```
-mvn jbake:watch
-```
-
-If you keep this command running, changes to the sources will be
-detected and the site will be rendered incrementally.
-
-This is convenient when writing content.
-
-### Serve the site locally
-
-```
-mvn jbake:serve
-```
-
-If a webserver is required (e.g. absolute path are used), this command
-will start a webserver (jetty) at http://localhost:8820.  It will also
-watch for changes and rebuild incrementally.
-
-## Deploy the site to Github Pages
-
-```
-mvn deploy
-```
-
-## Produce a zip file for download
-
-To produce a zip file containing the generated html files, use:
-
-```
-mvn package
-```
-
-When making a release on GitHub, this zip file should be added to the release.
-
-## Links
-
-- [JBake maven plugin documentation](https://github.com/Blazebit/jbake-maven-plugin)
-- [JBake documentation](http://jbake.org/docs/2.5.1)
-- [Freemarker documentation](http://freemarker.org/docs)
-- [AsciiDoc User Guide](http://asciidoc.org/userguide.html)
-- [Asciidoctor quick reference](http://asciidoctor.org/docs/asciidoc-syntax-quick-reference)
diff --git a/docs/troubleshooting-guide/pom.xml b/docs/troubleshooting-guide/pom.xml
index c44fec8..85f286d 100644
--- a/docs/troubleshooting-guide/pom.xml
+++ b/docs/troubleshooting-guide/pom.xml
@@ -25,7 +25,6 @@
         <version>7.0.0-SNAPSHOT</version>
         <relativePath>../parent</relativePath>
     </parent>
-    <groupId>org.glassfish.docs</groupId>
     <artifactId>troubleshooting-guide</artifactId>
     <packaging>jar</packaging>
     <name>Eclipse GlassFish Server Troubleshooting Guide, Release 7</name>
diff --git a/docs/troubleshooting-guide/src/main/jbake/content/faqs.adoc b/docs/troubleshooting-guide/src/main/asciidoc/faqs.adoc
similarity index 100%
rename from docs/troubleshooting-guide/src/main/jbake/content/faqs.adoc
rename to docs/troubleshooting-guide/src/main/asciidoc/faqs.adoc
diff --git a/docs/troubleshooting-guide/src/main/jbake/assets/img/eclipse_foundation_logo_tiny.png b/docs/troubleshooting-guide/src/main/asciidoc/img/eclipse_foundation_logo_tiny.png
similarity index 100%
rename from docs/troubleshooting-guide/src/main/jbake/assets/img/eclipse_foundation_logo_tiny.png
rename to docs/troubleshooting-guide/src/main/asciidoc/img/eclipse_foundation_logo_tiny.png
Binary files differ
diff --git a/docs/troubleshooting-guide/src/main/jbake/content/overview.adoc b/docs/troubleshooting-guide/src/main/asciidoc/overview.adoc
similarity index 100%
rename from docs/troubleshooting-guide/src/main/jbake/content/overview.adoc
rename to docs/troubleshooting-guide/src/main/asciidoc/overview.adoc
diff --git a/docs/troubleshooting-guide/src/main/jbake/content/preface.adoc b/docs/troubleshooting-guide/src/main/asciidoc/preface.adoc
similarity index 100%
rename from docs/troubleshooting-guide/src/main/jbake/content/preface.adoc
rename to docs/troubleshooting-guide/src/main/asciidoc/preface.adoc
diff --git a/docs/troubleshooting-guide/src/main/jbake/content/specific-issues.adoc b/docs/troubleshooting-guide/src/main/asciidoc/specific-issues.adoc
similarity index 100%
rename from docs/troubleshooting-guide/src/main/jbake/content/specific-issues.adoc
rename to docs/troubleshooting-guide/src/main/asciidoc/specific-issues.adoc
diff --git a/docs/troubleshooting-guide/src/main/jbake/content/title.adoc b/docs/troubleshooting-guide/src/main/asciidoc/title.adoc
similarity index 95%
rename from docs/troubleshooting-guide/src/main/jbake/content/title.adoc
rename to docs/troubleshooting-guide/src/main/asciidoc/title.adoc
index 7fd58dc..a91e287 100644
--- a/docs/troubleshooting-guide/src/main/jbake/content/title.adoc
+++ b/docs/troubleshooting-guide/src/main/asciidoc/title.adoc
@@ -42,3 +42,5 @@
 Opteron, the AMD logo, and the AMD Opteron logo are trademarks or
 registered trademarks of Advanced Micro Devices. UNIX is a registered
 trademark of The Open Group.
+
+image:img/eclipse_foundation_logo_tiny.png["Eclipse Logo"]
diff --git a/docs/troubleshooting-guide/src/main/jbake/assets/css/style.css b/docs/troubleshooting-guide/src/main/jbake/assets/css/style.css
deleted file mode 100644
index 25a16e4..0000000
--- a/docs/troubleshooting-guide/src/main/jbake/assets/css/style.css
+++ /dev/null
@@ -1,315 +0,0 @@
-/* CSS */
-/*! normalize.css v3.0.2 | MIT License | git.io/normalize */
-/** 1. Set default font family to sans-serif. 2. Prevent iOS text size adjust after orientation change, without disabling user zoom. */
-html { font-family: sans-serif; /* 1 */ -ms-text-size-adjust: 100%; /* 2 */ -webkit-text-size-adjust: 100%; /* 2 */ }
-
-/* HTML5 display definitions ========================================================================== */
-/** Correct `block` display not defined for any HTML5 element in IE 8/9. Correct `block` display not defined for `details` or `summary` in IE 10/11 and Firefox. Correct `block` display not defined for `main` in IE 11. */
-article, aside, details, figcaption, figure, footer, header, hgroup, main, menu, nav, section, summary { display: block; }
-
-/** 1. Correct `inline-block` display not defined in IE 8/9. 2. Normalize vertical alignment of `progress` in Chrome, Firefox, and Opera. */
-audio, canvas, progress, video { display: inline-block; /* 1 */ vertical-align: baseline; /* 2 */ }
-
-/** Prevent modern browsers from displaying `audio` without controls. Remove excess height in iOS 5 devices. */
-audio:not([controls]) { display: none; height: 0; }
-
-/** Address `[hidden]` styling not present in IE 8/9/10. Hide the `template` element in IE 8/9/11, Safari, and Firefox < 22. */
-[hidden], template { display: none; }
-
-/* Links ========================================================================== */
-/** Remove the gray background color from active links in IE 10. */
-a { background-color: transparent; }
-
-/** Improve readability when focused and also mouse hovered in all browsers. */
-a:active, a:hover { outline: 0; }
-
-/* Text-level semantics ========================================================================== */
-/** Address styling not present in IE 8/9/10/11, Safari, and Chrome. */
-abbr[title] { border-bottom: 1px dotted; }
-
-/** Address style set to `bolder` in Firefox 4+, Safari, and Chrome. */
-b, strong { font-weight: bold; }
-
-/** Address styling not present in Safari and Chrome. */
-dfn { font-style: italic; }
-
-/** Address variable `h1` font-size and margin within `section` and `article` contexts in Firefox 4+, Safari, and Chrome. */
-h1 { font-size: 2em; margin: 0.67em 0; }
-
-/** Address styling not present in IE 8/9. */
-mark { background: #ff0; color: #000; }
-
-/** Address inconsistent and variable font size in all browsers. */
-small { font-size: 80%; }
-
-/** Prevent `sub` and `sup` affecting `line-height` in all browsers. */
-sub, sup { font-size: 75%; line-height: 0; position: relative; vertical-align: baseline; }
-
-sup { top: -0.5em; }
-
-sub { bottom: -0.25em; }
-
-/* Embedded content ========================================================================== */
-/** Remove border when inside `a` element in IE 8/9/10. */
-img { border: 0; }
-
-/** Correct overflow not hidden in IE 9/10/11. */
-svg:not(:root) { overflow: hidden; }
-
-/* Grouping content ========================================================================== */
-/** Address margin not present in IE 8/9 and Safari. */
-figure { margin: 1em 40px; }
-
-/** Address differences between Firefox and other browsers. */
-hr { box-sizing: content-box; height: 0; }
-
-/** Contain overflow in all browsers. */
-pre { overflow: auto; }
-
-/** Address odd `em`-unit font size rendering in all browsers. */
-code, kbd, pre, samp { font-family: monospace, monospace; font-size: 1em; }
-
-/* Forms ========================================================================== */
-/** Known limitation: by default, Chrome and Safari on OS X allow very limited styling of `select`, unless a `border` property is set. */
-/** 1. Correct color not being inherited. Known issue: affects color of disabled elements. 2. Correct font properties not being inherited. 3. Address margins set differently in Firefox 4+, Safari, and Chrome. */
-button, input, optgroup, select, textarea { color: inherit; /* 1 */ font: inherit; /* 2 */ margin: 0; /* 3 */ }
-
-/** Address `overflow` set to `hidden` in IE 8/9/10/11. */
-button { overflow: visible; }
-
-/** Address inconsistent `text-transform` inheritance for `button` and `select`. All other form control elements do not inherit `text-transform` values. Correct `button` style inheritance in Firefox, IE 8/9/10/11, and Opera. Correct `select` style inheritance in Firefox. */
-button, select { text-transform: none; }
-
-/** 1. Avoid the WebKit bug in Android 4.0.* where (2) destroys native `audio` and `video` controls. 2. Correct inability to style clickable `input` types in iOS. 3. Improve usability and consistency of cursor style between image-type `input` and others. */
-button, html input[type="button"], input[type="reset"], input[type="submit"] { -webkit-appearance: button; /* 2 */ cursor: pointer; /* 3 */ }
-
-/** Re-set default cursor for disabled elements. */
-button[disabled], html input[disabled] { cursor: default; }
-
-/** Remove inner padding and border in Firefox 4+. */
-button::-moz-focus-inner, input::-moz-focus-inner { border: 0; padding: 0; }
-
-/** Address Firefox 4+ setting `line-height` on `input` using `!important` in the UA stylesheet. */
-input { line-height: normal; }
-
-/** It's recommended that you don't attempt to style these elements. Firefox's implementation doesn't respect box-sizing, padding, or width.  1. Address box sizing set to `content-box` in IE 8/9/10. 2. Remove excess padding in IE 8/9/10. */
-input[type="checkbox"], input[type="radio"] { box-sizing: border-box; /* 1 */ padding: 0; /* 2 */ }
-
-/** Fix the cursor style for Chrome's increment/decrement buttons. For certain `font-size` values of the `input`, it causes the cursor style of the decrement button to change from `default` to `text`. */
-input[type="number"]::-webkit-inner-spin-button, input[type="number"]::-webkit-outer-spin-button { height: auto; }
-
-/** 1. Address `appearance` set to `searchfield` in Safari and Chrome. 2. Address `box-sizing` set to `border-box` in Safari and Chrome (include `-moz` to future-proof). */
-input[type="search"] { -webkit-appearance: textfield; /* 1 */ /* 2 */ box-sizing: content-box; }
-
-/** Remove inner padding and search cancel button in Safari and Chrome on OS X. Safari (but not Chrome) clips the cancel button when the search input has padding (and `textfield` appearance). */
-input[type="search"]::-webkit-search-cancel-button, input[type="search"]::-webkit-search-decoration { -webkit-appearance: none; }
-
-/** Define consistent border, margin, and padding. */
-fieldset { border: 1px solid #c0c0c0; margin: 0 2px; padding: 0.35em 0.625em 0.75em; }
-
-/** 1. Correct `color` not being inherited in IE 8/9/10/11. 2. Remove padding so people aren't caught out if they zero out fieldsets. */
-legend { border: 0; /* 1 */ padding: 0; /* 2 */ }
-
-/** Remove default vertical scrollbar in IE 8/9/10/11. */
-textarea { overflow: auto; }
-
-/** Don't inherit the `font-weight` (applied by a rule above). NOTE: the default cannot safely be changed in Chrome and Safari on OS X. */
-optgroup { font-weight: bold; }
-
-/* Tables ========================================================================== */
-/** Remove most spacing between table cells. */
-table { border-collapse: collapse; border-spacing: 0; }
-
-td, th { padding: 0; }
-
-/* LAYOUT STYLES */
-
-p { margin-top: 0; }
-
-code, pre { margin-bottom: 30px; font-family: Monaco, "Bitstream Vera Sans Mono", "Lucida Console", Terminal, monospace; font-size: 13px; color: #222; }
-
-code { padding: 0 3px; background-color: #f2f8fc; border: solid 1px #dbe7f3; }
-
-pre { padding: 20px; overflow: auto; text-shadow: none; background: #fff; border: solid 1px #f2f2f2; }
-
-pre code { padding: 0; color: #2879d0; background-color: #fff; border: none; }
-
-ul, ol, dl { margin-bottom: 20px; }
-
-/* COMMON STYLES */
-
-td.halign-right { text-align: right; } 
-
-td.halign-center { text-align: center; } 
-
-form { padding: 20px; background: #f2f2f2; }
-
-h2 { 
-   font-size: 2em;
-   line-height: 1.2em;
-   font-weight: 200;
-   letter-spacing: 0;
-}
-
-h3 { 
-   font-size: 1.4em;
-   line-height: 1.2em;
-   font-weight: normal;
-   letter-spacing: 0;
-}
-
-.sect1 {
-   margin-left: 4%;
-   margin-right: 4%;
-   font: 13px/20px Arial, Helvetica, sans-serif  
-}
-
-a:link {
-   text-decoration: none;
-   color: #09569d;
-}
-
-#preamble hr{
-   margin-left: 0%;
-   margin-right: 0%;
-}
-
-#preamble .sectionbody table  {
-   font-weight: 200;
-   margin-left: 4%;
-   margin-right: 4%;
-}
-
-hr {
-   margin-bottom: 12px;
-}
-
-table.tableblock.frame-all.grid-all.spread {
-   font-size: 12px;
-}
-
-code {
-   font-size:.9em;
-   border: 1px solid #eaeaea;
-   background-color: #f6f6f6;
-   border-radius: 3px;
-   padding: 1px;
-   padding-left:2px;
-   padding-right:2px;
-}
-
-pre.prettyprint.highlight {
-   border: 1px solid #eaeaea;
-   background-color: #f6f6f6;
-   border-radius: 4px;
-   padding: 8px;
-   padding-top:4px;
-   padding-bottom:4px;
-}
-
-.language-oac_no_warn {
-   font-size:.9em;
-   color:#222;
-   background-color: transparent;
-}
-
-#doc-title {
-   margin-left: 4%;
-}
-
-#top-nav {
-   margin-left: 4%;
-   font-size: 12px;
-}
-
-#bottom-nav {
-   margin-left: 4%;
-   font-size: 12px;
-}
-
-.vector-font {
-   color:grey; 
-   font-size: 20px;
-}
-
-#copyright {
-   padding-top: 10px;
-   padding-bottom: 4px;
-   display: table;
-   margin:0 auto;
-   color: grey;
-   font-size: 12px;
-   vertical-align: middle;
-}
-
-.beta {color: #FF0000}
-
-/* GENERAL ELEMENT TYPE STYLES */
-
-/* #Media Queries
-================================================== */
-/* Smaller than standard 960 (devices and browsers) */
-/* Tablet Portrait size to standard 960 (devices and browsers) */
-@media only screen and (min-width: 768px) and (max-width: 959px) { .inner { width: 740px; }
-  header h1, header h2 { width: 340px; }
-  header h1 { font-size: 60px; }
-  header h2 { font-size: 30px; }
-}
-/* All Mobile Sizes (devices and browser) */
-@media only screen and (max-width: 767px) { .inner { width: 93%; }
-  header { padding: 20px 0; }
-  header .inner { position: relative; }
-  header h1, header h2 { width: 100%; }
-  header h1 { font-size: 48px; }
-  header h2 { font-size: 24px; }
-  header a.button { position: relative; display: inline-block; width: auto; height: auto; padding: 5px 10px; margin-top: 15px; font-size: 13px; line-height: 1; color: #2879d0; text-align: center; background-color: #9ddcff; background-image: none; border-radius: 5px; -moz-border-radius: 5px; -webkit-border-radius: 5px; }
-  header a.button small { display: inline; font-size: 13px; }
-}
-/* Mobile Landscape Size to Tablet Portrait (devices and browsers) */
-/* Mobile Portrait Size to Mobile Landscape Size (devices and browsers) */
-
-header h1 { padding-top: 14px; font-size: 2em; font-weight: 200; line-height: 1.4; color: #FFFFFF; letter-spacing: 0px; border-bottom: 0px; }
-
-header h2 { font-size: 1.2em; margin-top: 0; margin-bottom: 0; font-weight: 200; line-height: .8; color: #ec7D11; letter-spacing: 0; }
-
-/*
-header a.button { background: transparent url(../images/logo.png) 0 0 no-repeat; padding-left: 32px; }
-*/
-
-header a:hover { text-decoration: none; }
-
-/* Admonition (Note) block */
-.admonitionblock > table {
-  border: 0;
-  background: none;
-  width: 100%;
-  table-layout: auto;
-  margin-bottom: 10.5px;
-}
-.admonitionblock > table td.icon {
-  text-align: center;
-  width: 60px;
-}
-.admonitionblock > table td.icon img {
-  max-width: none;
-}
-.admonitionblock > table td.icon .title {
-  text-transform: uppercase;
-}
-.admonitionblock > table td.content {
-  padding-left: 1em;
-  padding-right: 1em;
-  border-left: 3px solid #ddd;
-}
-.admonitionblock > table td.content > :last-child > :last-child {
-  margin-bottom: 0;
-}
-.admonitionblock td.icon [class^="fa icon-"]:before {
-  font-size: 2.5em;
-  text-shadow: 1px 1px 2px rgba(0, 0, 0, 0.5);
-  cursor: default;
-}
-.admonitionblock td.icon .icon-note:before {
-  content: "\f05a";
-  color: #5bc0de;
-}
diff --git a/docs/troubleshooting-guide/src/main/jbake/jbake.properties b/docs/troubleshooting-guide/src/main/jbake/jbake.properties
deleted file mode 100644
index 546d09c..0000000
--- a/docs/troubleshooting-guide/src/main/jbake/jbake.properties
+++ /dev/null
@@ -1,7 +0,0 @@
-site.host=http://jbake.org
-render.tags=false
-render.sitemap=false
-render.archive=false
-render.feed=false
-asciidoctor.option.safe=0
-asciidoctor.attributes.export=true
diff --git a/docs/troubleshooting-guide/src/main/jbake/templates/footer.ftl b/docs/troubleshooting-guide/src/main/jbake/templates/footer.ftl
deleted file mode 100644
index 6f2b09e..0000000
--- a/docs/troubleshooting-guide/src/main/jbake/templates/footer.ftl
+++ /dev/null
@@ -1,46 +0,0 @@
-<#-- a footer template fragment included in the page template -->
-<hr />
-
-<table width="90%" id="bottom-nav" cellspacing="0" cellpadding="0">
-	<colgroup>
-		<col width="12%"/>
-		<col width="12%"/>
-		<col width="*"/>
-	</colgroup>
-	<tr>		
-	    <#if content.prev??>
-		<td align="left">
-		<a href="${content.prev}">
-			<span class=" vector-font"><i class="fa fa-arrow-circle-left" aria-hidden="true"></i></span>
-			<span style="position:relative;top:-2px;">Previous</span>
-		</a>
-		</td>
-		</#if>
-
-		<#if content.next??>
-		<td align="left">
-		<a href="${content.next}">
-			<span class="vector-font"><i class="fa fa-arrow-circle-right vector-font" aria-hidden="true"></i></span>
-			<span style="position:relative;top:-2px;">Next</span>
-		</a>
-		</td>
-		</#if>
-
-		<td align="right">
-		<a href="toc.html">
-			<span class="vector-font"><i class="fa fa-list vector-font" aria-hidden="true"></i></span>
-			<span style="position:relative;top:-2px;">Contents</span>
-		</a>
-		</td>
-	</tr>
-</table>
-
-<span id="copyright">
-        <img src="img/eclipse_foundation_logo_tiny.png" height="20px" alt="Eclipse Foundation Logo" align="top"/>&nbsp;            
-        <span >Copyright&nbsp;&copy;&nbsp;2019,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</span>
-</span>
-
-<p align="center" class="beta">${config.status!}</p>
-
-</body>
-</html>
diff --git a/docs/troubleshooting-guide/src/main/jbake/templates/header.ftl b/docs/troubleshooting-guide/src/main/jbake/templates/header.ftl
deleted file mode 100644
index 82ebb36..0000000
--- a/docs/troubleshooting-guide/src/main/jbake/templates/header.ftl
+++ /dev/null
@@ -1,55 +0,0 @@
-<!DOCTYPE html>
-<#-- a header template fragment included in the page template -->
-<html lang="en">
-  <head>
-    <meta charset="utf-8"/>
-    <title><#if (content.title)??><#escape x as x?xml>${content.title}</#escape></#if></title>
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <link href="<#if (content.rootpath)??>${content.rootpath}<#else></#if>css/style.css" rel="stylesheet">
-    <script src="https://use.fontawesome.com/96c4d89611.js"></script>
-  </head>
-  <body>
-<table id="doc-title" cellspacing="0" cellpadding="0">
-  <tr>
-  <td align="left" valign="top">
-  <b>${content.title}</b><br />
-      <p class="beta">${config.status!}</p>
-  </td>
-  </tr>
-</table>
-<hr />
-
-<table width="90%" id="top-nav" cellspacing="0" cellpadding="0">
-	<colgroup>
-		<col width="12%"/>
-		<col width="12%"/>
-		<col width="*"/>
-	</colgroup>
-	<tr>
-	    <#if content.prev??>
-		<td align="left">
-		<a href="${content.prev}">
-			<span class="vector-font"><i class="fa fa-arrow-circle-left" aria-hidden="true"></i></span>
-			<span style="position:relative;top:-2px;">Previous</span>
-		</a>
-		</td>
-	    </#if>
-
-	    <#if content.next??>
-		<td align="left">
-		<a href="${content.next}">
-			<span class=" vector-font"><i class="fa fa-arrow-circle-right vector-font" aria-hidden="true"></i></span>
-			<span style="position:relative;top:-2px;">Next</span>
-		</a>
-		</td>
-	    </#if>
-
-		<td align="right">
-		<a href="toc.html">
-			<span class=" vector-font"><i class="fa fa-list vector-font" aria-hidden="true"></i></span>
-			<span style="position:relative;top:-2px;">Contents</span>
-		</a>
-		</td>
-	</tr>
-</table>
-
diff --git a/docs/troubleshooting-guide/src/main/jbake/templates/menu.ftl b/docs/troubleshooting-guide/src/main/jbake/templates/menu.ftl
deleted file mode 100644
index 888c03d..0000000
--- a/docs/troubleshooting-guide/src/main/jbake/templates/menu.ftl
+++ /dev/null
@@ -1 +0,0 @@
-<#-- a menu bar template fragment included in the page template -->
\ No newline at end of file
diff --git a/docs/troubleshooting-guide/src/main/jbake/templates/page.ftl b/docs/troubleshooting-guide/src/main/jbake/templates/page.ftl
deleted file mode 100644
index eca51db..0000000
--- a/docs/troubleshooting-guide/src/main/jbake/templates/page.ftl
+++ /dev/null
@@ -1,8 +0,0 @@
-<#-- a top level page layout template -->
-
-<#include "header.ftl">
-<#include "menu.ftl">
-
-${content.body}
-
-<#include "footer.ftl">
\ No newline at end of file
diff --git a/docs/upgrade-guide/README.md b/docs/upgrade-guide/README.md
deleted file mode 100644
index a3ec2b6..0000000
--- a/docs/upgrade-guide/README.md
+++ /dev/null
@@ -1,77 +0,0 @@
-# A JBake project template
-
-## About JBake
-
-JBake is a static site generator, it's inspired from jekyll and written
-in java.  The basic idea is to have templates for the structure of the
-page, and the body generated from asciidoc content.
-
-## Pre requisites
-
-- Maven
-- JDK8+
-
-Deploying to Github will require password less authentication.
-
-This is done by exporting your SSH public key into your Github account.
-
-## Build the site locally
-
-The site is generated under target/staging.
-
-Open file:///PATH_TO_PROJECT_DIR/target/staging in a browser to view the site.
-
-```
-mvn generate-resources
-```
-
-Or you can invoke the JBake plugin directly.
-
-```
-mvn jbake:build
-```
-
-### Rebuild the site on changes
-
-```
-mvn jbake:watch
-```
-
-If you keep this command running, changes to the sources will be
-detected and the site will be rendered incrementally.
-
-This is convenient when writing content.
-
-### Serve the site locally
-
-```
-mvn jbake:serve
-```
-
-If a webserver is required (e.g. absolute path are used), this command
-will start a webserver (jetty) at http://localhost:8820.  It will also
-watch for changes and rebuild incrementally.
-
-## Deploy the site to Github Pages
-
-```
-mvn deploy
-```
-
-## Produce a zip file for download
-
-To produce a zip file containing the generated html files, use:
-
-```
-mvn package
-```
-
-When making a release on GitHub, this zip file should be added to the release.
-
-## Links
-
-- [JBake maven plugin documentation](https://github.com/Blazebit/jbake-maven-plugin)
-- [JBake documentation](http://jbake.org/docs/2.5.1)
-- [Freemarker documentation](http://freemarker.org/docs)
-- [AsciiDoc User Guide](http://asciidoc.org/userguide.html)
-- [Asciidoctor quick reference](http://asciidoctor.org/docs/asciidoc-syntax-quick-reference)
diff --git a/docs/upgrade-guide/pom.xml b/docs/upgrade-guide/pom.xml
index 7bd86ce..71c6469 100644
--- a/docs/upgrade-guide/pom.xml
+++ b/docs/upgrade-guide/pom.xml
@@ -25,7 +25,6 @@
         <version>7.0.0-SNAPSHOT</version>
         <relativePath>../parent</relativePath>
     </parent>
-    <groupId>org.glassfish.docs</groupId>
     <artifactId>upgrade-guide</artifactId>
     <packaging>jar</packaging>
     <name>Eclipse GlassFish Server Upgrade Guide, Release 7</name>
diff --git a/docs/upgrade-guide/src/main/jbake/assets/img/eclipse_foundation_logo_tiny.png b/docs/upgrade-guide/src/main/asciidoc/img/eclipse_foundation_logo_tiny.png
similarity index 100%
rename from docs/upgrade-guide/src/main/jbake/assets/img/eclipse_foundation_logo_tiny.png
rename to docs/upgrade-guide/src/main/asciidoc/img/eclipse_foundation_logo_tiny.png
Binary files differ
diff --git a/docs/upgrade-guide/src/main/jbake/content/loe.adoc b/docs/upgrade-guide/src/main/asciidoc/loe.adoc
similarity index 100%
rename from docs/upgrade-guide/src/main/jbake/content/loe.adoc
rename to docs/upgrade-guide/src/main/asciidoc/loe.adoc
diff --git a/docs/upgrade-guide/src/main/jbake/content/lot.adoc b/docs/upgrade-guide/src/main/asciidoc/lot.adoc
similarity index 100%
rename from docs/upgrade-guide/src/main/jbake/content/lot.adoc
rename to docs/upgrade-guide/src/main/asciidoc/lot.adoc
diff --git a/docs/upgrade-guide/src/main/jbake/content/preface.adoc b/docs/upgrade-guide/src/main/asciidoc/preface.adoc
similarity index 100%
rename from docs/upgrade-guide/src/main/jbake/content/preface.adoc
rename to docs/upgrade-guide/src/main/asciidoc/preface.adoc
diff --git a/docs/upgrade-guide/src/main/jbake/content/title.adoc b/docs/upgrade-guide/src/main/asciidoc/title.adoc
similarity index 100%
rename from docs/upgrade-guide/src/main/jbake/content/title.adoc
rename to docs/upgrade-guide/src/main/asciidoc/title.adoc
diff --git a/docs/upgrade-guide/src/main/jbake/content/upgrade-compatibility-issues.adoc b/docs/upgrade-guide/src/main/asciidoc/upgrade-compatibility-issues.adoc
similarity index 100%
rename from docs/upgrade-guide/src/main/jbake/content/upgrade-compatibility-issues.adoc
rename to docs/upgrade-guide/src/main/asciidoc/upgrade-compatibility-issues.adoc
diff --git a/docs/upgrade-guide/src/main/jbake/content/upgrading-legacy-installation.adoc b/docs/upgrade-guide/src/main/asciidoc/upgrading-legacy-installation.adoc
similarity index 100%
rename from docs/upgrade-guide/src/main/jbake/content/upgrading-legacy-installation.adoc
rename to docs/upgrade-guide/src/main/asciidoc/upgrading-legacy-installation.adoc
diff --git a/docs/upgrade-guide/src/main/jbake/assets/css/style.css b/docs/upgrade-guide/src/main/jbake/assets/css/style.css
deleted file mode 100644
index 25a16e4..0000000
--- a/docs/upgrade-guide/src/main/jbake/assets/css/style.css
+++ /dev/null
@@ -1,315 +0,0 @@
-/* CSS */
-/*! normalize.css v3.0.2 | MIT License | git.io/normalize */
-/** 1. Set default font family to sans-serif. 2. Prevent iOS text size adjust after orientation change, without disabling user zoom. */
-html { font-family: sans-serif; /* 1 */ -ms-text-size-adjust: 100%; /* 2 */ -webkit-text-size-adjust: 100%; /* 2 */ }
-
-/* HTML5 display definitions ========================================================================== */
-/** Correct `block` display not defined for any HTML5 element in IE 8/9. Correct `block` display not defined for `details` or `summary` in IE 10/11 and Firefox. Correct `block` display not defined for `main` in IE 11. */
-article, aside, details, figcaption, figure, footer, header, hgroup, main, menu, nav, section, summary { display: block; }
-
-/** 1. Correct `inline-block` display not defined in IE 8/9. 2. Normalize vertical alignment of `progress` in Chrome, Firefox, and Opera. */
-audio, canvas, progress, video { display: inline-block; /* 1 */ vertical-align: baseline; /* 2 */ }
-
-/** Prevent modern browsers from displaying `audio` without controls. Remove excess height in iOS 5 devices. */
-audio:not([controls]) { display: none; height: 0; }
-
-/** Address `[hidden]` styling not present in IE 8/9/10. Hide the `template` element in IE 8/9/11, Safari, and Firefox < 22. */
-[hidden], template { display: none; }
-
-/* Links ========================================================================== */
-/** Remove the gray background color from active links in IE 10. */
-a { background-color: transparent; }
-
-/** Improve readability when focused and also mouse hovered in all browsers. */
-a:active, a:hover { outline: 0; }
-
-/* Text-level semantics ========================================================================== */
-/** Address styling not present in IE 8/9/10/11, Safari, and Chrome. */
-abbr[title] { border-bottom: 1px dotted; }
-
-/** Address style set to `bolder` in Firefox 4+, Safari, and Chrome. */
-b, strong { font-weight: bold; }
-
-/** Address styling not present in Safari and Chrome. */
-dfn { font-style: italic; }
-
-/** Address variable `h1` font-size and margin within `section` and `article` contexts in Firefox 4+, Safari, and Chrome. */
-h1 { font-size: 2em; margin: 0.67em 0; }
-
-/** Address styling not present in IE 8/9. */
-mark { background: #ff0; color: #000; }
-
-/** Address inconsistent and variable font size in all browsers. */
-small { font-size: 80%; }
-
-/** Prevent `sub` and `sup` affecting `line-height` in all browsers. */
-sub, sup { font-size: 75%; line-height: 0; position: relative; vertical-align: baseline; }
-
-sup { top: -0.5em; }
-
-sub { bottom: -0.25em; }
-
-/* Embedded content ========================================================================== */
-/** Remove border when inside `a` element in IE 8/9/10. */
-img { border: 0; }
-
-/** Correct overflow not hidden in IE 9/10/11. */
-svg:not(:root) { overflow: hidden; }
-
-/* Grouping content ========================================================================== */
-/** Address margin not present in IE 8/9 and Safari. */
-figure { margin: 1em 40px; }
-
-/** Address differences between Firefox and other browsers. */
-hr { box-sizing: content-box; height: 0; }
-
-/** Contain overflow in all browsers. */
-pre { overflow: auto; }
-
-/** Address odd `em`-unit font size rendering in all browsers. */
-code, kbd, pre, samp { font-family: monospace, monospace; font-size: 1em; }
-
-/* Forms ========================================================================== */
-/** Known limitation: by default, Chrome and Safari on OS X allow very limited styling of `select`, unless a `border` property is set. */
-/** 1. Correct color not being inherited. Known issue: affects color of disabled elements. 2. Correct font properties not being inherited. 3. Address margins set differently in Firefox 4+, Safari, and Chrome. */
-button, input, optgroup, select, textarea { color: inherit; /* 1 */ font: inherit; /* 2 */ margin: 0; /* 3 */ }
-
-/** Address `overflow` set to `hidden` in IE 8/9/10/11. */
-button { overflow: visible; }
-
-/** Address inconsistent `text-transform` inheritance for `button` and `select`. All other form control elements do not inherit `text-transform` values. Correct `button` style inheritance in Firefox, IE 8/9/10/11, and Opera. Correct `select` style inheritance in Firefox. */
-button, select { text-transform: none; }
-
-/** 1. Avoid the WebKit bug in Android 4.0.* where (2) destroys native `audio` and `video` controls. 2. Correct inability to style clickable `input` types in iOS. 3. Improve usability and consistency of cursor style between image-type `input` and others. */
-button, html input[type="button"], input[type="reset"], input[type="submit"] { -webkit-appearance: button; /* 2 */ cursor: pointer; /* 3 */ }
-
-/** Re-set default cursor for disabled elements. */
-button[disabled], html input[disabled] { cursor: default; }
-
-/** Remove inner padding and border in Firefox 4+. */
-button::-moz-focus-inner, input::-moz-focus-inner { border: 0; padding: 0; }
-
-/** Address Firefox 4+ setting `line-height` on `input` using `!important` in the UA stylesheet. */
-input { line-height: normal; }
-
-/** It's recommended that you don't attempt to style these elements. Firefox's implementation doesn't respect box-sizing, padding, or width.  1. Address box sizing set to `content-box` in IE 8/9/10. 2. Remove excess padding in IE 8/9/10. */
-input[type="checkbox"], input[type="radio"] { box-sizing: border-box; /* 1 */ padding: 0; /* 2 */ }
-
-/** Fix the cursor style for Chrome's increment/decrement buttons. For certain `font-size` values of the `input`, it causes the cursor style of the decrement button to change from `default` to `text`. */
-input[type="number"]::-webkit-inner-spin-button, input[type="number"]::-webkit-outer-spin-button { height: auto; }
-
-/** 1. Address `appearance` set to `searchfield` in Safari and Chrome. 2. Address `box-sizing` set to `border-box` in Safari and Chrome (include `-moz` to future-proof). */
-input[type="search"] { -webkit-appearance: textfield; /* 1 */ /* 2 */ box-sizing: content-box; }
-
-/** Remove inner padding and search cancel button in Safari and Chrome on OS X. Safari (but not Chrome) clips the cancel button when the search input has padding (and `textfield` appearance). */
-input[type="search"]::-webkit-search-cancel-button, input[type="search"]::-webkit-search-decoration { -webkit-appearance: none; }
-
-/** Define consistent border, margin, and padding. */
-fieldset { border: 1px solid #c0c0c0; margin: 0 2px; padding: 0.35em 0.625em 0.75em; }
-
-/** 1. Correct `color` not being inherited in IE 8/9/10/11. 2. Remove padding so people aren't caught out if they zero out fieldsets. */
-legend { border: 0; /* 1 */ padding: 0; /* 2 */ }
-
-/** Remove default vertical scrollbar in IE 8/9/10/11. */
-textarea { overflow: auto; }
-
-/** Don't inherit the `font-weight` (applied by a rule above). NOTE: the default cannot safely be changed in Chrome and Safari on OS X. */
-optgroup { font-weight: bold; }
-
-/* Tables ========================================================================== */
-/** Remove most spacing between table cells. */
-table { border-collapse: collapse; border-spacing: 0; }
-
-td, th { padding: 0; }
-
-/* LAYOUT STYLES */
-
-p { margin-top: 0; }
-
-code, pre { margin-bottom: 30px; font-family: Monaco, "Bitstream Vera Sans Mono", "Lucida Console", Terminal, monospace; font-size: 13px; color: #222; }
-
-code { padding: 0 3px; background-color: #f2f8fc; border: solid 1px #dbe7f3; }
-
-pre { padding: 20px; overflow: auto; text-shadow: none; background: #fff; border: solid 1px #f2f2f2; }
-
-pre code { padding: 0; color: #2879d0; background-color: #fff; border: none; }
-
-ul, ol, dl { margin-bottom: 20px; }
-
-/* COMMON STYLES */
-
-td.halign-right { text-align: right; } 
-
-td.halign-center { text-align: center; } 
-
-form { padding: 20px; background: #f2f2f2; }
-
-h2 { 
-   font-size: 2em;
-   line-height: 1.2em;
-   font-weight: 200;
-   letter-spacing: 0;
-}
-
-h3 { 
-   font-size: 1.4em;
-   line-height: 1.2em;
-   font-weight: normal;
-   letter-spacing: 0;
-}
-
-.sect1 {
-   margin-left: 4%;
-   margin-right: 4%;
-   font: 13px/20px Arial, Helvetica, sans-serif  
-}
-
-a:link {
-   text-decoration: none;
-   color: #09569d;
-}
-
-#preamble hr{
-   margin-left: 0%;
-   margin-right: 0%;
-}
-
-#preamble .sectionbody table  {
-   font-weight: 200;
-   margin-left: 4%;
-   margin-right: 4%;
-}
-
-hr {
-   margin-bottom: 12px;
-}
-
-table.tableblock.frame-all.grid-all.spread {
-   font-size: 12px;
-}
-
-code {
-   font-size:.9em;
-   border: 1px solid #eaeaea;
-   background-color: #f6f6f6;
-   border-radius: 3px;
-   padding: 1px;
-   padding-left:2px;
-   padding-right:2px;
-}
-
-pre.prettyprint.highlight {
-   border: 1px solid #eaeaea;
-   background-color: #f6f6f6;
-   border-radius: 4px;
-   padding: 8px;
-   padding-top:4px;
-   padding-bottom:4px;
-}
-
-.language-oac_no_warn {
-   font-size:.9em;
-   color:#222;
-   background-color: transparent;
-}
-
-#doc-title {
-   margin-left: 4%;
-}
-
-#top-nav {
-   margin-left: 4%;
-   font-size: 12px;
-}
-
-#bottom-nav {
-   margin-left: 4%;
-   font-size: 12px;
-}
-
-.vector-font {
-   color:grey; 
-   font-size: 20px;
-}
-
-#copyright {
-   padding-top: 10px;
-   padding-bottom: 4px;
-   display: table;
-   margin:0 auto;
-   color: grey;
-   font-size: 12px;
-   vertical-align: middle;
-}
-
-.beta {color: #FF0000}
-
-/* GENERAL ELEMENT TYPE STYLES */
-
-/* #Media Queries
-================================================== */
-/* Smaller than standard 960 (devices and browsers) */
-/* Tablet Portrait size to standard 960 (devices and browsers) */
-@media only screen and (min-width: 768px) and (max-width: 959px) { .inner { width: 740px; }
-  header h1, header h2 { width: 340px; }
-  header h1 { font-size: 60px; }
-  header h2 { font-size: 30px; }
-}
-/* All Mobile Sizes (devices and browser) */
-@media only screen and (max-width: 767px) { .inner { width: 93%; }
-  header { padding: 20px 0; }
-  header .inner { position: relative; }
-  header h1, header h2 { width: 100%; }
-  header h1 { font-size: 48px; }
-  header h2 { font-size: 24px; }
-  header a.button { position: relative; display: inline-block; width: auto; height: auto; padding: 5px 10px; margin-top: 15px; font-size: 13px; line-height: 1; color: #2879d0; text-align: center; background-color: #9ddcff; background-image: none; border-radius: 5px; -moz-border-radius: 5px; -webkit-border-radius: 5px; }
-  header a.button small { display: inline; font-size: 13px; }
-}
-/* Mobile Landscape Size to Tablet Portrait (devices and browsers) */
-/* Mobile Portrait Size to Mobile Landscape Size (devices and browsers) */
-
-header h1 { padding-top: 14px; font-size: 2em; font-weight: 200; line-height: 1.4; color: #FFFFFF; letter-spacing: 0px; border-bottom: 0px; }
-
-header h2 { font-size: 1.2em; margin-top: 0; margin-bottom: 0; font-weight: 200; line-height: .8; color: #ec7D11; letter-spacing: 0; }
-
-/*
-header a.button { background: transparent url(../images/logo.png) 0 0 no-repeat; padding-left: 32px; }
-*/
-
-header a:hover { text-decoration: none; }
-
-/* Admonition (Note) block */
-.admonitionblock > table {
-  border: 0;
-  background: none;
-  width: 100%;
-  table-layout: auto;
-  margin-bottom: 10.5px;
-}
-.admonitionblock > table td.icon {
-  text-align: center;
-  width: 60px;
-}
-.admonitionblock > table td.icon img {
-  max-width: none;
-}
-.admonitionblock > table td.icon .title {
-  text-transform: uppercase;
-}
-.admonitionblock > table td.content {
-  padding-left: 1em;
-  padding-right: 1em;
-  border-left: 3px solid #ddd;
-}
-.admonitionblock > table td.content > :last-child > :last-child {
-  margin-bottom: 0;
-}
-.admonitionblock td.icon [class^="fa icon-"]:before {
-  font-size: 2.5em;
-  text-shadow: 1px 1px 2px rgba(0, 0, 0, 0.5);
-  cursor: default;
-}
-.admonitionblock td.icon .icon-note:before {
-  content: "\f05a";
-  color: #5bc0de;
-}
diff --git a/docs/upgrade-guide/src/main/jbake/jbake.properties b/docs/upgrade-guide/src/main/jbake/jbake.properties
deleted file mode 100644
index 546d09c..0000000
--- a/docs/upgrade-guide/src/main/jbake/jbake.properties
+++ /dev/null
@@ -1,7 +0,0 @@
-site.host=http://jbake.org
-render.tags=false
-render.sitemap=false
-render.archive=false
-render.feed=false
-asciidoctor.option.safe=0
-asciidoctor.attributes.export=true
diff --git a/docs/upgrade-guide/src/main/jbake/templates/footer.ftl b/docs/upgrade-guide/src/main/jbake/templates/footer.ftl
deleted file mode 100644
index 6f2b09e..0000000
--- a/docs/upgrade-guide/src/main/jbake/templates/footer.ftl
+++ /dev/null
@@ -1,46 +0,0 @@
-<#-- a footer template fragment included in the page template -->
-<hr />
-
-<table width="90%" id="bottom-nav" cellspacing="0" cellpadding="0">
-	<colgroup>
-		<col width="12%"/>
-		<col width="12%"/>
-		<col width="*"/>
-	</colgroup>
-	<tr>		
-	    <#if content.prev??>
-		<td align="left">
-		<a href="${content.prev}">
-			<span class=" vector-font"><i class="fa fa-arrow-circle-left" aria-hidden="true"></i></span>
-			<span style="position:relative;top:-2px;">Previous</span>
-		</a>
-		</td>
-		</#if>
-
-		<#if content.next??>
-		<td align="left">
-		<a href="${content.next}">
-			<span class="vector-font"><i class="fa fa-arrow-circle-right vector-font" aria-hidden="true"></i></span>
-			<span style="position:relative;top:-2px;">Next</span>
-		</a>
-		</td>
-		</#if>
-
-		<td align="right">
-		<a href="toc.html">
-			<span class="vector-font"><i class="fa fa-list vector-font" aria-hidden="true"></i></span>
-			<span style="position:relative;top:-2px;">Contents</span>
-		</a>
-		</td>
-	</tr>
-</table>
-
-<span id="copyright">
-        <img src="img/eclipse_foundation_logo_tiny.png" height="20px" alt="Eclipse Foundation Logo" align="top"/>&nbsp;            
-        <span >Copyright&nbsp;&copy;&nbsp;2019,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</span>
-</span>
-
-<p align="center" class="beta">${config.status!}</p>
-
-</body>
-</html>
diff --git a/docs/upgrade-guide/src/main/jbake/templates/header.ftl b/docs/upgrade-guide/src/main/jbake/templates/header.ftl
deleted file mode 100644
index 82ebb36..0000000
--- a/docs/upgrade-guide/src/main/jbake/templates/header.ftl
+++ /dev/null
@@ -1,55 +0,0 @@
-<!DOCTYPE html>
-<#-- a header template fragment included in the page template -->
-<html lang="en">
-  <head>
-    <meta charset="utf-8"/>
-    <title><#if (content.title)??><#escape x as x?xml>${content.title}</#escape></#if></title>
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <link href="<#if (content.rootpath)??>${content.rootpath}<#else></#if>css/style.css" rel="stylesheet">
-    <script src="https://use.fontawesome.com/96c4d89611.js"></script>
-  </head>
-  <body>
-<table id="doc-title" cellspacing="0" cellpadding="0">
-  <tr>
-  <td align="left" valign="top">
-  <b>${content.title}</b><br />
-      <p class="beta">${config.status!}</p>
-  </td>
-  </tr>
-</table>
-<hr />
-
-<table width="90%" id="top-nav" cellspacing="0" cellpadding="0">
-	<colgroup>
-		<col width="12%"/>
-		<col width="12%"/>
-		<col width="*"/>
-	</colgroup>
-	<tr>
-	    <#if content.prev??>
-		<td align="left">
-		<a href="${content.prev}">
-			<span class="vector-font"><i class="fa fa-arrow-circle-left" aria-hidden="true"></i></span>
-			<span style="position:relative;top:-2px;">Previous</span>
-		</a>
-		</td>
-	    </#if>
-
-	    <#if content.next??>
-		<td align="left">
-		<a href="${content.next}">
-			<span class=" vector-font"><i class="fa fa-arrow-circle-right vector-font" aria-hidden="true"></i></span>
-			<span style="position:relative;top:-2px;">Next</span>
-		</a>
-		</td>
-	    </#if>
-
-		<td align="right">
-		<a href="toc.html">
-			<span class=" vector-font"><i class="fa fa-list vector-font" aria-hidden="true"></i></span>
-			<span style="position:relative;top:-2px;">Contents</span>
-		</a>
-		</td>
-	</tr>
-</table>
-
diff --git a/docs/upgrade-guide/src/main/jbake/templates/menu.ftl b/docs/upgrade-guide/src/main/jbake/templates/menu.ftl
deleted file mode 100644
index 888c03d..0000000
--- a/docs/upgrade-guide/src/main/jbake/templates/menu.ftl
+++ /dev/null
@@ -1 +0,0 @@
-<#-- a menu bar template fragment included in the page template -->
\ No newline at end of file
diff --git a/docs/upgrade-guide/src/main/jbake/templates/page.ftl b/docs/upgrade-guide/src/main/jbake/templates/page.ftl
deleted file mode 100644
index eca51db..0000000
--- a/docs/upgrade-guide/src/main/jbake/templates/page.ftl
+++ /dev/null
@@ -1,8 +0,0 @@
-<#-- a top level page layout template -->
-
-<#include "header.ftl">
-<#include "menu.ftl">
-
-${content.body}
-
-<#include "footer.ftl">
\ No newline at end of file
diff --git a/docs/website/pom.xml b/docs/website/pom.xml
index b37349d..d86899b 100644
--- a/docs/website/pom.xml
+++ b/docs/website/pom.xml
@@ -24,7 +24,6 @@
         <artifactId>docs</artifactId>
         <version>7.0.0-SNAPSHOT</version>
     </parent>
-    <groupId>org.glassfish.docs</groupId>
     <artifactId>website</artifactId>
     <packaging>jar</packaging>
     <name>Eclipse GlassFish website content</name>
@@ -36,7 +35,7 @@
 
     <!--
         This project doesn't inherit from ../parent because it doesn't
-        need jbake, and so the jar plugin needs to be configured here...
+        need asciidoc, and so the jar plugin needs to be configured here...
     -->
     <build>
         <defaultGoal>package</defaultGoal>