diff --git a/.gitignore b/.gitignore
index 66d4db2..f484b5d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -38,3 +38,7 @@
/Semester 2/QuizBusLogic/target/
/Semester 2/lab04_nav1_CalebFontenot/target/
/Semester 2/RecursionDemo/target/
+/Semester 2/lab04_nav1_CalebFontenot_war_1.0-SNAPSHOT2/target/
+/Semester 2/lab5_EL1_F23_CalebFontenot/target/
+/Semester 2/labEL2_CalebFontenot/target/
+/Semester 2/MP2-chapter4_Java20_CalebFontenot/nbproject/private/
diff --git a/Semester 2/MP1_CalebFontenot/nb-configuration.xml b/Semester 2/MP1_CalebFontenot/nb-configuration.xml
new file mode 100644
index 0000000..5e1a2de
--- /dev/null
+++ b/Semester 2/MP1_CalebFontenot/nb-configuration.xml
@@ -0,0 +1,20 @@
+
+
+
+
+
+ 10-web
+ gfv700ee10
+ Facelets
+
+
diff --git a/Semester 2/MP1_CalebFontenot/pom.xml b/Semester 2/MP1_CalebFontenot/pom.xml
new file mode 100644
index 0000000..dfad21f
--- /dev/null
+++ b/Semester 2/MP1_CalebFontenot/pom.xml
@@ -0,0 +1,77 @@
+
+ 4.0.0
+ edu.slcc.asdv.caleb
+ MP1_CalebFontenot
+ 1.0-SNAPSHOT
+ war
+ MP1_CalebFontenot-1.0-SNAPSHOT
+
+
+ 11
+ 11
+ ${project.build.directory}/endorsed
+ UTF-8
+ false
+ 10.0.0
+
+
+
+
+ jakarta.platform
+ jakarta.jakartaee-api
+ ${jakartaee}
+ provided
+
+
+
+
+
+
+ org.apache.maven.plugins
+ maven-compiler-plugin
+ 3.8.1
+
+
+ 11
+
+ ${endorsed.dir}
+
+
+
+
+ org.apache.maven.plugins
+ maven-war-plugin
+ 2.3
+
+ false
+
+
+
+ org.apache.maven.plugins
+ maven-dependency-plugin
+ 2.6
+
+
+ validate
+
+ copy
+
+
+ ${endorsed.dir}
+ true
+
+
+ jakarta.platform
+ jakarta.jakartaee-api
+ ${jakartaee}
+ jar
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Semester 2/MP1_CalebFontenot/src/main/java/edu/slcc/asdv/beans/Navigation.java b/Semester 2/MP1_CalebFontenot/src/main/java/edu/slcc/asdv/beans/Navigation.java
new file mode 100644
index 0000000..c481909
--- /dev/null
+++ b/Semester 2/MP1_CalebFontenot/src/main/java/edu/slcc/asdv/beans/Navigation.java
@@ -0,0 +1,23 @@
+/*
+ * Click nbfs://nbhost/SystemFileSystem/Templates/Licenses/license-default.txt to change this license
+ * Click nbfs://nbhost/SystemFileSystem/Templates/JSF/JSFManagedBean.java to edit this template
+ */
+
+package edu.slcc.asdv.beans;
+
+import jakarta.inject.Named;
+import jakarta.enterprise.context.Dependent;
+
+/**
+ *
+ * @author caleb
+ */
+@Named(value="navigation")
+@Dependent
+public class Navigation {
+
+ /** Creates a new instance of Navigation */
+ public Navigation() {
+ }
+
+}
diff --git a/Semester 2/MP1_CalebFontenot/src/main/java/edu/slcc/asdv/caleb/mp1_calebfontenot/JakartaRestConfiguration.java b/Semester 2/MP1_CalebFontenot/src/main/java/edu/slcc/asdv/caleb/mp1_calebfontenot/JakartaRestConfiguration.java
new file mode 100644
index 0000000..e98dc05
--- /dev/null
+++ b/Semester 2/MP1_CalebFontenot/src/main/java/edu/slcc/asdv/caleb/mp1_calebfontenot/JakartaRestConfiguration.java
@@ -0,0 +1,13 @@
+package edu.slcc.asdv.caleb.mp1_calebfontenot;
+
+import jakarta.ws.rs.ApplicationPath;
+import jakarta.ws.rs.core.Application;
+
+/**
+ * Configures Jakarta RESTful Web Services for the application.
+ * @author Juneau
+ */
+@ApplicationPath("resources")
+public class JakartaRestConfiguration extends Application {
+
+}
diff --git a/Semester 2/MP1_CalebFontenot/src/main/java/edu/slcc/asdv/caleb/mp1_calebfontenot/resources/JakartaEE10Resource.java b/Semester 2/MP1_CalebFontenot/src/main/java/edu/slcc/asdv/caleb/mp1_calebfontenot/resources/JakartaEE10Resource.java
new file mode 100644
index 0000000..1aff88d
--- /dev/null
+++ b/Semester 2/MP1_CalebFontenot/src/main/java/edu/slcc/asdv/caleb/mp1_calebfontenot/resources/JakartaEE10Resource.java
@@ -0,0 +1,20 @@
+package edu.slcc.asdv.caleb.mp1_calebfontenot.resources;
+
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.core.Response;
+
+/**
+ *
+ * @author
+ */
+@Path("jakartaee10")
+public class JakartaEE10Resource {
+
+ @GET
+ public Response ping(){
+ return Response
+ .ok("ping Jakarta EE")
+ .build();
+ }
+}
diff --git a/Semester 2/MP1_CalebFontenot/src/main/resources/META-INF/persistence.xml b/Semester 2/MP1_CalebFontenot/src/main/resources/META-INF/persistence.xml
new file mode 100644
index 0000000..7582bf1
--- /dev/null
+++ b/Semester 2/MP1_CalebFontenot/src/main/resources/META-INF/persistence.xml
@@ -0,0 +1,7 @@
+
+
+
+
+
+
+
diff --git a/Semester 2/MP1_CalebFontenot/src/main/webapp/WEB-INF/beans.xml b/Semester 2/MP1_CalebFontenot/src/main/webapp/WEB-INF/beans.xml
new file mode 100644
index 0000000..9dfae34
--- /dev/null
+++ b/Semester 2/MP1_CalebFontenot/src/main/webapp/WEB-INF/beans.xml
@@ -0,0 +1,6 @@
+
+
+
\ No newline at end of file
diff --git a/Semester 2/MP1_CalebFontenot/src/main/webapp/WEB-INF/glassfish-web.xml b/Semester 2/MP1_CalebFontenot/src/main/webapp/WEB-INF/glassfish-web.xml
new file mode 100644
index 0000000..673cc06
--- /dev/null
+++ b/Semester 2/MP1_CalebFontenot/src/main/webapp/WEB-INF/glassfish-web.xml
@@ -0,0 +1,25 @@
+
+
+
+
+
+
+
+ Keep a copy of the generated servlet class' java code.
+
+
+
diff --git a/Semester 2/MP1_CalebFontenot/src/main/webapp/WEB-INF/web.xml b/Semester 2/MP1_CalebFontenot/src/main/webapp/WEB-INF/web.xml
new file mode 100644
index 0000000..fcfcd54
--- /dev/null
+++ b/Semester 2/MP1_CalebFontenot/src/main/webapp/WEB-INF/web.xml
@@ -0,0 +1,24 @@
+
+
+
+ jakarta.faces.PROJECT_STAGE
+ Development
+
+
+ Faces Servlet
+ jakarta.faces.webapp.FacesServlet
+ 1
+
+
+ Faces Servlet
+ /faces/*
+
+
+
+ 30
+
+
+
+ faces/index.xhtml
+
+
diff --git a/Semester 2/MP1_CalebFontenot/src/main/webapp/index.html b/Semester 2/MP1_CalebFontenot/src/main/webapp/index.html
new file mode 100644
index 0000000..3368e9c
--- /dev/null
+++ b/Semester 2/MP1_CalebFontenot/src/main/webapp/index.html
@@ -0,0 +1,10 @@
+
+
+
+ Start Page
+
+
+
+ Hello World!
+
+
diff --git a/Semester 2/RecursionDemo/pom.xml b/Semester 2/RecursionDemo/pom.xml
deleted file mode 100644
index 4f49854..0000000
--- a/Semester 2/RecursionDemo/pom.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
- 4.0.0
- edu.slcc.asdv.caleb
- RecursionDemo
- 1.0-SNAPSHOT
- jar
-
- UTF-8
- 20
- 20
- edu.slcc.asdv.caleb.recursiondemo.RecursionDemo
-
-
\ No newline at end of file
diff --git a/Semester 2/RecursionDemo/src/main/java/edu/slcc/asdv/caleb/recursiondemo/RecursionDemo.java b/Semester 2/RecursionDemo/src/main/java/edu/slcc/asdv/caleb/recursiondemo/RecursionDemo.java
deleted file mode 100644
index 2ed88ca..0000000
--- a/Semester 2/RecursionDemo/src/main/java/edu/slcc/asdv/caleb/recursiondemo/RecursionDemo.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Click nbfs://nbhost/SystemFileSystem/Templates/Licenses/license-default.txt to change this license
- */
-package edu.slcc.asdv.caleb.recursiondemo;
-
-/**
- *
- * @author caleb
- */
-public class RecursionDemo {
-
- static void printNTimes(int nTimes, String message)
- {
- for (int i = 0; i < nTimes; ++i) {
- System.out.println(message);
- }
- }
-
- static void printNTimesRecursion(int nTimes, String message)
- {
- if (nTimes == 0) {
- return;
- }
- System.out.println(message);
- printNTimesRecursion(--nTimes, message);
- }
-
- public static long factorial(int n)
- {
- long fact;
- if (n == 1)
- return 1;
- fact = n * factorial(n - 1);
- return fact;
- }
-
- public static void main(String[] args)
- {
- System.out.println(factorial(20));
- printNTimesRecursion(1, "Hello Recursion");
- }
-}
diff --git a/Semester 2/lab04_nav1_CalebFontenot/faces-config.NavData b/Semester 2/lab04_nav1_CalebFontenot/faces-config.NavData
new file mode 100644
index 0000000..298bfc5
--- /dev/null
+++ b/Semester 2/lab04_nav1_CalebFontenot/faces-config.NavData
@@ -0,0 +1,6 @@
+
+
+
+
+
+
diff --git a/Semester 2/lab04_nav1_CalebFontenot/src/main/java/edu/slcc/asdv/beans/SimpleController.java b/Semester 2/lab04_nav1_CalebFontenot/src/main/java/edu/slcc/asdv/beans/SimpleController.java
index 13c11ef..4ac674f 100644
--- a/Semester 2/lab04_nav1_CalebFontenot/src/main/java/edu/slcc/asdv/beans/SimpleController.java
+++ b/Semester 2/lab04_nav1_CalebFontenot/src/main/java/edu/slcc/asdv/beans/SimpleController.java
@@ -7,6 +7,7 @@ package edu.slcc.asdv.beans;
import jakarta.inject.Named;
import jakarta.enterprise.context.RequestScoped;
+import java.io.Serializable;
/**
*
@@ -14,7 +15,7 @@ import jakarta.enterprise.context.RequestScoped;
*/
@Named(value="simpleController")
@RequestScoped
-public class SimpleController {
+public class SimpleController implements Serializable {
private String message;
diff --git a/Semester 2/lab04_nav1_CalebFontenot/src/main/java/edu/slcc/asdv/beans/SimpleController2.java b/Semester 2/lab04_nav1_CalebFontenot/src/main/java/edu/slcc/asdv/beans/SimpleController2.java
new file mode 100644
index 0000000..dd56821
--- /dev/null
+++ b/Semester 2/lab04_nav1_CalebFontenot/src/main/java/edu/slcc/asdv/beans/SimpleController2.java
@@ -0,0 +1,23 @@
+/*
+ * Click nbfs://nbhost/SystemFileSystem/Templates/Licenses/license-default.txt to change this license
+ * Click nbfs://nbhost/SystemFileSystem/Templates/JSF/JSFManagedBean.java to edit this template
+ */
+
+package edu.slcc.asdv.beans;
+
+import jakarta.inject.Named;
+import jakarta.enterprise.context.Dependent;
+
+/**
+ *
+ * @author caleb
+ */
+@Named(value="simpleController2")
+@Dependent
+public class SimpleController2 extends SimpleController {
+
+ /** Creates a new instance of SimpleController2 */
+ public SimpleController2() {
+ }
+
+}
diff --git a/Semester 2/lab04_nav1_CalebFontenot/src/main/webapp/WEB-INF/faces-config.xml b/Semester 2/lab04_nav1_CalebFontenot/src/main/webapp/WEB-INF/faces-config.xml
index 04063f8..83e69e7 100644
--- a/Semester 2/lab04_nav1_CalebFontenot/src/main/webapp/WEB-INF/faces-config.xml
+++ b/Semester 2/lab04_nav1_CalebFontenot/src/main/webapp/WEB-INF/faces-config.xml
@@ -49,5 +49,9 @@
-
+
+ messageHandler
+ edu.slcc.asdv.beans.SimpleController2
+ request
+
diff --git a/Semester 2/lab04_nav1_CalebFontenot/src/main/webapp/error-message.xhtml b/Semester 2/lab04_nav1_CalebFontenot/src/main/webapp/error-message.xhtml
index cfb9a6a..5911d51 100644
--- a/Semester 2/lab04_nav1_CalebFontenot/src/main/webapp/error-message.xhtml
+++ b/Semester 2/lab04_nav1_CalebFontenot/src/main/webapp/error-message.xhtml
@@ -6,6 +6,7 @@
Facelet Title
+ #{simpleController}
Error Message Page
Message is too short
diff --git a/Semester 2/lab04_nav1_CalebFontenot/src/main/webapp/index.xhtml b/Semester 2/lab04_nav1_CalebFontenot/src/main/webapp/index.xhtml
index 1eb56d6..209351f 100644
--- a/Semester 2/lab04_nav1_CalebFontenot/src/main/webapp/index.xhtml
+++ b/Semester 2/lab04_nav1_CalebFontenot/src/main/webapp/index.xhtml
@@ -7,7 +7,8 @@
-
+
+