Updated year wishes.

.classpath

@@ -3,17 +3,17 @@
 	<classpathentry kind="src" path="test"/>
 	<classpathentry kind="src" path="webapp"/>
 	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
 		<attributes>
 			<attribute name="module" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jst.server.core.container/org.eclipse.jst.server.tomcat.runtimeTarget/Apache Tomcat v9.0.46">
+	<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/>
+	<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.web.container"/>
+	<classpathentry kind="con" path="org.eclipse.jst.server.core.container/org.eclipse.jst.server.tomcat.runtimeTarget/apache-tomcat-10.1.12">
 		<attributes>
 			<attribute name="owner.project.facets" value="jst.web"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/>
-	<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.web.container"/>
 	<classpathentry kind="output" path="build/classes"/>
 </classpath>

.project

@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>LibreServiceEuWeb</name>
+	<name>LSEUWeb</name>
 	<comment></comment>
 	<projects>
-		<project>kiss4web</project>
 	</projects>
 	<buildSpec>
 		<buildCommand>

.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,9 +12,10 @@ 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_selector_in_method_invocation_on_expression_first_line=false
 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
 org.eclipse.jdt.core.formatter.align_variable_declarations_on_columns=false
 org.eclipse.jdt.core.formatter.align_with_spaces=false
@@ -42,6 +43,8 @@ org.eclipse.jdt.core.formatter.alignment_for_conditional_expression_chain=0
 org.eclipse.jdt.core.formatter.alignment_for_enum_constants=49
 org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
 org.eclipse.jdt.core.formatter.alignment_for_expressions_in_for_loop_header=0
+org.eclipse.jdt.core.formatter.alignment_for_expressions_in_switch_case_with_arrow=0
+org.eclipse.jdt.core.formatter.alignment_for_expressions_in_switch_case_with_colon=0
 org.eclipse.jdt.core.formatter.alignment_for_logical_operator=16
 org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0
 org.eclipse.jdt.core.formatter.alignment_for_module_statements=16
@@ -50,6 +53,7 @@ org.eclipse.jdt.core.formatter.alignment_for_multiplicative_operator=16
 org.eclipse.jdt.core.formatter.alignment_for_parameterized_type_references=0
 org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
 org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_permitted_types_in_type_declaration=16
 org.eclipse.jdt.core.formatter.alignment_for_record_components=16
 org.eclipse.jdt.core.formatter.alignment_for_relational_operator=0
 org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80
@@ -60,6 +64,7 @@ org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
 org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
 org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_record_declaration=16
 org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_switch_case_with_arrow=0
 org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
 org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
 org.eclipse.jdt.core.formatter.alignment_for_type_annotations=0
@@ -111,6 +116,7 @@ org.eclipse.jdt.core.formatter.comment.indent_tag_description=false
 org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
 org.eclipse.jdt.core.formatter.comment.insert_new_line_between_different_tags=do not insert
 org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert
+org.eclipse.jdt.core.formatter.comment.javadoc_do_not_separate_block_tags=false
 org.eclipse.jdt.core.formatter.comment.line_length=80
 org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true
 org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true
@@ -183,6 +189,7 @@ org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arg
 org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
 org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
 org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_permitted_types=insert
 org.eclipse.jdt.core.formatter.insert_space_after_comma_in_record_components=insert
 org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
 org.eclipse.jdt.core.formatter.insert_space_after_comma_in_switch_case_expressions=insert
@@ -274,6 +281,7 @@ org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_ar
 org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
 org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
 org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_permitted_types=do not insert
 org.eclipse.jdt.core.formatter.insert_space_before_comma_in_record_components=do not insert
 org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
 org.eclipse.jdt.core.formatter.insert_space_before_comma_in_switch_case_expressions=do not insert
@@ -357,6 +365,8 @@ org.eclipse.jdt.core.formatter.keep_simple_do_while_body_on_same_line=false
 org.eclipse.jdt.core.formatter.keep_simple_for_body_on_same_line=false
 org.eclipse.jdt.core.formatter.keep_simple_getter_setter_on_one_line=false
 org.eclipse.jdt.core.formatter.keep_simple_while_body_on_same_line=false
+org.eclipse.jdt.core.formatter.keep_switch_body_block_on_one_line=one_line_never
+org.eclipse.jdt.core.formatter.keep_switch_case_with_arrow_on_one_line=one_line_never
 org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
 org.eclipse.jdt.core.formatter.keep_type_declaration_on_one_line=one_line_never
 org.eclipse.jdt.core.formatter.lineSplit=200
@@ -397,5 +407,6 @@ org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true
 org.eclipse.jdt.core.formatter.wrap_before_relational_operator=true
 org.eclipse.jdt.core.formatter.wrap_before_shift_operator=true
 org.eclipse.jdt.core.formatter.wrap_before_string_concatenation=true
+org.eclipse.jdt.core.formatter.wrap_before_switch_case_arrow_operator=false
 org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true
 org.eclipse.jdt.core.javaFormatter=org.eclipse.jdt.core.defaultJavaFormatter

.settings/org.eclipse.jdt.ui.prefs

@@ -136,7 +136,7 @@ cleanup_settings_version=2
 eclipse.preferences.version=1
 editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
 formatter_profile=_StatoolInfos
-formatter_settings_version=21
+formatter_settings_version=23
 jautodoc.cleanup.add_header=false
 jautodoc.cleanup.javadoc=false
 jautodoc.cleanup.replace_header=false

.settings/org.eclipse.ltk.core.refactoring.prefs

@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+org.eclipse.ltk.core.refactoring.enable.project.refactoring.history=false

.settings/org.eclipse.wst.common.component

@@ -1,39 +1,35 @@
 <?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
-                    
+                        
+    
     
     
     
     <wb-module deploy-name="JugaWeb">
-                
+                        
+        
         <wb-resource deploy-path="/WEB-INF/classes" source-path="/test"/>
-                
+                        
+        
         <wb-resource deploy-path="/WEB-INF/classes" source-path="/src"/>
-                
+                        
+        
         <wb-resource deploy-path="/" source-path="/webapp"/>
-                                
-        
-        
-        <dependent-module archiveName="kiss4web.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/kiss4web/kiss4web">
                                                 
-            
-            
-            <dependency-type>uses</dependency-type>
-                                            
         
         
-        </dependent-module>
-                                        
-        
         
         
         <property name="java-output-path" value="/JugaWeb/build/classes"/>
+                
         <property name="context-root" value="StatoolInfosWeb"/>
-                                    
+                                            
+    
     
     
     
     </wb-module>
-                
+                    
+
 
 
 

.settings/org.eclipse.wst.common.project.facet.core.xml

@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <faceted-project>
-  <runtime name="Apache Tomcat v9.0.46"/>
+  <runtime name="apache-tomcat-10.1.12"/>
   <fixed facet="wst.jsdt.web"/>
   <fixed facet="java"/>
   <fixed facet="jst.web"/>
-  <installed facet="java" version="11"/>
   <installed facet="jst.web" version="4.0"/>
   <installed facet="wst.jsdt.web" version="1.0"/>
+  <installed facet="java" version="17"/>
 </faceted-project>

build-appjar.xml

