diff --git a/nbproject/project.properties b/nbproject/project.properties index 7d07af0..66ef7c2 100644 --- a/nbproject/project.properties +++ b/nbproject/project.properties @@ -35,7 +35,7 @@ j2ee.compile.on.save=true j2ee.copy.static.files.on.save=true j2ee.deploy.on.save=true j2ee.platform=10-web -j2ee.platform.classpath=${j2ee.server.home}/bin/tomcat-juli.jar:${j2ee.server.home}/lib/annotations-api.jar:${j2ee.server.home}/lib/catalina-ant.jar:${j2ee.server.home}/lib/catalina-ha.jar:${j2ee.server.home}/lib/catalina-ssi.jar:${j2ee.server.home}/lib/catalina-storeconfig.jar:${j2ee.server.home}/lib/catalina-tribes.jar:${j2ee.server.home}/lib/catalina.jar:${j2ee.server.home}/lib/ecj-4.27.jar:${j2ee.server.home}/lib/el-api.jar:${j2ee.server.home}/lib/jakartaee-migration-1.0.8-shaded.jar:${j2ee.server.home}/lib/jasper-el.jar:${j2ee.server.home}/lib/jasper.jar:${j2ee.server.home}/lib/jaspic-api.jar:${j2ee.server.home}/lib/jsp-api.jar:${j2ee.server.home}/lib/mysql-connector-java-8.0.23.jar:${j2ee.server.home}/lib/servlet-api.jar:${j2ee.server.home}/lib/tomcat-api.jar:${j2ee.server.home}/lib/tomcat-coyote-ffm.jar:${j2ee.server.home}/lib/tomcat-coyote.jar:${j2ee.server.home}/lib/tomcat-dbcp.jar:${j2ee.server.home}/lib/tomcat-i18n-cs.jar:${j2ee.server.home}/lib/tomcat-i18n-de.jar:${j2ee.server.home}/lib/tomcat-i18n-es.jar:${j2ee.server.home}/lib/tomcat-i18n-fr.jar:${j2ee.server.home}/lib/tomcat-i18n-ja.jar:${j2ee.server.home}/lib/tomcat-i18n-ko.jar:${j2ee.server.home}/lib/tomcat-i18n-pt-BR.jar:${j2ee.server.home}/lib/tomcat-i18n-ru.jar:${j2ee.server.home}/lib/tomcat-i18n-zh-CN.jar:${j2ee.server.home}/lib/tomcat-jdbc.jar:${j2ee.server.home}/lib/tomcat-jni.jar:${j2ee.server.home}/lib/tomcat-util-scan.jar:${j2ee.server.home}/lib/tomcat-util.jar:${j2ee.server.home}/lib/tomcat-websocket.jar:${j2ee.server.home}/lib/websocket-api.jar:${j2ee.server.home}/lib/websocket-client-api.jar +j2ee.platform.classpath=${j2ee.server.home}/bin/tomcat-juli.jar:${j2ee.server.home}/lib/annotations-api.jar:${j2ee.server.home}/lib/catalina-ant.jar:${j2ee.server.home}/lib/catalina-ha.jar:${j2ee.server.home}/lib/catalina-ssi.jar:${j2ee.server.home}/lib/catalina-storeconfig.jar:${j2ee.server.home}/lib/catalina-tribes.jar:${j2ee.server.home}/lib/catalina.jar:${j2ee.server.home}/lib/ecj-4.27.jar:${j2ee.server.home}/lib/el-api.jar:${j2ee.server.home}/lib/jakartaee-migration-1.0.8-shaded.jar:${j2ee.server.home}/lib/jasper-el.jar:${j2ee.server.home}/lib/jasper.jar:${j2ee.server.home}/lib/jaspic-api.jar:${j2ee.server.home}/lib/jsp-api.jar:${j2ee.server.home}/lib/servlet-api.jar:${j2ee.server.home}/lib/tomcat-api.jar:${j2ee.server.home}/lib/tomcat-coyote-ffm.jar:${j2ee.server.home}/lib/tomcat-coyote.jar:${j2ee.server.home}/lib/tomcat-dbcp.jar:${j2ee.server.home}/lib/tomcat-i18n-cs.jar:${j2ee.server.home}/lib/tomcat-i18n-de.jar:${j2ee.server.home}/lib/tomcat-i18n-es.jar:${j2ee.server.home}/lib/tomcat-i18n-fr.jar:${j2ee.server.home}/lib/tomcat-i18n-ja.jar:${j2ee.server.home}/lib/tomcat-i18n-ko.jar:${j2ee.server.home}/lib/tomcat-i18n-pt-BR.jar:${j2ee.server.home}/lib/tomcat-i18n-ru.jar:${j2ee.server.home}/lib/tomcat-i18n-zh-CN.jar:${j2ee.server.home}/lib/tomcat-jdbc.jar:${j2ee.server.home}/lib/tomcat-jni.jar:${j2ee.server.home}/lib/tomcat-util-scan.jar:${j2ee.server.home}/lib/tomcat-util.jar:${j2ee.server.home}/lib/tomcat-websocket.jar:${j2ee.server.home}/lib/websocket-api.jar:${j2ee.server.home}/lib/websocket-client-api.jar j2ee.server.type=Tomcat jar.compress=false javac.classpath=\ diff --git a/src/java/bdd/CaserneMySQL.java b/src/java/bdd/CaserneMySQL.java index 09ab635..fb2c744 100644 --- a/src/java/bdd/CaserneMySQL.java +++ b/src/java/bdd/CaserneMySQL.java @@ -14,7 +14,7 @@ import java.sql.SQLException; * @author Dominique_2 */ public class CaserneMySQL { - private final Connection laConnection = Connexion.getConnect("10.121.38.106", + private final Connection laConnection = Connexion.getConnect("10.121.38.201", "sdis29", "adminBDsdis", "mdpBDsdis"); diff --git a/src/java/bdd/ParamMySQL.java b/src/java/bdd/ParamMySQL.java index 964d7a8..f090551 100644 --- a/src/java/bdd/ParamMySQL.java +++ b/src/java/bdd/ParamMySQL.java @@ -18,7 +18,7 @@ import java.util.ArrayList; */ public class ParamMySQL { - private final Connection laConnection = Connexion.getConnect("10.121.38.106", + private final Connection laConnection = Connexion.getConnect("10.121.38.201", "sdis29", "adminBDsdis", "mdpBDsdis"); diff --git a/src/java/bdd/PompierMySQL.java b/src/java/bdd/PompierMySQL.java index d5df64f..fc4643f 100644 --- a/src/java/bdd/PompierMySQL.java +++ b/src/java/bdd/PompierMySQL.java @@ -24,7 +24,7 @@ import java.util.logging.Logger; */ public class PompierMySQL { - private final Connection theConnection = Connexion.getConnect("10.121.38.106", + private final Connection theConnection = Connexion.getConnect("10.121.38.201", "sdis29", "adminBDsdis", "mdpBDsdis"); diff --git a/web/WEB-INF/jspf/formulairePompier.jspf b/web/WEB-INF/jspf/formulairePompier.jspf index 8854c11..16b02ab 100644 --- a/web/WEB-INF/jspf/formulairePompier.jspf +++ b/web/WEB-INF/jspf/formulairePompier.jspf @@ -1,7 +1,8 @@ <%@ page pageEncoding="UTF-8" %>
\ No newline at end of file diff --git a/web/WEB-INF/jspf/header.jspf b/web/WEB-INF/jspf/header.jspf index 2cdb0e7..ca7acfa 100644 --- a/web/WEB-INF/jspf/header.jspf +++ b/web/WEB-INF/jspf/header.jspf @@ -4,7 +4,7 @@