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 2017/09/20 04:47:05 UTC
[myfaces-tobago] branch master updated: TOBAGO-1794: Deploy
different versions of Tobago demo in the VM * update site
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 d89db7b TOBAGO-1794: Deploy different versions of Tobago demo in the VM * update site
d89db7b is described below
commit d89db7b243987260a6c5e7150340746bb380c633
Author: Udo Schnurpfeil <lo...@apache.org>
AuthorDate: Wed Sep 20 06:46:59 2017 +0200
TOBAGO-1794: Deploy different versions of Tobago demo in the VM
* update site
---
src/site/apt/demo.apt | 33 ++++------------------
src/site/apt/guide.apt | 10 +++----
src/site/apt/index.apt | 20 ++++++-------
src/site/apt/migration-1.5.apt | 2 +-
src/site/apt/migration-2.0.apt | 2 +-
src/site/apt/new-2.0.apt | 2 +-
src/site/fml/faq.fml | 20 ++++---------
src/site/site.xml | 4 +--
.../src/main/webapp/content/10-intro/intro.xhtml | 4 +--
9 files changed, 33 insertions(+), 64 deletions(-)
diff --git a/src/site/apt/demo.apt b/src/site/apt/demo.apt
index 736b612..879d9c5 100644
--- a/src/site/apt/demo.apt
+++ b/src/site/apt/demo.apt
@@ -19,39 +19,18 @@
Live Demo
- A live demo can be found for different versions here:
-
- * {{{http://www.irian.biz/tobago-example-demo-3.0.x/}3.0.x (current release)}}
-
- * {{{http://www.irian.biz/tobago-example-demo-2.0.x/}2.0.x (last release)}}
-
- * {{{http://example.irian.at/tobago-example-demo-1.5.x/}1.5.x (old release - nightly)}}
-
- * {{{http://example.irian.at/tobago-example-demo-1.0.x/}1.0.x (old release - nightly)}}
+ The Tobago demo is for demonstration and documentation purpose.
+ It presents the features of Tobago including layout and themes and contains
+ an overview of the provided controls and best practices how to use Tobago.
- []
+ A {{{http://tobago-vm.apache.org/}live demo}} can be found for different versions.
- This demo and more examples you can find in the Subversion (see {{{./getting-started.html}Getting Started}} section).
+ This demo and more examples you can find in the VCS (see {{{./getting-started.html}Getting Started}} section).
The current snapshot of the demo war can be downloaded at:
{{https://repository.apache.org/content/repositories/snapshots/org/apache/myfaces/tobago/tobago-example-demo/}}
-Examples
-
- Tobago contains various example applications including a general demo, an address book application, a blank WAR,
- and an example theme.
-
-* Tobago Demo
-
- The Tobago demo is for demonstration and documentation purpose.
- It presents the features of Tobago including layout and themes and contains
- an overview of the provided controls and best practices how to use Tobago.
-
-* Blank WAR
+Blank WAR
The Blank WAR is a minimal WAR to display a simple page with Tobago -- useful to get started with your own Tobago
application.
-
-* Blank Theme
-
- This theme shows how to extend an existing theme.
diff --git a/src/site/apt/guide.apt b/src/site/apt/guide.apt
index 6bc37df..58a4bc8 100644
--- a/src/site/apt/guide.apt
+++ b/src/site/apt/guide.apt
@@ -206,7 +206,7 @@ mvn install
[images/guide-basic-controls.png] Basic Controls
- Live demo of the basic controls: {{http://www.irian.biz/tobago-example-demo-2.0.x/faces/content/01-basic/basic.xhtml}}
+ Live demo of the basic controls: {{http://tobago-vm.apache.org/demo-2-release/faces/content/01-basic/basic.xhtml}}
The basic controls page also shows two variants of a normal input control: the date input control and the time input
control.
@@ -257,7 +257,7 @@ mvn install
[images/guide-sheet.png] Sheet
- Live demo of a sheet: {{http://www.irian.biz/tobago-example-demo-2.0.x/faces/content/02-sheet/sheet.xhtml}}
+ Live demo of a sheet: {{http://tobago-vm.apache.org/demo-2-release/faces/content/02-sheet/sheet.xhtml}}
A code fragment from the address book example:
@@ -296,7 +296,7 @@ mvn install
[images/guide-tab-group.png] Tab Group
- Live demo of a tab group: {{http://www.irian.biz/tobago-example-demo-2.0.x/faces/content/04-tab/tab.xhtml}}
+ Live demo of a tab group: {{http://tobago-vm.apache.org/demo-2-release/faces/content/04-tab/tab.xhtml}}
A code fragment from the address book example:
@@ -324,7 +324,7 @@ mvn install
[images/guide-menu.png] Menu
- Live demo of a menu: {{http://www.irian.biz/tobago-example-demo-2.0.x/faces/content/05-toolBar/toolBar.xhtml}}
+ Live demo of a menu: {{http://tobago-vm.apache.org/demo-2-release/faces/content/05-toolBar/toolBar.xhtml}}
A code fragment from the address book example:
@@ -364,7 +364,7 @@ mvn install
[images/guide-toolbar.png] Tool Bar
- Live demo of a tool bar: {{http://www.irian.biz/tobago-example-demo-2.0.x/faces/content/05-toolBar/toolBar.xhtml}}
+ Live demo of a tool bar: {{http://tobago-vm.apache.org/demo-2-release/faces/content/05-toolBar/toolBar.xhtml}}
A code fragment from the address book example:
diff --git a/src/site/apt/index.apt b/src/site/apt/index.apt
index 6391f7b..359e58f 100644
--- a/src/site/apt/index.apt
+++ b/src/site/apt/index.apt
@@ -186,7 +186,7 @@ News
[]
- Also see section: {{{http://www.irian.biz/tobago-example-demo/faces/content/10-intro/30-new+in+3+0/new+in+3+0.xhtml} What's new in Tobago 3.0?}}
+ Also see section: {{{http://tobago-vm.apache.org/demo-4-snapshot/content/10-intro/30-new+in+3+0/new+in+3+0.xhtml} What's new in Tobago 3.0?}}
\ {}
~~ hack for a bit space
@@ -226,7 +226,7 @@ News
[]
- Also see section: {{{http://www.irian.biz/tobago-example-demo/faces/content/10-intro/30-new+in+3+0/new+in+3+0.xhtml} What's new in Tobago 3.0?}}
+ Also see section: {{{http://tobago-vm.apache.org/demo-4-snapshot/content/10-intro/30-new+in+3+0/new+in+3+0.xhtml} What's new in Tobago 3.0?}}
\ {}
~~ hack for a bit space
@@ -252,7 +252,7 @@ News
[]
- Also see section: {{{http://www.irian.biz/tobago-example-demo/faces/content/10-intro/30-new+in+3+0/new+in+3+0.xhtml} What's new in Tobago 3.0?}}
+ Also see section: {{{http://tobago-vm.apache.org/demo-4-snapshot/content/10-intro/30-new+in+3+0/new+in+3+0.xhtml} What's new in Tobago 3.0?}}
\ {}
~~ hack for a bit space
@@ -276,7 +276,7 @@ News
[]
- Also see section: {{{http://www.irian.biz/tobago-example-demo/faces/content/10-intro/30-new+in+3+0/new+in+3+0.xhtml} What's new in Tobago 3.0?}}
+ Also see section: {{{http://tobago-vm.apache.org/demo-4-snapshot/content/10-intro/30-new+in+3+0/new+in+3+0.xhtml} What's new in Tobago 3.0?}}
\ {}
~~ hack for a bit space
@@ -323,7 +323,7 @@ News
[]
- Also see section: {{{http://www.irian.biz/tobago-example-demo/faces/content/10-intro/30-new+in+3+0/new+in+3+0.xhtml} What's new in Tobago 3.0?}}
+ Also see section: {{{http://tobago-vm.apache.org/demo-4-snapshot/content/10-intro/30-new+in+3+0/new+in+3+0.xhtml} What's new in Tobago 3.0?}}
\ {}
~~ hack for a bit space
@@ -347,7 +347,7 @@ News
[]
- Also see section: {{{http://www.irian.biz/tobago-example-demo/faces/content/10-intro/30-new+in+3+0/new+in+3+0.xhtml} What's new in Tobago 3.0?}}
+ Also see section: {{{http://tobago-vm.apache.org/demo-4-snapshot/content/10-intro/30-new+in+3+0/new+in+3+0.xhtml} What's new in Tobago 3.0?}}
\ {}
~~ hack for a bit space
@@ -409,7 +409,7 @@ svn switch https://svn.apache.org/repos/asf/myfaces/tobago/trunk/
[]
- Also see section: {{{http://www.irian.biz/tobago-example-demo/faces/content/10-intro/30-new+in+3+0/new+in+3+0.xhtml} What's new in Tobago 3.0?}}
+ Also see section: {{{http://tobago-vm.apache.org/demo-4-snapshot/content/10-intro/30-new+in+3+0/new+in+3+0.xhtml} What's new in Tobago 3.0?}}
\ {}
~~ hack for a bit space
@@ -436,7 +436,7 @@ svn switch https://svn.apache.org/repos/asf/myfaces/tobago/trunk/
This may be the last version using Bootstrap 3.
The next alpha of Tobago will properly using Bootstrap 4, where the second alpha was released a few days ago.
- Also see section: {{{http://www.irian.biz/tobago-example-demo/faces/content/10-intro/30-new+in+3+0/new+in+3+0.xhtml} What's new in Tobago 3.0?}}
+ Also see section: {{{http://tobago-vm.apache.org/demo-4-snapshot/content/10-intro/30-new+in+3+0/new+in+3+0.xhtml} What's new in Tobago 3.0?}}
\ {}
~~ hack for a bit space
@@ -448,7 +448,7 @@ svn switch https://svn.apache.org/repos/asf/myfaces/tobago/trunk/
Release notes can be found in
{{{http://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12310273&styleName=Html&version=12325880}Jira}}.
- See section: {{{http://www.irian.biz/tobago-example-demo/faces/content/10-intro/30-new+in+3+0/new+in+3+0.xhtml} What's new in Tobago 3.0?}}
+ See section: {{{http://tobago-vm.apache.org/demo-4-snapshot/content/10-intro/30-new+in+3+0/new+in+3+0.xhtml} What's new in Tobago 3.0?}}
\ {}
~~ hack for a bit space
@@ -555,7 +555,7 @@ svn switch https://svn.apache.org/repos/asf/myfaces/tobago/trunk/
Release notes can be found in
{{{http://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12310273&styleName=Html&version=12321253}Jira}}.
- See section: {{{http://www.irian.biz/tobago-example-demo/faces/content/10-intro/40-new+in+2+0/new+in+2+0.xhtml} What's new in Tobago 2.0?}}
+ See section: {{{http://tobago-vm.apache.org/demo-4-snapshot/content/10-intro/40-new+in+2+0/new+in+2+0.xhtml} What's new in Tobago 2.0?}}
\ {}
~~ hack for a bit space
diff --git a/src/site/apt/migration-1.5.apt b/src/site/apt/migration-1.5.apt
index 5d910d4..4fb5af6 100644
--- a/src/site/apt/migration-1.5.apt
+++ b/src/site/apt/migration-1.5.apt
@@ -19,4 +19,4 @@
Content was moved
- The content of this page was moved to {{{http://www.irian.biz/tobago-example-demo/faces/content/10-intro/50-migration/99-migration/migration15.xhtml}Migration from Tobago 1.0 to 1.5}}
+ The content of this page was moved to {{{http://tobago-vm.apache.org/demo-4-snapshot/content/10-intro/50-migration/99-migration/migration15.xhtml}Migration from Tobago 1.0 to 1.5}}
diff --git a/src/site/apt/migration-2.0.apt b/src/site/apt/migration-2.0.apt
index c844199..d0c3e9b 100644
--- a/src/site/apt/migration-2.0.apt
+++ b/src/site/apt/migration-2.0.apt
@@ -19,4 +19,4 @@
Content was moved
- The content of this page was moved to {{{http://www.irian.biz/tobago-example-demo/faces/content/10-intro/50-migration/98-migration/migration20.xhtml}Migration from Tobago 1.5 to 2.0}}
+ The content of this page was moved to {{{http://tobago-vm.apache.org/demo-4-snapshot/content/10-intro/50-migration/98-migration/migration20.xhtml}Migration from Tobago 1.5 to 2.0}}
diff --git a/src/site/apt/new-2.0.apt b/src/site/apt/new-2.0.apt
index 087d929..f1f2451 100644
--- a/src/site/apt/new-2.0.apt
+++ b/src/site/apt/new-2.0.apt
@@ -19,4 +19,4 @@
Content was moved
- The content of this page was moved to {{{http://www.irian.biz/tobago-example-demo/faces/content/10-intro/40-new+in+2+0/new+in+2+0.xhtml}New in Tobago 2.0}}
+ The content of this page was moved to {{{http://tobago-vm.apache.org/demo-4-snapshot/content/10-intro/40-new+in+2+0/new+in+2+0.xhtml}New in Tobago 2.0}}
diff --git a/src/site/fml/faq.fml b/src/site/fml/faq.fml
index df8f705..f8d328b 100644
--- a/src/site/fml/faq.fml
+++ b/src/site/fml/faq.fml
@@ -32,18 +32,8 @@
<question>Where can I find documentation or HowTos for using Tobago?</question>
<answer>
<p>
- Please, see
- </p>
- <p>
- <a href="http://www.irian.biz/tobago-example-demo/">Tobago Demo</a>.
- </p>
- <p>
- There is also a demo for
- </p>
- <p>
- <a href="http://www.irian.biz/tobago-example-demo-2.0.x/">
- Tobago 2.0
- </a>
+ Beside this site, the use of Tobago is explained in the
+ <a href="http://tobago-vm.apache.org/">Demo</a>.
</p>
</answer>
</faq>
@@ -136,8 +126,8 @@
</p>
<p>Starting with Tobago 3.0 the Servlet API 3.0 will be used. Some more information about the
usage you will find in <a href="https://issues.apache.org/jira/browse/TOBAGO-1539">Jira</a>
- and in the <a href="http://www.irian.biz/tobago-example-demo-3.0.x/faces/content/20-component/100-upload/upload.xhtml">Tobago Demo 3.0</a>.
- There is also a <a href="http://www.irian.biz/tobago-example-demo/faces/content/10-intro/50-migration/97-migration/migration30.xhtml">migration guide</a> available.
+ and in the <a href="http://tobago-vm.apache.org/demo-3-release/faces/content/20-component/100-upload/upload.xhtml">Tobago Demo 3.0</a>.
+ There is also a <a href="http://tobago-vm.apache.org/demo-4-snapshot/content/10-intro/30-new+in+3+0/new+in+3+0.xhtml">migration guide</a> available.
</p>
</answer>
</faq>
@@ -147,7 +137,7 @@
<answer>
<p>The page tag already acts like a form tag. You only need a explicit form tag for partial validation of your data.
Please look at the forms example in the
- <a href="http://www.irian.biz/tobago-example-demo-3.0.x/faces/content/30-concept/08-form/form.xhtml">Tobago demo</a>
+ <a href="http://tobago-vm.apache.org/demo-3-release/faces/content/30-concept/08-form/form.xhtml">Tobago demo</a>
</p>
</answer>
</faq>
diff --git a/src/site/site.xml b/src/site/site.xml
index eac936c..b449dc6 100644
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -52,10 +52,10 @@
<menu name="Documentation">
<item name="Getting Started" href="http://myfaces.apache.org/tobago/getting-started.html"/>
<item name="Compatibility" href="http://myfaces.apache.org/tobago/compatibility.html"/>
- <item name="New in Tobago 3.0" href="http://www.irian.biz/tobago-example-demo/faces/content/10-intro/30-new+in+3+0/new+in+3+0.xhtml"/>
+ <item name="New in Tobago 3.0" href="http://tobago-vm.apache.org/demo-4-snapshot/content/10-intro/30-new+in+3+0/new+in+3+0.xhtml"/>
<item name="Guide to Tobago" href="http://myfaces.apache.org/tobago/guide.html"/>
<item name="Test Tobago 3.0 Demo" href="http://myfaces.apache.org/tobago/howto-test.html"/>
- <item name="Migration" href="http://www.irian.biz/tobago-example-demo/faces/content/10-intro/50-migration/97-migration/migration30.xhtml"/>
+ <item name="Migration" href="http://tobago-vm.apache.org/demo-4-snapshot/content/10-intro/50-migration/97-migration/migration30.xhtml"/>
<item name="Roadmap" href="https://issues.apache.org/jira/browse/TOBAGO?selectedTab=com.atlassian.jira.plugin.system.project%3Aroadmap-panel" />
<item name="FAQ" href="http://myfaces.apache.org/tobago/faq.html" />
<item name="API Documentation" href="http://myfaces.apache.org/tobago/api.html" />
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/intro.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/intro.xhtml
index 98ce2fc..32fe5fe 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/intro.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/intro.xhtml
@@ -55,12 +55,12 @@
<tc:section label="Local Demo">
<p>In case that this demo already runs on your local machine,
you can follow the link to the
- <tc:link label="public demo" link="http://www.irian.biz/tobago-example-demo-3.0.x/"/>.</p>
+ <tc:link label="public demo" link="http://tobago-vm.apache.org/"/>.</p>
<p>If this is the public demo and you want to build it on your own, read the following instructions.</p>
<tc:section label="Instructions">
<p>First of all you need
<tc:link label="Maven" link="https://maven.apache.org/"/> (at least version 3.0.4) and
- <tc:link label="Java SE 6" link="http://www.oracle.com/technetwork/java/javase/downloads/"/> or higher.</p>
+ <tc:link label="Java SE 8" link="http://www.oracle.com/technetwork/java/javase/downloads/"/> or higher.</p>
<p>After that, check out the source code from subversion repository.
<br/>
<code>git clone https://github.com/apache/myfaces-tobago</code>
--
To stop receiving notification emails like this one, please contact
['"commits@myfaces.apache.org" <co...@myfaces.apache.org>'].