diff --git a/.gitignore b/.gitignore
index 9dad4ed..fed1a4a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -82,6 +82,7 @@ local.properties
.idea/**/usage.statistics.xml
.idea/**/dictionaries
.idea/**/shelf
+.idea/**.xml
# Generated files
.idea/**/contentModel.xml
diff --git a/README.md b/README.md
index ab8a62e..48687ea 100644
--- a/README.md
+++ b/README.md
@@ -53,7 +53,7 @@ Insérer du `code` :
```java
public interface ClientHandler {
- public void handle();
+ void handle();
}
```
diff --git a/jetty-runner.sh b/jetty-runner.sh
deleted file mode 100755
index 586f651..0000000
--- a/jetty-runner.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash
-
-# Téléchargement du runner jetty (https://www.eclipse.org/jetty/documentation/9.4.x/runner.html)
-wget -O jetty-runner.jar -c http://central.maven.org/maven2/org/eclipse/jetty/jetty-runner/9.4.15.v20190215/jetty-runner-9.4.15.v20190215.jar
-
-# Compilation du war dans target
-mvn package
-
-# Lancement du projet (Ã adapter si le jar change)
-java -jar jetty-runner.jar target/pr.tp.web-0.0.1-SNAPSHOT.war
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 84e7bad..9326c55 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,8 +9,8 @@
UTF-8
- 8
- 8
+ 17
+ 17
@@ -20,12 +20,10 @@
3.8.1
test
-
- javax.servlet
- javax.servlet-api
- 4.0.1
- provided
+ jakarta.servlet
+ jakarta.servlet-api
+ 6.0.0
diff --git a/src/main/java/pr/tp/web/example/HelloServlet.java b/src/main/java/pr/tp/web/example/HelloServlet.java
index 1406aa8..b33a0d0 100644
--- a/src/main/java/pr/tp/web/example/HelloServlet.java
+++ b/src/main/java/pr/tp/web/example/HelloServlet.java
@@ -3,11 +3,11 @@ package pr.tp.web.example;
import java.io.IOException;
import java.io.PrintWriter;
-import javax.servlet.ServletException;
-import javax.servlet.annotation.WebServlet;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.annotation.WebServlet;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
@WebServlet(name = "hello", urlPatterns = { "/hello" })
public class HelloServlet extends HttpServlet {
diff --git a/src/main/java/pr/tp/web/example/ServletAvecParam.java b/src/main/java/pr/tp/web/example/ServletAvecParam.java
index b185d3d..38d8311 100644
--- a/src/main/java/pr/tp/web/example/ServletAvecParam.java
+++ b/src/main/java/pr/tp/web/example/ServletAvecParam.java
@@ -3,14 +3,14 @@ package pr.tp.web.example;
import java.io.IOException;
import java.util.Enumeration;
-import javax.servlet.RequestDispatcher;
-import javax.servlet.ServletConfig;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletException;
-import javax.servlet.annotation.WebServlet;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.RequestDispatcher;
+import jakarta.servlet.ServletConfig;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.annotation.WebServlet;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
@WebServlet(name = "params", urlPatterns = { "/params" })
public class ServletAvecParam extends HttpServlet {
diff --git a/src/main/java/pr/tp/web/servlet/Chat.java b/src/main/java/pr/tp/web/servlet/Chat.java
index 1bc08ac..a322d93 100644
--- a/src/main/java/pr/tp/web/servlet/Chat.java
+++ b/src/main/java/pr/tp/web/servlet/Chat.java
@@ -1,7 +1,7 @@
package pr.tp.web.servlet;
-import javax.servlet.annotation.WebServlet;
-import javax.servlet.http.HttpServlet;
+import jakarta.servlet.annotation.WebServlet;
+import jakarta.servlet.http.HttpServlet;
@WebServlet("/chat")
public class Chat extends HttpServlet {
diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml
index d3edb75..33a76a0 100644
--- a/src/main/webapp/WEB-INF/web.xml
+++ b/src/main/webapp/WEB-INF/web.xml
@@ -1,12 +1,19 @@
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee
+ http://xmlns.jcp.org/xml/ns/javaee/web-app_4_0.xsd"
+ version="4.0">
- Archetype Created Web Application
+ PR TP WEB
+
+
+
+ index.jsp
+
+
+
name
Joe
@@ -16,9 +23,7 @@
password
-
+
params
pr.tp.web.example.ServletAvecParam
@@ -28,4 +33,13 @@
+
+
+
+
diff --git a/src/main/webapp/index.jsp b/src/main/webapp/index.jsp
index 0345a1e..657081f 100644
--- a/src/main/webapp/index.jsp
+++ b/src/main/webapp/index.jsp
@@ -1,9 +1,11 @@
<%@ page import="java.util.Date"%>
-
+
Hello IPR
+
+
Page de démo
Cette page est générée par la jsp : src/main/webapp/index.jsp
@@ -15,7 +17,7 @@
Servlet
/pr.tp.web/src/main/java/pr/tp/web/example/ServletAvecParam.java qui
démontre la lecture de paramètres du fichier web.xml dans la console
- (cette servlet redirige sur la page /index.jsp)
+ (cette servlet redirige sur la page /index.jsp et affiche dans la console du serveur web)
Vous êtes libre de modifier ces pages ou de les effacer si vous
@@ -26,6 +28,7 @@
Il est
<%=new Date()%>
+
diff --git a/webapp-runner.sh b/webapp-runner.sh
deleted file mode 100755
index 163920e..0000000
--- a/webapp-runner.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash
-
-# Téléchargement du runner jetty (https://www.eclipse.org/jetty/documentation/9.4.x/runner.html)
-wget -O webapp-runner.jar -c http://central.maven.org/maven2/com/github/jsimone/webapp-runner/9.0.16.0/webapp-runner-9.0.16.0.jar
-
-# Compilation du war dans target
-mvn package
-
-# Lancement du projet (Ã adapter si le jar change)
-java -jar webapp-runner.jar target/pr.tp.web-0.0.1-SNAPSHOT.war
\ No newline at end of file