[FEAT][PC]Modification des fichiers pour ajouter les properties nécessaires à la connection

.vscode/settings.json

 {
     "java.project.sourcePaths": [
-        "WEB-INF\\src"
+        "src/main/java"
     ],
     "java.project.referencedLibraries": [
-        "e:\\tomcat\\lib\\annotations-api.jar",
-        "e:\\tomcat\\lib\\catalina.jar",
-        "e:\\tomcat\\lib\\catalina-ant.jar",
-        "e:\\tomcat\\lib\\catalina-ha.jar",
-        "e:\\tomcat\\lib\\catalina-ssi.jar",
-        "e:\\tomcat\\lib\\catalina-storeconfig.jar",
-        "e:\\tomcat\\lib\\catalina-tribes.jar",
-        "e:\\tomcat\\lib\\ecj-4.27.jar",
-        "e:\\tomcat\\lib\\el-api.jar",
-        "e:\\tomcat\\lib\\jakartaee-migration-1.0.8-shaded.jar",
-        "e:\\tomcat\\lib\\jasper.jar",
-        "e:\\tomcat\\lib\\jasper-el.jar",
-        "e:\\tomcat\\lib\\jaspic-api.jar",
-        "e:\\tomcat\\lib\\jsp-api.jar",
-        "e:\\tomcat\\lib\\postgresql-42.7.4.jar",
-        "e:\\tomcat\\lib\\servlet-api.jar",
-        "e:\\tomcat\\lib\\tomcat-api.jar",
-        "e:\\tomcat\\lib\\tomcat-coyote.jar",
-        "e:\\tomcat\\lib\\tomcat-coyote-ffm.jar",
-        "e:\\tomcat\\lib\\tomcat-dbcp.jar",
-        "e:\\tomcat\\lib\\tomcat-i18n-cs.jar",
-        "e:\\tomcat\\lib\\tomcat-i18n-de.jar",
-        "e:\\tomcat\\lib\\tomcat-i18n-es.jar",
-        "e:\\tomcat\\lib\\tomcat-i18n-fr.jar",
-        "e:\\tomcat\\lib\\tomcat-i18n-ja.jar",
-        "e:\\tomcat\\lib\\tomcat-i18n-ko.jar",
-        "e:\\tomcat\\lib\\tomcat-i18n-pt-BR.jar",
-        "e:\\tomcat\\lib\\tomcat-i18n-ru.jar",
-        "e:\\tomcat\\lib\\tomcat-i18n-zh-CN.jar",
-        "e:\\tomcat\\lib\\tomcat-jdbc.jar",
-        "e:\\tomcat\\lib\\tomcat-jni.jar",
-        "e:\\tomcat\\lib\\tomcat-util.jar",
-        "e:\\tomcat\\lib\\tomcat-util-scan.jar",
-        "e:\\tomcat\\lib\\tomcat-websocket.jar",
-        "e:\\tomcat\\lib\\websocket-api.jar",
-        "e:\\tomcat\\lib\\websocket-client-api.jar"
+        "/home/infoetu/paul.cancel.etu/R5.A.09/tomcat/lib/tomcat-i18n-es.jar",
+        "/home/infoetu/paul.cancel.etu/R5.A.09/tomcat/lib/jakartaee-migration-1.0.8-shaded.jar",
+        "/home/infoetu/paul.cancel.etu/R5.A.09/tomcat/lib/tomcat-jdbc.jar",
+        "/home/infoetu/paul.cancel.etu/R5.A.09/tomcat/lib/tomcat-i18n-ja.jar",
+        "/home/infoetu/paul.cancel.etu/R5.A.09/tomcat/lib/tomcat-websocket.jar",
+        "/home/infoetu/paul.cancel.etu/R5.A.09/tomcat/lib/jsp-api.jar",
+        "/home/infoetu/paul.cancel.etu/R5.A.09/tomcat/lib/tomcat-i18n-ru.jar",
+        "/home/infoetu/paul.cancel.etu/R5.A.09/tomcat/lib/el-api.jar",
+        "/home/infoetu/paul.cancel.etu/R5.A.09/tomcat/lib/tomcat-i18n-ko.jar",
+        "/home/infoetu/paul.cancel.etu/R5.A.09/tomcat/lib/jaspic-api.jar",
+        "/home/infoetu/paul.cancel.etu/R5.A.09/tomcat/lib/annotations-api.jar",
+        "/home/infoetu/paul.cancel.etu/R5.A.09/tomcat/lib/tomcat-coyote.jar",
+        "/home/infoetu/paul.cancel.etu/R5.A.09/tomcat/lib/tomcat-util-scan.jar",
+        "/home/infoetu/paul.cancel.etu/R5.A.09/tomcat/lib/catalina-tribes.jar",
+        "/home/infoetu/paul.cancel.etu/R5.A.09/tomcat/lib/jasper-el.jar",
+        "/home/infoetu/paul.cancel.etu/R5.A.09/tomcat/lib/catalina-ha.jar",
+        "/home/infoetu/paul.cancel.etu/R5.A.09/tomcat/lib/tomcat-i18n-cs.jar",
+        "/home/infoetu/paul.cancel.etu/R5.A.09/tomcat/lib/websocket-api.jar",
+        "/home/infoetu/paul.cancel.etu/R5.A.09/tomcat/lib/postgresql-42.7.4.jar",
+        "/home/infoetu/paul.cancel.etu/R5.A.09/tomcat/lib/tomcat-jni.jar",
+        "/home/infoetu/paul.cancel.etu/R5.A.09/tomcat/lib/tomcat-coyote-ffm.jar",
+        "/home/infoetu/paul.cancel.etu/R5.A.09/tomcat/lib/tomcat-i18n-zh-CN.jar",
+        "/home/infoetu/paul.cancel.etu/R5.A.09/tomcat/lib/servlet-api.jar",
+        "/home/infoetu/paul.cancel.etu/R5.A.09/tomcat/lib/tomcat-i18n-de.jar",
+        "/home/infoetu/paul.cancel.etu/R5.A.09/tomcat/lib/tomcat-api.jar",
+        "/home/infoetu/paul.cancel.etu/R5.A.09/tomcat/lib/websocket-client-api.jar",
+        "/home/infoetu/paul.cancel.etu/R5.A.09/tomcat/lib/catalina.jar",
+        "/home/infoetu/paul.cancel.etu/R5.A.09/tomcat/lib/tomcat-i18n-fr.jar",
+        "/home/infoetu/paul.cancel.etu/R5.A.09/tomcat/lib/tomcat-i18n-pt-BR.jar",
+        "/home/infoetu/paul.cancel.etu/R5.A.09/tomcat/lib/catalina-ant.jar",
+        "/home/infoetu/paul.cancel.etu/R5.A.09/tomcat/lib/jasper.jar",
+        "/home/infoetu/paul.cancel.etu/R5.A.09/tomcat/lib/catalina-ssi.jar",
+        "/home/infoetu/paul.cancel.etu/R5.A.09/tomcat/lib/ecj-4.27.jar",
+        "/home/infoetu/paul.cancel.etu/R5.A.09/tomcat/lib/catalina-storeconfig.jar",
+        "/home/infoetu/paul.cancel.etu/R5.A.09/tomcat/lib/tomcat-util.jar",
+        "/home/infoetu/paul.cancel.etu/R5.A.09/tomcat/lib/tomcat-dbcp.jar"
     ],
     "java.project.outputPath": "WEB-INF\\classes"
 }
