move proprietary, common to app

.github/labeler-config-srvaroa.yml

@@ -44,17 +44,17 @@ labels:
   - label: 'Front End'
     files:
       - 'app/core/src/main/resources/templates/.*'
-      - 'proprietary/src/main/resources/templates/.*'
+      - 'app/proprietary/src/main/resources/templates/.*'
       - 'app/core/src/main/resources/static/.*'
-      - 'proprietary/src/main/resources/static/.*'
+      - 'app/proprietary/src/main/resources/static/.*'
       - '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/.*'
+      - 'app/proprietary/src/main/java/stirling/software/proprietary/security/controller/web/.*'
 
   - label: 'Java'
     files:
-      - 'common/src/main/java/.*.java'
-      - 'proprietary/src/main/java/.*.java'
+      - 'app/common/src/main/java/.*.java'
+      - 'app/proprietary/src/main/java/.*.java'
       - 'app/core/src/main/java/.*.java'
 
   - label: 'Back End'
@@ -70,7 +70,7 @@ labels:
 
   - label: 'Security'
     files:
-      - 'proprietary/src/main/java/stirling/software/proprietary/security/.*'
+      - 'app/proprietary/src/main/java/stirling/software/proprietary/security/.*'
       - 'scripts/download-security-jar.sh'
       - '.github/workflows/dependency-review.yml'
       - '.github/workflows/scorecards.yml'
@@ -81,7 +81,7 @@ labels:
       - '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/.*'
+      - 'app/proprietary/src/main/java/stirling/software/proprietary/security/controller/api/.*'
       - 'scripts/png_to_webp.py'
       - 'split_photos.py'
       - '.github/workflows/swagger.yml'
@@ -119,8 +119,8 @@ labels:
 
   - label: 'Test'
     files:
-      - 'common/src/test/.*'
-      - 'proprietary/src/test/.*'
+      - 'app/common/src/test/.*'
+      - 'app/proprietary/src/test/.*'
       - 'app/core/src/test/.*'
       - 'testing/.*'
       - '.github/workflows/scorecards.yml'
@@ -137,6 +137,6 @@ labels:
       - 'gradlew.bat'
       - 'settings.gradle'
       - 'build.gradle'
-      - 'common/build.gradle'
-      - 'proprietary/build.gradle'
+      - 'app/common/build.gradle'
+      - 'app/proprietary/build.gradle'
       - 'app/core/build.gradle'

.github/workflows/build.yml

@@ -50,10 +50,10 @@ jobs:
           declare -a dirs=(
             "app/core/build/reports/tests/"
             "app/core/build/test-results/"
-            "common/build/reports/tests/"
-            "common/build/test-results/"
-            "proprietary/build/reports/tests/"
-            "proprietary/build/test-results/"
+            "app/common/build/reports/tests/"
+            "app/common/build/test-results/"
+            "app/proprietary/build/reports/tests/"
+            "app/proprietary/build/test-results/"
           )
           missing_reports=()
           for dir in "${dirs[@]}"; do
@@ -77,12 +77,12 @@ jobs:
             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/
-            proprietary/build/reports/tests/
-            proprietary/build/test-results/
-            proprietary/build/reports/problems/
+            app/common/build/reports/tests/
+            app/common/build/test-results/
+            app/common/build/reports/problems/
+            app/proprietary/build/reports/tests/
+            app/proprietary/build/test-results/
+            app/proprietary/build/reports/problems/
             build/reports/problems/
           retention-days: 3
           if-no-files-found: warn

.gitignore

@@ -126,8 +126,8 @@ SwaggerDoc.json
 *.db
 /build
 /app/core/build
-/common/build
-/proprietary/build
+/app/common/build
+/app/proprietary/build
 
 # Byte-compiled / optimized / DLL files
 __pycache__/

.vscode/settings.json

@@ -79,11 +79,11 @@
     ".venv*/",
     ".vscode/",
     "bin/",
