.classpath

@@ -9,27 +9,89 @@
 	<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
-			<attribute name="optional" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
+	<classpathentry kind="var" path="M2_REPO/javax/annotation/javax.annotation-api/1.3.2/javax.annotation-api-1.3.2.jar" sourcepath="M2_REPO/javax/annotation/javax.annotation-api/1.3.2/javax.annotation-api-1.3.2-sources.jar"/>
+	<classpathentry kind="var" path="M2_REPO/javax/enterprise/cdi-api/2.0/cdi-api-2.0.jar" sourcepath="M2_REPO/javax/enterprise/cdi-api/2.0/cdi-api-2.0-sources.jar"/>
+	<classpathentry kind="var" path="M2_REPO/javax/interceptor/javax.interceptor-api/1.2/javax.interceptor-api-1.2.jar" sourcepath="M2_REPO/javax/interceptor/javax.interceptor-api/1.2/javax.interceptor-api-1.2-sources.jar"/>
+	<classpathentry kind="var" path="M2_REPO/javax/inject/javax.inject/1/javax.inject-1.jar" sourcepath="M2_REPO/javax/inject/javax.inject/1/javax.inject-1-sources.jar"/>
+	<classpathentry kind="var" path="M2_REPO/javax/transaction/javax.transaction-api/1.3/javax.transaction-api-1.3.jar" sourcepath="M2_REPO/javax/transaction/javax.transaction-api/1.3/javax.transaction-api-1.3-sources.jar"/>
+	<classpathentry kind="var" path="M2_REPO/javax/xml/bind/jaxb-api/2.3.1/jaxb-api-2.3.1.jar" sourcepath="M2_REPO/javax/xml/bind/jaxb-api/2.3.1/jaxb-api-2.3.1-sources.jar"/>
+	<classpathentry kind="var" path="M2_REPO/javax/activation/javax.activation-api/1.2.0/javax.activation-api-1.2.0.jar" sourcepath="M2_REPO/javax/activation/javax.activation-api/1.2.0/javax.activation-api-1.2.0-sources.jar"/>
+	<classpathentry kind="var" path="M2_REPO/javax/persistence/javax.persistence-api/2.2/javax.persistence-api-2.2.jar" sourcepath="M2_REPO/javax/persistence/javax.persistence-api/2.2/javax.persistence-api-2.2-sources.jar"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
+	<classpathentry kind="var" path="M2_REPO/org/joinfaces/primefaces-spring-boot-starter/3.3.0-rc2/primefaces-spring-boot-starter-3.3.0-rc2.jar" sourcepath="M2_REPO/org/joinfaces/primefaces-spring-boot-starter/3.3.0-rc2/primefaces-spring-boot-starter-3.3.0-rc2-sources.jar"/>
+	<classpathentry kind="var" path="M2_REPO/org/primefaces/extensions/resources-ckeditor/6.2.9/resources-ckeditor-6.2.9.jar" sourcepath="M2_REPO/org/primefaces/extensions/resources-ckeditor/6.2.9/resources-ckeditor-6.2.9-sources.jar"/>
+	<classpathentry kind="var" path="M2_REPO/commons-io/commons-io/2.6/commons-io-2.6.jar" sourcepath="M2_REPO/commons-io/commons-io/2.6/commons-io-2.6-sources.jar"/>
+	<classpathentry kind="var" path="M2_REPO/org/apache/commons/commons-lang3/3.8.1/commons-lang3-3.8.1.jar" sourcepath="M2_REPO/org/apache/commons/commons-lang3/3.8.1/commons-lang3-3.8.1-sources.jar"/>
+	<classpathentry kind="var" path="M2_REPO/org/joinfaces/jsf-spring-boot-starter/3.3.0-rc2/jsf-spring-boot-starter-3.3.0-rc2.jar" sourcepath="M2_REPO/org/joinfaces/jsf-spring-boot-starter/3.3.0-rc2/jsf-spring-boot-starter-3.3.0-rc2-sources.jar"/>
+	<classpathentry kind="var" path="M2_REPO/org/springframework/security/spring-security-taglibs/5.1.1.RELEASE/spring-security-taglibs-5.1.1.RELEASE.jar" sourcepath="M2_REPO/org/springframework/security/spring-security-taglibs/5.1.1.RELEASE/spring-security-taglibs-5.1.1.RELEASE-sources.jar"/>
+	<classpathentry kind="var" path="M2_REPO/org/springframework/spring-aop/5.1.2.RELEASE/spring-aop-5.1.2.RELEASE.jar" sourcepath="M2_REPO/org/springframework/spring-aop/5.1.2.RELEASE/spring-aop-5.1.2.RELEASE-sources.jar"/>
+	<classpathentry kind="var" path="M2_REPO/org/springframework/spring-beans/5.1.2.RELEASE/spring-beans-5.1.2.RELEASE.jar" sourcepath="M2_REPO/org/springframework/spring-beans/5.1.2.RELEASE/spring-beans-5.1.2.RELEASE-sources.jar"/>
+	<classpathentry kind="var" path="M2_REPO/org/springframework/spring-core/5.1.2.RELEASE/spring-core-5.1.2.RELEASE.jar" sourcepath="M2_REPO/org/springframework/spring-core/5.1.2.RELEASE/spring-core-5.1.2.RELEASE-sources.jar"/>
+	<classpathentry kind="var" path="M2_REPO/org/springframework/spring-jcl/5.1.2.RELEASE/spring-jcl-5.1.2.RELEASE.jar" sourcepath="M2_REPO/org/springframework/spring-jcl/5.1.2.RELEASE/spring-jcl-5.1.2.RELEASE-sources.jar"/>
+	<classpathentry kind="var" path="M2_REPO/org/springframework/spring-context/5.1.2.RELEASE/spring-context-5.1.2.RELEASE.jar" sourcepath="M2_REPO/org/springframework/spring-context/5.1.2.RELEASE/spring-context-5.1.2.RELEASE-sources.jar"/>
+	<classpathentry kind="var" path="M2_REPO/org/springframework/spring-expression/5.1.2.RELEASE/spring-expression-5.1.2.RELEASE.jar" sourcepath="M2_REPO/org/springframework/spring-expression/5.1.2.RELEASE/spring-expression-5.1.2.RELEASE-sources.jar"/>
+	<classpathentry kind="var" path="M2_REPO/org/springframework/spring-web/5.1.2.RELEASE/spring-web-5.1.2.RELEASE.jar" sourcepath="M2_REPO/org/springframework/spring-web/5.1.2.RELEASE/spring-web-5.1.2.RELEASE-sources.jar"/>
+	<classpathentry kind="var" path="M2_REPO/org/joinfaces/joinfaces-autoconfigure/3.3.0-rc2/joinfaces-autoconfigure-3.3.0-rc2.jar" sourcepath="M2_REPO/org/joinfaces/joinfaces-autoconfigure/3.3.0-rc2/joinfaces-autoconfigure-3.3.0-rc2-sources.jar"/>
+	<classpathentry kind="var" path="M2_REPO/org/springframework/boot/spring-boot-autoconfigure/2.1.0.RELEASE/spring-boot-autoconfigure-2.1.0.RELEASE.jar" sourcepath="M2_REPO/org/springframework/boot/spring-boot-autoconfigure/2.1.0.RELEASE/spring-boot-autoconfigure-2.1.0.RELEASE-sources.jar"/>
+	<classpathentry kind="var" path="M2_REPO/org/springframework/boot/spring-boot/2.1.0.RELEASE/spring-boot-2.1.0.RELEASE.jar" sourcepath="M2_REPO/org/springframework/boot/spring-boot/2.1.0.RELEASE/spring-boot-2.1.0.RELEASE-sources.jar"/>
+	<classpathentry kind="var" path="M2_REPO/org/reflections/reflections/0.9.11/reflections-0.9.11.jar" sourcepath="M2_REPO/org/reflections/reflections/0.9.11/reflections-0.9.11-sources.jar"/>
+	<classpathentry kind="var" path="M2_REPO/com/google/guava/guava/20.0/guava-20.0.jar" sourcepath="M2_REPO/com/google/guava/guava/20.0/guava-20.0-sources.jar"/>
+	<classpathentry kind="var" path="M2_REPO/org/javassist/javassist/3.23.1-GA/javassist-3.23.1-GA.jar" sourcepath="M2_REPO/org/javassist/javassist/3.23.1-GA/javassist-3.23.1-GA-sources.jar"/>
+	<classpathentry kind="var" path="M2_REPO/org/springframework/boot/spring-boot-starter/2.1.0.RELEASE/spring-boot-starter-2.1.0.RELEASE.jar"/>
+	<classpathentry kind="var" path="M2_REPO/org/springframework/boot/spring-boot-starter-logging/2.1.0.RELEASE/spring-boot-starter-logging-2.1.0.RELEASE.jar"/>
+	<classpathentry kind="var" path="M2_REPO/ch/qos/logback/logback-classic/1.2.3/logback-classic-1.2.3.jar" sourcepath="M2_REPO/ch/qos/logback/logback-classic/1.2.3/logback-classic-1.2.3-sources.jar"/>
+	<classpathentry kind="var" path="M2_REPO/ch/qos/logback/logback-core/1.2.3/logback-core-1.2.3.jar" sourcepath="M2_REPO/ch/qos/logback/logback-core/1.2.3/logback-core-1.2.3-sources.jar"/>
+	<classpathentry kind="var" path="M2_REPO/org/slf4j/slf4j-api/1.7.25/slf4j-api-1.7.25.jar" sourcepath="M2_REPO/org/slf4j/slf4j-api/1.7.25/slf4j-api-1.7.25-sources.jar"/>
+	<classpathentry kind="var" path="M2_REPO/org/apache/logging/log4j/log4j-to-slf4j/2.11.1/log4j-to-slf4j-2.11.1.jar" sourcepath="M2_REPO/org/apache/logging/log4j/log4j-to-slf4j/2.11.1/log4j-to-slf4j-2.11.1-sources.jar"/>
+	<classpathentry kind="var" path="M2_REPO/org/apache/logging/log4j/log4j-api/2.11.1/log4j-api-2.11.1.jar" sourcepath="M2_REPO/org/apache/logging/log4j/log4j-api/2.11.1/log4j-api-2.11.1-sources.jar"/>
+	<classpathentry kind="var" path="M2_REPO/org/slf4j/jul-to-slf4j/1.7.25/jul-to-slf4j-1.7.25.jar" sourcepath="M2_REPO/org/slf4j/jul-to-slf4j/1.7.25/jul-to-slf4j-1.7.25-sources.jar"/>
+	<classpathentry kind="var" path="M2_REPO/org/yaml/snakeyaml/1.23/snakeyaml-1.23.jar" sourcepath="M2_REPO/org/yaml/snakeyaml/1.23/snakeyaml-1.23-sources.jar"/>
+	<classpathentry kind="var" path="M2_REPO/org/joinfaces/tomcat-spring-boot-starter/3.3.0-rc2/tomcat-spring-boot-starter-3.3.0-rc2.jar" sourcepath="M2_REPO/org/joinfaces/tomcat-spring-boot-starter/3.3.0-rc2/tomcat-spring-boot-starter-3.3.0-rc2-sources.jar"/>
+	<classpathentry kind="var" path="M2_REPO/org/springframework/boot/spring-boot-starter-tomcat/2.1.0.RELEASE/spring-boot-starter-tomcat-2.1.0.RELEASE.jar"/>
+	<classpathentry kind="var" path="M2_REPO/org/apache/tomcat/embed/tomcat-embed-core/9.0.12/tomcat-embed-core-9.0.12.jar" sourcepath="M2_REPO/org/apache/tomcat/embed/tomcat-embed-core/9.0.12/tomcat-embed-core-9.0.12-sources.jar"/>
+	<classpathentry kind="var" path="M2_REPO/org/apache/tomcat/embed/tomcat-embed-el/9.0.12/tomcat-embed-el-9.0.12.jar" sourcepath="M2_REPO/org/apache/tomcat/embed/tomcat-embed-el/9.0.12/tomcat-embed-el-9.0.12-sources.jar"/>
+	<classpathentry kind="var" path="M2_REPO/org/apache/tomcat/embed/tomcat-embed-websocket/9.0.12/tomcat-embed-websocket-9.0.12.jar" sourcepath="M2_REPO/org/apache/tomcat/embed/tomcat-embed-websocket/9.0.12/tomcat-embed-websocket-9.0.12-sources.jar"/>
+	<classpathentry kind="var" path="M2_REPO/org/apache/tomcat/embed/tomcat-embed-jasper/9.0.12/tomcat-embed-jasper-9.0.12.jar" sourcepath="M2_REPO/org/apache/tomcat/embed/tomcat-embed-jasper/9.0.12/tomcat-embed-jasper-9.0.12-sources.jar"/>
+	<classpathentry kind="var" path="M2_REPO/org/eclipse/jdt/ecj/3.13.102/ecj-3.13.102.jar" sourcepath="M2_REPO/org/eclipse/jdt/ecj/3.13.102/ecj-3.13.102-sources.jar"/>
+	<classpathentry kind="var" path="M2_REPO/org/joinfaces/mojarra-spring-boot-starter/3.3.0-rc2/mojarra-spring-boot-starter-3.3.0-rc2.jar" sourcepath="M2_REPO/org/joinfaces/mojarra-spring-boot-starter/3.3.0-rc2/mojarra-spring-boot-starter-3.3.0-rc2-sources.jar"/>
+	<classpathentry kind="var" path="M2_REPO/org/glassfish/javax.faces/2.3.7/javax.faces-2.3.7.jar" sourcepath="M2_REPO/org/glassfish/javax.faces/2.3.7/javax.faces-2.3.7-sources.jar"/>
+	<classpathentry kind="var" path="M2_REPO/org/joinfaces/omnifaces1-spring-boot-starter/3.3.0-rc2/omnifaces1-spring-boot-starter-3.3.0-rc2.jar" sourcepath="M2_REPO/org/joinfaces/omnifaces1-spring-boot-starter/3.3.0-rc2/omnifaces1-spring-boot-starter-3.3.0-rc2-sources.jar"/>
+	<classpathentry kind="var" path="M2_REPO/org/omnifaces/omnifaces/1.14.1/omnifaces-1.14.1.jar" sourcepath="M2_REPO/org/omnifaces/omnifaces/1.14.1/omnifaces-1.14.1-sources.jar"/>
+	<classpathentry kind="var" path="M2_REPO/org/joinfaces/spring-security-jsf-taglib/3.3.0-rc2/spring-security-jsf-taglib-3.3.0-rc2.jar" sourcepath="M2_REPO/org/joinfaces/spring-security-jsf-taglib/3.3.0-rc2/spring-security-jsf-taglib-3.3.0-rc2-sources.jar"/>
+	<classpathentry kind="var" path="M2_REPO/org/primefaces/primefaces/6.2/primefaces-6.2.jar" sourcepath="M2_REPO/org/primefaces/primefaces/6.2/primefaces-6.2-sources.jar"/>
+	<classpathentry kind="var" path="M2_REPO/org/primefaces/extensions/primefaces-extensions/6.2.9/primefaces-extensions-6.2.9.jar" sourcepath="M2_REPO/org/primefaces/extensions/primefaces-extensions/6.2.9/primefaces-extensions-6.2.9-sources.jar"/>
+	<classpathentry kind="var" path="M2_REPO/com/google/code/gson/gson/2.8.5/gson-2.8.5.jar" sourcepath="M2_REPO/com/google/code/gson/gson/2.8.5/gson-2.8.5-sources.jar"/>
+	<classpathentry kind="var" path="M2_REPO/org/springframework/boot/spring-boot-starter-data-jpa/2.1.0.RELEASE/spring-boot-starter-data-jpa-2.1.0.RELEASE.jar"/>
+	<classpathentry kind="var" path="M2_REPO/org/springframework/boot/spring-boot-starter-aop/2.1.0.RELEASE/spring-boot-starter-aop-2.1.0.RELEASE.jar"/>
+	<classpathentry kind="var" path="M2_REPO/org/aspectj/aspectjweaver/1.9.2/aspectjweaver-1.9.2.jar" sourcepath="M2_REPO/org/aspectj/aspectjweaver/1.9.2/aspectjweaver-1.9.2-sources.jar"/>
+	<classpathentry kind="var" path="M2_REPO/org/springframework/boot/spring-boot-starter-jdbc/2.1.0.RELEASE/spring-boot-starter-jdbc-2.1.0.RELEASE.jar"/>
+	<classpathentry kind="var" path="M2_REPO/com/zaxxer/HikariCP/3.2.0/HikariCP-3.2.0.jar" sourcepath="M2_REPO/com/zaxxer/HikariCP/3.2.0/HikariCP-3.2.0-sources.jar"/>
+	<classpathentry kind="var" path="M2_REPO/org/springframework/spring-jdbc/5.1.2.RELEASE/spring-jdbc-5.1.2.RELEASE.jar" sourcepath="M2_REPO/org/springframework/spring-jdbc/5.1.2.RELEASE/spring-jdbc-5.1.2.RELEASE-sources.jar"/>
+	<classpathentry kind="var" path="M2_REPO/org/springframework/spring-tx/5.1.2.RELEASE/spring-tx-5.1.2.RELEASE.jar" sourcepath="M2_REPO/org/springframework/spring-tx/5.1.2.RELEASE/spring-tx-5.1.2.RELEASE-sources.jar"/>
+	<classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate-core/5.3.7.Final/hibernate-core-5.3.7.Final.jar" sourcepath="M2_REPO/org/hibernate/hibernate-core/5.3.7.Final/hibernate-core-5.3.7.Final-sources.jar"/>
+	<classpathentry kind="var" path="M2_REPO/org/jboss/logging/jboss-logging/3.3.2.Final/jboss-logging-3.3.2.Final.jar" sourcepath="M2_REPO/org/jboss/logging/jboss-logging/3.3.2.Final/jboss-logging-3.3.2.Final-sources.jar"/>
+	<classpathentry kind="var" path="M2_REPO/net/bytebuddy/byte-buddy/1.9.3/byte-buddy-1.9.3.jar" sourcepath="M2_REPO/net/bytebuddy/byte-buddy/1.9.3/byte-buddy-1.9.3-sources.jar"/>
+	<classpathentry kind="var" path="M2_REPO/antlr/antlr/2.7.7/antlr-2.7.7.jar"/>
+	<classpathentry kind="var" path="M2_REPO/org/jboss/jandex/2.0.5.Final/jandex-2.0.5.Final.jar" sourcepath="M2_REPO/org/jboss/jandex/2.0.5.Final/jandex-2.0.5.Final-sources.jar"/>
+	<classpathentry kind="var" path="M2_REPO/com/fasterxml/classmate/1.4.0/classmate-1.4.0.jar" sourcepath="M2_REPO/com/fasterxml/classmate/1.4.0/classmate-1.4.0-sources.jar"/>
+	<classpathentry kind="var" path="M2_REPO/org/dom4j/dom4j/2.1.1/dom4j-2.1.1.jar" sourcepath="M2_REPO/org/dom4j/dom4j/2.1.1/dom4j-2.1.1-sources.jar"/>
+	<classpathentry kind="var" path="M2_REPO/org/hibernate/common/hibernate-commons-annotations/5.0.4.Final/hibernate-commons-annotations-5.0.4.Final.jar" sourcepath="M2_REPO/org/hibernate/common/hibernate-commons-annotations/5.0.4.Final/hibernate-commons-annotations-5.0.4.Final-sources.jar"/>
+	<classpathentry kind="var" path="M2_REPO/org/springframework/data/spring-data-jpa/2.1.2.RELEASE/spring-data-jpa-2.1.2.RELEASE.jar" sourcepath="M2_REPO/org/springframework/data/spring-data-jpa/2.1.2.RELEASE/spring-data-jpa-2.1.2.RELEASE-sources.jar"/>
+	<classpathentry kind="var" path="M2_REPO/org/springframework/data/spring-data-commons/2.1.2.RELEASE/spring-data-commons-2.1.2.RELEASE.jar" sourcepath="M2_REPO/org/springframework/data/spring-data-commons/2.1.2.RELEASE/spring-data-commons-2.1.2.RELEASE-sources.jar"/>
+	<classpathentry kind="var" path="M2_REPO/org/springframework/spring-orm/5.1.2.RELEASE/spring-orm-5.1.2.RELEASE.jar" sourcepath="M2_REPO/org/springframework/spring-orm/5.1.2.RELEASE/spring-orm-5.1.2.RELEASE-sources.jar"/>
+	<classpathentry kind="var" path="M2_REPO/org/springframework/spring-aspects/5.1.2.RELEASE/spring-aspects-5.1.2.RELEASE.jar" sourcepath="M2_REPO/org/springframework/spring-aspects/5.1.2.RELEASE/spring-aspects-5.1.2.RELEASE-sources.jar"/>
+	<classpathentry kind="var" path="M2_REPO/com/h2database/h2/1.4.197/h2-1.4.197.jar" sourcepath="M2_REPO/com/h2database/h2/1.4.197/h2-1.4.197-sources.jar"/>
 	<classpathentry kind="src" output="target/test-classes" path="src/test/java">
 		<attributes>
