This is an automated email from the ASF dual-hosted git repository. dblevins pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/tomee-site-generator.git
commit d007c5a77f16efc944a5917a5343f9d728a641e2 Author: David Blevins <david.blev...@gmail.com> AuthorDate: Sat Jul 4 15:52:35 2020 -0700 Ability to apply labels to the versions --- .../org/apache/tomee/website/Configuration.java | 2 +- src/main/java/org/apache/tomee/website/Source.java | 9 ++++++++ .../org/apache/tomee/website/VersionsIndex.java | 26 +++++++++++++--------- 3 files changed, 26 insertions(+), 11 deletions(-) diff --git a/src/main/java/org/apache/tomee/website/Configuration.java b/src/main/java/org/apache/tomee/website/Configuration.java index 6465f04..1b90fac 100644 --- a/src/main/java/org/apache/tomee/website/Configuration.java +++ b/src/main/java/org/apache/tomee/website/Configuration.java @@ -91,7 +91,7 @@ public class Configuration { return new Source[]{ // new Source("https://github.com/apache/tomee.git", "master", "tomee-8.0"), - new Source("https://github.com/apache/tomee.git", "master", "tomee-9.0").related(microProfile2).related(jakartaEE9).javadoc("^org.apache.(openejb|tomee).*"), + new Source("https://github.com/apache/tomee.git", "master", "tomee-9.0").label("milestone").related(microProfile2).related(jakartaEE9).javadoc("^org.apache.(openejb|tomee).*"), new Source("https://github.com/apache/tomee.git", "master", "tomee-8.0", true).related(microProfile2).related(jakartaEE8).javadoc("^org.apache.(openejb|tomee).*"), new Source("https://github.com/apache/tomee.git", "tomee-7.1.0", "tomee-7.1").javadoc("^org.apache.(openejb|tomee).*"), new Source("https://github.com/apache/tomee.git", "tomee-7.0.5", "tomee-7.0").javadoc("^org.apache.(openejb|tomee).*"), diff --git a/src/main/java/org/apache/tomee/website/Source.java b/src/main/java/org/apache/tomee/website/Source.java index a93019b..5478cec 100644 --- a/src/main/java/org/apache/tomee/website/Source.java +++ b/src/main/java/org/apache/tomee/website/Source.java @@ -60,6 +60,7 @@ import java.util.stream.Stream; */ public class Source { private final String name; + private String label; private final String scmUrl; private final String branch; private final boolean latest; @@ -177,6 +178,14 @@ public class Source { return this; } + public String getLabel() { + return this.label; + } + + public Source label(final String label) { + this.label = label; + return this; + } @Override public String toString() { diff --git a/src/main/java/org/apache/tomee/website/VersionsIndex.java b/src/main/java/org/apache/tomee/website/VersionsIndex.java index e39a43d..4e35fc8 100644 --- a/src/main/java/org/apache/tomee/website/VersionsIndex.java +++ b/src/main/java/org/apache/tomee/website/VersionsIndex.java @@ -31,9 +31,9 @@ public class VersionsIndex { try { final StringBuilder index = new StringBuilder(); index.append(":jbake-type: page\n") - .append(":jbake-status: published\n") - .append(":jbake-title: Apache TomEE Documentation\n") - .append("\n") + .append(":jbake-status: published\n") + .append(":jbake-title: Apache TomEE Documentation\n") + .append("\n") ; @@ -42,6 +42,12 @@ public class VersionsIndex { if ("latest".equals(source.getName())) continue; index.append("*").append(source.getName()); + + if (source.getLabel() != null) { + final String label = source.getLabel(); + index.append(" (").append(label).append(")"); + } + if (source.isLatest()) { index.append(" (latest)"); } @@ -64,13 +70,13 @@ public class VersionsIndex { for (String LanguageDir : listOfLanguagesDirs) { if (!LanguageDir.equalsIgnoreCase("en")) { index.append(" link:") - .append(source.getName()) - .append("/") - .append(LanguageDir) - .append("/examples/") - .append("[ [") - .append(LanguageDir) - .append("\\] ]"); + .append(source.getName()) + .append("/") + .append(LanguageDir) + .append("/examples/") + .append("[ [") + .append(LanguageDir) + .append("\\] ]"); } }