Publish website (#22729)

* Move all web site content to these projects and create a project
to publish the web site content, including the documentation.
diff --git a/docs/glassfish/README.md b/docs/glassfish/README.md
new file mode 100644
index 0000000..4e78b4c
--- /dev/null
+++ b/docs/glassfish/README.md
@@ -0,0 +1,58 @@
+# Eclipse GlassFish Documentation
+
+The subdirectories of this directory contain the Eclipse GlassFish
+website and documentation content, and the Maven projects to publish it.
+
+The entire gh-pages content is published from here.
+**DO NOT** update the gh-pages branch directly.
+
+The `website` project contains the top level web site content.
+The content is in `src/main/resources`.
+
+The `parent` project effectively acts as an include file that contains
+all the common jbake configuration that the other projects need.
+(This project needs to be able to be installed with `mvn install`
+and unfortunately I couldn't figure out how to do that without having
+some valid jbake configuration in this project.
+So, there's a dummy `jbake.properties` file but no real content.)
+
+The `distribution` project combines all the separate documentation
+project contents into a single file, to make it convenient for
+the `publish` project to reference published versions of the
+documentation for previous releases.
+
+The `publish` project contains the configuration to publish the
+entire web site.
+
+Each of the documentation projects generates a jar file with the
+content for that document, using jbake.
+The content is installed with `mvn install`.
+The content of all these jar files is combined into a single jar
+file by the `distribution` project.
+Only this combine jar file needs to be deployed to Maven.
+The `publish` project collects all of these distribution jar files
+for the current relase and previous releases  using the
+`maven-dependency-plugin`, lays them out in the proper directory
+structure, and uses the `maven-scm-publish-plugin` to publish
+the content to the `gh-pages` branch of the GitHub repository.
+
+For each of the documents, there's a current version published under
+the `docs/SNAPSHOT` directory, as well as stable released versions
+published under the `docs/<version>` directories.
+There's a `docs/latest` symlink that refers to the latest (final) release.
+
+When a GlassFish release is done, the documents need to be generated
+and deployed, so that final version numbered documents will be in the
+Maven repository forever in the distribution artifact, and can be
+collected by the `publish` project to create the web site.
+The `publish/pom.xml` file needs to be updated to add the newly released
+version.
+The `website/src/main/resources/docs/README.md` file needs to be updated
+to add the previous versions to a "previous versions" section.
+
+## To Do
+
+* Add a Jenkins job that waits for changes and publishes the web site.
+* Move this directory from `docs/glassfish` to `docs`.  (The extra
+directory layer seems gratuitous.)
+* Deploy/publish 5.1.0 versions of the docs.
diff --git a/docs/glassfish/add-on-component-development-guide/pom.xml b/docs/glassfish/add-on-component-development-guide/pom.xml
index 4efe82d..48c8c5f 100644
--- a/docs/glassfish/add-on-component-development-guide/pom.xml
+++ b/docs/glassfish/add-on-component-development-guide/pom.xml
@@ -18,106 +18,14 @@
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <groupId>org.glassfish</groupId>
+    <parent>
+        <groupId>org.glassfish.docs</groupId>
+        <artifactId>parent</artifactId>
+        <version>5.1.1-SNAPSHOT</version>
+        <relativePath>../parent</relativePath>
+    </parent>
+    <groupId>org.glassfish.docs</groupId>
     <artifactId>add-on-component-development-guide</artifactId>
-    <packaging>pom</packaging>
-    <version>1.0.0-SNAPSHOT</version>
+    <packaging>jar</packaging>
     <name>Eclipse GlassFish Server Add-On Component Development Guide, Release 5.1</name>
-
-    <properties>
-        <site.output.dir>${project.build.directory}/staging</site.output.dir>
-        <maven.site.skip>true</maven.site.skip>
-        <maven.deploy.skip>true</maven.deploy.skip>
-    </properties>
-
-    <distributionManagement>
-        <site>
-            <url>scm:git:git@github.com:javaee/add-on-component-development-guide.git</url>
-        </site>
-    </distributionManagement>
-
-    <build>
-        <defaultGoal>package</defaultGoal>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-enforcer-plugin</artifactId>
-                <version>1.4.1</version>
-                <executions>
-                    <execution>
-                        <id>enforce-versions</id>
-                        <goals>
-                            <goal>enforce</goal>
-                        </goals>
-                        <configuration>
-                            <rules>
-                                <requireJavaVersion>
-                                    <version>[1.8.0,1.9.0)</version>
-                                    <message>You need JDK8 or lower</message>
-                                </requireJavaVersion>
-                            </rules>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>com.blazebit</groupId>
-                <artifactId>jbake-maven-plugin</artifactId>
-                <version>1.0.0</version>
-                <configuration>
-                    <outputDirectory>${site.output.dir}</outputDirectory>
-                </configuration>
-                <executions>
-                    <execution>
-                        <id>build-site</id>
-                        <phase>generate-resources</phase>
-                        <goals>
-                            <goal>build</goal>
-                        </goals>
-                    </execution>
-                </executions>
-                <dependencies>
-                    <dependency>
-                        <groupId>org.asciidoctor</groupId>
-                        <artifactId>asciidoctorj</artifactId>
-                        <version>1.5.5</version>
-                    </dependency>
-                    <dependency>
-                        <groupId>org.asciidoctor</groupId>
-                        <artifactId>asciidoctorj-diagram</artifactId>
-                        <version>1.5.4</version>
-                    </dependency>
-                </dependencies>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-scm-publish-plugin</artifactId>
-                <version>1.1</version>
-                <executions>
-                    <execution>
-                        <id>deploy-site</id>
-                        <phase>deploy</phase>
-                        <goals>
-                            <goal>publish-scm</goal>
-                        </goals>
-                        <configuration>
-                            <scmBranch>gh-pages</scmBranch>
-                            <skipDeletedFiles>false</skipDeletedFiles>
-                            <checkinComment>Update site</checkinComment>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-	</plugins>
-
-	<pluginManagement>
-	    <plugins>
-		<plugin>
-		    <groupId>org.apache.maven.plugins</groupId>
-		    <artifactId>maven-assembly-plugin</artifactId>
-		    <version>2.4</version>
-		</plugin>
-	    </plugins>
-	</pluginManagement>
-    </build>
 </project>
diff --git a/docs/glassfish/add-on-component-development-guide/src/main/jbake/assets/CONTRIBUTING.md b/docs/glassfish/add-on-component-development-guide/src/main/jbake/assets/CONTRIBUTING.md
deleted file mode 100644
index a0ebaa0..0000000
--- a/docs/glassfish/add-on-component-development-guide/src/main/jbake/assets/CONTRIBUTING.md
+++ /dev/null
@@ -1,57 +0,0 @@
-# Contributing to Eclipse GlassFish
-
-Thanks for your interest in this project.
-
-## Project description
-
-Eclipse GlassFish is a complete application server that implements the Jakarta
-EE specification. GlassFish includes implementations of all required and
-optional Jakarta EE APIs, and passes all Jakarta EE TCKs. GlassFish also
-includes a complete administration console, clustering support, and other
-developer and production focused tools and features.
-
-* https://projects.eclipse.org/projects/ee4j.glassfish
-
-## Developer resources
-
-Information regarding source code management, builds, coding standards, and
-more.
-
-* https://projects.eclipse.org/projects/ee4j.glassfish/developer
-
-The project maintains the following source code repositories
-
-* https://github.com/eclipse-ee4j/glassfish-ha-api
-* https://github.com/eclipse-ee4j/glassfish-logging-annotation-processor
-* https://github.com/eclipse-ee4j/glassfish-shoal
-* https://github.com/eclipse-ee4j/glassfish-cdi-porting-tck
-* https://github.com/eclipse-ee4j/glassfish-jsftemplating
-* https://github.com/eclipse-ee4j/glassfish-hk2-extra
-* https://github.com/eclipse-ee4j/glassfish-hk2
-* https://github.com/eclipse-ee4j/glassfish-fighterfish
-* https://github.com/eclipse-ee4j/glassfish
-* https://github.com/eclipse-ee4j/glassfish-maven-embedded-plugin
-* https://github.com/eclipse-ee4j/bvtck-porting
-
-## Eclipse Contributor Agreement
-
-Before your contribution can be accepted by the project team contributors must
-electronically sign the Eclipse Contributor Agreement (ECA).
-
-* http://www.eclipse.org/legal/ECA.php
-
-Commits that are provided by non-committers must have a Signed-off-by field in
-the footer indicating that the author is aware of the terms by which the
-contribution has been provided to the project. The non-committer must
-additionally have an Eclipse Foundation account and must have a signed Eclipse
-Contributor Agreement (ECA) on file.
-
-For more information, please see the Eclipse Committer Handbook:
-https://www.eclipse.org/projects/handbook/#resources-commit
-
-## Contact
-
-Contact the project developers via the project's "dev" list.
-
-* https://accounts.eclipse.org/mailing-list/glassfish-dev
-
diff --git a/docs/glassfish/add-on-component-development-guide/src/main/jbake/assets/LICENSE.md b/docs/glassfish/add-on-component-development-guide/src/main/jbake/assets/LICENSE.md
deleted file mode 100644
index f046098..0000000
--- a/docs/glassfish/add-on-component-development-guide/src/main/jbake/assets/LICENSE.md
+++ /dev/null
@@ -1,277 +0,0 @@
-# Eclipse Public License - v 2.0
-
-        THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE
-        PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION
-        OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
-
-    1. DEFINITIONS
-
-    "Contribution" means:
-
-      a) in the case of the initial Contributor, the initial content
-         Distributed under this Agreement, and
-
-      b) in the case of each subsequent Contributor: 
-         i) changes to the Program, and 
-         ii) additions to the Program;
-      where such changes and/or additions to the Program originate from
-      and are Distributed by that particular Contributor. A Contribution
-      "originates" from a Contributor if it was added to the Program by
-      such Contributor itself or anyone acting on such Contributor's behalf.
-      Contributions do not include changes or additions to the Program that
-      are not Modified Works.
-
-    "Contributor" means any person or entity that Distributes the Program.
-
-    "Licensed Patents" mean patent claims licensable by a Contributor which
-    are necessarily infringed by the use or sale of its Contribution alone
-    or when combined with the Program.
-
-    "Program" means the Contributions Distributed in accordance with this
-    Agreement.
-
-    "Recipient" means anyone who receives the Program under this Agreement
-    or any Secondary License (as applicable), including Contributors.
-
-    "Derivative Works" shall mean any work, whether in Source Code or other
-    form, that is based on (or derived from) the Program and for which the
-    editorial revisions, annotations, elaborations, or other modifications
-    represent, as a whole, an original work of authorship.
-
-    "Modified Works" shall mean any work in Source Code or other form that
-    results from an addition to, deletion from, or modification of the
-    contents of the Program, including, for purposes of clarity any new file
-    in Source Code form that contains any contents of the Program. Modified
-    Works shall not include works that contain only declarations,
-    interfaces, types, classes, structures, or files of the Program solely
-    in each case in order to link to, bind by name, or subclass the Program
-    or Modified Works thereof.
-
-    "Distribute" means the acts of a) distributing or b) making available
-    in any manner that enables the transfer of a copy.
-
-    "Source Code" means the form of a Program preferred for making
-    modifications, including but not limited to software source code,
-    documentation source, and configuration files.
-
-    "Secondary License" means either the GNU General Public License,
-    Version 2.0, or any later versions of that license, including any
-    exceptions or additional permissions as identified by the initial
-    Contributor.
-
-    2. GRANT OF RIGHTS
-
-      a) Subject to the terms of this Agreement, each Contributor hereby
-      grants Recipient a non-exclusive, worldwide, royalty-free copyright
-      license to reproduce, prepare Derivative Works of, publicly display,
-      publicly perform, Distribute and sublicense the Contribution of such
-      Contributor, if any, and such Derivative Works.
-
-      b) Subject to the terms of this Agreement, each Contributor hereby
-      grants Recipient a non-exclusive, worldwide, royalty-free patent
-      license under Licensed Patents to make, use, sell, offer to sell,
-      import and otherwise transfer the Contribution of such Contributor,
-      if any, in Source Code or other form. This patent license shall
-      apply to the combination of the Contribution and the Program if, at
-      the time the Contribution is added by the Contributor, such addition
-      of the Contribution causes such combination to be covered by the
-      Licensed Patents. The patent license shall not apply to any other
-      combinations which include the Contribution. No hardware per se is
-      licensed hereunder.
-
-      c) Recipient understands that although each Contributor grants the
-      licenses to its Contributions set forth herein, no assurances are
-      provided by any Contributor that the Program does not infringe the
-      patent or other intellectual property rights of any other entity.
-      Each Contributor disclaims any liability to Recipient for claims
-      brought by any other entity based on infringement of intellectual
-      property rights or otherwise. As a condition to exercising the
-      rights and licenses granted hereunder, each Recipient hereby
-      assumes sole responsibility to secure any other intellectual
-      property rights needed, if any. For example, if a third party
-      patent license is required to allow Recipient to Distribute the
-      Program, it is Recipient's responsibility to acquire that license
-      before distributing the Program.
-
-      d) Each Contributor represents that to its knowledge it has
-      sufficient copyright rights in its Contribution, if any, to grant
-      the copyright license set forth in this Agreement.
-
-      e) Notwithstanding the terms of any Secondary License, no
-      Contributor makes additional grants to any Recipient (other than
-      those set forth in this Agreement) as a result of such Recipient's
-      receipt of the Program under the terms of a Secondary License
-      (if permitted under the terms of Section 3).
-
-    3. REQUIREMENTS
-
-    3.1 If a Contributor Distributes the Program in any form, then:
-
-      a) the Program must also be made available as Source Code, in
-      accordance with section 3.2, and the Contributor must accompany
-      the Program with a statement that the Source Code for the Program
-      is available under this Agreement, and informs Recipients how to
-      obtain it in a reasonable manner on or through a medium customarily
-      used for software exchange; and
-
-      b) the Contributor may Distribute the Program under a license
-      different than this Agreement, provided that such license:
-         i) effectively disclaims on behalf of all other Contributors all
-         warranties and conditions, express and implied, including
-         warranties or conditions of title and non-infringement, and
-         implied warranties or conditions of merchantability and fitness
-         for a particular purpose;
-
-         ii) effectively excludes on behalf of all other Contributors all
-         liability for damages, including direct, indirect, special,
-         incidental and consequential damages, such as lost profits;
-
-         iii) does not attempt to limit or alter the recipients' rights
-         in the Source Code under section 3.2; and
-
-         iv) requires any subsequent distribution of the Program by any
-         party to be under a license that satisfies the requirements
-         of this section 3.
-
-    3.2 When the Program is Distributed as Source Code:
-
-      a) it must be made available under this Agreement, or if the
-      Program (i) is combined with other material in a separate file or
-      files made available under a Secondary License, and (ii) the initial
-      Contributor attached to the Source Code the notice described in
-      Exhibit A of this Agreement, then the Program may be made available
-      under the terms of such Secondary Licenses, and
-
-      b) a copy of this Agreement must be included with each copy of
-      the Program.
-
-    3.3 Contributors may not remove or alter any copyright, patent,
-    trademark, attribution notices, disclaimers of warranty, or limitations
-    of liability ("notices") contained within the Program from any copy of
-    the Program which they Distribute, provided that Contributors may add
-    their own appropriate notices.
-
-    4. COMMERCIAL DISTRIBUTION
-
-    Commercial distributors of software may accept certain responsibilities
-    with respect to end users, business partners and the like. While this
-    license is intended to facilitate the commercial use of the Program,
-    the Contributor who includes the Program in a commercial product
-    offering should do so in a manner which does not create potential
-    liability for other Contributors. Therefore, if a Contributor includes
-    the Program in a commercial product offering, such Contributor
-    ("Commercial Contributor") hereby agrees to defend and indemnify every
-    other Contributor ("Indemnified Contributor") against any losses,
-    damages and costs (collectively "Losses") arising from claims, lawsuits
-    and other legal actions brought by a third party against the Indemnified
-    Contributor to the extent caused by the acts or omissions of such
-    Commercial Contributor in connection with its distribution of the Program
-    in a commercial product offering. The obligations in this section do not
-    apply to any claims or Losses relating to any actual or alleged
-    intellectual property infringement. In order to qualify, an Indemnified
-    Contributor must: a) promptly notify the Commercial Contributor in
-    writing of such claim, and b) allow the Commercial Contributor to control,
-    and cooperate with the Commercial Contributor in, the defense and any
-    related settlement negotiations. The Indemnified Contributor may
-    participate in any such claim at its own expense.
-
-    For example, a Contributor might include the Program in a commercial
-    product offering, Product X. That Contributor is then a Commercial
-    Contributor. If that Commercial Contributor then makes performance
-    claims, or offers warranties related to Product X, those performance
-    claims and warranties are such Commercial Contributor's responsibility
-    alone. Under this section, the Commercial Contributor would have to
-    defend claims against the other Contributors related to those performance
-    claims and warranties, and if a court requires any other Contributor to
-    pay any damages as a result, the Commercial Contributor must pay
-    those damages.
-
-    5. NO WARRANTY
-
-    EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT
-    PERMITTED BY APPLICABLE LAW, THE PROGRAM IS PROVIDED ON AN "AS IS"
-    BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR
-    IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF
-    TITLE, NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR
-    PURPOSE. Each Recipient is solely responsible for determining the
-    appropriateness of using and distributing the Program and assumes all
-    risks associated with its exercise of rights under this Agreement,
-    including but not limited to the risks and costs of program errors,
-    compliance with applicable laws, damage to or loss of data, programs
-    or equipment, and unavailability or interruption of operations.
-
-    6. DISCLAIMER OF LIABILITY
-
-    EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT
-    PERMITTED BY APPLICABLE LAW, NEITHER RECIPIENT NOR ANY CONTRIBUTORS
-    SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-    EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST
-    PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-    CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-    ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE
-    EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF THE
-    POSSIBILITY OF SUCH DAMAGES.
-
-    7. GENERAL
-
-    If any provision of this Agreement is invalid or unenforceable under
-    applicable law, it shall not affect the validity or enforceability of
-    the remainder of the terms of this Agreement, and without further
-    action by the parties hereto, such provision shall be reformed to the
-    minimum extent necessary to make such provision valid and enforceable.
-
-    If Recipient institutes patent litigation against any entity
-    (including a cross-claim or counterclaim in a lawsuit) alleging that the
-    Program itself (excluding combinations of the Program with other software
-    or hardware) infringes such Recipient's patent(s), then such Recipient's
-    rights granted under Section 2(b) shall terminate as of the date such
-    litigation is filed.
-
-    All Recipient's rights under this Agreement shall terminate if it
-    fails to comply with any of the material terms or conditions of this
-    Agreement and does not cure such failure in a reasonable period of
-    time after becoming aware of such noncompliance. If all Recipient's
-    rights under this Agreement terminate, Recipient agrees to cease use
-    and distribution of the Program as soon as reasonably practicable.
-    However, Recipient's obligations under this Agreement and any licenses
-    granted by Recipient relating to the Program shall continue and survive.
-
-    Everyone is permitted to copy and distribute copies of this Agreement,
-    but in order to avoid inconsistency the Agreement is copyrighted and
-    may only be modified in the following manner. The Agreement Steward
-    reserves the right to publish new versions (including revisions) of
-    this Agreement from time to time. No one other than the Agreement
-    Steward has the right to modify this Agreement. The Eclipse Foundation
-    is the initial Agreement Steward. The Eclipse Foundation may assign the
-    responsibility to serve as the Agreement Steward to a suitable separate
-    entity. Each new version of the Agreement will be given a distinguishing
-    version number. The Program (including Contributions) may always be
-    Distributed subject to the version of the Agreement under which it was
-    received. In addition, after a new version of the Agreement is published,
-    Contributor may elect to Distribute the Program (including its
-    Contributions) under the new version.
-
-    Except as expressly stated in Sections 2(a) and 2(b) above, Recipient
-    receives no rights or licenses to the intellectual property of any
-    Contributor under this Agreement, whether expressly, by implication,
-    estoppel or otherwise. All rights in the Program not expressly granted
-    under this Agreement are reserved. Nothing in this Agreement is intended
-    to be enforceable by any entity that is not a Contributor or Recipient.
-    No third-party beneficiary rights are created under this Agreement.
-
-    Exhibit A - Form of Secondary Licenses Notice
-
-    "This Source Code may also be made available under the following 
-    Secondary Licenses when the conditions for such availability set forth 
-    in the Eclipse Public License, v. 2.0 are satisfied: {name license(s),
-    version(s), and exceptions or additional permissions here}."
-
-      Simply including a copy of this Agreement, including this Exhibit A
-      is not sufficient to license the Source Code under Secondary Licenses.
-
-      If it is not possible or desirable to put the notice in a particular
-      file, then You may include the notice in a location (such as a LICENSE
-      file in a relevant directory) where a recipient would be likely to
-      look for such a notice.
-
-      You may add additional accurate notices of copyright ownership.
\ No newline at end of file
diff --git a/docs/glassfish/add-on-component-development-guide/src/main/jbake/assets/README.md b/docs/glassfish/add-on-component-development-guide/src/main/jbake/assets/README.md
deleted file mode 100644
index f8f962c..0000000
--- a/docs/glassfish/add-on-component-development-guide/src/main/jbake/assets/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-# About
-
-The {{site.title}} project contains the [AsciiDoc](http://asciidoc.org/)
-source code for the ...
diff --git a/docs/glassfish/add-on-component-development-guide/src/main/jbake/assets/_config.yml b/docs/glassfish/add-on-component-development-guide/src/main/jbake/assets/_config.yml
deleted file mode 100644
index a249887..0000000
--- a/docs/glassfish/add-on-component-development-guide/src/main/jbake/assets/_config.yml
+++ /dev/null
@@ -1,14 +0,0 @@
-theme: jekyll-theme-architect
-
-title: [add-on-component-development-guide]
-description: [Eclipse GlassFish Server Add-On Component Development Guide, Release 5.1]
-
-# sidebar links url
-links:
-  source: https://github.com/javaee/add-on-component-development-guide
-  download: https://github.com/javaee/add-on-component-development-guide/releases
-  #mailinglist: https://javaee.groups.io/g/add-on-component-development-guide
-  #javadocs:
-  docs: https://javaee.github.io/add-on-component-development-guide
-  #faq:
-
diff --git a/docs/glassfish/add-on-component-development-guide/src/main/jbake/assets/_layouts/default.html b/docs/glassfish/add-on-component-development-guide/src/main/jbake/assets/_layouts/default.html
deleted file mode 100644
index f896fad..0000000
--- a/docs/glassfish/add-on-component-development-guide/src/main/jbake/assets/_layouts/default.html
+++ /dev/null
@@ -1,100 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <meta charset='utf-8'>
-    <meta http-equiv="X-UA-Compatible" content="chrome=1">
-    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
-    <link rel="stylesheet" href="{{ '/assets/css/style.css?' | relative_url }}" media="screen" type="text/css">
-    <link rel="stylesheet" href="{{ '/assets/css/print.css' | relative_url }}" media="print" type="text/css">
-
-    <!--[if lt IE 9]>
-    <script src="//html5shiv.googlecode.com/svn/trunk/html5.js"></script>
-    <![endif]-->
-
-    <title>{{ site.title | default: site.github.repository_name }}</title>
-  </head>
-
-  <body>
-    <header>
-      <div class="inner">
-        <a href="{{ '/' | absolute_url }}">
-          <h1>{{ site.title | default: site.github.repository_name }}</h1>
-        </a>
-        <h2>{{ site.description | default: site.github.project_tagline }}</h2>
-        {% if site.github.is_project_page %}
-        <a href="{{ '/' | absolute_url }}" class="button"></a>
-        {% endif %}
-      </div>
-    </header>
-
-    <div id="content-wrapper">
-      <div class="inner clearfix">
-        <section id="main-content">
-          {{ content }}
-
-        </section>
-
-        <aside id="sidebar">
-          
-          <hr/>
-
-          <div class="moveright">
-            {% if site.links.source %}
-               <h2><a href="{{ site.links.source }}"><p>Sources</p></a></h2>
-            {% endif %}
-            
-            {% if site.links.javadocs %}
-              <h2><a href="{{ site.links.javadocs }}"><p>APIs</p></a></h2>
-            {% endif %}
-
-            {% if site.links.docs %}
-              <h2><a href="{{ site.links.docs }}"><p>Documentation</p></a></h2>
-            {% endif %}
-
-            {% if site.links.faq %}
-              <h2><a href="{{ site.links.faq }}"><p>FAQ</p></a></h2>
-            {% endif %}
-            
-            {% if site.links.download %}
-               <h2><a href="{{ site.links.download }}"><p>Download</p></a></h2>
-            {% endif %}
-
-            {% if site.links.hide_issuetracker != true %}
-            <h2><a href="{{ site.github.issues_url }}"><p>Issue Tracker</p></a></h2>
-            {% endif %}
-
-            {% if site.links.mailinglist %}
-               <h2><a href="{{ site.links.mailinglist }}"><p>Mailing List</p></a></h2>
-            {% endif %}          
-
-            <h2><a href="CONTRIBUTING"><p>Contribute</p></a></h2>
-
-            <h2><a href="LICENSE"><p>License</p></a></h2>
-          </div>
-          
-          <hr/>
-          
-          <div class="sponsor">
-            <p>Sponsored by<a href="http://www.oracle.com" class="oraclelogo"></a></p>
-          </div>
-          
-        </aside>
-      </div>
-    </div>
-
-    <div class="footer"><a id="copyright" class="oracle" href="https://www.oracle.com/legal/copyright.html">&copy; Oracle</a> | By contributing to this project, you are agreeing to the terms of use described <a href="CONTRIBUTING">here</a>.</div>
-
-    {% if site.google_analytics %}
-      <script type="text/javascript">
-        var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
-        document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));
-      </script>
-      <script type="text/javascript">
-        try {
-          var pageTracker = _gat._getTracker("{{ site.google_analytics }}");
-        pageTracker._trackPageview();
-        } catch(err) {}
-      </script>
-    {% endif %}
-  </body>
-</html>
diff --git a/docs/glassfish/add-on-component-development-guide/src/main/jbake/assets/assets/css/print.scss b/docs/glassfish/add-on-component-development-guide/src/main/jbake/assets/assets/css/print.scss
deleted file mode 100644
index 6115d8d..0000000
--- a/docs/glassfish/add-on-component-development-guide/src/main/jbake/assets/assets/css/print.scss
+++ /dev/null
@@ -1,8 +0,0 @@
----
----
-
-@import "{{ site.theme }}";
-h1 {
-  font-size: 1.8em;
-}
-
diff --git a/docs/glassfish/add-on-component-development-guide/src/main/jbake/assets/assets/css/style.scss b/docs/glassfish/add-on-component-development-guide/src/main/jbake/assets/assets/css/style.scss
deleted file mode 100644
index 3cf8c1a..0000000
--- a/docs/glassfish/add-on-component-development-guide/src/main/jbake/assets/assets/css/style.scss
+++ /dev/null
@@ -1,246 +0,0 @@
----
----
-
-@import "{{ site.theme }}";
-
-header {
-  padding-top: 16px;
-  padding-bottom: 40px;
-  font-family: 'Mukta Vaani', 'Open Sans', 'Helvetica Neue', Helvetica, Arial, serif;
-  background: url(../images/header-bkg.jpg) 0 0 repeat-x;
-  border-bottom: solid 1px #E0E0E0;  
-}
-
-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; // orange
-  //color: #2879d0; // blue
-  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;
-}
-
-a {
-  font-weight: 300;
-  color: #2879d0;
-}
-
-a:hover { 
-  text-decoration: underline;
-}
-
-#sidebar p {
-  font-size: 1em;
-  margin-bottom: 1em;
-}
-
-.highlight { 
-  background-color: #ffffff;
-}
-
-.sponsor {
-  float: left;
-  padding-top: 20px;
-  padding-left: 18px;
-}
-
-.moveright30{
-  padding-left: 30px;
-}
-
-.moveright{
-  padding-left: 40px;
-}
-
-.moveright50{
-  padding-left: 50px;
-}
-
-/*
-a.oraclelogo {
-  position: absolute;
-  background: transparent url(../images/Oracle-logo.png) 0 0 no-repeat;
-  background-position: 2px -2px; 
-  background-size: 100% ;
-  width: 96px;
-  height: 62px;
-  padding-top: 2px;
-  padding-right: 20px;
-}
-*/
-
-aside#sidebar {
-  padding-top: 40px;
-  line-height: 1.2;
-}
-
-hr {
-  border:none;
-  height: 10px;
-  width: 75%;
-  height: 50px;
-  margin-top: 0;
-  border-bottom: 1px solid #cccccc;
-  box-shadow: 0 20px 20px -20px #aaa;
-  margin: -48px auto 10px; 
-}
-
-table {
-   margin-bottom: 20px;
-}
-
-th, td {
-  padding: .2em;
-}
-
-td {
-  font-weight: 400;
-}
-
-ul {
-  font-size: 1em;
-  margin-left: 12px;
-}
-
-ol {
-    list-style-position: inside;
-    list-style: decimal;
-    margin-left: 26px;
-}
-
-blockquote {
-    padding: 0 0 0 10px;
-    margin-left: 14px;
-    margin-bottom: 2px;
-    font-size: 1em;
-    border-left: 4px solid #ddd;
-}
-
-#main-content h1 {
-  padding-top: .6em;
-  font-family: 'Mukta Vaani', 'Open Sans', 'Helvetica Neue', Helvetica, Arial, serif;
-  font-size: 1.6em;
-  font-weight: 500;
-  color : #666;
-  text-indent: 16px;
-  letter-spacing: 0px;
-  border-bottom:1px solid #cccccc;
-  padding-bottom:1px;
-  line-height: 1.2;
-  //margin: .6em 0;
-  margin-bottom: .6em;
-}
-
-#main-content h1:before {
-  //padding-right: 0.3em;
-  margin-left: -1em;
-  content: "";
-}
-
-#main-content h2 {
-  margin-bottom: 8px;
-  font-family: 'Mukta Vaani', 'Open Sans', 'Helvetica Neue', Helvetica, Arial, serif;
-  font-size: 1.4em;
-  font-weight: 400;
-  //color: #474747;
-  color: #3c657b; // blue
-  text-indent: 4px;
-}
-
-#main-content h2:before {
-  padding-right: 1.3em;
-  margin-left: -1.5em;
-  content: "";
-  font-weight: 700;
-}
-
-#main-content h3 {
-  text-indent: 24px;
-  margin-bottom: 8px;
-  font-family: 'Mukta Vaani', 'Open Sans', 'Helvetica Neue', Helvetica, Arial, serif;
-  font-size: 1.2em;
-  font-weight: 500;
-  color: #3c657b;
-  text-indent: 4px;
-}
-
-#main-content h3:before {
-  content: "";
-  margin-left: -0.3em;
-  padding-right: 0.1em;
-}
-
-#main-content h4 {
-  margin-bottom: 8px;
-  font-family: 'Mukta Vaani', 'Open Sans', 'Helvetica Neue', Helvetica, Arial, serif;
-  font-size: 1.2em;
-  font-weight: 500;
-  color: #3c657b;
-  text-indent: 4px;
-}
-
-#main-content h4:before {
-  content: "";
-  margin-left: -0.3em;
-  padding-right: 0.1em;
-}
-
-#main-content p {
-  font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, serif;
-  font-weight: normal;
-  font-size: 1em;
-  margin-bottom: 2px;
-}
-
-.footer {
-  position: fixed; 
-  bottom: 0;
-  left: 0;
-  right: 0;
-  height: 6px;
-  background-color: #f0f0f0;
-  //padding: 1rem;
-  padding-top: 4px;
-  padding-bottom: 14px;
-  font-size: 0.8em;
-  text-align: center;
-}
-
-.oracle {
-  color: #666;
-  font-weight: 400;
-}
-
-.oracle:hover { 
-  text-decoration: none;
-  color: #FF0000;
-}
-
-.fullpage {
-  //float: center;
-  color: FF0000;
-  width: 900px;
-}
\ No newline at end of file
diff --git a/docs/glassfish/add-on-component-development-guide/src/main/jbake/assets/assets/images/header-bkg.jpg b/docs/glassfish/add-on-component-development-guide/src/main/jbake/assets/assets/images/header-bkg.jpg
deleted file mode 100644
index 481faa5..0000000
--- a/docs/glassfish/add-on-component-development-guide/src/main/jbake/assets/assets/images/header-bkg.jpg
+++ /dev/null
Binary files differ
diff --git a/docs/glassfish/add-on-component-development-guide/src/main/jbake/content/title.adoc b/docs/glassfish/add-on-component-development-guide/src/main/jbake/content/title.adoc
index ebee5e2..18c789b 100644
--- a/docs/glassfish/add-on-component-development-guide/src/main/jbake/content/title.adoc
+++ b/docs/glassfish/add-on-component-development-guide/src/main/jbake/content/title.adoc
@@ -8,7 +8,7 @@
 ========================================================================
 
 
-[[glassfish-server-open-source-edition]]
+[[eclipse-glassfish-server]]
 Eclipse GlassFish Server
 ------------------------
 
diff --git a/docs/glassfish/add-on-component-development-guide/src/main/jbake/templates/footer.ftl b/docs/glassfish/add-on-component-development-guide/src/main/jbake/templates/footer.ftl
index e7df506..131fe6c 100644
--- a/docs/glassfish/add-on-component-development-guide/src/main/jbake/templates/footer.ftl
+++ b/docs/glassfish/add-on-component-development-guide/src/main/jbake/templates/footer.ftl
@@ -36,7 +36,7 @@
 </table>
 
 <span id="copyright">
-        <img src="img/eclipse_foundation_logo_tiny.png" height="20px" alt="Eclipse Foundation Logo" align="top"/>&nbsp;            
+        <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>
 
diff --git a/docs/glassfish/administration-guide/pom.xml b/docs/glassfish/administration-guide/pom.xml
index 7b8f981..b7c097a 100644
--- a/docs/glassfish/administration-guide/pom.xml
+++ b/docs/glassfish/administration-guide/pom.xml
@@ -18,106 +18,14 @@
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <groupId>org.glassfish</groupId>
+    <parent>
+        <groupId>org.glassfish.docs</groupId>
+        <artifactId>parent</artifactId>
+        <version>5.1.1-SNAPSHOT</version>
+        <relativePath>../parent</relativePath>
+    </parent>
+    <groupId>org.glassfish.docs</groupId>
     <artifactId>administration-guide</artifactId>
-    <packaging>pom</packaging>
-    <version>1.0.0-SNAPSHOT</version>
+    <packaging>jar</packaging>
     <name>Eclipse GlassFish Server Administration Guide, Release 5.1</name>
-
-    <properties>
-        <site.output.dir>${project.build.directory}/staging</site.output.dir>
-        <maven.site.skip>true</maven.site.skip>
-        <maven.deploy.skip>true</maven.deploy.skip>
-    </properties>
-
-    <distributionManagement>
-        <site>
-            <url>scm:git:git@github.com:javaee/administration-guide.git</url>
-        </site>
-    </distributionManagement>
-
-    <build>
-        <defaultGoal>package</defaultGoal>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-enforcer-plugin</artifactId>
-                <version>1.4.1</version>
-                <executions>
-                    <execution>
-                        <id>enforce-versions</id>
-                        <goals>
-                            <goal>enforce</goal>
-                        </goals>
-                        <configuration>
-                            <rules>
-                                <requireJavaVersion>
-                                    <version>[1.8.0,1.9.0)</version>
-                                    <message>You need JDK8 or lower</message>
-                                </requireJavaVersion>
-                            </rules>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>com.blazebit</groupId>
-                <artifactId>jbake-maven-plugin</artifactId>
-                <version>1.0.0</version>
-                <configuration>
-                    <outputDirectory>${site.output.dir}</outputDirectory>
-                </configuration>
-                <executions>
-                    <execution>
-                        <id>build-site</id>
-                        <phase>generate-resources</phase>
-                        <goals>
-                            <goal>build</goal>
-                        </goals>
-                    </execution>
-                </executions>
-                <dependencies>
-                    <dependency>
-                        <groupId>org.asciidoctor</groupId>
-                        <artifactId>asciidoctorj</artifactId>
-                        <version>1.5.5</version>
-                    </dependency>
-                    <dependency>
-                        <groupId>org.asciidoctor</groupId>
-                        <artifactId>asciidoctorj-diagram</artifactId>
-                        <version>1.5.4</version>
-                    </dependency>
-                </dependencies>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-scm-publish-plugin</artifactId>
-                <version>1.1</version>
-                <executions>
-                    <execution>
-                        <id>deploy-site</id>
-                        <phase>deploy</phase>
-                        <goals>
-                            <goal>publish-scm</goal>
-                        </goals>
-                        <configuration>
-                            <scmBranch>gh-pages</scmBranch>
-                            <skipDeletedFiles>false</skipDeletedFiles>
-                            <checkinComment>Update site</checkinComment>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-	</plugins>
-
-	<pluginManagement>
-	    <plugins>
-		<plugin>
-		    <groupId>org.apache.maven.plugins</groupId>
-		    <artifactId>maven-assembly-plugin</artifactId>
-		    <version>2.4</version>
-		</plugin>
-	    </plugins>
-	</pluginManagement>
-    </build>
 </project>
diff --git a/docs/glassfish/administration-guide/src/main/jbake/assets/CONTRIBUTING.md b/docs/glassfish/administration-guide/src/main/jbake/assets/CONTRIBUTING.md
deleted file mode 100644
index a0ebaa0..0000000
--- a/docs/glassfish/administration-guide/src/main/jbake/assets/CONTRIBUTING.md
+++ /dev/null
@@ -1,57 +0,0 @@
-# Contributing to Eclipse GlassFish
-
-Thanks for your interest in this project.
-
-## Project description
-
-Eclipse GlassFish is a complete application server that implements the Jakarta
-EE specification. GlassFish includes implementations of all required and
-optional Jakarta EE APIs, and passes all Jakarta EE TCKs. GlassFish also
-includes a complete administration console, clustering support, and other
-developer and production focused tools and features.
-
-* https://projects.eclipse.org/projects/ee4j.glassfish
-
-## Developer resources
-
-Information regarding source code management, builds, coding standards, and
-more.
-
-* https://projects.eclipse.org/projects/ee4j.glassfish/developer
-
-The project maintains the following source code repositories
-
-* https://github.com/eclipse-ee4j/glassfish-ha-api
-* https://github.com/eclipse-ee4j/glassfish-logging-annotation-processor
-* https://github.com/eclipse-ee4j/glassfish-shoal
-* https://github.com/eclipse-ee4j/glassfish-cdi-porting-tck
-* https://github.com/eclipse-ee4j/glassfish-jsftemplating
-* https://github.com/eclipse-ee4j/glassfish-hk2-extra
-* https://github.com/eclipse-ee4j/glassfish-hk2
-* https://github.com/eclipse-ee4j/glassfish-fighterfish
-* https://github.com/eclipse-ee4j/glassfish
-* https://github.com/eclipse-ee4j/glassfish-maven-embedded-plugin
-* https://github.com/eclipse-ee4j/bvtck-porting
-
-## Eclipse Contributor Agreement
-
-Before your contribution can be accepted by the project team contributors must
-electronically sign the Eclipse Contributor Agreement (ECA).
-
-* http://www.eclipse.org/legal/ECA.php
-
-Commits that are provided by non-committers must have a Signed-off-by field in
-the footer indicating that the author is aware of the terms by which the
-contribution has been provided to the project. The non-committer must
-additionally have an Eclipse Foundation account and must have a signed Eclipse
-Contributor Agreement (ECA) on file.
-
-For more information, please see the Eclipse Committer Handbook:
-https://www.eclipse.org/projects/handbook/#resources-commit
-
-## Contact
-
-Contact the project developers via the project's "dev" list.
-
-* https://accounts.eclipse.org/mailing-list/glassfish-dev
-
diff --git a/docs/glassfish/administration-guide/src/main/jbake/assets/LICENSE.md b/docs/glassfish/administration-guide/src/main/jbake/assets/LICENSE.md
deleted file mode 100644
index f046098..0000000
--- a/docs/glassfish/administration-guide/src/main/jbake/assets/LICENSE.md
+++ /dev/null
@@ -1,277 +0,0 @@
-# Eclipse Public License - v 2.0
-
-        THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE
-        PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION
-        OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
-
-    1. DEFINITIONS
-
-    "Contribution" means:
-
-      a) in the case of the initial Contributor, the initial content
-         Distributed under this Agreement, and
-
-      b) in the case of each subsequent Contributor: 
-         i) changes to the Program, and 
-         ii) additions to the Program;
-      where such changes and/or additions to the Program originate from
-      and are Distributed by that particular Contributor. A Contribution
-      "originates" from a Contributor if it was added to the Program by
-      such Contributor itself or anyone acting on such Contributor's behalf.
-      Contributions do not include changes or additions to the Program that
-      are not Modified Works.
-
-    "Contributor" means any person or entity that Distributes the Program.
-
-    "Licensed Patents" mean patent claims licensable by a Contributor which
-    are necessarily infringed by the use or sale of its Contribution alone
-    or when combined with the Program.
-
-    "Program" means the Contributions Distributed in accordance with this
-    Agreement.
-
-    "Recipient" means anyone who receives the Program under this Agreement
-    or any Secondary License (as applicable), including Contributors.
-
-    "Derivative Works" shall mean any work, whether in Source Code or other
-    form, that is based on (or derived from) the Program and for which the
-    editorial revisions, annotations, elaborations, or other modifications
-    represent, as a whole, an original work of authorship.
-
-    "Modified Works" shall mean any work in Source Code or other form that
-    results from an addition to, deletion from, or modification of the
-    contents of the Program, including, for purposes of clarity any new file
-    in Source Code form that contains any contents of the Program. Modified
-    Works shall not include works that contain only declarations,
-    interfaces, types, classes, structures, or files of the Program solely
-    in each case in order to link to, bind by name, or subclass the Program
-    or Modified Works thereof.
-
-    "Distribute" means the acts of a) distributing or b) making available
-    in any manner that enables the transfer of a copy.
-
-    "Source Code" means the form of a Program preferred for making
-    modifications, including but not limited to software source code,
-    documentation source, and configuration files.
-
-    "Secondary License" means either the GNU General Public License,
-    Version 2.0, or any later versions of that license, including any
-    exceptions or additional permissions as identified by the initial
-    Contributor.
-
-    2. GRANT OF RIGHTS
-
-      a) Subject to the terms of this Agreement, each Contributor hereby
-      grants Recipient a non-exclusive, worldwide, royalty-free copyright
-      license to reproduce, prepare Derivative Works of, publicly display,
-      publicly perform, Distribute and sublicense the Contribution of such
-      Contributor, if any, and such Derivative Works.
-
-      b) Subject to the terms of this Agreement, each Contributor hereby
-      grants Recipient a non-exclusive, worldwide, royalty-free patent
-      license under Licensed Patents to make, use, sell, offer to sell,
-      import and otherwise transfer the Contribution of such Contributor,
-      if any, in Source Code or other form. This patent license shall
-      apply to the combination of the Contribution and the Program if, at
-      the time the Contribution is added by the Contributor, such addition
-      of the Contribution causes such combination to be covered by the
-      Licensed Patents. The patent license shall not apply to any other
-      combinations which include the Contribution. No hardware per se is
-      licensed hereunder.
-
-      c) Recipient understands that although each Contributor grants the
-      licenses to its Contributions set forth herein, no assurances are
-      provided by any Contributor that the Program does not infringe the
-      patent or other intellectual property rights of any other entity.
-      Each Contributor disclaims any liability to Recipient for claims
-      brought by any other entity based on infringement of intellectual
-      property rights or otherwise. As a condition to exercising the
-      rights and licenses granted hereunder, each Recipient hereby
-      assumes sole responsibility to secure any other intellectual
-      property rights needed, if any. For example, if a third party
-      patent license is required to allow Recipient to Distribute the
-      Program, it is Recipient's responsibility to acquire that license
-      before distributing the Program.
-
-      d) Each Contributor represents that to its knowledge it has
-      sufficient copyright rights in its Contribution, if any, to grant
-      the copyright license set forth in this Agreement.
-
-      e) Notwithstanding the terms of any Secondary License, no
-      Contributor makes additional grants to any Recipient (other than
-      those set forth in this Agreement) as a result of such Recipient's
-      receipt of the Program under the terms of a Secondary License
-      (if permitted under the terms of Section 3).
-
-    3. REQUIREMENTS
-
-    3.1 If a Contributor Distributes the Program in any form, then:
-
-      a) the Program must also be made available as Source Code, in
-      accordance with section 3.2, and the Contributor must accompany
-      the Program with a statement that the Source Code for the Program
-      is available under this Agreement, and informs Recipients how to
-      obtain it in a reasonable manner on or through a medium customarily
-      used for software exchange; and
-
-      b) the Contributor may Distribute the Program under a license
-      different than this Agreement, provided that such license:
-         i) effectively disclaims on behalf of all other Contributors all
-         warranties and conditions, express and implied, including
-         warranties or conditions of title and non-infringement, and
-         implied warranties or conditions of merchantability and fitness
-         for a particular purpose;
-
-         ii) effectively excludes on behalf of all other Contributors all
-         liability for damages, including direct, indirect, special,
-         incidental and consequential damages, such as lost profits;
-
-         iii) does not attempt to limit or alter the recipients' rights
-         in the Source Code under section 3.2; and
-
-         iv) requires any subsequent distribution of the Program by any
-         party to be under a license that satisfies the requirements
-         of this section 3.
-
-    3.2 When the Program is Distributed as Source Code:
-
-      a) it must be made available under this Agreement, or if the
-      Program (i) is combined with other material in a separate file or
-      files made available under a Secondary License, and (ii) the initial
-      Contributor attached to the Source Code the notice described in
-      Exhibit A of this Agreement, then the Program may be made available
-      under the terms of such Secondary Licenses, and
-
-      b) a copy of this Agreement must be included with each copy of
-      the Program.
-
-    3.3 Contributors may not remove or alter any copyright, patent,
-    trademark, attribution notices, disclaimers of warranty, or limitations
-    of liability ("notices") contained within the Program from any copy of
-    the Program which they Distribute, provided that Contributors may add
-    their own appropriate notices.
-
-    4. COMMERCIAL DISTRIBUTION
-
-    Commercial distributors of software may accept certain responsibilities
-    with respect to end users, business partners and the like. While this
-    license is intended to facilitate the commercial use of the Program,
-    the Contributor who includes the Program in a commercial product
-    offering should do so in a manner which does not create potential
-    liability for other Contributors. Therefore, if a Contributor includes
-    the Program in a commercial product offering, such Contributor
-    ("Commercial Contributor") hereby agrees to defend and indemnify every
-    other Contributor ("Indemnified Contributor") against any losses,
-    damages and costs (collectively "Losses") arising from claims, lawsuits
-    and other legal actions brought by a third party against the Indemnified
-    Contributor to the extent caused by the acts or omissions of such
-    Commercial Contributor in connection with its distribution of the Program
-    in a commercial product offering. The obligations in this section do not
-    apply to any claims or Losses relating to any actual or alleged
-    intellectual property infringement. In order to qualify, an Indemnified
-    Contributor must: a) promptly notify the Commercial Contributor in
-    writing of such claim, and b) allow the Commercial Contributor to control,
-    and cooperate with the Commercial Contributor in, the defense and any
-    related settlement negotiations. The Indemnified Contributor may
-    participate in any such claim at its own expense.
-
-    For example, a Contributor might include the Program in a commercial
-    product offering, Product X. That Contributor is then a Commercial
-    Contributor. If that Commercial Contributor then makes performance
-    claims, or offers warranties related to Product X, those performance
-    claims and warranties are such Commercial Contributor's responsibility
-    alone. Under this section, the Commercial Contributor would have to
-    defend claims against the other Contributors related to those performance
-    claims and warranties, and if a court requires any other Contributor to
-    pay any damages as a result, the Commercial Contributor must pay
-    those damages.
-
-    5. NO WARRANTY
-
-    EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT
-    PERMITTED BY APPLICABLE LAW, THE PROGRAM IS PROVIDED ON AN "AS IS"
-    BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR
-    IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF
-    TITLE, NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR
-    PURPOSE. Each Recipient is solely responsible for determining the
-    appropriateness of using and distributing the Program and assumes all
-    risks associated with its exercise of rights under this Agreement,
-    including but not limited to the risks and costs of program errors,
-    compliance with applicable laws, damage to or loss of data, programs
-    or equipment, and unavailability or interruption of operations.
-
-    6. DISCLAIMER OF LIABILITY
-
-    EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT
-    PERMITTED BY APPLICABLE LAW, NEITHER RECIPIENT NOR ANY CONTRIBUTORS
-    SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-    EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST
-    PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-    CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-    ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE
-    EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF THE
-    POSSIBILITY OF SUCH DAMAGES.
-
-    7. GENERAL
-
-    If any provision of this Agreement is invalid or unenforceable under
-    applicable law, it shall not affect the validity or enforceability of
-    the remainder of the terms of this Agreement, and without further
-    action by the parties hereto, such provision shall be reformed to the
-    minimum extent necessary to make such provision valid and enforceable.
-
-    If Recipient institutes patent litigation against any entity
-    (including a cross-claim or counterclaim in a lawsuit) alleging that the
-    Program itself (excluding combinations of the Program with other software
-    or hardware) infringes such Recipient's patent(s), then such Recipient's
-    rights granted under Section 2(b) shall terminate as of the date such
-    litigation is filed.
-
-    All Recipient's rights under this Agreement shall terminate if it
-    fails to comply with any of the material terms or conditions of this
-    Agreement and does not cure such failure in a reasonable period of
-    time after becoming aware of such noncompliance. If all Recipient's
-    rights under this Agreement terminate, Recipient agrees to cease use
-    and distribution of the Program as soon as reasonably practicable.
-    However, Recipient's obligations under this Agreement and any licenses
-    granted by Recipient relating to the Program shall continue and survive.
-
-    Everyone is permitted to copy and distribute copies of this Agreement,
-    but in order to avoid inconsistency the Agreement is copyrighted and
-    may only be modified in the following manner. The Agreement Steward
-    reserves the right to publish new versions (including revisions) of
-    this Agreement from time to time. No one other than the Agreement
-    Steward has the right to modify this Agreement. The Eclipse Foundation
-    is the initial Agreement Steward. The Eclipse Foundation may assign the
-    responsibility to serve as the Agreement Steward to a suitable separate
-    entity. Each new version of the Agreement will be given a distinguishing
-    version number. The Program (including Contributions) may always be
-    Distributed subject to the version of the Agreement under which it was
-    received. In addition, after a new version of the Agreement is published,
-    Contributor may elect to Distribute the Program (including its
-    Contributions) under the new version.
-
-    Except as expressly stated in Sections 2(a) and 2(b) above, Recipient
-    receives no rights or licenses to the intellectual property of any
-    Contributor under this Agreement, whether expressly, by implication,
-    estoppel or otherwise. All rights in the Program not expressly granted
-    under this Agreement are reserved. Nothing in this Agreement is intended
-    to be enforceable by any entity that is not a Contributor or Recipient.
-    No third-party beneficiary rights are created under this Agreement.
-
-    Exhibit A - Form of Secondary Licenses Notice
-
-    "This Source Code may also be made available under the following 
-    Secondary Licenses when the conditions for such availability set forth 
-    in the Eclipse Public License, v. 2.0 are satisfied: {name license(s),
-    version(s), and exceptions or additional permissions here}."
-
-      Simply including a copy of this Agreement, including this Exhibit A
-      is not sufficient to license the Source Code under Secondary Licenses.
-
-      If it is not possible or desirable to put the notice in a particular
-      file, then You may include the notice in a location (such as a LICENSE
-      file in a relevant directory) where a recipient would be likely to
-      look for such a notice.
-
-      You may add additional accurate notices of copyright ownership.
\ No newline at end of file
diff --git a/docs/glassfish/administration-guide/src/main/jbake/assets/README.md b/docs/glassfish/administration-guide/src/main/jbake/assets/README.md
deleted file mode 100644
index f8f962c..0000000
--- a/docs/glassfish/administration-guide/src/main/jbake/assets/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-# About
-
-The {{site.title}} project contains the [AsciiDoc](http://asciidoc.org/)
-source code for the ...
diff --git a/docs/glassfish/administration-guide/src/main/jbake/assets/_config.yml b/docs/glassfish/administration-guide/src/main/jbake/assets/_config.yml
deleted file mode 100644
index 5d35969..0000000
--- a/docs/glassfish/administration-guide/src/main/jbake/assets/_config.yml
+++ /dev/null
@@ -1,14 +0,0 @@
-theme: jekyll-theme-architect
-
-title: [administration-guide]
-description: [Eclipse GlassFish Server Administration Guide, Release 5.1]
-
-# sidebar links url
-links:
-  source: https://github.com/javaee/administration-guide
-  download: https://github.com/javaee/administration-guide/releases
-  #mailinglist: https://javaee.groups.io/g/administration-guide
-  #javadocs:
-  docs: https://javaee.github.io/administration-guide
-  #faq:
-
diff --git a/docs/glassfish/administration-guide/src/main/jbake/assets/_layouts/default.html b/docs/glassfish/administration-guide/src/main/jbake/assets/_layouts/default.html
deleted file mode 100644
index f896fad..0000000
--- a/docs/glassfish/administration-guide/src/main/jbake/assets/_layouts/default.html
+++ /dev/null
@@ -1,100 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <meta charset='utf-8'>
-    <meta http-equiv="X-UA-Compatible" content="chrome=1">
-    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
-    <link rel="stylesheet" href="{{ '/assets/css/style.css?' | relative_url }}" media="screen" type="text/css">
-    <link rel="stylesheet" href="{{ '/assets/css/print.css' | relative_url }}" media="print" type="text/css">
-
-    <!--[if lt IE 9]>
-    <script src="//html5shiv.googlecode.com/svn/trunk/html5.js"></script>
-    <![endif]-->
-
-    <title>{{ site.title | default: site.github.repository_name }}</title>
-  </head>
-
-  <body>
-    <header>
-      <div class="inner">
-        <a href="{{ '/' | absolute_url }}">
-          <h1>{{ site.title | default: site.github.repository_name }}</h1>
-        </a>
-        <h2>{{ site.description | default: site.github.project_tagline }}</h2>
-        {% if site.github.is_project_page %}
-        <a href="{{ '/' | absolute_url }}" class="button"></a>
-        {% endif %}
-      </div>
-    </header>
-
-    <div id="content-wrapper">
-      <div class="inner clearfix">
-        <section id="main-content">
-          {{ content }}
-
-        </section>
-
-        <aside id="sidebar">
-          
-          <hr/>
-
-          <div class="moveright">
-            {% if site.links.source %}
-               <h2><a href="{{ site.links.source }}"><p>Sources</p></a></h2>
-            {% endif %}
-            
-            {% if site.links.javadocs %}
-              <h2><a href="{{ site.links.javadocs }}"><p>APIs</p></a></h2>
-            {% endif %}
-
-            {% if site.links.docs %}
-              <h2><a href="{{ site.links.docs }}"><p>Documentation</p></a></h2>
-            {% endif %}
-
-            {% if site.links.faq %}
-              <h2><a href="{{ site.links.faq }}"><p>FAQ</p></a></h2>
-            {% endif %}
-            
-            {% if site.links.download %}
-               <h2><a href="{{ site.links.download }}"><p>Download</p></a></h2>
-            {% endif %}
-
-            {% if site.links.hide_issuetracker != true %}
-            <h2><a href="{{ site.github.issues_url }}"><p>Issue Tracker</p></a></h2>
-            {% endif %}
-
-            {% if site.links.mailinglist %}
-               <h2><a href="{{ site.links.mailinglist }}"><p>Mailing List</p></a></h2>
-            {% endif %}          
-
-            <h2><a href="CONTRIBUTING"><p>Contribute</p></a></h2>
-
-            <h2><a href="LICENSE"><p>License</p></a></h2>
-          </div>
-          
-          <hr/>
-          
-          <div class="sponsor">
-            <p>Sponsored by<a href="http://www.oracle.com" class="oraclelogo"></a></p>
-          </div>
-          
-        </aside>
-      </div>
-    </div>
-
-    <div class="footer"><a id="copyright" class="oracle" href="https://www.oracle.com/legal/copyright.html">&copy; Oracle</a> | By contributing to this project, you are agreeing to the terms of use described <a href="CONTRIBUTING">here</a>.</div>
-
-    {% if site.google_analytics %}
-      <script type="text/javascript">
-        var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
-        document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));
-      </script>
-      <script type="text/javascript">
-        try {
-          var pageTracker = _gat._getTracker("{{ site.google_analytics }}");
-        pageTracker._trackPageview();
-        } catch(err) {}
-      </script>
-    {% endif %}
-  </body>
-</html>
diff --git a/docs/glassfish/administration-guide/src/main/jbake/assets/assets/css/print.scss b/docs/glassfish/administration-guide/src/main/jbake/assets/assets/css/print.scss
deleted file mode 100644
index 6115d8d..0000000
--- a/docs/glassfish/administration-guide/src/main/jbake/assets/assets/css/print.scss
+++ /dev/null
@@ -1,8 +0,0 @@
----
----
-
-@import "{{ site.theme }}";
-h1 {
-  font-size: 1.8em;
-}
-
diff --git a/docs/glassfish/administration-guide/src/main/jbake/assets/assets/css/style.scss b/docs/glassfish/administration-guide/src/main/jbake/assets/assets/css/style.scss
deleted file mode 100644
index 3cf8c1a..0000000
--- a/docs/glassfish/administration-guide/src/main/jbake/assets/assets/css/style.scss
+++ /dev/null
@@ -1,246 +0,0 @@
----
----
-
-@import "{{ site.theme }}";
-
-header {
-  padding-top: 16px;
-  padding-bottom: 40px;
-  font-family: 'Mukta Vaani', 'Open Sans', 'Helvetica Neue', Helvetica, Arial, serif;
-  background: url(../images/header-bkg.jpg) 0 0 repeat-x;
-  border-bottom: solid 1px #E0E0E0;  
-}
-
-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; // orange
-  //color: #2879d0; // blue
-  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;
-}
-
-a {
-  font-weight: 300;
-  color: #2879d0;
-}
-
-a:hover { 
-  text-decoration: underline;
-}
-
-#sidebar p {
-  font-size: 1em;
-  margin-bottom: 1em;
-}
-
-.highlight { 
-  background-color: #ffffff;
-}
-
-.sponsor {
-  float: left;
-  padding-top: 20px;
-  padding-left: 18px;
-}
-
-.moveright30{
-  padding-left: 30px;
-}
-
-.moveright{
-  padding-left: 40px;
-}
-
-.moveright50{
-  padding-left: 50px;
-}
-
-/*
-a.oraclelogo {
-  position: absolute;
-  background: transparent url(../images/Oracle-logo.png) 0 0 no-repeat;
-  background-position: 2px -2px; 
-  background-size: 100% ;
-  width: 96px;
-  height: 62px;
-  padding-top: 2px;
-  padding-right: 20px;
-}
-*/
-
-aside#sidebar {
-  padding-top: 40px;
-  line-height: 1.2;
-}
-
-hr {
-  border:none;
-  height: 10px;
-  width: 75%;
-  height: 50px;
-  margin-top: 0;
-  border-bottom: 1px solid #cccccc;
-  box-shadow: 0 20px 20px -20px #aaa;
-  margin: -48px auto 10px; 
-}
-
-table {
-   margin-bottom: 20px;
-}
-
-th, td {
-  padding: .2em;
-}
-
-td {
-  font-weight: 400;
-}
-
-ul {
-  font-size: 1em;
-  margin-left: 12px;
-}
-
-ol {
-    list-style-position: inside;
-    list-style: decimal;
-    margin-left: 26px;
-}
-
-blockquote {
-    padding: 0 0 0 10px;
-    margin-left: 14px;
-    margin-bottom: 2px;
-    font-size: 1em;
-    border-left: 4px solid #ddd;
-}
-
-#main-content h1 {
-  padding-top: .6em;
-  font-family: 'Mukta Vaani', 'Open Sans', 'Helvetica Neue', Helvetica, Arial, serif;
-  font-size: 1.6em;
-  font-weight: 500;
-  color : #666;
-  text-indent: 16px;
-  letter-spacing: 0px;
-  border-bottom:1px solid #cccccc;
-  padding-bottom:1px;
-  line-height: 1.2;
-  //margin: .6em 0;
-  margin-bottom: .6em;
-}
-
-#main-content h1:before {
-  //padding-right: 0.3em;
-  margin-left: -1em;
-  content: "";
-}
-
-#main-content h2 {
-  margin-bottom: 8px;
-  font-family: 'Mukta Vaani', 'Open Sans', 'Helvetica Neue', Helvetica, Arial, serif;
-  font-size: 1.4em;
-  font-weight: 400;
-  //color: #474747;
-  color: #3c657b; // blue
-  text-indent: 4px;
-}
-
-#main-content h2:before {
-  padding-right: 1.3em;
-  margin-left: -1.5em;
-  content: "";
-  font-weight: 700;
-}
-
-#main-content h3 {
-  text-indent: 24px;
-  margin-bottom: 8px;
-  font-family: 'Mukta Vaani', 'Open Sans', 'Helvetica Neue', Helvetica, Arial, serif;
-  font-size: 1.2em;
-  font-weight: 500;
-  color: #3c657b;
-  text-indent: 4px;
-}
-
-#main-content h3:before {
-  content: "";
-  margin-left: -0.3em;
-  padding-right: 0.1em;
-}
-
-#main-content h4 {
-  margin-bottom: 8px;
-  font-family: 'Mukta Vaani', 'Open Sans', 'Helvetica Neue', Helvetica, Arial, serif;
-  font-size: 1.2em;
-  font-weight: 500;
-  color: #3c657b;
-  text-indent: 4px;
-}
-
-#main-content h4:before {
-  content: "";
-  margin-left: -0.3em;
-  padding-right: 0.1em;
-}
-
-#main-content p {
-  font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, serif;
-  font-weight: normal;
-  font-size: 1em;
-  margin-bottom: 2px;
-}
-
-.footer {
-  position: fixed; 
-  bottom: 0;
-  left: 0;
-  right: 0;
-  height: 6px;
-  background-color: #f0f0f0;
-  //padding: 1rem;
-  padding-top: 4px;
-  padding-bottom: 14px;
-  font-size: 0.8em;
-  text-align: center;
-}
-
-.oracle {
-  color: #666;
-  font-weight: 400;
-}
-
-.oracle:hover { 
-  text-decoration: none;
-  color: #FF0000;
-}
-
-.fullpage {
-  //float: center;
-  color: FF0000;
-  width: 900px;
-}
\ No newline at end of file
diff --git a/docs/glassfish/administration-guide/src/main/jbake/assets/assets/images/header-bkg.jpg b/docs/glassfish/administration-guide/src/main/jbake/assets/assets/images/header-bkg.jpg
deleted file mode 100644
index 481faa5..0000000
--- a/docs/glassfish/administration-guide/src/main/jbake/assets/assets/images/header-bkg.jpg
+++ /dev/null
Binary files differ
diff --git a/docs/glassfish/administration-guide/src/main/jbake/content/title.adoc b/docs/glassfish/administration-guide/src/main/jbake/content/title.adoc
index cb1a923..b828c0a 100644
--- a/docs/glassfish/administration-guide/src/main/jbake/content/title.adoc
+++ b/docs/glassfish/administration-guide/src/main/jbake/content/title.adoc
@@ -7,9 +7,9 @@
 = Eclipse GlassFish Server Administration Guide, Release 5.1
 
 
-[[glassfish-server-open-source-edition]]
+[[eclipse-glassfish-server]]
 Eclipse GlassFish Server
-------------------------------------
+------------------------
 
 Administration Guide
 
diff --git a/docs/glassfish/administration-guide/src/main/jbake/templates/footer.ftl b/docs/glassfish/administration-guide/src/main/jbake/templates/footer.ftl
index e7df506..131fe6c 100644
--- a/docs/glassfish/administration-guide/src/main/jbake/templates/footer.ftl
+++ b/docs/glassfish/administration-guide/src/main/jbake/templates/footer.ftl
@@ -36,7 +36,7 @@
 </table>
 
 <span id="copyright">
-        <img src="img/eclipse_foundation_logo_tiny.png" height="20px" alt="Eclipse Foundation Logo" align="top"/>&nbsp;            
+        <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>
 
diff --git a/docs/glassfish/application-deployment-guide/pom.xml b/docs/glassfish/application-deployment-guide/pom.xml
index 15e3343..5d203bd 100644
--- a/docs/glassfish/application-deployment-guide/pom.xml
+++ b/docs/glassfish/application-deployment-guide/pom.xml
@@ -18,106 +18,14 @@
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <groupId>org.glassfish</groupId>
+    <parent>
+        <groupId>org.glassfish.docs</groupId>
+        <artifactId>parent</artifactId>
+        <version>5.1.1-SNAPSHOT</version>
+        <relativePath>../parent</relativePath>
+    </parent>
+    <groupId>org.glassfish.docs</groupId>
     <artifactId>application-deployment-guide</artifactId>
-    <packaging>pom</packaging>
-    <version>1.0.0-SNAPSHOT</version>
+    <packaging>jar</packaging>
     <name>Eclipse GlassFish Server Application Deployment Guide, Release 5.1</name>
-
-    <properties>
-        <site.output.dir>${project.build.directory}/staging</site.output.dir>
-        <maven.site.skip>true</maven.site.skip>
-        <maven.deploy.skip>true</maven.deploy.skip>
-    </properties>
-
-    <distributionManagement>
-        <site>
-            <url>scm:git:git@github.com:javaee/application-deployment-guide.git</url>
-        </site>
-    </distributionManagement>
-
-    <build>
-        <defaultGoal>package</defaultGoal>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-enforcer-plugin</artifactId>
-                <version>1.4.1</version>
-                <executions>
-                    <execution>
-                        <id>enforce-versions</id>
-                        <goals>
-                            <goal>enforce</goal>
-                        </goals>
-                        <configuration>
-                            <rules>
-                                <requireJavaVersion>
-                                    <version>[1.8.0,1.9.0)</version>
-                                    <message>You need JDK8 or lower</message>
-                                </requireJavaVersion>
-                            </rules>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>com.blazebit</groupId>
-                <artifactId>jbake-maven-plugin</artifactId>
-                <version>1.0.0</version>
-                <configuration>
-                    <outputDirectory>${site.output.dir}</outputDirectory>
-                </configuration>
-                <executions>
-                    <execution>
-                        <id>build-site</id>
-                        <phase>generate-resources</phase>
-                        <goals>
-                            <goal>build</goal>
-                        </goals>
-                    </execution>
-                </executions>
-                <dependencies>
-                    <dependency>
-                        <groupId>org.asciidoctor</groupId>
-                        <artifactId>asciidoctorj</artifactId>
-                        <version>1.5.5</version>
-                    </dependency>
-                    <dependency>
-                        <groupId>org.asciidoctor</groupId>
-                        <artifactId>asciidoctorj-diagram</artifactId>
-                        <version>1.5.4</version>
-                    </dependency>
-                </dependencies>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-scm-publish-plugin</artifactId>
-                <version>1.1</version>
-                <executions>
-                    <execution>
-                        <id>deploy-site</id>
-                        <phase>deploy</phase>
-                        <goals>
-                            <goal>publish-scm</goal>
-                        </goals>
-                        <configuration>
-                            <scmBranch>gh-pages</scmBranch>
-                            <skipDeletedFiles>false</skipDeletedFiles>
-                            <checkinComment>Update site</checkinComment>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-	</plugins>
-
-	<pluginManagement>
-	    <plugins>
-		<plugin>
-		    <groupId>org.apache.maven.plugins</groupId>
-		    <artifactId>maven-assembly-plugin</artifactId>
-		    <version>2.4</version>
-		</plugin>
-	    </plugins>
-	</pluginManagement>
-    </build>
 </project>
diff --git a/docs/glassfish/application-deployment-guide/src/main/jbake/assets/CONTRIBUTING.md b/docs/glassfish/application-deployment-guide/src/main/jbake/assets/CONTRIBUTING.md
deleted file mode 100644
index a0ebaa0..0000000
--- a/docs/glassfish/application-deployment-guide/src/main/jbake/assets/CONTRIBUTING.md
+++ /dev/null
@@ -1,57 +0,0 @@
-# Contributing to Eclipse GlassFish
-
-Thanks for your interest in this project.
-
-## Project description
-
-Eclipse GlassFish is a complete application server that implements the Jakarta
-EE specification. GlassFish includes implementations of all required and
-optional Jakarta EE APIs, and passes all Jakarta EE TCKs. GlassFish also
-includes a complete administration console, clustering support, and other
-developer and production focused tools and features.
-
-* https://projects.eclipse.org/projects/ee4j.glassfish
-
-## Developer resources
-
-Information regarding source code management, builds, coding standards, and
-more.
-
-* https://projects.eclipse.org/projects/ee4j.glassfish/developer
-
-The project maintains the following source code repositories
-
-* https://github.com/eclipse-ee4j/glassfish-ha-api
-* https://github.com/eclipse-ee4j/glassfish-logging-annotation-processor
-* https://github.com/eclipse-ee4j/glassfish-shoal
-* https://github.com/eclipse-ee4j/glassfish-cdi-porting-tck
-* https://github.com/eclipse-ee4j/glassfish-jsftemplating
-* https://github.com/eclipse-ee4j/glassfish-hk2-extra
-* https://github.com/eclipse-ee4j/glassfish-hk2
-* https://github.com/eclipse-ee4j/glassfish-fighterfish
-* https://github.com/eclipse-ee4j/glassfish
-* https://github.com/eclipse-ee4j/glassfish-maven-embedded-plugin
-* https://github.com/eclipse-ee4j/bvtck-porting
-
-## Eclipse Contributor Agreement
-
-Before your contribution can be accepted by the project team contributors must
-electronically sign the Eclipse Contributor Agreement (ECA).
-
-* http://www.eclipse.org/legal/ECA.php
-
-Commits that are provided by non-committers must have a Signed-off-by field in
-the footer indicating that the author is aware of the terms by which the
-contribution has been provided to the project. The non-committer must
-additionally have an Eclipse Foundation account and must have a signed Eclipse
-Contributor Agreement (ECA) on file.
-
-For more information, please see the Eclipse Committer Handbook:
-https://www.eclipse.org/projects/handbook/#resources-commit
-
-## Contact
-
-Contact the project developers via the project's "dev" list.
-
-* https://accounts.eclipse.org/mailing-list/glassfish-dev
-
diff --git a/docs/glassfish/application-deployment-guide/src/main/jbake/assets/LICENSE.md b/docs/glassfish/application-deployment-guide/src/main/jbake/assets/LICENSE.md
deleted file mode 100644
index f046098..0000000
--- a/docs/glassfish/application-deployment-guide/src/main/jbake/assets/LICENSE.md
+++ /dev/null
@@ -1,277 +0,0 @@
-# Eclipse Public License - v 2.0
-
-        THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE
-        PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION
-        OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
-
-    1. DEFINITIONS
-
-    "Contribution" means:
-
-      a) in the case of the initial Contributor, the initial content
-         Distributed under this Agreement, and
-
-      b) in the case of each subsequent Contributor: 
-         i) changes to the Program, and 
-         ii) additions to the Program;
-      where such changes and/or additions to the Program originate from
-      and are Distributed by that particular Contributor. A Contribution
-      "originates" from a Contributor if it was added to the Program by
-      such Contributor itself or anyone acting on such Contributor's behalf.
-      Contributions do not include changes or additions to the Program that
-      are not Modified Works.
-
-    "Contributor" means any person or entity that Distributes the Program.
-
-    "Licensed Patents" mean patent claims licensable by a Contributor which
-    are necessarily infringed by the use or sale of its Contribution alone
-    or when combined with the Program.
-
-    "Program" means the Contributions Distributed in accordance with this
-    Agreement.
-
-    "Recipient" means anyone who receives the Program under this Agreement
-    or any Secondary License (as applicable), including Contributors.
-
-    "Derivative Works" shall mean any work, whether in Source Code or other
-    form, that is based on (or derived from) the Program and for which the
-    editorial revisions, annotations, elaborations, or other modifications
-    represent, as a whole, an original work of authorship.
-
-    "Modified Works" shall mean any work in Source Code or other form that
-    results from an addition to, deletion from, or modification of the
-    contents of the Program, including, for purposes of clarity any new file
-    in Source Code form that contains any contents of the Program. Modified
-    Works shall not include works that contain only declarations,
-    interfaces, types, classes, structures, or files of the Program solely
-    in each case in order to link to, bind by name, or subclass the Program
-    or Modified Works thereof.
-
-    "Distribute" means the acts of a) distributing or b) making available
-    in any manner that enables the transfer of a copy.
-
-    "Source Code" means the form of a Program preferred for making
-    modifications, including but not limited to software source code,
-    documentation source, and configuration files.
-
-    "Secondary License" means either the GNU General Public License,
-    Version 2.0, or any later versions of that license, including any
-    exceptions or additional permissions as identified by the initial
-    Contributor.
-
-    2. GRANT OF RIGHTS
-
-      a) Subject to the terms of this Agreement, each Contributor hereby
-      grants Recipient a non-exclusive, worldwide, royalty-free copyright
-      license to reproduce, prepare Derivative Works of, publicly display,
-      publicly perform, Distribute and sublicense the Contribution of such
-      Contributor, if any, and such Derivative Works.
-
-      b) Subject to the terms of this Agreement, each Contributor hereby
-      grants Recipient a non-exclusive, worldwide, royalty-free patent
-      license under Licensed Patents to make, use, sell, offer to sell,
-      import and otherwise transfer the Contribution of such Contributor,
-      if any, in Source Code or other form. This patent license shall
-      apply to the combination of the Contribution and the Program if, at
-      the time the Contribution is added by the Contributor, such addition
-      of the Contribution causes such combination to be covered by the
-      Licensed Patents. The patent license shall not apply to any other
-      combinations which include the Contribution. No hardware per se is
-      licensed hereunder.
-
-      c) Recipient understands that although each Contributor grants the
-      licenses to its Contributions set forth herein, no assurances are
-      provided by any Contributor that the Program does not infringe the
-      patent or other intellectual property rights of any other entity.
-      Each Contributor disclaims any liability to Recipient for claims
-      brought by any other entity based on infringement of intellectual
-      property rights or otherwise. As a condition to exercising the
-      rights and licenses granted hereunder, each Recipient hereby
-      assumes sole responsibility to secure any other intellectual
-      property rights needed, if any. For example, if a third party
-      patent license is required to allow Recipient to Distribute the
-      Program, it is Recipient's responsibility to acquire that license
-      before distributing the Program.
-
-      d) Each Contributor represents that to its knowledge it has
-      sufficient copyright rights in its Contribution, if any, to grant
-      the copyright license set forth in this Agreement.
-
-      e) Notwithstanding the terms of any Secondary License, no
-      Contributor makes additional grants to any Recipient (other than
-      those set forth in this Agreement) as a result of such Recipient's
-      receipt of the Program under the terms of a Secondary License
-      (if permitted under the terms of Section 3).
-
-    3. REQUIREMENTS
-
-    3.1 If a Contributor Distributes the Program in any form, then:
-
-      a) the Program must also be made available as Source Code, in
-      accordance with section 3.2, and the Contributor must accompany
-      the Program with a statement that the Source Code for the Program
-      is available under this Agreement, and informs Recipients how to
-      obtain it in a reasonable manner on or through a medium customarily
-      used for software exchange; and
-
-      b) the Contributor may Distribute the Program under a license
-      different than this Agreement, provided that such license:
-         i) effectively disclaims on behalf of all other Contributors all
-         warranties and conditions, express and implied, including
-         warranties or conditions of title and non-infringement, and
-         implied warranties or conditions of merchantability and fitness
-         for a particular purpose;
-
-         ii) effectively excludes on behalf of all other Contributors all
-         liability for damages, including direct, indirect, special,
-         incidental and consequential damages, such as lost profits;
-
-         iii) does not attempt to limit or alter the recipients' rights
-         in the Source Code under section 3.2; and
-
-         iv) requires any subsequent distribution of the Program by any
-         party to be under a license that satisfies the requirements
-         of this section 3.
-
-    3.2 When the Program is Distributed as Source Code:
-
-      a) it must be made available under this Agreement, or if the
-      Program (i) is combined with other material in a separate file or
-      files made available under a Secondary License, and (ii) the initial
-      Contributor attached to the Source Code the notice described in
-      Exhibit A of this Agreement, then the Program may be made available
-      under the terms of such Secondary Licenses, and
-
-      b) a copy of this Agreement must be included with each copy of
-      the Program.
-
-    3.3 Contributors may not remove or alter any copyright, patent,
-    trademark, attribution notices, disclaimers of warranty, or limitations
-    of liability ("notices") contained within the Program from any copy of
-    the Program which they Distribute, provided that Contributors may add
-    their own appropriate notices.
-
-    4. COMMERCIAL DISTRIBUTION
-
-    Commercial distributors of software may accept certain responsibilities
-    with respect to end users, business partners and the like. While this
-    license is intended to facilitate the commercial use of the Program,
-    the Contributor who includes the Program in a commercial product
-    offering should do so in a manner which does not create potential
-    liability for other Contributors. Therefore, if a Contributor includes
-    the Program in a commercial product offering, such Contributor
-    ("Commercial Contributor") hereby agrees to defend and indemnify every
-    other Contributor ("Indemnified Contributor") against any losses,
-    damages and costs (collectively "Losses") arising from claims, lawsuits
-    and other legal actions brought by a third party against the Indemnified
-    Contributor to the extent caused by the acts or omissions of such
-    Commercial Contributor in connection with its distribution of the Program
-    in a commercial product offering. The obligations in this section do not
-    apply to any claims or Losses relating to any actual or alleged
-    intellectual property infringement. In order to qualify, an Indemnified
-    Contributor must: a) promptly notify the Commercial Contributor in
-    writing of such claim, and b) allow the Commercial Contributor to control,
-    and cooperate with the Commercial Contributor in, the defense and any
-    related settlement negotiations. The Indemnified Contributor may
-    participate in any such claim at its own expense.
-
-    For example, a Contributor might include the Program in a commercial
-    product offering, Product X. That Contributor is then a Commercial
-    Contributor. If that Commercial Contributor then makes performance
-    claims, or offers warranties related to Product X, those performance
-    claims and warranties are such Commercial Contributor's responsibility
-    alone. Under this section, the Commercial Contributor would have to
-    defend claims against the other Contributors related to those performance
-    claims and warranties, and if a court requires any other Contributor to
-    pay any damages as a result, the Commercial Contributor must pay
-    those damages.
-
-    5. NO WARRANTY
-
-    EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT
-    PERMITTED BY APPLICABLE LAW, THE PROGRAM IS PROVIDED ON AN "AS IS"
-    BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR
-    IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF
-    TITLE, NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR
-    PURPOSE. Each Recipient is solely responsible for determining the
-    appropriateness of using and distributing the Program and assumes all
-    risks associated with its exercise of rights under this Agreement,
-    including but not limited to the risks and costs of program errors,
-    compliance with applicable laws, damage to or loss of data, programs
-    or equipment, and unavailability or interruption of operations.
-
-    6. DISCLAIMER OF LIABILITY
-
-    EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT
-    PERMITTED BY APPLICABLE LAW, NEITHER RECIPIENT NOR ANY CONTRIBUTORS
-    SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-    EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST
-    PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-    CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-    ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE
-    EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF THE
-    POSSIBILITY OF SUCH DAMAGES.
-
-    7. GENERAL
-
-    If any provision of this Agreement is invalid or unenforceable under
-    applicable law, it shall not affect the validity or enforceability of
-    the remainder of the terms of this Agreement, and without further
-    action by the parties hereto, such provision shall be reformed to the
-    minimum extent necessary to make such provision valid and enforceable.
-
-    If Recipient institutes patent litigation against any entity
-    (including a cross-claim or counterclaim in a lawsuit) alleging that the
-    Program itself (excluding combinations of the Program with other software
-    or hardware) infringes such Recipient's patent(s), then such Recipient's
-    rights granted under Section 2(b) shall terminate as of the date such
-    litigation is filed.
-
-    All Recipient's rights under this Agreement shall terminate if it
-    fails to comply with any of the material terms or conditions of this
-    Agreement and does not cure such failure in a reasonable period of
-    time after becoming aware of such noncompliance. If all Recipient's
-    rights under this Agreement terminate, Recipient agrees to cease use
-    and distribution of the Program as soon as reasonably practicable.
-    However, Recipient's obligations under this Agreement and any licenses
-    granted by Recipient relating to the Program shall continue and survive.
-
-    Everyone is permitted to copy and distribute copies of this Agreement,
-    but in order to avoid inconsistency the Agreement is copyrighted and
-    may only be modified in the following manner. The Agreement Steward
-    reserves the right to publish new versions (including revisions) of
-    this Agreement from time to time. No one other than the Agreement
-    Steward has the right to modify this Agreement. The Eclipse Foundation
-    is the initial Agreement Steward. The Eclipse Foundation may assign the
-    responsibility to serve as the Agreement Steward to a suitable separate
-    entity. Each new version of the Agreement will be given a distinguishing
-    version number. The Program (including Contributions) may always be
-    Distributed subject to the version of the Agreement under which it was
-    received. In addition, after a new version of the Agreement is published,
-    Contributor may elect to Distribute the Program (including its
-    Contributions) under the new version.
-
-    Except as expressly stated in Sections 2(a) and 2(b) above, Recipient
-    receives no rights or licenses to the intellectual property of any
-    Contributor under this Agreement, whether expressly, by implication,
-    estoppel or otherwise. All rights in the Program not expressly granted
-    under this Agreement are reserved. Nothing in this Agreement is intended
-    to be enforceable by any entity that is not a Contributor or Recipient.
-    No third-party beneficiary rights are created under this Agreement.
-
-    Exhibit A - Form of Secondary Licenses Notice
-
-    "This Source Code may also be made available under the following 
-    Secondary Licenses when the conditions for such availability set forth 
-    in the Eclipse Public License, v. 2.0 are satisfied: {name license(s),
-    version(s), and exceptions or additional permissions here}."
-
-      Simply including a copy of this Agreement, including this Exhibit A
-      is not sufficient to license the Source Code under Secondary Licenses.
-
-      If it is not possible or desirable to put the notice in a particular
-      file, then You may include the notice in a location (such as a LICENSE
-      file in a relevant directory) where a recipient would be likely to
-      look for such a notice.
-
-      You may add additional accurate notices of copyright ownership.
\ No newline at end of file
diff --git a/docs/glassfish/application-deployment-guide/src/main/jbake/assets/README.md b/docs/glassfish/application-deployment-guide/src/main/jbake/assets/README.md
deleted file mode 100644
index f8f962c..0000000
--- a/docs/glassfish/application-deployment-guide/src/main/jbake/assets/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-# About
-
-The {{site.title}} project contains the [AsciiDoc](http://asciidoc.org/)
-source code for the ...
diff --git a/docs/glassfish/application-deployment-guide/src/main/jbake/assets/_config.yml b/docs/glassfish/application-deployment-guide/src/main/jbake/assets/_config.yml
deleted file mode 100644
index 9362e6c..0000000
--- a/docs/glassfish/application-deployment-guide/src/main/jbake/assets/_config.yml
+++ /dev/null
@@ -1,14 +0,0 @@
-theme: jekyll-theme-architect
-
-title: [application-deployment-guide]
-description: [Eclipse GlassFish Server Application Deployment Guide, Release 5.1]
-
-# sidebar links url
-links:
-  source: https://github.com/javaee/application-deployment-guide
-  download: https://github.com/javaee/application-deployment-guide/releases
-  #mailinglist: https://javaee.groups.io/g/application-deployment-guide
-  #javadocs:
-  docs: https://javaee.github.io/application-deployment-guide
-  #faq:
-
diff --git a/docs/glassfish/application-deployment-guide/src/main/jbake/assets/_layouts/default.html b/docs/glassfish/application-deployment-guide/src/main/jbake/assets/_layouts/default.html
deleted file mode 100644
index f896fad..0000000
--- a/docs/glassfish/application-deployment-guide/src/main/jbake/assets/_layouts/default.html
+++ /dev/null
@@ -1,100 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <meta charset='utf-8'>
-    <meta http-equiv="X-UA-Compatible" content="chrome=1">
-    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
-    <link rel="stylesheet" href="{{ '/assets/css/style.css?' | relative_url }}" media="screen" type="text/css">
-    <link rel="stylesheet" href="{{ '/assets/css/print.css' | relative_url }}" media="print" type="text/css">
-
-    <!--[if lt IE 9]>
-    <script src="//html5shiv.googlecode.com/svn/trunk/html5.js"></script>
-    <![endif]-->
-
-    <title>{{ site.title | default: site.github.repository_name }}</title>
-  </head>
-
-  <body>
-    <header>
-      <div class="inner">
-        <a href="{{ '/' | absolute_url }}">
-          <h1>{{ site.title | default: site.github.repository_name }}</h1>
-        </a>
-        <h2>{{ site.description | default: site.github.project_tagline }}</h2>
-        {% if site.github.is_project_page %}
-        <a href="{{ '/' | absolute_url }}" class="button"></a>
-        {% endif %}
-      </div>
-    </header>
-
-    <div id="content-wrapper">
-      <div class="inner clearfix">
-        <section id="main-content">
-          {{ content }}
-
-        </section>
-
-        <aside id="sidebar">
-          
-          <hr/>
-
-          <div class="moveright">
-            {% if site.links.source %}
-               <h2><a href="{{ site.links.source }}"><p>Sources</p></a></h2>
-            {% endif %}
-            
-            {% if site.links.javadocs %}
-              <h2><a href="{{ site.links.javadocs }}"><p>APIs</p></a></h2>
-            {% endif %}
-
-            {% if site.links.docs %}
-              <h2><a href="{{ site.links.docs }}"><p>Documentation</p></a></h2>
-            {% endif %}
-
-            {% if site.links.faq %}
-              <h2><a href="{{ site.links.faq }}"><p>FAQ</p></a></h2>
-            {% endif %}
-            
-            {% if site.links.download %}
-               <h2><a href="{{ site.links.download }}"><p>Download</p></a></h2>
-            {% endif %}
-
-            {% if site.links.hide_issuetracker != true %}
-            <h2><a href="{{ site.github.issues_url }}"><p>Issue Tracker</p></a></h2>
-            {% endif %}
-
-            {% if site.links.mailinglist %}
-               <h2><a href="{{ site.links.mailinglist }}"><p>Mailing List</p></a></h2>
-            {% endif %}          
-
-            <h2><a href="CONTRIBUTING"><p>Contribute</p></a></h2>
-
-            <h2><a href="LICENSE"><p>License</p></a></h2>
-          </div>
-          
-          <hr/>
-          
-          <div class="sponsor">
-            <p>Sponsored by<a href="http://www.oracle.com" class="oraclelogo"></a></p>
-          </div>
-          
-        </aside>
-      </div>
-    </div>
-
-    <div class="footer"><a id="copyright" class="oracle" href="https://www.oracle.com/legal/copyright.html">&copy; Oracle</a> | By contributing to this project, you are agreeing to the terms of use described <a href="CONTRIBUTING">here</a>.</div>
-
-    {% if site.google_analytics %}
-      <script type="text/javascript">
-        var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
-        document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));
-      </script>
-      <script type="text/javascript">
-        try {
-          var pageTracker = _gat._getTracker("{{ site.google_analytics }}");
-        pageTracker._trackPageview();
-        } catch(err) {}
-      </script>
-    {% endif %}
-  </body>
-</html>
diff --git a/docs/glassfish/application-deployment-guide/src/main/jbake/assets/assets/css/print.scss b/docs/glassfish/application-deployment-guide/src/main/jbake/assets/assets/css/print.scss
deleted file mode 100644
index 6115d8d..0000000
--- a/docs/glassfish/application-deployment-guide/src/main/jbake/assets/assets/css/print.scss
+++ /dev/null
@@ -1,8 +0,0 @@
----
----
-
-@import "{{ site.theme }}";
-h1 {
-  font-size: 1.8em;
-}
-
diff --git a/docs/glassfish/application-deployment-guide/src/main/jbake/assets/assets/css/style.scss b/docs/glassfish/application-deployment-guide/src/main/jbake/assets/assets/css/style.scss
deleted file mode 100644
index 3cf8c1a..0000000
--- a/docs/glassfish/application-deployment-guide/src/main/jbake/assets/assets/css/style.scss
+++ /dev/null
@@ -1,246 +0,0 @@
----
----
-
-@import "{{ site.theme }}";
-
-header {
-  padding-top: 16px;
-  padding-bottom: 40px;
-  font-family: 'Mukta Vaani', 'Open Sans', 'Helvetica Neue', Helvetica, Arial, serif;
-  background: url(../images/header-bkg.jpg) 0 0 repeat-x;
-  border-bottom: solid 1px #E0E0E0;  
-}
-
-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; // orange
-  //color: #2879d0; // blue
-  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;
-}
-
-a {
-  font-weight: 300;
-  color: #2879d0;
-}
-
-a:hover { 
-  text-decoration: underline;
-}
-
-#sidebar p {
-  font-size: 1em;
-  margin-bottom: 1em;
-}
-
-.highlight { 
-  background-color: #ffffff;
-}
-
-.sponsor {
-  float: left;
-  padding-top: 20px;
-  padding-left: 18px;
-}
-
-.moveright30{
-  padding-left: 30px;
-}
-
-.moveright{
-  padding-left: 40px;
-}
-
-.moveright50{
-  padding-left: 50px;
-}
-
-/*
-a.oraclelogo {
-  position: absolute;
-  background: transparent url(../images/Oracle-logo.png) 0 0 no-repeat;
-  background-position: 2px -2px; 
-  background-size: 100% ;
-  width: 96px;
-  height: 62px;
-  padding-top: 2px;
-  padding-right: 20px;
-}
-*/
-
-aside#sidebar {
-  padding-top: 40px;
-  line-height: 1.2;
-}
-
-hr {
-  border:none;
-  height: 10px;
-  width: 75%;
-  height: 50px;
-  margin-top: 0;
-  border-bottom: 1px solid #cccccc;
-  box-shadow: 0 20px 20px -20px #aaa;
-  margin: -48px auto 10px; 
-}
-
-table {
-   margin-bottom: 20px;
-}
-
-th, td {
-  padding: .2em;
-}
-
-td {
-  font-weight: 400;
-}
-
-ul {
-  font-size: 1em;
-  margin-left: 12px;
-}
-
-ol {
-    list-style-position: inside;
-    list-style: decimal;
-    margin-left: 26px;
-}
-
-blockquote {
-    padding: 0 0 0 10px;
-    margin-left: 14px;
-    margin-bottom: 2px;
-    font-size: 1em;
-    border-left: 4px solid #ddd;
-}
-
-#main-content h1 {
-  padding-top: .6em;
-  font-family: 'Mukta Vaani', 'Open Sans', 'Helvetica Neue', Helvetica, Arial, serif;
-  font-size: 1.6em;
-  font-weight: 500;
-  color : #666;
-  text-indent: 16px;
-  letter-spacing: 0px;
-  border-bottom:1px solid #cccccc;
-  padding-bottom:1px;
-  line-height: 1.2;
-  //margin: .6em 0;
-  margin-bottom: .6em;
-}
-
-#main-content h1:before {
-  //padding-right: 0.3em;
-  margin-left: -1em;
-  content: "";
-}
-
-#main-content h2 {
-  margin-bottom: 8px;
-  font-family: 'Mukta Vaani', 'Open Sans', 'Helvetica Neue', Helvetica, Arial, serif;
-  font-size: 1.4em;
-  font-weight: 400;
-  //color: #474747;
-  color: #3c657b; // blue
-  text-indent: 4px;
-}
-
-#main-content h2:before {
-  padding-right: 1.3em;
-  margin-left: -1.5em;
-  content: "";
-  font-weight: 700;
-}
-
-#main-content h3 {
-  text-indent: 24px;
-  margin-bottom: 8px;
-  font-family: 'Mukta Vaani', 'Open Sans', 'Helvetica Neue', Helvetica, Arial, serif;
-  font-size: 1.2em;
-  font-weight: 500;
-  color: #3c657b;
-  text-indent: 4px;
-}
-
-#main-content h3:before {
-  content: "";
-  margin-left: -0.3em;
-  padding-right: 0.1em;
-}
-
-#main-content h4 {
-  margin-bottom: 8px;
-  font-family: 'Mukta Vaani', 'Open Sans', 'Helvetica Neue', Helvetica, Arial, serif;
-  font-size: 1.2em;
-  font-weight: 500;
-  color: #3c657b;
-  text-indent: 4px;
-}
-
-#main-content h4:before {
-  content: "";
-  margin-left: -0.3em;
-  padding-right: 0.1em;
-}
-
-#main-content p {
-  font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, serif;
-  font-weight: normal;
-  font-size: 1em;
-  margin-bottom: 2px;
-}
-
-.footer {
-  position: fixed; 
-  bottom: 0;
-  left: 0;
-  right: 0;
-  height: 6px;
-  background-color: #f0f0f0;
-  //padding: 1rem;
-  padding-top: 4px;
-  padding-bottom: 14px;
-  font-size: 0.8em;
-  text-align: center;
-}
-
-.oracle {
-  color: #666;
-  font-weight: 400;
-}
-
-.oracle:hover { 
-  text-decoration: none;
-  color: #FF0000;
-}
-
-.fullpage {
-  //float: center;
-  color: FF0000;
-  width: 900px;
-}
\ No newline at end of file
diff --git a/docs/glassfish/application-deployment-guide/src/main/jbake/assets/assets/images/header-bkg.jpg b/docs/glassfish/application-deployment-guide/src/main/jbake/assets/assets/images/header-bkg.jpg
deleted file mode 100644
index 481faa5..0000000
--- a/docs/glassfish/application-deployment-guide/src/main/jbake/assets/assets/images/header-bkg.jpg
+++ /dev/null
Binary files differ
diff --git a/docs/glassfish/application-deployment-guide/src/main/jbake/content/title.adoc b/docs/glassfish/application-deployment-guide/src/main/jbake/content/title.adoc
index 2b2930a..4aaf46e 100644
--- a/docs/glassfish/application-deployment-guide/src/main/jbake/content/title.adoc
+++ b/docs/glassfish/application-deployment-guide/src/main/jbake/content/title.adoc
@@ -7,7 +7,7 @@
 Eclipse GlassFish Server Application Deployment Guide, Release 5.1
 ==================================================================
 
-[[glassfish-server-open-source-edition]]
+[[eclipse-glassfish-server]]
 Eclipse GlassFish Server
 ------------------------
 
@@ -44,4 +44,4 @@
 trademarks or registered trademarks of SPARC International, Inc. AMD, 
 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. 
\ No newline at end of file
+trademark of The Open Group. 
diff --git a/docs/glassfish/application-deployment-guide/src/main/jbake/templates/footer.ftl b/docs/glassfish/application-deployment-guide/src/main/jbake/templates/footer.ftl
index e7df506..131fe6c 100644
--- a/docs/glassfish/application-deployment-guide/src/main/jbake/templates/footer.ftl
+++ b/docs/glassfish/application-deployment-guide/src/main/jbake/templates/footer.ftl
@@ -36,7 +36,7 @@
 </table>
 
 <span id="copyright">
-        <img src="img/eclipse_foundation_logo_tiny.png" height="20px" alt="Eclipse Foundation Logo" align="top"/>&nbsp;            
+        <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>
 
diff --git a/docs/glassfish/application-development-guide/pom.xml b/docs/glassfish/application-development-guide/pom.xml
index d7f7d64..19942de 100644
--- a/docs/glassfish/application-development-guide/pom.xml
+++ b/docs/glassfish/application-development-guide/pom.xml
@@ -18,106 +18,14 @@
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <groupId>org.glassfish</groupId>
+    <parent>
+        <groupId>org.glassfish.docs</groupId>
+        <artifactId>parent</artifactId>
+        <version>5.1.1-SNAPSHOT</version>
+        <relativePath>../parent</relativePath>
+    </parent>
+    <groupId>org.glassfish.docs</groupId>
     <artifactId>application-development-guide</artifactId>
-    <packaging>pom</packaging>
-    <version>1.0.0-SNAPSHOT</version>
+    <packaging>jar</packaging>
     <name>Eclipse GlassFish Server Application Development Guide, Release 5.1</name>
-
-    <properties>
-        <site.output.dir>${project.build.directory}/staging</site.output.dir>
-        <maven.site.skip>true</maven.site.skip>
-        <maven.deploy.skip>true</maven.deploy.skip>
-    </properties>
-
-    <distributionManagement>
-        <site>
-            <url>scm:git:git@github.com:javaee/application-development-guide.git</url>
-        </site>
-    </distributionManagement>
-
-    <build>
-        <defaultGoal>package</defaultGoal>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-enforcer-plugin</artifactId>
-                <version>1.4.1</version>
-                <executions>
-                    <execution>
-                        <id>enforce-versions</id>
-                        <goals>
-                            <goal>enforce</goal>
-                        </goals>
-                        <configuration>
-                            <rules>
-                                <requireJavaVersion>
-                                    <version>[1.8.0,1.9.0)</version>
-                                    <message>You need JDK8 or lower</message>
-                                </requireJavaVersion>
-                            </rules>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>com.blazebit</groupId>
-                <artifactId>jbake-maven-plugin</artifactId>
-                <version>1.0.0</version>
-                <configuration>
-                    <outputDirectory>${site.output.dir}</outputDirectory>
-                </configuration>
-                <executions>
-                    <execution>
-                        <id>build-site</id>
-                        <phase>generate-resources</phase>
-                        <goals>
-                            <goal>build</goal>
-                        </goals>
-                    </execution>
-                </executions>
-                <dependencies>
-                    <dependency>
-                        <groupId>org.asciidoctor</groupId>
-                        <artifactId>asciidoctorj</artifactId>
-                        <version>1.5.5</version>
-                    </dependency>
-                    <dependency>
-                        <groupId>org.asciidoctor</groupId>
-                        <artifactId>asciidoctorj-diagram</artifactId>
-                        <version>1.5.4</version>
-                    </dependency>
-                </dependencies>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-scm-publish-plugin</artifactId>
-                <version>1.1</version>
-                <executions>
-                    <execution>
-                        <id>deploy-site</id>
-                        <phase>deploy</phase>
-                        <goals>
-                            <goal>publish-scm</goal>
-                        </goals>
-                        <configuration>
-                            <scmBranch>gh-pages</scmBranch>
-                            <skipDeletedFiles>false</skipDeletedFiles>
-                            <checkinComment>Update site</checkinComment>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-	</plugins>
-
-	<pluginManagement>
-	    <plugins>
-		<plugin>
-		    <groupId>org.apache.maven.plugins</groupId>
-		    <artifactId>maven-assembly-plugin</artifactId>
-		    <version>2.4</version>
-		</plugin>
-	    </plugins>
-	</pluginManagement>
-    </build>
 </project>
diff --git a/docs/glassfish/application-development-guide/src/main/jbake/assets/CONTRIBUTING.md b/docs/glassfish/application-development-guide/src/main/jbake/assets/CONTRIBUTING.md
deleted file mode 100644
index a0ebaa0..0000000
--- a/docs/glassfish/application-development-guide/src/main/jbake/assets/CONTRIBUTING.md
+++ /dev/null
@@ -1,57 +0,0 @@
-# Contributing to Eclipse GlassFish
-
-Thanks for your interest in this project.
-
-## Project description
-
-Eclipse GlassFish is a complete application server that implements the Jakarta
-EE specification. GlassFish includes implementations of all required and
-optional Jakarta EE APIs, and passes all Jakarta EE TCKs. GlassFish also
-includes a complete administration console, clustering support, and other
-developer and production focused tools and features.
-
-* https://projects.eclipse.org/projects/ee4j.glassfish
-
-## Developer resources
-
-Information regarding source code management, builds, coding standards, and
-more.
-
-* https://projects.eclipse.org/projects/ee4j.glassfish/developer
-
-The project maintains the following source code repositories
-
-* https://github.com/eclipse-ee4j/glassfish-ha-api
-* https://github.com/eclipse-ee4j/glassfish-logging-annotation-processor
-* https://github.com/eclipse-ee4j/glassfish-shoal
-* https://github.com/eclipse-ee4j/glassfish-cdi-porting-tck
-* https://github.com/eclipse-ee4j/glassfish-jsftemplating
-* https://github.com/eclipse-ee4j/glassfish-hk2-extra
-* https://github.com/eclipse-ee4j/glassfish-hk2
-* https://github.com/eclipse-ee4j/glassfish-fighterfish
-* https://github.com/eclipse-ee4j/glassfish
-* https://github.com/eclipse-ee4j/glassfish-maven-embedded-plugin
-* https://github.com/eclipse-ee4j/bvtck-porting
-
-## Eclipse Contributor Agreement
-
-Before your contribution can be accepted by the project team contributors must
-electronically sign the Eclipse Contributor Agreement (ECA).
-
-* http://www.eclipse.org/legal/ECA.php
-
-Commits that are provided by non-committers must have a Signed-off-by field in
-the footer indicating that the author is aware of the terms by which the
-contribution has been provided to the project. The non-committer must
-additionally have an Eclipse Foundation account and must have a signed Eclipse
-Contributor Agreement (ECA) on file.
-
-For more information, please see the Eclipse Committer Handbook:
-https://www.eclipse.org/projects/handbook/#resources-commit
-
-## Contact
-
-Contact the project developers via the project's "dev" list.
-
-* https://accounts.eclipse.org/mailing-list/glassfish-dev
-
diff --git a/docs/glassfish/application-development-guide/src/main/jbake/assets/LICENSE.md b/docs/glassfish/application-development-guide/src/main/jbake/assets/LICENSE.md
deleted file mode 100644
index f046098..0000000
--- a/docs/glassfish/application-development-guide/src/main/jbake/assets/LICENSE.md
+++ /dev/null
@@ -1,277 +0,0 @@
-# Eclipse Public License - v 2.0
-
-        THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE
-        PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION
-        OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
-
-    1. DEFINITIONS
-
-    "Contribution" means:
-
-      a) in the case of the initial Contributor, the initial content
-         Distributed under this Agreement, and
-
-      b) in the case of each subsequent Contributor: 
-         i) changes to the Program, and 
-         ii) additions to the Program;
-      where such changes and/or additions to the Program originate from
-      and are Distributed by that particular Contributor. A Contribution
-      "originates" from a Contributor if it was added to the Program by
-      such Contributor itself or anyone acting on such Contributor's behalf.
-      Contributions do not include changes or additions to the Program that
-      are not Modified Works.
-
-    "Contributor" means any person or entity that Distributes the Program.
-
-    "Licensed Patents" mean patent claims licensable by a Contributor which
-    are necessarily infringed by the use or sale of its Contribution alone
-    or when combined with the Program.
-
-    "Program" means the Contributions Distributed in accordance with this
-    Agreement.
-
-    "Recipient" means anyone who receives the Program under this Agreement
-    or any Secondary License (as applicable), including Contributors.
-
-    "Derivative Works" shall mean any work, whether in Source Code or other
-    form, that is based on (or derived from) the Program and for which the
-    editorial revisions, annotations, elaborations, or other modifications
-    represent, as a whole, an original work of authorship.
-
-    "Modified Works" shall mean any work in Source Code or other form that
-    results from an addition to, deletion from, or modification of the
-    contents of the Program, including, for purposes of clarity any new file
-    in Source Code form that contains any contents of the Program. Modified
-    Works shall not include works that contain only declarations,
-    interfaces, types, classes, structures, or files of the Program solely
-    in each case in order to link to, bind by name, or subclass the Program
-    or Modified Works thereof.
-
-    "Distribute" means the acts of a) distributing or b) making available
-    in any manner that enables the transfer of a copy.
-
-    "Source Code" means the form of a Program preferred for making
-    modifications, including but not limited to software source code,
-    documentation source, and configuration files.
-
-    "Secondary License" means either the GNU General Public License,
-    Version 2.0, or any later versions of that license, including any
-    exceptions or additional permissions as identified by the initial
-    Contributor.
-
-    2. GRANT OF RIGHTS
-
-      a) Subject to the terms of this Agreement, each Contributor hereby
-      grants Recipient a non-exclusive, worldwide, royalty-free copyright
-      license to reproduce, prepare Derivative Works of, publicly display,
-      publicly perform, Distribute and sublicense the Contribution of such
-      Contributor, if any, and such Derivative Works.
-
-      b) Subject to the terms of this Agreement, each Contributor hereby
-      grants Recipient a non-exclusive, worldwide, royalty-free patent
-      license under Licensed Patents to make, use, sell, offer to sell,
-      import and otherwise transfer the Contribution of such Contributor,
-      if any, in Source Code or other form. This patent license shall
-      apply to the combination of the Contribution and the Program if, at
-      the time the Contribution is added by the Contributor, such addition
-      of the Contribution causes such combination to be covered by the
-      Licensed Patents. The patent license shall not apply to any other
-      combinations which include the Contribution. No hardware per se is
-      licensed hereunder.
-
-      c) Recipient understands that although each Contributor grants the
-      licenses to its Contributions set forth herein, no assurances are
-      provided by any Contributor that the Program does not infringe the
-      patent or other intellectual property rights of any other entity.
-      Each Contributor disclaims any liability to Recipient for claims
-      brought by any other entity based on infringement of intellectual
-      property rights or otherwise. As a condition to exercising the
-      rights and licenses granted hereunder, each Recipient hereby
-      assumes sole responsibility to secure any other intellectual
-      property rights needed, if any. For example, if a third party
-      patent license is required to allow Recipient to Distribute the
-      Program, it is Recipient's responsibility to acquire that license
-      before distributing the Program.
-
-      d) Each Contributor represents that to its knowledge it has
-      sufficient copyright rights in its Contribution, if any, to grant
-      the copyright license set forth in this Agreement.
-
-      e) Notwithstanding the terms of any Secondary License, no
-      Contributor makes additional grants to any Recipient (other than
-      those set forth in this Agreement) as a result of such Recipient's
-      receipt of the Program under the terms of a Secondary License
-      (if permitted under the terms of Section 3).
-
-    3. REQUIREMENTS
-
-    3.1 If a Contributor Distributes the Program in any form, then:
-
-      a) the Program must also be made available as Source Code, in
-      accordance with section 3.2, and the Contributor must accompany
-      the Program with a statement that the Source Code for the Program
-      is available under this Agreement, and informs Recipients how to
-      obtain it in a reasonable manner on or through a medium customarily
-      used for software exchange; and
-
-      b) the Contributor may Distribute the Program under a license
-      different than this Agreement, provided that such license:
-         i) effectively disclaims on behalf of all other Contributors all
-         warranties and conditions, express and implied, including
-         warranties or conditions of title and non-infringement, and
-         implied warranties or conditions of merchantability and fitness
-         for a particular purpose;
-
-         ii) effectively excludes on behalf of all other Contributors all
-         liability for damages, including direct, indirect, special,
-         incidental and consequential damages, such as lost profits;
-
-         iii) does not attempt to limit or alter the recipients' rights
-         in the Source Code under section 3.2; and
-
-         iv) requires any subsequent distribution of the Program by any
-         party to be under a license that satisfies the requirements
-         of this section 3.
-
-    3.2 When the Program is Distributed as Source Code:
-
-      a) it must be made available under this Agreement, or if the
-      Program (i) is combined with other material in a separate file or
-      files made available under a Secondary License, and (ii) the initial
-      Contributor attached to the Source Code the notice described in
-      Exhibit A of this Agreement, then the Program may be made available
-      under the terms of such Secondary Licenses, and
-
-      b) a copy of this Agreement must be included with each copy of
-      the Program.
-
-    3.3 Contributors may not remove or alter any copyright, patent,
-    trademark, attribution notices, disclaimers of warranty, or limitations
-    of liability ("notices") contained within the Program from any copy of
-    the Program which they Distribute, provided that Contributors may add
-    their own appropriate notices.
-
-    4. COMMERCIAL DISTRIBUTION
-
-    Commercial distributors of software may accept certain responsibilities
-    with respect to end users, business partners and the like. While this
-    license is intended to facilitate the commercial use of the Program,
-    the Contributor who includes the Program in a commercial product
-    offering should do so in a manner which does not create potential
-    liability for other Contributors. Therefore, if a Contributor includes
-    the Program in a commercial product offering, such Contributor
-    ("Commercial Contributor") hereby agrees to defend and indemnify every
-    other Contributor ("Indemnified Contributor") against any losses,
-    damages and costs (collectively "Losses") arising from claims, lawsuits
-    and other legal actions brought by a third party against the Indemnified
-    Contributor to the extent caused by the acts or omissions of such
-    Commercial Contributor in connection with its distribution of the Program
-    in a commercial product offering. The obligations in this section do not
-    apply to any claims or Losses relating to any actual or alleged
-    intellectual property infringement. In order to qualify, an Indemnified
-    Contributor must: a) promptly notify the Commercial Contributor in
-    writing of such claim, and b) allow the Commercial Contributor to control,
-    and cooperate with the Commercial Contributor in, the defense and any
-    related settlement negotiations. The Indemnified Contributor may
-    participate in any such claim at its own expense.
-
-    For example, a Contributor might include the Program in a commercial
-    product offering, Product X. That Contributor is then a Commercial
-    Contributor. If that Commercial Contributor then makes performance
-    claims, or offers warranties related to Product X, those performance
-    claims and warranties are such Commercial Contributor's responsibility
-    alone. Under this section, the Commercial Contributor would have to
-    defend claims against the other Contributors related to those performance
-    claims and warranties, and if a court requires any other Contributor to
-    pay any damages as a result, the Commercial Contributor must pay
-    those damages.
-
-    5. NO WARRANTY
-
-    EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT
-    PERMITTED BY APPLICABLE LAW, THE PROGRAM IS PROVIDED ON AN "AS IS"
-    BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR
-    IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF
-    TITLE, NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR
-    PURPOSE. Each Recipient is solely responsible for determining the
-    appropriateness of using and distributing the Program and assumes all
-    risks associated with its exercise of rights under this Agreement,
-    including but not limited to the risks and costs of program errors,
-    compliance with applicable laws, damage to or loss of data, programs
-    or equipment, and unavailability or interruption of operations.
-
-    6. DISCLAIMER OF LIABILITY
-
-    EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT
-    PERMITTED BY APPLICABLE LAW, NEITHER RECIPIENT NOR ANY CONTRIBUTORS
-    SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-    EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST
-    PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-    CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-    ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE
-    EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF THE
-    POSSIBILITY OF SUCH DAMAGES.
-
-    7. GENERAL
-
-    If any provision of this Agreement is invalid or unenforceable under
-    applicable law, it shall not affect the validity or enforceability of
-    the remainder of the terms of this Agreement, and without further
-    action by the parties hereto, such provision shall be reformed to the
-    minimum extent necessary to make such provision valid and enforceable.
-
-    If Recipient institutes patent litigation against any entity
-    (including a cross-claim or counterclaim in a lawsuit) alleging that the
-    Program itself (excluding combinations of the Program with other software
-    or hardware) infringes such Recipient's patent(s), then such Recipient's
-    rights granted under Section 2(b) shall terminate as of the date such
-    litigation is filed.
-
-    All Recipient's rights under this Agreement shall terminate if it
-    fails to comply with any of the material terms or conditions of this
-    Agreement and does not cure such failure in a reasonable period of
-    time after becoming aware of such noncompliance. If all Recipient's
-    rights under this Agreement terminate, Recipient agrees to cease use
-    and distribution of the Program as soon as reasonably practicable.
-    However, Recipient's obligations under this Agreement and any licenses
-    granted by Recipient relating to the Program shall continue and survive.
-
-    Everyone is permitted to copy and distribute copies of this Agreement,
-    but in order to avoid inconsistency the Agreement is copyrighted and
-    may only be modified in the following manner. The Agreement Steward
-    reserves the right to publish new versions (including revisions) of
-    this Agreement from time to time. No one other than the Agreement
-    Steward has the right to modify this Agreement. The Eclipse Foundation
-    is the initial Agreement Steward. The Eclipse Foundation may assign the
-    responsibility to serve as the Agreement Steward to a suitable separate
-    entity. Each new version of the Agreement will be given a distinguishing
-    version number. The Program (including Contributions) may always be
-    Distributed subject to the version of the Agreement under which it was
-    received. In addition, after a new version of the Agreement is published,
-    Contributor may elect to Distribute the Program (including its
-    Contributions) under the new version.
-
-    Except as expressly stated in Sections 2(a) and 2(b) above, Recipient
-    receives no rights or licenses to the intellectual property of any
-    Contributor under this Agreement, whether expressly, by implication,
-    estoppel or otherwise. All rights in the Program not expressly granted
-    under this Agreement are reserved. Nothing in this Agreement is intended
-    to be enforceable by any entity that is not a Contributor or Recipient.
-    No third-party beneficiary rights are created under this Agreement.
-
-    Exhibit A - Form of Secondary Licenses Notice
-
-    "This Source Code may also be made available under the following 
-    Secondary Licenses when the conditions for such availability set forth 
-    in the Eclipse Public License, v. 2.0 are satisfied: {name license(s),
-    version(s), and exceptions or additional permissions here}."
-
-      Simply including a copy of this Agreement, including this Exhibit A
-      is not sufficient to license the Source Code under Secondary Licenses.
-
-      If it is not possible or desirable to put the notice in a particular
-      file, then You may include the notice in a location (such as a LICENSE
-      file in a relevant directory) where a recipient would be likely to
-      look for such a notice.
-
-      You may add additional accurate notices of copyright ownership.
\ No newline at end of file
diff --git a/docs/glassfish/application-development-guide/src/main/jbake/assets/README.md b/docs/glassfish/application-development-guide/src/main/jbake/assets/README.md
deleted file mode 100644
index f8f962c..0000000
--- a/docs/glassfish/application-development-guide/src/main/jbake/assets/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-# About
-
-The {{site.title}} project contains the [AsciiDoc](http://asciidoc.org/)
-source code for the ...
diff --git a/docs/glassfish/application-development-guide/src/main/jbake/assets/_config.yml b/docs/glassfish/application-development-guide/src/main/jbake/assets/_config.yml
deleted file mode 100644
index 173f295..0000000
--- a/docs/glassfish/application-development-guide/src/main/jbake/assets/_config.yml
+++ /dev/null
@@ -1,14 +0,0 @@
-theme: jekyll-theme-architect
-
-title: [application-development-guide]
-description: [Eclipse GlassFish Server Application Development Guide, Release 5.1]
-
-# sidebar links url
-links:
-  source: https://github.com/javaee/application-development-guide
-  download: https://github.com/javaee/application-development-guide/releases
-  #mailinglist: https://javaee.groups.io/g/application-development-guide
-  #javadocs:
-  docs: https://javaee.github.io/application-development-guide
-  #faq:
-
diff --git a/docs/glassfish/application-development-guide/src/main/jbake/assets/_layouts/default.html b/docs/glassfish/application-development-guide/src/main/jbake/assets/_layouts/default.html
deleted file mode 100644
index f896fad..0000000
--- a/docs/glassfish/application-development-guide/src/main/jbake/assets/_layouts/default.html
+++ /dev/null
@@ -1,100 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <meta charset='utf-8'>
-    <meta http-equiv="X-UA-Compatible" content="chrome=1">
-    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
-    <link rel="stylesheet" href="{{ '/assets/css/style.css?' | relative_url }}" media="screen" type="text/css">
-    <link rel="stylesheet" href="{{ '/assets/css/print.css' | relative_url }}" media="print" type="text/css">
-
-    <!--[if lt IE 9]>
-    <script src="//html5shiv.googlecode.com/svn/trunk/html5.js"></script>
-    <![endif]-->
-
-    <title>{{ site.title | default: site.github.repository_name }}</title>
-  </head>
-
-  <body>
-    <header>
-      <div class="inner">
-        <a href="{{ '/' | absolute_url }}">
-          <h1>{{ site.title | default: site.github.repository_name }}</h1>
-        </a>
-        <h2>{{ site.description | default: site.github.project_tagline }}</h2>
-        {% if site.github.is_project_page %}
-        <a href="{{ '/' | absolute_url }}" class="button"></a>
-        {% endif %}
-      </div>
-    </header>
-
-    <div id="content-wrapper">
-      <div class="inner clearfix">
-        <section id="main-content">
-          {{ content }}
-
-        </section>
-
-        <aside id="sidebar">
-          
-          <hr/>
-
-          <div class="moveright">
-            {% if site.links.source %}
-               <h2><a href="{{ site.links.source }}"><p>Sources</p></a></h2>
-            {% endif %}
-            
-            {% if site.links.javadocs %}
-              <h2><a href="{{ site.links.javadocs }}"><p>APIs</p></a></h2>
-            {% endif %}
-
-            {% if site.links.docs %}
-              <h2><a href="{{ site.links.docs }}"><p>Documentation</p></a></h2>
-            {% endif %}
-
-            {% if site.links.faq %}
-              <h2><a href="{{ site.links.faq }}"><p>FAQ</p></a></h2>
-            {% endif %}
-            
-            {% if site.links.download %}
-               <h2><a href="{{ site.links.download }}"><p>Download</p></a></h2>
-            {% endif %}
-
-            {% if site.links.hide_issuetracker != true %}
-            <h2><a href="{{ site.github.issues_url }}"><p>Issue Tracker</p></a></h2>
-            {% endif %}
-
-            {% if site.links.mailinglist %}
-               <h2><a href="{{ site.links.mailinglist }}"><p>Mailing List</p></a></h2>
-            {% endif %}          
-
-            <h2><a href="CONTRIBUTING"><p>Contribute</p></a></h2>
-
-            <h2><a href="LICENSE"><p>License</p></a></h2>
-          </div>
-          
-          <hr/>
-          
-          <div class="sponsor">
-            <p>Sponsored by<a href="http://www.oracle.com" class="oraclelogo"></a></p>
-          </div>
-          
-        </aside>
-      </div>
-    </div>
-
-    <div class="footer"><a id="copyright" class="oracle" href="https://www.oracle.com/legal/copyright.html">&copy; Oracle</a> | By contributing to this project, you are agreeing to the terms of use described <a href="CONTRIBUTING">here</a>.</div>
-
-    {% if site.google_analytics %}
-      <script type="text/javascript">
-        var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
-        document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));
-      </script>
-      <script type="text/javascript">
-        try {
-          var pageTracker = _gat._getTracker("{{ site.google_analytics }}");
-        pageTracker._trackPageview();
-        } catch(err) {}
-      </script>
-    {% endif %}
-  </body>
-</html>
diff --git a/docs/glassfish/application-development-guide/src/main/jbake/assets/assets/css/print.scss b/docs/glassfish/application-development-guide/src/main/jbake/assets/assets/css/print.scss
deleted file mode 100644
index 6115d8d..0000000
--- a/docs/glassfish/application-development-guide/src/main/jbake/assets/assets/css/print.scss
+++ /dev/null
@@ -1,8 +0,0 @@
----
----
-
-@import "{{ site.theme }}";
-h1 {
-  font-size: 1.8em;
-}
-
diff --git a/docs/glassfish/application-development-guide/src/main/jbake/assets/assets/css/style.scss b/docs/glassfish/application-development-guide/src/main/jbake/assets/assets/css/style.scss
deleted file mode 100644
index 3cf8c1a..0000000
--- a/docs/glassfish/application-development-guide/src/main/jbake/assets/assets/css/style.scss
+++ /dev/null
@@ -1,246 +0,0 @@
----
----
-
-@import "{{ site.theme }}";
-
-header {
-  padding-top: 16px;
-  padding-bottom: 40px;
-  font-family: 'Mukta Vaani', 'Open Sans', 'Helvetica Neue', Helvetica, Arial, serif;
-  background: url(../images/header-bkg.jpg) 0 0 repeat-x;
-  border-bottom: solid 1px #E0E0E0;  
-}
-
-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; // orange
-  //color: #2879d0; // blue
-  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;
-}
-
-a {
-  font-weight: 300;
-  color: #2879d0;
-}
-
-a:hover { 
-  text-decoration: underline;
-}
-
-#sidebar p {
-  font-size: 1em;
-  margin-bottom: 1em;
-}
-
-.highlight { 
-  background-color: #ffffff;
-}
-
-.sponsor {
-  float: left;
-  padding-top: 20px;
-  padding-left: 18px;
-}
-
-.moveright30{
-  padding-left: 30px;
-}
-
-.moveright{
-  padding-left: 40px;
-}
-
-.moveright50{
-  padding-left: 50px;
-}
-
-/*
-a.oraclelogo {
-  position: absolute;
-  background: transparent url(../images/Oracle-logo.png) 0 0 no-repeat;
-  background-position: 2px -2px; 
-  background-size: 100% ;
-  width: 96px;
-  height: 62px;
-  padding-top: 2px;
-  padding-right: 20px;
-}
-*/
-
-aside#sidebar {
-  padding-top: 40px;
-  line-height: 1.2;
-}
-
-hr {
-  border:none;
-  height: 10px;
-  width: 75%;
-  height: 50px;
-  margin-top: 0;
-  border-bottom: 1px solid #cccccc;
-  box-shadow: 0 20px 20px -20px #aaa;
-  margin: -48px auto 10px; 
-}
-
-table {
-   margin-bottom: 20px;
-}
-
-th, td {
-  padding: .2em;
-}
-
-td {
-  font-weight: 400;
-}
-
-ul {
-  font-size: 1em;
-  margin-left: 12px;
-}
-
-ol {
-    list-style-position: inside;
-    list-style: decimal;
-    margin-left: 26px;
-}
-
-blockquote {
-    padding: 0 0 0 10px;
-    margin-left: 14px;
-    margin-bottom: 2px;
-    font-size: 1em;
-    border-left: 4px solid #ddd;
-}
-
-#main-content h1 {
-  padding-top: .6em;
-  font-family: 'Mukta Vaani', 'Open Sans', 'Helvetica Neue', Helvetica, Arial, serif;
-  font-size: 1.6em;
-  font-weight: 500;
-  color : #666;
-  text-indent: 16px;
-  letter-spacing: 0px;
-  border-bottom:1px solid #cccccc;
-  padding-bottom:1px;
-  line-height: 1.2;
-  //margin: .6em 0;
-  margin-bottom: .6em;
-}
-
-#main-content h1:before {
-  //padding-right: 0.3em;
-  margin-left: -1em;
-  content: "";
-}
-
-#main-content h2 {
-  margin-bottom: 8px;
-  font-family: 'Mukta Vaani', 'Open Sans', 'Helvetica Neue', Helvetica, Arial, serif;
-  font-size: 1.4em;
-  font-weight: 400;
-  //color: #474747;
-  color: #3c657b; // blue
-  text-indent: 4px;
-}
-
-#main-content h2:before {
-  padding-right: 1.3em;
-  margin-left: -1.5em;
-  content: "";
-  font-weight: 700;
-}
-
-#main-content h3 {
-  text-indent: 24px;
-  margin-bottom: 8px;
-  font-family: 'Mukta Vaani', 'Open Sans', 'Helvetica Neue', Helvetica, Arial, serif;
-  font-size: 1.2em;
-  font-weight: 500;
-  color: #3c657b;
-  text-indent: 4px;
-}
-
-#main-content h3:before {
-  content: "";
-  margin-left: -0.3em;
-  padding-right: 0.1em;
-}
-
-#main-content h4 {
-  margin-bottom: 8px;
-  font-family: 'Mukta Vaani', 'Open Sans', 'Helvetica Neue', Helvetica, Arial, serif;
-  font-size: 1.2em;
-  font-weight: 500;
-  color: #3c657b;
-  text-indent: 4px;
-}
-
-#main-content h4:before {
-  content: "";
-  margin-left: -0.3em;
-  padding-right: 0.1em;
-}
-
-#main-content p {
-  font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, serif;
-  font-weight: normal;
-  font-size: 1em;
-  margin-bottom: 2px;
-}
-
-.footer {
-  position: fixed; 
-  bottom: 0;
-  left: 0;
-  right: 0;
-  height: 6px;
-  background-color: #f0f0f0;
-  //padding: 1rem;
-  padding-top: 4px;
-  padding-bottom: 14px;
-  font-size: 0.8em;
-  text-align: center;
-}
-
-.oracle {
-  color: #666;
-  font-weight: 400;
-}
-
-.oracle:hover { 
-  text-decoration: none;
-  color: #FF0000;
-}
-
-.fullpage {
-  //float: center;
-  color: FF0000;
-  width: 900px;
-}
\ No newline at end of file
diff --git a/docs/glassfish/application-development-guide/src/main/jbake/assets/assets/images/header-bkg.jpg b/docs/glassfish/application-development-guide/src/main/jbake/assets/assets/images/header-bkg.jpg
deleted file mode 100644
index 481faa5..0000000
--- a/docs/glassfish/application-development-guide/src/main/jbake/assets/assets/images/header-bkg.jpg
+++ /dev/null
Binary files differ
diff --git a/docs/glassfish/application-development-guide/src/main/jbake/content/title.adoc b/docs/glassfish/application-development-guide/src/main/jbake/content/title.adoc
index e487705..5e9fbf4 100644
--- a/docs/glassfish/application-development-guide/src/main/jbake/content/title.adoc
+++ b/docs/glassfish/application-development-guide/src/main/jbake/content/title.adoc
@@ -7,7 +7,7 @@
 Eclipse GlassFish Server Application Development Guide, Release 5.1
 ===================================================================
 
-[[glassfish-server-open-source-edition]]
+[[eclipse-glassfish-server]]
 Eclipse GlassFish Server
 ------------------------
 
@@ -48,4 +48,4 @@
 trademarks or registered trademarks of SPARC International, Inc. AMD, 
 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. 
\ No newline at end of file
+trademark of The Open Group. 
diff --git a/docs/glassfish/application-development-guide/src/main/jbake/templates/footer.ftl b/docs/glassfish/application-development-guide/src/main/jbake/templates/footer.ftl
index 46ecc29..b734c7b 100644
--- a/docs/glassfish/application-development-guide/src/main/jbake/templates/footer.ftl
+++ b/docs/glassfish/application-development-guide/src/main/jbake/templates/footer.ftl
@@ -36,7 +36,7 @@
 </table>
 
 <span id="copyright">
-        <img src="img/eclipse_foundation_logo_tiny.png" height="20px" alt="Eclipse Foundation Logo" align="top"/>&nbsp;            
+        <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>
 </body>
diff --git a/docs/glassfish/deployment-planning-guide/pom.xml b/docs/glassfish/deployment-planning-guide/pom.xml
index c2738df..85373ee 100644
--- a/docs/glassfish/deployment-planning-guide/pom.xml
+++ b/docs/glassfish/deployment-planning-guide/pom.xml
@@ -18,106 +18,14 @@
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <groupId>org.glassfish</groupId>
+    <parent>
+        <groupId>org.glassfish.docs</groupId>
+        <artifactId>parent</artifactId>
+        <version>5.1.1-SNAPSHOT</version>
+        <relativePath>../parent</relativePath>
+    </parent>
+    <groupId>org.glassfish.docs</groupId>
     <artifactId>deployment-planning-guide</artifactId>
-    <packaging>pom</packaging>
-    <version>1.0.0-SNAPSHOT</version>
+    <packaging>jar</packaging>
     <name>Eclipse GlassFish Server Deployment Planning Guide, Release 5.1</name>
-
-    <properties>
-        <site.output.dir>${project.build.directory}/staging</site.output.dir>
-        <maven.site.skip>true</maven.site.skip>
-        <maven.deploy.skip>true</maven.deploy.skip>
-    </properties>
-
-    <distributionManagement>
-        <site>
-            <url>scm:git:git@github.com:javaee/deployment-planning-guide.git</url>
-        </site>
-    </distributionManagement>
-
-    <build>
-        <defaultGoal>package</defaultGoal>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-enforcer-plugin</artifactId>
-                <version>1.4.1</version>
-                <executions>
-                    <execution>
-                        <id>enforce-versions</id>
-                        <goals>
-                            <goal>enforce</goal>
-                        </goals>
-                        <configuration>
-                            <rules>
-                                <requireJavaVersion>
-                                    <version>[1.8.0,1.9.0)</version>
-                                    <message>You need JDK8 or lower</message>
-                                </requireJavaVersion>
-                            </rules>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>com.blazebit</groupId>
-                <artifactId>jbake-maven-plugin</artifactId>
-                <version>1.0.0</version>
-                <configuration>
-                    <outputDirectory>${site.output.dir}</outputDirectory>
-                </configuration>
-                <executions>
-                    <execution>
-                        <id>build-site</id>
-                        <phase>generate-resources</phase>
-                        <goals>
-                            <goal>build</goal>
-                        </goals>
-                    </execution>
-                </executions>
-                <dependencies>
-                    <dependency>
-                        <groupId>org.asciidoctor</groupId>
-                        <artifactId>asciidoctorj</artifactId>
-                        <version>1.5.5</version>
-                    </dependency>
-                    <dependency>
-                        <groupId>org.asciidoctor</groupId>
-                        <artifactId>asciidoctorj-diagram</artifactId>
-                        <version>1.5.4</version>
-                    </dependency>
-                </dependencies>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-scm-publish-plugin</artifactId>
-                <version>1.1</version>
-                <executions>
-                    <execution>
-                        <id>deploy-site</id>
-                        <phase>deploy</phase>
-                        <goals>
-                            <goal>publish-scm</goal>
-                        </goals>
-                        <configuration>
-                            <scmBranch>gh-pages</scmBranch>
-                            <skipDeletedFiles>false</skipDeletedFiles>
-                            <checkinComment>Update site</checkinComment>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-	</plugins>
-
-	<pluginManagement>
-	    <plugins>
-		<plugin>
-		    <groupId>org.apache.maven.plugins</groupId>
-		    <artifactId>maven-assembly-plugin</artifactId>
-		    <version>2.4</version>
-		</plugin>
-	    </plugins>
-	</pluginManagement>
-    </build>
 </project>
diff --git a/docs/glassfish/deployment-planning-guide/src/main/jbake/assets/CONTRIBUTING.md b/docs/glassfish/deployment-planning-guide/src/main/jbake/assets/CONTRIBUTING.md
deleted file mode 100644
index a0ebaa0..0000000
--- a/docs/glassfish/deployment-planning-guide/src/main/jbake/assets/CONTRIBUTING.md
+++ /dev/null
@@ -1,57 +0,0 @@
-# Contributing to Eclipse GlassFish
-
-Thanks for your interest in this project.
-
-## Project description
-
-Eclipse GlassFish is a complete application server that implements the Jakarta
-EE specification. GlassFish includes implementations of all required and
-optional Jakarta EE APIs, and passes all Jakarta EE TCKs. GlassFish also
-includes a complete administration console, clustering support, and other
-developer and production focused tools and features.
-
-* https://projects.eclipse.org/projects/ee4j.glassfish
-
-## Developer resources
-
-Information regarding source code management, builds, coding standards, and
-more.
-
-* https://projects.eclipse.org/projects/ee4j.glassfish/developer
-
-The project maintains the following source code repositories
-
-* https://github.com/eclipse-ee4j/glassfish-ha-api
-* https://github.com/eclipse-ee4j/glassfish-logging-annotation-processor
-* https://github.com/eclipse-ee4j/glassfish-shoal
-* https://github.com/eclipse-ee4j/glassfish-cdi-porting-tck
-* https://github.com/eclipse-ee4j/glassfish-jsftemplating
-* https://github.com/eclipse-ee4j/glassfish-hk2-extra
-* https://github.com/eclipse-ee4j/glassfish-hk2
-* https://github.com/eclipse-ee4j/glassfish-fighterfish
-* https://github.com/eclipse-ee4j/glassfish
-* https://github.com/eclipse-ee4j/glassfish-maven-embedded-plugin
-* https://github.com/eclipse-ee4j/bvtck-porting
-
-## Eclipse Contributor Agreement
-
-Before your contribution can be accepted by the project team contributors must
-electronically sign the Eclipse Contributor Agreement (ECA).
-
-* http://www.eclipse.org/legal/ECA.php
-
-Commits that are provided by non-committers must have a Signed-off-by field in
-the footer indicating that the author is aware of the terms by which the
-contribution has been provided to the project. The non-committer must
-additionally have an Eclipse Foundation account and must have a signed Eclipse
-Contributor Agreement (ECA) on file.
-
-For more information, please see the Eclipse Committer Handbook:
-https://www.eclipse.org/projects/handbook/#resources-commit
-
-## Contact
-
-Contact the project developers via the project's "dev" list.
-
-* https://accounts.eclipse.org/mailing-list/glassfish-dev
-
diff --git a/docs/glassfish/deployment-planning-guide/src/main/jbake/assets/LICENSE.md b/docs/glassfish/deployment-planning-guide/src/main/jbake/assets/LICENSE.md
deleted file mode 100644
index f046098..0000000
--- a/docs/glassfish/deployment-planning-guide/src/main/jbake/assets/LICENSE.md
+++ /dev/null
@@ -1,277 +0,0 @@
-# Eclipse Public License - v 2.0
-
-        THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE
-        PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION
-        OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
-
-    1. DEFINITIONS
-
-    "Contribution" means:
-
-      a) in the case of the initial Contributor, the initial content
-         Distributed under this Agreement, and
-
-      b) in the case of each subsequent Contributor: 
-         i) changes to the Program, and 
-         ii) additions to the Program;
-      where such changes and/or additions to the Program originate from
-      and are Distributed by that particular Contributor. A Contribution
-      "originates" from a Contributor if it was added to the Program by
-      such Contributor itself or anyone acting on such Contributor's behalf.
-      Contributions do not include changes or additions to the Program that
-      are not Modified Works.
-
-    "Contributor" means any person or entity that Distributes the Program.
-
-    "Licensed Patents" mean patent claims licensable by a Contributor which
-    are necessarily infringed by the use or sale of its Contribution alone
-    or when combined with the Program.
-
-    "Program" means the Contributions Distributed in accordance with this
-    Agreement.
-
-    "Recipient" means anyone who receives the Program under this Agreement
-    or any Secondary License (as applicable), including Contributors.
-
-    "Derivative Works" shall mean any work, whether in Source Code or other
-    form, that is based on (or derived from) the Program and for which the
-    editorial revisions, annotations, elaborations, or other modifications
-    represent, as a whole, an original work of authorship.
-
-    "Modified Works" shall mean any work in Source Code or other form that
-    results from an addition to, deletion from, or modification of the
-    contents of the Program, including, for purposes of clarity any new file
-    in Source Code form that contains any contents of the Program. Modified
-    Works shall not include works that contain only declarations,
-    interfaces, types, classes, structures, or files of the Program solely
-    in each case in order to link to, bind by name, or subclass the Program
-    or Modified Works thereof.
-
-    "Distribute" means the acts of a) distributing or b) making available
-    in any manner that enables the transfer of a copy.
-
-    "Source Code" means the form of a Program preferred for making
-    modifications, including but not limited to software source code,
-    documentation source, and configuration files.
-
-    "Secondary License" means either the GNU General Public License,
-    Version 2.0, or any later versions of that license, including any
-    exceptions or additional permissions as identified by the initial
-    Contributor.
-
-    2. GRANT OF RIGHTS
-
-      a) Subject to the terms of this Agreement, each Contributor hereby
-      grants Recipient a non-exclusive, worldwide, royalty-free copyright
-      license to reproduce, prepare Derivative Works of, publicly display,
-      publicly perform, Distribute and sublicense the Contribution of such
-      Contributor, if any, and such Derivative Works.
-
-      b) Subject to the terms of this Agreement, each Contributor hereby
-      grants Recipient a non-exclusive, worldwide, royalty-free patent
-      license under Licensed Patents to make, use, sell, offer to sell,
-      import and otherwise transfer the Contribution of such Contributor,
-      if any, in Source Code or other form. This patent license shall
-      apply to the combination of the Contribution and the Program if, at
-      the time the Contribution is added by the Contributor, such addition
-      of the Contribution causes such combination to be covered by the
-      Licensed Patents. The patent license shall not apply to any other
-      combinations which include the Contribution. No hardware per se is
-      licensed hereunder.
-
-      c) Recipient understands that although each Contributor grants the
-      licenses to its Contributions set forth herein, no assurances are
-      provided by any Contributor that the Program does not infringe the
-      patent or other intellectual property rights of any other entity.
-      Each Contributor disclaims any liability to Recipient for claims
-      brought by any other entity based on infringement of intellectual
-      property rights or otherwise. As a condition to exercising the
-      rights and licenses granted hereunder, each Recipient hereby
-      assumes sole responsibility to secure any other intellectual
-      property rights needed, if any. For example, if a third party
-      patent license is required to allow Recipient to Distribute the
-      Program, it is Recipient's responsibility to acquire that license
-      before distributing the Program.
-
-      d) Each Contributor represents that to its knowledge it has
-      sufficient copyright rights in its Contribution, if any, to grant
-      the copyright license set forth in this Agreement.
-
-      e) Notwithstanding the terms of any Secondary License, no
-      Contributor makes additional grants to any Recipient (other than
-      those set forth in this Agreement) as a result of such Recipient's
-      receipt of the Program under the terms of a Secondary License
-      (if permitted under the terms of Section 3).
-
-    3. REQUIREMENTS
-
-    3.1 If a Contributor Distributes the Program in any form, then:
-
-      a) the Program must also be made available as Source Code, in
-      accordance with section 3.2, and the Contributor must accompany
-      the Program with a statement that the Source Code for the Program
-      is available under this Agreement, and informs Recipients how to
-      obtain it in a reasonable manner on or through a medium customarily
-      used for software exchange; and
-
-      b) the Contributor may Distribute the Program under a license
-      different than this Agreement, provided that such license:
-         i) effectively disclaims on behalf of all other Contributors all
-         warranties and conditions, express and implied, including
-         warranties or conditions of title and non-infringement, and
-         implied warranties or conditions of merchantability and fitness
-         for a particular purpose;
-
-         ii) effectively excludes on behalf of all other Contributors all
-         liability for damages, including direct, indirect, special,
-         incidental and consequential damages, such as lost profits;
-
-         iii) does not attempt to limit or alter the recipients' rights
-         in the Source Code under section 3.2; and
-
-         iv) requires any subsequent distribution of the Program by any
-         party to be under a license that satisfies the requirements
-         of this section 3.
-
-    3.2 When the Program is Distributed as Source Code:
-
-      a) it must be made available under this Agreement, or if the
-      Program (i) is combined with other material in a separate file or
-      files made available under a Secondary License, and (ii) the initial
-      Contributor attached to the Source Code the notice described in
-      Exhibit A of this Agreement, then the Program may be made available
-      under the terms of such Secondary Licenses, and
-
-      b) a copy of this Agreement must be included with each copy of
-      the Program.
-
-    3.3 Contributors may not remove or alter any copyright, patent,
-    trademark, attribution notices, disclaimers of warranty, or limitations
-    of liability ("notices") contained within the Program from any copy of
-    the Program which they Distribute, provided that Contributors may add
-    their own appropriate notices.
-
-    4. COMMERCIAL DISTRIBUTION
-
-    Commercial distributors of software may accept certain responsibilities
-    with respect to end users, business partners and the like. While this
-    license is intended to facilitate the commercial use of the Program,
-    the Contributor who includes the Program in a commercial product
-    offering should do so in a manner which does not create potential
-    liability for other Contributors. Therefore, if a Contributor includes
-    the Program in a commercial product offering, such Contributor
-    ("Commercial Contributor") hereby agrees to defend and indemnify every
-    other Contributor ("Indemnified Contributor") against any losses,
-    damages and costs (collectively "Losses") arising from claims, lawsuits
-    and other legal actions brought by a third party against the Indemnified
-    Contributor to the extent caused by the acts or omissions of such
-    Commercial Contributor in connection with its distribution of the Program
-    in a commercial product offering. The obligations in this section do not
-    apply to any claims or Losses relating to any actual or alleged
-    intellectual property infringement. In order to qualify, an Indemnified
-    Contributor must: a) promptly notify the Commercial Contributor in
-    writing of such claim, and b) allow the Commercial Contributor to control,
-    and cooperate with the Commercial Contributor in, the defense and any
-    related settlement negotiations. The Indemnified Contributor may
-    participate in any such claim at its own expense.
-
-    For example, a Contributor might include the Program in a commercial
-    product offering, Product X. That Contributor is then a Commercial
-    Contributor. If that Commercial Contributor then makes performance
-    claims, or offers warranties related to Product X, those performance
-    claims and warranties are such Commercial Contributor's responsibility
-    alone. Under this section, the Commercial Contributor would have to
-    defend claims against the other Contributors related to those performance
-    claims and warranties, and if a court requires any other Contributor to
-    pay any damages as a result, the Commercial Contributor must pay
-    those damages.
-
-    5. NO WARRANTY
-
-    EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT
-    PERMITTED BY APPLICABLE LAW, THE PROGRAM IS PROVIDED ON AN "AS IS"
-    BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR
-    IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF
-    TITLE, NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR
-    PURPOSE. Each Recipient is solely responsible for determining the
-    appropriateness of using and distributing the Program and assumes all
-    risks associated with its exercise of rights under this Agreement,
-    including but not limited to the risks and costs of program errors,
-    compliance with applicable laws, damage to or loss of data, programs
-    or equipment, and unavailability or interruption of operations.
-
-    6. DISCLAIMER OF LIABILITY
-
-    EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT
-    PERMITTED BY APPLICABLE LAW, NEITHER RECIPIENT NOR ANY CONTRIBUTORS
-    SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-    EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST
-    PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-    CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-    ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE
-    EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF THE
-    POSSIBILITY OF SUCH DAMAGES.
-
-    7. GENERAL
-
-    If any provision of this Agreement is invalid or unenforceable under
-    applicable law, it shall not affect the validity or enforceability of
-    the remainder of the terms of this Agreement, and without further
-    action by the parties hereto, such provision shall be reformed to the
-    minimum extent necessary to make such provision valid and enforceable.
-
-    If Recipient institutes patent litigation against any entity
-    (including a cross-claim or counterclaim in a lawsuit) alleging that the
-    Program itself (excluding combinations of the Program with other software
-    or hardware) infringes such Recipient's patent(s), then such Recipient's
-    rights granted under Section 2(b) shall terminate as of the date such
-    litigation is filed.
-
-    All Recipient's rights under this Agreement shall terminate if it
-    fails to comply with any of the material terms or conditions of this
-    Agreement and does not cure such failure in a reasonable period of
-    time after becoming aware of such noncompliance. If all Recipient's
-    rights under this Agreement terminate, Recipient agrees to cease use
-    and distribution of the Program as soon as reasonably practicable.
-    However, Recipient's obligations under this Agreement and any licenses
-    granted by Recipient relating to the Program shall continue and survive.
-
-    Everyone is permitted to copy and distribute copies of this Agreement,
-    but in order to avoid inconsistency the Agreement is copyrighted and
-    may only be modified in the following manner. The Agreement Steward
-    reserves the right to publish new versions (including revisions) of
-    this Agreement from time to time. No one other than the Agreement
-    Steward has the right to modify this Agreement. The Eclipse Foundation
-    is the initial Agreement Steward. The Eclipse Foundation may assign the
-    responsibility to serve as the Agreement Steward to a suitable separate
-    entity. Each new version of the Agreement will be given a distinguishing
-    version number. The Program (including Contributions) may always be
-    Distributed subject to the version of the Agreement under which it was
-    received. In addition, after a new version of the Agreement is published,
-    Contributor may elect to Distribute the Program (including its
-    Contributions) under the new version.
-
-    Except as expressly stated in Sections 2(a) and 2(b) above, Recipient
-    receives no rights or licenses to the intellectual property of any
-    Contributor under this Agreement, whether expressly, by implication,
-    estoppel or otherwise. All rights in the Program not expressly granted
-    under this Agreement are reserved. Nothing in this Agreement is intended
-    to be enforceable by any entity that is not a Contributor or Recipient.
-    No third-party beneficiary rights are created under this Agreement.
-
-    Exhibit A - Form of Secondary Licenses Notice
-
-    "This Source Code may also be made available under the following 
-    Secondary Licenses when the conditions for such availability set forth 
-    in the Eclipse Public License, v. 2.0 are satisfied: {name license(s),
-    version(s), and exceptions or additional permissions here}."
-
-      Simply including a copy of this Agreement, including this Exhibit A
-      is not sufficient to license the Source Code under Secondary Licenses.
-
-      If it is not possible or desirable to put the notice in a particular
-      file, then You may include the notice in a location (such as a LICENSE
-      file in a relevant directory) where a recipient would be likely to
-      look for such a notice.
-
-      You may add additional accurate notices of copyright ownership.
\ No newline at end of file
diff --git a/docs/glassfish/deployment-planning-guide/src/main/jbake/assets/README.md b/docs/glassfish/deployment-planning-guide/src/main/jbake/assets/README.md
deleted file mode 100644
index f8f962c..0000000
--- a/docs/glassfish/deployment-planning-guide/src/main/jbake/assets/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-# About
-
-The {{site.title}} project contains the [AsciiDoc](http://asciidoc.org/)
-source code for the ...
diff --git a/docs/glassfish/deployment-planning-guide/src/main/jbake/assets/_config.yml b/docs/glassfish/deployment-planning-guide/src/main/jbake/assets/_config.yml
deleted file mode 100644
index bd7449e..0000000
--- a/docs/glassfish/deployment-planning-guide/src/main/jbake/assets/_config.yml
+++ /dev/null
@@ -1,14 +0,0 @@
-theme: jekyll-theme-architect
-
-title: [deployment-planning-guide]
-description: [Eclipse GlassFish Server Deployment Planning Guide, Release 5.1]
-
-# sidebar links url
-links:
-  source: https://github.com/javaee/deployment-planning-guide
-  download: https://github.com/javaee/deployment-planning-guide/releases
-  #mailinglist: https://javaee.groups.io/g/deployment-planning-guide
-  #javadocs:
-  docs: https://javaee.github.io/deployment-planning-guide
-  #faq:
-
diff --git a/docs/glassfish/deployment-planning-guide/src/main/jbake/assets/_layouts/default.html b/docs/glassfish/deployment-planning-guide/src/main/jbake/assets/_layouts/default.html
deleted file mode 100644
index f896fad..0000000
--- a/docs/glassfish/deployment-planning-guide/src/main/jbake/assets/_layouts/default.html
+++ /dev/null
@@ -1,100 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <meta charset='utf-8'>
-    <meta http-equiv="X-UA-Compatible" content="chrome=1">
-    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
-    <link rel="stylesheet" href="{{ '/assets/css/style.css?' | relative_url }}" media="screen" type="text/css">
-    <link rel="stylesheet" href="{{ '/assets/css/print.css' | relative_url }}" media="print" type="text/css">
-
-    <!--[if lt IE 9]>
-    <script src="//html5shiv.googlecode.com/svn/trunk/html5.js"></script>
-    <![endif]-->
-
-    <title>{{ site.title | default: site.github.repository_name }}</title>
-  </head>
-
-  <body>
-    <header>
-      <div class="inner">
-        <a href="{{ '/' | absolute_url }}">
-          <h1>{{ site.title | default: site.github.repository_name }}</h1>
-        </a>
-        <h2>{{ site.description | default: site.github.project_tagline }}</h2>
-        {% if site.github.is_project_page %}
-        <a href="{{ '/' | absolute_url }}" class="button"></a>
-        {% endif %}
-      </div>
-    </header>
-
-    <div id="content-wrapper">
-      <div class="inner clearfix">
-        <section id="main-content">
-          {{ content }}
-
-        </section>
-
-        <aside id="sidebar">
-          
-          <hr/>
-
-          <div class="moveright">
-            {% if site.links.source %}
-               <h2><a href="{{ site.links.source }}"><p>Sources</p></a></h2>
-            {% endif %}
-            
-            {% if site.links.javadocs %}
-              <h2><a href="{{ site.links.javadocs }}"><p>APIs</p></a></h2>
-            {% endif %}
-
-            {% if site.links.docs %}
-              <h2><a href="{{ site.links.docs }}"><p>Documentation</p></a></h2>
-            {% endif %}
-
-            {% if site.links.faq %}
-              <h2><a href="{{ site.links.faq }}"><p>FAQ</p></a></h2>
-            {% endif %}
-            
-            {% if site.links.download %}
-               <h2><a href="{{ site.links.download }}"><p>Download</p></a></h2>
-            {% endif %}
-
-            {% if site.links.hide_issuetracker != true %}
-            <h2><a href="{{ site.github.issues_url }}"><p>Issue Tracker</p></a></h2>
-            {% endif %}
-
-            {% if site.links.mailinglist %}
-               <h2><a href="{{ site.links.mailinglist }}"><p>Mailing List</p></a></h2>
-            {% endif %}          
-
-            <h2><a href="CONTRIBUTING"><p>Contribute</p></a></h2>
-
-            <h2><a href="LICENSE"><p>License</p></a></h2>
-          </div>
-          
-          <hr/>
-          
-          <div class="sponsor">
-            <p>Sponsored by<a href="http://www.oracle.com" class="oraclelogo"></a></p>
-          </div>
-          
-        </aside>
-      </div>
-    </div>
-
-    <div class="footer"><a id="copyright" class="oracle" href="https://www.oracle.com/legal/copyright.html">&copy; Oracle</a> | By contributing to this project, you are agreeing to the terms of use described <a href="CONTRIBUTING">here</a>.</div>
-
-    {% if site.google_analytics %}
-      <script type="text/javascript">
-        var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
-        document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));
-      </script>
-      <script type="text/javascript">
-        try {
-          var pageTracker = _gat._getTracker("{{ site.google_analytics }}");
-        pageTracker._trackPageview();
-        } catch(err) {}
-      </script>
-    {% endif %}
-  </body>
-</html>
diff --git a/docs/glassfish/deployment-planning-guide/src/main/jbake/assets/assets/css/print.scss b/docs/glassfish/deployment-planning-guide/src/main/jbake/assets/assets/css/print.scss
deleted file mode 100644
index 6115d8d..0000000
--- a/docs/glassfish/deployment-planning-guide/src/main/jbake/assets/assets/css/print.scss
+++ /dev/null
@@ -1,8 +0,0 @@
----
----
-
-@import "{{ site.theme }}";
-h1 {
-  font-size: 1.8em;
-}
-
diff --git a/docs/glassfish/deployment-planning-guide/src/main/jbake/assets/assets/css/style.scss b/docs/glassfish/deployment-planning-guide/src/main/jbake/assets/assets/css/style.scss
deleted file mode 100644
index 3cf8c1a..0000000
--- a/docs/glassfish/deployment-planning-guide/src/main/jbake/assets/assets/css/style.scss
+++ /dev/null
@@ -1,246 +0,0 @@
----
----
-
-@import "{{ site.theme }}";
-
-header {
-  padding-top: 16px;
-  padding-bottom: 40px;
-  font-family: 'Mukta Vaani', 'Open Sans', 'Helvetica Neue', Helvetica, Arial, serif;
-  background: url(../images/header-bkg.jpg) 0 0 repeat-x;
-  border-bottom: solid 1px #E0E0E0;  
-}
-
-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; // orange
-  //color: #2879d0; // blue
-  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;
-}
-
-a {
-  font-weight: 300;
-  color: #2879d0;
-}
-
-a:hover { 
-  text-decoration: underline;
-}
-
-#sidebar p {
-  font-size: 1em;
-  margin-bottom: 1em;
-}
-
-.highlight { 
-  background-color: #ffffff;
-}
-
-.sponsor {
-  float: left;
-  padding-top: 20px;
-  padding-left: 18px;
-}
-
-.moveright30{
-  padding-left: 30px;
-}
-
-.moveright{
-  padding-left: 40px;
-}
-
-.moveright50{
-  padding-left: 50px;
-}
-
-/*
-a.oraclelogo {
-  position: absolute;
-  background: transparent url(../images/Oracle-logo.png) 0 0 no-repeat;
-  background-position: 2px -2px; 
-  background-size: 100% ;
-  width: 96px;
-  height: 62px;
-  padding-top: 2px;
-  padding-right: 20px;
-}
-*/
-
-aside#sidebar {
-  padding-top: 40px;
-  line-height: 1.2;
-}
-
-hr {
-  border:none;
-  height: 10px;
-  width: 75%;
-  height: 50px;
-  margin-top: 0;
-  border-bottom: 1px solid #cccccc;
-  box-shadow: 0 20px 20px -20px #aaa;
-  margin: -48px auto 10px; 
-}
-
-table {
-   margin-bottom: 20px;
-}
-
-th, td {
-  padding: .2em;
-}
-
-td {
-  font-weight: 400;
-}
-
-ul {
-  font-size: 1em;
-  margin-left: 12px;
-}
-
-ol {
-    list-style-position: inside;
-    list-style: decimal;
-    margin-left: 26px;
-}
-
-blockquote {
-    padding: 0 0 0 10px;
-    margin-left: 14px;
-    margin-bottom: 2px;
-    font-size: 1em;
-    border-left: 4px solid #ddd;
-}
-
-#main-content h1 {
-  padding-top: .6em;
-  font-family: 'Mukta Vaani', 'Open Sans', 'Helvetica Neue', Helvetica, Arial, serif;
-  font-size: 1.6em;
-  font-weight: 500;
-  color : #666;
-  text-indent: 16px;
-  letter-spacing: 0px;
-  border-bottom:1px solid #cccccc;
-  padding-bottom:1px;
-  line-height: 1.2;
-  //margin: .6em 0;
-  margin-bottom: .6em;
-}
-
-#main-content h1:before {
-  //padding-right: 0.3em;
-  margin-left: -1em;
-  content: "";
-}
-
-#main-content h2 {
-  margin-bottom: 8px;
-  font-family: 'Mukta Vaani', 'Open Sans', 'Helvetica Neue', Helvetica, Arial, serif;
-  font-size: 1.4em;
-  font-weight: 400;
-  //color: #474747;
-  color: #3c657b; // blue
-  text-indent: 4px;
-}
-
-#main-content h2:before {
-  padding-right: 1.3em;
-  margin-left: -1.5em;
-  content: "";
-  font-weight: 700;
-}
-
-#main-content h3 {
-  text-indent: 24px;
-  margin-bottom: 8px;
-  font-family: 'Mukta Vaani', 'Open Sans', 'Helvetica Neue', Helvetica, Arial, serif;
-  font-size: 1.2em;
-  font-weight: 500;
-  color: #3c657b;
-  text-indent: 4px;
-}
-
-#main-content h3:before {
-  content: "";
-  margin-left: -0.3em;
-  padding-right: 0.1em;
-}
-
-#main-content h4 {
-  margin-bottom: 8px;
-  font-family: 'Mukta Vaani', 'Open Sans', 'Helvetica Neue', Helvetica, Arial, serif;
-  font-size: 1.2em;
-  font-weight: 500;
-  color: #3c657b;
-  text-indent: 4px;
-}
-
-#main-content h4:before {
-  content: "";
-  margin-left: -0.3em;
-  padding-right: 0.1em;
-}
-
-#main-content p {
-  font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, serif;
-  font-weight: normal;
-  font-size: 1em;
-  margin-bottom: 2px;
-}
-
-.footer {
-  position: fixed; 
-  bottom: 0;
-  left: 0;
-  right: 0;
-  height: 6px;
-  background-color: #f0f0f0;
-  //padding: 1rem;
-  padding-top: 4px;
-  padding-bottom: 14px;
-  font-size: 0.8em;
-  text-align: center;
-}
-
-.oracle {
-  color: #666;
-  font-weight: 400;
-}
-
-.oracle:hover { 
-  text-decoration: none;
-  color: #FF0000;
-}
-
-.fullpage {
-  //float: center;
-  color: FF0000;
-  width: 900px;
-}
\ No newline at end of file
diff --git a/docs/glassfish/deployment-planning-guide/src/main/jbake/assets/assets/images/header-bkg.jpg b/docs/glassfish/deployment-planning-guide/src/main/jbake/assets/assets/images/header-bkg.jpg
deleted file mode 100644
index 481faa5..0000000
--- a/docs/glassfish/deployment-planning-guide/src/main/jbake/assets/assets/images/header-bkg.jpg
+++ /dev/null
Binary files differ
diff --git a/docs/glassfish/deployment-planning-guide/src/main/jbake/content/title.adoc b/docs/glassfish/deployment-planning-guide/src/main/jbake/content/title.adoc
index ca719dd..29b0091 100644
--- a/docs/glassfish/deployment-planning-guide/src/main/jbake/content/title.adoc
+++ b/docs/glassfish/deployment-planning-guide/src/main/jbake/content/title.adoc
@@ -7,7 +7,7 @@
 Eclipse GlassFish Server Deployment Planning Guide, Release 5.1
 ===============================================================
 
-[[glassfish-server-open-source-edition]]
+[[eclipse-glassfish-server]]
 Eclipse GlassFish Server
 ------------------------
 
@@ -43,4 +43,4 @@
 trademarks or registered trademarks of SPARC International, Inc. AMD, 
 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. 
\ No newline at end of file
+trademark of The Open Group. 
diff --git a/docs/glassfish/deployment-planning-guide/src/main/jbake/templates/footer.ftl b/docs/glassfish/deployment-planning-guide/src/main/jbake/templates/footer.ftl
index e7df506..131fe6c 100644
--- a/docs/glassfish/deployment-planning-guide/src/main/jbake/templates/footer.ftl
+++ b/docs/glassfish/deployment-planning-guide/src/main/jbake/templates/footer.ftl
@@ -36,7 +36,7 @@
 </table>
 
 <span id="copyright">
-        <img src="img/eclipse_foundation_logo_tiny.png" height="20px" alt="Eclipse Foundation Logo" align="top"/>&nbsp;            
+        <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>
 
diff --git a/docs/glassfish/distribution/pom.xml b/docs/glassfish/distribution/pom.xml
new file mode 100644
index 0000000..7ab8db9
--- /dev/null
+++ b/docs/glassfish/distribution/pom.xml
@@ -0,0 +1,169 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 
+    Copyright (c) 2017, 2019 Oracle and/or its affiliates. All rights reserved.
+ 
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+ 
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+ 
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+ 
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.glassfish.docs</groupId>
+        <artifactId>docs</artifactId>
+        <version>5.1.1-SNAPSHOT</version>
+    </parent>
+    <groupId>org.glassfish.docs</groupId>
+    <artifactId>distribution</artifactId>
+    <packaging>jar</packaging>
+    <name>Eclipse GlassFish Documentation Distribution</name>
+    <description>
+        Combine the Eclipse GlassFish documentation into one bundle
+        for distribution.
+    </description>
+
+    <properties>
+        <maven.site.skip>true</maven.site.skip>
+    </properties>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>get-dependencies</id>
+                        <phase>generate-sources</phase>
+                        <goals>
+                            <goal>unpack-dependencies</goal>
+                        </goals>
+                        <configuration>
+                            <includeGroupIds>
+                                org.glassfish.docs
+                            </includeGroupIds>
+                            <excludes>META-INF/**</excludes>
+                            <outputDirectory>
+                                ${project.build.directory}/classes
+                            </outputDirectory>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+	</plugins>
+    </build>
+
+    <dependencies>
+        <!--
+            The following items are the current
+            (under development) versions of the
+            documentation.
+        -->
+        <dependency>
+            <groupId>org.glassfish.docs</groupId>
+            <artifactId>add-on-component-development-guide</artifactId>
+            <version>${project.version}</version>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>org.glassfish.docs</groupId>
+            <artifactId>administration-guide</artifactId>
+            <version>${project.version}</version>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>org.glassfish.docs</groupId>
+            <artifactId>application-deployment-guide</artifactId>
+            <version>${project.version}</version>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>org.glassfish.docs</groupId>
+            <artifactId>application-development-guide</artifactId>
+            <version>${project.version}</version>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>org.glassfish.docs</groupId>
+            <artifactId>deployment-planning-guide</artifactId>
+            <version>${project.version}</version>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>org.glassfish.docs</groupId>
+            <artifactId>embedded-server-guide</artifactId>
+            <version>${project.version}</version>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>org.glassfish.docs</groupId>
+            <artifactId>error-messages-reference</artifactId>
+            <version>${project.version}</version>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>org.glassfish.docs</groupId>
+            <artifactId>ha-administration-guide</artifactId>
+            <version>${project.version}</version>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>org.glassfish.docs</groupId>
+            <artifactId>installation-guide</artifactId>
+            <version>${project.version}</version>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>org.glassfish.docs</groupId>
+            <artifactId>performance-tuning-guide</artifactId>
+            <version>${project.version}</version>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>org.glassfish.docs</groupId>
+            <artifactId>quick-start-guide</artifactId>
+            <version>${project.version}</version>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>org.glassfish.docs</groupId>
+            <artifactId>reference-manual</artifactId>
+            <version>${project.version}</version>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>org.glassfish.docs</groupId>
+            <artifactId>release-notes</artifactId>
+            <version>${project.version}</version>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>org.glassfish.docs</groupId>
+            <artifactId>security-guide</artifactId>
+            <version>${project.version}</version>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>org.glassfish.docs</groupId>
+            <artifactId>troubleshooting-guide</artifactId>
+            <version>${project.version}</version>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>org.glassfish.docs</groupId>
+            <artifactId>upgrade-guide</artifactId>
+            <version>${project.version}</version>
+            <optional>true</optional>
+        </dependency>
+    </dependencies>
+</project>
diff --git a/docs/glassfish/embedded-server-guide/pom.xml b/docs/glassfish/embedded-server-guide/pom.xml
index a1a38d9..ca9b5bf 100644
--- a/docs/glassfish/embedded-server-guide/pom.xml
+++ b/docs/glassfish/embedded-server-guide/pom.xml
@@ -18,106 +18,14 @@
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <groupId>org.glassfish</groupId>
+    <parent>
+        <groupId>org.glassfish.docs</groupId>
+        <artifactId>parent</artifactId>
+        <version>5.1.1-SNAPSHOT</version>
+        <relativePath>../parent</relativePath>
+    </parent>
+    <groupId>org.glassfish.docs</groupId>
     <artifactId>embedded-server-guide</artifactId>
-    <packaging>pom</packaging>
-    <version>1.0.0-SNAPSHOT</version>
+    <packaging>jar</packaging>
     <name>Eclipse GlassFish Server Embedded Server Guide, Release 5.1</name>
-
-    <properties>
-        <site.output.dir>${project.build.directory}/staging</site.output.dir>
-        <maven.site.skip>true</maven.site.skip>
-        <maven.deploy.skip>true</maven.deploy.skip>
-    </properties>
-
-    <distributionManagement>
-        <site>
-            <url>scm:git:git@github.com:javaee/embedded-server-guide.git</url>
-        </site>
-    </distributionManagement>
-
-    <build>
-        <defaultGoal>package</defaultGoal>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-enforcer-plugin</artifactId>
-                <version>1.4.1</version>
-                <executions>
-                    <execution>
-                        <id>enforce-versions</id>
-                        <goals>
-                            <goal>enforce</goal>
-                        </goals>
-                        <configuration>
-                            <rules>
-                                <requireJavaVersion>
-                                    <version>[1.8.0,1.9.0)</version>
-                                    <message>You need JDK8 or lower</message>
-                                </requireJavaVersion>
-                            </rules>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>com.blazebit</groupId>
-                <artifactId>jbake-maven-plugin</artifactId>
-                <version>1.0.0</version>
-                <configuration>
-                    <outputDirectory>${site.output.dir}</outputDirectory>
-                </configuration>
-                <executions>
-                    <execution>
-                        <id>build-site</id>
-                        <phase>generate-resources</phase>
-                        <goals>
-                            <goal>build</goal>
-                        </goals>
-                    </execution>
-                </executions>
-                <dependencies>
-                    <dependency>
-                        <groupId>org.asciidoctor</groupId>
-                        <artifactId>asciidoctorj</artifactId>
-                        <version>1.5.5</version>
-                    </dependency>
-                    <dependency>
-                        <groupId>org.asciidoctor</groupId>
-                        <artifactId>asciidoctorj-diagram</artifactId>
-                        <version>1.5.4</version>
-                    </dependency>
-                </dependencies>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-scm-publish-plugin</artifactId>
-                <version>1.1</version>
-                <executions>
-                    <execution>
-                        <id>deploy-site</id>
-                        <phase>deploy</phase>
-                        <goals>
-                            <goal>publish-scm</goal>
-                        </goals>
-                        <configuration>
-                            <scmBranch>gh-pages</scmBranch>
-                            <skipDeletedFiles>false</skipDeletedFiles>
-                            <checkinComment>Update site</checkinComment>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-	</plugins>
-
-	<pluginManagement>
-	    <plugins>
-		<plugin>
-		    <groupId>org.apache.maven.plugins</groupId>
-		    <artifactId>maven-assembly-plugin</artifactId>
-		    <version>2.4</version>
-		</plugin>
-	    </plugins>
-	</pluginManagement>
-    </build>
 </project>
diff --git a/docs/glassfish/embedded-server-guide/src/main/jbake/assets/CONTRIBUTING.md b/docs/glassfish/embedded-server-guide/src/main/jbake/assets/CONTRIBUTING.md
deleted file mode 100644
index a0ebaa0..0000000
--- a/docs/glassfish/embedded-server-guide/src/main/jbake/assets/CONTRIBUTING.md
+++ /dev/null
@@ -1,57 +0,0 @@
-# Contributing to Eclipse GlassFish
-
-Thanks for your interest in this project.
-
-## Project description
-
-Eclipse GlassFish is a complete application server that implements the Jakarta
-EE specification. GlassFish includes implementations of all required and
-optional Jakarta EE APIs, and passes all Jakarta EE TCKs. GlassFish also
-includes a complete administration console, clustering support, and other
-developer and production focused tools and features.
-
-* https://projects.eclipse.org/projects/ee4j.glassfish
-
-## Developer resources
-
-Information regarding source code management, builds, coding standards, and
-more.
-
-* https://projects.eclipse.org/projects/ee4j.glassfish/developer
-
-The project maintains the following source code repositories
-
-* https://github.com/eclipse-ee4j/glassfish-ha-api
-* https://github.com/eclipse-ee4j/glassfish-logging-annotation-processor
-* https://github.com/eclipse-ee4j/glassfish-shoal
-* https://github.com/eclipse-ee4j/glassfish-cdi-porting-tck
-* https://github.com/eclipse-ee4j/glassfish-jsftemplating
-* https://github.com/eclipse-ee4j/glassfish-hk2-extra
-* https://github.com/eclipse-ee4j/glassfish-hk2
-* https://github.com/eclipse-ee4j/glassfish-fighterfish
-* https://github.com/eclipse-ee4j/glassfish
-* https://github.com/eclipse-ee4j/glassfish-maven-embedded-plugin
-* https://github.com/eclipse-ee4j/bvtck-porting
-
-## Eclipse Contributor Agreement
-
-Before your contribution can be accepted by the project team contributors must
-electronically sign the Eclipse Contributor Agreement (ECA).
-
-* http://www.eclipse.org/legal/ECA.php
-
-Commits that are provided by non-committers must have a Signed-off-by field in
-the footer indicating that the author is aware of the terms by which the
-contribution has been provided to the project. The non-committer must
-additionally have an Eclipse Foundation account and must have a signed Eclipse
-Contributor Agreement (ECA) on file.
-
-For more information, please see the Eclipse Committer Handbook:
-https://www.eclipse.org/projects/handbook/#resources-commit
-
-## Contact
-
-Contact the project developers via the project's "dev" list.
-
-* https://accounts.eclipse.org/mailing-list/glassfish-dev
-
diff --git a/docs/glassfish/embedded-server-guide/src/main/jbake/assets/LICENSE.md b/docs/glassfish/embedded-server-guide/src/main/jbake/assets/LICENSE.md
deleted file mode 100644
index f046098..0000000
--- a/docs/glassfish/embedded-server-guide/src/main/jbake/assets/LICENSE.md
+++ /dev/null
@@ -1,277 +0,0 @@
-# Eclipse Public License - v 2.0
-
-        THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE
-        PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION
-        OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
-
-    1. DEFINITIONS
-
-    "Contribution" means:
-
-      a) in the case of the initial Contributor, the initial content
-         Distributed under this Agreement, and
-
-      b) in the case of each subsequent Contributor: 
-         i) changes to the Program, and 
-         ii) additions to the Program;
-      where such changes and/or additions to the Program originate from
-      and are Distributed by that particular Contributor. A Contribution
-      "originates" from a Contributor if it was added to the Program by
-      such Contributor itself or anyone acting on such Contributor's behalf.
-      Contributions do not include changes or additions to the Program that
-      are not Modified Works.
-
-    "Contributor" means any person or entity that Distributes the Program.
-
-    "Licensed Patents" mean patent claims licensable by a Contributor which
-    are necessarily infringed by the use or sale of its Contribution alone
-    or when combined with the Program.
-
-    "Program" means the Contributions Distributed in accordance with this
-    Agreement.
-
-    "Recipient" means anyone who receives the Program under this Agreement
-    or any Secondary License (as applicable), including Contributors.
-
-    "Derivative Works" shall mean any work, whether in Source Code or other
-    form, that is based on (or derived from) the Program and for which the
-    editorial revisions, annotations, elaborations, or other modifications
-    represent, as a whole, an original work of authorship.
-
-    "Modified Works" shall mean any work in Source Code or other form that
-    results from an addition to, deletion from, or modification of the
-    contents of the Program, including, for purposes of clarity any new file
-    in Source Code form that contains any contents of the Program. Modified
-    Works shall not include works that contain only declarations,
-    interfaces, types, classes, structures, or files of the Program solely
-    in each case in order to link to, bind by name, or subclass the Program
-    or Modified Works thereof.
-
-    "Distribute" means the acts of a) distributing or b) making available
-    in any manner that enables the transfer of a copy.
-
-    "Source Code" means the form of a Program preferred for making
-    modifications, including but not limited to software source code,
-    documentation source, and configuration files.
-
-    "Secondary License" means either the GNU General Public License,
-    Version 2.0, or any later versions of that license, including any
-    exceptions or additional permissions as identified by the initial
-    Contributor.
-
-    2. GRANT OF RIGHTS
-
-      a) Subject to the terms of this Agreement, each Contributor hereby
-      grants Recipient a non-exclusive, worldwide, royalty-free copyright
-      license to reproduce, prepare Derivative Works of, publicly display,
-      publicly perform, Distribute and sublicense the Contribution of such
-      Contributor, if any, and such Derivative Works.
-
-      b) Subject to the terms of this Agreement, each Contributor hereby
-      grants Recipient a non-exclusive, worldwide, royalty-free patent
-      license under Licensed Patents to make, use, sell, offer to sell,
-      import and otherwise transfer the Contribution of such Contributor,
-      if any, in Source Code or other form. This patent license shall
-      apply to the combination of the Contribution and the Program if, at
-      the time the Contribution is added by the Contributor, such addition
-      of the Contribution causes such combination to be covered by the
-      Licensed Patents. The patent license shall not apply to any other
-      combinations which include the Contribution. No hardware per se is
-      licensed hereunder.
-
-      c) Recipient understands that although each Contributor grants the
-      licenses to its Contributions set forth herein, no assurances are
-      provided by any Contributor that the Program does not infringe the
-      patent or other intellectual property rights of any other entity.
-      Each Contributor disclaims any liability to Recipient for claims
-      brought by any other entity based on infringement of intellectual
-      property rights or otherwise. As a condition to exercising the
-      rights and licenses granted hereunder, each Recipient hereby
-      assumes sole responsibility to secure any other intellectual
-      property rights needed, if any. For example, if a third party
-      patent license is required to allow Recipient to Distribute the
-      Program, it is Recipient's responsibility to acquire that license
-      before distributing the Program.
-
-      d) Each Contributor represents that to its knowledge it has
-      sufficient copyright rights in its Contribution, if any, to grant
-      the copyright license set forth in this Agreement.
-
-      e) Notwithstanding the terms of any Secondary License, no
-      Contributor makes additional grants to any Recipient (other than
-      those set forth in this Agreement) as a result of such Recipient's
-      receipt of the Program under the terms of a Secondary License
-      (if permitted under the terms of Section 3).
-
-    3. REQUIREMENTS
-
-    3.1 If a Contributor Distributes the Program in any form, then:
-
-      a) the Program must also be made available as Source Code, in
-      accordance with section 3.2, and the Contributor must accompany
-      the Program with a statement that the Source Code for the Program
-      is available under this Agreement, and informs Recipients how to
-      obtain it in a reasonable manner on or through a medium customarily
-      used for software exchange; and
-
-      b) the Contributor may Distribute the Program under a license
-      different than this Agreement, provided that such license:
-         i) effectively disclaims on behalf of all other Contributors all
-         warranties and conditions, express and implied, including
-         warranties or conditions of title and non-infringement, and
-         implied warranties or conditions of merchantability and fitness
-         for a particular purpose;
-
-         ii) effectively excludes on behalf of all other Contributors all
-         liability for damages, including direct, indirect, special,
-         incidental and consequential damages, such as lost profits;
-
-         iii) does not attempt to limit or alter the recipients' rights
-         in the Source Code under section 3.2; and
-
-         iv) requires any subsequent distribution of the Program by any
-         party to be under a license that satisfies the requirements
-         of this section 3.
-
-    3.2 When the Program is Distributed as Source Code:
-
-      a) it must be made available under this Agreement, or if the
-      Program (i) is combined with other material in a separate file or
-      files made available under a Secondary License, and (ii) the initial
-      Contributor attached to the Source Code the notice described in
-      Exhibit A of this Agreement, then the Program may be made available
-      under the terms of such Secondary Licenses, and
-
-      b) a copy of this Agreement must be included with each copy of
-      the Program.
-
-    3.3 Contributors may not remove or alter any copyright, patent,
-    trademark, attribution notices, disclaimers of warranty, or limitations
-    of liability ("notices") contained within the Program from any copy of
-    the Program which they Distribute, provided that Contributors may add
-    their own appropriate notices.
-
-    4. COMMERCIAL DISTRIBUTION
-
-    Commercial distributors of software may accept certain responsibilities
-    with respect to end users, business partners and the like. While this
-    license is intended to facilitate the commercial use of the Program,
-    the Contributor who includes the Program in a commercial product
-    offering should do so in a manner which does not create potential
-    liability for other Contributors. Therefore, if a Contributor includes
-    the Program in a commercial product offering, such Contributor
-    ("Commercial Contributor") hereby agrees to defend and indemnify every
-    other Contributor ("Indemnified Contributor") against any losses,
-    damages and costs (collectively "Losses") arising from claims, lawsuits
-    and other legal actions brought by a third party against the Indemnified
-    Contributor to the extent caused by the acts or omissions of such
-    Commercial Contributor in connection with its distribution of the Program
-    in a commercial product offering. The obligations in this section do not
-    apply to any claims or Losses relating to any actual or alleged
-    intellectual property infringement. In order to qualify, an Indemnified
-    Contributor must: a) promptly notify the Commercial Contributor in
-    writing of such claim, and b) allow the Commercial Contributor to control,
-    and cooperate with the Commercial Contributor in, the defense and any
-    related settlement negotiations. The Indemnified Contributor may
-    participate in any such claim at its own expense.
-
-    For example, a Contributor might include the Program in a commercial
-    product offering, Product X. That Contributor is then a Commercial
-    Contributor. If that Commercial Contributor then makes performance
-    claims, or offers warranties related to Product X, those performance
-    claims and warranties are such Commercial Contributor's responsibility
-    alone. Under this section, the Commercial Contributor would have to
-    defend claims against the other Contributors related to those performance
-    claims and warranties, and if a court requires any other Contributor to
-    pay any damages as a result, the Commercial Contributor must pay
-    those damages.
-
-    5. NO WARRANTY
-
-    EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT
-    PERMITTED BY APPLICABLE LAW, THE PROGRAM IS PROVIDED ON AN "AS IS"
-    BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR
-    IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF
-    TITLE, NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR
-    PURPOSE. Each Recipient is solely responsible for determining the
-    appropriateness of using and distributing the Program and assumes all
-    risks associated with its exercise of rights under this Agreement,
-    including but not limited to the risks and costs of program errors,
-    compliance with applicable laws, damage to or loss of data, programs
-    or equipment, and unavailability or interruption of operations.
-
-    6. DISCLAIMER OF LIABILITY
-
-    EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT
-    PERMITTED BY APPLICABLE LAW, NEITHER RECIPIENT NOR ANY CONTRIBUTORS
-    SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-    EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST
-    PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-    CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-    ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE
-    EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF THE
-    POSSIBILITY OF SUCH DAMAGES.
-
-    7. GENERAL
-
-    If any provision of this Agreement is invalid or unenforceable under
-    applicable law, it shall not affect the validity or enforceability of
-    the remainder of the terms of this Agreement, and without further
-    action by the parties hereto, such provision shall be reformed to the
-    minimum extent necessary to make such provision valid and enforceable.
-
-    If Recipient institutes patent litigation against any entity
-    (including a cross-claim or counterclaim in a lawsuit) alleging that the
-    Program itself (excluding combinations of the Program with other software
-    or hardware) infringes such Recipient's patent(s), then such Recipient's
-    rights granted under Section 2(b) shall terminate as of the date such
-    litigation is filed.
-
-    All Recipient's rights under this Agreement shall terminate if it
-    fails to comply with any of the material terms or conditions of this
-    Agreement and does not cure such failure in a reasonable period of
-    time after becoming aware of such noncompliance. If all Recipient's
-    rights under this Agreement terminate, Recipient agrees to cease use
-    and distribution of the Program as soon as reasonably practicable.
-    However, Recipient's obligations under this Agreement and any licenses
-    granted by Recipient relating to the Program shall continue and survive.
-
-    Everyone is permitted to copy and distribute copies of this Agreement,
-    but in order to avoid inconsistency the Agreement is copyrighted and
-    may only be modified in the following manner. The Agreement Steward
-    reserves the right to publish new versions (including revisions) of
-    this Agreement from time to time. No one other than the Agreement
-    Steward has the right to modify this Agreement. The Eclipse Foundation
-    is the initial Agreement Steward. The Eclipse Foundation may assign the
-    responsibility to serve as the Agreement Steward to a suitable separate
-    entity. Each new version of the Agreement will be given a distinguishing
-    version number. The Program (including Contributions) may always be
-    Distributed subject to the version of the Agreement under which it was
-    received. In addition, after a new version of the Agreement is published,
-    Contributor may elect to Distribute the Program (including its
-    Contributions) under the new version.
-
-    Except as expressly stated in Sections 2(a) and 2(b) above, Recipient
-    receives no rights or licenses to the intellectual property of any
-    Contributor under this Agreement, whether expressly, by implication,
-    estoppel or otherwise. All rights in the Program not expressly granted
-    under this Agreement are reserved. Nothing in this Agreement is intended
-    to be enforceable by any entity that is not a Contributor or Recipient.
-    No third-party beneficiary rights are created under this Agreement.
-
-    Exhibit A - Form of Secondary Licenses Notice
-
-    "This Source Code may also be made available under the following 
-    Secondary Licenses when the conditions for such availability set forth 
-    in the Eclipse Public License, v. 2.0 are satisfied: {name license(s),
-    version(s), and exceptions or additional permissions here}."
-
-      Simply including a copy of this Agreement, including this Exhibit A
-      is not sufficient to license the Source Code under Secondary Licenses.
-
-      If it is not possible or desirable to put the notice in a particular
-      file, then You may include the notice in a location (such as a LICENSE
-      file in a relevant directory) where a recipient would be likely to
-      look for such a notice.
-
-      You may add additional accurate notices of copyright ownership.
\ No newline at end of file
diff --git a/docs/glassfish/embedded-server-guide/src/main/jbake/assets/README.md b/docs/glassfish/embedded-server-guide/src/main/jbake/assets/README.md
deleted file mode 100644
index f8f962c..0000000
--- a/docs/glassfish/embedded-server-guide/src/main/jbake/assets/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-# About
-
-The {{site.title}} project contains the [AsciiDoc](http://asciidoc.org/)
-source code for the ...
diff --git a/docs/glassfish/embedded-server-guide/src/main/jbake/assets/_config.yml b/docs/glassfish/embedded-server-guide/src/main/jbake/assets/_config.yml
deleted file mode 100644
index c240f3b..0000000
--- a/docs/glassfish/embedded-server-guide/src/main/jbake/assets/_config.yml
+++ /dev/null
@@ -1,14 +0,0 @@
-theme: jekyll-theme-architect
-
-title: [embedded-server-guide]
-description: [Eclipse GlassFish Server Embedded Server Guide, Release 5.1]
-
-# sidebar links url
-links:
-  source: https://github.com/javaee/embedded-server-guide
-  download: https://github.com/javaee/embedded-server-guide/releases
-  #mailinglist: https://javaee.groups.io/g/embedded-server-guide
-  #javadocs:
-  docs: https://javaee.github.io/embedded-server-guide
-  #faq:
-
diff --git a/docs/glassfish/embedded-server-guide/src/main/jbake/assets/_layouts/default.html b/docs/glassfish/embedded-server-guide/src/main/jbake/assets/_layouts/default.html
deleted file mode 100644
index f896fad..0000000
--- a/docs/glassfish/embedded-server-guide/src/main/jbake/assets/_layouts/default.html
+++ /dev/null
@@ -1,100 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <meta charset='utf-8'>
-    <meta http-equiv="X-UA-Compatible" content="chrome=1">
-    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
-    <link rel="stylesheet" href="{{ '/assets/css/style.css?' | relative_url }}" media="screen" type="text/css">
-    <link rel="stylesheet" href="{{ '/assets/css/print.css' | relative_url }}" media="print" type="text/css">
-
-    <!--[if lt IE 9]>
-    <script src="//html5shiv.googlecode.com/svn/trunk/html5.js"></script>
-    <![endif]-->
-
-    <title>{{ site.title | default: site.github.repository_name }}</title>
-  </head>
-
-  <body>
-    <header>
-      <div class="inner">
-        <a href="{{ '/' | absolute_url }}">
-          <h1>{{ site.title | default: site.github.repository_name }}</h1>
-        </a>
-        <h2>{{ site.description | default: site.github.project_tagline }}</h2>
-        {% if site.github.is_project_page %}
-        <a href="{{ '/' | absolute_url }}" class="button"></a>
-        {% endif %}
-      </div>
-    </header>
-
-    <div id="content-wrapper">
-      <div class="inner clearfix">
-        <section id="main-content">
-          {{ content }}
-
-        </section>
-
-        <aside id="sidebar">
-          
-          <hr/>
-
-          <div class="moveright">
-            {% if site.links.source %}
-               <h2><a href="{{ site.links.source }}"><p>Sources</p></a></h2>
-            {% endif %}
-            
-            {% if site.links.javadocs %}
-              <h2><a href="{{ site.links.javadocs }}"><p>APIs</p></a></h2>
-            {% endif %}
-
-            {% if site.links.docs %}
-              <h2><a href="{{ site.links.docs }}"><p>Documentation</p></a></h2>
-            {% endif %}
-
-            {% if site.links.faq %}
-              <h2><a href="{{ site.links.faq }}"><p>FAQ</p></a></h2>
-            {% endif %}
-            
-            {% if site.links.download %}
-               <h2><a href="{{ site.links.download }}"><p>Download</p></a></h2>
-            {% endif %}
-
-            {% if site.links.hide_issuetracker != true %}
-            <h2><a href="{{ site.github.issues_url }}"><p>Issue Tracker</p></a></h2>
-            {% endif %}
-
-            {% if site.links.mailinglist %}
-               <h2><a href="{{ site.links.mailinglist }}"><p>Mailing List</p></a></h2>
-            {% endif %}          
-
-            <h2><a href="CONTRIBUTING"><p>Contribute</p></a></h2>
-
-            <h2><a href="LICENSE"><p>License</p></a></h2>
-          </div>
-          
-          <hr/>
-          
-          <div class="sponsor">
-            <p>Sponsored by<a href="http://www.oracle.com" class="oraclelogo"></a></p>
-          </div>
-          
-        </aside>
-      </div>
-    </div>
-
-    <div class="footer"><a id="copyright" class="oracle" href="https://www.oracle.com/legal/copyright.html">&copy; Oracle</a> | By contributing to this project, you are agreeing to the terms of use described <a href="CONTRIBUTING">here</a>.</div>
-
-    {% if site.google_analytics %}
-      <script type="text/javascript">
-        var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
-        document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));
-      </script>
-      <script type="text/javascript">
-        try {
-          var pageTracker = _gat._getTracker("{{ site.google_analytics }}");
-        pageTracker._trackPageview();
-        } catch(err) {}
-      </script>
-    {% endif %}
-  </body>
-</html>
diff --git a/docs/glassfish/embedded-server-guide/src/main/jbake/assets/assets/css/print.scss b/docs/glassfish/embedded-server-guide/src/main/jbake/assets/assets/css/print.scss
deleted file mode 100644
index 6115d8d..0000000
--- a/docs/glassfish/embedded-server-guide/src/main/jbake/assets/assets/css/print.scss
+++ /dev/null
@@ -1,8 +0,0 @@
----
----
-
-@import "{{ site.theme }}";
-h1 {
-  font-size: 1.8em;
-}
-
diff --git a/docs/glassfish/embedded-server-guide/src/main/jbake/assets/assets/css/style.scss b/docs/glassfish/embedded-server-guide/src/main/jbake/assets/assets/css/style.scss
deleted file mode 100644
index 3cf8c1a..0000000
--- a/docs/glassfish/embedded-server-guide/src/main/jbake/assets/assets/css/style.scss
+++ /dev/null
@@ -1,246 +0,0 @@
----
----
-
-@import "{{ site.theme }}";
-
-header {
-  padding-top: 16px;
-  padding-bottom: 40px;
-  font-family: 'Mukta Vaani', 'Open Sans', 'Helvetica Neue', Helvetica, Arial, serif;
-  background: url(../images/header-bkg.jpg) 0 0 repeat-x;
-  border-bottom: solid 1px #E0E0E0;  
-}
-
-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; // orange
-  //color: #2879d0; // blue
-  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;
-}
-
-a {
-  font-weight: 300;
-  color: #2879d0;
-}
-
-a:hover { 
-  text-decoration: underline;
-}
-
-#sidebar p {
-  font-size: 1em;
-  margin-bottom: 1em;
-}
-
-.highlight { 
-  background-color: #ffffff;
-}
-
-.sponsor {
-  float: left;
-  padding-top: 20px;
-  padding-left: 18px;
-}
-
-.moveright30{
-  padding-left: 30px;
-}
-
-.moveright{
-  padding-left: 40px;
-}
-
-.moveright50{
-  padding-left: 50px;
-}
-
-/*
-a.oraclelogo {
-  position: absolute;
-  background: transparent url(../images/Oracle-logo.png) 0 0 no-repeat;
-  background-position: 2px -2px; 
-  background-size: 100% ;
-  width: 96px;
-  height: 62px;
-  padding-top: 2px;
-  padding-right: 20px;
-}
-*/
-
-aside#sidebar {
-  padding-top: 40px;
-  line-height: 1.2;
-}
-
-hr {
-  border:none;
-  height: 10px;
-  width: 75%;
-  height: 50px;
-  margin-top: 0;
-  border-bottom: 1px solid #cccccc;
-  box-shadow: 0 20px 20px -20px #aaa;
-  margin: -48px auto 10px; 
-}
-
-table {
-   margin-bottom: 20px;
-}
-
-th, td {
-  padding: .2em;
-}
-
-td {
-  font-weight: 400;
-}
-
-ul {
-  font-size: 1em;
-  margin-left: 12px;
-}
-
-ol {
-    list-style-position: inside;
-    list-style: decimal;
-    margin-left: 26px;
-}
-
-blockquote {
-    padding: 0 0 0 10px;
-    margin-left: 14px;
-    margin-bottom: 2px;
-    font-size: 1em;
-    border-left: 4px solid #ddd;
-}
-
-#main-content h1 {
-  padding-top: .6em;
-  font-family: 'Mukta Vaani', 'Open Sans', 'Helvetica Neue', Helvetica, Arial, serif;
-  font-size: 1.6em;
-  font-weight: 500;
-  color : #666;
-  text-indent: 16px;
-  letter-spacing: 0px;
-  border-bottom:1px solid #cccccc;
-  padding-bottom:1px;
-  line-height: 1.2;
-  //margin: .6em 0;
-  margin-bottom: .6em;
-}
-
-#main-content h1:before {
-  //padding-right: 0.3em;
-  margin-left: -1em;
-  content: "";
-}
-
-#main-content h2 {
-  margin-bottom: 8px;
-  font-family: 'Mukta Vaani', 'Open Sans', 'Helvetica Neue', Helvetica, Arial, serif;
-  font-size: 1.4em;
-  font-weight: 400;
-  //color: #474747;
-  color: #3c657b; // blue
-  text-indent: 4px;
-}
-
-#main-content h2:before {
-  padding-right: 1.3em;
-  margin-left: -1.5em;
-  content: "";
-  font-weight: 700;
-}
-
-#main-content h3 {
-  text-indent: 24px;
-  margin-bottom: 8px;
-  font-family: 'Mukta Vaani', 'Open Sans', 'Helvetica Neue', Helvetica, Arial, serif;
-  font-size: 1.2em;
-  font-weight: 500;
-  color: #3c657b;
-  text-indent: 4px;
-}
-
-#main-content h3:before {
-  content: "";
-  margin-left: -0.3em;
-  padding-right: 0.1em;
-}
-
-#main-content h4 {
-  margin-bottom: 8px;
-  font-family: 'Mukta Vaani', 'Open Sans', 'Helvetica Neue', Helvetica, Arial, serif;
-  font-size: 1.2em;
-  font-weight: 500;
-  color: #3c657b;
-  text-indent: 4px;
-}
-
-#main-content h4:before {
-  content: "";
-  margin-left: -0.3em;
-  padding-right: 0.1em;
-}
-
-#main-content p {
-  font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, serif;
-  font-weight: normal;
-  font-size: 1em;
-  margin-bottom: 2px;
-}
-
-.footer {
-  position: fixed; 
-  bottom: 0;
-  left: 0;
-  right: 0;
-  height: 6px;
-  background-color: #f0f0f0;
-  //padding: 1rem;
-  padding-top: 4px;
-  padding-bottom: 14px;
-  font-size: 0.8em;
-  text-align: center;
-}
-
-.oracle {
-  color: #666;
-  font-weight: 400;
-}
-
-.oracle:hover { 
-  text-decoration: none;
-  color: #FF0000;
-}
-
-.fullpage {
-  //float: center;
-  color: FF0000;
-  width: 900px;
-}
\ No newline at end of file
diff --git a/docs/glassfish/embedded-server-guide/src/main/jbake/assets/assets/images/header-bkg.jpg b/docs/glassfish/embedded-server-guide/src/main/jbake/assets/assets/images/header-bkg.jpg
deleted file mode 100644
index 481faa5..0000000
--- a/docs/glassfish/embedded-server-guide/src/main/jbake/assets/assets/images/header-bkg.jpg
+++ /dev/null
Binary files differ
diff --git a/docs/glassfish/embedded-server-guide/src/main/jbake/content/title.adoc b/docs/glassfish/embedded-server-guide/src/main/jbake/content/title.adoc
index 627532f..a6d97d1 100644
--- a/docs/glassfish/embedded-server-guide/src/main/jbake/content/title.adoc
+++ b/docs/glassfish/embedded-server-guide/src/main/jbake/content/title.adoc
@@ -7,7 +7,7 @@
 Eclipse GlassFish Server Embedded Server Guide, Release 5.1
 ===========================================================
 
-[[glassfish-server-open-source-edition]]
+[[eclipse-glassfish-server]]
 Eclipse GlassFish Server
 ------------------------
 
@@ -53,4 +53,4 @@
 trademarks or registered trademarks of SPARC International, Inc. AMD, 
 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. 
\ No newline at end of file
+trademark of The Open Group. 
diff --git a/docs/glassfish/embedded-server-guide/src/main/jbake/templates/footer.ftl b/docs/glassfish/embedded-server-guide/src/main/jbake/templates/footer.ftl
index e7df506..131fe6c 100644
--- a/docs/glassfish/embedded-server-guide/src/main/jbake/templates/footer.ftl
+++ b/docs/glassfish/embedded-server-guide/src/main/jbake/templates/footer.ftl
@@ -36,7 +36,7 @@
 </table>
 
 <span id="copyright">
-        <img src="img/eclipse_foundation_logo_tiny.png" height="20px" alt="Eclipse Foundation Logo" align="top"/>&nbsp;            
+        <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>
 
diff --git a/docs/glassfish/error-messages-reference/pom.xml b/docs/glassfish/error-messages-reference/pom.xml
index b7f718e..5c4b892 100644
--- a/docs/glassfish/error-messages-reference/pom.xml
+++ b/docs/glassfish/error-messages-reference/pom.xml
@@ -18,106 +18,14 @@
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <groupId>org.glassfish</groupId>
+    <parent>
+        <groupId>org.glassfish.docs</groupId>
+        <artifactId>parent</artifactId>
+        <version>5.1.1-SNAPSHOT</version>
+        <relativePath>../parent</relativePath>
+    </parent>
+    <groupId>org.glassfish.docs</groupId>
     <artifactId>error-messages-reference</artifactId>
-    <packaging>pom</packaging>
-    <version>1.0.0-SNAPSHOT</version>
+    <packaging>jar</packaging>
     <name>Eclipse GlassFish Server Error Message Reference, Release 5.1</name>
-
-    <properties>
-        <site.output.dir>${project.build.directory}/staging</site.output.dir>
-        <maven.site.skip>true</maven.site.skip>
-        <maven.deploy.skip>true</maven.deploy.skip>
-    </properties>
-
-    <distributionManagement>
-        <site>
-            <url>scm:git:git@github.com:javaee/error-messages-reference.git</url>
-        </site>
-    </distributionManagement>
-
-    <build>
-        <defaultGoal>package</defaultGoal>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-enforcer-plugin</artifactId>
-                <version>1.4.1</version>
-                <executions>
-                    <execution>
-                        <id>enforce-versions</id>
-                        <goals>
-                            <goal>enforce</goal>
-                        </goals>
-                        <configuration>
-                            <rules>
-                                <requireJavaVersion>
-                                    <version>[1.8.0,1.9.0)</version>
-                                    <message>You need JDK8 or lower</message>
-                                </requireJavaVersion>
-                            </rules>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>com.blazebit</groupId>
-                <artifactId>jbake-maven-plugin</artifactId>
-                <version>1.0.0</version>
-                <configuration>
-                    <outputDirectory>${site.output.dir}</outputDirectory>
-                </configuration>
-                <executions>
-                    <execution>
-                        <id>build-site</id>
-                        <phase>generate-resources</phase>
-                        <goals>
-                            <goal>build</goal>
-                        </goals>
-                    </execution>
-                </executions>
-                <dependencies>
-                    <dependency>
-                        <groupId>org.asciidoctor</groupId>
-                        <artifactId>asciidoctorj</artifactId>
-                        <version>1.5.5</version>
-                    </dependency>
-                    <dependency>
-                        <groupId>org.asciidoctor</groupId>
-                        <artifactId>asciidoctorj-diagram</artifactId>
-                        <version>1.5.4</version>
-                    </dependency>
-                </dependencies>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-scm-publish-plugin</artifactId>
-                <version>1.1</version>
-                <executions>
-                    <execution>
-                        <id>deploy-site</id>
-                        <phase>deploy</phase>
-                        <goals>
-                            <goal>publish-scm</goal>
-                        </goals>
-                        <configuration>
-                            <scmBranch>gh-pages</scmBranch>
-                            <skipDeletedFiles>false</skipDeletedFiles>
-                            <checkinComment>Update site</checkinComment>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-	</plugins>
-
-	<pluginManagement>
-	    <plugins>
-		<plugin>
-		    <groupId>org.apache.maven.plugins</groupId>
-		    <artifactId>maven-assembly-plugin</artifactId>
-		    <version>2.4</version>
-		</plugin>
-	    </plugins>
-	</pluginManagement>
-    </build>
 </project>
diff --git a/docs/glassfish/error-messages-reference/src/main/jbake/assets/CONTRIBUTING.md b/docs/glassfish/error-messages-reference/src/main/jbake/assets/CONTRIBUTING.md
deleted file mode 100644
index a0ebaa0..0000000
--- a/docs/glassfish/error-messages-reference/src/main/jbake/assets/CONTRIBUTING.md
+++ /dev/null
@@ -1,57 +0,0 @@
-# Contributing to Eclipse GlassFish
-
-Thanks for your interest in this project.
-
-## Project description
-
-Eclipse GlassFish is a complete application server that implements the Jakarta
-EE specification. GlassFish includes implementations of all required and
-optional Jakarta EE APIs, and passes all Jakarta EE TCKs. GlassFish also
-includes a complete administration console, clustering support, and other
-developer and production focused tools and features.
-
-* https://projects.eclipse.org/projects/ee4j.glassfish
-
-## Developer resources
-
-Information regarding source code management, builds, coding standards, and
-more.
-
-* https://projects.eclipse.org/projects/ee4j.glassfish/developer
-
-The project maintains the following source code repositories
-
-* https://github.com/eclipse-ee4j/glassfish-ha-api
-* https://github.com/eclipse-ee4j/glassfish-logging-annotation-processor
-* https://github.com/eclipse-ee4j/glassfish-shoal
-* https://github.com/eclipse-ee4j/glassfish-cdi-porting-tck
-* https://github.com/eclipse-ee4j/glassfish-jsftemplating
-* https://github.com/eclipse-ee4j/glassfish-hk2-extra
-* https://github.com/eclipse-ee4j/glassfish-hk2
-* https://github.com/eclipse-ee4j/glassfish-fighterfish
-* https://github.com/eclipse-ee4j/glassfish
-* https://github.com/eclipse-ee4j/glassfish-maven-embedded-plugin
-* https://github.com/eclipse-ee4j/bvtck-porting
-
-## Eclipse Contributor Agreement
-
-Before your contribution can be accepted by the project team contributors must
-electronically sign the Eclipse Contributor Agreement (ECA).
-
-* http://www.eclipse.org/legal/ECA.php
-
-Commits that are provided by non-committers must have a Signed-off-by field in
-the footer indicating that the author is aware of the terms by which the
-contribution has been provided to the project. The non-committer must
-additionally have an Eclipse Foundation account and must have a signed Eclipse
-Contributor Agreement (ECA) on file.
-
-For more information, please see the Eclipse Committer Handbook:
-https://www.eclipse.org/projects/handbook/#resources-commit
-
-## Contact
-
-Contact the project developers via the project's "dev" list.
-
-* https://accounts.eclipse.org/mailing-list/glassfish-dev
-
diff --git a/docs/glassfish/error-messages-reference/src/main/jbake/assets/LICENSE.md b/docs/glassfish/error-messages-reference/src/main/jbake/assets/LICENSE.md
deleted file mode 100644
index f046098..0000000
--- a/docs/glassfish/error-messages-reference/src/main/jbake/assets/LICENSE.md
+++ /dev/null
@@ -1,277 +0,0 @@
-# Eclipse Public License - v 2.0
-
-        THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE
-        PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION
-        OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
-
-    1. DEFINITIONS
-
-    "Contribution" means:
-
-      a) in the case of the initial Contributor, the initial content
-         Distributed under this Agreement, and
-
-      b) in the case of each subsequent Contributor: 
-         i) changes to the Program, and 
-         ii) additions to the Program;
-      where such changes and/or additions to the Program originate from
-      and are Distributed by that particular Contributor. A Contribution
-      "originates" from a Contributor if it was added to the Program by
-      such Contributor itself or anyone acting on such Contributor's behalf.
-      Contributions do not include changes or additions to the Program that
-      are not Modified Works.
-
-    "Contributor" means any person or entity that Distributes the Program.
-
-    "Licensed Patents" mean patent claims licensable by a Contributor which
-    are necessarily infringed by the use or sale of its Contribution alone
-    or when combined with the Program.
-
-    "Program" means the Contributions Distributed in accordance with this
-    Agreement.
-
-    "Recipient" means anyone who receives the Program under this Agreement
-    or any Secondary License (as applicable), including Contributors.
-
-    "Derivative Works" shall mean any work, whether in Source Code or other
-    form, that is based on (or derived from) the Program and for which the
-    editorial revisions, annotations, elaborations, or other modifications
-    represent, as a whole, an original work of authorship.
-
-    "Modified Works" shall mean any work in Source Code or other form that
-    results from an addition to, deletion from, or modification of the
-    contents of the Program, including, for purposes of clarity any new file
-    in Source Code form that contains any contents of the Program. Modified
-    Works shall not include works that contain only declarations,
-    interfaces, types, classes, structures, or files of the Program solely
-    in each case in order to link to, bind by name, or subclass the Program
-    or Modified Works thereof.
-
-    "Distribute" means the acts of a) distributing or b) making available
-    in any manner that enables the transfer of a copy.
-
-    "Source Code" means the form of a Program preferred for making
-    modifications, including but not limited to software source code,
-    documentation source, and configuration files.
-
-    "Secondary License" means either the GNU General Public License,
-    Version 2.0, or any later versions of that license, including any
-    exceptions or additional permissions as identified by the initial
-    Contributor.
-
-    2. GRANT OF RIGHTS
-
-      a) Subject to the terms of this Agreement, each Contributor hereby
-      grants Recipient a non-exclusive, worldwide, royalty-free copyright
-      license to reproduce, prepare Derivative Works of, publicly display,
-      publicly perform, Distribute and sublicense the Contribution of such
-      Contributor, if any, and such Derivative Works.
-
-      b) Subject to the terms of this Agreement, each Contributor hereby
-      grants Recipient a non-exclusive, worldwide, royalty-free patent
-      license under Licensed Patents to make, use, sell, offer to sell,
-      import and otherwise transfer the Contribution of such Contributor,
-      if any, in Source Code or other form. This patent license shall
-      apply to the combination of the Contribution and the Program if, at
-      the time the Contribution is added by the Contributor, such addition
-      of the Contribution causes such combination to be covered by the
-      Licensed Patents. The patent license shall not apply to any other
-      combinations which include the Contribution. No hardware per se is
-      licensed hereunder.
-
-      c) Recipient understands that although each Contributor grants the
-      licenses to its Contributions set forth herein, no assurances are
-      provided by any Contributor that the Program does not infringe the
-      patent or other intellectual property rights of any other entity.
-      Each Contributor disclaims any liability to Recipient for claims
-      brought by any other entity based on infringement of intellectual
-      property rights or otherwise. As a condition to exercising the
-      rights and licenses granted hereunder, each Recipient hereby
-      assumes sole responsibility to secure any other intellectual
-      property rights needed, if any. For example, if a third party
-      patent license is required to allow Recipient to Distribute the
-      Program, it is Recipient's responsibility to acquire that license
-      before distributing the Program.
-
-      d) Each Contributor represents that to its knowledge it has
-      sufficient copyright rights in its Contribution, if any, to grant
-      the copyright license set forth in this Agreement.
-
-      e) Notwithstanding the terms of any Secondary License, no
-      Contributor makes additional grants to any Recipient (other than
-      those set forth in this Agreement) as a result of such Recipient's
-      receipt of the Program under the terms of a Secondary License
-      (if permitted under the terms of Section 3).
-
-    3. REQUIREMENTS
-
-    3.1 If a Contributor Distributes the Program in any form, then:
-
-      a) the Program must also be made available as Source Code, in
-      accordance with section 3.2, and the Contributor must accompany
-      the Program with a statement that the Source Code for the Program
-      is available under this Agreement, and informs Recipients how to
-      obtain it in a reasonable manner on or through a medium customarily
-      used for software exchange; and
-
-      b) the Contributor may Distribute the Program under a license
-      different than this Agreement, provided that such license:
-         i) effectively disclaims on behalf of all other Contributors all
-         warranties and conditions, express and implied, including
-         warranties or conditions of title and non-infringement, and
-         implied warranties or conditions of merchantability and fitness
-         for a particular purpose;
-
-         ii) effectively excludes on behalf of all other Contributors all
-         liability for damages, including direct, indirect, special,
-         incidental and consequential damages, such as lost profits;
-
-         iii) does not attempt to limit or alter the recipients' rights
-         in the Source Code under section 3.2; and
-
-         iv) requires any subsequent distribution of the Program by any
-         party to be under a license that satisfies the requirements
-         of this section 3.
-
-    3.2 When the Program is Distributed as Source Code:
-
-      a) it must be made available under this Agreement, or if the
-      Program (i) is combined with other material in a separate file or
-      files made available under a Secondary License, and (ii) the initial
-      Contributor attached to the Source Code the notice described in
-      Exhibit A of this Agreement, then the Program may be made available
-      under the terms of such Secondary Licenses, and
-
-      b) a copy of this Agreement must be included with each copy of
-      the Program.
-
-    3.3 Contributors may not remove or alter any copyright, patent,
-    trademark, attribution notices, disclaimers of warranty, or limitations
-    of liability ("notices") contained within the Program from any copy of
-    the Program which they Distribute, provided that Contributors may add
-    their own appropriate notices.
-
-    4. COMMERCIAL DISTRIBUTION
-
-    Commercial distributors of software may accept certain responsibilities
-    with respect to end users, business partners and the like. While this
-    license is intended to facilitate the commercial use of the Program,
-    the Contributor who includes the Program in a commercial product
-    offering should do so in a manner which does not create potential
-    liability for other Contributors. Therefore, if a Contributor includes
-    the Program in a commercial product offering, such Contributor
-    ("Commercial Contributor") hereby agrees to defend and indemnify every
-    other Contributor ("Indemnified Contributor") against any losses,
-    damages and costs (collectively "Losses") arising from claims, lawsuits
-    and other legal actions brought by a third party against the Indemnified
-    Contributor to the extent caused by the acts or omissions of such
-    Commercial Contributor in connection with its distribution of the Program
-    in a commercial product offering. The obligations in this section do not
-    apply to any claims or Losses relating to any actual or alleged
-    intellectual property infringement. In order to qualify, an Indemnified
-    Contributor must: a) promptly notify the Commercial Contributor in
-    writing of such claim, and b) allow the Commercial Contributor to control,
-    and cooperate with the Commercial Contributor in, the defense and any
-    related settlement negotiations. The Indemnified Contributor may
-    participate in any such claim at its own expense.
-
-    For example, a Contributor might include the Program in a commercial
-    product offering, Product X. That Contributor is then a Commercial
-    Contributor. If that Commercial Contributor then makes performance
-    claims, or offers warranties related to Product X, those performance
-    claims and warranties are such Commercial Contributor's responsibility
-    alone. Under this section, the Commercial Contributor would have to
-    defend claims against the other Contributors related to those performance
-    claims and warranties, and if a court requires any other Contributor to
-    pay any damages as a result, the Commercial Contributor must pay
-    those damages.
-
-    5. NO WARRANTY
-
-    EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT
-    PERMITTED BY APPLICABLE LAW, THE PROGRAM IS PROVIDED ON AN "AS IS"
-    BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR
-    IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF
-    TITLE, NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR
-    PURPOSE. Each Recipient is solely responsible for determining the
-    appropriateness of using and distributing the Program and assumes all
-    risks associated with its exercise of rights under this Agreement,
-    including but not limited to the risks and costs of program errors,
-    compliance with applicable laws, damage to or loss of data, programs
-    or equipment, and unavailability or interruption of operations.
-
-    6. DISCLAIMER OF LIABILITY
-
-    EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT
-    PERMITTED BY APPLICABLE LAW, NEITHER RECIPIENT NOR ANY CONTRIBUTORS
-    SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-    EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST
-    PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-    CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-    ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE
-    EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF THE
-    POSSIBILITY OF SUCH DAMAGES.
-
-    7. GENERAL
-
-    If any provision of this Agreement is invalid or unenforceable under
-    applicable law, it shall not affect the validity or enforceability of
-    the remainder of the terms of this Agreement, and without further
-    action by the parties hereto, such provision shall be reformed to the
-    minimum extent necessary to make such provision valid and enforceable.
-
-    If Recipient institutes patent litigation against any entity
-    (including a cross-claim or counterclaim in a lawsuit) alleging that the
-    Program itself (excluding combinations of the Program with other software
-    or hardware) infringes such Recipient's patent(s), then such Recipient's
-    rights granted under Section 2(b) shall terminate as of the date such
-    litigation is filed.
-
-    All Recipient's rights under this Agreement shall terminate if it
-    fails to comply with any of the material terms or conditions of this
-    Agreement and does not cure such failure in a reasonable period of
-    time after becoming aware of such noncompliance. If all Recipient's
-    rights under this Agreement terminate, Recipient agrees to cease use
-    and distribution of the Program as soon as reasonably practicable.
-    However, Recipient's obligations under this Agreement and any licenses
-    granted by Recipient relating to the Program shall continue and survive.
-
-    Everyone is permitted to copy and distribute copies of this Agreement,
-    but in order to avoid inconsistency the Agreement is copyrighted and
-    may only be modified in the following manner. The Agreement Steward
-    reserves the right to publish new versions (including revisions) of
-    this Agreement from time to time. No one other than the Agreement
-    Steward has the right to modify this Agreement. The Eclipse Foundation
-    is the initial Agreement Steward. The Eclipse Foundation may assign the
-    responsibility to serve as the Agreement Steward to a suitable separate
-    entity. Each new version of the Agreement will be given a distinguishing
-    version number. The Program (including Contributions) may always be
-    Distributed subject to the version of the Agreement under which it was
-    received. In addition, after a new version of the Agreement is published,
-    Contributor may elect to Distribute the Program (including its
-    Contributions) under the new version.
-
-    Except as expressly stated in Sections 2(a) and 2(b) above, Recipient
-    receives no rights or licenses to the intellectual property of any
-    Contributor under this Agreement, whether expressly, by implication,
-    estoppel or otherwise. All rights in the Program not expressly granted
-    under this Agreement are reserved. Nothing in this Agreement is intended
-    to be enforceable by any entity that is not a Contributor or Recipient.
-    No third-party beneficiary rights are created under this Agreement.
-
-    Exhibit A - Form of Secondary Licenses Notice
-
-    "This Source Code may also be made available under the following 
-    Secondary Licenses when the conditions for such availability set forth 
-    in the Eclipse Public License, v. 2.0 are satisfied: {name license(s),
-    version(s), and exceptions or additional permissions here}."
-
-      Simply including a copy of this Agreement, including this Exhibit A
-      is not sufficient to license the Source Code under Secondary Licenses.
-
-      If it is not possible or desirable to put the notice in a particular
-      file, then You may include the notice in a location (such as a LICENSE
-      file in a relevant directory) where a recipient would be likely to
-      look for such a notice.
-
-      You may add additional accurate notices of copyright ownership.
\ No newline at end of file
diff --git a/docs/glassfish/error-messages-reference/src/main/jbake/assets/README.md b/docs/glassfish/error-messages-reference/src/main/jbake/assets/README.md
deleted file mode 100644
index f8f962c..0000000
--- a/docs/glassfish/error-messages-reference/src/main/jbake/assets/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-# About
-
-The {{site.title}} project contains the [AsciiDoc](http://asciidoc.org/)
-source code for the ...
diff --git a/docs/glassfish/error-messages-reference/src/main/jbake/assets/_config.yml b/docs/glassfish/error-messages-reference/src/main/jbake/assets/_config.yml
deleted file mode 100644
index dbe0236..0000000
--- a/docs/glassfish/error-messages-reference/src/main/jbake/assets/_config.yml
+++ /dev/null
@@ -1,14 +0,0 @@
-theme: jekyll-theme-architect
-
-title: [error-messages-reference]
-description: [Eclipse GlassFish Server Error Message Reference, Release 5.1]
-
-# sidebar links url
-links:
-  source: https://github.com/javaee/error-messages-reference
-  download: https://github.com/javaee/error-messages-reference/releases
-  #mailinglist: https://javaee.groups.io/g/error-messages-reference
-  #javadocs:
-  docs: https://javaee.github.io/error-messages-reference
-  #faq:
-
diff --git a/docs/glassfish/error-messages-reference/src/main/jbake/assets/_layouts/default.html b/docs/glassfish/error-messages-reference/src/main/jbake/assets/_layouts/default.html
deleted file mode 100644
index f896fad..0000000
--- a/docs/glassfish/error-messages-reference/src/main/jbake/assets/_layouts/default.html
+++ /dev/null
@@ -1,100 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <meta charset='utf-8'>
-    <meta http-equiv="X-UA-Compatible" content="chrome=1">
-    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
-    <link rel="stylesheet" href="{{ '/assets/css/style.css?' | relative_url }}" media="screen" type="text/css">
-    <link rel="stylesheet" href="{{ '/assets/css/print.css' | relative_url }}" media="print" type="text/css">
-
-    <!--[if lt IE 9]>
-    <script src="//html5shiv.googlecode.com/svn/trunk/html5.js"></script>
-    <![endif]-->
-
-    <title>{{ site.title | default: site.github.repository_name }}</title>
-  </head>
-
-  <body>
-    <header>
-      <div class="inner">
-        <a href="{{ '/' | absolute_url }}">
-          <h1>{{ site.title | default: site.github.repository_name }}</h1>
-        </a>
-        <h2>{{ site.description | default: site.github.project_tagline }}</h2>
-        {% if site.github.is_project_page %}
-        <a href="{{ '/' | absolute_url }}" class="button"></a>
-        {% endif %}
-      </div>
-    </header>
-
-    <div id="content-wrapper">
-      <div class="inner clearfix">
-        <section id="main-content">
-          {{ content }}
-
-        </section>
-
-        <aside id="sidebar">
-          
-          <hr/>
-
-          <div class="moveright">
-            {% if site.links.source %}
-               <h2><a href="{{ site.links.source }}"><p>Sources</p></a></h2>
-            {% endif %}
-            
-            {% if site.links.javadocs %}
-              <h2><a href="{{ site.links.javadocs }}"><p>APIs</p></a></h2>
-            {% endif %}
-
-            {% if site.links.docs %}
-              <h2><a href="{{ site.links.docs }}"><p>Documentation</p></a></h2>
-            {% endif %}
-
-            {% if site.links.faq %}
-              <h2><a href="{{ site.links.faq }}"><p>FAQ</p></a></h2>
-            {% endif %}
-            
-            {% if site.links.download %}
-               <h2><a href="{{ site.links.download }}"><p>Download</p></a></h2>
-            {% endif %}
-
-            {% if site.links.hide_issuetracker != true %}
-            <h2><a href="{{ site.github.issues_url }}"><p>Issue Tracker</p></a></h2>
-            {% endif %}
-
-            {% if site.links.mailinglist %}
-               <h2><a href="{{ site.links.mailinglist }}"><p>Mailing List</p></a></h2>
-            {% endif %}          
-
-            <h2><a href="CONTRIBUTING"><p>Contribute</p></a></h2>
-
-            <h2><a href="LICENSE"><p>License</p></a></h2>
-          </div>
-          
-          <hr/>
-          
-          <div class="sponsor">
-            <p>Sponsored by<a href="http://www.oracle.com" class="oraclelogo"></a></p>
-          </div>
-          
-        </aside>
-      </div>
-    </div>
-
-    <div class="footer"><a id="copyright" class="oracle" href="https://www.oracle.com/legal/copyright.html">&copy; Oracle</a> | By contributing to this project, you are agreeing to the terms of use described <a href="CONTRIBUTING">here</a>.</div>
-
-    {% if site.google_analytics %}
-      <script type="text/javascript">
-        var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
-        document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));
-      </script>
-      <script type="text/javascript">
-        try {
-          var pageTracker = _gat._getTracker("{{ site.google_analytics }}");
-        pageTracker._trackPageview();
-        } catch(err) {}
-      </script>
-    {% endif %}
-  </body>
-</html>
diff --git a/docs/glassfish/error-messages-reference/src/main/jbake/assets/assets/css/print.scss b/docs/glassfish/error-messages-reference/src/main/jbake/assets/assets/css/print.scss
deleted file mode 100644
index 6115d8d..0000000
--- a/docs/glassfish/error-messages-reference/src/main/jbake/assets/assets/css/print.scss
+++ /dev/null
@@ -1,8 +0,0 @@
----
----
-
-@import "{{ site.theme }}";
-h1 {
-  font-size: 1.8em;
-}
-
diff --git a/docs/glassfish/error-messages-reference/src/main/jbake/assets/assets/css/style.scss b/docs/glassfish/error-messages-reference/src/main/jbake/assets/assets/css/style.scss
deleted file mode 100644
index 3cf8c1a..0000000
--- a/docs/glassfish/error-messages-reference/src/main/jbake/assets/assets/css/style.scss
+++ /dev/null
@@ -1,246 +0,0 @@
----
----
-
-@import "{{ site.theme }}";
-
-header {
-  padding-top: 16px;
-  padding-bottom: 40px;
-  font-family: 'Mukta Vaani', 'Open Sans', 'Helvetica Neue', Helvetica, Arial, serif;
-  background: url(../images/header-bkg.jpg) 0 0 repeat-x;
-  border-bottom: solid 1px #E0E0E0;  
-}
-
-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; // orange
-  //color: #2879d0; // blue
-  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;
-}
-
-a {
-  font-weight: 300;
-  color: #2879d0;
-}
-
-a:hover { 
-  text-decoration: underline;
-}
-
-#sidebar p {
-  font-size: 1em;
-  margin-bottom: 1em;
-}
-
-.highlight { 
-  background-color: #ffffff;
-}
-
-.sponsor {
-  float: left;
-  padding-top: 20px;
-  padding-left: 18px;
-}
-
-.moveright30{
-  padding-left: 30px;
-}
-
-.moveright{
-  padding-left: 40px;
-}
-
-.moveright50{
-  padding-left: 50px;
-}
-
-/*
-a.oraclelogo {
-  position: absolute;
-  background: transparent url(../images/Oracle-logo.png) 0 0 no-repeat;
-  background-position: 2px -2px; 
-  background-size: 100% ;
-  width: 96px;
-  height: 62px;
-  padding-top: 2px;
-  padding-right: 20px;
-}
-*/
-
-aside#sidebar {
-  padding-top: 40px;
-  line-height: 1.2;
-}
-
-hr {
-  border:none;
-  height: 10px;
-  width: 75%;
-  height: 50px;
-  margin-top: 0;
-  border-bottom: 1px solid #cccccc;
-  box-shadow: 0 20px 20px -20px #aaa;
-  margin: -48px auto 10px; 
-}
-
-table {
-   margin-bottom: 20px;
-}
-
-th, td {
-  padding: .2em;
-}
-
-td {
-  font-weight: 400;
-}
-
-ul {
-  font-size: 1em;
-  margin-left: 12px;
-}
-
-ol {
-    list-style-position: inside;
-    list-style: decimal;
-    margin-left: 26px;
-}
-
-blockquote {
-    padding: 0 0 0 10px;
-    margin-left: 14px;
-    margin-bottom: 2px;
-    font-size: 1em;
-    border-left: 4px solid #ddd;
-}
-
-#main-content h1 {
-  padding-top: .6em;
-  font-family: 'Mukta Vaani', 'Open Sans', 'Helvetica Neue', Helvetica, Arial, serif;
-  font-size: 1.6em;
-  font-weight: 500;
-  color : #666;
-  text-indent: 16px;
-  letter-spacing: 0px;
-  border-bottom:1px solid #cccccc;
-  padding-bottom:1px;
-  line-height: 1.2;
-  //margin: .6em 0;
-  margin-bottom: .6em;
-}
-
-#main-content h1:before {
-  //padding-right: 0.3em;
-  margin-left: -1em;
-  content: "";
-}
-
-#main-content h2 {
-  margin-bottom: 8px;
-  font-family: 'Mukta Vaani', 'Open Sans', 'Helvetica Neue', Helvetica, Arial, serif;
-  font-size: 1.4em;
-  font-weight: 400;
-  //color: #474747;
-  color: #3c657b; // blue
-  text-indent: 4px;
-}
-
-#main-content h2:before {
-  padding-right: 1.3em;
-  margin-left: -1.5em;
-  content: "";
-  font-weight: 700;
-}
-
-#main-content h3 {
-  text-indent: 24px;
-  margin-bottom: 8px;
-  font-family: 'Mukta Vaani', 'Open Sans', 'Helvetica Neue', Helvetica, Arial, serif;
-  font-size: 1.2em;
-  font-weight: 500;
-  color: #3c657b;
-  text-indent: 4px;
-}
-
-#main-content h3:before {
-  content: "";
-  margin-left: -0.3em;
-  padding-right: 0.1em;
-}
-
-#main-content h4 {
-  margin-bottom: 8px;
-  font-family: 'Mukta Vaani', 'Open Sans', 'Helvetica Neue', Helvetica, Arial, serif;
-  font-size: 1.2em;
-  font-weight: 500;
-  color: #3c657b;
-  text-indent: 4px;
-}
-
-#main-content h4:before {
-  content: "";
-  margin-left: -0.3em;
-  padding-right: 0.1em;
-}
-
-#main-content p {
-  font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, serif;
-  font-weight: normal;
-  font-size: 1em;
-  margin-bottom: 2px;
-}
-
-.footer {
-  position: fixed; 
-  bottom: 0;
-  left: 0;
-  right: 0;
-  height: 6px;
-  background-color: #f0f0f0;
-  //padding: 1rem;
-  padding-top: 4px;
-  padding-bottom: 14px;
-  font-size: 0.8em;
-  text-align: center;
-}
-
-.oracle {
-  color: #666;
-  font-weight: 400;
-}
-
-.oracle:hover { 
-  text-decoration: none;
-  color: #FF0000;
-}
-
-.fullpage {
-  //float: center;
-  color: FF0000;
-  width: 900px;
-}
\ No newline at end of file
diff --git a/docs/glassfish/error-messages-reference/src/main/jbake/assets/assets/images/header-bkg.jpg b/docs/glassfish/error-messages-reference/src/main/jbake/assets/assets/images/header-bkg.jpg
deleted file mode 100644
index 481faa5..0000000
--- a/docs/glassfish/error-messages-reference/src/main/jbake/assets/assets/images/header-bkg.jpg
+++ /dev/null
Binary files differ
diff --git a/docs/glassfish/error-messages-reference/src/main/jbake/content/title.adoc b/docs/glassfish/error-messages-reference/src/main/jbake/content/title.adoc
index d31aeac..f4c2034 100644
--- a/docs/glassfish/error-messages-reference/src/main/jbake/content/title.adoc
+++ b/docs/glassfish/error-messages-reference/src/main/jbake/content/title.adoc
@@ -7,7 +7,7 @@
 Eclipse GlassFish Server Error Message Reference, Release 5.1
 =============================================================
 
-[[glassfish-server-open-source-edition]]
+[[eclipse-glassfish-server]]
 Eclipse GlassFish Server
 ------------------------
 
@@ -43,4 +43,4 @@
 trademarks or registered trademarks of SPARC International, Inc. AMD, 
 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. 
\ No newline at end of file
+trademark of The Open Group. 
diff --git a/docs/glassfish/error-messages-reference/src/main/jbake/templates/footer.ftl b/docs/glassfish/error-messages-reference/src/main/jbake/templates/footer.ftl
index f134701..e6a9645 100644
--- a/docs/glassfish/error-messages-reference/src/main/jbake/templates/footer.ftl
+++ b/docs/glassfish/error-messages-reference/src/main/jbake/templates/footer.ftl
@@ -36,7 +36,7 @@
 </table>
 
 <span id="copyright">
-        <img src="img/eclipse_foundation_logo_tiny.png" height="20px" alt="Eclipse Foundation Logo" align="top"/>&nbsp;            
+        <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>>
 
diff --git a/docs/glassfish/ha-administration-guide/pom.xml b/docs/glassfish/ha-administration-guide/pom.xml
index 3e9930a..c204f92 100644
--- a/docs/glassfish/ha-administration-guide/pom.xml
+++ b/docs/glassfish/ha-administration-guide/pom.xml
@@ -18,106 +18,14 @@
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <groupId>org.glassfish</groupId>
+    <parent>
+        <groupId>org.glassfish.docs</groupId>
+        <artifactId>parent</artifactId>
+        <version>5.1.1-SNAPSHOT</version>
+        <relativePath>../parent</relativePath>
+    </parent>
+    <groupId>org.glassfish.docs</groupId>
     <artifactId>ha-administration-guide</artifactId>
-    <packaging>pom</packaging>
-    <version>1.0.0-SNAPSHOT</version>
+    <packaging>jar</packaging>
     <name>Eclipse GlassFish Server High Availability Administration Guide, Release 5.1</name>
-
-    <properties>
-        <site.output.dir>${project.build.directory}/staging</site.output.dir>
-        <maven.site.skip>true</maven.site.skip>
-        <maven.deploy.skip>true</maven.deploy.skip>
-    </properties>
-
-    <distributionManagement>
-        <site>
-            <url>scm:git:git@github.com:javaee/ha-administration-guide.git</url>
-        </site>
-    </distributionManagement>
-
-    <build>
-        <defaultGoal>package</defaultGoal>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-enforcer-plugin</artifactId>
-                <version>1.4.1</version>
-                <executions>
-                    <execution>
-                        <id>enforce-versions</id>
-                        <goals>
-                            <goal>enforce</goal>
-                        </goals>
-                        <configuration>
-                            <rules>
-                                <requireJavaVersion>
-                                    <version>[1.8.0,1.9.0)</version>
-                                    <message>You need JDK8 or lower</message>
-                                </requireJavaVersion>
-                            </rules>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>com.blazebit</groupId>
-                <artifactId>jbake-maven-plugin</artifactId>
-                <version>1.0.0</version>
-                <configuration>
-                    <outputDirectory>${site.output.dir}</outputDirectory>
-                </configuration>
-                <executions>
-                    <execution>
-                        <id>build-site</id>
-                        <phase>generate-resources</phase>
-                        <goals>
-                            <goal>build</goal>
-                        </goals>
-                    </execution>
-                </executions>
-                <dependencies>
-                    <dependency>
-                        <groupId>org.asciidoctor</groupId>
-                        <artifactId>asciidoctorj</artifactId>
-                        <version>1.5.5</version>
-                    </dependency>
-                    <dependency>
-                        <groupId>org.asciidoctor</groupId>
-                        <artifactId>asciidoctorj-diagram</artifactId>
-                        <version>1.5.4</version>
-                    </dependency>
-                </dependencies>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-scm-publish-plugin</artifactId>
-                <version>1.1</version>
-                <executions>
-                    <execution>
-                        <id>deploy-site</id>
-                        <phase>deploy</phase>
-                        <goals>
-                            <goal>publish-scm</goal>
-                        </goals>
-                        <configuration>
-                            <scmBranch>gh-pages</scmBranch>
-                            <skipDeletedFiles>false</skipDeletedFiles>
-                            <checkinComment>Update site</checkinComment>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-	</plugins>
-
-	<pluginManagement>
-	    <plugins>
-		<plugin>
-		    <groupId>org.apache.maven.plugins</groupId>
-		    <artifactId>maven-assembly-plugin</artifactId>
-		    <version>2.4</version>
-		</plugin>
-	    </plugins>
-	</pluginManagement>
-    </build>
 </project>
diff --git a/docs/glassfish/ha-administration-guide/src/main/jbake/assets/CONTRIBUTING.md b/docs/glassfish/ha-administration-guide/src/main/jbake/assets/CONTRIBUTING.md
deleted file mode 100644
index a0ebaa0..0000000
--- a/docs/glassfish/ha-administration-guide/src/main/jbake/assets/CONTRIBUTING.md
+++ /dev/null
@@ -1,57 +0,0 @@
-# Contributing to Eclipse GlassFish
-
-Thanks for your interest in this project.
-
-## Project description
-
-Eclipse GlassFish is a complete application server that implements the Jakarta
-EE specification. GlassFish includes implementations of all required and
-optional Jakarta EE APIs, and passes all Jakarta EE TCKs. GlassFish also
-includes a complete administration console, clustering support, and other
-developer and production focused tools and features.
-
-* https://projects.eclipse.org/projects/ee4j.glassfish
-
-## Developer resources
-
-Information regarding source code management, builds, coding standards, and
-more.
-
-* https://projects.eclipse.org/projects/ee4j.glassfish/developer
-
-The project maintains the following source code repositories
-
-* https://github.com/eclipse-ee4j/glassfish-ha-api
-* https://github.com/eclipse-ee4j/glassfish-logging-annotation-processor
-* https://github.com/eclipse-ee4j/glassfish-shoal
-* https://github.com/eclipse-ee4j/glassfish-cdi-porting-tck
-* https://github.com/eclipse-ee4j/glassfish-jsftemplating
-* https://github.com/eclipse-ee4j/glassfish-hk2-extra
-* https://github.com/eclipse-ee4j/glassfish-hk2
-* https://github.com/eclipse-ee4j/glassfish-fighterfish
-* https://github.com/eclipse-ee4j/glassfish
-* https://github.com/eclipse-ee4j/glassfish-maven-embedded-plugin
-* https://github.com/eclipse-ee4j/bvtck-porting
-
-## Eclipse Contributor Agreement
-
-Before your contribution can be accepted by the project team contributors must
-electronically sign the Eclipse Contributor Agreement (ECA).
-
-* http://www.eclipse.org/legal/ECA.php
-
-Commits that are provided by non-committers must have a Signed-off-by field in
-the footer indicating that the author is aware of the terms by which the
-contribution has been provided to the project. The non-committer must
-additionally have an Eclipse Foundation account and must have a signed Eclipse
-Contributor Agreement (ECA) on file.
-
-For more information, please see the Eclipse Committer Handbook:
-https://www.eclipse.org/projects/handbook/#resources-commit
-
-## Contact
-
-Contact the project developers via the project's "dev" list.
-
-* https://accounts.eclipse.org/mailing-list/glassfish-dev
-
diff --git a/docs/glassfish/ha-administration-guide/src/main/jbake/assets/LICENSE.md b/docs/glassfish/ha-administration-guide/src/main/jbake/assets/LICENSE.md
deleted file mode 100644
index f046098..0000000
--- a/docs/glassfish/ha-administration-guide/src/main/jbake/assets/LICENSE.md
+++ /dev/null
@@ -1,277 +0,0 @@
-# Eclipse Public License - v 2.0
-
-        THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE
-        PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION
-        OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
-
-    1. DEFINITIONS
-
-    "Contribution" means:
-
-      a) in the case of the initial Contributor, the initial content
-         Distributed under this Agreement, and
-
-      b) in the case of each subsequent Contributor: 
-         i) changes to the Program, and 
-         ii) additions to the Program;
-      where such changes and/or additions to the Program originate from
-      and are Distributed by that particular Contributor. A Contribution
-      "originates" from a Contributor if it was added to the Program by
-      such Contributor itself or anyone acting on such Contributor's behalf.
-      Contributions do not include changes or additions to the Program that
-      are not Modified Works.
-
-    "Contributor" means any person or entity that Distributes the Program.
-
-    "Licensed Patents" mean patent claims licensable by a Contributor which
-    are necessarily infringed by the use or sale of its Contribution alone
-    or when combined with the Program.
-
-    "Program" means the Contributions Distributed in accordance with this
-    Agreement.
-
-    "Recipient" means anyone who receives the Program under this Agreement
-    or any Secondary License (as applicable), including Contributors.
-
-    "Derivative Works" shall mean any work, whether in Source Code or other
-    form, that is based on (or derived from) the Program and for which the
-    editorial revisions, annotations, elaborations, or other modifications
-    represent, as a whole, an original work of authorship.
-
-    "Modified Works" shall mean any work in Source Code or other form that
-    results from an addition to, deletion from, or modification of the
-    contents of the Program, including, for purposes of clarity any new file
-    in Source Code form that contains any contents of the Program. Modified
-    Works shall not include works that contain only declarations,
-    interfaces, types, classes, structures, or files of the Program solely
-    in each case in order to link to, bind by name, or subclass the Program
-    or Modified Works thereof.
-
-    "Distribute" means the acts of a) distributing or b) making available
-    in any manner that enables the transfer of a copy.
-
-    "Source Code" means the form of a Program preferred for making
-    modifications, including but not limited to software source code,
-    documentation source, and configuration files.
-
-    "Secondary License" means either the GNU General Public License,
-    Version 2.0, or any later versions of that license, including any
-    exceptions or additional permissions as identified by the initial
-    Contributor.
-
-    2. GRANT OF RIGHTS
-
-      a) Subject to the terms of this Agreement, each Contributor hereby
-      grants Recipient a non-exclusive, worldwide, royalty-free copyright
-      license to reproduce, prepare Derivative Works of, publicly display,
-      publicly perform, Distribute and sublicense the Contribution of such
-      Contributor, if any, and such Derivative Works.
-
-      b) Subject to the terms of this Agreement, each Contributor hereby
-      grants Recipient a non-exclusive, worldwide, royalty-free patent
-      license under Licensed Patents to make, use, sell, offer to sell,
-      import and otherwise transfer the Contribution of such Contributor,
-      if any, in Source Code or other form. This patent license shall
-      apply to the combination of the Contribution and the Program if, at
-      the time the Contribution is added by the Contributor, such addition
-      of the Contribution causes such combination to be covered by the
-      Licensed Patents. The patent license shall not apply to any other
-      combinations which include the Contribution. No hardware per se is
-      licensed hereunder.
-
-      c) Recipient understands that although each Contributor grants the
-      licenses to its Contributions set forth herein, no assurances are
-      provided by any Contributor that the Program does not infringe the
-      patent or other intellectual property rights of any other entity.
-      Each Contributor disclaims any liability to Recipient for claims
-      brought by any other entity based on infringement of intellectual
-      property rights or otherwise. As a condition to exercising the
-      rights and licenses granted hereunder, each Recipient hereby
-      assumes sole responsibility to secure any other intellectual
-      property rights needed, if any. For example, if a third party
-      patent license is required to allow Recipient to Distribute the
-      Program, it is Recipient's responsibility to acquire that license
-      before distributing the Program.
-
-      d) Each Contributor represents that to its knowledge it has
-      sufficient copyright rights in its Contribution, if any, to grant
-      the copyright license set forth in this Agreement.
-
-      e) Notwithstanding the terms of any Secondary License, no
-      Contributor makes additional grants to any Recipient (other than
-      those set forth in this Agreement) as a result of such Recipient's
-      receipt of the Program under the terms of a Secondary License
-      (if permitted under the terms of Section 3).
-
-    3. REQUIREMENTS
-
-    3.1 If a Contributor Distributes the Program in any form, then:
-
-      a) the Program must also be made available as Source Code, in
-      accordance with section 3.2, and the Contributor must accompany
-      the Program with a statement that the Source Code for the Program
-      is available under this Agreement, and informs Recipients how to
-      obtain it in a reasonable manner on or through a medium customarily
-      used for software exchange; and
-
-      b) the Contributor may Distribute the Program under a license
-      different than this Agreement, provided that such license:
-         i) effectively disclaims on behalf of all other Contributors all
-         warranties and conditions, express and implied, including
-         warranties or conditions of title and non-infringement, and
-         implied warranties or conditions of merchantability and fitness
-         for a particular purpose;
-
-         ii) effectively excludes on behalf of all other Contributors all
-         liability for damages, including direct, indirect, special,
-         incidental and consequential damages, such as lost profits;
-
-         iii) does not attempt to limit or alter the recipients' rights
-         in the Source Code under section 3.2; and
-
-         iv) requires any subsequent distribution of the Program by any
-         party to be under a license that satisfies the requirements
-         of this section 3.
-
-    3.2 When the Program is Distributed as Source Code:
-
-      a) it must be made available under this Agreement, or if the
-      Program (i) is combined with other material in a separate file or
-      files made available under a Secondary License, and (ii) the initial
-      Contributor attached to the Source Code the notice described in
-      Exhibit A of this Agreement, then the Program may be made available
-      under the terms of such Secondary Licenses, and
-
-      b) a copy of this Agreement must be included with each copy of
-      the Program.
-
-    3.3 Contributors may not remove or alter any copyright, patent,
-    trademark, attribution notices, disclaimers of warranty, or limitations
-    of liability ("notices") contained within the Program from any copy of
-    the Program which they Distribute, provided that Contributors may add
-    their own appropriate notices.
-
-    4. COMMERCIAL DISTRIBUTION
-
-    Commercial distributors of software may accept certain responsibilities
-    with respect to end users, business partners and the like. While this
-    license is intended to facilitate the commercial use of the Program,
-    the Contributor who includes the Program in a commercial product
-    offering should do so in a manner which does not create potential
-    liability for other Contributors. Therefore, if a Contributor includes
-    the Program in a commercial product offering, such Contributor
-    ("Commercial Contributor") hereby agrees to defend and indemnify every
-    other Contributor ("Indemnified Contributor") against any losses,
-    damages and costs (collectively "Losses") arising from claims, lawsuits
-    and other legal actions brought by a third party against the Indemnified
-    Contributor to the extent caused by the acts or omissions of such
-    Commercial Contributor in connection with its distribution of the Program
-    in a commercial product offering. The obligations in this section do not
-    apply to any claims or Losses relating to any actual or alleged
-    intellectual property infringement. In order to qualify, an Indemnified
-    Contributor must: a) promptly notify the Commercial Contributor in
-    writing of such claim, and b) allow the Commercial Contributor to control,
-    and cooperate with the Commercial Contributor in, the defense and any
-    related settlement negotiations. The Indemnified Contributor may
-    participate in any such claim at its own expense.
-
-    For example, a Contributor might include the Program in a commercial
-    product offering, Product X. That Contributor is then a Commercial
-    Contributor. If that Commercial Contributor then makes performance
-    claims, or offers warranties related to Product X, those performance
-    claims and warranties are such Commercial Contributor's responsibility
-    alone. Under this section, the Commercial Contributor would have to
-    defend claims against the other Contributors related to those performance
-    claims and warranties, and if a court requires any other Contributor to
-    pay any damages as a result, the Commercial Contributor must pay
-    those damages.
-
-    5. NO WARRANTY
-
-    EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT
-    PERMITTED BY APPLICABLE LAW, THE PROGRAM IS PROVIDED ON AN "AS IS"
-    BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR
-    IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF
-    TITLE, NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR
-    PURPOSE. Each Recipient is solely responsible for determining the
-    appropriateness of using and distributing the Program and assumes all
-    risks associated with its exercise of rights under this Agreement,
-    including but not limited to the risks and costs of program errors,
-    compliance with applicable laws, damage to or loss of data, programs
-    or equipment, and unavailability or interruption of operations.
-
-    6. DISCLAIMER OF LIABILITY
-
-    EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT
-    PERMITTED BY APPLICABLE LAW, NEITHER RECIPIENT NOR ANY CONTRIBUTORS
-    SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-    EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST
-    PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-    CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-    ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE
-    EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF THE
-    POSSIBILITY OF SUCH DAMAGES.
-
-    7. GENERAL
-
-    If any provision of this Agreement is invalid or unenforceable under
-    applicable law, it shall not affect the validity or enforceability of
-    the remainder of the terms of this Agreement, and without further
-    action by the parties hereto, such provision shall be reformed to the
-    minimum extent necessary to make such provision valid and enforceable.
-
-    If Recipient institutes patent litigation against any entity
-    (including a cross-claim or counterclaim in a lawsuit) alleging that the
-    Program itself (excluding combinations of the Program with other software
-    or hardware) infringes such Recipient's patent(s), then such Recipient's
-    rights granted under Section 2(b) shall terminate as of the date such
-    litigation is filed.
-
-    All Recipient's rights under this Agreement shall terminate if it
-    fails to comply with any of the material terms or conditions of this
-    Agreement and does not cure such failure in a reasonable period of
-    time after becoming aware of such noncompliance. If all Recipient's
-    rights under this Agreement terminate, Recipient agrees to cease use
-    and distribution of the Program as soon as reasonably practicable.
-    However, Recipient's obligations under this Agreement and any licenses
-    granted by Recipient relating to the Program shall continue and survive.
-
-    Everyone is permitted to copy and distribute copies of this Agreement,
-    but in order to avoid inconsistency the Agreement is copyrighted and
-    may only be modified in the following manner. The Agreement Steward
-    reserves the right to publish new versions (including revisions) of
-    this Agreement from time to time. No one other than the Agreement
-    Steward has the right to modify this Agreement. The Eclipse Foundation
-    is the initial Agreement Steward. The Eclipse Foundation may assign the
-    responsibility to serve as the Agreement Steward to a suitable separate
-    entity. Each new version of the Agreement will be given a distinguishing
-    version number. The Program (including Contributions) may always be
-    Distributed subject to the version of the Agreement under which it was
-    received. In addition, after a new version of the Agreement is published,
-    Contributor may elect to Distribute the Program (including its
-    Contributions) under the new version.
-
-    Except as expressly stated in Sections 2(a) and 2(b) above, Recipient
-    receives no rights or licenses to the intellectual property of any
-    Contributor under this Agreement, whether expressly, by implication,
-    estoppel or otherwise. All rights in the Program not expressly granted
-    under this Agreement are reserved. Nothing in this Agreement is intended
-    to be enforceable by any entity that is not a Contributor or Recipient.
-    No third-party beneficiary rights are created under this Agreement.
-
-    Exhibit A - Form of Secondary Licenses Notice
-
-    "This Source Code may also be made available under the following 
-    Secondary Licenses when the conditions for such availability set forth 
-    in the Eclipse Public License, v. 2.0 are satisfied: {name license(s),
-    version(s), and exceptions or additional permissions here}."
-
-      Simply including a copy of this Agreement, including this Exhibit A
-      is not sufficient to license the Source Code under Secondary Licenses.
-
-      If it is not possible or desirable to put the notice in a particular
-      file, then You may include the notice in a location (such as a LICENSE
-      file in a relevant directory) where a recipient would be likely to
-      look for such a notice.
-
-      You may add additional accurate notices of copyright ownership.
\ No newline at end of file
diff --git a/docs/glassfish/ha-administration-guide/src/main/jbake/assets/README.md b/docs/glassfish/ha-administration-guide/src/main/jbake/assets/README.md
deleted file mode 100644
index f8f962c..0000000
--- a/docs/glassfish/ha-administration-guide/src/main/jbake/assets/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-# About
-
-The {{site.title}} project contains the [AsciiDoc](http://asciidoc.org/)
-source code for the ...
diff --git a/docs/glassfish/ha-administration-guide/src/main/jbake/assets/_config.yml b/docs/glassfish/ha-administration-guide/src/main/jbake/assets/_config.yml
deleted file mode 100644
index 1b1eaad..0000000
--- a/docs/glassfish/ha-administration-guide/src/main/jbake/assets/_config.yml
+++ /dev/null
@@ -1,14 +0,0 @@
-theme: jekyll-theme-architect
-
-title: [ha-administration-guide]
-description: [Eclipse GlassFish Server High Availability Administration Guide, Release 5.1]
-
-# sidebar links url
-links:
-  source: https://github.com/javaee/ha-administration-guide
-  download: https://github.com/javaee/ha-administration-guide/releases
-  #mailinglist: https://javaee.groups.io/g/ha-administration-guide
-  #javadocs:
-  docs: https://javaee.github.io/ha-administration-guide
-  #faq:
-
diff --git a/docs/glassfish/ha-administration-guide/src/main/jbake/assets/_layouts/default.html b/docs/glassfish/ha-administration-guide/src/main/jbake/assets/_layouts/default.html
deleted file mode 100644
index f896fad..0000000
--- a/docs/glassfish/ha-administration-guide/src/main/jbake/assets/_layouts/default.html
+++ /dev/null
@@ -1,100 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <meta charset='utf-8'>
-    <meta http-equiv="X-UA-Compatible" content="chrome=1">
-    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
-    <link rel="stylesheet" href="{{ '/assets/css/style.css?' | relative_url }}" media="screen" type="text/css">
-    <link rel="stylesheet" href="{{ '/assets/css/print.css' | relative_url }}" media="print" type="text/css">
-
-    <!--[if lt IE 9]>
-    <script src="//html5shiv.googlecode.com/svn/trunk/html5.js"></script>
-    <![endif]-->
-
-    <title>{{ site.title | default: site.github.repository_name }}</title>
-  </head>
-
-  <body>
-    <header>
-      <div class="inner">
-        <a href="{{ '/' | absolute_url }}">
-          <h1>{{ site.title | default: site.github.repository_name }}</h1>
-        </a>
-        <h2>{{ site.description | default: site.github.project_tagline }}</h2>
-        {% if site.github.is_project_page %}
-        <a href="{{ '/' | absolute_url }}" class="button"></a>
-        {% endif %}
-      </div>
-    </header>
-
-    <div id="content-wrapper">
-      <div class="inner clearfix">
-        <section id="main-content">
-          {{ content }}
-
-        </section>
-
-        <aside id="sidebar">
-          
-          <hr/>
-
-          <div class="moveright">
-            {% if site.links.source %}
-               <h2><a href="{{ site.links.source }}"><p>Sources</p></a></h2>
-            {% endif %}
-            
-            {% if site.links.javadocs %}
-              <h2><a href="{{ site.links.javadocs }}"><p>APIs</p></a></h2>
-            {% endif %}
-
-            {% if site.links.docs %}
-              <h2><a href="{{ site.links.docs }}"><p>Documentation</p></a></h2>
-            {% endif %}
-
-            {% if site.links.faq %}
-              <h2><a href="{{ site.links.faq }}"><p>FAQ</p></a></h2>
-            {% endif %}
-            
-            {% if site.links.download %}
-               <h2><a href="{{ site.links.download }}"><p>Download</p></a></h2>
-            {% endif %}
-
-            {% if site.links.hide_issuetracker != true %}
-            <h2><a href="{{ site.github.issues_url }}"><p>Issue Tracker</p></a></h2>
-            {% endif %}
-
-            {% if site.links.mailinglist %}
-               <h2><a href="{{ site.links.mailinglist }}"><p>Mailing List</p></a></h2>
-            {% endif %}          
-
-            <h2><a href="CONTRIBUTING"><p>Contribute</p></a></h2>
-
-            <h2><a href="LICENSE"><p>License</p></a></h2>
-          </div>
-          
-          <hr/>
-          
-          <div class="sponsor">
-            <p>Sponsored by<a href="http://www.oracle.com" class="oraclelogo"></a></p>
-          </div>
-          
-        </aside>
-      </div>
-    </div>
-
-    <div class="footer"><a id="copyright" class="oracle" href="https://www.oracle.com/legal/copyright.html">&copy; Oracle</a> | By contributing to this project, you are agreeing to the terms of use described <a href="CONTRIBUTING">here</a>.</div>
-
-    {% if site.google_analytics %}
-      <script type="text/javascript">
-        var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
-        document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));
-      </script>
-      <script type="text/javascript">
-        try {
-          var pageTracker = _gat._getTracker("{{ site.google_analytics }}");
-        pageTracker._trackPageview();
-        } catch(err) {}
-      </script>
-    {% endif %}
-  </body>
-</html>
diff --git a/docs/glassfish/ha-administration-guide/src/main/jbake/assets/assets/css/print.scss b/docs/glassfish/ha-administration-guide/src/main/jbake/assets/assets/css/print.scss
deleted file mode 100644
index 6115d8d..0000000
--- a/docs/glassfish/ha-administration-guide/src/main/jbake/assets/assets/css/print.scss
+++ /dev/null
@@ -1,8 +0,0 @@
----
----
-
-@import "{{ site.theme }}";
-h1 {
-  font-size: 1.8em;
-}
-
diff --git a/docs/glassfish/ha-administration-guide/src/main/jbake/assets/assets/css/style.scss b/docs/glassfish/ha-administration-guide/src/main/jbake/assets/assets/css/style.scss
deleted file mode 100644
index 3cf8c1a..0000000
--- a/docs/glassfish/ha-administration-guide/src/main/jbake/assets/assets/css/style.scss
+++ /dev/null
@@ -1,246 +0,0 @@
----
----
-
-@import "{{ site.theme }}";
-
-header {
-  padding-top: 16px;
-  padding-bottom: 40px;
-  font-family: 'Mukta Vaani', 'Open Sans', 'Helvetica Neue', Helvetica, Arial, serif;
-  background: url(../images/header-bkg.jpg) 0 0 repeat-x;
-  border-bottom: solid 1px #E0E0E0;  
-}
-
-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; // orange
-  //color: #2879d0; // blue
-  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;
-}
-
-a {
-  font-weight: 300;
-  color: #2879d0;
-}
-
-a:hover { 
-  text-decoration: underline;
-}
-
-#sidebar p {
-  font-size: 1em;
-  margin-bottom: 1em;
-}
-
-.highlight { 
-  background-color: #ffffff;
-}
-
-.sponsor {
-  float: left;
-  padding-top: 20px;
-  padding-left: 18px;
-}
-
-.moveright30{
-  padding-left: 30px;
-}
-
-.moveright{
-  padding-left: 40px;
-}
-
-.moveright50{
-  padding-left: 50px;
-}
-
-/*
-a.oraclelogo {
-  position: absolute;
-  background: transparent url(../images/Oracle-logo.png) 0 0 no-repeat;
-  background-position: 2px -2px; 
-  background-size: 100% ;
-  width: 96px;
-  height: 62px;
-  padding-top: 2px;
-  padding-right: 20px;
-}
-*/
-
-aside#sidebar {
-  padding-top: 40px;
-  line-height: 1.2;
-}
-
-hr {
-  border:none;
-  height: 10px;
-  width: 75%;
-  height: 50px;
-  margin-top: 0;
-  border-bottom: 1px solid #cccccc;
-  box-shadow: 0 20px 20px -20px #aaa;
-  margin: -48px auto 10px; 
-}
-
-table {
-   margin-bottom: 20px;
-}
-
-th, td {
-  padding: .2em;
-}
-
-td {
-  font-weight: 400;
-}
-
-ul {
-  font-size: 1em;
-  margin-left: 12px;
-}
-
-ol {
-    list-style-position: inside;
-    list-style: decimal;
-    margin-left: 26px;
-}
-
-blockquote {
-    padding: 0 0 0 10px;
-    margin-left: 14px;
-    margin-bottom: 2px;
-    font-size: 1em;
-    border-left: 4px solid #ddd;
-}
-
-#main-content h1 {
-  padding-top: .6em;
-  font-family: 'Mukta Vaani', 'Open Sans', 'Helvetica Neue', Helvetica, Arial, serif;
-  font-size: 1.6em;
-  font-weight: 500;
-  color : #666;
-  text-indent: 16px;
-  letter-spacing: 0px;
-  border-bottom:1px solid #cccccc;
-  padding-bottom:1px;
-  line-height: 1.2;
-  //margin: .6em 0;
-  margin-bottom: .6em;
-}
-
-#main-content h1:before {
-  //padding-right: 0.3em;
-  margin-left: -1em;
-  content: "";
-}
-
-#main-content h2 {
-  margin-bottom: 8px;
-  font-family: 'Mukta Vaani', 'Open Sans', 'Helvetica Neue', Helvetica, Arial, serif;
-  font-size: 1.4em;
-  font-weight: 400;
-  //color: #474747;
-  color: #3c657b; // blue
-  text-indent: 4px;
-}
-
-#main-content h2:before {
-  padding-right: 1.3em;
-  margin-left: -1.5em;
-  content: "";
-  font-weight: 700;
-}
-
-#main-content h3 {
-  text-indent: 24px;
-  margin-bottom: 8px;
-  font-family: 'Mukta Vaani', 'Open Sans', 'Helvetica Neue', Helvetica, Arial, serif;
-  font-size: 1.2em;
-  font-weight: 500;
-  color: #3c657b;
-  text-indent: 4px;
-}
-
-#main-content h3:before {
-  content: "";
-  margin-left: -0.3em;
-  padding-right: 0.1em;
-}
-
-#main-content h4 {
-  margin-bottom: 8px;
-  font-family: 'Mukta Vaani', 'Open Sans', 'Helvetica Neue', Helvetica, Arial, serif;
-  font-size: 1.2em;
-  font-weight: 500;
-  color: #3c657b;
-  text-indent: 4px;
-}
-
-#main-content h4:before {
-  content: "";
-  margin-left: -0.3em;
-  padding-right: 0.1em;
-}
-
-#main-content p {
-  font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, serif;
-  font-weight: normal;
-  font-size: 1em;
-  margin-bottom: 2px;
-}
-
-.footer {
-  position: fixed; 
-  bottom: 0;
-  left: 0;
-  right: 0;
-  height: 6px;
-  background-color: #f0f0f0;
-  //padding: 1rem;
-  padding-top: 4px;
-  padding-bottom: 14px;
-  font-size: 0.8em;
-  text-align: center;
-}
-
-.oracle {
-  color: #666;
-  font-weight: 400;
-}
-
-.oracle:hover { 
-  text-decoration: none;
-  color: #FF0000;
-}
-
-.fullpage {
-  //float: center;
-  color: FF0000;
-  width: 900px;
-}
\ No newline at end of file
diff --git a/docs/glassfish/ha-administration-guide/src/main/jbake/assets/assets/images/header-bkg.jpg b/docs/glassfish/ha-administration-guide/src/main/jbake/assets/assets/images/header-bkg.jpg
deleted file mode 100644
index 481faa5..0000000
--- a/docs/glassfish/ha-administration-guide/src/main/jbake/assets/assets/images/header-bkg.jpg
+++ /dev/null
Binary files differ
diff --git a/docs/glassfish/ha-administration-guide/src/main/jbake/content/title.adoc b/docs/glassfish/ha-administration-guide/src/main/jbake/content/title.adoc
index 78a17d3..8705a95 100644
--- a/docs/glassfish/ha-administration-guide/src/main/jbake/content/title.adoc
+++ b/docs/glassfish/ha-administration-guide/src/main/jbake/content/title.adoc
@@ -7,7 +7,7 @@
 Eclipse GlassFish Server High Availability Administration Guide, Release 5.1
 ============================================================================
 
-[[glassfish-server-open-source-edition]]
+[[eclipse-glassfish-server]]
 Eclipse GlassFish Server
 ------------------------
 
@@ -53,4 +53,4 @@
 trademarks or registered trademarks of SPARC International, Inc. AMD, 
 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. 
\ No newline at end of file
+trademark of The Open Group. 
diff --git a/docs/glassfish/ha-administration-guide/src/main/jbake/templates/footer.ftl b/docs/glassfish/ha-administration-guide/src/main/jbake/templates/footer.ftl
index e7df506..131fe6c 100644
--- a/docs/glassfish/ha-administration-guide/src/main/jbake/templates/footer.ftl
+++ b/docs/glassfish/ha-administration-guide/src/main/jbake/templates/footer.ftl
@@ -36,7 +36,7 @@
 </table>
 
 <span id="copyright">
-        <img src="img/eclipse_foundation_logo_tiny.png" height="20px" alt="Eclipse Foundation Logo" align="top"/>&nbsp;            
+        <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>
 
diff --git a/docs/glassfish/installation-guide/pom.xml b/docs/glassfish/installation-guide/pom.xml
index 640d958..5a5944e 100644
--- a/docs/glassfish/installation-guide/pom.xml
+++ b/docs/glassfish/installation-guide/pom.xml
@@ -18,106 +18,14 @@
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <groupId>org.glassfish</groupId>
+    <parent>
+        <groupId>org.glassfish.docs</groupId>
+        <artifactId>parent</artifactId>
+        <version>5.1.1-SNAPSHOT</version>
+        <relativePath>../parent</relativePath>
+    </parent>
+    <groupId>org.glassfish.docs</groupId>
     <artifactId>installation-guide</artifactId>
-    <packaging>pom</packaging>
-    <version>1.0.0-SNAPSHOT</version>
+    <packaging>jar</packaging>
     <name>Eclipse GlassFish Server Installation Guide, Release 5.1</name>
-
-    <properties>
-        <site.output.dir>${project.build.directory}/staging</site.output.dir>
-        <maven.site.skip>true</maven.site.skip>
-        <maven.deploy.skip>true</maven.deploy.skip>
-    </properties>
-
-    <distributionManagement>
-        <site>
-            <url>scm:git:git@github.com:javaee/installation-guide.git</url>
-        </site>
-    </distributionManagement>
-
-    <build>
-        <defaultGoal>package</defaultGoal>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-enforcer-plugin</artifactId>
-                <version>1.4.1</version>
-                <executions>
-                    <execution>
-                        <id>enforce-versions</id>
-                        <goals>
-                            <goal>enforce</goal>
-                        </goals>
-                        <configuration>
-                            <rules>
-                                <requireJavaVersion>
-                                    <version>[1.8.0,1.9.0)</version>
-                                    <message>You need JDK8 or lower</message>
-                                </requireJavaVersion>
-                            </rules>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>com.blazebit</groupId>
-                <artifactId>jbake-maven-plugin</artifactId>
-                <version>1.0.0</version>
-                <configuration>
-                    <outputDirectory>${site.output.dir}</outputDirectory>
-                </configuration>
-                <executions>
-                    <execution>
-                        <id>build-site</id>
-                        <phase>generate-resources</phase>
-                        <goals>
-                            <goal>build</goal>
-                        </goals>
-                    </execution>
-                </executions>
-                <dependencies>
-                    <dependency>
-                        <groupId>org.asciidoctor</groupId>
-                        <artifactId>asciidoctorj</artifactId>
-                        <version>1.5.5</version>
-                    </dependency>
-                    <dependency>
-                        <groupId>org.asciidoctor</groupId>
-                        <artifactId>asciidoctorj-diagram</artifactId>
-                        <version>1.5.4</version>
-                    </dependency>
-                </dependencies>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-scm-publish-plugin</artifactId>
-                <version>1.1</version>
-                <executions>
-                    <execution>
-                        <id>deploy-site</id>
-                        <phase>deploy</phase>
-                        <goals>
-                            <goal>publish-scm</goal>
-                        </goals>
-                        <configuration>
-                            <scmBranch>gh-pages</scmBranch>
-                            <skipDeletedFiles>false</skipDeletedFiles>
-                            <checkinComment>Update site</checkinComment>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-	</plugins>
-
-	<pluginManagement>
-	    <plugins>
-		<plugin>
-		    <groupId>org.apache.maven.plugins</groupId>
-		    <artifactId>maven-assembly-plugin</artifactId>
-		    <version>2.4</version>
-		</plugin>
-	    </plugins>
-	</pluginManagement>
-    </build>
 </project>
diff --git a/docs/glassfish/installation-guide/src/main/jbake/assets/CONTRIBUTING.md b/docs/glassfish/installation-guide/src/main/jbake/assets/CONTRIBUTING.md
deleted file mode 100644
index a0ebaa0..0000000
--- a/docs/glassfish/installation-guide/src/main/jbake/assets/CONTRIBUTING.md
+++ /dev/null
@@ -1,57 +0,0 @@
-# Contributing to Eclipse GlassFish
-
-Thanks for your interest in this project.
-
-## Project description
-
-Eclipse GlassFish is a complete application server that implements the Jakarta
-EE specification. GlassFish includes implementations of all required and
-optional Jakarta EE APIs, and passes all Jakarta EE TCKs. GlassFish also
-includes a complete administration console, clustering support, and other
-developer and production focused tools and features.
-
-* https://projects.eclipse.org/projects/ee4j.glassfish
-
-## Developer resources
-
-Information regarding source code management, builds, coding standards, and
-more.
-
-* https://projects.eclipse.org/projects/ee4j.glassfish/developer
-
-The project maintains the following source code repositories
-
-* https://github.com/eclipse-ee4j/glassfish-ha-api
-* https://github.com/eclipse-ee4j/glassfish-logging-annotation-processor
-* https://github.com/eclipse-ee4j/glassfish-shoal
-* https://github.com/eclipse-ee4j/glassfish-cdi-porting-tck
-* https://github.com/eclipse-ee4j/glassfish-jsftemplating
-* https://github.com/eclipse-ee4j/glassfish-hk2-extra
-* https://github.com/eclipse-ee4j/glassfish-hk2
-* https://github.com/eclipse-ee4j/glassfish-fighterfish
-* https://github.com/eclipse-ee4j/glassfish
-* https://github.com/eclipse-ee4j/glassfish-maven-embedded-plugin
-* https://github.com/eclipse-ee4j/bvtck-porting
-
-## Eclipse Contributor Agreement
-
-Before your contribution can be accepted by the project team contributors must
-electronically sign the Eclipse Contributor Agreement (ECA).
-
-* http://www.eclipse.org/legal/ECA.php
-
-Commits that are provided by non-committers must have a Signed-off-by field in
-the footer indicating that the author is aware of the terms by which the
-contribution has been provided to the project. The non-committer must
-additionally have an Eclipse Foundation account and must have a signed Eclipse
-Contributor Agreement (ECA) on file.
-
-For more information, please see the Eclipse Committer Handbook:
-https://www.eclipse.org/projects/handbook/#resources-commit
-
-## Contact
-
-Contact the project developers via the project's "dev" list.
-
-* https://accounts.eclipse.org/mailing-list/glassfish-dev
-
diff --git a/docs/glassfish/installation-guide/src/main/jbake/assets/LICENSE.md b/docs/glassfish/installation-guide/src/main/jbake/assets/LICENSE.md
deleted file mode 100644
index f046098..0000000
--- a/docs/glassfish/installation-guide/src/main/jbake/assets/LICENSE.md
+++ /dev/null
@@ -1,277 +0,0 @@
-# Eclipse Public License - v 2.0
-
-        THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE
-        PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION
-        OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
-
-    1. DEFINITIONS
-
-    "Contribution" means:
-
-      a) in the case of the initial Contributor, the initial content
-         Distributed under this Agreement, and
-
-      b) in the case of each subsequent Contributor: 
-         i) changes to the Program, and 
-         ii) additions to the Program;
-      where such changes and/or additions to the Program originate from
-      and are Distributed by that particular Contributor. A Contribution
-      "originates" from a Contributor if it was added to the Program by
-      such Contributor itself or anyone acting on such Contributor's behalf.
-      Contributions do not include changes or additions to the Program that
-      are not Modified Works.
-
-    "Contributor" means any person or entity that Distributes the Program.
-
-    "Licensed Patents" mean patent claims licensable by a Contributor which
-    are necessarily infringed by the use or sale of its Contribution alone
-    or when combined with the Program.
-
-    "Program" means the Contributions Distributed in accordance with this
-    Agreement.
-
-    "Recipient" means anyone who receives the Program under this Agreement
-    or any Secondary License (as applicable), including Contributors.
-
-    "Derivative Works" shall mean any work, whether in Source Code or other
-    form, that is based on (or derived from) the Program and for which the
-    editorial revisions, annotations, elaborations, or other modifications
-    represent, as a whole, an original work of authorship.
-
-    "Modified Works" shall mean any work in Source Code or other form that
-    results from an addition to, deletion from, or modification of the
-    contents of the Program, including, for purposes of clarity any new file
-    in Source Code form that contains any contents of the Program. Modified
-    Works shall not include works that contain only declarations,
-    interfaces, types, classes, structures, or files of the Program solely
-    in each case in order to link to, bind by name, or subclass the Program
-    or Modified Works thereof.
-
-    "Distribute" means the acts of a) distributing or b) making available
-    in any manner that enables the transfer of a copy.
-
-    "Source Code" means the form of a Program preferred for making
-    modifications, including but not limited to software source code,
-    documentation source, and configuration files.
-
-    "Secondary License" means either the GNU General Public License,
-    Version 2.0, or any later versions of that license, including any
-    exceptions or additional permissions as identified by the initial
-    Contributor.
-
-    2. GRANT OF RIGHTS
-
-      a) Subject to the terms of this Agreement, each Contributor hereby
-      grants Recipient a non-exclusive, worldwide, royalty-free copyright
-      license to reproduce, prepare Derivative Works of, publicly display,
-      publicly perform, Distribute and sublicense the Contribution of such
-      Contributor, if any, and such Derivative Works.
-
-      b) Subject to the terms of this Agreement, each Contributor hereby
-      grants Recipient a non-exclusive, worldwide, royalty-free patent
-      license under Licensed Patents to make, use, sell, offer to sell,
-      import and otherwise transfer the Contribution of such Contributor,
-      if any, in Source Code or other form. This patent license shall
-      apply to the combination of the Contribution and the Program if, at
-      the time the Contribution is added by the Contributor, such addition
-      of the Contribution causes such combination to be covered by the
-      Licensed Patents. The patent license shall not apply to any other
-      combinations which include the Contribution. No hardware per se is
-      licensed hereunder.
-
-      c) Recipient understands that although each Contributor grants the
-      licenses to its Contributions set forth herein, no assurances are
-      provided by any Contributor that the Program does not infringe the
-      patent or other intellectual property rights of any other entity.
-      Each Contributor disclaims any liability to Recipient for claims
-      brought by any other entity based on infringement of intellectual
-      property rights or otherwise. As a condition to exercising the
-      rights and licenses granted hereunder, each Recipient hereby
-      assumes sole responsibility to secure any other intellectual
-      property rights needed, if any. For example, if a third party
-      patent license is required to allow Recipient to Distribute the
-      Program, it is Recipient's responsibility to acquire that license
-      before distributing the Program.
-
-      d) Each Contributor represents that to its knowledge it has
-      sufficient copyright rights in its Contribution, if any, to grant
-      the copyright license set forth in this Agreement.
-
-      e) Notwithstanding the terms of any Secondary License, no
-      Contributor makes additional grants to any Recipient (other than
-      those set forth in this Agreement) as a result of such Recipient's
-      receipt of the Program under the terms of a Secondary License
-      (if permitted under the terms of Section 3).
-
-    3. REQUIREMENTS
-
-    3.1 If a Contributor Distributes the Program in any form, then:
-
-      a) the Program must also be made available as Source Code, in
-      accordance with section 3.2, and the Contributor must accompany
-      the Program with a statement that the Source Code for the Program
-      is available under this Agreement, and informs Recipients how to
-      obtain it in a reasonable manner on or through a medium customarily
-      used for software exchange; and
-
-      b) the Contributor may Distribute the Program under a license
-      different than this Agreement, provided that such license:
-         i) effectively disclaims on behalf of all other Contributors all
-         warranties and conditions, express and implied, including
-         warranties or conditions of title and non-infringement, and
-         implied warranties or conditions of merchantability and fitness
-         for a particular purpose;
-
-         ii) effectively excludes on behalf of all other Contributors all
-         liability for damages, including direct, indirect, special,
-         incidental and consequential damages, such as lost profits;
-
-         iii) does not attempt to limit or alter the recipients' rights
-         in the Source Code under section 3.2; and
-
-         iv) requires any subsequent distribution of the Program by any
-         party to be under a license that satisfies the requirements
-         of this section 3.
-
-    3.2 When the Program is Distributed as Source Code:
-
-      a) it must be made available under this Agreement, or if the
-      Program (i) is combined with other material in a separate file or
-      files made available under a Secondary License, and (ii) the initial
-      Contributor attached to the Source Code the notice described in
-      Exhibit A of this Agreement, then the Program may be made available
-      under the terms of such Secondary Licenses, and
-
-      b) a copy of this Agreement must be included with each copy of
-      the Program.
-
-    3.3 Contributors may not remove or alter any copyright, patent,
-    trademark, attribution notices, disclaimers of warranty, or limitations
-    of liability ("notices") contained within the Program from any copy of
-    the Program which they Distribute, provided that Contributors may add
-    their own appropriate notices.
-
-    4. COMMERCIAL DISTRIBUTION
-
-    Commercial distributors of software may accept certain responsibilities
-    with respect to end users, business partners and the like. While this
-    license is intended to facilitate the commercial use of the Program,
-    the Contributor who includes the Program in a commercial product
-    offering should do so in a manner which does not create potential
-    liability for other Contributors. Therefore, if a Contributor includes
-    the Program in a commercial product offering, such Contributor
-    ("Commercial Contributor") hereby agrees to defend and indemnify every
-    other Contributor ("Indemnified Contributor") against any losses,
-    damages and costs (collectively "Losses") arising from claims, lawsuits
-    and other legal actions brought by a third party against the Indemnified
-    Contributor to the extent caused by the acts or omissions of such
-    Commercial Contributor in connection with its distribution of the Program
-    in a commercial product offering. The obligations in this section do not
-    apply to any claims or Losses relating to any actual or alleged
-    intellectual property infringement. In order to qualify, an Indemnified
-    Contributor must: a) promptly notify the Commercial Contributor in
-    writing of such claim, and b) allow the Commercial Contributor to control,
-    and cooperate with the Commercial Contributor in, the defense and any
-    related settlement negotiations. The Indemnified Contributor may
-    participate in any such claim at its own expense.
-
-    For example, a Contributor might include the Program in a commercial
-    product offering, Product X. That Contributor is then a Commercial
-    Contributor. If that Commercial Contributor then makes performance
-    claims, or offers warranties related to Product X, those performance
-    claims and warranties are such Commercial Contributor's responsibility
-    alone. Under this section, the Commercial Contributor would have to
-    defend claims against the other Contributors related to those performance
-    claims and warranties, and if a court requires any other Contributor to
-    pay any damages as a result, the Commercial Contributor must pay
-    those damages.
-
-    5. NO WARRANTY
-
-    EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT
-    PERMITTED BY APPLICABLE LAW, THE PROGRAM IS PROVIDED ON AN "AS IS"
-    BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR
-    IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF
-    TITLE, NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR
-    PURPOSE. Each Recipient is solely responsible for determining the
-    appropriateness of using and distributing the Program and assumes all
-    risks associated with its exercise of rights under this Agreement,
-    including but not limited to the risks and costs of program errors,
-    compliance with applicable laws, damage to or loss of data, programs
-    or equipment, and unavailability or interruption of operations.
-
-    6. DISCLAIMER OF LIABILITY
-
-    EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT
-    PERMITTED BY APPLICABLE LAW, NEITHER RECIPIENT NOR ANY CONTRIBUTORS
-    SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-    EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST
-    PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-    CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-    ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE
-    EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF THE
-    POSSIBILITY OF SUCH DAMAGES.
-
-    7. GENERAL
-
-    If any provision of this Agreement is invalid or unenforceable under
-    applicable law, it shall not affect the validity or enforceability of
-    the remainder of the terms of this Agreement, and without further
-    action by the parties hereto, such provision shall be reformed to the
-    minimum extent necessary to make such provision valid and enforceable.
-
-    If Recipient institutes patent litigation against any entity
-    (including a cross-claim or counterclaim in a lawsuit) alleging that the
-    Program itself (excluding combinations of the Program with other software
-    or hardware) infringes such Recipient's patent(s), then such Recipient's
-    rights granted under Section 2(b) shall terminate as of the date such
-    litigation is filed.
-
-    All Recipient's rights under this Agreement shall terminate if it
-    fails to comply with any of the material terms or conditions of this
-    Agreement and does not cure such failure in a reasonable period of
-    time after becoming aware of such noncompliance. If all Recipient's
-    rights under this Agreement terminate, Recipient agrees to cease use
-    and distribution of the Program as soon as reasonably practicable.
-    However, Recipient's obligations under this Agreement and any licenses
-    granted by Recipient relating to the Program shall continue and survive.
-
-    Everyone is permitted to copy and distribute copies of this Agreement,
-    but in order to avoid inconsistency the Agreement is copyrighted and
-    may only be modified in the following manner. The Agreement Steward
-    reserves the right to publish new versions (including revisions) of
-    this Agreement from time to time. No one other than the Agreement
-    Steward has the right to modify this Agreement. The Eclipse Foundation
-    is the initial Agreement Steward. The Eclipse Foundation may assign the
-    responsibility to serve as the Agreement Steward to a suitable separate
-    entity. Each new version of the Agreement will be given a distinguishing
-    version number. The Program (including Contributions) may always be
-    Distributed subject to the version of the Agreement under which it was
-    received. In addition, after a new version of the Agreement is published,
-    Contributor may elect to Distribute the Program (including its
-    Contributions) under the new version.
-
-    Except as expressly stated in Sections 2(a) and 2(b) above, Recipient
-    receives no rights or licenses to the intellectual property of any
-    Contributor under this Agreement, whether expressly, by implication,
-    estoppel or otherwise. All rights in the Program not expressly granted
-    under this Agreement are reserved. Nothing in this Agreement is intended
-    to be enforceable by any entity that is not a Contributor or Recipient.
-    No third-party beneficiary rights are created under this Agreement.
-
-    Exhibit A - Form of Secondary Licenses Notice
-
-    "This Source Code may also be made available under the following 
-    Secondary Licenses when the conditions for such availability set forth 
-    in the Eclipse Public License, v. 2.0 are satisfied: {name license(s),
-    version(s), and exceptions or additional permissions here}."
-
-      Simply including a copy of this Agreement, including this Exhibit A
-      is not sufficient to license the Source Code under Secondary Licenses.
-
-      If it is not possible or desirable to put the notice in a particular
-      file, then You may include the notice in a location (such as a LICENSE
-      file in a relevant directory) where a recipient would be likely to
-      look for such a notice.
-
-      You may add additional accurate notices of copyright ownership.
\ No newline at end of file
diff --git a/docs/glassfish/installation-guide/src/main/jbake/assets/README.md b/docs/glassfish/installation-guide/src/main/jbake/assets/README.md
deleted file mode 100644
index f8f962c..0000000
--- a/docs/glassfish/installation-guide/src/main/jbake/assets/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-# About
-
-The {{site.title}} project contains the [AsciiDoc](http://asciidoc.org/)
-source code for the ...
diff --git a/docs/glassfish/installation-guide/src/main/jbake/assets/_config.yml b/docs/glassfish/installation-guide/src/main/jbake/assets/_config.yml
deleted file mode 100644
index 8d22e55..0000000
--- a/docs/glassfish/installation-guide/src/main/jbake/assets/_config.yml
+++ /dev/null
@@ -1,14 +0,0 @@
-theme: jekyll-theme-architect
-
-title: [installation-guide]
-description: [Eclipse GlassFish Server Installation Guide, Release 5.1]
-
-# sidebar links url
-links:
-  source: https://github.com/javaee/installation-guide
-  download: https://github.com/javaee/installation-guide/releases
-  #mailinglist: https://javaee.groups.io/g/installation-guide
-  #javadocs:
-  docs: https://javaee.github.io/installation-guide
-  #faq:
-
diff --git a/docs/glassfish/installation-guide/src/main/jbake/assets/_layouts/default.html b/docs/glassfish/installation-guide/src/main/jbake/assets/_layouts/default.html
deleted file mode 100644
index f896fad..0000000
--- a/docs/glassfish/installation-guide/src/main/jbake/assets/_layouts/default.html
+++ /dev/null
@@ -1,100 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <meta charset='utf-8'>
-    <meta http-equiv="X-UA-Compatible" content="chrome=1">
-    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
-    <link rel="stylesheet" href="{{ '/assets/css/style.css?' | relative_url }}" media="screen" type="text/css">
-    <link rel="stylesheet" href="{{ '/assets/css/print.css' | relative_url }}" media="print" type="text/css">
-
-    <!--[if lt IE 9]>
-    <script src="//html5shiv.googlecode.com/svn/trunk/html5.js"></script>
-    <![endif]-->
-
-    <title>{{ site.title | default: site.github.repository_name }}</title>
-  </head>
-
-  <body>
-    <header>
-      <div class="inner">
-        <a href="{{ '/' | absolute_url }}">
-          <h1>{{ site.title | default: site.github.repository_name }}</h1>
-        </a>
-        <h2>{{ site.description | default: site.github.project_tagline }}</h2>
-        {% if site.github.is_project_page %}
-        <a href="{{ '/' | absolute_url }}" class="button"></a>
-        {% endif %}
-      </div>
-    </header>
-
-    <div id="content-wrapper">
-      <div class="inner clearfix">
-        <section id="main-content">
-          {{ content }}
-
-        </section>
-
-        <aside id="sidebar">
-          
-          <hr/>
-
-          <div class="moveright">
-            {% if site.links.source %}
-               <h2><a href="{{ site.links.source }}"><p>Sources</p></a></h2>
-            {% endif %}
-            
-            {% if site.links.javadocs %}
-              <h2><a href="{{ site.links.javadocs }}"><p>APIs</p></a></h2>
-            {% endif %}
-
-            {% if site.links.docs %}
-              <h2><a href="{{ site.links.docs }}"><p>Documentation</p></a></h2>
-            {% endif %}
-
-            {% if site.links.faq %}
-              <h2><a href="{{ site.links.faq }}"><p>FAQ</p></a></h2>
-            {% endif %}
-            
-            {% if site.links.download %}
-               <h2><a href="{{ site.links.download }}"><p>Download</p></a></h2>
-            {% endif %}
-
-            {% if site.links.hide_issuetracker != true %}
-            <h2><a href="{{ site.github.issues_url }}"><p>Issue Tracker</p></a></h2>
-            {% endif %}
-
-            {% if site.links.mailinglist %}
-               <h2><a href="{{ site.links.mailinglist }}"><p>Mailing List</p></a></h2>
-            {% endif %}          
-
-            <h2><a href="CONTRIBUTING"><p>Contribute</p></a></h2>
-
-            <h2><a href="LICENSE"><p>License</p></a></h2>
-          </div>
-          
-          <hr/>
-          
-          <div class="sponsor">
-            <p>Sponsored by<a href="http://www.oracle.com" class="oraclelogo"></a></p>
-          </div>
-          
-        </aside>
-      </div>
-    </div>
-
-    <div class="footer"><a id="copyright" class="oracle" href="https://www.oracle.com/legal/copyright.html">&copy; Oracle</a> | By contributing to this project, you are agreeing to the terms of use described <a href="CONTRIBUTING">here</a>.</div>
-
-    {% if site.google_analytics %}
-      <script type="text/javascript">
-        var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
-        document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));
-      </script>
-      <script type="text/javascript">
-        try {
-          var pageTracker = _gat._getTracker("{{ site.google_analytics }}");
-        pageTracker._trackPageview();
-        } catch(err) {}
-      </script>
-    {% endif %}
-  </body>
-</html>
diff --git a/docs/glassfish/installation-guide/src/main/jbake/assets/assets/css/print.scss b/docs/glassfish/installation-guide/src/main/jbake/assets/assets/css/print.scss
deleted file mode 100644
index 6115d8d..0000000
--- a/docs/glassfish/installation-guide/src/main/jbake/assets/assets/css/print.scss
+++ /dev/null
@@ -1,8 +0,0 @@
----
----
-
-@import "{{ site.theme }}";
-h1 {
-  font-size: 1.8em;
-}
-
diff --git a/docs/glassfish/installation-guide/src/main/jbake/assets/assets/css/style.scss b/docs/glassfish/installation-guide/src/main/jbake/assets/assets/css/style.scss
deleted file mode 100644
index 3cf8c1a..0000000
--- a/docs/glassfish/installation-guide/src/main/jbake/assets/assets/css/style.scss
+++ /dev/null
@@ -1,246 +0,0 @@
----
----
-
-@import "{{ site.theme }}";
-
-header {
-  padding-top: 16px;
-  padding-bottom: 40px;
-  font-family: 'Mukta Vaani', 'Open Sans', 'Helvetica Neue', Helvetica, Arial, serif;
-  background: url(../images/header-bkg.jpg) 0 0 repeat-x;
-  border-bottom: solid 1px #E0E0E0;  
-}
-
-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; // orange
-  //color: #2879d0; // blue
-  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;
-}
-
-a {
-  font-weight: 300;
-  color: #2879d0;
-}
-
-a:hover { 
-  text-decoration: underline;
-}
-
-#sidebar p {
-  font-size: 1em;
-  margin-bottom: 1em;
-}
-
-.highlight { 
-  background-color: #ffffff;
-}
-
-.sponsor {
-  float: left;
-  padding-top: 20px;
-  padding-left: 18px;
-}
-
-.moveright30{
-  padding-left: 30px;
-}
-
-.moveright{
-  padding-left: 40px;
-}
-
-.moveright50{
-  padding-left: 50px;
-}
-
-/*
-a.oraclelogo {
-  position: absolute;
-  background: transparent url(../images/Oracle-logo.png) 0 0 no-repeat;
-  background-position: 2px -2px; 
-  background-size: 100% ;
-  width: 96px;
-  height: 62px;
-  padding-top: 2px;
-  padding-right: 20px;
-}
-*/
-
-aside#sidebar {
-  padding-top: 40px;
-  line-height: 1.2;
-}
-
-hr {
-  border:none;
-  height: 10px;
-  width: 75%;
-  height: 50px;
-  margin-top: 0;
-  border-bottom: 1px solid #cccccc;
-  box-shadow: 0 20px 20px -20px #aaa;
-  margin: -48px auto 10px; 
-}
-
-table {
-   margin-bottom: 20px;
-}
-
-th, td {
-  padding: .2em;
-}
-
-td {
-  font-weight: 400;
-}
-
-ul {
-  font-size: 1em;
-  margin-left: 12px;
-}
-
-ol {
-    list-style-position: inside;
-    list-style: decimal;
-    margin-left: 26px;
-}
-
-blockquote {
-    padding: 0 0 0 10px;
-    margin-left: 14px;
-    margin-bottom: 2px;
-    font-size: 1em;
-    border-left: 4px solid #ddd;
-}
-
-#main-content h1 {
-  padding-top: .6em;
-  font-family: 'Mukta Vaani', 'Open Sans', 'Helvetica Neue', Helvetica, Arial, serif;
-  font-size: 1.6em;
-  font-weight: 500;
-  color : #666;
-  text-indent: 16px;
-  letter-spacing: 0px;
-  border-bottom:1px solid #cccccc;
-  padding-bottom:1px;
-  line-height: 1.2;
-  //margin: .6em 0;
-  margin-bottom: .6em;
-}
-
-#main-content h1:before {
-  //padding-right: 0.3em;
-  margin-left: -1em;
-  content: "";
-}
-
-#main-content h2 {
-  margin-bottom: 8px;
-  font-family: 'Mukta Vaani', 'Open Sans', 'Helvetica Neue', Helvetica, Arial, serif;
-  font-size: 1.4em;
-  font-weight: 400;
-  //color: #474747;
-  color: #3c657b; // blue
-  text-indent: 4px;
-}
-
-#main-content h2:before {
-  padding-right: 1.3em;
-  margin-left: -1.5em;
-  content: "";
-  font-weight: 700;
-}
-
-#main-content h3 {
-  text-indent: 24px;
-  margin-bottom: 8px;
-  font-family: 'Mukta Vaani', 'Open Sans', 'Helvetica Neue', Helvetica, Arial, serif;
-  font-size: 1.2em;
-  font-weight: 500;
-  color: #3c657b;
-  text-indent: 4px;
-}
-
-#main-content h3:before {
-  content: "";
-  margin-left: -0.3em;
-  padding-right: 0.1em;
-}
-
-#main-content h4 {
-  margin-bottom: 8px;
-  font-family: 'Mukta Vaani', 'Open Sans', 'Helvetica Neue', Helvetica, Arial, serif;
-  font-size: 1.2em;
-  font-weight: 500;
-  color: #3c657b;
-  text-indent: 4px;
-}
-
-#main-content h4:before {
-  content: "";
-  margin-left: -0.3em;
-  padding-right: 0.1em;
-}
-
-#main-content p {
-  font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, serif;
-  font-weight: normal;
-  font-size: 1em;
-  margin-bottom: 2px;
-}
-
-.footer {
-  position: fixed; 
-  bottom: 0;
-  left: 0;
-  right: 0;
-  height: 6px;
-  background-color: #f0f0f0;
-  //padding: 1rem;
-  padding-top: 4px;
-  padding-bottom: 14px;
-  font-size: 0.8em;
-  text-align: center;
-}
-
-.oracle {
-  color: #666;
-  font-weight: 400;
-}
-
-.oracle:hover { 
-  text-decoration: none;
-  color: #FF0000;
-}
-
-.fullpage {
-  //float: center;
-  color: FF0000;
-  width: 900px;
-}
\ No newline at end of file
diff --git a/docs/glassfish/installation-guide/src/main/jbake/assets/assets/images/header-bkg.jpg b/docs/glassfish/installation-guide/src/main/jbake/assets/assets/images/header-bkg.jpg
deleted file mode 100644
index 481faa5..0000000
--- a/docs/glassfish/installation-guide/src/main/jbake/assets/assets/images/header-bkg.jpg
+++ /dev/null
Binary files differ
diff --git a/docs/glassfish/installation-guide/src/main/jbake/content/title.adoc b/docs/glassfish/installation-guide/src/main/jbake/content/title.adoc
index 4563b14..4146613 100644
--- a/docs/glassfish/installation-guide/src/main/jbake/content/title.adoc
+++ b/docs/glassfish/installation-guide/src/main/jbake/content/title.adoc
@@ -7,7 +7,7 @@
 Eclipse GlassFish Server Installation Guide, Release 5.1
 ========================================================
 
-[[glassfish-server-open-source-edition]]
+[[eclipse-glassfish-server]]
 Eclipse GlassFish Server
 ------------------------
 
@@ -42,4 +42,4 @@
 trademarks or registered trademarks of SPARC International, Inc. AMD, 
 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. 
\ No newline at end of file
+trademark of The Open Group. 
diff --git a/docs/glassfish/installation-guide/src/main/jbake/templates/footer.ftl b/docs/glassfish/installation-guide/src/main/jbake/templates/footer.ftl
index e7df506..131fe6c 100644
--- a/docs/glassfish/installation-guide/src/main/jbake/templates/footer.ftl
+++ b/docs/glassfish/installation-guide/src/main/jbake/templates/footer.ftl
@@ -36,7 +36,7 @@
 </table>
 
 <span id="copyright">
-        <img src="img/eclipse_foundation_logo_tiny.png" height="20px" alt="Eclipse Foundation Logo" align="top"/>&nbsp;            
+        <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>
 
diff --git a/docs/glassfish/parent/pom.xml b/docs/glassfish/parent/pom.xml
new file mode 100644
index 0000000..e4af62a
--- /dev/null
+++ b/docs/glassfish/parent/pom.xml
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 
+    Copyright (c) 2017, 2019 Oracle and/or its affiliates. All rights reserved.
+ 
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+ 
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+ 
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+ 
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.glassfish.docs</groupId>
+        <artifactId>docs</artifactId>
+        <version>5.1.1-SNAPSHOT</version>
+    </parent>
+    <groupId>org.glassfish.docs</groupId>
+    <artifactId>parent</artifactId>
+    <packaging>pom</packaging>
+    <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>
+    </properties>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>com.blazebit</groupId>
+                <artifactId>jbake-maven-plugin</artifactId>
+                <version>1.0.0</version>
+                <configuration>
+                    <outputDirectory>${site.output.dir}</outputDirectory>
+                </configuration>
+                <executions>
+                    <execution>
+                        <id>build-site</id>
+                        <phase>generate-resources</phase>
+                        <goals>
+                            <goal>build</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <dependencies>
+                    <dependency>
+                        <groupId>org.asciidoctor</groupId>
+                        <artifactId>asciidoctorj</artifactId>
+                        <version>1.5.5</version>
+                    </dependency>
+                    <dependency>
+                        <groupId>org.asciidoctor</groupId>
+                        <artifactId>asciidoctorj-diagram</artifactId>
+                        <version>1.5.4</version>
+                    </dependency>
+                </dependencies>
+            </plugin>
+	    <plugin>
+		<artifactId>maven-jar-plugin</artifactId>
+		<configuration>
+		    <finalName>${project.artifactId}</finalName>
+                    <classesDirectory>${project.build.directory}/staging</classesDirectory>
+		</configuration>
+	    </plugin>
+	</plugins>
+    </build>
+</project>
diff --git a/docs/glassfish/parent/src/main/jbake/content/.gitkeep b/docs/glassfish/parent/src/main/jbake/content/.gitkeep
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/docs/glassfish/parent/src/main/jbake/content/.gitkeep
diff --git a/docs/glassfish/parent/src/main/jbake/jbake.properties b/docs/glassfish/parent/src/main/jbake/jbake.properties
new file mode 100644
index 0000000..04823fb
--- /dev/null
+++ b/docs/glassfish/parent/src/main/jbake/jbake.properties
@@ -0,0 +1,7 @@
+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/glassfish/parent/src/main/jbake/templates/.gitkeep b/docs/glassfish/parent/src/main/jbake/templates/.gitkeep
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/docs/glassfish/parent/src/main/jbake/templates/.gitkeep
diff --git a/docs/glassfish/performance-tuning-guide/pom.xml b/docs/glassfish/performance-tuning-guide/pom.xml
index 24067ca..70798bb 100644
--- a/docs/glassfish/performance-tuning-guide/pom.xml
+++ b/docs/glassfish/performance-tuning-guide/pom.xml
@@ -18,106 +18,14 @@
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <groupId>org.glassfish</groupId>
+    <parent>
+        <groupId>org.glassfish.docs</groupId>
+        <artifactId>parent</artifactId>
+        <version>5.1.1-SNAPSHOT</version>
+        <relativePath>../parent</relativePath>
+    </parent>
+    <groupId>org.glassfish.docs</groupId>
     <artifactId>performance-tuning-guide</artifactId>
-    <packaging>pom</packaging>
-    <version>1.0.0-SNAPSHOT</version>
+    <packaging>jar</packaging>
     <name>Eclipse GlassFish Server Performance Tuning Guide, Release 5.1</name>
-
-    <properties>
-        <site.output.dir>${project.build.directory}/staging</site.output.dir>
-        <maven.site.skip>true</maven.site.skip>
-        <maven.deploy.skip>true</maven.deploy.skip>
-    </properties>
-
-    <distributionManagement>
-        <site>
-            <url>scm:git:git@github.com:javaee/performance-tuning-guide.git</url>
-        </site>
-    </distributionManagement>
-
-    <build>
-        <defaultGoal>package</defaultGoal>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-enforcer-plugin</artifactId>
-                <version>1.4.1</version>
-                <executions>
-                    <execution>
-                        <id>enforce-versions</id>
-                        <goals>
-                            <goal>enforce</goal>
-                        </goals>
-                        <configuration>
-                            <rules>
-                                <requireJavaVersion>
-                                    <version>[1.8.0,1.9.0)</version>
-                                    <message>You need JDK8 or lower</message>
-                                </requireJavaVersion>
-                            </rules>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>com.blazebit</groupId>
-                <artifactId>jbake-maven-plugin</artifactId>
-                <version>1.0.0</version>
-                <configuration>
-                    <outputDirectory>${site.output.dir}</outputDirectory>
-                </configuration>
-                <executions>
-                    <execution>
-                        <id>build-site</id>
-                        <phase>generate-resources</phase>
-                        <goals>
-                            <goal>build</goal>
-                        </goals>
-                    </execution>
-                </executions>
-                <dependencies>
-                    <dependency>
-                        <groupId>org.asciidoctor</groupId>
-                        <artifactId>asciidoctorj</artifactId>
-                        <version>1.5.5</version>
-                    </dependency>
-                    <dependency>
-                        <groupId>org.asciidoctor</groupId>
-                        <artifactId>asciidoctorj-diagram</artifactId>
-                        <version>1.5.4</version>
-                    </dependency>
-                </dependencies>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-scm-publish-plugin</artifactId>
-                <version>1.1</version>
-                <executions>
-                    <execution>
-                        <id>deploy-site</id>
-                        <phase>deploy</phase>
-                        <goals>
-                            <goal>publish-scm</goal>
-                        </goals>
-                        <configuration>
-                            <scmBranch>gh-pages</scmBranch>
-                            <skipDeletedFiles>false</skipDeletedFiles>
-                            <checkinComment>Update site</checkinComment>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-	</plugins>
-
-	<pluginManagement>
-	    <plugins>
-		<plugin>
-		    <groupId>org.apache.maven.plugins</groupId>
-		    <artifactId>maven-assembly-plugin</artifactId>
-		    <version>2.4</version>
-		</plugin>
-	    </plugins>
-	</pluginManagement>
-    </build>
 </project>
diff --git a/docs/glassfish/performance-tuning-guide/src/main/jbake/assets/CONTRIBUTING.md b/docs/glassfish/performance-tuning-guide/src/main/jbake/assets/CONTRIBUTING.md
deleted file mode 100644
index a0ebaa0..0000000
--- a/docs/glassfish/performance-tuning-guide/src/main/jbake/assets/CONTRIBUTING.md
+++ /dev/null
@@ -1,57 +0,0 @@
-# Contributing to Eclipse GlassFish
-
-Thanks for your interest in this project.
-
-## Project description
-
-Eclipse GlassFish is a complete application server that implements the Jakarta
-EE specification. GlassFish includes implementations of all required and
-optional Jakarta EE APIs, and passes all Jakarta EE TCKs. GlassFish also
-includes a complete administration console, clustering support, and other
-developer and production focused tools and features.
-
-* https://projects.eclipse.org/projects/ee4j.glassfish
-
-## Developer resources
-
-Information regarding source code management, builds, coding standards, and
-more.
-
-* https://projects.eclipse.org/projects/ee4j.glassfish/developer
-
-The project maintains the following source code repositories
-
-* https://github.com/eclipse-ee4j/glassfish-ha-api
-* https://github.com/eclipse-ee4j/glassfish-logging-annotation-processor
-* https://github.com/eclipse-ee4j/glassfish-shoal
-* https://github.com/eclipse-ee4j/glassfish-cdi-porting-tck
-* https://github.com/eclipse-ee4j/glassfish-jsftemplating
-* https://github.com/eclipse-ee4j/glassfish-hk2-extra
-* https://github.com/eclipse-ee4j/glassfish-hk2
-* https://github.com/eclipse-ee4j/glassfish-fighterfish
-* https://github.com/eclipse-ee4j/glassfish
-* https://github.com/eclipse-ee4j/glassfish-maven-embedded-plugin
-* https://github.com/eclipse-ee4j/bvtck-porting
-
-## Eclipse Contributor Agreement
-
-Before your contribution can be accepted by the project team contributors must
-electronically sign the Eclipse Contributor Agreement (ECA).
-
-* http://www.eclipse.org/legal/ECA.php
-
-Commits that are provided by non-committers must have a Signed-off-by field in
-the footer indicating that the author is aware of the terms by which the
-contribution has been provided to the project. The non-committer must
-additionally have an Eclipse Foundation account and must have a signed Eclipse
-Contributor Agreement (ECA) on file.
-
-For more information, please see the Eclipse Committer Handbook:
-https://www.eclipse.org/projects/handbook/#resources-commit
-
-## Contact
-
-Contact the project developers via the project's "dev" list.
-
-* https://accounts.eclipse.org/mailing-list/glassfish-dev
-
diff --git a/docs/glassfish/performance-tuning-guide/src/main/jbake/assets/LICENSE.md b/docs/glassfish/performance-tuning-guide/src/main/jbake/assets/LICENSE.md
deleted file mode 100644
index f046098..0000000
--- a/docs/glassfish/performance-tuning-guide/src/main/jbake/assets/LICENSE.md
+++ /dev/null
@@ -1,277 +0,0 @@
-# Eclipse Public License - v 2.0
-
-        THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE
-        PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION
-        OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
-
-    1. DEFINITIONS
-
-    "Contribution" means:
-
-      a) in the case of the initial Contributor, the initial content
-         Distributed under this Agreement, and
-
-      b) in the case of each subsequent Contributor: 
-         i) changes to the Program, and 
-         ii) additions to the Program;
-      where such changes and/or additions to the Program originate from
-      and are Distributed by that particular Contributor. A Contribution
-      "originates" from a Contributor if it was added to the Program by
-      such Contributor itself or anyone acting on such Contributor's behalf.
-      Contributions do not include changes or additions to the Program that
-      are not Modified Works.
-
-    "Contributor" means any person or entity that Distributes the Program.
-
-    "Licensed Patents" mean patent claims licensable by a Contributor which
-    are necessarily infringed by the use or sale of its Contribution alone
-    or when combined with the Program.
-
-    "Program" means the Contributions Distributed in accordance with this
-    Agreement.
-
-    "Recipient" means anyone who receives the Program under this Agreement
-    or any Secondary License (as applicable), including Contributors.
-
-    "Derivative Works" shall mean any work, whether in Source Code or other
-    form, that is based on (or derived from) the Program and for which the
-    editorial revisions, annotations, elaborations, or other modifications
-    represent, as a whole, an original work of authorship.
-
-    "Modified Works" shall mean any work in Source Code or other form that
-    results from an addition to, deletion from, or modification of the
-    contents of the Program, including, for purposes of clarity any new file
-    in Source Code form that contains any contents of the Program. Modified
-    Works shall not include works that contain only declarations,
-    interfaces, types, classes, structures, or files of the Program solely
-    in each case in order to link to, bind by name, or subclass the Program
-    or Modified Works thereof.
-
-    "Distribute" means the acts of a) distributing or b) making available
-    in any manner that enables the transfer of a copy.
-
-    "Source Code" means the form of a Program preferred for making
-    modifications, including but not limited to software source code,
-    documentation source, and configuration files.
-
-    "Secondary License" means either the GNU General Public License,
-    Version 2.0, or any later versions of that license, including any
-    exceptions or additional permissions as identified by the initial
-    Contributor.
-
-    2. GRANT OF RIGHTS
-
-      a) Subject to the terms of this Agreement, each Contributor hereby
-      grants Recipient a non-exclusive, worldwide, royalty-free copyright
-      license to reproduce, prepare Derivative Works of, publicly display,
-      publicly perform, Distribute and sublicense the Contribution of such
-      Contributor, if any, and such Derivative Works.
-
-      b) Subject to the terms of this Agreement, each Contributor hereby
-      grants Recipient a non-exclusive, worldwide, royalty-free patent
-      license under Licensed Patents to make, use, sell, offer to sell,
-      import and otherwise transfer the Contribution of such Contributor,
-      if any, in Source Code or other form. This patent license shall
-      apply to the combination of the Contribution and the Program if, at
-      the time the Contribution is added by the Contributor, such addition
-      of the Contribution causes such combination to be covered by the
-      Licensed Patents. The patent license shall not apply to any other
-      combinations which include the Contribution. No hardware per se is
-      licensed hereunder.
-
-      c) Recipient understands that although each Contributor grants the
-      licenses to its Contributions set forth herein, no assurances are
-      provided by any Contributor that the Program does not infringe the
-      patent or other intellectual property rights of any other entity.
-      Each Contributor disclaims any liability to Recipient for claims
-      brought by any other entity based on infringement of intellectual
-      property rights or otherwise. As a condition to exercising the
-      rights and licenses granted hereunder, each Recipient hereby
-      assumes sole responsibility to secure any other intellectual
-      property rights needed, if any. For example, if a third party
-      patent license is required to allow Recipient to Distribute the
-      Program, it is Recipient's responsibility to acquire that license
-      before distributing the Program.
-
-      d) Each Contributor represents that to its knowledge it has
-      sufficient copyright rights in its Contribution, if any, to grant
-      the copyright license set forth in this Agreement.
-
-      e) Notwithstanding the terms of any Secondary License, no
-      Contributor makes additional grants to any Recipient (other than
-      those set forth in this Agreement) as a result of such Recipient's
-      receipt of the Program under the terms of a Secondary License
-      (if permitted under the terms of Section 3).
-
-    3. REQUIREMENTS
-
-    3.1 If a Contributor Distributes the Program in any form, then:
-
-      a) the Program must also be made available as Source Code, in
-      accordance with section 3.2, and the Contributor must accompany
-      the Program with a statement that the Source Code for the Program
-      is available under this Agreement, and informs Recipients how to
-      obtain it in a reasonable manner on or through a medium customarily
-      used for software exchange; and
-
-      b) the Contributor may Distribute the Program under a license
-      different than this Agreement, provided that such license:
-         i) effectively disclaims on behalf of all other Contributors all
-         warranties and conditions, express and implied, including
-         warranties or conditions of title and non-infringement, and
-         implied warranties or conditions of merchantability and fitness
-         for a particular purpose;
-
-         ii) effectively excludes on behalf of all other Contributors all
-         liability for damages, including direct, indirect, special,
-         incidental and consequential damages, such as lost profits;
-
-         iii) does not attempt to limit or alter the recipients' rights
-         in the Source Code under section 3.2; and
-
-         iv) requires any subsequent distribution of the Program by any
-         party to be under a license that satisfies the requirements
-         of this section 3.
-
-    3.2 When the Program is Distributed as Source Code:
-
-      a) it must be made available under this Agreement, or if the
-      Program (i) is combined with other material in a separate file or
-      files made available under a Secondary License, and (ii) the initial
-      Contributor attached to the Source Code the notice described in
-      Exhibit A of this Agreement, then the Program may be made available
-      under the terms of such Secondary Licenses, and
-
-      b) a copy of this Agreement must be included with each copy of
-      the Program.
-
-    3.3 Contributors may not remove or alter any copyright, patent,
-    trademark, attribution notices, disclaimers of warranty, or limitations
-    of liability ("notices") contained within the Program from any copy of
-    the Program which they Distribute, provided that Contributors may add
-    their own appropriate notices.
-
-    4. COMMERCIAL DISTRIBUTION
-
-    Commercial distributors of software may accept certain responsibilities
-    with respect to end users, business partners and the like. While this
-    license is intended to facilitate the commercial use of the Program,
-    the Contributor who includes the Program in a commercial product
-    offering should do so in a manner which does not create potential
-    liability for other Contributors. Therefore, if a Contributor includes
-    the Program in a commercial product offering, such Contributor
-    ("Commercial Contributor") hereby agrees to defend and indemnify every
-    other Contributor ("Indemnified Contributor") against any losses,
-    damages and costs (collectively "Losses") arising from claims, lawsuits
-    and other legal actions brought by a third party against the Indemnified
-    Contributor to the extent caused by the acts or omissions of such
-    Commercial Contributor in connection with its distribution of the Program
-    in a commercial product offering. The obligations in this section do not
-    apply to any claims or Losses relating to any actual or alleged
-    intellectual property infringement. In order to qualify, an Indemnified
-    Contributor must: a) promptly notify the Commercial Contributor in
-    writing of such claim, and b) allow the Commercial Contributor to control,
-    and cooperate with the Commercial Contributor in, the defense and any
-    related settlement negotiations. The Indemnified Contributor may
-    participate in any such claim at its own expense.
-
-    For example, a Contributor might include the Program in a commercial
-    product offering, Product X. That Contributor is then a Commercial
-    Contributor. If that Commercial Contributor then makes performance
-    claims, or offers warranties related to Product X, those performance
-    claims and warranties are such Commercial Contributor's responsibility
-    alone. Under this section, the Commercial Contributor would have to
-    defend claims against the other Contributors related to those performance
-    claims and warranties, and if a court requires any other Contributor to
-    pay any damages as a result, the Commercial Contributor must pay
-    those damages.
-
-    5. NO WARRANTY
-
-    EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT
-    PERMITTED BY APPLICABLE LAW, THE PROGRAM IS PROVIDED ON AN "AS IS"
-    BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR
-    IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF
-    TITLE, NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR
-    PURPOSE. Each Recipient is solely responsible for determining the
-    appropriateness of using and distributing the Program and assumes all
-    risks associated with its exercise of rights under this Agreement,
-    including but not limited to the risks and costs of program errors,
-    compliance with applicable laws, damage to or loss of data, programs
-    or equipment, and unavailability or interruption of operations.
-
-    6. DISCLAIMER OF LIABILITY
-
-    EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT
-    PERMITTED BY APPLICABLE LAW, NEITHER RECIPIENT NOR ANY CONTRIBUTORS
-    SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-    EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST
-    PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-    CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-    ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE
-    EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF THE
-    POSSIBILITY OF SUCH DAMAGES.
-
-    7. GENERAL
-
-    If any provision of this Agreement is invalid or unenforceable under
-    applicable law, it shall not affect the validity or enforceability of
-    the remainder of the terms of this Agreement, and without further
-    action by the parties hereto, such provision shall be reformed to the
-    minimum extent necessary to make such provision valid and enforceable.
-
-    If Recipient institutes patent litigation against any entity
-    (including a cross-claim or counterclaim in a lawsuit) alleging that the
-    Program itself (excluding combinations of the Program with other software
-    or hardware) infringes such Recipient's patent(s), then such Recipient's
-    rights granted under Section 2(b) shall terminate as of the date such
-    litigation is filed.
-
-    All Recipient's rights under this Agreement shall terminate if it
-    fails to comply with any of the material terms or conditions of this
-    Agreement and does not cure such failure in a reasonable period of
-    time after becoming aware of such noncompliance. If all Recipient's
-    rights under this Agreement terminate, Recipient agrees to cease use
-    and distribution of the Program as soon as reasonably practicable.
-    However, Recipient's obligations under this Agreement and any licenses
-    granted by Recipient relating to the Program shall continue and survive.
-
-    Everyone is permitted to copy and distribute copies of this Agreement,
-    but in order to avoid inconsistency the Agreement is copyrighted and
-    may only be modified in the following manner. The Agreement Steward
-    reserves the right to publish new versions (including revisions) of
-    this Agreement from time to time. No one other than the Agreement
-    Steward has the right to modify this Agreement. The Eclipse Foundation
-    is the initial Agreement Steward. The Eclipse Foundation may assign the
-    responsibility to serve as the Agreement Steward to a suitable separate
-    entity. Each new version of the Agreement will be given a distinguishing
-    version number. The Program (including Contributions) may always be
-    Distributed subject to the version of the Agreement under which it was
-    received. In addition, after a new version of the Agreement is published,
-    Contributor may elect to Distribute the Program (including its
-    Contributions) under the new version.
-
-    Except as expressly stated in Sections 2(a) and 2(b) above, Recipient
-    receives no rights or licenses to the intellectual property of any
-    Contributor under this Agreement, whether expressly, by implication,
-    estoppel or otherwise. All rights in the Program not expressly granted
-    under this Agreement are reserved. Nothing in this Agreement is intended
-    to be enforceable by any entity that is not a Contributor or Recipient.
-    No third-party beneficiary rights are created under this Agreement.
-
-    Exhibit A - Form of Secondary Licenses Notice
-
-    "This Source Code may also be made available under the following 
-    Secondary Licenses when the conditions for such availability set forth 
-    in the Eclipse Public License, v. 2.0 are satisfied: {name license(s),
-    version(s), and exceptions or additional permissions here}."
-
-      Simply including a copy of this Agreement, including this Exhibit A
-      is not sufficient to license the Source Code under Secondary Licenses.
-
-      If it is not possible or desirable to put the notice in a particular
-      file, then You may include the notice in a location (such as a LICENSE
-      file in a relevant directory) where a recipient would be likely to
-      look for such a notice.
-
-      You may add additional accurate notices of copyright ownership.
\ No newline at end of file
diff --git a/docs/glassfish/performance-tuning-guide/src/main/jbake/assets/README.md b/docs/glassfish/performance-tuning-guide/src/main/jbake/assets/README.md
deleted file mode 100644
index f8f962c..0000000
--- a/docs/glassfish/performance-tuning-guide/src/main/jbake/assets/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-# About
-
-The {{site.title}} project contains the [AsciiDoc](http://asciidoc.org/)
-source code for the ...
diff --git a/docs/glassfish/performance-tuning-guide/src/main/jbake/assets/_config.yml b/docs/glassfish/performance-tuning-guide/src/main/jbake/assets/_config.yml
deleted file mode 100644
index aa7d276..0000000
--- a/docs/glassfish/performance-tuning-guide/src/main/jbake/assets/_config.yml
+++ /dev/null
@@ -1,14 +0,0 @@
-theme: jekyll-theme-architect
-
-title: [performance-tuning-guide]
-description: [Eclipse GlassFish Server Performance Tuning Guide, Release 5.1]
-
-# sidebar links url
-links:
-  source: https://github.com/javaee/performance-tuning-guide
-  download: https://github.com/javaee/performance-tuning-guide/releases
-  #mailinglist: https://javaee.groups.io/g/performance-tuning-guide
-  #javadocs:
-  docs: https://javaee.github.io/performance-tuning-guide
-  #faq:
-
diff --git a/docs/glassfish/performance-tuning-guide/src/main/jbake/assets/_layouts/default.html b/docs/glassfish/performance-tuning-guide/src/main/jbake/assets/_layouts/default.html
deleted file mode 100644
index f896fad..0000000
--- a/docs/glassfish/performance-tuning-guide/src/main/jbake/assets/_layouts/default.html
+++ /dev/null
@@ -1,100 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <meta charset='utf-8'>
-    <meta http-equiv="X-UA-Compatible" content="chrome=1">
-    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
-    <link rel="stylesheet" href="{{ '/assets/css/style.css?' | relative_url }}" media="screen" type="text/css">
-    <link rel="stylesheet" href="{{ '/assets/css/print.css' | relative_url }}" media="print" type="text/css">
-
-    <!--[if lt IE 9]>
-    <script src="//html5shiv.googlecode.com/svn/trunk/html5.js"></script>
-    <![endif]-->
-
-    <title>{{ site.title | default: site.github.repository_name }}</title>
-  </head>
-
-  <body>
-    <header>
-      <div class="inner">
-        <a href="{{ '/' | absolute_url }}">
-          <h1>{{ site.title | default: site.github.repository_name }}</h1>
-        </a>
-        <h2>{{ site.description | default: site.github.project_tagline }}</h2>
-        {% if site.github.is_project_page %}
-        <a href="{{ '/' | absolute_url }}" class="button"></a>
-        {% endif %}
-      </div>
-    </header>
-
-    <div id="content-wrapper">
-      <div class="inner clearfix">
-        <section id="main-content">
-          {{ content }}
-
-        </section>
-
-        <aside id="sidebar">
-          
-          <hr/>
-
-          <div class="moveright">
-            {% if site.links.source %}
-               <h2><a href="{{ site.links.source }}"><p>Sources</p></a></h2>
-            {% endif %}
-            
-            {% if site.links.javadocs %}
-              <h2><a href="{{ site.links.javadocs }}"><p>APIs</p></a></h2>
-            {% endif %}
-
-            {% if site.links.docs %}
-              <h2><a href="{{ site.links.docs }}"><p>Documentation</p></a></h2>
-            {% endif %}
-
-            {% if site.links.faq %}
-              <h2><a href="{{ site.links.faq }}"><p>FAQ</p></a></h2>
-            {% endif %}
-            
-            {% if site.links.download %}
-               <h2><a href="{{ site.links.download }}"><p>Download</p></a></h2>
-            {% endif %}
-
-            {% if site.links.hide_issuetracker != true %}
-            <h2><a href="{{ site.github.issues_url }}"><p>Issue Tracker</p></a></h2>
-            {% endif %}
-
-            {% if site.links.mailinglist %}
-               <h2><a href="{{ site.links.mailinglist }}"><p>Mailing List</p></a></h2>
-            {% endif %}          
-
-            <h2><a href="CONTRIBUTING"><p>Contribute</p></a></h2>
-
-            <h2><a href="LICENSE"><p>License</p></a></h2>
-          </div>
-          
-          <hr/>
-          
-          <div class="sponsor">
-            <p>Sponsored by<a href="http://www.oracle.com" class="oraclelogo"></a></p>
-          </div>
-          
-        </aside>
-      </div>
-    </div>
-
-    <div class="footer"><a id="copyright" class="oracle" href="https://www.oracle.com/legal/copyright.html">&copy; Oracle</a> | By contributing to this project, you are agreeing to the terms of use described <a href="CONTRIBUTING">here</a>.</div>
-
-    {% if site.google_analytics %}
-      <script type="text/javascript">
-        var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
-        document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));
-      </script>
-      <script type="text/javascript">
-        try {
-          var pageTracker = _gat._getTracker("{{ site.google_analytics }}");
-        pageTracker._trackPageview();
-        } catch(err) {}
-      </script>
-    {% endif %}
-  </body>
-</html>
diff --git a/docs/glassfish/performance-tuning-guide/src/main/jbake/assets/assets/css/print.scss b/docs/glassfish/performance-tuning-guide/src/main/jbake/assets/assets/css/print.scss
deleted file mode 100644
index 6115d8d..0000000
--- a/docs/glassfish/performance-tuning-guide/src/main/jbake/assets/assets/css/print.scss
+++ /dev/null
@@ -1,8 +0,0 @@
----
----
-
-@import "{{ site.theme }}";
-h1 {
-  font-size: 1.8em;
-}
-
diff --git a/docs/glassfish/performance-tuning-guide/src/main/jbake/assets/assets/css/style.scss b/docs/glassfish/performance-tuning-guide/src/main/jbake/assets/assets/css/style.scss
deleted file mode 100644
index 3cf8c1a..0000000
--- a/docs/glassfish/performance-tuning-guide/src/main/jbake/assets/assets/css/style.scss
+++ /dev/null
@@ -1,246 +0,0 @@
----
----
-
-@import "{{ site.theme }}";
-
-header {
-  padding-top: 16px;
-  padding-bottom: 40px;
-  font-family: 'Mukta Vaani', 'Open Sans', 'Helvetica Neue', Helvetica, Arial, serif;
-  background: url(../images/header-bkg.jpg) 0 0 repeat-x;
-  border-bottom: solid 1px #E0E0E0;  
-}
-
-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; // orange
-  //color: #2879d0; // blue
-  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;
-}
-
-a {
-  font-weight: 300;
-  color: #2879d0;
-}
-
-a:hover { 
-  text-decoration: underline;
-}
-
-#sidebar p {
-  font-size: 1em;
-  margin-bottom: 1em;
-}
-
-.highlight { 
-  background-color: #ffffff;
-}
-
-.sponsor {
-  float: left;
-  padding-top: 20px;
-  padding-left: 18px;
-}
-
-.moveright30{
-  padding-left: 30px;
-}
-
-.moveright{
-  padding-left: 40px;
-}
-
-.moveright50{
-  padding-left: 50px;
-}
-
-/*
-a.oraclelogo {
-  position: absolute;
-  background: transparent url(../images/Oracle-logo.png) 0 0 no-repeat;
-  background-position: 2px -2px; 
-  background-size: 100% ;
-  width: 96px;
-  height: 62px;
-  padding-top: 2px;
-  padding-right: 20px;
-}
-*/
-
-aside#sidebar {
-  padding-top: 40px;
-  line-height: 1.2;
-}
-
-hr {
-  border:none;
-  height: 10px;
-  width: 75%;
-  height: 50px;
-  margin-top: 0;
-  border-bottom: 1px solid #cccccc;
-  box-shadow: 0 20px 20px -20px #aaa;
-  margin: -48px auto 10px; 
-}
-
-table {
-   margin-bottom: 20px;
-}
-
-th, td {
-  padding: .2em;
-}
-
-td {
-  font-weight: 400;
-}
-
-ul {
-  font-size: 1em;
-  margin-left: 12px;
-}
-
-ol {
-    list-style-position: inside;
-    list-style: decimal;
-    margin-left: 26px;
-}
-
-blockquote {
-    padding: 0 0 0 10px;
-    margin-left: 14px;
-    margin-bottom: 2px;
-    font-size: 1em;
-    border-left: 4px solid #ddd;
-}
-
-#main-content h1 {
-  padding-top: .6em;
-  font-family: 'Mukta Vaani', 'Open Sans', 'Helvetica Neue', Helvetica, Arial, serif;
-  font-size: 1.6em;
-  font-weight: 500;
-  color : #666;
-  text-indent: 16px;
-  letter-spacing: 0px;
-  border-bottom:1px solid #cccccc;
-  padding-bottom:1px;
-  line-height: 1.2;
-  //margin: .6em 0;
-  margin-bottom: .6em;
-}
-
-#main-content h1:before {
-  //padding-right: 0.3em;
-  margin-left: -1em;
-  content: "";
-}
-
-#main-content h2 {
-  margin-bottom: 8px;
-  font-family: 'Mukta Vaani', 'Open Sans', 'Helvetica Neue', Helvetica, Arial, serif;
-  font-size: 1.4em;
-  font-weight: 400;
-  //color: #474747;
-  color: #3c657b; // blue
-  text-indent: 4px;
-}
-
-#main-content h2:before {
-  padding-right: 1.3em;
-  margin-left: -1.5em;
-  content: "";
-  font-weight: 700;
-}
-
-#main-content h3 {
-  text-indent: 24px;
-  margin-bottom: 8px;
-  font-family: 'Mukta Vaani', 'Open Sans', 'Helvetica Neue', Helvetica, Arial, serif;
-  font-size: 1.2em;
-  font-weight: 500;
-  color: #3c657b;
-  text-indent: 4px;
-}
-
-#main-content h3:before {
-  content: "";
-  margin-left: -0.3em;
-  padding-right: 0.1em;
-}
-
-#main-content h4 {
-  margin-bottom: 8px;
-  font-family: 'Mukta Vaani', 'Open Sans', 'Helvetica Neue', Helvetica, Arial, serif;
-  font-size: 1.2em;
-  font-weight: 500;
-  color: #3c657b;
-  text-indent: 4px;
-}
-
-#main-content h4:before {
-  content: "";
-  margin-left: -0.3em;
-  padding-right: 0.1em;
-}
-
-#main-content p {
-  font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, serif;
-  font-weight: normal;
-  font-size: 1em;
-  margin-bottom: 2px;
-}
-
-.footer {
-  position: fixed; 
-  bottom: 0;
-  left: 0;
-  right: 0;
-  height: 6px;
-  background-color: #f0f0f0;
-  //padding: 1rem;
-  padding-top: 4px;
-  padding-bottom: 14px;
-  font-size: 0.8em;
-  text-align: center;
-}
-
-.oracle {
-  color: #666;
-  font-weight: 400;
-}
-
-.oracle:hover { 
-  text-decoration: none;
-  color: #FF0000;
-}
-
-.fullpage {
-  //float: center;
-  color: FF0000;
-  width: 900px;
-}
\ No newline at end of file
diff --git a/docs/glassfish/performance-tuning-guide/src/main/jbake/assets/assets/images/header-bkg.jpg b/docs/glassfish/performance-tuning-guide/src/main/jbake/assets/assets/images/header-bkg.jpg
deleted file mode 100644
index 481faa5..0000000
--- a/docs/glassfish/performance-tuning-guide/src/main/jbake/assets/assets/images/header-bkg.jpg
+++ /dev/null
Binary files differ
diff --git a/docs/glassfish/performance-tuning-guide/src/main/jbake/content/title.adoc b/docs/glassfish/performance-tuning-guide/src/main/jbake/content/title.adoc
index 56a9fb0..f0c902b 100644
--- a/docs/glassfish/performance-tuning-guide/src/main/jbake/content/title.adoc
+++ b/docs/glassfish/performance-tuning-guide/src/main/jbake/content/title.adoc
@@ -7,7 +7,7 @@
 Eclipse GlassFish Server Performance Tuning Guide, Release 5.1
 ==============================================================
 
-[[glassfish-server-open-source-edition]]
+[[eclipse-glassfish-server]]
 Eclipse GlassFish Server
 ------------------------
 
@@ -42,4 +42,4 @@
 trademarks or registered trademarks of SPARC International, Inc. AMD, 
 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. 
\ No newline at end of file
+trademark of The Open Group. 
diff --git a/docs/glassfish/performance-tuning-guide/src/main/jbake/templates/footer.ftl b/docs/glassfish/performance-tuning-guide/src/main/jbake/templates/footer.ftl
index 46ecc29..b734c7b 100644
--- a/docs/glassfish/performance-tuning-guide/src/main/jbake/templates/footer.ftl
+++ b/docs/glassfish/performance-tuning-guide/src/main/jbake/templates/footer.ftl
@@ -36,7 +36,7 @@
 </table>
 
 <span id="copyright">
-        <img src="img/eclipse_foundation_logo_tiny.png" height="20px" alt="Eclipse Foundation Logo" align="top"/>&nbsp;            
+        <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>
 </body>
diff --git a/docs/glassfish/pom.xml b/docs/glassfish/pom.xml
new file mode 100644
index 0000000..708e6be
--- /dev/null
+++ b/docs/glassfish/pom.xml
@@ -0,0 +1,122 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 
+    Copyright (c) 2017, 2019 Oracle and/or its affiliates. All rights reserved.
+ 
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+ 
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+ 
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+ 
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <!--
+        XXX - Temporarily inherit from ee4j parent,
+        eventually inherit from GlassFish parent.
+    -->
+    <parent>
+        <groupId>org.eclipse.ee4j</groupId>
+        <artifactId>project</artifactId>
+        <version>1.0.5</version>
+    </parent>
+    <groupId>org.glassfish.docs</groupId>
+    <artifactId>docs</artifactId>
+    <version>5.1.1-SNAPSHOT</version>
+    <packaging>pom</packaging>
+    <name>Eclipse GlassFish Documentation</name>
+
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    </properties>
+
+    <modules>
+        <module>parent</module>
+        <module>website</module>
+        <module>add-on-component-development-guide</module>
+        <module>administration-guide</module>
+        <module>application-deployment-guide</module>
+        <module>application-development-guide</module>
+        <module>deployment-planning-guide</module>
+        <module>embedded-server-guide</module>
+        <module>error-messages-reference</module>
+        <module>ha-administration-guide</module>
+        <module>installation-guide</module>
+        <module>performance-tuning-guide</module>
+        <module>quick-start-guide</module>
+        <module>reference-manual</module>
+        <module>release-notes</module>
+        <module>security-guide</module>
+        <module>troubleshooting-guide</module>
+        <module>upgrade-guide</module>
+        <module>distribution</module>
+    </modules>
+
+    <profiles>
+        <profile>
+            <id>publish-site</id>
+            <modules>
+                <module>publish</module>
+            </modules>
+        </profile>
+    </profiles>
+
+    <build>
+        <defaultGoal>install</defaultGoal>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-enforcer-plugin</artifactId>
+                <version>1.4.1</version>
+                <executions>
+                    <execution>
+                        <id>enforce-versions</id>
+                        <goals>
+                            <goal>enforce</goal>
+                        </goals>
+                        <configuration>
+                            <rules>
+                                <requireJavaVersion>
+                                    <version>[1.8.0,1.9.0)</version>
+                                    <message>You need JDK8 or lower</message>
+                                </requireJavaVersion>
+                            </rules>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+
+	<pluginManagement>
+	    <plugins>
+		<plugin>
+		    <groupId>org.apache.maven.plugins</groupId>
+		    <artifactId>maven-jar-plugin</artifactId>
+		    <version>3.1.1</version>
+		</plugin>
+		<plugin>
+		    <groupId>org.apache.maven.plugins</groupId>
+		    <artifactId>maven-dependency-plugin</artifactId>
+		    <version>3.1.1</version>
+		</plugin>
+		<plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-scm-publish-plugin</artifactId>
+                    <version>3.0.0</version>
+		</plugin>
+		<plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-antrun-plugin</artifactId>
+                    <version>1.8</version>
+		</plugin>
+	    </plugins>
+	</pluginManagement>
+    </build>
+</project>
diff --git a/docs/glassfish/publish/pom.xml b/docs/glassfish/publish/pom.xml
new file mode 100644
index 0000000..5c931b9
--- /dev/null
+++ b/docs/glassfish/publish/pom.xml
@@ -0,0 +1,206 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 
+    Copyright (c) 2017, 2019 Oracle and/or its affiliates. All rights reserved.
+ 
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+ 
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+ 
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+ 
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.glassfish.docs</groupId>
+        <artifactId>docs</artifactId>
+        <version>5.1.1-SNAPSHOT</version>
+    </parent>
+    <groupId>org.glassfish.docs</groupId>
+    <artifactId>publish</artifactId>
+    <packaging>jar</packaging>
+    <name>Publish the Eclipse GlassFish Website</name>
+
+    <distributionManagement>
+        <site>
+            <url>scm:git:git@github.com:eclipse-ee4j/glassfish.git</url>
+        </site>
+    </distributionManagement>
+
+    <properties>
+        <site.output.dir>${project.build.directory}/staging</site.output.dir>
+        <maven.site.skip>true</maven.site.skip>
+        <!-- the directory where the current snapshot is published -->
+        <dir.snap>${site.output.dir}/docs/SNAPSHOT</dir.snap>
+        <!-- add a new property for each new release -->
+        <dir.510>${site.output.dir}/docs/5.1.0</dir.510>
+        <!-- the "latest" version; update when a new release is done -->
+        <docs.version>5.1.0</docs.version>
+    </properties>
+
+    <!--
+        This profile is used to publish the entire web site.
+
+        Usage: mvn -Ppublish-site deploy
+    -->
+    <profiles>
+        <profile>
+            <id>publish-site</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <artifactId>maven-dependency-plugin</artifactId>
+                        <executions>
+                            <!--
+                                Get the content for the top level web site.
+                            -->
+                            <execution>
+                                <id>get-website</id>
+                                <phase>generate-sources</phase>
+                                <goals>
+                                    <goal>unpack</goal>
+                                </goals>
+                                <configuration>
+                                    <excludes>
+                                        META-INF/**
+                                    </excludes>
+                                    <artifactItems>
+                                        <artifactItem>
+                                            <groupId>org.glassfish.docs</groupId>
+                                            <artifactId>website</artifactId>
+                                            <version>${project.version}</version>
+                                            <outputDirectory>
+                                                ${site.output.dir}
+                                            </outputDirectory>
+                                        </artifactItem>
+                                    </artifactItems>
+                                </configuration>
+                            </execution>
+                            <!--
+                                Get the collection of documentation for the
+                                current (under development) release.
+                            -->
+                            <execution>
+                                <id>get-current</id>
+                                <phase>generate-sources</phase>
+                                <goals>
+                                    <goal>unpack</goal>
+                                </goals>
+                                <configuration>
+                                    <includeGroupIds>
+                                        org.glassfish.docs
+                                    </includeGroupIds>
+                                    <excludes>META-INF/**</excludes>
+                                    <artifactItems>
+                                        <artifactItem>
+                                            <groupId>org.glassfish.docs</groupId>
+                                            <artifactId>distribution</artifactId>
+                                            <version>${project.version}</version>
+                                            <outputDirectory>
+                                                ${dir.snap}
+                                            </outputDirectory>
+                                        </artifactItem>
+                                    </artifactItems>
+                                </configuration>
+                            </execution>
+                            <!--
+                                Get the collection of documentation for the
+                                5.1.0 release.
+                            -->
+                            <execution>
+                                <id>get-510</id>
+                                <phase>generate-sources</phase>
+                                <goals>
+                                    <goal>unpack</goal>
+                                </goals>
+                                <configuration>
+                                    <includeGroupIds>
+                                        org.glassfish.docs
+                                    </includeGroupIds>
+                                    <excludes>META-INF/**</excludes>
+                                    <artifactItems>
+                                        <artifactItem>
+                                            <groupId>org.glassfish.docs</groupId>
+                                            <artifactId>distribution</artifactId>
+                                            <version>5.1.0</version>
+                                            <outputDirectory>
+                                                ${dir.510}
+                                            </outputDirectory>
+                                        </artifactItem>
+                                    </artifactItems>
+                                </configuration>
+                            </execution>
+                            <!--
+                                Add additional execution blocks here as
+                                new releases are made, using the above
+                                as a template.  Don't forget to update
+                                the docs.version property.
+                            -->
+                        </executions>
+                    </plugin>
+
+                    <!--
+                        Create a symlink from "latest" to the most recently
+                        released version of the docs.
+                    -->
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-antrun-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>create-latest-link</id>
+                                <phase>process-resources</phase>
+                                <goals>
+                                    <goal>run</goal>
+                                </goals>
+                                <configuration>
+                                    <target>
+                                        <delete
+                                          dir="${site.output.dir}/docs/latest"
+                                          followSymlinks="false"
+                                          removeNotFollowedSymlinks="true"
+                                          />
+                                        <symlink
+                                          link="${site.output.dir}/docs/latest"
+                                          resource="${docs.version}"/>
+                                    </target>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+
+                    <!--
+                        Publish the entire web site to the gh-pages branch.
+                    -->
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-scm-publish-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>deploy-site</id>
+                                <phase>deploy</phase>
+                                <goals>
+                                    <goal>publish-scm</goal>
+                                </goals>
+                                <configuration>
+                                    <scmBranch>gh-pages</scmBranch>
+                                    <basedir>docs</basedir>
+                                    <skipDeletedFiles>false</skipDeletedFiles>
+                                    <checkinComment>Update docs</checkinComment>
+                                    <skipCheckin>true</skipCheckin>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
+</project>
diff --git a/docs/glassfish/quick-start-guide/pom.xml b/docs/glassfish/quick-start-guide/pom.xml
index 3cd32bf..236a4b5 100644
--- a/docs/glassfish/quick-start-guide/pom.xml
+++ b/docs/glassfish/quick-start-guide/pom.xml
@@ -18,106 +18,14 @@
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <groupId>org.glassfish</groupId>
+    <parent>
+        <groupId>org.glassfish.docs</groupId>
+        <artifactId>parent</artifactId>
+        <version>5.1.1-SNAPSHOT</version>
+        <relativePath>../parent</relativePath>
+    </parent>
+    <groupId>org.glassfish.docs</groupId>
     <artifactId>quick-start-guide</artifactId>
-    <packaging>pom</packaging>
-    <version>1.0.0-SNAPSHOT</version>
+    <packaging>jar</packaging>
     <name>Eclipse GlassFish Server Quick Start Guide, Release 5.1</name>
-
-    <properties>
-        <site.output.dir>${project.build.directory}/staging</site.output.dir>
-        <maven.site.skip>true</maven.site.skip>
-        <maven.deploy.skip>true</maven.deploy.skip>
-    </properties>
-
-    <distributionManagement>
-        <site>
-            <url>scm:git:git@github.com:javaee/quick-start-guide.git</url>
-        </site>
-    </distributionManagement>
-
-    <build>
-        <defaultGoal>package</defaultGoal>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-enforcer-plugin</artifactId>
-                <version>1.4.1</version>
-                <executions>
-                    <execution>
-                        <id>enforce-versions</id>
-                        <goals>
-                            <goal>enforce</goal>
-                        </goals>
-                        <configuration>
-                            <rules>
-                                <requireJavaVersion>
-                                    <version>[1.8.0,1.9.0)</version>
-                                    <message>You need JDK8 or lower</message>
-                                </requireJavaVersion>
-                            </rules>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>com.blazebit</groupId>
-                <artifactId>jbake-maven-plugin</artifactId>
-                <version>1.0.0</version>
-                <configuration>
-                    <outputDirectory>${site.output.dir}</outputDirectory>
-                </configuration>
-                <executions>
-                    <execution>
-                        <id>build-site</id>
-                        <phase>generate-resources</phase>
-                        <goals>
-                            <goal>build</goal>
-                        </goals>
-                    </execution>
-                </executions>
-                <dependencies>
-                    <dependency>
-                        <groupId>org.asciidoctor</groupId>
-                        <artifactId>asciidoctorj</artifactId>
-                        <version>1.5.5</version>
-                    </dependency>
-                    <dependency>
-                        <groupId>org.asciidoctor</groupId>
-                        <artifactId>asciidoctorj-diagram</artifactId>
-                        <version>1.5.4</version>
-                    </dependency>
-                </dependencies>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-scm-publish-plugin</artifactId>
-                <version>1.1</version>
-                <executions>
-                    <execution>
-                        <id>deploy-site</id>
-                        <phase>deploy</phase>
-                        <goals>
-                            <goal>publish-scm</goal>
-                        </goals>
-                        <configuration>
-                            <scmBranch>gh-pages</scmBranch>
-                            <skipDeletedFiles>false</skipDeletedFiles>
-                            <checkinComment>Update site</checkinComment>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-	</plugins>
-
-	<pluginManagement>
-	    <plugins>
-		<plugin>
-		    <groupId>org.apache.maven.plugins</groupId>
-		    <artifactId>maven-assembly-plugin</artifactId>
-		    <version>2.4</version>
-		</plugin>
-	    </plugins>
-	</pluginManagement>
-    </build>
 </project>
diff --git a/docs/glassfish/quick-start-guide/src/main/jbake/assets/CONTRIBUTING.md b/docs/glassfish/quick-start-guide/src/main/jbake/assets/CONTRIBUTING.md
deleted file mode 100644
index a0ebaa0..0000000
--- a/docs/glassfish/quick-start-guide/src/main/jbake/assets/CONTRIBUTING.md
+++ /dev/null
@@ -1,57 +0,0 @@
-# Contributing to Eclipse GlassFish
-
-Thanks for your interest in this project.
-
-## Project description
-
-Eclipse GlassFish is a complete application server that implements the Jakarta
-EE specification. GlassFish includes implementations of all required and
-optional Jakarta EE APIs, and passes all Jakarta EE TCKs. GlassFish also
-includes a complete administration console, clustering support, and other
-developer and production focused tools and features.
-
-* https://projects.eclipse.org/projects/ee4j.glassfish
-
-## Developer resources
-
-Information regarding source code management, builds, coding standards, and
-more.
-
-* https://projects.eclipse.org/projects/ee4j.glassfish/developer
-
-The project maintains the following source code repositories
-
-* https://github.com/eclipse-ee4j/glassfish-ha-api
-* https://github.com/eclipse-ee4j/glassfish-logging-annotation-processor
-* https://github.com/eclipse-ee4j/glassfish-shoal
-* https://github.com/eclipse-ee4j/glassfish-cdi-porting-tck
-* https://github.com/eclipse-ee4j/glassfish-jsftemplating
-* https://github.com/eclipse-ee4j/glassfish-hk2-extra
-* https://github.com/eclipse-ee4j/glassfish-hk2
-* https://github.com/eclipse-ee4j/glassfish-fighterfish
-* https://github.com/eclipse-ee4j/glassfish
-* https://github.com/eclipse-ee4j/glassfish-maven-embedded-plugin
-* https://github.com/eclipse-ee4j/bvtck-porting
-
-## Eclipse Contributor Agreement
-
-Before your contribution can be accepted by the project team contributors must
-electronically sign the Eclipse Contributor Agreement (ECA).
-
-* http://www.eclipse.org/legal/ECA.php
-
-Commits that are provided by non-committers must have a Signed-off-by field in
-the footer indicating that the author is aware of the terms by which the
-contribution has been provided to the project. The non-committer must
-additionally have an Eclipse Foundation account and must have a signed Eclipse
-Contributor Agreement (ECA) on file.
-
-For more information, please see the Eclipse Committer Handbook:
-https://www.eclipse.org/projects/handbook/#resources-commit
-
-## Contact
-
-Contact the project developers via the project's "dev" list.
-
-* https://accounts.eclipse.org/mailing-list/glassfish-dev
-
diff --git a/docs/glassfish/quick-start-guide/src/main/jbake/assets/LICENSE.md b/docs/glassfish/quick-start-guide/src/main/jbake/assets/LICENSE.md
deleted file mode 100644
index f046098..0000000
--- a/docs/glassfish/quick-start-guide/src/main/jbake/assets/LICENSE.md
+++ /dev/null
@@ -1,277 +0,0 @@
-# Eclipse Public License - v 2.0
-
-        THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE
-        PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION
-        OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
-
-    1. DEFINITIONS
-
-    "Contribution" means:
-
-      a) in the case of the initial Contributor, the initial content
-         Distributed under this Agreement, and
-
-      b) in the case of each subsequent Contributor: 
-         i) changes to the Program, and 
-         ii) additions to the Program;
-      where such changes and/or additions to the Program originate from
-      and are Distributed by that particular Contributor. A Contribution
-      "originates" from a Contributor if it was added to the Program by
-      such Contributor itself or anyone acting on such Contributor's behalf.
-      Contributions do not include changes or additions to the Program that
-      are not Modified Works.
-
-    "Contributor" means any person or entity that Distributes the Program.
-
-    "Licensed Patents" mean patent claims licensable by a Contributor which
-    are necessarily infringed by the use or sale of its Contribution alone
-    or when combined with the Program.
-
-    "Program" means the Contributions Distributed in accordance with this
-    Agreement.
-
-    "Recipient" means anyone who receives the Program under this Agreement
-    or any Secondary License (as applicable), including Contributors.
-
-    "Derivative Works" shall mean any work, whether in Source Code or other
-    form, that is based on (or derived from) the Program and for which the
-    editorial revisions, annotations, elaborations, or other modifications
-    represent, as a whole, an original work of authorship.
-
-    "Modified Works" shall mean any work in Source Code or other form that
-    results from an addition to, deletion from, or modification of the
-    contents of the Program, including, for purposes of clarity any new file
-    in Source Code form that contains any contents of the Program. Modified
-    Works shall not include works that contain only declarations,
-    interfaces, types, classes, structures, or files of the Program solely
-    in each case in order to link to, bind by name, or subclass the Program
-    or Modified Works thereof.
-
-    "Distribute" means the acts of a) distributing or b) making available
-    in any manner that enables the transfer of a copy.
-
-    "Source Code" means the form of a Program preferred for making
-    modifications, including but not limited to software source code,
-    documentation source, and configuration files.
-
-    "Secondary License" means either the GNU General Public License,
-    Version 2.0, or any later versions of that license, including any
-    exceptions or additional permissions as identified by the initial
-    Contributor.
-
-    2. GRANT OF RIGHTS
-
-      a) Subject to the terms of this Agreement, each Contributor hereby
-      grants Recipient a non-exclusive, worldwide, royalty-free copyright
-      license to reproduce, prepare Derivative Works of, publicly display,
-      publicly perform, Distribute and sublicense the Contribution of such
-      Contributor, if any, and such Derivative Works.
-
-      b) Subject to the terms of this Agreement, each Contributor hereby
-      grants Recipient a non-exclusive, worldwide, royalty-free patent
-      license under Licensed Patents to make, use, sell, offer to sell,
-      import and otherwise transfer the Contribution of such Contributor,
-      if any, in Source Code or other form. This patent license shall
-      apply to the combination of the Contribution and the Program if, at
-      the time the Contribution is added by the Contributor, such addition
-      of the Contribution causes such combination to be covered by the
-      Licensed Patents. The patent license shall not apply to any other
-      combinations which include the Contribution. No hardware per se is
-      licensed hereunder.
-
-      c) Recipient understands that although each Contributor grants the
-      licenses to its Contributions set forth herein, no assurances are
-      provided by any Contributor that the Program does not infringe the
-      patent or other intellectual property rights of any other entity.
-      Each Contributor disclaims any liability to Recipient for claims
-      brought by any other entity based on infringement of intellectual
-      property rights or otherwise. As a condition to exercising the
-      rights and licenses granted hereunder, each Recipient hereby
-      assumes sole responsibility to secure any other intellectual
-      property rights needed, if any. For example, if a third party
-      patent license is required to allow Recipient to Distribute the
-      Program, it is Recipient's responsibility to acquire that license
-      before distributing the Program.
-
-      d) Each Contributor represents that to its knowledge it has
-      sufficient copyright rights in its Contribution, if any, to grant
-      the copyright license set forth in this Agreement.
-
-      e) Notwithstanding the terms of any Secondary License, no
-      Contributor makes additional grants to any Recipient (other than
-      those set forth in this Agreement) as a result of such Recipient's
-      receipt of the Program under the terms of a Secondary License
-      (if permitted under the terms of Section 3).
-
-    3. REQUIREMENTS
-
-    3.1 If a Contributor Distributes the Program in any form, then:
-
-      a) the Program must also be made available as Source Code, in
-      accordance with section 3.2, and the Contributor must accompany
-      the Program with a statement that the Source Code for the Program
-      is available under this Agreement, and informs Recipients how to
-      obtain it in a reasonable manner on or through a medium customarily
-      used for software exchange; and
-
-      b) the Contributor may Distribute the Program under a license
-      different than this Agreement, provided that such license:
-         i) effectively disclaims on behalf of all other Contributors all
-         warranties and conditions, express and implied, including
-         warranties or conditions of title and non-infringement, and
-         implied warranties or conditions of merchantability and fitness
-         for a particular purpose;
-
-         ii) effectively excludes on behalf of all other Contributors all
-         liability for damages, including direct, indirect, special,
-         incidental and consequential damages, such as lost profits;
-
-         iii) does not attempt to limit or alter the recipients' rights
-         in the Source Code under section 3.2; and
-
-         iv) requires any subsequent distribution of the Program by any
-         party to be under a license that satisfies the requirements
-         of this section 3.
-
-    3.2 When the Program is Distributed as Source Code:
-
-      a) it must be made available under this Agreement, or if the
-      Program (i) is combined with other material in a separate file or
-      files made available under a Secondary License, and (ii) the initial
-      Contributor attached to the Source Code the notice described in
-      Exhibit A of this Agreement, then the Program may be made available
-      under the terms of such Secondary Licenses, and
-
-      b) a copy of this Agreement must be included with each copy of
-      the Program.
-
-    3.3 Contributors may not remove or alter any copyright, patent,
-    trademark, attribution notices, disclaimers of warranty, or limitations
-    of liability ("notices") contained within the Program from any copy of
-    the Program which they Distribute, provided that Contributors may add
-    their own appropriate notices.
-
-    4. COMMERCIAL DISTRIBUTION
-
-    Commercial distributors of software may accept certain responsibilities
-    with respect to end users, business partners and the like. While this
-    license is intended to facilitate the commercial use of the Program,
-    the Contributor who includes the Program in a commercial product
-    offering should do so in a manner which does not create potential
-    liability for other Contributors. Therefore, if a Contributor includes
-    the Program in a commercial product offering, such Contributor
-    ("Commercial Contributor") hereby agrees to defend and indemnify every
-    other Contributor ("Indemnified Contributor") against any losses,
-    damages and costs (collectively "Losses") arising from claims, lawsuits
-    and other legal actions brought by a third party against the Indemnified
-    Contributor to the extent caused by the acts or omissions of such
-    Commercial Contributor in connection with its distribution of the Program
-    in a commercial product offering. The obligations in this section do not
-    apply to any claims or Losses relating to any actual or alleged
-    intellectual property infringement. In order to qualify, an Indemnified
-    Contributor must: a) promptly notify the Commercial Contributor in
-    writing of such claim, and b) allow the Commercial Contributor to control,
-    and cooperate with the Commercial Contributor in, the defense and any
-    related settlement negotiations. The Indemnified Contributor may
-    participate in any such claim at its own expense.
-
-    For example, a Contributor might include the Program in a commercial
-    product offering, Product X. That Contributor is then a Commercial
-    Contributor. If that Commercial Contributor then makes performance
-    claims, or offers warranties related to Product X, those performance
-    claims and warranties are such Commercial Contributor's responsibility
-    alone. Under this section, the Commercial Contributor would have to
-    defend claims against the other Contributors related to those performance
-    claims and warranties, and if a court requires any other Contributor to
-    pay any damages as a result, the Commercial Contributor must pay
-    those damages.
-
-    5. NO WARRANTY
-
-    EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT
-    PERMITTED BY APPLICABLE LAW, THE PROGRAM IS PROVIDED ON AN "AS IS"
-    BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR
-    IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF
-    TITLE, NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR
-    PURPOSE. Each Recipient is solely responsible for determining the
-    appropriateness of using and distributing the Program and assumes all
-    risks associated with its exercise of rights under this Agreement,
-    including but not limited to the risks and costs of program errors,
-    compliance with applicable laws, damage to or loss of data, programs
-    or equipment, and unavailability or interruption of operations.
-
-    6. DISCLAIMER OF LIABILITY
-
-    EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT
-    PERMITTED BY APPLICABLE LAW, NEITHER RECIPIENT NOR ANY CONTRIBUTORS
-    SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-    EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST
-    PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-    CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-    ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE
-    EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF THE
-    POSSIBILITY OF SUCH DAMAGES.
-
-    7. GENERAL
-
-    If any provision of this Agreement is invalid or unenforceable under
-    applicable law, it shall not affect the validity or enforceability of
-    the remainder of the terms of this Agreement, and without further
-    action by the parties hereto, such provision shall be reformed to the
-    minimum extent necessary to make such provision valid and enforceable.
-
-    If Recipient institutes patent litigation against any entity
-    (including a cross-claim or counterclaim in a lawsuit) alleging that the
-    Program itself (excluding combinations of the Program with other software
-    or hardware) infringes such Recipient's patent(s), then such Recipient's
-    rights granted under Section 2(b) shall terminate as of the date such
-    litigation is filed.
-
-    All Recipient's rights under this Agreement shall terminate if it
-    fails to comply with any of the material terms or conditions of this
-    Agreement and does not cure such failure in a reasonable period of
-    time after becoming aware of such noncompliance. If all Recipient's
-    rights under this Agreement terminate, Recipient agrees to cease use
-    and distribution of the Program as soon as reasonably practicable.
-    However, Recipient's obligations under this Agreement and any licenses
-    granted by Recipient relating to the Program shall continue and survive.
-
-    Everyone is permitted to copy and distribute copies of this Agreement,
-    but in order to avoid inconsistency the Agreement is copyrighted and
-    may only be modified in the following manner. The Agreement Steward
-    reserves the right to publish new versions (including revisions) of
-    this Agreement from time to time. No one other than the Agreement
-    Steward has the right to modify this Agreement. The Eclipse Foundation
-    is the initial Agreement Steward. The Eclipse Foundation may assign the
-    responsibility to serve as the Agreement Steward to a suitable separate
-    entity. Each new version of the Agreement will be given a distinguishing
-    version number. The Program (including Contributions) may always be
-    Distributed subject to the version of the Agreement under which it was
-    received. In addition, after a new version of the Agreement is published,
-    Contributor may elect to Distribute the Program (including its
-    Contributions) under the new version.
-
-    Except as expressly stated in Sections 2(a) and 2(b) above, Recipient
-    receives no rights or licenses to the intellectual property of any
-    Contributor under this Agreement, whether expressly, by implication,
-    estoppel or otherwise. All rights in the Program not expressly granted
-    under this Agreement are reserved. Nothing in this Agreement is intended
-    to be enforceable by any entity that is not a Contributor or Recipient.
-    No third-party beneficiary rights are created under this Agreement.
-
-    Exhibit A - Form of Secondary Licenses Notice
-
-    "This Source Code may also be made available under the following 
-    Secondary Licenses when the conditions for such availability set forth 
-    in the Eclipse Public License, v. 2.0 are satisfied: {name license(s),
-    version(s), and exceptions or additional permissions here}."
-
-      Simply including a copy of this Agreement, including this Exhibit A
-      is not sufficient to license the Source Code under Secondary Licenses.
-
-      If it is not possible or desirable to put the notice in a particular
-      file, then You may include the notice in a location (such as a LICENSE
-      file in a relevant directory) where a recipient would be likely to
-      look for such a notice.
-
-      You may add additional accurate notices of copyright ownership.
\ No newline at end of file
diff --git a/docs/glassfish/quick-start-guide/src/main/jbake/assets/README.md b/docs/glassfish/quick-start-guide/src/main/jbake/assets/README.md
deleted file mode 100644
index f8f962c..0000000
--- a/docs/glassfish/quick-start-guide/src/main/jbake/assets/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-# About
-
-The {{site.title}} project contains the [AsciiDoc](http://asciidoc.org/)
-source code for the ...
diff --git a/docs/glassfish/quick-start-guide/src/main/jbake/assets/_config.yml b/docs/glassfish/quick-start-guide/src/main/jbake/assets/_config.yml
deleted file mode 100644
index 43b2738..0000000
--- a/docs/glassfish/quick-start-guide/src/main/jbake/assets/_config.yml
+++ /dev/null
@@ -1,14 +0,0 @@
-theme: jekyll-theme-architect
-
-title: [quick-start-guide]
-description: [Eclipse GlassFish Server Quick Start Guide, Release 5.1]
-
-# sidebar links url
-links:
-  source: https://github.com/javaee/quick-start-guide
-  download: https://github.com/javaee/quick-start-guide/releases
-  #mailinglist: https://javaee.groups.io/g/quick-start-guide
-  #javadocs:
-  docs: https://javaee.github.io/quick-start-guide
-  #faq:
-
diff --git a/docs/glassfish/quick-start-guide/src/main/jbake/assets/_layouts/default.html b/docs/glassfish/quick-start-guide/src/main/jbake/assets/_layouts/default.html
deleted file mode 100644
index f896fad..0000000
--- a/docs/glassfish/quick-start-guide/src/main/jbake/assets/_layouts/default.html
+++ /dev/null
@@ -1,100 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <meta charset='utf-8'>
-    <meta http-equiv="X-UA-Compatible" content="chrome=1">
-    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
-    <link rel="stylesheet" href="{{ '/assets/css/style.css?' | relative_url }}" media="screen" type="text/css">
-    <link rel="stylesheet" href="{{ '/assets/css/print.css' | relative_url }}" media="print" type="text/css">
-
-    <!--[if lt IE 9]>
-    <script src="//html5shiv.googlecode.com/svn/trunk/html5.js"></script>
-    <![endif]-->
-
-    <title>{{ site.title | default: site.github.repository_name }}</title>
-  </head>
-
-  <body>
-    <header>
-      <div class="inner">
-        <a href="{{ '/' | absolute_url }}">
-          <h1>{{ site.title | default: site.github.repository_name }}</h1>
-        </a>
-        <h2>{{ site.description | default: site.github.project_tagline }}</h2>
-        {% if site.github.is_project_page %}
-        <a href="{{ '/' | absolute_url }}" class="button"></a>
-        {% endif %}
-      </div>
-    </header>
-
-    <div id="content-wrapper">
-      <div class="inner clearfix">
-        <section id="main-content">
-          {{ content }}
-
-        </section>
-
-        <aside id="sidebar">
-          
-          <hr/>
-
-          <div class="moveright">
-            {% if site.links.source %}
-               <h2><a href="{{ site.links.source }}"><p>Sources</p></a></h2>
-            {% endif %}
-            
-            {% if site.links.javadocs %}
-              <h2><a href="{{ site.links.javadocs }}"><p>APIs</p></a></h2>
-            {% endif %}
-
-            {% if site.links.docs %}
-              <h2><a href="{{ site.links.docs }}"><p>Documentation</p></a></h2>
-            {% endif %}
-
-            {% if site.links.faq %}
-              <h2><a href="{{ site.links.faq }}"><p>FAQ</p></a></h2>
-            {% endif %}
-            
-            {% if site.links.download %}
-               <h2><a href="{{ site.links.download }}"><p>Download</p></a></h2>
-            {% endif %}
-
-            {% if site.links.hide_issuetracker != true %}
-            <h2><a href="{{ site.github.issues_url }}"><p>Issue Tracker</p></a></h2>
-            {% endif %}
-
-            {% if site.links.mailinglist %}
-               <h2><a href="{{ site.links.mailinglist }}"><p>Mailing List</p></a></h2>
-            {% endif %}          
-
-            <h2><a href="CONTRIBUTING"><p>Contribute</p></a></h2>
-
-            <h2><a href="LICENSE"><p>License</p></a></h2>
-          </div>
-          
-          <hr/>
-          
-          <div class="sponsor">
-            <p>Sponsored by<a href="http://www.oracle.com" class="oraclelogo"></a></p>
-          </div>
-          
-        </aside>
-      </div>
-    </div>
-
-    <div class="footer"><a id="copyright" class="oracle" href="https://www.oracle.com/legal/copyright.html">&copy; Oracle</a> | By contributing to this project, you are agreeing to the terms of use described <a href="CONTRIBUTING">here</a>.</div>
-
-    {% if site.google_analytics %}
-      <script type="text/javascript">
-        var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
-        document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));
-      </script>
-      <script type="text/javascript">
-        try {
-          var pageTracker = _gat._getTracker("{{ site.google_analytics }}");
-        pageTracker._trackPageview();
-        } catch(err) {}
-      </script>
-    {% endif %}
-  </body>
-</html>
diff --git a/docs/glassfish/quick-start-guide/src/main/jbake/assets/assets/css/print.scss b/docs/glassfish/quick-start-guide/src/main/jbake/assets/assets/css/print.scss
deleted file mode 100644
index 6115d8d..0000000
--- a/docs/glassfish/quick-start-guide/src/main/jbake/assets/assets/css/print.scss
+++ /dev/null
@@ -1,8 +0,0 @@
----
----
-
-@import "{{ site.theme }}";
-h1 {
-  font-size: 1.8em;
-}
-
diff --git a/docs/glassfish/quick-start-guide/src/main/jbake/assets/assets/css/style.scss b/docs/glassfish/quick-start-guide/src/main/jbake/assets/assets/css/style.scss
deleted file mode 100644
index 3cf8c1a..0000000
--- a/docs/glassfish/quick-start-guide/src/main/jbake/assets/assets/css/style.scss
+++ /dev/null
@@ -1,246 +0,0 @@
----
----
-
-@import "{{ site.theme }}";
-
-header {
-  padding-top: 16px;
-  padding-bottom: 40px;
-  font-family: 'Mukta Vaani', 'Open Sans', 'Helvetica Neue', Helvetica, Arial, serif;
-  background: url(../images/header-bkg.jpg) 0 0 repeat-x;
-  border-bottom: solid 1px #E0E0E0;  
-}
-
-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; // orange
-  //color: #2879d0; // blue
-  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;
-}
-
-a {
-  font-weight: 300;
-  color: #2879d0;
-}
-
-a:hover { 
-  text-decoration: underline;
-}
-
-#sidebar p {
-  font-size: 1em;
-  margin-bottom: 1em;
-}
-
-.highlight { 
-  background-color: #ffffff;
-}
-
-.sponsor {
-  float: left;
-  padding-top: 20px;
-  padding-left: 18px;
-}
-
-.moveright30{
-  padding-left: 30px;
-}
-
-.moveright{
-  padding-left: 40px;
-}
-
-.moveright50{
-  padding-left: 50px;
-}
-
-/*
-a.oraclelogo {
-  position: absolute;
-  background: transparent url(../images/Oracle-logo.png) 0 0 no-repeat;
-  background-position: 2px -2px; 
-  background-size: 100% ;
-  width: 96px;
-  height: 62px;
-  padding-top: 2px;
-  padding-right: 20px;
-}
-*/
-
-aside#sidebar {
-  padding-top: 40px;
-  line-height: 1.2;
-}
-
-hr {
-  border:none;
-  height: 10px;
-  width: 75%;
-  height: 50px;
-  margin-top: 0;
-  border-bottom: 1px solid #cccccc;
-  box-shadow: 0 20px 20px -20px #aaa;
-  margin: -48px auto 10px; 
-}
-
-table {
-   margin-bottom: 20px;
-}
-
-th, td {
-  padding: .2em;
-}
-
-td {
-  font-weight: 400;
-}
-
-ul {
-  font-size: 1em;
-  margin-left: 12px;
-}
-
-ol {
-    list-style-position: inside;
-    list-style: decimal;
-    margin-left: 26px;
-}
-
-blockquote {
-    padding: 0 0 0 10px;
-    margin-left: 14px;
-    margin-bottom: 2px;
-    font-size: 1em;
-    border-left: 4px solid #ddd;
-}
-
-#main-content h1 {
-  padding-top: .6em;
-  font-family: 'Mukta Vaani', 'Open Sans', 'Helvetica Neue', Helvetica, Arial, serif;
-  font-size: 1.6em;
-  font-weight: 500;
-  color : #666;
-  text-indent: 16px;
-  letter-spacing: 0px;
-  border-bottom:1px solid #cccccc;
-  padding-bottom:1px;
-  line-height: 1.2;
-  //margin: .6em 0;
-  margin-bottom: .6em;
-}
-
-#main-content h1:before {
-  //padding-right: 0.3em;
-  margin-left: -1em;
-  content: "";
-}
-
-#main-content h2 {
-  margin-bottom: 8px;
-  font-family: 'Mukta Vaani', 'Open Sans', 'Helvetica Neue', Helvetica, Arial, serif;
-  font-size: 1.4em;
-  font-weight: 400;
-  //color: #474747;
-  color: #3c657b; // blue
-  text-indent: 4px;
-}
-
-#main-content h2:before {
-  padding-right: 1.3em;
-  margin-left: -1.5em;
-  content: "";
-  font-weight: 700;
-}
-
-#main-content h3 {
-  text-indent: 24px;
-  margin-bottom: 8px;
-  font-family: 'Mukta Vaani', 'Open Sans', 'Helvetica Neue', Helvetica, Arial, serif;
-  font-size: 1.2em;
-  font-weight: 500;
-  color: #3c657b;
-  text-indent: 4px;
-}
-
-#main-content h3:before {
-  content: "";
-  margin-left: -0.3em;
-  padding-right: 0.1em;
-}
-
-#main-content h4 {
-  margin-bottom: 8px;
-  font-family: 'Mukta Vaani', 'Open Sans', 'Helvetica Neue', Helvetica, Arial, serif;
-  font-size: 1.2em;
-  font-weight: 500;
-  color: #3c657b;
-  text-indent: 4px;
-}
-
-#main-content h4:before {
-  content: "";
-  margin-left: -0.3em;
-  padding-right: 0.1em;
-}
-
-#main-content p {
-  font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, serif;
-  font-weight: normal;
-  font-size: 1em;
-  margin-bottom: 2px;
-}
-
-.footer {
-  position: fixed; 
-  bottom: 0;
-  left: 0;
-  right: 0;
-  height: 6px;
-  background-color: #f0f0f0;
-  //padding: 1rem;
-  padding-top: 4px;
-  padding-bottom: 14px;
-  font-size: 0.8em;
-  text-align: center;
-}
-
-.oracle {
-  color: #666;
-  font-weight: 400;
-}
-
-.oracle:hover { 
-  text-decoration: none;
-  color: #FF0000;
-}
-
-.fullpage {
-  //float: center;
-  color: FF0000;
-  width: 900px;
-}
\ No newline at end of file
diff --git a/docs/glassfish/quick-start-guide/src/main/jbake/assets/assets/images/header-bkg.jpg b/docs/glassfish/quick-start-guide/src/main/jbake/assets/assets/images/header-bkg.jpg
deleted file mode 100644
index 481faa5..0000000
--- a/docs/glassfish/quick-start-guide/src/main/jbake/assets/assets/images/header-bkg.jpg
+++ /dev/null
Binary files differ
diff --git a/docs/glassfish/quick-start-guide/src/main/jbake/content/title.adoc b/docs/glassfish/quick-start-guide/src/main/jbake/content/title.adoc
index 58f111b..95dc697 100644
--- a/docs/glassfish/quick-start-guide/src/main/jbake/content/title.adoc
+++ b/docs/glassfish/quick-start-guide/src/main/jbake/content/title.adoc
@@ -7,7 +7,7 @@
 Eclipse GlassFish Server Quick Start Guide, Release 5.1
 =======================================================
 
-[[glassfish-server-open-source-edition]]
+[[eclipse-glassfish-server]]
 Eclipse GlassFish Server
 ------------------------
 
@@ -45,4 +45,4 @@
 trademarks or registered trademarks of SPARC International, Inc. AMD, 
 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. 
\ No newline at end of file
+trademark of The Open Group. 
diff --git a/docs/glassfish/quick-start-guide/src/main/jbake/templates/footer.ftl b/docs/glassfish/quick-start-guide/src/main/jbake/templates/footer.ftl
index 46ecc29..b734c7b 100644
--- a/docs/glassfish/quick-start-guide/src/main/jbake/templates/footer.ftl
+++ b/docs/glassfish/quick-start-guide/src/main/jbake/templates/footer.ftl
@@ -36,7 +36,7 @@
 </table>
 
 <span id="copyright">
-        <img src="img/eclipse_foundation_logo_tiny.png" height="20px" alt="Eclipse Foundation Logo" align="top"/>&nbsp;            
+        <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>
 </body>
diff --git a/docs/glassfish/reference-manual/pom.xml b/docs/glassfish/reference-manual/pom.xml
index c5531c9..3660732 100644
--- a/docs/glassfish/reference-manual/pom.xml
+++ b/docs/glassfish/reference-manual/pom.xml
@@ -18,106 +18,14 @@
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <groupId>org.glassfish</groupId>
+    <parent>
+        <groupId>org.glassfish.docs</groupId>
+        <artifactId>parent</artifactId>
+        <version>5.1.1-SNAPSHOT</version>
+        <relativePath>../parent</relativePath>
+    </parent>
+    <groupId>org.glassfish.docs</groupId>
     <artifactId>reference-manual</artifactId>
-    <packaging>pom</packaging>
-    <version>1.0.0-SNAPSHOT</version>
+    <packaging>jar</packaging>
     <name>Eclipse GlassFish Server Reference Manual, Release 5.1</name>
-
-    <properties>
-        <site.output.dir>${project.build.directory}/staging</site.output.dir>
-        <maven.site.skip>true</maven.site.skip>
-        <maven.deploy.skip>true</maven.deploy.skip>
-    </properties>
-
-    <distributionManagement>
-        <site>
-            <url>scm:git:git@github.com:javaee/reference-manual.git</url>
-        </site>
-    </distributionManagement>
-
-    <build>
-        <defaultGoal>package</defaultGoal>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-enforcer-plugin</artifactId>
-                <version>1.4.1</version>
-                <executions>
-                    <execution>
-                        <id>enforce-versions</id>
-                        <goals>
-                            <goal>enforce</goal>
-                        </goals>
-                        <configuration>
-                            <rules>
-                                <requireJavaVersion>
-                                    <version>[1.8.0,1.9.0)</version>
-                                    <message>You need JDK8 or lower</message>
-                                </requireJavaVersion>
-                            </rules>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>com.blazebit</groupId>
-                <artifactId>jbake-maven-plugin</artifactId>
-                <version>1.0.0</version>
-                <configuration>
-                    <outputDirectory>${site.output.dir}</outputDirectory>
-                </configuration>
-                <executions>
-                    <execution>
-                        <id>build-site</id>
-                        <phase>generate-resources</phase>
-                        <goals>
-                            <goal>build</goal>
-                        </goals>
-                    </execution>
-                </executions>
-                <dependencies>
-                    <dependency>
-                        <groupId>org.asciidoctor</groupId>
-                        <artifactId>asciidoctorj</artifactId>
-                        <version>1.5.5</version>
-                    </dependency>
-                    <dependency>
-                        <groupId>org.asciidoctor</groupId>
-                        <artifactId>asciidoctorj-diagram</artifactId>
-                        <version>1.5.4</version>
-                    </dependency>
-                </dependencies>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-scm-publish-plugin</artifactId>
-                <version>1.1</version>
-                <executions>
-                    <execution>
-                        <id>deploy-site</id>
-                        <phase>deploy</phase>
-                        <goals>
-                            <goal>publish-scm</goal>
-                        </goals>
-                        <configuration>
-                            <scmBranch>gh-pages</scmBranch>
-                            <skipDeletedFiles>false</skipDeletedFiles>
-                            <checkinComment>Update site</checkinComment>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-	</plugins>
-
-	<pluginManagement>
-	    <plugins>
-		<plugin>
-		    <groupId>org.apache.maven.plugins</groupId>
-		    <artifactId>maven-assembly-plugin</artifactId>
-		    <version>2.4</version>
-		</plugin>
-	    </plugins>
-	</pluginManagement>
-    </build>
 </project>
diff --git a/docs/glassfish/reference-manual/src/main/jbake/assets/CONTRIBUTING.md b/docs/glassfish/reference-manual/src/main/jbake/assets/CONTRIBUTING.md
deleted file mode 100644
index a0ebaa0..0000000
--- a/docs/glassfish/reference-manual/src/main/jbake/assets/CONTRIBUTING.md
+++ /dev/null
@@ -1,57 +0,0 @@
-# Contributing to Eclipse GlassFish
-
-Thanks for your interest in this project.
-
-## Project description
-
-Eclipse GlassFish is a complete application server that implements the Jakarta
-EE specification. GlassFish includes implementations of all required and
-optional Jakarta EE APIs, and passes all Jakarta EE TCKs. GlassFish also
-includes a complete administration console, clustering support, and other
-developer and production focused tools and features.
-
-* https://projects.eclipse.org/projects/ee4j.glassfish
-
-## Developer resources
-
-Information regarding source code management, builds, coding standards, and
-more.
-
-* https://projects.eclipse.org/projects/ee4j.glassfish/developer
-
-The project maintains the following source code repositories
-
-* https://github.com/eclipse-ee4j/glassfish-ha-api
-* https://github.com/eclipse-ee4j/glassfish-logging-annotation-processor
-* https://github.com/eclipse-ee4j/glassfish-shoal
-* https://github.com/eclipse-ee4j/glassfish-cdi-porting-tck
-* https://github.com/eclipse-ee4j/glassfish-jsftemplating
-* https://github.com/eclipse-ee4j/glassfish-hk2-extra
-* https://github.com/eclipse-ee4j/glassfish-hk2
-* https://github.com/eclipse-ee4j/glassfish-fighterfish
-* https://github.com/eclipse-ee4j/glassfish
-* https://github.com/eclipse-ee4j/glassfish-maven-embedded-plugin
-* https://github.com/eclipse-ee4j/bvtck-porting
-
-## Eclipse Contributor Agreement
-
-Before your contribution can be accepted by the project team contributors must
-electronically sign the Eclipse Contributor Agreement (ECA).
-
-* http://www.eclipse.org/legal/ECA.php
-
-Commits that are provided by non-committers must have a Signed-off-by field in
-the footer indicating that the author is aware of the terms by which the
-contribution has been provided to the project. The non-committer must
-additionally have an Eclipse Foundation account and must have a signed Eclipse
-Contributor Agreement (ECA) on file.
-
-For more information, please see the Eclipse Committer Handbook:
-https://www.eclipse.org/projects/handbook/#resources-commit
-
-## Contact
-
-Contact the project developers via the project's "dev" list.
-
-* https://accounts.eclipse.org/mailing-list/glassfish-dev
-
diff --git a/docs/glassfish/reference-manual/src/main/jbake/assets/LICENSE.md b/docs/glassfish/reference-manual/src/main/jbake/assets/LICENSE.md
deleted file mode 100644
index f046098..0000000
--- a/docs/glassfish/reference-manual/src/main/jbake/assets/LICENSE.md
+++ /dev/null
@@ -1,277 +0,0 @@
-# Eclipse Public License - v 2.0
-
-        THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE
-        PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION
-        OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
-
-    1. DEFINITIONS
-
-    "Contribution" means:
-
-      a) in the case of the initial Contributor, the initial content
-         Distributed under this Agreement, and
-
-      b) in the case of each subsequent Contributor: 
-         i) changes to the Program, and 
-         ii) additions to the Program;
-      where such changes and/or additions to the Program originate from
-      and are Distributed by that particular Contributor. A Contribution
-      "originates" from a Contributor if it was added to the Program by
-      such Contributor itself or anyone acting on such Contributor's behalf.
-      Contributions do not include changes or additions to the Program that
-      are not Modified Works.
-
-    "Contributor" means any person or entity that Distributes the Program.
-
-    "Licensed Patents" mean patent claims licensable by a Contributor which
-    are necessarily infringed by the use or sale of its Contribution alone
-    or when combined with the Program.
-
-    "Program" means the Contributions Distributed in accordance with this
-    Agreement.
-
-    "Recipient" means anyone who receives the Program under this Agreement
-    or any Secondary License (as applicable), including Contributors.
-
-    "Derivative Works" shall mean any work, whether in Source Code or other
-    form, that is based on (or derived from) the Program and for which the
-    editorial revisions, annotations, elaborations, or other modifications
-    represent, as a whole, an original work of authorship.
-
-    "Modified Works" shall mean any work in Source Code or other form that
-    results from an addition to, deletion from, or modification of the
-    contents of the Program, including, for purposes of clarity any new file
-    in Source Code form that contains any contents of the Program. Modified
-    Works shall not include works that contain only declarations,
-    interfaces, types, classes, structures, or files of the Program solely
-    in each case in order to link to, bind by name, or subclass the Program
-    or Modified Works thereof.
-
-    "Distribute" means the acts of a) distributing or b) making available
-    in any manner that enables the transfer of a copy.
-
-    "Source Code" means the form of a Program preferred for making
-    modifications, including but not limited to software source code,
-    documentation source, and configuration files.
-
-    "Secondary License" means either the GNU General Public License,
-    Version 2.0, or any later versions of that license, including any
-    exceptions or additional permissions as identified by the initial
-    Contributor.
-
-    2. GRANT OF RIGHTS
-
-      a) Subject to the terms of this Agreement, each Contributor hereby
-      grants Recipient a non-exclusive, worldwide, royalty-free copyright
-      license to reproduce, prepare Derivative Works of, publicly display,
-      publicly perform, Distribute and sublicense the Contribution of such
-      Contributor, if any, and such Derivative Works.
-
-      b) Subject to the terms of this Agreement, each Contributor hereby
-      grants Recipient a non-exclusive, worldwide, royalty-free patent
-      license under Licensed Patents to make, use, sell, offer to sell,
-      import and otherwise transfer the Contribution of such Contributor,
-      if any, in Source Code or other form. This patent license shall
-      apply to the combination of the Contribution and the Program if, at
-      the time the Contribution is added by the Contributor, such addition
-      of the Contribution causes such combination to be covered by the
-      Licensed Patents. The patent license shall not apply to any other
-      combinations which include the Contribution. No hardware per se is
-      licensed hereunder.
-
-      c) Recipient understands that although each Contributor grants the
-      licenses to its Contributions set forth herein, no assurances are
-      provided by any Contributor that the Program does not infringe the
-      patent or other intellectual property rights of any other entity.
-      Each Contributor disclaims any liability to Recipient for claims
-      brought by any other entity based on infringement of intellectual
-      property rights or otherwise. As a condition to exercising the
-      rights and licenses granted hereunder, each Recipient hereby
-      assumes sole responsibility to secure any other intellectual
-      property rights needed, if any. For example, if a third party
-      patent license is required to allow Recipient to Distribute the
-      Program, it is Recipient's responsibility to acquire that license
-      before distributing the Program.
-
-      d) Each Contributor represents that to its knowledge it has
-      sufficient copyright rights in its Contribution, if any, to grant
-      the copyright license set forth in this Agreement.
-
-      e) Notwithstanding the terms of any Secondary License, no
-      Contributor makes additional grants to any Recipient (other than
-      those set forth in this Agreement) as a result of such Recipient's
-      receipt of the Program under the terms of a Secondary License
-      (if permitted under the terms of Section 3).
-
-    3. REQUIREMENTS
-
-    3.1 If a Contributor Distributes the Program in any form, then:
-
-      a) the Program must also be made available as Source Code, in
-      accordance with section 3.2, and the Contributor must accompany
-      the Program with a statement that the Source Code for the Program
-      is available under this Agreement, and informs Recipients how to
-      obtain it in a reasonable manner on or through a medium customarily
-      used for software exchange; and
-
-      b) the Contributor may Distribute the Program under a license
-      different than this Agreement, provided that such license:
-         i) effectively disclaims on behalf of all other Contributors all
-         warranties and conditions, express and implied, including
-         warranties or conditions of title and non-infringement, and
-         implied warranties or conditions of merchantability and fitness
-         for a particular purpose;
-
-         ii) effectively excludes on behalf of all other Contributors all
-         liability for damages, including direct, indirect, special,
-         incidental and consequential damages, such as lost profits;
-
-         iii) does not attempt to limit or alter the recipients' rights
-         in the Source Code under section 3.2; and
-
-         iv) requires any subsequent distribution of the Program by any
-         party to be under a license that satisfies the requirements
-         of this section 3.
-
-    3.2 When the Program is Distributed as Source Code:
-
-      a) it must be made available under this Agreement, or if the
-      Program (i) is combined with other material in a separate file or
-      files made available under a Secondary License, and (ii) the initial
-      Contributor attached to the Source Code the notice described in
-      Exhibit A of this Agreement, then the Program may be made available
-      under the terms of such Secondary Licenses, and
-
-      b) a copy of this Agreement must be included with each copy of
-      the Program.
-
-    3.3 Contributors may not remove or alter any copyright, patent,
-    trademark, attribution notices, disclaimers of warranty, or limitations
-    of liability ("notices") contained within the Program from any copy of
-    the Program which they Distribute, provided that Contributors may add
-    their own appropriate notices.
-
-    4. COMMERCIAL DISTRIBUTION
-
-    Commercial distributors of software may accept certain responsibilities
-    with respect to end users, business partners and the like. While this
-    license is intended to facilitate the commercial use of the Program,
-    the Contributor who includes the Program in a commercial product
-    offering should do so in a manner which does not create potential
-    liability for other Contributors. Therefore, if a Contributor includes
-    the Program in a commercial product offering, such Contributor
-    ("Commercial Contributor") hereby agrees to defend and indemnify every
-    other Contributor ("Indemnified Contributor") against any losses,
-    damages and costs (collectively "Losses") arising from claims, lawsuits
-    and other legal actions brought by a third party against the Indemnified
-    Contributor to the extent caused by the acts or omissions of such
-    Commercial Contributor in connection with its distribution of the Program
-    in a commercial product offering. The obligations in this section do not
-    apply to any claims or Losses relating to any actual or alleged
-    intellectual property infringement. In order to qualify, an Indemnified
-    Contributor must: a) promptly notify the Commercial Contributor in
-    writing of such claim, and b) allow the Commercial Contributor to control,
-    and cooperate with the Commercial Contributor in, the defense and any
-    related settlement negotiations. The Indemnified Contributor may
-    participate in any such claim at its own expense.
-
-    For example, a Contributor might include the Program in a commercial
-    product offering, Product X. That Contributor is then a Commercial
-    Contributor. If that Commercial Contributor then makes performance
-    claims, or offers warranties related to Product X, those performance
-    claims and warranties are such Commercial Contributor's responsibility
-    alone. Under this section, the Commercial Contributor would have to
-    defend claims against the other Contributors related to those performance
-    claims and warranties, and if a court requires any other Contributor to
-    pay any damages as a result, the Commercial Contributor must pay
-    those damages.
-
-    5. NO WARRANTY
-
-    EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT
-    PERMITTED BY APPLICABLE LAW, THE PROGRAM IS PROVIDED ON AN "AS IS"
-    BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR
-    IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF
-    TITLE, NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR
-    PURPOSE. Each Recipient is solely responsible for determining the
-    appropriateness of using and distributing the Program and assumes all
-    risks associated with its exercise of rights under this Agreement,
-    including but not limited to the risks and costs of program errors,
-    compliance with applicable laws, damage to or loss of data, programs
-    or equipment, and unavailability or interruption of operations.
-
-    6. DISCLAIMER OF LIABILITY
-
-    EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT
-    PERMITTED BY APPLICABLE LAW, NEITHER RECIPIENT NOR ANY CONTRIBUTORS
-    SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-    EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST
-    PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-    CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-    ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE
-    EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF THE
-    POSSIBILITY OF SUCH DAMAGES.
-
-    7. GENERAL
-
-    If any provision of this Agreement is invalid or unenforceable under
-    applicable law, it shall not affect the validity or enforceability of
-    the remainder of the terms of this Agreement, and without further
-    action by the parties hereto, such provision shall be reformed to the
-    minimum extent necessary to make such provision valid and enforceable.
-
-    If Recipient institutes patent litigation against any entity
-    (including a cross-claim or counterclaim in a lawsuit) alleging that the
-    Program itself (excluding combinations of the Program with other software
-    or hardware) infringes such Recipient's patent(s), then such Recipient's
-    rights granted under Section 2(b) shall terminate as of the date such
-    litigation is filed.
-
-    All Recipient's rights under this Agreement shall terminate if it
-    fails to comply with any of the material terms or conditions of this
-    Agreement and does not cure such failure in a reasonable period of
-    time after becoming aware of such noncompliance. If all Recipient's
-    rights under this Agreement terminate, Recipient agrees to cease use
-    and distribution of the Program as soon as reasonably practicable.
-    However, Recipient's obligations under this Agreement and any licenses
-    granted by Recipient relating to the Program shall continue and survive.
-
-    Everyone is permitted to copy and distribute copies of this Agreement,
-    but in order to avoid inconsistency the Agreement is copyrighted and
-    may only be modified in the following manner. The Agreement Steward
-    reserves the right to publish new versions (including revisions) of
-    this Agreement from time to time. No one other than the Agreement
-    Steward has the right to modify this Agreement. The Eclipse Foundation
-    is the initial Agreement Steward. The Eclipse Foundation may assign the
-    responsibility to serve as the Agreement Steward to a suitable separate
-    entity. Each new version of the Agreement will be given a distinguishing
-    version number. The Program (including Contributions) may always be
-    Distributed subject to the version of the Agreement under which it was
-    received. In addition, after a new version of the Agreement is published,
-    Contributor may elect to Distribute the Program (including its
-    Contributions) under the new version.
-
-    Except as expressly stated in Sections 2(a) and 2(b) above, Recipient
-    receives no rights or licenses to the intellectual property of any
-    Contributor under this Agreement, whether expressly, by implication,
-    estoppel or otherwise. All rights in the Program not expressly granted
-    under this Agreement are reserved. Nothing in this Agreement is intended
-    to be enforceable by any entity that is not a Contributor or Recipient.
-    No third-party beneficiary rights are created under this Agreement.
-
-    Exhibit A - Form of Secondary Licenses Notice
-
-    "This Source Code may also be made available under the following 
-    Secondary Licenses when the conditions for such availability set forth 
-    in the Eclipse Public License, v. 2.0 are satisfied: {name license(s),
-    version(s), and exceptions or additional permissions here}."
-
-      Simply including a copy of this Agreement, including this Exhibit A
-      is not sufficient to license the Source Code under Secondary Licenses.
-
-      If it is not possible or desirable to put the notice in a particular
-      file, then You may include the notice in a location (such as a LICENSE
-      file in a relevant directory) where a recipient would be likely to
-      look for such a notice.
-
-      You may add additional accurate notices of copyright ownership.
\ No newline at end of file
diff --git a/docs/glassfish/reference-manual/src/main/jbake/assets/README.md b/docs/glassfish/reference-manual/src/main/jbake/assets/README.md
deleted file mode 100644
index f8f962c..0000000
--- a/docs/glassfish/reference-manual/src/main/jbake/assets/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-# About
-
-The {{site.title}} project contains the [AsciiDoc](http://asciidoc.org/)
-source code for the ...
diff --git a/docs/glassfish/reference-manual/src/main/jbake/assets/_config.yml b/docs/glassfish/reference-manual/src/main/jbake/assets/_config.yml
deleted file mode 100644
index 6c113aa..0000000
--- a/docs/glassfish/reference-manual/src/main/jbake/assets/_config.yml
+++ /dev/null
@@ -1,14 +0,0 @@
-theme: jekyll-theme-architect
-
-title: [reference-manual]
-description: [Eclipse GlassFish Server Reference Manual, Release 5.1]
-
-# sidebar links url
-links:
-  source: https://github.com/javaee/reference-manual
-  download: https://github.com/javaee/reference-manual/releases
-  #mailinglist: https://javaee.groups.io/g/reference-manual
-  #javadocs:
-  docs: https://javaee.github.io/reference-manual
-  #faq:
-
diff --git a/docs/glassfish/reference-manual/src/main/jbake/assets/_layouts/default.html b/docs/glassfish/reference-manual/src/main/jbake/assets/_layouts/default.html
deleted file mode 100644
index f896fad..0000000
--- a/docs/glassfish/reference-manual/src/main/jbake/assets/_layouts/default.html
+++ /dev/null
@@ -1,100 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <meta charset='utf-8'>
-    <meta http-equiv="X-UA-Compatible" content="chrome=1">
-    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
-    <link rel="stylesheet" href="{{ '/assets/css/style.css?' | relative_url }}" media="screen" type="text/css">
-    <link rel="stylesheet" href="{{ '/assets/css/print.css' | relative_url }}" media="print" type="text/css">
-
-    <!--[if lt IE 9]>
-    <script src="//html5shiv.googlecode.com/svn/trunk/html5.js"></script>
-    <![endif]-->
-
-    <title>{{ site.title | default: site.github.repository_name }}</title>
-  </head>
-
-  <body>
-    <header>
-      <div class="inner">
-        <a href="{{ '/' | absolute_url }}">
-          <h1>{{ site.title | default: site.github.repository_name }}</h1>
-        </a>
-        <h2>{{ site.description | default: site.github.project_tagline }}</h2>
-        {% if site.github.is_project_page %}
-        <a href="{{ '/' | absolute_url }}" class="button"></a>
-        {% endif %}
-      </div>
-    </header>
-
-    <div id="content-wrapper">
-      <div class="inner clearfix">
-        <section id="main-content">
-          {{ content }}
-
-        </section>
-
-        <aside id="sidebar">
-          
-          <hr/>
-
-          <div class="moveright">
-            {% if site.links.source %}
-               <h2><a href="{{ site.links.source }}"><p>Sources</p></a></h2>
-            {% endif %}
-            
-            {% if site.links.javadocs %}
-              <h2><a href="{{ site.links.javadocs }}"><p>APIs</p></a></h2>
-            {% endif %}
-
-            {% if site.links.docs %}
-              <h2><a href="{{ site.links.docs }}"><p>Documentation</p></a></h2>
-            {% endif %}
-
-            {% if site.links.faq %}
-              <h2><a href="{{ site.links.faq }}"><p>FAQ</p></a></h2>
-            {% endif %}
-            
-            {% if site.links.download %}
-               <h2><a href="{{ site.links.download }}"><p>Download</p></a></h2>
-            {% endif %}
-
-            {% if site.links.hide_issuetracker != true %}
-            <h2><a href="{{ site.github.issues_url }}"><p>Issue Tracker</p></a></h2>
-            {% endif %}
-
-            {% if site.links.mailinglist %}
-               <h2><a href="{{ site.links.mailinglist }}"><p>Mailing List</p></a></h2>
-            {% endif %}          
-
-            <h2><a href="CONTRIBUTING"><p>Contribute</p></a></h2>
-
-            <h2><a href="LICENSE"><p>License</p></a></h2>
-          </div>
-          
-          <hr/>
-          
-          <div class="sponsor">
-            <p>Sponsored by<a href="http://www.oracle.com" class="oraclelogo"></a></p>
-          </div>
-          
-        </aside>
-      </div>
-    </div>
-
-    <div class="footer"><a id="copyright" class="oracle" href="https://www.oracle.com/legal/copyright.html">&copy; Oracle</a> | By contributing to this project, you are agreeing to the terms of use described <a href="CONTRIBUTING">here</a>.</div>
-
-    {% if site.google_analytics %}
-      <script type="text/javascript">
-        var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
-        document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));
-      </script>
-      <script type="text/javascript">
-        try {
-          var pageTracker = _gat._getTracker("{{ site.google_analytics }}");
-        pageTracker._trackPageview();
-        } catch(err) {}
-      </script>
-    {% endif %}
-  </body>
-</html>
diff --git a/docs/glassfish/reference-manual/src/main/jbake/assets/assets/css/print.scss b/docs/glassfish/reference-manual/src/main/jbake/assets/assets/css/print.scss
deleted file mode 100644
index 6115d8d..0000000
--- a/docs/glassfish/reference-manual/src/main/jbake/assets/assets/css/print.scss
+++ /dev/null
@@ -1,8 +0,0 @@
----
----
-
-@import "{{ site.theme }}";
-h1 {
-  font-size: 1.8em;
-}
-
diff --git a/docs/glassfish/reference-manual/src/main/jbake/assets/assets/css/style.scss b/docs/glassfish/reference-manual/src/main/jbake/assets/assets/css/style.scss
deleted file mode 100644
index 3cf8c1a..0000000
--- a/docs/glassfish/reference-manual/src/main/jbake/assets/assets/css/style.scss
+++ /dev/null
@@ -1,246 +0,0 @@
----
----
-
-@import "{{ site.theme }}";
-
-header {
-  padding-top: 16px;
-  padding-bottom: 40px;
-  font-family: 'Mukta Vaani', 'Open Sans', 'Helvetica Neue', Helvetica, Arial, serif;
-  background: url(../images/header-bkg.jpg) 0 0 repeat-x;
-  border-bottom: solid 1px #E0E0E0;  
-}
-
-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; // orange
-  //color: #2879d0; // blue
-  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;
-}
-
-a {
-  font-weight: 300;
-  color: #2879d0;
-}
-
-a:hover { 
-  text-decoration: underline;
-}
-
-#sidebar p {
-  font-size: 1em;
-  margin-bottom: 1em;
-}
-
-.highlight { 
-  background-color: #ffffff;
-}
-
-.sponsor {
-  float: left;
-  padding-top: 20px;
-  padding-left: 18px;
-}
-
-.moveright30{
-  padding-left: 30px;
-}
-
-.moveright{
-  padding-left: 40px;
-}
-
-.moveright50{
-  padding-left: 50px;
-}
-
-/*
-a.oraclelogo {
-  position: absolute;
-  background: transparent url(../images/Oracle-logo.png) 0 0 no-repeat;
-  background-position: 2px -2px; 
-  background-size: 100% ;
-  width: 96px;
-  height: 62px;
-  padding-top: 2px;
-  padding-right: 20px;
-}
-*/
-
-aside#sidebar {
-  padding-top: 40px;
-  line-height: 1.2;
-}
-
-hr {
-  border:none;
-  height: 10px;
-  width: 75%;
-  height: 50px;
-  margin-top: 0;
-  border-bottom: 1px solid #cccccc;
-  box-shadow: 0 20px 20px -20px #aaa;
-  margin: -48px auto 10px; 
-}
-
-table {
-   margin-bottom: 20px;
-}
-
-th, td {
-  padding: .2em;
-}
-
-td {
-  font-weight: 400;
-}
-
-ul {
-  font-size: 1em;
-  margin-left: 12px;
-}
-
-ol {
-    list-style-position: inside;
-    list-style: decimal;
-    margin-left: 26px;
-}
-
-blockquote {
-    padding: 0 0 0 10px;
-    margin-left: 14px;
-    margin-bottom: 2px;
-    font-size: 1em;
-    border-left: 4px solid #ddd;
-}
-
-#main-content h1 {
-  padding-top: .6em;
-  font-family: 'Mukta Vaani', 'Open Sans', 'Helvetica Neue', Helvetica, Arial, serif;
-  font-size: 1.6em;
-  font-weight: 500;
-  color : #666;
-  text-indent: 16px;
-  letter-spacing: 0px;
-  border-bottom:1px solid #cccccc;
-  padding-bottom:1px;
-  line-height: 1.2;
-  //margin: .6em 0;
-  margin-bottom: .6em;
-}
-
-#main-content h1:before {
-  //padding-right: 0.3em;
-  margin-left: -1em;
-  content: "";
-}
-
-#main-content h2 {
-  margin-bottom: 8px;
-  font-family: 'Mukta Vaani', 'Open Sans', 'Helvetica Neue', Helvetica, Arial, serif;
-  font-size: 1.4em;
-  font-weight: 400;
-  //color: #474747;
-  color: #3c657b; // blue
-  text-indent: 4px;
-}
-
-#main-content h2:before {
-  padding-right: 1.3em;
-  margin-left: -1.5em;
-  content: "";
-  font-weight: 700;
-}
-
-#main-content h3 {
-  text-indent: 24px;
-  margin-bottom: 8px;
-  font-family: 'Mukta Vaani', 'Open Sans', 'Helvetica Neue', Helvetica, Arial, serif;
-  font-size: 1.2em;
-  font-weight: 500;
-  color: #3c657b;
-  text-indent: 4px;
-}
-
-#main-content h3:before {
-  content: "";
-  margin-left: -0.3em;
-  padding-right: 0.1em;
-}
-
-#main-content h4 {
-  margin-bottom: 8px;
-  font-family: 'Mukta Vaani', 'Open Sans', 'Helvetica Neue', Helvetica, Arial, serif;
-  font-size: 1.2em;
-  font-weight: 500;
-  color: #3c657b;
-  text-indent: 4px;
-}
-
-#main-content h4:before {
-  content: "";
-  margin-left: -0.3em;
-  padding-right: 0.1em;
-}
-
-#main-content p {
-  font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, serif;
-  font-weight: normal;
-  font-size: 1em;
-  margin-bottom: 2px;
-}
-
-.footer {
-  position: fixed; 
-  bottom: 0;
-  left: 0;
-  right: 0;
-  height: 6px;
-  background-color: #f0f0f0;
-  //padding: 1rem;
-  padding-top: 4px;
-  padding-bottom: 14px;
-  font-size: 0.8em;
-  text-align: center;
-}
-
-.oracle {
-  color: #666;
-  font-weight: 400;
-}
-
-.oracle:hover { 
-  text-decoration: none;
-  color: #FF0000;
-}
-
-.fullpage {
-  //float: center;
-  color: FF0000;
-  width: 900px;
-}
\ No newline at end of file
diff --git a/docs/glassfish/reference-manual/src/main/jbake/assets/assets/images/header-bkg.jpg b/docs/glassfish/reference-manual/src/main/jbake/assets/assets/images/header-bkg.jpg
deleted file mode 100644
index 481faa5..0000000
--- a/docs/glassfish/reference-manual/src/main/jbake/assets/assets/images/header-bkg.jpg
+++ /dev/null
Binary files differ
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/title.adoc b/docs/glassfish/reference-manual/src/main/jbake/content/title.adoc
index 43f7ec8..6370f77 100644
--- a/docs/glassfish/reference-manual/src/main/jbake/content/title.adoc
+++ b/docs/glassfish/reference-manual/src/main/jbake/content/title.adoc
@@ -7,7 +7,7 @@
 Eclipse GlassFish Server Reference Manual, Release 5.1
 ======================================================
 
-[[glassfish-server-open-source-edition]]
+[[eclipse-glassfish-server]]
 Eclipse GlassFish Server
 ------------------------
 
@@ -52,4 +52,4 @@
 trademarks or registered trademarks of SPARC International, Inc. AMD, 
 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. 
\ No newline at end of file
+trademark of The Open Group. 
diff --git a/docs/glassfish/reference-manual/src/main/jbake/templates/footer.ftl b/docs/glassfish/reference-manual/src/main/jbake/templates/footer.ftl
index e7df506..131fe6c 100644
--- a/docs/glassfish/reference-manual/src/main/jbake/templates/footer.ftl
+++ b/docs/glassfish/reference-manual/src/main/jbake/templates/footer.ftl
@@ -36,7 +36,7 @@
 </table>
 
 <span id="copyright">
-        <img src="img/eclipse_foundation_logo_tiny.png" height="20px" alt="Eclipse Foundation Logo" align="top"/>&nbsp;            
+        <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>
 
diff --git a/docs/glassfish/release-notes/pom.xml b/docs/glassfish/release-notes/pom.xml
index 9f408af..b265f67 100644
--- a/docs/glassfish/release-notes/pom.xml
+++ b/docs/glassfish/release-notes/pom.xml
@@ -18,106 +18,14 @@
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <groupId>org.glassfish</groupId>
+    <parent>
+        <groupId>org.glassfish.docs</groupId>
+        <artifactId>parent</artifactId>
+        <version>5.1.1-SNAPSHOT</version>
+        <relativePath>../parent</relativePath>
+    </parent>
+    <groupId>org.glassfish.docs</groupId>
     <artifactId>release-notes</artifactId>
-    <packaging>pom</packaging>
-    <version>1.0.0-SNAPSHOT</version>
+    <packaging>jar</packaging>
     <name>Eclipse GlassFish Server Release Notes, Release 5.1</name>
-
-    <properties>
-        <site.output.dir>${project.build.directory}/staging</site.output.dir>
-        <maven.site.skip>true</maven.site.skip>
-        <maven.deploy.skip>true</maven.deploy.skip>
-    </properties>
-
-    <distributionManagement>
-        <site>
-            <url>scm:git:git@github.com:javaee/release-notes.git</url>
-        </site>
-    </distributionManagement>
-
-    <build>
-        <defaultGoal>package</defaultGoal>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-enforcer-plugin</artifactId>
-                <version>1.4.1</version>
-                <executions>
-                    <execution>
-                        <id>enforce-versions</id>
-                        <goals>
-                            <goal>enforce</goal>
-                        </goals>
-                        <configuration>
-                            <rules>
-                                <requireJavaVersion>
-                                    <version>[1.8.0,1.9.0)</version>
-                                    <message>You need JDK8 or lower</message>
-                                </requireJavaVersion>
-                            </rules>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>com.blazebit</groupId>
-                <artifactId>jbake-maven-plugin</artifactId>
-                <version>1.0.0</version>
-                <configuration>
-                    <outputDirectory>${site.output.dir}</outputDirectory>
-                </configuration>
-                <executions>
-                    <execution>
-                        <id>build-site</id>
-                        <phase>generate-resources</phase>
-                        <goals>
-                            <goal>build</goal>
-                        </goals>
-                    </execution>
-                </executions>
-                <dependencies>
-                    <dependency>
-                        <groupId>org.asciidoctor</groupId>
-                        <artifactId>asciidoctorj</artifactId>
-                        <version>1.5.5</version>
-                    </dependency>
-                    <dependency>
-                        <groupId>org.asciidoctor</groupId>
-                        <artifactId>asciidoctorj-diagram</artifactId>
-                        <version>1.5.4</version>
-                    </dependency>
-                </dependencies>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-scm-publish-plugin</artifactId>
-                <version>1.1</version>
-                <executions>
-                    <execution>
-                        <id>deploy-site</id>
-                        <phase>deploy</phase>
-                        <goals>
-                            <goal>publish-scm</goal>
-                        </goals>
-                        <configuration>
-                            <scmBranch>gh-pages</scmBranch>
-                            <skipDeletedFiles>false</skipDeletedFiles>
-                            <checkinComment>Update site</checkinComment>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-	</plugins>
-
-	<pluginManagement>
-	    <plugins>
-		<plugin>
-		    <groupId>org.apache.maven.plugins</groupId>
-		    <artifactId>maven-assembly-plugin</artifactId>
-		    <version>2.4</version>
-		</plugin>
-	    </plugins>
-	</pluginManagement>
-    </build>
 </project>
diff --git a/docs/glassfish/release-notes/src/main/jbake/assets/CONTRIBUTING.md b/docs/glassfish/release-notes/src/main/jbake/assets/CONTRIBUTING.md
deleted file mode 100644
index a0ebaa0..0000000
--- a/docs/glassfish/release-notes/src/main/jbake/assets/CONTRIBUTING.md
+++ /dev/null
@@ -1,57 +0,0 @@
-# Contributing to Eclipse GlassFish
-
-Thanks for your interest in this project.
-
-## Project description
-
-Eclipse GlassFish is a complete application server that implements the Jakarta
-EE specification. GlassFish includes implementations of all required and
-optional Jakarta EE APIs, and passes all Jakarta EE TCKs. GlassFish also
-includes a complete administration console, clustering support, and other
-developer and production focused tools and features.
-
-* https://projects.eclipse.org/projects/ee4j.glassfish
-
-## Developer resources
-
-Information regarding source code management, builds, coding standards, and
-more.
-
-* https://projects.eclipse.org/projects/ee4j.glassfish/developer
-
-The project maintains the following source code repositories
-
-* https://github.com/eclipse-ee4j/glassfish-ha-api
-* https://github.com/eclipse-ee4j/glassfish-logging-annotation-processor
-* https://github.com/eclipse-ee4j/glassfish-shoal
-* https://github.com/eclipse-ee4j/glassfish-cdi-porting-tck
-* https://github.com/eclipse-ee4j/glassfish-jsftemplating
-* https://github.com/eclipse-ee4j/glassfish-hk2-extra
-* https://github.com/eclipse-ee4j/glassfish-hk2
-* https://github.com/eclipse-ee4j/glassfish-fighterfish
-* https://github.com/eclipse-ee4j/glassfish
-* https://github.com/eclipse-ee4j/glassfish-maven-embedded-plugin
-* https://github.com/eclipse-ee4j/bvtck-porting
-
-## Eclipse Contributor Agreement
-
-Before your contribution can be accepted by the project team contributors must
-electronically sign the Eclipse Contributor Agreement (ECA).
-
-* http://www.eclipse.org/legal/ECA.php
-
-Commits that are provided by non-committers must have a Signed-off-by field in
-the footer indicating that the author is aware of the terms by which the
-contribution has been provided to the project. The non-committer must
-additionally have an Eclipse Foundation account and must have a signed Eclipse
-Contributor Agreement (ECA) on file.
-
-For more information, please see the Eclipse Committer Handbook:
-https://www.eclipse.org/projects/handbook/#resources-commit
-
-## Contact
-
-Contact the project developers via the project's "dev" list.
-
-* https://accounts.eclipse.org/mailing-list/glassfish-dev
-
diff --git a/docs/glassfish/release-notes/src/main/jbake/assets/LICENSE.md b/docs/glassfish/release-notes/src/main/jbake/assets/LICENSE.md
deleted file mode 100644
index f046098..0000000
--- a/docs/glassfish/release-notes/src/main/jbake/assets/LICENSE.md
+++ /dev/null
@@ -1,277 +0,0 @@
-# Eclipse Public License - v 2.0
-
-        THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE
-        PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION
-        OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
-
-    1. DEFINITIONS
-
-    "Contribution" means:
-
-      a) in the case of the initial Contributor, the initial content
-         Distributed under this Agreement, and
-
-      b) in the case of each subsequent Contributor: 
-         i) changes to the Program, and 
-         ii) additions to the Program;
-      where such changes and/or additions to the Program originate from
-      and are Distributed by that particular Contributor. A Contribution
-      "originates" from a Contributor if it was added to the Program by
-      such Contributor itself or anyone acting on such Contributor's behalf.
-      Contributions do not include changes or additions to the Program that
-      are not Modified Works.
-
-    "Contributor" means any person or entity that Distributes the Program.
-
-    "Licensed Patents" mean patent claims licensable by a Contributor which
-    are necessarily infringed by the use or sale of its Contribution alone
-    or when combined with the Program.
-
-    "Program" means the Contributions Distributed in accordance with this
-    Agreement.
-
-    "Recipient" means anyone who receives the Program under this Agreement
-    or any Secondary License (as applicable), including Contributors.
-
-    "Derivative Works" shall mean any work, whether in Source Code or other
-    form, that is based on (or derived from) the Program and for which the
-    editorial revisions, annotations, elaborations, or other modifications
-    represent, as a whole, an original work of authorship.
-
-    "Modified Works" shall mean any work in Source Code or other form that
-    results from an addition to, deletion from, or modification of the
-    contents of the Program, including, for purposes of clarity any new file
-    in Source Code form that contains any contents of the Program. Modified
-    Works shall not include works that contain only declarations,
-    interfaces, types, classes, structures, or files of the Program solely
-    in each case in order to link to, bind by name, or subclass the Program
-    or Modified Works thereof.
-
-    "Distribute" means the acts of a) distributing or b) making available
-    in any manner that enables the transfer of a copy.
-
-    "Source Code" means the form of a Program preferred for making
-    modifications, including but not limited to software source code,
-    documentation source, and configuration files.
-
-    "Secondary License" means either the GNU General Public License,
-    Version 2.0, or any later versions of that license, including any
-    exceptions or additional permissions as identified by the initial
-    Contributor.
-
-    2. GRANT OF RIGHTS
-
-      a) Subject to the terms of this Agreement, each Contributor hereby
-      grants Recipient a non-exclusive, worldwide, royalty-free copyright
-      license to reproduce, prepare Derivative Works of, publicly display,
-      publicly perform, Distribute and sublicense the Contribution of such
-      Contributor, if any, and such Derivative Works.
-
-      b) Subject to the terms of this Agreement, each Contributor hereby
-      grants Recipient a non-exclusive, worldwide, royalty-free patent
-      license under Licensed Patents to make, use, sell, offer to sell,
-      import and otherwise transfer the Contribution of such Contributor,
-      if any, in Source Code or other form. This patent license shall
-      apply to the combination of the Contribution and the Program if, at
-      the time the Contribution is added by the Contributor, such addition
-      of the Contribution causes such combination to be covered by the
-      Licensed Patents. The patent license shall not apply to any other
-      combinations which include the Contribution. No hardware per se is
-      licensed hereunder.
-
-      c) Recipient understands that although each Contributor grants the
-      licenses to its Contributions set forth herein, no assurances are
-      provided by any Contributor that the Program does not infringe the
-      patent or other intellectual property rights of any other entity.
-      Each Contributor disclaims any liability to Recipient for claims
-      brought by any other entity based on infringement of intellectual
-      property rights or otherwise. As a condition to exercising the
-      rights and licenses granted hereunder, each Recipient hereby
-      assumes sole responsibility to secure any other intellectual
-      property rights needed, if any. For example, if a third party
-      patent license is required to allow Recipient to Distribute the
-      Program, it is Recipient's responsibility to acquire that license
-      before distributing the Program.
-
-      d) Each Contributor represents that to its knowledge it has
-      sufficient copyright rights in its Contribution, if any, to grant
-      the copyright license set forth in this Agreement.
-
-      e) Notwithstanding the terms of any Secondary License, no
-      Contributor makes additional grants to any Recipient (other than
-      those set forth in this Agreement) as a result of such Recipient's
-      receipt of the Program under the terms of a Secondary License
-      (if permitted under the terms of Section 3).
-
-    3. REQUIREMENTS
-
-    3.1 If a Contributor Distributes the Program in any form, then:
-
-      a) the Program must also be made available as Source Code, in
-      accordance with section 3.2, and the Contributor must accompany
-      the Program with a statement that the Source Code for the Program
-      is available under this Agreement, and informs Recipients how to
-      obtain it in a reasonable manner on or through a medium customarily
-      used for software exchange; and
-
-      b) the Contributor may Distribute the Program under a license
-      different than this Agreement, provided that such license:
-         i) effectively disclaims on behalf of all other Contributors all
-         warranties and conditions, express and implied, including
-         warranties or conditions of title and non-infringement, and
-         implied warranties or conditions of merchantability and fitness
-         for a particular purpose;
-
-         ii) effectively excludes on behalf of all other Contributors all
-         liability for damages, including direct, indirect, special,
-         incidental and consequential damages, such as lost profits;
-
-         iii) does not attempt to limit or alter the recipients' rights
-         in the Source Code under section 3.2; and
-
-         iv) requires any subsequent distribution of the Program by any
-         party to be under a license that satisfies the requirements
-         of this section 3.
-
-    3.2 When the Program is Distributed as Source Code:
-
-      a) it must be made available under this Agreement, or if the
-      Program (i) is combined with other material in a separate file or
-      files made available under a Secondary License, and (ii) the initial
-      Contributor attached to the Source Code the notice described in
-      Exhibit A of this Agreement, then the Program may be made available
-      under the terms of such Secondary Licenses, and
-
-      b) a copy of this Agreement must be included with each copy of
-      the Program.
-
-    3.3 Contributors may not remove or alter any copyright, patent,
-    trademark, attribution notices, disclaimers of warranty, or limitations
-    of liability ("notices") contained within the Program from any copy of
-    the Program which they Distribute, provided that Contributors may add
-    their own appropriate notices.
-
-    4. COMMERCIAL DISTRIBUTION
-
-    Commercial distributors of software may accept certain responsibilities
-    with respect to end users, business partners and the like. While this
-    license is intended to facilitate the commercial use of the Program,
-    the Contributor who includes the Program in a commercial product
-    offering should do so in a manner which does not create potential
-    liability for other Contributors. Therefore, if a Contributor includes
-    the Program in a commercial product offering, such Contributor
-    ("Commercial Contributor") hereby agrees to defend and indemnify every
-    other Contributor ("Indemnified Contributor") against any losses,
-    damages and costs (collectively "Losses") arising from claims, lawsuits
-    and other legal actions brought by a third party against the Indemnified
-    Contributor to the extent caused by the acts or omissions of such
-    Commercial Contributor in connection with its distribution of the Program
-    in a commercial product offering. The obligations in this section do not
-    apply to any claims or Losses relating to any actual or alleged
-    intellectual property infringement. In order to qualify, an Indemnified
-    Contributor must: a) promptly notify the Commercial Contributor in
-    writing of such claim, and b) allow the Commercial Contributor to control,
-    and cooperate with the Commercial Contributor in, the defense and any
-    related settlement negotiations. The Indemnified Contributor may
-    participate in any such claim at its own expense.
-
-    For example, a Contributor might include the Program in a commercial
-    product offering, Product X. That Contributor is then a Commercial
-    Contributor. If that Commercial Contributor then makes performance
-    claims, or offers warranties related to Product X, those performance
-    claims and warranties are such Commercial Contributor's responsibility
-    alone. Under this section, the Commercial Contributor would have to
-    defend claims against the other Contributors related to those performance
-    claims and warranties, and if a court requires any other Contributor to
-    pay any damages as a result, the Commercial Contributor must pay
-    those damages.
-
-    5. NO WARRANTY
-
-    EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT
-    PERMITTED BY APPLICABLE LAW, THE PROGRAM IS PROVIDED ON AN "AS IS"
-    BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR
-    IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF
-    TITLE, NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR
-    PURPOSE. Each Recipient is solely responsible for determining the
-    appropriateness of using and distributing the Program and assumes all
-    risks associated with its exercise of rights under this Agreement,
-    including but not limited to the risks and costs of program errors,
-    compliance with applicable laws, damage to or loss of data, programs
-    or equipment, and unavailability or interruption of operations.
-
-    6. DISCLAIMER OF LIABILITY
-
-    EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT
-    PERMITTED BY APPLICABLE LAW, NEITHER RECIPIENT NOR ANY CONTRIBUTORS
-    SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-    EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST
-    PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-    CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-    ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE
-    EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF THE
-    POSSIBILITY OF SUCH DAMAGES.
-
-    7. GENERAL
-
-    If any provision of this Agreement is invalid or unenforceable under
-    applicable law, it shall not affect the validity or enforceability of
-    the remainder of the terms of this Agreement, and without further
-    action by the parties hereto, such provision shall be reformed to the
-    minimum extent necessary to make such provision valid and enforceable.
-
-    If Recipient institutes patent litigation against any entity
-    (including a cross-claim or counterclaim in a lawsuit) alleging that the
-    Program itself (excluding combinations of the Program with other software
-    or hardware) infringes such Recipient's patent(s), then such Recipient's
-    rights granted under Section 2(b) shall terminate as of the date such
-    litigation is filed.
-
-    All Recipient's rights under this Agreement shall terminate if it
-    fails to comply with any of the material terms or conditions of this
-    Agreement and does not cure such failure in a reasonable period of
-    time after becoming aware of such noncompliance. If all Recipient's
-    rights under this Agreement terminate, Recipient agrees to cease use
-    and distribution of the Program as soon as reasonably practicable.
-    However, Recipient's obligations under this Agreement and any licenses
-    granted by Recipient relating to the Program shall continue and survive.
-
-    Everyone is permitted to copy and distribute copies of this Agreement,
-    but in order to avoid inconsistency the Agreement is copyrighted and
-    may only be modified in the following manner. The Agreement Steward
-    reserves the right to publish new versions (including revisions) of
-    this Agreement from time to time. No one other than the Agreement
-    Steward has the right to modify this Agreement. The Eclipse Foundation
-    is the initial Agreement Steward. The Eclipse Foundation may assign the
-    responsibility to serve as the Agreement Steward to a suitable separate
-    entity. Each new version of the Agreement will be given a distinguishing
-    version number. The Program (including Contributions) may always be
-    Distributed subject to the version of the Agreement under which it was
-    received. In addition, after a new version of the Agreement is published,
-    Contributor may elect to Distribute the Program (including its
-    Contributions) under the new version.
-
-    Except as expressly stated in Sections 2(a) and 2(b) above, Recipient
-    receives no rights or licenses to the intellectual property of any
-    Contributor under this Agreement, whether expressly, by implication,
-    estoppel or otherwise. All rights in the Program not expressly granted
-    under this Agreement are reserved. Nothing in this Agreement is intended
-    to be enforceable by any entity that is not a Contributor or Recipient.
-    No third-party beneficiary rights are created under this Agreement.
-
-    Exhibit A - Form of Secondary Licenses Notice
-
-    "This Source Code may also be made available under the following 
-    Secondary Licenses when the conditions for such availability set forth 
-    in the Eclipse Public License, v. 2.0 are satisfied: {name license(s),
-    version(s), and exceptions or additional permissions here}."
-
-      Simply including a copy of this Agreement, including this Exhibit A
-      is not sufficient to license the Source Code under Secondary Licenses.
-
-      If it is not possible or desirable to put the notice in a particular
-      file, then You may include the notice in a location (such as a LICENSE
-      file in a relevant directory) where a recipient would be likely to
-      look for such a notice.
-
-      You may add additional accurate notices of copyright ownership.
\ No newline at end of file
diff --git a/docs/glassfish/release-notes/src/main/jbake/assets/README.md b/docs/glassfish/release-notes/src/main/jbake/assets/README.md
deleted file mode 100644
index f8f962c..0000000
--- a/docs/glassfish/release-notes/src/main/jbake/assets/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-# About
-
-The {{site.title}} project contains the [AsciiDoc](http://asciidoc.org/)
-source code for the ...
diff --git a/docs/glassfish/release-notes/src/main/jbake/assets/_config.yml b/docs/glassfish/release-notes/src/main/jbake/assets/_config.yml
deleted file mode 100644
index d580baa..0000000
--- a/docs/glassfish/release-notes/src/main/jbake/assets/_config.yml
+++ /dev/null
@@ -1,14 +0,0 @@
-theme: jekyll-theme-architect
-
-title: [release-notes]
-description: [Eclipse GlassFish Server Release Notes, Release 5.1]
-
-# sidebar links url
-links:
-  source: https://github.com/javaee/release-notes
-  download: https://github.com/javaee/release-notes/releases
-  #mailinglist: https://javaee.groups.io/g/release-notes
-  #javadocs:
-  docs: https://javaee.github.io/release-notes
-  #faq:
-
diff --git a/docs/glassfish/release-notes/src/main/jbake/assets/_layouts/default.html b/docs/glassfish/release-notes/src/main/jbake/assets/_layouts/default.html
deleted file mode 100644
index f896fad..0000000
--- a/docs/glassfish/release-notes/src/main/jbake/assets/_layouts/default.html
+++ /dev/null
@@ -1,100 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <meta charset='utf-8'>
-    <meta http-equiv="X-UA-Compatible" content="chrome=1">
-    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
-    <link rel="stylesheet" href="{{ '/assets/css/style.css?' | relative_url }}" media="screen" type="text/css">
-    <link rel="stylesheet" href="{{ '/assets/css/print.css' | relative_url }}" media="print" type="text/css">
-
-    <!--[if lt IE 9]>
-    <script src="//html5shiv.googlecode.com/svn/trunk/html5.js"></script>
-    <![endif]-->
-
-    <title>{{ site.title | default: site.github.repository_name }}</title>
-  </head>
-
-  <body>
-    <header>
-      <div class="inner">
-        <a href="{{ '/' | absolute_url }}">
-          <h1>{{ site.title | default: site.github.repository_name }}</h1>
-        </a>
-        <h2>{{ site.description | default: site.github.project_tagline }}</h2>
-        {% if site.github.is_project_page %}
-        <a href="{{ '/' | absolute_url }}" class="button"></a>
-        {% endif %}
-      </div>
-    </header>
-
-    <div id="content-wrapper">
-      <div class="inner clearfix">
-        <section id="main-content">
-          {{ content }}
-
-        </section>
-
-        <aside id="sidebar">
-          
-          <hr/>
-
-          <div class="moveright">
-            {% if site.links.source %}
-               <h2><a href="{{ site.links.source }}"><p>Sources</p></a></h2>
-            {% endif %}
-            
-            {% if site.links.javadocs %}
-              <h2><a href="{{ site.links.javadocs }}"><p>APIs</p></a></h2>
-            {% endif %}
-
-            {% if site.links.docs %}
-              <h2><a href="{{ site.links.docs }}"><p>Documentation</p></a></h2>
-            {% endif %}
-
-            {% if site.links.faq %}
-              <h2><a href="{{ site.links.faq }}"><p>FAQ</p></a></h2>
-            {% endif %}
-            
-            {% if site.links.download %}
-               <h2><a href="{{ site.links.download }}"><p>Download</p></a></h2>
-            {% endif %}
-
-            {% if site.links.hide_issuetracker != true %}
-            <h2><a href="{{ site.github.issues_url }}"><p>Issue Tracker</p></a></h2>
-            {% endif %}
-
-            {% if site.links.mailinglist %}
-               <h2><a href="{{ site.links.mailinglist }}"><p>Mailing List</p></a></h2>
-            {% endif %}          
-
-            <h2><a href="CONTRIBUTING"><p>Contribute</p></a></h2>
-
-            <h2><a href="LICENSE"><p>License</p></a></h2>
-          </div>
-          
-          <hr/>
-          
-          <div class="sponsor">
-            <p>Sponsored by<a href="http://www.oracle.com" class="oraclelogo"></a></p>
-          </div>
-          
-        </aside>
-      </div>
-    </div>
-
-    <div class="footer"><a id="copyright" class="oracle" href="https://www.oracle.com/legal/copyright.html">&copy; Oracle</a> | By contributing to this project, you are agreeing to the terms of use described <a href="CONTRIBUTING">here</a>.</div>
-
-    {% if site.google_analytics %}
-      <script type="text/javascript">
-        var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
-        document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));
-      </script>
-      <script type="text/javascript">
-        try {
-          var pageTracker = _gat._getTracker("{{ site.google_analytics }}");
-        pageTracker._trackPageview();
-        } catch(err) {}
-      </script>
-    {% endif %}
-  </body>
-</html>
diff --git a/docs/glassfish/release-notes/src/main/jbake/assets/assets/css/print.scss b/docs/glassfish/release-notes/src/main/jbake/assets/assets/css/print.scss
deleted file mode 100644
index 6115d8d..0000000
--- a/docs/glassfish/release-notes/src/main/jbake/assets/assets/css/print.scss
+++ /dev/null
@@ -1,8 +0,0 @@
----
----
-
-@import "{{ site.theme }}";
-h1 {
-  font-size: 1.8em;
-}
-
diff --git a/docs/glassfish/release-notes/src/main/jbake/assets/assets/css/style.scss b/docs/glassfish/release-notes/src/main/jbake/assets/assets/css/style.scss
deleted file mode 100644
index 2006080..0000000
--- a/docs/glassfish/release-notes/src/main/jbake/assets/assets/css/style.scss
+++ /dev/null
@@ -1,244 +0,0 @@
----
----
-
-@import "{{ site.theme }}";
-
-header {
-  padding-top: 16px;
-  padding-bottom: 40px;
-  font-family: 'Mukta Vaani', 'Open Sans', 'Helvetica Neue', Helvetica, Arial, serif;
-  background: url(../images/header-bkg.jpg) 0 0 repeat-x;
-  border-bottom: solid 1px #E0E0E0;  
-}
-
-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; // orange
-  //color: #2879d0; // blue
-  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;
-}
-
-a {
-  font-weight: 300;
-  color: #2879d0;
-}
-
-a:hover { 
-  text-decoration: underline;
-}
-
-#sidebar p {
-  font-size: 1em;
-  margin-bottom: 1em;
-}
-
-.highlight { 
-  background-color: #ffffff;
-}
-
-.sponsor {
-  float: left;
-  padding-top: 20px;
-  padding-left: 18px;
-}
-
-.moveright30{
-  padding-left: 30px;
-}
-
-.moveright{
-  padding-left: 40px;
-}
-
-.moveright50{
-  padding-left: 50px;
-}
-
-a.oraclelogo {
-  position: absolute;
-  background: transparent url(../images/Oracle-logo.png) 0 0 no-repeat;
-  background-position: 2px -2px; 
-  background-size: 100% ;
-  width: 96px;
-  height: 62px;
-  padding-top: 2px;
-  padding-right: 20px;
-}
-
-aside#sidebar {
-  padding-top: 40px;
-  line-height: 1.2;
-}
-
-hr {
-  border:none;
-  height: 10px;
-  width: 75%;
-  height: 50px;
-  margin-top: 0;
-  border-bottom: 1px solid #cccccc;
-  box-shadow: 0 20px 20px -20px #aaa;
-  margin: -48px auto 10px; 
-}
-
-table {
-   margin-bottom: 20px;
-}
-
-th, td {
-  padding: .2em;
-}
-
-td {
-  font-weight: 400;
-}
-
-ul {
-  font-size: 1em;
-  margin-left: 12px;
-}
-
-ol {
-    list-style-position: inside;
-    list-style: decimal;
-    margin-left: 26px;
-}
-
-blockquote {
-    padding: 0 0 0 10px;
-    margin-left: 14px;
-    margin-bottom: 2px;
-    font-size: 1em;
-    border-left: 4px solid #ddd;
-}
-
-#main-content h1 {
-  padding-top: .6em;
-  font-family: 'Mukta Vaani', 'Open Sans', 'Helvetica Neue', Helvetica, Arial, serif;
-  font-size: 1.6em;
-  font-weight: 500;
-  color : #666;
-  text-indent: 16px;
-  letter-spacing: 0px;
-  border-bottom:1px solid #cccccc;
-  padding-bottom:1px;
-  line-height: 1.2;
-  //margin: .6em 0;
-  margin-bottom: .6em;
-}
-
-#main-content h1:before {
-  //padding-right: 0.3em;
-  margin-left: -1em;
-  content: "";
-}
-
-#main-content h2 {
-  margin-bottom: 8px;
-  font-family: 'Mukta Vaani', 'Open Sans', 'Helvetica Neue', Helvetica, Arial, serif;
-  font-size: 1.4em;
-  font-weight: 400;
-  //color: #474747;
-  color: #3c657b; // blue
-  text-indent: 4px;
-}
-
-#main-content h2:before {
-  padding-right: 1.3em;
-  margin-left: -1.5em;
-  content: "";
-  font-weight: 700;
-}
-
-#main-content h3 {
-  text-indent: 24px;
-  margin-bottom: 8px;
-  font-family: 'Mukta Vaani', 'Open Sans', 'Helvetica Neue', Helvetica, Arial, serif;
-  font-size: 1.2em;
-  font-weight: 500;
-  color: #3c657b;
-  text-indent: 4px;
-}
-
-#main-content h3:before {
-  content: "";
-  margin-left: -0.3em;
-  padding-right: 0.1em;
-}
-
-#main-content h4 {
-  margin-bottom: 8px;
-  font-family: 'Mukta Vaani', 'Open Sans', 'Helvetica Neue', Helvetica, Arial, serif;
-  font-size: 1.2em;
-  font-weight: 500;
-  color: #3c657b;
-  text-indent: 4px;
-}
-
-#main-content h4:before {
-  content: "";
-  margin-left: -0.3em;
-  padding-right: 0.1em;
-}
-
-#main-content p {
-  font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, serif;
-  font-weight: normal;
-  font-size: 1em;
-  margin-bottom: 2px;
-}
-
-.footer {
-  position: fixed; 
-  bottom: 0;
-  left: 0;
-  right: 0;
-  height: 6px;
-  background-color: #f0f0f0;
-  //padding: 1rem;
-  padding-top: 4px;
-  padding-bottom: 14px;
-  font-size: 0.8em;
-  text-align: center;
-}
-
-.oracle {
-  color: #666;
-  font-weight: 400;
-}
-
-.oracle:hover { 
-  text-decoration: none;
-  color: #FF0000;
-}
-
-.fullpage {
-  //float: center;
-  color: FF0000;
-  width: 900px;
-}
\ No newline at end of file
diff --git a/docs/glassfish/release-notes/src/main/jbake/assets/assets/images/header-bkg.jpg b/docs/glassfish/release-notes/src/main/jbake/assets/assets/images/header-bkg.jpg
deleted file mode 100644
index 481faa5..0000000
--- a/docs/glassfish/release-notes/src/main/jbake/assets/assets/images/header-bkg.jpg
+++ /dev/null
Binary files differ
diff --git a/docs/glassfish/release-notes/src/main/jbake/content/title.adoc b/docs/glassfish/release-notes/src/main/jbake/content/title.adoc
index ccb9347..46e7dd7 100644
--- a/docs/glassfish/release-notes/src/main/jbake/content/title.adoc
+++ b/docs/glassfish/release-notes/src/main/jbake/content/title.adoc
@@ -7,7 +7,7 @@
 Eclipse GlassFish Server Release Notes, Release 5.1
 ===================================================
 
-[[glassfish-server-open-source-edition]]
+[[eclipse-glassfish-server]]
 Eclipse GlassFish Server
 ------------------------
 
@@ -44,4 +44,4 @@
 trademarks or registered trademarks of SPARC International, Inc. AMD, 
 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. 
\ No newline at end of file
+trademark of The Open Group. 
diff --git a/docs/glassfish/security-guide/pom.xml b/docs/glassfish/security-guide/pom.xml
index 066b496..be8910b 100644
--- a/docs/glassfish/security-guide/pom.xml
+++ b/docs/glassfish/security-guide/pom.xml
@@ -18,106 +18,14 @@
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <groupId>org.glassfish</groupId>
+    <parent>
+        <groupId>org.glassfish.docs</groupId>
+        <artifactId>parent</artifactId>
+        <version>5.1.1-SNAPSHOT</version>
+        <relativePath>../parent</relativePath>
+    </parent>
+    <groupId>org.glassfish.docs</groupId>
     <artifactId>security-guide</artifactId>
-    <packaging>pom</packaging>
-    <version>1.0.0-SNAPSHOT</version>
+    <packaging>jar</packaging>
     <name>Eclipse GlassFish Server Security Guide, Release 5.1</name>
-
-    <properties>
-        <site.output.dir>${project.build.directory}/staging</site.output.dir>
-        <maven.site.skip>true</maven.site.skip>
-        <maven.deploy.skip>true</maven.deploy.skip>
-    </properties>
-
-    <distributionManagement>
-        <site>
-            <url>scm:git:git@github.com:javaee/security-guide.git</url>
-        </site>
-    </distributionManagement>
-
-    <build>
-        <defaultGoal>package</defaultGoal>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-enforcer-plugin</artifactId>
-                <version>1.4.1</version>
-                <executions>
-                    <execution>
-                        <id>enforce-versions</id>
-                        <goals>
-                            <goal>enforce</goal>
-                        </goals>
-                        <configuration>
-                            <rules>
-                                <requireJavaVersion>
-                                    <version>[1.8.0,1.9.0)</version>
-                                    <message>You need JDK8 or lower</message>
-                                </requireJavaVersion>
-                            </rules>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>com.blazebit</groupId>
-                <artifactId>jbake-maven-plugin</artifactId>
-                <version>1.0.0</version>
-                <configuration>
-                    <outputDirectory>${site.output.dir}</outputDirectory>
-                </configuration>
-                <executions>
-                    <execution>
-                        <id>build-site</id>
-                        <phase>generate-resources</phase>
-                        <goals>
-                            <goal>build</goal>
-                        </goals>
-                    </execution>
-                </executions>
-                <dependencies>
-                    <dependency>
-                        <groupId>org.asciidoctor</groupId>
-                        <artifactId>asciidoctorj</artifactId>
-                        <version>1.5.5</version>
-                    </dependency>
-                    <dependency>
-                        <groupId>org.asciidoctor</groupId>
-                        <artifactId>asciidoctorj-diagram</artifactId>
-                        <version>1.5.4</version>
-                    </dependency>
-                </dependencies>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-scm-publish-plugin</artifactId>
-                <version>1.1</version>
-                <executions>
-                    <execution>
-                        <id>deploy-site</id>
-                        <phase>deploy</phase>
-                        <goals>
-                            <goal>publish-scm</goal>
-                        </goals>
-                        <configuration>
-                            <scmBranch>gh-pages</scmBranch>
-                            <skipDeletedFiles>false</skipDeletedFiles>
-                            <checkinComment>Update site</checkinComment>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-	</plugins>
-
-	<pluginManagement>
-	    <plugins>
-		<plugin>
-		    <groupId>org.apache.maven.plugins</groupId>
-		    <artifactId>maven-assembly-plugin</artifactId>
-		    <version>2.4</version>
-		</plugin>
-	    </plugins>
-	</pluginManagement>
-    </build>
 </project>
diff --git a/docs/glassfish/security-guide/src/main/jbake/assets/CONTRIBUTING.md b/docs/glassfish/security-guide/src/main/jbake/assets/CONTRIBUTING.md
deleted file mode 100644
index a0ebaa0..0000000
--- a/docs/glassfish/security-guide/src/main/jbake/assets/CONTRIBUTING.md
+++ /dev/null
@@ -1,57 +0,0 @@
-# Contributing to Eclipse GlassFish
-
-Thanks for your interest in this project.
-
-## Project description
-
-Eclipse GlassFish is a complete application server that implements the Jakarta
-EE specification. GlassFish includes implementations of all required and
-optional Jakarta EE APIs, and passes all Jakarta EE TCKs. GlassFish also
-includes a complete administration console, clustering support, and other
-developer and production focused tools and features.
-
-* https://projects.eclipse.org/projects/ee4j.glassfish
-
-## Developer resources
-
-Information regarding source code management, builds, coding standards, and
-more.
-
-* https://projects.eclipse.org/projects/ee4j.glassfish/developer
-
-The project maintains the following source code repositories
-
-* https://github.com/eclipse-ee4j/glassfish-ha-api
-* https://github.com/eclipse-ee4j/glassfish-logging-annotation-processor
-* https://github.com/eclipse-ee4j/glassfish-shoal
-* https://github.com/eclipse-ee4j/glassfish-cdi-porting-tck
-* https://github.com/eclipse-ee4j/glassfish-jsftemplating
-* https://github.com/eclipse-ee4j/glassfish-hk2-extra
-* https://github.com/eclipse-ee4j/glassfish-hk2
-* https://github.com/eclipse-ee4j/glassfish-fighterfish
-* https://github.com/eclipse-ee4j/glassfish
-* https://github.com/eclipse-ee4j/glassfish-maven-embedded-plugin
-* https://github.com/eclipse-ee4j/bvtck-porting
-
-## Eclipse Contributor Agreement
-
-Before your contribution can be accepted by the project team contributors must
-electronically sign the Eclipse Contributor Agreement (ECA).
-
-* http://www.eclipse.org/legal/ECA.php
-
-Commits that are provided by non-committers must have a Signed-off-by field in
-the footer indicating that the author is aware of the terms by which the
-contribution has been provided to the project. The non-committer must
-additionally have an Eclipse Foundation account and must have a signed Eclipse
-Contributor Agreement (ECA) on file.
-
-For more information, please see the Eclipse Committer Handbook:
-https://www.eclipse.org/projects/handbook/#resources-commit
-
-## Contact
-
-Contact the project developers via the project's "dev" list.
-
-* https://accounts.eclipse.org/mailing-list/glassfish-dev
-
diff --git a/docs/glassfish/security-guide/src/main/jbake/assets/LICENSE.md b/docs/glassfish/security-guide/src/main/jbake/assets/LICENSE.md
deleted file mode 100644
index f046098..0000000
--- a/docs/glassfish/security-guide/src/main/jbake/assets/LICENSE.md
+++ /dev/null
@@ -1,277 +0,0 @@
-# Eclipse Public License - v 2.0
-
-        THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE
-        PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION
-        OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
-
-    1. DEFINITIONS
-
-    "Contribution" means:
-
-      a) in the case of the initial Contributor, the initial content
-         Distributed under this Agreement, and
-
-      b) in the case of each subsequent Contributor: 
-         i) changes to the Program, and 
-         ii) additions to the Program;
-      where such changes and/or additions to the Program originate from
-      and are Distributed by that particular Contributor. A Contribution
-      "originates" from a Contributor if it was added to the Program by
-      such Contributor itself or anyone acting on such Contributor's behalf.
-      Contributions do not include changes or additions to the Program that
-      are not Modified Works.
-
-    "Contributor" means any person or entity that Distributes the Program.
-
-    "Licensed Patents" mean patent claims licensable by a Contributor which
-    are necessarily infringed by the use or sale of its Contribution alone
-    or when combined with the Program.
-
-    "Program" means the Contributions Distributed in accordance with this
-    Agreement.
-
-    "Recipient" means anyone who receives the Program under this Agreement
-    or any Secondary License (as applicable), including Contributors.
-
-    "Derivative Works" shall mean any work, whether in Source Code or other
-    form, that is based on (or derived from) the Program and for which the
-    editorial revisions, annotations, elaborations, or other modifications
-    represent, as a whole, an original work of authorship.
-
-    "Modified Works" shall mean any work in Source Code or other form that
-    results from an addition to, deletion from, or modification of the
-    contents of the Program, including, for purposes of clarity any new file
-    in Source Code form that contains any contents of the Program. Modified
-    Works shall not include works that contain only declarations,
-    interfaces, types, classes, structures, or files of the Program solely
-    in each case in order to link to, bind by name, or subclass the Program
-    or Modified Works thereof.
-
-    "Distribute" means the acts of a) distributing or b) making available
-    in any manner that enables the transfer of a copy.
-
-    "Source Code" means the form of a Program preferred for making
-    modifications, including but not limited to software source code,
-    documentation source, and configuration files.
-
-    "Secondary License" means either the GNU General Public License,
-    Version 2.0, or any later versions of that license, including any
-    exceptions or additional permissions as identified by the initial
-    Contributor.
-
-    2. GRANT OF RIGHTS
-
-      a) Subject to the terms of this Agreement, each Contributor hereby
-      grants Recipient a non-exclusive, worldwide, royalty-free copyright
-      license to reproduce, prepare Derivative Works of, publicly display,
-      publicly perform, Distribute and sublicense the Contribution of such
-      Contributor, if any, and such Derivative Works.
-
-      b) Subject to the terms of this Agreement, each Contributor hereby
-      grants Recipient a non-exclusive, worldwide, royalty-free patent
-      license under Licensed Patents to make, use, sell, offer to sell,
-      import and otherwise transfer the Contribution of such Contributor,
-      if any, in Source Code or other form. This patent license shall
-      apply to the combination of the Contribution and the Program if, at
-      the time the Contribution is added by the Contributor, such addition
-      of the Contribution causes such combination to be covered by the
-      Licensed Patents. The patent license shall not apply to any other
-      combinations which include the Contribution. No hardware per se is
-      licensed hereunder.
-
-      c) Recipient understands that although each Contributor grants the
-      licenses to its Contributions set forth herein, no assurances are
-      provided by any Contributor that the Program does not infringe the
-      patent or other intellectual property rights of any other entity.
-      Each Contributor disclaims any liability to Recipient for claims
-      brought by any other entity based on infringement of intellectual
-      property rights or otherwise. As a condition to exercising the
-      rights and licenses granted hereunder, each Recipient hereby
-      assumes sole responsibility to secure any other intellectual
-      property rights needed, if any. For example, if a third party
-      patent license is required to allow Recipient to Distribute the
-      Program, it is Recipient's responsibility to acquire that license
-      before distributing the Program.
-
-      d) Each Contributor represents that to its knowledge it has
-      sufficient copyright rights in its Contribution, if any, to grant
-      the copyright license set forth in this Agreement.
-
-      e) Notwithstanding the terms of any Secondary License, no
-      Contributor makes additional grants to any Recipient (other than
-      those set forth in this Agreement) as a result of such Recipient's
-      receipt of the Program under the terms of a Secondary License
-      (if permitted under the terms of Section 3).
-
-    3. REQUIREMENTS
-
-    3.1 If a Contributor Distributes the Program in any form, then:
-
-      a) the Program must also be made available as Source Code, in
-      accordance with section 3.2, and the Contributor must accompany
-      the Program with a statement that the Source Code for the Program
-      is available under this Agreement, and informs Recipients how to
-      obtain it in a reasonable manner on or through a medium customarily
-      used for software exchange; and
-
-      b) the Contributor may Distribute the Program under a license
-      different than this Agreement, provided that such license:
-         i) effectively disclaims on behalf of all other Contributors all
-         warranties and conditions, express and implied, including
-         warranties or conditions of title and non-infringement, and
-         implied warranties or conditions of merchantability and fitness
-         for a particular purpose;
-
-         ii) effectively excludes on behalf of all other Contributors all
-         liability for damages, including direct, indirect, special,
-         incidental and consequential damages, such as lost profits;
-
-         iii) does not attempt to limit or alter the recipients' rights
-         in the Source Code under section 3.2; and
-
-         iv) requires any subsequent distribution of the Program by any
-         party to be under a license that satisfies the requirements
-         of this section 3.
-
-    3.2 When the Program is Distributed as Source Code:
-
-      a) it must be made available under this Agreement, or if the
-      Program (i) is combined with other material in a separate file or
-      files made available under a Secondary License, and (ii) the initial
-      Contributor attached to the Source Code the notice described in
-      Exhibit A of this Agreement, then the Program may be made available
-      under the terms of such Secondary Licenses, and
-
-      b) a copy of this Agreement must be included with each copy of
-      the Program.
-
-    3.3 Contributors may not remove or alter any copyright, patent,
-    trademark, attribution notices, disclaimers of warranty, or limitations
-    of liability ("notices") contained within the Program from any copy of
-    the Program which they Distribute, provided that Contributors may add
-    their own appropriate notices.
-
-    4. COMMERCIAL DISTRIBUTION
-
-    Commercial distributors of software may accept certain responsibilities
-    with respect to end users, business partners and the like. While this
-    license is intended to facilitate the commercial use of the Program,
-    the Contributor who includes the Program in a commercial product
-    offering should do so in a manner which does not create potential
-    liability for other Contributors. Therefore, if a Contributor includes
-    the Program in a commercial product offering, such Contributor
-    ("Commercial Contributor") hereby agrees to defend and indemnify every
-    other Contributor ("Indemnified Contributor") against any losses,
-    damages and costs (collectively "Losses") arising from claims, lawsuits
-    and other legal actions brought by a third party against the Indemnified
-    Contributor to the extent caused by the acts or omissions of such
-    Commercial Contributor in connection with its distribution of the Program
-    in a commercial product offering. The obligations in this section do not
-    apply to any claims or Losses relating to any actual or alleged
-    intellectual property infringement. In order to qualify, an Indemnified
-    Contributor must: a) promptly notify the Commercial Contributor in
-    writing of such claim, and b) allow the Commercial Contributor to control,
-    and cooperate with the Commercial Contributor in, the defense and any
-    related settlement negotiations. The Indemnified Contributor may
-    participate in any such claim at its own expense.
-
-    For example, a Contributor might include the Program in a commercial
-    product offering, Product X. That Contributor is then a Commercial
-    Contributor. If that Commercial Contributor then makes performance
-    claims, or offers warranties related to Product X, those performance
-    claims and warranties are such Commercial Contributor's responsibility
-    alone. Under this section, the Commercial Contributor would have to
-    defend claims against the other Contributors related to those performance
-    claims and warranties, and if a court requires any other Contributor to
-    pay any damages as a result, the Commercial Contributor must pay
-    those damages.
-
-    5. NO WARRANTY
-
-    EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT
-    PERMITTED BY APPLICABLE LAW, THE PROGRAM IS PROVIDED ON AN "AS IS"
-    BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR
-    IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF
-    TITLE, NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR
-    PURPOSE. Each Recipient is solely responsible for determining the
-    appropriateness of using and distributing the Program and assumes all
-    risks associated with its exercise of rights under this Agreement,
-    including but not limited to the risks and costs of program errors,
-    compliance with applicable laws, damage to or loss of data, programs
-    or equipment, and unavailability or interruption of operations.
-
-    6. DISCLAIMER OF LIABILITY
-
-    EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT
-    PERMITTED BY APPLICABLE LAW, NEITHER RECIPIENT NOR ANY CONTRIBUTORS
-    SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-    EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST
-    PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-    CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-    ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE
-    EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF THE
-    POSSIBILITY OF SUCH DAMAGES.
-
-    7. GENERAL
-
-    If any provision of this Agreement is invalid or unenforceable under
-    applicable law, it shall not affect the validity or enforceability of
-    the remainder of the terms of this Agreement, and without further
-    action by the parties hereto, such provision shall be reformed to the
-    minimum extent necessary to make such provision valid and enforceable.
-
-    If Recipient institutes patent litigation against any entity
-    (including a cross-claim or counterclaim in a lawsuit) alleging that the
-    Program itself (excluding combinations of the Program with other software
-    or hardware) infringes such Recipient's patent(s), then such Recipient's
-    rights granted under Section 2(b) shall terminate as of the date such
-    litigation is filed.
-
-    All Recipient's rights under this Agreement shall terminate if it
-    fails to comply with any of the material terms or conditions of this
-    Agreement and does not cure such failure in a reasonable period of
-    time after becoming aware of such noncompliance. If all Recipient's
-    rights under this Agreement terminate, Recipient agrees to cease use
-    and distribution of the Program as soon as reasonably practicable.
-    However, Recipient's obligations under this Agreement and any licenses
-    granted by Recipient relating to the Program shall continue and survive.
-
-    Everyone is permitted to copy and distribute copies of this Agreement,
-    but in order to avoid inconsistency the Agreement is copyrighted and
-    may only be modified in the following manner. The Agreement Steward
-    reserves the right to publish new versions (including revisions) of
-    this Agreement from time to time. No one other than the Agreement
-    Steward has the right to modify this Agreement. The Eclipse Foundation
-    is the initial Agreement Steward. The Eclipse Foundation may assign the
-    responsibility to serve as the Agreement Steward to a suitable separate
-    entity. Each new version of the Agreement will be given a distinguishing
-    version number. The Program (including Contributions) may always be
-    Distributed subject to the version of the Agreement under which it was
-    received. In addition, after a new version of the Agreement is published,
-    Contributor may elect to Distribute the Program (including its
-    Contributions) under the new version.
-
-    Except as expressly stated in Sections 2(a) and 2(b) above, Recipient
-    receives no rights or licenses to the intellectual property of any
-    Contributor under this Agreement, whether expressly, by implication,
-    estoppel or otherwise. All rights in the Program not expressly granted
-    under this Agreement are reserved. Nothing in this Agreement is intended
-    to be enforceable by any entity that is not a Contributor or Recipient.
-    No third-party beneficiary rights are created under this Agreement.
-
-    Exhibit A - Form of Secondary Licenses Notice
-
-    "This Source Code may also be made available under the following 
-    Secondary Licenses when the conditions for such availability set forth 
-    in the Eclipse Public License, v. 2.0 are satisfied: {name license(s),
-    version(s), and exceptions or additional permissions here}."
-
-      Simply including a copy of this Agreement, including this Exhibit A
-      is not sufficient to license the Source Code under Secondary Licenses.
-
-      If it is not possible or desirable to put the notice in a particular
-      file, then You may include the notice in a location (such as a LICENSE
-      file in a relevant directory) where a recipient would be likely to
-      look for such a notice.
-
-      You may add additional accurate notices of copyright ownership.
\ No newline at end of file
diff --git a/docs/glassfish/security-guide/src/main/jbake/assets/README.md b/docs/glassfish/security-guide/src/main/jbake/assets/README.md
deleted file mode 100644
index f8f962c..0000000
--- a/docs/glassfish/security-guide/src/main/jbake/assets/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-# About
-
-The {{site.title}} project contains the [AsciiDoc](http://asciidoc.org/)
-source code for the ...
diff --git a/docs/glassfish/security-guide/src/main/jbake/assets/_config.yml b/docs/glassfish/security-guide/src/main/jbake/assets/_config.yml
deleted file mode 100644
index 89de64c..0000000
--- a/docs/glassfish/security-guide/src/main/jbake/assets/_config.yml
+++ /dev/null
@@ -1,14 +0,0 @@
-theme: jekyll-theme-architect
-
-title: [security-guide]
-description: [Eclipse GlassFish Server Security Guide, Release 5.1]
-
-# sidebar links url
-links:
-  source: https://github.com/javaee/security-guide
-  download: https://github.com/javaee/security-guide/releases
-  #mailinglist: https://javaee.groups.io/g/security-guide
-  #javadocs:
-  docs: https://javaee.github.io/security-guide
-  #faq:
-
diff --git a/docs/glassfish/security-guide/src/main/jbake/assets/_layouts/default.html b/docs/glassfish/security-guide/src/main/jbake/assets/_layouts/default.html
deleted file mode 100644
index f896fad..0000000
--- a/docs/glassfish/security-guide/src/main/jbake/assets/_layouts/default.html
+++ /dev/null
@@ -1,100 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <meta charset='utf-8'>
-    <meta http-equiv="X-UA-Compatible" content="chrome=1">
-    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
-    <link rel="stylesheet" href="{{ '/assets/css/style.css?' | relative_url }}" media="screen" type="text/css">
-    <link rel="stylesheet" href="{{ '/assets/css/print.css' | relative_url }}" media="print" type="text/css">
-
-    <!--[if lt IE 9]>
-    <script src="//html5shiv.googlecode.com/svn/trunk/html5.js"></script>
-    <![endif]-->
-
-    <title>{{ site.title | default: site.github.repository_name }}</title>
-  </head>
-
-  <body>
-    <header>
-      <div class="inner">
-        <a href="{{ '/' | absolute_url }}">
-          <h1>{{ site.title | default: site.github.repository_name }}</h1>
-        </a>
-        <h2>{{ site.description | default: site.github.project_tagline }}</h2>
-        {% if site.github.is_project_page %}
-        <a href="{{ '/' | absolute_url }}" class="button"></a>
-        {% endif %}
-      </div>
-    </header>
-
-    <div id="content-wrapper">
-      <div class="inner clearfix">
-        <section id="main-content">
-          {{ content }}
-
-        </section>
-
-        <aside id="sidebar">
-          
-          <hr/>
-
-          <div class="moveright">
-            {% if site.links.source %}
-               <h2><a href="{{ site.links.source }}"><p>Sources</p></a></h2>
-            {% endif %}
-            
-            {% if site.links.javadocs %}
-              <h2><a href="{{ site.links.javadocs }}"><p>APIs</p></a></h2>
-            {% endif %}
-
-            {% if site.links.docs %}
-              <h2><a href="{{ site.links.docs }}"><p>Documentation</p></a></h2>
-            {% endif %}
-
-            {% if site.links.faq %}
-              <h2><a href="{{ site.links.faq }}"><p>FAQ</p></a></h2>
-            {% endif %}
-            
-            {% if site.links.download %}
-               <h2><a href="{{ site.links.download }}"><p>Download</p></a></h2>
-            {% endif %}
-
-            {% if site.links.hide_issuetracker != true %}
-            <h2><a href="{{ site.github.issues_url }}"><p>Issue Tracker</p></a></h2>
-            {% endif %}
-
-            {% if site.links.mailinglist %}
-               <h2><a href="{{ site.links.mailinglist }}"><p>Mailing List</p></a></h2>
-            {% endif %}          
-
-            <h2><a href="CONTRIBUTING"><p>Contribute</p></a></h2>
-
-            <h2><a href="LICENSE"><p>License</p></a></h2>
-          </div>
-          
-          <hr/>
-          
-          <div class="sponsor">
-            <p>Sponsored by<a href="http://www.oracle.com" class="oraclelogo"></a></p>
-          </div>
-          
-        </aside>
-      </div>
-    </div>
-
-    <div class="footer"><a id="copyright" class="oracle" href="https://www.oracle.com/legal/copyright.html">&copy; Oracle</a> | By contributing to this project, you are agreeing to the terms of use described <a href="CONTRIBUTING">here</a>.</div>
-
-    {% if site.google_analytics %}
-      <script type="text/javascript">
-        var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
-        document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));
-      </script>
-      <script type="text/javascript">
-        try {
-          var pageTracker = _gat._getTracker("{{ site.google_analytics }}");
-        pageTracker._trackPageview();
-        } catch(err) {}
-      </script>
-    {% endif %}
-  </body>
-</html>
diff --git a/docs/glassfish/security-guide/src/main/jbake/assets/assets/css/print.scss b/docs/glassfish/security-guide/src/main/jbake/assets/assets/css/print.scss
deleted file mode 100644
index 6115d8d..0000000
--- a/docs/glassfish/security-guide/src/main/jbake/assets/assets/css/print.scss
+++ /dev/null
@@ -1,8 +0,0 @@
----
----
-
-@import "{{ site.theme }}";
-h1 {
-  font-size: 1.8em;
-}
-
diff --git a/docs/glassfish/security-guide/src/main/jbake/assets/assets/css/style.scss b/docs/glassfish/security-guide/src/main/jbake/assets/assets/css/style.scss
deleted file mode 100644
index 3cf8c1a..0000000
--- a/docs/glassfish/security-guide/src/main/jbake/assets/assets/css/style.scss
+++ /dev/null
@@ -1,246 +0,0 @@
----
----
-
-@import "{{ site.theme }}";
-
-header {
-  padding-top: 16px;
-  padding-bottom: 40px;
-  font-family: 'Mukta Vaani', 'Open Sans', 'Helvetica Neue', Helvetica, Arial, serif;
-  background: url(../images/header-bkg.jpg) 0 0 repeat-x;
-  border-bottom: solid 1px #E0E0E0;  
-}
-
-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; // orange
-  //color: #2879d0; // blue
-  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;
-}
-
-a {
-  font-weight: 300;
-  color: #2879d0;
-}
-
-a:hover { 
-  text-decoration: underline;
-}
-
-#sidebar p {
-  font-size: 1em;
-  margin-bottom: 1em;
-}
-
-.highlight { 
-  background-color: #ffffff;
-}
-
-.sponsor {
-  float: left;
-  padding-top: 20px;
-  padding-left: 18px;
-}
-
-.moveright30{
-  padding-left: 30px;
-}
-
-.moveright{
-  padding-left: 40px;
-}
-
-.moveright50{
-  padding-left: 50px;
-}
-
-/*
-a.oraclelogo {
-  position: absolute;
-  background: transparent url(../images/Oracle-logo.png) 0 0 no-repeat;
-  background-position: 2px -2px; 
-  background-size: 100% ;
-  width: 96px;
-  height: 62px;
-  padding-top: 2px;
-  padding-right: 20px;
-}
-*/
-
-aside#sidebar {
-  padding-top: 40px;
-  line-height: 1.2;
-}
-
-hr {
-  border:none;
-  height: 10px;
-  width: 75%;
-  height: 50px;
-  margin-top: 0;
-  border-bottom: 1px solid #cccccc;
-  box-shadow: 0 20px 20px -20px #aaa;
-  margin: -48px auto 10px; 
-}
-
-table {
-   margin-bottom: 20px;
-}
-
-th, td {
-  padding: .2em;
-}
-
-td {
-  font-weight: 400;
-}
-
-ul {
-  font-size: 1em;
-  margin-left: 12px;
-}
-
-ol {
-    list-style-position: inside;
-    list-style: decimal;
-    margin-left: 26px;
-}
-
-blockquote {
-    padding: 0 0 0 10px;
-    margin-left: 14px;
-    margin-bottom: 2px;
-    font-size: 1em;
-    border-left: 4px solid #ddd;
-}
-
-#main-content h1 {
-  padding-top: .6em;
-  font-family: 'Mukta Vaani', 'Open Sans', 'Helvetica Neue', Helvetica, Arial, serif;
-  font-size: 1.6em;
-  font-weight: 500;
-  color : #666;
-  text-indent: 16px;
-  letter-spacing: 0px;
-  border-bottom:1px solid #cccccc;
-  padding-bottom:1px;
-  line-height: 1.2;
-  //margin: .6em 0;
-  margin-bottom: .6em;
-}
-
-#main-content h1:before {
-  //padding-right: 0.3em;
-  margin-left: -1em;
-  content: "";
-}
-
-#main-content h2 {
-  margin-bottom: 8px;
-  font-family: 'Mukta Vaani', 'Open Sans', 'Helvetica Neue', Helvetica, Arial, serif;
-  font-size: 1.4em;
-  font-weight: 400;
-  //color: #474747;
-  color: #3c657b; // blue
-  text-indent: 4px;
-}
-
-#main-content h2:before {
-  padding-right: 1.3em;
-  margin-left: -1.5em;
-  content: "";
-  font-weight: 700;
-}
-
-#main-content h3 {
-  text-indent: 24px;
-  margin-bottom: 8px;
-  font-family: 'Mukta Vaani', 'Open Sans', 'Helvetica Neue', Helvetica, Arial, serif;
-  font-size: 1.2em;
-  font-weight: 500;
-  color: #3c657b;
-  text-indent: 4px;
-}
-
-#main-content h3:before {
-  content: "";
-  margin-left: -0.3em;
-  padding-right: 0.1em;
-}
-
-#main-content h4 {
-  margin-bottom: 8px;
-  font-family: 'Mukta Vaani', 'Open Sans', 'Helvetica Neue', Helvetica, Arial, serif;
-  font-size: 1.2em;
-  font-weight: 500;
-  color: #3c657b;
-  text-indent: 4px;
-}
-
-#main-content h4:before {
-  content: "";
-  margin-left: -0.3em;
-  padding-right: 0.1em;
-}
-
-#main-content p {
-  font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, serif;
-  font-weight: normal;
-  font-size: 1em;
-  margin-bottom: 2px;
-}
-
-.footer {
-  position: fixed; 
-  bottom: 0;
-  left: 0;
-  right: 0;
-  height: 6px;
-  background-color: #f0f0f0;
-  //padding: 1rem;
-  padding-top: 4px;
-  padding-bottom: 14px;
-  font-size: 0.8em;
-  text-align: center;
-}
-
-.oracle {
-  color: #666;
-  font-weight: 400;
-}
-
-.oracle:hover { 
-  text-decoration: none;
-  color: #FF0000;
-}
-
-.fullpage {
-  //float: center;
-  color: FF0000;
-  width: 900px;
-}
\ No newline at end of file
diff --git a/docs/glassfish/security-guide/src/main/jbake/assets/assets/images/header-bkg.jpg b/docs/glassfish/security-guide/src/main/jbake/assets/assets/images/header-bkg.jpg
deleted file mode 100644
index 481faa5..0000000
--- a/docs/glassfish/security-guide/src/main/jbake/assets/assets/images/header-bkg.jpg
+++ /dev/null
Binary files differ
diff --git a/docs/glassfish/security-guide/src/main/jbake/content/title.adoc b/docs/glassfish/security-guide/src/main/jbake/content/title.adoc
index e6fd42e..1726d9f 100644
--- a/docs/glassfish/security-guide/src/main/jbake/content/title.adoc
+++ b/docs/glassfish/security-guide/src/main/jbake/content/title.adoc
@@ -7,7 +7,7 @@
 Eclipse GlassFish Server Security Guide, Release 5.1
 ====================================================
 
-[[glassfish-server-open-source-edition]]
+[[eclipse-glassfish-server]]
 Eclipse GlassFish Server
 ------------------------
 
@@ -42,4 +42,4 @@
 trademarks or registered trademarks of SPARC International, Inc. AMD, 
 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. 
\ No newline at end of file
+trademark of The Open Group. 
diff --git a/docs/glassfish/security-guide/src/main/jbake/templates/footer.ftl b/docs/glassfish/security-guide/src/main/jbake/templates/footer.ftl
index 46ecc29..b734c7b 100644
--- a/docs/glassfish/security-guide/src/main/jbake/templates/footer.ftl
+++ b/docs/glassfish/security-guide/src/main/jbake/templates/footer.ftl
@@ -36,7 +36,7 @@
 </table>
 
 <span id="copyright">
-        <img src="img/eclipse_foundation_logo_tiny.png" height="20px" alt="Eclipse Foundation Logo" align="top"/>&nbsp;            
+        <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>
 </body>
diff --git a/docs/glassfish/troubleshooting-guide/pom.xml b/docs/glassfish/troubleshooting-guide/pom.xml
index 6512229..93fb393 100644
--- a/docs/glassfish/troubleshooting-guide/pom.xml
+++ b/docs/glassfish/troubleshooting-guide/pom.xml
@@ -18,106 +18,14 @@
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <groupId>org.glassfish</groupId>
+    <parent>
+        <groupId>org.glassfish.docs</groupId>
+        <artifactId>parent</artifactId>
+        <version>5.1.1-SNAPSHOT</version>
+        <relativePath>../parent</relativePath>
+    </parent>
+    <groupId>org.glassfish.docs</groupId>
     <artifactId>troubleshooting-guide</artifactId>
-    <packaging>pom</packaging>
-    <version>1.0.0-SNAPSHOT</version>
+    <packaging>jar</packaging>
     <name>Eclipse GlassFish Server Troubleshooting Guide, Release 5.1</name>
-
-    <properties>
-        <site.output.dir>${project.build.directory}/staging</site.output.dir>
-        <maven.site.skip>true</maven.site.skip>
-        <maven.deploy.skip>true</maven.deploy.skip>
-    </properties>
-
-    <distributionManagement>
-        <site>
-            <url>scm:git:git@github.com:javaee/troubleshooting-guide.git</url>
-        </site>
-    </distributionManagement>
-
-    <build>
-        <defaultGoal>package</defaultGoal>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-enforcer-plugin</artifactId>
-                <version>1.4.1</version>
-                <executions>
-                    <execution>
-                        <id>enforce-versions</id>
-                        <goals>
-                            <goal>enforce</goal>
-                        </goals>
-                        <configuration>
-                            <rules>
-                                <requireJavaVersion>
-                                    <version>[1.8.0,1.9.0)</version>
-                                    <message>You need JDK8 or lower</message>
-                                </requireJavaVersion>
-                            </rules>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>com.blazebit</groupId>
-                <artifactId>jbake-maven-plugin</artifactId>
-                <version>1.0.0</version>
-                <configuration>
-                    <outputDirectory>${site.output.dir}</outputDirectory>
-                </configuration>
-                <executions>
-                    <execution>
-                        <id>build-site</id>
-                        <phase>generate-resources</phase>
-                        <goals>
-                            <goal>build</goal>
-                        </goals>
-                    </execution>
-                </executions>
-                <dependencies>
-                    <dependency>
-                        <groupId>org.asciidoctor</groupId>
-                        <artifactId>asciidoctorj</artifactId>
-                        <version>1.5.5</version>
-                    </dependency>
-                    <dependency>
-                        <groupId>org.asciidoctor</groupId>
-                        <artifactId>asciidoctorj-diagram</artifactId>
-                        <version>1.5.4</version>
-                    </dependency>
-                </dependencies>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-scm-publish-plugin</artifactId>
-                <version>1.1</version>
-                <executions>
-                    <execution>
-                        <id>deploy-site</id>
-                        <phase>deploy</phase>
-                        <goals>
-                            <goal>publish-scm</goal>
-                        </goals>
-                        <configuration>
-                            <scmBranch>gh-pages</scmBranch>
-                            <skipDeletedFiles>false</skipDeletedFiles>
-                            <checkinComment>Update site</checkinComment>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-	</plugins>
-
-	<pluginManagement>
-	    <plugins>
-		<plugin>
-		    <groupId>org.apache.maven.plugins</groupId>
-		    <artifactId>maven-assembly-plugin</artifactId>
-		    <version>2.4</version>
-		</plugin>
-	    </plugins>
-	</pluginManagement>
-    </build>
 </project>
diff --git a/docs/glassfish/troubleshooting-guide/src/main/jbake/assets/CONTRIBUTING.md b/docs/glassfish/troubleshooting-guide/src/main/jbake/assets/CONTRIBUTING.md
deleted file mode 100644
index a0ebaa0..0000000
--- a/docs/glassfish/troubleshooting-guide/src/main/jbake/assets/CONTRIBUTING.md
+++ /dev/null
@@ -1,57 +0,0 @@
-# Contributing to Eclipse GlassFish
-
-Thanks for your interest in this project.
-
-## Project description
-
-Eclipse GlassFish is a complete application server that implements the Jakarta
-EE specification. GlassFish includes implementations of all required and
-optional Jakarta EE APIs, and passes all Jakarta EE TCKs. GlassFish also
-includes a complete administration console, clustering support, and other
-developer and production focused tools and features.
-
-* https://projects.eclipse.org/projects/ee4j.glassfish
-
-## Developer resources
-
-Information regarding source code management, builds, coding standards, and
-more.
-
-* https://projects.eclipse.org/projects/ee4j.glassfish/developer
-
-The project maintains the following source code repositories
-
-* https://github.com/eclipse-ee4j/glassfish-ha-api
-* https://github.com/eclipse-ee4j/glassfish-logging-annotation-processor
-* https://github.com/eclipse-ee4j/glassfish-shoal
-* https://github.com/eclipse-ee4j/glassfish-cdi-porting-tck
-* https://github.com/eclipse-ee4j/glassfish-jsftemplating
-* https://github.com/eclipse-ee4j/glassfish-hk2-extra
-* https://github.com/eclipse-ee4j/glassfish-hk2
-* https://github.com/eclipse-ee4j/glassfish-fighterfish
-* https://github.com/eclipse-ee4j/glassfish
-* https://github.com/eclipse-ee4j/glassfish-maven-embedded-plugin
-* https://github.com/eclipse-ee4j/bvtck-porting
-
-## Eclipse Contributor Agreement
-
-Before your contribution can be accepted by the project team contributors must
-electronically sign the Eclipse Contributor Agreement (ECA).
-
-* http://www.eclipse.org/legal/ECA.php
-
-Commits that are provided by non-committers must have a Signed-off-by field in
-the footer indicating that the author is aware of the terms by which the
-contribution has been provided to the project. The non-committer must
-additionally have an Eclipse Foundation account and must have a signed Eclipse
-Contributor Agreement (ECA) on file.
-
-For more information, please see the Eclipse Committer Handbook:
-https://www.eclipse.org/projects/handbook/#resources-commit
-
-## Contact
-
-Contact the project developers via the project's "dev" list.
-
-* https://accounts.eclipse.org/mailing-list/glassfish-dev
-
diff --git a/docs/glassfish/troubleshooting-guide/src/main/jbake/assets/LICENSE.md b/docs/glassfish/troubleshooting-guide/src/main/jbake/assets/LICENSE.md
deleted file mode 100644
index f046098..0000000
--- a/docs/glassfish/troubleshooting-guide/src/main/jbake/assets/LICENSE.md
+++ /dev/null
@@ -1,277 +0,0 @@
-# Eclipse Public License - v 2.0
-
-        THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE
-        PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION
-        OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
-
-    1. DEFINITIONS
-
-    "Contribution" means:
-
-      a) in the case of the initial Contributor, the initial content
-         Distributed under this Agreement, and
-
-      b) in the case of each subsequent Contributor: 
-         i) changes to the Program, and 
-         ii) additions to the Program;
-      where such changes and/or additions to the Program originate from
-      and are Distributed by that particular Contributor. A Contribution
-      "originates" from a Contributor if it was added to the Program by
-      such Contributor itself or anyone acting on such Contributor's behalf.
-      Contributions do not include changes or additions to the Program that
-      are not Modified Works.
-
-    "Contributor" means any person or entity that Distributes the Program.
-
-    "Licensed Patents" mean patent claims licensable by a Contributor which
-    are necessarily infringed by the use or sale of its Contribution alone
-    or when combined with the Program.
-
-    "Program" means the Contributions Distributed in accordance with this
-    Agreement.
-
-    "Recipient" means anyone who receives the Program under this Agreement
-    or any Secondary License (as applicable), including Contributors.
-
-    "Derivative Works" shall mean any work, whether in Source Code or other
-    form, that is based on (or derived from) the Program and for which the
-    editorial revisions, annotations, elaborations, or other modifications
-    represent, as a whole, an original work of authorship.
-
-    "Modified Works" shall mean any work in Source Code or other form that
-    results from an addition to, deletion from, or modification of the
-    contents of the Program, including, for purposes of clarity any new file
-    in Source Code form that contains any contents of the Program. Modified
-    Works shall not include works that contain only declarations,
-    interfaces, types, classes, structures, or files of the Program solely
-    in each case in order to link to, bind by name, or subclass the Program
-    or Modified Works thereof.
-
-    "Distribute" means the acts of a) distributing or b) making available
-    in any manner that enables the transfer of a copy.
-
-    "Source Code" means the form of a Program preferred for making
-    modifications, including but not limited to software source code,
-    documentation source, and configuration files.
-
-    "Secondary License" means either the GNU General Public License,
-    Version 2.0, or any later versions of that license, including any
-    exceptions or additional permissions as identified by the initial
-    Contributor.
-
-    2. GRANT OF RIGHTS
-
-      a) Subject to the terms of this Agreement, each Contributor hereby
-      grants Recipient a non-exclusive, worldwide, royalty-free copyright
-      license to reproduce, prepare Derivative Works of, publicly display,
-      publicly perform, Distribute and sublicense the Contribution of such
-      Contributor, if any, and such Derivative Works.
-
-      b) Subject to the terms of this Agreement, each Contributor hereby
-      grants Recipient a non-exclusive, worldwide, royalty-free patent
-      license under Licensed Patents to make, use, sell, offer to sell,
-      import and otherwise transfer the Contribution of such Contributor,
-      if any, in Source Code or other form. This patent license shall
-      apply to the combination of the Contribution and the Program if, at
-      the time the Contribution is added by the Contributor, such addition
-      of the Contribution causes such combination to be covered by the
-      Licensed Patents. The patent license shall not apply to any other
-      combinations which include the Contribution. No hardware per se is
-      licensed hereunder.
-
-      c) Recipient understands that although each Contributor grants the
-      licenses to its Contributions set forth herein, no assurances are
-      provided by any Contributor that the Program does not infringe the
-      patent or other intellectual property rights of any other entity.
-      Each Contributor disclaims any liability to Recipient for claims
-      brought by any other entity based on infringement of intellectual
-      property rights or otherwise. As a condition to exercising the
-      rights and licenses granted hereunder, each Recipient hereby
-      assumes sole responsibility to secure any other intellectual
-      property rights needed, if any. For example, if a third party
-      patent license is required to allow Recipient to Distribute the
-      Program, it is Recipient's responsibility to acquire that license
-      before distributing the Program.
-
-      d) Each Contributor represents that to its knowledge it has
-      sufficient copyright rights in its Contribution, if any, to grant
-      the copyright license set forth in this Agreement.
-
-      e) Notwithstanding the terms of any Secondary License, no
-      Contributor makes additional grants to any Recipient (other than
-      those set forth in this Agreement) as a result of such Recipient's
-      receipt of the Program under the terms of a Secondary License
-      (if permitted under the terms of Section 3).
-
-    3. REQUIREMENTS
-
-    3.1 If a Contributor Distributes the Program in any form, then:
-
-      a) the Program must also be made available as Source Code, in
-      accordance with section 3.2, and the Contributor must accompany
-      the Program with a statement that the Source Code for the Program
-      is available under this Agreement, and informs Recipients how to
-      obtain it in a reasonable manner on or through a medium customarily
-      used for software exchange; and
-
-      b) the Contributor may Distribute the Program under a license
-      different than this Agreement, provided that such license:
-         i) effectively disclaims on behalf of all other Contributors all
-         warranties and conditions, express and implied, including
-         warranties or conditions of title and non-infringement, and
-         implied warranties or conditions of merchantability and fitness
-         for a particular purpose;
-
-         ii) effectively excludes on behalf of all other Contributors all
-         liability for damages, including direct, indirect, special,
-         incidental and consequential damages, such as lost profits;
-
-         iii) does not attempt to limit or alter the recipients' rights
-         in the Source Code under section 3.2; and
-
-         iv) requires any subsequent distribution of the Program by any
-         party to be under a license that satisfies the requirements
-         of this section 3.
-
-    3.2 When the Program is Distributed as Source Code:
-
-      a) it must be made available under this Agreement, or if the
-      Program (i) is combined with other material in a separate file or
-      files made available under a Secondary License, and (ii) the initial
-      Contributor attached to the Source Code the notice described in
-      Exhibit A of this Agreement, then the Program may be made available
-      under the terms of such Secondary Licenses, and
-
-      b) a copy of this Agreement must be included with each copy of
-      the Program.
-
-    3.3 Contributors may not remove or alter any copyright, patent,
-    trademark, attribution notices, disclaimers of warranty, or limitations
-    of liability ("notices") contained within the Program from any copy of
-    the Program which they Distribute, provided that Contributors may add
-    their own appropriate notices.
-
-    4. COMMERCIAL DISTRIBUTION
-
-    Commercial distributors of software may accept certain responsibilities
-    with respect to end users, business partners and the like. While this
-    license is intended to facilitate the commercial use of the Program,
-    the Contributor who includes the Program in a commercial product
-    offering should do so in a manner which does not create potential
-    liability for other Contributors. Therefore, if a Contributor includes
-    the Program in a commercial product offering, such Contributor
-    ("Commercial Contributor") hereby agrees to defend and indemnify every
-    other Contributor ("Indemnified Contributor") against any losses,
-    damages and costs (collectively "Losses") arising from claims, lawsuits
-    and other legal actions brought by a third party against the Indemnified
-    Contributor to the extent caused by the acts or omissions of such
-    Commercial Contributor in connection with its distribution of the Program
-    in a commercial product offering. The obligations in this section do not
-    apply to any claims or Losses relating to any actual or alleged
-    intellectual property infringement. In order to qualify, an Indemnified
-    Contributor must: a) promptly notify the Commercial Contributor in
-    writing of such claim, and b) allow the Commercial Contributor to control,
-    and cooperate with the Commercial Contributor in, the defense and any
-    related settlement negotiations. The Indemnified Contributor may
-    participate in any such claim at its own expense.
-
-    For example, a Contributor might include the Program in a commercial
-    product offering, Product X. That Contributor is then a Commercial
-    Contributor. If that Commercial Contributor then makes performance
-    claims, or offers warranties related to Product X, those performance
-    claims and warranties are such Commercial Contributor's responsibility
-    alone. Under this section, the Commercial Contributor would have to
-    defend claims against the other Contributors related to those performance
-    claims and warranties, and if a court requires any other Contributor to
-    pay any damages as a result, the Commercial Contributor must pay
-    those damages.
-
-    5. NO WARRANTY
-
-    EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT
-    PERMITTED BY APPLICABLE LAW, THE PROGRAM IS PROVIDED ON AN "AS IS"
-    BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR
-    IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF
-    TITLE, NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR
-    PURPOSE. Each Recipient is solely responsible for determining the
-    appropriateness of using and distributing the Program and assumes all
-    risks associated with its exercise of rights under this Agreement,
-    including but not limited to the risks and costs of program errors,
-    compliance with applicable laws, damage to or loss of data, programs
-    or equipment, and unavailability or interruption of operations.
-
-    6. DISCLAIMER OF LIABILITY
-
-    EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT
-    PERMITTED BY APPLICABLE LAW, NEITHER RECIPIENT NOR ANY CONTRIBUTORS
-    SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-    EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST
-    PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-    CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-    ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE
-    EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF THE
-    POSSIBILITY OF SUCH DAMAGES.
-
-    7. GENERAL
-
-    If any provision of this Agreement is invalid or unenforceable under
-    applicable law, it shall not affect the validity or enforceability of
-    the remainder of the terms of this Agreement, and without further
-    action by the parties hereto, such provision shall be reformed to the
-    minimum extent necessary to make such provision valid and enforceable.
-
-    If Recipient institutes patent litigation against any entity
-    (including a cross-claim or counterclaim in a lawsuit) alleging that the
-    Program itself (excluding combinations of the Program with other software
-    or hardware) infringes such Recipient's patent(s), then such Recipient's
-    rights granted under Section 2(b) shall terminate as of the date such
-    litigation is filed.
-
-    All Recipient's rights under this Agreement shall terminate if it
-    fails to comply with any of the material terms or conditions of this
-    Agreement and does not cure such failure in a reasonable period of
-    time after becoming aware of such noncompliance. If all Recipient's
-    rights under this Agreement terminate, Recipient agrees to cease use
-    and distribution of the Program as soon as reasonably practicable.
-    However, Recipient's obligations under this Agreement and any licenses
-    granted by Recipient relating to the Program shall continue and survive.
-
-    Everyone is permitted to copy and distribute copies of this Agreement,
-    but in order to avoid inconsistency the Agreement is copyrighted and
-    may only be modified in the following manner. The Agreement Steward
-    reserves the right to publish new versions (including revisions) of
-    this Agreement from time to time. No one other than the Agreement
-    Steward has the right to modify this Agreement. The Eclipse Foundation
-    is the initial Agreement Steward. The Eclipse Foundation may assign the
-    responsibility to serve as the Agreement Steward to a suitable separate
-    entity. Each new version of the Agreement will be given a distinguishing
-    version number. The Program (including Contributions) may always be
-    Distributed subject to the version of the Agreement under which it was
-    received. In addition, after a new version of the Agreement is published,
-    Contributor may elect to Distribute the Program (including its
-    Contributions) under the new version.
-
-    Except as expressly stated in Sections 2(a) and 2(b) above, Recipient
-    receives no rights or licenses to the intellectual property of any
-    Contributor under this Agreement, whether expressly, by implication,
-    estoppel or otherwise. All rights in the Program not expressly granted
-    under this Agreement are reserved. Nothing in this Agreement is intended
-    to be enforceable by any entity that is not a Contributor or Recipient.
-    No third-party beneficiary rights are created under this Agreement.
-
-    Exhibit A - Form of Secondary Licenses Notice
-
-    "This Source Code may also be made available under the following 
-    Secondary Licenses when the conditions for such availability set forth 
-    in the Eclipse Public License, v. 2.0 are satisfied: {name license(s),
-    version(s), and exceptions or additional permissions here}."
-
-      Simply including a copy of this Agreement, including this Exhibit A
-      is not sufficient to license the Source Code under Secondary Licenses.
-
-      If it is not possible or desirable to put the notice in a particular
-      file, then You may include the notice in a location (such as a LICENSE
-      file in a relevant directory) where a recipient would be likely to
-      look for such a notice.
-
-      You may add additional accurate notices of copyright ownership.
\ No newline at end of file
diff --git a/docs/glassfish/troubleshooting-guide/src/main/jbake/assets/README.md b/docs/glassfish/troubleshooting-guide/src/main/jbake/assets/README.md
deleted file mode 100644
index f8f962c..0000000
--- a/docs/glassfish/troubleshooting-guide/src/main/jbake/assets/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-# About
-
-The {{site.title}} project contains the [AsciiDoc](http://asciidoc.org/)
-source code for the ...
diff --git a/docs/glassfish/troubleshooting-guide/src/main/jbake/assets/_config.yml b/docs/glassfish/troubleshooting-guide/src/main/jbake/assets/_config.yml
deleted file mode 100644
index 729b3f9..0000000
--- a/docs/glassfish/troubleshooting-guide/src/main/jbake/assets/_config.yml
+++ /dev/null
@@ -1,14 +0,0 @@
-theme: jekyll-theme-architect
-
-title: [troubleshooting-guide]
-description: [Eclipse GlassFish Server Troubleshooting Guide, Release 5.1]
-
-# sidebar links url
-links:
-  source: https://github.com/javaee/troubleshooting-guide
-  download: https://github.com/javaee/troubleshooting-guide/releases
-  #mailinglist: https://javaee.groups.io/g/troubleshooting-guide
-  #javadocs:
-  docs: https://javaee.github.io/troubleshooting-guide
-  #faq:
-
diff --git a/docs/glassfish/troubleshooting-guide/src/main/jbake/assets/_layouts/default.html b/docs/glassfish/troubleshooting-guide/src/main/jbake/assets/_layouts/default.html
deleted file mode 100644
index f896fad..0000000
--- a/docs/glassfish/troubleshooting-guide/src/main/jbake/assets/_layouts/default.html
+++ /dev/null
@@ -1,100 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <meta charset='utf-8'>
-    <meta http-equiv="X-UA-Compatible" content="chrome=1">
-    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
-    <link rel="stylesheet" href="{{ '/assets/css/style.css?' | relative_url }}" media="screen" type="text/css">
-    <link rel="stylesheet" href="{{ '/assets/css/print.css' | relative_url }}" media="print" type="text/css">
-
-    <!--[if lt IE 9]>
-    <script src="//html5shiv.googlecode.com/svn/trunk/html5.js"></script>
-    <![endif]-->
-
-    <title>{{ site.title | default: site.github.repository_name }}</title>
-  </head>
-
-  <body>
-    <header>
-      <div class="inner">
-        <a href="{{ '/' | absolute_url }}">
-          <h1>{{ site.title | default: site.github.repository_name }}</h1>
-        </a>
-        <h2>{{ site.description | default: site.github.project_tagline }}</h2>
-        {% if site.github.is_project_page %}
-        <a href="{{ '/' | absolute_url }}" class="button"></a>
-        {% endif %}
-      </div>
-    </header>
-
-    <div id="content-wrapper">
-      <div class="inner clearfix">
-        <section id="main-content">
-          {{ content }}
-
-        </section>
-
-        <aside id="sidebar">
-          
-          <hr/>
-
-          <div class="moveright">
-            {% if site.links.source %}
-               <h2><a href="{{ site.links.source }}"><p>Sources</p></a></h2>
-            {% endif %}
-            
-            {% if site.links.javadocs %}
-              <h2><a href="{{ site.links.javadocs }}"><p>APIs</p></a></h2>
-            {% endif %}
-
-            {% if site.links.docs %}
-              <h2><a href="{{ site.links.docs }}"><p>Documentation</p></a></h2>
-            {% endif %}
-
-            {% if site.links.faq %}
-              <h2><a href="{{ site.links.faq }}"><p>FAQ</p></a></h2>
-            {% endif %}
-            
-            {% if site.links.download %}
-               <h2><a href="{{ site.links.download }}"><p>Download</p></a></h2>
-            {% endif %}
-
-            {% if site.links.hide_issuetracker != true %}
-            <h2><a href="{{ site.github.issues_url }}"><p>Issue Tracker</p></a></h2>
-            {% endif %}
-
-            {% if site.links.mailinglist %}
-               <h2><a href="{{ site.links.mailinglist }}"><p>Mailing List</p></a></h2>
-            {% endif %}          
-
-            <h2><a href="CONTRIBUTING"><p>Contribute</p></a></h2>
-
-            <h2><a href="LICENSE"><p>License</p></a></h2>
-          </div>
-          
-          <hr/>
-          
-          <div class="sponsor">
-            <p>Sponsored by<a href="http://www.oracle.com" class="oraclelogo"></a></p>
-          </div>
-          
-        </aside>
-      </div>
-    </div>
-
-    <div class="footer"><a id="copyright" class="oracle" href="https://www.oracle.com/legal/copyright.html">&copy; Oracle</a> | By contributing to this project, you are agreeing to the terms of use described <a href="CONTRIBUTING">here</a>.</div>
-
-    {% if site.google_analytics %}
-      <script type="text/javascript">
-        var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
-        document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));
-      </script>
-      <script type="text/javascript">
-        try {
-          var pageTracker = _gat._getTracker("{{ site.google_analytics }}");
-        pageTracker._trackPageview();
-        } catch(err) {}
-      </script>
-    {% endif %}
-  </body>
-</html>
diff --git a/docs/glassfish/troubleshooting-guide/src/main/jbake/assets/assets/css/print.scss b/docs/glassfish/troubleshooting-guide/src/main/jbake/assets/assets/css/print.scss
deleted file mode 100644
index 6115d8d..0000000
--- a/docs/glassfish/troubleshooting-guide/src/main/jbake/assets/assets/css/print.scss
+++ /dev/null
@@ -1,8 +0,0 @@
----
----
-
-@import "{{ site.theme }}";
-h1 {
-  font-size: 1.8em;
-}
-
diff --git a/docs/glassfish/troubleshooting-guide/src/main/jbake/assets/assets/css/style.scss b/docs/glassfish/troubleshooting-guide/src/main/jbake/assets/assets/css/style.scss
deleted file mode 100644
index 3cf8c1a..0000000
--- a/docs/glassfish/troubleshooting-guide/src/main/jbake/assets/assets/css/style.scss
+++ /dev/null
@@ -1,246 +0,0 @@
----
----
-
-@import "{{ site.theme }}";
-
-header {
-  padding-top: 16px;
-  padding-bottom: 40px;
-  font-family: 'Mukta Vaani', 'Open Sans', 'Helvetica Neue', Helvetica, Arial, serif;
-  background: url(../images/header-bkg.jpg) 0 0 repeat-x;
-  border-bottom: solid 1px #E0E0E0;  
-}
-
-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; // orange
-  //color: #2879d0; // blue
-  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;
-}
-
-a {
-  font-weight: 300;
-  color: #2879d0;
-}
-
-a:hover { 
-  text-decoration: underline;
-}
-
-#sidebar p {
-  font-size: 1em;
-  margin-bottom: 1em;
-}
-
-.highlight { 
-  background-color: #ffffff;
-}
-
-.sponsor {
-  float: left;
-  padding-top: 20px;
-  padding-left: 18px;
-}
-
-.moveright30{
-  padding-left: 30px;
-}
-
-.moveright{
-  padding-left: 40px;
-}
-
-.moveright50{
-  padding-left: 50px;
-}
-
-/*
-a.oraclelogo {
-  position: absolute;
-  background: transparent url(../images/Oracle-logo.png) 0 0 no-repeat;
-  background-position: 2px -2px; 
-  background-size: 100% ;
-  width: 96px;
-  height: 62px;
-  padding-top: 2px;
-  padding-right: 20px;
-}
-*/
-
-aside#sidebar {
-  padding-top: 40px;
-  line-height: 1.2;
-}
-
-hr {
-  border:none;
-  height: 10px;
-  width: 75%;
-  height: 50px;
-  margin-top: 0;
-  border-bottom: 1px solid #cccccc;
-  box-shadow: 0 20px 20px -20px #aaa;
-  margin: -48px auto 10px; 
-}
-
-table {
-   margin-bottom: 20px;
-}
-
-th, td {
-  padding: .2em;
-}
-
-td {
-  font-weight: 400;
-}
-
-ul {
-  font-size: 1em;
-  margin-left: 12px;
-}
-
-ol {
-    list-style-position: inside;
-    list-style: decimal;
-    margin-left: 26px;
-}
-
-blockquote {
-    padding: 0 0 0 10px;
-    margin-left: 14px;
-    margin-bottom: 2px;
-    font-size: 1em;
-    border-left: 4px solid #ddd;
-}
-
-#main-content h1 {
-  padding-top: .6em;
-  font-family: 'Mukta Vaani', 'Open Sans', 'Helvetica Neue', Helvetica, Arial, serif;
-  font-size: 1.6em;
-  font-weight: 500;
-  color : #666;
-  text-indent: 16px;
-  letter-spacing: 0px;
-  border-bottom:1px solid #cccccc;
-  padding-bottom:1px;
-  line-height: 1.2;
-  //margin: .6em 0;
-  margin-bottom: .6em;
-}
-
-#main-content h1:before {
-  //padding-right: 0.3em;
-  margin-left: -1em;
-  content: "";
-}
-
-#main-content h2 {
-  margin-bottom: 8px;
-  font-family: 'Mukta Vaani', 'Open Sans', 'Helvetica Neue', Helvetica, Arial, serif;
-  font-size: 1.4em;
-  font-weight: 400;
-  //color: #474747;
-  color: #3c657b; // blue
-  text-indent: 4px;
-}
-
-#main-content h2:before {
-  padding-right: 1.3em;
-  margin-left: -1.5em;
-  content: "";
-  font-weight: 700;
-}
-
-#main-content h3 {
-  text-indent: 24px;
-  margin-bottom: 8px;
-  font-family: 'Mukta Vaani', 'Open Sans', 'Helvetica Neue', Helvetica, Arial, serif;
-  font-size: 1.2em;
-  font-weight: 500;
-  color: #3c657b;
-  text-indent: 4px;
-}
-
-#main-content h3:before {
-  content: "";
-  margin-left: -0.3em;
-  padding-right: 0.1em;
-}
-
-#main-content h4 {
-  margin-bottom: 8px;
-  font-family: 'Mukta Vaani', 'Open Sans', 'Helvetica Neue', Helvetica, Arial, serif;
-  font-size: 1.2em;
-  font-weight: 500;
-  color: #3c657b;
-  text-indent: 4px;
-}
-
-#main-content h4:before {
-  content: "";
-  margin-left: -0.3em;
-  padding-right: 0.1em;
-}
-
-#main-content p {
-  font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, serif;
-  font-weight: normal;
-  font-size: 1em;
-  margin-bottom: 2px;
-}
-
-.footer {
-  position: fixed; 
-  bottom: 0;
-  left: 0;
-  right: 0;
-  height: 6px;
-  background-color: #f0f0f0;
-  //padding: 1rem;
-  padding-top: 4px;
-  padding-bottom: 14px;
-  font-size: 0.8em;
-  text-align: center;
-}
-
-.oracle {
-  color: #666;
-  font-weight: 400;
-}
-
-.oracle:hover { 
-  text-decoration: none;
-  color: #FF0000;
-}
-
-.fullpage {
-  //float: center;
-  color: FF0000;
-  width: 900px;
-}
\ No newline at end of file
diff --git a/docs/glassfish/troubleshooting-guide/src/main/jbake/assets/assets/images/header-bkg.jpg b/docs/glassfish/troubleshooting-guide/src/main/jbake/assets/assets/images/header-bkg.jpg
deleted file mode 100644
index 481faa5..0000000
--- a/docs/glassfish/troubleshooting-guide/src/main/jbake/assets/assets/images/header-bkg.jpg
+++ /dev/null
Binary files differ
diff --git a/docs/glassfish/troubleshooting-guide/src/main/jbake/assets/assets/images/logo.png b/docs/glassfish/troubleshooting-guide/src/main/jbake/assets/assets/images/logo.png
deleted file mode 100644
index af471e3..0000000
--- a/docs/glassfish/troubleshooting-guide/src/main/jbake/assets/assets/images/logo.png
+++ /dev/null
Binary files differ
diff --git a/docs/glassfish/troubleshooting-guide/src/main/jbake/content/title.adoc b/docs/glassfish/troubleshooting-guide/src/main/jbake/content/title.adoc
index ea5ad34..3c1c328 100644
--- a/docs/glassfish/troubleshooting-guide/src/main/jbake/content/title.adoc
+++ b/docs/glassfish/troubleshooting-guide/src/main/jbake/content/title.adoc
@@ -7,7 +7,7 @@
 Eclipse GlassFish Server Troubleshooting Guide, Release 5.1
 ===========================================================
 
-[[glassfish-server-open-source-edition]]
+[[eclipse-glassfish-server]]
 Eclipse GlassFish Server
 ------------------------
 
@@ -42,4 +42,4 @@
 trademarks or registered trademarks of SPARC International, Inc. AMD, 
 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. 
\ No newline at end of file
+trademark of The Open Group. 
diff --git a/docs/glassfish/troubleshooting-guide/src/main/jbake/templates/footer.ftl b/docs/glassfish/troubleshooting-guide/src/main/jbake/templates/footer.ftl
index e7df506..131fe6c 100644
--- a/docs/glassfish/troubleshooting-guide/src/main/jbake/templates/footer.ftl
+++ b/docs/glassfish/troubleshooting-guide/src/main/jbake/templates/footer.ftl
@@ -36,7 +36,7 @@
 </table>
 
 <span id="copyright">
-        <img src="img/eclipse_foundation_logo_tiny.png" height="20px" alt="Eclipse Foundation Logo" align="top"/>&nbsp;            
+        <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>
 
diff --git a/docs/glassfish/upgrade-guide/pom.xml b/docs/glassfish/upgrade-guide/pom.xml
index 3d661d4..73eca96 100644
--- a/docs/glassfish/upgrade-guide/pom.xml
+++ b/docs/glassfish/upgrade-guide/pom.xml
@@ -18,106 +18,14 @@
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <groupId>org.glassfish</groupId>
+    <parent>
+        <groupId>org.glassfish.docs</groupId>
+        <artifactId>parent</artifactId>
+        <version>5.1.1-SNAPSHOT</version>
+        <relativePath>../parent</relativePath>
+    </parent>
+    <groupId>org.glassfish.docs</groupId>
     <artifactId>upgrade-guide</artifactId>
-    <packaging>pom</packaging>
-    <version>1.0.0-SNAPSHOT</version>
+    <packaging>jar</packaging>
     <name>Eclipse GlassFish Server Upgrade Guide, Release 5.1</name>
-
-    <properties>
-        <site.output.dir>${project.build.directory}/staging</site.output.dir>
-        <maven.site.skip>true</maven.site.skip>
-        <maven.deploy.skip>true</maven.deploy.skip>
-    </properties>
-
-    <distributionManagement>
-        <site>
-            <url>scm:git:git@github.com:javaee/upgrade-guide.git</url>
-        </site>
-    </distributionManagement>
-
-    <build>
-        <defaultGoal>package</defaultGoal>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-enforcer-plugin</artifactId>
-                <version>1.4.1</version>
-                <executions>
-                    <execution>
-                        <id>enforce-versions</id>
-                        <goals>
-                            <goal>enforce</goal>
-                        </goals>
-                        <configuration>
-                            <rules>
-                                <requireJavaVersion>
-                                    <version>[1.8.0,1.9.0)</version>
-                                    <message>You need JDK8 or lower</message>
-                                </requireJavaVersion>
-                            </rules>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>com.blazebit</groupId>
-                <artifactId>jbake-maven-plugin</artifactId>
-                <version>1.0.0</version>
-                <configuration>
-                    <outputDirectory>${site.output.dir}</outputDirectory>
-                </configuration>
-                <executions>
-                    <execution>
-                        <id>build-site</id>
-                        <phase>generate-resources</phase>
-                        <goals>
-                            <goal>build</goal>
-                        </goals>
-                    </execution>
-                </executions>
-                <dependencies>
-                    <dependency>
-                        <groupId>org.asciidoctor</groupId>
-                        <artifactId>asciidoctorj</artifactId>
-                        <version>1.5.5</version>
-                    </dependency>
-                    <dependency>
-                        <groupId>org.asciidoctor</groupId>
-                        <artifactId>asciidoctorj-diagram</artifactId>
-                        <version>1.5.4</version>
-                    </dependency>
-                </dependencies>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-scm-publish-plugin</artifactId>
-                <version>1.1</version>
-                <executions>
-                    <execution>
-                        <id>deploy-site</id>
-                        <phase>deploy</phase>
-                        <goals>
-                            <goal>publish-scm</goal>
-                        </goals>
-                        <configuration>
-                            <scmBranch>gh-pages</scmBranch>
-                            <skipDeletedFiles>false</skipDeletedFiles>
-                            <checkinComment>Update site</checkinComment>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-	</plugins>
-
-	<pluginManagement>
-	    <plugins>
-		<plugin>
-		    <groupId>org.apache.maven.plugins</groupId>
-		    <artifactId>maven-assembly-plugin</artifactId>
-		    <version>2.4</version>
-		</plugin>
-	    </plugins>
-	</pluginManagement>
-    </build>
 </project>
diff --git a/docs/glassfish/upgrade-guide/src/main/jbake/assets/CONTRIBUTING.md b/docs/glassfish/upgrade-guide/src/main/jbake/assets/CONTRIBUTING.md
deleted file mode 100644
index a0ebaa0..0000000
--- a/docs/glassfish/upgrade-guide/src/main/jbake/assets/CONTRIBUTING.md
+++ /dev/null
@@ -1,57 +0,0 @@
-# Contributing to Eclipse GlassFish
-
-Thanks for your interest in this project.
-
-## Project description
-
-Eclipse GlassFish is a complete application server that implements the Jakarta
-EE specification. GlassFish includes implementations of all required and
-optional Jakarta EE APIs, and passes all Jakarta EE TCKs. GlassFish also
-includes a complete administration console, clustering support, and other
-developer and production focused tools and features.
-
-* https://projects.eclipse.org/projects/ee4j.glassfish
-
-## Developer resources
-
-Information regarding source code management, builds, coding standards, and
-more.
-
-* https://projects.eclipse.org/projects/ee4j.glassfish/developer
-
-The project maintains the following source code repositories
-
-* https://github.com/eclipse-ee4j/glassfish-ha-api
-* https://github.com/eclipse-ee4j/glassfish-logging-annotation-processor
-* https://github.com/eclipse-ee4j/glassfish-shoal
-* https://github.com/eclipse-ee4j/glassfish-cdi-porting-tck
-* https://github.com/eclipse-ee4j/glassfish-jsftemplating
-* https://github.com/eclipse-ee4j/glassfish-hk2-extra
-* https://github.com/eclipse-ee4j/glassfish-hk2
-* https://github.com/eclipse-ee4j/glassfish-fighterfish
-* https://github.com/eclipse-ee4j/glassfish
-* https://github.com/eclipse-ee4j/glassfish-maven-embedded-plugin
-* https://github.com/eclipse-ee4j/bvtck-porting
-
-## Eclipse Contributor Agreement
-
-Before your contribution can be accepted by the project team contributors must
-electronically sign the Eclipse Contributor Agreement (ECA).
-
-* http://www.eclipse.org/legal/ECA.php
-
-Commits that are provided by non-committers must have a Signed-off-by field in
-the footer indicating that the author is aware of the terms by which the
-contribution has been provided to the project. The non-committer must
-additionally have an Eclipse Foundation account and must have a signed Eclipse
-Contributor Agreement (ECA) on file.
-
-For more information, please see the Eclipse Committer Handbook:
-https://www.eclipse.org/projects/handbook/#resources-commit
-
-## Contact
-
-Contact the project developers via the project's "dev" list.
-
-* https://accounts.eclipse.org/mailing-list/glassfish-dev
-
diff --git a/docs/glassfish/upgrade-guide/src/main/jbake/assets/LICENSE.md b/docs/glassfish/upgrade-guide/src/main/jbake/assets/LICENSE.md
deleted file mode 100644
index f046098..0000000
--- a/docs/glassfish/upgrade-guide/src/main/jbake/assets/LICENSE.md
+++ /dev/null
@@ -1,277 +0,0 @@
-# Eclipse Public License - v 2.0
-
-        THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE
-        PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION
-        OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
-
-    1. DEFINITIONS
-
-    "Contribution" means:
-
-      a) in the case of the initial Contributor, the initial content
-         Distributed under this Agreement, and
-
-      b) in the case of each subsequent Contributor: 
-         i) changes to the Program, and 
-         ii) additions to the Program;
-      where such changes and/or additions to the Program originate from
-      and are Distributed by that particular Contributor. A Contribution
-      "originates" from a Contributor if it was added to the Program by
-      such Contributor itself or anyone acting on such Contributor's behalf.
-      Contributions do not include changes or additions to the Program that
-      are not Modified Works.
-
-    "Contributor" means any person or entity that Distributes the Program.
-
-    "Licensed Patents" mean patent claims licensable by a Contributor which
-    are necessarily infringed by the use or sale of its Contribution alone
-    or when combined with the Program.
-
-    "Program" means the Contributions Distributed in accordance with this
-    Agreement.
-
-    "Recipient" means anyone who receives the Program under this Agreement
-    or any Secondary License (as applicable), including Contributors.
-
-    "Derivative Works" shall mean any work, whether in Source Code or other
-    form, that is based on (or derived from) the Program and for which the
-    editorial revisions, annotations, elaborations, or other modifications
-    represent, as a whole, an original work of authorship.
-
-    "Modified Works" shall mean any work in Source Code or other form that
-    results from an addition to, deletion from, or modification of the
-    contents of the Program, including, for purposes of clarity any new file
-    in Source Code form that contains any contents of the Program. Modified
-    Works shall not include works that contain only declarations,
-    interfaces, types, classes, structures, or files of the Program solely
-    in each case in order to link to, bind by name, or subclass the Program
-    or Modified Works thereof.
-
-    "Distribute" means the acts of a) distributing or b) making available
-    in any manner that enables the transfer of a copy.
-
-    "Source Code" means the form of a Program preferred for making
-    modifications, including but not limited to software source code,
-    documentation source, and configuration files.
-
-    "Secondary License" means either the GNU General Public License,
-    Version 2.0, or any later versions of that license, including any
-    exceptions or additional permissions as identified by the initial
-    Contributor.
-
-    2. GRANT OF RIGHTS
-
-      a) Subject to the terms of this Agreement, each Contributor hereby
-      grants Recipient a non-exclusive, worldwide, royalty-free copyright
-      license to reproduce, prepare Derivative Works of, publicly display,
-      publicly perform, Distribute and sublicense the Contribution of such
-      Contributor, if any, and such Derivative Works.
-
-      b) Subject to the terms of this Agreement, each Contributor hereby
-      grants Recipient a non-exclusive, worldwide, royalty-free patent
-      license under Licensed Patents to make, use, sell, offer to sell,
-      import and otherwise transfer the Contribution of such Contributor,
-      if any, in Source Code or other form. This patent license shall
-      apply to the combination of the Contribution and the Program if, at
-      the time the Contribution is added by the Contributor, such addition
-      of the Contribution causes such combination to be covered by the
-      Licensed Patents. The patent license shall not apply to any other
-      combinations which include the Contribution. No hardware per se is
-      licensed hereunder.
-
-      c) Recipient understands that although each Contributor grants the
-      licenses to its Contributions set forth herein, no assurances are
-      provided by any Contributor that the Program does not infringe the
-      patent or other intellectual property rights of any other entity.
-      Each Contributor disclaims any liability to Recipient for claims
-      brought by any other entity based on infringement of intellectual
-      property rights or otherwise. As a condition to exercising the
-      rights and licenses granted hereunder, each Recipient hereby
-      assumes sole responsibility to secure any other intellectual
-      property rights needed, if any. For example, if a third party
-      patent license is required to allow Recipient to Distribute the
-      Program, it is Recipient's responsibility to acquire that license
-      before distributing the Program.
-
-      d) Each Contributor represents that to its knowledge it has
-      sufficient copyright rights in its Contribution, if any, to grant
-      the copyright license set forth in this Agreement.
-
-      e) Notwithstanding the terms of any Secondary License, no
-      Contributor makes additional grants to any Recipient (other than
-      those set forth in this Agreement) as a result of such Recipient's
-      receipt of the Program under the terms of a Secondary License
-      (if permitted under the terms of Section 3).
-
-    3. REQUIREMENTS
-
-    3.1 If a Contributor Distributes the Program in any form, then:
-
-      a) the Program must also be made available as Source Code, in
-      accordance with section 3.2, and the Contributor must accompany
-      the Program with a statement that the Source Code for the Program
-      is available under this Agreement, and informs Recipients how to
-      obtain it in a reasonable manner on or through a medium customarily
-      used for software exchange; and
-
-      b) the Contributor may Distribute the Program under a license
-      different than this Agreement, provided that such license:
-         i) effectively disclaims on behalf of all other Contributors all
-         warranties and conditions, express and implied, including
-         warranties or conditions of title and non-infringement, and
-         implied warranties or conditions of merchantability and fitness
-         for a particular purpose;
-
-         ii) effectively excludes on behalf of all other Contributors all
-         liability for damages, including direct, indirect, special,
-         incidental and consequential damages, such as lost profits;
-
-         iii) does not attempt to limit or alter the recipients' rights
-         in the Source Code under section 3.2; and
-
-         iv) requires any subsequent distribution of the Program by any
-         party to be under a license that satisfies the requirements
-         of this section 3.
-
-    3.2 When the Program is Distributed as Source Code:
-
-      a) it must be made available under this Agreement, or if the
-      Program (i) is combined with other material in a separate file or
-      files made available under a Secondary License, and (ii) the initial
-      Contributor attached to the Source Code the notice described in
-      Exhibit A of this Agreement, then the Program may be made available
-      under the terms of such Secondary Licenses, and
-
-      b) a copy of this Agreement must be included with each copy of
-      the Program.
-
-    3.3 Contributors may not remove or alter any copyright, patent,
-    trademark, attribution notices, disclaimers of warranty, or limitations
-    of liability ("notices") contained within the Program from any copy of
-    the Program which they Distribute, provided that Contributors may add
-    their own appropriate notices.
-
-    4. COMMERCIAL DISTRIBUTION
-
-    Commercial distributors of software may accept certain responsibilities
-    with respect to end users, business partners and the like. While this
-    license is intended to facilitate the commercial use of the Program,
-    the Contributor who includes the Program in a commercial product
-    offering should do so in a manner which does not create potential
-    liability for other Contributors. Therefore, if a Contributor includes
-    the Program in a commercial product offering, such Contributor
-    ("Commercial Contributor") hereby agrees to defend and indemnify every
-    other Contributor ("Indemnified Contributor") against any losses,
-    damages and costs (collectively "Losses") arising from claims, lawsuits
-    and other legal actions brought by a third party against the Indemnified
-    Contributor to the extent caused by the acts or omissions of such
-    Commercial Contributor in connection with its distribution of the Program
-    in a commercial product offering. The obligations in this section do not
-    apply to any claims or Losses relating to any actual or alleged
-    intellectual property infringement. In order to qualify, an Indemnified
-    Contributor must: a) promptly notify the Commercial Contributor in
-    writing of such claim, and b) allow the Commercial Contributor to control,
-    and cooperate with the Commercial Contributor in, the defense and any
-    related settlement negotiations. The Indemnified Contributor may
-    participate in any such claim at its own expense.
-
-    For example, a Contributor might include the Program in a commercial
-    product offering, Product X. That Contributor is then a Commercial
-    Contributor. If that Commercial Contributor then makes performance
-    claims, or offers warranties related to Product X, those performance
-    claims and warranties are such Commercial Contributor's responsibility
-    alone. Under this section, the Commercial Contributor would have to
-    defend claims against the other Contributors related to those performance
-    claims and warranties, and if a court requires any other Contributor to
-    pay any damages as a result, the Commercial Contributor must pay
-    those damages.
-
-    5. NO WARRANTY
-
-    EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT
-    PERMITTED BY APPLICABLE LAW, THE PROGRAM IS PROVIDED ON AN "AS IS"
-    BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR
-    IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF
-    TITLE, NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR
-    PURPOSE. Each Recipient is solely responsible for determining the
-    appropriateness of using and distributing the Program and assumes all
-    risks associated with its exercise of rights under this Agreement,
-    including but not limited to the risks and costs of program errors,
-    compliance with applicable laws, damage to or loss of data, programs
-    or equipment, and unavailability or interruption of operations.
-
-    6. DISCLAIMER OF LIABILITY
-
-    EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT
-    PERMITTED BY APPLICABLE LAW, NEITHER RECIPIENT NOR ANY CONTRIBUTORS
-    SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-    EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST
-    PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-    CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-    ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE
-    EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF THE
-    POSSIBILITY OF SUCH DAMAGES.
-
-    7. GENERAL
-
-    If any provision of this Agreement is invalid or unenforceable under
-    applicable law, it shall not affect the validity or enforceability of
-    the remainder of the terms of this Agreement, and without further
-    action by the parties hereto, such provision shall be reformed to the
-    minimum extent necessary to make such provision valid and enforceable.
-
-    If Recipient institutes patent litigation against any entity
-    (including a cross-claim or counterclaim in a lawsuit) alleging that the
-    Program itself (excluding combinations of the Program with other software
-    or hardware) infringes such Recipient's patent(s), then such Recipient's
-    rights granted under Section 2(b) shall terminate as of the date such
-    litigation is filed.
-
-    All Recipient's rights under this Agreement shall terminate if it
-    fails to comply with any of the material terms or conditions of this
-    Agreement and does not cure such failure in a reasonable period of
-    time after becoming aware of such noncompliance. If all Recipient's
-    rights under this Agreement terminate, Recipient agrees to cease use
-    and distribution of the Program as soon as reasonably practicable.
-    However, Recipient's obligations under this Agreement and any licenses
-    granted by Recipient relating to the Program shall continue and survive.
-
-    Everyone is permitted to copy and distribute copies of this Agreement,
-    but in order to avoid inconsistency the Agreement is copyrighted and
-    may only be modified in the following manner. The Agreement Steward
-    reserves the right to publish new versions (including revisions) of
-    this Agreement from time to time. No one other than the Agreement
-    Steward has the right to modify this Agreement. The Eclipse Foundation
-    is the initial Agreement Steward. The Eclipse Foundation may assign the
-    responsibility to serve as the Agreement Steward to a suitable separate
-    entity. Each new version of the Agreement will be given a distinguishing
-    version number. The Program (including Contributions) may always be
-    Distributed subject to the version of the Agreement under which it was
-    received. In addition, after a new version of the Agreement is published,
-    Contributor may elect to Distribute the Program (including its
-    Contributions) under the new version.
-
-    Except as expressly stated in Sections 2(a) and 2(b) above, Recipient
-    receives no rights or licenses to the intellectual property of any
-    Contributor under this Agreement, whether expressly, by implication,
-    estoppel or otherwise. All rights in the Program not expressly granted
-    under this Agreement are reserved. Nothing in this Agreement is intended
-    to be enforceable by any entity that is not a Contributor or Recipient.
-    No third-party beneficiary rights are created under this Agreement.
-
-    Exhibit A - Form of Secondary Licenses Notice
-
-    "This Source Code may also be made available under the following 
-    Secondary Licenses when the conditions for such availability set forth 
-    in the Eclipse Public License, v. 2.0 are satisfied: {name license(s),
-    version(s), and exceptions or additional permissions here}."
-
-      Simply including a copy of this Agreement, including this Exhibit A
-      is not sufficient to license the Source Code under Secondary Licenses.
-
-      If it is not possible or desirable to put the notice in a particular
-      file, then You may include the notice in a location (such as a LICENSE
-      file in a relevant directory) where a recipient would be likely to
-      look for such a notice.
-
-      You may add additional accurate notices of copyright ownership.
\ No newline at end of file
diff --git a/docs/glassfish/upgrade-guide/src/main/jbake/assets/README.md b/docs/glassfish/upgrade-guide/src/main/jbake/assets/README.md
deleted file mode 100644
index f8f962c..0000000
--- a/docs/glassfish/upgrade-guide/src/main/jbake/assets/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-# About
-
-The {{site.title}} project contains the [AsciiDoc](http://asciidoc.org/)
-source code for the ...
diff --git a/docs/glassfish/upgrade-guide/src/main/jbake/assets/_config.yml b/docs/glassfish/upgrade-guide/src/main/jbake/assets/_config.yml
deleted file mode 100644
index d67244d..0000000
--- a/docs/glassfish/upgrade-guide/src/main/jbake/assets/_config.yml
+++ /dev/null
@@ -1,14 +0,0 @@
-theme: jekyll-theme-architect
-
-title: [upgrade-guide]
-description: [Eclipse GlassFish Server Upgrade Guide, Release 5.1]
-
-# sidebar links url
-links:
-  source: https://github.com/javaee/upgrade-guide
-  download: https://github.com/javaee/upgrade-guide/releases
-  #mailinglist: https://javaee.groups.io/g/upgrade-guide
-  #javadocs:
-  docs: https://javaee.github.io/upgrade-guide
-  #faq:
-
diff --git a/docs/glassfish/upgrade-guide/src/main/jbake/assets/_layouts/default.html b/docs/glassfish/upgrade-guide/src/main/jbake/assets/_layouts/default.html
deleted file mode 100644
index f896fad..0000000
--- a/docs/glassfish/upgrade-guide/src/main/jbake/assets/_layouts/default.html
+++ /dev/null
@@ -1,100 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <meta charset='utf-8'>
-    <meta http-equiv="X-UA-Compatible" content="chrome=1">
-    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
-    <link rel="stylesheet" href="{{ '/assets/css/style.css?' | relative_url }}" media="screen" type="text/css">
-    <link rel="stylesheet" href="{{ '/assets/css/print.css' | relative_url }}" media="print" type="text/css">
-
-    <!--[if lt IE 9]>
-    <script src="//html5shiv.googlecode.com/svn/trunk/html5.js"></script>
-    <![endif]-->
-
-    <title>{{ site.title | default: site.github.repository_name }}</title>
-  </head>
-
-  <body>
-    <header>
-      <div class="inner">
-        <a href="{{ '/' | absolute_url }}">
-          <h1>{{ site.title | default: site.github.repository_name }}</h1>
-        </a>
-        <h2>{{ site.description | default: site.github.project_tagline }}</h2>
-        {% if site.github.is_project_page %}
-        <a href="{{ '/' | absolute_url }}" class="button"></a>
-        {% endif %}
-      </div>
-    </header>
-
-    <div id="content-wrapper">
-      <div class="inner clearfix">
-        <section id="main-content">
-          {{ content }}
-
-        </section>
-
-        <aside id="sidebar">
-          
-          <hr/>
-
-          <div class="moveright">
-            {% if site.links.source %}
-               <h2><a href="{{ site.links.source }}"><p>Sources</p></a></h2>
-            {% endif %}
-            
-            {% if site.links.javadocs %}
-              <h2><a href="{{ site.links.javadocs }}"><p>APIs</p></a></h2>
-            {% endif %}
-
-            {% if site.links.docs %}
-              <h2><a href="{{ site.links.docs }}"><p>Documentation</p></a></h2>
-            {% endif %}
-
-            {% if site.links.faq %}
-              <h2><a href="{{ site.links.faq }}"><p>FAQ</p></a></h2>
-            {% endif %}
-            
-            {% if site.links.download %}
-               <h2><a href="{{ site.links.download }}"><p>Download</p></a></h2>
-            {% endif %}
-
-            {% if site.links.hide_issuetracker != true %}
-            <h2><a href="{{ site.github.issues_url }}"><p>Issue Tracker</p></a></h2>
-            {% endif %}
-
-            {% if site.links.mailinglist %}
-               <h2><a href="{{ site.links.mailinglist }}"><p>Mailing List</p></a></h2>
-            {% endif %}          
-
-            <h2><a href="CONTRIBUTING"><p>Contribute</p></a></h2>
-
-            <h2><a href="LICENSE"><p>License</p></a></h2>
-          </div>
-          
-          <hr/>
-          
-          <div class="sponsor">
-            <p>Sponsored by<a href="http://www.oracle.com" class="oraclelogo"></a></p>
-          </div>
-          
-        </aside>
-      </div>
-    </div>
-
-    <div class="footer"><a id="copyright" class="oracle" href="https://www.oracle.com/legal/copyright.html">&copy; Oracle</a> | By contributing to this project, you are agreeing to the terms of use described <a href="CONTRIBUTING">here</a>.</div>
-
-    {% if site.google_analytics %}
-      <script type="text/javascript">
-        var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
-        document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));
-      </script>
-      <script type="text/javascript">
-        try {
-          var pageTracker = _gat._getTracker("{{ site.google_analytics }}");
-        pageTracker._trackPageview();
-        } catch(err) {}
-      </script>
-    {% endif %}
-  </body>
-</html>
diff --git a/docs/glassfish/upgrade-guide/src/main/jbake/assets/assets/css/print.scss b/docs/glassfish/upgrade-guide/src/main/jbake/assets/assets/css/print.scss
deleted file mode 100644
index 6115d8d..0000000
--- a/docs/glassfish/upgrade-guide/src/main/jbake/assets/assets/css/print.scss
+++ /dev/null
@@ -1,8 +0,0 @@
----
----
-
-@import "{{ site.theme }}";
-h1 {
-  font-size: 1.8em;
-}
-
diff --git a/docs/glassfish/upgrade-guide/src/main/jbake/assets/assets/css/style.scss b/docs/glassfish/upgrade-guide/src/main/jbake/assets/assets/css/style.scss
deleted file mode 100644
index 3cf8c1a..0000000
--- a/docs/glassfish/upgrade-guide/src/main/jbake/assets/assets/css/style.scss
+++ /dev/null
@@ -1,246 +0,0 @@
----
----
-
-@import "{{ site.theme }}";
-
-header {
-  padding-top: 16px;
-  padding-bottom: 40px;
-  font-family: 'Mukta Vaani', 'Open Sans', 'Helvetica Neue', Helvetica, Arial, serif;
-  background: url(../images/header-bkg.jpg) 0 0 repeat-x;
-  border-bottom: solid 1px #E0E0E0;  
-}
-
-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; // orange
-  //color: #2879d0; // blue
-  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;
-}
-
-a {
-  font-weight: 300;
-  color: #2879d0;
-}
-
-a:hover { 
-  text-decoration: underline;
-}
-
-#sidebar p {
-  font-size: 1em;
-  margin-bottom: 1em;
-}
-
-.highlight { 
-  background-color: #ffffff;
-}
-
-.sponsor {
-  float: left;
-  padding-top: 20px;
-  padding-left: 18px;
-}
-
-.moveright30{
-  padding-left: 30px;
-}
-
-.moveright{
-  padding-left: 40px;
-}
-
-.moveright50{
-  padding-left: 50px;
-}
-
-/*
-a.oraclelogo {
-  position: absolute;
-  background: transparent url(../images/Oracle-logo.png) 0 0 no-repeat;
-  background-position: 2px -2px; 
-  background-size: 100% ;
-  width: 96px;
-  height: 62px;
-  padding-top: 2px;
-  padding-right: 20px;
-}
-*/
-
-aside#sidebar {
-  padding-top: 40px;
-  line-height: 1.2;
-}
-
-hr {
-  border:none;
-  height: 10px;
-  width: 75%;
-  height: 50px;
-  margin-top: 0;
-  border-bottom: 1px solid #cccccc;
-  box-shadow: 0 20px 20px -20px #aaa;
-  margin: -48px auto 10px; 
-}
-
-table {
-   margin-bottom: 20px;
-}
-
-th, td {
-  padding: .2em;
-}
-
-td {
-  font-weight: 400;
-}
-
-ul {
-  font-size: 1em;
-  margin-left: 12px;
-}
-
-ol {
-    list-style-position: inside;
-    list-style: decimal;
-    margin-left: 26px;
-}
-
-blockquote {
-    padding: 0 0 0 10px;
-    margin-left: 14px;
-    margin-bottom: 2px;
-    font-size: 1em;
-    border-left: 4px solid #ddd;
-}
-
-#main-content h1 {
-  padding-top: .6em;
-  font-family: 'Mukta Vaani', 'Open Sans', 'Helvetica Neue', Helvetica, Arial, serif;
-  font-size: 1.6em;
-  font-weight: 500;
-  color : #666;
-  text-indent: 16px;
-  letter-spacing: 0px;
-  border-bottom:1px solid #cccccc;
-  padding-bottom:1px;
-  line-height: 1.2;
-  //margin: .6em 0;
-  margin-bottom: .6em;
-}
-
-#main-content h1:before {
-  //padding-right: 0.3em;
-  margin-left: -1em;
-  content: "";
-}
-
-#main-content h2 {
-  margin-bottom: 8px;
-  font-family: 'Mukta Vaani', 'Open Sans', 'Helvetica Neue', Helvetica, Arial, serif;
-  font-size: 1.4em;
-  font-weight: 400;
-  //color: #474747;
-  color: #3c657b; // blue
-  text-indent: 4px;
-}
-
-#main-content h2:before {
-  padding-right: 1.3em;
-  margin-left: -1.5em;
-  content: "";
-  font-weight: 700;
-}
-
-#main-content h3 {
-  text-indent: 24px;
-  margin-bottom: 8px;
-  font-family: 'Mukta Vaani', 'Open Sans', 'Helvetica Neue', Helvetica, Arial, serif;
-  font-size: 1.2em;
-  font-weight: 500;
-  color: #3c657b;
-  text-indent: 4px;
-}
-
-#main-content h3:before {
-  content: "";
-  margin-left: -0.3em;
-  padding-right: 0.1em;
-}
-
-#main-content h4 {
-  margin-bottom: 8px;
-  font-family: 'Mukta Vaani', 'Open Sans', 'Helvetica Neue', Helvetica, Arial, serif;
-  font-size: 1.2em;
-  font-weight: 500;
-  color: #3c657b;
-  text-indent: 4px;
-}
-
-#main-content h4:before {
-  content: "";
-  margin-left: -0.3em;
-  padding-right: 0.1em;
-}
-
-#main-content p {
-  font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, serif;
-  font-weight: normal;
-  font-size: 1em;
-  margin-bottom: 2px;
-}
-
-.footer {
-  position: fixed; 
-  bottom: 0;
-  left: 0;
-  right: 0;
-  height: 6px;
-  background-color: #f0f0f0;
-  //padding: 1rem;
-  padding-top: 4px;
-  padding-bottom: 14px;
-  font-size: 0.8em;
-  text-align: center;
-}
-
-.oracle {
-  color: #666;
-  font-weight: 400;
-}
-
-.oracle:hover { 
-  text-decoration: none;
-  color: #FF0000;
-}
-
-.fullpage {
-  //float: center;
-  color: FF0000;
-  width: 900px;
-}
\ No newline at end of file
diff --git a/docs/glassfish/upgrade-guide/src/main/jbake/assets/assets/images/header-bkg.jpg b/docs/glassfish/upgrade-guide/src/main/jbake/assets/assets/images/header-bkg.jpg
deleted file mode 100644
index 481faa5..0000000
--- a/docs/glassfish/upgrade-guide/src/main/jbake/assets/assets/images/header-bkg.jpg
+++ /dev/null
Binary files differ
diff --git a/docs/glassfish/upgrade-guide/src/main/jbake/content/title.adoc b/docs/glassfish/upgrade-guide/src/main/jbake/content/title.adoc
index 5c6abe0..9a8c1b7 100644
--- a/docs/glassfish/upgrade-guide/src/main/jbake/content/title.adoc
+++ b/docs/glassfish/upgrade-guide/src/main/jbake/content/title.adoc
@@ -7,7 +7,7 @@
 Eclipse GlassFish Server Upgrade Guide, Release 5.1
 ===================================================
 
-[[glassfish-server-open-source-edition]]
+[[eclipse-glassfish-server]]
 Eclipse GlassFish Server
 ------------------------
 
@@ -56,4 +56,4 @@
 trademarks or registered trademarks of SPARC International, Inc. AMD, 
 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. 
\ No newline at end of file
+trademark of The Open Group. 
diff --git a/docs/glassfish/upgrade-guide/src/main/jbake/templates/footer.ftl b/docs/glassfish/upgrade-guide/src/main/jbake/templates/footer.ftl
index 46ecc29..b734c7b 100644
--- a/docs/glassfish/upgrade-guide/src/main/jbake/templates/footer.ftl
+++ b/docs/glassfish/upgrade-guide/src/main/jbake/templates/footer.ftl
@@ -36,7 +36,7 @@
 </table>
 
 <span id="copyright">
-        <img src="img/eclipse_foundation_logo_tiny.png" height="20px" alt="Eclipse Foundation Logo" align="top"/>&nbsp;            
+        <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>
 </body>
diff --git a/docs/glassfish/website/pom.xml b/docs/glassfish/website/pom.xml
new file mode 100644
index 0000000..e74075c
--- /dev/null
+++ b/docs/glassfish/website/pom.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 
+    Copyright (c) 2017, 2019 Oracle and/or its affiliates. All rights reserved.
+ 
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+ 
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+ 
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+ 
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.glassfish.docs</groupId>
+        <artifactId>docs</artifactId>
+        <version>5.1.1-SNAPSHOT</version>
+    </parent>
+    <groupId>org.glassfish.docs</groupId>
+    <artifactId>website</artifactId>
+    <packaging>jar</packaging>
+    <name>Eclipse GlassFish website content</name>
+
+    <properties>
+        <maven.site.skip>true</maven.site.skip>
+        <maven.deploy.skip>true</maven.deploy.skip>
+    </properties>
+
+    <!--
+        This project doesn't inherit from ../parent because it doesn't
+        need jbake, and so the jar plugin needs to be configured here...
+    -->
+    <build>
+        <defaultGoal>package</defaultGoal>
+        <plugins>
+	    <plugin>
+		<artifactId>maven-jar-plugin</artifactId>
+		<configuration>
+		    <finalName>${project.artifactId}</finalName>
+		</configuration>
+	    </plugin>
+	</plugins>
+    </build>
+</project>
diff --git a/docs/glassfish/website/src/main/resources/CONTRIBUTING.md b/docs/glassfish/website/src/main/resources/CONTRIBUTING.md
new file mode 100644
index 0000000..09c9aaf
--- /dev/null
+++ b/docs/glassfish/website/src/main/resources/CONTRIBUTING.md
@@ -0,0 +1,70 @@
+# Contributing to Eclipse GlassFish
+
+Thanks for your interest in this project.
+
+## Project description
+
+Eclipse GlassFish is a complete application server that implements the Jakarta
+EE specification. GlassFish includes implementations of all required and
+optional Jakarta EE APIs, and passes all Jakarta EE TCKs. GlassFish also
+includes a complete administration console, clustering support, and other
+developer and production focused tools and features.
+
+* [https://projects.eclipse.org/projects/ee4j.glassfish](https://projects.eclipse.org/projects/ee4j.glassfish)
+
+## Developer resources
+
+Information regarding source code management, builds, coding standards, and
+more.
+
+* [https://projects.eclipse.org/projects/ee4j.glassfish/developer](https://projects.eclipse.org/projects/ee4j.glassfish/developer)
+
+The project maintains the following source code repositories
+
+* [https://github.com/eclipse-ee4j/glassfish](https://github.com/eclipse-ee4j/glassfish)
+* [https://github.com/eclipse-ee4j/glassfish-ha-api](https://github.com/eclipse-ee4j/glassfish-ha-api)
+* [https://github.com/eclipse-ee4j/glassfish-logging-annotation-processor](https://github.com/eclipse-ee4j/glassfish-logging-annotation-processor)
+* [https://github.com/eclipse-ee4j/glassfish-shoal](https://github.com/eclipse-ee4j/glassfish-shoal)
+* [https://github.com/eclipse-ee4j/glassfish-cdi-porting-tck](https://github.com/eclipse-ee4j/glassfish-cdi-porting-tck)
+* [https://github.com/eclipse-ee4j/glassfish-jsftemplating](https://github.com/eclipse-ee4j/glassfish-jsftemplating)
+* [https://github.com/eclipse-ee4j/glassfish-hk2-extra](https://github.com/eclipse-ee4j/glassfish-hk2-extra)
+* [https://github.com/eclipse-ee4j/glassfish-hk2](https://github.com/eclipse-ee4j/glassfish-hk2)
+* [https://github.com/eclipse-ee4j/glassfish-fighterfish](https://github.com/eclipse-ee4j/glassfish-fighterfish)
+* [https://github.com/eclipse-ee4j/glassfish-maven-embedded-plugin](https://github.com/eclipse-ee4j/glassfish-maven-embedded-plugin)
+* [https://github.com/eclipse-ee4j/bvtck-porting](https://github.com/eclipse-ee4j/bvtck-porting)
+* [https://github.com/eclipse-ee4j/ditck-porting](https://github.com/eclipse-ee4j/ditck-porting)
+* [https://github.com/eclipse-ee4j/cditck-porting](https://github.com/eclipse-ee4j/cditck-porting)
+* [https://github.com/eclipse-ee4j/glassfish-woodstock](https://github.com/eclipse-ee4j/glassfish-woodstock)
+* [https://github.com/eclipse-ee4j/glassfish-spec-version-maven-plugin](https://github.com/eclipse-ee4j/glassfish-spec-version-maven-plugin)
+* [https://github.com/eclipse-ee4j/glassfish-build-maven-plugin](https://github.com/eclipse-ee4j/glassfish-build-maven-plugin)
+* [https://github.com/eclipse-ee4j/glassfish-repackaged](https://github.com/eclipse-ee4j/glassfish-repackaged)
+* [https://github.com/eclipse-ee4j/glassfish-copyright-plugin](https://github.com/eclipse-ee4j/glassfish-copyright-plugin)
+* [https://github.com/eclipse-ee4j/glassfish-doc-plugin](https://github.com/eclipse-ee4j/glassfish-doc-plugin)
+* [https://github.com/eclipse-ee4j/glassfish-security-plugin](https://github.com/eclipse-ee4j/glassfish-security-plugin)
+* [https://github.com/eclipse-ee4j/jakartaee-schemas](https://github.com/eclipse-ee4j/jakartaee-schemas)
+* [https://github.com/eclipse-ee4j/glassfish-firstcup-examples](https://github.com/eclipse-ee4j/glassfish-firstcup-examples)
+* [https://github.com/eclipse-ee4j/glassfish-tutorial-examples](https://github.com/eclipse-ee4j/glassfish-tutorial-examples)
+* [https://github.com/eclipse-ee4j/glassfish-firstcup](https://github.com/eclipse-ee4j/glassfish-firstcup)
+* [https://github.com/eclipse-ee4j/glassfish-tutorial](https://github.com/eclipse-ee4j/glassfish-tutorial)
+
+## Eclipse Contributor Agreement
+
+Before your contribution can be accepted by the project team contributors must
+electronically sign the Eclipse Contributor Agreement (ECA).
+
+* [http://www.eclipse.org/legal/ECA.php](http://www.eclipse.org/legal/ECA.php)
+
+Commits that are provided by non-committers must have a Signed-off-by field in
+the footer indicating that the author is aware of the terms by which the
+contribution has been provided to the project. The non-committer must
+additionally have an Eclipse Foundation account and must have a signed Eclipse
+Contributor Agreement (ECA) on file.
+
+For more information, please see the Eclipse Committer Handbook:
+[https://www.eclipse.org/projects/handbook/#resources-commit](https://www.eclipse.org/projects/handbook/#resources-commit)
+
+## Contact
+
+Contact the project developers via the project's "dev" list.
+
+* [https://accounts.eclipse.org/mailing-list/glassfish-dev](https://accounts.eclipse.org/mailing-list/glassfish-dev)
diff --git a/docs/glassfish/website/src/main/resources/LICENSE.md b/docs/glassfish/website/src/main/resources/LICENSE.md
new file mode 100644
index 0000000..5de3d1b
--- /dev/null
+++ b/docs/glassfish/website/src/main/resources/LICENSE.md
@@ -0,0 +1,637 @@
+# Eclipse Public License - v 2.0
+
+        THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE
+        PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION
+        OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
+
+    1. DEFINITIONS
+
+    "Contribution" means:
+
+      a) in the case of the initial Contributor, the initial content
+         Distributed under this Agreement, and
+
+      b) in the case of each subsequent Contributor: 
+         i) changes to the Program, and 
+         ii) additions to the Program;
+      where such changes and/or additions to the Program originate from
+      and are Distributed by that particular Contributor. A Contribution
+      "originates" from a Contributor if it was added to the Program by
+      such Contributor itself or anyone acting on such Contributor's behalf.
+      Contributions do not include changes or additions to the Program that
+      are not Modified Works.
+
+    "Contributor" means any person or entity that Distributes the Program.
+
+    "Licensed Patents" mean patent claims licensable by a Contributor which
+    are necessarily infringed by the use or sale of its Contribution alone
+    or when combined with the Program.
+
+    "Program" means the Contributions Distributed in accordance with this
+    Agreement.
+
+    "Recipient" means anyone who receives the Program under this Agreement
+    or any Secondary License (as applicable), including Contributors.
+
+    "Derivative Works" shall mean any work, whether in Source Code or other
+    form, that is based on (or derived from) the Program and for which the
+    editorial revisions, annotations, elaborations, or other modifications
+    represent, as a whole, an original work of authorship.
+
+    "Modified Works" shall mean any work in Source Code or other form that
+    results from an addition to, deletion from, or modification of the
+    contents of the Program, including, for purposes of clarity any new file
+    in Source Code form that contains any contents of the Program. Modified
+    Works shall not include works that contain only declarations,
+    interfaces, types, classes, structures, or files of the Program solely
+    in each case in order to link to, bind by name, or subclass the Program
+    or Modified Works thereof.
+
+    "Distribute" means the acts of a) distributing or b) making available
+    in any manner that enables the transfer of a copy.
+
+    "Source Code" means the form of a Program preferred for making
+    modifications, including but not limited to software source code,
+    documentation source, and configuration files.
+
+    "Secondary License" means either the GNU General Public License,
+    Version 2.0, or any later versions of that license, including any
+    exceptions or additional permissions as identified by the initial
+    Contributor.
+
+    2. GRANT OF RIGHTS
+
+      a) Subject to the terms of this Agreement, each Contributor hereby
+      grants Recipient a non-exclusive, worldwide, royalty-free copyright
+      license to reproduce, prepare Derivative Works of, publicly display,
+      publicly perform, Distribute and sublicense the Contribution of such
+      Contributor, if any, and such Derivative Works.
+
+      b) Subject to the terms of this Agreement, each Contributor hereby
+      grants Recipient a non-exclusive, worldwide, royalty-free patent
+      license under Licensed Patents to make, use, sell, offer to sell,
+      import and otherwise transfer the Contribution of such Contributor,
+      if any, in Source Code or other form. This patent license shall
+      apply to the combination of the Contribution and the Program if, at
+      the time the Contribution is added by the Contributor, such addition
+      of the Contribution causes such combination to be covered by the
+      Licensed Patents. The patent license shall not apply to any other
+      combinations which include the Contribution. No hardware per se is
+      licensed hereunder.
+
+      c) Recipient understands that although each Contributor grants the
+      licenses to its Contributions set forth herein, no assurances are
+      provided by any Contributor that the Program does not infringe the
+      patent or other intellectual property rights of any other entity.
+      Each Contributor disclaims any liability to Recipient for claims
+      brought by any other entity based on infringement of intellectual
+      property rights or otherwise. As a condition to exercising the
+      rights and licenses granted hereunder, each Recipient hereby
+      assumes sole responsibility to secure any other intellectual
+      property rights needed, if any. For example, if a third party
+      patent license is required to allow Recipient to Distribute the
+      Program, it is Recipient's responsibility to acquire that license
+      before distributing the Program.
+
+      d) Each Contributor represents that to its knowledge it has
+      sufficient copyright rights in its Contribution, if any, to grant
+      the copyright license set forth in this Agreement.
+
+      e) Notwithstanding the terms of any Secondary License, no
+      Contributor makes additional grants to any Recipient (other than
+      those set forth in this Agreement) as a result of such Recipient's
+      receipt of the Program under the terms of a Secondary License
+      (if permitted under the terms of Section 3).
+
+    3. REQUIREMENTS
+
+    3.1 If a Contributor Distributes the Program in any form, then:
+
+      a) the Program must also be made available as Source Code, in
+      accordance with section 3.2, and the Contributor must accompany
+      the Program with a statement that the Source Code for the Program
+      is available under this Agreement, and informs Recipients how to
+      obtain it in a reasonable manner on or through a medium customarily
+      used for software exchange; and
+
+      b) the Contributor may Distribute the Program under a license
+      different than this Agreement, provided that such license:
+         i) effectively disclaims on behalf of all other Contributors all
+         warranties and conditions, express and implied, including
+         warranties or conditions of title and non-infringement, and
+         implied warranties or conditions of merchantability and fitness
+         for a particular purpose;
+
+         ii) effectively excludes on behalf of all other Contributors all
+         liability for damages, including direct, indirect, special,
+         incidental and consequential damages, such as lost profits;
+
+         iii) does not attempt to limit or alter the recipients' rights
+         in the Source Code under section 3.2; and
+
+         iv) requires any subsequent distribution of the Program by any
+         party to be under a license that satisfies the requirements
+         of this section 3.
+
+    3.2 When the Program is Distributed as Source Code:
+
+      a) it must be made available under this Agreement, or if the
+      Program (i) is combined with other material in a separate file or
+      files made available under a Secondary License, and (ii) the initial
+      Contributor attached to the Source Code the notice described in
+      Exhibit A of this Agreement, then the Program may be made available
+      under the terms of such Secondary Licenses, and
+
+      b) a copy of this Agreement must be included with each copy of
+      the Program.
+
+    3.3 Contributors may not remove or alter any copyright, patent,
+    trademark, attribution notices, disclaimers of warranty, or limitations
+    of liability ("notices") contained within the Program from any copy of
+    the Program which they Distribute, provided that Contributors may add
+    their own appropriate notices.
+
+    4. COMMERCIAL DISTRIBUTION
+
+    Commercial distributors of software may accept certain responsibilities
+    with respect to end users, business partners and the like. While this
+    license is intended to facilitate the commercial use of the Program,
+    the Contributor who includes the Program in a commercial product
+    offering should do so in a manner which does not create potential
+    liability for other Contributors. Therefore, if a Contributor includes
+    the Program in a commercial product offering, such Contributor
+    ("Commercial Contributor") hereby agrees to defend and indemnify every
+    other Contributor ("Indemnified Contributor") against any losses,
+    damages and costs (collectively "Losses") arising from claims, lawsuits
+    and other legal actions brought by a third party against the Indemnified
+    Contributor to the extent caused by the acts or omissions of such
+    Commercial Contributor in connection with its distribution of the Program
+    in a commercial product offering. The obligations in this section do not
+    apply to any claims or Losses relating to any actual or alleged
+    intellectual property infringement. In order to qualify, an Indemnified
+    Contributor must: a) promptly notify the Commercial Contributor in
+    writing of such claim, and b) allow the Commercial Contributor to control,
+    and cooperate with the Commercial Contributor in, the defense and any
+    related settlement negotiations. The Indemnified Contributor may
+    participate in any such claim at its own expense.
+
+    For example, a Contributor might include the Program in a commercial
+    product offering, Product X. That Contributor is then a Commercial
+    Contributor. If that Commercial Contributor then makes performance
+    claims, or offers warranties related to Product X, those performance
+    claims and warranties are such Commercial Contributor's responsibility
+    alone. Under this section, the Commercial Contributor would have to
+    defend claims against the other Contributors related to those performance
+    claims and warranties, and if a court requires any other Contributor to
+    pay any damages as a result, the Commercial Contributor must pay
+    those damages.
+
+    5. NO WARRANTY
+
+    EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT
+    PERMITTED BY APPLICABLE LAW, THE PROGRAM IS PROVIDED ON AN "AS IS"
+    BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR
+    IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF
+    TITLE, NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR
+    PURPOSE. Each Recipient is solely responsible for determining the
+    appropriateness of using and distributing the Program and assumes all
+    risks associated with its exercise of rights under this Agreement,
+    including but not limited to the risks and costs of program errors,
+    compliance with applicable laws, damage to or loss of data, programs
+    or equipment, and unavailability or interruption of operations.
+
+    6. DISCLAIMER OF LIABILITY
+
+    EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT
+    PERMITTED BY APPLICABLE LAW, NEITHER RECIPIENT NOR ANY CONTRIBUTORS
+    SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+    EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST
+    PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+    CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+    ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE
+    EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF THE
+    POSSIBILITY OF SUCH DAMAGES.
+
+    7. GENERAL
+
+    If any provision of this Agreement is invalid or unenforceable under
+    applicable law, it shall not affect the validity or enforceability of
+    the remainder of the terms of this Agreement, and without further
+    action by the parties hereto, such provision shall be reformed to the
+    minimum extent necessary to make such provision valid and enforceable.
+
+    If Recipient institutes patent litigation against any entity
+    (including a cross-claim or counterclaim in a lawsuit) alleging that the
+    Program itself (excluding combinations of the Program with other software
+    or hardware) infringes such Recipient's patent(s), then such Recipient's
+    rights granted under Section 2(b) shall terminate as of the date such
+    litigation is filed.
+
+    All Recipient's rights under this Agreement shall terminate if it
+    fails to comply with any of the material terms or conditions of this
+    Agreement and does not cure such failure in a reasonable period of
+    time after becoming aware of such noncompliance. If all Recipient's
+    rights under this Agreement terminate, Recipient agrees to cease use
+    and distribution of the Program as soon as reasonably practicable.
+    However, Recipient's obligations under this Agreement and any licenses
+    granted by Recipient relating to the Program shall continue and survive.
+
+    Everyone is permitted to copy and distribute copies of this Agreement,
+    but in order to avoid inconsistency the Agreement is copyrighted and
+    may only be modified in the following manner. The Agreement Steward
+    reserves the right to publish new versions (including revisions) of
+    this Agreement from time to time. No one other than the Agreement
+    Steward has the right to modify this Agreement. The Eclipse Foundation
+    is the initial Agreement Steward. The Eclipse Foundation may assign the
+    responsibility to serve as the Agreement Steward to a suitable separate
+    entity. Each new version of the Agreement will be given a distinguishing
+    version number. The Program (including Contributions) may always be
+    Distributed subject to the version of the Agreement under which it was
+    received. In addition, after a new version of the Agreement is published,
+    Contributor may elect to Distribute the Program (including its
+    Contributions) under the new version.
+
+    Except as expressly stated in Sections 2(a) and 2(b) above, Recipient
+    receives no rights or licenses to the intellectual property of any
+    Contributor under this Agreement, whether expressly, by implication,
+    estoppel or otherwise. All rights in the Program not expressly granted
+    under this Agreement are reserved. Nothing in this Agreement is intended
+    to be enforceable by any entity that is not a Contributor or Recipient.
+    No third-party beneficiary rights are created under this Agreement.
+
+    Exhibit A - Form of Secondary Licenses Notice
+
+    "This Source Code may also be made available under the following 
+    Secondary Licenses when the conditions for such availability set forth 
+    in the Eclipse Public License, v. 2.0 are satisfied: {name license(s),
+    version(s), and exceptions or additional permissions here}."
+
+      Simply including a copy of this Agreement, including this Exhibit A
+      is not sufficient to license the Source Code under Secondary Licenses.
+
+      If it is not possible or desirable to put the notice in a particular
+      file, then You may include the notice in a location (such as a LICENSE
+      file in a relevant directory) where a recipient would be likely to
+      look for such a notice.
+
+      You may add additional accurate notices of copyright ownership.
+
+---
+
+##    The GNU General Public License (GPL) Version 2, June 1991
+
+    Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+    51 Franklin Street, Fifth Floor
+    Boston, MA 02110-1335
+    USA
+
+    Everyone is permitted to copy and distribute verbatim copies
+    of this license document, but changing it is not allowed.
+
+    Preamble
+
+    The licenses for most software are designed to take away your freedom to
+    share and change it. By contrast, the GNU General Public License is
+    intended to guarantee your freedom to share and change free software--to
+    make sure the software is free for all its users. This General Public
+    License applies to most of the Free Software Foundation's software and
+    to any other program whose authors commit to using it. (Some other Free
+    Software Foundation software is covered by the GNU Library General
+    Public License instead.) You can apply it to your programs, too.
+
+    When we speak of free software, we are referring to freedom, not price.
+    Our General Public Licenses are designed to make sure that you have the
+    freedom to distribute copies of free software (and charge for this
+    service if you wish), that you receive source code or can get it if you
+    want it, that you can change the software or use pieces of it in new
+    free programs; and that you know you can do these things.
+
+    To protect your rights, we need to make restrictions that forbid anyone
+    to deny you these rights or to ask you to surrender the rights. These
+    restrictions translate to certain responsibilities for you if you
+    distribute copies of the software, or if you modify it.
+
+    For example, if you distribute copies of such a program, whether gratis
+    or for a fee, you must give the recipients all the rights that you have.
+    You must make sure that they, too, receive or can get the source code.
+    And you must show them these terms so they know their rights.
+
+    We protect your rights with two steps: (1) copyright the software, and
+    (2) offer you this license which gives you legal permission to copy,
+    distribute and/or modify the software.
+
+    Also, for each author's protection and ours, we want to make certain
+    that everyone understands that there is no warranty for this free
+    software. If the software is modified by someone else and passed on, we
+    want its recipients to know that what they have is not the original, so
+    that any problems introduced by others will not reflect on the original
+    authors' reputations.
+
+    Finally, any free program is threatened constantly by software patents.
+    We wish to avoid the danger that redistributors of a free program will
+    individually obtain patent licenses, in effect making the program
+    proprietary. To prevent this, we have made it clear that any patent must
+    be licensed for everyone's free use or not licensed at all.
+
+    The precise terms and conditions for copying, distribution and
+    modification follow.
+
+    TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+    0. This License applies to any program or other work which contains a
+    notice placed by the copyright holder saying it may be distributed under
+    the terms of this General Public License. The "Program", below, refers
+    to any such program or work, and a "work based on the Program" means
+    either the Program or any derivative work under copyright law: that is
+    to say, a work containing the Program or a portion of it, either
+    verbatim or with modifications and/or translated into another language.
+    (Hereinafter, translation is included without limitation in the term
+    "modification".) Each licensee is addressed as "you".
+
+    Activities other than copying, distribution and modification are not
+    covered by this License; they are outside its scope. The act of running
+    the Program is not restricted, and the output from the Program is
+    covered only if its contents constitute a work based on the Program
+    (independent of having been made by running the Program). Whether that
+    is true depends on what the Program does.
+
+    1. You may copy and distribute verbatim copies of the Program's source
+    code as you receive it, in any medium, provided that you conspicuously
+    and appropriately publish on each copy an appropriate copyright notice
+    and disclaimer of warranty; keep intact all the notices that refer to
+    this License and to the absence of any warranty; and give any other
+    recipients of the Program a copy of this License along with the Program.
+
+    You may charge a fee for the physical act of transferring a copy, and
+    you may at your option offer warranty protection in exchange for a fee.
+
+    2. You may modify your copy or copies of the Program or any portion of
+    it, thus forming a work based on the Program, and copy and distribute
+    such modifications or work under the terms of Section 1 above, provided
+    that you also meet all of these conditions:
+
+        a) You must cause the modified files to carry prominent notices
+        stating that you changed the files and the date of any change.
+
+        b) You must cause any work that you distribute or publish, that in
+        whole or in part contains or is derived from the Program or any part
+        thereof, to be licensed as a whole at no charge to all third parties
+        under the terms of this License.
+
+        c) If the modified program normally reads commands interactively
+        when run, you must cause it, when started running for such
+        interactive use in the most ordinary way, to print or display an
+        announcement including an appropriate copyright notice and a notice
+        that there is no warranty (or else, saying that you provide a
+        warranty) and that users may redistribute the program under these
+        conditions, and telling the user how to view a copy of this License.
+        (Exception: if the Program itself is interactive but does not
+        normally print such an announcement, your work based on the Program
+        is not required to print an announcement.)
+
+    These requirements apply to the modified work as a whole. If
+    identifiable sections of that work are not derived from the Program, and
+    can be reasonably considered independent and separate works in
+    themselves, then this License, and its terms, do not apply to those
+    sections when you distribute them as separate works. But when you
+    distribute the same sections as part of a whole which is a work based on
+    the Program, the distribution of the whole must be on the terms of this
+    License, whose permissions for other licensees extend to the entire
+    whole, and thus to each and every part regardless of who wrote it.
+
+    Thus, it is not the intent of this section to claim rights or contest
+    your rights to work written entirely by you; rather, the intent is to
+    exercise the right to control the distribution of derivative or
+    collective works based on the Program.
+
+    In addition, mere aggregation of another work not based on the Program
+    with the Program (or with a work based on the Program) on a volume of a
+    storage or distribution medium does not bring the other work under the
+    scope of this License.
+
+    3. You may copy and distribute the Program (or a work based on it,
+    under Section 2) in object code or executable form under the terms of
+    Sections 1 and 2 above provided that you also do one of the following:
+
+        a) Accompany it with the complete corresponding machine-readable
+        source code, which must be distributed under the terms of Sections 1
+        and 2 above on a medium customarily used for software interchange; or,
+
+        b) Accompany it with a written offer, valid for at least three
+        years, to give any third party, for a charge no more than your cost
+        of physically performing source distribution, a complete
+        machine-readable copy of the corresponding source code, to be
+        distributed under the terms of Sections 1 and 2 above on a medium
+        customarily used for software interchange; or,
+
+        c) Accompany it with the information you received as to the offer to
+        distribute corresponding source code. (This alternative is allowed
+        only for noncommercial distribution and only if you received the
+        program in object code or executable form with such an offer, in
+        accord with Subsection b above.)
+
+    The source code for a work means the preferred form of the work for
+    making modifications to it. For an executable work, complete source code
+    means all the source code for all modules it contains, plus any
+    associated interface definition files, plus the scripts used to control
+    compilation and installation of the executable. However, as a special
+    exception, the source code distributed need not include anything that is
+    normally distributed (in either source or binary form) with the major
+    components (compiler, kernel, and so on) of the operating system on
+    which the executable runs, unless that component itself accompanies the
+    executable.
+
+    If distribution of executable or object code is made by offering access
+    to copy from a designated place, then offering equivalent access to copy
+    the source code from the same place counts as distribution of the source
+    code, even though third parties are not compelled to copy the source
+    along with the object code.
+
+    4. You may not copy, modify, sublicense, or distribute the Program
+    except as expressly provided under this License. Any attempt otherwise
+    to copy, modify, sublicense or distribute the Program is void, and will
+    automatically terminate your rights under this License. However, parties
+    who have received copies, or rights, from you under this License will
+    not have their licenses terminated so long as such parties remain in
+    full compliance.
+
+    5. You are not required to accept this License, since you have not
+    signed it. However, nothing else grants you permission to modify or
+    distribute the Program or its derivative works. These actions are
+    prohibited by law if you do not accept this License. Therefore, by
+    modifying or distributing the Program (or any work based on the
+    Program), you indicate your acceptance of this License to do so, and all
+    its terms and conditions for copying, distributing or modifying the
+    Program or works based on it.
+
+    6. Each time you redistribute the Program (or any work based on the
+    Program), the recipient automatically receives a license from the
+    original licensor to copy, distribute or modify the Program subject to
+    these terms and conditions. You may not impose any further restrictions
+    on the recipients' exercise of the rights granted herein. You are not
+    responsible for enforcing compliance by third parties to this License.
+
+    7. If, as a consequence of a court judgment or allegation of patent
+    infringement or for any other reason (not limited to patent issues),
+    conditions are imposed on you (whether by court order, agreement or
+    otherwise) that contradict the conditions of this License, they do not
+    excuse you from the conditions of this License. If you cannot distribute
+    so as to satisfy simultaneously your obligations under this License and
+    any other pertinent obligations, then as a consequence you may not
+    distribute the Program at all. For example, if a patent license would
+    not permit royalty-free redistribution of the Program by all those who
+    receive copies directly or indirectly through you, then the only way you
+    could satisfy both it and this License would be to refrain entirely from
+    distribution of the Program.
+
+    If any portion of this section is held invalid or unenforceable under
+    any particular circumstance, the balance of the section is intended to
+    apply and the section as a whole is intended to apply in other
+    circumstances.
+
+    It is not the purpose of this section to induce you to infringe any
+    patents or other property right claims or to contest validity of any
+    such claims; this section has the sole purpose of protecting the
+    integrity of the free software distribution system, which is implemented
+    by public license practices. Many people have made generous
+    contributions to the wide range of software distributed through that
+    system in reliance on consistent application of that system; it is up to
+    the author/donor to decide if he or she is willing to distribute
+    software through any other system and a licensee cannot impose that choice.
+
+    This section is intended to make thoroughly clear what is believed to be
+    a consequence of the rest of this License.
+
+    8. If the distribution and/or use of the Program is restricted in
+    certain countries either by patents or by copyrighted interfaces, the
+    original copyright holder who places the Program under this License may
+    add an explicit geographical distribution limitation excluding those
+    countries, so that distribution is permitted only in or among countries
+    not thus excluded. In such case, this License incorporates the
+    limitation as if written in the body of this License.
+
+    9. The Free Software Foundation may publish revised and/or new
+    versions of the General Public License from time to time. Such new
+    versions will be similar in spirit to the present version, but may
+    differ in detail to address new problems or concerns.
+
+    Each version is given a distinguishing version number. If the Program
+    specifies a version number of this License which applies to it and "any
+    later version", you have the option of following the terms and
+    conditions either of that version or of any later version published by
+    the Free Software Foundation. If the Program does not specify a version
+    number of this License, you may choose any version ever published by the
+    Free Software Foundation.
+
+    10. If you wish to incorporate parts of the Program into other free
+    programs whose distribution conditions are different, write to the
+    author to ask for permission. For software which is copyrighted by the
+    Free Software Foundation, write to the Free Software Foundation; we
+    sometimes make exceptions for this. Our decision will be guided by the
+    two goals of preserving the free status of all derivatives of our free
+    software and of promoting the sharing and reuse of software generally.
+
+    NO WARRANTY
+
+    11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO
+    WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
+    EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
+    OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND,
+    EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+    WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE
+    ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH
+    YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL
+    NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+    12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
+    WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
+    AND/OR REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR
+    DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL
+    DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM
+    (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED
+    INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF
+    THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR
+    OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+
+    END OF TERMS AND CONDITIONS
+
+    How to Apply These Terms to Your New Programs
+
+    If you develop a new program, and you want it to be of the greatest
+    possible use to the public, the best way to achieve this is to make it
+    free software which everyone can redistribute and change under these terms.
+
+    To do so, attach the following notices to the program. It is safest to
+    attach them to the start of each source file to most effectively convey
+    the exclusion of warranty; and each file should have at least the
+    "copyright" line and a pointer to where the full notice is found.
+
+        One line to give the program's name and a brief idea of what it does.
+        Copyright (C) <year> <name of author>
+
+        This program is free software; you can redistribute it and/or modify
+        it under the terms of the GNU General Public License as published by
+        the Free Software Foundation; either version 2 of the License, or
+        (at your option) any later version.
+
+        This program is distributed in the hope that it will be useful, but
+        WITHOUT ANY WARRANTY; without even the implied warranty of
+        MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+        General Public License for more details.
+
+        You should have received a copy of the GNU General Public License
+        along with this program; if not, write to the Free Software
+        Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA
+
+    Also add information on how to contact you by electronic and paper mail.
+
+    If the program is interactive, make it output a short notice like this
+    when it starts in an interactive mode:
+
+        Gnomovision version 69, Copyright (C) year name of author
+        Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type
+        `show w'. This is free software, and you are welcome to redistribute
+        it under certain conditions; type `show c' for details.
+
+    The hypothetical commands `show w' and `show c' should show the
+    appropriate parts of the General Public License. Of course, the commands
+    you use may be called something other than `show w' and `show c'; they
+    could even be mouse-clicks or menu items--whatever suits your program.
+
+    You should also get your employer (if you work as a programmer) or your
+    school, if any, to sign a "copyright disclaimer" for the program, if
+    necessary. Here is a sample; alter the names:
+
+        Yoyodyne, Inc., hereby disclaims all copyright interest in the
+        program `Gnomovision' (which makes passes at compilers) written by
+        James Hacker.
+
+        signature of Ty Coon, 1 April 1989
+        Ty Coon, President of Vice
+
+    This General Public License does not permit incorporating your program
+    into proprietary programs. If your program is a subroutine library, you
+    may consider it more useful to permit linking proprietary applications
+    with the library. If this is what you want to do, use the GNU Library
+    General Public License instead of this License.
+
+---
+
+## CLASSPATH EXCEPTION
+
+    Linking this library statically or dynamically with other modules is
+    making a combined work based on this library.  Thus, the terms and
+    conditions of the GNU General Public License version 2 cover the whole
+    combination.
+
+    As a special exception, the copyright holders of this library give you
+    permission to link this library with independent modules to produce an
+    executable, regardless of the license terms of these independent
+    modules, and to copy and distribute the resulting executable under
+    terms of your choice, provided that you also meet, for each linked
+    independent module, the terms and conditions of the license of that
+    module.  An independent module is a module which is not derived from or
+    based on this library.  If you modify this library, you may extend this
+    exception to your version of the library, but you are not obligated to
+    do so.  If you do not wish to do so, delete this exception statement
+    from your version.
diff --git a/docs/glassfish/website/src/main/resources/README.md b/docs/glassfish/website/src/main/resources/README.md
new file mode 100644
index 0000000..63fddc0
--- /dev/null
+++ b/docs/glassfish/website/src/main/resources/README.md
@@ -0,0 +1,32 @@
+# Eclipse GlassFish
+
+## About
+
+Eclipse GlassFish is a Jakarta EE compatible implementation sponsored by
+the Eclipse Foundation.
+Eclipse GlassFish 5.1 is Java EE 8 Compatible.
+
+## Latest News
+
+Jan 28, 2019 -- Eclipse GlassFish 5.1 is released
+
+See the blog
+
+### Sept 28, 2017 - Introducing Eclipse Enterprise for Java
+
+See the [Jakarta EE home-page](https://jakarta.ee/).
+
+## How To Contribute
+
+The Eclipse GlassFish Project is open for contributions and your help is
+greatly appreciated.
+The easiest way to contribute to the Eclipse GlassFish documentation is by
+opening an [issue](https://github.com/eclipse-ee4j/glassfish/issues)
+that contains feedback and review comments.
+Contributions to the source code are also welcome.
+
+Please review the following links:
+
+* [Contribute](CONTRIBUTING)
+* [Pull Request Acceptance Workflow](pr_workflow)
+* [License](LICENSE)
diff --git a/docs/glassfish/website/src/main/resources/_config.yml b/docs/glassfish/website/src/main/resources/_config.yml
new file mode 100644
index 0000000..71122b0
--- /dev/null
+++ b/docs/glassfish/website/src/main/resources/_config.yml
@@ -0,0 +1,18 @@
+remote_theme: jakartaee/jekyll-theme-jakarta-ee
+
+title: [Eclipse GlassFish]
+description: [Open Source Jakarta EE Platform Implementation]
+
+# sidebar links url
+links:
+  download: download
+  source: https://github.com/eclipse-ee4j/glassfish
+  mailinglist: https://accounts.eclipse.org/mailing-list/glassfish-dev
+  #javadocs:
+  docs: documentation
+  #faq:
+  hide_issuetracker: true #set explicitly to 'true' if you don't want to have the issue tracker link displayed
+
+include:
+  - LICENSE.md
+  - CONTRIBUTING.md
diff --git a/docs/glassfish/website/src/main/resources/docs/README.md b/docs/glassfish/website/src/main/resources/docs/README.md
new file mode 100644
index 0000000..38ae6a1
--- /dev/null
+++ b/docs/glassfish/website/src/main/resources/docs/README.md
@@ -0,0 +1,59 @@
+
+# Eclipse GlassFish Documentation and User Guides
+
+## <a name="current">Current Release</a>
+
+* [Add On Component Development Guide](latest/add-on-component-development-guide/toc.html)
+* [Administration Guide](latest/administration-guide/toc.html)
+* [Application Deployment Guide](latest/application-deployment-guide/toc.html)
+* [Application Development Guide](latest/application-development-guide/toc.html)
+* [Deployment Planning Guide](latest/deployment-planning-guide/toc.html)
+* [Embedded Server Guide](latest/embedded-server-guide/toc.html)
+* [Error Messages Reference](latest/error-messages-reference/toc.html)
+* [High Availability Administration Guide](latest/ha-administration-guide/toc.html)
+* [Installation Guide](latest/installation-guide/toc.html)
+* [Performance Tuning Guide](latest/performance-tuning-guide/toc.html)
+* [Quick Start Guide](latest/quick-start-guide/toc.html)
+* [Reference Manual](latest/reference-manual/toc.html)
+* [Release Notes](latest/release-notes/toc.html)
+* [Security Guide](latest/security-guide/toc.html)
+* [Troubleshooting Guide](latest/troubleshooting-guide/toc.html)
+* [Upgrade Guide](latest/upgrade-guide/toc.html)
+
+## <a name="development">Development Version</a>
+
+* [Add On Component Development Guide](SNAPSHOT/add-on-component-development-guide/toc.html)
+* [Administration Guide](SNAPSHOT/administration-guide/toc.html)
+* [Application Deployment Guide](SNAPSHOT/application-deployment-guide/toc.html)
+* [Application Development Guide](SNAPSHOT/application-development-guide/toc.html)
+* [Deployment Planning Guide](SNAPSHOT/deployment-planning-guide/toc.html)
+* [Embedded Server Guide](SNAPSHOT/embedded-server-guide/toc.html)
+* [Error Messages Reference](SNAPSHOT/error-messages-reference/toc.html)
+* [High Availability Administration Guide](SNAPSHOT/ha-administration-guide/toc.html)
+* [Installation Guide](SNAPSHOT/installation-guide/toc.html)
+* [Performance Tuning Guide](SNAPSHOT/performance-tuning-guide/toc.html)
+* [Quick Start Guide](SNAPSHOT/quick-start-guide/toc.html)
+* [Reference Manual](SNAPSHOT/reference-manual/toc.html)
+* [Release Notes](SNAPSHOT/release-notes/toc.html)
+* [Security Guide](SNAPSHOT/security-guide/toc.html)
+* [Troubleshooting Guide](SNAPSHOT/troubleshooting-guide/toc.html)
+* [Upgrade Guide](SNAPSHOT/upgrade-guide/toc.html)
+
+## <a name="5.1.0">5.1.0 Release</a>
+
+* [Add On Component Development Guide](5.1.0/add-on-component-development-guide/toc.html)
+* [Administration Guide](5.1.0/administration-guide/toc.html)
+* [Application Deployment Guide](5.1.0/application-deployment-guide/toc.html)
+* [Application Development Guide](5.1.0/application-development-guide/toc.html)
+* [Deployment Planning Guide](5.1.0/deployment-planning-guide/toc.html)
+* [Embedded Server Guide](5.1.0/embedded-server-guide/toc.html)
+* [Error Messages Reference](5.1.0/error-messages-reference/toc.html)
+* [High Availability Administration Guide](5.1.0/ha-administration-guide/toc.html)
+* [Installation Guide](5.1.0/installation-guide/toc.html)
+* [Performance Tuning Guide](5.1.0/performance-tuning-guide/toc.html)
+* [Quick Start Guide](5.1.0/quick-start-guide/toc.html)
+* [Reference Manual](5.1.0/reference-manual/toc.html)
+* [Release Notes](5.1.0/release-notes/toc.html)
+* [Security Guide](5.1.0/security-guide/toc.html)
+* [Troubleshooting Guide](5.1.0/troubleshooting-guide/toc.html)
+* [Upgrade Guide](5.1.0/upgrade-guide/toc.html)
diff --git a/docs/glassfish/website/src/main/resources/documentation.md b/docs/glassfish/website/src/main/resources/documentation.md
new file mode 100644
index 0000000..612e8f9
--- /dev/null
+++ b/docs/glassfish/website/src/main/resources/documentation.md
@@ -0,0 +1,25 @@
+# Jakarta EE and GlassFish Documentation
+
+## Jakarta EE Tutorials
+
+* [Jakarta EE 8 First Cup](https://eclipse-ee4j.github.io/jakartaee-firstcup)
+* [Jakarta EE 8 Tutorial](https://eclipse-ee4j.github.io/jakartaee-tutorial)
+
+## Jakarta EE API Documentation and Tag Reference
+(Coming soon!)
+
+* [Jakarta EE 8 Specification APIs]()
+* [JavaServer Faces 2.3 Facelets Tag Library Documentation]()
+* [JavaServer Faces 2.3 JSP Tag Library Documentation]()
+* [JavaServer Faces 2.3 Standard HTML RenderKit Documentation]()
+* [JavaServer Faces 2.3 JavaScript Documentation]()
+
+## Eclipse GlassFish Documentation and User Guides
+
+* [Current release](docs#current)
+* [Development version](docs#development)
+* [5.1.0 release](docs#5.1.0)
+
+## Eclipse Open MQ Documentation
+
+* See the [Open MQ Project](https://eclipse-ee4j.github.io/openmq/guides)
diff --git a/docs/glassfish/website/src/main/resources/download.md b/docs/glassfish/website/src/main/resources/download.md
new file mode 100644
index 0000000..08c9cb6
--- /dev/null
+++ b/docs/glassfish/website/src/main/resources/download.md
@@ -0,0 +1,12 @@
+# Eclipse GlassFish 5.1 Downloads
+
+* [Eclipse GlassFish 5.1 - Full Platform](https://www.eclipse.org/downloads/download.php?file=/glassfish/glassfish-5.1.0.zip)
+* [Eclipse GlassFish 5.1 - Web Profile](https://www.eclipse.org/downloads/download.php?file=/glassfish/web-5.1.0.zip)
+
+## Looking for Java EE 8?
+
+Java EE has been contributed to the Eclipse Foundation.
+The Jakarta EE community is responsible for all evolution of the
+project formerly known as Java EE.
+If you are looking for details of the Java EE GlassFish project, you can
+[browse here](javaee.github.io/glassfish). 
diff --git a/docs/glassfish/website/src/main/resources/img/eclipse_foundation_logo_tiny.png b/docs/glassfish/website/src/main/resources/img/eclipse_foundation_logo_tiny.png
new file mode 100644
index 0000000..ee830ae
--- /dev/null
+++ b/docs/glassfish/website/src/main/resources/img/eclipse_foundation_logo_tiny.png
Binary files differ
diff --git a/docs/glassfish/website/src/main/resources/pr_workflow.md b/docs/glassfish/website/src/main/resources/pr_workflow.md
new file mode 100644
index 0000000..ef7fa50
--- /dev/null
+++ b/docs/glassfish/website/src/main/resources/pr_workflow.md
@@ -0,0 +1,55 @@
+# Pull Request Acceptance Workflow
+
+## One Time Setup
+* [Fork](https://help.github.com/articles/fork-a-repo/) the
+[repository](https://github.com/eclipse-ee4j/glassfish/).
+* [Clone](https://help.github.com/articles/cloning-a-repository/)
+your forked repository.
+```
+$ git clone https://github.com/YOUR-USERNAME/glassfish.git
+```
+* [Configure](https://help.github.com/articles/configuring-a-remote-for-a-fork/)
+the remote for your fork.
+```
+$ git remote add upstream https://github.com/eclipse-ee4j/glassfish.git
+$ git remote -v
+origin    https://github.com/YOUR-USERNAME/glassfish.git (fetch)
+origin    https://github.com/YOUR-USERNAME/glassfish.git (push)
+upstream    https://github.com/eclipse-ee4j/glassfish.git (fetch)
+upstream    https://github.com/eclipse-ee4j/glassfish.git (push)
+```
+## Raising a Pull Request
+* Sync the master of your fork with upstream master.
+```
+$ git fetch upstream
+$ git checkout master
+$ git merge upstream/master
+$ git push origin master # push local master to github fork.
+```
+* Create a local topic branch in your fork from your master.
+```
+$ git checkout -b issue_1234
+```
+* Do the development in your branch.
+* Commit all the changes.
+```
+$ git commit -m "my commit message"
+```
+* Push your changes in a remote branch of your fork.
+```
+$ git push origin issues_1234
+```
+* Before raising a Pull Request, please raise an
+[issue](https://github.com/eclipse-ee4j/glassfish/issues)
+if it doesn't exist. We would like every Pull Request to be associated
+with an issue. Submit the Pull Request referring to the issue number.
+* Raise a [Pull Request](https://github.com/eclipse-ee4j/glassfish/pulls).
+* Make sure you put a proper 'title' for the Pull Request. The title of
+the Pull Request would become the commit message. Instead of giving
+'title' like "Iss xxxx" or "Fixes #xxxxx", consider giving a proper one
+line 'title' for the Pull Request like "Fixes xxx : <brief description
+about the issue/fix>"
+* In the Pull Request description (body), please mention "Fixes #xxxxx"
+in order to link the Pull Request with the Issue you are fixing.
+* If you have signed the [ECA](https://www.eclipse.org/legal/ECA.php),
+one of the project team members will review your Pull Request.