From e3fc4bccd4471cae079d7fdbf1dc122c80856491 Mon Sep 17 00:00:00 2001 From: Kane Wang Date: Wed, 24 Aug 2022 18:01:27 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=9D=E5=AD=98=E8=BF=9B=E5=BA=A6=EF=BC=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- tomcat-servlet/tomcat-servlet/pom.xml | 6 +++--- .../src/main/java/com/cpic/xim/ServletTest.java | 3 ++- .../tomcat-servlet/src/main/webapp/index.jsp | 2 +- .../surefire-reports/TEST-com.cpic.xim.ServletTest.xml | 10 +++++----- .../surefire-reports/com.cpic.xim.ServletTest.txt | 2 +- .../tomcat-servlet/target/tomcat-servlet/index.jsp | 4 ++-- 6 files changed, 14 insertions(+), 13 deletions(-) diff --git a/tomcat-servlet/tomcat-servlet/pom.xml b/tomcat-servlet/tomcat-servlet/pom.xml index a4b89d2..f36c746 100644 --- a/tomcat-servlet/tomcat-servlet/pom.xml +++ b/tomcat-servlet/tomcat-servlet/pom.xml @@ -28,9 +28,9 @@ jakarta.servlet jakarta.servlet-api - 5.0.0 - system - ${project.basedir}/src/main/webapp/WEB-INF/lib/servlet-api.jar + 6.0.0 + provided + diff --git a/tomcat-servlet/tomcat-servlet/src/main/java/com/cpic/xim/ServletTest.java b/tomcat-servlet/tomcat-servlet/src/main/java/com/cpic/xim/ServletTest.java index 0b128e1..e848d8d 100644 --- a/tomcat-servlet/tomcat-servlet/src/main/java/com/cpic/xim/ServletTest.java +++ b/tomcat-servlet/tomcat-servlet/src/main/java/com/cpic/xim/ServletTest.java @@ -2,7 +2,7 @@ * @Author: Kane * @Date: 2022-08-23 21:28:26 * @LastEditors: Kane - * @LastEditTime: 2022-08-24 16:06:56 + * @LastEditTime: 2022-08-24 17:54:54 * @FilePath: \tomcat-servlet\src\main\java\com\cpic\xim\ServletTest.java * @Description: * @@ -15,6 +15,7 @@ import java.io.IOException; import java.io.PrintWriter; import jakarta.servlet.*; import jakarta.servlet.http.*; +import javax.naming.*; public class ServletTest extends HttpServlet diff --git a/tomcat-servlet/tomcat-servlet/src/main/webapp/index.jsp b/tomcat-servlet/tomcat-servlet/src/main/webapp/index.jsp index 4f31c21..1d9d9e1 100644 --- a/tomcat-servlet/tomcat-servlet/src/main/webapp/index.jsp +++ b/tomcat-servlet/tomcat-servlet/src/main/webapp/index.jsp @@ -15,7 +15,7 @@ - Document + 测试Tomcat 10.X 访问servlet diff --git a/tomcat-servlet/tomcat-servlet/target/surefire-reports/TEST-com.cpic.xim.ServletTest.xml b/tomcat-servlet/tomcat-servlet/target/surefire-reports/TEST-com.cpic.xim.ServletTest.xml index 857ae6f..0c94d10 100644 --- a/tomcat-servlet/tomcat-servlet/target/surefire-reports/TEST-com.cpic.xim.ServletTest.xml +++ b/tomcat-servlet/tomcat-servlet/target/surefire-reports/TEST-com.cpic.xim.ServletTest.xml @@ -1,10 +1,10 @@ - + - + @@ -15,9 +15,9 @@ - + - + @@ -30,7 +30,7 @@ - + diff --git a/tomcat-servlet/tomcat-servlet/target/surefire-reports/com.cpic.xim.ServletTest.txt b/tomcat-servlet/tomcat-servlet/target/surefire-reports/com.cpic.xim.ServletTest.txt index 2211469..7f2a153 100644 --- a/tomcat-servlet/tomcat-servlet/target/surefire-reports/com.cpic.xim.ServletTest.txt +++ b/tomcat-servlet/tomcat-servlet/target/surefire-reports/com.cpic.xim.ServletTest.txt @@ -1,4 +1,4 @@ ------------------------------------------------------------------------------- Test set: com.cpic.xim.ServletTest ------------------------------------------------------------------------------- -Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.036 s - in com.cpic.xim.ServletTest +Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.035 s - in com.cpic.xim.ServletTest diff --git a/tomcat-servlet/tomcat-servlet/target/tomcat-servlet/index.jsp b/tomcat-servlet/tomcat-servlet/target/tomcat-servlet/index.jsp index 1ab1c54..1d9d9e1 100644 --- a/tomcat-servlet/tomcat-servlet/target/tomcat-servlet/index.jsp +++ b/tomcat-servlet/tomcat-servlet/target/tomcat-servlet/index.jsp @@ -8,14 +8,14 @@ * * Copyright (c) ${2022} by Kane, All Rights Reserved. --> -<%@ page pageEncoding="UTF-8" %> +<%@ page pageEncoding="UTF-8" contentType="text/html" %> - Document + 测试Tomcat 10.X 访问servlet