From 1c56351377f960293528d03b8ac190bf63708991 Mon Sep 17 00:00:00 2001
From: Kathryn Rodriguez <kathryn.n.rodriguez@gmail.com>
Date: Fri, 25 Mar 2022 12:58:40 -0500
Subject: [PATCH 1/4] forgot to push up yesterday

---
 pom.xml                              |  2 +-
 src/main/java/HelloWorldServlet.java | 11 +++++++++--
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index 4782732164..b396d2a827 100644
--- a/pom.xml
+++ b/pom.xml
@@ -27,7 +27,7 @@
         <dependency>
             <groupId>javax.servlet</groupId>
             <artifactId>javax.servlet-api</artifactId>
-            <version>3.0.1</version>
+            <version>4.0.1</version>
         </dependency>
     </dependencies>
 
diff --git a/src/main/java/HelloWorldServlet.java b/src/main/java/HelloWorldServlet.java
index dd49fb7133..d0f726421d 100644
--- a/src/main/java/HelloWorldServlet.java
+++ b/src/main/java/HelloWorldServlet.java
@@ -1,9 +1,16 @@
+import javax.servlet.annotation.WebServlet;
 import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.io.PrintWriter;
 
-public class HelloWorldServlet extends HttpServlet {
-    protected void doGet(HttpServletRequest req, HttpServletResponse res) {
+@WebServlet(name = "HelloWorldServlet", urlPatterns = "/hello-world")
 
+public class HelloWorldServlet extends HttpServlet {
+    protected void doGet(HttpServletRequest request, HttpServletResponse response) throws IOException {
+        response.setContentType("text/html");
+        PrintWriter out = response.getWriter();
+        out.println("<h1>Hello, World!</h1>");
     }
 }

From 9ee0fadb531c5cfc3e9f7c7407438706304ff5c8 Mon Sep 17 00:00:00 2001
From: Kathryn Rodriguez <kathryn.n.rodriguez@gmail.com>
Date: Tue, 29 Mar 2022 10:17:52 -0500
Subject: [PATCH 2/4] tried to change urlPatterns

---
 src/main/java/HelloWorldServlet.java | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/main/java/HelloWorldServlet.java b/src/main/java/HelloWorldServlet.java
index d0f726421d..8882f61e02 100644
--- a/src/main/java/HelloWorldServlet.java
+++ b/src/main/java/HelloWorldServlet.java
@@ -1,16 +1,17 @@
-import javax.servlet.annotation.WebServlet;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-import java.io.PrintWriter;
 
-@WebServlet(name = "HelloWorldServlet", urlPatterns = "/hello-world")
+import java.io.*;
+import javax.servlet.*;
+import javax.servlet.annotation.WebServlet;
+import javax.servlet.http.*;
 
+@WebServlet(name = "HelloWorldServlet", urlPatterns = "/hello")
 public class HelloWorldServlet extends HttpServlet {
-    protected void doGet(HttpServletRequest request, HttpServletResponse response) throws IOException {
+
+    @Override
+    protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
         response.setContentType("text/html");
         PrintWriter out = response.getWriter();
         out.println("<h1>Hello, World!</h1>");
     }
+
 }

From b04468ba7bb8b27fd430d334cb4199bb0ca57470 Mon Sep 17 00:00:00 2001
From: Kathryn Rodriguez <kathryn.n.rodriguez@gmail.com>
Date: Wed, 30 Mar 2022 10:12:16 -0500
Subject: [PATCH 3/4] servlets exercise done

---
 src/main/java/CounterServlet.java    | 18 ++++++++++++++++++
 src/main/java/HelloWorldServlet.java | 21 +++++++++++++--------
 2 files changed, 31 insertions(+), 8 deletions(-)
 create mode 100644 src/main/java/CounterServlet.java

diff --git a/src/main/java/CounterServlet.java b/src/main/java/CounterServlet.java
new file mode 100644
index 0000000000..4e01ac3184
--- /dev/null
+++ b/src/main/java/CounterServlet.java
@@ -0,0 +1,18 @@
+import javax.servlet.annotation.WebServlet;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+
+@WebServlet(name = "CounterServlet", urlPatterns = "/counter")
+public class CounterServlet extends HttpServlet {
+    public int counter = 0;
+
+    protected void doGet(HttpServletRequest request, HttpServletResponse response) throws IOException {
+        if (request.getParameter("reset") != null && request.getParameter("reset").equalsIgnoreCase("reset")) {
+            counter = 0;
+        }
+        counter++;
+        response.getWriter().println("<h1>The page load count is: " + counter + "</h1>");
+    }
+}
diff --git a/src/main/java/HelloWorldServlet.java b/src/main/java/HelloWorldServlet.java
index 8882f61e02..6ff165aa77 100644
--- a/src/main/java/HelloWorldServlet.java
+++ b/src/main/java/HelloWorldServlet.java
@@ -1,17 +1,22 @@
-
-import java.io.*;
-import javax.servlet.*;
 import javax.servlet.annotation.WebServlet;
 import javax.servlet.http.*;
+//import javax.servlet.http.HttpServletRequest;
+//import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.io.PrintWriter;
 
 @WebServlet(name = "HelloWorldServlet", urlPatterns = "/hello")
 public class HelloWorldServlet extends HttpServlet {
-
-    @Override
-    protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+    protected void doGet(HttpServletRequest request, HttpServletResponse response) throws IOException {
         response.setContentType("text/html");
+
+        String output = "<h1>Hello, World!</h1>";
+
+        if (request.getParameter("name") != null) {
+            output = "<h1>Hello, " + request.getParameter("name") + "!</h1>";
+        }
+
         PrintWriter out = response.getWriter();
-        out.println("<h1>Hello, World!</h1>");
+        out.println(output);
     }
-
 }

From c978a0c6c8de1123c5d47b4b7ab38ad2dbb7d67a Mon Sep 17 00:00:00 2001
From: Kathryn Rodriguez <kathryn.n.rodriguez@gmail.com>
Date: Thu, 31 Mar 2022 10:39:15 -0500
Subject: [PATCH 4/4] lecture notes

---
 pom.xml                              |  6 ++++++
 src/main/webapp/jsp-jstl-lecture.jsp | 27 +++++++++++++++++++++++++++
 2 files changed, 33 insertions(+)
 create mode 100644 src/main/webapp/jsp-jstl-lecture.jsp

diff --git a/pom.xml b/pom.xml
index b396d2a827..bafb746076 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,6 +29,12 @@
             <artifactId>javax.servlet-api</artifactId>
             <version>4.0.1</version>
         </dependency>
+
+        <dependency>
+            <groupId>jstl</groupId>
+            <artifactId>jstl</artifactId>
+            <version>1.2</version>
+        </dependency>
     </dependencies>
 
 </project>
\ No newline at end of file
diff --git a/src/main/webapp/jsp-jstl-lecture.jsp b/src/main/webapp/jsp-jstl-lecture.jsp
new file mode 100644
index 0000000000..b4119d469d
--- /dev/null
+++ b/src/main/webapp/jsp-jstl-lecture.jsp
@@ -0,0 +1,27 @@
+<%--
+  Created by IntelliJ IDEA.
+  User: kathrynrodriguez
+  Date: 3/31/22
+  Time: 9:45 AM
+  To change this template use File | Settings | File Templates.
+--%>
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
+<%! int counter = 0; %>
+<% counter += 1; %>
+<html>
+<head>
+  <title>Title</title>
+</head>
+<body>
+
+<h1>The current count is <%= counter %>.</h1>
+
+View the page source!
+
+<%-- this is a JSP comment, you will *not* see this in the html --%>
+
+<!-- this is an HTML comment, you *will* see this in the html -->
+
+</body>
+</html>