@@ -0,0 +1,177 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<project default="main" name="Build-appjar">
+	<!--ANT 1.7 is required                                        -->
+	<property name="buildjar.version" value="1.8" />
+	<property file="build.properties" />
+	<property name="build.dir" value="${basedir}/build" />
+	<property name="build.src" value="${basedir}/src" />
+	<property name="build.classes" value="${build.dir}/classes" />
+	<property name="build.javadoc" value="${build.dir}/javadoc" />
+	<property name="test.src" value="${basedir}/test" />
+	<property name="test.classes" value="${build.dir}/test-classes" />
+	<property name="debug" value="on" />
+    <path id="project.libs">
+        <fileset dir="${basedir}/lib" includes="**/*.jar" excludes="*sources* *src*" />
+        <!--fileset dir="${basedir}/lib/Logs" includes="**.jar" excludes="*sources* *src*" /-->
+    </path>
+
+	<property name="classpath.absolute" value="${toString:project.libs}" />
+    <manifestclasspath property="classpath.relative" jarfile="statoolinfos.jar">
+        <classpath refid="project.libs" />
+    </manifestclasspath>
+
+	<!-- ***** Main ***** -->
+    <target name="main" description="Manage distribution build" depends="dist, clean">
+        <echo>Done.</echo>
+    </target>
+    
+	<!-- ***** Help ***** --> 
+    <target name="help" description="Display detailed usage information">
+    	<echo>Type ant -p</echo>
+    </target> 
+
+	<!-- ***** Clear ***** -->
+	<target name="clear" description="Clear temporary directories before work">
+		<delete dir="${build.dir}" />
+	</target>
+	
+	<!-- ***** Clean ***** -->
+    <target name="clean" description="Clear temporary directories after work">
+        <delete dir="${build.dir}" />
+    </target>
+
+	<!-- ***** Compile ***** -->
+    <target name="compile" description="Compile project">
+		<delete dir="${build.classes}" />
+		<mkdir dir="${build.classes}" />
+        <echo>classpath=${toString:project.libs}</echo>
+        <javac srcdir="${build.src}" destdir="${build.classes}" classpath="${toString:project.libs}" debug="${debug}"  deprecation="on" includeantruntime="no" />
+    </target>
+
+	<!-- ***** copy stuff ***** -->
+    <target name="copysourcestuff" description="Copy source files other than Java">
+		<copy todir="${build.classes}">
+			<fileset dir="${build.src}" excludes="**/*.java" />
+		</copy>
+    </target>
+    
+	<!-- ***** JavaDoc ***** -->
+	<target name="javadoc" description="Javadoc construction">
+		<javadoc sourcepath="${build.src}" destdir="${build.javadoc}">
+			<classpath>
+				<fileset dir="lib" includes="**/*.jar" />
+			</classpath>
+		</javadoc>
+	</target>
+	
+	<!-- ***** Dist ***** -->
+    <target name="dist" description="Build distribution directory" depends="clear,compile,copysourcestuff,javadoc">
+        <!--echo message="==========>Build Classpath: ${classpath.absolute}" /-->
+        <!--echo message="==========>Manifest Classpath: ${classpath.relative}" /-->
+
+    	<!-- AUTOMATIC MANAGEMENT -->
+        <buildnumber file="build.num" description="Id of the build"/>
+        <property name="dist.version" value="${product.revision.major}.${product.revision.minor}.${build.number}${dist.snapshot}" />
+        <property name="dist.name" value="${product.name}-${dist.version}" />
+        <property name="dist.dir" value="${basedir}/dist/${product.name}-${dist.version}" />
+        <tstamp>
+            <format property="dist.time" pattern="dd/MM/yyyy HH:mm:ss" />
+        </tstamp>
+    
+    	<!-- -->
+        <delete dir="${dist.dir}" />
+        <mkdir dir="${dist.dir}"/>
+
+        <!-- Update build_information.properties file -->
+        <property name="build.information.file" value="${build.classes}/fr/devinsy/statoolinfos/build_information.properties" />
+        <propertyfile file="${build.information.file}" >
+            <entry  key="product.name" value="${product.name}"/>
+            <entry  key="product.revision.major" value="${product.revision.major}"/>
+            <entry  key="product.revision.minor" value="${product.revision.minor}"/>
+            <entry  key="product.revision.build" value="${build.number}"/>
+        	<entry  key="product.revision.snapshot" value="${dist.snapshot}"/>
+            <entry  key="product.revision.date" type="date" value="now"/>
+            <entry  key="product.revision.generator" value="Ant"/>
+            <entry  key="product.revision.author" value="${user.name}"/>
+        </propertyfile>
+
+
+    	<!-- Build the jar file list. -->
+		<!-- Package jar -->
+		<property name="dist.jar" value="${dist.dir}/${product.name}.jar" />
+		<jar destfile="${dist.jar}">
+			<restrict>
+			     <name regex=".*/*\.(class|gif|ico|jpg|ngp|png|pom|properties|svg@|xml|xsd)"/>
+			     <archives>
+			     	<zips>
+			            <fileset dir="${basedir}/lib" includes="**/*.jar" excludes="*sources* *src*" />
+			     	</zips>
+			     </archives>
+			</restrict>
+			<manifest>
+				<attribute name="Built-By" value="${user.name} using ant" />
+				<attribute name="Built-Date" value="${dist.time}" />
+  		        <attribute name="Main-Class" value = "fr.devinsy.statoolinfos.StatoolInfosLauncher"/>
+			</manifest>
+			<fileset dir="${build.classes}" />
+            <!--zipfileset dir="${basedir}/lib" includes="${toString:project.libs}" /-->
+		</jar>
+    	
+		<!-- Package sources -->
+		<property name="dist.srczip" value="${dist.dir}/${dist.name}-sources.zip" />
+		<zip destfile="${dist.srczip}" update="true" preserve0permissions="true">
+			<fileset dir="${build.src}" />
+			<zipfileset dir="${basedir}/" includes="LICENSE" />
+		</zip>
+
+		<!-- Package Javadoc -->
+		<property name="dist.javadoc.zip" value="${dist.dir}/${dist.name}-javadoc.zip" />
+		<zip destfile="${dist.javadoc.zip}" update="true">
+			<fileset dir="${build.javadoc}" />
+			<zipfileset dir="${basedir}/" includes="LICENSE" />
+		</zip>
+
+			
+	    <!-- Copy stuff -->
+        <copy file="resources/scripts/${product.name}.sh" todir="${dist.dir}/" overwrite="true" />
+        <chmod file="${dist.dir}/${product.name}.sh" perm="ugo+rx" />
+		<copy file="LICENSE" todir="${dist.dir}/" overwrite="true" failonerror="false" />
+		<copy file="README" todir="${dist.dir}/" overwrite="true" failonerror="false" />
+		<copy file="README.md" todir="${dist.dir}/" overwrite="true" failonerror="false" />
+        <!--copy file="scripts/log4j.properties" todir="${dist.dir}/" overwrite="true" /-->
+    	
+        <mkdir dir="${dist.dir}/conf" />
+		<copy todir="${dist.dir}/conf">
+			<fileset dir="${basedir}/resources/conf" includes="*" />
+		</copy>
+        <!--
+        <mkdir dir="${dist.dir}/man"/>
+		<copy todir="${dist.dir}/man">
+			<fileset dir="${basedir}/resources/man" includes="*" />
+		</copy>
+        -->
+    	
+    	<delete file="${build.information.file}" />
+    </target>
+	
+	<!-- ***** Build and GIT ***** -->
+	<target name="buildandgit" depends="dist,clean">
+		<echo message="Commit build.num" />
+		<exec executable="git" outputproperty="git.commit.out" failifexecutionfails="true">
+			<arg line="commit -m 'Build ${dist.version}' build.num" />
+		</exec>
+		<echo message="${git.commit.out}" />
+
+		<echo message="Tag" />
+		<exec executable="git" outputproperty="git.tag.out" failifexecutionfails="true">
+			<arg line="tag -a ${dist.version} -m 'Build ${dist.version}'" />
+		</exec>
+		<echo message="${git.tag.out}" />
+
+		<echo message="Push" />
+		<exec executable="git" outputproperty="git.push.out" failifexecutionfails="true">
+			<arg line="push --follow-tags" />
+		</exec>
+		<echo message="${git.push.out}" />
+	</target>
+</project>

build-local.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<project default="dist" name="Build">
+	<!-- -->
+	<import file="build-appjar.xml" />
+	<property name="dist.snapshot" value="" />
+</project>

build-snapshot.xml

@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<project default="snapshot" name="Build Snapshot">
+	<!-- -->
+	<import file="build-appjar.xml" />
+	<property name="buildnum.file" value="${basedir}/build.num" />
+	<property name="buildnum.tmpfile" value="${basedir}/build.num.tmp" />
+	<tstamp>
+    	<format property="dist.snapshot.number" pattern="yyyyMMddHHmmss" />
+	</tstamp>
+	<property name="dist.snapshot" value="-SNAPSHOT_${dist.snapshot.number}" />
+	
+	<!-- ***** Store ***** -->
+    <target name="store" description="Store the build number version">
+    	<copy file="${buildnum.file}" tofile="${buildnum.tmpfile}" overwrite="true" />
+    </target>
+    	
+	<!-- ***** Restore ***** -->
+    <target name="restore" description="Restore the build number version">
+    	<copy file="${buildnum.tmpfile}" tofile="${buildnum.file}" overwrite="true" />
+    	<delete file="${buildnum.tmpfile}" />
+	</target>
+
+	<!-- ***** Snapshot ***** -->
+    <target name="snapshot" description="Build a snapshot" depends="store,dist,restore">
+    </target>
+	
+</project>

build-tagandpush.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<project default="buildandgit" name="BuildAndGit">
+	<!-- -->
+	<import file="build-appjar.xml" />
+	<property name="dist.snapshot" value="" />
+</project>

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
+
+

