mtsinc7/gourmetj-springboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: mtsinc7:95ceb82eed82bcb379917c113714c633b5fb102a
Branches Tags
mtsinc7:main
mtsinc7:version2
mtsinc7:VERSION2
..
compare: mtsinc7:a792f5d2b744724f640c415669b2f04978dc2842
Branches Tags
mtsinc7:main
mtsinc7:version2
mtsinc7:VERSION2

No commits in common. "95ceb82eed82bcb379917c113714c633b5fb102a" and "a792f5d2b744724f640c415669b2f04978dc2842" have entirely different histories.
95ceb82eed ... a792f5d2b7

7 changed files with 54 additions and 83 deletions
Show Stats Expand all files Collapse all files

12
pom.xml
View File

@ -122,14 +122,12 @@
<artifactId>spring-boot-starter-web</artifactId> <artifactId>spring-boot-starter-web</artifactId>
</dependency> </dependency>
<!-- https://mvnrepository.com/artifact/jakarta.servlet/jakarta.servlet-api --> <!-- <dependency>
<dependency> <groupId>jakarta.servlet.jsp</groupId>
<groupId>jakarta.servlet</groupId> <artifactId>jakarta.servlet.jsp-api</artifactId>
<artifactId>jakarta.servlet-api</artifactId> <version>2.3.3</version>
<version>6.0.0</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>-->
<!-- <dependency> <!-- <dependency>
<groupId>jakarta.servlet</groupId> <groupId>jakarta.servlet</groupId>
<artifactId>jstl</artifactId> <artifactId>jstl</artifactId>

11
src/main/java/com/mousetech/gourmetj/CookieBean.java
View File

@ -124,15 +124,4 @@ public class CookieBean {
public void setDisplayListSize(Integer value) { public void setDisplayListSize(Integer value) {
cookieMap.put(KEY_DISPLAY_ROWS, String.valueOf(value)); cookieMap.put(KEY_DISPLAY_ROWS, String.valueOf(value));
} }
public void sessionIdleListener() {
log.warn("Session Idle Listener fired.");
JSFUtils.addWarningMessage("Timeout approaching. Save your work!");
}
public void sessionTimeout() {
log.warn("Session Timeout Listener fired.");
JSFUtils.logout();
}
} }

16
src/main/java/com/mousetech/gourmetj/JSFUtils.java
View File

@ -12,7 +12,6 @@ import jakarta.faces.context.ExternalContext;
import jakarta.faces.context.FacesContext; import jakarta.faces.context.FacesContext;
import jakarta.faces.context.Flash; import jakarta.faces.context.Flash;
import jakarta.servlet.http.Cookie; import jakarta.servlet.http.Cookie;
import jakarta.servlet.http.HttpSession;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
@ -149,20 +148,5 @@ public class JSFUtils {
getExternalContext().addResponseCookie(name, getExternalContext().addResponseCookie(name,
URLEncoder.encode(value, "UTF-8"), URLEncoder.encode(value, "UTF-8"),
properties); properties);
}
/**
* Destroy current session, logging user out.
*/
public static void logout() {
log.warn("Logging out session");
jakarta.servlet.http.HttpSession session =
(HttpSession) getExternalContext().getSession(false);
if ( session != null ) {
session.invalidate();
} else {
log.warn("Session did not exist.");
}
} }
} }

4
src/main/java/com/mousetech/gourmetj/SpringPrimeFacesApplication.java
View File

