website changes Signed-off-by: Andy Gumbrecht <agumbre...@tomitribe.com>
Project: http://git-wip-us.apache.org/repos/asf/tomee-site-generator/repo Commit: http://git-wip-us.apache.org/repos/asf/tomee-site-generator/commit/c7bc597d Tree: http://git-wip-us.apache.org/repos/asf/tomee-site-generator/tree/c7bc597d Diff: http://git-wip-us.apache.org/repos/asf/tomee-site-generator/diff/c7bc597d Branch: refs/heads/master Commit: c7bc597d8f97a7c44e352e083005f7f1452c89ef Parents: 4578ea0 Author: Ivan Junckes Filho <ivanjunc...@gmail.com> Authored: Wed Jul 5 09:38:57 2017 -0300 Committer: Andy Gumbrecht <agumbre...@tomitribe.com> Committed: Mon Jul 10 22:55:02 2017 +0200 ---------------------------------------------------------------------- .../java/org/apache/tomee/website/JBake.java | 12 +++++++ .../content/admin/configuration/index.adoc | 2 +- src/main/jbake/content/admin/file-layout.adoc | 2 +- src/main/jbake/content/admin/index.adoc | 9 ------ .../advanced/applicationcomposer/index.adoc | 2 +- .../jbake/content/advanced/client/index.adoc | 7 ----- .../jbake/content/advanced/client/jndi.adoc | 2 +- src/main/jbake/content/advanced/index.adoc | 11 ------- .../content/advanced/jms/jms-configuration.adoc | 4 +-- .../jbake/content/advanced/setup/index.adoc | 2 +- .../jbake/content/advanced/shading/index.adoc | 4 +-- src/main/jbake/content/community/index.adoc | 4 +-- .../content/developer/classloading/index.adoc | 2 +- .../content/developer/configuration/cxf.adoc | 4 +-- src/main/jbake/content/developer/ide/index.adoc | 4 +-- src/main/jbake/content/developer/index.adoc | 13 -------- .../jbake/content/developer/json/index.adoc | 4 +-- .../testing/applicationcomposer/index.adoc | 2 +- .../jbake/content/developer/testing/index.adoc | 2 +- .../jbake/content/developer/tools/index.adoc | 2 +- src/main/jbake/content/documentation.adoc | 26 +++++++++++++++ src/main/jbake/content/download-ng.adoc | 2 +- src/main/jbake/templates/footer.gsp | 33 ++++++++++---------- src/main/jbake/templates/index.gsp | 18 +++++------ src/main/jbake/templates/menu.gsp | 13 +++----- 25 files changed, 90 insertions(+), 96 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tomee-site-generator/blob/c7bc597d/src/main/java/org/apache/tomee/website/JBake.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/tomee/website/JBake.java b/src/main/java/org/apache/tomee/website/JBake.java index e4b288d..77702ee 100755 --- a/src/main/java/org/apache/tomee/website/JBake.java +++ b/src/main/java/org/apache/tomee/website/JBake.java @@ -3,6 +3,7 @@ package org.apache.tomee.website; import com.orientechnologies.orient.core.Orient; import lombok.RequiredArgsConstructor; import org.apache.commons.configuration.CompositeConfiguration; +import org.apache.commons.io.FileUtils; import org.apache.tomee.embedded.Configuration; import org.apache.tomee.embedded.Container; import org.jbake.app.ConfigUtil; @@ -56,6 +57,7 @@ public class JBake { PDFify.generatePdf(pdfSource, destination); } + copyFileLayoutToDirStructure(destination); System.out.println(" > done :)"); } catch (final Exception e) { e.printStackTrace(); @@ -178,4 +180,14 @@ public class JBake { onQuit.run(); } } + + private static void copyFileLayoutToDirStructure(File destination) throws IOException { + final File adminFolder = new File(destination, "admin"); + final File fileLayoutHtml = new File(adminFolder, "file-layout.html"); + final File dirStructureHtml = new File(adminFolder, "directory-structure.html"); + final File fileLayoutPdf = new File(adminFolder, "file-layout.pdf"); + final File dirStructurePdf = new File(adminFolder, "directory-structure.pdf"); + FileUtils.copyFile(fileLayoutHtml, dirStructureHtml); + FileUtils.copyFile(fileLayoutPdf, dirStructurePdf); + } } http://git-wip-us.apache.org/repos/asf/tomee-site-generator/blob/c7bc597d/src/main/jbake/content/admin/configuration/index.adoc ---------------------------------------------------------------------- diff --git a/src/main/jbake/content/admin/configuration/index.adoc b/src/main/jbake/content/admin/configuration/index.adoc index 223d780..a483971 100755 --- a/src/main/jbake/content/admin/configuration/index.adoc +++ b/src/main/jbake/content/admin/configuration/index.adoc @@ -1,4 +1,4 @@ -= Configuration += How to configure :jbake-date: 2016-03-16 :jbake-type: page :jbake-status: published http://git-wip-us.apache.org/repos/asf/tomee-site-generator/blob/c7bc597d/src/main/jbake/content/admin/file-layout.adoc ---------------------------------------------------------------------- diff --git a/src/main/jbake/content/admin/file-layout.adoc b/src/main/jbake/content/admin/file-layout.adoc index d2f2446..433fea3 100755 --- a/src/main/jbake/content/admin/file-layout.adoc +++ b/src/main/jbake/content/admin/file-layout.adoc @@ -1,4 +1,4 @@ -= TomEE File Layout += Directory Structure :jbake-date: 2016-03-16 :jbake-type: page :jbake-status: published http://git-wip-us.apache.org/repos/asf/tomee-site-generator/blob/c7bc597d/src/main/jbake/content/admin/index.adoc ---------------------------------------------------------------------- diff --git a/src/main/jbake/content/admin/index.adoc b/src/main/jbake/content/admin/index.adoc deleted file mode 100755 index 8ec3283..0000000 --- a/src/main/jbake/content/admin/index.adoc +++ /dev/null @@ -1,9 +0,0 @@ -= TomEE Administration -:jbake-date: 2016-03-16 -:jbake-type: page -:jbake-status: published -:jbake-tomeepdf: - -- link:file-layout.html[TomEE File Layout] -- link:configuration/index.html[Configuration Reference] -- link:cluster/index.html[Clustering] http://git-wip-us.apache.org/repos/asf/tomee-site-generator/blob/c7bc597d/src/main/jbake/content/advanced/applicationcomposer/index.adoc ---------------------------------------------------------------------- diff --git a/src/main/jbake/content/advanced/applicationcomposer/index.adoc b/src/main/jbake/content/advanced/applicationcomposer/index.adoc index 23e5156..50390cc 100755 --- a/src/main/jbake/content/advanced/applicationcomposer/index.adoc +++ b/src/main/jbake/content/advanced/applicationcomposer/index.adoc @@ -1,4 +1,4 @@ -= Application Composer Advanced Usage += ApplicationComposer with JBatch :jbake-date: 2016-03-16 :jbake-type: page :jbake-status: published http://git-wip-us.apache.org/repos/asf/tomee-site-generator/blob/c7bc597d/src/main/jbake/content/advanced/client/index.adoc ---------------------------------------------------------------------- diff --git a/src/main/jbake/content/advanced/client/index.adoc b/src/main/jbake/content/advanced/client/index.adoc deleted file mode 100644 index 3e78b33..0000000 --- a/src/main/jbake/content/advanced/client/index.adoc +++ /dev/null @@ -1,7 +0,0 @@ -= Advanced -:jbake-date: 2016-10-14 -:jbake-type: page -:jbake-status: published -:jbake-tomeepdf: - -- link:jndi.html[JNDI clients] http://git-wip-us.apache.org/repos/asf/tomee-site-generator/blob/c7bc597d/src/main/jbake/content/advanced/client/jndi.adoc ---------------------------------------------------------------------- diff --git a/src/main/jbake/content/advanced/client/jndi.adoc b/src/main/jbake/content/advanced/client/jndi.adoc index 7a42782..e1c5d2f 100644 --- a/src/main/jbake/content/advanced/client/jndi.adoc +++ b/src/main/jbake/content/advanced/client/jndi.adoc @@ -1,4 +1,4 @@ -= Advanced += JNDI :jbake-date: 2016-10-14 :jbake-type: page :jbake-status: published http://git-wip-us.apache.org/repos/asf/tomee-site-generator/blob/c7bc597d/src/main/jbake/content/advanced/index.adoc ---------------------------------------------------------------------- diff --git a/src/main/jbake/content/advanced/index.adoc b/src/main/jbake/content/advanced/index.adoc deleted file mode 100755 index 6b3ba64..0000000 --- a/src/main/jbake/content/advanced/index.adoc +++ /dev/null @@ -1,11 +0,0 @@ -= Advanced -:jbake-date: 2016-03-16 -:jbake-type: page -:jbake-status: published -:jbake-tomeepdf: - -- link:applicationcomposer/index.html[Use `ApplicationComposer` to write mains] -- link:setup/index.html[How to install TomEE properly] -- link:shading/index.html[Simple deployable: fat/uber jars] -- link:client/index.html[Clients (JNDI)] -- link:jms/jms-configuration.html[JMS Configuration Tips] http://git-wip-us.apache.org/repos/asf/tomee-site-generator/blob/c7bc597d/src/main/jbake/content/advanced/jms/jms-configuration.adoc ---------------------------------------------------------------------- diff --git a/src/main/jbake/content/advanced/jms/jms-configuration.adoc b/src/main/jbake/content/advanced/jms/jms-configuration.adoc index bd2fe16..5a2f027 100644 --- a/src/main/jbake/content/advanced/jms/jms-configuration.adoc +++ b/src/main/jbake/content/advanced/jms/jms-configuration.adoc @@ -4,7 +4,7 @@ :jbake-status: published :jbake-tomeepdf: -== Why my ActiveMQ/JMS MDB is not scaling as expected? +==== Why my ActiveMQ/JMS MDB is not scaling as expected? There are multiple configurations points to ensure you scale as much as you want. @@ -61,7 +61,7 @@ public static class MyMdb implements MessageListener { </Resource> ---- -== Slow consumption +==== Slow consumption If you find you have a slow consumption of messages there are several options to have a look (activemq website explains it very well) but one very impacting option can be the prefetch size. http://git-wip-us.apache.org/repos/asf/tomee-site-generator/blob/c7bc597d/src/main/jbake/content/advanced/setup/index.adoc ---------------------------------------------------------------------- diff --git a/src/main/jbake/content/advanced/setup/index.adoc b/src/main/jbake/content/advanced/setup/index.adoc index 3eeb386..4fe684d 100755 --- a/src/main/jbake/content/advanced/setup/index.adoc +++ b/src/main/jbake/content/advanced/setup/index.adoc @@ -4,7 +4,7 @@ :jbake-status: published -You can use TomEE as described on link:../../admin/file-layout.html[File Layout] page but in production it is better to +You can use TomEE as described on link:../../admin/directory-structure.html[Directory Structure] page but in production it is better to split TomEE and application binaries and configuration. Idea is to have this kind of layout (the root is the one you prefer): http://git-wip-us.apache.org/repos/asf/tomee-site-generator/blob/c7bc597d/src/main/jbake/content/advanced/shading/index.adoc ---------------------------------------------------------------------- diff --git a/src/main/jbake/content/advanced/shading/index.adoc b/src/main/jbake/content/advanced/shading/index.adoc index 22ac0c3..329bc39 100755 --- a/src/main/jbake/content/advanced/shading/index.adoc +++ b/src/main/jbake/content/advanced/shading/index.adoc @@ -1,11 +1,9 @@ -= TomEE Shading += Fat / Uber jars - Shade Plugin :jbake-date: 2016-03-16 :jbake-type: page :jbake-status: published :jbake-tomeepdf: -== Fat Jars with Maven - Shading the container and the application has some challenges like merging correctly resources (`META-INF/services/` typically). Here is a maven shade plugin configuration working for most cases: http://git-wip-us.apache.org/repos/asf/tomee-site-generator/blob/c7bc597d/src/main/jbake/content/community/index.adoc ---------------------------------------------------------------------- diff --git a/src/main/jbake/content/community/index.adoc b/src/main/jbake/content/community/index.adoc index 3ad41fe..8e31139 100755 --- a/src/main/jbake/content/community/index.adoc +++ b/src/main/jbake/content/community/index.adoc @@ -3,7 +3,7 @@ :jbake-type: page :jbake-status: published -=== In code veritas est +=== Source Code Want to grab TomEE source code and hack it? Nothing simpler, just go link:sources.html[there]. @@ -19,7 +19,7 @@ Facebook, Twitter, Google+: if that speaks to you just follow this link:social.h For more information about available support for TomEE please have a look on link:../security/support.html[Support] page. -=== Contribute the this website +=== Contribute to this website This website is a simple JBake project you can find at https://git-wip-us.apache.org/repos/asf/tomee-site-generator.git. http://git-wip-us.apache.org/repos/asf/tomee-site-generator/blob/c7bc597d/src/main/jbake/content/developer/classloading/index.adoc ---------------------------------------------------------------------- diff --git a/src/main/jbake/content/developer/classloading/index.adoc b/src/main/jbake/content/developer/classloading/index.adoc index af1fe1f..4b2cdd9 100755 --- a/src/main/jbake/content/developer/classloading/index.adoc +++ b/src/main/jbake/content/developer/classloading/index.adoc @@ -1,4 +1,4 @@ -= TomEE ClassLoading += TomEE Classloading :jbake-date: 2016-03-16 :jbake-type: page :jbake-status: published http://git-wip-us.apache.org/repos/asf/tomee-site-generator/blob/c7bc597d/src/main/jbake/content/developer/configuration/cxf.adoc ---------------------------------------------------------------------- diff --git a/src/main/jbake/content/developer/configuration/cxf.adoc b/src/main/jbake/content/developer/configuration/cxf.adoc index 6da508b..db9db80 100755 --- a/src/main/jbake/content/developer/configuration/cxf.adoc +++ b/src/main/jbake/content/developer/configuration/cxf.adoc @@ -1,10 +1,10 @@ -= TomEE and CXF Configuration += CXF Configuration - JAX-RS and JAX-WS :jbake-date: 2016-03-16 :jbake-type: page :jbake-status: published :jbake-tomeepdf: -TomEE relies on Apache CXF for JAX-WS and JAX-RS, it doesn't provides all CXF modules but most comomn +TomEE relies on Apache CXF for JAX-RS and JAX-WS, it doesn't provides all CXF modules but most common ones for both specifications (JAX-RS is part of all distributions but JAX-WS is only part of plus one). == Configuration http://git-wip-us.apache.org/repos/asf/tomee-site-generator/blob/c7bc597d/src/main/jbake/content/developer/ide/index.adoc ---------------------------------------------------------------------- diff --git a/src/main/jbake/content/developer/ide/index.adoc b/src/main/jbake/content/developer/ide/index.adoc index 2616b89..f389993 100755 --- a/src/main/jbake/content/developer/ide/index.adoc +++ b/src/main/jbake/content/developer/ide/index.adoc @@ -1,10 +1,10 @@ -= TomEE and IDE += IDEs :jbake-date: 2016-03-16 :jbake-type: page :jbake-status: published :jbake-tomeepdf: -TomEE is supported by main IDE of the marker: +TomEE is supported by the main IDEs in the market: - https://eclipse.org/downloads/[Eclipse] - https://www.jetbrains.com/idea/download/[Intellij Idea] http://git-wip-us.apache.org/repos/asf/tomee-site-generator/blob/c7bc597d/src/main/jbake/content/developer/index.adoc ---------------------------------------------------------------------- diff --git a/src/main/jbake/content/developer/index.adoc b/src/main/jbake/content/developer/index.adoc deleted file mode 100755 index 181b700..0000000 --- a/src/main/jbake/content/developer/index.adoc +++ /dev/null @@ -1,13 +0,0 @@ -= TomEE for Developers -:jbake-date: 2016-03-16 -:jbake-type: page -:jbake-status: published -:jbake-tomeepdf: - -- link:classloading/index.html[All you need to know about TomEE classloading] -- link:ide/index.html[Eclipse, Intellij Idea, Netbeans]: TomEE in and IDE -- link:testing/index.html[TomEE and Testing] -- link:tools/index.html[TomEE and Tools] -- link:json/index.html[TomEE and JSON] -- link:configuration/cxf.html[TomEE CXF Configuration] -- link:migration/tomee-1-to-7.html[Migrating from TomEE 1 to 7] http://git-wip-us.apache.org/repos/asf/tomee-site-generator/blob/c7bc597d/src/main/jbake/content/developer/json/index.adoc ---------------------------------------------------------------------- diff --git a/src/main/jbake/content/developer/json/index.adoc b/src/main/jbake/content/developer/json/index.adoc index ba39fb4..d71fb5b 100755 --- a/src/main/jbake/content/developer/json/index.adoc +++ b/src/main/jbake/content/developer/json/index.adoc @@ -1,4 +1,4 @@ -= TomEE and JSON += TomEE 7 and Apache Johnzon :jbake-date: 2016-03-16 :jbake-type: page :jbake-status: published @@ -8,7 +8,7 @@ Since TomEE 7.0, TomEE comes with Apache Johnzon. It means you can use JSON-P out of the box but also Johnzon Mapper which is the default JAX-RS provider for JSON. -IMPORTANT: this is a breaking change with 1.x which was using jettison. +*IMPORTANT* - this is a breaking change with 1.x which was using jettison. This last one was relying on JAXB model to generate JSON which often led to unexpected JSON tree and some unexpected escaping too. http://git-wip-us.apache.org/repos/asf/tomee-site-generator/blob/c7bc597d/src/main/jbake/content/developer/testing/applicationcomposer/index.adoc ---------------------------------------------------------------------- diff --git a/src/main/jbake/content/developer/testing/applicationcomposer/index.adoc b/src/main/jbake/content/developer/testing/applicationcomposer/index.adoc index 64b5e48..d5bf455 100755 --- a/src/main/jbake/content/developer/testing/applicationcomposer/index.adoc +++ b/src/main/jbake/content/developer/testing/applicationcomposer/index.adoc @@ -1,4 +1,4 @@ -= ApplicationComposer: The TomEE Swiss Knife += ApplicationComposer: the swiss knife of TomEE :jbake-date: 2016-03-16 :jbake-type: page :jbake-status: published http://git-wip-us.apache.org/repos/asf/tomee-site-generator/blob/c7bc597d/src/main/jbake/content/developer/testing/index.adoc ---------------------------------------------------------------------- diff --git a/src/main/jbake/content/developer/testing/index.adoc b/src/main/jbake/content/developer/testing/index.adoc index 66e562c..5ab39a7 100755 --- a/src/main/jbake/content/developer/testing/index.adoc +++ b/src/main/jbake/content/developer/testing/index.adoc @@ -1,4 +1,4 @@ -= TomEE and Testing += Testing :jbake-date: 2016-03-16 :jbake-type: page :jbake-status: published http://git-wip-us.apache.org/repos/asf/tomee-site-generator/blob/c7bc597d/src/main/jbake/content/developer/tools/index.adoc ---------------------------------------------------------------------- diff --git a/src/main/jbake/content/developer/tools/index.adoc b/src/main/jbake/content/developer/tools/index.adoc index 713638e..3d59740 100755 --- a/src/main/jbake/content/developer/tools/index.adoc +++ b/src/main/jbake/content/developer/tools/index.adoc @@ -1,4 +1,4 @@ -= TomEE developer tools += Build tools :jbake-date: 2016-03-16 :jbake-type: page :jbake-status: published http://git-wip-us.apache.org/repos/asf/tomee-site-generator/blob/c7bc597d/src/main/jbake/content/documentation.adoc ---------------------------------------------------------------------- diff --git a/src/main/jbake/content/documentation.adoc b/src/main/jbake/content/documentation.adoc new file mode 100644 index 0000000..8764106 --- /dev/null +++ b/src/main/jbake/content/documentation.adoc @@ -0,0 +1,26 @@ += TomEE Documentation +:jbake-date: 2016-03-16 +:jbake-type: page +:jbake-status: published +:jbake-tomeepdf: + +=== Administration +- link:admin/configuration/index.html[How to configure] +- link:admin/directory-structure.html[Directory Structure] +- link:admin/cluster/index.html[Clustering] + +=== Developers +- link:developer/ide/index.html[IDEs - Eclipse, Intellij Idea and Netbeans] +- link:developer/testing/index.html[Testing - Arquillian, OpenEJB JUnit, TomEE Embedded and ApplicationComposer] +- link:developer/tools/index.html[Build Tools - Maven and Gradle] +- link:developer/migration/tomee-1-to-7.html[Migrating from TomEE 1 to 7] +- link:developer/json/index.html[TomEE 7 and Apache Johnzon (JSON Mapper)] +- link:developer/configuration/cxf.html[Apache CXF Configuration - JAX-RS and JAX-WS] +- link:developer/classloading/index.html[TomEE Classloading] + +=== Advanced +- link:advanced/applicationcomposer/index.html[`ApplicationComposer` with JBatch] +- link:advanced/setup/index.html[How to setup TomEE in production] +- link:advanced/shading/index.html[Fat / Uber jars - Shade Plugin] +- link:advanced/client/jndi.html[JNDI] +- link:advanced/jms/jms-configuration.html[JMS Configuration Tips] \ No newline at end of file http://git-wip-us.apache.org/repos/asf/tomee-site-generator/blob/c7bc597d/src/main/jbake/content/download-ng.adoc ---------------------------------------------------------------------- diff --git a/src/main/jbake/content/download-ng.adoc b/src/main/jbake/content/download-ng.adoc index 0610a06..438ec6f 100755 --- a/src/main/jbake/content/download-ng.adoc +++ b/src/main/jbake/content/download-ng.adoc @@ -5,7 +5,7 @@ :jbake-tomeepdf: :icons: font -IMPORTANT: only TomEE 1.x WebProfile and JAX-RS distributions are certified. +IMPORTANT: Only TomEE 1.x WebProfile and JAX-RS distributions are certified. [.table.table-bordered,options="header"] |=== http://git-wip-us.apache.org/repos/asf/tomee-site-generator/blob/c7bc597d/src/main/jbake/templates/footer.gsp ---------------------------------------------------------------------- diff --git a/src/main/jbake/templates/footer.gsp b/src/main/jbake/templates/footer.gsp index 2c24dc9..48b46f3 100755 --- a/src/main/jbake/templates/footer.gsp +++ b/src/main/jbake/templates/footer.gsp @@ -13,28 +13,21 @@ <div class="col-sm-6 text-center-mobile"> <div class="row opening-hours"> <div class="col-sm-3 text-center-mobile"> - <h5><a href="<%if (content.rootpath) {%>${content.rootpath}<% } else { %><% }%>admin/index.html" class="white">Administration</a></h5> + <h5><a href="<%if (content.rootpath) {%>${content.rootpath}<% } else { %><% }%>documentation.html" class="white">Documentation</a></h5> <ul class="list-unstyled"> - <li><a href="<%if (content.rootpath) {%>${content.rootpath}<% } else { %><% }%>admin/cluster/index.html" class="regular light-white">Cluster</a></li> - <li><a href="<%if (content.rootpath) {%>${content.rootpath}<% } else { %><% }%>admin/configuration/index.html" class="regular light-white">Configuration</a></li> - </ul> - </div> - <div class="col-sm-3 text-center-mobile"> - <h5><a href="<%if (content.rootpath) {%>${content.rootpath}<% } else { %><% }%>developer/index.html" class="white">Developer</a></h5> - <ul class="list-unstyled"> - <li><a href="<%if (content.rootpath) {%>${content.rootpath}<% } else { %><% }%>developer/classloading/index.html" class="regular light-white">Classloading</a></li> - <li><a href="<%if (content.rootpath) {%>${content.rootpath}<% } else { %><% }%>developer/ide/index.html" class="regular light-white">IDE</a></li> + <li><a href="<%if (content.rootpath) {%>${content.rootpath}<% } else { %><% }%>admin/configuration/index.html" class="regular light-white">How to configure</a></li> + <li><a href="<%if (content.rootpath) {%>${content.rootpath}<% } else { %><% }%>admin/directory-structure.html" class="regular light-white">Dir. Structure</a></li> <li><a href="<%if (content.rootpath) {%>${content.rootpath}<% } else { %><% }%>developer/testing/index.html" class="regular light-white">Testing</a></li> - <li><a href="<%if (content.rootpath) {%>${content.rootpath}<% } else { %><% }%>developer/tools/index.html" class="regular light-white">Tools</a></li> + <li><a href="<%if (content.rootpath) {%>${content.rootpath}<% } else { %><% }%>admin/cluster/index.html" class="regular light-white">Clustering</a></li> </ul> </div> <div class="col-sm-3 text-center-mobile"> - <h5><a href="<%if (content.rootpath) {%>${content.rootpath}<% } else { %><% }%>advanced/index.html" class="white">Advanced</a></h5> + <h5><a href="<%if (content.rootpath) {%>${content.rootpath}<% } else { %><% }%>examples.html" class="white">Examples</a></h5> <ul class="list-unstyled"> - <li><a href="<%if (content.rootpath) {%>${content.rootpath}<% } else { %><% }%>advanced/applicationcomposer/index.html" class="regular light-white">Application Composer</a></li> - <li><a href="<%if (content.rootpath) {%>${content.rootpath}<% } else { %><% }%>advanced/setup/index.html" class="regular light-white">Setup</a></li> - <li><a href="<%if (content.rootpath) {%>${content.rootpath}<% } else { %><% }%>advanced/shading/index.html" class="regular light-white">Shading</a></li> - <li><a href="<%if (content.rootpath) {%>${content.rootpath}<% } else { %><% }%>advanced/tomee-embedded/index.html" class="regular light-white">TomEE Embedded</a></li> + <li><a href="<%if (content.rootpath) {%>${content.rootpath}<% } else { %><% }%>examples/simple-cdi-interceptor.html" class="regular light-white">CDI Interceptor</a></li> + <li><a href="<%if (content.rootpath) {%>${content.rootpath}<% } else { %><% }%>examples/rest-cdi.html" class="regular light-white">REST with CDI</a></li> + <li><a href="<%if (content.rootpath) {%>${content.rootpath}<% } else { %><% }%>examples/ejb-examples.html" class="regular light-white">EJB</a></li> + <li><a href="<%if (content.rootpath) {%>${content.rootpath}<% } else { %><% }%>examples/jsf-managedBean-and-ejb.html" class="regular light-white">JSF</a></li> </ul> </div> <div class="col-sm-3 text-center-mobile"> @@ -45,6 +38,14 @@ <li><a href="<%if (content.rootpath) {%>${content.rootpath}<% } else { %><% }%>community/sources.html" class="regular light-white">Sources</a></li> </ul> </div> + <div class="col-sm-3 text-center-mobile"> + <h5><a href="<%if (content.rootpath) {%>${content.rootpath}<% } else { %><% }%>security/index.html" class="white">Security</a></h5> + <ul class="list-unstyled"> + <li><a href="http://apache.org/security"; target="_blank" class="regular light-white">Apache Security</a></li> + <li><a href="http://apache.org/security/projects.html"; target="_blank" class="regular light-white">Security Projects</a></li> + <li><a href="http://cve.mitre.org"; target="_blank" class="regular light-white">CVE</a></li> + </ul> + </div> </div> </div> </div> http://git-wip-us.apache.org/repos/asf/tomee-site-generator/blob/c7bc597d/src/main/jbake/templates/index.gsp ---------------------------------------------------------------------- diff --git a/src/main/jbake/templates/index.gsp b/src/main/jbake/templates/index.gsp index 3933987..da8c393 100755 --- a/src/main/jbake/templates/index.gsp +++ b/src/main/jbake/templates/index.gsp @@ -25,28 +25,28 @@ <div class="row intro-tables animated fadeInUp" style="opacity: 0;"> <div class="col-md-4"> <div class="intro-table intro-table1 intro-table-hover1 intro-table-hover"> - <h5 class="white heading hide-hover">TomEE for administrators</h5> + <h5 class="white heading hide-hover">Learn more about TomEE</h5> <div class="bottom"> - <h4 class="white heading small-heading no-margin regular">I'm an admin</h4> - <a href="<%if (content.rootpath) {%>${content.rootpath}<% } else { %><% }%>admin/index.html" class="btn btn-white-fill expand">Learn more...</a> + <h4 class="white heading small-heading no-margin regular">Documentation</h4> + <a href="<%if (content.rootpath) {%>${content.rootpath}<% } else { %><% }%>/documentation.html" class="btn btn-white-fill expand">Learn more...</a> </div> </div> </div> <div class="col-md-4"> <div class="intro-table intro-table2 intro-table-hover2 intro-table-hover"> - <h5 class="white heading hide-hover">TomEE for developers</h5> + <h5 class="white heading hide-hover">How can I contribute to TomEE?</h5> <div class="bottom"> - <h4 class="white heading small-heading no-margin regular">I'm a developer</h4> - <a href="<%if (content.rootpath) {%>${content.rootpath}<% } else { %><% }%>developer/index.html" class="btn btn-white-fill expand">Learn more...</a> + <h4 class="white heading small-heading no-margin regular">Community</h4> + <a href="<%if (content.rootpath) {%>${content.rootpath}<% } else { %><% }%>/community/index.html" class="btn btn-white-fill expand">Learn more...</a> </div> </div> </div> <div class="col-md-4"> <div class="intro-table intro-table3 intro-table-hover3 intro-table-hover"> - <h5 class="white heading hide-hover">Advanced usages</h5> + <h5 class="white heading hide-hover">How can I download TomEE?</h5> <div class="bottom"> - <h4 class="white heading small-heading no-margin regular">Too easy, let's go further</h4> - <a href="<%if (content.rootpath) {%>${content.rootpath}<% } else { %><% }%>advanced/index.html" class="btn btn-white-fill expand">Learn more...</a> + <h4 class="white heading small-heading no-margin regular">Downloads</h4> + <a href="<%if (content.rootpath) {%>${content.rootpath}<% } else { %><% }%>/download-ng.html" class="btn btn-white-fill expand">Learn more...</a> </div> </div> </div> http://git-wip-us.apache.org/repos/asf/tomee-site-generator/blob/c7bc597d/src/main/jbake/templates/menu.gsp ---------------------------------------------------------------------- diff --git a/src/main/jbake/templates/menu.gsp b/src/main/jbake/templates/menu.gsp index 0fe2ae3..bd61ee7 100755 --- a/src/main/jbake/templates/menu.gsp +++ b/src/main/jbake/templates/menu.gsp @@ -8,7 +8,7 @@ <span class="icon-bar"></span> <span class="icon-bar"></span> </button> - <a class="navbar-brand" href="<%if (content.rootpath) {%>${content.rootpath}<% } else { %><% }%>/#"> + <a class="navbar-brand" href="/"> <span> <% if (content.uri && content.uri == '/index.html') { %> @@ -26,14 +26,11 @@ <!-- Collect the nav links, forms, and other content for toggling --> <div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1"> <ul class="nav navbar-nav navbar-right main-nav"> - <li><a href="<%if (content.rootpath) {%>${content.rootpath}<% } else { %><% }%>developer/index.html">Developer</a></li> - <li><a href="<%if (content.rootpath) {%>${content.rootpath}<% } else { %><% }%>admin/index.html">Admin</a></li> - <li><a href="<%if (content.rootpath) {%>${content.rootpath}<% } else { %><% }%>advanced/index.html">Advanced</a></li> - <li><a href="<%if (content.rootpath) {%>${content.rootpath}<% } else { %><% }%>security/index.html">Security</a></li> - <li><a href="<%if (content.rootpath) {%>${content.rootpath}<% } else { %><% }%>examples/index-ng.html">Examples</a></li> - <li><a href="<%if (content.rootpath) {%>${content.rootpath}<% } else { %><% }%>blog/index.html">Blog</a></li> + <li><a href="<%if (content.rootpath) {%>${content.rootpath}<% } else { %><% }%>documentation.html">Documentation</a></li> + <li><a href="<%if (content.rootpath) {%>${content.rootpath}<% } else { %><% }%>examples/index.html">Examples</a></li> <li><a href="<%if (content.rootpath) {%>${content.rootpath}<% } else { %><% }%>community/index.html">Community</a></li> - <li><a href="<%if (content.rootpath) {%>${content.rootpath}<% } else { %><% }%>download-ng.html">Downloads</a></li> + <li><a href="<%if (content.rootpath) {%>${content.rootpath}<% } else { %><% }%>security/index.html">Security</a></li> + <li><a href="<%if (content.rootpath) {%>${content.rootpath}<% } else { %><% }%>download-ng.html">Downloads</a></li> </ul> </div> <!-- /.navbar-collapse -->
