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 2022/08/03 10:59:32 UTC
[myfaces-tobago] branch main updated: demo: update
This is an automated email from the ASF dual-hosted git repository.
lofwyr pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/myfaces-tobago.git
The following commit(s) were added to refs/heads/main by this push:
new a1b6aaefb3 demo: update
new 5669f5e191 Merge pull request #3045 from lofwyr14/main-demo-update
a1b6aaefb3 is described below
commit a1b6aaefb3d28c16bb4f4fbab266dd8e2168cfd5
Author: Udo Schnurpfeil <ud...@irian.eu>
AuthorDate: Wed Aug 3 12:44:56 2022 +0200
demo: update
---
.../org/apache/myfaces/tobago/example/demo/DockerServer.java | 6 ++----
.../apache/myfaces/tobago/example/demo/NavigationTree.java | 11 +++--------
2 files changed, 5 insertions(+), 12 deletions(-)
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/DockerServer.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/DockerServer.java
index 113b10975e..3347c71582 100644
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/DockerServer.java
+++ b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/DockerServer.java
@@ -45,10 +45,8 @@ public enum DockerServer implements Serializable {
0,
"tomee",
new String[]{
- "8-jre-1.7.5-plus",
- "8-jre-7.0.5-plus",
- "8-jre-7.1.0-plus",
- "11-jre-8.0.0-M3-plus"},
+ "8.0-jre8-plus",
+ "9.0-jre11-plus"},
false,
" -Djsf=provided"),
liberty(
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/NavigationTree.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/NavigationTree.java
index 9f97265d14..df218d108f 100644
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/NavigationTree.java
+++ b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/NavigationTree.java
@@ -59,20 +59,15 @@ public class NavigationTree implements Serializable {
@Inject
private Event<NavigationNode> events;
- /**
- * todo: Seems not working with Java EE 6, needs Java EE 7?
- */
-// @Inject
-// private ServletContext servletContext;
+ @Inject
+ private ServletContext servletContext;
+
public NavigationTree() {
LOG.info("<init> " + this);
}
@PostConstruct
protected void postConstruct() {
- // todo: refactor with Java EE 7
- final ServletContext servletContext;
- servletContext = (ServletContext) FacesContext.getCurrentInstance().getExternalContext().getContext();
final List<NavigationNode> nodes = new ArrayList<>();