.github/workflows/build-deploy.yml

@@ -1,84 +0,0 @@
-name: Maven CI/CD
-
-on:
-  push:
-    branches: [master]
-    tags: [v*]
-  workflow_dispatch:
-
-jobs:
-  build_and_publish:
-    runs-on: ubuntu-latest
-
-    steps:
-      - uses: actions/checkout@v2
-      - name: Set up JDK 11
-        uses: actions/setup-java@v2
-        with:
-          java-version: "11"
-          distribution: "temurin"
-          cache: maven
-      - name: Install test dependencies
-        run: sudo apt-get update && sudo apt-get -y -q --no-install-recommends install ffmpeg mediainfo tesseract-ocr tesseract-ocr-deu
-      - name: Build with Maven
-        run: mvn --batch-mode -Pprod clean install
-      - name: Upload war artifact
-        uses: actions/upload-artifact@v2
-        with:
-          name: docs-web-ci.war
-          path: docs-web/target/docs*.war
-
-  build_docker_image:
-    name: Publish to Docker Hub
-    runs-on: ubuntu-latest
-    needs: [build_and_publish]
-
-    steps:
-      - 
-        name: Checkout
-        uses: actions/checkout@v2
-      - 
-        name: Download war artifact
-        uses: actions/download-artifact@v2
-        with:
-          name: docs-web-ci.war
-          path: docs-web/target
-      - 
-        name: Setup up Docker Buildx
-        uses: docker/setup-buildx-action@v1
-      - 
-        name: Login to DockerHub
-        if: github.event_name != 'pull_request'
-        uses: docker/login-action@v1
-        with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
-      - 
-        name: Populate Docker metadata
-        id: metadata
-        uses: docker/metadata-action@v3
-        with:
-          images: sismics/docs
-          flavor: |
-            latest=false
-          tags: |
-            type=ref,event=tag
-            type=raw,value=latest,enable=${{ github.ref_type != 'tag' }}
-          labels: |
-            org.opencontainers.image.title = Teedy
-            org.opencontainers.image.description = Teedy is an open source, lightweight document management system for individuals and businesses.
-            org.opencontainers.image.created = ${{ github.event_created_at }}
-            org.opencontainers.image.author = Sismics
-            org.opencontainers.image.url = https://teedy.io/
-            org.opencontainers.image.vendor = Sismics
-            org.opencontainers.image.license = GPLv2
-            org.opencontainers.image.version = ${{ github.event_head_commit.id }}
-      - 
-        name: Build and push
-        id: docker_build
-        uses: docker/build-push-action@v2
-        with:
-          context: .
-          push: ${{ github.event_name != 'pull_request' }}
-          tags: ${{ steps.metadata.outputs.tags }}
-          labels: ${{ steps.metadata.outputs.labels }}

.gitignore

@@ -13,9 +13,4 @@ node_modules
 import_test
 teedy-importer-linux
 teedy-importer-macos
