Migrated to Java 17 and Tomcat 10.1.
This commit is contained in:
parent
633af0b9f3
commit
a350d4bd35
47 changed files with 927 additions and 174 deletions
|
|
@ -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>
|
||||
|
|
|
|||
2
.project
2
.project
|
|
@ -1,6 +1,6 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<projectDescription>
|
||||
<name>LibreServiceEuWeb</name>
|
||||
<name>LSEUWeb</name>
|
||||
<comment></comment>
|
||||
<projects>
|
||||
<project>kiss4web</project>
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
eclipse.preferences.version=1
|
||||
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
|
||||
org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
|
||||
org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
|
||||
org.eclipse.jdt.core.compiler.codegen.targetPlatform=17
|
||||
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
|
||||
org.eclipse.jdt.core.compiler.compliance=11
|
||||
org.eclipse.jdt.core.compiler.compliance=17
|
||||
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
|
||||
org.eclipse.jdt.core.compiler.debug.localVariable=generate
|
||||
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
|
||||
|
|
@ -12,7 +12,7 @@ org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
|
|||
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
|
||||
org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
|
||||
org.eclipse.jdt.core.compiler.release=enabled
|
||||
org.eclipse.jdt.core.compiler.source=11
|
||||
org.eclipse.jdt.core.compiler.source=17
|
||||
org.eclipse.jdt.core.formatter.align_assignment_statements_on_columns=false
|
||||
org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines=2147483647
|
||||
org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
|
||||
|
|
|
|||
|
|
@ -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>
|
||||
|
|
|
|||
177
build-appjar.xml
Normal file
177
build-appjar.xml
Normal file
|
|
@ -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>
|
||||
6
build-local.xml
Normal file
6
build-local.xml
Normal file
|
|
@ -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>
|
||||
27
build-snapshot.xml
Normal file
27
build-snapshot.xml
Normal file
|
|
@ -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>
|
||||
6
build-tagandpush.xml
Normal file
6
build-tagandpush.xml
Normal file
|
|
@ -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>
|
||||
168
build.sh
Executable file
168
build.sh
Executable file
|
|
@ -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
|
||||
|
||||
|
||||
9
build.xml
Normal file
9
build.xml
Normal file
|
|
@ -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>
|
||||
5
buildandgit.xml
Normal file
5
buildandgit.xml
Normal file
|
|
@ -0,0 +1,5 @@
|
|||
<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
|
||||
<project default="buildandgit" name="Kiwa">
|
||||
<!-- -->
|
||||
<import file="buildwar.xml" />
|
||||
</project>
|
||||
151
buildjar.xml
Normal file
151
buildjar.xml
Normal file
|
|
@ -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>
|
||||
196
buildwar.xml
Normal file
196
buildwar.xml
Normal file
|
|
@ -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>
|
||||
2
notes
Normal file
2
notes
Normal file
|
|
@ -0,0 +1,2 @@
|
|||
|
||||
Build par export
|
||||
12
resources/conf/statoolinfos-sample.conf
Normal file
12
resources/conf/statoolinfos-sample.conf
Normal file
|
|
@ -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
|
||||
|
||||
3
resources/conf/statoolinfos.cron
Normal file
3
resources/conf/statoolinfos.cron
Normal file
|
|
@ -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
|
||||
10
resources/scripts/statoolinfos.sh
Executable file
10
resources/scripts/statoolinfos.sh
Executable file
|
|
@ -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
|
||||
BIN
resources/statoolinfos-logo-name.jpg
Normal file
BIN
resources/statoolinfos-logo-name.jpg
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 11 KiB |
BIN
resources/statoolinfos-logo-sans.jpg
Normal file
BIN
resources/statoolinfos-logo-sans.jpg
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 15 KiB |
BIN
resources/statoolinfos-logo.ico
Normal file
BIN
resources/statoolinfos-logo.ico
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 35 KiB |
BIN
resources/statoolinfos-logo.jpg
Normal file
BIN
resources/statoolinfos-logo.jpg
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 15 KiB |
|
|
@ -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);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -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 ==========");
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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 ServicesPage extends HttpServlet
|
|||
private static final long serialVersionUID = -8225743451426546008L;
|
||||
private static Logger logger = LoggerFactory.getLogger(ServicesPage.class);
|
||||
|
||||
/* (non-Javadoc)
|
||||
* @see javax.servlet.http.HttpServlet#doGet(javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse)
|
||||
/**
|
||||
* {@inheritDoc}
|
||||
*/
|
||||
@Override
|
||||
public void doGet(final HttpServletRequest request, final HttpServletResponse response) throws IOException, ServletException
|
||||
|
|
@ -76,8 +75,8 @@ public class ServicesPage extends HttpServlet
|
|||
logger.debug("doGet done.");
|
||||
}
|
||||
|
||||
/* (non-Javadoc)
|
||||
* @see javax.servlet.http.HttpServlet#doPost(javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse)
|
||||
/**
|
||||
* {@inheritDoc}
|
||||
*/
|
||||
@Override
|
||||
public void doPost(final HttpServletRequest request, final HttpServletResponse response) throws ServletException, IOException
|
||||
|
|
|
|||
|
|
@ -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.
|
||||
|
|
|
|||
|
|
@ -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>");
|
||||
}
|
||||
}
|
||||
|
||||
// ////////////////////////////////////////////////////////////////////////
|
||||
|
|
|
|||
|
|
@ -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.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;
|
||||
|
||||
|
|
@ -41,8 +40,8 @@ public class AudioPage extends HttpServlet
|
|||
private static final long serialVersionUID = -8225743451426546008L;
|
||||
private static Logger logger = LoggerFactory.getLogger(AudioPage.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 AudioPage 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
|
||||
|
|
|
|||
|
|
@ -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.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;
|
||||
|
||||
|
|
@ -41,8 +40,8 @@ public class MinetestPage extends HttpServlet
|
|||
private static final long serialVersionUID = -8225743451426546008L;
|
||||
private static Logger logger = LoggerFactory.getLogger(MinetestPage.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
|
||||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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.
|
||||
*
|
||||
|
|
@ -20,16 +20,15 @@ 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;
|
||||
|
||||
|
|
@ -41,8 +40,8 @@ public class PadPage extends HttpServlet
|
|||
private static final long serialVersionUID = -8225743451426546008L;
|
||||
private static Logger logger = LoggerFactory.getLogger(PadPage.class);
|
||||
|
||||
/* (non-Javadoc)
|
||||
* @see javax.servlet.http.HttpServlet#doGet(javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse)
|
||||
/**
|
||||
* {@inheritDoc}
|
||||
*/
|
||||
@Override
|
||||
public void doGet(final HttpServletRequest request, final HttpServletResponse response) throws IOException, ServletException
|
||||
|
|
@ -76,8 +75,8 @@ public class 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
|
||||
|
|
|
|||
|
|
@ -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.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;
|
||||
|
||||
|
|
@ -41,8 +40,8 @@ public class PastePage extends HttpServlet
|
|||
private static final long serialVersionUID = -8225743451426546008L;
|
||||
private static Logger logger = LoggerFactory.getLogger(PastePage.class);
|
||||
|
||||
/* (non-Javadoc)
|
||||
* @see javax.servlet.http.HttpServlet#doGet(javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse)
|
||||
/**
|
||||
* {@inheritDoc}
|
||||
*/
|
||||
@Override
|
||||
public void doGet(final HttpServletRequest request, final HttpServletResponse response) throws IOException, ServletException
|
||||
|
|
@ -76,8 +75,8 @@ public class 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
|
||||
|
|
|
|||
|
|
@ -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.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;
|
||||
|
||||
|
|
@ -41,8 +40,8 @@ public class QrcodePage extends HttpServlet
|
|||
private static final long serialVersionUID = -8225743451426546008L;
|
||||
private static Logger logger = LoggerFactory.getLogger(QrcodePage.class);
|
||||
|
||||
/* (non-Javadoc)
|
||||
* @see javax.servlet.http.HttpServlet#doGet(javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse)
|
||||
/**
|
||||
* {@inheritDoc}
|
||||
*/
|
||||
@Override
|
||||
public void doGet(final HttpServletRequest request, final HttpServletResponse response) throws IOException, ServletException
|
||||
|
|
@ -76,8 +75,8 @@ public class 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
|
||||
|
|
|
|||
|
|
@ -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.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;
|
||||
|
||||
|
|
@ -41,8 +40,8 @@ public class VisioPage extends HttpServlet
|
|||
private static final long serialVersionUID = -8225743451426546008L;
|
||||
private static Logger logger = LoggerFactory.getLogger(VisioPage.class);
|
||||
|
||||
/* (non-Javadoc)
|
||||
* @see javax.servlet.http.HttpServlet#doGet(javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse)
|
||||
/**
|
||||
* {@inheritDoc}
|
||||
*/
|
||||
@Override
|
||||
public void doGet(final HttpServletRequest request, final HttpServletResponse response) throws IOException, ServletException
|
||||
|
|
@ -76,8 +75,8 @@ public class 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
|
||||
|
|
|
|||
|
|
@ -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"/>
|
||||
|
|
|
|||
Binary file not shown.
Binary file not shown.
BIN
webapp/WEB-INF/lib/devinsy-utils-0.17.0-sources.zip
Normal file
BIN
webapp/WEB-INF/lib/devinsy-utils-0.17.0-sources.zip
Normal file
Binary file not shown.
BIN
webapp/WEB-INF/lib/devinsy-utils-0.17.0.jar
Normal file
BIN
webapp/WEB-INF/lib/devinsy-utils-0.17.0.jar
Normal file
Binary file not shown.
BIN
webapp/WEB-INF/lib/tomcat10-servlet-api-10.1.16-sources.zip
Normal file
BIN
webapp/WEB-INF/lib/tomcat10-servlet-api-10.1.16-sources.zip
Normal file
Binary file not shown.
BIN
webapp/WEB-INF/lib/tomcat10-servlet-api-10.1.16.jar
Normal file
BIN
webapp/WEB-INF/lib/tomcat10-servlet-api-10.1.16.jar
Normal file
Binary file not shown.
|
|
@ -1,10 +1,10 @@
|
|||
# Log configuration
|
||||
# #################
|
||||
|
||||
# priority setting: DEBUG < INFO < WARN < ERROR
|
||||
dest = err
|
||||
# priority setting: TRACE < DEBUG < INFO < WARN < ERROR
|
||||
name = Log4j2PropertiesConfig
|
||||
status = TRACE
|
||||
status = ERROR
|
||||
dest = err
|
||||
|
||||
# Appenders settings.
|
||||
appenders = console, logfile
|
||||
|
|
|
|||
Loading…
Reference in a new issue