-			<attribute name="test" value="true"/>
 			<attribute name="optional" value="true"/>
 			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/5"/>
-	<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources">
-		<attributes>
 			<attribute name="test" value="true"/>
-			<attribute name="maven.pomderived" value="true"/>
-			<attribute name="optional" value="true"/>
 		</attributes>
 	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
@@ -37,5 +99,6 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/5"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>

.project

@@ -5,11 +5,6 @@
 	<projects>
 	</projects>
 	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.wst.common.project.facet.core.builder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
 		<buildCommand>
 			<name>org.eclipse.jdt.core.javabuilder</name>
 			<arguments>
@@ -22,8 +17,7 @@
 		</buildCommand>
 	</buildSpec>
 	<natures>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
 		<nature>org.eclipse.m2e.core.maven2Nature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
 	</natures>
 </projectDescription>

README.md

@@ -1,4 +1,4 @@
-# Gourmet Recipe Manager - Spring Boot - Version 2
+# Gourmet Recipe Manager - Spring Boot
 
 This is a port of Thomas Hinkle (thinkle) Gourmet Recipe Manager.
 
@@ -85,26 +85,4 @@ employed when you run this app on your local desktop.
 ### Improved graphics support
 
 A lot of recipe websites publish images in webp form. Support
-for webp has now been added.
+for webp has now been added.
-
-### Better session management
-
-JSF tends to depend on session-scope context. Sessions, however
-time out and this has been an annoyance when a recipe is being
-displayed. To minimize this, better timeout mechanisms have been
-installed and the recipe browser keeps last-search and search-type
-values in long-lived cookies on the client. The server will read
-and cache them, but if the server times out, it will automatically
-re-read the cookies on the next request.
-
-When editing, the AJAX controls tended to get confused when a
-session timed out. New changes give a "save work" warning 5 minutes
-before timeout, and force a timeout from JavaScript that
-exits the unattended page before the user can run afoul of the
-lost session.
-
-Note that by default, JSF caches ViewState in a session so every
-JSF View can cause a session to be created, not just Views that
-reference View- or SessionScoped backing beans. This is alterable
-by setting an option in the faces-config.
-force 

application.properties

@@ -1,8 +1,13 @@
 
 # THIS is the application properties used when testing in the IDE
-# or running stand-alone from the command line.
+# The application.yml (production) is ignored.
-# It augments/overrides application.yml in the JAR
+#joinfaces.jsf.project-stage=development
+# They lied. This doesn't work:
+joinfaces.primefaces.theme=cupertino
 joinfaces.jsf.webapp-resources-directory=/resources
+# This works. Note that ONLY THE FIRST theme set will work unless
+# you delete the old primefaces.THEME from ServletContext
+server.servlet.context-parameters.primefaces.THEME=omega
 server.servlet.session.timeout=30m
 
 spring.thymeleaf.enabled=false
@@ -13,17 +18,11 @@ spring.datasource.url=jdbc:mysql://dbase/recipes
 spring.datasource.username=recipes
 pring.datasource.password=yumyumyum
 spring.datasource.driverClassName=com.mysql.cj.jdbc.Driver
-
+#org.sqlite.JDBC
-#Runtime lies and says no longer required, but it defaults to MySQL5.5.0!:
+#spring.jpa.hibernate.dialect=org.hibernate.dialect.SQLServer2012Dialect
-spring.jpa.database-platform=org.hibernate.dialect.MySQL8Dialect
+spring.jpa.database-platform=org.hibernate.dialect.MySQLDialect
 #org.sqlite.hibernate.dialect.SQLiteDialect
 #spring.jpa.show-sql: true
 
 # My special properties
 gourmet.password.file=${user.home}/.gourmetpw