build.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<project default="dist-top" name="Libre-service.eu">
+	<!-- -->
+	<import file="buildwar.xml" />
+
+	<!-- -->
+	<target name="dist-top" description="Build distribution" depends="dist">
+	</target>
+</project>

buildandgit.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<project default="buildandgit" name="Kiwa">
+	<!-- -->
+	<import file="buildwar.xml" />
+</project>

buildjar.xml

@@ -0,0 +1,151 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<project default="dist" name="jarbuild">
+	<!--ANT 1.7 is required -->
+	<property name="buildjar.version" value="1.4" />
+	<property file="build.properties" />
+	<property name="build.dir" value="${basedir}/build" />
+	<property name="build.src" value="${basedir}/src" />
+	<property name="build.classes" value="${build.dir}/classes" />
+	<property name="build.javadoc" value="${build.dir}/javadoc" />
+	<property name="test.src" value="${basedir}/test" />
+	<property name="test.classes" value="${build.dir}/test-classes" />
+	<property name="debug" value="on" />
+
+	<path id="build.classpath">
+		<fileset dir="lib" includes="**/*.jar" />
+	</path>
+
+	<path id="test.classpath.compile">
+		<path refid="build.classpath" />
+		<pathelement path="${build.classes}" />
+	</path>
+
+	<path id="test.classpath.run">
+		<path refid="test.classpath.compile" />
+		<pathelement path="${test.classes}" />
+	</path>
+
+
+	<!-- ***** Help ***** -->
+	<target name="help" description="Display detailed usage information">
+		<echo>Type ant -p</echo>
+	</target>
+
+	<!-- ***** Clean ***** -->
+	<target name="clean" description="Clean temporary directories">
+		<delete dir="${build.dir}" />
+	</target>
+
+	<!-- ***** Compile ***** -->
+	<target name="compile" description="Compile main code">
+		<mkdir dir="${build.dir}/classes" />
+		<javac srcdir="${build.src}" destdir="${build.classes}" debug="${debug}" deprecation="on" includeantruntime="false">
+			<classpath refid="test.classpath.compile" />
+		</javac>
+	</target>
+
+	<!-- ***** Compile test ***** -->
+	<target name="compile-test" description="Compile test code">
+		<mkdir dir="${test.classes}" />
+		<javac srcdir="${test.src}" destdir="${test.classes}" debug="${debug}" deprecation="on" includeantruntime="false">
+			<classpath refid="test.classpath.compile" />
+		</javac>
+	</target>
+
+
+	<!-- ***** Test ***** -->
+	<target name="test" description="Run unit tests" depends="clean,compile,compile-test">
+		<mkdir dir="${build.dir}/test-reports" />
+		<junit printsummary="yes" haltonfailure="no">
+			<classpath refid="test.classpath.run" />
+			<formatter type="plain" usefile="true" />
+			<batchtest fork="yes" todir="${build.dir}/test-reports/">
+				<fileset dir="test">
+					<include name="**/*Test.java" />
+				</fileset>
+			</batchtest>
+		</junit>
+	</target>
+
+	<!-- ***** JavaDoc ***** -->
+	<target name="javadoc" description="Javadoc construction">
+		<javadoc sourcepath="${build.src}" destdir="${build.javadoc}">
+			<classpath>
+				<fileset dir="lib" includes="**/*.jar" />
+			</classpath>
+		</javadoc>
+	</target>
+
+	<!-- ***** Dist ***** -->
+	<target name="dist" description="Build distribution" depends="clean,compile,javadoc">
+		<!-- -->
+		<buildnumber file="build.num" description="Id of the build" />
+		<!-- AUTOMATIC MANAGEMENT -->
+		<property name="dist.version" value="${product.revision.major}.${product.revision.minor}.${build.number}" />
+		<property name="dist.name" value="${product.name}-${dist.version}" />
+		<property name="dist.dir" value="${basedir}/dist/${dist.name}" />
+
+		<!-- -->
+		<mkdir dir="${dist.dir}" />
+
+		<!-- -->
+		<copy file="LICENSE" todir="${dist.dir}/" overwrite="true" />
+
+		<!-- Package main -->
+		<property name="dist.jar" value="${dist.dir}/${dist.name}.jar" />
+		<tstamp>
+			<format property="dist.time" pattern="dd/MM/yyyy HH:mm:ss" />
+			<!-- TODAY -->
+		</tstamp>
+		<jar destfile="${dist.jar}">
+			<manifest>
+				<attribute name="Built-By" value="${user.name} using ant" />
+				<attribute name="Built-Date" value="${dist.time}" />
+			</manifest>
+			<fileset dir="${build.classes}" />
+			<zipfileset dir="${basedir}/" includes="LICENSE" />
+		</jar>
+
+		<!-- Package sources -->
+		<property name="dist.srczip" value="${dist.dir}/${dist.name}-sources.zip" />
+		<zip destfile="${dist.srczip}" update="true" preserve0permissions="true">
+			<fileset dir="${basedir}/src" />
+			<zipfileset dir="${basedir}/" includes="LICENSE" />
+		</zip>
+
+		<!-- Package Javadoc -->
+		<property name="dist.javadoc.zip" value="${dist.dir}/${dist.name}-javadoc.zip" />
+		<zip destfile="${dist.javadoc.zip}" update="true" preserve0permissions="true">
+			<fileset dir="${build.javadoc}" />
+			<zipfileset dir="${basedir}/" includes="LICENSE" />
+		</zip>
+
+		<!-- Package lib -->
+		<copy todir="${dist.dir}/lib" overwrite="true">
+			<fileset dir="lib" excludes="hamcrest-core*,junit*" />
+		</copy>
+	</target>
+	
+	<!-- ***** Dist ***** -->
+	<target name="buildandgit" depends="dist">
+		<!-- GIT actions-->
+        <echo message="Commit build.num"/>
+        <exec executable="git" outputproperty="git.commit.out" failifexecutionfails="true">
+                <arg line="commit -m 'Build ${dist.version}' build.num"/>
+        </exec>
+		<echo message="${git.commit.out}" />
+		
+        <echo message="Tag"/>
+        <exec executable="git" outputproperty="git.tag.out" failifexecutionfails="true">
+                <arg line="tag -a ${dist.version} -m 'Build ${dist.version}'"/>
+        </exec>
+		<echo message="${git.tag.out}" />
+		
+        <echo message="Push"/>
+        <exec executable="git" outputproperty="git.push.out" failifexecutionfails="true">
+                <arg line="push --follow-tags"/>
+        </exec>
+		<echo message="${git.push.out}" />
+	</target>
+
+</project>

buildwar.xml

