From fa1a1cfebe1688a0f966b9f27d43d19ebe62bf45 Mon Sep 17 00:00:00 2001
From: Amaury Vanoorenberghe <amaury.vanoorenberghe.etu@univ-lille.fr>
Date: Wed, 29 Sep 2021 10:13:14 +0200
Subject: [PATCH] SETUP - Correction de bugs dans les scripts de build eet
suppression des .class
---
.gitignore | 2 +-
build.cmd | 14 ++++++++++++--
run.cmd | 22 ----------------------
run.sh | 5 -----
src/First.java | 20 ++++++++++++++++++++
{webapp/WEB-INF/classes => src}/Test.java | 0
webapp/WEB-INF/classes/.gitkeep | 0
webapp/WEB-INF/classes/Test.class | Bin 1408 -> 0 bytes
8 files changed, 33 insertions(+), 30 deletions(-)
delete mode 100644 run.cmd
delete mode 100644 run.sh
create mode 100644 src/First.java
rename {webapp/WEB-INF/classes => src}/Test.java (100%)
create mode 100644 webapp/WEB-INF/classes/.gitkeep
delete mode 100644 webapp/WEB-INF/classes/Test.class
diff --git a/.gitignore b/.gitignore
index d9265cf..ad381a0 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 83b916b..ba55f28 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 9ff3d84..0000000
--- 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 e58dd25..0000000
--- 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 0000000..daf8619
--- /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 0000000..e69de29
diff --git a/webapp/WEB-INF/classes/Test.class b/webapp/WEB-INF/classes/Test.class
deleted file mode 100644
index e0f7ce6cf0120f260258f5a3fac32ea20fe8e59a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 1408
zcmX^0Z`VEs1_l!bM=l0o24xNg6>bJq1~m|&&cUF;#h}Tc#lfJ>!Jxyzpv%Fa$HAb_
z!C=6_V93E>#KB<9!C=C{V9L&5#?D~Q$iQZknU`5&$H>5}p&7==z~Y>rlFG=y?~|FA
z>Q|bZlv)&$n3R*s$iQBlT2z*qoXW@$q~Vj5Se96!4-&~qEz!>?DJjtRC@CojPAw|S
zNi7LVEi6qfF0m%4thgXQuQ=5jWG|O%MRICENoIatF*}0=JA)-716Oc<X;E^jTPDbQ
z&XCmN5<QT;j0}=NrFkWpxv629#hFPtsg8Mh`6Y>9t&9w+XqG0zCH2Eolb{Z?W@KP3
zOUx-vWn|!m`vPPE4}%DUC?kV-NoobiTe&&b$r*`7#i=E>p&@R%7VHdGJPg(hHarZr
z40enR{5Fay`N<`f1*r-dCAm3v><soi3=Rx7j11;B8L5dWb~YuMB{`{f&~Q=!*<hm&
z5wp>Us7T6BskF06PR%PxEwWQ!WKgupFth_HR7gox$VpUyx>&(0u`JO>Kf@5DhQ%hS
z$c~XA*d{3_GcVgNG%r;lwWuhyv`C>?J+-(*Aw4IvxcKnORE3npykdpq)RK}^g@VNN
zR6T{@#L}YFDuuHA(qfR|$@xV^ndzxT3idYo5VIH=v_Xc09FSV2kdvxVlv<KsTBJ~x
zS_IYsG6w8fkSYa61}+<YgxgtdN^?N&v$x5~v{MLz=qyUjNi4}sQ?OF7NmR%vN=>uX
z)6*{jMJ71RkU2K`iFOJ$1$K-K3CJcSCKc!Blqy)k^n;R{mA-yXesW??Mt*ULepzNp
zDw2@|<iWOp(!D;!wfr{vkVw!6J4k_%fd%A!Mg}=hYQvq%F%&?f3Z9S|8H7P5=x65Z
zd-@}Zs)0mtn;Vo0$rg+Ze8s6H&iQ#Isd*(Kl?ADc45E;nr=OFUm#!aNQk0pO4$eHB
z>8T~*MVTe3MT`vM8k*oN0J1iqC^HW#VU6S(Bw<Dd_5zTioID0a1|bGv1`uFkU<Bm@
z21W)k1_lOM21W)(1_lOJt?dkq8yOfF7#YMF7#P^Vf*cHt3=#~I3`}69dl;A)SQr=>
zQgnovb}}$CG3e}MU}0qN(-mUf#=xd4#11Aoz$7P_<N}irHiYB`i|~L+UNFfACi%gn
z0GJfq#=wSfi5r6;0|Nsu0|x^i13v>lgD8UlgEWI6*hA_J!VJ0$A`He1q70S{Vhr{S
z;tZ|~5)9r9k_>?iQVih?(hRW-G7QNKvJ6sSUokOAGsrM7F~~A7FfcL5F~~D8Fz_)j
RGAJ-GGAKqfFcvc?0RWHgbWH#N
--
GitLab