diff --git a/.gitignore b/.gitignore index d9265cf50ba4c38ba7a1cbaf8c30651d4511f78b..ad381a0b2ad29d2e949221aff3cda5f1a329b7dc 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ [Bb]uild/ -.class \ No newline at end of file +*.class diff --git a/build.cmd b/build.cmd index 83b916bd2d0b1274b7bf51e25331494835cee829..ba55f28f5f612d6ee413a23190d9444510daf701 100644 --- a/build.cmd +++ b/build.cmd @@ -2,10 +2,20 @@ PUSHD %~dp0 -SET JAVA_HOME=C:\program files\java\jdk11.0.1 +SET JAVA_HOME=C:\Program Files\Java\jdk1.8.0_211 MKDIR build > NUL -javac -d build/ src/*.java +SET LIBS= +FOR %%F IN (%CD%\lib\*.jar) DO SET LIBS=!LIBS!;%%F +SET LIBS=%LIBS:~1% + +SET CLASSES= +FOR %%F IN (%CD%\build\*.class) DO SET CLASSES=!CLASSES!;%%F +SET CLASSES=%CLASSES:~1% + +SET CLASSPATH=%CD%\build;%CD%\lib;%LIBS%;%CLASSES% + +javac -d webapp/WEB-INF/classes/ src/*.java POPD \ No newline at end of file diff --git a/run.cmd b/run.cmd deleted file mode 100644 index 9ff3d84ddca90ac9b0fa1ecbe98f4eadf78cdc80..0000000000000000000000000000000000000000 --- a/run.cmd +++ /dev/null @@ -1,22 +0,0 @@ -@ECHO OFF -SETLOCAL enabledelayedexpansion enableextensions - -PUSHD %~dp0 - -SET JAVA_HOME=C:\program files\java\jdk11.0.1 - -SET LIBS= -FOR %%F IN (%CD%\lib\*.jar) DO SET LIBS=!LIBS!;%%F -SET LIBS=%LIBS:~1% - -SET CLASSES= -FOR %%F IN (%CD%\build\*.class) DO SET CLASSES=!CLASSES!;%%F -SET CLASSES=%CLASSES:~1% - -SET CLASSPATH=%CD%\build;%CD%\lib;%LIBS%;%CLASSES% - -java "%1" - -POPD - -ENDLOCAL \ No newline at end of file diff --git a/run.sh b/run.sh deleted file mode 100644 index e58dd25660bf0ff9ff9b765ff3723661932d3b0b..0000000000000000000000000000000000000000 --- a/run.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/bash - -LIBS=$(ls -R lib/*.jar | tr "\n" ":"). - -java -cp "${LIBS}":./build "$1" \ No newline at end of file diff --git a/src/First.java b/src/First.java new file mode 100644 index 0000000000000000000000000000000000000000..daf861998c0701d42a32391bc003b2fccd759421 --- /dev/null +++ b/src/First.java @@ -0,0 +1,20 @@ +import java.io.*; +import javax.servlet.*; +import javax.servlet.http.*; +import javax.servlet.annotation.WebServlet; + +@WebServlet("/servlet-First") +public class First extends HttpServlet +{ + public void service( HttpServletRequest req, HttpServletResponse res ) + throws ServletException, IOException + { + res.setContentType("text/html;charset=UTF-8"); + PrintWriter out = res.getWriter(); + out.println( "<head><title>servlet first</title>" ); + out.println( "<META content=\"charset=UTF-8\"></head><body><center>" ); + out.println( "<h1>Test de ma Servlet</h1>" ); + out.println( "<h2>Super ! ?a marche</h2>" ); + out.println( "</center> </body>" ); + } +} \ No newline at end of file diff --git a/webapp/WEB-INF/classes/Test.java b/src/Test.java similarity index 100% rename from webapp/WEB-INF/classes/Test.java rename to src/Test.java diff --git a/webapp/WEB-INF/classes/.gitkeep b/webapp/WEB-INF/classes/.gitkeep new file mode 100644 index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 diff --git a/webapp/WEB-INF/classes/Test.class b/webapp/WEB-INF/classes/Test.class deleted file mode 100644 index e0f7ce6cf0120f260258f5a3fac32ea20fe8e59a..0000000000000000000000000000000000000000 Binary files a/webapp/WEB-INF/classes/Test.class and /dev/null differ