@@ -0,0 +1,196 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<project default="dist" name="warbuild">
+	<!--ANT 1.7 is required -->
+	<property name="builwjar.version" value="1.3" />
+	<property file="src/build_information.properties" />
+	<property name="build.dir" value="${basedir}/build.tmp" />
+	<property name="build.src" value="${basedir}/src" />
+	<property name="build.web" value="${basedir}/WebContent" />
+	<property name="build.classes" value="${build.dir}/classes" />
+	<property name="build.javadoc" value="${build.dir}/javadoc" />
+	<property name="lib.dir" value="${basedir}/WebContent/WEB-INF/lib" />
+	<property name="test.src" value="${basedir}/test" />
+	<property name="test.classes" value="${build.dir}/test-classes" />
+	<property name="debug" value="on" />
+
+	<path id="build.classpath">
+		<fileset dir="${lib.dir}" includes="**/*.jar" />
+		<fileset dir="resources/extra-jars" includes="**/*.jar" />
+	</path>
+
+	<path id="test.classpath.compile">
+		<path refid="build.classpath" />
+		<pathelement path="${build.classes}" />
+	</path>
+
+	<path id="test.classpath.run">
+		<path refid="test.classpath.compile" />
+		<pathelement path="${test.classes}" />
+	</path>
+
+
+	<!-- ***** Help ***** -->
+	<target name="help" description="Display detailed usage information">
+		<echo>Type ant -p</echo>
+	</target>
+
+	<!-- ***** Clean ***** -->
+	<target name="clean" description="Clean temporary directories">
+		<delete dir="${build.dir}" />
+	</target>
+
+	<!-- ***** Compile ***** -->
+	<target name="compile" description="Compile main code">
+		<mkdir dir="${build.dir}/classes" />
+		<javac srcdir="${build.src}" destdir="${build.classes}" debug="${debug}" deprecation="on" includeantruntime="false">
+			<classpath refid="test.classpath.compile" />
+		</javac>
+	</target>
+
+	<!-- ***** Compile test ***** -->
+	<target name="compile-test" description="Compile test code">
+		<mkdir dir="${test.classes}" />
+		<javac srcdir="${test.src}" destdir="${test.classes}" debug="${debug}" deprecation="on" includeantruntime="false">
+			<classpath refid="test.classpath.compile" />
+		</javac>
+	</target>
+
+
+	<!-- ***** Run test ***** -->
+	<target name="test" description="Run unit tests" depends="clean,compile,compile-test">
+		<mkdir dir="${build.dir}/test-reports" />
+		<junit printsummary="yes" haltonfailure="no">
+			<classpath refid="test.classpath.run" />
+			<formatter type="plain" usefile="true" />
+			<batchtest fork="yes" todir="${build.dir}/test-reports/">
+				<fileset dir="test">
+					<include name="**/*Test.java" />
+				</fileset>
+			</batchtest>
+		</junit>
+	</target>
+
+	<!-- ***** JavaDoc ***** -->
+	<target name="javadoc" description="Javadoc construction">
+		<javadoc sourcepath="${build.src}" destdir="${build.javadoc}">
+			<classpath>
+				<fileset dir="${lib.dir}" includes="**/*.jar" excludes="*source* *src*" />
+				<fileset dir="resources/extra-jars" includes="**/*.jar" excludes="*source* *src*" />
+	 		</classpath>
+		</javadoc>
+	</target>
+
+	
+	<!-- ***** Dist ***** -->
+	<target name="dist" description="Build distribution" depends="clean,compile,javadoc">
+		<!-- Copy source resources -->
+		<copy todir="${build.classes}/">
+			<fileset dir="${build.src}" excludes="**/*.java" />  
+		</copy>
+		
+		<!-- -->
+		<buildnumber file="build.num" description="Id of the build" />
+		<!-- AUTOMATIC MANAGEMENT -->
+		<property name="dist.version" value="${product.revision.major}.${product.revision.minor}.${build.number}${product.revision.alpha}" />
+		<property name="dist.name" value="${product.name}-${dist.version}" />
+		<property name="dist.dir" value="${basedir}/dist/${dist.name}" />
+
+		<!-- -->
+		<mkdir dir="${dist.dir}" />
+
+		<!-- -->
+		<copy file="LICENSE" todir="${dist.dir}/" overwrite="true" />
+
+		
+		<!-- Update build_information.properties file -->
+		<propertyfile file="${build.classes}/build_information.properties" >
+			<entry  key="product.name" value="${product.name}"/>
+			<entry  key="product.revision.major" value="${product.revision.major}"/>
+			<entry  key="product.revision.minor" value="${product.revision.minor}"/>
+			<entry  key="product.revision.build" value="${build.number}${product.revision.alpha}"/>
+			<entry  key="product.revision.date" type="date" value="now"/>
+			<entry  key="product.revision.generator" value="Ant"/>
+			<entry  key="product.revision.author" value="${user.name}"/>
+		</propertyfile>
+
+		
+		<!-- Package war -->
+		<!-- property name="dist.war" value="${dist.dir}/${dist.name}.war" /-->
+		<property name="dist.war" value="${dist.dir}/${product.name}.war" />
+		<tstamp>
+			 <!-- TODAY -->
+			<format property="dist.time" pattern="dd/MM/yyyy HH:mm:ss" />
+		</tstamp>
+		<war destfile="${dist.war}" webxml="WebContent/WEB-INF/web.xml">
+			<manifest>
+				<attribute name="Built-By" value="${user.name} using ant" />
+				<attribute name="Built-Date" value="${dist.time}" />
+			</manifest>
+			<classes dir="${build.classes}" />
+			<fileset dir="${build.web}">
+				<!-- Need to exclude it since webxml is an attribute of the war tag above. -->
+				<!--exclude name="WEB-INF/web.xml" /-->
+				<!-- Need to exclude it since environment configuration is made in $CATALINA_BASE/conf/Catalina/localhost/ folder. -->
+				<exclude name="META-INF/context.xml" />
+			</fileset>
+			<zipfileset dir="${basedir}/" includes="LICENSE" />
+		</war>
+
+		<!-- Copy resources -->
+		<copy todir="${dist.dir}/">
+			<fileset dir="${basedir}/resources" />  
+		</copy>
+
+		
+		<!-- Package sources -->
+		<property name="dist.srczip" value="${dist.dir}/${dist.name}-sources.zip" />
+		<zip destfile="${dist.srczip}" update="true" preserve0permissions="true">
+			<fileset dir="${basedir}/src" />
+			<zipfileset dir="${basedir}/" includes="LICENSE" />
+		</zip>
+
+		<!-- Package Javadoc -->
+		<property name="dist.javadoc.zip" value="${dist.dir}/${dist.name}-javadoc.zip" />
+		<zip destfile="${dist.javadoc.zip}" update="true" preserve0permissions="true">
+			<fileset dir="${build.javadoc}" />
+			<zipfileset dir="${basedir}/" includes="LICENSE" />
+		</zip>
+		
+		<!-- Clean -->
+		<delete dir="${build.dir}" />
+	</target>
+	
+	<!-- ***** Dist ***** -->
+	<target name="buildandgit" depends="dist">
+		<!-- GIT actions-->
+        <echo message="Commit build.num"/>
+        <exec executable="git" outputproperty="git.commit.out" failifexecutionfails="true">
+                <arg line="commit -m 'Build ${dist.version}' build.num"/>
+        </exec>
+		<echo message="${git.commit.out}" />
+		
+		
+        <echo message="Tag"/>
+        <exec executable="git" outputproperty="git.tag.out" failifexecutionfails="true">
+                <arg line="tag -a ${dist.version} -m 'Build ${dist.version}'"/>
+        </exec>
+		<echo message="${git.tag.out}" />
+
+        <echo message="Push"/>
+        <exec executable="git" outputproperty="git.push.out" failifexecutionfails="true">
+                <arg line="push --follow-tags"/>
+        </exec>
+		<echo message="${git.push.out}" />
+	</target>
+
+	
+	<!-- ***** Dist ***** -->
+	<target name="testgit">
+		<echo message="testgit" />
+        <exec executable="git" outputproperty="git.out" failifexecutionfails="true">
+                <arg value="version"/>
+        </exec>
+		<echo message="${git.out}" />
+	</target>
+
+</project>

notes

@@ -0,0 +1,2 @@
+
+Build par export

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
+

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

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

src/eu/libreservice/www/LibreServiceEuWeb.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021 Christian Pierre MOMON <christian@momon.org>
+ * Copyright (C) 2021-2023 Christian Pierre MOMON <christian@momon.org>
  * 
  * 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);
         }
     }
 

src/eu/libreservice/www/LibreServiceEuWebLauncher.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021 Christian Pierre MOMON <christian@momon.org>
+ * Copyright (C) 2021-2023 Christian Pierre MOMON <christian@momon.org>
  * 
  * 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 ==========");

src/website/AccueilPage.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021 Christian Pierre MOMON <christian@momon.org>
+ * Copyright (C) 2021-2023 Christian Pierre MOMON <christian@momon.org>
  * 
  * 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

src/website/AproposPage.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021 Christian Pierre MOMON <christian@momon.org>
+ * Copyright (C) 2021-2023 Christian Pierre MOMON <christian@momon.org>
  * 
  * 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

src/website/CguPage.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021 Christian Pierre MOMON <christian@momon.org>
+ * Copyright (C) 2021-2023 Christian Pierre MOMON <christian@momon.org>
  * 
  * 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

src/website/ContactPage.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021 Christian Pierre MOMON <christian@momon.org>
+ * Copyright (C) 2021-2023 Christian Pierre MOMON <christian@momon.org>
  * 
  * 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

src/website/IndexXhtml.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021 Christian Pierre MOMON <christian@momon.org>
+ * Copyright (C) 2021-2023 Christian Pierre MOMON <christian@momon.org>
  * 
  * 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

src/website/MentionsLegalesPage.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021 Christian Pierre MOMON <christian@momon.org>
+ * Copyright (C) 2021-2023 Christian Pierre MOMON <christian@momon.org>
  * 
  * 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

src/website/RegistreModerationPage.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021 Christian Pierre MOMON <christian@momon.org>
+ * Copyright (C) 2021-2023 Christian Pierre MOMON <christian@momon.org>
  * 
  * 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

src/website/accueil.xhtml

@@ -31,27 +31,27 @@
 			<h3>Les services</h3>
 			<p><span style="display: inline-block; width: 80px;">Audio :</span>
 				<a href="https://audio.libre-service.eu/" class="button-hero-square" role="button" style="margin-right: 10px;">Utiliser</a>
