From 9c667fbe9a8c8fa9f086c89f33b87289189c8242 Mon Sep 17 00:00:00 2001 From: "thomas.millot" Date: Mon, 18 Oct 2021 15:32:53 +0200 Subject: [PATCH] Merge origin/master Conflicts: web/WEB-INF/AuthentificationJSP.jsp --- nbproject/genfiles.properties | 4 ++-- nbproject/project.properties | 3 +-- nbproject/project.xml | 4 ++-- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/nbproject/genfiles.properties b/nbproject/genfiles.properties index 795fef0..7a04e5d 100644 --- a/nbproject/genfiles.properties +++ b/nbproject/genfiles.properties @@ -1,8 +1,8 @@ -build.xml.data.CRC32=573ee386 +build.xml.data.CRC32=5eaaa012 build.xml.script.CRC32=9c118765 build.xml.stylesheet.CRC32=1707db4f@1.86.0.1 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml. # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you. -nbproject/build-impl.xml.data.CRC32=573ee386 +nbproject/build-impl.xml.data.CRC32=5eaaa012 nbproject/build-impl.xml.script.CRC32=7458d665 nbproject/build-impl.xml.stylesheet.CRC32=334708a0@1.86.0.1 diff --git a/nbproject/project.properties b/nbproject/project.properties index 93b0dd7..12e3d57 100644 --- a/nbproject/project.properties +++ b/nbproject/project.properties @@ -12,7 +12,7 @@ build.test.classes.dir=${build.dir}/test/classes build.test.results.dir=${build.dir}/test/results build.web.dir=${build.dir}/web build.web.excludes=${build.classes.excludes} -client.urlPart= +client.urlPart=/Authentif compile.jsps=false conf.dir=${source.root}/conf debug.classpath=${build.classes.dir}:${javac.classpath} @@ -69,7 +69,6 @@ javadoc.use=true javadoc.version=false javadoc.windowtitle= lib.dir=${web.docbase.dir}/WEB-INF/lib -no.dependencies=false persistence.xml.dir=${conf.dir} platform.active=default_platform resource.dir=setup diff --git a/nbproject/project.xml b/nbproject/project.xml index ccc65a8..846adcd 100644 --- a/nbproject/project.xml +++ b/nbproject/project.xml @@ -21,10 +21,10 @@ - + - +