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:28 UTC
[myfaces-tobago] 09/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 eeb209be2f617e0eaffa6b4cf890b02eade1aaa3
Author: Udo Schnurpfeil <ud...@irian.eu>
AuthorDate: Thu Sep 23 14:51:45 2021 +0200
demo: Enhancements for Tobago 5.x
* Restructure the menu
issue: TOBAGO-1843
---
.../example/demo/bestpractice/BestPracticeController.java | 2 +-
.../example/demo/bestpractice/TransitionController.java | 2 +-
.../23-transition => 350-transition}/Transition.xhtml | 0
.../x-transition-after-sleep.xhtml | 2 +-
.../Non_Faces_Response.xhtml | 0
.../x-sample.pdf | Bin
.../x-sample.txt | 0
.../Non_Faces_Request.xhtml | 10 +++++-----
.../x-fish-pond.xhtml | 4 ++--
9 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/bestpractice/BestPracticeController.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/bestpractice/BestPracticeController.java
index 3000e9a..ecf0215 100644
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/bestpractice/BestPracticeController.java
+++ b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/bestpractice/BestPracticeController.java
@@ -72,7 +72,7 @@ public class BestPracticeController {
}
private InputStream getInputStream(boolean pdf, FacesContext facesContext) {
- final String path = "content/30-concept/24-non-faces-response/x-sample." + (pdf ? "pdf" : "txt");
+ final String path = "content/360-non-faces-response/x-sample." + (pdf ? "pdf" : "txt");
InputStream inputStream = facesContext.getExternalContext().getResourceAsStream(path);
if (inputStream == null) {
inputStream = facesContext.getExternalContext().getResourceAsStream("/" + path);
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/bestpractice/TransitionController.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/bestpractice/TransitionController.java
index 42c227f..acdb968 100644
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/bestpractice/TransitionController.java
+++ b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/bestpractice/TransitionController.java
@@ -37,7 +37,7 @@ public class TransitionController {
LOG.info("Waiting " + sleep + " millis.");
Thread.sleep(sleep);
- return "/content/30-concept/23-transition/x-transition-after-sleep.xhtml?faces-redirect=true";
+ return "/content/350-transition/x-transition-after-sleep.xhtml?faces-redirect=true";
}
public String sleep5s() throws InterruptedException {
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/23-transition/Transition.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/350-transition/Transition.xhtml
similarity index 100%
rename from tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/23-transition/Transition.xhtml
rename to tobago-example/tobago-example-demo/src/main/webapp/content/350-transition/Transition.xhtml
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/23-transition/x-transition-after-sleep.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/350-transition/x-transition-after-sleep.xhtml
similarity index 92%
rename from tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/23-transition/x-transition-after-sleep.xhtml
rename to tobago-example/tobago-example-demo/src/main/webapp/content/350-transition/x-transition-after-sleep.xhtml
index f54cc25..4175919 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/23-transition/x-transition-after-sleep.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/350-transition/x-transition-after-sleep.xhtml
@@ -22,6 +22,6 @@
xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
<ui:param name="title" value="Transition after sleep"/>
- <tc:button label="Back" outcome="/content/30-concept/23-transition/Transition.xhtml"/>
+ <tc:button label="Back" outcome="/content/350-transition/Transition.xhtml"/>
</ui:composition>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/24-non-faces-response/Non_Faces_Response.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/360-non-faces-response/Non_Faces_Response.xhtml
similarity index 100%
rename from tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/24-non-faces-response/Non_Faces_Response.xhtml
rename to tobago-example/tobago-example-demo/src/main/webapp/content/360-non-faces-response/Non_Faces_Response.xhtml
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/24-non-faces-response/x-sample.pdf b/tobago-example/tobago-example-demo/src/main/webapp/content/360-non-faces-response/x-sample.pdf
similarity index 100%
rename from tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/24-non-faces-response/x-sample.pdf
rename to tobago-example/tobago-example-demo/src/main/webapp/content/360-non-faces-response/x-sample.pdf
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/24-non-faces-response/x-sample.txt b/tobago-example/tobago-example-demo/src/main/webapp/content/360-non-faces-response/x-sample.txt
similarity index 100%
rename from tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/24-non-faces-response/x-sample.txt
rename to tobago-example/tobago-example-demo/src/main/webapp/content/360-non-faces-response/x-sample.txt
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/90-non-faces-request/Non_Faces_Request.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/370-non-faces-request/Non_Faces_Request.xhtml
similarity index 60%
rename from tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/90-non-faces-request/Non_Faces_Request.xhtml
rename to tobago-example/tobago-example-demo/src/main/webapp/content/370-non-faces-request/Non_Faces_Request.xhtml
index 660988d..cde8a0a 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/90-non-faces-request/Non_Faces_Request.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/370-non-faces-request/Non_Faces_Request.xhtml
@@ -32,11 +32,11 @@
<p>
Use these links from external applications:<br/>
- <a href="#{request.contextPath}/content/30-concept/90-non-faces-request/x-fish-pond.xhtml?fishId=0&jfwid=#{request.parameterMap['jfwid'][0]}">fishId=0</a><br/>
- <a href="#{request.contextPath}/content/30-concept/90-non-faces-request/x-fish-pond.xhtml?fishId=1&jfwid=#{request.parameterMap['jfwid'][0]}">fishId=1</a><br/>
- <a href="#{request.contextPath}/content/30-concept/90-non-faces-request/x-fish-pond.xhtml?fishId=2&jfwid=#{request.parameterMap['jfwid'][0]}">fishId=2</a><br/>
- <a href="#{request.contextPath}/content/30-concept/90-non-faces-request/x-fish-pond.xhtml?fishId=3&jfwid=#{request.parameterMap['jfwid'][0]}">fishId=3</a><br/>
- <a href="#{request.contextPath}/content/30-concept/90-non-faces-request/x-fish-pond.xhtml?fishId=4&jfwid=#{request.parameterMap['jfwid'][0]}">fishId=4</a><br/>
+ <a href="#{request.contextPath}/content/370-non-faces-request/x-fish-pond.xhtml?fishId=0&jfwid=#{request.parameterMap['jfwid'][0]}">fishId=0</a><br/>
+ <a href="#{request.contextPath}/content/370-non-faces-request/x-fish-pond.xhtml?fishId=1&jfwid=#{request.parameterMap['jfwid'][0]}">fishId=1</a><br/>
+ <a href="#{request.contextPath}/content/370-non-faces-request/x-fish-pond.xhtml?fishId=2&jfwid=#{request.parameterMap['jfwid'][0]}">fishId=2</a><br/>
+ <a href="#{request.contextPath}/content/370-non-faces-request/x-fish-pond.xhtml?fishId=3&jfwid=#{request.parameterMap['jfwid'][0]}">fishId=3</a><br/>
+ <a href="#{request.contextPath}/content/370-non-faces-request/x-fish-pond.xhtml?fishId=4&jfwid=#{request.parameterMap['jfwid'][0]}">fishId=4</a><br/>
</p>
</tc:panel>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/90-non-faces-request/x-fish-pond.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/370-non-faces-request/x-fish-pond.xhtml
similarity index 89%
rename from tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/90-non-faces-request/x-fish-pond.xhtml
rename to tobago-example/tobago-example-demo/src/main/webapp/content/370-non-faces-request/x-fish-pond.xhtml
index e943e2f..c73dcbc 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/90-non-faces-request/x-fish-pond.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/370-non-faces-request/x-fish-pond.xhtml
@@ -40,7 +40,7 @@
<f:ajax render="pond :page:header:headerInfo" execute="pond"/>
</tc:button>
<tc:button label="back to start"
- action="/content/30-concept/90-non-faces-request/Non_Faces_Request.xhtml?faces-redirect=true"/>
+ action="/content/370-non-faces-request/Non_Faces_Request.xhtml?faces-redirect=true"/>
</tc:buttons>
<!-- todo: space between buttons and in -->
@@ -48,7 +48,7 @@
<tc:in label="Id:" value="#{fishPond.selectedFishId}">
<f:facet name="after">
<tc:link label="Go"
- action="/content/30-concept/90-non-faces-request/x-fish-pond.xhtml?faces-redirect=true&includeViewParams=true"/>
+ action="/content/370-non-faces-request/x-fish-pond.xhtml?faces-redirect=true&includeViewParams=true"/>
</f:facet>
</tc:in>