-
-# This will override aplication.yml
-#server.servlet.context-parameters.primefaces.THEME=le-frog
-
-### HttpSession timeout (note effects on detailEdit idleMonitors)
-server.servlet.session.timeout=35m

pom.xml

@@ -7,7 +7,7 @@
 
     <groupId>com.mousetech.gourmet</groupId>
     <artifactId>gourmetj</artifactId>
-    <version>0.2.0</version>
+    <version>0.1.4-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <name>GourmetJ</name>
@@ -17,7 +17,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>3.2.2</version>
+        <version>2.1.0.RELEASE</version>
         <relativePath /> <!-- lookup parent from repository -->
     </parent>
 
@@ -30,44 +30,25 @@
     </repositories>
 
     <properties>
-        <!-- compile library versions -->
-        <jakarta.validation-api.version>3.0.2</jakarta.validation-api.version>
-        <joinfaces.version>5.2.2</joinfaces.version>
-        <maven-model.version>3.9.6</maven-model.version>
-
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-        <java.version>17</java.version>
+        <java.version>11</java.version>
-        <spring-boot.version>3.2.2</spring-boot.version>
+        <joinfaces.version>3.3.0-rc2</joinfaces.version>
-        <faces.version>4.0.5</faces.version>
-        <joinfaces.version>5.2.2</joinfaces.version>
-        <twelvemonkeys.version>3.10.1</twelvemonkeys.version>
         <junit.jupiter.version>5.4.0</junit.jupiter.version>
     </properties>
 
     <dependencyManagement>
         <dependencies>
-            <dependency>
-                <groupId>jakarta.validation</groupId>
-                <artifactId>jakarta.validation-api</artifactId>
-                <version>${jakarta.validation-api.version}</version>
-            </dependency>
             <dependency>
                 <groupId>org.joinfaces</groupId>
-                <artifactId>joinfaces-bom</artifactId>
+                <artifactId>joinfaces-dependencies</artifactId>
                 <version>${joinfaces.version}</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
-            <dependency>
-                <groupId>org.apache.maven</groupId>
-                <artifactId>maven-model</artifactId>
-                <version>${maven-model.version}</version>
-            </dependency>
         </dependencies>
     </dependencyManagement>
 
-
     <dependencies>
         <dependency>
             <groupId>org.joinfaces</groupId>
@@ -79,15 +60,9 @@
             <version>1.0.10</version>
         </dependency>
         <dependency>
-            <!--  Primefaces theme won't work without this! -->
-            <groupId>com.google.code.gson</groupId>
-            <artifactId>gson</artifactId>
-            <scope>runtime</scope>
-        </dependency>        
-        <!--        <dependency>
             <groupId>javax.enterprise</groupId>
             <artifactId>cdi-api</artifactId>
-        </dependency>-->
+        </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-security</artifactId>
@@ -96,73 +71,55 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-data-jpa</artifactId>
         </dependency>
-        <!--
-        https://mvnrepository.com/artifact/jakarta.persistence/jakarta.persistence-api -->
-<!--        <dependency>
-            <groupId>javax.persistence</groupId>
-            <artifactId>javax.persistence-api</artifactId>
-            <version>2.2</version>
-        </dependency>-->
-
         <dependency>
-            <groupId>jakarta.validation</groupId>
+            <groupId>javax.validation</groupId>
-            <artifactId>jakarta.validation-api</artifactId>
+            <artifactId>validation-api</artifactId>
         </dependency>
-        <!--
+        <!-- https://mvnrepository.com/artifact/org.hibernate.validator/hibernate-validator -->
-            https://mvnrepository.com/artifact/org.hibernate.validator/hibernate-validator -->
         <dependency>
             <groupId>org.hibernate.validator</groupId>
             <artifactId>hibernate-validator</artifactId>
         </dependency>
 
-        <!--
+        <!-- https://mvnrepository.com/artifact/org.springframework.boot/spring-boot-starter-web -->
-        https://mvnrepository.com/artifact/org.springframework.boot/spring-boot-starter-web -->
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
         </dependency>
 
-        <!-- https://mvnrepository.com/artifact/jakarta.servlet/jakarta.servlet-api -->
         <dependency>
-            <groupId>jakarta.servlet</groupId>
+            <groupId>javax.servlet.jsp</groupId>
-            <artifactId>jakarta.servlet-api</artifactId>
+            <artifactId>javax.servlet.jsp-api</artifactId>
+            <version>2.3.3</version>
             <scope>provided</scope>
         </dependency>
-
+        <dependency>
-        <!--        <dependency>
+            <groupId>javax.servlet</groupId>
-            <groupId>jakarta.servlet</groupId>
             <artifactId>jstl</artifactId>
         </dependency>
--->
+
         <dependency>
             <groupId>org.apache.tomcat.embed</groupId>
             <artifactId>tomcat-embed-jasper</artifactId>
             <scope>provided</scope>
         </dependency>
-        <!--        <dependency>
+        <dependency>
             <groupId>org.glassfish</groupId>
-            <artifactId>jakarta.el</artifactId>
+            <artifactId>javax.el</artifactId>
         </dependency>
--->
 
-        <!--
+        <!-- https://mvnrepository.com/artifact/com.twelvemonkeys.imageio/imageio-core -->
-            https://mvnrepository.com/artifact/com.twelvemonkeys.imageio/imageio-core -->
         <dependency>
             <groupId>com.twelvemonkeys.imageio</groupId>
             <artifactId>imageio-core</artifactId>
-            <version>${twelvemonkeys.version}</version>
+            <version>3.8.1</version>
         </dependency>
-        <dependency>
+        <!-- https://mvnrepository.com/artifact/com.twelvemonkeys.imageio/imageio-webp -->
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-lang3</artifactId>
-        </dependency>
-        <!--
-            https://mvnrepository.com/artifact/com.twelvemonkeys.imageio/imageio-webp -->
         <!-- In Core??? -->
         <dependency>
             <groupId>com.twelvemonkeys.imageio</groupId>
             <artifactId>imageio-webp</artifactId>
-            <version>${twelvemonkeys.version}</version>
+            <version>3.8.1</version>
             <scope>compile</scope>
         </dependency>
         <!-- Needed only if you deploy ImageIO plugins as part of a web app.
@@ -171,7 +128,7 @@
         <dependency>
             <groupId>com.twelvemonkeys.servlet</groupId>
             <artifactId>servlet</artifactId>
-            <version>${twelvemonkeys.version}</version>
+            <version>3.8.1</version>
             <scope>compile</scope>
         </dependency>
 
@@ -184,15 +141,21 @@
             <version>8.0.30</version>
         </dependency>
 
