You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lo...@apache.org on 2018/01/25 10:04:20 UTC
[myfaces-tobago] branch master updated: demo on tobago-vm * update
to current versions and current vote * using scripting to generate entries
for each version, instead of writing all in HTML (easier to maintain)
This is an automated email from the ASF dual-hosted git repository.
lofwyr pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/myfaces-tobago.git
The following commit(s) were added to refs/heads/master by this push:
new 9584737 demo on tobago-vm * update to current versions and current vote * using scripting to generate entries for each version, instead of writing all in HTML (easier to maintain)
9584737 is described below
commit 95847370bc80e538e89bdec6a843df675d6c08ef
Author: Udo Schnurpfeil <lo...@apache.org>
AuthorDate: Thu Jan 25 11:04:13 2018 +0100
demo on tobago-vm
* update to current versions and current vote
* using scripting to generate entries for each version, instead of writing all in HTML (easier to maintain)
---
src/site/apt/release-checklist.apt | 4 +
.../main/tobago-vm/docker/apache-proxy/index.html | 215 +++++++++++----------
.../src/main/tobago-vm/docker/docker-compose.yml | 32 +--
3 files changed, 140 insertions(+), 111 deletions(-)
diff --git a/src/site/apt/release-checklist.apt b/src/site/apt/release-checklist.apt
index 3099823..34caa6d 100644
--- a/src/site/apt/release-checklist.apt
+++ b/src/site/apt/release-checklist.apt
@@ -108,6 +108,8 @@ mvn release:perform
* <Close> the repository on the {{{https://repository.apache.org/}Nexus}} instance for stating (you will receive a mail with the staging location).
+ * Update the staging and snapshot version on tobago-vm.apache.org
+
* Voting
* Propose a vote on the dev list with the staging location (see {{Vote template}} below).
@@ -126,6 +128,8 @@ mvn release:perform
* Add the release version and date to the {{{https://reporter.apache.org/addrelease.html?myfaces}Apache Committee Report Helper}}.
+ * Update the release and stating version on tobago-vm.apache.org
+
* Building the site
* Updating the release and version information in the APT files of trunk, e. g.:
diff --git a/tobago-example/tobago-example-demo/src/main/tobago-vm/docker/apache-proxy/index.html b/tobago-example/tobago-example-demo/src/main/tobago-vm/docker/apache-proxy/index.html
index 5170b99..9a2632b 100644
--- a/tobago-example/tobago-example-demo/src/main/tobago-vm/docker/apache-proxy/index.html
+++ b/tobago-example/tobago-example-demo/src/main/tobago-vm/docker/apache-proxy/index.html
@@ -5,15 +5,112 @@
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
<title>Tobago Demo</title>
<link href="https://getbootstrap.com/dist/css/bootstrap.css" rel="stylesheet">
+ <script src="https://code.jquery.com/jquery-1.11.3.js"></script>
<style>
div.disabled {
opacity: 0.3;
}
+
.na {
text-align: center;
vertical-align: middle;
}
</style>
+ <script>
+
+ jQuery(document).ready(function () {
+
+ //
+ // EDIT HERE (START)
+ //
+
+ var versions = [
+ {
+ major: "4",
+ release: "4.0.0",
+ staging: "",
+ snapshot: "4.1.0-SNAPSHOT",
+ link: "4",
+ archived: false
+ },
+ {
+ major: "3",
+ release: "3.0.6",
+ staging: "",
+ snapshot: "3.0.7-SNAPSHOT",
+ link: "3",
+ archived: false
+ },
+ {
+ major: "2",
+ release: "2.1.0",
+ staging: "2.1.1",
+ snapshot: "2.1.2-SNAPSHOT",
+ link: "2",
+ archived: false
+ },
+ {
+ major: "1.5",
+ release: "1.5.13",
+ staging: "",
+ snapshot: "",
+ link: "1-5",
+ archived: true
+
+ },
+ {
+ major: "1.0",
+ release: "1.0.42",
+ staging: "",
+ snapshot: "",
+ link: "1-0",
+ archived: true
+ }
+ ];
+
+ //
+ // EDIT HERE (END)
+ //
+
+ var template = jQuery("#template");
+
+ for (var v = versions.length - 1; v >= 0; v--) {
+ var version = versions[v];
+ var clone = template.clone();
+
+ clone.find(".x-title").append(version.major);
+ clone.find(".x-release-version").append(version.release);
+ clone.find(".x-staging-version").prepend(version.staging + " ");
+ clone.find(".x-snapshot-version").append(version.snapshot);
+
+ if (version.staging) {
+ clone.find(".x-staging-off").get(0).setAttribute("style", "display:none !important");
+ } else {
+ clone.find(".x-staging-on").get(0).setAttribute("style", "display:none !important");
+ }
+
+ if (version.snapshot) {
+ clone.find(".x-snapshot-off").get(0).setAttribute("style", "display:none !important");
+ } else {
+ clone.find(".x-snapshot-on").get(0).setAttribute("style", "display:none !important");
+ }
+
+ clone.find(".x-release-link").attr("href", "/demo-" + version.link + "-release/");
+ clone.find(".x-staging-link").attr("href", "/demo-" + version.link + "-staging/");
+ clone.find(".x-snapshot-link").attr("href", "/demo-" + version.link + "-snapshot/");
+
+ if (version.archived) {
+ clone.find(".btn-success").removeClass("btn-success").addClass("btn-secondary");
+ clone.find(".x-release-version").append(" (archived)");
+ }
+
+ clone.insertAfter(template);
+ }
+
+ template.hide();
+
+ });
+ </script>
</head>
<body class="bd-home">
@@ -45,118 +142,38 @@
</div>
</div>
- <!-- 4 -->
+ <!-- template -->
- <div class="masthead-followup row m-0 border border-white">
- <div class="col-12 col-md-4 p-3 p-md-5 bg-light border border-white">
- <h3>Tobago 4</h3>
- <h5>4.0.0</h5>
- <p>Last released version.</p>
- <a class="btn btn-success" href="/demo-4-release/">Demo</a>
- </div>
- <div class="col-12 col-md-4 p-3 p-md-5 bg-light border border-white disabled d-md-flex d-none">
- <h3 class="na">Currently no voting active.</h3>
- </div>
-<!--
- <div class="col-12 col-md-4 p-3 p-md-5 bg-light border border-white">
- <h3>Tobago 4</h3>
- <h5>4.0.0 (coming soon)</h5>
- <p>Voting in progress.</p>
- <a class="btn btn-warning" href="/demo-4-staging/">Demo</a>
- </div>
--->
- <div class="col-12 col-md-4 p-3 p-md-5 bg-light border border-white">
- <h3>Tobago 4</h3>
- <h5>4.0.1-SNAPSHOT</h5>
- <p>Current development version. Work in progress.</p>
- <a class="btn btn-danger" href="/demo-4-snapshot/">Demo</a>
- </div>
- </div>
+ <div id="template"
+ class="masthead-followup row m-0 border border-white">
- <!-- 3 -->
-
- <div class="masthead-followup row m-0 border border-white">
<div class="col-12 col-md-4 p-3 p-md-5 bg-light border border-white">
- <h3>Tobago 3</h3>
- <h5>3.0.6</h5>
+ <h3 class="x-title">Tobago </h3>
+ <h5 class="x-release-version"></h5>
<p>Last released version.</p>
- <a class="btn btn-success" href="/demo-3-release/">Demo</a>
- </div>
- <div class="col-12 col-md-4 p-3 p-md-5 bg-light border border-white disabled d-md-flex d-none">
- <h3 class="na">Currently no voting active.</h3>
-<!--
- <h3>Tobago 3</h3>
- <h5>3.0.6 (coming soon)</h5>
- <p>Voting in progress.</p>
- <a class="btn btn-warning" href="/demo-3-staging/">Demo</a>
--->
- </div>
- <div class="col-12 col-md-4 p-3 p-md-5 bg-light border border-white">
- <h3>Tobago 3</h3>
- <h5>3.0.7-SNAPSHOT</h5>
- <p>Next version in development.</p>
- <a class="btn btn-danger" href="/demo-3-snapshot/">Demo</a>
+ <a class="x-release-link btn btn-success" href="/">Demo</a>
</div>
- </div>
-
- <!-- 2 -->
- <div class="masthead-followup row m-0 border border-white">
- <div class="col-12 col-md-4 p-3 p-md-5 bg-light border border-white">
- <h3>Tobago 2</h3>
- <h5>2.1.0</h5>
- <p>Last released version.</p>
- <a class="btn btn-success" href="/demo-2-release/">Demo</a>
- </div>
- <div class="col-12 col-md-4 p-3 p-md-5 bg-light border border-white disabled d-md-flex d-none">
- <h3 class="na">Currently no voting active.</h3>
-<!--
- <h3>Tobago 2</h3>
- <h5>2.1.1 (coming soon)</h5>
+ <div class="x-staging-on col-12 col-md-4 p-3 p-md-5 bg-light border border-white">
+ <h3 class="x-title">Tobago </h3>
+ <h5 class="x-staging-version">(not released yet)</h5>
<p>Voting in progress.</p>
- <a class="btn btn-warning" href="/demo-2-staging/">Demo</a>
--->
+ <a class="x-staging-link btn btn-warning" href="/">Demo</a>
</div>
- <div class="col-12 col-md-4 p-3 p-md-5 bg-light border border-white">
- <h3>Tobago 2</h3>
- <h5>2.1.1-SNAPSHOT</h5>
- <p>Next version in development.</p>
- <a class="btn btn-danger" href="/demo-2-snapshot/">Demo</a>
+ <div class="x-staging-off col-12 col-md-4 p-3 p-md-5 bg-light border border-white disabled d-md-flex d-none">
+ <h3 class="na">Currently no voting active.</h3>
</div>
- </div>
-
- <!-- 1.5 -->
- <div class="masthead-followup row m-0 border border-white">
- <div class="col-12 col-md-4 p-3 p-md-5 bg-light border border-white">
- <h3>Tobago 1.5</h3>
- <h5>1.5.13</h5>
- <p>Old released version.</p>
- <a class="btn btn-secondary" href="/demo-1-5-release/">Demo</a>
- </div>
- <div class="col-12 col-md-4 p-3 p-md-5 bg-light border border-white disabled d-md-flex d-none">
- <h3 class="na"></h3>
+ <div class="x-snapshot-on col-12 col-md-4 p-3 p-md-5 bg-light border border-white">
+ <h3 class="x-title">Tobago </h3>
+ <h5 class="x-snapshot-version"></h5>
+ <p>Current development version. Work in progress.</p>
+ <a class="x-snapshot-link btn btn-danger" href="/">Demo</a>
</div>
- <div class="col-12 col-md-4 p-3 p-md-5 bg-light border border-white disabled d-md-flex d-none">
- <h3 class="na"></h3>
+ <div class="x-snapshot-off col-12 col-md-4 p-3 p-md-5 bg-light border border-white disabled d-md-flex d-none">
+ <h3 class="na">No active development.</h3>
</div>
- </div>
-
- <!-- 1 -->
- <div class="masthead-followup row m-0 border border-white">
- <div class="col-12 col-md-4 p-3 p-md-5 bg-light border border-white">
- <h3>Tobago 1.0</h3>
- <h5>1.0.42</h5>
- <p>Old released version.</p>
- <a class="btn btn-secondary" href="/demo-1-0-release/">Demo</a>
- </div>
- <div class="col-12 col-md-4 p-3 p-md-5 bg-light border border-white disabled d-md-flex d-none">
- <h3 class="na"></h3>
- </div>
- <div class="col-12 col-md-4 p-3 p-md-5 bg-light border border-white disabled d-md-flex d-none">
- <h3 class="na"></h3>
- </div>
</div>
</div>
diff --git a/tobago-example/tobago-example-demo/src/main/tobago-vm/docker/docker-compose.yml b/tobago-example/tobago-example-demo/src/main/tobago-vm/docker/docker-compose.yml
index 717fec4..982462b 100644
--- a/tobago-example/tobago-example-demo/src/main/tobago-vm/docker/docker-compose.yml
+++ b/tobago-example/tobago-example-demo/src/main/tobago-vm/docker/docker-compose.yml
@@ -28,10 +28,14 @@ services:
# - demo-3-staging
- demo-3-snapshot
- demo-2-release
-# - demo-2-staging
+ - demo-2-staging
- demo-2-snapshot
- demo-1-5-release
+# - demo-1-5-staging
+# - demo-1-5-snapshot
- demo-1-0-release
+# - demo-1-0-staging
+# - demo-1-0-snapshot
depends_on:
- demo-4-release
# - demo-4-staging
@@ -40,10 +44,14 @@ services:
# - demo-3-staging
- demo-3-snapshot
- demo-2-release
-# - demo-2-staging
+ - demo-2-staging
- demo-2-snapshot
- demo-1-5-release
+# - demo-1-5-staging
+# - demo-1-5-snapshot
- demo-1-0-release
+# - demo-1-0-staging
+# - demo-1-0-snapshot
demo-4-release:
image: tobago/tomcat:latest
environment:
@@ -62,7 +70,7 @@ services:
demo-4-snapshot:
image: tobago/tomcat:latest
environment:
- - TOBAGO_VERSION=4.0.1-SNAPSHOT
+ - TOBAGO_VERSION=4.1.0-SNAPSHOT
- CONTEXT_PATH=demo-4-snapshot
volumes:
- /opt/docker/artifacts:/opt/docker/artifacts
@@ -95,18 +103,18 @@ services:
- CONTEXT_PATH=demo-2-release
volumes:
- /opt/docker/artifacts:/opt/docker/artifacts
-# demo-2-staging:
-# image: tobago/tomcat:latest
-# environment:
-# - TOBAGO_VERSION=2.1.1
-# - STAGING_NUMBER=111x
-# - CONTEXT_PATH=demo-3-staging
-# volumes:
-# - /opt/docker/artifacts:/opt/docker/artifacts
+ demo-2-staging:
+ image: tobago/tomcat:latest
+ environment:
+ - TOBAGO_VERSION=2.1.1
+ - STAGING_NUMBER=1125
+ - CONTEXT_PATH=demo-2-staging
+ volumes:
+ - /opt/docker/artifacts:/opt/docker/artifacts
demo-2-snapshot:
image: tobago/tomcat:latest
environment:
- - TOBAGO_VERSION=2.1.1-SNAPSHOT
+ - TOBAGO_VERSION=2.1.2-SNAPSHOT
- CONTEXT_PATH=demo-2-snapshot
volumes:
- /opt/docker/artifacts:/opt/docker/artifacts
--
To stop receiving notification emails like this one, please contact
lofwyr@apache.org.