@ -10,20 +10,18 @@ import org.springframework.boot.autoconfigure.domain.EntityScan;
import org.springframework.boot.web.server.ErrorPage; import org.springframework.boot.web.server.ErrorPage;
import org.springframework.boot.web.server.ErrorPageRegistrar; import org.springframework.boot.web.server.ErrorPageRegistrar;
import org.springframework.boot.web.server.ErrorPageRegistry; import org.springframework.boot.web.server.ErrorPageRegistry;
import org.springframework.boot.web.servlet.ServletComponentScan;
import org.springframework.boot.web.servlet.ServletContextInitializer; import org.springframework.boot.web.servlet.ServletContextInitializer;
import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Bean;
import org.springframework.http.HttpStatus; import org.springframework.http.HttpStatus;
@SpringBootApplication @SpringBootApplication
@ServletComponentScan
@EntityScan(value = { @EntityScan(value = {
"com.mousetech.gourmetj.persistence.model" }) "com.mousetech.gourmetj.persistence.model" })
public class SpringPrimeFacesApplication { public class SpringPrimeFacesApplication {
final String errorPage = "/error/error.html"; final String errorPage = "/error/error.html";
final String error404Page = "/error/error404.html"; final String error404Page = "/error/error404.html";
final String expiredPage = "/main.xhtml"; final String expiredPage = "/error/viewExpired.xhtml";
public static void main(String[] args) { public static void main(String[] args) {
SpringApplication.run(SpringPrimeFacesApplication.class, SpringApplication.run(SpringPrimeFacesApplication.class,

14
src/main/java/com/mousetech/gourmetj/UserSession.java
View File

@ -164,6 +164,20 @@ public class UserSession implements Serializable {
*/ */
private List<Recipe> shoppingList = new ArrayList<Recipe>(); private List<Recipe> shoppingList = new ArrayList<Recipe>();
/**
* @return the sessionTimeoutInterval, msec
*/
public long getSessionTimeoutInterval() {
return 5000L; //sessionTimeoutInterval;
}
public void sessionIdleListener() {
log.warn("Session Idle Listener fired.");
JSFUtils.addWarningMessage("Timeout approaching. Save your work!");
// PrimeFaces.current()
// .executeScript("sessionExpiredConfirmation.show()");
}
public String logoutAction() { public String logoutAction() {
log.warn("Session Idle listener logout"); log.warn("Session Idle listener logout");
return goHome(); return goHome();

78
src/main/resources/META-INF/resources/detailEdit.xhtml
View File

@ -15,14 +15,13 @@
<h:outputScript name="js/scrolltable.js" /> <h:outputScript name="js/scrolltable.js" />
<style> <style>
.deDescl { .deDescl {
width: 15em; width: 15em;
text-align: left; text-align: left;
}
}
.deDescr { .deDescr {
text-align: left; text-align: left;
} }
.ingSel { .ingSel {
width: 3em; width: 3em;
text-align: center; text-align: center;
@ -55,9 +54,7 @@
<p:tab id="overviewTab" <p:tab id="overviewTab"
title="Description" title="Description"
> >
<p:panelGrid columns="2" <p:panelGrid columns="2" columnClasses="deDescl, deDescr">
columnClasses="deDescl, deDescr"
>
<f:facet name="header">Description</f:facet> <f:facet name="header">Description</f:facet>
<p:outputLabel for="@next" <p:outputLabel for="@next"
value="Title" value="Title"
@ -152,15 +149,13 @@
rows="10" cols="45" rows="10" cols="45"
value="#{recipeDetailBean.recipe.description}" value="#{recipeDetailBean.recipe.description}"
/> />
</p:panelGrid> </p:panelGrid>
<p:panel id="picPanel"> <p:panel id="picPanel">
<img id="bigPix" <img id="bigPix"
src="/img/picture/?dt=#{recipeDetailBean.currentTime}" src="/img/picture/?dt=#{recipeDetailBean.currentTime}"
/> />
</p:panel> </p:panel>
<p:panelGrid id="picButtonPanel" <p:panelGrid id="picButtonPanel" columns="2">
columns="2"
>
<p:fileUpload id="ctlUpload" <p:fileUpload id="ctlUpload"
label="Upload Image" label="Upload Image"
listener="#{recipeDetailBean.ajaxUploadImage}" listener="#{recipeDetailBean.ajaxUploadImage}"
@ -170,14 +165,14 @@
auto="true" auto="true"
sizeLimit="1000000" sizeLimit="1000000"
allowTypes="/(\.|\/)(gif|jpe?g|png|webp)$/" allowTypes="/(\.|\/)(gif|jpe?g|png|webp)$/"
/> />
<p:commandButton id="ctlDelImg" <p:commandButton id="ctlDelImg"
value="Delete Image" value="Delete Image"
action="#{recipeDetailBean.ajaxDeleteImage}" action="#{recipeDetailBean.ajaxDeleteImage}"
update="picPanel" update="picPanel"
immediate="true" immediate="true"
/> />
</p:panelGrid> </p:panelGrid>
</p:tab> </p:tab>
<p:tab id="ingredientsTab" <p:tab id="ingredientsTab"
title="Ingredients" title="Ingredients"
@ -401,28 +396,23 @@
action="recipeDetails.jsf" action="recipeDetails.jsf"
/> />
<p:commandButton id="doHome" value="Home" <p:commandButton id="doHome" value="Home"
icon="ui-icon-home" ajax="false" icon="ui-icon-home"
immediate="true" action="main.jsf" ajax="false" immediate="true"
/> action="main.jsf"
/>
</h:form> </h:form>
</p:panel> </p:panel>
<!-- Note timeouts must be less than <!-- -->
session timeout in application properties--> <p:growl id="growl" showDetail="true" />
<p:growl id="growl" showDetail="true" sticky="true" />
<h:form id="frmTimeout"> <h:form id="frmTimeout">
<p:idleMonitor timeout="1500000"> <p:idleMonitor
<p:ajax id="ajaxIdle" event="idle" timeout="#{userSession.sessionTimeoutInterval}"
listener="#{cookieBean.sessionIdleListener}" >
update="growl" <p:ajax id="ajaxIdle" event="idle"
/> listener="#{userSession.sessionIdleListener}"
</p:idleMonitor> update="growl"
<p:idleMonitor timeout="1900000"> />
<p:ajax id="ajaxIdle" event="idle" </p:idleMonitor>
listener="#{cookieBean.sessionTimeout}"
update="growl"
oncomplete="window.location='#{request.contextPath}/main.jsf'"
/>
</p:idleMonitor>
</h:form> </h:form>
<!-- --> <!-- -->
<p:dialog id="addGroupDlg" widgetVar="addGroupDlg"> <p:dialog id="addGroupDlg" widgetVar="addGroupDlg">
@ -454,9 +444,7 @@
<p:dialog id="editShopcatDlg" <p:dialog id="editShopcatDlg"
widgetVar="editShopcatDlg" widgetVar="editShopcatDlg"
> >
<ui:include <ui:include src="/WEB-INF/layout/dialog/editShopcat.xhtml" />
src="/WEB-INF/layout/dialog/editShopcat.xhtml"
/>
</p:dialog> </p:dialog>
</ui:define> </ui:define>
</ui:composition> </ui:composition>

2
src/main/resources/application.yml
View File

@ -25,7 +25,7 @@ server:
servlet: servlet:
session: session:
timeout: '30m' timeout: '30m'
# Theme here overrides joinfaces theme # Theme here pverrides jinfaces theme
# context-parameters: # context-parameters:
# primefaces: # primefaces:
# THEME: vela # THEME: vela