-teedy-importer-win.exe
-docs/*
-!docs/.gitkeep
-
-#macos
-.DS_Store
+teedy-importer-win.exe

.travis.yml

@@ -0,0 +1,33 @@
+sudo: required
+dist: trusty
+language: java
+before_install:
+  - sudo add-apt-repository -y ppa:mc3man/trusty-media
+  - sudo apt-get -qq update
+  - sudo apt-get -y -q install ffmpeg mediainfo tesseract-ocr tesseract-ocr-fra tesseract-ocr-ita tesseract-ocr-kor tesseract-ocr-rus tesseract-ocr-ukr tesseract-ocr-spa tesseract-ocr-ara tesseract-ocr-hin tesseract-ocr-deu tesseract-ocr-pol tesseract-ocr-jpn tesseract-ocr-por tesseract-ocr-tha tesseract-ocr-jpn tesseract-ocr-chi-sim tesseract-ocr-chi-tra tesseract-ocr-nld tesseract-ocr-tur tesseract-ocr-heb tesseract-ocr-hun tesseract-ocr-fin tesseract-ocr-swe tesseract-ocr-lav tesseract-ocr-dan tesseract-ocr-nor
+  - sudo apt-get -y -q install haveged && sudo service haveged start
+after_success:
+  - |
+    if [ "$TRAVIS_PULL_REQUEST" == "false" ]; then
+      mvn -Pprod -DskipTests clean install
+      docker login -u $DOCKER_USER -p $DOCKER_PASS
+      export REPO=sismics/docs
+      export TAG=`if [ "$TRAVIS_BRANCH" == "master" ]; then echo "latest"; else echo $TRAVIS_BRANCH ; fi`
+      docker build -f Dockerfile -t $REPO:$COMMIT .
+      docker tag $REPO:$COMMIT $REPO:$TAG
+      docker tag $REPO:$COMMIT $REPO:travis-$TRAVIS_BUILD_NUMBER
+      docker push $REPO
+      cd docs-importer
+      export REPO=sismics/docs-importer
+      export TAG=`if [ "$TRAVIS_BRANCH" == "master" ]; then echo "latest"; else echo $TRAVIS_BRANCH ; fi`
+      docker build -f Dockerfile -t $REPO:$COMMIT .
+      docker tag $REPO:$COMMIT $REPO:$TAG
+      docker tag $REPO:$COMMIT $REPO:travis-$TRAVIS_BUILD_NUMBER
+      docker push $REPO
+    fi
+env:
+  global:
+  - secure: LRGpjWORb0qy6VuypZjTAfA8uRHlFUMTwb77cenS9PPRBxuSnctC531asS9Xg3DqC5nsRxBBprgfCKotn5S8nBSD1ceHh84NASyzLSBft3xSMbg7f/2i7MQ+pGVwLncusBU6E/drnMFwZBleo+9M8Tf96axY5zuUp90MUTpSgt0=
+  - secure: bCDDR6+I7PmSkuTYZv1HF/z98ANX/SFEESUCqxVmV5Gs0zFC0vQXaPJQ2xaJNRop1HZBFMZLeMMPleb0iOs985smpvK2F6Rbop9Tu+Vyo0uKqv9tbZ7F8Nfgnv9suHKZlL84FNeUQZJX6vsFIYPEJ/r7K5P/M0PdUy++fEwxEhU=
+  - secure: ewXnzbkgCIHpDWtaWGMa1OYZJ/ki99zcIl4jcDPIC0eB3njX/WgfcC6i0Ke9mLqDqwXarWJ6helm22sNh+xtQiz6isfBtBX+novfRt9AANrBe3koCMUemMDy7oh5VflBaFNP0DVb8LSCnwf6dx6ZB5E9EB8knvk40quc/cXpGjY=
+  - COMMIT=${TRAVIS_COMMIT::8}

Dockerfile

@@ -1,75 +1,13 @@
-FROM ubuntu:22.04
-LABEL maintainer="b.gamard@sismics.com"
+FROM sismics/ubuntu-jetty:9.4.12-2
+MAINTAINER b.gamard@sismics.com
 
-# Run Debian in non interactive mode
-ENV DEBIAN_FRONTEND noninteractive
+RUN apt-get update && apt-get -y -q install ffmpeg mediainfo tesseract-ocr tesseract-ocr-fra tesseract-ocr-ita tesseract-ocr-kor tesseract-ocr-rus tesseract-ocr-ukr tesseract-ocr-spa tesseract-ocr-ara tesseract-ocr-hin tesseract-ocr-deu tesseract-ocr-pol tesseract-ocr-jpn tesseract-ocr-por tesseract-ocr-tha tesseract-ocr-jpn tesseract-ocr-chi-sim tesseract-ocr-chi-tra tesseract-ocr-nld tesseract-ocr-tur tesseract-ocr-heb tesseract-ocr-hun tesseract-ocr-fin tesseract-ocr-swe tesseract-ocr-lav tesseract-ocr-dan tesseract-ocr-nor && \
+    apt-get clean && rm -rf /var/lib/apt/lists/*
 
-# Configure env
-ENV LANG C.UTF-8
-ENV LC_ALL C.UTF-8
-ENV JAVA_HOME /usr/lib/jvm/java-11-openjdk-amd64/
-ENV JAVA_OPTIONS -Dfile.encoding=UTF-8 -Xmx1g
-ENV JETTY_VERSION 11.0.20
-ENV JETTY_HOME /opt/jetty
+# Remove the embedded javax.mail jar from Jetty
+RUN rm -f /opt/jetty/lib/mail/javax.mail.glassfish-*.jar
 
-# Install packages
-RUN apt-get update && \
-    apt-get -y -q --no-install-recommends install \
-    vim less procps unzip wget tzdata openjdk-11-jdk \
-    ffmpeg \
-    mediainfo \
-    tesseract-ocr \
-    tesseract-ocr-ara \
-    tesseract-ocr-ces \
-    tesseract-ocr-chi-sim \
-    tesseract-ocr-chi-tra \
-    tesseract-ocr-dan \
-    tesseract-ocr-deu \
-    tesseract-ocr-fin \
-    tesseract-ocr-fra \
-    tesseract-ocr-heb \
-    tesseract-ocr-hin \
-    tesseract-ocr-hun \
-    tesseract-ocr-ita \
-    tesseract-ocr-jpn \
-    tesseract-ocr-kor \
-    tesseract-ocr-lav \
-    tesseract-ocr-nld \
-    tesseract-ocr-nor \
-    tesseract-ocr-pol \
-    tesseract-ocr-por \
-    tesseract-ocr-rus \
-    tesseract-ocr-spa \
-    tesseract-ocr-swe \
-    tesseract-ocr-tha \
-    tesseract-ocr-tur \
-    tesseract-ocr-ukr \
-    tesseract-ocr-vie \
-    tesseract-ocr-sqi \
-    && apt-get clean && \
-    rm -rf /var/lib/apt/lists/*
-RUN dpkg-reconfigure -f noninteractive tzdata
+ADD docs.xml /opt/jetty/webapps/docs.xml
+ADD docs-web/target/docs-web-*.war /opt/jetty/webapps/docs.war
 
-# Install Jetty
-RUN wget -nv -O /tmp/jetty.tar.gz \
-    "https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-home/${JETTY_VERSION}/jetty-home-${JETTY_VERSION}.tar.gz" \
-    && tar xzf /tmp/jetty.tar.gz -C /opt \
-    && mv /opt/jetty* /opt/jetty \
-    && useradd jetty -U -s /bin/false \
-    && chown -R jetty:jetty /opt/jetty \
-    && mkdir /opt/jetty/webapps \
-    && chmod +x /opt/jetty/bin/jetty.sh
-
-EXPOSE 8080
-
-# Install app
-RUN mkdir /app && \
-    cd /app && \
-    java -jar /opt/jetty/start.jar --add-modules=server,http,webapp,deploy
-
-ADD docs.xml /app/webapps/docs.xml
-ADD docs-web/target/docs-web-*.war /app/webapps/docs.war
-
-WORKDIR /app
-
-CMD ["java", "-jar", "/opt/jetty/start.jar"]
+ENV JAVA_OPTIONS -Xmx1g

README.md

@@ -3,7 +3,7 @@
 </h3>
 
 [![License: GPL v2](https://img.shields.io/badge/License-GPL%20v2-blue.svg)](https://www.gnu.org/licenses/old-licenses/gpl-2.0.en.html)
-[![Maven CI/CD](https://github.com/sismics/docs/actions/workflows/build-deploy.yml/badge.svg)](https://github.com/sismics/docs/actions/workflows/build-deploy.yml)
+[![Build Status](https://secure.travis-ci.org/sismics/docs.png)](http://travis-ci.org/sismics/docs)
 
 Teedy is an open source, lightweight document management system for individuals and businesses.
 
@@ -15,7 +15,8 @@ Teedy is an open source, lightweight document management system for individuals
 
 ![New!](https://teedy.io/img/laptop-demo.png?20180301)
 
-# Demo
+Demo
+----
 
 A demo is available at [demo.teedy.io](https://demo.teedy.io)
 
@@ -23,7 +24,8 @@ A demo is available at [demo.teedy.io](https://demo.teedy.io)
 - "admin" login with "admin" password
 - "demo" login with "password" password 
 
-# Features
+Features
+--------
 
 - Responsive user interface
 - Optical character recognition
@@ -53,20 +55,21 @@ A demo is available at [demo.teedy.io](https://demo.teedy.io)
 - [Bulk files importer](https://github.com/sismics/docs/tree/master/docs-importer) (single or scan mode)
 - Tested to one million documents
 
-# Install with Docker
+Install with Docker
+-------------------
 
-A preconfigured Docker image is available, including OCR and media conversion tools, listening on port 8080. If no PostgreSQL config is provided, the database is an embedded H2 database. The H2 embedded database should only be used for testing. For production usage use the provided PostgreSQL configuration (check the Docker Compose example)
+A preconfigured Docker image is available, including OCR and media conversion tools, listening on port 8080. The database is an embedded H2 database but PostgreSQL is also supported for more performance.
 
 **The default admin password is "admin". Don't forget to change it before going to production.**
 
 - Master branch, can be unstable. Not recommended for production use: `sismics/docs:latest`
-- Latest stable version: `sismics/docs:v1.11`
+- Latest stable version: `sismics/docs:v1.8`
 
 The data directory is `/data`. Don't forget to mount a volume on it.
 
 To build external URL, the server is expecting a `DOCS_BASE_URL` environment variable (for example https://teedy.mycompany.com)
 
-## Available environment variables
+### Available environment variables
 
 - General
   - `DOCS_BASE_URL`: The base url used by the application. Generated url's will be using this as base.
@@ -81,7 +84,6 @@ To build external URL, the server is expecting a `DOCS_BASE_URL` environment var
   - `DATABASE_URL`: The jdbc connection string to be used by `hibernate`.
   - `DATABASE_USER`: The user which should be used for the database connection.
   - `DATABASE_PASSWORD`: The password to be used for the database connection.
-  - `DATABASE_POOL_SIZE`: The pool size to be used for the database connection.
 
 - Language
   - `DOCS_DEFAULT_LANGUAGE`: The language which will be used as default. Currently supported values are:
@@ -93,19 +95,41 @@ To build external URL, the server is expecting a `DOCS_BASE_URL` environment var
   - `DOCS_SMTP_USERNAME`: The username to be used.
   - `DOCS_SMTP_PASSWORD`: The password to be used.
 
-## Examples
+### Examples
 
 In the following examples some passwords are exposed in cleartext. This was done in order to keep the examples simple. We strongly encourage you to use variables with an `.env` file or other means to securely store your passwords.
 
-
-### Default, using PostgreSQL
+#### Using the internal database
 
 ```yaml
 version: '3'
 services:
 # Teedy Application
   teedy-server:
-    image: sismics/docs:v1.11
+    image: sismics/docs:v1.8
+    restart: unless-stopped
+    ports:
+      # Map internal port to host
+      - 8080:8080
+    environment:
+      # Base url to be used
+      DOCS_BASE_URL: "https://docs.example.com"
+      # Set the admin email
+      DOCS_ADMIN_EMAIL_INIT: "admin@example.com"
+      # Set the admin password (in this example: "superSecure")
+      DOCS_ADMIN_PASSWORD_INIT: "$$2a$$05$$PcMNUbJvsk7QHFSfEIDaIOjk1VI9/E7IPjTKx.jkjPxkx2EOKSoPS"
+    volumes:
+      - ./docs/data:/data
+```
+
+#### Using PostgreSQL
+
+```yaml
+version: '3'
+services:
+# Teedy Application
+  teedy-server:
+    image: sismics/docs:v1.8
     restart: unless-stopped
     ports:
       # Map internal port to host
@@ -123,7 +147,6 @@ services:
       DATABASE_URL: "jdbc:postgresql://teedy-db:5432/teedy"
       DATABASE_USER: "teedy_db_user"
       DATABASE_PASSWORD: "teedy_db_password"
-      DATABASE_POOL_SIZE: "10"
     volumes:
       - ./docs/data:/data
     networks:
@@ -157,47 +180,26 @@ networks:
     driver: bridge
 ```
 
-### Using the internal database (only for testing)
+Manual installation
+-------------------
 
-```yaml
-version: '3'
-services:
-# Teedy Application
-  teedy-server:
-    image: sismics/docs:v1.11
-    restart: unless-stopped
-    ports:
-      # Map internal port to host
-      - 8080:8080
-    environment:
-      # Base url to be used
-      DOCS_BASE_URL: "https://docs.example.com"
-      # Set the admin email
-      DOCS_ADMIN_EMAIL_INIT: "admin@example.com"
-      # Set the admin password (in this example: "superSecure")
-      DOCS_ADMIN_PASSWORD_INIT: "$$2a$$05$$PcMNUbJvsk7QHFSfEIDaIOjk1VI9/E7IPjTKx.jkjPxkx2EOKSoPS"
-    volumes:
-      - ./docs/data:/data
-```
+#### Requirements
 
-# Manual installation
-
-## Requirements
-
-- Java 11
-- Tesseract 4 for OCR
+- Java 8 with the [Java Cryptography Extension](http://www.oracle.com/technetwork/java/javase/downloads/jce-7-download-432124.html)
+- Tesseract 3 or 4 for OCR
 - ffmpeg for video thumbnails
 - mediainfo for video metadata extraction
 - A webapp server like [Jetty](http://eclipse.org/jetty/) or [Tomcat](http://tomcat.apache.org/)
 
-## Download
+#### Download
 
 The latest release is downloadable here: <https://github.com/sismics/docs/releases> in WAR format. 
 **The default admin password is "admin". Don't forget to change it before going to production.**
 
-## How to build Teedy from the sources
+How to build Teedy from the sources
+----------------------------------
 
-Prerequisites: JDK 11, Maven 3, NPM, Grunt, Tesseract 4
+Prerequisites: JDK 8 with JCE, Maven 3, NPM, Grunt, Tesseract 3 or 4
 
 Teedy is organized in several Maven modules:
 
@@ -208,39 +210,35 @@ Teedy is organized in several Maven modules:
 First off, clone the repository: `git clone git://github.com/sismics/docs.git`
 or download the sources from GitHub.
 
-### Launch the build
+#### Launch the build
 
 From the root directory:
 
-```console
-mvn clean -DskipTests install
-```
+    mvn clean -DskipTests install
 
-### Run a stand-alone version
+#### Run a stand-alone version
 
 From the `docs-web` directory:
 
-```console
-mvn jetty:run
-```
+    mvn jetty:run
 
-### Build a .war to deploy to your servlet container
+#### Build a .war to deploy to your servlet container
 
 From the `docs-web` directory:
 
-```console
-mvn -Pprod -DskipTests clean install
-```
+    mvn -Pprod -DskipTests clean install
 
 You will get your deployable WAR in the `docs-web/target` directory.
 
-# Contributing
+Contributing
+------------
 
 All contributions are more than welcomed. Contributions may close an issue, fix a bug (reported or not reported), improve the existing code, add new feature, and so on.
 
 The `master` branch is the default and base branch for the project. It is used for development and all Pull Requests should go there.
 
-# License
+License
+-------
 
 Teedy is released under the terms of the GPL license. See `COPYING` for more
 information or see <http://opensource.org/licenses/GPL-2.0>.

docker-compose.yml

@@ -1,18 +0,0 @@
-version: '3'
-services:
-# Teedy Application
-  teedy-server:
-    image: sismics/docs:v1.10
-    restart: unless-stopped
-    ports:
-      # Map internal port to host
-      - 8080:8080
-    environment:
-      # Base url to be used
-      DOCS_BASE_URL: "https://docs.example.com"
-      # Set the admin email
-      DOCS_ADMIN_EMAIL_INIT: "admin@example.com"
-      # Set the admin password (in this example: "superSecure")
-      DOCS_ADMIN_PASSWORD_INIT: "$$2a$$05$$PcMNUbJvsk7QHFSfEIDaIOjk1VI9/E7IPjTKx.jkjPxkx2EOKSoPS"
-    volumes:
-      - ./docs/data:/data

docs-core/pom.xml

@@ -5,10 +5,10 @@
   <parent>
     <groupId>com.sismics.docs</groupId>
     <artifactId>docs-parent</artifactId>
-    <version>1.12-SNAPSHOT</version>
-    <relativePath>../pom.xml</relativePath>
+    <version>1.9</version>
+    <relativePath>..</relativePath>
   </parent>
-
+  
   <modelVersion>4.0.0</modelVersion>
   <artifactId>docs-core</artifactId>
   <packaging>jar</packaging>
@@ -17,10 +17,20 @@
   <dependencies>
     <!-- Persistence layer dependencies -->
     <dependency>
-      <groupId>org.hibernate.orm</groupId>
+      <groupId>org.hibernate</groupId>
       <artifactId>hibernate-core</artifactId>
     </dependency>
-
+    
+    <dependency>
+      <groupId>org.hibernate</groupId>
+      <artifactId>hibernate-entitymanager</artifactId>
+    </dependency>
+    
+    <dependency>
+      <groupId>org.hibernate</groupId>
+      <artifactId>hibernate-c3p0</artifactId>
+    </dependency>
+    
     <!-- Other external dependencies -->
     <dependency>
       <groupId>joda-time</groupId>
@@ -31,30 +41,30 @@
       <groupId>com.google.guava</groupId>
       <artifactId>guava</artifactId>
     </dependency>
-
+    
     <dependency>
       <groupId>org.apache.commons</groupId>
       <artifactId>commons-compress</artifactId>
     </dependency>
-
+    
     <dependency>
-      <groupId>org.apache.commons</groupId>
-      <artifactId>commons-lang3</artifactId>
+      <groupId>commons-lang</groupId>
+      <artifactId>commons-lang</artifactId>
     </dependency>
 
     <dependency>
       <groupId>org.apache.commons</groupId>
       <artifactId>commons-email</artifactId>
     </dependency>
-
+    
     <dependency>
       <groupId>org.freemarker</groupId>
       <artifactId>freemarker</artifactId>
     </dependency>
 
     <dependency>
-      <groupId>jakarta.json</groupId>
-      <artifactId>jakarta.json-api</artifactId>
+      <groupId>org.glassfish</groupId>
+      <artifactId>javax.json</artifactId>
     </dependency>
 
     <dependency>
@@ -66,17 +76,17 @@
       <groupId>log4j</groupId>
       <artifactId>log4j</artifactId>
     </dependency>
-
+    
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-log4j12</artifactId>
     </dependency>
-
+    
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-api</artifactId>
     </dependency>
-
+    
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>jcl-over-slf4j</artifactId>
@@ -85,18 +95,19 @@
     <dependency>
       <groupId>at.favre.lib</groupId>
       <artifactId>bcrypt</artifactId>
+      <version>0.9.0</version>
     </dependency>
-
+    
     <dependency>
       <groupId>org.apache.lucene</groupId>
       <artifactId>lucene-core</artifactId>
     </dependency>
-
+    
     <dependency>
       <groupId>org.apache.lucene</groupId>
       <artifactId>lucene-analyzers-common</artifactId>
     </dependency>
-
+    
     <dependency>
       <groupId>org.apache.lucene</groupId>
       <artifactId>lucene-queryparser</artifactId>
@@ -112,6 +123,11 @@
       <artifactId>lucene-highlighter</artifactId>
     </dependency>
 
+    <dependency>
+      <groupId>com.sun.mail</groupId>
+      <artifactId>javax.mail</artifactId>
+    </dependency>
+
     <dependency>
       <groupId>com.squareup.okhttp3</groupId>
       <artifactId>okhttp</artifactId>
@@ -119,12 +135,7 @@
 
     <dependency>
       <groupId>org.apache.directory.api</groupId>
-      <artifactId>api-ldap-client-api</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>org.apache.directory.api</groupId>
-      <artifactId>api-ldap-codec-standalone</artifactId>
+      <artifactId>api-all</artifactId>
     </dependency>
 
     <!-- Only there to read old index and rebuild them -->
@@ -132,22 +143,22 @@
       <groupId>org.apache.lucene</groupId>
       <artifactId>lucene-backward-codecs</artifactId>
     </dependency>
-
+    
     <dependency>
       <groupId>org.imgscalr</groupId>
       <artifactId>imgscalr-lib</artifactId>
     </dependency>
-
+    
     <dependency>
       <groupId>org.apache.pdfbox</groupId>
       <artifactId>pdfbox</artifactId>
     </dependency>
-
+    
     <dependency>
       <groupId>org.bouncycastle</groupId>
       <artifactId>bcprov-jdk15on</artifactId>
     </dependency>
-
+    
     <dependency>
       <groupId>fr.opensagres.xdocreport</groupId>
       <artifactId>fr.opensagres.odfdom.converter.pdf</artifactId>
@@ -185,20 +196,39 @@
       <artifactId>postgresql</artifactId>
     </dependency>
 
+    <!-- JDK 11 JAXB dependencies -->
+    <dependency>
+      <groupId>javax.xml.bind</groupId>
+      <artifactId>jaxb-api</artifactId>
+      <version>2.3.0</version>
+    </dependency>
+
+    <dependency>
+      <groupId>com.sun.xml.bind</groupId>
+      <artifactId>jaxb-core</artifactId>
+      <version>2.3.0</version>
+    </dependency>
+
+    <dependency>
+      <groupId>com.sun.xml.bind</groupId>
+      <artifactId>jaxb-impl</artifactId>
+      <version>2.3.0</version>
+    </dependency>
+
     <!-- Test dependencies -->
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
       <scope>test</scope>
     </dependency>
-
+    
     <dependency>
       <groupId>com.h2database</groupId>
       <artifactId>h2</artifactId>
       <scope>test</scope>
     </dependency>
   </dependencies>
-
+  
   <profiles>
     <!-- Development profile (active by default) -->
     <profile>
@@ -210,7 +240,7 @@
           <value>dev</value>
         </property>
       </activation>
-
+      
       <build>
         <resources>
           <resource>
@@ -226,7 +256,7 @@
       <id>prod</id>
     </profile>
   </profiles>
-
+  
   <build>
     <resources>
       <resource>

docs-core/src/main/java/com/sismics/docs/core/constant/ConfigType.java

@@ -1,9 +1,9 @@
 package com.sismics.docs.core.constant;
 
 /**
- * Configuration parameters.
+ * Configuration parameters. 
  *
- * @author jtremeaux
+ * @author jtremeaux 
  */
 public enum ConfigType {
     /**
@@ -20,11 +20,6 @@ public enum ConfigType {
      */
     GUEST_LOGIN,
 
-    /**
-     * OCR enabled.
-     */
-    OCR_ENABLED,
-
     /**
      * Default language.
      */
@@ -45,7 +40,6 @@ public enum ConfigType {
     INBOX_ENABLED,
     INBOX_HOSTNAME,
     INBOX_PORT,
-    INBOX_STARTTLS,
     INBOX_USERNAME,
     INBOX_PASSWORD,
     INBOX_FOLDER,
@@ -59,7 +53,6 @@ public enum ConfigType {
     LDAP_ENABLED,
     LDAP_HOST,
     LDAP_PORT,
-    LDAP_USESSL,
     LDAP_ADMIN_DN,
     LDAP_ADMIN_PASSWORD,
     LDAP_BASE_DN,

docs-core/src/main/java/com/sismics/docs/core/constant/Constants.java

@@ -43,7 +43,7 @@ public class Constants {
     /**
      * Supported document languages.
      */
-    public static final List<String> SUPPORTED_LANGUAGES = Lists.newArrayList("eng", "fra", "ita", "deu", "spa", "por", "pol", "rus", "ukr", "ara", "hin", "chi_sim", "chi_tra", "jpn", "tha", "kor", "nld", "tur", "heb", "hun", "fin", "swe", "lav", "dan", "nor", "vie", "ces", "sqi");
+    public static final List<String> SUPPORTED_LANGUAGES = Lists.newArrayList("eng", "fra", "ita", "deu", "spa", "por", "pol", "rus", "ukr", "ara", "hin", "chi_sim", "chi_tra", "jpn", "tha", "kor", "nld", "tur", "heb", "hun", "fin", "swe", "lav", "dan", "nor");
 
     /**
      * Base URL environment variable.

docs-core/src/main/java/com/sismics/docs/core/dao/AclDao.java

@@ -10,8 +10,8 @@ import com.sismics.docs.core.util.AuditLogUtil;
 import com.sismics.docs.core.util.SecurityUtil;
 import com.sismics.util.context.ThreadLocalContext;
 
-import jakarta.persistence.EntityManager;
-import jakarta.persistence.Query;
+import javax.persistence.EntityManager;
+import javax.persistence.Query;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;

docs-core/src/main/java/com/sismics/docs/core/dao/AuditLogDao.java

@@ -12,7 +12,7 @@ import com.sismics.docs.core.util.jpa.QueryParam;
 import com.sismics.docs.core.util.jpa.SortCriteria;
 import com.sismics.util.context.ThreadLocalContext;
 
-import jakarta.persistence.EntityManager;
+import javax.persistence.EntityManager;
 import java.sql.Timestamp;
 import java.util.*;
 

docs-core/src/main/java/com/sismics/docs/core/dao/AuthenticationTokenDao.java

@@ -4,8 +4,8 @@ import com.sismics.docs.core.model.jpa.AuthenticationToken;
 import com.sismics.util.context.ThreadLocalContext;
 import org.joda.time.DateTime;
 
-import jakarta.persistence.EntityManager;
-import jakarta.persistence.Query;
+import javax.persistence.EntityManager;
+import javax.persistence.Query;
 import java.util.Date;
 import java.util.List;
 import java.util.UUID;

docs-core/src/main/java/com/sismics/docs/core/dao/CommentDao.java

@@ -6,9 +6,9 @@ import com.sismics.docs.core.model.jpa.Comment;
 import com.sismics.docs.core.util.AuditLogUtil;
 import com.sismics.util.context.ThreadLocalContext;
 
-import jakarta.persistence.EntityManager;
-import jakarta.persistence.NoResultException;
-import jakarta.persistence.Query;
+import javax.persistence.EntityManager;
+import javax.persistence.NoResultException;
+import javax.persistence.Query;
 import java.sql.Timestamp;
 import java.util.ArrayList;
 import java.util.Date;

docs-core/src/main/java/com/sismics/docs/core/dao/ConfigDao.java

@@ -4,8 +4,8 @@ import com.sismics.docs.core.constant.ConfigType;
 import com.sismics.docs.core.model.jpa.Config;
 import com.sismics.util.context.ThreadLocalContext;
 
-import jakarta.persistence.EntityManager;
-import jakarta.persistence.NoResultException;
+import javax.persistence.EntityManager;
+import javax.persistence.NoResultException;
 
 /**
  * Configuration parameter DAO.

docs-core/src/main/java/com/sismics/docs/core/dao/ContributorDao.java

@@ -4,8 +4,8 @@ import com.sismics.docs.core.dao.dto.ContributorDto;
 import com.sismics.docs.core.model.jpa.Contributor;
 import com.sismics.util.context.ThreadLocalContext;
 
-import jakarta.persistence.EntityManager;
-import jakarta.persistence.Query;
+import javax.persistence.EntityManager;
+import javax.persistence.Query;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.UUID;

docs-core/src/main/java/com/sismics/docs/core/dao/DocumentDao.java

@@ -7,10 +7,9 @@ import com.sismics.docs.core.model.jpa.Document;
 import com.sismics.docs.core.util.AuditLogUtil;
 import com.sismics.util.context.ThreadLocalContext;
 
-import jakarta.persistence.EntityManager;
-import jakarta.persistence.NoResultException;
-import jakarta.persistence.Query;
-import jakarta.persistence.TypedQuery;
+import javax.persistence.EntityManager;
+import javax.persistence.NoResultException;
+import javax.persistence.Query;
 import java.sql.Timestamp;
 import java.util.Date;
 import java.util.List;
@@ -51,9 +50,10 @@ public class DocumentDao {
      * @param limit Limit
      * @return List of documents
      */
+    @SuppressWarnings("unchecked")
     public List<Document> findAll(int offset, int limit) {
         EntityManager em = ThreadLocalContext.get().getEntityManager();
-        TypedQuery<Document> q = em.createQuery("select d from Document d where d.deleteDate is null", Document.class);
+        Query q = em.createQuery("select d from Document d where d.deleteDate is null");
         q.setFirstResult(offset);
         q.setMaxResults(limit);
         return q.getResultList();
@@ -65,9 +65,10 @@ public class DocumentDao {
      * @param userId User ID
      * @return List of documents
      */
+    @SuppressWarnings("unchecked")
     public List<Document> findByUserId(String userId) {
         EntityManager em = ThreadLocalContext.get().getEntityManager();
-        TypedQuery<Document> q = em.createQuery("select d from Document d where d.userId = :userId and d.deleteDate is null", Document.class);
+        Query q = em.createQuery("select d from Document d where d.userId = :userId and d.deleteDate is null");
         q.setParameter("userId", userId);
         return q.getResultList();
     }
@@ -87,7 +88,7 @@ public class DocumentDao {
         }
 
         EntityManager em = ThreadLocalContext.get().getEntityManager();
-        StringBuilder sb = new StringBuilder("select distinct d.DOC_ID_C, d.DOC_TITLE_C, d.DOC_DESCRIPTION_C, d.DOC_SUBJECT_C, d.DOC_IDENTIFIER_C, d.DOC_PUBLISHER_C, d.DOC_FORMAT_C, d.DOC_SOURCE_C, d.DOC_TYPE_C, d.DOC_COVERAGE_C, d.DOC_RIGHTS_C, d.DOC_CREATEDATE_D, d.DOC_UPDATEDATE_D, d.DOC_LANGUAGE_C, d.DOC_IDFILE_C,");
+        StringBuilder sb = new StringBuilder("select distinct d.DOC_ID_C, d.DOC_TITLE_C, d.DOC_DESCRIPTION_C, d.DOC_SUBJECT_C, d.DOC_IDENTIFIER_C, d.DOC_PUBLISHER_C, d.DOC_FORMAT_C, d.DOC_SOURCE_C, d.DOC_TYPE_C, d.DOC_COVERAGE_C, d.DOC_RIGHTS_C, d.DOC_CREATEDATE_D, d.DOC_UPDATEDATE_D, d.DOC_LANGUAGE_C, ");
         sb.append(" (select count(s.SHA_ID_C) from T_SHARE s, T_ACL ac where ac.ACL_SOURCEID_C = d.DOC_ID_C and ac.ACL_TARGETID_C = s.SHA_ID_C and ac.ACL_DELETEDATE_D is null and s.SHA_DELETEDATE_D is null) shareCount, ");
         sb.append(" (select count(f.FIL_ID_C) from T_FILE f where f.FIL_DELETEDATE_D is null and f.FIL_IDDOC_C = d.DOC_ID_C) fileCount, ");
         sb.append(" u.USE_USERNAME_C ");
@@ -121,7 +122,6 @@ public class DocumentDao {
         documentDto.setCreateTimestamp(((Timestamp) o[i++]).getTime());
         documentDto.setUpdateTimestamp(((Timestamp) o[i++]).getTime());
         documentDto.setLanguage((String) o[i++]);
-        documentDto.setFileId((String) o[i++]);
         documentDto.setShared(((Number) o[i++]).intValue() > 0);
         documentDto.setFileCount(((Number) o[i++]).intValue());
         documentDto.setCreator((String) o[i]);
@@ -138,16 +138,16 @@ public class DocumentDao {
         EntityManager em = ThreadLocalContext.get().getEntityManager();
             
         // Get the document
-        TypedQuery<Document> dq = em.createQuery("select d from Document d where d.id = :id and d.deleteDate is null", Document.class);
-        dq.setParameter("id", id);
-        Document documentDb = dq.getSingleResult();
+        Query q = em.createQuery("select d from Document d where d.id = :id and d.deleteDate is null");
+        q.setParameter("id", id);
+        Document documentDb = (Document) q.getSingleResult();
         
         // Delete the document
         Date dateNow = new Date();
         documentDb.setDeleteDate(dateNow);
 
         // Delete linked data
-        Query q = em.createQuery("update File f set f.deleteDate = :dateNow where f.documentId = :documentId and f.deleteDate is null");
+        q = em.createQuery("update File f set f.deleteDate = :dateNow where f.documentId = :documentId and f.deleteDate is null");
         q.setParameter("documentId", id);
         q.setParameter("dateNow", dateNow);
         q.executeUpdate();
@@ -179,10 +179,10 @@ public class DocumentDao {
      */
     public Document getById(String id) {
         EntityManager em = ThreadLocalContext.get().getEntityManager();
-        TypedQuery<Document> q = em.createQuery("select d from Document d where d.id = :id and d.deleteDate is null", Document.class);
+        Query q = em.createQuery("select d from Document d where d.id = :id and d.deleteDate is null");
         q.setParameter("id", id);
         try {
-            return q.getSingleResult();
+            return (Document) q.getSingleResult();
         } catch (NoResultException e) {
             return null;
         }
@@ -199,9 +199,9 @@ public class DocumentDao {
         EntityManager em = ThreadLocalContext.get().getEntityManager();
 
         // Get the document
-        TypedQuery<Document> q = em.createQuery("select d from Document d where d.id = :id and d.deleteDate is null", Document.class);
+        Query q = em.createQuery("select d from Document d where d.id = :id and d.deleteDate is null");
         q.setParameter("id", document.getId());
-        Document documentDb = q.getSingleResult();
+        Document documentDb = (Document) q.getSingleResult();
 
         // Update the document
         documentDb.setTitle(document.getTitle());
@@ -237,6 +237,7 @@ public class DocumentDao {
         query.setParameter("fileId", document.getFileId());
         query.setParameter("id", document.getId());
         query.executeUpdate();
+
     }
 
     /**

docs-core/src/main/java/com/sismics/docs/core/dao/DocumentMetadataDao.java

@@ -5,8 +5,8 @@ import com.sismics.docs.core.dao.dto.DocumentMetadataDto;
 import com.sismics.docs.core.model.jpa.DocumentMetadata;
 import com.sismics.util.context.ThreadLocalContext;
 
-import jakarta.persistence.EntityManager;
-import jakarta.persistence.Query;
+import javax.persistence.EntityManager;
+import javax.persistence.Query;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.UUID;

docs-core/src/main/java/com/sismics/docs/core/dao/FileDao.java

@@ -4,16 +4,12 @@ import com.sismics.docs.core.constant.AuditLogType;
 import com.sismics.docs.core.model.jpa.File;
 import com.sismics.docs.core.util.AuditLogUtil;
 import com.sismics.util.context.ThreadLocalContext;
-import jakarta.persistence.EntityManager;
-import jakarta.persistence.NoResultException;
-import jakarta.persistence.Query;
-import jakarta.persistence.TypedQuery;
 
-import java.util.Collections;
+import javax.persistence.EntityManager;
+import javax.persistence.NoResultException;
+import javax.persistence.Query;
 import java.util.Date;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 import java.util.UUID;
 
 /**
@@ -51,9 +47,10 @@ public class FileDao {
      * @param limit Limit
      * @return List of files
      */
+    @SuppressWarnings("unchecked")
     public List<File> findAll(int offset, int limit) {
         EntityManager em = ThreadLocalContext.get().getEntityManager();
-        TypedQuery<File> q = em.createQuery("select f from File f where f.deleteDate is null", File.class);
+        Query q = em.createQuery("select f from File f where f.deleteDate is null");
         q.setFirstResult(offset);
         q.setMaxResults(limit);
         return q.getResultList();
@@ -65,38 +62,28 @@ public class FileDao {
      * @param userId User ID
      * @return List of files
      */
+    @SuppressWarnings("unchecked")
     public List<File> findByUserId(String userId) {
         EntityManager em = ThreadLocalContext.get().getEntityManager();
-        TypedQuery<File> q = em.createQuery("select f from File f where f.userId = :userId and f.deleteDate is null", File.class);
+        Query q = em.createQuery("select f from File f where f.userId = :userId and f.deleteDate is null");
         q.setParameter("userId", userId);
         return q.getResultList();
     }
-
-    /**
-     * Returns a list of active files.
-     *
-     * @param ids Files IDs
-     * @return List of files
-     */
-    public List<File> getFiles(List<String> ids) {
-        EntityManager em = ThreadLocalContext.get().getEntityManager();
-        TypedQuery<File> q = em.createQuery("select f from File f where f.id in :ids and f.deleteDate is null", File.class);
-        q.setParameter("ids", ids);
-        return q.getResultList();
-    }
     
     /**
-     * Returns an active file or null.
+     * Returns an active file.
      * 
      * @param id File ID
-     * @return File
+     * @return Document
      */
     public File getFile(String id) {
-        List<File> files = getFiles(List.of(id));
-        if (files.isEmpty()) {
+        EntityManager em = ThreadLocalContext.get().getEntityManager();
+        Query q = em.createQuery("select f from File f where f.id = :id and f.deleteDate is null");
+        q.setParameter("id", id);
+        try {
+            return (File) q.getSingleResult();
+        } catch (NoResultException e) {
             return null;
-        } else {
-            return files.get(0);
         }
     }
     
@@ -105,15 +92,15 @@ public class FileDao {
      * 
      * @param id File ID
      * @param userId User ID
-     * @return File
+     * @return Document
      */
     public File getFile(String id, String userId) {
         EntityManager em = ThreadLocalContext.get().getEntityManager();
-        TypedQuery<File> q = em.createQuery("select f from File f where f.id = :id and f.userId = :userId and f.deleteDate is null", File.class);
+        Query q = em.createQuery("select f from File f where f.id = :id and f.userId = :userId and f.deleteDate is null");
         q.setParameter("id", id);
         q.setParameter("userId", userId);
         try {
-            return q.getSingleResult();
+            return (File) q.getSingleResult();
         } catch (NoResultException e) {
             return null;
         }
@@ -129,9 +116,9 @@ public class FileDao {
         EntityManager em = ThreadLocalContext.get().getEntityManager();
             
         // Get the file
-        TypedQuery<File> q = em.createQuery("select f from File f where f.id = :id and f.deleteDate is null", File.class);
+        Query q = em.createQuery("select f from File f where f.id = :id and f.deleteDate is null");
         q.setParameter("id", id);
-        File fileDb = q.getSingleResult();
+        File fileDb = (File) q.getSingleResult();
         
         // Delete the file
         Date dateNow = new Date();
@@ -151,9 +138,9 @@ public class FileDao {
         EntityManager em = ThreadLocalContext.get().getEntityManager();
         
         // Get the file
-        TypedQuery<File> q = em.createQuery("select f from File f where f.id = :id and f.deleteDate is null", File.class);
+        Query q = em.createQuery("select f from File f where f.id = :id and f.deleteDate is null");
         q.setParameter("id", file.getId());
-        File fileDb = q.getSingleResult();
+        File fileDb = (File) q.getSingleResult();
 
         // Update the file
         fileDb.setDocumentId(file.getDocumentId());
@@ -163,7 +150,6 @@ public class FileDao {
         fileDb.setMimeType(file.getMimeType());
         fileDb.setVersionId(file.getVersionId());
         fileDb.setLatestVersion(file.isLatestVersion());
-        fileDb.setSize(file.getSize());
 
         return file;
     }
@@ -176,82 +162,46 @@ public class FileDao {
      */
     public File getActiveById(String id) {
         EntityManager em = ThreadLocalContext.get().getEntityManager();
-        TypedQuery<File> q = em.createQuery("select f from File f where f.id = :id and f.deleteDate is null", File.class);
+        Query q = em.createQuery("select f from File f where f.id = :id and f.deleteDate is null");
         q.setParameter("id", id);
         try {
-            return q.getSingleResult();
+            return (File) q.getSingleResult();
         } catch (NoResultException e) {
             return null;
         }
     }
     
     /**
-     * Get files by document ID or all orphan files of a user.
+     * Get files by document ID or all orphan files of an user.
      * 
      * @param userId User ID
      * @param documentId Document ID
      * @return List of files
      */
+    @SuppressWarnings("unchecked")
     public List<File> getByDocumentId(String userId, String documentId) {
         EntityManager em = ThreadLocalContext.get().getEntityManager();
         if (documentId == null) {
-            TypedQuery<File> q = em.createQuery("select f from File f where f.documentId is null and f.deleteDate is null and f.latestVersion = true and f.userId = :userId order by f.createDate asc", File.class);
+            Query q = em.createQuery("select f from File f where f.documentId is null and f.deleteDate is null and f.latestVersion = true and f.userId = :userId order by f.createDate asc");
             q.setParameter("userId", userId);
             return q.getResultList();
-        } else {
-            return getByDocumentsIds(Collections.singleton(documentId));
         }
-    }
-
-    /**
-     * Get files by documents IDs.
-     *
-     * @param documentIds Documents IDs
-     * @return List of files
-     */
-    public List<File> getByDocumentsIds(Iterable<String> documentIds) {
-        EntityManager em = ThreadLocalContext.get().getEntityManager();
-        TypedQuery<File> q = em.createQuery("select f from File f where f.documentId in :documentIds and f.latestVersion = true and f.deleteDate is null order by f.order asc", File.class);
-        q.setParameter("documentIds", documentIds);
+        Query q = em.createQuery("select f from File f where f.documentId = :documentId and f.latestVersion = true and f.deleteDate is null order by f.order asc");
+        q.setParameter("documentId", documentId);
         return q.getResultList();
     }
 
-    /**
-     * Get files count by documents IDs.
-     *
-     * @param documentIds Documents IDs
-     * @return the number of files per document id
-     */
-    public Map<String, Long> countByDocumentsIds(Iterable<String> documentIds) {
-        EntityManager em = ThreadLocalContext.get().getEntityManager();
-        Query q = em.createQuery("select f.documentId, count(*) from File f where f.documentId in :documentIds and f.latestVersion = true and f.deleteDate is null group by (f.documentId)");
-        q.setParameter("documentIds", documentIds);
-        Map<String, Long> result = new HashMap<>();
-        q.getResultList().forEach(o -> {
-            Object[] resultLine = (Object[]) o;
-            result.put((String) resultLine[0], (Long) resultLine[1]);
-        });
-        return result;
-    }
-
     /**
      * Get all files from a version.
      *
      * @param versionId Version ID
      * @return List of files
      */
+    @SuppressWarnings("unchecked")
     public List<File> getByVersionId(String versionId) {
         EntityManager em = ThreadLocalContext.get().getEntityManager();
-        TypedQuery<File> q = em.createQuery("select f from File f where f.versionId = :versionId and f.deleteDate is null order by f.order asc", File.class);
+        Query q = em.createQuery("select f from File f where f.versionId = :versionId and f.deleteDate is null order by f.order asc");
         q.setParameter("versionId", versionId);
         return q.getResultList();
     }
-
-    public List<File> getFilesWithUnknownSize(int limit) {
-        EntityManager em = ThreadLocalContext.get().getEntityManager();
-        TypedQuery<File> q = em.createQuery("select f from File f where f.size = :size and f.deleteDate is null order by f.order asc", File.class);
-        q.setParameter("size", File.UNKNOWN_SIZE);
-        q.setMaxResults(limit);
-        return q.getResultList();
-    }
 }

docs-core/src/main/java/com/sismics/docs/core/dao/GroupDao.java

@@ -12,9 +12,9 @@ import com.sismics.docs.core.util.jpa.QueryUtil;
 import com.sismics.docs.core.util.jpa.SortCriteria;
 import com.sismics.util.context.ThreadLocalContext;
 
-import jakarta.persistence.EntityManager;
-import jakarta.persistence.NoResultException;
-import jakarta.persistence.Query;
+import javax.persistence.EntityManager;
+import javax.persistence.NoResultException;
+import javax.persistence.Query;
 import java.util.*;
 
 /**
@@ -183,10 +183,12 @@ public class GroupDao {
         }
         
         criteriaList.add("g.GRP_DELETEDATE_D is null");
-
-        sb.append(" where ");
-        sb.append(Joiner.on(" and ").join(criteriaList));
-
+        
+        if (!criteriaList.isEmpty()) {
+            sb.append(" where ");
+            sb.append(Joiner.on(" and ").join(criteriaList));
+        }
+        
         // Perform the search
         QueryParam queryParam = QueryUtil.getSortedQueryParam(new QueryParam(sb.toString(), parameterMap), sortCriteria);
         @SuppressWarnings("unchecked")

docs-core/src/main/java/com/sismics/docs/core/dao/MetadataDao.java

@@ -12,9 +12,9 @@ import com.sismics.docs.core.util.jpa.QueryUtil;
 import com.sismics.docs.core.util.jpa.SortCriteria;
 import com.sismics.util.context.ThreadLocalContext;
 
-import jakarta.persistence.EntityManager;
-import jakarta.persistence.NoResultException;
-import jakarta.persistence.Query;
+import javax.persistence.EntityManager;
+import javax.persistence.NoResultException;
+import javax.persistence.Query;
 import java.util.*;
 
 /**
@@ -123,8 +123,10 @@ public class MetadataDao {
 
         criteriaList.add("m.MET_DELETEDATE_D is null");
 
-        sb.append(" where ");
-        sb.append(Joiner.on(" and ").join(criteriaList));
+        if (!criteriaList.isEmpty()) {
+            sb.append(" where ");
+            sb.append(Joiner.on(" and ").join(criteriaList));
+        }
 
         // Perform the search
         QueryParam queryParam = QueryUtil.getSortedQueryParam(new QueryParam(sb.toString(), parameterMap), sortCriteria);

docs-core/src/main/java/com/sismics/docs/core/dao/PasswordRecoveryDao.java

@@ -6,9 +6,9 @@ import com.sismics.util.context.ThreadLocalContext;
 import org.joda.time.DateTime;
 import org.joda.time.DurationFieldType;
 
-import jakarta.persistence.EntityManager;
-import jakarta.persistence.NoResultException;
-import jakarta.persistence.Query;
+import javax.persistence.EntityManager;
+import javax.persistence.NoResultException;
+import javax.persistence.Query;
 import java.util.Date;
 import java.util.UUID;
 

docs-core/src/main/java/com/sismics/docs/core/dao/RelationDao.java

@@ -4,8 +4,8 @@ import com.sismics.docs.core.dao.dto.RelationDto;
 import com.sismics.docs.core.model.jpa.Relation;
 import com.sismics.util.context.ThreadLocalContext;
 
-import jakarta.persistence.EntityManager;
-import jakarta.persistence.Query;
+import javax.persistence.EntityManager;
+import javax.persistence.Query;
 import java.util.*;
 
 /**

docs-core/src/main/java/com/sismics/docs/core/dao/RoleBaseFunctionDao.java

@@ -3,8 +3,8 @@ package com.sismics.docs.core.dao;
 import com.google.common.collect.Sets;
 import com.sismics.util.context.ThreadLocalContext;
 
-import jakarta.persistence.EntityManager;
-import jakarta.persistence.Query;
+import javax.persistence.EntityManager;
+import javax.persistence.Query;
 import java.util.Set;
 
 /**

docs-core/src/main/java/com/sismics/docs/core/dao/RouteDao.java

@@ -11,7 +11,7 @@ import com.sismics.docs.core.util.jpa.QueryUtil;
 import com.sismics.docs.core.util.jpa.SortCriteria;
 import com.sismics.util.context.ThreadLocalContext;
 
-import jakarta.persistence.EntityManager;
+import javax.persistence.EntityManager;
 import java.sql.Timestamp;
 import java.util.*;
 
@@ -64,8 +64,10 @@ public class RouteDao {
         }
         criteriaList.add("r.RTE_DELETEDATE_D is null");
 
-        sb.append(" where ");
-        sb.append(Joiner.on(" and ").join(criteriaList));
+        if (!criteriaList.isEmpty()) {
+            sb.append(" where ");
+            sb.append(Joiner.on(" and ").join(criteriaList));
+        }
 
         // Perform the search
         QueryParam queryParam = QueryUtil.getSortedQueryParam(new QueryParam(sb.toString(), parameterMap), sortCriteria);

docs-core/src/main/java/com/sismics/docs/core/dao/RouteModelDao.java

@@ -12,9 +12,9 @@ import com.sismics.docs.core.util.jpa.QueryUtil;
 import com.sismics.docs.core.util.jpa.SortCriteria;
 import com.sismics.util.context.ThreadLocalContext;
 
-import jakarta.persistence.EntityManager;
-import jakarta.persistence.NoResultException;
-import jakarta.persistence.Query;
+import javax.persistence.EntityManager;
+import javax.persistence.NoResultException;
+import javax.persistence.Query;
 import java.sql.Timestamp;
 import java.util.*;
 
@@ -145,8 +145,10 @@ public class RouteModelDao {
 
         criteriaList.add("rm.RTM_DELETEDATE_D is null");
 
-        sb.append(" where ");
-        sb.append(Joiner.on(" and ").join(criteriaList));
+        if (!criteriaList.isEmpty()) {
+            sb.append(" where ");
+            sb.append(Joiner.on(" and ").join(criteriaList));
+        }
 
         // Perform the search
         QueryParam queryParam = QueryUtil.getSortedQueryParam(new QueryParam(sb.toString(), parameterMap), sortCriteria);

docs-core/src/main/java/com/sismics/docs/core/dao/RouteStepDao.java

@@ -12,8 +12,8 @@ import com.sismics.docs.core.util.jpa.QueryUtil;
 import com.sismics.docs.core.util.jpa.SortCriteria;
 import com.sismics.util.context.ThreadLocalContext;
 
-import jakarta.persistence.EntityManager;
-import jakarta.persistence.Query;
+import javax.persistence.EntityManager;
+import javax.persistence.Query;
 import java.sql.Timestamp;
 import java.util.*;
 
@@ -90,8 +90,10 @@ public class RouteStepDao {
         }
         criteriaList.add("rs.RTP_DELETEDATE_D is null");
 
-        sb.append(" where ");
-        sb.append(Joiner.on(" and ").join(criteriaList));
+        if (!criteriaList.isEmpty()) {
+            sb.append(" where ");
+            sb.append(Joiner.on(" and ").join(criteriaList));
+        }
 
         // Perform the search
         QueryParam queryParam = QueryUtil.getSortedQueryParam(new QueryParam(sb.toString(), parameterMap), sortCriteria);

docs-core/src/main/java/com/sismics/docs/core/dao/ShareDao.java

@@ -3,8 +3,8 @@ package com.sismics.docs.core.dao;
 import com.sismics.docs.core.model.jpa.Share;
 import com.sismics.util.context.ThreadLocalContext;
 
-import jakarta.persistence.EntityManager;
-import jakarta.persistence.Query;
+import javax.persistence.EntityManager;
+import javax.persistence.Query;
 import java.util.Date;
 import java.util.UUID;
 
@@ -19,6 +19,7 @@ public class ShareDao {
      * 
      * @param share Share
      * @return New ID
+     * @throws Exception
      */
     public String create(Share share) {
         // Create the UUID

docs-core/src/main/java/com/sismics/docs/core/dao/TagDao.java

@@ -13,9 +13,9 @@ import com.sismics.docs.core.util.jpa.QueryUtil;
 import com.sismics.docs.core.util.jpa.SortCriteria;
 import com.sismics.util.context.ThreadLocalContext;
 
-import jakarta.persistence.EntityManager;
-import jakarta.persistence.NoResultException;
-import jakarta.persistence.Query;
+import javax.persistence.EntityManager;
+import javax.persistence.NoResultException;
+import javax.persistence.Query;
 import java.util.*;
 
 /**
@@ -199,8 +199,10 @@ public class TagDao {
 
         criteriaList.add("t.TAG_DELETEDATE_D is null");
 
-        sb.append(" where ");
-        sb.append(Joiner.on(" and ").join(criteriaList));
+        if (!criteriaList.isEmpty()) {
+            sb.append(" where ");
+            sb.append(Joiner.on(" and ").join(criteriaList));
+        }
 
         // Perform the search
         QueryParam queryParam = QueryUtil.getSortedQueryParam(new QueryParam(sb.toString(), parameterMap), sortCriteria);

docs-core/src/main/java/com/sismics/docs/core/dao/UserDao.java

@@ -1,7 +1,6 @@
 package com.sismics.docs.core.dao;
 
 import com.google.common.base.Joiner;
-import com.google.common.base.Strings;
 import at.favre.lib.crypto.bcrypt.BCrypt;
 import org.joda.time.DateTime;
 import org.slf4j.Logger;
@@ -19,9 +18,9 @@ import com.sismics.docs.core.util.jpa.QueryUtil;
 import com.sismics.docs.core.util.jpa.SortCriteria;
 import com.sismics.util.context.ThreadLocalContext;
 
-import jakarta.persistence.EntityManager;
-import jakarta.persistence.NoResultException;
-import jakarta.persistence.Query;
+import javax.persistence.EntityManager;
+import javax.persistence.NoResultException;
+import javax.persistence.Query;
 import java.sql.Timestamp;
 import java.util.*;
 
@@ -290,7 +289,7 @@ public class UserDao {
     private String hashPassword(String password) {
         int bcryptWork = Constants.DEFAULT_BCRYPT_WORK;
         String envBcryptWork = System.getenv(Constants.BCRYPT_WORK_ENV);
-        if (!Strings.isNullOrEmpty(envBcryptWork)) {
+        if (envBcryptWork != null) {
             try {
                 int envBcryptWorkInt = Integer.parseInt(envBcryptWork);
                 if (envBcryptWorkInt >= 4 && envBcryptWorkInt <= 31) {

docs-core/src/main/java/com/sismics/docs/core/dao/VocabularyDao.java

@@ -3,9 +3,9 @@ package com.sismics.docs.core.dao;
 import com.sismics.docs.core.model.jpa.Vocabulary;
 import com.sismics.util.context.ThreadLocalContext;
 
-import jakarta.persistence.EntityManager;
-import jakarta.persistence.NoResultException;
-import jakarta.persistence.Query;
+import javax.persistence.EntityManager;
+import javax.persistence.NoResultException;
+import javax.persistence.Query;
 import java.util.List;
 import java.util.UUID;
 
@@ -20,6 +20,7 @@ public class VocabularyDao {
      * 
      * @param vocabulary Vocabulary
      * @return New ID
+     * @throws Exception
      */
     public String create(Vocabulary vocabulary) {
         // Create the UUID

docs-core/src/main/java/com/sismics/docs/core/dao/WebhookDao.java

@@ -9,9 +9,9 @@ import com.sismics.docs.core.util.jpa.QueryUtil;
 import com.sismics.docs.core.util.jpa.SortCriteria;
 import com.sismics.util.context.ThreadLocalContext;
 
-import jakarta.persistence.EntityManager;
-import jakarta.persistence.NoResultException;
-import jakarta.persistence.Query;
+import javax.persistence.EntityManager;
+import javax.persistence.NoResultException;
+import javax.persistence.Query;
 import java.sql.Timestamp;
 import java.util.*;
 
@@ -42,9 +42,11 @@ public class WebhookDao {
         }
         criteriaList.add("w.WHK_DELETEDATE_D is null");
 
-        sb.append(" where ");
-        sb.append(Joiner.on(" and ").join(criteriaList));
-
+        if (!criteriaList.isEmpty()) {
+            sb.append(" where ");
+            sb.append(Joiner.on(" and ").join(criteriaList));
+        }
+        
         // Perform the search
         QueryParam queryParam = QueryUtil.getSortedQueryParam(new QueryParam(sb.toString(), parameterMap), sortCriteria);
         @SuppressWarnings("unchecked")

docs-core/src/main/java/com/sismics/docs/core/dao/criteria/DocumentCriteria.java

@@ -1,6 +1,5 @@
 package com.sismics.docs.core.dao.criteria;
 
-import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
@@ -19,7 +18,7 @@ public class DocumentCriteria {
     /**
      * Search query.
      */
-    private String simpleSearch;
+    private String search;
     
     /**
      * Full content search query.
@@ -50,13 +49,13 @@ public class DocumentCriteria {
      * Tag IDs.
      * The first level list will be AND'ed and the second level list will be OR'ed.
      */
-    private List<List<String>> tagIdList = new ArrayList<>();
+    private List<List<String>> tagIdList;
     
     /**
-     * Tag IDs to exclude.
+     * Tag IDs to excluded.
      * The first and second level list will be excluded.
      */
-    private List<List<String>> excludedTagIdList = new ArrayList<>();
+    private List<List<String>> excludedTagIdList;
 
     /**
      * Shared status.
@@ -82,12 +81,7 @@ public class DocumentCriteria {
      * MIME type of a file.
      */
     private String mimeType;
-
-    /**
-     * Titles to include.
-     */
-    private List<String> titleList = new ArrayList<>();
-
+    
     public List<String> getTargetIdList() {
         return targetIdList;
     }
@@ -96,12 +90,12 @@ public class DocumentCriteria {
         this.targetIdList = targetIdList;
     }
 
-    public String getSimpleSearch() {
-        return simpleSearch;
+    public String getSearch() {
+        return search;
     }
 
-    public void setSimpleSearch(String search) {
-        this.simpleSearch = search;
+    public void setSearch(String search) {
+        this.search = search;
     }
 
     public String getFullSearch() {
@@ -132,10 +126,19 @@ public class DocumentCriteria {
         return tagIdList;
     }
 
+    public void setTagIdList(List<List<String>> tagIdList) {
+        this.tagIdList = tagIdList;
+    }
+
     public List<List<String>> getExcludedTagIdList() {
         return excludedTagIdList;
     }
 
+    public DocumentCriteria setExcludedTagIdList(List<List<String>> excludedTagIdList) {
+        this.excludedTagIdList = excludedTagIdList;
+        return this;
+    }
+
     public Boolean getShared() {
         return shared;
     }
@@ -159,7 +162,11 @@ public class DocumentCriteria {
     public void setCreatorId(String creatorId) {
         this.creatorId = creatorId;
     }
- 
+
+    public Boolean getActiveRoute() {
+        return activeRoute;
+    }
+
     public Date getUpdateDateMin() {
         return updateDateMin;
     }
@@ -176,10 +183,6 @@ public class DocumentCriteria {
         this.updateDateMax = updateDateMax;
     }
 
-    public Boolean getActiveRoute() {
-        return activeRoute;
-    }
-
     public void setActiveRoute(Boolean activeRoute) {
         this.activeRoute = activeRoute;
     }
@@ -191,8 +194,4 @@ public class DocumentCriteria {
     public void setMimeType(String mimeType) {
         this.mimeType = mimeType;
     }
-
-    public List<String> getTitleList() {
-        return titleList;
-    }
 }

docs-core/src/main/java/com/sismics/docs/core/dao/dto/RouteStepDto.java

@@ -3,8 +3,8 @@ package com.sismics.docs.core.dao.dto;
 import com.sismics.docs.core.constant.RouteStepType;
 import com.sismics.util.JsonUtil;
 
-import jakarta.json.Json;
-import jakarta.json.JsonObjectBuilder;
+import javax.json.Json;
+import javax.json.JsonObjectBuilder;
 
 /**
  * Route step DTO.

docs-core/src/main/java/com/sismics/docs/core/event/FileDeletedAsyncEvent.java

@@ -13,8 +13,6 @@ public class FileDeletedAsyncEvent extends UserEvent {
      */
     private String fileId;
 
-    private Long fileSize;
-
     public String getFileId() {
         return fileId;
     }
@@ -23,19 +21,10 @@ public class FileDeletedAsyncEvent extends UserEvent {
         this.fileId = fileId;
     }
 
-    public Long getFileSize() {
-        return fileSize;
-    }
-
-    public void setFileSize(Long fileSize) {
-        this.fileSize = fileSize;
-    }
-
     @Override
     public String toString() {
         return MoreObjects.toStringHelper(this)
             .add("fileId", fileId)
-            .add("fileSize", fileSize)
             .toString();
     }
-}
+}

docs-core/src/main/java/com/sismics/docs/core/listener/async/FileDeletedAsyncListener.java

@@ -2,11 +2,8 @@ package com.sismics.docs.core.listener.async;
 
 import com.google.common.eventbus.AllowConcurrentEvents;
 import com.google.common.eventbus.Subscribe;
-import com.sismics.docs.core.dao.UserDao;
 import com.sismics.docs.core.event.FileDeletedAsyncEvent;
 import com.sismics.docs.core.model.context.AppContext;
-import com.sismics.docs.core.model.jpa.File;
-import com.sismics.docs.core.model.jpa.User;
 import com.sismics.docs.core.util.FileUtil;
 import com.sismics.docs.core.util.TransactionUtil;
 import org.slf4j.Logger;
@@ -14,7 +11,7 @@ import org.slf4j.LoggerFactory;
 
 /**
  * Listener on file deleted.
- *
+ * 
  * @author bgamard
  */
 public class FileDeletedAsyncListener {
@@ -25,7 +22,7 @@ public class FileDeletedAsyncListener {
 
     /**
      * File deleted.
-     *
+     * 
      * @param event File deleted event
      * @throws Exception e
      */
@@ -35,24 +32,6 @@ public class FileDeletedAsyncListener {
         if (log.isInfoEnabled()) {
             log.info("File deleted event: " + event.toString());
         }
-        TransactionUtil.handle(() -> {
-            // Update the user quota
-            UserDao userDao = new UserDao();
-            User user = userDao.getById(event.getUserId());
-            if (user != null) {
-                Long fileSize = event.getFileSize();
-
-                if (fileSize.equals(File.UNKNOWN_SIZE)) {
-                    // The file size was not in the database, in this case we need to get from the unencrypted size.
-                    fileSize = FileUtil.getFileSize(event.getFileId(), user);
-                }
-
-                if (! fileSize.equals(File.UNKNOWN_SIZE)) {
-                    user.setStorageCurrent(user.getStorageCurrent() - fileSize);
-                    userDao.updateQuota(user);
-                }
-            }
-        });
 
         // Delete the file from storage
         FileUtil.delete(event.getFileId());

docs-core/src/main/java/com/sismics/docs/core/listener/async/WebhookAsyncListener.java

@@ -86,7 +86,7 @@ public class WebhookAsyncListener {
             }
         });
 
-        RequestBody body = RequestBody.create("{\"event\": \"" + event.name() + "\", \"id\": \"" + id + "\"}", JSON);
+        RequestBody body = RequestBody.create(JSON, "{\"event\": \"" + event.name() + "\", \"id\": \"" + id + "\"}");
 
         for (String webhookUrl : webhookUrlList) {
             Request request = new Request.Builder()

docs-core/src/main/java/com/sismics/docs/core/model/context/AppContext.java

@@ -1,6 +1,5 @@
 package com.sismics.docs.core.model.context;
 
-import com.google.common.base.Strings;
 import com.google.common.collect.Lists;
 import com.google.common.eventbus.AsyncEventBus;
 import com.google.common.eventbus.EventBus;
@@ -9,7 +8,6 @@ import com.sismics.docs.core.dao.UserDao;
 import com.sismics.docs.core.listener.async.*;
 import com.sismics.docs.core.model.jpa.User;
 import com.sismics.docs.core.service.FileService;
-import com.sismics.docs.core.service.FileSizeService;
 import com.sismics.docs.core.service.InboxService;
 import com.sismics.docs.core.util.PdfUtil;
 import com.sismics.docs.core.util.indexing.IndexingHandler;
@@ -66,11 +64,6 @@ public class AppContext {
      */
     private FileService fileService;
 
-    /**
-     * File size service.
-     */
-    private FileSizeService fileSizeService;
-
     /**
      * Asynchronous executors.
      */
@@ -87,7 +80,7 @@ public class AppContext {
             List<Class<? extends IndexingHandler>> indexingHandlerList = Lists.newArrayList(
                     new ClasspathScanner<IndexingHandler>().findClasses(IndexingHandler.class, "com.sismics.docs.core.util.indexing"));
             for (Class<? extends IndexingHandler> handlerClass : indexingHandlerList) {
-                IndexingHandler handler = handlerClass.getDeclaredConstructor().newInstance();
+                IndexingHandler handler = handlerClass.newInstance();
                 if (handler.accept()) {
                     indexingHandler = handler;
                     break;
@@ -108,17 +101,12 @@ public class AppContext {
         inboxService.startAsync();
         inboxService.awaitRunning();
 
-        // Start file size service
-        fileSizeService = new FileSizeService();
-        fileSizeService.startAsync();
-        fileSizeService.awaitRunning();
-
         // Register fonts
         PdfUtil.registerFonts();
 
         // Change the admin password if needed
         String envAdminPassword = System.getenv(Constants.ADMIN_PASSWORD_INIT_ENV);
-        if (!Strings.isNullOrEmpty(envAdminPassword)) {
+        if (envAdminPassword != null) {
             UserDao userDao = new UserDao();
             User adminUser = userDao.getById("admin");
             if (Constants.DEFAULT_ADMIN_PASSWORD.equals(adminUser.getPassword())) {
@@ -129,7 +117,7 @@ public class AppContext {
 
         // Change the admin email if needed
         String envAdminEmail = System.getenv(Constants.ADMIN_EMAIL_INIT_ENV);
-        if (!Strings.isNullOrEmpty(envAdminEmail)) {
+        if (envAdminEmail != null) {
             UserDao userDao = new UserDao();
             User adminUser = userDao.getById("admin");
             if (Constants.DEFAULT_ADMIN_EMAIL.equals(adminUser.getEmail())) {
@@ -249,10 +237,6 @@ public class AppContext {
             fileService.stopAsync();
         }
 
-        if (fileSizeService != null) {
-            fileSizeService.stopAsync();
-        }
-
         instance = null;
     }
 }

docs-core/src/main/java/com/sismics/docs/core/model/jpa/Acl.java

@@ -4,7 +4,7 @@ import com.google.common.base.MoreObjects;
 import com.sismics.docs.core.constant.AclType;
 import com.sismics.docs.core.constant.PermType;
 
-import jakarta.persistence.*;
+import javax.persistence.*;
 import java.util.Date;
 
 /**

docs-core/src/main/java/com/sismics/docs/core/model/jpa/AuditLog.java

@@ -2,12 +2,12 @@ package com.sismics.docs.core.model.jpa;
 
 import java.util.Date;
 
-import jakarta.persistence.Column;
-import jakarta.persistence.Entity;
-import jakarta.persistence.EnumType;
-import jakarta.persistence.Enumerated;
-import jakarta.persistence.Id;
-import jakarta.persistence.Table;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.EnumType;
+import javax.persistence.Enumerated;
+import javax.persistence.Id;
+import javax.persistence.Table;
 
 import com.google.common.base.MoreObjects;
 import com.sismics.docs.core.constant.AuditLogType;

docs-core/src/main/java/com/sismics/docs/core/model/jpa/AuthenticationToken.java

@@ -2,10 +2,10 @@ package com.sismics.docs.core.model.jpa;
 
 import java.util.Date;
 
-import jakarta.persistence.Column;
-import jakarta.persistence.Entity;
-import jakarta.persistence.Id;
-import jakarta.persistence.Table;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Table;
 
 import com.google.common.base.MoreObjects;
 

docs-core/src/main/java/com/sismics/docs/core/model/jpa/BaseFunction.java

@@ -1,9 +1,9 @@
 package com.sismics.docs.core.model.jpa;
 
-import jakarta.persistence.Column;
-import jakarta.persistence.Entity;
-import jakarta.persistence.Id;
-import jakarta.persistence.Table;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Table;
 
 import com.google.common.base.MoreObjects;
 

docs-core/src/main/java/com/sismics/docs/core/model/jpa/Comment.java

@@ -2,10 +2,10 @@ package com.sismics.docs.core.model.jpa;
 
 import java.util.Date;
 
-import jakarta.persistence.Column;
-import jakarta.persistence.Entity;
-import jakarta.persistence.Id;
-import jakarta.persistence.Table;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Table;
 
 import com.google.common.base.MoreObjects;
 

docs-core/src/main/java/com/sismics/docs/core/model/jpa/Config.java

@@ -1,11 +1,11 @@
 package com.sismics.docs.core.model.jpa;
 
-import jakarta.persistence.Column;
-import jakarta.persistence.Entity;
-import jakarta.persistence.EnumType;
-import jakarta.persistence.Enumerated;
-import jakarta.persistence.Id;
-import jakarta.persistence.Table;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.EnumType;
+import javax.persistence.Enumerated;
+import javax.persistence.Id;
+import javax.persistence.Table;
 
 import com.google.common.base.MoreObjects;
 import com.sismics.docs.core.constant.ConfigType;

docs-core/src/main/java/com/sismics/docs/core/model/jpa/Contributor.java

@@ -1,9 +1,9 @@
 package com.sismics.docs.core.model.jpa;
 
-import jakarta.persistence.Column;
-import jakarta.persistence.Entity;
-import jakarta.persistence.Id;
-import jakarta.persistence.Table;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Table;
 
 import com.google.common.base.MoreObjects;
 

docs-core/src/main/java/com/sismics/docs/core/model/jpa/Document.java

@@ -2,10 +2,10 @@ package com.sismics.docs.core.model.jpa;
 
 import com.google.common.base.MoreObjects;
 
-import jakarta.persistence.Column;
-import jakarta.persistence.Entity;
-import jakarta.persistence.Id;
-import jakarta.persistence.Table;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Table;
 import java.util.Date;
 
 /**

docs-core/src/main/java/com/sismics/docs/core/model/jpa/DocumentMetadata.java

@@ -2,10 +2,10 @@ package com.sismics.docs.core.model.jpa;
 
 import com.google.common.base.MoreObjects;
 
-import jakarta.persistence.Column;
-import jakarta.persistence.Entity;
-import jakarta.persistence.Id;
-import jakarta.persistence.Table;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Table;
 import java.io.Serializable;
 
 /**

docs-core/src/main/java/com/sismics/docs/core/model/jpa/DocumentTag.java

@@ -3,10 +3,10 @@ package com.sismics.docs.core.model.jpa;
 import java.io.Serializable;
 import java.util.Date;
 
-import jakarta.persistence.Column;
-import jakarta.persistence.Entity;
-import jakarta.persistence.Id;
-import jakarta.persistence.Table;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Table;
 
 import com.google.common.base.MoreObjects;
 

docs-core/src/main/java/com/sismics/docs/core/model/jpa/File.java

@@ -4,7 +4,7 @@ import com.google.common.base.MoreObjects;
 import com.google.common.base.Strings;
 import com.sismics.util.mime.MimeTypeUtil;
 
-import jakarta.persistence.*;
+import javax.persistence.*;
 import java.util.Date;
 
 /**
@@ -88,14 +88,6 @@ public class File implements Loggable {
     @Column(name = "FIL_LATESTVERSION_B", nullable = false)
     private boolean latestVersion;
 
-    public static final Long UNKNOWN_SIZE = -1L;
-
-    /**
-     * Can be {@link File#UNKNOWN_SIZE} if the size has not been stored in the database when the file has been uploaded
-     */
-    @Column(name = "FIL_SIZE_N", nullable = false)
-    private Long size;
-
     /**
      * Private key to decrypt the file.
      * Not saved to database, of course.
@@ -212,18 +204,6 @@ public class File implements Loggable {
         return this;
     }
 
-    /**
-     * Can return {@link File#UNKNOWN_SIZE} if the file size is not stored in the database.
-     */
-    public Long getSize() {
-        return size;
-    }
-
-    public File setSize(Long size) {
-        this.size = size;
-        return this;
-    }
-
     @Override
     public String toString() {
         return MoreObjects.toStringHelper(this)

docs-core/src/main/java/com/sismics/docs/core/model/jpa/Group.java

@@ -2,10 +2,10 @@ package com.sismics.docs.core.model.jpa;
 
 import java.util.Date;
 
-import jakarta.persistence.Column;
-import jakarta.persistence.Entity;
-import jakarta.persistence.Id;
-import jakarta.persistence.Table;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Table;
 
 import com.google.common.base.MoreObjects;
 

docs-core/src/main/java/com/sismics/docs/core/model/jpa/Metadata.java

@@ -3,7 +3,7 @@ package com.sismics.docs.core.model.jpa;
 import com.google.common.base.MoreObjects;
 import com.sismics.docs.core.constant.MetadataType;
 
-import jakarta.persistence.*;
+import javax.persistence.*;
 import java.util.Date;
 
 /**

docs-core/src/main/java/com/sismics/docs/core/model/jpa/PasswordRecovery.java

@@ -2,10 +2,10 @@ package com.sismics.docs.core.model.jpa;
 
 import com.google.common.base.MoreObjects;
 
-import jakarta.persistence.Column;
-import jakarta.persistence.Entity;
-import jakarta.persistence.Id;
-import jakarta.persistence.Table;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Table;
 import java.util.Date;
 
 /**

docs-core/src/main/java/com/sismics/docs/core/model/jpa/Relation.java

@@ -2,10 +2,10 @@ package com.sismics.docs.core.model.jpa;
 
 import java.util.Date;
 
-import jakarta.persistence.Column;
-import jakarta.persistence.Entity;
-import jakarta.persistence.Id;
-import jakarta.persistence.Table;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Table;
 
 import com.google.common.base.MoreObjects;
 

docs-core/src/main/java/com/sismics/docs/core/model/jpa/Role.java

@@ -2,10 +2,10 @@ package com.sismics.docs.core.model.jpa;
 
 import java.util.Date;
 
-import jakarta.persistence.Column;
-import jakarta.persistence.Entity;
-import jakarta.persistence.Id;
-import jakarta.persistence.Table;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Table;
 
 import com.google.common.base.MoreObjects;
 

docs-core/src/main/java/com/sismics/docs/core/model/jpa/RoleBaseFunction.java

@@ -2,10 +2,10 @@ package com.sismics.docs.core.model.jpa;
 
 import java.util.Date;
 
-import jakarta.persistence.Column;
-import jakarta.persistence.Entity;
-import jakarta.persistence.Id;
-import jakarta.persistence.Table;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Table;
 
 import com.google.common.base.MoreObjects;
 

docs-core/src/main/java/com/sismics/docs/core/model/jpa/Route.java

@@ -2,10 +2,10 @@ package com.sismics.docs.core.model.jpa;
 
 import com.google.common.base.MoreObjects;
 
-import jakarta.persistence.Column;
-import jakarta.persistence.Entity;
-import jakarta.persistence.Id;
-import jakarta.persistence.Table;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Table;
 import java.util.Date;
 
 /**

docs-core/src/main/java/com/sismics/docs/core/model/jpa/RouteModel.java

@@ -2,10 +2,10 @@ package com.sismics.docs.core.model.jpa;
 
 import com.google.common.base.MoreObjects;
 
-import jakarta.persistence.Column;
-import jakarta.persistence.Entity;
-import jakarta.persistence.Id;
-import jakarta.persistence.Table;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Table;
 import java.util.Date;
 
 /**

docs-core/src/main/java/com/sismics/docs/core/model/jpa/RouteStep.java

@@ -4,7 +4,7 @@ import com.google.common.base.MoreObjects;
 import com.sismics.docs.core.constant.RouteStepTransition;
 import com.sismics.docs.core.constant.RouteStepType;
 
-import jakarta.persistence.*;
+import javax.persistence.*;
 import java.util.Date;
 
 /**

docs-core/src/main/java/com/sismics/docs/core/model/jpa/Share.java

@@ -2,10 +2,10 @@ package com.sismics.docs.core.model.jpa;
 
 import java.util.Date;
 
-import jakarta.persistence.Column;
-import jakarta.persistence.Entity;
-import jakarta.persistence.Id;
-import jakarta.persistence.Table;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Table;
 
 import com.google.common.base.MoreObjects;
 

docs-core/src/main/java/com/sismics/docs/core/model/jpa/Tag.java

@@ -2,10 +2,10 @@ package com.sismics.docs.core.model.jpa;
 
 import java.util.Date;
 
-import jakarta.persistence.Column;
-import jakarta.persistence.Entity;
-import jakarta.persistence.Id;
-import jakarta.persistence.Table;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Table;
 
 import com.google.common.base.MoreObjects;
 

docs-core/src/main/java/com/sismics/docs/core/model/jpa/User.java

@@ -2,10 +2,10 @@ package com.sismics.docs.core.model.jpa;
 
 import com.google.common.base.MoreObjects;
 
-import jakarta.persistence.Column;
-import jakarta.persistence.Entity;
-import jakarta.persistence.Id;
-import jakarta.persistence.Table;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Table;
 import java.util.Date;
 
 /**

docs-core/src/main/java/com/sismics/docs/core/model/jpa/UserGroup.java

@@ -3,10 +3,10 @@ package com.sismics.docs.core.model.jpa;
 import java.io.Serializable;
 import java.util.Date;
 
-import jakarta.persistence.Column;
-import jakarta.persistence.Entity;
-import jakarta.persistence.Id;
-import jakarta.persistence.Table;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Table;
 
 import com.google.common.base.MoreObjects;
 

docs-core/src/main/java/com/sismics/docs/core/model/jpa/Vocabulary.java

@@ -1,9 +1,9 @@
 package com.sismics.docs.core.model.jpa;
 
-import jakarta.persistence.Column;
-import jakarta.persistence.Entity;
-import jakarta.persistence.Id;
-import jakarta.persistence.Table;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Table;
 
 import com.google.common.base.MoreObjects;
 

docs-core/src/main/java/com/sismics/docs/core/model/jpa/Webhook.java

@@ -3,7 +3,7 @@ package com.sismics.docs.core.model.jpa;
 import com.google.common.base.MoreObjects;
 import com.sismics.docs.core.constant.WebhookEvent;
 
-import jakarta.persistence.*;
+import javax.persistence.*;
 import java.util.Date;
 
 /**

docs-core/src/main/java/com/sismics/docs/core/service/FileService.java

@@ -69,18 +69,13 @@ public class FileService extends AbstractScheduledService {
         return Scheduler.newFixedDelaySchedule(0, 5, TimeUnit.SECONDS);
     }
 
-    public Path createTemporaryFile() throws IOException {
-        return createTemporaryFile(null);
-    }
-
     /**
      * Create a temporary file.
      *
-     * @param name Wanted file name
      * @return New temporary file
      */
-    public Path createTemporaryFile(String name) throws IOException {
-        Path path = Files.createTempFile("sismics_docs", name);
+    public Path createTemporaryFile() throws IOException {
+        Path path = Files.createTempFile("sismics_docs", null);
         referenceSet.add(new TemporaryPathReference(path, referenceQueue));
         return path;
     }

docs-core/src/main/java/com/sismics/docs/core/service/FileSizeService.java

@@ -1,78 +0,0 @@
-package com.sismics.docs.core.service;
-
-import com.google.common.util.concurrent.AbstractScheduledService;
-import com.sismics.docs.core.dao.FileDao;
-import com.sismics.docs.core.dao.UserDao;
-import com.sismics.docs.core.model.jpa.File;
-import com.sismics.docs.core.model.jpa.User;
-import com.sismics.docs.core.util.FileUtil;
-import com.sismics.docs.core.util.TransactionUtil;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.util.List;
-import java.util.concurrent.TimeUnit;
-
-/**
- * Service that retrieve files sizes when they are not in the database.
- */
-public class FileSizeService extends AbstractScheduledService {
-    /**
-     * Logger.
-     */
-    private static final Logger log = LoggerFactory.getLogger(FileSizeService.class);
-
-    public FileSizeService() {
-    }
-
-    @Override
-    protected void startUp() {
-        log.info("File size service starting up");
-    }
-
-    @Override
-    protected void shutDown() {
-        log.info("File size service shutting down");
-    }
-
-    private static final int BATCH_SIZE = 30;
-    
-    @Override
-    protected void runOneIteration() {
-        try {
-            TransactionUtil.handle(() -> {
-                FileDao fileDao = new FileDao();
-                List<File> files = fileDao.getFilesWithUnknownSize(BATCH_SIZE);
-                for(File file : files) {
-                    processFile(file);
-                }
-                if(files.size() < BATCH_SIZE) {
-                    log.info("No more file to process, stopping the service");
-                    stopAsync();
-                }
-            });
-        } catch (Throwable e) {
-            log.error("Exception during file service iteration", e);
-        }
-    }
-
-    void processFile(File file) {
-        UserDao userDao = new UserDao();
-        User user = userDao.getById(file.getUserId());
-        if(user == null) {
-            return;
-        }
-
-        long fileSize = FileUtil.getFileSize(file.getId(), user);
-        if(fileSize != File.UNKNOWN_SIZE){
-            FileDao fileDao = new FileDao();
-            file.setSize(fileSize);
-            fileDao.update(file);
-        }
-    }
-
-    @Override
-    protected Scheduler scheduler() {
-        return Scheduler.newFixedDelaySchedule(0, 1, TimeUnit.MINUTES);
-    }
-}

docs-core/src/main/java/com/sismics/docs/core/service/InboxService.java

@@ -1,11 +1,14 @@
 package com.sismics.docs.core.service;
 
+import com.google.common.collect.Lists;
+import com.google.common.collect.Sets;
 import com.google.common.util.concurrent.AbstractScheduledService;
 import com.sismics.docs.core.constant.ConfigType;
 import com.sismics.docs.core.dao.TagDao;
 import com.sismics.docs.core.dao.criteria.TagCriteria;
 import com.sismics.docs.core.dao.dto.TagDto;
 import com.sismics.docs.core.event.DocumentCreatedAsyncEvent;
+import com.sismics.docs.core.model.jpa.Config;
 import com.sismics.docs.core.model.jpa.Document;
 import com.sismics.docs.core.model.jpa.Tag;
 import com.sismics.docs.core.util.ConfigUtil;
@@ -15,7 +18,7 @@ import com.sismics.docs.core.util.TransactionUtil;
 import com.sismics.docs.core.util.jpa.SortCriteria;
 import com.sismics.util.EmailUtil;
 import com.sismics.util.context.ThreadLocalContext;
-import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -82,7 +85,7 @@ public class InboxService extends AbstractScheduledService {
             lastSyncDate = new Date();
             lastSyncMessageCount = 0;
             try {
-                Map<String, String> tagsNameToId = getAllTags();
+                HashMap<String, String> tagsNameToId = getAllTags();
 
                 inbox = openInbox();
                 Message[] messages = inbox.search(new FlagTerm(new Flags(Flags.Flag.SEEN), false));
@@ -156,7 +159,6 @@ public class InboxService extends AbstractScheduledService {
         String port = ConfigUtil.getConfigStringValue(ConfigType.INBOX_PORT);
         properties.put("mail.imap.host", ConfigUtil.getConfigStringValue(ConfigType.INBOX_HOSTNAME));
         properties.put("mail.imap.port", port);
-        properties.setProperty("mail.imap.starttls.enable", ConfigUtil.getConfigStringValue(ConfigType.INBOX_STARTTLS).toString());
         boolean isSsl = "993".equals(port);
         properties.put("mail.imap.ssl.enable", String.valueOf(isSsl));
         properties.setProperty("mail.imap.socketFactory.class",
@@ -190,7 +192,7 @@ public class InboxService extends AbstractScheduledService {
      * @param message Message
      * @throws Exception e
      */
-    private void importMessage(Message message, Map<String, String> tags) throws Exception {
+    private void importMessage(Message message, HashMap<String, String> tags) throws Exception {
         log.info("Importing message: " + message.getSubject());
 
         // Parse the mail
@@ -271,16 +273,16 @@ public class InboxService extends AbstractScheduledService {
     /**
      * Fetches a HashMap with all tag names as keys and their respective ids as values.
      *
-     * @return Map with all tags or null if not enabled
+     * @return HashMap with all tags or null if not enabled
      */
-    private Map<String, String> getAllTags() {
+    private HashMap<String, String> getAllTags() {
         if (!ConfigUtil.getConfigBooleanValue(ConfigType.INBOX_AUTOMATIC_TAGS)) {
             return null;
         }
         TagDao tagDao = new TagDao();
         List<TagDto> tags = tagDao.findByCriteria(new TagCriteria().setTargetIdList(null), new SortCriteria(1, true));
 
-        Map<String, String> tagsNameToId = new HashMap<>();
+        HashMap<String, String> tagsNameToId = new HashMap<>();
         for (TagDto tagDto : tags) {
             tagsNameToId.put(tagDto.getName(), tagDto.getId());
         }

docs-core/src/main/java/com/sismics/docs/core/util/ActionUtil.java

@@ -9,7 +9,7 @@ import com.sismics.docs.core.util.action.RemoveTagAction;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import jakarta.json.JsonObject;
+import javax.json.JsonObject;
 
 /**
  * Action utilities.

docs-core/src/main/java/com/sismics/docs/core/util/AuditLogUtil.java

@@ -6,7 +6,7 @@ import com.sismics.docs.core.model.jpa.AuditLog;
 import com.sismics.docs.core.model.jpa.Loggable;
 import com.sismics.util.context.ThreadLocalContext;
 
-import jakarta.persistence.EntityManager;
+import javax.persistence.EntityManager;
 
 /**
  * Audit log utilities.

docs-core/src/main/java/com/sismics/docs/core/util/ConfigUtil.java

@@ -8,12 +8,13 @@ import java.util.ResourceBundle;
 
 /**
  * Configuration parameter utilities.
- *
+ * 
+ * @author jtremeaux
  */
 public class ConfigUtil {
     /**
      * Returns the textual value of a configuration parameter.
-     *
+     * 
      * @param configType Type of the configuration parameter
      * @return Textual value of the configuration parameter
      * @throws IllegalStateException Configuration parameter undefined
@@ -29,7 +30,7 @@ public class ConfigUtil {
 
     /**
      * Returns the configuration resource bundle.
-     *
+     * 
      * @return Resource bundle
      */
     public static ResourceBundle getConfigBundle() {
@@ -38,14 +39,14 @@ public class ConfigUtil {
 
     /**
      * Returns the integer value of a configuration parameter.
-     *
+     * 
      * @param configType Type of the configuration parameter
      * @return Integer value of the configuration parameter
      * @throws IllegalStateException Configuration parameter undefined
      */
     public static int getConfigIntegerValue(ConfigType configType) {
         String value = getConfigStringValue(configType);
-
+        
         return Integer.parseInt(value);
     }
 
@@ -64,28 +65,14 @@ public class ConfigUtil {
 
     /**
      * Returns the boolean value of a configuration parameter.
-     *
+     * 
      * @param configType Type of the configuration parameter
      * @return Boolean value of the configuration parameter
      * @throws IllegalStateException Configuration parameter undefined
      */
     public static boolean getConfigBooleanValue(ConfigType configType) {
         String value = getConfigStringValue(configType);
+        
         return Boolean.parseBoolean(value);
     }
-
-    /**
-     * Returns the boolean value of a configuration parameter with a default value.
-     *
-     * @param configType Type of the configuration parameter
-     * @param defaultValue Default value to return if the configuration parameter is undefined
-     * @return Boolean value of the configuration parameter
-     */
-    public static boolean getConfigBooleanValue(ConfigType configType, boolean defaultValue) {
-        try {
-            return getConfigBooleanValue(configType);
-        } catch (IllegalStateException e) {
-            return defaultValue;
-        }
-    }
 }

docs-core/src/main/java/com/sismics/docs/core/util/DirectoryUtil.java

@@ -5,7 +5,7 @@ import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 
-import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang.StringUtils;
 
 import com.sismics.util.EnvironmentUtil;
 

docs-core/src/main/java/com/sismics/docs/core/util/FileUtil.java

@@ -1,5 +1,6 @@
 package com.sismics.docs.core.util;
 
+import com.google.common.base.Charsets;
 import com.google.common.base.Strings;
 import com.google.common.collect.Lists;
 import com.google.common.io.CharStreams;
@@ -16,10 +17,7 @@ import com.sismics.util.Scalr;
 import com.sismics.util.context.ThreadLocalContext;
 import com.sismics.util.io.InputStreamReaderThread;
 import com.sismics.util.mime.MimeTypeUtil;
-import org.apache.commons.io.IOUtils;
-import org.apache.commons.io.input.CountingInputStream;
-import org.apache.commons.io.output.NullOutputStream;
-import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -30,7 +28,6 @@ import java.awt.image.BufferedImage;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
-import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.*;
@@ -49,7 +46,7 @@ public class FileUtil {
     /**
      * File ID of files currently being processed.
      */
-    private static final Set<String> processingFileSet = Collections.synchronizedSet(new HashSet<>());
+    private static Set<String> processingFileSet = Collections.synchronizedSet(new HashSet<>());
     
     /**
      * Optical character recognition on an image.
@@ -79,7 +76,7 @@ public class FileUtil {
 
         // Consume the data as text
         try (InputStream is = process.getInputStream()) {
-            return CharStreams.toString(new InputStreamReader(is, StandardCharsets.UTF_8));
+            return CharStreams.toString(new InputStreamReader(is, Charsets.UTF_8));
         }
     }
 
@@ -152,7 +149,6 @@ public class FileUtil {
         file.setName(StringUtils.abbreviate(name, 200));
         file.setMimeType(mimeType);
         file.setUserId(userId);
-        file.setSize(fileSize);
 
         // Get files of this document
         FileDao fileDao = new FileDao();
@@ -244,31 +240,4 @@ public class FileUtil {
     public static boolean isProcessingFile(String fileId) {
         return processingFileSet.contains(fileId);
     }
-
-    /**
-     * Get the size of a file on disk.
-     *
-     * @param fileId the file id
-     * @param user   the file owner
-     * @return the size or -1 if something went wrong
-     */
-    public static long getFileSize(String fileId, User user) {
-        // To get the size we copy the decrypted content into a null output stream
-        // and count the copied byte size.
-        Path storedFile = DirectoryUtil.getStorageDirectory().resolve(fileId);
-        if (! Files.exists(storedFile)) {
-            log.debug("File does not exist " + fileId);
-            return File.UNKNOWN_SIZE;
-        }
-        try (InputStream fileInputStream = Files.newInputStream(storedFile);
-             InputStream inputStream = EncryptionUtil.decryptInputStream(fileInputStream, user.getPrivateKey());
-             CountingInputStream countingInputStream = new CountingInputStream(inputStream);
-        ) {
-            IOUtils.copy(countingInputStream, NullOutputStream.NULL_OUTPUT_STREAM);
-            return countingInputStream.getByteCount();
-        } catch (Exception e) {
-            log.debug("Can't find size of file " + fileId, e);
-            return File.UNKNOWN_SIZE;
-        }
-    }
 }

docs-core/src/main/java/com/sismics/docs/core/util/MetadataUtil.java

@@ -10,9 +10,9 @@ import com.sismics.docs.core.dao.dto.MetadataDto;
 import com.sismics.docs.core.model.jpa.DocumentMetadata;
 import com.sismics.docs.core.util.jpa.SortCriteria;
 
-import jakarta.json.Json;
-import jakarta.json.JsonArrayBuilder;
-import jakarta.json.JsonObjectBuilder;
+import javax.json.Json;
+import javax.json.JsonArrayBuilder;
+import javax.json.JsonObjectBuilder;
 import java.text.MessageFormat;
 import java.util.List;
 import java.util.Map;

docs-core/src/main/java/com/sismics/docs/core/util/RoutingUtil.java

@@ -19,10 +19,10 @@ import com.sismics.docs.core.model.jpa.Document;
 import com.sismics.docs.core.model.jpa.RouteModel;
 import com.sismics.util.context.ThreadLocalContext;
 
-import jakarta.json.Json;
-import jakarta.json.JsonArray;
-import jakarta.json.JsonObject;
-import jakarta.json.JsonReader;
+import javax.json.Json;
+import javax.json.JsonArray;
+import javax.json.JsonObject;
+import javax.json.JsonReader;
 import java.io.StringReader;
 import java.util.List;
 

docs-core/src/main/java/com/sismics/docs/core/util/TagUtil.java

@@ -1,9 +1,8 @@
-package com.sismics.docs.rest.util;
+package com.sismics.docs.core.util;
 
+import com.google.common.collect.Lists;
 import com.sismics.docs.core.dao.dto.TagDto;
 
-import java.util.ArrayList;
-import java.util.Collections;
 import java.util.List;
 
 /**
@@ -13,14 +12,14 @@ import java.util.List;
  */
 public class TagUtil {
     /**
-     * Recursively find children of a tag.
+     * Recursively find children of a tags.
      *
      * @param parentTagDto Parent tag
      * @param allTagDtoList List of all tags
      * @return Children tags
      */
     public static List<TagDto> findChildren(TagDto parentTagDto, List<TagDto> allTagDtoList) {
-        List<TagDto> childrenTagDtoList = new ArrayList<>();
+        List<TagDto> childrenTagDtoList = Lists.newArrayList();
 
         for (TagDto tagDto : allTagDtoList) {
             if (parentTagDto.getId().equals(tagDto.getParentId())) {
@@ -33,17 +32,17 @@ public class TagUtil {
     }
 
     /**
-     * Find tags by name (start with, ignore case).
+     * Find tags by name (start with).
      *
      * @param name Name
      * @param allTagDtoList List of all tags
      * @return List of filtered tags
      */
     public static List<TagDto> findByName(String name, List<TagDto> allTagDtoList) {
-        if (name.isEmpty()) {
-            return Collections.emptyList();
+        List<TagDto> tagDtoList = Lists.newArrayList();
+        if (name == null || name.isEmpty()) {
+            return tagDtoList;
         }
-        List<TagDto> tagDtoList = new ArrayList<>();
         name = name.toLowerCase();
         for (TagDto tagDto : allTagDtoList) {
             if (tagDto.getName().toLowerCase().startsWith(name)) {

docs-core/src/main/java/com/sismics/docs/core/util/TransactionUtil.java

@@ -5,8 +5,8 @@ import com.sismics.util.jpa.EMF;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import jakarta.persistence.EntityManager;
-import jakarta.persistence.EntityTransaction;
+import javax.persistence.EntityManager;
+import javax.persistence.EntityTransaction;
 
 /**
  * Database transaction utils.

docs-core/src/main/java/com/sismics/docs/core/util/action/Action.java

@@ -2,7 +2,7 @@ package com.sismics.docs.core.util.action;
 
 import com.sismics.docs.core.dao.dto.DocumentDto;
 
-import jakarta.json.JsonObject;
+import javax.json.JsonObject;
 
 /**
  * Base action interface.

docs-core/src/main/java/com/sismics/docs/core/util/action/AddTagAction.java

@@ -6,7 +6,7 @@ import com.sismics.docs.core.dao.criteria.TagCriteria;
 import com.sismics.docs.core.dao.dto.DocumentDto;
 import com.sismics.docs.core.dao.dto.TagDto;
 
-import jakarta.json.JsonObject;
+import javax.json.JsonObject;
 import java.util.List;
 import java.util.Set;
 

docs-core/src/main/java/com/sismics/docs/core/util/action/ProcessFilesAction.java

@@ -13,7 +13,7 @@ import com.sismics.util.context.ThreadLocalContext;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import jakarta.json.JsonObject;
+import javax.json.JsonObject;
 import java.nio.file.Path;
 import java.util.List;
 

docs-core/src/main/java/com/sismics/docs/core/util/action/RemoveTagAction.java

@@ -6,7 +6,7 @@ import com.sismics.docs.core.dao.criteria.TagCriteria;
 import com.sismics.docs.core.dao.dto.DocumentDto;
 import com.sismics.docs.core.dao.dto.TagDto;
 
-import jakarta.json.JsonObject;
+import javax.json.JsonObject;
 import java.util.List;
 import java.util.Set;
 

docs-core/src/main/java/com/sismics/docs/core/util/action/TagAction.java

@@ -4,7 +4,7 @@ import com.sismics.docs.core.dao.TagDao;
 import com.sismics.docs.core.dao.criteria.TagCriteria;
 import com.sismics.docs.core.dao.dto.TagDto;
 
-import jakarta.json.JsonObject;
+import javax.json.JsonObject;
 import java.util.List;
 
 /**

docs-core/src/main/java/com/sismics/docs/core/util/authentication/AuthenticationUtil.java

@@ -20,7 +20,7 @@ public class AuthenticationUtil {
 
                     .map(clazz -> {
                 try {
-                    return clazz.getDeclaredConstructor().newInstance();
+                    return clazz.newInstance();
                 } catch (Exception e) {
                     throw new RuntimeException(e);
                 }

docs-core/src/main/java/com/sismics/docs/core/util/authentication/LdapAuthenticationHandler.java

@@ -8,14 +8,16 @@ import com.sismics.docs.core.model.jpa.Config;
 import com.sismics.docs.core.model.jpa.User;
 import com.sismics.docs.core.util.ConfigUtil;
 import com.sismics.util.ClasspathScanner;
+import org.apache.commons.pool.impl.GenericObjectPool;
 import org.apache.directory.api.ldap.model.cursor.EntryCursor;
 import org.apache.directory.api.ldap.model.entry.Attribute;
 import org.apache.directory.api.ldap.model.entry.Entry;
 import org.apache.directory.api.ldap.model.entry.Value;
 import org.apache.directory.api.ldap.model.message.SearchScope;
-import org.apache.directory.ldap.client.api.LdapConnection;
+import org.apache.directory.ldap.client.api.DefaultLdapConnectionFactory;
 import org.apache.directory.ldap.client.api.LdapConnectionConfig;
-import org.apache.directory.ldap.client.api.LdapNetworkConnection;
+import org.apache.directory.ldap.client.api.LdapConnectionPool;
+import org.apache.directory.ldap.client.api.ValidatingPoolableLdapConnectionFactory;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -34,41 +36,62 @@ public class LdapAuthenticationHandler implements AuthenticationHandler {
     private static final Logger log = LoggerFactory.getLogger(LdapAuthenticationHandler.class);
 
     /**
-     * Get a LDAP connection.
-     * @return LdapConnection
+     * LDAP connection pool.
      */
-    private LdapConnection getConnection() {
+    private static LdapConnectionPool pool;
+
+    /**
+     * Reset the LDAP pool.
+     */
+    public static void reset() {
+        if (pool != null) {
+            try {
+                pool.close();
+            } catch (Exception e) {
+                // NOP
+            }
+        }
+        pool = null;
+    }
+
+    /**
+     * Initialize the LDAP pool.
+     */
+    private static void init() {
         ConfigDao configDao = new ConfigDao();
         Config ldapEnabled = configDao.getById(ConfigType.LDAP_ENABLED);
-        if (ldapEnabled == null || !Boolean.parseBoolean(ldapEnabled.getValue())) {
-            return null;
+        if (pool != null || ldapEnabled == null || !Boolean.parseBoolean(ldapEnabled.getValue())) {
+            return;
         }
 
         LdapConnectionConfig config = new LdapConnectionConfig();
         config.setLdapHost(ConfigUtil.getConfigStringValue(ConfigType.LDAP_HOST));
         config.setLdapPort(ConfigUtil.getConfigIntegerValue(ConfigType.LDAP_PORT));
-        config.setUseSsl(ConfigUtil.getConfigBooleanValue(ConfigType.LDAP_USESSL));
         config.setName(ConfigUtil.getConfigStringValue(ConfigType.LDAP_ADMIN_DN));
         config.setCredentials(ConfigUtil.getConfigStringValue(ConfigType.LDAP_ADMIN_PASSWORD));
 
-        return new LdapNetworkConnection(config);
+        DefaultLdapConnectionFactory factory = new DefaultLdapConnectionFactory(config);
+        GenericObjectPool.Config poolConfig = new GenericObjectPool.Config();
+        poolConfig.whenExhaustedAction = GenericObjectPool.WHEN_EXHAUSTED_GROW;
+        poolConfig.maxWait = 500;
+        pool = new LdapConnectionPool(new ValidatingPoolableLdapConnectionFactory(factory), poolConfig);
     }
 
     @Override
     public User authenticate(String username, String password) {
+        init();
+        if (pool == null) {
+            return null;
+        }
+
         // Fetch and authenticate the user
         Entry userEntry;
-        try (LdapConnection ldapConnection = getConnection()) {
-            if (ldapConnection == null) {
-                return null;
-            }
-            ldapConnection.bind();
-
-            EntryCursor cursor = ldapConnection.search(ConfigUtil.getConfigStringValue(ConfigType.LDAP_BASE_DN),
+        try {
+            EntryCursor cursor = pool.getConnection().search(ConfigUtil.getConfigStringValue(ConfigType.LDAP_BASE_DN),
                     ConfigUtil.getConfigStringValue(ConfigType.LDAP_FILTER).replace("USERNAME", username), SearchScope.SUBTREE);
             if (cursor.next()) {
                 userEntry = cursor.get();
-                ldapConnection.bind(userEntry.getDn(), password);
+                pool.getConnection().bind(userEntry.getDn(), password);
             } else {
                 // User not found
                 return null;
@@ -91,7 +114,7 @@ public class LdapAuthenticationHandler implements AuthenticationHandler {
             if (mailAttribute == null || mailAttribute.get() == null) {
                 user.setEmail(ConfigUtil.getConfigStringValue(ConfigType.LDAP_DEFAULT_EMAIL));
             } else {
-                Value value = mailAttribute.get();
+                Value<?> value = mailAttribute.get();
                 user.setEmail(value.getString());
             }
             user.setStorageQuota(ConfigUtil.getConfigLongValue(ConfigType.LDAP_DEFAULT_STORAGE));

docs-core/src/main/java/com/sismics/docs/core/util/format/FormatHandlerUtil.java

@@ -26,12 +26,12 @@ public class FormatHandlerUtil {
     public static FormatHandler find(String mimeType) {
         try {
             for (Class<? extends FormatHandler> formatHandlerClass : FORMAT_HANDLERS) {
-                FormatHandler formatHandler = formatHandlerClass.getDeclaredConstructor().newInstance();
+                FormatHandler formatHandler = formatHandlerClass.newInstance();
                 if (formatHandler.accept(mimeType)) {
                     return formatHandler;
                 }
             }
-        } catch (Exception e) {
+        } catch (InstantiationException | IllegalAccessException e) {
             return null;
         }
 

docs-core/src/main/java/com/sismics/docs/core/util/format/ImageFormatHandler.java

@@ -3,8 +3,6 @@ package com.sismics.docs.core.util.format;
 import com.google.common.io.Closer;
 import com.sismics.docs.core.constant.Constants;
 import com.sismics.docs.core.util.FileUtil;
-import com.sismics.docs.core.util.ConfigUtil;
-import com.sismics.docs.core.constant.ConfigType;
 import com.sismics.util.mime.MimeType;
 import org.apache.pdfbox.io.MemoryUsageSetting;
 import org.apache.pdfbox.pdmodel.PDDocument;
@@ -24,6 +22,7 @@ import java.nio.file.Path;
 /**
  * Image format handler.
  *
+ * @author bgamard
  */
 public class ImageFormatHandler implements FormatHandler {
     /**
@@ -46,7 +45,7 @@ public class ImageFormatHandler implements FormatHandler {
 
     @Override
     public String extractContent(String language, Path file) throws Exception {
-        if (language == null || !ConfigUtil.getConfigBooleanValue(ConfigType.OCR_ENABLED, true)) {
+        if (language == null) {
             return null;
         }
 

docs-core/src/main/java/com/sismics/docs/core/util/format/PdfFormatHandler.java

@@ -2,8 +2,6 @@ package com.sismics.docs.core.util.format;
 
 import com.google.common.io.Closer;
 import com.sismics.docs.core.util.FileUtil;
-import com.sismics.docs.core.util.ConfigUtil;
-import com.sismics.docs.core.constant.ConfigType;
 import com.sismics.util.mime.MimeType;
 import org.apache.pdfbox.io.MemoryUsageSetting;
 import org.apache.pdfbox.multipdf.PDFMergerUtility;
@@ -55,7 +53,7 @@ public class PdfFormatHandler implements FormatHandler {
         }
 
         // No text content, try to OCR it
-        if (language != null && content != null && content.trim().isEmpty() && ConfigUtil.getConfigBooleanValue(ConfigType.OCR_ENABLED, true)) {
+        if (language != null && content != null && content.trim().isEmpty()) {
             StringBuilder sb = new StringBuilder();
             try (InputStream inputStream = Files.newInputStream(file);
                  PDDocument pdfDocument = PDDocument.load(inputStream)) {

docs-core/src/main/java/com/sismics/docs/core/util/format/PptxFormatHandler.java

@@ -9,7 +9,7 @@ import org.apache.pdfbox.pdmodel.PDPageContentStream;
 import org.apache.pdfbox.pdmodel.common.PDRectangle;
 import org.apache.pdfbox.pdmodel.graphics.image.LosslessFactory;
 import org.apache.pdfbox.pdmodel.graphics.image.PDImageXObject;
-import org.apache.poi.sl.extractor.SlideShowExtractor;
+import org.apache.poi.xslf.extractor.XSLFPowerPointExtractor;
 import org.apache.poi.xslf.usermodel.XMLSlideShow;
 import org.apache.poi.xslf.usermodel.XSLFSlide;
 
@@ -50,7 +50,7 @@ public class PptxFormatHandler implements FormatHandler {
     @Override
     public String extractContent(String language, Path file) throws Exception {
         XMLSlideShow pptx = loadPPtxFile(file);
-        return new SlideShowExtractor<>(pptx).getText();
+        return new XSLFPowerPointExtractor(pptx).getText();
     }
 
     @Override

docs-core/src/main/java/com/sismics/docs/core/util/format/TextPlainFormatHandler.java

@@ -1,5 +1,6 @@
 package com.sismics.docs.core.util.format;
 
+import com.google.common.base.Charsets;
 import com.google.common.io.Closer;
 import com.lowagie.text.*;
 import com.lowagie.text.pdf.PdfWriter;
@@ -10,7 +11,6 @@ import org.apache.pdfbox.pdmodel.PDDocument;
 
 import java.awt.image.BufferedImage;
 import java.io.OutputStream;
-import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Path;
 
@@ -33,7 +33,7 @@ public class TextPlainFormatHandler implements FormatHandler {
         PdfWriter.getInstance(output, pdfOutputStream);
 
         output.open();
-        String content = Files.readString(file, StandardCharsets.UTF_8);
+        String content = new String(Files.readAllBytes(file), Charsets.UTF_8);
         Font font = FontFactory.getFont("LiberationMono-Regular");
         Paragraph paragraph = new Paragraph(content, font);
         paragraph.setAlignment(Element.ALIGN_LEFT);
@@ -46,7 +46,7 @@ public class TextPlainFormatHandler implements FormatHandler {
 
     @Override
     public String extractContent(String language, Path file) throws Exception {
-        return Files.readString(file, StandardCharsets.UTF_8);
+        return new String(Files.readAllBytes(file), "UTF-8");
     }
 
     @Override

docs-core/src/main/java/com/sismics/docs/core/util/format/VideoFormatHandler.java

@@ -1,5 +1,6 @@
 package com.sismics.docs.core.util.format;
 
+import com.google.common.base.Charsets;
 import com.google.common.collect.Lists;
 import com.google.common.io.ByteStreams;
 import com.google.common.io.Closer;
@@ -12,7 +13,6 @@ import javax.imageio.ImageIO;
 import java.awt.image.BufferedImage;
 import java.io.IOException;
 import java.io.InputStream;
-import java.nio.charset.StandardCharsets;
 import java.nio.file.Path;
 import java.util.Arrays;
 import java.util.List;
@@ -65,7 +65,7 @@ public class VideoFormatHandler implements FormatHandler {
 
         // Consume the data as a string
         try (InputStream is = process.getInputStream()) {
-            return new String(ByteStreams.toByteArray(is), StandardCharsets.UTF_8);
+            return new String(ByteStreams.toByteArray(is), Charsets.UTF_8);
         } catch (Exception e) {
             return null;
         }

docs-core/src/main/java/com/sismics/docs/core/util/indexing/LuceneIndexingHandler.java

@@ -26,18 +26,9 @@ import org.apache.lucene.analysis.standard.StandardAnalyzer;
 import org.apache.lucene.document.Field;
 import org.apache.lucene.document.StringField;
 import org.apache.lucene.document.TextField;
-import org.apache.lucene.index.CheckIndex;
-import org.apache.lucene.index.ConcurrentMergeScheduler;
-import org.apache.lucene.index.DirectoryReader;
-import org.apache.lucene.index.IndexWriter;
-import org.apache.lucene.index.IndexWriterConfig;
-import org.apache.lucene.index.Term;
+import org.apache.lucene.index.*;
 import org.apache.lucene.queryparser.simple.SimpleQueryParser;
-import org.apache.lucene.search.BooleanClause;
-import org.apache.lucene.search.BooleanQuery;
-import org.apache.lucene.search.IndexSearcher;
-import org.apache.lucene.search.ScoreDoc;
-import org.apache.lucene.search.TopDocs;
+import org.apache.lucene.search.*;
 import org.apache.lucene.search.highlight.Highlighter;
 import org.apache.lucene.search.highlight.QueryScorer;
 import org.apache.lucene.search.highlight.SimpleHTMLEncoder;
@@ -46,9 +37,9 @@ import org.apache.lucene.search.spell.LuceneDictionary;
 import org.apache.lucene.search.suggest.Lookup;
 import org.apache.lucene.search.suggest.analyzing.FuzzySuggester;
 import org.apache.lucene.store.Directory;
-import org.apache.lucene.store.NIOFSDirectory;
 import org.apache.lucene.store.NoLockFactory;
 import org.apache.lucene.store.RAMDirectory;
+import org.apache.lucene.store.SimpleFSDirectory;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -56,12 +47,7 @@ import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.sql.Timestamp;
-import java.util.ArrayList;
-import java.util.Comparator;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
+import java.util.*;
 
 /**
  * Lucene indexing handler.
@@ -130,7 +116,7 @@ public class LuceneIndexingHandler implements IndexingHandler {
         } else if (luceneStorage.equals("FILE")) {
             Path luceneDirectory = DirectoryUtil.getLuceneDirectory();
             log.info("Using file Lucene storage: {}", luceneDirectory);
-            directory = new NIOFSDirectory(luceneDirectory, NoLockFactory.INSTANCE);
+            directory = new SimpleFSDirectory(luceneDirectory, NoLockFactory.INSTANCE);
         }
 
         // Create an index writer
@@ -256,28 +242,34 @@ public class LuceneIndexingHandler implements IndexingHandler {
 
         StringBuilder sb = new StringBuilder("select distinct d.DOC_ID_C c0, d.DOC_TITLE_C c1, d.DOC_DESCRIPTION_C c2, d.DOC_CREATEDATE_D c3, d.DOC_LANGUAGE_C c4, d.DOC_IDFILE_C, ");
         sb.append(" s.count c5, ");
+        sb.append(" f.count c6, ");
         sb.append(" rs2.RTP_ID_C c7, rs2.RTP_NAME_C, d.DOC_UPDATEDATE_D c8 ");
         sb.append(" from T_DOCUMENT d ");
         sb.append(" left join (SELECT count(s.SHA_ID_C) count, ac.ACL_SOURCEID_C " +
                 "   FROM T_SHARE s, T_ACL ac " +
                 "   WHERE ac.ACL_TARGETID_C = s.SHA_ID_C AND ac.ACL_DELETEDATE_D IS NULL AND " +
-                "         s.SHA_DELETEDATE_D IS NULL group by ac.ACL_SOURCEID_C) s on s.ACL_SOURCEID_C = d.DOC_ID_C ");
+                "         s.SHA_DELETEDATE_D IS NULL group by ac.ACL_SOURCEID_C) s on s.ACL_SOURCEID_C = d.DOC_ID_C " +
+                "  left join (SELECT count(f.FIL_ID_C) count, f.FIL_IDDOC_C " +
+                "   FROM T_FILE f " +
+                "   WHERE f.FIL_DELETEDATE_D is null group by f.FIL_IDDOC_C) f on f.FIL_IDDOC_C = d.DOC_ID_C ");
         sb.append(" left join (select rs.*, rs3.idDocument " +
                 "from T_ROUTE_STEP rs " +
                 "join (select r.RTE_IDDOCUMENT_C idDocument, rs.RTP_IDROUTE_C idRoute, min(rs.RTP_ORDER_N) minOrder from T_ROUTE_STEP rs join T_ROUTE r on r.RTE_ID_C = rs.RTP_IDROUTE_C and r.RTE_DELETEDATE_D is null where rs.RTP_DELETEDATE_D is null and rs.RTP_ENDDATE_D is null group by rs.RTP_IDROUTE_C, r.RTE_IDDOCUMENT_C) rs3 on rs.RTP_IDROUTE_C = rs3.idRoute and rs.RTP_ORDER_N = rs3.minOrder " +
                 "where rs.RTP_IDTARGET_C in (:targetIdList)) rs2 on rs2.idDocument = d.DOC_ID_C ");
 
         // Add search criterias
-        if (!SecurityUtil.skipAclCheck(criteria.getTargetIdList())) {
-            // Read permission is enough for searching
-            sb.append(" left join T_ACL a on a.ACL_TARGETID_C in (:targetIdList) and a.ACL_SOURCEID_C = d.DOC_ID_C and a.ACL_PERM_C = 'READ' and a.ACL_DELETEDATE_D is null ");
-            sb.append(" left join T_DOCUMENT_TAG dta on dta.DOT_IDDOCUMENT_C = d.DOC_ID_C and dta.DOT_DELETEDATE_D is null ");
-            sb.append(" left join T_ACL a2 on a2.ACL_TARGETID_C in (:targetIdList) and a2.ACL_SOURCEID_C = dta.DOT_IDTAG_C and a2.ACL_PERM_C = 'READ' and a2.ACL_DELETEDATE_D is null ");
-            criteriaList.add("(a.ACL_ID_C is not null or a2.ACL_ID_C is not null)");
+        if (criteria.getTargetIdList() != null) {
+            if (!SecurityUtil.skipAclCheck(criteria.getTargetIdList())) {
+                // Read permission is enough for searching
+                sb.append(" left join T_ACL a on a.ACL_TARGETID_C in (:targetIdList) and a.ACL_SOURCEID_C = d.DOC_ID_C and a.ACL_PERM_C = 'READ' and a.ACL_DELETEDATE_D is null ");
+                sb.append(" left join T_DOCUMENT_TAG dta on dta.DOT_IDDOCUMENT_C = d.DOC_ID_C and dta.DOT_DELETEDATE_D is null ");
+                sb.append(" left join T_ACL a2 on a2.ACL_TARGETID_C in (:targetIdList) and a2.ACL_SOURCEID_C = dta.DOT_IDTAG_C and a2.ACL_PERM_C = 'READ' and a2.ACL_DELETEDATE_D is null ");
+                criteriaList.add("(a.ACL_ID_C is not null or a2.ACL_ID_C is not null)");
+            }
+            parameterMap.put("targetIdList", criteria.getTargetIdList());
         }
-        parameterMap.put("targetIdList", criteria.getTargetIdList());
-        if (!Strings.isNullOrEmpty(criteria.getSimpleSearch()) || !Strings.isNullOrEmpty(criteria.getFullSearch())) {
-            documentSearchMap = search(criteria.getSimpleSearch(), criteria.getFullSearch());
+        if (!Strings.isNullOrEmpty(criteria.getSearch()) || !Strings.isNullOrEmpty(criteria.getFullSearch())) {
+            documentSearchMap = search(criteria.getSearch(), criteria.getFullSearch());
             if (documentSearchMap.isEmpty()) {
                 // If the search doesn't find any document, the request should return nothing
                 documentSearchMap.put(UUID.randomUUID().toString(), null);
@@ -303,11 +295,7 @@ public class LuceneIndexingHandler implements IndexingHandler {
             criteriaList.add("d.DOC_UPDATEDATE_D <= :updateDateMax");
             parameterMap.put("updateDateMax", criteria.getUpdateDateMax());
         }
-        if (!criteria.getTitleList().isEmpty()) {
-            criteriaList.add("d.DOC_TITLE_C in :title");
-            parameterMap.put("title", criteria.getTitleList());
-        }
-        if (!criteria.getTagIdList().isEmpty()) {
+        if (criteria.getTagIdList() != null && !criteria.getTagIdList().isEmpty()) {
             int index = 0;
             for (List<String> tagIdList : criteria.getTagIdList()) {
                 List<String> tagCriteriaList = Lists.newArrayList();
@@ -320,7 +308,7 @@ public class LuceneIndexingHandler implements IndexingHandler {
                 criteriaList.add("(" + Joiner.on(" OR ").join(tagCriteriaList) + ")");
             }
         }
-        if (!criteria.getExcludedTagIdList().isEmpty()) {
+        if (criteria.getExcludedTagIdList() != null && !criteria.getExcludedTagIdList().isEmpty()) {
             int index = 0;
             for (List<String> tagIdList : criteria.getExcludedTagIdList()) {
                 List<String> tagCriteriaList = Lists.newArrayList();
@@ -355,8 +343,10 @@ public class LuceneIndexingHandler implements IndexingHandler {
 
         criteriaList.add("d.DOC_DELETEDATE_D is null");
 
-        sb.append(" where ");
-        sb.append(Joiner.on(" and ").join(criteriaList));
+        if (!criteriaList.isEmpty()) {
+            sb.append(" where ");
+            sb.append(Joiner.on(" and ").join(criteriaList));
+        }
 
         // Perform the search
         QueryParam queryParam = new QueryParam(sb.toString(), parameterMap);
@@ -375,6 +365,8 @@ public class LuceneIndexingHandler implements IndexingHandler {
             documentDto.setFileId((String) o[i++]);
             Number shareCount = (Number) o[i++];
             documentDto.setShared(shareCount != null && shareCount.intValue() > 0);
+            Number fileCount = (Number) o[i++];
+            documentDto.setFileCount(fileCount == null ? 0 : fileCount.intValue());
             documentDto.setActiveRoute(o[i++] != null);
             documentDto.setCurrentStepName((String) o[i++]);
             documentDto.setUpdateTimestamp(((Timestamp) o[i]).getTime());
@@ -412,14 +404,14 @@ public class LuceneIndexingHandler implements IndexingHandler {
     /**
      * Fulltext search in files and documents.
      *
-     * @param simpleSearchQuery Search query on metadatas
+     * @param searchQuery Search query on metadatas
      * @param fullSearchQuery Search query on all fields
      * @return Map of document IDs as key and highlight as value
      * @throws Exception e
      */
-    private Map<String, String> search(String simpleSearchQuery, String fullSearchQuery) throws Exception {
+    private Map<String, String> search(String searchQuery, String fullSearchQuery) throws Exception {
         // The fulltext query searches in all fields
-        String searchQuery = simpleSearchQuery + " " + fullSearchQuery;
+        searchQuery = searchQuery + " " + fullSearchQuery;
 
         // Build search query
         Analyzer analyzer = new StandardAnalyzer();

docs-core/src/main/java/com/sismics/docs/core/util/jpa/PaginatedLists.java

@@ -1,6 +1,6 @@
 package com.sismics.docs.core.util.jpa;
 
-import jakarta.persistence.Query;
+import javax.persistence.Query;
 import java.util.List;
 
 /**
@@ -68,7 +68,7 @@ public class PaginatedLists {
     }
 
     /**
-     * Executes a query and returns the data of the current page.
+     * Executes a query and returns the data of the currunt page.
      * 
      * @param paginatedList Paginated list object containing parameters, and into which results are added by side effects
      * @param queryParam Query parameters
@@ -82,6 +82,18 @@ public class PaginatedLists {
         q.setMaxResults(paginatedList.getLimit());
         return q.getResultList();
     }
+    
+    /**
+     * Executes a paginated request with 2 native queries (one to count the number of results, and one to return the page).
+     * 
+     * @param paginatedList Paginated list object containing parameters, and into which results are added by side effects
+     * @param queryParam Query parameters
+     * @return List of results
+     */
+    public static <E> List<Object[]> executePaginatedQuery(PaginatedList<E> paginatedList, QueryParam queryParam) {
+        executeCountQuery(paginatedList, queryParam);
+        return executeResultQuery(paginatedList, queryParam);
+    }
 
     /**
      * Executes a paginated request with 2 native queries (one to count the number of results, and one to return the page).

docs-core/src/main/java/com/sismics/docs/core/util/jpa/QueryUtil.java

@@ -2,8 +2,8 @@ package com.sismics.docs.core.util.jpa;
 
 import java.util.Map.Entry;
 
-import jakarta.persistence.EntityManager;
-import jakarta.persistence.Query;
+import javax.persistence.EntityManager;
+import javax.persistence.Query;
 
 import com.sismics.util.context.ThreadLocalContext;
 

docs-core/src/main/java/com/sismics/util/EmailUtil.java

@@ -17,9 +17,9 @@ import org.jsoup.Jsoup;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import jakarta.json.Json;
-import jakarta.json.JsonObject;
-import jakarta.json.JsonReader;
+import javax.json.Json;
+import javax.json.JsonObject;
+import javax.json.JsonReader;
 import javax.mail.Message;
 import javax.mail.MessagingException;
 import javax.mail.Multipart;
@@ -29,7 +29,6 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.io.StringReader;
 import java.io.StringWriter;
-import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.StandardCopyOption;
@@ -88,12 +87,12 @@ public class EmailUtil {
         try {
             // Build email headers
             HtmlEmail email = new HtmlEmail();
-            email.setCharset(StandardCharsets.UTF_8.name());
+            email.setCharset("UTF-8");
             ConfigDao configDao = new ConfigDao();
 
             // Hostname
             String envHostname = System.getenv(Constants.SMTP_HOSTNAME_ENV);
-            if (Strings.isNullOrEmpty(envHostname)) {
+            if (envHostname == null) {
                 email.setHostName(ConfigUtil.getConfigStringValue(ConfigType.SMTP_HOSTNAME));
             } else {
                 email.setHostName(envHostname);
@@ -102,7 +101,7 @@ public class EmailUtil {
             // Port
             int port = ConfigUtil.getConfigIntegerValue(ConfigType.SMTP_PORT);
             String envPort = System.getenv(Constants.SMTP_PORT_ENV);
-            if (!Strings.isNullOrEmpty(envPort)) {
+            if (envPort != null) {
                 port = Integer.valueOf(envPort);
             }
             email.setSmtpPort(port);
@@ -115,7 +114,7 @@ public class EmailUtil {
             // Username and password
             String envUsername = System.getenv(Constants.SMTP_USERNAME_ENV);
             String envPassword = System.getenv(Constants.SMTP_PASSWORD_ENV);
-            if (Strings.isNullOrEmpty(envUsername) || Strings.isNullOrEmpty(envPassword)) {
+            if (envUsername == null || envPassword == null) {
                 Config usernameConfig = configDao.getById(ConfigType.SMTP_USERNAME);
                 Config passwordConfig = configDao.getById(ConfigType.SMTP_PASSWORD);
                 if (usernameConfig != null && passwordConfig != null) {

docs-core/src/main/java/com/sismics/util/HtmlToPlainText.java

@@ -1,6 +1,6 @@
 package com.sismics.util;
 
-import org.jsoup.internal.StringUtil;
+import org.jsoup.helper.StringUtil;
 import org.jsoup.nodes.Element;
 import org.jsoup.nodes.Node;
 import org.jsoup.nodes.TextNode;
@@ -28,7 +28,7 @@ public class HtmlToPlainText {
     }
 
     // the formatting rules, implemented in a breadth-first DOM traverse
-    static private class FormattingVisitor implements NodeVisitor {
+    private class FormattingVisitor implements NodeVisitor {
         private static final int maxWidth = 80;
         private int width = 0;
         private StringBuilder accum = new StringBuilder(); // holds the accumulated text
@@ -64,7 +64,7 @@ public class HtmlToPlainText {
                 return; // don't accumulate long runs of empty spaces
 
             if (text.length() + width > maxWidth) { // won't fit, needs to wrap
-                String[] words = text.split("\\s+");
+                String words[] = text.split("\\s+");
                 for (int i = 0; i < words.length; i++) {
                     String word = words[i];
                     boolean last = i == words.length - 1;

docs-core/src/main/java/com/sismics/util/ImageUtil.java

@@ -1,5 +1,6 @@
 package com.sismics.util;
 
+import com.google.common.base.Charsets;
 import com.google.common.hash.Hashing;
 
 import javax.imageio.IIOImage;
@@ -12,7 +13,6 @@ import java.awt.image.BufferedImage;
 import java.awt.image.WritableRaster;
 import java.io.IOException;
 import java.io.OutputStream;
-import java.nio.charset.StandardCharsets;
 import java.util.Iterator;
 
 /**
@@ -80,7 +80,7 @@ public class ImageUtil {
         }
 
         return Hashing.md5().hashString(
-                email.trim().toLowerCase(), StandardCharsets.UTF_8)
+                email.trim().toLowerCase(), Charsets.UTF_8)
                 .toString();
     }
 

docs-core/src/main/java/com/sismics/util/JsonUtil.java

@@ -1,7 +1,7 @@
 package com.sismics.util;
 
-import jakarta.json.Json;
-import jakarta.json.JsonValue;
+import javax.json.Json;
+import javax.json.JsonValue;
 
 /**
  * JSON utilities.

docs-core/src/main/java/com/sismics/util/ResourceUtil.java

@@ -8,7 +8,6 @@ import java.io.IOException;
 import java.net.URISyntaxException;
 import java.net.URL;
 import java.net.URLDecoder;
-import java.nio.charset.StandardCharsets;
 import java.text.MessageFormat;
 import java.util.*;
 import java.util.jar.JarEntry;
@@ -54,7 +53,7 @@ public class ResourceUtil {
             
             // Extract the JAR path
             String jarPath = dirUrl.getPath().substring(5, dirUrl.getPath().indexOf("!"));
-            JarFile jar = new JarFile(URLDecoder.decode(jarPath, StandardCharsets.UTF_8));
+            JarFile jar = new JarFile(URLDecoder.decode(jarPath, "UTF-8"));
             Set<String> fileSet = new HashSet<String>();
             
             try {

docs-core/src/main/java/com/sismics/util/context/ThreadLocalContext.java

@@ -3,7 +3,7 @@ package com.sismics.util.context;
 import com.google.common.collect.Lists;
 import com.sismics.docs.core.model.context.AppContext;
 
-import jakarta.persistence.EntityManager;
+import javax.persistence.EntityManager;
 import java.util.Iterator;
 import java.util.List;
 

docs-core/src/main/java/com/sismics/util/jpa/DbOpenHelper.java

@@ -39,7 +39,7 @@ abstract class DbOpenHelper {
     private static final Logger log = LoggerFactory.getLogger(DbOpenHelper.class);
 
     private final JdbcConnectionAccess jdbcConnectionAccess;
-
+    
     private final List<Exception> exceptions = new ArrayList<>();
 
     private Formatter formatter;
@@ -99,7 +99,7 @@ abstract class DbOpenHelper {
                 onCreate();
                 oldVersion = 0;
             }
-
+            
             // Execute update script
             ResourceBundle configBundle = ConfigUtil.getConfigBundle();
             Integer currentVersion = Integer.parseInt(configBundle.getString("db.version"));
@@ -126,7 +126,7 @@ abstract class DbOpenHelper {
 
     /**
      * Execute all upgrade scripts in ascending order for a given version.
-     *
+     * 
      * @param version Version number
      * @throws Exception e
      */
@@ -136,7 +136,7 @@ abstract class DbOpenHelper {
             return name.matches("dbupdate-" + versionString + "-\\d+\\.sql");
         });
         Collections.sort(fileNameList);
-
+        
         for (String fileName : fileNameList) {
             if (log.isInfoEnabled()) {
                 log.info(MessageFormat.format("Executing script: {0}", fileName));
@@ -145,16 +145,16 @@ abstract class DbOpenHelper {
             executeScript(is);
         }
     }
-
+    
     /**
      * Execute a SQL script. All statements must be one line only.
-     *
+     * 
      * @param inputScript Script to execute
      * @throws IOException e
      */
     private void executeScript(InputStream inputScript) throws IOException {
         List<String> lines = CharStreams.readLines(new InputStreamReader(inputScript));
-
+        
         for (String sql : lines) {
             if (Strings.isNullOrEmpty(sql) || sql.startsWith("--")) {
                 continue;
@@ -178,13 +178,13 @@ abstract class DbOpenHelper {
     }
 
     public abstract void onCreate() throws Exception;
-
+    
     public abstract void onUpgrade(int oldVersion, int newVersion) throws Exception;
-
+    
     /**
-     * Returns a List of all Exceptions which occurred during the export.
+     * Returns a List of all Exceptions which occured during the export.
      *
-     * @return A List containing the Exceptions occurred during the export
+     * @return A List containig the Exceptions occured during the export
      */
     public List<?> getExceptions() {
         return exceptions;
@@ -192,7 +192,7 @@ abstract class DbOpenHelper {
 
     /**
      * Format the output SQL statements.
-     *
+     * 
      * @param format True to format
      */
     public void setFormat(boolean format) {

docs-core/src/main/java/com/sismics/util/jpa/EMF.java

@@ -1,15 +1,15 @@
 package com.sismics.util.jpa;
 
-import com.google.common.base.Strings;
 import com.sismics.docs.core.util.DirectoryUtil;
 import org.hibernate.boot.registry.StandardServiceRegistryBuilder;
+import org.hibernate.cfg.Environment;
 import org.hibernate.internal.util.config.ConfigurationHelper;
 import org.hibernate.service.ServiceRegistry;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import jakarta.persistence.EntityManagerFactory;
-import jakarta.persistence.Persistence;
+import javax.persistence.EntityManagerFactory;
+import javax.persistence.Persistence;
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.URL;
@@ -26,7 +26,7 @@ import java.util.Properties;
 public final class EMF {
     private static final Logger log = LoggerFactory.getLogger(EMF.class);
 
-    private static Properties properties;
+    private static Map<Object, Object> properties;
 
     private static EntityManagerFactory emfInstance;
 
@@ -34,6 +34,7 @@ public final class EMF {
         try {
             properties = getEntityManagerProperties();
 
+            Environment.verifyProperties(properties);
             ConfigurationHelper.resolvePlaceHolders(properties);
             ServiceRegistry reg = new StandardServiceRegistryBuilder().applySettings(properties).build();
 
@@ -59,7 +60,7 @@ public final class EMF {
         }
     }
     
-    private static Properties getEntityManagerProperties() {
+    private static Map<Object, Object> getEntityManagerProperties() {
         // Use properties file if exists
         try {
             URL hibernatePropertiesUrl = EMF.class.getResource("/hibernate.properties");
@@ -79,24 +80,19 @@ public final class EMF {
         String databaseUrl = System.getenv("DATABASE_URL");
         String databaseUsername = System.getenv("DATABASE_USER");
         String databasePassword = System.getenv("DATABASE_PASSWORD");
-        String databasePoolSize = System.getenv("DATABASE_POOL_SIZE");
-        if(databasePoolSize == null) {
-            databasePoolSize = "10";
-        }
 
         log.info("Configuring EntityManager from environment parameters");
-        Properties props = new Properties();
+        Map<Object, Object> props = new HashMap<>();
         Path dbDirectory = DirectoryUtil.getDbDirectory();
         String dbFile = dbDirectory.resolve("docs").toAbsolutePath().toString();
-        if (Strings.isNullOrEmpty(databaseUrl)) {
-            log.warn("Using an embedded H2 database. Only suitable for testing purpose, not for production!");
+        if (databaseUrl == null) {
             props.put("hibernate.connection.driver_class", "org.h2.Driver");
             props.put("hibernate.dialect", "org.hibernate.dialect.HSQLDialect");
             props.put("hibernate.connection.url", "jdbc:h2:file:" + dbFile + ";CACHE_SIZE=65536;LOCK_TIMEOUT=10000");
             props.put("hibernate.connection.username", "sa");
         } else {
             props.put("hibernate.connection.driver_class", "org.postgresql.Driver");
-            props.put("hibernate.dialect", "org.hibernate.dialect.PostgreSQLDialect");
+            props.put("hibernate.dialect", "org.hibernate.dialect.PostgreSQL94Dialect");
             props.put("hibernate.connection.url", databaseUrl);
             props.put("hibernate.connection.username", databaseUsername);
             props.put("hibernate.connection.password", databasePassword);
@@ -106,9 +102,12 @@ public final class EMF {
         props.put("hibernate.format_sql", "false");
         props.put("hibernate.max_fetch_depth", "5");
         props.put("hibernate.cache.use_second_level_cache", "false");
-        props.put("hibernate.connection.initial_pool_size", "1");
-        props.put("hibernate.connection.pool_size", databasePoolSize);
-        props.put("hibernate.connection.pool_validation_interval", "5");
+        props.put("hibernate.c3p0.min_size", "1");
+        props.put("hibernate.c3p0.max_size", "10");
+        props.put("hibernate.c3p0.timeout", "5000");
+        props.put("hibernate.c3p0.max_statements", "0");
+        props.put("hibernate.c3p0.acquire_increment", "1");
+        props.put("hibernate.c3p0.idle_test_period", "10");
         return props;
     }
     
@@ -140,4 +139,4 @@ public final class EMF {
     public static String getDriver() {
         return (String) properties.get("hibernate.connection.driver_class");
     }
-}
+}

docs-core/src/main/java/com/sismics/util/log4j/LogCriteria.java

@@ -1,6 +1,6 @@
 package com.sismics.util.log4j;
 
-import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang.StringUtils;
 import org.apache.log4j.Level;
 
 /**