-				<a href="/services/audio.xhtml" class="button-hero-square" role="button">Découvrir</a>
+				<a href="/services/audio/" class="button-hero-square" role="button">Découvrir</a>
 			</p>
 			<p><span style="display: inline-block; width: 80px;">Minetest :</span>
 				<a href="https://minetest.libre-service.eu/" class="button-hero-square" role="button" style="margin-right: 10px;">Utiliser</a>
-				<a href="/services/minetest.xhtml" class="button-hero-square" role="button">Découvrir</a>
+				<a href="/services/minetest/" class="button-hero-square" role="button">Découvrir</a>
 			</p>
 			<p><span style="display: inline-block; width: 80px;">Pad :</span>
 				<a href="https://pad.libre-service.eu/" class="button-hero-square" role="button" style="margin-right: 10px;">Utiliser</a>
-				<a href="/services/pad.xhtml" class="button-hero-square" role="button">Découvrir</a>
+				<a href="/services/pad/" class="button-hero-square" role="button">Découvrir</a>
 			</p>
 			<p><span style="display: inline-block; width: 80px;">Paste :</span>
 				<a href="https://paste.libre-service.eu/" class="button-hero-square" role="button" style="margin-right: 10px;">Utiliser</a>
-				<a href="/services/paste.xhtml" class="button-hero-square" role="button">Découvrir</a>
+				<a href="/services/paste/" class="button-hero-square" role="button">Découvrir</a>
 			</p>
 			<p><span style="display: inline-block; width: 80px;">QRcode :</span>
 				<a href="https://qrcode.libre-service.eu/" class="button-hero-square" role="button" style="margin-right: 10px;">Utiliser</a>
-				<a href="/services/qrcode.xhtml" class="button-hero-square" role="button">Découvrir</a> 
+				<a href="/services/qrcode/" class="button-hero-square" role="button">Découvrir</a> 
 			</p>
 			<p><span style="display: inline-block; width: 80px;">Visio :</span>
 				<a href="https://visio.libre-service.eu/" class="button-hero-square" role="button" style="margin-right: 10px;">Utiliser</a>
-				<a href="/services/visio.xhtml" class="button-hero-square" role="button">Découvrir</a>
+				<a href="/services/visio/" class="button-hero-square" role="button">Découvrir</a>
 			</p>
 		</div>
 	</div>
@@ -68,6 +68,12 @@
 	</div>
 	
 	<h3>Actualités</h3>
+	<p>1<sup>er</sup> janvier 2025 : Libre-service.eu vous souhaite une bonne année 2025, avec des services libres, éthiques et loyaux pour un monde numérique libérateur et émancipateur <span style="font-size: large;">🎇 🎉</span>
+	</p>
+	<p>23 décembre 2025 : Libre-service.eu vous souhaite de bonnes fêtes de fin d'année dans un monde libre, éthique et loyal <span style="font-size: x-large;">☃ 🎉</span>
+	</p>
+	<p>1<sup>er</sup> janvier 2024 : Libre-service.eu vous souhaite une bonne année 2024, avec des services libres, éthiques et loyaux pour un monde numérique libérateur et émancipateur <span style="font-size: large;">🎇 🎉</span>
+	</p>
 	<p>17 novembre 2023 : les services de Libre-service passent en IPv6&#160;&#160;<span style="font-size: large;">🦺</span>
 	</p>
 	<p>17 novembre 2023 : Libre-service déménage ses machines au Data Center Park Falkenstein de <a href="https://www.hetzner.com/?country=fr" alt="Hetzner">Hetzner</a> en Allemagne&#160;&#160;<span style="font-size: large;">🦺</span>
@@ -96,7 +102,7 @@
 	</p> 
 	<p>02 avril 2022 : visio mensuelle avec l'équipe de Libre-service.eu à 11h00 sur <a href="https://visio.libre-service.eu/contact">notre salon dédié</a>&#160;&#160;<span class="fa fa-users" style="font-size: large;"></span>
 	</p> 
-	<p>26 mars 2022 : Libre-service.eu ouvre un nouveau service de <a href="/services/pad.xhtml">traitement de texte collaboratif</a> basé sur Etherpad <span class="fa fa-gnu" style="font-size: x-large;"></span>
+	<p>26 mars 2022 : Libre-service.eu ouvre un nouveau service de <a href="/services/pad/">traitement de texte collaboratif</a> basé sur Etherpad <span class="fa fa-gnu" style="font-size: x-large;"></span>
 	</p> 
 	<p>05 mars 2022 : visio mensuelle avec l'équipe de Libre-service.eu à 11h00 sur <a href="https://visio.libre-service.eu/contact">notre salon dédié</a>&#160;&#160;<span class="fa fa-users" style="font-size: large;"></span>
 	</p> 
@@ -106,7 +112,7 @@
 	</p> 
 	<p>24 décembre 2021 : Libre-service.eu vous souhaite de bonnes fêtes de fin d'année dans un monde libre, éthique et loyal <span style="font-size: x-large;">☃ 🎉</span>
 	</p> 
-	<p>23 décembre 2021 : Libre-service.eu ouvre un nouveau service <a href="/services/minetest.xhtml">Minetest</a> basé sur Mineclone2.
+	<p>23 décembre 2021 : Libre-service.eu ouvre un nouveau service <a href="/services/minetest/">Minetest</a> basé sur Mineclone2.
 	</p> 
 	<p>21 décembre 2021 : Libre-service.eu rejoint officiellement le <a href="https://www.chatons.org/">collectif CHATONS</a> <a href="https://www.chatons.org/"><img src="/commons/logo_chatons2-128x.png" alt="Logo CHATONS" style="width: 35px; vertical-align: middle;"/></a>
 	</p> 

src/website/charter/ErrorView.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021 Christian Pierre MOMON <christian@momon.org>
+ * Copyright (C) 2021-2023 Christian Pierre MOMON <christian@momon.org>
  * 
  * 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.

src/website/charter/FatalView.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021 Christian Pierre MOMON <christian@momon.org>
+ * Copyright (C) 2021-2023 Christian Pierre MOMON <christian@momon.org>
  * 
  * 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("</body></html>");
     }
 }
-
-// ////////////////////////////////////////////////////////////////////////

src/website/charter/libreserviceeu.css

@@ -216,7 +216,7 @@ blockquote
 {
 	/* Useful with second button */
 	display:inline-block;
-	float:right;"
+	float:right;
 }
 
 .without
@@ -540,7 +540,7 @@ table > tfoot > tr.warning > th,
 table > tfoot > tr > td.warning,
 table > tfoot > tr > th.warning
 {
-    background-color: ##f58e1c;
+    background-color: #f58e1c;
 }
 
 table > thead > tr.alert > td,
@@ -666,7 +666,8 @@ table > tfoot > tr > th.danger
 
 /*******/
 