-    "common/bin/",
-    "proprietary/bin/",
+    "app/common/bin/",
+    "app/proprietary/bin/",
     "build/",
-    "common/build/",
-    "proprietary/build/",
+    "app/common/build/",
+    "app/proprietary/build/",
     "configs/",
     "customFiles/",
     "docs/",
@@ -97,8 +97,8 @@
     ".git-blame-ignore-revs",
     ".gitattributes",
     ".gitignore",
-    "common/.gitignore",
-    "proprietary/.gitignore",
+    "app/common/.gitignore",
+    "app/proprietary/.gitignore",
     ".pre-commit-config.yaml",
   ],
   // Enables signature help in Java.
@@ -130,7 +130,7 @@
   "html.format.maxPreserveNewLines": 2,
   "java.project.sourcePaths": [
     "app/core/src/main/java",
-    "common/src/main/java",
-    "proprietary/src/main/java"
+    "app/common/src/main/java",
+    "app/proprietary/src/main/java"
   ]
 }

Dockerfile.fat

@@ -6,8 +6,8 @@ COPY settings.gradle .
 COPY gradlew .
 COPY gradle gradle/
 COPY app/core/build.gradle core/.
-COPY common/build.gradle common/.
-COPY proprietary/build.gradle proprietary/.
+COPY app/common/build.gradle common/.
+COPY app/proprietary/build.gradle proprietary/.
 RUN ./gradlew build -x spotlessApply -x spotlessCheck -x test -x sonarqube || return 0
 
 # Set the working directory

LICENSE

@@ -4,8 +4,8 @@ Copyright (c) 2025 Stirling PDF Inc.
 
 Portions of this software are licensed as follows:
 
-* All content that resides under the "proprietary/" directory of this repository,
-if that directory exists, is licensed under the license defined in "proprietary/LICENSE".
+* All content that resides under the "app/proprietary/" directory of this repository,
+if that directory exists, is licensed under the license defined in "app/proprietary/LICENSE".
 * Content outside of the above mentioned directories or restrictions above is
 available under the MIT License as defined below.
 

app/common/.gitignore

@@ -124,7 +124,7 @@ SwaggerDoc.json
 *.rar
 *.db
 /build
-/common/build/
+/app/common/build/
 
 # Byte-compiled / optimized / DLL files
 __pycache__/

app/common/src/main/java/stirling/software/common/config/TempFileShutdownHook.java

@@ -6,7 +6,6 @@ import java.nio.file.Path;
 import java.util.Set;
 
 import org.springframework.beans.factory.DisposableBean;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 import lombok.extern.slf4j.Slf4j;
@@ -24,7 +23,6 @@ public class TempFileShutdownHook implements DisposableBean {
 
     private final TempFileRegistry registry;
 
-    @Autowired
     public TempFileShutdownHook(TempFileRegistry registry) {
         this.registry = registry;
 

app/common/src/main/java/stirling/software/common/service/TaskManager.java

@@ -1,6 +1,5 @@
 package stirling.software.common.service;
 
-import io.github.pixee.security.ZipSecurity;
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
@@ -21,6 +20,8 @@ import org.springframework.http.MediaType;
 import org.springframework.stereotype.Service;
 import org.springframework.web.multipart.MultipartFile;
 
+import io.github.pixee.security.ZipSecurity;
+
 import jakarta.annotation.PreDestroy;
 
 import lombok.extern.slf4j.Slf4j;
@@ -361,7 +362,8 @@ public class TaskManager {
         MultipartFile zipFile = fileStorage.retrieveFile(zipFileId);
 
         try (ZipInputStream zipIn =
-                ZipSecurity.createHardenedInputStream(new ByteArrayInputStream(zipFile.getBytes()))) {
+                ZipSecurity.createHardenedInputStream(
+                        new ByteArrayInputStream(zipFile.getBytes()))) {
             ZipEntry entry;
             while ((entry = zipIn.getNextEntry()) != null) {
                 if (!entry.isDirectory()) {