move to app

.gitattributes

@@ -1,10 +1,10 @@
 * text=auto eol=lf
 
 # Ignore all JavaScript files in a directory
-core/src/main/resources/static/pdfjs/* linguist-vendored
-core/src/main/resources/static/pdfjs/** linguist-vendored
-core/src/main/resources/static/pdfjs-legacy/* linguist-vendored
-core/src/main/resources/static/pdfjs-legacy/** linguist-vendored
-core/src/main/resources/static/css/bootstrap-icons.css linguist-vendored
-core/src/main/resources/static/css/bootstrap.min.css linguist-vendored
-core/src/main/resources/static/css/fonts/* linguist-vendored
+app/core/src/main/resources/static/pdfjs/* linguist-vendored
+app/core/src/main/resources/static/pdfjs/** linguist-vendored
+app/core/src/main/resources/static/pdfjs-legacy/* linguist-vendored
+app/core/src/main/resources/static/pdfjs-legacy/** linguist-vendored
+app/core/src/main/resources/static/css/bootstrap-icons.css linguist-vendored
+app/core/src/main/resources/static/css/bootstrap.min.css linguist-vendored
+app/core/src/main/resources/static/css/fonts/* linguist-vendored

.github/labeler-config-srvaroa.yml

@@ -36,34 +36,34 @@ labels:
 
   - label: 'Translation'
     files:
-      - 'core/src/main/resources/messages_[a-zA-Z_]{2}_[a-zA-Z_]{2,7}.properties'
+      - 'app/core/src/main/resources/messages_[a-zA-Z_]{2}_[a-zA-Z_]{2,7}.properties'
       - 'scripts/ignore_translation.toml'
-      - 'core/src/main/resources/templates/fragments/languages.html'
+      - 'app/core/src/main/resources/templates/fragments/languages.html'
       - '.github/scripts/check_language_properties.py'
 
   - label: 'Front End'
     files:
-      - 'core/src/main/resources/templates/.*'
+      - 'app/core/src/main/resources/templates/.*'
       - 'proprietary/src/main/resources/templates/.*'
-      - 'core/src/main/resources/static/.*'
+      - 'app/core/src/main/resources/static/.*'
       - 'proprietary/src/main/resources/static/.*'
-      - 'core/src/main/java/stirling/software/SPDF/controller/web/.*'
-      - 'core/src/main/java/stirling/software/SPDF/UI/.*'
+      - 'app/core/src/main/java/stirling/software/SPDF/controller/web/.*'
+      - 'app/core/src/main/java/stirling/software/SPDF/UI/.*'
       - 'proprietary/src/main/java/stirling/software/proprietary/security/controller/web/.*'
 
   - label: 'Java'
     files:
       - 'common/src/main/java/.*.java'
       - 'proprietary/src/main/java/.*.java'
-      - 'core/src/main/java/.*.java'
+      - 'app/core/src/main/java/.*.java'
 
   - label: 'Back End'
     files:
-      - 'core/src/main/java/stirling/software/SPDF/config/.*'
-      - 'core/src/main/java/stirling/software/SPDF/controller/.*'
-      - 'core/src/main/resources/settings.yml.template'
-      - 'core/src/main/resources/application.properties'
-      - 'core/src/main/resources/banner.txt'
+      - 'app/core/src/main/java/stirling/software/SPDF/config/.*'
+      - 'app/core/src/main/java/stirling/software/SPDF/controller/.*'
+      - 'app/core/src/main/resources/settings.yml.template'
+      - 'app/core/src/main/resources/application.properties'
+      - 'app/core/src/main/resources/banner.txt'
       - 'scripts/png_to_webp.py'
       - 'split_photos.py'
       - 'application.properties'
@@ -77,10 +77,10 @@ labels:
 
   - label: 'API'
     files:
-      - 'core/src/main/java/stirling/software/SPDF/config/OpenApiConfig.java'
-      - 'core/src/main/java/stirling/software/SPDF/controller/web/MetricsController.java'
-      - 'core/src/main/java/stirling/software/SPDF/controller/api/.*'
-      - 'core/src/main/java/stirling/software/SPDF/model/api/.*'
+      - 'app/core/src/main/java/stirling/software/SPDF/config/OpenApiConfig.java'
+      - 'app/core/src/main/java/stirling/software/SPDF/controller/web/MetricsController.java'
+      - 'app/core/src/main/java/stirling/software/SPDF/controller/api/.*'
+      - 'app/core/src/main/java/stirling/software/SPDF/model/api/.*'
       - 'proprietary/src/main/java/stirling/software/proprietary/security/controller/api/.*'
       - 'scripts/png_to_webp.py'
       - 'split_photos.py'
@@ -121,7 +121,7 @@ labels:
     files:
       - 'common/src/test/.*'
       - 'proprietary/src/test/.*'
-      - 'core/src/test/.*'
+      - 'app/core/src/test/.*'
       - 'testing/.*'
       - '.github/workflows/scorecards.yml'
       - 'exampleYmlFiles/test_cicd.yml'
@@ -139,4 +139,4 @@ labels:
       - 'build.gradle'
       - 'common/build.gradle'
       - 'proprietary/build.gradle'
-      - 'core/build.gradle'
+      - 'app/core/build.gradle'

.github/scripts/check_language_properties.py

@@ -197,7 +197,7 @@ def check_for_differences(reference_file, file_list, branch, actor):
     if len(file_list) == 1:
         file_arr = file_list[0].split()
     base_dir = os.path.abspath(
-        os.path.join(os.getcwd(), "core", "src", "main", "resources")
+        os.path.join(os.getcwd(), "app", "core", "src", "main", "resources")
     )
 
     for file_path in file_arr:
@@ -219,12 +219,13 @@ def check_for_differences(reference_file, file_list, branch, actor):
                 # only local windows command
                 not file_normpath.startswith(
                     os.path.join(
-                        "", "core", "src", "main", "resources", "messages_"
+                        "", "app", "core", "src", "main", "resources", "messages_"
                     )
                 )
                 and not file_normpath.startswith(
                     os.path.join(
                         os.getcwd(),
+                        "app",
                         "core",
                         "src",
                         "main",
@@ -389,6 +390,7 @@ if __name__ == "__main__":
             file_list = glob.glob(
                 os.path.join(
                     os.getcwd(),
+                    "app",
                     "core",
                     "src",
                     "main",

.github/workflows/build.yml

@@ -48,8 +48,8 @@ jobs:
         if: always()
         run: |
           declare -a dirs=(
-            "core/build/reports/tests/"
-            "core/build/test-results/"
+            "app/core/build/reports/tests/"
+            "app/core/build/test-results/"
             "common/build/reports/tests/"
             "common/build/test-results/"
             "proprietary/build/reports/tests/"
@@ -74,9 +74,9 @@ jobs:
         with:
           name: test-reports-jdk-${{ matrix.jdk-version }}-spring-security-${{ matrix.spring-security }}
           path: |
-            core/build/reports/tests/
-            core/build/test-results/
-            core/build/reports/problems/
+            app/core/build/reports/tests/
+            app/core/build/test-results/
+            app/core/build/reports/problems/
             common/build/reports/tests/
             common/build/test-results/
             common/build/reports/problems/

.github/workflows/check_properties.yml

@@ -4,7 +4,7 @@ on:
   pull_request_target:
     types: [opened, synchronize, reopened]
     paths:
-      - "core/src/main/resources/messages_*.properties"
+      - "app/core/src/main/resources/messages_*.properties"
 
 permissions:
   contents: read # Allow read access to repository content
@@ -67,7 +67,7 @@ jobs:
               exit 1
             fi
             # Get changed files and filter for properties files, handle case where no matches are found
-            gh pr view ${{ steps.get-pr-data.outputs.pr_number }} --json files -q ".files[].path" | grep -E '^core/src/main/resources/messages_[a-zA-Z_]{2}_[a-zA-Z_]{2,7}\.properties$' > changed_files.txt || echo "No matching properties files found in PR"
+            gh pr view ${{ steps.get-pr-data.outputs.pr_number }} --json files -q ".files[].path" | grep -E '^app/core/src/main/resources/messages_[a-zA-Z_]{2}_[a-zA-Z_]{2,7}\.properties$' > changed_files.txt || echo "No matching properties files found in PR"
             # Check if any files were found
             if [ ! -s changed_files.txt ]; then
               echo "No properties files changed in this PR"
@@ -117,7 +117,7 @@ jobs:
             const changedFiles = files
               .filter(file => 
                 file.status !== "removed" &&
-                /^core\/src\/main\/resources\/messages_[a-zA-Z_]{2}_[a-zA-Z_]{2,7}\.properties$/.test(file.filename)
+                /^app\/core\/src\/main\/resources\/messages_[a-zA-Z_]{2}_[a-zA-Z_]{2,7}\.properties$/.test(file.filename)
               )
               .map(file => file.filename);
 
@@ -157,12 +157,12 @@ jobs:
 
             // Determine reference file
             let referenceFilePath;
-            if (changedFiles.includes("core/src/main/resources/messages_en_GB.properties")) {
+            if (changedFiles.includes("app/core/src/main/resources/messages_en_GB.properties")) {
               console.log("Using PR branch reference file.");
               const { data: fileContent } = await github.rest.repos.getContent({
                 owner: prRepoOwner,
                 repo: prRepoName,
-                path: "core/src/main/resources/messages_en_GB.properties",
+                path: "app/core/src/main/resources/messages_en_GB.properties",
                 ref: branch,
               });
 
@@ -174,7 +174,7 @@ jobs:
               const { data: fileContent } = await github.rest.repos.getContent({
                 owner: repoOwner,
                 repo: repoName,
-                path: "core/src/main/resources/messages_en_GB.properties",
+                path: "app/core/src/main/resources/messages_en_GB.properties",
                 ref: "main",
               });
 

.github/workflows/licenses-update.yml

@@ -57,7 +57,7 @@ jobs:
 
       - name: Move and rename license file
         run: |
-          mv build/reports/dependency-license/index.json core/src/main/resources/static/3rdPartyLicenses.json
+          mv build/reports/dependency-license/index.json app/core/src/main/resources/static/3rdPartyLicenses.json
 
       - name: Commit changes
         run: |

.github/workflows/multiOSReleases.yml

@@ -86,7 +86,7 @@ jobs:
         run: |
           mkdir ./binaries
           mv ./build/launch4j/Stirling-PDF.exe ./binaries/win-Stirling-PDF-portable-Server${{ matrix.file_suffix }}.exe
-          mv ./core/build/libs/stirling-pdf-${{ needs.read_versions.outputs.version }}.jar ./binaries/Stirling-PDF${{ matrix.file_suffix }}.jar
+          mv ./app/core/build/libs/stirling-pdf-${{ needs.read_versions.outputs.version }}.jar ./binaries/Stirling-PDF${{ matrix.file_suffix }}.jar
 
       - name: Upload build artifacts
         uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2

.github/workflows/sync_files.yml

@@ -8,8 +8,8 @@ on:
     paths:
       - "build.gradle"
       - "README.md"
-      - "core/src/main/resources/messages_*.properties"
-      - "core/src/main/resources/static/3rdPartyLicenses.json"
+      - "app/core/src/main/resources/messages_*.properties"
+      - "app/core/src/main/resources/static/3rdPartyLicenses.json"
       - "scripts/ignore_translation.toml"
 
 permissions:
@@ -41,11 +41,11 @@ jobs:
 
       - name: Sync translation property files
         run: |
-          python .github/scripts/check_language_properties.py --reference-file "core/src/main/resources/messages_en_GB.properties" --branch main
+          python .github/scripts/check_language_properties.py --reference-file "app/core/src/main/resources/messages_en_GB.properties" --branch main
 
       - name: Commit translation files
         run: |
-          git add core/src/main/resources/messages_*.properties
+          git add app/core/src/main/resources/messages_*.properties
           git diff --staged --quiet || git commit -m ":memo: Sync translation files" || echo "No changes detected"
 
       - name: Install dependencies
@@ -101,4 +101,4 @@ jobs:
           sign-commits: true
           add-paths: |
             README.md
-            core/src/main/resources/messages_*.properties
+            app/core/src/main/resources/messages_*.properties

.gitignore

@@ -125,7 +125,7 @@ SwaggerDoc.json
 *.rar
 *.db
 /build
-/core/build
+/app/core/build
 /common/build
 /proprietary/build
 

.vscode/settings.json

@@ -129,7 +129,7 @@
   "html.format.preserveNewLines": true,
   "html.format.maxPreserveNewLines": 2,
   "java.project.sourcePaths": [
-    "core/src/main/java",
+    "app/core/src/main/java",
     "common/src/main/java",
     "proprietary/src/main/java"
   ]

Dockerfile

@@ -4,8 +4,8 @@ FROM alpine:3.22.0@sha256:8a1f59ffb675680d47db6337b49d22281a139e9d709335b492be02
 # Copy necessary files
 COPY scripts /scripts
 COPY pipeline /pipeline
-COPY core/src/main/resources/static/fonts/*.ttf /usr/share/fonts/opentype/noto/
-COPY core/build/libs/*.jar app.jar
+COPY app/core/src/main/resources/static/fonts/*.ttf /usr/share/fonts/opentype/noto/
+COPY app/core/build/libs/*.jar app.jar
 
 ARG VERSION_TAG
 
@@ -34,10 +34,10 @@ ENV DISABLE_ADDITIONAL_FEATURES=true \
     UNO_PATH=/usr/lib/libreoffice/program \
     URE_BOOTSTRAP=file:///usr/lib/libreoffice/program/fundamentalrc \
     PATH=$PATH:/opt/venv/bin \
-    STIRLING_TEMPFILES_DIRECTORY=/tmp/core \
-    TMPDIR=/tmp/core \
-    TEMP=/tmp/core \
-    TMP=/tmp/core
+    STIRLING_TEMPFILES_DIRECTORY=/tmp/stirling-pdf \
+    TMPDIR=/tmp/stirling-pdf \
+    TEMP=/tmp/stirling-pdf \
+    TMP=/tmp/stirling-pdf
 
 
 # JDK for app
@@ -85,7 +85,7 @@ RUN echo "@main https://dl-cdn.alpinelinux.org/alpine/edge/main" | tee -a /etc/a
     ln -s /usr/lib/libreoffice/program/unohelper.py /opt/venv/lib/python3.12/site-packages/ && \
     ln -s /usr/lib/libreoffice/program /opt/venv/lib/python3.12/site-packages/LibreOffice && \
     mv /usr/share/tessdata /usr/share/tessdata-original && \
-    mkdir -p $HOME /configs /logs /customFiles /pipeline/watchedFolders /pipeline/finishedFolders /tmp/core && \
+    mkdir -p $HOME /configs /logs /customFiles /pipeline/watchedFolders /pipeline/finishedFolders /tmp/stirling-pdf && \
     # Configure URW Base 35 fonts
     ln -s /usr/share/fontconfig/conf.avail/69-urw-*.conf /etc/fonts/conf.d/ && \
     fc-cache -f -v && \
@@ -93,11 +93,11 @@ RUN echo "@main https://dl-cdn.alpinelinux.org/alpine/edge/main" | tee -a /etc/a
     chmod +x /scripts/init.sh && \
     # User permissions
     addgroup -S stirlingpdfgroup && adduser -S stirlingpdfuser -G stirlingpdfgroup && \
-    chown -R stirlingpdfuser:stirlingpdfgroup $HOME /scripts /usr/share/fonts/opentype/noto /configs /customFiles /pipeline /tmp/core && \
+    chown -R stirlingpdfuser:stirlingpdfgroup $HOME /scripts /usr/share/fonts/opentype/noto /configs /customFiles /pipeline /tmp/stirling-pdf && \
     chown stirlingpdfuser:stirlingpdfgroup /app.jar
 
 EXPOSE 8080/tcp
 
 # Set user and run command
 ENTRYPOINT ["tini", "--", "/scripts/init.sh"]
-CMD ["sh", "-c", "java -Dfile.encoding=UTF-8 -Djava.io.tmpdir=/tmp/core -jar /app.jar & /opt/venv/bin/unoserver --port 2003 --interface 127.0.0.1"]
+CMD ["sh", "-c", "java -Dfile.encoding=UTF-8 -Djava.io.tmpdir=/tmp/stirling-pdf -jar /app.jar & /opt/venv/bin/unoserver --port 2003 --interface 127.0.0.1"]

Dockerfile.dev

@@ -28,10 +28,10 @@ RUN apt-get update && apt-get install -y \
 
 # Setze die Environment Variable für setuptools
 ENV SETUPTOOLS_USE_DISTUTILS=local \
-    STIRLING_TEMPFILES_DIRECTORY=/tmp/core \
-    TMPDIR=/tmp/core \
-    TEMP=/tmp/core \
-    TMP=/tmp/core
+    STIRLING_TEMPFILES_DIRECTORY=/tmp/stirling-pdf \
+    TMPDIR=/tmp/stirling-pdf \
+    TEMP=/tmp/stirling-pdf \
+    TMP=/tmp/stirling-pdf
 
 # Installation der benötigten Python-Pakete
 RUN python3 -m venv --system-site-packages /opt/venv \
@@ -44,10 +44,10 @@ ENV PATH="/opt/venv/bin:$PATH"
 
 COPY . /workspace
 
-RUN mkdir -p /tmp/core \
+RUN mkdir -p /tmp/stirling-pdf \
   && fc-cache -f -v \
   && adduser --disabled-password --gecos '' devuser \
-  && chown -R devuser:devuser /home/devuser /workspace /tmp/core
+  && chown -R devuser:devuser /home/devuser /workspace /tmp/stirling-pdf
 RUN echo "devuser ALL=(ALL) NOPASSWD:ALL" > /etc/sudoers.d/devuser \
   && chmod 0440 /etc/sudoers.d/devuser
 

Dockerfile.fat

@@ -5,7 +5,7 @@ COPY build.gradle .
 COPY settings.gradle .
 COPY gradlew .
 COPY gradle gradle/
-COPY core/build.gradle core/.
+COPY app/core/build.gradle core/.
 COPY common/build.gradle common/.
 COPY proprietary/build.gradle proprietary/.
 RUN ./gradlew build -x spotlessApply -x spotlessCheck -x test -x sonarqube || return 0
@@ -27,7 +27,7 @@ FROM alpine:3.22.0@sha256:8a1f59ffb675680d47db6337b49d22281a139e9d709335b492be02
 # Copy necessary files
 COPY scripts /scripts
 COPY pipeline /pipeline
-COPY core/src/main/resources/static/fonts/*.ttf /usr/share/fonts/opentype/noto/
+COPY app/core/src/main/resources/static/fonts/*.ttf /usr/share/fonts/opentype/noto/
 COPY --from=build /app/core/build/libs/*.jar app.jar
 
 ARG VERSION_TAG
@@ -47,10 +47,10 @@ ENV DISABLE_ADDITIONAL_FEATURES=true \
     UNO_PATH=/usr/lib/libreoffice/program \
     URE_BOOTSTRAP=file:///usr/lib/libreoffice/program/fundamentalrc \
     PATH=$PATH:/opt/venv/bin \
-    STIRLING_TEMPFILES_DIRECTORY=/tmp/core \
-    TMPDIR=/tmp/core \
-    TEMP=/tmp/core \
-    TMP=/tmp/core
+    STIRLING_TEMPFILES_DIRECTORY=/tmp/stirling-pdf \
+    TMPDIR=/tmp/stirling-pdf \
+    TEMP=/tmp/stirling-pdf \
+    TMP=/tmp/stirling-pdf
 
 
 # JDK for app
@@ -97,7 +97,7 @@ RUN echo "@main https://dl-cdn.alpinelinux.org/alpine/edge/main" | tee -a /etc/a
     ln -s /usr/lib/libreoffice/program/unohelper.py /opt/venv/lib/python3.12/site-packages/ && \
     ln -s /usr/lib/libreoffice/program /opt/venv/lib/python3.12/site-packages/LibreOffice && \
     mv /usr/share/tessdata /usr/share/tessdata-original && \
-    mkdir -p $HOME /configs /logs /customFiles /pipeline/watchedFolders /pipeline/finishedFolders /tmp/core && \
+    mkdir -p $HOME /configs /logs /customFiles /pipeline/watchedFolders /pipeline/finishedFolders /tmp/stirling-pdf && \
     # Configure URW Base 35 fonts
     ln -s /usr/share/fontconfig/conf.avail/69-urw-*.conf /etc/fonts/conf.d/ && \
     fc-cache -f -v && \
@@ -105,10 +105,10 @@ RUN echo "@main https://dl-cdn.alpinelinux.org/alpine/edge/main" | tee -a /etc/a
     chmod +x /scripts/init.sh && \
     # User permissions
     addgroup -S stirlingpdfgroup && adduser -S stirlingpdfuser -G stirlingpdfgroup && \
-    chown -R stirlingpdfuser:stirlingpdfgroup $HOME /scripts /usr/share/fonts/opentype/noto /configs /customFiles /pipeline /tmp/core && \
+    chown -R stirlingpdfuser:stirlingpdfgroup $HOME /scripts /usr/share/fonts/opentype/noto /configs /customFiles /pipeline /tmp/stirling-pdf && \
     chown stirlingpdfuser:stirlingpdfgroup /app.jar
 
 EXPOSE 8080/tcp
 # Set user and run command
 ENTRYPOINT ["tini", "--", "/scripts/init.sh"]
-CMD ["sh", "-c", "java -Dfile.encoding=UTF-8 -Djava.io.tmpdir=/tmp/core -jar /app.jar & /opt/venv/bin/unoserver --port 2003 --interface 127.0.0.1"]
+CMD ["sh", "-c", "java -Dfile.encoding=UTF-8 -Djava.io.tmpdir=/tmp/stirling-pdf -jar /app.jar & /opt/venv/bin/unoserver --port 2003 --interface 127.0.0.1"]

Dockerfile.ultra-lite

@@ -12,17 +12,17 @@ ENV DISABLE_ADDITIONAL_FEATURES=true \
     PUID=1000 \
     PGID=1000 \
     UMASK=022 \
-    STIRLING_TEMPFILES_DIRECTORY=/tmp/core \
-    TMPDIR=/tmp/core \
-    TEMP=/tmp/core \
-    TMP=/tmp/core
+    STIRLING_TEMPFILES_DIRECTORY=/tmp/stirling-pdf \
+    TMPDIR=/tmp/stirling-pdf \
+    TEMP=/tmp/stirling-pdf \
+    TMP=/tmp/stirling-pdf
 
 # Copy necessary files
 COPY scripts/download-security-jar.sh /scripts/download-security-jar.sh
 COPY scripts/init-without-ocr.sh /scripts/init-without-ocr.sh
 COPY scripts/installFonts.sh /scripts/installFonts.sh
 COPY pipeline /pipeline
-COPY core/build/libs/*.jar app.jar
+COPY app/core/build/libs/*.jar app.jar
 
 # Set up necessary directories and permissions
 RUN echo "@testing https://dl-cdn.alpinelinux.org/alpine/edge/main" | tee -a /etc/apk/repositories && \
@@ -39,10 +39,10 @@ RUN echo "@testing https://dl-cdn.alpinelinux.org/alpine/edge/main" | tee -a /et
         su-exec \
         openjdk21-jre && \
     # User permissions
-    mkdir -p /configs /logs /customFiles /usr/share/fonts/opentype/noto /tmp/core && \
+    mkdir -p /configs /logs /customFiles /usr/share/fonts/opentype/noto /tmp/stirling-pdf && \
     chmod +x /scripts/*.sh && \
     addgroup -S stirlingpdfgroup && adduser -S stirlingpdfuser -G stirlingpdfgroup && \
-    chown -R stirlingpdfuser:stirlingpdfgroup $HOME /scripts  /configs /customFiles /pipeline /tmp/core && \
+    chown -R stirlingpdfuser:stirlingpdfgroup $HOME /scripts  /configs /customFiles /pipeline /tmp/stirling-pdf && \
     chown stirlingpdfuser:stirlingpdfgroup /app.jar
 
 # Set environment variables
@@ -52,4 +52,4 @@ EXPOSE 8080/tcp
 
 # Run the application
 ENTRYPOINT ["tini", "--", "/scripts/init-without-ocr.sh"]
-CMD ["java", "-Dfile.encoding=UTF-8", "-Djava.io.tmpdir=/tmp/core", "-jar", "/app.jar"]
+CMD ["java", "-Dfile.encoding=UTF-8", "-Djava.io.tmpdir=/tmp/stirling-pdf", "-jar", "/app.jar"]