diff --git a/src/main/java/com/mousetech/gourmetj/SpringPrimeFacesApplication.java b/src/main/java/com/mousetech/gourmetj/SpringPrimeFacesApplication.java index 3a43fb3..90e934e 100644 --- a/src/main/java/com/mousetech/gourmetj/SpringPrimeFacesApplication.java +++ b/src/main/java/com/mousetech/gourmetj/SpringPrimeFacesApplication.java @@ -23,7 +23,7 @@ public class SpringPrimeFacesApplication { final String errorPage = "/error/error.html"; final String error404Page = "/error/error404.html"; - final String expiredPage = "/error/viewExpired.html"; + final String expiredPage = "/error/viewExpired.xhtml"; public static void main(String[] args) { SpringApplication.run(SpringPrimeFacesApplication.class, diff --git a/src/main/java/com/mousetech/gourmetj/UserSession.java b/src/main/java/com/mousetech/gourmetj/UserSession.java index 0e4af9c..4a0c100 100644 --- a/src/main/java/com/mousetech/gourmetj/UserSession.java +++ b/src/main/java/com/mousetech/gourmetj/UserSession.java @@ -130,8 +130,8 @@ public class UserSession implements Serializable { } // Primefaces handle session timeout - // Session timeout, ms - long sessionTimeoutInterval = 30000L; + // Session timeout, ms (25 minutes) + long sessionTimeoutInterval = 25 * 60_000L; /** * @return the sessionTimeoutInterval diff --git a/src/main/resources/META-INF/resources/WEB-INF/faces-config.xml b/src/main/resources/META-INF/resources/WEB-INF/faces-config.xml new file mode 100644 index 0000000..359b914 --- /dev/null +++ b/src/main/resources/META-INF/resources/WEB-INF/faces-config.xml @@ -0,0 +1,17 @@ + + + GourmetJ + + * + + home + /main.jsf + + + diff --git a/src/main/resources/META-INF/resources/error/viewExpired.xhtml b/src/main/resources/META-INF/resources/error/viewExpired.xhtml new file mode 100644 index 0000000..2c3ba4b --- /dev/null +++ b/src/main/resources/META-INF/resources/error/viewExpired.xhtml @@ -0,0 +1,17 @@ + + + + + + View Expired + + +

View Expired.

+ + The user session has timed out. Return to main page. + + +
+ \ No newline at end of file diff --git a/src/main/resources/META-INF/resources/favicon.ico b/src/main/resources/META-INF/resources/favicon.ico new file mode 100644 index 0000000..767f978 Binary files /dev/null and b/src/main/resources/META-INF/resources/favicon.ico differ diff --git a/src/main/resources/META-INF/resources/recipeDetails.xhtml b/src/main/resources/META-INF/resources/recipeDetails.xhtml index 2f6d5d5..8523d0d 100644 --- a/src/main/resources/META-INF/resources/recipeDetails.xhtml +++ b/src/main/resources/META-INF/resources/recipeDetails.xhtml @@ -47,7 +47,7 @@