\ No newline at end of file

WEB-INF/src/connection/DS.java

-package connection;
-
-import java.sql.Connection;
-import java.sql.DriverManager;
-
-public class DS {
-    public static Connection getConnection(){
-        try {
-
-        Class.forName("org.postgresql.Driver");
-
-        String url = "jdbc:postgresql://psqlserv/but3";
-        String nom = "paulcanceletu";
-        String mdp = "moi";
-        return DriverManager.getConnection(url, nom, mdp);
-        } catch (Exception e) {
-            System.out.println(e.getMessage());
-        }
-        return null;
-    }
-}
-

pom.xml

@@ -147,6 +147,7 @@
             <directory>${basedir}/src/main/resources</directory>
             <includes>
               <include>css/print.css</include>
+              <include>**/*.txt</include>
             </includes>
           </resource>
 

WEB-INF/src/Login.java → src/main/java/sae/doctolib/Login.java

+package sae.doctolib;
+
 import java.io.*;
 import jakarta.servlet.*;
 import jakarta.servlet.http.*;

src/main/java/sae/doctolib/connection/DS.java

+package sae.doctolib.connection;
+
+import java.io.FileNotFoundException;
+import java.io.InputStream;
+import java.sql.*;
+import java.util.Properties;
+
+public class DS {
+    public static Connection getConnection(){
+        Properties properties = new Properties();
+        try {
+            System.out.println("Chemin de recherche: " + DS.class.getClassLoader().getResource("Properties/connection.txt"));
+            InputStream input = DS.class.getClassLoader().getResourceAsStream("Properties/connection.txt");
+            if(input == null) {
+                throw new FileNotFoundException("Data not found");
+            }
+            properties.load(input);
+
+            Class.forName("org.postgresql.Driver");
+
+            String url = properties.getProperty("url");
+            String nom = properties.getProperty("nom");
+            String mdp = properties.getProperty("mdp");
+            System.out.println(url + nom + mdp);
+            return DriverManager.getConnection(url, nom, mdp);
+        } catch (Exception e) {
+            System.out.println(e.getMessage());
+        }
+        return null;
+    }
+
+    public static void main(String[] args) {
+        try {
+            Connection con = DS.getConnection();
+
+            String query = "SELECT * FROM etudiants";
+            Statement stmt = con.createStatement();
+            ResultSet rs = stmt.executeQuery(query);
+            while(rs.next()){
+                System.out.println(rs.getString(1));
+            }
+        } catch (Exception e) {
+            System.out.println(e.getMessage());
+        }
+    }
+}
+

WEB-INF/src/dao/DaoUser.java → src/main/java/sae/doctolib/dao/DaoUser.java

-package dao;
+package sae.doctolib.dao;
 
 
 import java.util.List;
 
-import dto.User;
+import sae.doctolib.dto.User;
 
 public interface DaoUser {
     public List<User> findAll();

WEB-INF/src/dao/implementation/UserService.java → src/main/java/sae/doctolib/dao/implementation/UserService.java

-package dao.implementation;
+package sae.doctolib.dao.implementation;
 
 import java.sql.Connection;
 import java.util.List;
 
-import connection.DS;
-import dao.DaoUser;
-import dto.User;
+
+import sae.doctolib.connection.DS;
+import sae.doctolib.dao.DaoUser;
+import sae.doctolib.dto.User;
 
 public class UserService implements DaoUser{
     private Connection con;

WEB-INF/src/dto/Calendar.java → src/main/java/sae/doctolib/dto/Calendar.java

-package dto;
+package sae.doctolib.dto;
 
 import java.time.LocalDate;
 

WEB-INF/src/dto/Demand.java → src/main/java/sae/doctolib/dto/Demand.java

-package dto;
+package sae.doctolib.dto;
 
 import java.time.LocalDate;