();
+ for(Problem problem: problems) {
+ returnArray.add(problem.isCorrectAnswer());
+ }
+ return returnArray;
+ }
+}
diff --git a/Semester 2/Assignments/MP2_BusinessLogic_CalebFontenot/src/main/java/com/corejsf/Problem.java b/Semester 2/Assignments/MP2_BusinessLogic_CalebFontenot/src/main/java/com/corejsf/Problem.java
new file mode 100644
index 0000000..1cf63c9
--- /dev/null
+++ b/Semester 2/Assignments/MP2_BusinessLogic_CalebFontenot/src/main/java/com/corejsf/Problem.java
@@ -0,0 +1,33 @@
+package com.corejsf;
+
+import java.io.Serializable;
+
+public class Problem implements Serializable, ProblemInterface {
+ private String question;
+ private boolean answer;
+
+ public Problem() {}
+
+ public Problem(String question, boolean solution) {
+ this.question = question;
+ this.answer = solution;
+ }
+
+ public String getQuestion() {
+ return question;
+ }
+
+ public void setQuestion(String question) {
+ this.question = question;
+ }
+
+ public boolean isCorrectAnswer() {
+ return answer;
+ }
+
+ public void setAnswer(boolean answer) {
+ this.answer = answer;
+ }
+
+
+}
diff --git a/Semester 2/Assignments/MP2_BusinessLogic_CalebFontenot/src/main/java/com/corejsf/ProblemInterface.java b/Semester 2/Assignments/MP2_BusinessLogic_CalebFontenot/src/main/java/com/corejsf/ProblemInterface.java
new file mode 100644
index 0000000..bdff948
--- /dev/null
+++ b/Semester 2/Assignments/MP2_BusinessLogic_CalebFontenot/src/main/java/com/corejsf/ProblemInterface.java
@@ -0,0 +1,19 @@
+/*
+ * Click nbfs://nbhost/SystemFileSystem/Templates/Licenses/license-default.txt to change this license
+ * Click nbfs://nbhost/SystemFileSystem/Templates/Classes/Interface.java to edit this template
+ */
+package com.corejsf;
+
+/**
+ *
+ * @author caleb
+ */
+public interface ProblemInterface {
+ public String getQuestion();
+
+ public void setQuestion(String question);
+
+ public boolean isCorrectAnswer();
+
+ public void setAnswer(boolean answer);
+}
diff --git a/Semester 2/Assignments/MP2_BusinessLogic_CalebFontenot/src/main/java/com/corejsf/QuizBean.java b/Semester 2/Assignments/MP2_BusinessLogic_CalebFontenot/src/main/java/com/corejsf/QuizBean.java
new file mode 100644
index 0000000..fc060df
--- /dev/null
+++ b/Semester 2/Assignments/MP2_BusinessLogic_CalebFontenot/src/main/java/com/corejsf/QuizBean.java
@@ -0,0 +1,90 @@
+package com.corejsf;
+
+import ejb.TestEJBLocal;
+import jakarta.enterprise.context.SessionScoped;
+import jakarta.faces.component.UIViewRoot;
+import jakarta.faces.context.FacesContext;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.Locale;
+
+@Named // or @Named
+@SessionScoped
+public class QuizBean implements Serializable {
+
+ @Inject
+ TestEJBLocal ejb;
+
+ public String getDataFromDatabase() {
+ return ejb.getDataFromDatabase().toString();
+ }
+
+ private int currentLocale = 0;
+ private Data theProblems = new Data();
+ private int currentIndex;
+ private int score;
+
+ public int getScore() {
+ return score;
+ }
+
+ public Problem getCurrent() {
+ return theProblems.getData().get(currentIndex);
+ }
+
+ public String getAnswer() {
+ return "";
+ }
+
+ public void setAnswer(String newValue) {
+ System.out.println("Called setAnswer\nAnswer was: " + newValue);
+ boolean answer = (Boolean.parseBoolean(newValue));
+ try {
+ if (newValue != "true"&& newValue != "false") {
+ // if the newValue is blank, make sure the answer gets interpreted as incorrect.
+ System.out.println("Answer was blank!");
+ answer = !getCurrent().isCorrectAnswer();
+ }
+ if (getCurrent().isCorrectAnswer() == answer) {
+ score++;
+ }
+ currentIndex = (currentIndex + 1) % theProblems.getData().size();
+ } catch (Exception ex) {
+ }
+ }
+
+ public void previousQuestion() {
+ if (currentIndex > 0) {
+ currentIndex = (currentIndex - 1);
+ } else {
+ currentIndex = theProblems.getData().size() - 1;
+ }
+ }
+
+ public void setLanguage(int locale) {
+ UIViewRoot viewRoot = FacesContext.getCurrentInstance().getViewRoot();
+ switch (locale) {
+ default:
+ case 0:
+ viewRoot.setLocale(new Locale("en")); //English
+ break;
+ case 1:
+ viewRoot.setLocale(new Locale("es")); //Spanish
+ break;
+ case 2:
+ viewRoot.setLocale(new Locale("fr")); //French
+ break;
+ case 3:
+ viewRoot.setLocale(new Locale("ru")); //Russian
+ break;
+ case 4:
+ viewRoot.setLocale(new Locale("el")); //Greek
+ break;
+ case 5:
+ viewRoot.setLocale(new Locale("ar")); //Arabic
+ break;
+ }
+ }
+}
diff --git a/Semester 2/QuizBusLogic/src/main/java/edu/slcc/asdv/caleb/quizbuslogic/JakartaRestConfiguration.java b/Semester 2/Assignments/MP2_BusinessLogic_CalebFontenot/src/main/java/edu/slcc/asdv/caleb/quizbuslogic/JakartaRestConfiguration.java
similarity index 100%
rename from Semester 2/QuizBusLogic/src/main/java/edu/slcc/asdv/caleb/quizbuslogic/JakartaRestConfiguration.java
rename to Semester 2/Assignments/MP2_BusinessLogic_CalebFontenot/src/main/java/edu/slcc/asdv/caleb/quizbuslogic/JakartaRestConfiguration.java
diff --git a/Semester 2/QuizBusLogic/src/main/java/edu/slcc/asdv/caleb/quizbuslogic/resources/JakartaEE10Resource.java b/Semester 2/Assignments/MP2_BusinessLogic_CalebFontenot/src/main/java/edu/slcc/asdv/caleb/quizbuslogic/resources/JakartaEE10Resource.java
similarity index 100%
rename from Semester 2/QuizBusLogic/src/main/java/edu/slcc/asdv/caleb/quizbuslogic/resources/JakartaEE10Resource.java
rename to Semester 2/Assignments/MP2_BusinessLogic_CalebFontenot/src/main/java/edu/slcc/asdv/caleb/quizbuslogic/resources/JakartaEE10Resource.java
diff --git a/Semester 2/QuizBusLogic/src/main/java/ejb/TestEJB.java b/Semester 2/Assignments/MP2_BusinessLogic_CalebFontenot/src/main/java/ejb/TestEJB.java
similarity index 100%
rename from Semester 2/QuizBusLogic/src/main/java/ejb/TestEJB.java
rename to Semester 2/Assignments/MP2_BusinessLogic_CalebFontenot/src/main/java/ejb/TestEJB.java
diff --git a/Semester 2/QuizBusLogic/src/main/java/ejb/TestEJBLocal.java b/Semester 2/Assignments/MP2_BusinessLogic_CalebFontenot/src/main/java/ejb/TestEJBLocal.java
similarity index 100%
rename from Semester 2/QuizBusLogic/src/main/java/ejb/TestEJBLocal.java
rename to Semester 2/Assignments/MP2_BusinessLogic_CalebFontenot/src/main/java/ejb/TestEJBLocal.java
diff --git a/Semester 2/QuizBusLogic/src/main/resources/META-INF/persistence.xml b/Semester 2/Assignments/MP2_BusinessLogic_CalebFontenot/src/main/resources/META-INF/persistence.xml
similarity index 100%
rename from Semester 2/QuizBusLogic/src/main/resources/META-INF/persistence.xml
rename to Semester 2/Assignments/MP2_BusinessLogic_CalebFontenot/src/main/resources/META-INF/persistence.xml
diff --git a/Semester 2/Assignments/MP2_BusinessLogic_CalebFontenot/src/main/resources/messages/messages.properties b/Semester 2/Assignments/MP2_BusinessLogic_CalebFontenot/src/main/resources/messages/messages.properties
new file mode 100644
index 0000000..6ca1438
--- /dev/null
+++ b/Semester 2/Assignments/MP2_BusinessLogic_CalebFontenot/src/main/resources/messages/messages.properties
@@ -0,0 +1,18 @@
+
+# Click nbfs://nbhost/SystemFileSystem/Templates/Licenses/license-default.txt to change this license
+# Click nbfs://nbhost/SystemFileSystem/Templates/Other/properties.properties to edit this template
+currentLocale=Current Locale: English
+title=Java Quiz
+heading=Have fun with Java Quiz!
+currentScore=Your current score is {0}.
+guessNext=Answer the question correctly by typing 'true' or 'false' in the text box.
+answer=Your answer:
+next=Next
+previous=Previous
+englishLocale=Change locale to English
+spanishLocale=Change locale to Spanish
+frenchLocale=Change locale to French
+greekLocale=Change locale to Greek
+arabicLocale=Change locale to Arabic
+russianLocale=Change locale to Russian
+
diff --git a/Semester 2/Assignments/MP2_BusinessLogic_CalebFontenot/src/main/resources/messages/messages_ar.properties b/Semester 2/Assignments/MP2_BusinessLogic_CalebFontenot/src/main/resources/messages/messages_ar.properties
new file mode 100644
index 0000000..6c805de
--- /dev/null
+++ b/Semester 2/Assignments/MP2_BusinessLogic_CalebFontenot/src/main/resources/messages/messages_ar.properties
@@ -0,0 +1,17 @@
+
+# Click nbfs://nbhost/SystemFileSystem/Templates/Licenses/license-default.txt to change this license
+# Click nbfs://nbhost/SystemFileSystem/Templates/Other/properties.properties to edit this template
+currentLocale=\u0627\u0644\u0644\u063a\u0629 \u0627\u0644\u062d\u0627\u0644\u064a\u0629: \u0627\u0644\u0639\u0631\u0628\u064a\u0629
+title=\u0627\u062e\u062a\u0628\u0627\u0631 \u062c\u0627\u0641\u0627
+heading=\u0627\u0633\u062a\u0645\u062a\u0639 \u0645\u0639 Java Quiz!
+currentScore=\u0646\u062a\u064a\u062c\u062a\u0643 \u0627\u0644\u062d\u0627\u0644\u064a\u0629 \u0647\u064a {0}.
+guessNext=\u0623\u062c\u0628 \u0639\u0646 \u0627\u0644\u0633\u0624\u0627\u0644 \u0628\u0634\u0643\u0644 \u0635\u062d\u064a\u062d \u0639\u0646 \u0637\u0631\u064a\u0642 \u0643\u062a\u0627\u0628\u0629 "\u0635\u062d\u064a\u062d" \u0623\u0648 "\u062e\u0637\u0623" \u0641\u064a \u0645\u0631\u0628\u0639 \u0627\u0644\u0646\u0635.
+answer=\u0625\u062c\u0627\u0628\u062a\u0643:
+next=\u0627\u0644\u062a\u0627\u0644\u064a
+previous=\u0627\u0644\u0633\u0627\u0628\u0642
+englishLocale=\u062a\u063a\u064a\u064a\u0631 \u0627\u0644\u0644\u063a\u0629 \u0625\u0644\u0649 \u0627\u0644\u0625\u0646\u062c\u0644\u064a\u0632\u064a\u0629
+spanishLocale=\u062a\u063a\u064a\u064a\u0631 \u0627\u0644\u0644\u063a\u0629 \u0625\u0644\u0649 \u0627\u0644\u0625\u0633\u0628\u0627\u0646\u064a\u0629
+frenchLocale=\u062a\u063a\u064a\u064a\u0631 \u0627\u0644\u0644\u063a\u0629 \u0625\u0644\u0649 \u0627\u0644\u0641\u0631\u0646\u0633\u064a\u0629
+greekLocale=\u062a\u063a\u064a\u064a\u0631 \u0627\u0644\u0644\u063a\u0629 \u0625\u0644\u0649 \u0627\u0644\u064a\u0648\u0646\u0627\u0646\u064a\u0629
+arabicLocale=\u062a\u063a\u064a\u064a\u0631 \u0627\u0644\u0644\u063a\u0629 \u0625\u0644\u0649 \u0627\u0644\u0644\u063a\u0629 \u0627\u0644\u0639\u0631\u0628\u064a\u0629
+russianLocale=\u062a\u063a\u064a\u064a\u0631 \u0627\u0644\u0644\u063a\u0629 \u0625\u0644\u0649 \u0627\u0644\u0631\u0648\u0633\u064a\u0629
diff --git a/Semester 2/Assignments/MP2_BusinessLogic_CalebFontenot/src/main/resources/messages/messages_el.properties b/Semester 2/Assignments/MP2_BusinessLogic_CalebFontenot/src/main/resources/messages/messages_el.properties
new file mode 100644
index 0000000..65a174b
--- /dev/null
+++ b/Semester 2/Assignments/MP2_BusinessLogic_CalebFontenot/src/main/resources/messages/messages_el.properties
@@ -0,0 +1,17 @@
+
+# Click nbfs://nbhost/SystemFileSystem/Templates/Licenses/license-default.txt to change this license
+# Click nbfs://nbhost/SystemFileSystem/Templates/Other/properties.properties to edit this template
+currentLocale=\u03a4\u03c1\u03ad\u03c7\u03bf\u03c5\u03c3\u03b1 \u03c4\u03bf\u03c0\u03bf\u03b8\u03b5\u03c3\u03af\u03b1: \u0395\u03bb\u03bb\u03b7\u03bd\u03b9\u03ba\u03ac
+title=Java Quiz
+heading=\u0394\u03b9\u03b1\u03c3\u03ba\u03b5\u03b4\u03ac\u03c3\u03c4\u03b5 \u03bc\u03b5 \u03c4\u03bf Java Quiz!
+currentScore=\u0397 \u03c4\u03c1\u03ad\u03c7\u03bf\u03c5\u03c3\u03b1 \u03b2\u03b1\u03b8\u03bc\u03bf\u03bb\u03bf\u03b3\u03af\u03b1 \u03c3\u03b1\u03c2 \u03b5\u03af\u03bd\u03b1\u03b9 {0}.
+guessNext=\u0391\u03c0\u03b1\u03bd\u03c4\u03ae\u03c3\u03c4\u03b5 \u03c3\u03c9\u03c3\u03c4\u03ac \u03c3\u03c4\u03b7\u03bd \u03b5\u03c1\u03ce\u03c4\u03b7\u03c3\u03b7 \u03c0\u03bb\u03b7\u03ba\u03c4\u03c1\u03bf\u03bb\u03bf\u03b3\u03ce\u03bd\u03c4\u03b1\u03c2 "true" \u03ae "false" \u03c3\u03c4\u03bf \u03c0\u03bb\u03b1\u03af\u03c3\u03b9\u03bf \u03ba\u03b5\u03b9\u03bc\u03ad\u03bd\u03bf\u03c5.
+answer=\u0397 \u03b1\u03c0\u03ac\u03bd\u03c4\u03b7\u03c3\u03ae \u03c3\u03b1\u03c2:
+next=\u0395\u03c0\u03cc\u03bc\u03b5\u03bd\u03bf
+previous=\u03a0\u03c1\u03bf\u03b7\u03b3\u03bf\u03cd\u03bc\u03b5\u03bd\u03bf
+englishLocale=\u0391\u03bb\u03bb\u03b1\u03b3\u03ae \u03c4\u03bf\u03c0\u03b9\u03ba\u03ce\u03bd \u03c1\u03c5\u03b8\u03bc\u03af\u03c3\u03b5\u03c9\u03bd \u03c3\u03b5 \u0391\u03b3\u03b3\u03bb\u03b9\u03ba\u03ac
+spanishLocale=\u0391\u03bb\u03bb\u03b1\u03b3\u03ae \u03c4\u03bf\u03c0\u03b9\u03ba\u03ce\u03bd \u03c1\u03c5\u03b8\u03bc\u03af\u03c3\u03b5\u03c9\u03bd \u03c3\u03b5 \u0399\u03c3\u03c0\u03b1\u03bd\u03b9\u03ba\u03ac
+frenchLocale=\u0391\u03bb\u03bb\u03b1\u03b3\u03ae \u03c4\u03bf\u03c0\u03b9\u03ba\u03ae\u03c2 \u03b3\u03bb\u03ce\u03c3\u03c3\u03b1\u03c2 \u03c3\u03b5 \u03b3\u03b1\u03bb\u03bb\u03b9\u03ba\u03ac
+greekLocale=\u0391\u03bb\u03bb\u03b1\u03b3\u03ae \u03c4\u03bf\u03c0\u03b9\u03ba\u03ae\u03c2 \u03c1\u03cd\u03b8\u03bc\u03b9\u03c3\u03b7\u03c2 \u03c3\u03b5 \u03b5\u03bb\u03bb\u03b7\u03bd\u03b9\u03ba\u03ac
+arabicLocale=\u0391\u03bb\u03bb\u03b1\u03b3\u03ae \u03c4\u03bf\u03c0\u03b9\u03ba\u03ce\u03bd \u03c1\u03c5\u03b8\u03bc\u03af\u03c3\u03b5\u03c9\u03bd \u03c3\u03b5 \u03b1\u03c1\u03b1\u03b2\u03b9\u03ba\u03ac
+russianLocale=\u0391\u03bb\u03bb\u03b1\u03b3\u03ae \u03c4\u03bf\u03c0\u03b9\u03ba\u03ce\u03bd \u03c1\u03c5\u03b8\u03bc\u03af\u03c3\u03b5\u03c9\u03bd \u03c3\u03b5 \u03a1\u03c9\u03c3\u03b9\u03ba\u03ac
diff --git a/Semester 2/Assignments/MP2_BusinessLogic_CalebFontenot/src/main/resources/messages/messages_es.properties b/Semester 2/Assignments/MP2_BusinessLogic_CalebFontenot/src/main/resources/messages/messages_es.properties
new file mode 100644
index 0000000..24f279b
--- /dev/null
+++ b/Semester 2/Assignments/MP2_BusinessLogic_CalebFontenot/src/main/resources/messages/messages_es.properties
@@ -0,0 +1,17 @@
+
+# Click nbfs://nbhost/SystemFileSystem/Templates/Licenses/license-default.txt to change this license
+# Click nbfs://nbhost/SystemFileSystem/Templates/Other/properties.properties to edit this template
+currentLocale=Configuraci\u00f3n regional actual: espa\u00f1ol
+title=Configuraci\u00f3n regional actual: ingl\u00e9s
+heading=\u00a1Divi\u00e9rtete con Java Quiz!
+currentScore=Su puntuaci\u00f3n actual es {0}.
+guessNext=Responda la pregunta correctamente escribiendo 'verdadero' o 'falso' en el cuadro de texto.
+answer=Tu respuesta:
+next=Siguiente
+previous=Anterior
+englishLocale=Cambiar configuraci\u00f3n regional a ingl\u00e9s
+spanishLocale=Cambiar configuraci\u00f3n regional a espa\u00f1ol
+frenchLocale=Cambiar configuraci\u00f3n regional a franc\u00e9s
+greekLocale=Cambiar configuraci\u00f3n regional a griego
+arabicLocale=Cambiar configuraci\u00f3n regional a \u00e1rabe
+russianLocale = Cambiar la configuraci\u00f3n regional a Rusa
diff --git a/Semester 2/Assignments/MP2_BusinessLogic_CalebFontenot/src/main/resources/messages/messages_fr.properties b/Semester 2/Assignments/MP2_BusinessLogic_CalebFontenot/src/main/resources/messages/messages_fr.properties
new file mode 100644
index 0000000..cfb30a5
--- /dev/null
+++ b/Semester 2/Assignments/MP2_BusinessLogic_CalebFontenot/src/main/resources/messages/messages_fr.properties
@@ -0,0 +1,17 @@
+
+# Click nbfs://nbhost/SystemFileSystem/Templates/Licenses/license-default.txt to change this license
+# Click nbfs://nbhost/SystemFileSystem/Templates/Other/properties.properties to edit this template
+currentLocale=Locale actuelle : fran\u00e7ais
+title=Quiz Java
+heading=Amusez-vous avec Java Quiz!
+currentScore=Votre score actuel est de {0}.
+guessNext=R\u00e9pondez correctement \u00e0 la question en tapant \u00ab vrai \u00bb ou \u00ab faux \u00bb dans la zone de texte.
+answer=Votre r\u00e9ponse :
+next=Suivant
+previous=Pr\u00e9c\u00e9dent
+englishLocale=Changer les param\u00e8tres r\u00e9gionaux en anglais
+spanishLocale=Changer les param\u00e8tres r\u00e9gionaux en espagnol
+frenchLocale=Changer les param\u00e8tres r\u00e9gionaux en fran\u00e7ais
+greekLocale=Changer les param\u00e8tres r\u00e9gionaux en grec
+arabicLocale=Changer les param\u00e8tres r\u00e9gionaux en arabe
+russianLocale=Changer les param\u00e8tres r\u00e9gionaux en russe
diff --git a/Semester 2/Assignments/MP2_BusinessLogic_CalebFontenot/src/main/resources/messages/messages_ru.properties b/Semester 2/Assignments/MP2_BusinessLogic_CalebFontenot/src/main/resources/messages/messages_ru.properties
new file mode 100644
index 0000000..cb141bb
--- /dev/null
+++ b/Semester 2/Assignments/MP2_BusinessLogic_CalebFontenot/src/main/resources/messages/messages_ru.properties
@@ -0,0 +1,17 @@
+
+# Click nbfs://nbhost/SystemFileSystem/Templates/Licenses/license-default.txt to change this license
+# Click nbfs://nbhost/SystemFileSystem/Templates/Other/properties.properties to edit this template
+currentLocale=\u0422\u0435\u043a\u0443\u0449\u0430\u044f \u043b\u043e\u043a\u0430\u043b\u044c: \u0420\u0443\u0441\u0441\u043a\u0438\u0439
+title=Java-\u0432\u0438\u043a\u0442\u043e\u0440\u0438\u043d\u0430
+heading=\u0423\u0434\u0430\u0447\u0438 \u0432 Java-\u0432\u0438\u043a\u0442\u043e\u0440\u0438\u043d\u0435!
+currentScore=\u0412\u0430\u0448 \u0442\u0435\u043a\u0443\u0449\u0438\u0439 \u0440\u0435\u0437\u0443\u043b\u044c\u0442\u0430\u0442: {0}.
+guessNext=\u041e\u0442\u0432\u0435\u0442\u044c\u0442\u0435 \u043f\u0440\u0430\u0432\u0438\u043b\u044c\u043d\u043e \u043d\u0430 \u0432\u043e\u043f\u0440\u043e\u0441, \u043d\u0430\u0431\u0440\u0430\u0432 \u00ab\u0438\u0441\u0442\u0438\u043d\u0430\u00bb \u0438\u043b\u0438 \u00ab\u043b\u043e\u0436\u044c\u00bb \u0432 \u0442\u0435\u043a\u0441\u0442\u043e\u0432\u043e\u043c \u043f\u043e\u043b\u0435.
+answer=\u0412\u0430\u0448 \u043e\u0442\u0432\u0435\u0442:
+next=\u0414\u0430\u043b\u0435\u0435
+previous=\u041f\u0440\u0435\u0434\u044b\u0434\u0443\u0449\u0438\u0439
+englishLocale=\u0418\u0437\u043c\u0435\u043d\u0438\u0442\u044c \u043b\u043e\u043a\u0430\u043b\u044c \u043d\u0430 \u0430\u043d\u0433\u043b\u0438\u0439\u0441\u043a\u0438\u0439
+spanishLocale=\u0418\u0437\u043c\u0435\u043d\u0438\u0442\u044c \u043b\u043e\u043a\u0430\u043b\u044c \u043d\u0430 \u0438\u0441\u043f\u0430\u043d\u0441\u043a\u0438\u0439
+frenchLocale=\u0418\u0437\u043c\u0435\u043d\u0438\u0442\u044c \u043b\u043e\u043a\u0430\u043b\u044c \u043d\u0430 \u0444\u0440\u0430\u043d\u0446\u0443\u0437\u0441\u043a\u0438\u0439
+greekLocale=\u0418\u0437\u043c\u0435\u043d\u0438\u0442\u044c \u043b\u043e\u043a\u0430\u043b\u044c \u043d\u0430 \u0433\u0440\u0435\u0447\u0435\u0441\u043a\u0438\u0439
+arabicLocale=\u0418\u0437\u043c\u0435\u043d\u0438\u0442\u044c \u043b\u043e\u043a\u0430\u043b\u044c \u043d\u0430 \u0430\u0440\u0430\u0431\u0441\u043a\u0438\u0439
+russianLocale=\u0418\u0437\u043c\u0435\u043d\u0438\u0442\u044c \u043b\u043e\u043a\u0430\u043b\u044c \u043d\u0430 \u0440\u0443\u0441\u0441\u043a\u0438\u0439
diff --git a/Semester 2/QuizBusLogic/src/main/webapp/Test1.xhtml b/Semester 2/Assignments/MP2_BusinessLogic_CalebFontenot/src/main/webapp/Test1.xhtml
similarity index 100%
rename from Semester 2/QuizBusLogic/src/main/webapp/Test1.xhtml
rename to Semester 2/Assignments/MP2_BusinessLogic_CalebFontenot/src/main/webapp/Test1.xhtml
diff --git a/Semester 2/QuizBusLogic/src/main/webapp/WEB-INF/beans.xml b/Semester 2/Assignments/MP2_BusinessLogic_CalebFontenot/src/main/webapp/WEB-INF/beans.xml
similarity index 100%
rename from Semester 2/QuizBusLogic/src/main/webapp/WEB-INF/beans.xml
rename to Semester 2/Assignments/MP2_BusinessLogic_CalebFontenot/src/main/webapp/WEB-INF/beans.xml
diff --git a/Semester 2/QuizBusLogic/src/main/webapp/WEB-INF/faces-config.xml b/Semester 2/Assignments/MP2_BusinessLogic_CalebFontenot/src/main/webapp/WEB-INF/faces-config.xml
similarity index 100%
rename from Semester 2/QuizBusLogic/src/main/webapp/WEB-INF/faces-config.xml
rename to Semester 2/Assignments/MP2_BusinessLogic_CalebFontenot/src/main/webapp/WEB-INF/faces-config.xml
diff --git a/Semester 2/QuizBusLogic/src/main/webapp/WEB-INF/glassfish-web.xml b/Semester 2/Assignments/MP2_BusinessLogic_CalebFontenot/src/main/webapp/WEB-INF/glassfish-web.xml
similarity index 100%
rename from Semester 2/QuizBusLogic/src/main/webapp/WEB-INF/glassfish-web.xml
rename to Semester 2/Assignments/MP2_BusinessLogic_CalebFontenot/src/main/webapp/WEB-INF/glassfish-web.xml
diff --git a/Semester 2/QuizBusLogic/src/main/webapp/WEB-INF/web.xml b/Semester 2/Assignments/MP2_BusinessLogic_CalebFontenot/src/main/webapp/WEB-INF/web.xml
similarity index 100%
rename from Semester 2/QuizBusLogic/src/main/webapp/WEB-INF/web.xml
rename to Semester 2/Assignments/MP2_BusinessLogic_CalebFontenot/src/main/webapp/WEB-INF/web.xml
diff --git a/Semester 2/QuizBusLogic/src/main/webapp/index.html b/Semester 2/Assignments/MP2_BusinessLogic_CalebFontenot/src/main/webapp/index.html
similarity index 100%
rename from Semester 2/QuizBusLogic/src/main/webapp/index.html
rename to Semester 2/Assignments/MP2_BusinessLogic_CalebFontenot/src/main/webapp/index.html
diff --git a/Semester 2/Assignments/MP2_BusinessLogic_CalebFontenot/src/main/webapp/index.xhtml b/Semester 2/Assignments/MP2_BusinessLogic_CalebFontenot/src/main/webapp/index.xhtml
new file mode 100644
index 0000000..a7847f9
--- /dev/null
+++ b/Semester 2/Assignments/MP2_BusinessLogic_CalebFontenot/src/main/webapp/index.xhtml
@@ -0,0 +1,36 @@
+
+
+
+
+ #{msgs.title}
+
+
+
+ #{msgs.heading}
+
+
+
+
+
+ #{msgs.guessNext}
+ #{quizBean.current.question}
+
+ #{msgs.answer}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Semester 2/Assignments/MP2_Navigation_CalebFontenot/Printed HTMLs/Navigator.html b/Semester 2/Assignments/MP2_Navigation_CalebFontenot/Printed HTMLs/Navigator.html
new file mode 100644
index 0000000..b5e22f5
--- /dev/null
+++ b/Semester 2/Assignments/MP2_Navigation_CalebFontenot/Printed HTMLs/Navigator.html
@@ -0,0 +1,83 @@
+
+
+
+Navigator.java
+
+
+
+
+/home/caleb/ASDV-Java/Semester 3/Assignments/MP2_Navigation_CalebFontenot/src/main/java/edu/slcc/asdv/pojo/Navigator.java |
+
+package edu.slcc.asdv.pojo;
+
+
+nbfs://nbhost/SystemFileSystem/Templates/Licenses/license-default.txt
+nbfs://nbhost/SystemFileSystem/Templates/JSF/JSFManagedBean.java
+
+
+import jakarta.inject.Named;
+import jakarta.enterprise.context.RequestScoped;
+
+
+
+
+
+@Named(value = "Navigator")
+@RequestScoped
+public class Navigator {
+
+
+
+
+ public Navigator() {
+ }
+
+ public String determine(String origin) {
+ int rand = (int) (Math.random() * 2);
+ System.out.println(rand);
+ String returnValue = "";
+ switch (origin) {
+ case "a":
+ if (rand == 0) {
+ returnValue = "b.xhtml";
+ } else {
+ returnValue = "defeat.xhtml";
+ }
+ break;
+ case "b":
+ if (rand == 0) {
+ returnValue = "c.xhtml";
+ } else {
+ returnValue = "defeat.xhtml";
+ }
+ break;
+ case "c":
+ if (rand == 0) {
+ returnValue = "victory.xhtml";
+ } else {
+ returnValue = "defeat.xhtml";
+ }
+ break;
+ }
+ System.out.println("Return value: " + returnValue);
+ return returnValue;
+ }
+}
+
+
+
diff --git a/Semester 2/Assignments/MP2_Navigation_CalebFontenot/Printed HTMLs/a.html b/Semester 2/Assignments/MP2_Navigation_CalebFontenot/Printed HTMLs/a.html
new file mode 100644
index 0000000..6999973
--- /dev/null
+++ b/Semester 2/Assignments/MP2_Navigation_CalebFontenot/Printed HTMLs/a.html
@@ -0,0 +1,42 @@
+
+
+
+a.xhtml
+
+
+
+
+/home/caleb/ASDV-Java/Semester 3/Assignments/MP2_Navigation_CalebFontenot/src/main/webapp/a.xhtml |
+
+<?xml version='1.0' encoding='UTF-8' ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:h="http://xmlns.jcp.org/jsf/html">
+ <h:head>
+ <title>a</title>
+ </h:head>
+ <h:body>
+ <h1>You are on A.</h1>
+ <h:form>
+ <h:commandLink value="try to go to b" action='#{Navigator.determine("a")}'/>
+ </h:form>
+ </h:body>
+</html>
+
+
+
diff --git a/Semester 2/Assignments/MP2_Navigation_CalebFontenot/Printed HTMLs/b.html b/Semester 2/Assignments/MP2_Navigation_CalebFontenot/Printed HTMLs/b.html
new file mode 100644
index 0000000..81a8697
--- /dev/null
+++ b/Semester 2/Assignments/MP2_Navigation_CalebFontenot/Printed HTMLs/b.html
@@ -0,0 +1,42 @@
+
+
+
+b.xhtml
+
+
+
+
+/home/caleb/ASDV-Java/Semester 3/Assignments/MP2_Navigation_CalebFontenot/src/main/webapp/b.xhtml |
+
+<?xml version='1.0' encoding='UTF-8' ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:h="http://xmlns.jcp.org/jsf/html">
+ <h:head>
+ <title>b</title>
+ </h:head>
+ <h:body>
+ <h1>Success! You are on B!</h1>
+ <h:form>
+ <h:commandLink value="try to go to c" action='#{Navigator.determine("b")}'/>
+ </h:form>
+ </h:body>
+</html>
+
+
+
diff --git a/Semester 2/Assignments/MP2_Navigation_CalebFontenot/Printed HTMLs/c.html b/Semester 2/Assignments/MP2_Navigation_CalebFontenot/Printed HTMLs/c.html
new file mode 100644
index 0000000..9b76b49
--- /dev/null
+++ b/Semester 2/Assignments/MP2_Navigation_CalebFontenot/Printed HTMLs/c.html
@@ -0,0 +1,42 @@
+
+
+
+c.xhtml
+
+
+
+
+/home/caleb/ASDV-Java/Semester 3/Assignments/MP2_Navigation_CalebFontenot/src/main/webapp/c.xhtml |
+
+<?xml version='1.0' encoding='UTF-8' ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:h="http://xmlns.jcp.org/jsf/html">
+ <h:head>
+ <title>c</title>
+ </h:head>
+ <h:body>
+ <h1>Success! You are on C!</h1>
+ <h:form>
+ <h:commandLink value="try to go to vitory" action='#{Navigator.determine("c")}'/>
+ </h:form>
+ </h:body>
+</html>
+
+
+
diff --git a/Semester 2/Assignments/MP2_Navigation_CalebFontenot/Printed HTMLs/defeat.html b/Semester 2/Assignments/MP2_Navigation_CalebFontenot/Printed HTMLs/defeat.html
new file mode 100644
index 0000000..633377c
--- /dev/null
+++ b/Semester 2/Assignments/MP2_Navigation_CalebFontenot/Printed HTMLs/defeat.html
@@ -0,0 +1,40 @@
+
+
+
+defeat.xhtml
+
+
+
+
+/home/caleb/ASDV-Java/Semester 3/Assignments/MP2_Navigation_CalebFontenot/src/main/webapp/defeat.xhtml |
+
+<?xml version='1.0' encoding='UTF-8' ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:h="http://xmlns.jcp.org/jsf/html">
+ <h:head>
+ <title>Defeat</title>
+ </h:head>
+ <h:body>
+ <h1>Aww, sorry, you loose 😢</h1>
+ <h:form>
+ <h:commandLink value="Try again?" action="a.xhtml"/>
+ </h:form>
+ </h:body>
+</html>
+
+
+
diff --git a/Semester 2/Assignments/MP2_Navigation_CalebFontenot/Printed HTMLs/index.html b/Semester 2/Assignments/MP2_Navigation_CalebFontenot/Printed HTMLs/index.html
new file mode 100644
index 0000000..8c96f12
--- /dev/null
+++ b/Semester 2/Assignments/MP2_Navigation_CalebFontenot/Printed HTMLs/index.html
@@ -0,0 +1,39 @@
+
+
+
+index.xhtml
+
+
+
+
+/home/caleb/ASDV-Java/Semester 3/Assignments/MP2_Navigation_CalebFontenot/src/main/webapp/index.xhtml |
+
+<?xml version='1.0' encoding='UTF-8' ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:h="http://xmlns.jcp.org/jsf/html">
+ <h:head>
+ <title>Facelet Title</title>
+ </h:head>
+ <h:body>
+ <h:form>
+ <h:commandLink value="Go to a" action="a.xhtml"/>
+ </h:form>
+ </h:body>
+</html>
+
+
+
diff --git a/Semester 2/Assignments/MP2_Navigation_CalebFontenot/Printed HTMLs/victory.html b/Semester 2/Assignments/MP2_Navigation_CalebFontenot/Printed HTMLs/victory.html
new file mode 100644
index 0000000..3865006
--- /dev/null
+++ b/Semester 2/Assignments/MP2_Navigation_CalebFontenot/Printed HTMLs/victory.html
@@ -0,0 +1,40 @@
+
+
+
+victory.xhtml
+
+
+
+
+/home/caleb/ASDV-Java/Semester 3/Assignments/MP2_Navigation_CalebFontenot/src/main/webapp/victory.xhtml |
+
+<?xml version='1.0' encoding='UTF-8' ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:h="http://xmlns.jcp.org/jsf/html">
+ <h:head>
+ <title>Victory</title>
+ </h:head>
+ <h:body>
+ <h1>Victory! 🎉</h1>
+ <h:form>
+ <h:commandLink value="Try again?" action="a.xhtml"/>
+ </h:form>
+ </h:body>
+</html>
+
+
+
diff --git a/Semester 2/Assignments/MP2_Navigation_CalebFontenot/nb-configuration.xml b/Semester 2/Assignments/MP2_Navigation_CalebFontenot/nb-configuration.xml
new file mode 100644
index 0000000..87712a3
--- /dev/null
+++ b/Semester 2/Assignments/MP2_Navigation_CalebFontenot/nb-configuration.xml
@@ -0,0 +1,20 @@
+
+
+
+
+
+ 10-web
+ gfv700ee10
+ JSP
+
+
diff --git a/Semester 2/Assignments/MP2_Navigation_CalebFontenot/pom.xml b/Semester 2/Assignments/MP2_Navigation_CalebFontenot/pom.xml
new file mode 100644
index 0000000..08a0d0e
--- /dev/null
+++ b/Semester 2/Assignments/MP2_Navigation_CalebFontenot/pom.xml
@@ -0,0 +1,77 @@
+
+ 4.0.0
+ com.calebfontenot
+ MP2_Navigation_CalebFontenot
+ 1.0-SNAPSHOT
+ war
+ MP2_Navigation_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/Assignments/MP2_Navigation_CalebFontenot/src/main/java/com/calebfontenot/mp2_navigation_calebfontenot/JakartaRestConfiguration.java b/Semester 2/Assignments/MP2_Navigation_CalebFontenot/src/main/java/com/calebfontenot/mp2_navigation_calebfontenot/JakartaRestConfiguration.java
new file mode 100644
index 0000000..00e33b0
--- /dev/null
+++ b/Semester 2/Assignments/MP2_Navigation_CalebFontenot/src/main/java/com/calebfontenot/mp2_navigation_calebfontenot/JakartaRestConfiguration.java
@@ -0,0 +1,13 @@
+package com.calebfontenot.mp2_navigation_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/Assignments/MP2_Navigation_CalebFontenot/src/main/java/com/calebfontenot/mp2_navigation_calebfontenot/resources/JakartaEE10Resource.java b/Semester 2/Assignments/MP2_Navigation_CalebFontenot/src/main/java/com/calebfontenot/mp2_navigation_calebfontenot/resources/JakartaEE10Resource.java
new file mode 100644
index 0000000..1720a95
--- /dev/null
+++ b/Semester 2/Assignments/MP2_Navigation_CalebFontenot/src/main/java/com/calebfontenot/mp2_navigation_calebfontenot/resources/JakartaEE10Resource.java
@@ -0,0 +1,20 @@
+package com.calebfontenot.mp2_navigation_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/Assignments/MP2_Navigation_CalebFontenot/src/main/java/edu/slcc/asdv/pojo/Navigator.java b/Semester 2/Assignments/MP2_Navigation_CalebFontenot/src/main/java/edu/slcc/asdv/pojo/Navigator.java
new file mode 100644
index 0000000..53b2cda
--- /dev/null
+++ b/Semester 2/Assignments/MP2_Navigation_CalebFontenot/src/main/java/edu/slcc/asdv/pojo/Navigator.java
@@ -0,0 +1,55 @@
+package edu.slcc.asdv.pojo;
+
+/*
+ * 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
+ */
+
+import jakarta.inject.Named;
+import jakarta.enterprise.context.RequestScoped;
+
+/**
+ *
+ * @author caleb
+ */
+@Named(value = "Navigator")
+@RequestScoped
+public class Navigator {
+
+ /**
+ * Creates a new instance of Navigator
+ */
+ public Navigator() {
+ }
+
+ public String determine(String origin) {
+ int rand = (int) (Math.random() * 2);
+ System.out.println(rand);
+ String returnValue = "";
+ switch (origin) {
+ case "a":
+ if (rand == 0) {
+ returnValue = "b.xhtml";
+ } else {
+ returnValue = "defeat.xhtml";
+ }
+ break;
+ case "b":
+ if (rand == 0) {
+ returnValue = "c.xhtml";
+ } else {
+ returnValue = "defeat.xhtml";
+ }
+ break;
+ case "c":
+ if (rand == 0) {
+ returnValue = "victory.xhtml";
+ } else {
+ returnValue = "defeat.xhtml";
+ }
+ break;
+ }
+ System.out.println("Return value: " + returnValue);
+ return returnValue;
+ }
+}
diff --git a/Semester 2/lab04_nav1_CalebFontenot/src/main/resources/META-INF/persistence.xml b/Semester 2/Assignments/MP2_Navigation_CalebFontenot/src/main/resources/META-INF/persistence.xml
similarity index 100%
rename from Semester 2/lab04_nav1_CalebFontenot/src/main/resources/META-INF/persistence.xml
rename to Semester 2/Assignments/MP2_Navigation_CalebFontenot/src/main/resources/META-INF/persistence.xml
diff --git a/Semester 2/lab5_EL1_F23_CalebFontenot/src/main/webapp/WEB-INF/beans.xml b/Semester 2/Assignments/MP2_Navigation_CalebFontenot/src/main/webapp/WEB-INF/beans.xml
similarity index 100%
rename from Semester 2/lab5_EL1_F23_CalebFontenot/src/main/webapp/WEB-INF/beans.xml
rename to Semester 2/Assignments/MP2_Navigation_CalebFontenot/src/main/webapp/WEB-INF/beans.xml
diff --git a/Semester 2/lab04_nav1_CalebFontenot/src/main/webapp/WEB-INF/glassfish-web.xml b/Semester 2/Assignments/MP2_Navigation_CalebFontenot/src/main/webapp/WEB-INF/glassfish-web.xml
similarity index 100%
rename from Semester 2/lab04_nav1_CalebFontenot/src/main/webapp/WEB-INF/glassfish-web.xml
rename to Semester 2/Assignments/MP2_Navigation_CalebFontenot/src/main/webapp/WEB-INF/glassfish-web.xml
diff --git a/Semester 2/lab04_nav1_CalebFontenot/src/main/webapp/WEB-INF/web.xml b/Semester 2/Assignments/MP2_Navigation_CalebFontenot/src/main/webapp/WEB-INF/web.xml
similarity index 100%
rename from Semester 2/lab04_nav1_CalebFontenot/src/main/webapp/WEB-INF/web.xml
rename to Semester 2/Assignments/MP2_Navigation_CalebFontenot/src/main/webapp/WEB-INF/web.xml
diff --git a/Semester 2/Assignments/MP2_Navigation_CalebFontenot/src/main/webapp/a.xhtml b/Semester 2/Assignments/MP2_Navigation_CalebFontenot/src/main/webapp/a.xhtml
new file mode 100644
index 0000000..a0839cb
--- /dev/null
+++ b/Semester 2/Assignments/MP2_Navigation_CalebFontenot/src/main/webapp/a.xhtml
@@ -0,0 +1,14 @@
+
+
+
+
+ a
+
+
+ You are on A.
+
+
+
+
+
diff --git a/Semester 2/Assignments/MP2_Navigation_CalebFontenot/src/main/webapp/b.xhtml b/Semester 2/Assignments/MP2_Navigation_CalebFontenot/src/main/webapp/b.xhtml
new file mode 100644
index 0000000..ef1fcf8
--- /dev/null
+++ b/Semester 2/Assignments/MP2_Navigation_CalebFontenot/src/main/webapp/b.xhtml
@@ -0,0 +1,14 @@
+
+
+
+
+ b
+
+
+ Success! You are on B!
+
+
+
+
+
diff --git a/Semester 2/Assignments/MP2_Navigation_CalebFontenot/src/main/webapp/c.xhtml b/Semester 2/Assignments/MP2_Navigation_CalebFontenot/src/main/webapp/c.xhtml
new file mode 100644
index 0000000..9f138ae
--- /dev/null
+++ b/Semester 2/Assignments/MP2_Navigation_CalebFontenot/src/main/webapp/c.xhtml
@@ -0,0 +1,14 @@
+
+
+
+
+ c
+
+
+ Success! You are on C!
+
+
+
+
+
diff --git a/Semester 2/Assignments/MP2_Navigation_CalebFontenot/src/main/webapp/defeat.xhtml b/Semester 2/Assignments/MP2_Navigation_CalebFontenot/src/main/webapp/defeat.xhtml
new file mode 100644
index 0000000..df9af38
--- /dev/null
+++ b/Semester 2/Assignments/MP2_Navigation_CalebFontenot/src/main/webapp/defeat.xhtml
@@ -0,0 +1,14 @@
+
+
+
+
+ Defeat
+
+
+ Aww, sorry, you loose 😢
+
+
+
+
+
diff --git a/Semester 2/lab5_EL1_F23_CalebFontenot/src/main/webapp/index.html b/Semester 2/Assignments/MP2_Navigation_CalebFontenot/src/main/webapp/index.html
similarity index 100%
rename from Semester 2/lab5_EL1_F23_CalebFontenot/src/main/webapp/index.html
rename to Semester 2/Assignments/MP2_Navigation_CalebFontenot/src/main/webapp/index.html
diff --git a/Semester 2/Assignments/MP2_Navigation_CalebFontenot/src/main/webapp/index.xhtml b/Semester 2/Assignments/MP2_Navigation_CalebFontenot/src/main/webapp/index.xhtml
new file mode 100644
index 0000000..d171a3a
--- /dev/null
+++ b/Semester 2/Assignments/MP2_Navigation_CalebFontenot/src/main/webapp/index.xhtml
@@ -0,0 +1,13 @@
+
+
+
+
+ Facelet Title
+
+
+
+
+
+
+
diff --git a/Semester 2/Assignments/MP2_Navigation_CalebFontenot/src/main/webapp/victory.xhtml b/Semester 2/Assignments/MP2_Navigation_CalebFontenot/src/main/webapp/victory.xhtml
new file mode 100644
index 0000000..4fee234
--- /dev/null
+++ b/Semester 2/Assignments/MP2_Navigation_CalebFontenot/src/main/webapp/victory.xhtml
@@ -0,0 +1,14 @@
+
+
+
+
+ Victory
+
+
+ Victory! 🎉
+
+
+
+
+
diff --git a/Semester 2/Assignments/QuizBusLogic/faces-config_1.NavData b/Semester 2/Assignments/QuizBusLogic/faces-config_1.NavData
new file mode 100644
index 0000000..e69de29
diff --git a/Semester 2/lab04_nav1_CalebFontenot/faces-config.NavData b/Semester 2/Assignments/QuizBusLogic/faces.config.NavData
similarity index 100%
rename from Semester 2/lab04_nav1_CalebFontenot/faces-config.NavData
rename to Semester 2/Assignments/QuizBusLogic/faces.config.NavData
diff --git a/Semester 2/Assignments/QuizBusLogic/nb-configuration.xml b/Semester 2/Assignments/QuizBusLogic/nb-configuration.xml
new file mode 100644
index 0000000..39d0b87
--- /dev/null
+++ b/Semester 2/Assignments/QuizBusLogic/nb-configuration.xml
@@ -0,0 +1,21 @@
+
+
+
+
+
+ 10-web
+ gfv700ee10
+ JDK_11__System_
+ Facelets
+
+
diff --git a/Semester 2/QuizBusLogic/pom.xml b/Semester 2/Assignments/QuizBusLogic/pom.xml
similarity index 100%
rename from Semester 2/QuizBusLogic/pom.xml
rename to Semester 2/Assignments/QuizBusLogic/pom.xml
diff --git a/Semester 2/QuizBusLogic/src/main/java/com/corejsf/Data.java b/Semester 2/Assignments/QuizBusLogic/src/main/java/com/corejsf/Data.java
similarity index 100%
rename from Semester 2/QuizBusLogic/src/main/java/com/corejsf/Data.java
rename to Semester 2/Assignments/QuizBusLogic/src/main/java/com/corejsf/Data.java
diff --git a/Semester 2/QuizBusLogic/src/main/java/com/corejsf/DataInterface.java b/Semester 2/Assignments/QuizBusLogic/src/main/java/com/corejsf/DataInterface.java
similarity index 100%
rename from Semester 2/QuizBusLogic/src/main/java/com/corejsf/DataInterface.java
rename to Semester 2/Assignments/QuizBusLogic/src/main/java/com/corejsf/DataInterface.java
diff --git a/Semester 2/QuizBusLogic/src/main/java/com/corejsf/Problem.java b/Semester 2/Assignments/QuizBusLogic/src/main/java/com/corejsf/Problem.java
similarity index 100%
rename from Semester 2/QuizBusLogic/src/main/java/com/corejsf/Problem.java
rename to Semester 2/Assignments/QuizBusLogic/src/main/java/com/corejsf/Problem.java
diff --git a/Semester 2/QuizBusLogic/src/main/java/com/corejsf/ProblemInterface.java b/Semester 2/Assignments/QuizBusLogic/src/main/java/com/corejsf/ProblemInterface.java
similarity index 100%
rename from Semester 2/QuizBusLogic/src/main/java/com/corejsf/ProblemInterface.java
rename to Semester 2/Assignments/QuizBusLogic/src/main/java/com/corejsf/ProblemInterface.java
diff --git a/Semester 2/QuizBusLogic/src/main/java/com/corejsf/QuizBean.java b/Semester 2/Assignments/QuizBusLogic/src/main/java/com/corejsf/QuizBean.java
similarity index 100%
rename from Semester 2/QuizBusLogic/src/main/java/com/corejsf/QuizBean.java
rename to Semester 2/Assignments/QuizBusLogic/src/main/java/com/corejsf/QuizBean.java
diff --git a/Semester 2/Assignments/QuizBusLogic/src/main/java/edu/slcc/asdv/caleb/quizbuslogic/JakartaRestConfiguration.java b/Semester 2/Assignments/QuizBusLogic/src/main/java/edu/slcc/asdv/caleb/quizbuslogic/JakartaRestConfiguration.java
new file mode 100644
index 0000000..33e4d4e
--- /dev/null
+++ b/Semester 2/Assignments/QuizBusLogic/src/main/java/edu/slcc/asdv/caleb/quizbuslogic/JakartaRestConfiguration.java
@@ -0,0 +1,13 @@
+package edu.slcc.asdv.caleb.quizbuslogic;
+
+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/Assignments/QuizBusLogic/src/main/java/edu/slcc/asdv/caleb/quizbuslogic/resources/JakartaEE10Resource.java b/Semester 2/Assignments/QuizBusLogic/src/main/java/edu/slcc/asdv/caleb/quizbuslogic/resources/JakartaEE10Resource.java
new file mode 100644
index 0000000..aef1453
--- /dev/null
+++ b/Semester 2/Assignments/QuizBusLogic/src/main/java/edu/slcc/asdv/caleb/quizbuslogic/resources/JakartaEE10Resource.java
@@ -0,0 +1,20 @@
+package edu.slcc.asdv.caleb.quizbuslogic.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/Assignments/QuizBusLogic/src/main/java/ejb/TestEJB.java b/Semester 2/Assignments/QuizBusLogic/src/main/java/ejb/TestEJB.java
new file mode 100644
index 0000000..0523590
--- /dev/null
+++ b/Semester 2/Assignments/QuizBusLogic/src/main/java/ejb/TestEJB.java
@@ -0,0 +1,29 @@
+/*
+ * Click nbfs://nbhost/SystemFileSystem/Templates/Licenses/license-default.txt to change this license
+ * Click nbfs://nbhost/SystemFileSystem/Templates/J2EE/EJB30/StatefulEjbClass.java to edit this template
+ */
+package ejb;
+
+import jakarta.ejb.Stateful;
+import java.util.ArrayList;
+
+/**
+ *
+ * @author caleb
+ */
+@Stateful
+public class TestEJB implements TestEJBLocal {
+
+ // Add business logic below. (Right-click in editor and choose
+ // "Insert Code > Add Business Method")
+
+ @Override
+ public ArrayList getDataFromDatabase()
+ {
+ ArrayList l = new ArrayList();
+ l.add("data from the database");
+ l.add("suppliers table");
+ return l;
+ }
+
+}
diff --git a/Semester 2/Assignments/QuizBusLogic/src/main/java/ejb/TestEJBLocal.java b/Semester 2/Assignments/QuizBusLogic/src/main/java/ejb/TestEJBLocal.java
new file mode 100644
index 0000000..1d4c3aa
--- /dev/null
+++ b/Semester 2/Assignments/QuizBusLogic/src/main/java/ejb/TestEJBLocal.java
@@ -0,0 +1,19 @@
+/*
+ * Click nbfs://nbhost/SystemFileSystem/Templates/Licenses/license-default.txt to change this license
+ * Click nbfs://nbhost/SystemFileSystem/Templates/J2EE/EJB30/SessionLocal.java to edit this template
+ */
+package ejb;
+
+import jakarta.ejb.Local;
+import java.util.ArrayList;
+
+/**
+ *
+ * @author caleb
+ */
+@Local
+public interface TestEJBLocal {
+
+ public ArrayList getDataFromDatabase();
+
+}
diff --git a/Semester 2/lab04_nav1_CalebFontenot_war_1.0-SNAPSHOT2/src/main/resources/META-INF/persistence.xml b/Semester 2/Assignments/QuizBusLogic/src/main/resources/META-INF/persistence.xml
similarity index 100%
rename from Semester 2/lab04_nav1_CalebFontenot_war_1.0-SNAPSHOT2/src/main/resources/META-INF/persistence.xml
rename to Semester 2/Assignments/QuizBusLogic/src/main/resources/META-INF/persistence.xml
diff --git a/Semester 2/QuizBusLogic/src/main/resources/messages/messages.properties b/Semester 2/Assignments/QuizBusLogic/src/main/resources/messages/messages.properties
similarity index 100%
rename from Semester 2/QuizBusLogic/src/main/resources/messages/messages.properties
rename to Semester 2/Assignments/QuizBusLogic/src/main/resources/messages/messages.properties
diff --git a/Semester 2/QuizBusLogic/src/main/resources/messages/messages_de.properties b/Semester 2/Assignments/QuizBusLogic/src/main/resources/messages/messages_de.properties
similarity index 100%
rename from Semester 2/QuizBusLogic/src/main/resources/messages/messages_de.properties
rename to Semester 2/Assignments/QuizBusLogic/src/main/resources/messages/messages_de.properties
diff --git a/Semester 2/QuizBusLogic/src/main/resources/messages/messages_es.properties b/Semester 2/Assignments/QuizBusLogic/src/main/resources/messages/messages_es.properties
similarity index 100%
rename from Semester 2/QuizBusLogic/src/main/resources/messages/messages_es.properties
rename to Semester 2/Assignments/QuizBusLogic/src/main/resources/messages/messages_es.properties
diff --git a/Semester 2/Assignments/QuizBusLogic/src/main/webapp/Test1.xhtml b/Semester 2/Assignments/QuizBusLogic/src/main/webapp/Test1.xhtml
new file mode 100644
index 0000000..1740b79
--- /dev/null
+++ b/Semester 2/Assignments/QuizBusLogic/src/main/webapp/Test1.xhtml
@@ -0,0 +1,11 @@
+
+
+
+
+ Facelet Title
+
+
+ Testing Locale Changed
+
+
diff --git a/Semester 2/labEL2_CalebFontenot/src/main/webapp/WEB-INF/beans.xml b/Semester 2/Assignments/QuizBusLogic/src/main/webapp/WEB-INF/beans.xml
similarity index 100%
rename from Semester 2/labEL2_CalebFontenot/src/main/webapp/WEB-INF/beans.xml
rename to Semester 2/Assignments/QuizBusLogic/src/main/webapp/WEB-INF/beans.xml
diff --git a/Semester 2/Assignments/QuizBusLogic/src/main/webapp/WEB-INF/faces-config.xml b/Semester 2/Assignments/QuizBusLogic/src/main/webapp/WEB-INF/faces-config.xml
new file mode 100644
index 0000000..1837826
--- /dev/null
+++ b/Semester 2/Assignments/QuizBusLogic/src/main/webapp/WEB-INF/faces-config.xml
@@ -0,0 +1,18 @@
+
+
+
+
+ en
+ de
+ es
+
+
+ messages.messages
+ msgs
+
+
+
\ No newline at end of file
diff --git a/Semester 2/lab04_nav1_CalebFontenot_war_1.0-SNAPSHOT2/src/main/webapp/WEB-INF/glassfish-web.xml b/Semester 2/Assignments/QuizBusLogic/src/main/webapp/WEB-INF/glassfish-web.xml
similarity index 100%
rename from Semester 2/lab04_nav1_CalebFontenot_war_1.0-SNAPSHOT2/src/main/webapp/WEB-INF/glassfish-web.xml
rename to Semester 2/Assignments/QuizBusLogic/src/main/webapp/WEB-INF/glassfish-web.xml
diff --git a/Semester 2/Assignments/QuizBusLogic/src/main/webapp/WEB-INF/web.xml b/Semester 2/Assignments/QuizBusLogic/src/main/webapp/WEB-INF/web.xml
new file mode 100644
index 0000000..00cfff4
--- /dev/null
+++ b/Semester 2/Assignments/QuizBusLogic/src/main/webapp/WEB-INF/web.xml
@@ -0,0 +1,23 @@
+
+
+
+ Faces Servlet
+ jakarta.faces.webapp.FacesServlet
+
+
+ Faces Servlet
+ /faces/*
+
+
+ faces/index.xhtml
+
+
+ jakarta.faces.PROJECT_STAGE
+ Development
+
+
\ No newline at end of file
diff --git a/Semester 2/labEL2_CalebFontenot/src/main/webapp/index.html b/Semester 2/Assignments/QuizBusLogic/src/main/webapp/index.html
similarity index 100%
rename from Semester 2/labEL2_CalebFontenot/src/main/webapp/index.html
rename to Semester 2/Assignments/QuizBusLogic/src/main/webapp/index.html
diff --git a/Semester 2/QuizBusLogic/src/main/webapp/index.xhtml b/Semester 2/Assignments/QuizBusLogic/src/main/webapp/index.xhtml
similarity index 100%
rename from Semester 2/QuizBusLogic/src/main/webapp/index.xhtml
rename to Semester 2/Assignments/QuizBusLogic/src/main/webapp/index.xhtml
diff --git a/Semester 2/Assignments/SwingTest/pom.xml b/Semester 2/Assignments/SwingTest/pom.xml
new file mode 100644
index 0000000..68c7648
--- /dev/null
+++ b/Semester 2/Assignments/SwingTest/pom.xml
@@ -0,0 +1,14 @@
+
+
+ 4.0.0
+ com.calebfontenot
+ SwingTest
+ 1.0-SNAPSHOT
+ jar
+
+ UTF-8
+ 1.8
+ 1.8
+ com.calebfontenot.swingtest.SwingTest
+
+
\ No newline at end of file
diff --git a/Semester 2/Assignments/SwingTest/src/main/java/com/calebfontenot/swingtest/SwingTest.java b/Semester 2/Assignments/SwingTest/src/main/java/com/calebfontenot/swingtest/SwingTest.java
new file mode 100644
index 0000000..0f2bf3b
--- /dev/null
+++ b/Semester 2/Assignments/SwingTest/src/main/java/com/calebfontenot/swingtest/SwingTest.java
@@ -0,0 +1,28 @@
+/*
+ * Click nbfs://nbhost/SystemFileSystem/Templates/Licenses/license-default.txt to change this license
+ */
+
+package com.calebfontenot.swingtest;
+
+
+import javax.swing.*;
+
+/**
+ *
+ * @author caleb
+ */
+// Hello.java (Java SE 8)
+
+public class SwingTest extends JFrame{
+ public SwingTest() {
+ super("Hello World");
+ setDefaultCloseOperation(WindowConstants.EXIT_ON_CLOSE);
+ add(new JLabel("Hello, world!"));
+ pack();
+ setVisible(true);
+ }
+
+ public static void main(String[] args) {
+ SwingUtilities.invokeLater(SwingTest::new);
+ }
+}
diff --git a/Semester 2/lab04_nav1_CalebFontenot/7_navigation1.pdf b/Semester 2/Assignments/lab04_nav1_CalebFontenot/7_navigation1.pdf
similarity index 100%
rename from Semester 2/lab04_nav1_CalebFontenot/7_navigation1.pdf
rename to Semester 2/Assignments/lab04_nav1_CalebFontenot/7_navigation1.pdf
diff --git a/Semester 2/lab04_nav1_CalebFontenot_war_1.0-SNAPSHOT2/faces-config.NavData b/Semester 2/Assignments/lab04_nav1_CalebFontenot/faces-config.NavData
similarity index 100%
rename from Semester 2/lab04_nav1_CalebFontenot_war_1.0-SNAPSHOT2/faces-config.NavData
rename to Semester 2/Assignments/lab04_nav1_CalebFontenot/faces-config.NavData
diff --git a/Semester 2/lab04_nav1_CalebFontenot/nb-configuration.xml b/Semester 2/Assignments/lab04_nav1_CalebFontenot/nb-configuration.xml
similarity index 100%
rename from Semester 2/lab04_nav1_CalebFontenot/nb-configuration.xml
rename to Semester 2/Assignments/lab04_nav1_CalebFontenot/nb-configuration.xml
diff --git a/Semester 2/lab04_nav1_CalebFontenot/pom.xml b/Semester 2/Assignments/lab04_nav1_CalebFontenot/pom.xml
similarity index 100%
rename from Semester 2/lab04_nav1_CalebFontenot/pom.xml
rename to Semester 2/Assignments/lab04_nav1_CalebFontenot/pom.xml
diff --git a/Semester 2/lab04_nav1_CalebFontenot/src/main/java/edu/slcc/asdv/beans/SimpleController.java b/Semester 2/Assignments/lab04_nav1_CalebFontenot/src/main/java/edu/slcc/asdv/beans/SimpleController.java
similarity index 100%
rename from Semester 2/lab04_nav1_CalebFontenot/src/main/java/edu/slcc/asdv/beans/SimpleController.java
rename to Semester 2/Assignments/lab04_nav1_CalebFontenot/src/main/java/edu/slcc/asdv/beans/SimpleController.java
diff --git a/Semester 2/lab04_nav1_CalebFontenot/src/main/java/edu/slcc/asdv/beans/SimpleController2.java b/Semester 2/Assignments/lab04_nav1_CalebFontenot/src/main/java/edu/slcc/asdv/beans/SimpleController2.java
similarity index 100%
rename from Semester 2/lab04_nav1_CalebFontenot/src/main/java/edu/slcc/asdv/beans/SimpleController2.java
rename to Semester 2/Assignments/lab04_nav1_CalebFontenot/src/main/java/edu/slcc/asdv/beans/SimpleController2.java
diff --git a/Semester 2/lab04_nav1_CalebFontenot/src/main/java/edu/slcc/asdv/beans/Utilities.java b/Semester 2/Assignments/lab04_nav1_CalebFontenot/src/main/java/edu/slcc/asdv/beans/Utilities.java
similarity index 100%
rename from Semester 2/lab04_nav1_CalebFontenot/src/main/java/edu/slcc/asdv/beans/Utilities.java
rename to Semester 2/Assignments/lab04_nav1_CalebFontenot/src/main/java/edu/slcc/asdv/beans/Utilities.java
diff --git a/Semester 2/lab04_nav1_CalebFontenot/src/main/java/edu/slcc/asdv/caleb/lab04_nav1_calebfontenot/JakartaRestConfiguration.java b/Semester 2/Assignments/lab04_nav1_CalebFontenot/src/main/java/edu/slcc/asdv/caleb/lab04_nav1_calebfontenot/JakartaRestConfiguration.java
similarity index 100%
rename from Semester 2/lab04_nav1_CalebFontenot/src/main/java/edu/slcc/asdv/caleb/lab04_nav1_calebfontenot/JakartaRestConfiguration.java
rename to Semester 2/Assignments/lab04_nav1_CalebFontenot/src/main/java/edu/slcc/asdv/caleb/lab04_nav1_calebfontenot/JakartaRestConfiguration.java
diff --git a/Semester 2/lab04_nav1_CalebFontenot/src/main/java/edu/slcc/asdv/caleb/lab04_nav1_calebfontenot/resources/JakartaEE10Resource.java b/Semester 2/Assignments/lab04_nav1_CalebFontenot/src/main/java/edu/slcc/asdv/caleb/lab04_nav1_calebfontenot/resources/JakartaEE10Resource.java
similarity index 100%
rename from Semester 2/lab04_nav1_CalebFontenot/src/main/java/edu/slcc/asdv/caleb/lab04_nav1_calebfontenot/resources/JakartaEE10Resource.java
rename to Semester 2/Assignments/lab04_nav1_CalebFontenot/src/main/java/edu/slcc/asdv/caleb/lab04_nav1_calebfontenot/resources/JakartaEE10Resource.java
diff --git a/Semester 2/lab5_EL1_F23_CalebFontenot/src/main/resources/META-INF/persistence.xml b/Semester 2/Assignments/lab04_nav1_CalebFontenot/src/main/resources/META-INF/persistence.xml
similarity index 100%
rename from Semester 2/lab5_EL1_F23_CalebFontenot/src/main/resources/META-INF/persistence.xml
rename to Semester 2/Assignments/lab04_nav1_CalebFontenot/src/main/resources/META-INF/persistence.xml
diff --git a/Semester 2/lab04_nav1_CalebFontenot/src/main/webapp/WEB-INF/beans.xml b/Semester 2/Assignments/lab04_nav1_CalebFontenot/src/main/webapp/WEB-INF/beans.xml
similarity index 100%
rename from Semester 2/lab04_nav1_CalebFontenot/src/main/webapp/WEB-INF/beans.xml
rename to Semester 2/Assignments/lab04_nav1_CalebFontenot/src/main/webapp/WEB-INF/beans.xml
diff --git a/Semester 2/lab04_nav1_CalebFontenot/src/main/webapp/WEB-INF/faces-config.xml b/Semester 2/Assignments/lab04_nav1_CalebFontenot/src/main/webapp/WEB-INF/faces-config.xml
similarity index 100%
rename from Semester 2/lab04_nav1_CalebFontenot/src/main/webapp/WEB-INF/faces-config.xml
rename to Semester 2/Assignments/lab04_nav1_CalebFontenot/src/main/webapp/WEB-INF/faces-config.xml
diff --git a/Semester 2/lab5_EL1_F23_CalebFontenot/src/main/webapp/WEB-INF/glassfish-web.xml b/Semester 2/Assignments/lab04_nav1_CalebFontenot/src/main/webapp/WEB-INF/glassfish-web.xml
similarity index 100%
rename from Semester 2/lab5_EL1_F23_CalebFontenot/src/main/webapp/WEB-INF/glassfish-web.xml
rename to Semester 2/Assignments/lab04_nav1_CalebFontenot/src/main/webapp/WEB-INF/glassfish-web.xml
diff --git a/Semester 2/lab04_nav1_CalebFontenot_war_1.0-SNAPSHOT2/src/main/webapp/WEB-INF/web.xml b/Semester 2/Assignments/lab04_nav1_CalebFontenot/src/main/webapp/WEB-INF/web.xml
similarity index 100%
rename from Semester 2/lab04_nav1_CalebFontenot_war_1.0-SNAPSHOT2/src/main/webapp/WEB-INF/web.xml
rename to Semester 2/Assignments/lab04_nav1_CalebFontenot/src/main/webapp/WEB-INF/web.xml
diff --git a/Semester 2/lab04_nav1_CalebFontenot/src/main/webapp/error-message.xhtml b/Semester 2/Assignments/lab04_nav1_CalebFontenot/src/main/webapp/error-message.xhtml
similarity index 100%
rename from Semester 2/lab04_nav1_CalebFontenot/src/main/webapp/error-message.xhtml
rename to Semester 2/Assignments/lab04_nav1_CalebFontenot/src/main/webapp/error-message.xhtml
diff --git a/Semester 2/lab04_nav1_CalebFontenot/src/main/webapp/index.xhtml b/Semester 2/Assignments/lab04_nav1_CalebFontenot/src/main/webapp/index.xhtml
similarity index 100%
rename from Semester 2/lab04_nav1_CalebFontenot/src/main/webapp/index.xhtml
rename to Semester 2/Assignments/lab04_nav1_CalebFontenot/src/main/webapp/index.xhtml
diff --git a/Semester 2/lab04_nav1_CalebFontenot/src/main/webapp/result-page-1.xhtml b/Semester 2/Assignments/lab04_nav1_CalebFontenot/src/main/webapp/result-page-1.xhtml
similarity index 100%
rename from Semester 2/lab04_nav1_CalebFontenot/src/main/webapp/result-page-1.xhtml
rename to Semester 2/Assignments/lab04_nav1_CalebFontenot/src/main/webapp/result-page-1.xhtml
diff --git a/Semester 2/lab04_nav1_CalebFontenot/src/main/webapp/result-page-2.xhtml b/Semester 2/Assignments/lab04_nav1_CalebFontenot/src/main/webapp/result-page-2.xhtml
similarity index 100%
rename from Semester 2/lab04_nav1_CalebFontenot/src/main/webapp/result-page-2.xhtml
rename to Semester 2/Assignments/lab04_nav1_CalebFontenot/src/main/webapp/result-page-2.xhtml
diff --git a/Semester 2/lab04_nav1_CalebFontenot/src/main/webapp/result-page-3.xhtml b/Semester 2/Assignments/lab04_nav1_CalebFontenot/src/main/webapp/result-page-3.xhtml
similarity index 100%
rename from Semester 2/lab04_nav1_CalebFontenot/src/main/webapp/result-page-3.xhtml
rename to Semester 2/Assignments/lab04_nav1_CalebFontenot/src/main/webapp/result-page-3.xhtml
diff --git a/Semester 2/lab04_nav1_CalebFontenot/src/main/webapp/start-page-1.xhtml b/Semester 2/Assignments/lab04_nav1_CalebFontenot/src/main/webapp/start-page-1.xhtml
similarity index 100%
rename from Semester 2/lab04_nav1_CalebFontenot/src/main/webapp/start-page-1.xhtml
rename to Semester 2/Assignments/lab04_nav1_CalebFontenot/src/main/webapp/start-page-1.xhtml
diff --git a/Semester 2/lab04_nav1_CalebFontenot/src/main/webapp/start-page-2.xhtml b/Semester 2/Assignments/lab04_nav1_CalebFontenot/src/main/webapp/start-page-2.xhtml
similarity index 100%
rename from Semester 2/lab04_nav1_CalebFontenot/src/main/webapp/start-page-2.xhtml
rename to Semester 2/Assignments/lab04_nav1_CalebFontenot/src/main/webapp/start-page-2.xhtml
diff --git a/Semester 2/lab04_nav1_CalebFontenot_war_1.0-SNAPSHOT2/7_navigation1.pdf b/Semester 2/Assignments/lab04_nav1_CalebFontenot_war_1.0-SNAPSHOT2/7_navigation1.pdf
similarity index 100%
rename from Semester 2/lab04_nav1_CalebFontenot_war_1.0-SNAPSHOT2/7_navigation1.pdf
rename to Semester 2/Assignments/lab04_nav1_CalebFontenot_war_1.0-SNAPSHOT2/7_navigation1.pdf
diff --git a/Semester 2/Assignments/lab04_nav1_CalebFontenot_war_1.0-SNAPSHOT2/faces-config.NavData b/Semester 2/Assignments/lab04_nav1_CalebFontenot_war_1.0-SNAPSHOT2/faces-config.NavData
new file mode 100644
index 0000000..298bfc5
--- /dev/null
+++ b/Semester 2/Assignments/lab04_nav1_CalebFontenot_war_1.0-SNAPSHOT2/faces-config.NavData
@@ -0,0 +1,6 @@
+
+
+
+
+
+
diff --git a/Semester 2/lab04_nav1_CalebFontenot_war_1.0-SNAPSHOT2/nb-configuration.xml b/Semester 2/Assignments/lab04_nav1_CalebFontenot_war_1.0-SNAPSHOT2/nb-configuration.xml
similarity index 100%
rename from Semester 2/lab04_nav1_CalebFontenot_war_1.0-SNAPSHOT2/nb-configuration.xml
rename to Semester 2/Assignments/lab04_nav1_CalebFontenot_war_1.0-SNAPSHOT2/nb-configuration.xml
diff --git a/Semester 2/lab04_nav1_CalebFontenot_war_1.0-SNAPSHOT2/pom.xml b/Semester 2/Assignments/lab04_nav1_CalebFontenot_war_1.0-SNAPSHOT2/pom.xml
similarity index 100%
rename from Semester 2/lab04_nav1_CalebFontenot_war_1.0-SNAPSHOT2/pom.xml
rename to Semester 2/Assignments/lab04_nav1_CalebFontenot_war_1.0-SNAPSHOT2/pom.xml
diff --git a/Semester 2/lab04_nav1_CalebFontenot_war_1.0-SNAPSHOT2/src/main/java/edu/slcc/asdv/beans/SimpleController.java b/Semester 2/Assignments/lab04_nav1_CalebFontenot_war_1.0-SNAPSHOT2/src/main/java/edu/slcc/asdv/beans/SimpleController.java
similarity index 100%
rename from Semester 2/lab04_nav1_CalebFontenot_war_1.0-SNAPSHOT2/src/main/java/edu/slcc/asdv/beans/SimpleController.java
rename to Semester 2/Assignments/lab04_nav1_CalebFontenot_war_1.0-SNAPSHOT2/src/main/java/edu/slcc/asdv/beans/SimpleController.java
diff --git a/Semester 2/lab04_nav1_CalebFontenot_war_1.0-SNAPSHOT2/src/main/java/edu/slcc/asdv/beans/SimpleController2.java b/Semester 2/Assignments/lab04_nav1_CalebFontenot_war_1.0-SNAPSHOT2/src/main/java/edu/slcc/asdv/beans/SimpleController2.java
similarity index 100%
rename from Semester 2/lab04_nav1_CalebFontenot_war_1.0-SNAPSHOT2/src/main/java/edu/slcc/asdv/beans/SimpleController2.java
rename to Semester 2/Assignments/lab04_nav1_CalebFontenot_war_1.0-SNAPSHOT2/src/main/java/edu/slcc/asdv/beans/SimpleController2.java
diff --git a/Semester 2/lab04_nav1_CalebFontenot_war_1.0-SNAPSHOT2/src/main/java/edu/slcc/asdv/beans/Utilities.java b/Semester 2/Assignments/lab04_nav1_CalebFontenot_war_1.0-SNAPSHOT2/src/main/java/edu/slcc/asdv/beans/Utilities.java
similarity index 100%
rename from Semester 2/lab04_nav1_CalebFontenot_war_1.0-SNAPSHOT2/src/main/java/edu/slcc/asdv/beans/Utilities.java
rename to Semester 2/Assignments/lab04_nav1_CalebFontenot_war_1.0-SNAPSHOT2/src/main/java/edu/slcc/asdv/beans/Utilities.java
diff --git a/Semester 2/lab04_nav1_CalebFontenot_war_1.0-SNAPSHOT2/src/main/java/edu/slcc/asdv/caleb/lab04_nav1_calebfontenot/JakartaRestConfiguration.java b/Semester 2/Assignments/lab04_nav1_CalebFontenot_war_1.0-SNAPSHOT2/src/main/java/edu/slcc/asdv/caleb/lab04_nav1_calebfontenot/JakartaRestConfiguration.java
similarity index 100%
rename from Semester 2/lab04_nav1_CalebFontenot_war_1.0-SNAPSHOT2/src/main/java/edu/slcc/asdv/caleb/lab04_nav1_calebfontenot/JakartaRestConfiguration.java
rename to Semester 2/Assignments/lab04_nav1_CalebFontenot_war_1.0-SNAPSHOT2/src/main/java/edu/slcc/asdv/caleb/lab04_nav1_calebfontenot/JakartaRestConfiguration.java
diff --git a/Semester 2/lab04_nav1_CalebFontenot_war_1.0-SNAPSHOT2/src/main/java/edu/slcc/asdv/caleb/lab04_nav1_calebfontenot/resources/JakartaEE10Resource.java b/Semester 2/Assignments/lab04_nav1_CalebFontenot_war_1.0-SNAPSHOT2/src/main/java/edu/slcc/asdv/caleb/lab04_nav1_calebfontenot/resources/JakartaEE10Resource.java
similarity index 100%
rename from Semester 2/lab04_nav1_CalebFontenot_war_1.0-SNAPSHOT2/src/main/java/edu/slcc/asdv/caleb/lab04_nav1_calebfontenot/resources/JakartaEE10Resource.java
rename to Semester 2/Assignments/lab04_nav1_CalebFontenot_war_1.0-SNAPSHOT2/src/main/java/edu/slcc/asdv/caleb/lab04_nav1_calebfontenot/resources/JakartaEE10Resource.java
diff --git a/Semester 2/labEL2_CalebFontenot/src/main/resources/META-INF/persistence.xml b/Semester 2/Assignments/lab04_nav1_CalebFontenot_war_1.0-SNAPSHOT2/src/main/resources/META-INF/persistence.xml
similarity index 100%
rename from Semester 2/labEL2_CalebFontenot/src/main/resources/META-INF/persistence.xml
rename to Semester 2/Assignments/lab04_nav1_CalebFontenot_war_1.0-SNAPSHOT2/src/main/resources/META-INF/persistence.xml
diff --git a/Semester 2/lab04_nav1_CalebFontenot_war_1.0-SNAPSHOT2/src/main/webapp/WEB-INF/beans.xml b/Semester 2/Assignments/lab04_nav1_CalebFontenot_war_1.0-SNAPSHOT2/src/main/webapp/WEB-INF/beans.xml
similarity index 100%
rename from Semester 2/lab04_nav1_CalebFontenot_war_1.0-SNAPSHOT2/src/main/webapp/WEB-INF/beans.xml
rename to Semester 2/Assignments/lab04_nav1_CalebFontenot_war_1.0-SNAPSHOT2/src/main/webapp/WEB-INF/beans.xml
diff --git a/Semester 2/lab04_nav1_CalebFontenot_war_1.0-SNAPSHOT2/src/main/webapp/WEB-INF/faces-config.xml b/Semester 2/Assignments/lab04_nav1_CalebFontenot_war_1.0-SNAPSHOT2/src/main/webapp/WEB-INF/faces-config.xml
similarity index 100%
rename from Semester 2/lab04_nav1_CalebFontenot_war_1.0-SNAPSHOT2/src/main/webapp/WEB-INF/faces-config.xml
rename to Semester 2/Assignments/lab04_nav1_CalebFontenot_war_1.0-SNAPSHOT2/src/main/webapp/WEB-INF/faces-config.xml
diff --git a/Semester 2/labEL2_CalebFontenot/src/main/webapp/WEB-INF/glassfish-web.xml b/Semester 2/Assignments/lab04_nav1_CalebFontenot_war_1.0-SNAPSHOT2/src/main/webapp/WEB-INF/glassfish-web.xml
similarity index 100%
rename from Semester 2/labEL2_CalebFontenot/src/main/webapp/WEB-INF/glassfish-web.xml
rename to Semester 2/Assignments/lab04_nav1_CalebFontenot_war_1.0-SNAPSHOT2/src/main/webapp/WEB-INF/glassfish-web.xml
diff --git a/Semester 2/lab5_EL1_F23_CalebFontenot/src/main/webapp/WEB-INF/web.xml b/Semester 2/Assignments/lab04_nav1_CalebFontenot_war_1.0-SNAPSHOT2/src/main/webapp/WEB-INF/web.xml
similarity index 100%
rename from Semester 2/lab5_EL1_F23_CalebFontenot/src/main/webapp/WEB-INF/web.xml
rename to Semester 2/Assignments/lab04_nav1_CalebFontenot_war_1.0-SNAPSHOT2/src/main/webapp/WEB-INF/web.xml
diff --git a/Semester 2/lab04_nav1_CalebFontenot_war_1.0-SNAPSHOT2/src/main/webapp/error-message.xhtml b/Semester 2/Assignments/lab04_nav1_CalebFontenot_war_1.0-SNAPSHOT2/src/main/webapp/error-message.xhtml
similarity index 100%
rename from Semester 2/lab04_nav1_CalebFontenot_war_1.0-SNAPSHOT2/src/main/webapp/error-message.xhtml
rename to Semester 2/Assignments/lab04_nav1_CalebFontenot_war_1.0-SNAPSHOT2/src/main/webapp/error-message.xhtml
diff --git a/Semester 2/lab04_nav1_CalebFontenot_war_1.0-SNAPSHOT2/src/main/webapp/index.xhtml b/Semester 2/Assignments/lab04_nav1_CalebFontenot_war_1.0-SNAPSHOT2/src/main/webapp/index.xhtml
similarity index 100%
rename from Semester 2/lab04_nav1_CalebFontenot_war_1.0-SNAPSHOT2/src/main/webapp/index.xhtml
rename to Semester 2/Assignments/lab04_nav1_CalebFontenot_war_1.0-SNAPSHOT2/src/main/webapp/index.xhtml
diff --git a/Semester 2/lab04_nav1_CalebFontenot_war_1.0-SNAPSHOT2/src/main/webapp/message-page.xhtml b/Semester 2/Assignments/lab04_nav1_CalebFontenot_war_1.0-SNAPSHOT2/src/main/webapp/message-page.xhtml
similarity index 100%
rename from Semester 2/lab04_nav1_CalebFontenot_war_1.0-SNAPSHOT2/src/main/webapp/message-page.xhtml
rename to Semester 2/Assignments/lab04_nav1_CalebFontenot_war_1.0-SNAPSHOT2/src/main/webapp/message-page.xhtml
diff --git a/Semester 2/lab04_nav1_CalebFontenot_war_1.0-SNAPSHOT2/src/main/webapp/start-page-1.xhtml b/Semester 2/Assignments/lab04_nav1_CalebFontenot_war_1.0-SNAPSHOT2/src/main/webapp/start-page-1.xhtml
similarity index 100%
rename from Semester 2/lab04_nav1_CalebFontenot_war_1.0-SNAPSHOT2/src/main/webapp/start-page-1.xhtml
rename to Semester 2/Assignments/lab04_nav1_CalebFontenot_war_1.0-SNAPSHOT2/src/main/webapp/start-page-1.xhtml
diff --git a/Semester 2/lab04_nav1_CalebFontenot_war_1.0-SNAPSHOT2/src/main/webapp/start-page-2.xhtml b/Semester 2/Assignments/lab04_nav1_CalebFontenot_war_1.0-SNAPSHOT2/src/main/webapp/start-page-2.xhtml
similarity index 100%
rename from Semester 2/lab04_nav1_CalebFontenot_war_1.0-SNAPSHOT2/src/main/webapp/start-page-2.xhtml
rename to Semester 2/Assignments/lab04_nav1_CalebFontenot_war_1.0-SNAPSHOT2/src/main/webapp/start-page-2.xhtml
diff --git a/Semester 2/lab5_EL1_F23_CalebFontenot/10-EL-1.pdf b/Semester 2/Assignments/lab5_EL1_F23_CalebFontenot/10-EL-1.pdf
similarity index 100%
rename from Semester 2/lab5_EL1_F23_CalebFontenot/10-EL-1.pdf
rename to Semester 2/Assignments/lab5_EL1_F23_CalebFontenot/10-EL-1.pdf
diff --git a/Semester 2/lab5_EL1_F23_CalebFontenot/nb-configuration.xml b/Semester 2/Assignments/lab5_EL1_F23_CalebFontenot/nb-configuration.xml
similarity index 100%
rename from Semester 2/lab5_EL1_F23_CalebFontenot/nb-configuration.xml
rename to Semester 2/Assignments/lab5_EL1_F23_CalebFontenot/nb-configuration.xml
diff --git a/Semester 2/lab5_EL1_F23_CalebFontenot/pom.xml b/Semester 2/Assignments/lab5_EL1_F23_CalebFontenot/pom.xml
similarity index 100%
rename from Semester 2/lab5_EL1_F23_CalebFontenot/pom.xml
rename to Semester 2/Assignments/lab5_EL1_F23_CalebFontenot/pom.xml
diff --git a/Semester 2/lab5_EL1_F23_CalebFontenot/src/main/java/edu/slcc/asdv/beans/EmployeeBean.java b/Semester 2/Assignments/lab5_EL1_F23_CalebFontenot/src/main/java/edu/slcc/asdv/beans/EmployeeBean.java
similarity index 100%
rename from Semester 2/lab5_EL1_F23_CalebFontenot/src/main/java/edu/slcc/asdv/beans/EmployeeBean.java
rename to Semester 2/Assignments/lab5_EL1_F23_CalebFontenot/src/main/java/edu/slcc/asdv/beans/EmployeeBean.java
diff --git a/Semester 2/lab5_EL1_F23_CalebFontenot/src/main/java/edu/slcc/asdv/beans/SimpleBean.java b/Semester 2/Assignments/lab5_EL1_F23_CalebFontenot/src/main/java/edu/slcc/asdv/beans/SimpleBean.java
similarity index 100%
rename from Semester 2/lab5_EL1_F23_CalebFontenot/src/main/java/edu/slcc/asdv/beans/SimpleBean.java
rename to Semester 2/Assignments/lab5_EL1_F23_CalebFontenot/src/main/java/edu/slcc/asdv/beans/SimpleBean.java
diff --git a/Semester 2/lab5_EL1_F23_CalebFontenot/src/main/java/edu/slcc/asdv/beans/TestBean1.java b/Semester 2/Assignments/lab5_EL1_F23_CalebFontenot/src/main/java/edu/slcc/asdv/beans/TestBean1.java
similarity index 100%
rename from Semester 2/lab5_EL1_F23_CalebFontenot/src/main/java/edu/slcc/asdv/beans/TestBean1.java
rename to Semester 2/Assignments/lab5_EL1_F23_CalebFontenot/src/main/java/edu/slcc/asdv/beans/TestBean1.java
diff --git a/Semester 2/lab5_EL1_F23_CalebFontenot/src/main/java/edu/slcc/asdv/caleb/lab5_el1_f23_calebfontenot/JakartaRestConfiguration.java b/Semester 2/Assignments/lab5_EL1_F23_CalebFontenot/src/main/java/edu/slcc/asdv/caleb/lab5_el1_f23_calebfontenot/JakartaRestConfiguration.java
similarity index 100%
rename from Semester 2/lab5_EL1_F23_CalebFontenot/src/main/java/edu/slcc/asdv/caleb/lab5_el1_f23_calebfontenot/JakartaRestConfiguration.java
rename to Semester 2/Assignments/lab5_EL1_F23_CalebFontenot/src/main/java/edu/slcc/asdv/caleb/lab5_el1_f23_calebfontenot/JakartaRestConfiguration.java
diff --git a/Semester 2/lab5_EL1_F23_CalebFontenot/src/main/java/edu/slcc/asdv/caleb/lab5_el1_f23_calebfontenot/resources/JakartaEE10Resource.java b/Semester 2/Assignments/lab5_EL1_F23_CalebFontenot/src/main/java/edu/slcc/asdv/caleb/lab5_el1_f23_calebfontenot/resources/JakartaEE10Resource.java
similarity index 100%
rename from Semester 2/lab5_EL1_F23_CalebFontenot/src/main/java/edu/slcc/asdv/caleb/lab5_el1_f23_calebfontenot/resources/JakartaEE10Resource.java
rename to Semester 2/Assignments/lab5_EL1_F23_CalebFontenot/src/main/java/edu/slcc/asdv/caleb/lab5_el1_f23_calebfontenot/resources/JakartaEE10Resource.java
diff --git a/Semester 2/lab5_EL1_F23_CalebFontenot/src/main/java/edu/slcc/asdv/pojos/Company.java b/Semester 2/Assignments/lab5_EL1_F23_CalebFontenot/src/main/java/edu/slcc/asdv/pojos/Company.java
similarity index 100%
rename from Semester 2/lab5_EL1_F23_CalebFontenot/src/main/java/edu/slcc/asdv/pojos/Company.java
rename to Semester 2/Assignments/lab5_EL1_F23_CalebFontenot/src/main/java/edu/slcc/asdv/pojos/Company.java
diff --git a/Semester 2/lab5_EL1_F23_CalebFontenot/src/main/java/edu/slcc/asdv/pojos/Employee.java b/Semester 2/Assignments/lab5_EL1_F23_CalebFontenot/src/main/java/edu/slcc/asdv/pojos/Employee.java
similarity index 100%
rename from Semester 2/lab5_EL1_F23_CalebFontenot/src/main/java/edu/slcc/asdv/pojos/Employee.java
rename to Semester 2/Assignments/lab5_EL1_F23_CalebFontenot/src/main/java/edu/slcc/asdv/pojos/Employee.java
diff --git a/Semester 2/lab5_EL1_F23_CalebFontenot/src/main/java/edu/slcc/asdv/pojos/Name.java b/Semester 2/Assignments/lab5_EL1_F23_CalebFontenot/src/main/java/edu/slcc/asdv/pojos/Name.java
similarity index 100%
rename from Semester 2/lab5_EL1_F23_CalebFontenot/src/main/java/edu/slcc/asdv/pojos/Name.java
rename to Semester 2/Assignments/lab5_EL1_F23_CalebFontenot/src/main/java/edu/slcc/asdv/pojos/Name.java
diff --git a/Semester 2/labNavigation1_CalebFontenot/src/main/resources/META-INF/persistence.xml b/Semester 2/Assignments/lab5_EL1_F23_CalebFontenot/src/main/resources/META-INF/persistence.xml
similarity index 100%
rename from Semester 2/labNavigation1_CalebFontenot/src/main/resources/META-INF/persistence.xml
rename to Semester 2/Assignments/lab5_EL1_F23_CalebFontenot/src/main/resources/META-INF/persistence.xml
diff --git a/Semester 2/labNavigation1_CalebFontenot/src/main/webapp/WEB-INF/beans.xml b/Semester 2/Assignments/lab5_EL1_F23_CalebFontenot/src/main/webapp/WEB-INF/beans.xml
similarity index 100%
rename from Semester 2/labNavigation1_CalebFontenot/src/main/webapp/WEB-INF/beans.xml
rename to Semester 2/Assignments/lab5_EL1_F23_CalebFontenot/src/main/webapp/WEB-INF/beans.xml
diff --git a/Semester 2/labNavigation1_CalebFontenot/src/main/webapp/WEB-INF/glassfish-web.xml b/Semester 2/Assignments/lab5_EL1_F23_CalebFontenot/src/main/webapp/WEB-INF/glassfish-web.xml
similarity index 100%
rename from Semester 2/labNavigation1_CalebFontenot/src/main/webapp/WEB-INF/glassfish-web.xml
rename to Semester 2/Assignments/lab5_EL1_F23_CalebFontenot/src/main/webapp/WEB-INF/glassfish-web.xml
diff --git a/Semester 2/labEL2_CalebFontenot/src/main/webapp/WEB-INF/web.xml b/Semester 2/Assignments/lab5_EL1_F23_CalebFontenot/src/main/webapp/WEB-INF/web.xml
similarity index 100%
rename from Semester 2/labEL2_CalebFontenot/src/main/webapp/WEB-INF/web.xml
rename to Semester 2/Assignments/lab5_EL1_F23_CalebFontenot/src/main/webapp/WEB-INF/web.xml
diff --git a/Semester 2/lab5_EL1_F23_CalebFontenot/src/main/webapp/accepted.xhtml b/Semester 2/Assignments/lab5_EL1_F23_CalebFontenot/src/main/webapp/accepted.xhtml
similarity index 100%
rename from Semester 2/lab5_EL1_F23_CalebFontenot/src/main/webapp/accepted.xhtml
rename to Semester 2/Assignments/lab5_EL1_F23_CalebFontenot/src/main/webapp/accepted.xhtml
diff --git a/Semester 2/labNavigation1_CalebFontenot/src/main/webapp/index.html b/Semester 2/Assignments/lab5_EL1_F23_CalebFontenot/src/main/webapp/index.html
similarity index 100%
rename from Semester 2/labNavigation1_CalebFontenot/src/main/webapp/index.html
rename to Semester 2/Assignments/lab5_EL1_F23_CalebFontenot/src/main/webapp/index.html
diff --git a/Semester 2/lab5_EL1_F23_CalebFontenot/src/main/webapp/index.xhtml b/Semester 2/Assignments/lab5_EL1_F23_CalebFontenot/src/main/webapp/index.xhtml
similarity index 100%
rename from Semester 2/lab5_EL1_F23_CalebFontenot/src/main/webapp/index.xhtml
rename to Semester 2/Assignments/lab5_EL1_F23_CalebFontenot/src/main/webapp/index.xhtml
diff --git a/Semester 2/lab5_EL1_F23_CalebFontenot/src/main/webapp/rejected.xhtml b/Semester 2/Assignments/lab5_EL1_F23_CalebFontenot/src/main/webapp/rejected.xhtml
similarity index 100%
rename from Semester 2/lab5_EL1_F23_CalebFontenot/src/main/webapp/rejected.xhtml
rename to Semester 2/Assignments/lab5_EL1_F23_CalebFontenot/src/main/webapp/rejected.xhtml
diff --git a/Semester 2/lab5_EL1_F23_CalebFontenot/src/main/webapp/submitting-properties.xhtml b/Semester 2/Assignments/lab5_EL1_F23_CalebFontenot/src/main/webapp/submitting-properties.xhtml
similarity index 100%
rename from Semester 2/lab5_EL1_F23_CalebFontenot/src/main/webapp/submitting-properties.xhtml
rename to Semester 2/Assignments/lab5_EL1_F23_CalebFontenot/src/main/webapp/submitting-properties.xhtml
diff --git a/Semester 2/labEL2_CalebFontenot/nb-configuration.xml b/Semester 2/Assignments/labEL2_CalebFontenot/nb-configuration.xml
similarity index 100%
rename from Semester 2/labEL2_CalebFontenot/nb-configuration.xml
rename to Semester 2/Assignments/labEL2_CalebFontenot/nb-configuration.xml
diff --git a/Semester 2/labEL2_CalebFontenot/pom.xml b/Semester 2/Assignments/labEL2_CalebFontenot/pom.xml
similarity index 100%
rename from Semester 2/labEL2_CalebFontenot/pom.xml
rename to Semester 2/Assignments/labEL2_CalebFontenot/pom.xml
diff --git a/Semester 2/labEL2_CalebFontenot/src/main/java/edu/slcc/asdv/beans/EmployeeBean.java b/Semester 2/Assignments/labEL2_CalebFontenot/src/main/java/edu/slcc/asdv/beans/EmployeeBean.java
similarity index 100%
rename from Semester 2/labEL2_CalebFontenot/src/main/java/edu/slcc/asdv/beans/EmployeeBean.java
rename to Semester 2/Assignments/labEL2_CalebFontenot/src/main/java/edu/slcc/asdv/beans/EmployeeBean.java
diff --git a/Semester 2/labEL2_CalebFontenot/src/main/java/edu/slcc/asdv/beans/Purchases.java b/Semester 2/Assignments/labEL2_CalebFontenot/src/main/java/edu/slcc/asdv/beans/Purchases.java
similarity index 100%
rename from Semester 2/labEL2_CalebFontenot/src/main/java/edu/slcc/asdv/beans/Purchases.java
rename to Semester 2/Assignments/labEL2_CalebFontenot/src/main/java/edu/slcc/asdv/beans/Purchases.java
diff --git a/Semester 2/labEL2_CalebFontenot/src/main/java/edu/slcc/asdv/beans/SimpleBean.java b/Semester 2/Assignments/labEL2_CalebFontenot/src/main/java/edu/slcc/asdv/beans/SimpleBean.java
similarity index 100%
rename from Semester 2/labEL2_CalebFontenot/src/main/java/edu/slcc/asdv/beans/SimpleBean.java
rename to Semester 2/Assignments/labEL2_CalebFontenot/src/main/java/edu/slcc/asdv/beans/SimpleBean.java
diff --git a/Semester 2/labEL2_CalebFontenot/src/main/java/edu/slcc/asdv/beans/TestBean1.java b/Semester 2/Assignments/labEL2_CalebFontenot/src/main/java/edu/slcc/asdv/beans/TestBean1.java
similarity index 100%
rename from Semester 2/labEL2_CalebFontenot/src/main/java/edu/slcc/asdv/beans/TestBean1.java
rename to Semester 2/Assignments/labEL2_CalebFontenot/src/main/java/edu/slcc/asdv/beans/TestBean1.java
diff --git a/Semester 2/labEL2_CalebFontenot/src/main/java/edu/slcc/asdv/bl/Utils.java b/Semester 2/Assignments/labEL2_CalebFontenot/src/main/java/edu/slcc/asdv/bl/Utils.java
similarity index 100%
rename from Semester 2/labEL2_CalebFontenot/src/main/java/edu/slcc/asdv/bl/Utils.java
rename to Semester 2/Assignments/labEL2_CalebFontenot/src/main/java/edu/slcc/asdv/bl/Utils.java
diff --git a/Semester 2/labEL2_CalebFontenot/src/main/java/edu/slcc/asdv/caleb/label2_calebfontenot/JakartaRestConfiguration.java b/Semester 2/Assignments/labEL2_CalebFontenot/src/main/java/edu/slcc/asdv/caleb/label2_calebfontenot/JakartaRestConfiguration.java
similarity index 100%
rename from Semester 2/labEL2_CalebFontenot/src/main/java/edu/slcc/asdv/caleb/label2_calebfontenot/JakartaRestConfiguration.java
rename to Semester 2/Assignments/labEL2_CalebFontenot/src/main/java/edu/slcc/asdv/caleb/label2_calebfontenot/JakartaRestConfiguration.java
diff --git a/Semester 2/labEL2_CalebFontenot/src/main/java/edu/slcc/asdv/caleb/label2_calebfontenot/resources/JakartaEE10Resource.java b/Semester 2/Assignments/labEL2_CalebFontenot/src/main/java/edu/slcc/asdv/caleb/label2_calebfontenot/resources/JakartaEE10Resource.java
similarity index 100%
rename from Semester 2/labEL2_CalebFontenot/src/main/java/edu/slcc/asdv/caleb/label2_calebfontenot/resources/JakartaEE10Resource.java
rename to Semester 2/Assignments/labEL2_CalebFontenot/src/main/java/edu/slcc/asdv/caleb/label2_calebfontenot/resources/JakartaEE10Resource.java
diff --git a/Semester 2/labEL2_CalebFontenot/src/main/java/edu/slcc/asdv/pojos/Company.java b/Semester 2/Assignments/labEL2_CalebFontenot/src/main/java/edu/slcc/asdv/pojos/Company.java
similarity index 100%
rename from Semester 2/labEL2_CalebFontenot/src/main/java/edu/slcc/asdv/pojos/Company.java
rename to Semester 2/Assignments/labEL2_CalebFontenot/src/main/java/edu/slcc/asdv/pojos/Company.java
diff --git a/Semester 2/labEL2_CalebFontenot/src/main/java/edu/slcc/asdv/pojos/Employee.java b/Semester 2/Assignments/labEL2_CalebFontenot/src/main/java/edu/slcc/asdv/pojos/Employee.java
similarity index 100%
rename from Semester 2/labEL2_CalebFontenot/src/main/java/edu/slcc/asdv/pojos/Employee.java
rename to Semester 2/Assignments/labEL2_CalebFontenot/src/main/java/edu/slcc/asdv/pojos/Employee.java
diff --git a/Semester 2/labEL2_CalebFontenot/src/main/java/edu/slcc/asdv/pojos/Name.java b/Semester 2/Assignments/labEL2_CalebFontenot/src/main/java/edu/slcc/asdv/pojos/Name.java
similarity index 100%
rename from Semester 2/labEL2_CalebFontenot/src/main/java/edu/slcc/asdv/pojos/Name.java
rename to Semester 2/Assignments/labEL2_CalebFontenot/src/main/java/edu/slcc/asdv/pojos/Name.java
diff --git a/Semester 2/Assignments/labEL2_CalebFontenot/src/main/resources/META-INF/persistence.xml b/Semester 2/Assignments/labEL2_CalebFontenot/src/main/resources/META-INF/persistence.xml
new file mode 100644
index 0000000..7582bf1
--- /dev/null
+++ b/Semester 2/Assignments/labEL2_CalebFontenot/src/main/resources/META-INF/persistence.xml
@@ -0,0 +1,7 @@
+
+
+
+
+
+
+
diff --git a/Semester 2/Assignments/labEL2_CalebFontenot/src/main/webapp/WEB-INF/beans.xml b/Semester 2/Assignments/labEL2_CalebFontenot/src/main/webapp/WEB-INF/beans.xml
new file mode 100644
index 0000000..9dfae34
--- /dev/null
+++ b/Semester 2/Assignments/labEL2_CalebFontenot/src/main/webapp/WEB-INF/beans.xml
@@ -0,0 +1,6 @@
+
+
+
\ No newline at end of file
diff --git a/Semester 2/Assignments/labEL2_CalebFontenot/src/main/webapp/WEB-INF/glassfish-web.xml b/Semester 2/Assignments/labEL2_CalebFontenot/src/main/webapp/WEB-INF/glassfish-web.xml
new file mode 100644
index 0000000..673cc06
--- /dev/null
+++ b/Semester 2/Assignments/labEL2_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/Assignments/labEL2_CalebFontenot/src/main/webapp/WEB-INF/web.xml b/Semester 2/Assignments/labEL2_CalebFontenot/src/main/webapp/WEB-INF/web.xml
new file mode 100644
index 0000000..fcfcd54
--- /dev/null
+++ b/Semester 2/Assignments/labEL2_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/Assignments/labEL2_CalebFontenot/src/main/webapp/index.html b/Semester 2/Assignments/labEL2_CalebFontenot/src/main/webapp/index.html
new file mode 100644
index 0000000..3368e9c
--- /dev/null
+++ b/Semester 2/Assignments/labEL2_CalebFontenot/src/main/webapp/index.html
@@ -0,0 +1,10 @@
+
+
+
+ Start Page
+
+
+
+ Hello World!
+
+
diff --git a/Semester 2/labEL2_CalebFontenot/src/main/webapp/index.xhtml b/Semester 2/Assignments/labEL2_CalebFontenot/src/main/webapp/index.xhtml
similarity index 100%
rename from Semester 2/labEL2_CalebFontenot/src/main/webapp/index.xhtml
rename to Semester 2/Assignments/labEL2_CalebFontenot/src/main/webapp/index.xhtml
diff --git a/Semester 2/labEL2_CalebFontenot/src/main/webapp/purchase-failure.xhtml b/Semester 2/Assignments/labEL2_CalebFontenot/src/main/webapp/purchase-failure.xhtml
similarity index 100%
rename from Semester 2/labEL2_CalebFontenot/src/main/webapp/purchase-failure.xhtml
rename to Semester 2/Assignments/labEL2_CalebFontenot/src/main/webapp/purchase-failure.xhtml
diff --git a/Semester 2/labEL2_CalebFontenot/src/main/webapp/purchase-success.xhtml b/Semester 2/Assignments/labEL2_CalebFontenot/src/main/webapp/purchase-success.xhtml
similarity index 100%
rename from Semester 2/labEL2_CalebFontenot/src/main/webapp/purchase-success.xhtml
rename to Semester 2/Assignments/labEL2_CalebFontenot/src/main/webapp/purchase-success.xhtml
diff --git a/Semester 2/labEL2_CalebFontenot/src/main/webapp/using-collections.xhtml b/Semester 2/Assignments/labEL2_CalebFontenot/src/main/webapp/using-collections.xhtml
similarity index 100%
rename from Semester 2/labEL2_CalebFontenot/src/main/webapp/using-collections.xhtml
rename to Semester 2/Assignments/labEL2_CalebFontenot/src/main/webapp/using-collections.xhtml
diff --git a/Semester 2/labNavigation1_CalebFontenot/pom.xml b/Semester 2/Assignments/labNavigation1_CalebFontenot/pom.xml
similarity index 100%
rename from Semester 2/labNavigation1_CalebFontenot/pom.xml
rename to Semester 2/Assignments/labNavigation1_CalebFontenot/pom.xml
diff --git a/Semester 2/labNavigation1_CalebFontenot/src/main/java/edu/slcc/asdv/caleb/labnavigation1_calebfontenot/JakartaRestConfiguration.java b/Semester 2/Assignments/labNavigation1_CalebFontenot/src/main/java/edu/slcc/asdv/caleb/labnavigation1_calebfontenot/JakartaRestConfiguration.java
similarity index 100%
rename from Semester 2/labNavigation1_CalebFontenot/src/main/java/edu/slcc/asdv/caleb/labnavigation1_calebfontenot/JakartaRestConfiguration.java
rename to Semester 2/Assignments/labNavigation1_CalebFontenot/src/main/java/edu/slcc/asdv/caleb/labnavigation1_calebfontenot/JakartaRestConfiguration.java
diff --git a/Semester 2/labNavigation1_CalebFontenot/src/main/java/edu/slcc/asdv/caleb/labnavigation1_calebfontenot/resources/JakartaEE10Resource.java b/Semester 2/Assignments/labNavigation1_CalebFontenot/src/main/java/edu/slcc/asdv/caleb/labnavigation1_calebfontenot/resources/JakartaEE10Resource.java
similarity index 100%
rename from Semester 2/labNavigation1_CalebFontenot/src/main/java/edu/slcc/asdv/caleb/labnavigation1_calebfontenot/resources/JakartaEE10Resource.java
rename to Semester 2/Assignments/labNavigation1_CalebFontenot/src/main/java/edu/slcc/asdv/caleb/labnavigation1_calebfontenot/resources/JakartaEE10Resource.java
diff --git a/Semester 2/Assignments/labNavigation1_CalebFontenot/src/main/resources/META-INF/persistence.xml b/Semester 2/Assignments/labNavigation1_CalebFontenot/src/main/resources/META-INF/persistence.xml
new file mode 100644
index 0000000..7582bf1
--- /dev/null
+++ b/Semester 2/Assignments/labNavigation1_CalebFontenot/src/main/resources/META-INF/persistence.xml
@@ -0,0 +1,7 @@
+
+
+
+
+
+
+
diff --git a/Semester 2/Assignments/labNavigation1_CalebFontenot/src/main/webapp/WEB-INF/beans.xml b/Semester 2/Assignments/labNavigation1_CalebFontenot/src/main/webapp/WEB-INF/beans.xml
new file mode 100644
index 0000000..9dfae34
--- /dev/null
+++ b/Semester 2/Assignments/labNavigation1_CalebFontenot/src/main/webapp/WEB-INF/beans.xml
@@ -0,0 +1,6 @@
+
+
+
\ No newline at end of file
diff --git a/Semester 2/Assignments/labNavigation1_CalebFontenot/src/main/webapp/WEB-INF/glassfish-web.xml b/Semester 2/Assignments/labNavigation1_CalebFontenot/src/main/webapp/WEB-INF/glassfish-web.xml
new file mode 100644
index 0000000..673cc06
--- /dev/null
+++ b/Semester 2/Assignments/labNavigation1_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/labNavigation1_CalebFontenot/src/main/webapp/WEB-INF/web.xml b/Semester 2/Assignments/labNavigation1_CalebFontenot/src/main/webapp/WEB-INF/web.xml
similarity index 100%
rename from Semester 2/labNavigation1_CalebFontenot/src/main/webapp/WEB-INF/web.xml
rename to Semester 2/Assignments/labNavigation1_CalebFontenot/src/main/webapp/WEB-INF/web.xml
diff --git a/Semester 2/Assignments/labNavigation1_CalebFontenot/src/main/webapp/index.html b/Semester 2/Assignments/labNavigation1_CalebFontenot/src/main/webapp/index.html
new file mode 100644
index 0000000..3368e9c
--- /dev/null
+++ b/Semester 2/Assignments/labNavigation1_CalebFontenot/src/main/webapp/index.html
@@ -0,0 +1,10 @@
+
+
+
+ Start Page
+
+
+
+ Hello World!
+
+
diff --git a/Semester 2/ZIPs/MP1_BusinessLogic_CalebFontenot.zip b/Semester 2/ZIPs/MP1_BusinessLogic_CalebFontenot.zip
new file mode 100644
index 0000000..ce83ae8
Binary files /dev/null and b/Semester 2/ZIPs/MP1_BusinessLogic_CalebFontenot.zip differ
diff --git a/Semester 2/ZIPs/MP1_Navigation_CalebFontenot.zip b/Semester 2/ZIPs/MP1_Navigation_CalebFontenot.zip
new file mode 100644
index 0000000..26abf33
Binary files /dev/null and b/Semester 2/ZIPs/MP1_Navigation_CalebFontenot.zip differ