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 2021/09/23 14:44:23 UTC
[myfaces-tobago] 04/09: demo: Enhancements for Tobago 5.x
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
commit 651e609120d159c85f27621b79bd94464fa08c8e
Author: Udo Schnurpfeil <ud...@irian.eu>
AuthorDate: Thu Sep 23 12:45:21 2021 +0200
demo: Enhancements for Tobago 5.x
* Restructure the menu
issue: TOBAGO-1843
---
.../apache/myfaces/tobago/example/demo/ButtonLinkController.java | 4 ++--
.../main/java/org/apache/myfaces/tobago/example/demo/Outcome.java | 6 +++---
.../webapp/content/040-command/00-button-link/Button_and_Link.xhtml | 4 ++--
.../06-validation => 170-validation}/00/Content_Validation.test.js | 0
.../06-validation => 170-validation}/00/Content_Validation.xhtml | 0
.../{30-concept/06-validation => 170-validation}/01/JSR_303.test.js | 0
.../{30-concept/06-validation => 170-validation}/01/JSR_303.xhtml | 0
.../{30-concept/06-validation => 170-validation}/02/Severity.xhtml | 0
.../06-validation => 170-validation}/30-messages/Messages.test.js | 0
.../06-validation => 170-validation}/30-messages/Messages.xhtml | 0
.../{30-concept/06-validation => 170-validation}/Validation.xhtml | 0
.../{30-concept/07-conversion => 180-conversion}/Conversion.xhtml | 0
.../content/{30-concept/20-format => 190-format}/Format.xhtml | 0
.../webapp/content/{30-concept/10-theme => 200-theme}/Theme.xhtml | 0
.../content/{30-concept/12-browser => 210-browser}/Browser.xhtml | 0
.../content/{30-concept/14-locale => 220-locale}/Locale.xhtml | 0
.../900-test/60000-manual/4000-button-link/Button_Link.xhtml | 2 +-
tobago-example/tobago-example-demo/test-scenarios-locally.sh | 2 +-
18 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/ButtonLinkController.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/ButtonLinkController.java
index 55a4bdc..593ea75 100644
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/ButtonLinkController.java
+++ b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/ButtonLinkController.java
@@ -33,9 +33,9 @@ public class ButtonLinkController implements Serializable {
private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
- public Outcome linkToComponentsRoot() {
+ public Outcome linkToCommandsRoot() {
LOG.info("link to components root");
- return Outcome.COMPONENT_COMPONENT;
+ return Outcome.COMMAND;
}
public Outcome actionPage() {
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/Outcome.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/Outcome.java
index c3377c0..fa6da4f 100644
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/Outcome.java
+++ b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/Outcome.java
@@ -27,9 +27,9 @@ public enum Outcome {
CONCEPT_SECURITY_ROLES_XLOGIN(
"/content/30-concept/80-security/20-roles/x-login.xhtml?faces-redirect=true"),
CONCEPT_LOCALE(
- "/content/30-concept/14-locale/Locale.xhtml"),
- COMPONENT_COMPONENT(
- "/content/20-component/Component.xhtml?faces-redirect=true"),
+ "/content/220-locale/Locale.xhtml"),
+ COMMAND(
+ "/content/040-command/Command.xhtml?faces-redirect=true"),
TEST_BUTTONLINK_XACTION(
"/content/40-test/4000-button-link/x-action.xhtml?faces-redirect=true"),
TEST_BUTTONLINK_XTARGETACTION(
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/040-command/00-button-link/Button_and_Link.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/040-command/00-button-link/Button_and_Link.xhtml
index 887da3a..ed65ec4 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/040-command/00-button-link/Button_and_Link.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/040-command/00-button-link/Button_and_Link.xhtml
@@ -51,7 +51,7 @@
|
<tc:link id="l2" label="Disabled" disabled="true" link="https://www.apache.org/"/>
|
- <tc:link id="l4" label="Action" action="#{buttonLinkController.linkToComponentsRoot}"/>
+ <tc:link id="l4" label="Action" action="#{buttonLinkController.linkToCommandsRoot}"/>
|
<tc:link id="l5" label="Link with an image" image="#{request.contextPath}/image/feather-leaf.png"
link="https://www.apache.org/"/>
@@ -60,7 +60,7 @@
<demo-highlight language="markup"><tc:button label="apache.org" link="https://www.apache.org/"/></demo-highlight>
<tc:button id="b1" label="apache.org" link="https://www.apache.org/"/>
<tc:button id="b2" label="Disabled" disabled="true" link="https://www.apache.org/"/>
- <tc:button id="b4" label="Action" action="#{buttonLinkController.linkToComponentsRoot}"/>
+ <tc:button id="b4" label="Action" action="#{buttonLinkController.linkToCommandsRoot}"/>
<tc:button id="b5" image="#{request.contextPath}/image/feather-leaf.png" link="https://www.apache.org/"/>
</tc:section>
</tc:section>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/06-validation/00/Content_Validation.test.js b/tobago-example/tobago-example-demo/src/main/webapp/content/170-validation/00/Content_Validation.test.js
similarity index 100%
rename from tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/06-validation/00/Content_Validation.test.js
rename to tobago-example/tobago-example-demo/src/main/webapp/content/170-validation/00/Content_Validation.test.js
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/06-validation/00/Content_Validation.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/170-validation/00/Content_Validation.xhtml
similarity index 100%
rename from tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/06-validation/00/Content_Validation.xhtml
rename to tobago-example/tobago-example-demo/src/main/webapp/content/170-validation/00/Content_Validation.xhtml
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/06-validation/01/JSR_303.test.js b/tobago-example/tobago-example-demo/src/main/webapp/content/170-validation/01/JSR_303.test.js
similarity index 100%
rename from tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/06-validation/01/JSR_303.test.js
rename to tobago-example/tobago-example-demo/src/main/webapp/content/170-validation/01/JSR_303.test.js
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/06-validation/01/JSR_303.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/170-validation/01/JSR_303.xhtml
similarity index 100%
rename from tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/06-validation/01/JSR_303.xhtml
rename to tobago-example/tobago-example-demo/src/main/webapp/content/170-validation/01/JSR_303.xhtml
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/06-validation/02/Severity.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/170-validation/02/Severity.xhtml
similarity index 100%
rename from tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/06-validation/02/Severity.xhtml
rename to tobago-example/tobago-example-demo/src/main/webapp/content/170-validation/02/Severity.xhtml
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/06-validation/30-messages/Messages.test.js b/tobago-example/tobago-example-demo/src/main/webapp/content/170-validation/30-messages/Messages.test.js
similarity index 100%
rename from tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/06-validation/30-messages/Messages.test.js
rename to tobago-example/tobago-example-demo/src/main/webapp/content/170-validation/30-messages/Messages.test.js
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/06-validation/30-messages/Messages.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/170-validation/30-messages/Messages.xhtml
similarity index 100%
rename from tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/06-validation/30-messages/Messages.xhtml
rename to tobago-example/tobago-example-demo/src/main/webapp/content/170-validation/30-messages/Messages.xhtml
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/06-validation/Validation.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/170-validation/Validation.xhtml
similarity index 100%
rename from tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/06-validation/Validation.xhtml
rename to tobago-example/tobago-example-demo/src/main/webapp/content/170-validation/Validation.xhtml
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/07-conversion/Conversion.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/180-conversion/Conversion.xhtml
similarity index 100%
rename from tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/07-conversion/Conversion.xhtml
rename to tobago-example/tobago-example-demo/src/main/webapp/content/180-conversion/Conversion.xhtml
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/20-format/Format.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/190-format/Format.xhtml
similarity index 100%
rename from tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/20-format/Format.xhtml
rename to tobago-example/tobago-example-demo/src/main/webapp/content/190-format/Format.xhtml
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/10-theme/Theme.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/200-theme/Theme.xhtml
similarity index 100%
rename from tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/10-theme/Theme.xhtml
rename to tobago-example/tobago-example-demo/src/main/webapp/content/200-theme/Theme.xhtml
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/12-browser/Browser.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/210-browser/Browser.xhtml
similarity index 100%
rename from tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/12-browser/Browser.xhtml
rename to tobago-example/tobago-example-demo/src/main/webapp/content/210-browser/Browser.xhtml
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/14-locale/Locale.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/220-locale/Locale.xhtml
similarity index 100%
rename from tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/14-locale/Locale.xhtml
rename to tobago-example/tobago-example-demo/src/main/webapp/content/220-locale/Locale.xhtml
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/60000-manual/4000-button-link/Button_Link.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/60000-manual/4000-button-link/Button_Link.xhtml
index 70bde8c..9bc7c20 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/60000-manual/4000-button-link/Button_Link.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/60000-manual/4000-button-link/Button_Link.xhtml
@@ -27,7 +27,7 @@
<tc:segmentLayout extraSmall="6seg 6seg">
<tc:flexLayout columns="auto auto" id="fl1">
<tc:in id="action"/>
- <tc:link label="actionLink" action="#{buttonLinkController.linkToComponentsRoot}"/>
+ <tc:link label="actionLink" action="#{buttonLinkController.linkToCommandsRoot}"/>
</tc:flexLayout>
<tc:flexLayout columns="auto auto" id="fl2">
diff --git a/tobago-example/tobago-example-demo/test-scenarios-locally.sh b/tobago-example/tobago-example-demo/test-scenarios-locally.sh
index b3d8325..cbb34e2 100755
--- a/tobago-example/tobago-example-demo/test-scenarios-locally.sh
+++ b/tobago-example/tobago-example-demo/test-scenarios-locally.sh
@@ -149,7 +149,7 @@ check() {
echo "Found a process ${PID} on port ${PORT} running!"
echo "Now testing..."
- STATUS=$(curl -o ${WORK}/JSR_303.xhtml -w "%{http_code}" http://localhost:${PORT}/content/30-concept/06-validation/01/JSR_303.xhtml)
+ STATUS=$(curl -o ${WORK}/JSR_303.xhtml -w "%{http_code}" http://localhost:${PORT}/content/170-validation/01/JSR_303.xhtml)
if [[ $? -gt 0 ]] ; then
error "The curl command has failed!" ${PID}