diff --git a/.classpath b/.classpath
index d5d51da..207ca29 100644
--- a/.classpath
+++ b/.classpath
@@ -3,17 +3,17 @@
-
+
-
+
+
+
-
-
diff --git a/.project b/.project
index 9b945a3..c048311 100644
--- a/.project
+++ b/.project
@@ -1,6 +1,6 @@
- LibreServiceEuWeb
+ LSEUWeb
kiss4web
diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs
index 3a357db..beecee7 100644
--- a/.settings/org.eclipse.jdt.core.prefs
+++ b/.settings/org.eclipse.jdt.core.prefs
@@ -1,9 +1,9 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=17
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=11
+org.eclipse.jdt.core.compiler.compliance=17
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -12,7 +12,7 @@ org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
org.eclipse.jdt.core.compiler.release=enabled
-org.eclipse.jdt.core.compiler.source=11
+org.eclipse.jdt.core.compiler.source=17
org.eclipse.jdt.core.formatter.align_assignment_statements_on_columns=false
org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines=2147483647
org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
diff --git a/.settings/org.eclipse.wst.common.project.facet.core.xml b/.settings/org.eclipse.wst.common.project.facet.core.xml
index 80fd752..38f28ae 100644
--- a/.settings/org.eclipse.wst.common.project.facet.core.xml
+++ b/.settings/org.eclipse.wst.common.project.facet.core.xml
@@ -1,10 +1,10 @@
-
+
-
+
diff --git a/build-appjar.xml b/build-appjar.xml
new file mode 100644
index 0000000..9c54e7c
--- /dev/null
+++ b/build-appjar.xml
@@ -0,0 +1,177 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Done.
+
+
+
+
+ Type ant -p
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ classpath=${toString:project.libs}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/build-local.xml b/build-local.xml
new file mode 100644
index 0000000..42599df
--- /dev/null
+++ b/build-local.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
+
diff --git a/build-snapshot.xml b/build-snapshot.xml
new file mode 100644
index 0000000..3c68374
--- /dev/null
+++ b/build-snapshot.xml
@@ -0,0 +1,27 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/build-tagandpush.xml b/build-tagandpush.xml
new file mode 100644
index 0000000..326d0e4
--- /dev/null
+++ b/build-tagandpush.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
+
diff --git a/build.sh b/build.sh
new file mode 100755
index 0000000..69a8dab
--- /dev/null
+++ b/build.sh
@@ -0,0 +1,168 @@
+#/bin/bash
+
+#
+# Display help.
+#
+function help
+{
+ echo "StatoolInfos build script."
+ echo "Usage: build.sh [ -h | -help | --help | -snapshot | -local | -full ]"
+ echo " -h, -help, --help display this help."
+ echo " -snapshot, --snapshot build a snapshot."
+ echo " -local, --local build a new version without tag nor version number commit nor Git push."
+ echo " -tagandpush, --tagandpush build a new version with tag, version number commit and Git push."
+ echo ""
+}
+
+#
+# Build snapshot.
+#
+function build_snapshot
+{
+ okCount=0
+
+ # Ant check.
+ antCheck=`which ant`
+ if [[ "$antCheck" =~ ^/.* ]]; then
+ echo "Ant requirement................ OK"
+ let "okCount+=1"
+ else
+ echo "Ant requirement................ MISSING"
+ fi
+
+ # Javac check.
+ javacCheck=`which javac`
+ if [[ "$javacCheck" =~ ^/.* ]]; then
+ echo "Javac requirement.............. OK"
+ let "okCount+=1"
+ else
+ echo "Javac requirement.............. MISSING"
+ fi
+
+ # Java version check.
+ javaVersionCheck=`javac -version 2>&1`
+ if [[ "$javaVersionCheck" =~ ^.*\ 11. ]]; then
+ echo "Java 11 version requirement..... OK"
+ let "okCount+=1"
+ else
+ echo "Java 11 version requirement..... MISSING"
+ fi
+
+ if [ "$okCount" == 3 ]; then
+ echo "Requirement OK"
+ ant -f build-snapshot.xml
+ else
+ echo "Requirement MISSING, build abort"
+ fi
+}
+
+#
+# Build local.
+#
+function build_local
+{
+ okCount=0
+
+ # Ant check.
+ antCheck=`which ant`
+ if [[ "$antCheck" =~ ^/.* ]]; then
+ echo "Ant requirement................ OK"
+ let "okCount+=1"
+ else
+ echo "Ant requirement................ MISSING"
+ fi
+
+ # Javac check.
+ javacCheck=`which javac`
+ if [[ "$javacCheck" =~ ^/.* ]]; then
+ echo "Javac requirement.............. OK"
+ let "okCount+=1"
+ else
+ echo "Javac requirement.............. MISSING"
+ fi
+
+ # Java version check.
+ javaVersionCheck=`javac -version 2>&1`
+ if [[ "$javaVersionCheck" =~ ^.*\ 11. ]]; then
+ echo "Java 11 version requirement..... OK"
+ let "okCount+=1"
+ else
+ echo "Java 11 version requirement..... MISSING"
+ fi
+
+ if [ "$okCount" == 3 ]; then
+ echo "Requirement OK"
+ ant -f build-local.xml
+ else
+ echo "Requirement MISSING, build abort"
+ fi
+}
+
+#
+# Build tagandpush.
+#
+function build_tagandpush
+{
+ okCount=0
+
+ # Ant check.
+ antCheck=`which ant`
+ if [[ "$antCheck" =~ ^/.* ]]; then
+ echo "Ant requirement................ OK"
+ let "okCount+=1"
+ else
+ echo "Ant requirement................ MISSING"
+ fi
+
+ # Javac check.
+ javacCheck=`which javac`
+ if [[ "$javacCheck" =~ ^/.* ]]; then
+ echo "Javac requirement.............. OK"
+ let "okCount+=1"
+ else
+ echo "Javac requirement.............. MISSING"
+ fi
+
+ # Java version check.
+ javaVersionCheck=`javac -version 2>&1`
+ if [[ "$javaVersionCheck" =~ ^.*\ 11. ]]; then
+ echo "Java 11 version requirement..... OK"
+ let "okCount+=1"
+ else
+ echo "Java 11 version requirement..... MISSING"
+ fi
+
+ # Git check.
+ gitCheck=`which git 2>&1`
+ if [[ "$gitCheck" =~ ^/.* ]]; then
+ echo "GIT requirement................ OK"
+ let "okCount+=1"
+ else
+ echo "GIT requirement................ MISSING"
+ fi
+
+ if [ "$okCount" == 4 ]; then
+ echo "Requirement OK"
+ ant -f build-tagandpush.xml
+ else
+ echo "Requirement MISSING, build abort"
+ fi
+}
+
+#
+# Main.
+#
+if [ "$#" -eq 0 ] || [ "$1" == "-h" ] || [ "$1" == "-help" ] || [ "$1" == "--help" ]; then
+ help
+elif [ "$1" == "-snapshot" ] || [ "$1" == "--snapshot" ] ; then
+ build_snapshot
+elif [ "$1" == "-local" ] || [ "$1" == "--local" ] ; then
+ build_local
+elif [ "$1" == "-tagandpush" ] || [ "$1" == "--tagandpush" ] ; then
+ build_tagandpush
+else
+ echo "Invalid parameters."
+ help
+fi
+
+
diff --git a/build.xml b/build.xml
new file mode 100644
index 0000000..2e5e25f
--- /dev/null
+++ b/build.xml
@@ -0,0 +1,9 @@
+
+
+
+
+
+
+
+
+
diff --git a/buildandgit.xml b/buildandgit.xml
new file mode 100644
index 0000000..e71746c
--- /dev/null
+++ b/buildandgit.xml
@@ -0,0 +1,5 @@
+
+
+
+
+
diff --git a/buildjar.xml b/buildjar.xml
new file mode 100644
index 0000000..d0303c1
--- /dev/null
+++ b/buildjar.xml
@@ -0,0 +1,151 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Type ant -p
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/buildwar.xml b/buildwar.xml
new file mode 100644
index 0000000..d4cc3d4
--- /dev/null
+++ b/buildwar.xml
@@ -0,0 +1,196 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Type ant -p
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/notes b/notes
new file mode 100644
index 0000000..9bf343b
--- /dev/null
+++ b/notes
@@ -0,0 +1,2 @@
+
+Build par export
\ No newline at end of file
diff --git a/resources/conf/statoolinfos-sample.conf b/resources/conf/statoolinfos-sample.conf
new file mode 100644
index 0000000..fbd45c8
--- /dev/null
+++ b/resources/conf/statoolinfos-sample.conf
@@ -0,0 +1,12 @@
+#
+# Sample StatoolInfos config file.
+#
+# Note: move this file outside the git directory.
+
+database.url=jdbc:mysql://localhost/
+database.name=agir2020
+database.login=admin
+database.password=suko7Gun
+
+targetDirectory=/home/cpm/Projets/StatoolInfos/TestZone/www
+
diff --git a/resources/conf/statoolinfos.cron b/resources/conf/statoolinfos.cron
new file mode 100644
index 0000000..1c7189a
--- /dev/null
+++ b/resources/conf/statoolinfos.cron
@@ -0,0 +1,3 @@
+LANGUAGE=fr_FR.UTF8
+LC_ALL=fr_FR.UTF-8
+/5 * * * * root /srv/statoolinfos/bin/statoolinfo.sh > /srv/statoolinfos/statoolinfos-cron.log
diff --git a/resources/scripts/statoolinfos.sh b/resources/scripts/statoolinfos.sh
new file mode 100755
index 0000000..f1e8fdb
--- /dev/null
+++ b/resources/scripts/statoolinfos.sh
@@ -0,0 +1,10 @@
+#!/bin/bash
+
+# Java check.
+javaCheck=`which java`
+if [[ "$javaCheck" =~ ^/.* ]]; then
+ #echo "Java requirement............... OK"
+ java -jar "$(dirname "$0")"/statoolinfos.jar $@
+else
+ echo "Java requirement............... MISSING"
+fi
diff --git a/resources/statoolinfos-logo-name.jpg b/resources/statoolinfos-logo-name.jpg
new file mode 100644
index 0000000..ed3ead0
Binary files /dev/null and b/resources/statoolinfos-logo-name.jpg differ
diff --git a/resources/statoolinfos-logo-sans.jpg b/resources/statoolinfos-logo-sans.jpg
new file mode 100644
index 0000000..94a8a2f
Binary files /dev/null and b/resources/statoolinfos-logo-sans.jpg differ
diff --git a/resources/statoolinfos-logo.ico b/resources/statoolinfos-logo.ico
new file mode 100644
index 0000000..eb85b69
Binary files /dev/null and b/resources/statoolinfos-logo.ico differ
diff --git a/resources/statoolinfos-logo.jpg b/resources/statoolinfos-logo.jpg
new file mode 100644
index 0000000..5d30f48
Binary files /dev/null and b/resources/statoolinfos-logo.jpg differ
diff --git a/src/eu/libreservice/www/LibreServiceEuWeb.java b/src/eu/libreservice/www/LibreServiceEuWeb.java
index 27fbb2b..1c35397 100644
--- a/src/eu/libreservice/www/LibreServiceEuWeb.java
+++ b/src/eu/libreservice/www/LibreServiceEuWeb.java
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2021 Christian Pierre MOMON
+ * Copyright (C) 2021-2023 Christian Pierre MOMON
*
* This file is part of LibreServiceEUWeb, the website www.libre-service.eu.
*
@@ -97,7 +97,7 @@ public class LibreServiceEuWeb
logInit(currentLog, "FAILED");
logger.warn("KISS4WEV INIT FAILED: " + exception.getMessage());
logger.warn(ExceptionUtils.getStackTrace(exception));
- Kiss4web.instance().setMode(Mode.APPLICATION_INIT_FAILED);
+ Kiss4web.instance().setMode(Mode.APP_INIT_FAILED);
}
}
diff --git a/src/eu/libreservice/www/LibreServiceEuWebLauncher.java b/src/eu/libreservice/www/LibreServiceEuWebLauncher.java
index 1a03de1..b65b68a 100644
--- a/src/eu/libreservice/www/LibreServiceEuWebLauncher.java
+++ b/src/eu/libreservice/www/LibreServiceEuWebLauncher.java
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2021 Christian Pierre MOMON
+ * Copyright (C) 2021-2023 Christian Pierre MOMON
*
* This file is part of LibreServiceEUWeb, the website www.libre-service.eu.
*
@@ -18,14 +18,13 @@
*/
package eu.libreservice.www;
-import javax.servlet.ServletContext;
-
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import fr.devinsy.kiss4web.Kiss4web;
import fr.devinsy.kiss4web.Kiss4web.Mode;
import fr.devinsy.kiss4web.Kiss4webLauncher;
+import jakarta.servlet.ServletContext;
/**
* The Class LibreServiceEuWebLauncher.
@@ -34,14 +33,14 @@ public class LibreServiceEuWebLauncher extends Kiss4webLauncher
{
private static Logger logger = LoggerFactory.getLogger(LibreServiceEuWebLauncher.class);
- /* (non-Javadoc)
- * @see fr.devinsy.kiss4web.Kiss4webLauncher#launch(javax.servlet.ServletContext)
+ /**
+ * {@inheritDoc}
*/
public void launch(final ServletContext context)
{
System.out.println("========= LibreServiceEuWeb WEBAPP LAUNCHING… ==========");
initLogger(context.getRealPath("/"));
- Kiss4web.instance().setMode(Mode.APPLICATION_INIT);
+ Kiss4web.instance().setMode(Mode.APP_INIT);
LibreServiceEuWeb.instance();
System.out.println("========= LibreServiceEuWeb WEBAPP LAUNCHED ==========");
diff --git a/src/website/AccueilPage.java b/src/website/AccueilPage.java
index d72e604..e6756c9 100644
--- a/src/website/AccueilPage.java
+++ b/src/website/AccueilPage.java
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2021 Christian Pierre MOMON
+ * Copyright (C) 2021-2023 Christian Pierre MOMON
*
* This file is part of LibreServiceEUWeb, the website www.libre-service.eu.
*
@@ -20,16 +20,15 @@ package website;
import java.io.IOException;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import fr.devinsy.xidyn.data.TagDataManager;
import fr.devinsy.xidyn.presenters.PresenterUtils;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
import website.charter.ErrorView;
import website.charter.WebCharterView;
@@ -41,8 +40,8 @@ public class AccueilPage extends HttpServlet
private static final long serialVersionUID = -8225743451426546008L;
private static Logger logger = LoggerFactory.getLogger(AccueilPage.class);
- /* (non-Javadoc)
- * @see javax.servlet.http.HttpServlet#doGet(javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse)
+ /**
+ * {@inheritDoc}
*/
@Override
public void doGet(final HttpServletRequest request, final HttpServletResponse response) throws IOException, ServletException
@@ -73,8 +72,8 @@ public class AccueilPage extends HttpServlet
}
}
- /* (non-Javadoc)
- * @see javax.servlet.http.HttpServlet#doPost(javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse)
+ /**
+ * {@inheritDoc}
*/
@Override
public void doPost(final HttpServletRequest request, final HttpServletResponse response) throws ServletException, IOException
diff --git a/src/website/AproposPage.java b/src/website/AproposPage.java
index 238fff2..a44c6f5 100644
--- a/src/website/AproposPage.java
+++ b/src/website/AproposPage.java
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2021 Christian Pierre MOMON
+ * Copyright (C) 2021-2023 Christian Pierre MOMON
*
* This file is part of LibreServiceEUWeb, the website www.libre-service.eu.
*
@@ -20,16 +20,15 @@ package website;
import java.io.IOException;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import fr.devinsy.xidyn.data.TagDataManager;
import fr.devinsy.xidyn.presenters.PresenterUtils;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
import website.charter.ErrorView;
import website.charter.WebCharterView;
@@ -41,8 +40,8 @@ public class AproposPage extends HttpServlet
private static final long serialVersionUID = -8225743451426546008L;
private static Logger logger = LoggerFactory.getLogger(AproposPage.class);
- /* (non-Javadoc)
- * @see javax.servlet.http.HttpServlet#doGet(javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse)
+ /**
+ * {@inheritDoc}
*/
@Override
public void doGet(final HttpServletRequest request, final HttpServletResponse response) throws IOException, ServletException
@@ -73,8 +72,8 @@ public class AproposPage extends HttpServlet
}
}
- /* (non-Javadoc)
- * @see javax.servlet.http.HttpServlet#doPost(javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse)
+ /**
+ * {@inheritDoc}
*/
@Override
public void doPost(final HttpServletRequest request, final HttpServletResponse response) throws ServletException, IOException
diff --git a/src/website/CguPage.java b/src/website/CguPage.java
index 2110a8d..2dedad1 100644
--- a/src/website/CguPage.java
+++ b/src/website/CguPage.java
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2021 Christian Pierre MOMON
+ * Copyright (C) 2021-2023 Christian Pierre MOMON
*
* This file is part of LibreServiceEUWeb, the website www.libre-service.eu.
*
@@ -20,16 +20,15 @@ package website;
import java.io.IOException;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import fr.devinsy.xidyn.data.TagDataManager;
import fr.devinsy.xidyn.presenters.PresenterUtils;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
import website.charter.ErrorView;
import website.charter.WebCharterView;
@@ -41,8 +40,8 @@ public class CguPage extends HttpServlet
private static final long serialVersionUID = -8225743451426546008L;
private static Logger logger = LoggerFactory.getLogger(CguPage.class);
- /* (non-Javadoc)
- * @see javax.servlet.http.HttpServlet#doGet(javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse)
+ /**
+ * {@inheritDoc}
*/
@Override
public void doGet(final HttpServletRequest request, final HttpServletResponse response) throws IOException, ServletException
@@ -74,8 +73,8 @@ public class CguPage extends HttpServlet
}
}
- /* (non-Javadoc)
- * @see javax.servlet.http.HttpServlet#doPost(javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse)
+ /**
+ * {@inheritDoc}
*/
@Override
public void doPost(final HttpServletRequest request, final HttpServletResponse response) throws ServletException, IOException
diff --git a/src/website/ContactPage.java b/src/website/ContactPage.java
index 82bd228..dc5b263 100644
--- a/src/website/ContactPage.java
+++ b/src/website/ContactPage.java
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2021 Christian Pierre MOMON
+ * Copyright (C) 2021-2023 Christian Pierre MOMON
*
* This file is part of LibreServiceEUWeb, the website www.libre-service.eu.
*
@@ -20,16 +20,15 @@ package website;
import java.io.IOException;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import fr.devinsy.xidyn.data.TagDataManager;
import fr.devinsy.xidyn.presenters.PresenterUtils;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
import website.charter.ErrorView;
import website.charter.WebCharterView;
@@ -41,8 +40,8 @@ public class ContactPage extends HttpServlet
private static final long serialVersionUID = -8225743451426546008L;
private static Logger logger = LoggerFactory.getLogger(ContactPage.class);
- /* (non-Javadoc)
- * @see javax.servlet.http.HttpServlet#doGet(javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse)
+ /**
+ * {@inheritDoc}
*/
@Override
public void doGet(final HttpServletRequest request, final HttpServletResponse response) throws IOException, ServletException
@@ -74,8 +73,8 @@ public class ContactPage extends HttpServlet
}
}
- /* (non-Javadoc)
- * @see javax.servlet.http.HttpServlet#doPost(javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse)
+ /**
+ * {@inheritDoc}
*/
@Override
public void doPost(final HttpServletRequest request, final HttpServletResponse response) throws ServletException, IOException
diff --git a/src/website/IndexXhtml.java b/src/website/IndexXhtml.java
index 47a0699..6c4285a 100644
--- a/src/website/IndexXhtml.java
+++ b/src/website/IndexXhtml.java
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2021 Christian Pierre MOMON
+ * Copyright (C) 2021-2023 Christian Pierre MOMON
*
* This file is part of LibreServiceEUWeb, the website www.libre-service.eu.
*
@@ -20,12 +20,11 @@ package website;
import java.io.IOException;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
import fr.devinsy.kiss4web.Redirector;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
import website.charter.ErrorView;
/**
@@ -36,8 +35,8 @@ public class IndexXhtml extends HttpServlet
private static final long serialVersionUID = 2794788000773558854L;
private static org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(IndexXhtml.class);
- /* (non-Javadoc)
- * @see javax.servlet.http.HttpServlet#doGet(javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse)
+ /**
+ * {@inheritDoc}
*/
@Override
public void doGet(final HttpServletRequest request, final HttpServletResponse response) throws IOException, ServletException
@@ -60,8 +59,8 @@ public class IndexXhtml extends HttpServlet
}
}
- /* (non-Javadoc)
- * @see javax.servlet.http.HttpServlet#doPost(javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse)
+ /**
+ * {@inheritDoc}
*/
@Override
public void doPost(final HttpServletRequest request, final HttpServletResponse response) throws ServletException, IOException
@@ -69,8 +68,8 @@ public class IndexXhtml extends HttpServlet
doGet(request, response);
}
- /* (non-Javadoc)
- * @see javax.servlet.GenericServlet#init()
+ /**
+ * {@inheritDoc}
*/
@Override
public void init() throws ServletException
diff --git a/src/website/MentionsLegalesPage.java b/src/website/MentionsLegalesPage.java
index dc04b59..5702866 100644
--- a/src/website/MentionsLegalesPage.java
+++ b/src/website/MentionsLegalesPage.java
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2021 Christian Pierre MOMON
+ * Copyright (C) 2021-2023 Christian Pierre MOMON
*
* This file is part of LibreServiceEUWeb, the website www.libre-service.eu.
*
@@ -20,16 +20,15 @@ package website;
import java.io.IOException;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import fr.devinsy.xidyn.data.TagDataManager;
import fr.devinsy.xidyn.presenters.PresenterUtils;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
import website.charter.ErrorView;
import website.charter.WebCharterView;
@@ -41,8 +40,8 @@ public class MentionsLegalesPage extends HttpServlet
private static final long serialVersionUID = -8225743451426546008L;
private static Logger logger = LoggerFactory.getLogger(MentionsLegalesPage.class);
- /* (non-Javadoc)
- * @see javax.servlet.http.HttpServlet#doGet(javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse)
+ /**
+ * {@inheritDoc}
*/
@Override
public void doGet(final HttpServletRequest request, final HttpServletResponse response) throws IOException, ServletException
@@ -73,8 +72,8 @@ public class MentionsLegalesPage extends HttpServlet
}
}
- /* (non-Javadoc)
- * @see javax.servlet.http.HttpServlet#doPost(javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse)
+ /**
+ * {@inheritDoc}
*/
@Override
public void doPost(final HttpServletRequest request, final HttpServletResponse response) throws ServletException, IOException
diff --git a/src/website/RegistreModerationPage.java b/src/website/RegistreModerationPage.java
index a22e770..dbf95cd 100644
--- a/src/website/RegistreModerationPage.java
+++ b/src/website/RegistreModerationPage.java
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2021 Christian Pierre MOMON
+ * Copyright (C) 2021-2023 Christian Pierre MOMON
*
* This file is part of LibreServiceEUWeb, the website www.libre-service.eu.
*
@@ -20,16 +20,15 @@ package website;
import java.io.IOException;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import fr.devinsy.xidyn.data.TagDataManager;
import fr.devinsy.xidyn.presenters.PresenterUtils;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
import website.charter.ErrorView;
import website.charter.WebCharterView;
@@ -41,8 +40,8 @@ public class RegistreModerationPage extends HttpServlet
private static final long serialVersionUID = -8225743451426546008L;
private static Logger logger = LoggerFactory.getLogger(RegistreModerationPage.class);
- /* (non-Javadoc)
- * @see javax.servlet.http.HttpServlet#doGet(javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse)
+ /**
+ * {@inheritDoc}
*/
@Override
public void doGet(final HttpServletRequest request, final HttpServletResponse response) throws IOException, ServletException
@@ -73,8 +72,8 @@ public class RegistreModerationPage extends HttpServlet
}
}
- /* (non-Javadoc)
- * @see javax.servlet.http.HttpServlet#doPost(javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse)
+ /**
+ * {@inheritDoc}
*/
@Override
public void doPost(final HttpServletRequest request, final HttpServletResponse response) throws ServletException, IOException
diff --git a/src/website/ServicesPage.java b/src/website/ServicesPage.java
index 01ba082..4d6a444 100644
--- a/src/website/ServicesPage.java
+++ b/src/website/ServicesPage.java
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2021 Christian Pierre MOMON
+ * Copyright (C) 2021-2023 Christian Pierre MOMON
*
* This file is part of LibreServiceEUWeb, the website www.libre-service.eu.
*
@@ -20,16 +20,15 @@ package website;
import java.io.IOException;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import fr.devinsy.xidyn.data.TagDataManager;
import fr.devinsy.xidyn.presenters.PresenterUtils;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
import website.charter.ErrorView;
import website.charter.WebCharterView;
@@ -41,8 +40,8 @@ public class ServicesPage extends HttpServlet
private static final long serialVersionUID = -8225743451426546008L;
private static Logger logger = LoggerFactory.getLogger(ServicesPage.class);
- /* (non-Javadoc)
- * @see javax.servlet.http.HttpServlet#doGet(javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse)
+ /**
+ * {@inheritDoc}
*/
@Override
public void doGet(final HttpServletRequest request, final HttpServletResponse response) throws IOException, ServletException
@@ -76,8 +75,8 @@ public class ServicesPage extends HttpServlet
logger.debug("doGet done.");
}
- /* (non-Javadoc)
- * @see javax.servlet.http.HttpServlet#doPost(javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse)
+ /**
+ * {@inheritDoc}
*/
@Override
public void doPost(final HttpServletRequest request, final HttpServletResponse response) throws ServletException, IOException
diff --git a/src/website/charter/ErrorView.java b/src/website/charter/ErrorView.java
index ba01d5b..301a2ee 100644
--- a/src/website/charter/ErrorView.java
+++ b/src/website/charter/ErrorView.java
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2021 Christian Pierre MOMON
+ * Copyright (C) 2021-2023 Christian Pierre MOMON
*
* This file is part of LibreServiceEUWeb, the website www.libre-service.eu.
*
@@ -20,10 +20,9 @@ package website.charter;
import java.io.IOException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
import fr.devinsy.strings.StringList;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
/**
* The Class ErrorView.
diff --git a/src/website/charter/FatalView.java b/src/website/charter/FatalView.java
index 22adf25..8aafe47 100644
--- a/src/website/charter/FatalView.java
+++ b/src/website/charter/FatalView.java
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2021 Christian Pierre MOMON
+ * Copyright (C) 2021-2023 Christian Pierre MOMON
*
* This file is part of LibreServiceEUWeb, the website www.libre-service.eu.
*
@@ -21,10 +21,9 @@ package website.charter;
import java.io.IOException;
import java.io.PrintWriter;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
import fr.devinsy.xidyn.utils.XidynUtils;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
/**
* The Class FatalView.
@@ -67,5 +66,3 @@ public class FatalView
out.println("