-.table_default {
+.table_default
+{
 	border-spacing:0px;
 	border-collapse:collapse;
 	width:100%;
@@ -674,8 +675,9 @@ table > tfoot > tr > th.danger
 
 .table_default > tr > th,
 .table_default > thead > tr > th,
-.table_default > tbody > tr > th {
+.table_default > tbody > tr > th
-	background-color:;
+{
+	/*background-color:;*/
 	border-collapse:collapse;
 	text-align:left;	
 	font-weight:bold;
@@ -685,12 +687,14 @@ table > tfoot > tr > th.danger
 }
 
 .table_default > tr:hover,
-.table_default > tbody > tr:hover {
+.table_default > tbody > tr:hover
+{
 	background-color:#ECECEC;
 }
 
 .table_default > tr > td,
-.table_default > tbody > tr > td {
+.table_default > tbody > tr > td
+{
 	vertical-align:top;
 	padding:5px;
 	margin-top:15px;
@@ -699,7 +703,8 @@ table > tfoot > tr > th.danger
 
 /*******/
 
-.table_classic {
+.table_classic
+{
 	border:0px;
 	width:100%;
 	margin: 0;
@@ -708,7 +713,8 @@ table > tfoot > tr > th.danger
 
 .table_classic > tr > th,
 .table_classic > thead > tr > th, 
-.table_classic > tbody > tr > th {
+.table_classic > tbody > tr > th
+{
 	background-color:#ECECEC;
 	border:1px solid #DCDCDC;
 	margin: 5px;
@@ -717,28 +723,32 @@ table > tfoot > tr > th.danger
 
 .table_classic > tr > td,
 .table_classic > tbody > tr > td,
-.table_classic > tfoot > tr > td {
+.table_classic > tfoot > tr > td
+{
 	border:1px solid #ECECEC;
 	margin: 5px;
 	padding: 5px;
 }
 
 .table_classic > tr:hover,
-.table_classic > tbody > tr:hover {
+.table_classic > tbody > tr:hover
+{
     background-color:#ECECEC;
 }
 
 
 /*******/
 
-.table_glued {
+.table_glued
+{
 	border:0px;
 	width:100%;
 	border-collapse: collapse;
 }
 
 .table_glued > tr > th,
-.table_glued > tbody > tr > th {
+.table_glued > tbody > tr > th
+{
 	background-color:#ECECEC;
 	border:0px;
 }
@@ -749,7 +759,8 @@ table > tfoot > tr > th.danger
 }
 
 /*******/
-.table_simple {
+.table_simple
+{
 	border: 0px solid red;
 	border-spacing: 0px;
 	border-collapse: collapse;
@@ -760,7 +771,8 @@ table > tfoot > tr > th.danger
 
 
 .table_simple > tr > th,
-.table_simple > tbody > tr > th {
+.table_simple > tbody > tr > th
+{
 	color: #2e2d30;
 	border: 0px none red;
 	border-collapse: collapse;
@@ -776,19 +788,22 @@ table > tfoot > tr > th.danger
 }
 
 .table_simple > tr,
-.table_simple > tbody > tr {
+.table_simple > tbody > tr
+{
 	border: 0px none red;
 	border-collapse: collapse;
 	border-spacing: 0;
 }
 
 .table_simple > tr:hover,
-.table_simple > tbody > tr:hover {
+.table_simple > tbody > tr:hover
+{
 	background-color: #d9dadb;
 }
 
 .table_simple > tr > td,
-.table_simple > tbody > tr > td {
+.table_simple > tbody > tr > td
+{
 	vertical-align: top;
 	padding-top: 3px;
 	padding-bottom: 3px;

src/website/charter/webCharterView.xhtml

@@ -28,7 +28,7 @@
 
 			<nav class="headerbox-menu">
 				<a class="headerbox-menu-button" href="/accueil.xhtml" role="button">Accueil</a>
-				<a class="headerbox-menu-button" href="/services.xhtml" role="button">Services libres</a>
+				<a class="headerbox-menu-button" href="/services/" role="button">Services libres</a>
 				<a class="headerbox-menu-button" href="/apropos.xhtml" role="button">À propos</a>
 			 	<a class="headerbox-menu-button" href="/cgu.xhtml" role="button">Conditions d’utilisation</a>
 			</nav>
@@ -110,7 +110,7 @@
 			</div>
 		</div>
 		<div class="footerbox-bottom">
-			<p>Devinsy 2021-2023 – Licence CC-BY-SA+</p>
+			<p>Devinsy 2021-2024 – Licence CC-BY-SA+</p>
 		</div>
 	</footer>
 </body>

src/website/services/IndexXhtml.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021 Christian Pierre MOMON <christian@momon.org>
+ * Copyright (C) 2021-2023 Christian Pierre MOMON <christian@momon.org>
  * 
  * This file is part of LibreServiceEUWeb, the website www.libre-service.eu.
  * 
@@ -20,33 +20,33 @@ package website.services;
 
 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;
 
 /**
  * The Class AccueilPage.
  */
-public class AudioPage extends HttpServlet
+public class IndexXhtml extends HttpServlet
 {
     private static final long serialVersionUID = -8225743451426546008L;
-    private static Logger logger = LoggerFactory.getLogger(AudioPage.class);
+    private static Logger logger = 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
     {
+        logger.debug("Services page.");
         try
         {
             // Get parameters.
@@ -59,7 +59,7 @@ public class AudioPage extends HttpServlet
             // ==============
             TagDataManager data = new TagDataManager();
 
-            String page = PresenterUtils.dynamize("/website/services/audio.xhtml", data).toString();
+            String page = PresenterUtils.dynamize("/website/services/services.xhtml", data).toString();
 
             String html = WebCharterView.build(page);
 
@@ -71,10 +71,12 @@ public class AudioPage extends HttpServlet
         {
             ErrorView.show(request, response, "Error", exception.getMessage(), null);
         }
+
+        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

src/website/services/audio/IndexXhtml.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021 Christian Pierre MOMON <christian@momon.org>
+ * Copyright (C) 2021-2023 Christian Pierre MOMON <christian@momon.org>
  * 
  * This file is part of LibreServiceEUWeb, the website www.libre-service.eu.
  * 
@@ -16,38 +16,36 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with LibreServiceEUWeb.  If not, see <http://www.gnu.org/licenses/>.
  */
-package website;
+package website.services.audio;
 
 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;
 
 /**
  * The Class AccueilPage.
  */
-public class ServicesPage extends HttpServlet
+public class IndexXhtml extends HttpServlet
 {
     private static final long serialVersionUID = -8225743451426546008L;
-    private static Logger logger = LoggerFactory.getLogger(ServicesPage.class);
+    private static Logger logger = 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
     {
-        logger.debug("Services page.");
         try
         {
             // Get parameters.
@@ -60,7 +58,7 @@ public class ServicesPage extends HttpServlet
             // ==============
             TagDataManager data = new TagDataManager();
 
-            String page = PresenterUtils.dynamize("/website/services.xhtml", data).toString();
+            String page = PresenterUtils.dynamize("/website/services/audio/audio.xhtml", data).toString();
 
             String html = WebCharterView.build(page);
 
@@ -72,12 +70,10 @@ public class ServicesPage extends HttpServlet
         {
             ErrorView.show(request, response, "Error", exception.getMessage(), null);
         }
-
-        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

src/website/services/audio/audio.xhtml

@@ -16,8 +16,8 @@
 	<h2>Description</h2>
 	<div class="clearfix">
 		<div style="float: right;">
-			<img src="/services/mumble2b.png" alt="L'interface graphique Mumble" style="height: 380px;" />
+			<img src="/services/audio/mumble2b.png" alt="L'interface graphique Mumble" style="height: 380px;" />
-			<p><img src="/services/mumble1.png" alt="Informations de connexion" style="" /></p>
+			<p><img src="/services/audio/mumble1.png" alt="Informations de connexion" style="" /></p>
 		</div>
 		<p>Audio.libre-service.eu est un service d'audio-conférence basé sur le logiciel libre <a href="https://www.mumble.info/">Mumble</a>.</p>
 		<p>Quelques caractéristiques :</p>

src/website/services/minetest/IndexXhtml.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021 Christian Pierre MOMON <christian@momon.org>
+ * Copyright (C) 2021-2023 Christian Pierre MOMON <christian@momon.org>
  * 
  * This file is part of LibreServiceEUWeb, the website www.libre-service.eu.
  * 
@@ -16,33 +16,32 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with LibreServiceEUWeb.  If not, see <http://www.gnu.org/licenses/>.
  */
-package website.services;
+package website.services.minetest;
 
 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;
 
 /**
  * The Class MinetestPage.
  */
-public class MinetestPage extends HttpServlet
+public class IndexXhtml extends HttpServlet
 {
     private static final long serialVersionUID = -8225743451426546008L;
-    private static Logger logger = LoggerFactory.getLogger(MinetestPage.class);
+    private static Logger logger = 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
@@ -59,7 +58,7 @@ public class MinetestPage extends HttpServlet
             // ==============
             TagDataManager data = new TagDataManager();
 
-            String page = PresenterUtils.dynamize("/website/services/minetest.xhtml", data).toString();
+            String page = PresenterUtils.dynamize("/website/services/minetest/minetest.xhtml", data).toString();
 
             String html = WebCharterView.build(page);
 
@@ -75,8 +74,8 @@ public class MinetestPage 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

src/website/services/minetest/minetest.xhtml

@@ -14,10 +14,10 @@
 	<h1>Le service Minetest.libre-service.eu</h1>
 
 	<div style="float: right;">
-		<img src="/services/minetest-soleil-800x.jpg" alt="Coucher de soleil dans le monde de Libremine" style="height: 200px;" /><br/>
+		<img src="/services/minetest/img-soleil-800x.jpg" alt="Coucher de soleil dans le monde de Libremine" style="height: 200px;" /><br/>
-		<img src="/services/minetest-lapin-800x.jpg" alt="Rencontre avec un lapin dans le monde de Libremine" style="height: 200px;" /><br/>
+		<img src="/services/minetest/img-lapin-800x.jpg" alt="Rencontre avec un lapin dans le monde de Libremine" style="height: 200px;" /><br/>
-		<img src="/services/minetest-vache-800x.jpg" alt="Rencontre avec une vache dans le monde de Libremine" style="height: 200px;" /><br/>
+		<img src="/services/minetest/img-vache-800x.jpg" alt="Rencontre avec une vache dans le monde de Libremine" style="height: 200px;" /><br/>
-		<img src="/services/minetest-pyramide-800x.jpg" alt="En quête d'une pyramide dans le monde de Libremine" style="height: 200px;" />
+		<img src="/services/minetest/img-pyramide-800x.jpg" alt="En quête d'une pyramide dans le monde de Libremine" style="height: 200px;" />
 	</div>
 	<h2>Description</h2>
 	<div class="clearfix">
@@ -53,6 +53,8 @@
 			<li>mot de passe : votre mot de passe</li>
 		</ul>
 		
+		<p><b>Attention : ce service n'est accessible qu'en IPv6</b>.</p>
+		
 		<h2>Les sources</h2>
 		<p>Pour Minetest, le paquet <a href="https://tracker.debian.org/pkg/minetest">Debian Stable Minetest</a> est utilisé.</p>
 		<p>Pour Mineclone2, les sources sont sur la <a href="https://git.minetest.land/MineClone2/MineClone2/">forge Minetest</a>.</p>

src/website/services/pad/IndexXhtml.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021-2022 Christian Pierre MOMON <christian@momon.org>
+ * Copyright (C) 2021-2023 Christian Pierre MOMON <christian@momon.org>
  * 
  * This file is part of LibreServiceEUWeb, the website www.libre-service.eu.
  * 
@@ -16,33 +16,32 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with LibreServiceEUWeb.  If not, see <http://www.gnu.org/licenses/>.
  */
-package website.services;
+package website.services.pad;
 
 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;
 
 /**
  * The Class PadPage.
  */
-public class PadPage extends HttpServlet
+public class IndexXhtml extends HttpServlet
 {
     private static final long serialVersionUID = -8225743451426546008L;
-    private static Logger logger = LoggerFactory.getLogger(PadPage.class);
+    private static Logger logger = 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,7 +59,7 @@ public class PadPage extends HttpServlet
             // ==============
             TagDataManager data = new TagDataManager();
 
-            String page = PresenterUtils.dynamize("/website/services/pad.xhtml", data).toString();
+            String page = PresenterUtils.dynamize("/website/services/pad/pad.xhtml", data).toString();
 
             String html = WebCharterView.build(page);
 
@@ -76,8 +75,8 @@ public class PadPage 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

src/website/services/pad/pad.xhtml

@@ -17,7 +17,7 @@
 	<div class="clearfix">
 		<p>Pad.libre-service.eu est un service de rédaction collaborative de texte basé sur le logiciel libre <a href="https://etherpad.org/">Etherpad</a>.</p>
 		<div style="float: right; margin-left: 10px;">
-			<img src="/services/etherpad_demo.gif" alt="Démonstration du service" style="width: 700px;" />
+			<img src="/services/pad/etherpad_demo.gif" alt="Démonstration du service" style="width: 700px;" />
 		</div>
 		<p>Quelques caractéristiques :</p>
 		<ul>

src/website/services/paste/IndexXhtml.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021 Christian Pierre MOMON <christian@momon.org>
+ * Copyright (C) 2021-2023 Christian Pierre MOMON <christian@momon.org>
  * 
  * This file is part of LibreServiceEUWeb, the website www.libre-service.eu.
  * 
@@ -16,33 +16,32 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with LibreServiceEUWeb.  If not, see <http://www.gnu.org/licenses/>.
  */
-package website.services;
+package website.services.paste;
 
 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;
 
 /**
  * The Class AccueilPage.
  */
-public class VisioPage extends HttpServlet
+public class IndexXhtml extends HttpServlet
 {
     private static final long serialVersionUID = -8225743451426546008L;
-    private static Logger logger = LoggerFactory.getLogger(VisioPage.class);
+    private static Logger logger = 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,7 +59,7 @@ public class VisioPage extends HttpServlet
             // ==============
             TagDataManager data = new TagDataManager();
 
-            String page = PresenterUtils.dynamize("/website/services/visio.xhtml", data).toString();
+            String page = PresenterUtils.dynamize("/website/services/paste/paste.xhtml", data).toString();
 
             String html = WebCharterView.build(page);
 
@@ -76,8 +75,8 @@ public class VisioPage 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

src/website/services/paste/paste.xhtml

@@ -16,8 +16,8 @@
 	<h2>Description</h2>
 	<div class="clearfix">
 		<div style="float: right; margin-left: 10px;">
-			<img src="/services/paste1.png" alt="Copie d'écran" style="width: 550px;" />
+			<img src="/services/paste/paste1.png" alt="Copie d'écran" style="width: 550px;" />
-			<p><img src="/services/paste2.png" alt="Copie d'écran" style="width: 550px;" /></p>
+			<p><img src="/services/paste/paste2.png" alt="Copie d'écran" style="width: 550px;" /></p>
 		</div>
 		<p>Paste.libre-service.eu est un service de transfert de texte chiffré basé sur le logiciel libre <a href="https://privatebin.info">PrivateBin</a>.</p>
 		<p>Quelques caractéristiques :</p>

src/website/services/qrcode/IndexXhtml.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021 Christian Pierre MOMON <christian@momon.org>
+ * Copyright (C) 2021-2023 Christian Pierre MOMON <christian@momon.org>
  * 
  * This file is part of LibreServiceEUWeb, the website www.libre-service.eu.
  * 
@@ -16,33 +16,32 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with LibreServiceEUWeb.  If not, see <http://www.gnu.org/licenses/>.
  */
-package website.services;
+package website.services.qrcode;
 
 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;
 
 /**
  * The Class AccueilPage.
  */
-public class PastePage extends HttpServlet
+public class IndexXhtml extends HttpServlet
 {
     private static final long serialVersionUID = -8225743451426546008L;
-    private static Logger logger = LoggerFactory.getLogger(PastePage.class);
+    private static Logger logger = 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,7 +59,7 @@ public class PastePage extends HttpServlet
             // ==============
             TagDataManager data = new TagDataManager();
 
-            String page = PresenterUtils.dynamize("/website/services/paste.xhtml", data).toString();
+            String page = PresenterUtils.dynamize("/website/services/qrcode/qrcode.xhtml", data).toString();
 
             String html = WebCharterView.build(page);
 
@@ -76,8 +75,8 @@ public class PastePage 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

src/website/services/qrcode/qrcode.xhtml

@@ -16,7 +16,7 @@
 	<h2>Description</h2>
 
 	<div class="clearfix">
-		<img src="/services/qrcode1.png" alt="Copie d'écran" style="height: 380px; float: right;" />
+		<img src="/services/qrcode/qrcode1.png" alt="Copie d'écran" style="height: 380px; float: right;" />
 		<p><a href="https://qrcode.libre-service.eu/">QRcode.libre-service.eu</a> est un service de génération de code QR basé sur le logiciel libre <a href="https://code.antopie.org/miraty/libreqr/">LibreQR</a>.</p>
 		<p>Quelques caractéristiques :</p>
 		<ul>
@@ -32,7 +32,7 @@
 		<blockquote style="width: 600px;">Un code QR, en anglais QR code, en forme longue quick response code, « code à réponse rapide », est un type de code-barres à deux dimensions (ou code matriciel) — format optique lisible par machine pouvant être visualisé sur l'écran d’un appareil mobile ou imprimé sur papier — constitué de modules-carrés noirs disposés dans un carré à fond blanc. Ces points définissent l'information que contient le code.</blockquote>
 	</div>
 	<p>Exemple de QRcode généré par le service :</p>
-	<img src="/services/qrcode2.png" alt="Copie d'écran" style="padding-left: 100px;" />
+	<img src="/services/qrcode/qrcode2.png" alt="Copie d'écran" style="padding-left: 100px;" />
 
 	<h2>Les sources</h2>
 	<p>Les codes sources du service qrcode.libre-service.eu sont disponibles sur <a href="https://forge.devinsy.fr/explore/repos?q=qrcode.libre-service.eu">notre forge</a>.</p>

src/website/services/services.xhtml

@@ -14,24 +14,28 @@
 	<h1>Les services</h1>
 	<p>Liste de tous les services proposés par Libre-service.eu :</p>
 	<div style="display: inline-block; vertical-align: top; margin-right: 40px;">
-		<h3><a href="/services/audio.xhtml">Audio.libre-service.eu</a></h3>
+		<h3><a href="./audio/">Audio.libre-service.eu</a></h3>
-		<img src="/services/mumble2b.png" alt="Copie d'écran de audio.libre-service.eu" style="width: 400px; margin-right: 40px; margin-bottom: 40px;" />
+		<img src="./audio/mumble2b.png" alt="Copie d'écran de audio.libre-service.eu" style="width: 400px; margin-right: 40px; margin-bottom: 40px;" />
 	</div>
 	<div style="display: inline-block; vertical-align: top; margin-right: 40px;">
-		<h3><a href="/services/qrcode.xhtml">QRcode.libre-service.eu</a></h3>
+		<h3><a href="./qrcode/">QRcode.libre-service.eu</a></h3>
-		<img src="/services/qrcode00.png" alt="Copie d'écran de qrcode.libre-service.eu" style="width: 400px; margin-right: 40px; margin-bottom: 40px;" />
+		<img src="./qrcode/qrcode00.png" alt="Copie d'écran de qrcode.libre-service.eu" style="width: 400px; margin-right: 40px; margin-bottom: 40px;" />
 	</div>
 	<div style="display: inline-block; vertical-align: top; margin-right: 40px;">
-		<h3><a href="/services/paste.xhtml">Paste.libre-service.eu</a></h3>
+		<h3><a href="./paste/">Paste.libre-service.eu</a></h3>
-		<img src="/services/paste00.png" alt="Copie d'écran de paste.libre-service.eu" style="width: 400px; margin-right: 40px;" />
+		<img src="./paste/paste00.png" alt="Copie d'écran de paste.libre-service.eu" style="width: 400px; margin-right: 40px;" />
 	</div>
 	<div style="display: inline-block; vertical-align: top; margin-right: 40px;">
-		<h3><a href="/services/visio.xhtml">Visio.libre-service.eu</a></h3>
+		<h3><a href="./pad/">Pad.libre-service.eu</a></h3>
-		<img src="/services/visio00.png" alt="Copie d'écran de visio.libre-service.eu" style="width: 400px; margin-right: 40px;" />
+		<img src="./pad/etherpad_demo.gif" alt="Copie d'écran de pad.libre-service.eu" style="width: 400px; margin-right: 40px;" />
 	</div>
 	<div style="display: inline-block; vertical-align: top; margin-right: 40px;">
-		<h3><a href="/services/minetest.xhtml">Minetest.libre-service.eu</a></h3>
+		<h3><a href="./minetest/">Minetest.libre-service.eu</a></h3>
-		<img src="/services/minetest-pyramide-800x.jpg" alt="Copie d'écran de minetest.libre-service.eu" style="width: 400px; margin-right: 40px;" />
+		<img src="./minetest/img-pyramide-800x.jpg" alt="Copie d'écran de minetest.libre-service.eu" style="width: 400px; margin-right: 40px;" />
+	</div>
+	<div style="display: inline-block; vertical-align: top; margin-right: 40px;">
+		<h3><a href="./visio/">Visio.libre-service.eu</a></h3>
+		<img src="./visio/visio00.png" alt="Copie d'écran de visio.libre-service.eu" style="width: 400px; margin-right: 40px;" />
 	</div>
 </body>
 </html>

src/website/services/visio/IndexXhtml.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021 Christian Pierre MOMON <christian@momon.org>
+ * Copyright (C) 2021-2023 Christian Pierre MOMON <christian@momon.org>
  * 
  * This file is part of LibreServiceEUWeb, the website www.libre-service.eu.
  * 
@@ -16,33 +16,32 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with LibreServiceEUWeb.  If not, see <http://www.gnu.org/licenses/>.
  */
-package website.services;
+package website.services.visio;
 
 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;
 
 /**
  * The Class AccueilPage.
  */
-public class QrcodePage extends HttpServlet
+public class IndexXhtml extends HttpServlet
 {
     private static final long serialVersionUID = -8225743451426546008L;
-    private static Logger logger = LoggerFactory.getLogger(QrcodePage.class);
+    private static Logger logger = 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,7 +59,7 @@ public class QrcodePage extends HttpServlet
             // ==============
             TagDataManager data = new TagDataManager();
 
-            String page = PresenterUtils.dynamize("/website/services/qrcode.xhtml", data).toString();
+            String page = PresenterUtils.dynamize("/website/services/visio/visio.xhtml", data).toString();
 
             String html = WebCharterView.build(page);
 
@@ -76,8 +75,8 @@ public class QrcodePage 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

src/website/services/visio/visio.xhtml

@@ -16,7 +16,7 @@
 	<h2>Description</h2>
 	<div class="clearfix">
 		<div style="float: right; margin-left: 10px;">
-			<img src="/services/visio1.png" alt="Copie d'écran" style="width: 500px;" />
+			<img src="/services/visio/visio1.png" alt="Copie d'écran" style="width: 500px;" />
 		</div>
 		<p>Visio.libre-service.eu est un service de visio-conférence basé sur le logiciel libre <a href="https://jitsi.org/">Jitsi Meet</a>.</p>
 		<p>À la fois professionnel et très simple d'utilisation, c'est un logiciel reconnu et à utiliser sans réserve.</p>
@@ -39,10 +39,10 @@
 	
 	Quelques copies d'écran pour découvrir la richesse de l'outil et vous donnez envie de l'utiliser !
 	<p>
-		<img src="/services/visio-chat.png" alt="Le chat" style="width: 450px;" />
+		<img src="/services/visio/visio-chat.png" alt="Le chat" style="width: 450px;" />
-		<img src="/services/visio-options.png" alt="Les options" style="width: 450px;" />
+		<img src="/services/visio/visio-options.png" alt="Les options" style="width: 450px;" />
-		<img src="/services/visio-sondage.png" alt="Un sondage" style="width: 450px;" />
+		<img src="/services/visio/visio-sondage.png" alt="Un sondage" style="width: 450px;" />
-		<img src="/services/visio-moderation.png" alt="La modératoin" style="width: 450px;" />
+		<img src="/services/visio/visio-moderation.png" alt="La modératoin" style="width: 450px;" />
 	</p>
 
 	<h2>Les sources</h2>

webapp/META-INF/context.xml

@@ -49,7 +49,7 @@
   	<Environment name="kiss4web.website.url" value="http://localhost:8080/" type="java.lang.String" override="true"/>
 
 	<!-- Define where is the log4file. -->
-  	<Environment name="kiss4web.log4j.path" value="WEB-INF/log4j2.properties" type="java.lang.String" override="true"/>
+  	<Environment name="kiss4web.log4j2.path" value="WEB-INF/log4j2.properties" type="java.lang.String" override="true"/>
 
 	<!-- Define where is the LibreServiceEUWEb configuration file. -->
   	<Environment name="libreserviceeusweb.configuration.file" value="/home/cpm/Projets/Libre-service.eu/EnvTest/conf/libreserviceeu.conf" type="java.lang.String" override="true"/>

webapp/WEB-INF/log4j2.properties

@@ -1,10 +1,10 @@
 # Log configuration 
 # #################
 
-# priority setting: DEBUG < INFO < WARN < ERROR
+# priority setting: TRACE < DEBUG < INFO < WARN < ERROR
-dest = err
 name = Log4j2PropertiesConfig
-status = TRACE
+status = ERROR
+dest = err
 
 # Appenders settings.
 appenders = console, logfile
@@ -12,14 +12,14 @@ appenders = console, logfile
 appender.console.type = Console
 appender.console.name = LogToConsole
 appender.console.layout.type = PatternLayout
-appender.console.layout.pattern = %d{ISO8601} - LibreServiceEuWeb [%-5p] %34.34c.%25M %t - %m%n
+appender.console.layout.pattern = %d{ISO8601} - LSEUWeb [%-5p] %34.34c.%25M %t - %m%n
 
 appender.logfile.type = RollingFile
 appender.logfile.name = LibreServiceEUWeb
-appender.logfile.fileName = /srv/www.libre-service.eu/libreserviceeuweb.log
+appender.logfile.fileName = /srv/www.libre-service.eu/lseuweb.log
-appender.logfile.filePattern = /srv/www.libre-service.eu/libreserviceeuweb-%i.log.gz
+appender.logfile.filePattern = /srv/www.libre-service.eu/lseuweb-%i.log.gz
 appender.logfile.layout.type = PatternLayout
-appender.logfile.layout.pattern = %d{ISO8601} - LibreServiceEuWeb [%-5p] %-50c.%30M - %m%n
+appender.logfile.layout.pattern = %d{ISO8601} - LSEUWeb [%-5p] %-50c.%30M - %m%n
 appender.logfile.policies.type = Policies
 appender.logfile.policies.size.type = SizeBasedTriggeringPolicy
 appender.logfile.policies.size.size=10MB