-        <!--            <dependency>
+        <!--  SQLite DB -->
-                <groupId>org.glassfish</groupId>
+        <dependency>
-                <artifactId>jakarta.faces</artifactId>
+            <groupId>org.xerial</groupId>
-                <version>${com.sun.faces.version}</version>
+            <artifactId>sqlite-jdbc</artifactId>
-            </dependency>-->
+        </dependency>
+        <dependency>
+            <groupId>com.github.gwenn</groupId>
+            <artifactId>sqlite-dialect</artifactId>
+            <version>0.1.2</version>
+        </dependency>
 
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter</artifactId>
+            <version>${junit.jupiter.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -201,6 +164,7 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
+
     <build>
         <plugins>
             <plugin>

src/main/java/com/mousetech/gourmetj/AdminMainBean.java

@@ -1,38 +1,33 @@
 package com.mousetech.gourmetj;
 
 import java.io.Serializable;
-import java.io.UnsupportedEncodingException;
+
-import java.util.ArrayList;
+import javax.annotation.PostConstruct;
-import java.util.List;
+import javax.faces.event.AjaxBehaviorEvent;
+import javax.faces.model.DataModel;
+import javax.faces.model.ListDataModel;
+import javax.faces.view.ViewScoped;
+import javax.inject.Inject;
+import javax.inject.Named;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.util.ArrayList;
+import java.util.List;
+
 import com.mousetech.gourmetj.persistence.model.Recipe;
 import com.mousetech.gourmetj.persistence.service.RecipeService;
 
-import jakarta.annotation.PostConstruct;
-import jakarta.enterprise.context.RequestScoped;
-import jakarta.faces.event.AjaxBehaviorEvent;
-import jakarta.faces.model.DataModel;
-import jakarta.faces.model.ListDataModel;
-import jakarta.inject.Inject;
-import jakarta.inject.Named;
-
 /**
  * Main control panel backing bean.
  * 
- * The rare and fabled RequestScope, which is otherwise
- * useless 90% of the time. Here we maintain no session
- * state. so we can better support the session timeout
- * for editing functions.
- * 
  * @author timh
  * @since Jun 28, 2012
  */
 
 @Named
-@RequestScoped
+@ViewScoped
 public class AdminMainBean implements Serializable {
 
 	/**
@@ -49,11 +44,8 @@ public class AdminMainBean implements Serializable {
 	private static final Logger log =
 			LoggerFactory.getLogger(AdminMainBean.class);
 
-	/** Cookie delimiter */
-	private static final String CKDLM = ",";
-
 	/**
-	 * Persistency service for Recipes.
+	 * Persistency service for Recipes
 	 */
 
 	@Inject
@@ -64,24 +56,6 @@ public class AdminMainBean implements Serializable {
 		this.recipeService = service;
 	}
 
-	// **
-	@Inject
-	private CookieBean cookieBean;
-	
-	/**
-	 * @return the cookieBean
-	 */
-	public CookieBean getCookieBean() {
-		return cookieBean;
-	}
-
-	/**
-	 * @param cookieBean the cookieBean to set
-	 */
-	public void setCookieBean(CookieBean cookieBean) {
-		this.cookieBean = cookieBean;
-	}
-
 	// **
 	@Inject
 	private UserSession userSession;
@@ -107,10 +81,10 @@ public class AdminMainBean implements Serializable {
 	 * @return the searchText
 	 */
 	public String getSearchText() {
-//		if (this.searchResults == null) {
+		if (this.searchResults == null) {
-//			this.setSearchText(cookieBean.getSearchText());
+			// Fake around broken @PostConstruct
-//		}
+			this.setSearchText(userSession.getLastSearch());
-		this.searchText = cookieBean.getSearchText();
+		}
 		return searchText;
 	}
 
@@ -119,7 +93,7 @@ public class AdminMainBean implements Serializable {
 	 */
 	public void setSearchText(String searchText) {
 		this.searchText = searchText;
-		cookieBean.setSearchText(searchText);
+		userSession.setLastSearch(searchText);
 	}
 
 	private List<String> suggestionList = null;
@@ -130,7 +104,7 @@ public class AdminMainBean implements Serializable {
 
 	public List<String> searchSuggestionList(String query) {
 		if (suggestionList == null) {
-			switch (searchtypeEnum()) {
+			switch (this.userSession.getSearchType()) {
 			case rst_BY_CATEGORY:
 				suggestionList = recipeService.findCategories();
 				break;
@@ -144,16 +118,6 @@ public class AdminMainBean implements Serializable {
 		return suggestionList;
 	}
 
-	private RecipeSearchType searchtypeEnum() {
-		int stn = cookieBean.getSearchType();
-		return searchtypeEnum(stn);
-	}
-
-	private RecipeSearchType searchtypeEnum(int stn) {
-		RecipeSearchType st = RecipeSearchType.values()[stn];
-		return st;
-	}
-	
 	/**/
 	transient DataModel<Recipe> searchResults;
 
@@ -163,7 +127,7 @@ public class AdminMainBean implements Serializable {
 	public DataModel<Recipe> getSearchResults() {
 		if (searchResults == null) {
 			searchResults = new ListDataModel<Recipe>();
-			init(); // @PostConstruct is broken TODO: fixed??
+			init(); // @PostConstruct is broken
 		}
 		return searchResults;
 	}
@@ -183,7 +147,7 @@ public class AdminMainBean implements Serializable {
 	@PostConstruct
 	void init() {
 		log.debug("Initializing AdminMainBean " + this);
-		this.setSearchText(cookieBean.getSearchText());
+		this.setSearchText(userSession.getLastSearch());
 		// Clean up from any previous operations.
 		this.userSession.setRecipe(null);
 		doFind();
@@ -213,20 +177,8 @@ public class AdminMainBean implements Serializable {
 	 */
 	public String doFind() {
 		List<Recipe> recipes = null;
-		if ( searchText == null ) {
-			setSearchText("");
-		}
-		searchText = searchText.trim();
 
-		// Persist current settings
+		switch (this.getUserSession().getSearchType()) {
-		try {
-			cookieBean.saveCookies();
-		} catch (UnsupportedEncodingException e) {
-			// Something is really wrong if we can't create UTF-8!
-			log.error("Unable to save cookies!", e);
-		}
-		RecipeSearchType st = searchtypeEnum(); 
-		switch (st) {
 		case rst_BY_NAME:
 			recipes = recipeService.findByTitle(searchText);
 			break;
@@ -244,11 +196,12 @@ public class AdminMainBean implements Serializable {
 			break;
 		default:
 			log.error("Invalid recipe search type: "
-					+ st);
+					+ this.getUserSession().getSearchType());
 			break;
 		}
 
-		getSearchResults().setWrappedData(recipes);	
+		getSearchResults().setWrappedData(recipes);
+		this.userSession.setLastSearch(this.getSearchText());
 		return null; // Stay on page
 	}
 
@@ -289,4 +242,27 @@ public class AdminMainBean implements Serializable {
 										// items.
 		return "recipeDetails?faces-redirect=true";
 	}
+
+	/**
+	 * Get printable preptime. Database version is in seconds.
+	 * 
+	 * @deprecated User {@link UserSession#formatTime(Long)}
+	 * 
+	 * @return Formatted time. Called from EL on main page.
+	 */
+	public String formatPreptime(int timesec) {
+		StringBuffer sb = new StringBuffer(20);
+		int preptime = timesec / 60;
+		if (preptime > 60) {
+			int hours = preptime / 60;
+			sb.append(hours);
+			sb.append(" h. ");
+			preptime %= 60;
+		}
+		if (preptime > 0) {
+			sb.append(preptime);
+			sb.append(" min.");
+		}
+		return sb.toString();
+	}
 }

src/main/java/com/mousetech/gourmetj/AppBean.java

@@ -1,51 +0,0 @@
-package com.mousetech.gourmetj;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import jakarta.enterprise.context.ApplicationScoped;
-import jakarta.faces.model.SelectItem;
-import jakarta.inject.Named;
-
-/**
- * Appplication-scope data (mostly constants)
- * 
- * @author timh
- * @since Feb 1, 2024
- */
-@Named
-@ApplicationScoped
-public class AppBean {
-
-	public AppBean() {
-		// TODO Auto-generated constructor stub
-	}
-
-	private List<SelectItem> searchTypeList;
-
-	/**
-	 * @return the searchTypeList
-	 * @see RecipeSearchType
-	 * Used by main.xhtml
-	 */
-	public List<SelectItem> getSearchTypeList() {
-		if (searchTypeList == null) {
-			searchTypeList = loadSearchTypeList();
-		}
-		return searchTypeList;
-	}
-
-	private List<SelectItem> loadSearchTypeList() {
-		List<SelectItem> list = new ArrayList<SelectItem>(5);
-		list.add(new SelectItem(RecipeSearchType.rst_BY_NAME.ordinal(),
-				"Title"));
-		list.add(new SelectItem(RecipeSearchType.rst_BY_CATEGORY.ordinal(),
-				"Category"));
-		list.add(new SelectItem(RecipeSearchType.rst_BY_CUISINE.ordinal(),
-				"Cuisine"));
-		list.add(
-			new SelectItem(RecipeSearchType.rst_BY_INGREDIENT.ordinal(),
-					"Ingredient"));
-		return list;
-	}	
-}

src/main/java/com/mousetech/gourmetj/CategoryView.java

@@ -2,10 +2,10 @@ package com.mousetech.gourmetj;
 
 import java.io.Serializable;
 import java.util.List;
-import jakarta.annotation.PostConstruct;
+import javax.annotation.PostConstruct;
-import jakarta.faces.view.ViewScoped;
+import javax.faces.view.ViewScoped;
-import jakarta.inject.Inject;
+import javax.inject.Inject;
-import jakarta.inject.Named;
+import javax.inject.Named;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

src/main/java/com/mousetech/gourmetj/CookieBean.java

@@ -1,142 +0,0 @@
-/**
- * Copyright (C) 2024, Tim Holloway
- *
- * Manages app data persisted client-side in cookies.
- *
- * Date written: Jan 31, 2024
- * Author: Tim Holloway <timh@mousetech.com>
- */
-package com.mousetech.gourmetj;
-
-import java.io.UnsupportedEncodingException;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Map.Entry;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import jakarta.annotation.PostConstruct;
-import jakarta.enterprise.context.RequestScoped;
-import jakarta.inject.Named;
-
-/**
- * Request caching object for cookie data persistence.
- * Does double-duty serving View Session timeouts.
- * 
- * @author timh
- * @since Jan 31, 2024
- */
-@Named
-@RequestScoped
-public class CookieBean {
-
-	private static final String KEY_DISPLAY_ROWS = "displayRows";
-
-	private static final String KEY_SEARCH_TYPE = "searchType";
-
-	private static final String KEY_SEARCH_FOR = "searchFor";
-
-	/* Logger */
-
-	private static final Logger log =
-			LoggerFactory.getLogger(CookieBean.class);
-
-	private Map<String, String> cookieMap;
-
-	/**
-	 * Constructor.
-	 */
-	public CookieBean() {
-	}
-
-	@PostConstruct
-	public void init() {
-		this.cookieMap = JSFUtils.getCookies();
-	}
-
-	/**
-	 * Persist us to client cookie storage
-	 * 
-	 * @throws UnsupportedEncodingException (which should never
-	 *                                      happen)
-	 */
-	public void saveCookies()
-			throws UnsupportedEncodingException {
-		final Map<String, Object> properties = new HashMap<>();
-		properties.put("maxAge", 31536000);
-		properties.put("path", "/");
-		properties.put("SameSite", "Strict");
-
-		for (Entry<String, String> e : cookieMap.entrySet()) {
-			JSFUtils.outputCookie(e.getKey(), e.getValue(),
-				properties);
-		}
-	}
-
-	/**
-	 * Get Cookie value by name
-	 * 
-	 * @param name Name of the cookie
-	 * @return Value stored in the cookie
-	 */
-	public String getCookieValue(String name) {
-		return cookieMap.get(name);
-	}
-
-	public void setCookieValue(String name, String value) {
-		cookieMap.put(name, value);
-	}
-
-	// ************************
-	// App-specific properties
-	// ************************
-
-	public String getSearchText() {
-		return cookieMap.get(KEY_SEARCH_FOR);
-	}
-
-	public void setSearchText(String value) {
-		cookieMap.put(KEY_SEARCH_FOR, value);
-	}
-
-	// **
-	public Integer getSearchType() {
-		if (!cookieMap.containsKey(KEY_SEARCH_TYPE)) {
-			cookieMap.put(KEY_SEARCH_TYPE, "0");
-		}
-		String st = cookieMap.get(KEY_SEARCH_TYPE);
-		return Integer.valueOf(String.valueOf(st));
-	}
-
-	public void setSearchType(Integer value) {
-		cookieMap.put(KEY_SEARCH_TYPE, String.valueOf(value));
-	}
-
-	// **
-	public Integer getDisplayListSize() {
-		if (!cookieMap.containsKey(KEY_DISPLAY_ROWS)) {
-			cookieMap.put(KEY_DISPLAY_ROWS, "30");
-		}
-		String st = cookieMap.get(KEY_DISPLAY_ROWS);
-		return Integer.valueOf(String.valueOf(st));
-	}
-
-	public void setDisplayListSize(Integer value) {
-		cookieMap.put(KEY_DISPLAY_ROWS, String.valueOf(value));
-	}
-	
-	/**
-	 * IdleMonitor backing methods (session/View timeout)
-	 */
-	public void sessionIdleListener() {
-		log.info("Session Idle Listener fired.");
-		JSFUtils.addWarningMessage("Timeout approaching. Save your work!");
-	}
-
-	public void sessionTimeout() {
-		log.info("Session Timeout Listener fired.");
-		JSFUtils.logout();
-	}
-
-}

src/main/java/com/mousetech/gourmetj/CuisineBean.java

@@ -8,9 +8,9 @@ package com.mousetech.gourmetj;
 
 import java.util.List;
 
-import jakarta.enterprise.context.ApplicationScoped;
+import javax.enterprise.context.ApplicationScoped;
-import jakarta.inject.Inject;
+import javax.inject.Inject;
-import jakarta.inject.Named;
+import javax.inject.Named;
 
 import com.mousetech.gourmetj.persistence.service.RecipeService;
 

src/main/java/com/mousetech/gourmetj/EditShopcatBean.java

@@ -3,12 +3,12 @@ package com.mousetech.gourmetj;
 import java.io.Serializable;
 import java.util.List;
 
-import jakarta.annotation.PostConstruct;
+import javax.annotation.PostConstruct;
-import jakarta.faces.event.AjaxBehaviorEvent;
+import javax.faces.event.AjaxBehaviorEvent;
-import jakarta.faces.event.ValueChangeEvent;
+import javax.faces.event.ValueChangeEvent;
-import jakarta.faces.view.ViewScoped;
+import javax.faces.view.ViewScoped;
-import jakarta.inject.Inject;
+import javax.inject.Inject;
-import jakarta.inject.Named;
+import javax.inject.Named;
 
 import com.mousetech.gourmetj.persistence.dao.ShopcatRepository;
 

src/main/java/com/mousetech/gourmetj/JSFUtils.java

@@ -1,18 +1,11 @@
 package com.mousetech.gourmetj;
 
 import java.io.InputStream;
-import java.io.UnsupportedEncodingException;
-import java.net.URLEncoder;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.stream.Collectors;
 
-import jakarta.faces.application.FacesMessage;
+import javax.faces.application.FacesMessage;
-import jakarta.faces.context.ExternalContext;
+import javax.faces.context.ExternalContext;
-import jakarta.faces.context.FacesContext;
+import javax.faces.context.FacesContext;
-import jakarta.faces.context.Flash;
+import javax.faces.context.Flash;
-import jakarta.servlet.http.Cookie;
-import jakarta.servlet.http.HttpSession;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -62,14 +55,6 @@ public class JSFUtils {
 			message);
 	}
 
-
-	public static void addWarningMessage(String msgString) {
-		FacesMessage message = new FacesMessage(
-			FacesMessage.SEVERITY_WARN, "WARNING", msgString);
-		FacesContext.getCurrentInstance().addMessage(null,
-			message);
-	}	
-	
 	/**
 	 * Post an error-level message to the FacesContext where the
 	 * <h:messages> tag can display it.
@@ -118,51 +103,4 @@ public class JSFUtils {
 	public static void putFlash(String key, Object value) {
 		flashScope().put(key, value);
 	}
-
-	//***********
-	//* COOKIE!!!
-	//***********
-	
-	/**
-	 * Get cookie values.
-	 */
-	public static Map<String, String> getCookies(){
-		Map<String, Object> m0 = getExternalContext().getRequestCookieMap();
-		Map<String, String>m1 = new HashMap<String, String>();
-		m1 = m0.entrySet()
-				.stream()
-				.collect(Collectors.toMap(
-					e -> e.getKey(),
-					e -> ((Cookie)e.getValue()).getValue()));
-		return m1;
-	}
-
-	/**
-	 * Set a cookie value in Response.
-	 * @param name Cookie name
-	 * @param value Cookie value
-	 * @param properties Cookie property Map (timeout, <i>etc.</i>)
-	 * @throws UnsupportedEncodingException 
-	 */
-	public static void outputCookie(String name,
-			String value, Map<String, Object> properties) throws UnsupportedEncodingException {
-		getExternalContext().addResponseCookie(name,
-			URLEncoder.encode(value, "UTF-8"),			
-			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.");
-		}
-		
-	}		
 }

src/main/java/com/mousetech/gourmetj/RecipeDetailBean.java

@@ -7,23 +7,24 @@ import java.util.List;
 import java.util.Objects;
 import java.util.Set;
 
-import jakarta.annotation.PostConstruct;
+import javax.annotation.PostConstruct;
 
-import jakarta.faces.model.DataModel;
+import javax.faces.event.AjaxBehaviorEvent;
-import jakarta.faces.model.ListDataModel;
+import javax.faces.model.DataModel;
-import jakarta.faces.view.ViewScoped;
+import javax.faces.model.ListDataModel;
-import jakarta.inject.Inject;
+import javax.faces.view.ViewScoped;
-import jakarta.inject.Named;
+import javax.inject.Inject;
-import jakarta.servlet.http.Part;
+import javax.inject.Named;
-import jakarta.faces.event.AjaxBehaviorEvent;
+import javax.servlet.http.Part;
 
 import org.apache.commons.lang3.StringUtils;
 import org.primefaces.event.FileUploadEvent;
-import org.primefaces.model.file.UploadedFile;
+import org.primefaces.model.UploadedFile;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-
+import com.mousetech.gourmetj.IngredientUI;
+import com.mousetech.gourmetj.UserSession;
 import com.mousetech.gourmetj.persistence.model.Category;
 import com.mousetech.gourmetj.persistence.model.Ingredient;
 import com.mousetech.gourmetj.persistence.model.Recipe;
@@ -390,7 +391,7 @@ public class RecipeDetailBean implements Serializable {
 	 * 
 	 * @param event Unused
 	 */
-	public void ajaxAddIngredient(jakarta.faces.event.AjaxBehaviorEvent event) {
+	public void ajaxAddIngredient(AjaxBehaviorEvent event) {
 		doAddIngredient();
 	}
 
@@ -1063,21 +1064,39 @@ public class RecipeDetailBean implements Serializable {
 
 	// ***
 
+	Part imageFile = null;
+
+	/**
+	 * @return the imageFile set by the image upload control
+	 */
+	public Part getImageFile() {
+		return imageFile;
+	}
+
+	/**
+	 * @param imageFile the imageFile to set
+	 */
+	public void setImageFile(Part imageFile) {
+		this.imageFile = imageFile;
+	}
+
 	/**
 	 * Load/replace images. Computes thumbnail.
 	 * 
 	 * @param event PrimeFaces file upload event object
 	 */
 	public void ajaxUploadImage(FileUploadEvent event) {
-		PictureController.importImage(recipe,
+		UploadedFile foo = event.getFile();
-			event.getFile().getContent());
+
+		PictureController.importImage(recipe, foo.getContents());
 	}
 
 	/**
 	 * Remove images from recipe
+	 * 
+	 * @param event Notused
 	 */
-	public void ajaxDeleteImage() {
+	public void ajaxDeleteImage(AjaxBehaviorEvent event) {
-		log.info("Deleting current recipe image");
 		this.recipe.setImage(null);
 		this.recipe.setThumb(null);
 	}

src/main/java/com/mousetech/gourmetj/ShoppingListBean.java

@@ -6,10 +6,10 @@ import java.util.Comparator;
 import java.util.List;
 import java.util.stream.Collectors;
 
-import jakarta.annotation.PostConstruct;
+import javax.annotation.PostConstruct;
-import jakarta.faces.view.ViewScoped;
+import javax.faces.view.ViewScoped;
-import jakarta.inject.Inject;
+import javax.inject.Inject;
-import jakarta.inject.Named;
+import javax.inject.Named;
 
 import org.apache.commons.lang3.StringUtils;
 import org.primefaces.model.StreamedContent;

src/main/java/com/mousetech/gourmetj/SpringPrimeFacesApplication.java

@@ -1,29 +1,31 @@
 package com.mousetech.gourmetj;
 
-import jakarta.faces.application.ViewExpiredException;
+import javax.faces.application.ViewExpiredException;
-import jakarta.servlet.ServletContext;
+import javax.servlet.ServletContext;
-import jakarta.servlet.ServletException;
+import javax.servlet.ServletException;
 
+import org.primefaces.application.resource.PrimeResourceHandler;
+import org.primefaces.renderkit.HeadRenderer;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.domain.EntityScan;
 import org.springframework.boot.web.server.ErrorPage;
 import org.springframework.boot.web.server.ErrorPageRegistrar;
 import org.springframework.boot.web.server.ErrorPageRegistry;
-import org.springframework.boot.web.servlet.ServletComponentScan;
 import org.springframework.boot.web.servlet.ServletContextInitializer;
 import org.springframework.context.annotation.Bean;
 import org.springframework.http.HttpStatus;
 
 @SpringBootApplication
-@ServletComponentScan
 @EntityScan(value = {
 		"com.mousetech.gourmetj.persistence.model" })
 public class SpringPrimeFacesApplication {
 
+	private static final String IMAGE_IIO_PROVIDER_CONTEXT_LISTENER =
+			"com.twelvemonkeys.servlet.image.IIOProviderContextListener";
 	final String errorPage = "/error/error.html";
 	final String error404Page = "/error/error404.html";
-	final String expiredPage = "/main.xhtml";
+	final String expiredPage = "/error/viewExpired.xhtml";
 
 	public static void main(String[] args) {
 		SpringApplication.run(SpringPrimeFacesApplication.class,
@@ -36,14 +38,21 @@ public class SpringPrimeFacesApplication {
 			@Override
 			public void onStartup(ServletContext servletContext)
 					throws ServletException {
+				/* Note that we cannot set theme here since it was
+				 * already set earlier. Default value is "aristo".
+				 */
+//				servletContext.setInitParameter(
+//					"primefaces.THEME", "bluesky");
 				servletContext.setInitParameter(
-					"jakarta.faces.FACELETS_SKIP_COMMENTS",
+					"javax.faces.FACELETS_SKIP_COMMENTS",
 					"true");
 				servletContext.setInitParameter(
 					"com.sun.faces.expressionFactory",
 					"com.sun.el.ExpressionFactoryImpl");
 				servletContext.setInitParameter(
 					"primefaces.UPLOADER", "native");
+				
+				servletContext.addListener(IMAGE_IIO_PROVIDER_CONTEXT_LISTENER);
 			}
 		};
 	}

src/main/java/com/mousetech/gourmetj/SpringSecurityConfig.java

@@ -2,6 +2,7 @@ package com.mousetech.gourmetj;
 
 import java.io.File;
 import java.io.FileReader;
+import java.io.LineNumberInputStream;
 import java.io.LineNumberReader;
 import java.util.Arrays;
 
@@ -9,43 +10,52 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.security.config.Customizer;
 import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder;
 import org.springframework.security.config.annotation.authentication.configurers.provisioning.InMemoryUserDetailsManagerConfigurer;
 import org.springframework.security.config.annotation.authentication.configurers.provisioning.UserDetailsManagerConfigurer;
 import org.springframework.security.config.annotation.web.builders.HttpSecurity;
 import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
-import org.springframework.security.config.annotation.web.configuration.WebSecurityCustomizer;
+import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
-import org.springframework.security.config.annotation.web.configurers.AbstractHttpConfigurer;
-import org.springframework.security.web.SecurityFilterChain;
-
-import jakarta.servlet.DispatcherType;
 
 @Configuration
 @EnableWebSecurity
-public class SpringSecurityConfig {
+public class SpringSecurityConfig
-		//extends WebSecurityConfigurerAdapter {
+		extends WebSecurityConfigurerAdapter {
 
 	/* Logger */
 
 	private static final Logger log =
 			LoggerFactory.getLogger(SpringSecurityConfig.class);
 
+	@Override
+	protected void configure(HttpSecurity http)
+			throws Exception {
+		// require all requests to be authenticated except
+		// for the resources
+		http.authorizeRequests()
+			.antMatchers("/javax.faces.resource/**",
+				"/",
+				"/index.jsf",
+				"/main.jsf",
+				"/img/**",
+				"/recipeDetails.jsf",
+				"/recipePrint.jsf")
+			.permitAll().anyRequest().authenticated();
+		// login
+		http.formLogin()// .loginPage("/login.xhtml")
+			.permitAll();
+		// .failureUrl("/login.xhtml?error=true");
+		// logout
+//			http.logout().logoutSuccessUrl("/login.xhtml");
+		// not needed as JSF 2.2 is implicitly protected
+		// against CSRF
+		http.csrf().disable();
+	}
 
 	@Value("${gourmet.password.file}")
 	private String passwordFile;
 
-	/**
-	 * Load in config file with in-memory credentials.
-	 * For practical use, this should probably be
-	 * replace with JdbcUserDetailsManager and credentials in
-	 * the recipe database.
-	 * 
-	 * @param auth Builder for the authenticator
-	 * @throws Exception
-	 */
 	@Autowired
 	public void configureGlobal(
 			AuthenticationManagerBuilder auth) throws Exception {
@@ -62,21 +72,17 @@ public class SpringSecurityConfig {
 		LineNumberReader rdr =
 				new LineNumberReader(new FileReader(pwFile));
 		String pwLine;
-		InMemoryUserDetailsManagerConfigurer<AuthenticationManagerBuilder> 
+		InMemoryUserDetailsManagerConfigurer<AuthenticationManagerBuilder> authenticator =
-		authenticator =
 				auth.inMemoryAuthentication();
 		while ((pwLine = rdr.readLine()) != null) {
 			pwLine = pwLine.trim();
-			if ((pwLine.length() == 0)
+			if (( pwLine.length() == 0) || (pwLine.charAt(0) == '#')) {
-					|| (pwLine.charAt(0) == '#')) {
 				continue;
 			}
 			String[] creds = parseCreds(pwLine);
-			UserDetailsManagerConfigurer<AuthenticationManagerBuilder,
+			UserDetailsManagerConfigurer<AuthenticationManagerBuilder, InMemoryUserDetailsManagerConfigurer<AuthenticationManagerBuilder>>.UserDetailsBuilder bar =
-				InMemoryUserDetailsManagerConfigurer<AuthenticationManagerBuilder>>
-					.UserDetailsBuilder bar =
 					authenticator.withUser(creds[0])
-						.password("{noop}" + creds[1]);
+						.password("{noop}"+creds[1]);
 			int credlen = creds.length;
 			for (int i = 2; i < credlen; i++) {
 				bar.roles(creds[i]);
@@ -98,37 +104,4 @@ public class SpringSecurityConfig {
 			.toArray(String[]::new);
 		return ocreds;
 	}
-
-    @Bean
-    SecurityFilterChain securityFilterChain(HttpSecurity http) throws Exception {
-
-        http
-                .csrf(AbstractHttpConfigurer::disable)
-                .cors(AbstractHttpConfigurer::disable)
-                .formLogin(Customizer.withDefaults())
-                .authorizeHttpRequests((authorize)-> authorize
-                		.dispatcherTypeMatchers(DispatcherType.FORWARD, DispatcherType.ERROR).permitAll()
-                        .anyRequest().authenticated()
-                );
-
-        return http.build();
-    }
-    
-    /**
-     * Replaces old antMatchers for determining secured URLs.
-     * @return customizer
-     */
-    @Bean
-    public WebSecurityCustomizer webSecurityCustomizer() {
-        return (web) -> web.ignoring().requestMatchers(
-        	"/javax.faces.resource/**",
-			"/",
-			"/index.jsf",
-			"/index.xhtml",
-			"/main.jsf",
-			"/img/**",
-			"/recipeDetails.jsf",
-			"/shoppingList.jsf",
-			"/recipePrint.jsf");
-    }
 }

src/main/java/com/mousetech/gourmetj/UserSession.java

@@ -4,9 +4,9 @@ import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.List;
 
-import jakarta.enterprise.context.SessionScoped;
+import javax.enterprise.context.SessionScoped;
-import jakarta.faces.model.SelectItem;
+import javax.faces.model.SelectItem;
-import jakarta.inject.Named;
+import javax.inject.Named;
 
 import org.primefaces.PrimeFaces;
 import org.slf4j.Logger;
@@ -124,12 +124,37 @@ public class UserSession implements Serializable {
 
 	/**
 	 * @param searchType the searchType to set
-	 * @deprecated. Use CookieBean TODO
 	 */
 	public void setSearchType(RecipeSearchType searchType) {
 		this.searchType = searchType;
 	}
 
+	private List<SelectItem> searchTypeList;
+
+	/**
+	 * @return the searchTypeList
+	 */
+	public List<SelectItem> getSearchTypeList() {
+		if (searchTypeList == null) {
+			searchTypeList = loadSearchTypeList();
+		}
+		return searchTypeList;
+	}
+
+	private List<SelectItem> loadSearchTypeList() {
+		List<SelectItem> list = new ArrayList<SelectItem>(5);
+		list.add(new SelectItem(RecipeSearchType.rst_BY_NAME,
+				"Title"));
+		list.add(new SelectItem(RecipeSearchType.rst_BY_CATEGORY,
+				"Category"));
+		list.add(new SelectItem(RecipeSearchType.rst_BY_CUISINE,
+				"Cuisine"));
+		list.add(
+			new SelectItem(RecipeSearchType.rst_BY_INGREDIENT,
+					"Ingredient"));
+		return list;
+	}
+
 	// ====
 
 	public String formatCategories(Recipe r) {
@@ -164,6 +189,19 @@ public class UserSession implements Serializable {
 	 */
 	private List<Recipe> shoppingList = new ArrayList<Recipe>();
 
+	/**
+	 * @return the sessionTimeoutInterval
+	 */
+	public long getSessionTimeoutInterval() {
+		return sessionTimeoutInterval;
+	}
+
+	public void sessionIdleListener() {
+		log.warn("Session Idle Listener fired.");
+		PrimeFaces.current()
+			.executeScript("sessionExpiredConfirmation.show()");
+	}
+
 	public String logoutAction() {
 		log.warn("Session Idle listener logout");
 		return goHome();

src/main/java/com/mousetech/gourmetj/persistence/dao/PantryRepository.java

@@ -2,7 +2,7 @@ package com.mousetech.gourmetj.persistence.dao;
 
 import java.util.List;
 
-import jakarta.transaction.Transactional;
+import javax.transaction.Transactional;
 
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Modifying;

src/main/java/com/mousetech/gourmetj/persistence/dao/ShopcatRepository.java

@@ -2,7 +2,7 @@ package com.mousetech.gourmetj.persistence.dao;
 
 import java.util.List;
 
-import jakarta.transaction.Transactional;
+import javax.transaction.Transactional;
 
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Modifying;

src/main/java/com/mousetech/gourmetj/persistence/model/Category.java

@@ -1,7 +1,7 @@
 package com.mousetech.gourmetj.persistence.model;
 
 import java.io.Serializable;
-import jakarta.persistence.*;
+import javax.persistence.*;
 
 
 /**

src/main/java/com/mousetech/gourmetj/persistence/model/Convtable.java

@@ -1,7 +1,7 @@
 package com.mousetech.gourmetj.persistence.model;
 
 import java.io.Serializable;
-import jakarta.persistence.*;
+import javax.persistence.*;
 
 
 /**

src/main/java/com/mousetech/gourmetj/persistence/model/Crossunitdict.java

@@ -1,7 +1,7 @@
 package com.mousetech.gourmetj.persistence.model;
 
 import java.io.Serializable;
-import jakarta.persistence.*;
+import javax.persistence.*;
 
 
 /**

src/main/java/com/mousetech/gourmetj/persistence/model/Density.java

@@ -1,7 +1,7 @@
 package com.mousetech.gourmetj.persistence.model;
 
 import java.io.Serializable;
-import jakarta.persistence.*;
+import javax.persistence.*;
 
 
 /**

src/main/java/com/mousetech/gourmetj/persistence/model/Info.java

@@ -1,7 +1,7 @@
 package com.mousetech.gourmetj.persistence.model;
 
 import java.io.Serializable;
-import jakarta.persistence.*;
+import javax.persistence.*;
 
 
 /**

src/main/java/com/mousetech/gourmetj/persistence/model/Ingredient.java

@@ -1,8 +1,8 @@
 package com.mousetech.gourmetj.persistence.model;
 
 import java.io.Serializable;
-import jakarta.persistence.*;
+import javax.persistence.*;
-import jakarta.validation.constraints.NotNull;
+import javax.validation.constraints.NotNull;
 
 /**
  * The persistent class for the "ingredients" database table. The

src/main/java/com/mousetech/gourmetj/persistence/model/Keylookup.java

@@ -1,7 +1,7 @@
 package com.mousetech.gourmetj.persistence.model;
 
 import java.io.Serializable;
-import jakarta.persistence.*;
+import javax.persistence.*;
 
 
 /**

src/main/java/com/mousetech/gourmetj/persistence/model/Pantry.java

@@ -1,7 +1,7 @@
 package com.mousetech.gourmetj.persistence.model;
 
 import java.io.Serializable;
-import jakarta.persistence.*;
+import javax.persistence.*;
 
 /**
  * The persistent class for the "pantry" database table.

src/main/java/com/mousetech/gourmetj/persistence/model/PluginInfo.java

@@ -1,7 +1,7 @@
 package com.mousetech.gourmetj.persistence.model;
 
 import java.io.Serializable;
-import jakarta.persistence.*;
+import javax.persistence.*;
 
 
 /**

src/main/java/com/mousetech/gourmetj/persistence/model/Recipe.java

@@ -6,7 +6,7 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 
-import jakarta.persistence.*;
+import javax.persistence.*;
 
 /**
  * The persistent class for the "recipe" database table.

src/main/java/com/mousetech/gourmetj/persistence/model/Shopcat.java

@@ -4,17 +4,17 @@ import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.List;
 
-import jakarta.persistence.Column;
+import javax.persistence.Column;
-import jakarta.persistence.Entity;
+import javax.persistence.Entity;
-import jakarta.persistence.FetchType;
+import javax.persistence.FetchType;
-import jakarta.persistence.GeneratedValue;
+import javax.persistence.GeneratedValue;
-import jakarta.persistence.GenerationType;
+import javax.persistence.GenerationType;
-import jakarta.persistence.Id;
+import javax.persistence.Id;
-import jakarta.persistence.ManyToOne;
+import javax.persistence.ManyToOne;
-import jakarta.persistence.NamedQueries;
+import javax.persistence.NamedQueries;
-import jakarta.persistence.NamedQuery;
+import javax.persistence.NamedQuery;
-import jakarta.persistence.OneToMany;
+import javax.persistence.OneToMany;
-import jakarta.persistence.Table;
+import javax.persistence.Table;
 
 /**
  * The persistent class for the "shopcats" database table.

src/main/java/com/mousetech/gourmetj/persistence/model/Shopcatsorder.java

@@ -1,7 +1,7 @@
 package com.mousetech.gourmetj.persistence.model;
 
 import java.io.Serializable;
-import jakarta.persistence.*;
+import javax.persistence.*;
 
 
 /**

src/main/java/com/mousetech/gourmetj/persistence/model/Unitdict.java

@@ -1,7 +1,7 @@
 package com.mousetech.gourmetj.persistence.model;
 
 import java.io.Serializable;
-import jakarta.persistence.*;
+import javax.persistence.*;
 
 
 /**

src/main/java/com/mousetech/gourmetj/persistence/service/CategoryService.java

@@ -2,9 +2,9 @@ package com.mousetech.gourmetj.persistence.service;
 
 import java.io.Serializable;
 import java.util.List;
-import jakarta.enterprise.context.ApplicationScoped;
+import javax.enterprise.context.ApplicationScoped;
-import jakarta.inject.Inject;
+import javax.inject.Inject;
-import jakarta.inject.Named;
+import javax.inject.Named;
 
 import org.springframework.transaction.annotation.Transactional;
 

src/main/java/com/mousetech/gourmetj/persistence/service/RecipeService.java

@@ -4,9 +4,9 @@ import java.io.Serializable;
 import java.util.List;
 import java.util.Optional;
 
-import jakarta.enterprise.context.ApplicationScoped;
+import javax.enterprise.context.ApplicationScoped;
-import jakarta.inject.Inject;
+import javax.inject.Inject;
-import jakarta.inject.Named;
+import javax.inject.Named;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

src/main/java/com/mousetech/gourmetj/springweb/PictureController.java

@@ -17,9 +17,9 @@ import java.io.InputStream;
 
 import javax.imageio.ImageIO;
 import javax.imageio.stream.ImageInputStream;
-import jakarta.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletRequest;
-import jakarta.servlet.http.HttpSession;
+import javax.servlet.http.HttpSession;
-import jakarta.servlet.http.Part;
+import javax.servlet.http.Part;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -180,7 +180,7 @@ public class PictureController {
 
 	/**
 	 * Take imageFile input and store it as image for recipe.
-	 * Generate thumbnail
+	 * Generate thumnail
 	 * 
 	 * @param recipe    Recipe to store into.
 	 * @param bs Info about uploaded data.

src/main/java/com/mousetech/gourmetj/utils/TimeConverter.java

@@ -6,13 +6,13 @@
  */
 package com.mousetech.gourmetj.utils;
 
-import jakarta.faces.application.FacesMessage;
+import javax.faces.application.FacesMessage;
-import jakarta.faces.component.UIComponent;
+import javax.faces.component.UIComponent;
-import jakarta.faces.context.FacesContext;
+import javax.faces.context.FacesContext;
-import jakarta.faces.convert.Converter;
+import javax.faces.convert.Converter;
-import jakarta.faces.convert.ConverterException;
+import javax.faces.convert.ConverterException;
-import jakarta.faces.convert.FacesConverter;
+import javax.faces.convert.FacesConverter;
-import jakarta.faces.validator.ValidatorException;
+import javax.faces.validator.ValidatorException;
 
 import org.apache.commons.lang3.StringUtils;
 
@@ -48,9 +48,6 @@ public class TimeConverter implements Converter<Integer> {
 	@Override
 	public String getAsString(FacesContext context,
 			UIComponent component, Integer value) {
-		if ( value == null ) {
-			return "--";
-		}
 		return TimeFormatter.formatTime(Long.valueOf(value));
 	}
 }

src/main/java/com/mousetech/gourmetj/utils/YamlShoppingList.java

@@ -1,22 +1,18 @@
 package com.mousetech.gourmetj.utils;
 
-import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
-import java.io.InputStream;
-import java.io.OutputStream;
 import java.io.PrintWriter;
 import java.util.List;
 
 import org.apache.commons.lang3.StringUtils;
-import org.primefaces.model.DefaultStreamedContent;
+import org.primefaces.model.ByteArrayContent;
 import org.primefaces.model.StreamedContent;
-import org.primefaces.util.SerializableSupplier;
+
 import com.mousetech.gourmetj.ShopIngredient;
 
 /**
  * Construct a Primefaces file output content for an ingredient
  * list in YAML format.
- * @see ShoppingListBean
  * 
  * @author timh
  * @since Jan 15, 2022
@@ -24,30 +20,18 @@ import com.mousetech.gourmetj.ShopIngredient;
 
 public class YamlShoppingList {
 
-	/**
-	 * Create "file" to download in YAML format
-	 * @param ingredientList Ingredient list to format
-	 * @return Http response for file download
-	 */
 	public static StreamedContent createDownload(
 			List<ShopIngredient> ingredientList) {
-	    StreamedContent file;
-		
-		
 		ByteArrayOutputStream ary = new ByteArrayOutputStream();
 		PrintWriter wtr = new PrintWriter(ary);
 		wtr.println("---");
 		formatContent(wtr, ingredientList);
 		wtr.close();
+		byte[] bas = ary.toByteArray();
 
-		InputStream airy = new ByteArrayInputStream(ary.toByteArray());
+		StreamedContent dlList = new ByteArrayContent(bas,
-		file = DefaultStreamedContent.
+				"text/text", "shopping_list.yml");
-				builder().contentEncoding("text/text")
+		return dlList;
-					.name("shopping_list.yml")
-                    .stream(() -> airy)
-                    .build();
-		
-		return file;
 	}
 
 	/**

src/main/resources/META-INF/resources/WEB-INF/layout/layout.xhtml

@@ -6,9 +6,10 @@
     xmlns:ui="http://java.sun.com/jsf/facelets"
     xmlns:p="http://primefaces.org/ui"
 >
-<h:head></h:head>
+<head></head>
-<h:body>
+<body>
     <ui:composition>
+        <f:view>
             <h:head>
                 <title><ui:insert name="title">Gourmet Recipe Manager (web version)</ui:insert></title>
                 <link rel="icon" type="image/vnd.microsoft.icon"
@@ -28,14 +29,50 @@
                 </ui:insert>
                 <!--  -->
                 <div id="footer">
-                    (C) 2021, 2024 Tim Holloway, Licensed under the <a
+                    (C) 2021 Tim Holloway, Licensed under the <a
                         href="http://www.apache.org/licenses/LICENSE-2.0"
                     >Apache License, Version 2.0</a>.
                     <p>Based on Gourmet Recipe Manager by T.
                         Hinkle</p>
                 </div>
                 <!--  -->
+                <h:form id="frmTimeout">
+                    <p:idleMonitor
+                        timeout="#{userSession.sessionTimeoutInterval}"
+                        onidle="PF('dlgSessionExpired').show()"
+                    >
+                        <p:ajax event="idle"
+                            listener="#{userSession.sessionIdleListener}"
+                        />
+                    </p:idleMonitor>
+                    <p:confirmDialog closable="false"
+                        id="sessionExpiredDlg"
+                        message="Your session has expired."
+                        header="#{msgs['confirmDialog.initiatingDestroyProcess.label']}"
+                        severity="alert"
+                        widgetVar="dlgSessionExpired"
+                        style="z-index: 25000"
+                    >
+                        <p:commandButton id="cmdExpiredOK"
+                            value="OK" action="/main.jsf"
+                            oncomplete="PF('dlgSessionExpired').hide()"
+                        />
+                    </p:confirmDialog>
+                </h:form>
+                <!--  -->
+                <h:form id="frmOpErr">
+                    <p:confirmDialog
+                        message="Session may have expired."
+                        header="Error"
+                        severity="alert" widgetVar="opError"
+                    >
+                        <p:commandButton value="OK"
+                            oncomplete="PF('opError').hide()"
+                        />
+                    </p:confirmDialog>
+                </h:form>
             </h:body>
+        </f:view>
     </ui:composition>
-</h:body>
+</body>
 </html>

src/main/resources/META-INF/resources/WEB-INF/layout/misctabs/ingshopkey.xhtml

@@ -8,13 +8,23 @@
 >
 <!-- === Edit ingkey/shopcat === -->
 <h:form id="frmIsk">
-    <p:panelGrid columns="2" style="width: 30em;">
+    <p:panelGrid>
-        <f:facet name="header">
+        <p:row>
-            <h:outputText value="Shopping Categories"/>
+            <p:column>
-        </f:facet>
+                <p:outputLabel for="ctlScSel"
-            <h:outputText value="Shopping Category"/>
+                    value="Shopping Category"
-            <h:outputText value="Ingredient key"/>
+                />
+            </p:column>
+            <p:column>
+                <p:outputLabel for="ctlIngkeySel"
+                    value="Ingredient Key"
+                />
+            </p:column>
+        </p:row>
+        <p:row style="vertical-align: top">
+            <p:column>
                 <p:selectOneListbox id="ctlScSel"
+                    style="width: 240px"
                     value="#{shoppingListBean.selectedShopcat}"
                 >
                     <f:selectItems
@@ -22,8 +32,10 @@
                     />
                     <p:ajax update="ctlIngkeySel" event="change" />
                 </p:selectOneListbox>
+            </p:column>
+            <p:column>
                 <h:selectManyListbox id="ctlIngkeySel"
-                    style="width: 12em;"
+                    style="width: 240px"
                     value="#{shoppingListBean.selectedIngkey}"
                     label="Ingcat"
                 >
@@ -32,21 +44,34 @@
                     />
                     <p:ajax event="change" update="ctlChangeCat"/>
                 </h:selectManyListbox>
+            </p:column>
+        </p:row>
+        <p:row>
+            <p:column>
                 <p:outputLabel
-                    value="Change selected ingredient key category to:"
+                    value="Change shopping category to:"
-                    style="width: 10em;"
                 />
+            </p:column>
+            <p:column>
                 <p:autoComplete
                     value="#{shoppingListBean.newShopcat}"
                     autoSelection="false" forceSelection="false"
                     maxResults="12"
                     completeMethod="#{shoppingListBean.suggestShopcat}"
                 />
+            </p:column>
+        </p:row>
+        <p:row>
+            <p:column>
                 <p:commandButton id="ctlChangeCat" value="Change..."
                     disabled="#{empty shoppingListBean.selectedIngkey}"
                     onclick="PF('dlgOkRecat').show()"
                 />
+            </p:column>
+            <p:column>
                 <h:outputText value="" />
+            </p:column>
+        </p:row>
     </p:panelGrid>
 </h:form>
 <!--  -->

src/main/resources/META-INF/resources/detailEdit.xhtml

@@ -14,15 +14,6 @@
         <ui:define name="content">
             <h:outputScript name="js/scrolltable.js" />
             <style>
-.deDescl {
-	width: 15em;
-	text-align: left;
-}
-
-.deDescr {
-	text-align: left;
-}
-
 .ingSel {
 	width: 3em;
 	text-align: center;
@@ -55,9 +46,7 @@
                         <p:tab id="overviewTab"
                             title="Description"
                         >
-                            <p:panelGrid columns="2"
+                            <p:panelGrid columns="2">
-                                columnClasses="deDescl, deDescr"
-                            >
                                 <f:facet name="header">Description</f:facet>
                                 <p:outputLabel for="@next"
                                     value="Title"
@@ -152,18 +141,14 @@
                                     rows="10" cols="45"
                                     value="#{recipeDetailBean.recipe.description}"
                                 />
-                            </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"
-                                columns="2"
-                            >
                                 <p:fileUpload id="ctlUpload"
                                     label="Upload Image"
-                                    listener="#{recipeDetailBean.ajaxUploadImage}"
+                                    fileUploadListener="#{recipeDetailBean.ajaxUploadImage}"
                                     global="true" mode="advanced"
                                     multiple="false"
                                     update=":messages picPanel"
@@ -173,10 +158,13 @@
                                 />
                                 <p:commandButton id="ctlDelImg"
                                     value="Delete Image"
-                                    action="#{recipeDetailBean.ajaxDeleteImage}"
+                                >
-                                    update="picPanel"
+                                    <f:ajax
-                                    immediate="true"
+                                        listener="#{recipeDetailBean.ajaxDeleteImage}"
-                                />
+                                        render="picPanel"
+                                        immediate="true"
+                                    />
+                                </p:commandButton>
                             </p:panelGrid>
                         </p:tab>
                         <p:tab id="ingredientsTab"
@@ -391,36 +379,22 @@
                             </p:panel>
                         </p:tab>
                     </p:tabView>
-                    <p:commandButton id="doSave" value="Save" icon="ui-icon-pencil" ajax="false" disabled="{not recipeDetailBean.dirty}" action="#{recipeDetailBean.doSave}" />
+                    <p:commandButton id="doSave" value="Save"
+                        icon="ui-icon-pencil" ajax="false"
+                        disabled="{not recipeDetailBean.dirty}"
+                        action="#{recipeDetailBean.doSave}"
+                    />
                     <p:commandButton id="doCancel" value="Cancel"
                         ajax="false" immediate="true"
                         action="recipeDetails.jsf"
                     />
                     <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>
             </p:panel>
-            <!--  Note timeouts  must be less than
-                     session timeout in application properties-->
-            <p:growl id="growl" showDetail="true" sticky="true" />
-            <h:form id="frmTimeout">
-                <p:idleMonitor timeout="1500000">
-                    <p:ajax id="ajaxIdle" event="idle"
-                        listener="#{cookieBean.sessionIdleListener}"
-                        update="growl"
-                    />
-                </p:idleMonitor>
-                <p:idleMonitor timeout="1900000">
-                    <p:ajax id="ajaxIdle" event="idle"
-                        listener="#{cookieBean.sessionTimeout}"
-                        update="growl"
-                        oncomplete="window.location='#{request.contextPath}/main.jsf'"
-                    />
-                </p:idleMonitor>
-            </h:form>
-            <!--  -->
             <p:dialog id="addGroupDlg" widgetVar="addGroupDlg">
                 <h:form id="frmAddGroup">
                     <p:panelGrid columns="1">
@@ -450,9 +424,7 @@
             <p:dialog id="editShopcatDlg"
                 widgetVar="editShopcatDlg"
             >
-                <ui:include
+                <ui:include src="/WEB-INF/layout/dialog/editShopcat.xhtml" />
-                    src="/WEB-INF/layout/dialog/editShopcat.xhtml"
-                />
             </p:dialog>
         </ui:define>
     </ui:composition>

src/main/resources/META-INF/resources/main.xhtml

@@ -28,10 +28,10 @@
                 />
                 <p:outputLabel for="@next" value="Search for " />
                 <p:selectOneMenu id="ctlSearchType"
-                    value="#{cookieBean.searchType}"
+                    value="#{userSession.searchType}"
                 >
                     <f:selectItems
-                        value="#{appBean.searchTypeList}"
+                        value="#{userSession.searchTypeList}"
                     />
                     <p:ajax
                         listener="#{adminMainBean.resetSuggestions}"
@@ -45,12 +45,12 @@
                 <p:commandButton value="New Recipe"
                     action="#{adminMainBean.doNewRecipe}"
                 />
-                <p:commandButton value="Shopping..."
+                <p:commandButton value="More..."
                     action="#{adminMainBean.doMore}"
                 />
                 <h:outputText id="slistSSize"
                     style="margin-left: 2em"
-                    value="#{cookieBean.displayListSize}"
+                    value="#{userSession.shoppingList.size()}"
                 />
                 <h:outputLabel for="slistSize"
                     value=" Recipes in Shopping List"

src/main/resources/META-INF/resources/recipeDetails.xhtml

@@ -27,166 +27,179 @@
         <h:messages />
         <h:form id="form1">
             <p:panelGrid label="#{recipeDetailBean.recipe.title}"
-                columns="2"
+                columns="1"
             >
-                <f:facet name="header">
+                <p:panelGrid>
-                    <h:outputText styleClass="recipeTitle"
+                    <f:facet name="header">
-                        value="#{recipeDetailBean.recipe.title}"
+                        <h:outputText styleClass="recipeTitle"
-                    />
+                            value="#{recipeDetailBean.recipe.title}"
-                </f:facet>
+                        />
-                <p:panel id="leftCol" style="width: auto;">
+                    </f:facet>
-                    <p:panelGrid columns="2">
+                    <p:row>
-                        <p:panelGrid id="picButtons" columns="2">
+                        <p:column id="leftCol" style="width: 75%">
-                            <img id="bigpix"
+                            <p:panelGrid columns="2">
-                                style="width: 132px;"
+                                <img id="bigpix"
-                                src="/img/picture/#{recipeDetailBean.recipe.id}"
+                                    src="/img/picture/#{recipeDetailBean.recipe.id}"
-                            />
+                                />
-                            <p:panelGrid id="pnlButtons"
+                                <p:panelGrid id="pnlDetails"
-                                columns="2" style="width: 220px;"
+                                    columns="2"
-                            >
+                                >
                                 <!--  TODO: ask if we should save -->
-                                <p:commandButton value="Back"
+                                    <p:commandButton value="Back"
-                                    ajax="false"
+                                        ajax="false"
-                                    icon="ui-icon-arrowthick-1-w"
+                                        icon="ui-icon-arrowthick-1-w"
-                                    action="home"
+                                        action="home"
-                                    immediate="true"
+                                        immediate="true"
+                                    />
+                                    <p:commandButton ajax="false"
+                                        value="Print"
+                                        icon="ui-icon-print"
+                                        action="recipePrint.jsf"
+                                        styleClass="ui-button-print"
+                                        immediate="true"
+                                    />
+                                   <p:commandButton id="ctlShop"
+                                        icon="ui-icon-cart"
+                                        value="Shop"
+                                        immediate="true"
+                                        styleClass="#{recipeDetailBean.shop ? 'greenButton' : null}"
+                                        action="#{recipeDetailBean.doShop}"
+                                        update="ctlShop"
+                                    />
+                                    <h:outputText value=""/>
+                                     <p:outputLabel for="@next"
+                                        value="Categories:"
+                                    />
+                                    <h:outputText
+                                        label="Category: "
+                                        value="#{userSession.formatCategories(recipeDetailBean.recipe)}"
+                                    />
+                                    <p:outputLabel for="@next"
+                                        value="Cuisine:"
+                                    />
+                                    <h:outputText
+                                        label="Cuisine: "
+                                        value="#{recipeDetailBean.recipe.cuisine}"
+                                    />
+                                    <p:outputLabel for="@next"
+                                        value="Prep Time:"
+                                    />
+                                    <h:outputText
+                                        label="Prep Time: "
+                                        value="#{recipeDetailBean.recipe.preptime}"
+                                        converter="com.mousetech.gourmetj.utils.TimeConverter"
+                                    />
+                                    <p:outputLabel for="@next"
+                                        value="Cook Time:"
+                                    />
+                                    <h:outputText
+                                        label="Cook Time: "
+                                        value="#{recipeDetailBean.recipe.cooktime}"
+                                        converter="com.mousetech.gourmetj.utils.TimeConverter"
+                                    />
+                                </p:panelGrid>
+                            </p:panelGrid>
+                            <h:commandLink value="Edit Details"
+                                action="#{recipeDetailBean.editDescription}"
+                            />
+                            <!--  -->
+                            <p:panelGrid id="pnlInstr"
+                                columns="1" style="width: 100%"
+                            >
+                                <f:facet name="header">
+                                    <h:outputText
+                                        styleClass="subtitle"
+                                        value="Instructions"
+                                    />
+                                </f:facet>
+                                <h:outputText id="instructions"
+                                    escape="false"
+                                    value="#{recipeDetailBean.instructions}"
                                 />
-                                <p:commandButton ajax="false"
+                                <h:commandLink
-                                    value="Print"
+                                    value="Edit Instructions"
-                                    icon="ui-icon-print"
+                                    action="#{recipeDetailBean.editInstructions}"
-                                    action="recipePrint.jsf"
-                                    styleClass="ui-button-print"
-                                    immediate="true"
-                                />
-                                <p:commandButton id="ctlShop"
-                                    icon="ui-icon-cart"
-                                    value="Shop" immediate="true"
-                                    styleClass="#{recipeDetailBean.shop ? 'greenButton' : null}"
-                                    action="#{recipeDetailBean.doShop}"
-                                    update="ctlShop"
-                                />
-                                <h:outputText value="" />
-                                <p:outputLabel for="@next"
-                                    value="Categories:"
-                                />
-                                <h:outputText label="Category: "
-                                    value="#{userSession.formatCategories(recipeDetailBean.recipe)}"
-                                />
-                                <p:outputLabel for="@next"
-                                    value="Cuisine:"
-                                />
-                                <h:outputText label="Cuisine: "
-                                    value="#{recipeDetailBean.recipe.cuisine}"
-                                />
-                                <p:outputLabel for="@next"
-                                    value="Prep Time:"
-                                />
-                                <h:outputText label="Prep Time: "
-                                    value="#{recipeDetailBean.recipe.preptime}"
-                                    converter="com.mousetech.gourmetj.utils.TimeConverter"
-                                />
-                                <p:outputLabel for="@next"
-                                    value="Cook Time:"
-                                />
-                                <h:outputText label="Cook Time: "
-                                    value="#{recipeDetailBean.recipe.cooktime}"
-                                    converter="com.mousetech.gourmetj.utils.TimeConverter"
-                                />
-                                <h:outputText value="" />
-                                <p:commandButton
-                                    icon="ui-icon-wrench"
-                                    value="Edit"
-                                    action="#{recipeDetailBean.editDescription}"
                                 />
                             </p:panelGrid>
-                        </p:panelGrid>
+                            <p:panelGrid id="pnlNotes"
-                    </p:panelGrid>
+                                columns="1" style="width: 100%"
-                    <!--  -->
+                            >
-                    <p:panel id="pnlInstr">
+                                <f:facet name="header">
-                        <f:facet name="header">
+                                    <h:outputText
-                            <h:outputText styleClass="subtitle"
+                                        styleClass="subtitle"
-                                value="Instructions"
+                                        value="Notes"
+                                    />
+                                </f:facet>
+                                <h:outputText escape="false"
+                                    value="#{recipeDetailBean.modifications}"
+                                />
+                                <h:commandLink value="Edit Notes"
+                                    action="#{recipeDetailBean.editNotes}"
+                                />
+                            </p:panelGrid>
+                            <p:commandButton id="ctlDelete"
+                                value="Delete Recipe"
+                                onclick="PF('okDeleteDlg').show()"
                             />
-                        </f:facet>
+                        </p:column>
-                        <h:outputText id="instructions"
+                        <!-- ====== Ingredients ============================ -->
-                            escape="false"
+                        <p:column id="ingredientsc"
-                            value="#{recipeDetailBean.instructions}"
+                            style="width: 25%; vertical-align: top;"
-                        />
-                        <br />
-                        <h:commandLink value="Edit Instructions"
-                            action="#{recipeDetailBean.editInstructions}"
-                        />
-                    </p:panel>
-                    <p:panel id="pnlNotes">
-                        <f:facet name="header">
-                            <h:outputText styleClass="subtitle"
-                                value="Notes"
-                            />
-                        </f:facet>
-                        <h:outputText escape="false"
-                            value="#{recipeDetailBean.modifications}"
-                        />
-                        <br />
-                        <h:commandLink value="Edit Notes"
-                            action="#{recipeDetailBean.editNotes}"
-                        />
-                    </p:panel>
-                    <p:commandButton id="ctlDelete"
-                        value="Delete Recipe"
-                        onclick="PF('okDeleteDlg').show()"
-                    />
-                </p:panel>
-                <!-- ====== Ingredients ============================ -->
-                <p:panel id="ingredientsc"
-                    style="width: 30%; min-width: 40em; vertical-align: top;"
-                >
-                    <p:dataTable id="ingredients"
-                        value="#{recipeDetailBean.ingredients}"
-                        var="item"
-                        rowStyleClass="#{item.ingGroup ? 'displayIngGroupRow' : null}"
-                    >
-                        <f:facet name="header">
-                            <h:outputText styleClass="subtitle"
-                                value="Ingredients"
-                            />
-                        </f:facet>
-                        <f:facet name="footer">
-                            <h:commandLink
-                                value="Edit Ingredients"
-                                style="vertical-align: top"
-                                action="#{recipeDetailBean.editIngredients}"
-                            />
-                        </f:facet>
-                        <p:column label="Amt"
-                            style="width: 3em; text-align: right"
                         >
+                            <p:dataTable id="ingredients"
+                                value="#{recipeDetailBean.ingredients}"
+                                var="item"
+                                rowStyleClass="#{item.ingGroup ? 'displayIngGroupRow' : null}"
+                            >
+                                <f:facet name="header">
+                                    <h:outputText
+                                        styleClass="subtitle"
+                                        value="Ingredients"
+                                    />
+                                </f:facet>
+                                <f:facet name="footer">
+                                    <h:commandLink
+                                        value="Edit Ingredients"
+                                        style="vertical-align: top"
+                                        action="#{recipeDetailBean.editIngredients}"
+                                    />
+                                </f:facet>
+                                <p:column label="Amt"
+                                    style="width: 3em; text-align: right"
+                                >
+                                    <h:outputText
+                                        value="#{item.displayAmount}"
+                                    />
+                                </p:column>
+                                <p:column label="Units"
+                                    style="width: 5em"
+                                >
+                                    <h:outputText
+                                        value="#{item.unit}"
+                                    />
+                                </p:column>
+                                <p:column label="Item"
+                                    style="width: 20em"
+                                >
+                                    <h:outputText
+                                        value="#{item.item}"
+                                    />
+                                </p:column>
+                                <p:column label="Optional"
+                                    style="width: 2em"
+                                >
+                                    <p:selectBooleanCheckbox
+                                        readonly="true"
+                                        value="#{item.optionalCB}"
+                                    />
+                                </p:column>
+                            </p:dataTable>
                             <h:outputText
-                                value="#{item.displayAmount}"
+                                value="Recipe ID: #{recipeDetailBean.recipe.id}"
                             />
                         </p:column>
-                        <p:column label="Units"
+                    </p:row>
-                            style="width: 5em"
+                </p:panelGrid>
-                        >
-                            <h:outputText value="#{item.unit}" />
-                        </p:column>
-                        <p:column label="Item"
-                            style="width: 20em; text-wrap: wrap"
-                        >
-                            <h:outputText value="#{item.item}" />
-                        </p:column>
-                        <p:column label="Optional"
-                            style="width: 2em"
-                        >
-                            <p:selectBooleanCheckbox
-                                disabled="true"
-                                value="#{item.optionalCB}"
-                            />
-                        </p:column>
-                    </p:dataTable>
-                    <h:outputText
-                        value="Recipe ID: #{recipeDetailBean.recipe.id}"
-                    />
-                </p:panel>
             </p:panelGrid>
         </h:form>
         <!--  -->

src/main/resources/META-INF/resources/shoppingList.xhtml

@@ -6,7 +6,7 @@
     xmlns:p="http://primefaces.org/ui"
     xmlns:c="http://xmlns.jcp.org/jstl"
 >
-    <!-- Tabbed page for the Mainpage "Shopping..." button -->
+    <!-- Tabbed page for the Mainpage "More..." button -->
     <ui:define name="title">Gourmet Recipe Manager - Shopping</ui:define>
     <ui:define name="content">
         <style>
@@ -34,7 +34,6 @@
 	
 }
 </style>
-        This is the list of recipe items you've selected to shop for.
         <h:messages />
         <p:tabView id="tabGroupClient" orientation="left"
             dynamic="true"
@@ -42,12 +41,12 @@
             <p:tab id="overviewTab" title="Shopping List">
                 <h:form id="form1">
                     <p:dataTable id="tblRecipes"
-                        style="width: 40em"
+                        style="width: 600px"
                         value="#{shoppingListBean.recipeList}"
                         var="item"
                     >
                         <f:facet name="header">
-                            <h:outputText value="Recipes " />
+                            <h:outputText value="Recipes" />
                             <p:commandButton
                                 update="@parent:tblRecipes"
                                 value="Clear Recipes"
@@ -83,11 +82,11 @@
                         </p:commandButton>
                     </p:column>
                     <p:column id="ingredientsc"
-                        style="vertical-align: top; margin-left: 1em; margin-right: 1em;"
+                        style="width: 25%; vertical-align: top;"
                     >
                         <p:dataTable id="tblShopIngredients"
+                            style="width: 600px; margin-top: 10px"
                             value="#{shoppingListBean.ingredientList}"
-                            style="width: 40em;"
                             sortBy="#{item.shopCat}" var="item"
                         >
                             <f:facet name="header">
@@ -96,11 +95,13 @@
                                     value="Ingredients"
                                 />
                             </f:facet>
+                            <p:headerRow>
                                 <p:column colspan="4">
                                     <h:outputText
                                         value="#{item.shopCat}"
                                     />
                                 </p:column>
+                            </p:headerRow>
                             <p:column label="Amt"
                                 style="width: 3em; text-align: right"
                             >
@@ -123,7 +124,7 @@
                                     styleClass="#{(item.inPantry) ? 'noRecipe' :'plusRecipe' }"
                                 />
                             </p:column>
-                            <p:column style="width: 3em">
+                            <p:column style="width: 2em">
                                 <f:facet name="header">
                                     <h:outputText value="Pantry" />
                                 </f:facet>
@@ -149,7 +150,6 @@
             </p:tab>
             <!--  -->
             <p:tab id="tabPantry" title="Pantry">
-                <h:outputText value="Stuff already in the pantry." />
                 <h:outputText value="For future implementation" />
             </p:tab>
             <!--  -->
@@ -160,7 +160,7 @@
         <h:form id="frmHome">
             <p:commandButton id="doHome" value="Home"
                 icon="ui-icon-home" ajax="false" immediate="true"
-                action="/main.jsf?redirect=true"
+                action="main.jsf"
             />
         </h:form>
     </ui:define>

src/main/resources/application.yml

@@ -13,28 +13,20 @@ spring:
     #url:  jdbc:sqlite:${home}/recipes.db
     url: jdbc:mysql:dbase/recipes
     # options: ${env} values
-    driverClassName: com.mysql.cj.jdbc.Driver
+    driverClassName: org.mysql.jdbc.Driver
     username: recipes
     password: yumyumyum
   jpa:
     hibernate:
       ddl-auto: none
+    #database-platform: org.sqlite.hibernate.dialect.SQLiteDialect
     database-platform: org.hibernate.dialect.MySQLDialect
 
 server:
     servlet:
         session:
             timeout: '30m'
-# Theme here overrides joinfaces theme            
-#        context-parameters:
-#            primefaces:
-#                THEME: vela
-
 
 gourmet:
     password:
         file: .gourmetpw
-        
-joinfaces:
-  primefaces:
-    theme: casablanca